diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6b2da4c58b40..da5bfa6ade41 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,6 +5,6 @@
 
 - [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md).
 - [ ] If contributing template-only or documentation-only changes which will change sample output, [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) beforehand.
-- [ ] Run the shell script `./bin/generate-samples.sh`to update all Petstore samples related to your fix. This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/config/java*`.
-- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `4.3.x`, `5.0.x`. Default: `master`.
+- [ ] Run the shell script `./bin/generate-samples.sh`to update all Petstore samples related to your fix. This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/config/java*`. For Windows users, please run the script in [Git BASH](https://gitforwindows.org/).
+- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`
 - [ ] Copy the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) to review the pull request if your PR is targeting a particular programming language.
diff --git a/.github/workflows/docker-tag-latest-release.yml b/.github/workflows/docker-tag-latest-release.yml
new file mode 100644
index 000000000000..73c7cbd87e92
--- /dev/null
+++ b/.github/workflows/docker-tag-latest-release.yml
@@ -0,0 +1,62 @@
+name: Docker Tag latest-release
+
+# Run every couple of days
+on:
+  schedule:
+  - cron: "30 12 */2 * *"
+
+jobs:
+  # This pulls all containers for the last known release tag, and tags as latest-release or x-latest-release for shared repo
+  tagLatestRelease:
+    runs-on: ubuntu-latest
+
+    steps:
+
+    # Pull the code so we have git metadata
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    # This action will "unshallow" so we have all tag info
+    - name: Get latest tag
+      id: tagger
+      uses: jimschubert/query-tag-action@v1
+      with:
+        include: 'v*'
+        exclude: '*-rc*'
+        commit-ish: 'HEAD~'
+
+    - name: DockerHub Login
+      run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+    
+    # Tags openapitools/openapi-generator-online, which is an automated build
+    - name: "Tag openapi-generator-online:x"
+      id: tag-openapi-generator-online
+      run: |
+        echo 'Tagging as latest-release: ${{steps.tagger.outputs.tag}}'
+        docker pull openapitools/openapi-generator-online:${{steps.tagger.outputs.tag}}
+        docker tag openapitools/openapi-generator-online:${{steps.tagger.outputs.tag}} openapitools/openapi-generator-online:latest-release
+        docker push openapitools/openapi-generator-online:latest-release
+
+    # Tags openapitools/openapi-generator's CLI image (this repo holds CLI + Online via tag prefix)
+    - name: "Tag openapi-generator:cli-x"
+      id: tag-cli
+      run: |
+        echo 'Tagging as latest-release: ${{steps.tagger.outputs.tag}}'
+        docker pull openapitools/openapi-generator:cli-${{steps.tagger.outputs.tag}}
+        docker tag openapitools/openapi-generator:cli-${{steps.tagger.outputs.tag}} openapitools/openapi-generator:cli-latest-release
+        docker push openapitools/openapi-generator:cli-latest-release
+
+    # Tags openapitools/openapi-generator's ONLINE image (this repo holds CLI + Online via tag prefix)
+    - name: "Tag openapi-generator:online-x"
+      id: tag-online
+      run: |
+        echo 'Tagging as latest-release: ${{steps.tagger.outputs.tag}}'
+        docker pull openapitools/openapi-generator:online-${{steps.tagger.outputs.tag}}
+        docker tag openapitools/openapi-generator:online-${{steps.tagger.outputs.tag}} openapitools/openapi-generator:online-latest-release
+        docker push openapitools/openapi-generator:online-latest-release
+
+    # Clean up docker credentials/configs/etc.
+    - name: Cleanup
+      if: always()
+      run: |
+        rm -f ${HOME}/.docker/config.json
diff --git a/.travis.yml b/.travis.yml
index d8493d013f5b..f8cb2a06187a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,10 @@ cache:
   - $HOME/samples/client/petstore/php/OpenAPIToolsClient-php/vendor
   - $HOME/samples/client/petstore/ruby/vendor/bundle
   - $HOME/samples/client/petstore/python/.venv/
+  - $HOME/samples/openapi3/client/petstore/typescript/tests/default/node_modules
+  - $HOME/samples/openapi3/client/petstore/typescript/tests/jquery/node_modules
+  - $HOME/samples/openapi3/client/petstore/typescript/tests/object_params/node_modules
+  - $HOME/samples/openapi3/client/petstore/typescript/tests/inversify/node_modules
   - $HOME/samples/client/petstore/typescript-node/npm/node_modules
   - $HOME/samples/client/petstore/typescript-node/npm/typings/
   - $HOME/samples/client/petstore/typescript-fetch/tests/default/node_modules
@@ -41,6 +45,7 @@ cache:
   - $HOME/.npm  
   - $HOME/.rvm/gems/ruby-2.4.1
   - $HOME/website/node_modules/
+  - $HOME/.cache/deno
 
 services:
   - docker
@@ -85,7 +90,8 @@ before_install:
   #- sudo apt-get update
   #- sudo apt-get install dart
   # switch to php7
-  - phpenv global 7.1
+  - phpenv versions
+  - phpenv global 7.2.15
   - php -v
   # install perl module
   #- cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
@@ -114,6 +120,9 @@ before_install:
       gpg --check-trustdb ;
     fi;
   - pushd .; cd website; yarn install; popd
+  # install Deno
+  - curl -fsSL https://deno.land/x/install/install.sh | sh -s v1.1.2
+  - export PATH="$HOME/.deno/bin:$PATH"
 
 install:
   # Add Godeps dependencies to GOPATH and PATH
diff --git a/CI/bitrise.yml b/CI/bitrise.yml
index 73d2e2b29a3c..9cd052310171 100644
--- a/CI/bitrise.yml
+++ b/CI/bitrise.yml
@@ -14,14 +14,14 @@ workflows:
     - brew-install@0.10.2:
         inputs:
         - packages: maven
-    - script@1.1.5:
+    - script@1.1.6:
         title: Install Cocoapods
         inputs:
         - content: |
             #!/usr/bin/env bash
 
             sudo gem install cocoapods
-    - script@1.1.5:
+    - script@1.1.6:
         inputs:
         - content: |
             #!/usr/bin/env bash
@@ -30,7 +30,7 @@ workflows:
 
             mvn --no-snapshot-updates package -Dorg.slf4j.simpleLogger.defaultLogLevel=error
         title: Build openapi-generator
-    - script@1.1.5:
+    - script@1.1.6:
         title: Update Swift samples
         inputs:
         - content: |
@@ -38,8 +38,8 @@ workflows:
 
             set -e
 
-            sh bin/generate-samples.sh bin/configs/swift5-*.yaml
-    - script@1.1.5:
+            bin/generate-samples.sh ./bin/configs/other/swift5-*
+    - script@1.1.6:
         title: Run Swift5 tests
         inputs:
         - content: |
@@ -48,14 +48,4 @@ workflows:
             set -e
 
             ./samples/client/test/swift5/swift5_test_all.sh
-# comment out the following as it's causing timeout
-#    - script@1.1.5:
-#        title: Run all bin scripts
-#        inputs:
-#        - content: |-
-#            #!/usr/bin/env bash
-#
-#            set -e
-#
-#            ./bin/run-all-petstore
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dcce5cb60987..e701fb5ba33a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -86,6 +86,7 @@ To add test cases (optional) covering the change in the code generator, please r
 
 To test the templates, please perform the following:
 - Update the Petstore sample by running the shell scripts under `bin` and `bin/openapi3` folder. For example, run `./bin/python-petstore.sh` and `./bin/openapi3/python-petstore.sh` to update the Python PetStore API client under [`samples/client/petstore/python`](https://github.com/openapitools/openapi-generator/tree/master/samples/client/petstore/python) and [`samples/openapi3/client/petstore/python`](https://github.com/openapitools/openapi-generator/tree/master/samples/openapi3/client/petstore/python). For Windows, the batch files can be found under `bin\windows` folder. (If you find that there are new files generated or unexpected changes as a result of the update, that's not unusual as the test cases are added to the OpenAPI spec from time to time. If you've questions or concerns, please open a ticket to start a discussion)
+- During development it can be helpful to quickly regenerate the samples without recompiling all of openapi-generator, e.g. when you have only updated the mustache templates. This can be done by passing the `-t` parameter: `./bin/python-petstore.sh -t modules/openapi-generator/src/main/resources/python`.
 - Run the tests in the sample folder using maven `mvn integration-test -rf :<artifactId>`, e.g. open a shell in `samples/client/petstore/python`, run `mvn integration-test -rf :PythonPetstoreClientTests`. The artifactId of the project can be found in the pom.xml file. (some languages may not contain unit testing for Petstore and we're looking for contribution from the community to implement those tests)
 - Finally, git commit the updated samples files: `git commit -a`
   (`git add -A` if added files with new test cases)
diff --git a/README.md b/README.md
index cddde6382812..bf67bf6c1933 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 [![LightBow](https://openapi-generator.tech/img/companies/lightbow.png)](https://www.lightbow.net/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/docspring.png" width="128" height="128">](https://docspring.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/datadog.png" width="128" height="128">](https://datadoghq.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
+[<img src="https://openapi-generator.tech/img/companies/thales.jpg" width="128" height="128">](https://cpl.thalesgroup.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 
 #### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS and Checkly for sponsoring the API monitoring
 
@@ -100,7 +101,9 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 5.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/) | 17.06.2020   | Major release with breaking changes (no fallback) |
+| 5.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/) | TBD   | Major release with breaking changes (no fallback) |
+| 5.0.0-beta2 (upcoming beta release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/) | 30.07.2020 | Major beta release with breaking changes (no fallback) |
+| [5.0.0-beta](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0-beta) (latest beta release) | 30.06.2020   | Major beta release with breaking changes (no fallback) |
 | [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1) (latest stable release)                                                    | 06.05.2020   | Patch release (enhancements, bug fixes, etc)                       |
 
 OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0
@@ -157,16 +160,16 @@ See the different versions of the [openapi-generator-cli](https://mvnrepository.
 <!-- RELEASE_VERSION -->
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum):
 
-JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta/openapi-generator-cli-5.0.0-beta.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta/openapi-generator-cli-5.0.0-beta.jar -O openapi-generator-cli.jar
 ```
 
 For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
 ```
-Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta/openapi-generator-cli-5.0.0-beta.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -257,6 +260,7 @@ To reinstall with the latest master, run `brew uninstall openapi-generator && br
 
 To install OpenJDK (pre-requisites), please run
 ```sh
+brew tap AdoptOpenJDK/openjdk
 brew cask install adoptopenjdk12
 export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-12.0.2.jdk/Contents/Home/
 ```
@@ -346,7 +350,7 @@ Once built, `run-in-docker.sh` will act as an executable for openapi-generator-c
 ./run-in-docker.sh list # Executes 'list' command for openapi-generator-cli
 ./run-in-docker.sh /gen/bin/go-petstore.sh  # Builds the Go client
 ./run-in-docker.sh generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
-    -g go -o /gen/out/go-petstore -DpackageName=petstore # generates go client, outputs locally to ./out/go-petstore
+    -g go -o /gen/out/go-petstore --package-name=petstore # generates go client, outputs locally to ./out/go-petstore
 ```
 
 ##### Troubleshooting
@@ -387,10 +391,10 @@ openapi-generator version
 ```
 
 <!-- RELEASE_VERSION -->
-Or install a particular OpenAPI Generator version (e.g. v4.3.1):
+Or install a particular OpenAPI Generator version (e.g. v5.0.0-beta):
 
 ```sh
-npm install @openapitools/openapi-generator-cli@cli-4.3.1 -g
+npm install @openapitools/openapi-generator-cli@cli-5.0.0-beta -g
 ```
 
 Or install it as dev-dependency:
@@ -414,7 +418,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat
 (if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g php -o c:\temp\php_api_client`)
 
 <!-- RELEASE_VERSION -->
-You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar)
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.0.0-beta/openapi-generator-cli-5.0.0-beta.jar)
 <!-- /RELEASE_VERSION -->
 
 To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`
@@ -752,6 +756,8 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2020-05-18 - [Spring Boot REST with OpenAPI 3](https://dev.to/alfonzjanfrithz/spring-boot-rest-with-openapi-3-59jm) by [Alfonz Jan Frithz](https://dev.to/alfonzjanfrithz)
 - 2020-05-19 - [Dead Simple APIs with Open API](https://www.youtube.com/watch?v=sIaXmR6xRAw) by [Chris Tankersley](https://github.com/dragonmantank) at [Nexmo](https://developer.nexmo.com/)
 - 2020-05-22 - [TypeScript REST API Client](https://dev.to/unhurried/typescript-rest-api-client-4in3) by ["unhurried"](https://dev.to/unhurried)
+- 2020-05-28 - [【使用 lotify + Swagger 建置可共用的 LINE Notify bot】 - #NiJia @ Chatbot Developer Taiwan 第 #19 小聚](https://www.youtube.com/watch?v=agYVz6dzh1I) by [Chatbot Developer Taiwan](https://www.youtube.com/channel/UCxeYUyZNnHmpX23YNF-ewvw)
+- 2020-06-23 - [新規サーバーアプリケーションにTypeScriptを採用してみた](https://www.cam-inc.co.jp/news/20200623) at [CAM Tech Blog](https://www.cam-inc.co.jp/news/tech-blog/)
 
 ## [6 - About Us](#table-of-contents)
 
@@ -952,7 +958,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Elm               | @eriktim (2018/09)                                                                                                                                                                                                                |
 | Erlang            | @tsloughter (2017/11) @jfacorro (2018/10) @robertoaloi (2018/10)                                                                                                                                                                  |
 | F#                | @nmfisher (2019/05)                                                                                                                                                                                                               |
-| Go                | @antihax (2017/11) @bvwells (2017/12) @grokify (2018/07) @kemokemo (2018/09) @bkabrda (2019/07)                                                                                                                                   |
+| Go                | @antihax (2017/11) @grokify (2018/07) @kemokemo (2018/09) @bkabrda (2019/07)                                                                                                                                   |
 | GraphQL           | @renepardon (2018/12)                                                                                                                                                                                                             |
 | Groovy            |                                                                                                                                                                                                                                   |
 | Haskell           |                                                                                                                                                                                                                                   |
@@ -969,7 +975,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | 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)                                                |
 | R                 | @Ramanth (2019/07) @saigiridhar21 (2019/07)                                                                                                                                                                                       |
 | Ruby              | @cliffano (2017/07) @zlx (2017/09) @autopp (2019/02)                                                                                                                                                                             |
-| Rust              | @frol (2017/07) @farcaller (2017/08) @bjgill (2017/12) @richardwhiuk (2019/07) @paladinzh (2020/05)                                                                                                                               |
+| Rust              | @frol (2017/07) @farcaller (2017/08) @richardwhiuk (2019/07) @paladinzh (2020/05)                                                                                                                               |
 | Scala             | @clasnake (2017/07), @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @shijinkui  (2018/01), @ramzimaalej (2018/03), @chameleon82 (2020/03), @Bouillie (2020/04)                                                          |
 | Swift             | @jgavris (2017/07) @ehyche (2017/08) @Edubits (2017/09) @jaz-ah (2017/09) @4brunu (2019/11)                                                                                                                                       |
 | TypeScript        | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02) |
diff --git a/bin/configs/java-feign.yaml b/bin/configs/java-feign.yaml
new file mode 100644
index 000000000000..9c44ae91d0df
--- /dev/null
+++ b/bin/configs/java-feign.yaml
@@ -0,0 +1,9 @@
+generatorName: java
+outputDir: samples/client/petstore/java/feign
+library: feign
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  booleanGetterPrefix: is
+  artifactId: petstore-feign
+  hideGenerationTimestamp: "true"
diff --git a/bin/configs/java-feign10x.yaml b/bin/configs/java-feign10x.yaml
deleted file mode 100644
index 4d741daac248..000000000000
--- a/bin/configs/java-feign10x.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/feign10x
-library: feign
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  booleanGetterPrefix: is
-  artifactId: petstore-feign-10x
-  hideGenerationTimestamp: "true"
diff --git a/bin/configs/java-jersey2-8-oas2.yaml b/bin/configs/java-jersey2-8-oas2.yaml
index 0e360085a9e9..82df73fc00f3 100644
--- a/bin/configs/java-jersey2-8-oas2.yaml
+++ b/bin/configs/java-jersey2-8-oas2.yaml
@@ -4,6 +4,7 @@ library: jersey2
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 additionalProperties:
   artifactId: petstore-jersey2-java8
-  hideGenerationTimestamp: "true"
+  hideGenerationTimestamp: true
   serverPort: "8082"
   dateLibrary: java8
+  useOneOfDiscriminatorLookup: true
diff --git a/bin/configs/java-jersey2-8.yaml b/bin/configs/java-jersey2-8.yaml
index ec636e75cb50..f968aac62307 100644
--- a/bin/configs/java-jersey2-8.yaml
+++ b/bin/configs/java-jersey2-8.yaml
@@ -1,9 +1,12 @@
 generatorName: java
 outputDir: samples/openapi3/client/petstore/java/jersey2-java8
 library: jersey2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
   artifactId: petstore-openapi3-jersey2-java8
-  hideGenerationTimestamp: "true"
+  hideGenerationTimestamp: true
   serverPort: "8082"
   dateLibrary: java8
+  useOneOfDiscriminatorLookup: true
+  disallowAdditionalPropertiesIfNotPresent: false
diff --git a/bin/configs/java-native-async.yaml b/bin/configs/java-native-async.yaml
new file mode 100644
index 000000000000..eb95d524a291
--- /dev/null
+++ b/bin/configs/java-native-async.yaml
@@ -0,0 +1,9 @@
+generatorName: java
+outputDir: samples/client/petstore/java/native-async
+library: native
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  artifactId: petstore-native
+  hideGenerationTimestamp: "true"
+  asyncNative: "true"
diff --git a/bin/configs/java-retrofit2-play24.yaml b/bin/configs/java-retrofit2-play24.yaml
deleted file mode 100644
index aa1bfb5b75bc..000000000000
--- a/bin/configs/java-retrofit2-play24.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/retrofit2-play24
-library: retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-additionalProperties:
-  usePlayWS: "true"
-  enableBuilderSupport: "true"
-  useBeanValidation: "true"
-  playVersion: play24
-  artifactId: petstore-java-client-retrofit2-play24
-  hideGenerationTimestamp: "true"
-  dateLibrary: java8
diff --git a/bin/configs/java-retrofit2-play25.yaml b/bin/configs/java-retrofit2-play25.yaml
deleted file mode 100644
index 49cfe3d0c741..000000000000
--- a/bin/configs/java-retrofit2-play25.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/retrofit2-play25
-library: retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-additionalProperties:
-  usePlayWS: "true"
-  enableBuilderSupport: "true"
-  useBeanValidation: "true"
-  playVersion: play25
-  artifactId: petstore-java-client-retrofit2-play25
-  hideGenerationTimestamp: "true"
diff --git a/bin/configs/java-retrofit2rx.yaml b/bin/configs/java-retrofit2rx.yaml
deleted file mode 100644
index 2f84144f78f7..000000000000
--- a/bin/configs/java-retrofit2rx.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/retrofit2rx
-library: retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  useRxJava: "true"
-  artifactId: petstore-retrofit2-rx
-  hideGenerationTimestamp: "true"
diff --git a/bin/configs/java-retrofit2rx3.yaml b/bin/configs/java-retrofit2rx3.yaml
new file mode 100644
index 000000000000..e4a1b5207c6d
--- /dev/null
+++ b/bin/configs/java-retrofit2rx3.yaml
@@ -0,0 +1,9 @@
+generatorName: java
+outputDir: samples/client/petstore/java/retrofit2rx3
+library: retrofit2
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  useRxJava3: "true"
+  artifactId: petstore-retrofit2-rx3
+  hideGenerationTimestamp: "true"
diff --git a/bin/configs/other/openapi3/objc-core-data.yaml b/bin/configs/objc-core-data.yaml
similarity index 84%
rename from bin/configs/other/openapi3/objc-core-data.yaml
rename to bin/configs/objc-core-data.yaml
index 7d3e047bc2d4..7625d0934cec 100644
--- a/bin/configs/other/openapi3/objc-core-data.yaml
+++ b/bin/configs/objc-core-data.yaml
@@ -3,5 +3,6 @@ outputDir: samples/client/petstore/objc/core-data
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.json
 templateDir: modules/openapi-generator/src/main/resources/objc
 additionalProperties:
+  classPrefix: SWG
+  podName: SwaggerClient
   coreData: "true"
-  appName: PetstoreClient
diff --git a/bin/configs/other/openapi3/objc-default.yaml b/bin/configs/objc-default.yaml
similarity index 83%
rename from bin/configs/other/openapi3/objc-default.yaml
rename to bin/configs/objc-default.yaml
index fbdef1a0a22a..5acc6b0c916a 100644
--- a/bin/configs/other/openapi3/objc-default.yaml
+++ b/bin/configs/objc-default.yaml
@@ -3,4 +3,5 @@ outputDir: samples/client/petstore/objc/default
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.json
 templateDir: modules/openapi-generator/src/main/resources/objc
 additionalProperties:
-  appName: PetstoreClient
+  classPrefix: SWG
+  podName: SwaggerClient
diff --git a/bin/configs/other/openapi3/php-slim-deprecated-php-slim.yaml b/bin/configs/other/openapi3/php-slim-deprecated-php-slim.yaml
deleted file mode 100644
index 09147cbb6713..000000000000
--- a/bin/configs/other/openapi3/php-slim-deprecated-php-slim.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-generatorName: php-slim-deprecated
-outputDir: samples/server/petstore/php-slim
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-slim-server
diff --git a/bin/configs/other/openapi3/typescript-angularjs.yaml b/bin/configs/other/openapi3/typescript-angularjs.yaml
deleted file mode 100644
index c379fa2ac6fc..000000000000
--- a/bin/configs/other/openapi3/typescript-angularjs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-generatorName: typescript-angularjs
-outputDir: samples/client/petstore/typescript-angularjs
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
diff --git a/bin/configs/php-OpenAPIClient-oas2.yaml b/bin/configs/php-OpenAPIClient-oas2.yaml
deleted file mode 100644
index d8cf9859d8f5..000000000000
--- a/bin/configs/php-OpenAPIClient-oas2.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-generatorName: php
-outputDir: samples/client/petstore/php/OpenAPIClient-php
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/php
diff --git a/bin/configs/php-OpenAPIClient.yaml b/bin/configs/php-OpenAPIClient.yaml
index a930b52a0c90..d3ce7bdae35f 100644
--- a/bin/configs/php-OpenAPIClient.yaml
+++ b/bin/configs/php-OpenAPIClient.yaml
@@ -1,4 +1,4 @@
 generatorName: php
-outputDir: samples/openapi3/client/petstore/php/OpenAPIClient-php
+outputDir: samples/client/petstore/php/OpenAPIClient-php
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/php
diff --git a/bin/configs/php-laravel.yaml b/bin/configs/php-laravel.yaml
new file mode 100644
index 000000000000..2d29f5000a03
--- /dev/null
+++ b/bin/configs/php-laravel.yaml
@@ -0,0 +1,4 @@
+generatorName: php-laravel
+outputDir: samples/server/petstore/php-laravel
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/php-laravel
diff --git a/bin/configs/php-silex-deprecated-OpenAPIServer.yaml b/bin/configs/php-silex-deprecated-OpenAPIServer.yaml
deleted file mode 100644
index 58e4b4fa1112..000000000000
--- a/bin/configs/php-silex-deprecated-OpenAPIServer.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-generatorName: php-silex-deprecated
-outputDir: samples/server/petstore/php-silex/OpenAPIServer
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-silex
diff --git a/bin/configs/php-slim-deprecated-php-slim.yaml b/bin/configs/php-slim-deprecated-php-slim.yaml
deleted file mode 100644
index 62342a190f88..000000000000
--- a/bin/configs/php-slim-deprecated-php-slim.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-generatorName: php-slim-deprecated
-outputDir: samples/server/petstore/php-slim
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-slim-server
diff --git a/bin/configs/php-slim4.yaml b/bin/configs/php-slim4.yaml
new file mode 100644
index 000000000000..a15c313a7720
--- /dev/null
+++ b/bin/configs/php-slim4.yaml
@@ -0,0 +1,4 @@
+generatorName: php-slim4
+outputDir: samples/server/petstore/php-slim4
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/php-slim4-server
diff --git a/bin/configs/php-ze-ph.yaml b/bin/configs/php-ze-ph.yaml
index b3416dc196be..009f17a0e432 100644
--- a/bin/configs/php-ze-ph.yaml
+++ b/bin/configs/php-ze-ph.yaml
@@ -1,4 +1,4 @@
 generatorName: php-ze-ph
 outputDir: samples/server/petstore/php-ze-ph
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/php-ze-ph
diff --git a/bin/configs/other/powershell.yaml b/bin/configs/powershell.yaml
similarity index 94%
rename from bin/configs/other/powershell.yaml
rename to bin/configs/powershell.yaml
index 2ef633c994f4..62a6dab02e14 100644
--- a/bin/configs/other/powershell.yaml
+++ b/bin/configs/powershell.yaml
@@ -9,3 +9,4 @@ additionalProperties:
   packageName: PSPetstore
   powershellGalleryUrl: https://www.powershellgallery.com/packages/PSPetstore
   apiNamePrefix: PS
+  powershellVersion: "5.0"
diff --git a/bin/configs/python-experimental-extensions-x-auth-alias.yaml b/bin/configs/python-experimental-extensions-x-auth-alias.yaml
new file mode 100644
index 000000000000..beaa59aa0d2b
--- /dev/null
+++ b/bin/configs/python-experimental-extensions-x-auth-alias.yaml
@@ -0,0 +1,6 @@
+generatorName: python-experimental
+outputDir: samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/
+inputSpec: modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
+templateDir: modules/openapi-generator/src/main/resources/python
+additionalProperties:
+  packageName: x_auth_id_alias
diff --git a/bin/configs/python-experimental-features-dynamic-servers.yaml b/bin/configs/python-experimental-features-dynamic-servers.yaml
new file mode 100644
index 000000000000..da52feaf928f
--- /dev/null
+++ b/bin/configs/python-experimental-features-dynamic-servers.yaml
@@ -0,0 +1,6 @@
+generatorName: python-experimental
+outputDir: samples/openapi3/client/features/dynamic-servers/python-experimental/
+inputSpec: modules/openapi-generator/src/test/resources/3_0/features/dynamic-servers.yaml
+templateDir: modules/openapi-generator/src/main/resources/python
+additionalProperties:
+  packageName: dynamic_servers
diff --git a/bin/configs/python-flask-python2.yaml b/bin/configs/python-flask-python2.yaml
deleted file mode 100644
index 156caf9c466a..000000000000
--- a/bin/configs/python-flask-python2.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-generatorName: python-flask
-outputDir: samples/server/petstore/python-flask-python2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-flask
-additionalProperties:
-  supportPython2: true
diff --git a/bin/configs/other/rust-hyper-petstore.yaml b/bin/configs/rust-hyper-petstore.yaml
similarity index 100%
rename from bin/configs/other/rust-hyper-petstore.yaml
rename to bin/configs/rust-hyper-petstore.yaml
diff --git a/bin/configs/other/rust-reqwest-petstore-async.yaml b/bin/configs/rust-reqwest-petstore-async.yaml
similarity index 77%
rename from bin/configs/other/rust-reqwest-petstore-async.yaml
rename to bin/configs/rust-reqwest-petstore-async.yaml
index 0fb53b47d284..40a22a01dfd8 100644
--- a/bin/configs/other/rust-reqwest-petstore-async.yaml
+++ b/bin/configs/rust-reqwest-petstore-async.yaml
@@ -4,5 +4,7 @@ library: reqwest
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/rust
 additionalProperties:
-  supportAsync: "true"
+  supportAsync: true
+  supportMultipleResponses: true
   packageName: petstore-reqwest-async
+  useSingleRequestParameter: true
diff --git a/bin/configs/other/rust-reqwest-petstore.yaml b/bin/configs/rust-reqwest-petstore.yaml
similarity index 100%
rename from bin/configs/other/rust-reqwest-petstore.yaml
rename to bin/configs/rust-reqwest-petstore.yaml
diff --git a/bin/configs/typescript-angularjs.yaml b/bin/configs/typescript-angularjs.yaml
deleted file mode 100644
index afaf8f53e862..000000000000
--- a/bin/configs/typescript-angularjs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-generatorName: typescript-angularjs
-outputDir: samples/client/petstore/typescript-angularjs
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
diff --git a/bin/configs/typescript-rxjs-with-interfaces.yaml b/bin/configs/typescript-rxjs-with-interfaces.yaml
deleted file mode 100644
index a5ef676abc7d..000000000000
--- a/bin/configs/typescript-rxjs-with-interfaces.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-generatorName: typescript-rxjs
-outputDir: samples/client/petstore/typescript-rxjs/builds/with-interfaces
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-additionalProperties:
-  withInterfaces: "true"
diff --git a/bin/configs/typescript-rxjs-with-progress-subscriber.yaml b/bin/configs/typescript-rxjs-with-progress-subscriber.yaml
new file mode 100644
index 000000000000..f20df704bec7
--- /dev/null
+++ b/bin/configs/typescript-rxjs-with-progress-subscriber.yaml
@@ -0,0 +1,5 @@
+generatorName: typescript-rxjs
+outputDir: samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+additionalProperties:
+  withProgressSubscriber: "true"
diff --git a/bin/generate-samples.sh b/bin/generate-samples.sh
index 5205b22c745c..d497a554f3ee 100755
--- a/bin/generate-samples.sh
+++ b/bin/generate-samples.sh
@@ -6,21 +6,61 @@ declare cwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 declare root="$(cd "$cwd" && cd ../ && pwd)"
 declare executable="${root}/modules/openapi-generator-cli/target/openapi-generator-cli.jar"
 
-echo "# START SCRIPT: $0"
-echo "This script generates all configs under bin/configs by default."
-echo "You may generate a targeted script or set of scripts using glob patterns."
-echo "For example: $0 bin/configs/java-*"
-echo ""
-echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
-
-sleep 5
 if [ ! -f "$executable" ]; then
   (cd "${root}" && mvn -B --no-snapshot-updates clean package -DskipTests=true -Dmaven.javadoc.skip=true -Djacoco.skip=true)
 fi
 
-export JAVA_OPTS="${JAVA_OPTS} -server -Duser.timezone=UTC"
+export JAVA_OPTS="${JAVA_OPTS} -ea -server -Duser.timezone=UTC"
 
-configs=${@:-"${root}"/bin/configs/*.yaml}
+files=()
+args=()
+end_option=false
+while [[ $# -gt 0 ]]; do
+  key="$1"
+  if [ "--" == "$key" ]; then
+    end_option=true
+  else
+    if [[ "$end_option" = true ]]; then
+      args+=("$1")
+    else
+      files+=("$1")
+    fi
+  fi
+  shift
+done
+
+header="# START SCRIPT: $0
+This script generates all configs under bin/configs by default.
+You may generate a targeted script or set of scripts using glob patterns.
+
+For example:
+    $0 bin/configs/java-*
+
+You may generate a single config with additional options if you use -- to
+separate the single config file from the generator arguments.
+
+For example:
+    $0 bin/configs/java-vertx.yaml -- --global-property debugModels=true
+
+"
+
+echo "$header"
+
+if [[ ${#files[@]} -eq 1 && "${files[0]}" != *'*'* ]]; then
+    # shellcheck disable=SC2086
+    # shellcheck disable=SC2068
+    java ${JAVA_OPTS} -jar "$executable" generate -c ${files[0]} ${args[@]}
+else
+    echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
+
+    sleep 5
+
+    if [ ${#files[@]} -eq 0 ]; then
+      files=("${root}"/bin/configs/*.yaml)
+    fi
+
+    # shellcheck disable=SC2086
+    # shellcheck disable=SC2068
+    java ${JAVA_OPTS} -jar "$executable" batch --includes-base-dir "${root}" --fail-fast  -- ${files[@]}
+fi
 
-# shellcheck disable=SC2086
-java $JAVA_OPTS -jar "$executable" batch --includes-base-dir "${root}" --fail-fast  -- $configs
diff --git a/bin/typescript.sh b/bin/typescript.sh
new file mode 100755
index 000000000000..c9c07a7b01aa
--- /dev/null
+++ b/bin/typescript.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+common_args="generate -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g typescript"
+samples="samples/openapi3/client/petstore/typescript/builds"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+
+printf "\033[32m## Creating default (fetch) client!\033[0m\n"
+args="-o $samples/default --additional-properties=platform=node,npmName=ts-petstore-client $@"
+java $JAVA_OPTS -jar $executable $common_args $args
+
+printf "\033[32m## Creating jquery client!\033[0m\n"
+args="-o $samples/jquery --additional-properties=framework=jquery,npmName=ts-petstore-client $@"
+java $JAVA_OPTS -jar $executable $common_args $args
+
+printf "\033[32m## Creating fetch object client!\033[0m\n"
+args="-o $samples/object_params --additional-properties=platform=node,npmName=ts-petstore-client,useObjectParameters=true $@"
+java $JAVA_OPTS -jar $executable $common_args $args
+
+printf "\033[32m## Creating fetch client with InversifyJS support!\033[0m\n"
+args="-o $samples/inversify --additional-properties=platform=node,npmName=ts-petstore-client,useInversify=true $@"
+java $JAVA_OPTS -jar $executable $common_args $args
+
+printf "\033[32m## Creating Deno (fetch) client!\033[0m\n"
+args="-o $samples/deno --additional-properties=platform=deno $@"
+java $JAVA_OPTS -jar $executable $common_args $args
diff --git a/bin/utils/ensure-up-to-date b/bin/utils/ensure-up-to-date
index efe99bd76a59..037d1f554e86 100755
--- a/bin/utils/ensure-up-to-date
+++ b/bin/utils/ensure-up-to-date
@@ -8,11 +8,8 @@ declare root="$(cd "$cwd" && cd ../../ && pwd)"
 declare executable="${root}/modules/openapi-generator-cli/target/openapi-generator-cli.jar"
 
 echo "# START SCRIPT: $0"
-
 echo "IMPORTANT: this script should be run by the CI (e.g. Shippable) to ensure that the 'samples/' folder is up to date."
-echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
-
-sleep 5
+echo ""
 
 "${root}/bin/generate-samples.sh"
 
diff --git a/bin/windows/typescript.bat b/bin/windows/typescript.bat
new file mode 100755
index 000000000000..0e006951cf41
--- /dev/null
+++ b/bin/windows/typescript.bat
@@ -0,0 +1,22 @@
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+
+set args=generate -i modules\openapi-generator\src\test\resources\3_0\petstore.yaml -g typescript -o samples\openapi3\client\petstore\typescript\builds\default --additional-properties=platform=node,npmName=ts-petstore-client
+java %JAVA_OPTS% -jar %executable% %args%
+
+args=generate -i modules\openapi-generator\src\test\resources\3_0\petstore.yaml  -g typescript -o samples\openapi3\client\petstore\typescript\builds\jquery --additional-properties=framework=jquery,npmName=ts-petstore-client
+java %JAVA_OPTS% -jar %executable% %args%
+
+set args=generate -i modules\openapi-generator\src\test\resources\3_0\petstore.yaml -g typescript -o samples\openapi3\client\petstore\typescript\builds\object_params --additional-properties=platform=node,npmName=ts-petstore-client,useObjectParameters
+java %JAVA_OPTS% -jar %executable% %args%
+
+set args=generate -i modules\openapi-generator\src\test\resources\3_0\petstore.yaml -g typescript -o samples\openapi3\client\petstore\typescript\builds\inversify --additional-properties=platform=node,npmName=ts-petstore-client,useInversify
+java %JAVA_OPTS% -jar %executable% %args%
+
+set args=generate -i modules\openapi-generator\src\test\resources\3_0\petstore.yaml -g typescript -o samples\openapi3\client\petstore\typescript\builds\deno --additional-properties=platform=deno
+java %JAVA_OPTS% -jar %executable% %args%
diff --git a/docs/building.md b/docs/building.md
index 257721f418e6..237263c8ef41 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -43,7 +43,7 @@ Once built, `run-in-docker.sh` will act as an executable for openapi-generator-c
 ```bash
 ./run-in-docker.sh help # Executes 'help' command for openapi-generator-cli
 ./run-in-docker.sh list # Executes 'list' command for openapi-generator-cli
-./run-in-docker.sh /gen/bin/go-petstore.sh  # Builds the Go client
+./run-in-docker.sh /gen/bin/generate-samples.sh /gen/bin/configs/go-petstore.yaml  # Builds the Go client
 ./run-in-docker.sh generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
     -g go -o /gen/out/go-petstore -DpackageName=petstore # generates go client, outputs locally to ./out/go-petstore
 ```
diff --git a/docs/contributing.md b/docs/contributing.md
index 69b766b2e88c..f7182f3a21f1 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -90,6 +90,7 @@ To add test cases (optional) covering the change in the code generator, please r
 
 To test the templates, please perform the following:
 - Update the Petstore sample by running the shell scripts under `bin` and `bin/openapi3` folder. For example, run `./bin/python-petstore.sh` and `./bin/openapi3/python-petstore.sh` to update the Python PetStore API client under [`samples/client/petstore/python`](https://github.com/openapitools/openapi-generator/tree/master/samples/client/petstore/python) and [`samples/openapi3/client/petstore/python`](https://github.com/openapitools/openapi-generator/tree/master/samples/openapi3/client/petstore/python). For Windows, the batch files can be found under `bin\windows` folder. (If you find that there are new files generated or unexpected changes as a result of the update, that's not unusual as the test cases are added to the OpenAPI spec from time to time. If you've questions or concerns, please open a ticket to start a discussion)
+- During development it can be helpful to quickly regenerate the samples without recompiling all of openapi-generator, e.g. when you have only updated the mustache templates. This can be done by passing the `-t` parameter: `./bin/python-petstore.sh -t modules/openapi-generator/src/main/resources/python`.
 - Run the tests in the sample folder using maven `mvn integration-test -rf :<artifactId>`, e.g. open a shell in `samples/client/petstore/python`, run `mvn integration-test -rf :PythonPetstoreClientTests`. The artifactId of the project can be found in the pom.xml file. (some languages may not contain unit testing for Petstore and we're looking for contribution from the community to implement those tests)
 - Finally, git commit the updated samples files: `git commit -a`
   (`git add -A` if added files with new test cases)
diff --git a/docs/generators.md b/docs/generators.md
index 3d0bb08663a5..cc7b311614a2 100644
--- a/docs/generators.md
+++ b/docs/generators.md
@@ -60,8 +60,9 @@ The following generators are available:
 * [scalaz](generators/scalaz.md)  
 * [swift4-deprecated (deprecated)](generators/swift4-deprecated.md)  
 * [swift5 (beta)](generators/swift5.md)  
+* [typescript (experimental)](generators/typescript.md)  
 * [typescript-angular](generators/typescript-angular.md)  
-* [typescript-angularjs](generators/typescript-angularjs.md)  
+* [typescript-angularjs-deprecated (deprecated)](generators/typescript-angularjs-deprecated.md)  
 * [typescript-aurelia](generators/typescript-aurelia.md)  
 * [typescript-axios](generators/typescript-axios.md)  
 * [typescript-fetch](generators/typescript-fetch.md)  
diff --git a/docs/generators/ada-server.md b/docs/generators/ada-server.md
index 66d41103a776..57c6b68723ea 100644
--- a/docs/generators/ada-server.md
+++ b/docs/generators/ada-server.md
@@ -6,8 +6,7 @@ sidebar_label: ada-server
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/ada.md b/docs/generators/ada.md
index 971e3267b2fb..196a711789c2 100644
--- a/docs/generators/ada.md
+++ b/docs/generators/ada.md
@@ -6,8 +6,7 @@ sidebar_label: ada
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/android.md b/docs/generators/android.md
index 11a5cd1e364e..600cf9742106 100644
--- a/docs/generators/android.md
+++ b/docs/generators/android.md
@@ -12,8 +12,7 @@ sidebar_label: android
 |apiPackage|package for generated api classes| |null|
 |artifactId|artifactId for use in the generated build.gradle and pom.xml| |null|
 |artifactVersion|artifact version for use in the generated build.gradle and pom.xml| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |groupId|groupId for use in the generated build.gradle and pom.xml| |null|
 |invokerPackage|root package for generated code| |null|
diff --git a/docs/generators/apache2.md b/docs/generators/apache2.md
index 3f183ffdf530..0b39e6f5653b 100644
--- a/docs/generators/apache2.md
+++ b/docs/generators/apache2.md
@@ -6,8 +6,7 @@ sidebar_label: apache2
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/apex.md b/docs/generators/apex.md
index 45d0d2a51231..70926207a2d0 100644
--- a/docs/generators/apex.md
+++ b/docs/generators/apex.md
@@ -9,8 +9,7 @@ sidebar_label: apex
 |apiVersion|The Metadata API version number to use for components in this package.| |null|
 |buildMethod|The build method for this package.| |null|
 |classPrefix|Prefix for generated classes. Set this to avoid overwriting existing classes in your org.| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |namedCredential|The named credential name for the HTTP callouts| |null|
diff --git a/docs/generators/asciidoc.md b/docs/generators/asciidoc.md
index ac2d3cca0b67..c3f686f39569 100644
--- a/docs/generators/asciidoc.md
+++ b/docs/generators/asciidoc.md
@@ -10,8 +10,7 @@ sidebar_label: asciidoc
 |appName|short name of the application| |null|
 |artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |null|
 |artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |groupId|groupId in generated pom.xml| |null|
 |headerAttributes|generation of asciidoc header meta data attributes (set to false to suppress, default: true)| |true|
@@ -22,10 +21,14 @@ If false: the 'additionalProperties' implementation is compliant with the OAS an
 |licenseInfo|a short description of the license| |null|
 |licenseUrl|a URL pointing to the full license| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|skipExamples|skip examples sections (default: false)| |false|
 |snippetDir|path with includable markup snippets (e.g. test output generated by restdoc, default: .)| |.|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
 |specDir|path with includable markup spec files (e.g. handwritten additional docs, default: ..)| |..|
+|useIntroduction|use introduction section, rather than an initial abstract (default: false)| |false|
+|useMethodAndPath|Use HTTP method and path as operation heading, instead of operation id (default: false)| |false|
+|useTableTitles|Use titles for tables, rather than wrapping tables instead their own section (default: false)| |false|
 
 ## IMPORT MAPPING
 
diff --git a/docs/generators/avro-schema.md b/docs/generators/avro-schema.md
index ba46bc6dc93f..89735cb0b167 100644
--- a/docs/generators/avro-schema.md
+++ b/docs/generators/avro-schema.md
@@ -6,8 +6,7 @@ sidebar_label: avro-schema
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |packageName|package for generated classes (where supported)| |null|
diff --git a/docs/generators/bash.md b/docs/generators/bash.md
index 0e5cbf5cc72f..9972a702621b 100644
--- a/docs/generators/bash.md
+++ b/docs/generators/bash.md
@@ -9,8 +9,7 @@ sidebar_label: bash
 |apiKeyAuthEnvironmentVariable|Name of environment variable where API key can be defined (e.g. PETSTORE_APIKEY='kjhasdGASDa5asdASD')| |false|
 |basicAuthEnvironmentVariable|Name of environment variable where username and password can be defined (e.g. PETSTORE_CREDS='username:password')| |null|
 |curlOptions|Default cURL options| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |generateBashCompletion|Whether to generate the Bash completion script| |false|
 |generateZshCompletion|Whether to generate the Zsh completion script| |false|
diff --git a/docs/generators/c.md b/docs/generators/c.md
index 8d467ca2fd0b..44afc2aa4261 100644
--- a/docs/generators/c.md
+++ b/docs/generators/c.md
@@ -6,8 +6,7 @@ sidebar_label: c
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
diff --git a/docs/generators/clojure.md b/docs/generators/clojure.md
index af43ffffe77d..a01362efe832 100644
--- a/docs/generators/clojure.md
+++ b/docs/generators/clojure.md
@@ -7,8 +7,7 @@ sidebar_label: clojure
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |baseNamespace|the base/top namespace (Default: generated from projectName)| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/cpp-qt5-client.md b/docs/generators/cpp-qt5-client.md
index bfda02a1d166..9bc18d175c0e 100644
--- a/docs/generators/cpp-qt5-client.md
+++ b/docs/generators/cpp-qt5-client.md
@@ -8,8 +8,7 @@ sidebar_label: cpp-qt5-client
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |contentCompression|Enable Compressed Content Encoding for requests and responses| |false|
 |cppNamespace|C++ namespace (convention: name::space::for::api).| |OpenAPI|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelNamePrefix|Prefix that will be prepended to all model names.| |OAI|
diff --git a/docs/generators/cpp-qt5-qhttpengine-server.md b/docs/generators/cpp-qt5-qhttpengine-server.md
index bbb1852e2312..059378274a52 100644
--- a/docs/generators/cpp-qt5-qhttpengine-server.md
+++ b/docs/generators/cpp-qt5-qhttpengine-server.md
@@ -8,8 +8,7 @@ sidebar_label: cpp-qt5-qhttpengine-server
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |contentCompression|Enable Compressed Content Encoding for requests and responses| |false|
 |cppNamespace|C++ namespace (convention: name::space::for::api).| |OpenAPI|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelNamePrefix|Prefix that will be prepended to all model names.| |OAI|
diff --git a/docs/generators/cpp-tizen.md b/docs/generators/cpp-tizen.md
index 5bc03d3fbab1..8c59c1e09a7a 100644
--- a/docs/generators/cpp-tizen.md
+++ b/docs/generators/cpp-tizen.md
@@ -6,8 +6,7 @@ sidebar_label: cpp-tizen
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/cpp-ue4.md b/docs/generators/cpp-ue4.md
index ecfac79de958..c2d32468c0c7 100644
--- a/docs/generators/cpp-ue4.md
+++ b/docs/generators/cpp-ue4.md
@@ -7,8 +7,7 @@ sidebar_label: cpp-ue4
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |cppNamespace|C++ namespace (convention: name::space::for::api).| |OpenAPI|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |optionalProjectFile|Generate Build.cs| |true|
diff --git a/docs/generators/cwiki.md b/docs/generators/cwiki.md
index c0bb03f3930a..f40be9a4507a 100644
--- a/docs/generators/cwiki.md
+++ b/docs/generators/cwiki.md
@@ -10,8 +10,7 @@ sidebar_label: cwiki
 |appName|short name of the application| |null|
 |artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |null|
 |artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |groupId|groupId in generated pom.xml| |null|
 |infoEmail|an email address to contact for inquiries about the application| |null|
diff --git a/docs/generators/dart-dio.md b/docs/generators/dart-dio.md
index e1c1e26c7f16..6a94504378c5 100644
--- a/docs/generators/dart-dio.md
+++ b/docs/generators/dart-dio.md
@@ -8,8 +8,7 @@ sidebar_label: dart-dio
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |browserClient|Is the client browser based (for Dart 1.x only)| |null|
 |dateLibrary|Option. Date library to use|<dl><dt>**core**</dt><dd>Dart core library (DateTime)</dd><dt>**timemachine**</dt><dd>Time Machine is date and time library for Flutter, Web, and Server with support for timezones, calendars, cultures, formatting and parsing.</dd></dl>|core|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |nullableFields|Is the null fields should be in the JSON payload| |null|
diff --git a/docs/generators/dart-jaguar.md b/docs/generators/dart-jaguar.md
index 5659caf86688..fb5f208ebbc4 100644
--- a/docs/generators/dart-jaguar.md
+++ b/docs/generators/dart-jaguar.md
@@ -7,8 +7,7 @@ sidebar_label: dart-jaguar
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |browserClient|Is the client browser based (for Dart 1.x only)| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |nullableFields|Is the null fields should be in the JSON payload| |null|
diff --git a/docs/generators/dart.md b/docs/generators/dart.md
index c4ee6f36b2e9..0e0e5d1b116d 100644
--- a/docs/generators/dart.md
+++ b/docs/generators/dart.md
@@ -7,8 +7,7 @@ sidebar_label: dart
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |browserClient|Is the client browser based (for Dart 1.x only)| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/dynamic-html.md b/docs/generators/dynamic-html.md
index 50ad9583c320..a5bb74c3c0b6 100644
--- a/docs/generators/dynamic-html.md
+++ b/docs/generators/dynamic-html.md
@@ -8,8 +8,7 @@ sidebar_label: dynamic-html
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |null|
 |artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |groupId|groupId in generated pom.xml| |null|
 |invokerPackage|root package for generated code| |null|
diff --git a/docs/generators/elixir.md b/docs/generators/elixir.md
index 45acc262f674..ae8e6d8310c8 100644
--- a/docs/generators/elixir.md
+++ b/docs/generators/elixir.md
@@ -6,8 +6,7 @@ sidebar_label: elixir
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay.Pets| |null|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
diff --git a/docs/generators/fsharp-functions.md b/docs/generators/fsharp-functions.md
index ec2f54a8cd72..966a0ab85c6e 100644
--- a/docs/generators/fsharp-functions.md
+++ b/docs/generators/fsharp-functions.md
@@ -6,8 +6,7 @@ sidebar_label: fsharp-functions
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |NoLicense|
diff --git a/docs/generators/groovy.md b/docs/generators/groovy.md
index 6ace5afab9e2..c0b4c3e54e44 100644
--- a/docs/generators/groovy.md
+++ b/docs/generators/groovy.md
@@ -18,8 +18,7 @@ sidebar_label: groovy
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/haskell-http-client.md b/docs/generators/haskell-http-client.md
index 883ffd35f0e5..b83503ce9fc1 100644
--- a/docs/generators/haskell-http-client.md
+++ b/docs/generators/haskell-http-client.md
@@ -17,8 +17,7 @@ sidebar_label: haskell-http-client
 |dateFormat|format string used to parse/render a date| |%Y-%m-%d|
 |dateTimeFormat|format string used to parse/render a datetime| |null|
 |dateTimeParseFormat|overrides the format string used to parse a datetime| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |generateEnums|Generate specific datatypes for OpenAPI enums| |true|
 |generateFormUrlEncodedInstances|Generate FromForm/ToForm instances for models that are used by operations that produce or consume application/x-www-form-urlencoded| |true|
diff --git a/docs/generators/haskell.md b/docs/generators/haskell.md
index bea5cef5a623..221d732893ed 100644
--- a/docs/generators/haskell.md
+++ b/docs/generators/haskell.md
@@ -7,8 +7,7 @@ sidebar_label: haskell
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
diff --git a/docs/generators/html.md b/docs/generators/html.md
index 7d03a4b1591a..ea73a73613f2 100644
--- a/docs/generators/html.md
+++ b/docs/generators/html.md
@@ -10,8 +10,7 @@ sidebar_label: html
 |appName|short name of the application| |null|
 |artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |null|
 |artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |groupId|groupId in generated pom.xml| |null|
 |infoEmail|an email address to contact for inquiries about the application| |null|
diff --git a/docs/generators/html2.md b/docs/generators/html2.md
index 1b3b2d572a94..2330a0b8b6d6 100644
--- a/docs/generators/html2.md
+++ b/docs/generators/html2.md
@@ -10,8 +10,7 @@ sidebar_label: html2
 |appName|short name of the application| |null|
 |artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |null|
 |artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |groupId|groupId in generated pom.xml| |null|
 |infoEmail|an email address to contact for inquiries about the application| |null|
diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md
index e539008e6058..4e0d9abd4dd4 100644
--- a/docs/generators/java-inflector.md
+++ b/docs/generators/java-inflector.md
@@ -20,8 +20,7 @@ sidebar_label: java-inflector
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/java-msf4j.md b/docs/generators/java-msf4j.md
index e11b4275c90e..3ad58943d028 100644
--- a/docs/generators/java-msf4j.md
+++ b/docs/generators/java-msf4j.md
@@ -20,8 +20,7 @@ sidebar_label: java-msf4j
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/java-pkmst.md b/docs/generators/java-pkmst.md
index 5076c7593297..e2490a4728e3 100644
--- a/docs/generators/java-pkmst.md
+++ b/docs/generators/java-pkmst.md
@@ -21,8 +21,7 @@ sidebar_label: java-pkmst
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |eurekaUri|Eureka URI| |null|
diff --git a/docs/generators/java-play-framework.md b/docs/generators/java-play-framework.md
index aefc44cd2e0b..934137113aa8 100644
--- a/docs/generators/java-play-framework.md
+++ b/docs/generators/java-play-framework.md
@@ -23,8 +23,7 @@ sidebar_label: java-play-framework
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/java-undertow-server.md b/docs/generators/java-undertow-server.md
index 354a67db6cf1..6916793a27c8 100644
--- a/docs/generators/java-undertow-server.md
+++ b/docs/generators/java-undertow-server.md
@@ -20,8 +20,7 @@ sidebar_label: java-undertow-server
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/java-vertx-web.md b/docs/generators/java-vertx-web.md
index d0f2dbd0bcef..cfdd8bb29fea 100644
--- a/docs/generators/java-vertx-web.md
+++ b/docs/generators/java-vertx-web.md
@@ -20,8 +20,7 @@ sidebar_label: java-vertx-web
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/java-vertx.md b/docs/generators/java-vertx.md
index f0bfea0446a2..1bceaefef95d 100644
--- a/docs/generators/java-vertx.md
+++ b/docs/generators/java-vertx.md
@@ -20,8 +20,7 @@ sidebar_label: java-vertx
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/java.md b/docs/generators/java.md
index 3d0d3afda003..aa3e6ebd7127 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -22,18 +22,16 @@ sidebar_label: java
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|feignVersion|Version of OpenFeign: '10.x' (default), '9.x' (deprecated)| |false|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.client|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
-|library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 9.x (deprecated) or 10.x (default). JSON processing: Jackson 2.9.x.</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 1.x. JSON processing: Jackson 2.9.x</dd></dl>|okhttp-gson|
+|library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 11.x. JSON processing: Jackson 2.9.x.</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 1.x. JSON processing: Jackson 2.9.x</dd></dl>|okhttp-gson|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |org.openapitools.client.model|
@@ -42,7 +40,7 @@ If false: the 'additionalProperties' implementation is compliant with the OAS an
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |performBeanValidation|Perform BeanValidation| |false|
-|playVersion|Version of Play! Framework (possible values &quot;play24&quot;, &quot;play25&quot; (default), &quot;play26&quot;)| |null|
+|playVersion|Version of Play! Framework (possible values &quot;play24&quot; (Deprecated), &quot;play25&quot; (Deprecated), &quot;play26&quot; (Default))| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |scmConnection|SCM connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
 |scmDeveloperConnection|SCM developer connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
@@ -59,8 +57,9 @@ If false: the 'additionalProperties' implementation is compliant with the OAS an
 |usePlayWS|Use Play! Async HTTP client (Play WS API)| |false|
 |useReflectionEqualsHashCode|Use org.apache.commons.lang3.builder for equals and hashCode in the models. WARNING: This will fail under a security manager, unless the appropriate permissions are set up correctly and also there's potential performance impact.| |false|
 |useRuntimeException|Use RuntimeException instead of Exception| |false|
-|useRxJava|Whether to use the RxJava adapter with the retrofit2 library.| |false|
+|useRxJava|Whether to use the RxJava adapter with the retrofit2 library. IMPORTANT: this option has been deprecated and will be removed in the 5.x release.| |false|
 |useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library.| |false|
+|useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library.| |false|
 |withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
 
 ## IMPORT MAPPING
diff --git a/docs/generators/javascript-apollo.md b/docs/generators/javascript-apollo.md
index 83a11b96146b..bf0191ee65ba 100644
--- a/docs/generators/javascript-apollo.md
+++ b/docs/generators/javascript-apollo.md
@@ -7,8 +7,7 @@ sidebar_label: javascript-apollo
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |emitJSDoc|generate JSDoc comments| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
diff --git a/docs/generators/javascript-closure-angular.md b/docs/generators/javascript-closure-angular.md
index 10eae6c46539..af62a7ee9e33 100644
--- a/docs/generators/javascript-closure-angular.md
+++ b/docs/generators/javascript-closure-angular.md
@@ -6,8 +6,7 @@ sidebar_label: javascript-closure-angular
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
diff --git a/docs/generators/javascript-flowtyped.md b/docs/generators/javascript-flowtyped.md
index 50392d647cbf..ec2d2d81e90c 100644
--- a/docs/generators/javascript-flowtyped.md
+++ b/docs/generators/javascript-flowtyped.md
@@ -6,8 +6,7 @@ sidebar_label: javascript-flowtyped
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
diff --git a/docs/generators/javascript.md b/docs/generators/javascript.md
index 82756eb1d5d6..b3637c8681c3 100644
--- a/docs/generators/javascript.md
+++ b/docs/generators/javascript.md
@@ -7,8 +7,7 @@ sidebar_label: javascript
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |emitJSDoc|generate JSDoc comments| |true|
 |emitModelMethods|generate getters and setters for model properties| |false|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
diff --git a/docs/generators/jaxrs-cxf-cdi.md b/docs/generators/jaxrs-cxf-cdi.md
index 703ae43da8dd..6a6dfc22e0be 100644
--- a/docs/generators/jaxrs-cxf-cdi.md
+++ b/docs/generators/jaxrs-cxf-cdi.md
@@ -20,8 +20,7 @@ sidebar_label: jaxrs-cxf-cdi
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md
index f4c76df0005d..9f784c15c140 100644
--- a/docs/generators/jaxrs-cxf-client.md
+++ b/docs/generators/jaxrs-cxf-client.md
@@ -20,8 +20,7 @@ sidebar_label: jaxrs-cxf-client
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/jaxrs-cxf-extended.md b/docs/generators/jaxrs-cxf-extended.md
index ee4f8c806eae..bda4dd2bcb3e 100644
--- a/docs/generators/jaxrs-cxf-extended.md
+++ b/docs/generators/jaxrs-cxf-extended.md
@@ -21,8 +21,7 @@ sidebar_label: jaxrs-cxf-extended
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/jaxrs-cxf.md b/docs/generators/jaxrs-cxf.md
index 1b92b5adb0c3..e5cecc5bfba8 100644
--- a/docs/generators/jaxrs-cxf.md
+++ b/docs/generators/jaxrs-cxf.md
@@ -21,8 +21,7 @@ sidebar_label: jaxrs-cxf
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/jaxrs-jersey.md b/docs/generators/jaxrs-jersey.md
index 38904348f0c5..25d89a4e2a68 100644
--- a/docs/generators/jaxrs-jersey.md
+++ b/docs/generators/jaxrs-jersey.md
@@ -20,8 +20,7 @@ sidebar_label: jaxrs-jersey
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/jaxrs-resteasy-eap.md b/docs/generators/jaxrs-resteasy-eap.md
index 94d017ba9b22..95aaf526c995 100644
--- a/docs/generators/jaxrs-resteasy-eap.md
+++ b/docs/generators/jaxrs-resteasy-eap.md
@@ -20,8 +20,7 @@ sidebar_label: jaxrs-resteasy-eap
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/jaxrs-resteasy.md b/docs/generators/jaxrs-resteasy.md
index d926832f2496..1652943e4166 100644
--- a/docs/generators/jaxrs-resteasy.md
+++ b/docs/generators/jaxrs-resteasy.md
@@ -20,8 +20,7 @@ sidebar_label: jaxrs-resteasy
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/jaxrs-spec.md b/docs/generators/jaxrs-spec.md
index c33c645b7df7..d806b2553c60 100644
--- a/docs/generators/jaxrs-spec.md
+++ b/docs/generators/jaxrs-spec.md
@@ -20,8 +20,7 @@ sidebar_label: jaxrs-spec
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/jmeter.md b/docs/generators/jmeter.md
index aa08a31ad002..0284648ba1b2 100644
--- a/docs/generators/jmeter.md
+++ b/docs/generators/jmeter.md
@@ -6,8 +6,7 @@ sidebar_label: jmeter
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/k6.md b/docs/generators/k6.md
index 92b6eef33235..67b5bfa8b354 100644
--- a/docs/generators/k6.md
+++ b/docs/generators/k6.md
@@ -6,8 +6,7 @@ sidebar_label: k6
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/kotlin.md b/docs/generators/kotlin.md
index af5c9a3f8743..19f4a5174211 100644
--- a/docs/generators/kotlin.md
+++ b/docs/generators/kotlin.md
@@ -8,7 +8,7 @@ sidebar_label: kotlin
 |apiSuffix|suffix for api classes| |Api|
 |artifactId|Generated artifact id (name of jar).| |kotlin-client|
 |artifactVersion|Generated artifact's package version.| |1.0.0|
-|collectionType|Option. Collection type to use|<dl><dt>**array**</dt><dd>kotlin.Array</dd><dt>**list**</dt><dd>kotlin.collections.List</dd></dl>|array|
+|collectionType|Option. Collection type to use|<dl><dt>**array**</dt><dd>kotlin.Array</dd><dt>**list**</dt><dd>kotlin.collections.List</dd></dl>|list|
 |dateLibrary|Option. Date library to use|<dl><dt>**threetenbp-localdatetime**</dt><dd>Threetenbp - Backport of JSR310 (jvm only, for legacy app only)</dd><dt>**string**</dt><dd>String</dd><dt>**java8-localdatetime**</dt><dd>Java 8 native JSR310 (jvm only, for legacy app only)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (jvm only, preferred for jdk 1.8+)</dd><dt>**threetenbp**</dt><dd>Threetenbp - Backport of JSR310 (jvm only, preferred for jdk &lt; 1.8)</dd></dl>|java8|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |camelCase|
 |groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
diff --git a/docs/generators/markdown.md b/docs/generators/markdown.md
index 42b38b611cc6..6da8654555d4 100644
--- a/docs/generators/markdown.md
+++ b/docs/generators/markdown.md
@@ -6,8 +6,7 @@ sidebar_label: markdown
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/nim.md b/docs/generators/nim.md
index f92d1bdf31a2..e302052fd9d0 100644
--- a/docs/generators/nim.md
+++ b/docs/generators/nim.md
@@ -6,8 +6,7 @@ sidebar_label: nim
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/nodejs-express-server.md b/docs/generators/nodejs-express-server.md
index b90bafa673ad..5615f9dc1511 100644
--- a/docs/generators/nodejs-express-server.md
+++ b/docs/generators/nodejs-express-server.md
@@ -6,8 +6,7 @@ sidebar_label: nodejs-express-server
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/nodejs-server-deprecated.md b/docs/generators/nodejs-server-deprecated.md
index f109ef771fda..a5c30a8ee3ef 100644
--- a/docs/generators/nodejs-server-deprecated.md
+++ b/docs/generators/nodejs-server-deprecated.md
@@ -6,8 +6,7 @@ sidebar_label: nodejs-server-deprecated
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |exportedName|When the generated code will be deployed to Google Cloud Functions, this option can be used to update the name of the exported function. By default, it refers to the basePath. This does not affect normal standalone nodejs server code.| |null|
 |googleCloudFunctions|When specified, it will generate the code which runs within Google Cloud Functions instead of standalone Node.JS server. See https://cloud.google.com/functions/docs/quickstart for the details of how to deploy the generated code.| |false|
diff --git a/docs/generators/ocaml.md b/docs/generators/ocaml.md
index 9d6ac07fb390..38df2a95226a 100644
--- a/docs/generators/ocaml.md
+++ b/docs/generators/ocaml.md
@@ -6,8 +6,7 @@ sidebar_label: ocaml
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/openapi-yaml.md b/docs/generators/openapi-yaml.md
index 6c2056c1d9b0..5380f962f160 100644
--- a/docs/generators/openapi-yaml.md
+++ b/docs/generators/openapi-yaml.md
@@ -6,8 +6,7 @@ sidebar_label: openapi-yaml
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |outputFile|Output filename| |openapi/openapi.yaml|
diff --git a/docs/generators/openapi.md b/docs/generators/openapi.md
index d4d4c7aa603a..1c51cb2f22ff 100644
--- a/docs/generators/openapi.md
+++ b/docs/generators/openapi.md
@@ -6,8 +6,7 @@ sidebar_label: openapi
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/php-laravel.md b/docs/generators/php-laravel.md
index 550361b7a325..c1d61a09ef6b 100644
--- a/docs/generators/php-laravel.md
+++ b/docs/generators/php-laravel.md
@@ -8,8 +8,7 @@ sidebar_label: php-laravel
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
 |artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
diff --git a/docs/generators/php-lumen.md b/docs/generators/php-lumen.md
index 2f30bbb7818d..955c705d4abd 100644
--- a/docs/generators/php-lumen.md
+++ b/docs/generators/php-lumen.md
@@ -8,8 +8,7 @@ sidebar_label: php-lumen
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
 |artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
diff --git a/docs/generators/php-silex-deprecated.md b/docs/generators/php-silex-deprecated.md
index 69d16ec9bbb5..6e9998fdbba1 100644
--- a/docs/generators/php-silex-deprecated.md
+++ b/docs/generators/php-silex-deprecated.md
@@ -6,8 +6,7 @@ sidebar_label: php-silex-deprecated
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/php-slim-deprecated.md b/docs/generators/php-slim-deprecated.md
index 834d7d17e87d..4a876d425b6f 100644
--- a/docs/generators/php-slim-deprecated.md
+++ b/docs/generators/php-slim-deprecated.md
@@ -8,8 +8,7 @@ sidebar_label: php-slim-deprecated
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
 |artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
diff --git a/docs/generators/php-slim4.md b/docs/generators/php-slim4.md
index 4bb03dc60e23..c69d96bc2a5a 100644
--- a/docs/generators/php-slim4.md
+++ b/docs/generators/php-slim4.md
@@ -8,8 +8,7 @@ sidebar_label: php-slim4
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
 |artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
diff --git a/docs/generators/php-symfony.md b/docs/generators/php-symfony.md
index dd0faa802561..f39f58ca5953 100644
--- a/docs/generators/php-symfony.md
+++ b/docs/generators/php-symfony.md
@@ -12,8 +12,7 @@ sidebar_label: php-symfony
 |bundleName|The name of the Symfony bundle. The template uses {{bundleName}}| |null|
 |composerProjectName|The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. petstore-client| |null|
 |composerVendorName|The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
diff --git a/docs/generators/php-ze-ph.md b/docs/generators/php-ze-ph.md
index 04ce9d997d9e..f3eb093b490c 100644
--- a/docs/generators/php-ze-ph.md
+++ b/docs/generators/php-ze-ph.md
@@ -8,8 +8,7 @@ sidebar_label: php-ze-ph
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
 |artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
diff --git a/docs/generators/php.md b/docs/generators/php.md
index 6d84ee3fbf48..3db906c9cd8c 100644
--- a/docs/generators/php.md
+++ b/docs/generators/php.md
@@ -8,8 +8,7 @@ sidebar_label: php
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
 |artifactVersion|The version to use in the composer package version field. e.g. 1.2.3| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
diff --git a/docs/generators/plantuml.md b/docs/generators/plantuml.md
index 6f2f76823cf0..78987919ac59 100644
--- a/docs/generators/plantuml.md
+++ b/docs/generators/plantuml.md
@@ -6,8 +6,7 @@ sidebar_label: plantuml
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/powershell.md b/docs/generators/powershell.md
index 2b16a3196987..df9d639de554 100644
--- a/docs/generators/powershell.md
+++ b/docs/generators/powershell.md
@@ -7,6 +7,7 @@ sidebar_label: powershell
 | ------ | ----------- | ------ | ------- |
 |apiNamePrefix|Prefix that will be appended to all PS objects. Default: empty string. e.g. Pet =&gt; PSPet.| |null|
 |commonVerbs|PS common verb mappings. e.g. Delete=Remove:Patch=Update to map Delete with Remove and Patch with Update accordingly.| |null|
+|discardReadOnly|Set discardReadonly to true to generate the Initialize cmdlet without readonly parameters| |null|
 |packageGuid|GUID for PowerShell module (e.g. a27b908d-2a20-467f-bc32-af6f3a654ac5). A random GUID will be generated by default.| |null|
 |packageName|Client package name (e.g. PSTwitter).| |PSOpenAPITools|
 |packageVersion|Package version (e.g. 0.1.2).| |0.1.2|
diff --git a/docs/generators/python-aiohttp.md b/docs/generators/python-aiohttp.md
index 562d371110dd..238ce936f407 100644
--- a/docs/generators/python-aiohttp.md
+++ b/docs/generators/python-aiohttp.md
@@ -8,8 +8,7 @@ sidebar_label: python-aiohttp
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |controllerPackage|controller package| |controllers|
 |defaultController|default controller| |default_controller|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |packageName|python package name (convention: snake_case).| |openapi_server|
@@ -19,7 +18,7 @@ If false: the 'additionalProperties' implementation is compliant with the OAS an
 |serverPort|TCP port to listen to in app.run| |8080|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|supportPython2|support python2| |false|
+|supportPython2|support python2. This option has been deprecated and will be removed in the 5.x release.| |false|
 |useNose|use the nose test framework| |false|
 
 ## IMPORT MAPPING
diff --git a/docs/generators/python-blueplanet.md b/docs/generators/python-blueplanet.md
index c4f3ef71d838..d5110862f94a 100644
--- a/docs/generators/python-blueplanet.md
+++ b/docs/generators/python-blueplanet.md
@@ -8,8 +8,7 @@ sidebar_label: python-blueplanet
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |controllerPackage|controller package| |controllers|
 |defaultController|default controller| |default_controller|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |packageName|python package name (convention: snake_case).| |openapi_server|
@@ -19,7 +18,7 @@ If false: the 'additionalProperties' implementation is compliant with the OAS an
 |serverPort|TCP port to listen to in app.run| |8080|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|supportPython2|support python2| |false|
+|supportPython2|support python2. This option has been deprecated and will be removed in the 5.x release.| |false|
 |useNose|use the nose test framework| |false|
 
 ## IMPORT MAPPING
diff --git a/docs/generators/python-experimental.md b/docs/generators/python-experimental.md
index 546dcc22542a..57fe34700234 100644
--- a/docs/generators/python-experimental.md
+++ b/docs/generators/python-experimental.md
@@ -162,7 +162,7 @@ sidebar_label: python-experimental
 |Examples|✓|OAS2,OAS3
 |XMLStructureDefinitions|✗|OAS2,OAS3
 |MultiServer|✗|OAS3
-|ParameterizedServer|✗|OAS3
+|ParameterizedServer|✓|OAS3
 |ParameterStyling|✗|OAS3
 |Callbacks|✗|OAS3
 |LinkObjects|✗|OAS3
diff --git a/docs/generators/python-flask.md b/docs/generators/python-flask.md
index 77ea8871a3ef..0a4004c0aa7d 100644
--- a/docs/generators/python-flask.md
+++ b/docs/generators/python-flask.md
@@ -8,8 +8,7 @@ sidebar_label: python-flask
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |controllerPackage|controller package| |controllers|
 |defaultController|default controller| |default_controller|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |packageName|python package name (convention: snake_case).| |openapi_server|
@@ -19,7 +18,7 @@ If false: the 'additionalProperties' implementation is compliant with the OAS an
 |serverPort|TCP port to listen to in app.run| |8080|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|supportPython2|support python2| |false|
+|supportPython2|support python2. This option has been deprecated and will be removed in the 5.x release.| |false|
 |useNose|use the nose test framework| |false|
 
 ## IMPORT MAPPING
diff --git a/docs/generators/ruby.md b/docs/generators/ruby.md
index a4808ee1af3d..f52189c1d76e 100644
--- a/docs/generators/ruby.md
+++ b/docs/generators/ruby.md
@@ -6,8 +6,7 @@ sidebar_label: ruby
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |gemAuthor|gem author (only one is supported).| |null|
 |gemAuthorEmail|gem author email (only one is supported).| |null|
diff --git a/docs/generators/rust-server.md b/docs/generators/rust-server.md
index cfd4f0cd8872..30100481fef9 100644
--- a/docs/generators/rust-server.md
+++ b/docs/generators/rust-server.md
@@ -19,7 +19,7 @@ sidebar_label: rust-server
 | Type/Alias | Instantiated By |
 | ---------- | --------------- |
 |array|Vec|
-|map|Map|
+|map|std::collections::HashMap|
 
 
 ## LANGUAGE PRIMITIVES
diff --git a/docs/generators/rust.md b/docs/generators/rust.md
index 951aa94f55ae..9cd4bec362bc 100644
--- a/docs/generators/rust.md
+++ b/docs/generators/rust.md
@@ -10,6 +10,7 @@ sidebar_label: rust
 |packageName|Rust package name (convention: lowercase).| |openapi|
 |packageVersion|Rust package version.| |1.0.0|
 |supportAsync|If set, generate async function call instead. This option is for 'reqwest' library only| |true|
+|supportMultipleResponses|If set, return type wraps an enum of all possible 2xx schemas. This option is for 'reqwest' library only| |false|
 |useSingleRequestParameter|Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.| |false|
 
 ## IMPORT MAPPING
diff --git a/docs/generators/scala-akka-http-server.md b/docs/generators/scala-akka-http-server.md
index 96e31f09055d..585e089dc997 100644
--- a/docs/generators/scala-akka-http-server.md
+++ b/docs/generators/scala-akka-http-server.md
@@ -11,8 +11,7 @@ sidebar_label: scala-akka-http-server
 |artifactId|artifactId| |openapi-scala-akka-http-server|
 |artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |invokerPackage|root package for generated code| |org.openapitools.server|
diff --git a/docs/generators/scala-akka.md b/docs/generators/scala-akka.md
index 2bad9c82b6ae..2c9e736357e7 100644
--- a/docs/generators/scala-akka.md
+++ b/docs/generators/scala-akka.md
@@ -8,8 +8,7 @@ sidebar_label: scala-akka
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |mainPackage|Top-level package name, which defines 'apiPackage', 'modelPackage', 'invokerPackage'| |org.openapitools.client|
diff --git a/docs/generators/scala-gatling.md b/docs/generators/scala-gatling.md
index b59c37ee1221..0732b626066e 100644
--- a/docs/generators/scala-gatling.md
+++ b/docs/generators/scala-gatling.md
@@ -8,8 +8,7 @@ sidebar_label: scala-gatling
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
diff --git a/docs/generators/scala-httpclient-deprecated.md b/docs/generators/scala-httpclient-deprecated.md
index e0d631f86453..bc9bd0774e65 100644
--- a/docs/generators/scala-httpclient-deprecated.md
+++ b/docs/generators/scala-httpclient-deprecated.md
@@ -8,8 +8,7 @@ sidebar_label: scala-httpclient-deprecated
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
diff --git a/docs/generators/scala-lagom-server.md b/docs/generators/scala-lagom-server.md
index 2ed7519b6651..a5eef9e5629a 100644
--- a/docs/generators/scala-lagom-server.md
+++ b/docs/generators/scala-lagom-server.md
@@ -8,8 +8,7 @@ sidebar_label: scala-lagom-server
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
diff --git a/docs/generators/scala-play-server.md b/docs/generators/scala-play-server.md
index d46eb3a9fbea..13735021d5d4 100644
--- a/docs/generators/scala-play-server.md
+++ b/docs/generators/scala-play-server.md
@@ -8,8 +8,7 @@ sidebar_label: scala-play-server
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
 |basePackage|Base package in which supporting classes are generated.| |org.openapitools|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |generateCustomExceptions|If set, generates custom exception types.| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
diff --git a/docs/generators/scala-sttp.md b/docs/generators/scala-sttp.md
index 05cbbe99deae..420682ca0820 100644
--- a/docs/generators/scala-sttp.md
+++ b/docs/generators/scala-sttp.md
@@ -7,18 +7,23 @@ sidebar_label: scala-sttp
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
+|circeVersion|The version of circe library| |0.13.0|
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|jodaTimeVersion|The version of joda-time library| |2.10.6|
+|json4sVersion|The version of json4s library| |3.6.8|
+|jsonLibrary|Json library to use. Possible values are: json4s and circe.| |json4s|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |mainPackage|Top-level package name, which defines 'apiPackage', 'modelPackage', 'invokerPackage'| |org.openapitools.client|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|separateErrorChannel|Whether to return response as F[Either[ResponseError[ErrorType], ReturnType]]] or to flatten response's error raising them through enclosing monad (F[ReturnType]).| |true|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
 |sourceFolder|source folder for generated code| |null|
+|sttpClientVersion|The version of sttp client| |2.2.0|
 
 ## IMPORT MAPPING
 
@@ -82,7 +87,7 @@ If false: the 'additionalProperties' implementation is compliant with the OAS an
 <li>final</li>
 <li>finally</li>
 <li>for</li>
-<li>forsome</li>
+<li>forSome</li>
 <li>if</li>
 <li>implicit</li>
 <li>import</li>
diff --git a/docs/generators/scalatra.md b/docs/generators/scalatra.md
index f9edf8f38759..f4b733094b00 100644
--- a/docs/generators/scalatra.md
+++ b/docs/generators/scalatra.md
@@ -8,8 +8,7 @@ sidebar_label: scalatra
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
diff --git a/docs/generators/scalaz.md b/docs/generators/scalaz.md
index 1d62a3e5ff01..18b52251dfc4 100644
--- a/docs/generators/scalaz.md
+++ b/docs/generators/scalaz.md
@@ -8,8 +8,7 @@ sidebar_label: scalaz
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |null|
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
diff --git a/docs/generators/spring.md b/docs/generators/spring.md
index fb93b92db40b..bc02a631d57b 100644
--- a/docs/generators/spring.md
+++ b/docs/generators/spring.md
@@ -25,8 +25,7 @@ sidebar_label: spring
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
diff --git a/docs/generators/swift4-deprecated.md b/docs/generators/swift4-deprecated.md
index 2ad3deb81c77..a589dbfcd0a8 100644
--- a/docs/generators/swift4-deprecated.md
+++ b/docs/generators/swift4-deprecated.md
@@ -6,8 +6,7 @@ sidebar_label: swift4-deprecated
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
diff --git a/docs/generators/swift5.md b/docs/generators/swift5.md
index 53e8733dec25..c51ca9e563e8 100644
--- a/docs/generators/swift5.md
+++ b/docs/generators/swift5.md
@@ -7,8 +7,7 @@ sidebar_label: swift5
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiNamePrefix|Prefix that will be appended to all API names ('tags'). Default: empty string. e.g. Pet =&gt; Pet.| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
diff --git a/docs/generators/typescript-angular.md b/docs/generators/typescript-angular.md
index 79974ab1641d..c4dbe172ea73 100644
--- a/docs/generators/typescript-angular.md
+++ b/docs/generators/typescript-angular.md
@@ -7,8 +7,7 @@ sidebar_label: typescript-angular
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiModulePrefix|The prefix of the generated ApiModule.| |null|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
@@ -24,6 +23,7 @@ If false: the 'additionalProperties' implementation is compliant with the OAS an
 |nullSafeAdditionalProps|Set to make additional properties types declare that their indexer may return undefined| |false|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |providedInRoot|Use this property to provide Injectables in root (it is only valid in angular version greater or equal to 6.0.0).| |false|
+|queryParamObjectFormat|The format for query param objects: 'dot', 'json', 'key'.| |dot|
 |serviceFileSuffix|The suffix of the file of the generated service (service&lt;suffix&gt;.ts).| |.service|
 |serviceSuffix|The suffix of the generated service.| |Service|
 |snapshot|When setting this property to true, the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm| |false|
diff --git a/docs/generators/typescript-angularjs-deprecated.md b/docs/generators/typescript-angularjs-deprecated.md
new file mode 100644
index 000000000000..4fbde59cb2c9
--- /dev/null
+++ b/docs/generators/typescript-angularjs-deprecated.md
@@ -0,0 +1,236 @@
+---
+title: Config Options for typescript-angularjs-deprecated
+sidebar_label: typescript-angularjs-deprecated
+---
+
+| Option | Description | Values | Default |
+| ------ | ----------- | ------ | ------- |
+|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
+|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
+|legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
+|nullSafeAdditionalProps|Set to make additional properties types declare that their indexer may return undefined| |false|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|supportsES6|Generate code that conforms to ES6.| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|Array|
+
+
+## LANGUAGE PRIMITIVES
+
+<ul class="column-ul">
+<li>Array</li>
+<li>Boolean</li>
+<li>Date</li>
+<li>Double</li>
+<li>Error</li>
+<li>File</li>
+<li>Float</li>
+<li>Integer</li>
+<li>Long</li>
+<li>Map</li>
+<li>Object</li>
+<li>ReadonlyArray</li>
+<li>String</li>
+<li>any</li>
+<li>boolean</li>
+<li>number</li>
+<li>object</li>
+<li>string</li>
+</ul>
+
+## RESERVED WORDS
+
+<ul class="column-ul">
+<li>abstract</li>
+<li>await</li>
+<li>boolean</li>
+<li>break</li>
+<li>byte</li>
+<li>case</li>
+<li>catch</li>
+<li>char</li>
+<li>class</li>
+<li>const</li>
+<li>continue</li>
+<li>debugger</li>
+<li>default</li>
+<li>delete</li>
+<li>do</li>
+<li>double</li>
+<li>else</li>
+<li>enum</li>
+<li>export</li>
+<li>extends</li>
+<li>false</li>
+<li>final</li>
+<li>finally</li>
+<li>float</li>
+<li>for</li>
+<li>formParams</li>
+<li>function</li>
+<li>goto</li>
+<li>headerParams</li>
+<li>if</li>
+<li>implements</li>
+<li>import</li>
+<li>in</li>
+<li>instanceof</li>
+<li>int</li>
+<li>interface</li>
+<li>let</li>
+<li>long</li>
+<li>native</li>
+<li>new</li>
+<li>null</li>
+<li>package</li>
+<li>private</li>
+<li>protected</li>
+<li>public</li>
+<li>queryParameters</li>
+<li>requestOptions</li>
+<li>return</li>
+<li>short</li>
+<li>static</li>
+<li>super</li>
+<li>switch</li>
+<li>synchronized</li>
+<li>this</li>
+<li>throw</li>
+<li>transient</li>
+<li>true</li>
+<li>try</li>
+<li>typeof</li>
+<li>useFormData</li>
+<li>var</li>
+<li>varLocalDeferred</li>
+<li>varLocalPath</li>
+<li>void</li>
+<li>volatile</li>
+<li>while</li>
+<li>with</li>
+<li>yield</li>
+</ul>
+
+## FEATURE SET
+
+
+### Client Modification Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|BasePath|✓|ToolingExtension
+|Authorizations|✗|ToolingExtension
+|UserAgent|✗|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
diff --git a/docs/generators/typescript-angularjs.md b/docs/generators/typescript-angularjs.md
index bd9f87fdb25d..1e6de0a46d03 100644
--- a/docs/generators/typescript-angularjs.md
+++ b/docs/generators/typescript-angularjs.md
@@ -6,8 +6,7 @@ sidebar_label: typescript-angularjs
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
diff --git a/docs/generators/typescript-aurelia.md b/docs/generators/typescript-aurelia.md
index 3e39180156b7..5afdd344f216 100644
--- a/docs/generators/typescript-aurelia.md
+++ b/docs/generators/typescript-aurelia.md
@@ -6,8 +6,7 @@ sidebar_label: typescript-aurelia
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
diff --git a/docs/generators/typescript-axios.md b/docs/generators/typescript-axios.md
index b2ab58b6adcb..ed94dd0aae6c 100644
--- a/docs/generators/typescript-axios.md
+++ b/docs/generators/typescript-axios.md
@@ -6,8 +6,7 @@ sidebar_label: typescript-axios
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
diff --git a/docs/generators/typescript-fetch.md b/docs/generators/typescript-fetch.md
index 037b7d01ca69..34e486fe79b6 100644
--- a/docs/generators/typescript-fetch.md
+++ b/docs/generators/typescript-fetch.md
@@ -6,8 +6,7 @@ sidebar_label: typescript-fetch
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
diff --git a/docs/generators/typescript-inversify.md b/docs/generators/typescript-inversify.md
index 3788b8a67d55..d7f81614fcef 100644
--- a/docs/generators/typescript-inversify.md
+++ b/docs/generators/typescript-inversify.md
@@ -6,8 +6,7 @@ sidebar_label: typescript-inversify
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
diff --git a/docs/generators/typescript-jquery.md b/docs/generators/typescript-jquery.md
index 16460679ccd8..3790b2ae3c60 100644
--- a/docs/generators/typescript-jquery.md
+++ b/docs/generators/typescript-jquery.md
@@ -6,8 +6,7 @@ sidebar_label: typescript-jquery
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
diff --git a/docs/generators/typescript-node.md b/docs/generators/typescript-node.md
index af0f5286f1b5..5bc32b4bd625 100644
--- a/docs/generators/typescript-node.md
+++ b/docs/generators/typescript-node.md
@@ -6,8 +6,7 @@ sidebar_label: typescript-node
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
diff --git a/docs/generators/typescript-redux-query.md b/docs/generators/typescript-redux-query.md
index 8f35944f8b75..767dcb6bfdba 100644
--- a/docs/generators/typescript-redux-query.md
+++ b/docs/generators/typescript-redux-query.md
@@ -6,8 +6,7 @@ sidebar_label: typescript-redux-query
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
diff --git a/docs/generators/typescript-rxjs.md b/docs/generators/typescript-rxjs.md
index 41d58058a862..270ce2ad7e4e 100644
--- a/docs/generators/typescript-rxjs.md
+++ b/docs/generators/typescript-rxjs.md
@@ -6,8 +6,7 @@ sidebar_label: typescript-rxjs
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document
-If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
@@ -22,7 +21,7 @@ If false: the 'additionalProperties' implementation is compliant with the OAS an
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
 |supportsES6|Generate code that conforms to ES6.| |false|
-|withInterfaces|Setting this property to true will generate interfaces next to the default class implementations.| |false|
+|withProgressSubscriber|Setting this property to true will generate API controller methods with support for subscribing to request progress.| |false|
 
 ## IMPORT MAPPING
 
diff --git a/docs/generators/typescript.md b/docs/generators/typescript.md
new file mode 100644
index 000000000000..00a4c3e22ae5
--- /dev/null
+++ b/docs/generators/typescript.md
@@ -0,0 +1,241 @@
+---
+title: Config Options for typescript
+sidebar_label: typescript
+---
+
+| Option | Description | Values | Default |
+| ------ | ----------- | ------ | ------- |
+|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|disallowAdditionalPropertiesIfNotPresent|Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. If true: when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.This setting is currently ignored for OAS 2.0 documents:  1) When the 'additionalProperties' keyword is not present in a 2.0 schema, additional properties are NOT allowed.  2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed.Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>when the 'additionalProperties' keyword is not present in a schema, the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. Note: this mode is not compliant with the JSON schema specification. This is the original openapi-generator behavior.</dd></dl>|true|
+|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
+|fileContentDataType|Specifies the type to use for the content of a file - i.e. Blob (Browser, Deno) / Buffer (node)| |Buffer|
+|framework|Specify the framework which should be used in the client code.|<dl><dt>**fetch-api**</dt><dd>fetch-api</dd><dt>**jquery**</dt><dd>jquery</dd></dl>|fetch-api|
+|legacyDiscriminatorBehavior|This flag is used by OpenAPITools codegen to influence the processing of the discriminator attribute in OpenAPI documents. This flag has no impact if the OAS document does not use the discriminator attribute. The default value of this flag is set in each language-specific code generator (e.g. Python, Java, go...)using the method toModelName. Note to developers supporting a language generator in OpenAPITools; to fully support the discriminator attribute as defined in the OAS specification 3.x, language generators should set this flag to true by default; however this requires updating the mustache templates to generate a language-specific discriminator lookup function that iterates over {{#mappedModels}} and does not iterate over {{children}}, {{#anyOf}}, or {{#oneOf}}.|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
+|npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
+|npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
+|npmVersion|The version of your npm package. If not provided, using the version from the OpenAPI specification file.| |1.0.0|
+|platform|Specifies the platform the code should run on. The default is 'node' for the 'request' framework and 'browser' otherwise.|<dl><dt>**browser**</dt><dd>browser</dd><dt>**node**</dt><dd>node</dd><dt>**deno**</dt><dd>deno</dd></dl>|browser|
+|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|snapshot|When setting this property to true, the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm| |false|
+|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|supportsES6|Generate code that conforms to ES6.| |false|
+|useInversify|Enable this to generate decorators and service identifiers for the InversifyJS inversion of control container. If you set 'deno' as 'platform', the generator will process this value as 'disable'.| |false|
+|useObjectParameters|Use aggregate parameter objects as function arguments for api operations instead of passing each parameter as a separate function argument.| |false|
+|useRxJS|Enable this to internally use rxjs observables. If disabled, a stub is used instead. This is required for the 'angular' framework.| |false|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|Array|
+
+
+## LANGUAGE PRIMITIVES
+
+<ul class="column-ul">
+<li>Array</li>
+<li>Boolean</li>
+<li>Date</li>
+<li>Double</li>
+<li>Error</li>
+<li>File</li>
+<li>Float</li>
+<li>Integer</li>
+<li>Long</li>
+<li>Map</li>
+<li>Object</li>
+<li>String</li>
+<li>any</li>
+<li>boolean</li>
+<li>number</li>
+<li>string</li>
+</ul>
+
+## RESERVED WORDS
+
+<ul class="column-ul">
+<li>abstract</li>
+<li>await</li>
+<li>boolean</li>
+<li>break</li>
+<li>byte</li>
+<li>case</li>
+<li>catch</li>
+<li>char</li>
+<li>class</li>
+<li>const</li>
+<li>continue</li>
+<li>debugger</li>
+<li>default</li>
+<li>delete</li>
+<li>do</li>
+<li>double</li>
+<li>else</li>
+<li>enum</li>
+<li>export</li>
+<li>extends</li>
+<li>false</li>
+<li>final</li>
+<li>finally</li>
+<li>float</li>
+<li>for</li>
+<li>formParams</li>
+<li>function</li>
+<li>goto</li>
+<li>headerParams</li>
+<li>if</li>
+<li>implements</li>
+<li>import</li>
+<li>in</li>
+<li>instanceof</li>
+<li>int</li>
+<li>interface</li>
+<li>let</li>
+<li>long</li>
+<li>native</li>
+<li>new</li>
+<li>null</li>
+<li>package</li>
+<li>private</li>
+<li>protected</li>
+<li>public</li>
+<li>queryParameters</li>
+<li>requestOptions</li>
+<li>return</li>
+<li>short</li>
+<li>static</li>
+<li>super</li>
+<li>switch</li>
+<li>synchronized</li>
+<li>this</li>
+<li>throw</li>
+<li>transient</li>
+<li>true</li>
+<li>try</li>
+<li>typeof</li>
+<li>useFormData</li>
+<li>var</li>
+<li>varLocalDeferred</li>
+<li>varLocalPath</li>
+<li>void</li>
+<li>volatile</li>
+<li>while</li>
+<li>with</li>
+<li>yield</li>
+</ul>
+
+## FEATURE SET
+
+
+### Client Modification Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|BasePath|✗|ToolingExtension
+|Authorizations|✗|ToolingExtension
+|UserAgent|✗|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
diff --git a/docs/plugins.md b/docs/plugins.md
index c01bec7a6f3b..7fcbf4ac4c10 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -15,7 +15,7 @@ Add to your `build->plugins` section (default phase is `generate-sources` phase)
 <plugin>
     <groupId>org.openapitools</groupId>
     <artifactId>openapi-generator-maven-plugin</artifactId>
-    <version>3.3.4</version>
+    <version>4.3.1</version>
     <executions>
         <execution>
             <goals>
diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
index 3387a4047487..12794d295537 100644
--- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
+++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.stream.Stream;
 
+import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.config.CodegenConfigurator;
 import org.slf4j.Logger;
@@ -52,8 +53,8 @@ public class Generate extends OpenApiGeneratorCommand {
             description = "where to write the generated files (current dir by default)")
     private String output = "";
 
-    @Option(name = {"-i", "--input-spec"}, title = "spec file", required = true,
-            description = "location of the OpenAPI spec, as URL or file (required)")
+    @Option(name = {"-i", "--input-spec"}, title = "spec file",
+            description = "location of the OpenAPI spec, as URL or file (required if not loaded via config using -c)")
     private String spec;
 
     @Option(name = {"-t", "--template-dir"}, title = "template directory",
@@ -264,6 +265,10 @@ public void execute() {
             if (configFile != null && configFile.length() > 0) {
                 // attempt to load from configFile
                 configurator = CodegenConfigurator.fromFile(configFile);
+            } else if (StringUtils.isEmpty(spec)) {
+                // if user doesn't pass configFile and does not pass spec, we can fail immediately because one of these two is required to run.
+                System.err.println("[error] Required option '-i' is missing");
+                System.exit(1);
             }
 
             // if a config file wasn't specified, or we were unable to read it
@@ -295,11 +300,9 @@ public void execute() {
             configurator.setInputSpec(spec);
         }
 
+        // Generator name should not be validated here, as it's validated in toClientOptInput
         if (isNotEmpty(generatorName)) {
             configurator.setGeneratorName(generatorName);
-        } else {
-            System.err.println("[error] A generator name (--generator-name / -g) is required.");
-            System.exit(1);
         }
 
         if (isNotEmpty(output)) {
diff --git a/modules/openapi-generator-maven-plugin/examples/java-client.xml b/modules/openapi-generator-maven-plugin/examples/java-client.xml
index f8213abd5abd..c22f4cfcce92 100644
--- a/modules/openapi-generator-maven-plugin/examples/java-client.xml
+++ b/modules/openapi-generator-maven-plugin/examples/java-client.xml
@@ -13,7 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>4.3.1</version>
+                <version>5.0.0-SNAPSHOT</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>
@@ -169,7 +169,11 @@
           <artifactId>joda-time</artifactId>
           <version>${jodatime-version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.github.scribejava</groupId>
+            <artifactId>scribejava-apis</artifactId>
+            <version>${scribejava-apis-version}</version>
+        </dependency>
         <!-- Base64 encoding that works in both JVM and Android -->
         <dependency>
             <groupId>com.brsanthu</groupId>
@@ -186,5 +190,6 @@
         <jodatime-version>2.7</jodatime-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.8.1</junit-version>
+        <scribejava-apis-version>6.9.0</scribejava-apis-version>
     </properties>
 </project>
diff --git a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
index 6b22f84ae473..388c3a0bfb49 100644
--- a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
+++ b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
@@ -13,7 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>4.3.1</version>
+                <version>5.0.0-SNAPSHOT</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
index 0fcb51998401..c0950191a917 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
@@ -361,7 +361,7 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case,
 
     public static final String DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT = "disallowAdditionalPropertiesIfNotPresent";
     public static final String DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT_DESC =
-        "Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document\n" +
+        "Specify the behavior when the 'additionalProperties' keyword is not present in the OAS document. " +
         
         "If false: the 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications. " +
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
index db04ec4ba7c9..f18293eaf20d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
@@ -30,8 +30,8 @@ public class CodegenOperation {
             isResponseBinary = false, isResponseFile = false, hasReference = false,
             isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy,
             isRestful, isDeprecated, isCallbackRequest, uniqueItems;
-    public String path, operationId, returnType, httpMethod, returnBaseType,
-            returnContainer, summary, unescapedNotes, notes, baseName, defaultResponse;
+    public String path, operationId, returnType, returnFormat, httpMethod, returnBaseType,
+            returnContainer, summary, unescapedNotes, notes, baseName, defaultResponse; 
     public CodegenDiscriminator discriminator;
     public List<Map<String, String>> consumes, produces, prioritizedContentTypes;
     public List<CodegenServer> servers = new ArrayList<CodegenServer>();
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 15228ef7dda2..a331c1a126a2 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -25,23 +25,7 @@
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Mustache.Compiler;
 import com.samskivert.mustache.Mustache.Lambda;
-import io.swagger.v3.core.util.Json;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.PathItem;
-import io.swagger.v3.oas.models.callbacks.Callback;
-import io.swagger.v3.oas.models.examples.Example;
-import io.swagger.v3.oas.models.headers.Header;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.parameters.*;
-import io.swagger.v3.oas.models.responses.ApiResponse;
-import io.swagger.v3.oas.models.responses.ApiResponses;
-import io.swagger.v3.oas.models.security.OAuthFlow;
-import io.swagger.v3.oas.models.security.OAuthFlows;
-import io.swagger.v3.oas.models.security.SecurityScheme;
-import io.swagger.v3.oas.models.servers.Server;
-import io.swagger.v3.oas.models.servers.ServerVariable;
-import io.swagger.v3.parser.util.SchemaTypeUtil;
+
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -59,7 +43,6 @@
 import org.openapitools.codegen.templating.mustache.*;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.openapitools.codegen.utils.OneOfImplementorAdditionalData;
-import org.openapitools.codegen.utils.SemVer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -73,6 +56,24 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import io.swagger.v3.core.util.Json;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.callbacks.Callback;
+import io.swagger.v3.oas.models.examples.Example;
+import io.swagger.v3.oas.models.headers.Header;
+import io.swagger.v3.oas.models.media.*;
+import io.swagger.v3.oas.models.parameters.*;
+import io.swagger.v3.oas.models.responses.ApiResponse;
+import io.swagger.v3.oas.models.responses.ApiResponses;
+import io.swagger.v3.oas.models.security.OAuthFlow;
+import io.swagger.v3.oas.models.security.OAuthFlows;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
+import io.swagger.v3.oas.models.servers.ServerVariable;
+import io.swagger.v3.parser.util.SchemaTypeUtil;
+
 import static org.openapitools.codegen.utils.OnceLogger.once;
 import static org.openapitools.codegen.utils.StringUtils.*;
 
@@ -361,7 +362,8 @@ protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
                 .put("lowercase", new LowercaseLambda().generator(this))
                 .put("uppercase", new UppercaseLambda())
                 .put("titlecase", new TitlecaseLambda())
-                .put("camelcase", new CamelCaseLambda().generator(this))
+                .put("camelcase", new CamelCaseLambda(true).generator(this))
+                .put("pascalcase", new CamelCaseLambda(false).generator(this))
                 .put("indented", new IndentedLambda())
                 .put("indented_8", new IndentedLambda(8, " "))
                 .put("indented_12", new IndentedLambda(12, " "))
@@ -1484,20 +1486,20 @@ public DefaultCodegen() {
 
         // option to change how we process + set the data in the 'additionalProperties' keyword.
         CliOption disallowAdditionalPropertiesIfNotPresentOpt = CliOption.newBoolean(
-            CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT,
-            CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT_DESC).defaultValue(Boolean.TRUE.toString());
+                CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT,
+                CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT_DESC).defaultValue(Boolean.TRUE.toString());
         Map<String, String> disallowAdditionalPropertiesIfNotPresentOpts = new HashMap<>();
         disallowAdditionalPropertiesIfNotPresentOpts.put("false",
-            "The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.");
+                "The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.");
         disallowAdditionalPropertiesIfNotPresentOpts.put("true",
-            "when the 'additionalProperties' keyword is not present in a schema, " +
-            "the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. " +
-            "Note: this mode is not compliant with the JSON schema specification. " +
-            "This is the original openapi-generator behavior.");
+                "when the 'additionalProperties' keyword is not present in a schema, " +
+                "the value of 'additionalProperties' is automatically set to false, i.e. no additional properties are allowed. " +
+                "Note: this mode is not compliant with the JSON schema specification. " +
+                "This is the original openapi-generator behavior.");
         disallowAdditionalPropertiesIfNotPresentOpt.setEnum(disallowAdditionalPropertiesIfNotPresentOpts);
         cliOptions.add(disallowAdditionalPropertiesIfNotPresentOpt);
         this.setDisallowAdditionalPropertiesIfNotPresent(true);
-        
+
         // initialize special character mapping
         initalizeSpecialCharacterMapping();
 
@@ -2638,7 +2640,7 @@ private Discriminator recursiveGetDiscriminator(Schema sc, OpenAPI openAPI) {
                 Integer hasDiscriminatorCnt = 0;
                 Integer hasNullTypeCnt = 0;
                 Set<String> discriminatorsPropNames = new HashSet<>();
-                for  (Schema oneOf: composedSchema.getOneOf()) {
+                for (Schema oneOf : composedSchema.getOneOf()) {
                     if (ModelUtils.isNullType(oneOf)) {
                         // The null type does not have a discriminator. Skip.
                         hasNullTypeCnt++;
@@ -2652,7 +2654,7 @@ private Discriminator recursiveGetDiscriminator(Schema sc, OpenAPI openAPI) {
                 }
                 if (discriminatorsPropNames.size() > 1) {
                     throw new RuntimeException("The oneOf schemas have conflicting discriminator property names. " +
-                        "oneOf schemas must have the same property name, but found " + String.join(", ", discriminatorsPropNames));
+                            "oneOf schemas must have the same property name, but found " + String.join(", ", discriminatorsPropNames));
                 }
                 if ((hasDiscriminatorCnt + hasNullTypeCnt) == composedSchema.getOneOf().size() && discriminatorsPropNames.size() == 1) {
                     disc.setPropertyName(foundDisc.getPropertyName());
@@ -2667,7 +2669,7 @@ private Discriminator recursiveGetDiscriminator(Schema sc, OpenAPI openAPI) {
                 Integer hasDiscriminatorCnt = 0;
                 Integer hasNullTypeCnt = 0;
                 Set<String> discriminatorsPropNames = new HashSet<>();
-                for  (Schema anyOf: composedSchema.getAnyOf()) {
+                for  (Schema anyOf : composedSchema.getAnyOf()) {
                     if (ModelUtils.isNullType(anyOf)) {
                         // The null type does not have a discriminator. Skip.
                         hasNullTypeCnt++;
@@ -2718,7 +2720,7 @@ protected List<MappedModel> getOneOfAnyOfDescendants(String composedSchemaName,
             if (schemaList == null) {
                 continue;
             }
-            for  (Schema sc: schemaList) {
+            for (Schema sc : schemaList) {
                 if (ModelUtils.isNullType(sc)) {
                     continue;
                 }
@@ -2873,7 +2875,7 @@ protected CodegenDiscriminator createDiscriminator(String schemaName, Schema sch
      * Handle the model for the 'additionalProperties' keyword in the OAS schema.
      *
      * @param codegenModel The codegen representation of the schema.
-     * @param schema the input OAS schema.
+     * @param schema       The input OAS schema.
      */
     protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
         addParentContainer(codegenModel, codegenModel.name, schema);
@@ -3499,7 +3501,8 @@ protected void handleMethodResponse(Operation operation,
             op.examples = new ExampleGenerator(schemas, this.openAPI).generateFromResponseSchema(exampleStatusCode, responseSchema, getProducesInfo(this.openAPI, operation));
             op.defaultResponse = toDefaultValue(responseSchema);
             op.returnType = cm.dataType;
-            op.hasReference = schemas.containsKey(op.returnBaseType);
+            op.returnFormat = cm.dataFormat;
+            op.hasReference = schemas != null && schemas.containsKey(op.returnBaseType);
 
             // lookup discriminator
             Schema schema = schemas.get(op.returnBaseType);
@@ -3613,12 +3616,12 @@ public CodegenOperation fromOperation(String path,
                     op.uniqueItems = true;
                     imports.add(typeMapping.get(r.containerType));
                 }
-                r.isDefault = response == methodResponse;
+
                 op.responses.add(r);
-                if (Boolean.TRUE.equals(r.isBinary) && Boolean.TRUE.equals(r.isDefault)) {
+                if (Boolean.TRUE.equals(r.isBinary) && Boolean.TRUE.equals(r.is2xx) && Boolean.FALSE.equals(op.isResponseBinary)) {
                     op.isResponseBinary = Boolean.TRUE;
                 }
-                if (Boolean.TRUE.equals(r.isFile) && Boolean.TRUE.equals(r.isDefault)) {
+                if (Boolean.TRUE.equals(r.isFile) && Boolean.TRUE.equals(r.is2xx) && Boolean.FALSE.equals(op.isResponseFile)) {
                     op.isResponseFile = Boolean.TRUE;
                 }
             }
@@ -3847,6 +3850,7 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 
         if ("default".equals(responseCode) || "defaultResponse".equals(responseCode)) {
             r.code = "0";
+            r.isDefault = true;
         } else {
             r.code = responseCode;
             switch (r.code.charAt(0)) {
@@ -3906,7 +3910,11 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
                 }
             } else {
                 if (cp.complexType != null) {
-                    r.baseType = cp.complexType;
+                    if (cp.items != null) {
+                        r.baseType = cp.items.complexType;
+                    } else {
+                        r.baseType = cp.complexType;
+                    }
                     r.isModel = true;
                 } else {
                     r.baseType = cp.baseType;
@@ -3961,8 +3969,8 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
                 r.containerType = cp.containerType;
                 r.isMapContainer = "map".equals(cp.containerType);
                 r.isListContainer = "list".equalsIgnoreCase(cp.containerType) ||
-                    "array".equalsIgnoreCase(cp.containerType) ||
-                    "set".equalsIgnoreCase(cp.containerType);
+                        "array".equalsIgnoreCase(cp.containerType) ||
+                        "set".equalsIgnoreCase(cp.containerType);
             } else {
                 r.simpleType = true;
             }
@@ -4093,22 +4101,23 @@ public CodegenParameter fromParameter(Parameter parameter, Set<String> imports)
             codegenParameter.vendorExtensions.putAll(parameter.getExtensions());
         }
 
-        Schema s;
+        Schema parameterSchema;
         if (parameter.getSchema() != null) {
-            s = parameter.getSchema();
+            parameterSchema = parameter.getSchema();
         } else if (parameter.getContent() != null) {
             Content content = parameter.getContent();
             if (content.size() > 1) {
                 once(LOGGER).warn("Multiple schemas found in content, returning only the first one");
             }
-            MediaType mediaType = content.values().iterator().next();
-            s = mediaType.getSchema();
+            Map.Entry<String, MediaType> entry = content.entrySet().iterator().next();
+            codegenParameter.contentType = entry.getKey();
+            parameterSchema = entry.getValue().getSchema();
         } else {
-            s = null;
+            parameterSchema = null;
         }
 
-        if (s != null) {
-            Schema parameterSchema = ModelUtils.unaliasSchema(this.openAPI, s, importMapping);
+        if (parameterSchema != null) {
+            parameterSchema = ModelUtils.unaliasSchema(this.openAPI, parameterSchema);
             if (parameterSchema == null) {
                 LOGGER.warn("warning!  Schema not found for parameter \"" + parameter.getName() + "\", using String");
                 parameterSchema = new StringSchema().description("//TODO automatically added by openapi-generator due to missing type definition.");
@@ -4518,6 +4527,11 @@ protected void addHeaders(ApiResponse response, List<CodegenProperty> properties
                 CodegenProperty cp = fromProperty(headerEntry.getKey(), schema);
                 cp.setDescription(escapeText(description));
                 cp.setUnescapedDescription(description);
+                if (header.getRequired() != null) {
+                    cp.setRequired(header.getRequired());
+                } else {
+                    cp.setRequired(false);
+                }
                 properties.add(cp);
             }
         }
@@ -5785,6 +5799,7 @@ private void addBodyModelSchema(CodegenParameter codegenParameter, String name,
             codegenParameter.baseType = codegenModel.classname;
             codegenParameter.dataType = getTypeDeclaration(codegenModel.classname);
             codegenParameter.description = codegenModel.description;
+            codegenParameter.isNullable = codegenModel.isNullable;
             imports.add(codegenParameter.baseType);
         } else {
             CodegenProperty codegenProperty = fromProperty("property", schema);
@@ -5798,6 +5813,7 @@ private void addBodyModelSchema(CodegenParameter codegenParameter, String name,
                 codegenParameter.baseType = codegenParameter.baseName;
                 codegenParameter.dataType = getTypeDeclaration(codegenModelName);
                 codegenParameter.description = codegenProperty.getDescription();
+                codegenParameter.isNullable = codegenProperty.isNullable;
             } else {
                 if (ModelUtils.isMapSchema(schema)) {// http body is map
                     LOGGER.error("Map should be supported. Please report to openapi-generator github repo about the issue.");
@@ -5853,6 +5869,9 @@ public CodegenParameter fromRequestBody(RequestBody body, Set<String> imports, S
         codegenParameter.description = escapeText(body.getDescription());
         codegenParameter.required = body.getRequired() != null ? body.getRequired() : Boolean.FALSE;
         codegenParameter.isBodyParam = Boolean.TRUE;
+        if (body.getExtensions() != null) {
+            codegenParameter.vendorExtensions.putAll(body.getExtensions());
+        }
 
         String name = null;
         LOGGER.debug("Request body = " + body);
@@ -5903,6 +5922,7 @@ public CodegenParameter fromRequestBody(RequestBody body, Set<String> imports, S
                 codegenParameter.baseType = getSchemaType(inner);
                 codegenParameter.isContainer = Boolean.TRUE;
                 codegenParameter.isMapContainer = Boolean.TRUE;
+                codegenParameter.isNullable = codegenProperty.isNullable;
 
                 setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty);
 
@@ -5945,6 +5965,7 @@ public CodegenParameter fromRequestBody(RequestBody body, Set<String> imports, S
                 codegenParameter.baseType = getSchemaType(inner);
                 codegenParameter.isContainer = Boolean.TRUE;
                 codegenParameter.isListContainer = Boolean.TRUE;
+                codegenParameter.isNullable = codegenProperty.isNullable;
 
                 setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty);
                 // set nullable
@@ -5968,6 +5989,7 @@ public CodegenParameter fromRequestBody(RequestBody body, Set<String> imports, S
                 codegenParameter.baseType = codegenProperty.baseType;
                 codegenParameter.dataType = codegenProperty.dataType;
                 codegenParameter.description = codegenProperty.description;
+                codegenParameter.isNullable = codegenProperty.isNullable;
                 codegenParameter.paramName = toParamName(codegenParameter.baseName);
             }
             setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty);
@@ -5997,6 +6019,7 @@ public CodegenParameter fromRequestBody(RequestBody body, Set<String> imports, S
                 codegenParameter.minLength = codegenProperty.minLength;
                 codegenParameter.maxLength = codegenProperty.maxLength;
                 codegenParameter.pattern = codegenProperty.pattern;
+                codegenParameter.isNullable = codegenProperty.isNullable;
 
                 if (codegenProperty.complexType != null) {
                     imports.add(codegenProperty.complexType);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
index 25c2e99890ce..f87bbe3aed14 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
@@ -892,7 +892,7 @@ public List<File> generate() {
 
             sb.append(System.lineSeparator());
 
-            System.err.println(sb.toString());
+            LOGGER.error(sb.toString());
         } else {
             // This exists here rather than in the method which generates supporting files to avoid accidentally adding files after this metadata.
             if (generateSupportingFiles) {
@@ -928,6 +928,10 @@ protected File processTemplateToFile(Map<String, Object> templateData, String te
 
     public Map<String, List<CodegenOperation>> processPaths(Paths paths) {
         Map<String, List<CodegenOperation>> ops = new TreeMap<>();
+        // when input file is not valid and doesn't contain any paths
+        if(paths == null) {
+            return ops;
+        }
         for (String resourcePath : paths.keySet()) {
             PathItem path = paths.get(resourcePath);
             processOperation(resourcePath, "get", path.getGet(), ops, path);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
index ddb41ce7b8a6..6b46f0d61097 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
@@ -466,7 +466,7 @@ public CodegenConfigurator setVerbose(boolean verbose) {
 
     @SuppressWarnings("WeakerAccess")
     public Context<?> toContext() {
-        Validate.notEmpty(generatorName, "language/generatorName must be specified");
+        Validate.notEmpty(generatorName, "generator name must be specified");
         Validate.notEmpty(inputSpec, "input spec must be specified");
 
         if (isEmpty(templatingEngineName)) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
index 7b7dca18ea6d..f7c62d2b7a67 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
@@ -28,15 +28,18 @@
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.DefaultCodegen;
 import org.openapitools.codegen.templating.mustache.IndentedLambda;
+import org.openapitools.codegen.utils.ModelUtils;
 import org.openapitools.codegen.utils.URLPathUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 abstract public class AbstractCppCodegen extends DefaultCodegen implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractCppCodegen.class);
@@ -237,6 +240,7 @@ public String toParamName(String name) {
         return sanitizeName(super.toParamName(name));
     }
 
+    @SuppressWarnings("rawtypes")
     @Override
     public CodegenProperty fromProperty(String name, Schema p) {
         CodegenProperty property = super.fromProperty(name, p);
@@ -353,4 +357,46 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
         }
         return postProcessModelsEnum(objs);
     }
+
+    @Override
+    public Map<String, Object> postProcessAllModels(Map<String, Object> objs){
+        Map<String, Object> models = super.postProcessAllModels(objs);
+        for (final Entry<String, Object> model : models.entrySet()) {
+            CodegenModel mo = ModelUtils.getModelByName(model.getKey(), models);
+            addForwardDeclarations(mo, models);
+        }
+        return models;
+    }
+
+    private void addForwardDeclarations(CodegenModel parentModel, Map<String, Object> objs) {
+        List<String> forwardDeclarations = new ArrayList<String>();
+        if(!parentModel.hasVars) {
+            return;
+        }
+        for(CodegenProperty property : parentModel.vars){
+            if(!( (property.isContainer && property.mostInnerItems.isModel) || (property.isModel) ) ){
+                continue;
+            }
+            String childPropertyType = property.isContainer? property.mostInnerItems.baseType : property.baseType;
+            for(final Entry<String, Object> mo : objs.entrySet()) {
+                CodegenModel childModel = ModelUtils.getModelByName(mo.getKey(), objs);
+                if( !childPropertyType.equals(childModel.classname) || childPropertyType.equals(parentModel.classname) || !childModel.hasVars ){
+                    continue;
+                }
+                for(CodegenProperty p : childModel.vars) {
+                    if(((p.isModel && p.dataType.equals(parentModel.classname)) || (p.isContainer && p.mostInnerItems.baseType.equals(parentModel.classname)))) {
+                        String forwardDecl = "class " + childModel.classname + ";";
+                        if(!forwardDeclarations.contains(forwardDecl)) {
+                            forwardDeclarations.add(forwardDecl);
+                        }
+                    }
+                }
+            }
+        }
+        if(!forwardDeclarations.isEmpty()){
+            parentModel.vendorExtensions.put("x-has-forward-declarations", true);
+            parentModel.vendorExtensions.put("x-forward-declarations", forwardDeclarations);
+        }
+        return;
+    }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
index 762f75e35d2f..c9cb89877774 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -129,7 +129,6 @@ public AbstractGoCodegen() {
         // in golang as interface{}.
         // See issue #5387 for more details.
         typeMapping.put("object", "map[string]interface{}");
-        typeMapping.put("interface{}", "interface{}");
         typeMapping.put("AnyType", "interface{}");
 
         numberTypes = new HashSet<String>(
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
index 0b41c204d471..9430b4e7f4b8 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -1649,10 +1649,24 @@ public void setAdditionalModelTypeAnnotations(final List<String> additionalModel
 
     @Override
     protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
-        super.addAdditionPropertiesToCodeGenModel(codegenModel, schema);
+        if (!supportsAdditionalPropertiesWithComposedSchema) {
+            // The additional (undeclared) propertiees are modeled in Java as a HashMap.
+            // 
+            // 1. supportsAdditionalPropertiesWithComposedSchema is set to false:
+            //    The generated model class extends from the HashMap. That does not work
+            //    with composed schemas that also use a discriminator because the model class
+            //    is supposed to extend from the generated parent model class.
+            // 2. supportsAdditionalPropertiesWithComposedSchema is set to true:
+            //    The HashMap is a field.
+            super.addAdditionPropertiesToCodeGenModel(codegenModel, schema);
+        }
 
         // See https://github.com/OpenAPITools/openapi-generator/pull/1729#issuecomment-449937728
-        codegenModel.additionalPropertiesType = getSchemaType(getAdditionalProperties(schema));
-        addImport(codegenModel, codegenModel.additionalPropertiesType);
+        Schema s = getAdditionalProperties(schema);
+        // 's' may be null if 'additionalProperties: false' in the OpenAPI schema.
+        if (s != null) {
+            codegenModel.additionalPropertiesType = getSchemaType(s);
+            addImport(codegenModel, codegenModel.additionalPropertiesType);
+        }
     }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
index 347ce1d07cfb..6c6ba19bb120 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
@@ -158,7 +158,7 @@ public AbstractKotlinCodegen() {
         typeMapping.put("set", "kotlin.collections.Set");
         typeMapping.put("map", "kotlin.collections.Map");
         typeMapping.put("object", "kotlin.Any");
-        typeMapping.put("binary", "kotlin.Array<kotlin.Byte>");
+        typeMapping.put("binary", "kotlin.ByteArray");
         typeMapping.put("Date", "java.time.LocalDate");
         typeMapping.put("DateTime", "java.time.LocalDateTime");
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
index 3a76a35649a0..d475cfb8e106 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
@@ -127,6 +127,7 @@ public AbstractPhpCodegen() {
         typeMapping.put("ByteArray", "string");
         typeMapping.put("UUID", "string");
         typeMapping.put("URI", "string");
+        typeMapping.put("AnyType", "mixed");
 
         cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
         cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java
index f8808929a36d..db3b11e42673 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java
@@ -49,6 +49,10 @@ public class AsciidocDocumentationCodegen extends DefaultCodegen implements Code
     public static final String SPEC_DIR = "specDir";
     public static final String SNIPPET_DIR = "snippetDir";
     public static final String HEADER_ATTRIBUTES_FLAG = "headerAttributes";
+    public static final String USE_INTRODUCTION_FLAG = "useIntroduction";
+    public static final String SKIP_EXAMPLES_FLAG = "skipExamples";
+    public static final String USE_METHOD_AND_PATH_FLAG = "useMethodAndPath";
+    public static final String USE_TABLE_TITLES_FLAG = "useTableTitles";
 
     /**
      * Lambda emitting an asciidoc "include::filename.adoc[]" if file is found in
@@ -150,6 +154,10 @@ public void execute(final Template.Fragment frag, final Writer out) throws IOExc
     protected String artifactId = "openapi-client";
     protected String artifactVersion = "1.0.0";
     protected boolean headerAttributes = true;
+    protected boolean useIntroduction = false;
+    protected boolean skipExamples = false;
+    protected boolean useMethodAndPath = false;
+    protected boolean useTableTitles = false;
 
     private IncludeMarkupLambda includeSpecMarkupLambda;
     private IncludeMarkupLambda includeSnippetMarkupLambda;
@@ -228,6 +236,18 @@ public AsciidocDocumentationCodegen() {
         cliOptions.add(CliOption.newBoolean(HEADER_ATTRIBUTES_FLAG,
                 "generation of asciidoc header meta data attributes (set to false to suppress, default: true)",
                 true));
+        cliOptions.add(CliOption.newBoolean(USE_INTRODUCTION_FLAG,
+                "use introduction section, rather than an initial abstract (default: false)",
+                false));
+        cliOptions.add(CliOption.newBoolean(SKIP_EXAMPLES_FLAG,
+                "skip examples sections (default: false)",
+                false));
+        cliOptions.add(CliOption.newBoolean(USE_METHOD_AND_PATH_FLAG,
+                "Use HTTP method and path as operation heading, instead of operation id (default: false)",
+                false));
+        cliOptions.add(CliOption.newBoolean(USE_TABLE_TITLES_FLAG,
+                "Use titles for tables, rather than wrapping tables instead their own section (default: false)",
+                false));
 
         additionalProperties.put("appName", "OpenAPI Sample description");
         additionalProperties.put("appDescription", "A sample OpenAPI documentation");
@@ -266,6 +286,38 @@ public void setHeaderAttributes(boolean headerAttributes) {
         this.headerAttributes = headerAttributes;
     }
 
+    public boolean isUseIntroduction() {
+        return useIntroduction;
+    }
+
+    public void setUseIntroduction(boolean useIntroduction) {
+        this.useIntroduction = useIntroduction;
+    }
+
+    public boolean isSkipExamples() {
+        return skipExamples;
+    }
+
+    public void setSkipExamples(boolean skipExamples) {
+        this.skipExamples = skipExamples;
+    }
+
+    public boolean isUseMethodAndPath() {
+        return useMethodAndPath;
+    }
+
+    public void setUseMethodAndPath(boolean useMethodAndPath) {
+        this.useMethodAndPath = useMethodAndPath;
+    }
+
+    public boolean isUseTableTitles() {
+        return useTableTitles;
+    }
+
+    public void setUseTableTitles(boolean useTableTitles) {
+        this.useTableTitles = useTableTitles;
+    }
+
     @Override
     public void processOpts() {
         super.processOpts();
@@ -291,11 +343,18 @@ public void processOpts() {
         this.linkSnippetMarkupLambda = new LinkMarkupLambda(snippetDir);
         additionalProperties.put("snippetlink", this.linkSnippetMarkupLambda);
 
+        processBooleanFlag(HEADER_ATTRIBUTES_FLAG, headerAttributes);
+        processBooleanFlag(USE_INTRODUCTION_FLAG, useIntroduction);
+        processBooleanFlag(SKIP_EXAMPLES_FLAG, skipExamples);
+        processBooleanFlag(USE_METHOD_AND_PATH_FLAG, useMethodAndPath);
+        processBooleanFlag(USE_TABLE_TITLES_FLAG, useTableTitles);
+    }
 
-        if (additionalProperties.containsKey(HEADER_ATTRIBUTES_FLAG)) {
-            this.setHeaderAttributes(convertPropertyToBooleanAndWriteBack(HEADER_ATTRIBUTES_FLAG));
+    private void processBooleanFlag(String flag, boolean value) {
+        if (additionalProperties.containsKey(flag)) {
+            this.setHeaderAttributes(convertPropertyToBooleanAndWriteBack(flag));
         } else {
-            additionalProperties.put(HEADER_ATTRIBUTES_FLAG, headerAttributes);
+            additionalProperties.put(flag, value);
         }
     }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
index 1a77a2af88d8..1350dfc19b1d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
@@ -62,7 +62,6 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
     private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}";
     private String userSecretsGuid = randomUUID().toString();
 
-    @SuppressWarnings("hiding")
     protected Logger LOGGER = LoggerFactory.getLogger(AspNetCoreServerCodegen.class);
 
     private boolean useSwashbuckle = true;
@@ -328,7 +327,7 @@ public void processOpts() {
             newtonsoftVersion = (String) additionalProperties.get(NEWTONSOFT_VERSION);
         }
 
-        // CHeck for the modifiers etc.
+        // Check for the modifiers etc.
         // The order of the checks is important.
         setBuildTarget();
         setClassModifier();
@@ -337,7 +336,7 @@ public void processOpts() {
         setUseSwashbuckle();
         setOperationIsAsync();
 
-        // CHeck for class modifier if not present set the default value.
+        // Check for class modifier if not present set the default value.
         additionalProperties.put(PROJECT_SDK, projectSdk);
 
         additionalProperties.put("dockerTag", packageName.toLowerCase(Locale.ROOT));
@@ -447,6 +446,7 @@ public String toRegularExpression(String pattern) {
         return escapeText(pattern);
     }
 
+    @SuppressWarnings("rawtypes")
     @Override
     public String getNullableType(Schema p, String type) {
         if (languageSpecificPrimitives.contains(type)) {
@@ -544,7 +544,9 @@ private void setAspnetCoreVersion(String packageFolder) {
             compatibilityVersion = "Version_" + aspnetCoreVersion.getOptValue().replace(".", "_");
         }
         LOGGER.info("ASP.NET core version: " + aspnetCoreVersion.getOptValue());
-        embeddedTemplateDir = "aspnetcore/" + determineTemplateVersion(aspnetCoreVersion.getOptValue());
+        if(!additionalProperties.containsKey(CodegenConstants.TEMPLATE_DIR)){
+            templateDir = embeddedTemplateDir = "aspnetcore" + File.separator + determineTemplateVersion(aspnetCoreVersion.getOptValue());
+        }
         additionalProperties.put(COMPATIBILITY_VERSION, compatibilityVersion);
     }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java
index 0ed1116bff61..4160502f47e7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java
@@ -322,8 +322,6 @@ public String toString() {
 
     protected File testDataControlFile = null;
 
-    protected String localVariablePrefix = "";
-
     public JavaCXFExtServerCodegen() {
         super();
 
@@ -444,9 +442,9 @@ private String appendLocalVariable(StringBuilder buffer, String indent, CodegenO
                                        Collection<String> localVars, Map<String, CodegenModel> models) {
 
         // Ensure that we're using a unique local variable name (to avoid typing and overwriting conflicts).
-        String localVar = localVariablePrefix + var.name;
+        String localVar = var.name;
         for (int i = 2; localVars.contains(localVar); i++)
-            localVar = localVariablePrefix + var.name + i;
+            localVar = var.name + i;
         localVars.add(localVar);
 
         if (!loadTestDataFromFile)
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
index 5a5b618a202b..b733ffbe7204 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
@@ -51,10 +51,10 @@ public class JavaClientCodegen extends AbstractJavaCodegen
 
     public static final String USE_RX_JAVA = "useRxJava";
     public static final String USE_RX_JAVA2 = "useRxJava2";
+    public static final String USE_RX_JAVA3 = "useRxJava3";
     public static final String DO_NOT_USE_RX = "doNotUseRx";
     public static final String USE_PLAY_WS = "usePlayWS";
     public static final String PLAY_VERSION = "playVersion";
-    public static final String FEIGN_VERSION = "feignVersion";
     public static final String ASYNC_NATIVE = "asyncNative";
     public static final String PARCELABLE_MODEL = "parcelableModel";
     public static final String USE_RUNTIME_EXCEPTION = "useRuntimeException";
@@ -65,9 +65,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
     public static final String PLAY_25 = "play25";
     public static final String PLAY_26 = "play26";
 
-    public static final String FEIGN_9 = "9.x";
-    public static final String FEIGN_10 = "10.x";
-
     public static final String FEIGN = "feign";
     public static final String GOOGLE_API_CLIENT = "google-api-client";
     public static final String JERSEY1 = "jersey1";
@@ -88,12 +85,12 @@ public class JavaClientCodegen extends AbstractJavaCodegen
     protected String gradleWrapperPackage = "gradle.wrapper";
     protected boolean useRxJava = false;
     protected boolean useRxJava2 = false;
+    protected boolean useRxJava3 = false;
     // backwards compatibility for openapi configs that specify neither rx1 nor rx2
     // (mustache does not allow for boolean operators so we need this extra field)
     protected boolean doNotUseRx = true;
     protected boolean usePlayWS = false;
-    protected String playVersion = PLAY_25;
-    protected String feignVersion = FEIGN_10;
+    protected String playVersion = PLAY_26;
     protected boolean asyncNative = false;
     protected boolean parcelableModel = false;
     protected boolean useBeanValidation = false;
@@ -129,26 +126,26 @@ public JavaClientCodegen() {
 
         modelTestTemplateFiles.put("model_test.mustache", ".java");
 
-        cliOptions.add(CliOption.newBoolean(USE_RX_JAVA, "Whether to use the RxJava adapter with the retrofit2 library."));
+        cliOptions.add(CliOption.newBoolean(USE_RX_JAVA, "Whether to use the RxJava adapter with the retrofit2 library. IMPORTANT: this option has been deprecated and will be removed in the 5.x release."));
         cliOptions.add(CliOption.newBoolean(USE_RX_JAVA2, "Whether to use the RxJava2 adapter with the retrofit2 library."));
+        cliOptions.add(CliOption.newBoolean(USE_RX_JAVA3, "Whether to use the RxJava3 adapter with the retrofit2 library."));
         cliOptions.add(CliOption.newBoolean(PARCELABLE_MODEL, "Whether to generate models for Android that implement Parcelable with the okhttp-gson library."));
         cliOptions.add(CliOption.newBoolean(USE_PLAY_WS, "Use Play! Async HTTP client (Play WS API)"));
-        cliOptions.add(CliOption.newString(PLAY_VERSION, "Version of Play! Framework (possible values \"play24\", \"play25\" (default), \"play26\")"));
+        cliOptions.add(CliOption.newString(PLAY_VERSION, "Version of Play! Framework (possible values \"play24\" (Deprecated), \"play25\" (Deprecated), \"play26\" (Default))"));
         cliOptions.add(CliOption.newBoolean(SUPPORT_JAVA6, "Whether to support Java6 with the Jersey1 library. This option has been deprecated and will be removed in the 5.x release"));
         cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations"));
         cliOptions.add(CliOption.newBoolean(PERFORM_BEANVALIDATION, "Perform BeanValidation"));
         cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
         cliOptions.add(CliOption.newBoolean(USE_RUNTIME_EXCEPTION, "Use RuntimeException instead of Exception"));
         cliOptions.add(CliOption.newBoolean(ASYNC_NATIVE, "If true, async handlers will be used, instead of the sync version"));
-        cliOptions.add(CliOption.newBoolean(FEIGN_VERSION, "Version of OpenFeign: '10.x' (default), '9.x' (deprecated)"));
         cliOptions.add(CliOption.newBoolean(USE_REFLECTION_EQUALS_HASHCODE, "Use org.apache.commons.lang3.builder for equals and hashCode in the models. WARNING: This will fail under a security manager, unless the appropriate permissions are set up correctly and also there's potential performance impact."));
         cliOptions.add(CliOption.newBoolean(CASE_INSENSITIVE_RESPONSE_HEADERS, "Make API response's headers case-insensitive. Available on " + OKHTTP_GSON + ", " + JERSEY2 + " libraries"));
 
         supportedLibraries.put(JERSEY1, "HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.");
         supportedLibraries.put(JERSEY2, "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x");
-        supportedLibraries.put(FEIGN, "HTTP client: OpenFeign 9.x (deprecated) or 10.x (default). JSON processing: Jackson 2.9.x.");
+        supportedLibraries.put(FEIGN, "HTTP client: OpenFeign 11.x. JSON processing: Jackson 2.9.x.");
         supportedLibraries.put(OKHTTP_GSON, "[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
-        supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)");
+        supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)");
         supportedLibraries.put(RESTTEMPLATE, "HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x");
         supportedLibraries.put(WEBCLIENT, "HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x");
         supportedLibraries.put(RESTEASY, "HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x");
@@ -176,6 +173,7 @@ public JavaClientCodegen() {
         // inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values,
         // and the discriminator mapping schemas in the OAS document.
         this.setLegacyDiscriminatorBehavior(false);
+
     }
 
     @Override
@@ -205,22 +203,40 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
     public void processOpts() {
         if ((WEBCLIENT.equals(getLibrary()) && "threetenbp".equals(dateLibrary)) || NATIVE.equals(getLibrary())) {
             dateLibrary = "java8";
-        } else if (MICROPROFILE.equals(getLibrary())) {
+        } else if (MICROPROFILE.equals(getLibrary()) && "threetenbp".equals(dateLibrary)) {
             dateLibrary = "legacy";
         }
 
         super.processOpts();
 
         // RxJava
-        if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA2)) {
-            LOGGER.warn("You specified both RxJava versions 1 and 2 but they are mutually exclusive. Defaulting to v2.");
-        } else if (additionalProperties.containsKey(USE_RX_JAVA)) {
-            this.setUseRxJava(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA).toString()));
-        }
-        if (additionalProperties.containsKey(USE_RX_JAVA2)) {
-            this.setUseRxJava2(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA2).toString()));
+        if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA2) && additionalProperties.containsKey(USE_RX_JAVA3)){
+            LOGGER.warn("You specified all RxJava versions 1, 2 and 3 but they are mutually exclusive. Defaulting to v3.");
+            this.setUseRxJava3(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA3).toString()));
+        }else {
+            if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA2)){
+                LOGGER.warn("You specified both RxJava versions 1 and 2 but they are mutually exclusive. Defaulting to v2.");
+                this.setUseRxJava2(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA2).toString()));
+            }else if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA3)) {
+                LOGGER.warn("You specified both RxJava versions 1 and 3 but they are mutually exclusive. Defaulting to v3.");
+                this.setUseRxJava3(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA3).toString()));
+            }else if(additionalProperties.containsKey(USE_RX_JAVA2) && additionalProperties.containsKey(USE_RX_JAVA3)){
+                LOGGER.warn("You specified both RxJava versions 2 and 3 but they are mutually exclusive. Defaulting to v3.");
+                this.setUseRxJava3(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA3).toString()));
+            }else{
+                if(additionalProperties.containsKey(USE_RX_JAVA)){
+                    this.setUseRxJava(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA).toString()));
+                }
+                if(additionalProperties.containsKey(USE_RX_JAVA2)){
+                    this.setUseRxJava2(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA2).toString()));
+                }
+                if(additionalProperties.containsKey(USE_RX_JAVA3)){
+                    this.setUseRxJava3(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA3).toString()));
+                }
+            }
         }
-        if (!useRxJava && !useRxJava2) {
+
+        if (!useRxJava && !useRxJava2 && !useRxJava3) {
             additionalProperties.put(DO_NOT_USE_RX, true);
         }
 
@@ -235,12 +251,6 @@ public void processOpts() {
         }
         additionalProperties.put(PLAY_VERSION, playVersion);
 
-        // default to feign 10.x
-        if (additionalProperties.containsKey(FEIGN_VERSION)) {
-            once(LOGGER).warn("feignVersion has been deprecated. 10.x is the default.");
-        }
-        additionalProperties.put(FEIGN_VERSION, feignVersion);
-
         if (additionalProperties.containsKey(ASYNC_NATIVE)) {
             this.setAsyncNative(convertPropertyToBooleanAndWriteBack(ASYNC_NATIVE));
         }
@@ -371,9 +381,20 @@ public void processOpts() {
             }
             supportingFiles.add(new SupportingFile("AbstractOpenApiSchema.mustache", (sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar), "AbstractOpenApiSchema.java"));
             forceSerializationLibrary(SERIALIZATION_LIBRARY_JACKSON);
+
+            // Composed schemas can have the 'additionalProperties' keyword, as specified in JSON schema.
+            // In principle, this should be enabled by default for all code generators. However due to limitations
+            // in other code generators, support needs to be enabled on a case-by-case basis.
+            // The flag below should be set for all Java libraries, but the templates need to be ported
+            // one by one for each library.
+            supportsAdditionalPropertiesWithComposedSchema = true;
+
         } else if (NATIVE.equals(getLibrary())) {
             setJava8Mode(true);
             additionalProperties.put("java8", "true");
+            if (!asyncNative) {
+                supportingFiles.add(new SupportingFile("ApiResponse.mustache", invokerFolder, "ApiResponse.java"));
+            }
             forceSerializationLibrary(SERIALIZATION_LIBRARY_JACKSON);
         } else if (RESTEASY.equals(getLibrary())) {
             supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
@@ -421,7 +442,6 @@ public void processOpts() {
             supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
             supportingFiles.add(new SupportingFile("api_exception.mustache", apiExceptionFolder, "ApiException.java"));
             supportingFiles.add(new SupportingFile("api_exception_mapper.mustache", apiExceptionFolder, "ApiExceptionMapper.java"));
-            importMapping.put("LocalDate", "org.joda.time.LocalDate");
             serializationLibrary = "none";
         } else {
             LOGGER.error("Unknown library option (-l/--library): " + getLibrary());
@@ -440,6 +460,7 @@ public void processOpts() {
             apiTemplateFiles.remove("api.mustache");
 
             if (PLAY_24.equals(playVersion)) {
+                LOGGER.warn("`play24` option has been deprecated and will be removed in the 5.x release. Please use `play26` instead.");
                 additionalProperties.put(PLAY_24, true);
                 apiTemplateFiles.put("play24/api.mustache", ".java");
 
@@ -450,6 +471,7 @@ public void processOpts() {
             }
 
             if (PLAY_25.equals(playVersion)) {
+                LOGGER.warn("`play25` option has been deprecated and will be removed in the 5.x release. Please use `play26` instead.");
                 additionalProperties.put(PLAY_25, true);
                 apiTemplateFiles.put("play25/api.mustache", ".java");
 
@@ -587,38 +609,6 @@ public int compare(CodegenParameter one, CodegenParameter another) {
             objs = AbstractJavaJAXRSServerCodegen.jaxrsPostProcessOperations(objs);
         }
 
-        if (JERSEY2.equals(getLibrary())) {
-            // index the model
-            HashMap<String, CodegenModel> modelMaps = new HashMap<String, CodegenModel>();
-            for (Object o : allModels) {
-                HashMap<String, Object> h = (HashMap<String, Object>) o;
-                CodegenModel m = (CodegenModel) h.get("model");
-                modelMaps.put(m.classname, m);
-            }
-
-            // check if return type is oneOf/anyeOf model
-            Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
-            List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
-            for (CodegenOperation op : operationList) {
-                if (op.returnType != null) {
-                    // look up the model to see if it's anyOf/oneOf
-                    if (modelMaps.containsKey(op.returnType) && modelMaps.get(op.returnType) != null) {
-                        CodegenModel cm = modelMaps.get(op.returnType);
-
-                        if (cm.oneOf != null && !cm.oneOf.isEmpty()) {
-                            op.vendorExtensions.put("x-java-return-type-one-of", true);
-                        }
-
-                        if (cm.anyOf != null && !cm.anyOf.isEmpty()) {
-                            op.vendorExtensions.put("x-java-return-type-any-of", true);
-                        }
-                    } else {
-                        //LOGGER.error("cannot lookup model " + op.returnType);
-                    }
-                }
-            }
-        }
-
         return objs;
     }
 
@@ -825,6 +815,11 @@ public void setUseRxJava2(boolean useRxJava2) {
         this.useRxJava2 = useRxJava2;
         doNotUseRx = false;
     }
+    
+    public void setUseRxJava3(boolean useRxJava3) {
+        this.useRxJava3 = useRxJava3;
+        doNotUseRx = false;
+    }
 
     public void setDoNotUseRx(boolean doNotUseRx) {
         this.doNotUseRx = doNotUseRx;
@@ -838,10 +833,6 @@ public void setPlayVersion(String playVersion) {
         this.playVersion = playVersion;
     }
 
-    public void setFeignVersion(String feignVersion) {
-        this.feignVersion = feignVersion;
-    }
-
     public void setAsyncNative(boolean asyncNative) {
         this.asyncNative = asyncNative;
     }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
index 6302588d8307..edd71aeae552 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
@@ -143,7 +143,8 @@ static class HTTPRequest {
 
         public HTTPRequest(String method, String path, @Nullable List<Parameter> query, @Nullable HTTPBody body,
                            @Nullable HTTPParameters params, @Nullable List<k6Check> k6Checks) {
-            this.method = method;
+            // NOTE: https://k6.io/docs/javascript-api/k6-http/del-url-body-params
+            this.method = method.equals("delete") ? "del" : method;
             this.path = path;
             this.query = query;
             this.body = body;
@@ -184,7 +185,6 @@ public HTTPRequestGroup(String groupName, Set<Parameter> variables, List<HTTPReq
 
     protected String invokerPackage;
     protected String sourceFolder = "";
-    protected String localVariablePrefix = "";
     private String modelPropertyNaming = "camelCase";
     protected boolean preserveLeadingParamChar = false;
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java
index cd80b05410bb..85a2956fc4f7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java
@@ -17,6 +17,7 @@
 
 package org.openapitools.codegen.languages;
 
+import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenModel;
@@ -28,6 +29,7 @@
 import org.openapitools.codegen.meta.features.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.openapitools.codegen.utils.ProcessUtils;
 
 import java.io.File;
 import java.util.HashMap;
@@ -60,7 +62,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
 
     protected String dateLibrary = DateLibrary.JAVA8.value;
     protected String requestDateConverter = RequestDateConverter.TO_JSON.value;
-    protected String collectionType = CollectionType.ARRAY.value;
+    protected String collectionType = CollectionType.LIST.value;
     protected boolean useRxJava = false;
     protected boolean useRxJava2 = false;
     protected boolean useCoroutines = false;
@@ -68,6 +70,8 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
     // (mustache does not allow for boolean operators so we need this extra field)
     protected boolean doNotUseRxAndCoroutines = true;
 
+    protected String authFolder;
+
     public enum DateLibrary {
         STRING("string"),
         THREETENBP("threetenbp"),
@@ -300,6 +304,7 @@ public void processOpts() {
 
         // infrastructure destination folder
         final String infrastructureFolder = (sourceFolder + File.separator + packageName + File.separator + "infrastructure").replace(".", "/");
+        authFolder = (sourceFolder + File.separator + packageName + File.separator + "auth").replace(".", "/");
 
         // additional properties
         if (additionalProperties.containsKey(DATE_LIBRARY)) {
@@ -339,6 +344,23 @@ public void processOpts() {
             typeMapping.put("list", "kotlin.collections.List");
             additionalProperties.put("isList", true);
         }
+
+        if(usesRetrofit2Library()) {
+            if (ProcessUtils.hasOAuthMethods(openAPI)) {
+                supportingFiles.add(new SupportingFile("auth/ApiKeyAuth.kt.mustache", authFolder, "ApiKeyAuth.kt"));
+                supportingFiles.add(new SupportingFile("auth/OAuth.kt.mustache", authFolder, "OAuth.kt"));
+                supportingFiles.add(new SupportingFile("auth/OAuthFlow.kt.mustache", authFolder, "OAuthFlow.kt"));
+                supportingFiles.add(new SupportingFile("auth/OAuthOkHttpClient.kt.mustache", authFolder, "OAuthOkHttpClient.kt"));
+            }
+
+            if(ProcessUtils.hasHttpBearerMethods(openAPI)) {
+                supportingFiles.add(new SupportingFile("auth/HttpBearerAuth.kt.mustache", authFolder, "HttpBearerAuth.kt"));
+            }
+            
+            if(ProcessUtils.hasHttpBasicMethods(openAPI)) {
+                supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.kt.mustache", authFolder, "HttpBasicAuth.kt"));
+            }
+        }
     }
 
     private void processDateLibrary() {
@@ -403,6 +425,7 @@ private void processJVMRetrofit2Library(String infrastructureFolder) {
         additionalProperties.put(JVM, true);
         additionalProperties.put(JVM_RETROFIT2, true);
         supportingFiles.add(new SupportingFile("infrastructure/ApiClient.kt.mustache", infrastructureFolder, "ApiClient.kt"));
+        supportingFiles.add(new SupportingFile("infrastructure/ResponseExt.kt.mustache", infrastructureFolder, "ResponseExt.kt"));
         supportingFiles.add(new SupportingFile("infrastructure/CollectionFormats.kt.mustache", infrastructureFolder, "CollectionFormats.kt"));
         addSupportingSerializerAdapters(infrastructureFolder);
     }
@@ -494,7 +517,6 @@ private void processMultiplatformLibrary(final String infrastructureFolder) {
         supportingFiles.add(new SupportingFile("infrastructure/OctetByteArray.kt.mustache", infrastructureFolder, "OctetByteArray.kt"));
 
         // multiplatform specific auth
-        final String authFolder = (sourceFolder + File.separator + packageName + File.separator + "auth").replace(".", "/");
         supportingFiles.add(new SupportingFile("auth/ApiKeyAuth.kt.mustache", authFolder, "ApiKeyAuth.kt"));
         supportingFiles.add(new SupportingFile("auth/Authentication.kt.mustache", authFolder, "Authentication.kt"));
         supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.kt.mustache", authFolder, "HttpBasicAuth.kt"));
@@ -558,6 +580,10 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
         return objects;
     }
 
+    private boolean usesRetrofit2Library() {
+        return getLibrary() != null && getLibrary().contains(JVM_RETROFIT2);
+    }
+
     @Override
     @SuppressWarnings("unchecked")
     public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<Object> allModels) {
@@ -567,6 +593,10 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
             List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
             for (CodegenOperation operation : ops) {
 
+                if (JVM_RETROFIT2.equals(getLibrary()) && StringUtils.isNotEmpty(operation.path) && operation.path.startsWith("/")) {
+                    operation.path = operation.path.substring(1);
+                }
+
                 // set multipart against all relevant operations
                 if (operation.hasConsumes == Boolean.TRUE) {
                     if (isMultipartType(operation.consumes)) {
@@ -574,6 +604,10 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
                     }
                 }
 
+                if (usesRetrofit2Library() && StringUtils.isNotEmpty(operation.path) && operation.path.startsWith("/")) {
+                    operation.path = operation.path.substring(1);
+                }
+
                 // modify the data type of binary form parameters to a more friendly type for multiplatform builds
                 if (MULTIPLATFORM.equals(getLibrary()) && operation.allParams != null) {
                     for (CodegenParameter param : operation.allParams) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
index 7d142d8a244a..909c1f59cf20 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
@@ -18,12 +18,9 @@
 
 import com.google.common.collect.ImmutableMap.Builder;
 import com.samskivert.mustache.Mustache;
-import com.samskivert.mustache.Template;
 import com.samskivert.mustache.Mustache.Lambda;
+import com.samskivert.mustache.Template;
 
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.media.Schema;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.languages.features.BeanValidationFeatures;
 import org.openapitools.codegen.meta.features.*;
@@ -37,7 +34,9 @@
 import java.net.URL;
 import java.util.*;
 import java.util.regex.Matcher;
-import java.util.stream.Collectors;
+
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
 
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
index fa6f87e4cb71..c0f8c77f0f0b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
@@ -122,16 +122,17 @@ public PhpLaravelServerCodegen() {
         supportingFiles.add(new SupportingFile("package.json", outputFolder, "package.json"));
         supportingFiles.add(new SupportingFile("phpunit.xml", outputFolder, "phpunit.xml"));
         supportingFiles.add(new SupportingFile("webpack.mix.js", outputFolder, "webpack.mix.js"));
-        supportingFiles.add(new SupportingFile(".env.example", outputFolder, ".env.example"));
+        supportingFiles.add(new SupportingFile("editorconfig", outputFolder, ".editorconfig"));
+        supportingFiles.add(new SupportingFile("env.example", outputFolder, ".env.example"));
+        supportingFiles.add(new SupportingFile("gitattributes", outputFolder, ".gitattributes"));
+        supportingFiles.add(new SupportingFile("styleci.yml", outputFolder, ".styleci.yml"));
         supportingFiles.add(new SupportingFile("server.php", outputFolder, "server.php"));
+        supportingFiles.add(new SupportingFile("gitignore", outputFolder, ".gitignore"));
 
         supportingFiles.add(new SupportingFile("bootstrap/cache/gitignore", outputFolder + File.separator + "bootstrap" + File.separator + "cache", ".gitignore"));
         supportingFiles.add(new SupportingFile("bootstrap/app.php", outputFolder + File.separator + "bootstrap", "app.php"));
-        supportingFiles.add(new SupportingFile("bootstrap/testingAutoload.php", outputFolder + File.separator + "bootstrap", "testingAutoload.php"));
 
         /* /public/ */
-        supportingFiles.add(new SupportingFile("public/css/app.css", outputFolder + File.separator + "public" + File.separator + "css", "app.css"));
-        supportingFiles.add(new SupportingFile("public/js/app.js", outputFolder + File.separator + "public" + File.separator + "js", "app.js"));
         supportingFiles.add(new SupportingFile("public/.htaccess", outputFolder + File.separator + "public", ".htaccess"));
         supportingFiles.add(new SupportingFile("public/favicon.ico", outputFolder + File.separator + "public", "favicon.ico"));
         supportingFiles.add(new SupportingFile("public/index.php", outputFolder + File.separator + "public", "index.php"));
@@ -147,6 +148,8 @@ public PhpLaravelServerCodegen() {
         /* /app/Http/Controllers/ */
         supportingFiles.add(new SupportingFile("app/Http/Kernel.php", outputFolder + File.separator + "app" + File.separator + "Http", "Kernel.php"));
         supportingFiles.add(new SupportingFile("app/Http/Controllers/Controller.php", outputFolder + File.separator + "app" + File.separator + "Http" + File.separator + "Controllers", "Controller.php"));
+        supportingFiles.add(new SupportingFile("app/Http/Middleware/Authenticate.php", outputFolder + File.separator + "app" + File.separator + "Http" + File.separator + "Middleware", "Authenticate.php"));
+        supportingFiles.add(new SupportingFile("app/Http/Middleware/CheckForMaintenanceMode.php", outputFolder + File.separator + "app" + File.separator + "Http" + File.separator + "Middleware", "CheckForMaintenanceMode.php"));
         supportingFiles.add(new SupportingFile("app/Http/Middleware/EncryptCookies.php", outputFolder + File.separator + "app" + File.separator + "Http" + File.separator + "Middleware", "EncryptCookies.php"));
         supportingFiles.add(new SupportingFile("app/Http/Middleware/RedirectIfAuthenticated.php", outputFolder + File.separator + "app" + File.separator + "Http" + File.separator + "Middleware", "RedirectIfAuthenticated.php"));
         supportingFiles.add(new SupportingFile("app/Http/Middleware/TrimStrings.php", outputFolder + File.separator + "app" + File.separator + "Http" + File.separator + "Middleware", "TrimStrings.php"));
@@ -163,11 +166,13 @@ public PhpLaravelServerCodegen() {
         supportingFiles.add(new SupportingFile("app/Providers/BroadcastServiceProvider.php", outputFolder + File.separator + "app" + File.separator + "Providers", "BroadcastServiceProvider.php"));
         supportingFiles.add(new SupportingFile("app/Providers/EventServiceProvider.php", outputFolder + File.separator + "app" + File.separator + "Providers", "EventServiceProvider.php"));
         supportingFiles.add(new SupportingFile("app/Providers/RouteServiceProvider.php", outputFolder + File.separator + "app" + File.separator + "Providers", "RouteServiceProvider.php"));
+        // /app/
+        supportingFiles.add(new SupportingFile("app/User.php", outputFolder + File.separator + "app", "RouteServiceProvider.php"));
 
         // /database/
         supportingFiles.add(new SupportingFile("database/factories/UserFactory.php", outputFolder + File.separator + "database" + File.separator + "factories", "UserFactory.php"));
         supportingFiles.add(new SupportingFile("database/migrations/2014_10_12_000000_create_users_table.php", outputFolder + File.separator + "database" + File.separator + "migrations", "2014_10_12_000000_create_users_table.php"));
-        supportingFiles.add(new SupportingFile("database/migrations/2014_10_12_100000_create_password_resets_table.php", outputFolder + File.separator + "database" + File.separator + "migrations", "2014_10_12_100000_create_password_resets_table.php"));
+        supportingFiles.add(new SupportingFile("database/migrations/2019_08_19_000000_create_failed_jobs_table.php", outputFolder + File.separator + "database" + File.separator + "migrations", "2019_08_19_000000_create_failed_jobs_table.php"));
         supportingFiles.add(new SupportingFile("database/seeds/DatabaseSeeder.php", outputFolder + File.separator + "database" + File.separator + "seeds", "DatabaseSeeder.php"));
         supportingFiles.add(new SupportingFile("database/gitignore", outputFolder + File.separator + "database", ".gitignore"));
 
@@ -176,6 +181,7 @@ public PhpLaravelServerCodegen() {
         supportingFiles.add(new SupportingFile("config/auth.php", outputFolder + File.separator + "config", "auth.php"));
         supportingFiles.add(new SupportingFile("config/broadcasting.php", outputFolder + File.separator + "config", "broadcasting.php"));
         supportingFiles.add(new SupportingFile("config/cache.php", outputFolder + File.separator + "config", "cache.php"));
+        supportingFiles.add(new SupportingFile("config/cors.php", outputFolder + File.separator + "config", "cors.php"));
         supportingFiles.add(new SupportingFile("config/database.php", outputFolder + File.separator + "config", "database.php"));
         supportingFiles.add(new SupportingFile("config/filesystems.php", outputFolder + File.separator + "config", "filesystems.php"));
         supportingFiles.add(new SupportingFile("config/hashing.php", outputFolder + File.separator + "config", "hashing.php"));
@@ -186,12 +192,13 @@ public PhpLaravelServerCodegen() {
         supportingFiles.add(new SupportingFile("config/session.php", outputFolder + File.separator + "config", "session.php"));
         supportingFiles.add(new SupportingFile("config/view.php", outputFolder + File.separator + "config", "view.php"));
 
+        // /database/
+        supportingFiles.add(new SupportingFile("database/migrations/2019_08_19_000000_create_failed_jobs_table.php", outputFolder + File.separator + "database" + File.separator + "migrations", "2019_08_19_000000_create_failed_jobs_table.php"));
+
         // /resources/
-        supportingFiles.add(new SupportingFile("resources/assets/js/components/ExampleComponent.vue", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "js" + File.separator + "components", "ExampleComponent.vue"));
-        supportingFiles.add(new SupportingFile("resources/assets/js/app.js", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "js", "app.js"));
-        supportingFiles.add(new SupportingFile("resources/assets/js/bootstrap.js", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "js", "bootstrap.js"));
-        supportingFiles.add(new SupportingFile("resources/assets/sass/_variables.scss", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "sass", "_variables.scss"));
-        supportingFiles.add(new SupportingFile("resources/assets/sass/app.scss", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "sass", "app.scss"));
+        supportingFiles.add(new SupportingFile("resources/js/app.js", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "js", "app.js"));
+        supportingFiles.add(new SupportingFile("resources/js/bootstrap.js", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "js", "bootstrap.js"));
+        supportingFiles.add(new SupportingFile("resources/sass/app.scss", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "sass", "app.scss"));
         supportingFiles.add(new SupportingFile("resources/lang/en/auth.php", outputFolder + File.separator + "resources" + File.separator + "lang" + File.separator + "en", "auth.php"));
         supportingFiles.add(new SupportingFile("resources/lang/en/pagination.php", outputFolder + File.separator + "resources" + File.separator + "lang" + File.separator + "en", "pagination.php"));
         supportingFiles.add(new SupportingFile("resources/lang/en/passwords.php", outputFolder + File.separator + "resources" + File.separator + "lang" + File.separator + "en", "passwords.php"));
@@ -203,6 +210,7 @@ public PhpLaravelServerCodegen() {
         supportingFiles.add(new SupportingFile("storage/app/public/gitignore", outputFolder + File.separator + "storage" + File.separator + "app" + File.separator + "public", ".gitignore"));
         supportingFiles.add(new SupportingFile("storage/framework/gitignore", outputFolder + File.separator + "storage" + File.separator + "framework", ".gitignore"));
         supportingFiles.add(new SupportingFile("storage/framework/cache/gitignore", outputFolder + File.separator + "storage" + File.separator + "framework" + File.separator + "cache", ".gitignore"));
+        supportingFiles.add(new SupportingFile("storage/framework/cache/data/gitignore", outputFolder + File.separator + "storage" + File.separator + "framework" + File.separator + "cache", ".gitignore"));
         supportingFiles.add(new SupportingFile("storage/framework/sessions/gitignore", outputFolder + File.separator + "storage" + File.separator + "framework" + File.separator + "sessions", ".gitignore"));
         supportingFiles.add(new SupportingFile("storage/framework/testing/gitignore", outputFolder + File.separator + "storage" + File.separator + "framework" + File.separator + "testing", ".gitignore"));
         supportingFiles.add(new SupportingFile("storage/framework/views/gitignore", outputFolder + File.separator + "storage" + File.separator + "framework" + File.separator + "views", ".gitignore"));
@@ -215,6 +223,14 @@ public PhpLaravelServerCodegen() {
         supportingFiles.add(new SupportingFile("tests/TestCase.php", outputFolder + File.separator + "tests", "TestCase.php"));
     }
 
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        // remove gitignore supporting file from AbstractPhpCodegen
+        supportingFiles.remove(supportingFiles.size() - 1);
+    }
+
     // override with any special post-processing
     @Override
     public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<Object> allModels) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java
index 1a8f20529fad..aed75feb5e02 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java
@@ -32,10 +32,6 @@ public class PhpSlim4ServerCodegen extends PhpSlimServerCodegen {
     public static final String PSR7_IMPLEMENTATION = "psr7Implementation";
 
     protected String psr7Implementation = "slim-psr7";
-    protected String mockDirName = "Mock";
-    protected String mockPackage = "";
-    protected String utilsDirName = "Utils";
-    protected String utilsPackage = "";
     protected String interfacesDirName = "Interfaces";
     protected String interfacesPackage = "";
 
@@ -46,8 +42,6 @@ public PhpSlim4ServerCodegen() {
                 .stability(Stability.STABLE)
                 .build();
 
-        mockPackage = invokerPackage + "\\" + mockDirName;
-        utilsPackage = invokerPackage + "\\" + utilsDirName;
         interfacesPackage = invokerPackage + "\\" + interfacesDirName;
         outputFolder = "generated-code" + File.separator + "slim4";
         embeddedTemplateDir = templateDir = "php-slim4-server";
@@ -84,30 +78,15 @@ public void processOpts() {
         super.processOpts();
 
         if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
-            // Update mockPackage and utilsPackage
-            mockPackage = invokerPackage + "\\" + mockDirName;
-            utilsPackage = invokerPackage + "\\" + utilsDirName;
+            // Update interfacesPackage
             interfacesPackage = invokerPackage + "\\" + interfacesDirName;
         }
 
-        // make mock src path available in mustache template
-        additionalProperties.put("mockPackage", mockPackage);
-        additionalProperties.put("mockSrcPath", "./" + toSrcPath(mockPackage, srcBasePath));
-        additionalProperties.put("mockTestPath", "./" + toSrcPath(mockPackage, testBasePath));
-
-        // same for utils package
-        additionalProperties.put("utilsPackage", utilsPackage);
-        additionalProperties.put("utilsSrcPath", "./" + toSrcPath(utilsPackage, srcBasePath));
-        additionalProperties.put("utilsTestPath", "./" + toSrcPath(utilsPackage, testBasePath));
-
         // same for interfaces package
         additionalProperties.put("interfacesPackage", interfacesPackage);
         additionalProperties.put("interfacesSrcPath", "./" + toSrcPath(interfacesPackage, srcBasePath));
         additionalProperties.put("interfacesTestPath", "./" + toSrcPath(interfacesPackage, testBasePath));
 
-        // external docs folder
-        additionalProperties.put("docsBasePath", "./" + docsBasePath);
-
         if (additionalProperties.containsKey(PSR7_IMPLEMENTATION)) {
             this.setPsr7Implementation((String) additionalProperties.get(PSR7_IMPLEMENTATION));
         }
@@ -140,23 +119,8 @@ public void processOpts() {
         // Slim 4 doesn't parse JSON body anymore we need to add suggested middleware
         // ref: https://www.slimframework.com/docs/v4/objects/request.html#the-request-body
         supportingFiles.add(new SupportingFile("json_body_parser_middleware.mustache", toSrcPath(invokerPackage + "\\Middleware", srcBasePath), "JsonBodyParserMiddleware.php"));
-
-        // mocking feature
-        supportingFiles.add(new SupportingFile("openapi_data_mocker_interface.mustache", toSrcPath(mockPackage, srcBasePath), toInterfaceName("OpenApiDataMocker") + ".php"));
-        supportingFiles.add(new SupportingFile("openapi_data_mocker.mustache", toSrcPath(mockPackage, srcBasePath), "OpenApiDataMocker.php"));
-        supportingFiles.add(new SupportingFile("openapi_data_mocker_test.mustache", toSrcPath(mockPackage, testBasePath), "OpenApiDataMockerTest.php"));
-        supportingFiles.add(new SupportingFile("openapi_data_mocker_middleware.mustache", toSrcPath(mockPackage, srcBasePath), "OpenApiDataMockerMiddleware.php"));
-        supportingFiles.add(new SupportingFile("openapi_data_mocker_middleware_test.mustache", toSrcPath(mockPackage, testBasePath), "OpenApiDataMockerMiddlewareTest.php"));
-        supportingFiles.add(new SupportingFile("mock_server.mustache", docsBasePath, "MockServer.md"));
-
-        // traits of ported utils
-        supportingFiles.add(new SupportingFile("string_utils_trait.mustache", toSrcPath(utilsPackage, srcBasePath), toTraitName("StringUtils") + ".php"));
-        supportingFiles.add(new SupportingFile("string_utils_trait_test.mustache", toSrcPath(utilsPackage, testBasePath), toTraitName("StringUtils") + "Test.php"));
-        supportingFiles.add(new SupportingFile("model_utils_trait.mustache", toSrcPath(utilsPackage, srcBasePath), toTraitName("ModelUtils") + ".php"));
-        supportingFiles.add(new SupportingFile("model_utils_trait_test.mustache", toSrcPath(utilsPackage, testBasePath), toTraitName("ModelUtils") + "Test.php"));
-
-        // model interface
-        supportingFiles.add(new SupportingFile("model_interface.mustache", toSrcPath(interfacesPackage, srcBasePath), toInterfaceName("Model") + ".php"));
+        supportingFiles.add(new SupportingFile("base_model.mustache", toSrcPath(invokerPackage, srcBasePath), "BaseModel.php"));
+        supportingFiles.add(new SupportingFile("base_model_test.mustache", toSrcPath(invokerPackage, testBasePath), "BaseModelTest.php"));
     }
 
     /**
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
index d3e519a9a7f9..7f166b6a241e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
@@ -54,13 +54,13 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
     protected Map<String, String> commonVerbs; // verbs not in the official ps verb list but can be mapped to one of the verbs
     protected HashSet methodNames; // store a list of method names to detect duplicates
     protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup
+    protected boolean discardReadOnly = false; // Discard the readonly property in initialize cmdlet
 
     /**
      * Constructs an instance of `PowerShellClientCodegen`.
      */
     public PowerShellClientCodegen() {
         super();
-
         modifyFeatureSet(features -> features
                 .includeDocumentationFeatures(DocumentationFeature.Readme)
                 .wireFormatFeatures(EnumSet.of(WireFormatFeature.JSON, WireFormatFeature.XML))
@@ -500,6 +500,13 @@ public PowerShellClientCodegen() {
         cliOptions.add(new CliOption(CodegenConstants.API_NAME_PREFIX, "Prefix that will be appended to all PS objects. Default: empty string. e.g. Pet => PSPet."));
         cliOptions.add(new CliOption("commonVerbs", "PS common verb mappings. e.g. Delete=Remove:Patch=Update to map Delete with Remove and Patch with Update accordingly."));
         cliOptions.add(new CliOption(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP_DESC));
+        cliOptions.add(new CliOption("discardReadOnly", "Set discardReadonly to true to generate the Initialize cmdlet without readonly parameters"));
+
+        // default value in the template
+        additionalProperties.put("powershellVersion", "6.2"); // minimal PS version
+        additionalProperties.put("author", "OpenAPI Generator Team");
+        additionalProperties.put("companyName", "openapitools.org");
+        additionalProperties.put("psData", null);
     }
 
     public CodegenType getTag() {
@@ -543,9 +550,18 @@ public void setUseOneOfDiscriminatorLookup(boolean useOneOfDiscriminatorLookup)
     public boolean getUseOneOfDiscriminatorLookup() {
         return this.useOneOfDiscriminatorLookup;
     }
+    
+    public void setDiscardReadOnly(boolean discardReadOnly) {
+        this.discardReadOnly = discardReadOnly;
+    }
+
+    public boolean getDiscardReadOnly() {
+        return this.discardReadOnly;
+    }
 
     @Override
     public void processOpts() {
+        this.setLegacyDiscriminatorBehavior(false);
         super.processOpts();
 
         if (StringUtils.isEmpty(System.getenv("POWERSHELL_POST_PROCESS_FILE"))) {
@@ -565,6 +581,12 @@ public void processOpts() {
             additionalProperties.put(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, useOneOfDiscriminatorLookup);
         }
 
+        if (additionalProperties.containsKey("discardReadOnly")) {
+            setDiscardReadOnly(convertPropertyToBooleanAndWriteBack("discardReadOnly"));
+        } else {
+            additionalProperties.put("discardReadOnly", discardReadOnly);
+        }
+
         if (StringUtils.isNotBlank(powershellGalleryUrl)) {
             // get the last segment of the URL
             // e.g. https://www.powershellgallery.com/packages/PSTwitter => PSTwitter
@@ -905,9 +927,19 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
         for (Object _mo : models) {
             Map<String, Object> _model = (Map<String, Object>) _mo;
             CodegenModel model = (CodegenModel) _model.get("model");
+            CodegenProperty lastWritableProperty = null;
 
             for (CodegenProperty cp : model.allVars) {
                 cp.vendorExtensions.put("x-powershell-data-type", getPSDataType(cp));
+                if(this.discardReadOnly && !cp.isReadOnly) {
+                    lastWritableProperty = cp;
+                }
+            }
+
+            // Mark the last readonly false property
+            if(this.discardReadOnly && lastWritableProperty != null) {
+                lastWritableProperty.vendorExtensions.put("x-powershell-last-writable", true);
+                model.allVars.set(model.allVars.indexOf(lastWritableProperty), lastWritableProperty);
             }
 
             // if oneOf contains "null" type
@@ -926,27 +958,6 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
             if ("null<String, SystemCollectionsHashtable>".equals(model.parent)) {
                 model.vendorExtensions.put("x-additional-properties", true);
             }
-
-            // automatically create discriminator mapping for oneOf/anyOf if not present
-            if (((model.oneOf != null && !model.oneOf.isEmpty()) || (model.anyOf != null && !model.anyOf.isEmpty())) &&
-                    model.discriminator != null && model.discriminator.getMapping() == null) {
-                // create mappedModels
-                Set<String> schemas = new HashSet<>();
-                if (model.oneOf != null && !model.oneOf.isEmpty()) {
-                    schemas = model.oneOf;
-                } else if (model.anyOf != null && !model.anyOf.isEmpty()) {
-                    schemas = model.anyOf;
-                }
-
-                HashSet<CodegenDiscriminator.MappedModel> mappedModels = new HashSet<>();
-
-                for (String s: schemas) {
-                    mappedModels.add(new CodegenDiscriminator.MappedModel(s, s));
-                }
-
-                model.discriminator.setMappedModels(mappedModels);
-
-            }
         }
 
         return objs;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAbstractConnexionServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAbstractConnexionServerCodegen.java
index 6105a43bf9ad..e94279d5ac4b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAbstractConnexionServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAbstractConnexionServerCodegen.java
@@ -161,7 +161,7 @@ public PythonAbstractConnexionServerCodegen(String templateDirectory, boolean fi
                 defaultValue("controllers"));
         cliOptions.add(new CliOption(DEFAULT_CONTROLLER, "default controller").
                 defaultValue("default_controller"));
-        cliOptions.add(new CliOption(SUPPORT_PYTHON2, "support python2").
+        cliOptions.add(new CliOption(SUPPORT_PYTHON2, "support python2. This option has been deprecated and will be removed in the 5.x release.").
                 defaultValue("false"));
         cliOptions.add(new CliOption("serverPort", "TCP port to listen to in app.run").
                 defaultValue("8080"));
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java
index e5adf04afdf9..50d0e67970fc 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java
@@ -72,6 +72,9 @@ public PythonClientExperimentalCodegen() {
                         SecurityFeature.ApiKey,
                         SecurityFeature.OAuth2_Implicit
                 ))
+                .includeGlobalFeatures(
+                        GlobalFeature.ParameterizedServer
+                )
                 .excludeGlobalFeatures(
                         GlobalFeature.XMLStructureDefinitions,
                         GlobalFeature.Callbacks,
@@ -416,12 +419,17 @@ public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
                     }
                 }
 
-                // fix the imports that each model has, change them to absolute
-                fixModelImports(cm.imports);
-
                 Schema modelSchema = ModelUtils.getSchema(this.openAPI, cm.name);
                 CodegenProperty modelProperty = fromProperty("value", modelSchema);
 
+                // import complex type from additional properties
+                if (cm.additionalPropertiesType != null && modelProperty.items != null && modelProperty.items.complexType != null) {
+                    cm.imports.add(modelProperty.items.complexType);
+                }
+
+                // fix the imports that each model has, change them to absolute
+                fixModelImports(cm.imports);
+
                 if (cm.isEnum || cm.isAlias) {
                     if (!modelProperty.isEnum && !modelProperty.hasValidation && !cm.isArrayModel) {
                         // remove these models because they are aliases and do not have any enums or validations
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
index bd6e45bd223f..e72e9d112e2f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
@@ -40,12 +40,14 @@ public class RustClientCodegen extends DefaultCodegen implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(RustClientCodegen.class);
     private boolean useSingleRequestParameter = false;
     private boolean supportAsync = true;
+    private boolean supportMultipleResponses = false;
 
     public static final String PACKAGE_NAME = "packageName";
     public static final String PACKAGE_VERSION = "packageVersion";
     public static final String HYPER_LIBRARY = "hyper";
     public static final String REQWEST_LIBRARY = "reqwest";
     public static final String SUPPORT_ASYNC = "supportAsync";
+    public static final String SUPPORT_MULTIPLE_RESPONSES = "supportMultipleResponses";
 
     protected String packageName = "openapi";
     protected String packageVersion = "1.0.0";
@@ -175,6 +177,8 @@ public RustClientCodegen() {
                 .defaultValue(Boolean.FALSE.toString()));
         cliOptions.add(new CliOption(SUPPORT_ASYNC, "If set, generate async function call instead. This option is for 'reqwest' library only", SchemaTypeUtil.BOOLEAN_TYPE)
                 .defaultValue(Boolean.TRUE.toString()));
+        cliOptions.add(new CliOption(SUPPORT_MULTIPLE_RESPONSES, "If set, return type wraps an enum of all possible 2xx schemas. This option is for 'reqwest' library only", SchemaTypeUtil.BOOLEAN_TYPE)
+            .defaultValue(Boolean.FALSE.toString()));
 
         supportedLibraries.put(HYPER_LIBRARY, "HTTP client: Hyper.");
         supportedLibraries.put(REQWEST_LIBRARY, "HTTP client: Reqwest.");
@@ -260,6 +264,11 @@ public void processOpts() {
         }
         writePropertyBack(SUPPORT_ASYNC, getSupportAsync());
 
+        if (additionalProperties.containsKey(SUPPORT_MULTIPLE_RESPONSES)) {
+            this.setSupportMultipleReturns(convertPropertyToBoolean(SUPPORT_MULTIPLE_RESPONSES));
+        }
+        writePropertyBack(SUPPORT_MULTIPLE_RESPONSES, getSupportMultipleReturns());
+
         additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName);
         additionalProperties.put(CodegenConstants.PACKAGE_VERSION, packageVersion);
 
@@ -291,8 +300,6 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile(getLibrary() + "/configuration.mustache", apiFolder, "configuration.rs"));
         if (HYPER_LIBRARY.equals(getLibrary())) {
             supportingFiles.add(new SupportingFile("request.rs", apiFolder, "request.rs"));
-        }
-        if (!getSupportAsync()) { // for sync only
             supportingFiles.add(new SupportingFile(getLibrary() + "/client.mustache", apiFolder, "client.rs"));
         }
     }
@@ -305,6 +312,14 @@ private void setSupportAsync(boolean supportAsync) {
         this.supportAsync = supportAsync;
     }
 
+    public boolean getSupportMultipleReturns() {
+        return supportMultipleResponses;
+    }
+
+    public void setSupportMultipleReturns(boolean supportMultipleResponses) {
+        this.supportMultipleResponses = supportMultipleResponses;
+    }
+
     private boolean getUseSingleRequestParameter() {
         return useSingleRequestParameter;
     }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
index e7de4e326498..fabaad68a99a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
@@ -188,7 +188,7 @@ public RustServerCodegen() {
 
         instantiationTypes.clear();
         instantiationTypes.put("array", "Vec");
-        instantiationTypes.put("map", "Map");
+        instantiationTypes.put("map", "std::collections::HashMap");
 
         typeMapping.clear();
         typeMapping.put("number", "f64");
@@ -1027,6 +1027,13 @@ private void postProcessOperationWithModels(CodegenOperation op, List<Object> al
             }
         }
 
+        for (CodegenParameter param : op.queryParams) {
+            // If the MIME type is JSON, mark it.  We don't currently support any other MIME types.
+            if (param.contentType != null && isMimetypeJson(param.contentType)) {
+                param.vendorExtensions.put("x-consumes-json", true);
+            }
+        }
+
         for (CodegenParameter param : op.formParams) {
             processParam(param, op);
         }
@@ -1235,7 +1242,7 @@ public CodegenModel fromModel(String name, Schema model) {
         Schema additionalProperties = getAdditionalProperties(model);
 
         if (additionalProperties != null) {
-            mdl.additionalPropertiesType = getSchemaType(additionalProperties);
+            mdl.additionalPropertiesType = getTypeDeclaration(additionalProperties);
         }
 
         return mdl;
@@ -1537,16 +1544,10 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
                     // the user than the alternative.
                     LOGGER.warn("Ignoring additionalProperties (see https://github.com/OpenAPITools/openapi-generator/issues/318) alongside defined properties");
                     cm.dataType = null;
-                } else {
-                    String type;
-
-                    if (typeMapping.containsKey(cm.additionalPropertiesType)) {
-                        type = typeMapping.get(cm.additionalPropertiesType);
-                    } else {
-                        type = toModelName(cm.additionalPropertiesType);
-                    }
-
-                    cm.dataType = "std::collections::HashMap<String, " + type + ">";
+                }
+                else
+                {
+                    cm.dataType = "std::collections::HashMap<String, " + cm.additionalPropertiesType + ">";
                 }
             } else if (cm.dataType != null) {
                 // We need to hack about with single-parameter models to
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java
index 43b48cb3114b..4fc1efdd5078 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java
@@ -16,50 +16,154 @@
 
 package org.openapitools.codegen.languages;
 
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
 import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.servers.Server;
-import org.openapitools.codegen.CodegenConfig;
-import org.openapitools.codegen.CodegenOperation;
-import org.openapitools.codegen.SupportingFile;
+import org.apache.commons.lang3.StringUtils;
+import org.openapitools.codegen.*;
 import org.openapitools.codegen.meta.GeneratorMetadata;
 import org.openapitools.codegen.meta.Stability;
+import org.openapitools.codegen.meta.features.*;
+import org.openapitools.codegen.utils.ModelUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.util.List;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.*;
+
+import static org.openapitools.codegen.utils.StringUtils.camelize;
+
+public class ScalaSttpClientCodegen extends AbstractScalaCodegen implements CodegenConfig {
+    private static final StringProperty STTP_CLIENT_VERSION = new StringProperty("sttpClientVersion", "The version of " +
+            "sttp client", "2.2.0");
+    private static final BooleanProperty USE_SEPARATE_ERROR_CHANNEL = new BooleanProperty("separateErrorChannel",
+            "Whether to return response as " +
+                    "F[Either[ResponseError[ErrorType], ReturnType]]] or to flatten " +
+                    "response's error raising them through enclosing monad (F[ReturnType]).", true);
+    private static final StringProperty JODA_TIME_VERSION = new StringProperty("jodaTimeVersion", "The version of " +
+            "joda-time library", "2.10.6");
+    private static final StringProperty JSON4S_VERSION = new StringProperty("json4sVersion", "The version of json4s " +
+            "library", "3.6.8");
+    private static final StringProperty CIRCE_VERSION = new StringProperty("circeVersion", "The version of circe " +
+            "library", "0.13.0");
+    private static final JsonLibraryProperty JSON_LIBRARY_PROPERTY = new JsonLibraryProperty();
+
+    public static final String DEFAULT_PACKAGE_NAME = "org.openapitools.client";
+    private static final PackageProperty PACKAGE_PROPERTY = new PackageProperty();
+
+    private static final List<Property<?>> properties = Arrays.asList(
+            STTP_CLIENT_VERSION, USE_SEPARATE_ERROR_CHANNEL, JODA_TIME_VERSION,
+            JSON4S_VERSION, CIRCE_VERSION, JSON_LIBRARY_PROPERTY, PACKAGE_PROPERTY);
+
+    private final Logger LOGGER = LoggerFactory.getLogger(ScalaSttpClientCodegen.class);
+
+    protected String groupId = "org.openapitools";
+    protected String artifactId = "openapi-client";
+    protected String artifactVersion = "1.0.0";
+    protected boolean registerNonStandardStatusCodes = true;
+    protected boolean renderJavadoc = true;
+    protected boolean removeOAuthSecurities = true;
 
-public class ScalaSttpClientCodegen extends ScalaAkkaClientCodegen implements CodegenConfig {
     public ScalaSttpClientCodegen() {
         super();
         generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata)
                 .stability(Stability.BETA)
                 .build();
 
-        embeddedTemplateDir = templateDir = "scala-sttp";
+        modifyFeatureSet(features -> features
+                .includeDocumentationFeatures(DocumentationFeature.Readme)
+                .wireFormatFeatures(EnumSet.of(WireFormatFeature.JSON, WireFormatFeature.XML, WireFormatFeature.Custom))
+                .securityFeatures(EnumSet.of(
+                        SecurityFeature.BasicAuth,
+                        SecurityFeature.ApiKey,
+                        SecurityFeature.BearerToken
+                ))
+                .excludeGlobalFeatures(
+                        GlobalFeature.XMLStructureDefinitions,
+                        GlobalFeature.Callbacks,
+                        GlobalFeature.LinkObjects,
+                        GlobalFeature.ParameterStyling
+                )
+                .excludeSchemaSupportFeatures(
+                        SchemaSupportFeature.Polymorphism
+                )
+                .excludeParameterFeatures(
+                        ParameterFeature.Cookie
+                )
+                .includeClientModificationFeatures(
+                        ClientModificationFeature.BasePath,
+                        ClientModificationFeature.UserAgent
+                )
+        );
+
         outputFolder = "generated-code/scala-sttp";
+        modelTemplateFiles.put("model.mustache", ".scala");
+        apiTemplateFiles.put("api.mustache", ".scala");
+        embeddedTemplateDir = templateDir = "scala-sttp";
+
+        additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
+        if (renderJavadoc) {
+            additionalProperties.put("javadocRenderer", new JavadocLambda());
+        }
+        additionalProperties.put("fnCapitalize", new CapitalizeLambda());
+        additionalProperties.put("fnCamelize", new CamelizeLambda(false));
+        additionalProperties.put("fnEnumEntry", new EnumEntryLambda());
+
+        importMapping.remove("Seq");
+        importMapping.remove("List");
+        importMapping.remove("Set");
+        importMapping.remove("Map");
+
+        typeMapping = new HashMap<>();
+        typeMapping.put("array", "Seq");
+        typeMapping.put("set", "Set");
+        typeMapping.put("boolean", "Boolean");
+        typeMapping.put("string", "String");
+        typeMapping.put("int", "Int");
+        typeMapping.put("integer", "Int");
+        typeMapping.put("long", "Long");
+        typeMapping.put("float", "Float");
+        typeMapping.put("byte", "Byte");
+        typeMapping.put("short", "Short");
+        typeMapping.put("char", "Char");
+        typeMapping.put("double", "Double");
+        typeMapping.put("object", "Any");
+        typeMapping.put("file", "File");
+        typeMapping.put("binary", "File");
+        typeMapping.put("number", "Double");
+
+        instantiationTypes.put("array", "ListBuffer");
+        instantiationTypes.put("map", "Map");
+
+        properties.stream()
+                .map(Property::toCliOptions)
+                .flatMap(Collection::stream)
+                .forEach(option -> cliOptions.add(option));
     }
 
     @Override
     public void processOpts() {
         super.processOpts();
-        if (additionalProperties.containsKey("mainPackage")) {
-            setMainPackage((String) additionalProperties.get("mainPackage"));
-            additionalProperties.replace("configKeyPath", this.configKeyPath);
-            apiPackage = mainPackage + ".api";
-            modelPackage = mainPackage + ".model";
-            invokerPackage = mainPackage + ".core";
-            additionalProperties.put("apiPackage", apiPackage);
-            additionalProperties.put("modelPackage", modelPackage);
-        }
+        properties.forEach(p -> p.updateAdditionalProperties(additionalProperties));
+        invokerPackage = PACKAGE_PROPERTY.getInvokerPackage(additionalProperties);
+        apiPackage = PACKAGE_PROPERTY.getApiPackage(additionalProperties);
+        modelPackage = PACKAGE_PROPERTY.getModelPackage(additionalProperties);
 
-        supportingFiles.clear();
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
         final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator);
-        supportingFiles.add(new SupportingFile("requests.mustache", invokerFolder, "requests.scala"));
-        supportingFiles.add(new SupportingFile("apiInvoker.mustache", invokerFolder, "ApiInvoker.scala"));
-        final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);
-        supportingFiles.add(new SupportingFile("enumsSerializers.mustache", apiFolder, "EnumsSerializers.scala"));
-        supportingFiles.add(new SupportingFile("serializers.mustache", invokerFolder, "Serializers.scala"));
+        supportingFiles.add(new SupportingFile("jsonSupport.mustache", invokerFolder, "JsonSupport.scala"));
+        supportingFiles.add(new SupportingFile("project/build.properties.mustache", "project", "build.properties"));
+        supportingFiles.add(new SupportingFile("dateSerializers.mustache", invokerFolder, "DateSerializers.scala"));
     }
 
     @Override
@@ -87,4 +191,300 @@ public CodegenOperation fromOperation(String path,
         op.path = encodePath(path);
         return op;
     }
+
+    @Override
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        if (this.reservedWordsMappings().containsKey(name)) {
+            return this.reservedWordsMappings().get(name);
+        }
+        return "`" + name + "`";
+    }
+
+    @Override
+    public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<Object> allModels) {
+        if (registerNonStandardStatusCodes) {
+            try {
+                @SuppressWarnings("unchecked")
+                Map<String, ArrayList<CodegenOperation>> opsMap = (Map<String, ArrayList<CodegenOperation>>) objs.get("operations");
+                HashSet<Integer> unknownCodes = new HashSet<Integer>();
+                for (CodegenOperation operation : opsMap.get("operation")) {
+                    for (CodegenResponse response : operation.responses) {
+                        if ("default".equals(response.code)) {
+                            continue;
+                        }
+                        try {
+                            int code = Integer.parseInt(response.code);
+                            if (code >= 600) {
+                                unknownCodes.add(code);
+                            }
+                        } catch (NumberFormatException e) {
+                            LOGGER.error("Status code is not an integer : response.code", e);
+                        }
+                    }
+                }
+                if (!unknownCodes.isEmpty()) {
+                    additionalProperties.put("unknownStatusCodes", unknownCodes);
+                }
+            } catch (Exception e) {
+                LOGGER.error("Unable to find operations List", e);
+            }
+        }
+        return super.postProcessOperationsWithModels(objs, allModels);
+    }
+
+    @Override
+    public List<CodegenSecurity> fromSecurity(Map<String, SecurityScheme> schemes) {
+        final List<CodegenSecurity> codegenSecurities = super.fromSecurity(schemes);
+        if (!removeOAuthSecurities) {
+            return codegenSecurities;
+        }
+
+        // Remove OAuth securities
+        Iterator<CodegenSecurity> it = codegenSecurities.iterator();
+        while (it.hasNext()) {
+            final CodegenSecurity security = it.next();
+            if (security.isOAuth) {
+                it.remove();
+            }
+        }
+        // Adapt 'hasMore'
+        it = codegenSecurities.iterator();
+        while (it.hasNext()) {
+            final CodegenSecurity security = it.next();
+            security.hasMore = it.hasNext();
+        }
+
+        if (codegenSecurities.isEmpty()) {
+            return null;
+        }
+        return codegenSecurities;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        return formatIdentifier(name, false);
+    }
+
+    @Override
+    public String toEnumName(CodegenProperty property) {
+        return formatIdentifier(property.baseName, true);
+    }
+
+    @Override
+    public String toDefaultValue(Schema p) {
+        if (p.getRequired() != null && p.getRequired().contains(p.getName())) {
+            return "None";
+        }
+
+        if (ModelUtils.isBooleanSchema(p)) {
+            return null;
+        } else if (ModelUtils.isDateSchema(p)) {
+            return null;
+        } else if (ModelUtils.isDateTimeSchema(p)) {
+            return null;
+        } else if (ModelUtils.isNumberSchema(p)) {
+            return null;
+        } else if (ModelUtils.isIntegerSchema(p)) {
+            return null;
+        } else if (ModelUtils.isMapSchema(p)) {
+            String inner = getSchemaType(getAdditionalProperties(p));
+            return "Map[String, " + inner + "].empty ";
+        } else if (ModelUtils.isArraySchema(p)) {
+            ArraySchema ap = (ArraySchema) p;
+            String inner = getSchemaType(ap.getItems());
+            if (ModelUtils.isSet(ap)) {
+                return "Set[" + inner + "].empty ";
+            }
+            return "Seq[" + inner + "].empty ";
+        } else if (ModelUtils.isStringSchema(p)) {
+            return null;
+        } else {
+            return null;
+        }
+    }
+
+    public static abstract class Property<T> {
+        final String name;
+        final String description;
+        final T defaultValue;
+
+        public Property(String name, String description, T defaultValue) {
+            this.name = name;
+            this.description = description;
+            this.defaultValue = defaultValue;
+        }
+
+        public abstract List<CliOption> toCliOptions();
+
+        public abstract void updateAdditionalProperties(Map<String, Object> additionalProperties);
+
+        public abstract T getValue(Map<String, Object> additionalProperties);
+
+        public void setValue(Map<String, Object> additionalProperties, T value) {
+            additionalProperties.put(name, value);
+        }
+    }
+
+    public static class StringProperty extends Property<String> {
+        public StringProperty(String name, String description, String defaultValue) {
+            super(name, description, defaultValue);
+        }
+
+        @Override
+        public List<CliOption> toCliOptions() {
+            return Collections.singletonList(CliOption.newString(name, description).defaultValue(defaultValue));
+        }
+
+        @Override
+        public void updateAdditionalProperties(Map<String, Object> additionalProperties) {
+            if (!additionalProperties.containsKey(name)) {
+                additionalProperties.put(name, defaultValue);
+            }
+        }
+
+        @Override
+        public String getValue(Map<String, Object> additionalProperties) {
+            return additionalProperties.getOrDefault(name, defaultValue).toString();
+        }
+    }
+
+    public static class BooleanProperty extends Property<Boolean> {
+        public BooleanProperty(String name, String description, Boolean defaultValue) {
+            super(name, description, defaultValue);
+        }
+
+        @Override
+        public List<CliOption> toCliOptions() {
+            return Collections.singletonList(CliOption.newBoolean(name, description, defaultValue));
+        }
+
+        @Override
+        public void updateAdditionalProperties(Map<String, Object> additionalProperties) {
+            Boolean value = getValue(additionalProperties);
+            additionalProperties.put(name, value);
+        }
+
+        @Override
+        public Boolean getValue(Map<String, Object> additionalProperties) {
+            return Boolean.valueOf(additionalProperties.getOrDefault(name, defaultValue.toString()).toString());
+        }
+    }
+
+    public static class JsonLibraryProperty extends StringProperty {
+        private static final String JSON4S = "json4s";
+        private static final String CIRCE = "circe";
+
+        public JsonLibraryProperty() {
+            super("jsonLibrary", "Json library to use. Possible values are: json4s and circe.", JSON4S);
+        }
+
+        @Override
+        public void updateAdditionalProperties(Map<String, Object> additionalProperties) {
+            String value = getValue(additionalProperties);
+            if (value.equals(CIRCE) || value.equals(JSON4S)) {
+                additionalProperties.put(CIRCE, value.equals(CIRCE));
+                additionalProperties.put(JSON4S, value.equals(JSON4S));
+            } else {
+                IllegalArgumentException exception =
+                        new IllegalArgumentException("Invalid json library: " + value + ". Must be " + CIRCE + " " +
+                                "or " + JSON4S);
+                throw exception;
+            }
+        }
+    }
+
+    public static class PackageProperty extends StringProperty {
+
+        public PackageProperty() {
+            super("mainPackage", "Top-level package name, which defines 'apiPackage', 'modelPackage', " +
+                    "'invokerPackage'", DEFAULT_PACKAGE_NAME);
+        }
+
+        @Override
+        public void updateAdditionalProperties(Map<String, Object> additionalProperties) {
+            String mainPackage = getValue(additionalProperties);
+            if (!additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
+                String apiPackage = mainPackage + ".api";
+                additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage);
+            }
+            if (!additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) {
+                String modelPackage = mainPackage + ".model";
+                additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage);
+            }
+            if (!additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
+                String invokerPackage = mainPackage + ".core";
+                additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+            }
+        }
+
+        public String getApiPackage(Map<String, Object> additionalProperties) {
+            return additionalProperties.getOrDefault(CodegenConstants.API_PACKAGE, DEFAULT_PACKAGE_NAME + ".api").toString();
+        }
+
+        public String getModelPackage(Map<String, Object> additionalProperties) {
+            return additionalProperties.getOrDefault(CodegenConstants.MODEL_PACKAGE, DEFAULT_PACKAGE_NAME + ".model").toString();
+        }
+
+        public String getInvokerPackage(Map<String, Object> additionalProperties) {
+            return additionalProperties.getOrDefault(CodegenConstants.INVOKER_PACKAGE, DEFAULT_PACKAGE_NAME + ".core").toString();
+        }
+    }
+
+    private static abstract class CustomLambda implements Mustache.Lambda {
+        @Override
+        public void execute(Template.Fragment frag, Writer out) throws IOException {
+            final StringWriter tempWriter = new StringWriter();
+            frag.execute(tempWriter);
+            out.write(formatFragment(tempWriter.toString()));
+        }
+
+        public abstract String formatFragment(String fragment);
+    }
+
+    private static class JavadocLambda extends CustomLambda {
+        @Override
+        public String formatFragment(String fragment) {
+            final String[] lines = fragment.split("\\r?\\n");
+            final StringBuilder sb = new StringBuilder();
+            sb.append("  /**\n");
+            for (String line : lines) {
+                sb.append("   * ").append(line).append("\n");
+            }
+            sb.append("   */\n");
+            return sb.toString();
+        }
+    }
+
+    private static class CapitalizeLambda extends CustomLambda {
+        @Override
+        public String formatFragment(String fragment) {
+            return StringUtils.capitalize(fragment);
+        }
+    }
+
+    private static class CamelizeLambda extends CustomLambda {
+        private final boolean capitalizeFirst;
+
+        public CamelizeLambda(boolean capitalizeFirst) {
+            this.capitalizeFirst = capitalizeFirst;
+        }
+
+        @Override
+        public String formatFragment(String fragment) {
+            return camelize(fragment, !capitalizeFirst);
+        }
+    }
+
+    private class EnumEntryLambda extends CustomLambda {
+        @Override
+        public String formatFragment(String fragment) {
+            return formatIdentifier(fragment, true);
+        }
+    }
+
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
index ccd1b7ad3d0e..57325357218b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
@@ -520,7 +520,7 @@ public String getTypeDeclaration(Schema p) {
         if (ModelUtils.isArraySchema(p)) {
             ArraySchema ap = (ArraySchema) p;
             Schema inner = ap.getItems();
-            return "[" + getTypeDeclaration(inner) + "]";
+            return ModelUtils.isSet(p) ? "Set<" + getTypeDeclaration(inner) + ">" : "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
             Schema inner = getAdditionalProperties(p);
             return "[String:" + getTypeDeclaration(inner) + "]";
@@ -639,7 +639,7 @@ public String toInstantiationType(Schema p) {
         } else if (ModelUtils.isArraySchema(p)) {
             ArraySchema ap = (ArraySchema) p;
             String inner = getSchemaType(ap.getItems());
-            return "[" + inner + "]";
+            return ModelUtils.isSet(p) ? "Set<" + inner + ">" : "[" + inner + "]";
         }
         return null;
     }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
index 9c87bc94f3f2..b9632aee1947 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
@@ -27,6 +27,8 @@
 
 import java.io.File;
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.apache.commons.lang3.StringUtils.capitalize;
 import static org.openapitools.codegen.utils.StringUtils.*;
@@ -38,6 +40,8 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
     private static String CLASS_NAME_SUFFIX_PATTERN = "^[a-zA-Z0-9]*$";
     private static String FILE_NAME_SUFFIX_PATTERN = "^[a-zA-Z0-9.-]*$";
 
+    public static enum QUERY_PARAM_OBJECT_FORMAT_TYPE {dot, json, key};
+
     private static final String DEFAULT_IMPORT_PREFIX = "./";
 
     public static final String NPM_REPOSITORY = "npmRepository";
@@ -55,6 +59,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
     public static final String FILE_NAMING = "fileNaming";
     public static final String STRING_ENUMS = "stringEnums";
     public static final String STRING_ENUMS_DESC = "Generate string enums instead of objects for enum values.";
+    public static final String QUERY_PARAM_OBJECT_FORMAT = "queryParamObjectFormat";
 
     protected String ngVersion = "9.0.0";
     protected String npmRepository = null;
@@ -65,6 +70,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
     protected String modelFileSuffix = "";
     protected String fileNaming = "camelCase";
     protected Boolean stringEnums = false;
+    protected QUERY_PARAM_OBJECT_FORMAT_TYPE queryParamObjectFormat = QUERY_PARAM_OBJECT_FORMAT_TYPE.dot;
 
     private boolean taggedUnions = false;
 
@@ -107,6 +113,7 @@ public TypeScriptAngularClientCodegen() {
         this.cliOptions.add(new CliOption(MODEL_FILE_SUFFIX, "The suffix of the file of the generated model (model<suffix>.ts)."));
         this.cliOptions.add(new CliOption(FILE_NAMING, "Naming convention for the output files: 'camelCase', 'kebab-case'.").defaultValue(this.fileNaming));
         this.cliOptions.add(new CliOption(STRING_ENUMS, STRING_ENUMS_DESC).defaultValue(String.valueOf(this.stringEnums)));
+        this.cliOptions.add(new CliOption(QUERY_PARAM_OBJECT_FORMAT, "The format for query param objects: 'dot', 'json', 'key'.").defaultValue(this.queryParamObjectFormat.name()));
     }
 
     @Override
@@ -223,6 +230,13 @@ public void processOpts() {
             this.setFileNaming(additionalProperties.get(FILE_NAMING).toString());
         }
 
+        if (additionalProperties.containsKey(QUERY_PARAM_OBJECT_FORMAT)) {
+            setQueryParamObjectFormat((String) additionalProperties.get(QUERY_PARAM_OBJECT_FORMAT));
+        }
+        additionalProperties.put("isQueryParamObjectFormatDot", getQueryParamObjectFormatDot());
+        additionalProperties.put("isQueryParamObjectFormatJson", getQueryParamObjectFormatJson());
+        additionalProperties.put("isQueryParamObjectFormatKey", getQueryParamObjectFormatKey());
+
     }
 
     private void addNpmPackageGeneration(SemVer ngVersion) {
@@ -303,11 +317,23 @@ public Boolean getStringEnums() {
         return stringEnums;
     }
 
+    public boolean getQueryParamObjectFormatDot() {
+        return QUERY_PARAM_OBJECT_FORMAT_TYPE.dot.equals(queryParamObjectFormat);
+    }
+
+    public boolean getQueryParamObjectFormatJson() {
+        return QUERY_PARAM_OBJECT_FORMAT_TYPE.json.equals(queryParamObjectFormat);
+    }
+
+    public boolean getQueryParamObjectFormatKey() {
+        return QUERY_PARAM_OBJECT_FORMAT_TYPE.key.equals(queryParamObjectFormat);
+    }
+
     @Override
     public boolean isDataTypeFile(final String dataType) {
         return dataType != null && dataType.equals("Blob");
     }
-
+ 
     @Override
     public String getTypeDeclaration(Schema p) {
         if (ModelUtils.isFileSchema(p)) {
@@ -615,6 +641,24 @@ private void validateClassSuffixArgument(String argument, String value) {
         }
     }
 
+    /**
+     * Set the query param object format.
+     *
+     * @param format the query param object format to use
+     */
+    public void setQueryParamObjectFormat(String format) {
+        try {
+            queryParamObjectFormat = QUERY_PARAM_OBJECT_FORMAT_TYPE.valueOf(format);
+        } catch (IllegalArgumentException e) {
+            String values = Stream.of(QUERY_PARAM_OBJECT_FORMAT_TYPE.values())
+                    .map(value -> "'" + value.name() + "'")
+                    .collect(Collectors.joining(", "));
+
+            String msg = String.format(Locale.ROOT, "Invalid query param object format '%s'. Must be one of %s.", format, values);
+            throw new IllegalArgumentException(msg);
+        }
+    }
+
     /**
      * Set the file naming type.
      *
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularJsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularJsClientCodegen.java
index 3b514117189d..e342d985e427 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularJsClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularJsClientCodegen.java
@@ -20,6 +20,8 @@
 import io.swagger.v3.oas.models.media.Schema;
 import org.openapitools.codegen.CodegenParameter;
 import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.meta.GeneratorMetadata;
+import org.openapitools.codegen.meta.Stability;
 
 import java.io.File;
 
@@ -38,16 +40,19 @@ public TypeScriptAngularJsClientCodegen() {
         removeOption(NPM_VERSION);
         removeOption(SNAPSHOT);
 
+        generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata)
+                .stability(Stability.DEPRECATED)
+                .build();
     }
 
     @Override
     public String getName() {
-        return "typescript-angularjs";
+        return "typescript-angularjs-deprecated";
     }
 
     @Override
     public String getHelp() {
-        return "Generates a TypeScript AngularJS client library.";
+        return "Generates a TypeScript AngularJS client library. This generator has been deprecated and will be removed in the future release.";
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
new file mode 100644
index 000000000000..512ddce35cbc
--- /dev/null
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
@@ -0,0 +1,860 @@
+/*
+ * Copyright 2020 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ * Copyright 2018 SmartBear Software
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openapitools.codegen.languages;
+
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.NumberSchema;
+import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+
+import org.apache.commons.lang3.StringUtils;
+import org.openapitools.codegen.*;
+import org.openapitools.codegen.meta.GeneratorMetadata;
+import org.openapitools.codegen.meta.Stability;
+import org.openapitools.codegen.utils.ModelUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.Map.Entry;
+import static org.openapitools.codegen.utils.StringUtils.camelize;
+import static org.openapitools.codegen.utils.StringUtils.underscore;
+
+
+public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenConfig {
+    private static final Logger LOGGER = LoggerFactory.getLogger(TypeScriptClientCodegen.class);
+
+    private static final String X_DISCRIMINATOR_TYPE = "x-discriminator-value";
+    private static final String UNDEFINED_VALUE = "undefined";
+
+    private static final String FRAMEWORK_SWITCH = "framework";
+    private static final String FRAMEWORK_SWITCH_DESC = "Specify the framework which should be used in the client code.";
+    private static final String[] FRAMEWORKS = { "fetch-api", "jquery" };
+    private static final String PLATFORM_SWITCH = "platform";
+    private static final String PLATFORM_SWITCH_DESC = "Specifies the platform the code should run on. The default is 'node' for the 'request' framework and 'browser' otherwise.";
+    private static final String[] PLATFORMS = { "browser", "node", "deno" };
+    private static final String FILE_CONTENT_DATA_TYPE= "fileContentDataType";
+    private static final String FILE_CONTENT_DATA_TYPE_DESC = "Specifies the type to use for the content of a file - i.e. Blob (Browser, Deno) / Buffer (node)";
+    private static final String USE_RXJS_SWITCH = "useRxJS";
+    private static final String USE_RXJS_SWITCH_DESC = "Enable this to internally use rxjs observables. If disabled, a stub is used instead. This is required for the 'angular' framework.";
+    private static final String USE_INVERSIFY_SWITCH = "useInversify";
+    private static final String USE_INVERSIFY_SWITCH_DESC = "Enable this to generate decorators and service identifiers for the InversifyJS inversion of control container. If you set 'deno' as 'platform', the generator will process this value as 'disable'.";
+
+    private static final String USE_OBJECT_PARAMS_SWITCH = "useObjectParameters";
+    private static final String USE_OBJECT_PARAMS_DESC = "Use aggregate parameter objects as function arguments for api operations instead of passing each parameter as a separate function argument.";
+
+    
+    private final Map<String, String> frameworkToHttpLibMap;
+    
+    // NPM Options
+    private static final String SNAPSHOT = "snapshot";
+    @SuppressWarnings("squid:S5164")
+    protected static final ThreadLocal<SimpleDateFormat> SNAPSHOT_SUFFIX_FORMAT = ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyyMMddHHmm", Locale.ROOT));
+    private static final String NPM_REPOSITORY = "npmRepository";
+    private static final String NPM_NAME = "npmName";
+    private static final String NPM_VERSION = "npmVersion";
+
+    // NPM Option Values
+    protected String npmRepository = null;
+    protected String snapshot = null;
+    protected String npmName = null;
+    protected String npmVersion = "1.0.0";
+    protected String modelPropertyNaming = "camelCase";
+    protected HashSet<String> languageGenericTypes;
+
+    public TypeScriptClientCodegen() {
+        super();
+            
+        this.frameworkToHttpLibMap = new HashMap<>();
+        this.frameworkToHttpLibMap.put("fetch-api", "isomorphic-fetch");
+        this.frameworkToHttpLibMap.put("jquery", "jquery");
+        
+        
+        this.generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata).stability(Stability.EXPERIMENTAL).build();
+        
+        // clear import mapping (from default generator) as TS does not use it
+        // at the moment
+        importMapping.clear();
+        outputFolder = "generated-code" + File.separator + "typescript";
+        embeddedTemplateDir = templateDir = "typescript";
+
+        supportsInheritance = true;
+        
+        // NOTE: TypeScript uses camel cased reserved words, while models are title cased. We don't want lowercase comparisons.
+        reservedWords.addAll(Arrays.asList(
+                // local variable names used in API methods (endpoints)
+                "varLocalPath", "queryParameters", "headerParams", "formParams", "useFormData", "varLocalDeferred",
+                "requestOptions",
+                // Typescript reserved words
+                "abstract", "await", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new", "null", "package", "private", "protected", "public", "return", "short", "static", "super", "switch", "synchronized", "this", "throw", "transient", "true", "try", "typeof", "var", "void", "volatile", "while", "with", "yield"));
+
+        languageSpecificPrimitives = new HashSet<>(Arrays.asList(
+                "string",
+                "String",
+                "boolean",
+                "Boolean",
+                "Double",
+                "Integer",
+                "Long",
+                "Float",
+                "Object",
+                "Array",
+                "Date",
+                "number",
+                "any",
+                "File",
+                "Error",
+                "Map"
+        ));
+
+        languageGenericTypes = new HashSet<String>(Arrays.asList(
+                "Array"
+        ));
+
+        instantiationTypes.put("array", "Array");
+
+        typeMapping = new HashMap<String, String>();
+        typeMapping.put("Array", "Array");
+        typeMapping.put("array", "Array");
+        typeMapping.put("List", "Array");
+        typeMapping.put("boolean", "boolean");
+        typeMapping.put("string", "string");
+        typeMapping.put("int", "number");
+        typeMapping.put("float", "number");
+        typeMapping.put("number", "number");
+        typeMapping.put("long", "number");
+        typeMapping.put("short", "number");
+        typeMapping.put("char", "string");
+        typeMapping.put("double", "number");
+        typeMapping.put("object", "any");
+        typeMapping.put("integer", "number");
+        typeMapping.put("Map", "any");
+        typeMapping.put("date", "string");
+        typeMapping.put("DateTime", "Date");
+        typeMapping.put("binary", "any");
+        typeMapping.put("File", "any");
+        typeMapping.put("ByteArray", "string");
+        typeMapping.put("UUID", "string");
+        typeMapping.put("Error", "Error");
+                
+
+        cliOptions.add(new CliOption(NPM_NAME, "The name under which you want to publish generated npm package." +
+                " Required to generate a full package"));
+        cliOptions.add(new CliOption(NPM_VERSION, "The version of your npm package. If not provided, using the version from the OpenAPI specification file.").defaultValue(this.getNpmVersion()));
+        cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json"));
+        cliOptions.add(CliOption.newBoolean(SNAPSHOT,
+                "When setting this property to true, the version will be suffixed with -SNAPSHOT." + this.SNAPSHOT_SUFFIX_FORMAT.get().toPattern(),
+                false));
+
+        cliOptions.add(new CliOption(CodegenConstants.MODEL_PROPERTY_NAMING, CodegenConstants.MODEL_PROPERTY_NAMING_DESC).defaultValue("camelCase"));
+        cliOptions.add(new CliOption(CodegenConstants.SUPPORTS_ES6, CodegenConstants.SUPPORTS_ES6_DESC).defaultValue("false"));
+        cliOptions.add(new CliOption(TypeScriptClientCodegen.FILE_CONTENT_DATA_TYPE, TypeScriptClientCodegen.FILE_CONTENT_DATA_TYPE_DESC).defaultValue("Buffer"));
+        cliOptions.add(new CliOption(TypeScriptClientCodegen.USE_RXJS_SWITCH, TypeScriptClientCodegen.USE_RXJS_SWITCH_DESC).defaultValue("false"));
+        cliOptions.add(new CliOption(TypeScriptClientCodegen.USE_OBJECT_PARAMS_SWITCH, TypeScriptClientCodegen.USE_OBJECT_PARAMS_DESC).defaultValue("false"));
+        cliOptions.add(new CliOption(TypeScriptClientCodegen.USE_INVERSIFY_SWITCH, TypeScriptClientCodegen.USE_INVERSIFY_SWITCH_DESC).defaultValue("false"));
+
+        CliOption frameworkOption = new CliOption(TypeScriptClientCodegen.FRAMEWORK_SWITCH, TypeScriptClientCodegen.FRAMEWORK_SWITCH_DESC);
+        for (String option: TypeScriptClientCodegen.FRAMEWORKS) {
+            frameworkOption.addEnum(option, option);
+        }
+        frameworkOption.defaultValue(FRAMEWORKS[0]);
+        cliOptions.add(frameworkOption);
+
+        CliOption platformOption = new CliOption(TypeScriptClientCodegen.PLATFORM_SWITCH, TypeScriptClientCodegen.PLATFORM_SWITCH_DESC);
+        for (String option: TypeScriptClientCodegen.PLATFORMS) {
+            platformOption.addEnum(option, option);
+        }
+        platformOption.defaultValue(PLATFORMS[0]);
+
+        cliOptions.add(platformOption);
+        
+        // Git
+        supportingFiles.add(new SupportingFile(".gitignore.mustache", "", ".gitignore"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        
+        // Util
+        supportingFiles.add(new SupportingFile("util.mustache", "", "util.ts"));
+        supportingFiles.add(new SupportingFile("api" + File.separator + "exception.mustache", "apis", "exception.ts"));
+        // http
+        supportingFiles.add(new SupportingFile("http" + File.separator + "http.mustache", "http", "http.ts"));
+        supportingFiles.add(new SupportingFile("http" + File.separator + "servers.mustache", "servers.ts"));
+
+        supportingFiles.add(new SupportingFile("configuration.mustache", "", "configuration.ts"));
+        supportingFiles.add(new SupportingFile("auth" + File.separator + "auth.mustache", "auth", "auth.ts"));
+        
+        supportingFiles.add(new SupportingFile("model" + File.separator + "models_all.mustache", "models", "all.ts"));
+
+        supportingFiles.add(new SupportingFile("types" + File.separator + "PromiseAPI.mustache", "types", "PromiseAPI.ts"));
+        supportingFiles.add(new SupportingFile("types" + File.separator + "ObservableAPI.mustache", "types", "ObservableAPI.ts"));
+        supportingFiles.add(new SupportingFile("types" + File.separator + "ObjectParamAPI.mustache", "types", "ObjectParamAPI.ts"));
+
+        // models
+        setModelPackage("");
+        supportingFiles.add(new SupportingFile("model" + File.separator + "ObjectSerializer.mustache", "models", "ObjectSerializer.ts"));
+        modelTemplateFiles.put("model" + File.separator + "model.mustache", ".ts");
+
+        // api
+        setApiPackage("");
+        supportingFiles.add(new SupportingFile("api" + File.separator + "middleware.mustache", "", "middleware.ts"));
+        supportingFiles.add(new SupportingFile("api" + File.separator + "baseapi.mustache", "apis", "baseapi.ts"));
+        apiTemplateFiles.put("api" + File.separator + "api.mustache", ".ts");
+    }
+
+    public String getNpmName() {
+        return npmName;
+    }
+
+    public void setNpmName(String npmName) {
+        this.npmName = npmName;
+    }
+
+    public String getNpmRepository() {
+        return npmRepository;
+    }
+
+    public void setNpmRepository(String npmRepository) {
+        this.npmRepository = npmRepository;
+    }
+
+    public String getNpmVersion() {
+        return npmVersion;
+    }
+
+    public void setNpmVersion(String npmVersion) {
+        this.npmVersion = npmVersion;
+    }
+    
+    @Override
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+    
+    @Override
+    public void preprocessOpenAPI(OpenAPI openAPI) {
+
+        if (additionalProperties.containsKey(NPM_NAME)) {
+
+            // If no npmVersion is provided in additional properties, version from API specification is used.
+            // If none of them is provided then fallbacks to default version
+            if (additionalProperties.containsKey(NPM_VERSION)) {
+                this.setNpmVersion(additionalProperties.get(NPM_VERSION).toString());
+            } else if (openAPI.getInfo() != null && openAPI.getInfo().getVersion() != null) {
+                this.setNpmVersion(openAPI.getInfo().getVersion());
+            }
+
+            if (additionalProperties.containsKey(SNAPSHOT) && Boolean.parseBoolean(additionalProperties.get(SNAPSHOT).toString())) {
+                if (npmVersion.toUpperCase(Locale.ROOT).matches("^.*-SNAPSHOT$")) {
+                    this.setNpmVersion(npmVersion + "." + SNAPSHOT_SUFFIX_FORMAT.get().format(new Date()));
+                } else {
+                    this.setNpmVersion(npmVersion + "-SNAPSHOT." + SNAPSHOT_SUFFIX_FORMAT.get().format(new Date()));
+                }
+            }
+            additionalProperties.put(NPM_VERSION, npmVersion);
+
+        }
+    }
+    
+    @Override
+    public Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs) {      
+        final Object propFramework = additionalProperties.get(FRAMEWORK_SWITCH);
+
+        Map<String, Boolean> frameworks = new HashMap<>();
+        for (String framework: FRAMEWORKS) {
+            frameworks.put(framework, framework.equals(propFramework));
+        }
+        objs.put("framework", propFramework);
+        objs.put("frameworks", frameworks);
+
+        objs.put("fileContentDataType", additionalProperties.get(FILE_CONTENT_DATA_TYPE));
+
+        return objs;
+    }
+    
+    @Override
+    public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> operations, List<Object> models) {     
+        
+        // Add additional filename information for model imports in the apis
+        List<Map<String, Object>> imports = (List<Map<String, Object>>) operations.get("imports");
+        for (Map<String, Object> im : imports) {
+            im.put("filename", ((String) im.get("import")).replace(".", File.separator));
+            im.put("classname", getModelnameFromModelFilename(im.get("import").toString()));
+        }
+        
+        @SuppressWarnings("unchecked")
+        Map<String, Object> operationsMap = (Map<String, Object>) operations.get("operations");
+        List<CodegenOperation> operationList = (List<CodegenOperation>) operationsMap.get("operation");
+        for (CodegenOperation operation: operationList) {
+            List<CodegenResponse> responses = operation.responses;
+            operation.returnType = this.getReturnType(responses);          
+        }
+        return operations;
+    }
+    
+    /**
+     * Returns the correct return type based on all 2xx HTTP responses defined for an operation.
+     * @param responses all CodegenResponses defined for one operation
+     * @return TypeScript return type
+     */
+    private String getReturnType(List<CodegenResponse> responses) {
+        Set<String> returnTypes = new HashSet<String>();
+        for (CodegenResponse response: responses) {
+            if (response.is2xx) {
+                if (response.dataType != null) {
+                    returnTypes.add(response.dataType);
+                } else {
+                    returnTypes.add("void");
+                }
+            }
+        }
+        
+        if (returnTypes.size() == 0) {
+            return null;
+        } 
+
+        return String.join(" | ", returnTypes);
+    }
+    
+    private String getModelnameFromModelFilename(String filename) {
+        String name = filename.substring((modelPackage() + File.separator).length());
+        return camelize(name);
+    }
+    
+    @Override
+    public String escapeReservedWord(String name) {
+        if (this.reservedWordsMappings().containsKey(name)) {
+            return this.reservedWordsMappings().get(name);
+        }
+        return "_" + name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // sanitize name
+        name = sanitizeName(name);
+
+        if ("_".equals(name)) {
+            name = "_u";
+        }
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$")) {
+            return name;
+        }
+
+        name = getNameUsingModelPropertyNaming(name);
+
+        // for reserved word or word starting with number, append _
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toModelName(String name) {
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
+        }
+
+        // model name cannot use reserved keyword, e.g. return
+        if (isReservedWord(name)) {
+            String modelName = camelize("model_" + name);
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            String modelName = camelize("model_" + name); // e.g. 200Response => Model200Response (after camelize)
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        if (languageSpecificPrimitives.contains(name)) {
+            String modelName = camelize("model_" + name);
+            LOGGER.warn(name + " (model name matches existing language type) cannot be used as a model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
+
+    @Override
+    protected String getParameterDataType(Parameter parameter, Schema p) {
+        // handle enums of various data types
+        Schema inner;
+        if (ModelUtils.isArraySchema(p)) {
+            ArraySchema mp1 = (ArraySchema) p;
+            inner = mp1.getItems();
+            return this.getSchemaType(p) + "<" + this.getParameterDataType(parameter, inner) + ">";
+        } else if (ModelUtils.isMapSchema(p)) {
+            inner = (Schema) p.getAdditionalProperties();
+            return "{ [key: string]: " + this.getParameterDataType(parameter, inner) + "; }";
+        } else if (ModelUtils.isStringSchema(p)) {
+            // Handle string enums
+            if (p.getEnum() != null) {
+                return enumValuesToEnumTypeUnion(p.getEnum(), "string");
+            }
+        } else if (ModelUtils.isIntegerSchema(p)) {
+            // Handle integer enums
+            if (p.getEnum() != null) {
+                return numericEnumValuesToEnumTypeUnion(new ArrayList<Number>(p.getEnum()));
+            }
+        } else if (ModelUtils.isNumberSchema(p)) {
+            // Handle double enums
+            if (p.getEnum() != null) {
+                return numericEnumValuesToEnumTypeUnion(new ArrayList<Number>(p.getEnum()));
+            }
+        }
+        return this.getTypeDeclaration(p);
+    }
+
+    /**
+     * Converts a list of strings to a literal union for representing enum values as a type.
+     * Example output: 'available' | 'pending' | 'sold'
+     *
+     * @param values   list of allowed enum values
+     * @param dataType either "string" or "number"
+     * @return a literal union for representing enum values as a type
+     */
+    protected String enumValuesToEnumTypeUnion(List<String> values, String dataType) {
+        StringBuilder b = new StringBuilder();
+        boolean isFirst = true;
+        for (String value : values) {
+            if (!isFirst) {
+                b.append(" | ");
+            }
+            b.append(toEnumValue(value.toString(), dataType));
+            isFirst = false;
+        }
+        return b.toString();
+    }
+
+    /**
+     * Converts a list of numbers to a literal union for representing enum values as a type.
+     * Example output: 3 | 9 | 55
+     *
+     * @param values a list of numbers
+     * @return a literal union for representing enum values as a type
+     */
+    protected String numericEnumValuesToEnumTypeUnion(List<Number> values) {
+        List<String> stringValues = new ArrayList<>();
+        for (Number value : values) {
+            stringValues.add(value.toString());
+        }
+        return enumValuesToEnumTypeUnion(stringValues, "number");
+    }
+
+    @Override
+    public String toDefaultValue(Schema p) {
+        if (ModelUtils.isBooleanSchema(p)) {
+            return UNDEFINED_VALUE;
+        } else if (ModelUtils.isDateSchema(p)) {
+            return UNDEFINED_VALUE;
+        } else if (ModelUtils.isDateTimeSchema(p)) {
+            return UNDEFINED_VALUE;
+        } else if (ModelUtils.isNumberSchema(p)) {
+           if (p.getDefault() != null) {
+             return p.getDefault().toString();
+           }
+           return UNDEFINED_VALUE;
+        } else if (ModelUtils.isIntegerSchema(p)) {
+            if (p.getDefault() != null) {
+                return p.getDefault().toString();
+            }
+            return UNDEFINED_VALUE;
+        } else if (ModelUtils.isStringSchema(p)) {
+            if (p.getDefault() != null) {
+                return "'" + (String) p.getDefault() + "'";
+            }
+            return UNDEFINED_VALUE;
+        } else {
+            return UNDEFINED_VALUE;
+        }
+
+    }
+    
+    @Override
+    protected boolean isReservedWord(String word) {
+        // NOTE: This differs from super's implementation in that TypeScript does _not_ want case insensitive matching.
+        return reservedWords.contains(word);
+    }
+
+    @Override
+    public String getSchemaType(Schema p) {
+        String openAPIType = super.getSchemaType(p);
+        String type = null;
+        if (typeMapping.containsKey(openAPIType)) {
+            type = typeMapping.get(openAPIType);
+            if (languageSpecificPrimitives.contains(type))
+                return type;
+        } else
+            type = openAPIType;
+        return toModelName(type);
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // throw exception if method name is empty
+        if (StringUtils.isEmpty(operationId)) {
+            throw new RuntimeException("Empty method name (operationId) not allowed");
+        }
+
+        // method name cannot use reserved keyword, e.g. return
+        // append _ at the beginning, e.g. _return
+        if (isReservedWord(operationId)) {
+            return escapeReservedWord(camelize(sanitizeName(operationId), true));
+        }
+
+        return camelize(sanitizeName(operationId), true);
+    }
+
+    public void setModelPropertyNaming(String naming) {
+        if ("original".equals(naming) || "camelCase".equals(naming) ||
+                "PascalCase".equals(naming) || "snake_case".equals(naming)) {
+            this.modelPropertyNaming = naming;
+        } else {
+            throw new IllegalArgumentException("Invalid model property naming '" +
+                    naming + "'. Must be 'original', 'camelCase', " +
+                    "'PascalCase' or 'snake_case'");
+        }
+    }
+
+    public String getModelPropertyNaming() {
+        return this.modelPropertyNaming;
+    }
+
+    public String getNameUsingModelPropertyNaming(String name) {
+        switch (CodegenConstants.MODEL_PROPERTY_NAMING_TYPE.valueOf(getModelPropertyNaming())) {
+            case original:
+                return name;
+            case camelCase:
+                return camelize(name, true);
+            case PascalCase:
+                return camelize(name);
+            case snake_case:
+                return underscore(name);
+            default:
+                throw new IllegalArgumentException("Invalid model property naming '" +
+                        name + "'. Must be 'original', 'camelCase', " +
+                        "'PascalCase' or 'snake_case'");
+        }
+
+    }
+
+    @Override
+    public String toEnumValue(String value, String datatype) {
+        if ("number".equals(datatype)) {
+            return value;
+        } else {
+            return "\'" + escapeText(value) + "\'";
+        }
+    }
+
+    @Override
+    public String toEnumDefaultValue(String value, String datatype) {
+        return datatype + "_" + value;
+    }
+
+    @Override
+    public String toEnumVarName(String name, String datatype) {
+        if (name.length() == 0) {
+            return "Empty";
+        }
+
+        // for symbol, e.g. $, #
+        if (getSymbolName(name) != null) {
+            return camelize(getSymbolName(name));
+        }
+
+        // number
+        if ("number".equals(datatype)) {
+            String varName = "NUMBER_" + name;
+
+            varName = varName.replaceAll("-", "MINUS_");
+            varName = varName.replaceAll("\\+", "PLUS_");
+            varName = varName.replaceAll("\\.", "_DOT_");
+            return varName;
+        }
+
+        // string
+        String enumName = sanitizeName(name);
+        enumName = enumName.replaceFirst("^_", "");
+        enumName = enumName.replaceFirst("_$", "");
+
+        // camelize the enum variable name
+        // ref: https://basarat.gitbooks.io/typescript/content/docs/enums.html
+        enumName = camelize(enumName);
+
+        if (enumName.matches("\\d.*")) { // starts with number
+            return "_" + enumName;
+        } else {
+            return enumName;
+        }
+    }
+
+    @Override
+    public String toEnumName(CodegenProperty property) {
+        String enumName = toModelName(property.name) + "Enum";
+
+        if (enumName.matches("\\d.*")) { // starts with number
+            return "_" + enumName;
+        } else {
+            return enumName;
+        }
+    }
+
+    @Override
+    public Map<String, Object> postProcessModels(Map<String, Object> objs) {
+        // process enum in models
+        List<Map<String, Object>> models = (List<Map<String, Object>>) postProcessModelsEnum(objs).get("models");
+        for (Object _mo : models) {
+            Map<String, Object> mo = (Map<String, Object>) _mo;
+            CodegenModel cm = (CodegenModel) mo.get("model");
+            cm.imports = new TreeSet(cm.imports);
+            // name enum with model name, e.g. StatusEnum => Pet.StatusEnum
+            for (CodegenProperty var : cm.vars) {
+                if (Boolean.TRUE.equals(var.isEnum)) {
+                    var.datatypeWithEnum = var.datatypeWithEnum.replace(var.enumName, cm.classname + var.enumName);
+                }
+            }
+            if (cm.parent != null) {
+                for (CodegenProperty var : cm.allVars) {
+                    if (Boolean.TRUE.equals(var.isEnum)) {
+                        var.datatypeWithEnum = var.datatypeWithEnum
+                                .replace(var.enumName, cm.classname + var.enumName);
+                    }
+                }
+            }
+        }
+        for (Map<String, Object> mo : models) {
+            CodegenModel cm = (CodegenModel) mo.get("model");
+            // Add additional filename information for imports
+            mo.put("tsImports", toTsImports(cm, cm.imports));
+        }
+        return objs;
+    }
+
+    private List<Map<String, String>> toTsImports(CodegenModel cm, Set<String> imports) {
+        List<Map<String, String>> tsImports = new ArrayList<>();
+        for (String im : imports) {
+            if (!im.equals(cm.classname)) {
+                HashMap<String, String> tsImport = new HashMap<>();
+                // TVG: This is used as class name in the import statements of the model file
+                tsImport.put("classname", im);
+                tsImport.put("filename", toModelFilename(im));
+                tsImports.add(tsImport);
+            }
+        }
+        return tsImports;
+    }
+
+
+    @Override
+    public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
+        Map<String, Object> result = super.postProcessAllModels(objs);
+
+        for (Map.Entry<String, Object> entry : result.entrySet()) {
+            Map<String, Object> inner = (Map<String, Object>) entry.getValue();
+            List<Map<String, Object>> models = (List<Map<String, Object>>) inner.get("models");
+            for (Map<String, Object> mo : models) {
+                CodegenModel cm = (CodegenModel) mo.get("model");
+                if (cm.discriminator != null && cm.children != null) {
+                    for (CodegenModel child : cm.children) {
+                        this.setDiscriminatorValue(child, cm.discriminator.getPropertyName(), this.getDiscriminatorValue(child));
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    private void setDiscriminatorValue(CodegenModel model, String baseName, String value) {
+        for (CodegenProperty prop : model.allVars) {
+            if (prop.baseName.equals(baseName)) {
+                prop.discriminatorValue = value;
+            }
+        }
+        if (model.children != null) {
+            final boolean newDiscriminator = model.discriminator != null;
+            for (CodegenModel child : model.children) {
+                this.setDiscriminatorValue(child, baseName, newDiscriminator ? value : this.getDiscriminatorValue(child));
+            }
+        }
+    }
+
+    private String getDiscriminatorValue(CodegenModel model) {
+        return model.vendorExtensions.containsKey(X_DISCRIMINATOR_TYPE) ?
+                (String) model.vendorExtensions.get(X_DISCRIMINATOR_TYPE) : model.classname;
+    }
+
+    @Override
+    public String escapeQuotationMark(String input) {
+        // remove ', " to avoid code injection
+        return input.replace("\"", "").replace("'", "");
+    }
+
+    @Override
+    public String escapeUnsafeCharacters(String input) {
+        return input.replace("*/", "*_/").replace("/*", "/_*");
+    }
+    
+    @Override
+    public String getName() {
+        return "typescript";
+    }
+
+    @Override
+    public String getHelp() {
+        return "Generates a TypeScript client library using Fetch API (beta).";
+    }
+
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if (additionalProperties.containsKey(CodegenConstants.MODEL_PROPERTY_NAMING)) {
+            setModelPropertyNaming((String) additionalProperties.get(CodegenConstants.MODEL_PROPERTY_NAMING));
+        }
+
+        convertPropertyToBooleanAndWriteBack(CodegenConstants.SUPPORTS_ES6);
+
+        // change package names
+        apiPackage = this.apiPackage + ".apis";
+        modelPackage = this.modelPackage + ".models";
+        testPackage = this.testPackage + ".tests";
+
+        additionalProperties.putIfAbsent(FRAMEWORK_SWITCH, FRAMEWORKS[0]);
+        supportingFiles.add(new SupportingFile("index.mustache", "index.ts"));
+
+        String httpLibName = this.getHttpLibForFramework(additionalProperties.get(FRAMEWORK_SWITCH).toString());
+        supportingFiles.add(new SupportingFile(
+              "http"  + File.separator + httpLibName + ".mustache",
+              "http", httpLibName + ".ts"
+        ));
+
+        Object propPlatform = additionalProperties.get(PLATFORM_SWITCH);
+        if (propPlatform == null) {
+            propPlatform = "browser";
+            additionalProperties.put("platform", propPlatform);
+        }
+
+        Map<String, Boolean> platforms = new HashMap<>();
+        for (String platform: PLATFORMS) {
+            platforms.put(platform, platform.equals(propPlatform));
+        }
+        additionalProperties.put("platforms", platforms);
+
+        additionalProperties.putIfAbsent(FILE_CONTENT_DATA_TYPE, propPlatform.equals("node") ? "Buffer" : "Blob");
+
+        if (!propPlatform.equals("deno")) {
+            supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+            supportingFiles.add(new SupportingFile("package.mustache", "", "package.json"));
+            supportingFiles.add(new SupportingFile("tsconfig.mustache", "", "tsconfig.json"));
+        }
+
+        if (propPlatform.equals("deno")) {
+            additionalProperties.put("extensionForDeno", ".ts");
+        }
+
+        final boolean useRxJS = convertPropertyToBooleanAndWriteBack(USE_RXJS_SWITCH);
+        if (!useRxJS) {
+            supportingFiles.add(new SupportingFile("rxjsStub.mustache", "rxjsStub.ts"));
+        }
+
+        final boolean useInversify = convertPropertyToBooleanAndWriteBack(USE_INVERSIFY_SWITCH);
+        if (useInversify) {
+            supportingFiles.add(new SupportingFile("services" + File.separator + "index.mustache", "services", "index.ts"));
+            supportingFiles.add(new SupportingFile("services" + File.separator + "configuration.mustache", "services", "configuration.ts"));
+            supportingFiles.add(new SupportingFile("services" + File.separator + "PromiseAPI.mustache", "services", "PromiseAPI.ts"));
+            supportingFiles.add(new SupportingFile("services" + File.separator + "ObservableAPI.mustache", "services", "ObservableAPI.ts"));
+            supportingFiles.add(new SupportingFile("services" + File.separator + "ObjectParamAPI.mustache", "services", "ObjectParamAPI.ts"));
+            supportingFiles.add(new SupportingFile("services" + File.separator + "http.mustache", "services", "http.ts"));
+            apiTemplateFiles.put("services" + File.separator + "api.mustache", ".service.ts");
+        }
+
+        // NPM Settings
+        if (additionalProperties.containsKey(NPM_NAME)) {
+            setNpmName(additionalProperties.get(NPM_NAME).toString());
+        }
+
+        if (additionalProperties.containsKey(NPM_VERSION)) {
+            setNpmVersion(additionalProperties.get(NPM_VERSION).toString());
+        }
+
+        if (additionalProperties.containsKey(NPM_REPOSITORY)) {
+            setNpmRepository(additionalProperties.get(NPM_REPOSITORY).toString());
+        }
+    }
+
+    private String getHttpLibForFramework(String object) {
+        return this.frameworkToHttpLibMap.get(object);
+    }
+
+
+    @Override
+    public String getTypeDeclaration(Schema p) {
+        Schema inner;
+        if (ModelUtils.isArraySchema(p)) {
+            inner = ((ArraySchema) p).getItems();
+            return this.getSchemaType(p) + "<" + this.getTypeDeclaration(inner) + ">";
+        } else if (ModelUtils.isMapSchema(p)) {
+            inner = (Schema) p.getAdditionalProperties();
+            return "{ [key: string]: " + this.getTypeDeclaration(inner) + "; }";
+        } else if (ModelUtils.isFileSchema(p)) {
+            return "HttpFile";
+        } else if (ModelUtils.isBinarySchema(p)) {
+            return "any";
+        } else {
+            return super.getTypeDeclaration(p);
+        }
+    }
+
+    @Override
+    protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
+        codegenModel.additionalPropertiesType = getTypeDeclaration((Schema) schema.getAdditionalProperties());
+        addImport(codegenModel, codegenModel.additionalPropertiesType);
+    }
+}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
index 7a740ab76e00..673d4d41e45b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
@@ -37,7 +37,7 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractTypeScriptClientCodegen.class);
 
     public static final String NPM_REPOSITORY = "npmRepository";
-    public static final String WITH_INTERFACES = "withInterfaces";
+    public static final String WITH_PROGRESS_SUBSCRIBER = "withProgressSubscriber";
 
     protected String npmRepository = null;
     protected Set<String> reservedParamNames = new HashSet<>();
@@ -60,7 +60,7 @@ public TypeScriptRxjsClientCodegen() {
         typeMapping.put("file", "Blob");
 
         this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json"));
-        this.cliOptions.add(new CliOption(WITH_INTERFACES, "Setting this property to true will generate interfaces next to the default class implementations.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString()));
+        this.cliOptions.add(new CliOption(WITH_PROGRESS_SUBSCRIBER, "Setting this property to true will generate API controller methods with support for subscribing to request progress.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString()));
 
         // these are used in the api template for more efficient destructuring
         this.reservedParamNames.add("headers");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java
index 32f62042c957..cf2f2571dc38 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java
@@ -42,11 +42,14 @@
 public class CamelCaseLambda implements Mustache.Lambda {
     private CodegenConfig generator = null;
     private Boolean escapeParam = false;
+    private Boolean lowercaseFirstLetter = true;
 
-    public CamelCaseLambda() {
-
+    public CamelCaseLambda(boolean lowercaseFirstLetter) {
+      this.lowercaseFirstLetter = lowercaseFirstLetter;
     }
 
+    public CamelCaseLambda() {}
+
     public CamelCaseLambda generator(final CodegenConfig generator) {
         this.generator = generator;
         return this;
@@ -59,7 +62,7 @@ public CamelCaseLambda escapeAsParamName(final Boolean escape) {
 
     @Override
     public void execute(Template.Fragment fragment, Writer writer) throws IOException {
-        String text = camelize(fragment.execute(), true);
+        String text = camelize(fragment.execute(), lowercaseFirstLetter);
         if (generator != null) {
             text = generator.sanitizeName(text);
             if (generator.reservedWords().contains(text)) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
index 961ff1974b24..5320f58f256e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
@@ -1026,7 +1026,7 @@ public static Schema unaliasSchema(OpenAPI openAPI,
         if (schema != null && StringUtils.isNotEmpty(schema.get$ref())) {
             String simpleRef = ModelUtils.getSimpleRef(schema.get$ref());
             if (importMappings.containsKey(simpleRef)) {
-                LOGGER.info("Schema unaliasing of {} omitted because aliased class is to be mapped to {}", simpleRef, importMappings.get(simpleRef));
+                LOGGER.debug("Schema unaliasing of {} omitted because aliased class is to be mapped to {}", simpleRef, importMappings.get(simpleRef));
                 return schema;
             }
             Schema ref = allSchemas.get(simpleRef);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java
index 4ded5b255055..28c9c25e5604 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java
@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import org.openapitools.codegen.CodegenModel;
+import org.openapitools.codegen.CodegenOperation;
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.CodegenSecurity;
 
@@ -81,7 +82,7 @@ public static boolean hasApiKeyMethods(List<CodegenSecurity> authMethods) {
     }
 
     /**
-     * Returns true if the specified OAS model has at least one operation with the HTTP signature
+     * Returns true if the specified OAS model has at least one operation with the HTTP basic
      * security scheme.
      * The HTTP signature scheme is defined in https://datatracker.ietf.org/doc/draft-cavage-http-signatures/
      *
diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache
index 58443cabc3a0..463bfddc1e20 100644
--- a/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache
+++ b/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache
@@ -3,7 +3,7 @@
 #include <ctype.h>
 #include "{{classname}}.h"
 
-
+#define MAX_NUMBER_LENGTH 16
 #define MAX_BUFFER_LENGTH 4096
 #define intToStr(dst, src) \
     do {\
@@ -209,7 +209,7 @@ end:
     // query parameters
     {{^isListContainer}}
     char *keyQuery_{{{paramName}}} = NULL;
-    {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{{dataType}}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}} valueQuery_{{{paramName}}} {{#isString}}{{^isEnum}}= NULL{{/isEnum}}{{/isString}};
+    {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}char *{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}char *{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}} valueQuery_{{{paramName}}} {{#isString}}{{^isEnum}}= NULL{{/isEnum}}{{/isString}}{{#isInteger}}= NULL{{/isInteger}};
     keyValuePair_t *keyPairQuery_{{paramName}} = 0;
     {{/isListContainer}}
     if ({{paramName}})
@@ -219,9 +219,21 @@ end:
         {{/isListContainer}}
         {{^isListContainer}}
         keyQuery_{{{paramName}}} = strdup("{{{baseName}}}");
+        {{#isInteger}}
+        valueQuery_{{{paramName}}} = calloc(1,MAX_NUMBER_LENGTH);
+        snprintf(valueQuery_{{{paramName}}}, MAX_NUMBER_LENGTH, "%d", {{{paramName}}});
+        {{/isInteger}}
+        {{#isBoolean}}
+        valueQuery_{{{paramName}}} = calloc(1,MAX_NUMBER_LENGTH);
+        snprintf(valueQuery_{{{paramName}}}, MAX_NUMBER_LENGTH, "%d", {{{paramName}}});
+        {{/isBoolean}}
+        {{^isInteger}}
+        {{^isBoolean}}
         valueQuery_{{{paramName}}} = {{#isString}}{{^isEnum}}strdup({{/isEnum}}{{/isString}}({{{paramName}}}){{#isString}}{{^isEnum}}){{/isEnum}}{{/isString}};
+        {{/isBoolean}}
+        {{/isInteger}}
         keyPairQuery_{{paramName}} = keyValuePair_create(keyQuery_{{{paramName}}}, {{#isEnum}}(void *)strdup({{{operationId}}}_{{enumName}}_ToString(
-		{{/isEnum}}{{^isString}}&{{/isString}}valueQuery_{{{paramName}}}{{#isEnum}})){{/isEnum}});
+		{{/isEnum}}{{^isString}}{{^isInteger}}{{^isBoolean}}&{{/isBoolean}}{{/isInteger}}{{/isString}}valueQuery_{{{paramName}}}{{#isEnum}})){{/isEnum}});
         list_addElement(localVarQueryParameters,keyPairQuery_{{paramName}});
         {{/isListContainer}}
     }
diff --git a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache
index 38ece474ad8e..fd3ca0ede280 100644
--- a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache
@@ -169,6 +169,7 @@ dependencies {
     {{^java8}}
     compile "com.brsanthu:migbase64:2.2"
     {{/java8}}
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
 
diff --git a/modules/openapi-generator/src/main/resources/Java/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/Java/generatedAnnotation.mustache
index a47b6faa85b9..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/Java/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/generatedAnnotation.mustache
@@ -1 +1 @@
-{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache
index feefdb939813..b451e97ae6e4 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache
@@ -19,9 +19,7 @@ import org.apache.oltu.oauth2.common.message.types.GrantType;
 import org.apache.oltu.oauth2.common.token.BasicOAuthToken;
 
 import feign.Client;
-{{#useFeign10}}
 import feign.Request.HttpMethod;
-{{/useFeign10}}
 import feign.Request.Options;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
@@ -95,12 +93,7 @@ public class OAuth implements RequestInterceptor {
         try {
             accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
         } catch (Exception e) {
-            {{#useFeign10}}
             throw new RetryableException(0, e.getMessage(), HttpMethod.POST, e, null, template.request());
-            {{/useFeign10}}
-            {{^useFeign10}}
-            throw new RetryableException(e.getMessage(), e,null);
-            {{/useFeign10}}
         }
         if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
             setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
index 86cdad95f82f..075db4f0cdbf 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
@@ -126,8 +126,8 @@ ext {
     {{#threetenbp}}
     jackson_threetenbp_version = "2.9.10"
     {{/threetenbp}}
-    feign_version = "{{#useFeign10}}11.0{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}"
-    feign_form_version = "{{#useFeign10}}3.8.0{{/useFeign10}}{{^useFeign10}}2.1.0{{/useFeign10}}"
+    feign_version = "11.0"
+    feign_form_version = "3.8.0"
     junit_version = "4.13"
     oltu_version = "1.0.1"
 }
@@ -154,5 +154,6 @@ dependencies {
     {{/threetenbp}}
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
     compile "com.brsanthu:migbase64:2.2"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache
index cd55527b8ec4..664cc67edfca 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache
@@ -10,10 +10,10 @@ lazy val root = (project in file(".")).
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       "io.swagger" % "swagger-annotations" % "1.5.24" % "compile",
-      "io.github.openfeign" % "feign-core" % "{{#useFeign10}}11.0{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile",
-      "io.github.openfeign" % "feign-jackson" % "{{#useFeign10}}11.0{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile",
-      "io.github.openfeign" % "feign-slf4j" % "{{#useFeign10}}11.0{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile",
-      "io.github.openfeign.form" % "feign-form" % "{{#useFeign10}}3.8.0{{/useFeign10}}{{^useFeign10}}2.1.0{{/useFeign10}}" % "compile",
+      "io.github.openfeign" % "feign-core" % "11.0" % "compile",
+      "io.github.openfeign" % "feign-jackson" % "11.0" % "compile",
+      "io.github.openfeign" % "feign-slf4j" % "11.0" % "compile",
+      "io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile",
       "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",
       "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile",
@@ -21,6 +21,7 @@ lazy val root = (project in file(".")).
       "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "com.brsanthu" % "migbase64" % "2.2" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
index a40806b32e98..60581b5336f2 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
@@ -161,6 +161,17 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
@@ -304,6 +315,12 @@
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
             <version>${oltu-version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -331,14 +348,15 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <swagger-annotations-version>1.5.24</swagger-annotations-version>
-        <feign-version>{{#useFeign10}}11.0{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}</feign-version>
-        <feign-form-version>{{#useFeign10}}3.8.0{{/useFeign10}}{{^useFeign10}}2.1.0{{/useFeign10}}</feign-form-version>
+        <feign-version>11.0</feign-version>
+        <feign-form-version>3.8.0</feign-form-version>
         <jackson-version>2.10.3</jackson-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
         <jackson-databind-version>2.10.3</jackson-databind-version>
         {{#threetenbp}}
         <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
         {{/threetenbp}}
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <oltu-version>1.0.1</oltu-version>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
index f6a517fbb928..d6e5035dc5d5 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
@@ -155,5 +155,6 @@ dependencies {
     {{#withXml}}
     compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version"
     {{/withXml}}
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache
index 516fe0eb90e5..de076de7db23 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache
@@ -27,6 +27,7 @@ lazy val root = (project in file(".")).
       {{#threetenbp}}
       "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
       {{/threetenbp}}
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
index 2412ba208ecb..203685fe6b67 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
@@ -166,6 +166,17 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
@@ -295,6 +306,12 @@
                 <version>${jackson-threetenbp-version}</version>
             </dependency>
         {{/threetenbp}}
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -318,6 +335,7 @@
         {{#threetenbp}}
         <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
         {{/threetenbp}}
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13</junit-version>
     </properties>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache
index f928aad9d758..d51d4497283e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache
@@ -30,14 +30,14 @@ public abstract class AbstractOpenApiSchema {
         this.isNullable = isNullable;
     }
 
-    /***
-     * Get the list of schemas allowed to be stored in this object
+    /**
+     * Get the list of oneOf/anyOf composed schemas allowed to be stored in this object
      *
      * @return an instance of the actual schema/object
      */
     public abstract Map<String, GenericType> getSchemas();
 
-    /***
+    /**
      * Get the actual instance
      *
      * @return an instance of the actual schema/object
@@ -45,14 +45,33 @@ public abstract class AbstractOpenApiSchema {
     @JsonValue
     public Object getActualInstance() {return instance;}
 
-    /***
+    /**
      * Set the actual instance
      *
      * @param instance the actual instance of the schema/object
      */
     public void setActualInstance(Object instance) {this.instance = instance;}
 
-    /***
+    /**
+     * Get the instant recursively when the schemas defined in oneOf/anyof happen to be oneOf/anyOf schema as well
+     *
+     * @return an instance of the actual schema/object
+     */
+    public Object getActualInstanceRecursively() {
+        return getActualInstanceRecursively(this);
+    }
+
+    private Object getActualInstanceRecursively(AbstractOpenApiSchema object) {
+        if (object.getActualInstance() == null) {
+            return null;
+        } else if (object.getActualInstance() instanceof AbstractOpenApiSchema) {
+            return getActualInstanceRecursively((AbstractOpenApiSchema)object.getActualInstance());
+        } else {
+            return object.getActualInstance();
+        }
+    }
+
+    /**
      * Get the schema type (e.g. anyOf, oneOf)
      *
      * @return the schema type
@@ -101,7 +120,7 @@ public abstract class AbstractOpenApiSchema {
         return Objects.hash(instance, isNullable, schemaType);
     }
 
-    /***
+    /**
      * Is nullalble
      *
      * @return true if it's nullable
@@ -113,4 +132,7 @@ public abstract class AbstractOpenApiSchema {
             return Boolean.FALSE;
         }
     }
+
+{{>libraries/jersey2/additional_properties}}
+
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
index d6ff3f94e0bd..dc15ec47491d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
@@ -27,6 +27,13 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import java.net.URI;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.security.cert.X509Certificate;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 {{^supportJava6}}
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
@@ -68,13 +75,13 @@ import {{invokerPackage}}.auth.ApiKeyAuth;
 {{#hasOAuthMethods}}
 import {{invokerPackage}}.auth.OAuth;
 {{/hasOAuthMethods}}
-import {{invokerPackage}}.model.AbstractOpenApiSchema;
 
 {{>generatedAnnotation}}
 public class ApiClient {
   protected Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   protected Map<String, String> defaultCookieMap = new HashMap<String, String>();
   protected String basePath = "{{{basePath}}}";
+  protected String userAgent;
   private static final Logger log = Logger.getLogger(ApiClient.class.getName());
 
   protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>({{#servers}}{{#-first}}Arrays.asList(
@@ -455,7 +462,7 @@ public class ApiClient {
   public ApiClient setOauthCredentials(String clientId, String clientSecret) {
     for (Authentication auth : authentications.values()) {
       if (auth instanceof OAuth) {
-        ((OAuth) auth).setCredentials(clientId, clientSecret);
+        ((OAuth) auth).setCredentials(clientId, clientSecret, isDebugging());
         return this;
       }
     }
@@ -515,10 +522,19 @@ public class ApiClient {
    * @return API client
    */
   public ApiClient setUserAgent(String userAgent) {
+    userAgent = userAgent;
     addDefaultHeader("User-Agent", userAgent);
     return this;
   }
 
+  /**
+   * Get the User-Agent header's value.
+   * @return User-Agent string
+   */
+  public String getUserAgent(){
+    return userAgent;
+  }
+
   /**
    * Add a default header.
    *
@@ -833,7 +849,7 @@ public class ApiClient {
    * @return Entity
    * @throws ApiException API exception
    */
-  public Entity<?> serialize(Object obj, Map<String, Object> formParams, String contentType) throws ApiException {
+  public Entity<?> serialize(Object obj, Map<String, Object> formParams, String contentType, boolean isBodyNullable) throws ApiException {
     Entity<?> entity;
     if (contentType.startsWith("multipart/form-data")) {
       MultiPart multiPart = new MultiPart();
@@ -857,7 +873,11 @@ public class ApiClient {
       entity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE);
     } else {
       // We let jersey handle the serialization
-      entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
+      if (isBodyNullable) { // payload is nullable
+        entity = Entity.entity(obj == null ? Entity.text("null") : obj, contentType);
+      } else {
+        entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
+      }
     }
     return entity;
   }
@@ -868,10 +888,11 @@ public class ApiClient {
    * @param obj Object
    * @param formParams Form parameters
    * @param contentType Context type
+   * @param isBodyNulalble True if the body is nullable
    * @return String
    * @throws ApiException API exception
    */
-  public String serializeToString(Object obj, Map<String, Object> formParams, String contentType) throws ApiException {
+  public String serializeToString(Object obj, Map<String, Object> formParams, String contentType, boolean isBodyNullable) throws ApiException {
     try {
       if (contentType.startsWith("multipart/form-data")) {
         throw new ApiException("multipart/form-data not yet supported for serializeToString (http signature authentication)");
@@ -887,74 +908,17 @@ public class ApiClient {
           return formString.substring(0, formString.length() - 1);
         }
       } else {
-        return json.getMapper().writeValueAsString(obj);
+        if (isBodyNullable) {
+          return obj == null ? "null" : json.getMapper().writeValueAsString(obj);
+        } else {
+          return json.getMapper().writeValueAsString(obj);
+        }
       }
     } catch (Exception ex) {
       throw new ApiException("Failed to perform serializeToString: " + ex.toString());
     }
   }
 
-  public AbstractOpenApiSchema deserializeSchemas(Response response, AbstractOpenApiSchema schema) throws ApiException{
-
-    Object result = null;
-    int matchCounter = 0;
-    ArrayList<String> matchSchemas = new ArrayList<>();
-
-    if (schema.isNullable()) {
-      response.bufferEntity();
-      if ("{}".equals(String.valueOf(response.readEntity(String.class))) ||
-          "".equals(String.valueOf(response.readEntity(String.class)))) {
-        // schema is nullable and the response body is {} or empty string
-        return schema;
-      }
-    }
-
-    for (Map.Entry<String, GenericType> entry : schema.getSchemas().entrySet()) {
-      String schemaName = entry.getKey();
-      GenericType schemaType = entry.getValue();
-
-      if (schemaType instanceof GenericType) { // model
-        try {
-          Object deserializedObject = deserialize(response, schemaType);
-          if (deserializedObject != null) {
-            result = deserializedObject;
-            matchCounter++;
-
-            if ("anyOf".equals(schema.getSchemaType())) {
-              break;
-            } else if ("oneOf".equals(schema.getSchemaType())) {
-              matchSchemas.add(schemaName);
-            } else {
-              throw new ApiException("Unknowe type found while expecting anyOf/oneOf:" + schema.getSchemaType());
-            }
-          } else {
-            // failed to deserialize the response in the schema provided, proceed to the next one if any
-          }
-        } catch (Exception ex) {
-          // failed to deserialize, do nothing and try next one (schema)
-          // Logging the error may be useful to troubleshoot why a payload fails to match
-          // the schema.
-          log.log(Level.FINE, "Input data does not match schema '" + schemaName + "'", ex);
-        }
-      } else {// unknown type
-        throw new ApiException(schemaType.getClass() + " is not a GenericType and cannot be handled properly in deserialization.");
-      }
-
-    }
-
-    if (matchCounter > 1 && "oneOf".equals(schema.getSchemaType())) {// more than 1 match for oneOf
-      throw new ApiException("Response body is invalid as it matches more than one schema (" + StringUtil.join(matchSchemas, ", ") + ") defined in the oneOf model: " + schema.getClass().getName());
-    } else if (matchCounter == 0) { // fail to match any in oneOf/anyOf schemas
-      throw new ApiException("Response body is invalid as it does not match any schemas (" + StringUtil.join(schema.getSchemas().keySet(), ", ") + ") defined in the oneOf/anyOf model: " + schema.getClass().getName());
-    } else { // only one matched
-      schema.setActualInstance(result);
-      return schema;
-    }
-
-  }
-
-
-
   /**
    * Deserialize response body to Java object according to the Content-Type.
    * @param <T> Type
@@ -1062,7 +1026,7 @@ public class ApiClient {
    * @param contentType The request's Content-Type header
    * @param authNames The authentications to apply
    * @param returnType The return type into which to deserialize the response
-   * @param schema An instance of the response that uses oneOf/anyOf
+   * @param isBodyNullable True if the body is nullable
    * @return The response body in type of string
    * @throws ApiException API exception
    */
@@ -1079,7 +1043,7 @@ public class ApiClient {
       String contentType,
       String[] authNames,
       GenericType<T> returnType,
-      AbstractOpenApiSchema schema)
+      boolean isBodyNullable)
       throws ApiException {
 
     // Not using `.target(targetURL).path(path)` below,
@@ -1126,7 +1090,7 @@ public class ApiClient {
       }
     }
 
-    Entity<?> entity = serialize(body, formParams, contentType);
+    Entity<?> entity = serialize(body, formParams, contentType, isBodyNullable);
 
     // put all headers in one place
     Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
@@ -1138,7 +1102,7 @@ public class ApiClient {
         queryParams,
         allHeaderParams,
         cookieParams,
-        serializeToString(body, formParams, contentType),
+        serializeToString(body, formParams, contentType, isBodyNullable),
         method,
         target.getUri());
 
@@ -1178,12 +1142,10 @@ public class ApiClient {
       if (response.getStatusInfo() == Status.NO_CONTENT) {
         return new ApiResponse<T>(statusCode, responseHeaders);
       } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) {
-        if (returnType == null) return new ApiResponse<T>(statusCode, responseHeaders);
-        else if (schema == null) {
+        if (returnType == null) {
+          return new ApiResponse<T>(statusCode, responseHeaders);
+        } else {
           return new ApiResponse<T>(statusCode, responseHeaders, deserialize(response, returnType));
-        } else { // oneOf/anyOf
-          return new ApiResponse<T>(
-              statusCode, responseHeaders, (T) deserializeSchemas(response, schema));
         }
       } else {
         String message = "error";
@@ -1229,8 +1191,8 @@ public class ApiClient {
    * @deprecated Add qualified name of the operation as a first parameter.
    */
   @Deprecated
-  public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType, AbstractOpenApiSchema schema) throws ApiException {
-    return invokeAPI(null, path, method, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames, returnType, schema);
+  public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType, boolean isBodyNullable) throws ApiException {
+    return invokeAPI(null, path, method, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames, returnType, isBodyNullable);
   }
 
   /**
@@ -1261,13 +1223,64 @@ public class ApiClient {
       java.util.logging.Logger.getLogger("org.glassfish.jersey.client").setLevel(java.util.logging.Level.SEVERE);
     }
     performAdditionalClientConfiguration(clientConfig);
-    return ClientBuilder.newClient(clientConfig);
+    ClientBuilder clientBuilder = ClientBuilder.newBuilder();
+    customizeClientBuilder(clientBuilder);
+    clientBuilder = clientBuilder.withConfig(clientConfig);
+    return clientBuilder.build();
   }
 
+  /**
+   * Perform additional configuration of the API client.
+   * This method can be overriden to customize the API client.
+   */
   protected void performAdditionalClientConfiguration(ClientConfig clientConfig) {
     // No-op extension point
   }
 
+  /**
+   * Customize the client builder.
+   *
+   * This method can be overriden to customize the API client. For example, this can be used to:
+   * 1. Set the hostname verifier to be used by the client to verify the endpoint's hostname
+   *    against its identification information.
+   * 2. Set the client-side key store.
+   * 3. Set the SSL context that will be used when creating secured transport connections to
+   *    server endpoints from web targets created by the client instance that is using this SSL context.
+   * 4. Set the client-side trust store.
+   *
+   * To completely disable certificate validation (at your own risk), you can
+   * override this method and invoke disableCertificateValidation(clientBuilder).
+   */
+  protected void customizeClientBuilder(ClientBuilder clientBuilder) {
+    // No-op extension point
+  }
+
+  /**
+   * Disable X.509 certificate validation in TLS connections.
+   *
+   * Please note that trusting all certificates is extremely risky.
+   * This may be useful in a development environment with self-signed certificates.
+   */
+  protected void disableCertificateValidation(ClientBuilder clientBuilder) throws KeyManagementException, NoSuchAlgorithmException {
+    TrustManager[] trustAllCerts = new X509TrustManager[] {
+      new X509TrustManager() {
+        @Override
+        public X509Certificate[] getAcceptedIssuers() {
+          return null;
+        }
+        @Override
+        public void checkClientTrusted(X509Certificate[] certs, String authType) {
+        }
+        @Override
+        public void checkServerTrusted(X509Certificate[] certs, String authType) {
+        }
+      }
+    };
+    SSLContext sslContext = SSLContext.getInstance("TLS");
+    sslContext.init(null, trustAllCerts, new SecureRandom());
+    clientBuilder.sslContext(sslContext);
+  }
+
   protected Map<String, List<String>> buildResponseHeaders(Response response) {
     Map<String, List<String>> responseHeaders = new HashMap<String, List<String>>();
     for (Entry<String, List<Object>> entry: response.getHeaders().entrySet()) {
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache
index dc3d9893e6d6..bcc075ac9fcb 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache
@@ -15,9 +15,16 @@ import com.fasterxml.jackson.datatype.joda.JodaModule;
 {{#threetenbp}}
 import com.fasterxml.jackson.datatype.threetenbp.ThreeTenModule;
 {{/threetenbp}}
+{{#models.0}}
+import {{modelPackage}}.*;
+{{/models.0}}
 
 import java.text.DateFormat;
-
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.core.GenericType;
 import javax.ws.rs.ext.ContextResolver;
 
 {{>generatedAnnotation}}
@@ -69,4 +76,197 @@ public class JSON implements ContextResolver<ObjectMapper> {
    * @return object mapper
    */
   public ObjectMapper getMapper() { return mapper; }
+
+  /**
+   * Returns the target model class that should be used to deserialize the input data.
+   * The discriminator mappings are used to determine the target model class.
+   *
+   * @param node The input data.
+   * @param modelClass The class that contains the discriminator mappings.
+   */
+  public static Class<?> getClassForElement(JsonNode node, Class<?> modelClass) {
+    ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass);
+    if (cdm != null) {
+      return cdm.getClassForElement(node, new HashSet<Class<?>>());
+    }
+    return null;
+  }
+
+  /**
+   * Helper class to register the discriminator mappings.
+   */
+  private static class ClassDiscriminatorMapping {
+    // The model class name.
+    Class<?> modelClass;
+    // The name of the discriminator property.
+    String discriminatorName;
+    // The discriminator mappings for a model class.
+    Map<String, Class<?>> discriminatorMappings;
+
+    // Constructs a new class discriminator.
+    ClassDiscriminatorMapping(Class<?> cls, String propertyName, Map<String, Class<?>> mappings) {
+      modelClass = cls;
+      discriminatorName = propertyName;
+      discriminatorMappings = new HashMap<String, Class<?>>();
+      if (mappings != null) {
+        discriminatorMappings.putAll(mappings);
+      }
+    }
+
+    // Return the name of the discriminator property for this model class.
+    String getDiscriminatorPropertyName() {
+      return discriminatorName;
+    }
+
+    // Return the discriminator value or null if the discriminator is not
+    // present in the payload.
+    String getDiscriminatorValue(JsonNode node) {
+      // Determine the value of the discriminator property in the input data.
+      if (discriminatorName != null) {
+        // Get the value of the discriminator property, if present in the input payload.
+        node = node.get(discriminatorName);
+        if (node != null && node.isValueNode()) {
+          String discrValue = node.asText();
+          if (discrValue != null) {
+            return discrValue;
+          }
+        }
+      }
+      return null;
+    }
+
+    /**
+     * Returns the target model class that should be used to deserialize the input data.
+     * This function can be invoked for anyOf/oneOf composed models with discriminator mappings.
+     * The discriminator mappings are used to determine the target model class.
+     *
+     * @param node The input data.
+     * @param visitedClasses The set of classes that have already been visited.
+     */
+    Class<?> getClassForElement(JsonNode node, Set<Class<?>> visitedClasses) {
+      if (visitedClasses.contains(modelClass)) {
+        // Class has already been visited.
+        return null;
+      }
+      // Determine the value of the discriminator property in the input data.
+      String discrValue = getDiscriminatorValue(node);
+      if (discrValue == null) {
+        return null;
+      }
+      Class<?> cls = discriminatorMappings.get(discrValue);
+      // It may not be sufficient to return this cls directly because that target class
+      // may itself be a composed schema, possibly with its own discriminator.
+      visitedClasses.add(modelClass);
+      for (Class<?> childClass : discriminatorMappings.values()) {
+        ClassDiscriminatorMapping childCdm = modelDiscriminators.get(childClass);
+        if (childCdm == null) {
+          continue;
+        }
+        if (!discriminatorName.equals(childCdm.discriminatorName)) {
+          discrValue = getDiscriminatorValue(node);
+          if (discrValue == null) {
+            continue;
+          }
+        }
+        if (childCdm != null) {
+          // Recursively traverse the discriminator mappings.
+          Class<?> childDiscr = childCdm.getClassForElement(node, visitedClasses);
+          if (childDiscr != null) {
+            return childDiscr;
+          }
+        }
+      }
+      return cls;
+    }
+  }
+
+  /**
+   * Returns true if inst is an instance of modelClass in the OpenAPI model hierarchy.
+   *
+   * The Java class hierarchy is not implemented the same way as the OpenAPI model hierarchy,
+   * so it's not possible to use the instanceof keyword.
+   *
+   * @param modelClass A OpenAPI model class.
+   * @param inst The instance object.
+   */
+  public static boolean isInstanceOf(Class<?> modelClass, Object inst, Set<Class<?>> visitedClasses) {
+    if (modelClass.isInstance(inst)) {
+      // This handles the 'allOf' use case with single parent inheritance.
+      return true;
+    }
+    if (visitedClasses.contains(modelClass)) {
+      // This is to prevent infinite recursion when the composed schemas have
+      // a circular dependency.
+      return false;
+    }
+    visitedClasses.add(modelClass);
+    
+    // Traverse the oneOf/anyOf composed schemas.
+    Map<String, GenericType> descendants = modelDescendants.get(modelClass);
+    if (descendants != null) {
+      for (GenericType childType : descendants.values()) {
+        if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  /**
+   * A map of discriminators for all model classes.
+   */
+  private static Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<Class<?>, ClassDiscriminatorMapping>();
+
+  /**
+   * A map of oneOf/anyOf descendants for each model class.
+   */
+  private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<Class<?>, Map<String, GenericType>>();
+
+  /**
+    * Register a model class discriminator.
+    *
+    * @param modelClass the model class
+    * @param discriminatorPropertyName the name of the discriminator property
+    * @param mappings a map with the discriminator mappings.
+    */
+  public static void registerDiscriminator(Class<?> modelClass, String discriminatorPropertyName, Map<String, Class<?>> mappings) {
+    ClassDiscriminatorMapping m = new ClassDiscriminatorMapping(modelClass, discriminatorPropertyName, mappings);
+    modelDiscriminators.put(modelClass, m);
+  }
+
+  /**
+    * Register the oneOf/anyOf descendants of the modelClass.
+    *
+    * @param modelClass the model class
+    * @param descendants a map of oneOf/anyOf descendants.
+    */
+  public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
+    modelDescendants.put(modelClass, descendants);
+  }
+
+  private static JSON json;
+
+  static
+  {
+    json = new JSON();
+  }
+
+  /**
+    * Get the default JSON instance.
+    *
+    * @return the default JSON instance
+    */
+  public static JSON getDefault() {
+    return json;
+  }
+
+  /**
+    * Set the default JSON instance.
+    *
+    * @param json JSON instance to be used
+    */
+  public static void setDefault(JSON json) {
+    JSON.json = json;
+  }
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/additional_properties.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/additional_properties.mustache
new file mode 100644
index 000000000000..61973dc24fa1
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/additional_properties.mustache
@@ -0,0 +1,39 @@
+{{#additionalPropertiesType}}
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, {{{.}}}> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public {{classname}} putAdditionalProperty(String key, {{{.}}} value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, {{{.}}}>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, {{{.}}}> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public {{{.}}} getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+{{/additionalPropertiesType}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache
index 5c3219b5de37..e23cece67ddb 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache
@@ -4,21 +4,44 @@ import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.HashSet;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import {{invokerPackage}}.JSON;
 
 {{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{>xmlAnnotation}}
 @JsonDeserialize(using={{classname}}.{{classname}}Deserializer.class)
+@JsonSerialize(using = {{classname}}.{{classname}}Serializer.class)
 public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-implements}}, {{{.}}}{{/vendorExtensions.x-implements}} {
     private static final Logger log = Logger.getLogger({{classname}}.class.getName());
 
+    public static class {{classname}}Serializer extends StdSerializer<{{classname}}> {
+        public {{classname}}Serializer(Class<{{classname}}> t) {
+            super(t);
+        }
+
+        public {{classname}}Serializer() {
+            this(null);
+        }
+
+        @Override
+        public void serialize({{classname}} value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeObject(value.getActualInstance());
+        }
+    }
+
     public static class {{classname}}Deserializer extends StdDeserializer<{{classname}}> {
         public {{classname}}Deserializer() {
             this({{classname}}.class);
@@ -33,6 +56,18 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
             JsonNode tree = jp.readValueAsTree();
 
             Object deserialized = null;
+            {{#discriminator}}
+            Class<?> cls = JSON.getClassForElement(tree, {{classname}}.class);
+            if (cls != null) {
+                // When the OAS schema includes a discriminator, use the discriminator value to
+                // discriminate the anyOf schemas.
+                // Get the discriminator mapping value to get the class.
+                deserialized = tree.traverse(jp.getCodec()).readValueAs(cls);
+                {{classname}} ret = new {{classname}}();
+                ret.setActualInstance(deserialized);
+                return ret;
+            }
+            {{/discriminator}}
             {{#anyOf}}
             // deserialzie {{{.}}}
             try {
@@ -48,6 +83,19 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
             {{/anyOf}}
             throw new IOException(String.format("Failed deserialization for {{classname}}: no match found"));
         }
+
+        /**
+         * Handle deserialization of the 'null' value.
+         */
+        @Override
+        public {{classname}} getNullValue(DeserializationContext ctxt) throws JsonMappingException {
+        {{#isNullable}}
+            return null;
+        {{/isNullable}}
+        {{^isNullable}}
+            throw new JsonMappingException(ctxt.getParser(), "{{classname}} cannot be null");
+        {{/isNullable}}
+        }
     }
 
     // store a list of schema names defined in anyOf
@@ -56,7 +104,21 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
     public {{classname}}() {
         super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
     }
+{{> libraries/jersey2/additional_properties }}
+    {{#additionalPropertiesType}}
+    /**
+     * Return true if this {{name}} object is equal to o.
+     */
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o) && Objects.equals(this.additionalProperties, (({{classname}})o).additionalProperties);
+    }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(getActualInstance(), isNullable(), getSchemaType(), additionalProperties);
+    }
+    {{/additionalPropertiesType}}
     {{#anyOf}}
     public {{classname}}({{{.}}} o) {
         super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
@@ -69,6 +131,16 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
         schemas.put("{{{.}}}", new GenericType<{{{.}}}>() {
         });
         {{/anyOf}}
+        JSON.registerDescendants({{classname}}.class, Collections.unmodifiableMap(schemas));
+        {{#discriminator}}
+        // Initialize and register the discriminator mappings.
+        Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+        {{#mappedModels}}
+        mappings.put("{{mappingName}}", {{modelName}}.class);
+        {{/mappedModels}}
+        mappings.put("{{name}}", {{classname}}.class);
+        JSON.registerDiscriminator({{classname}}.class, "{{propertyBaseName}}", mappings);
+        {{/discriminator}}
     }
 
     @Override
@@ -78,15 +150,15 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
 
     @Override
     public void setActualInstance(Object instance) {
-        {{#isNulalble}}
+        {{#isNullable}}
         if (instance == null) {
            super.setActualInstance(instance);
            return;
         }
 
-        {{/isNulalble}}
+        {{/isNullable}}
         {{#anyOf}}
-        if (instance instanceof {{{.}}}) {
+        if (JSON.isInstanceOf({{{.}}}.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache
index 509ae48a50ef..5fcfb9b19bb3 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache
@@ -167,18 +167,18 @@ public class {{classname}} {
     {{/returnType}}
     return apiClient.invokeAPI("{{classname}}.{{operationId}}", localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, {{#returnType}}localVarReturnType{{/returnType}}{{^returnType}}null{{/returnType}}, {{#vendorExtensions.x-java-return-type-one-of}}new {{{returnType}}}(){{/vendorExtensions.x-java-return-type-one-of}}{{^vendorExtensions.x-java-return-type-one-of}}{{#vendorExtensions.x-java-return-type-any-of}}new {{{returnType}}}(){{/vendorExtensions.x-java-return-type-any-of}}{{^vendorExtensions.x-java-return-type-any-of}}null{{/vendorExtensions.x-java-return-type-any-of}}{{/vendorExtensions.x-java-return-type-one-of}});
+                               localVarAuthNames, {{#returnType}}localVarReturnType{{/returnType}}{{^returnType}}null{{/returnType}}, {{#bodyParam}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/bodyParam}}{{^bodyParam}}false{{/bodyParam}});
   }
   {{#vendorExtensions.x-group-parameters}}
 
   public class API{{operationId}}Request {
     {{#allParams}}
-    private {{#isRequired}}final {{/isRequired}}{{{dataType}}} {{localVariablePrefix}}{{paramName}};
+    private {{#isRequired}}final {{/isRequired}}{{{dataType}}} {{paramName}};
     {{/allParams}}
 
     private API{{operationId}}Request({{#pathParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/pathParams}}) {
       {{#pathParams}}
-      this.{{localVariablePrefix}}{{paramName}} = {{paramName}};
+      this.{{paramName}} = {{paramName}};
       {{/pathParams}}
     }
     {{#allParams}}
@@ -190,7 +190,7 @@ public class {{classname}} {
      * @return API{{operationId}}Request
      */
     public API{{operationId}}Request {{paramName}}({{{dataType}}} {{paramName}}) {
-      this.{{localVariablePrefix}}{{paramName}} = {{paramName}};
+      this.{{paramName}} = {{paramName}};
       return this;
     }
     {{/isPathParam}}
@@ -236,7 +236,7 @@ public class {{classname}} {
     @Deprecated
     {{/isDeprecated}}
     public ApiResponse<{{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> executeWithHttpInfo() throws ApiException {
-      return {{operationId}}WithHttpInfo({{#allParams}}{{localVariablePrefix}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+      return {{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
     }
   }
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api_test.mustache
index 1c122287e8d5..1bb19c9acb1d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api_test.mustache
@@ -6,9 +6,10 @@ import {{invokerPackage}}.*;
 import {{invokerPackage}}.auth.*;
 {{#imports}}import {{import}};
 {{/imports}}
-import org.junit.Test;
-import org.junit.Ignore;
 import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
 
 {{^fullJavaUtil}}
 import java.util.ArrayList;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpSignatureAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpSignatureAuth.mustache
index c978de46a0f6..787bef3db0ca 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpSignatureAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpSignatureAuth.mustache
@@ -49,6 +49,9 @@ public class HttpSignatureAuth implements Authentication {
   // The digest algorithm which is used to calculate a cryptographic digest of the HTTP request body.
   private String digestAlgorithm;
 
+  // The maximum validity duration of the HTTP signature. 
+  private Long maxSignatureValidity;
+
   /**
    * Construct a new HTTP signature auth configuration object.
    *
@@ -57,19 +60,23 @@ public class HttpSignatureAuth implements Authentication {
    * @param algorithm The cryptographic algorithm.
    * @param digestAlgorithm The digest algorithm.
    * @param headers The list of HTTP headers that should be included in the HTTP signature.
+   * @param maxSignatureValidity The maximum validity duration of the HTTP signature.
+   *                             Used to set the '(expires)' field in the HTTP signature.
    */
   public HttpSignatureAuth(String keyId,
                            SigningAlgorithm signingAlgorithm,
                            Algorithm algorithm,
                            String digestAlgorithm,
                            AlgorithmParameterSpec parameterSpec,
-                           List<String> headers) {
+                           List<String> headers,
+                           Long maxSignatureValidity) {
     this.keyId = keyId;
     this.signingAlgorithm = signingAlgorithm;
     this.algorithm = algorithm;
     this.parameterSpec = parameterSpec;
     this.digestAlgorithm = digestAlgorithm;
     this.headers = headers;
+    this.maxSignatureValidity = maxSignatureValidity;
   }
 
   /**
@@ -179,6 +186,14 @@ public class HttpSignatureAuth implements Authentication {
     this.headers = headers;
   }
 
+  /**
+   * Returns the maximum validity duration of the HTTP signature.
+   * @return The maximum validity duration of the HTTP signature.
+   */
+  public Long getMaxSignatureValidity() {
+    return maxSignatureValidity;
+  }
+
   /**
    * Returns the signer instance used to sign HTTP messages.
    *
@@ -209,7 +224,7 @@ public class HttpSignatureAuth implements Authentication {
     if (key == null) {
       throw new ApiException("Private key (java.security.Key) cannot be null");
     }
-    signer = new Signer(key, new Signature(keyId, signingAlgorithm, algorithm, parameterSpec, null, headers));
+    signer = new Signer(key, new Signature(keyId, signingAlgorithm, algorithm, parameterSpec, null, headers, maxSignatureValidity));
   }
 
   @Override
@@ -234,16 +249,12 @@ public class HttpSignatureAuth implements Authentication {
         throw new ApiException("Signer cannot be null. Please call the method `setPrivateKey` to set it up correctly");
       }
 
-      // construct the path with the URL query string
-      String path = uri.getPath();
-
-      List<String> urlQueries = new ArrayList<String>();
-      for (Pair queryParam : queryParams) {
-        urlQueries.add(queryParam.getName() + "=" + URLEncoder.encode(queryParam.getValue(), "utf8").replaceAll("\\+", "%20"));
-      }
-
-      if (!urlQueries.isEmpty()) {
-        path = path + "?" + String.join("&", urlQueries);
+      // construct the path with the URL-encoded path and query.
+      // Calling getRawPath and getRawQuery ensures the path is URL-encoded as it will be serialized
+      // on the wire. The HTTP signature must use the encode URL as it is sent on the wire.
+      String path = uri.getRawPath();
+      if (uri.getRawQuery() != "") {
+        path += "?" + uri.getRawQuery();
       }
 
       headerParams.put("Authorization", signer.sign(method, path, headerParams).toString());
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache
index d18b41b0e4c4..62b573a66c07 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache
@@ -22,151 +22,161 @@ import java.util.logging.Logger;
 
 {{>generatedAnnotation}}
 public class OAuth implements Authentication {
-  private static final Logger log = Logger.getLogger(OAuth.class.getName());
-
-  private String tokenUrl;
-  private String absoluteTokenUrl;
-  private OAuthFlow flow = OAuthFlow.application;
-  private OAuth20Service service;
-  private DefaultApi20 authApi;
-  private String scope;
-  private String username;
-  private String password;
-  private String code;
-  private volatile OAuth2AccessToken accessToken;
-
-  public OAuth(String basePath, String tokenUrl) {
-    this.tokenUrl = tokenUrl;
-    this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
-    authApi = new DefaultApi20() {
-      @Override
-      public String getAccessTokenEndpoint() {
-        return absoluteTokenUrl;
-      }
-
-      @Override
-      protected String getAuthorizationBaseUrl() {
-        throw new UnsupportedOperationException("Shouldn't get there !");
-      }
-    };
-  }
-
-  private static String createAbsoluteTokenUrl(String basePath, String tokenUrl) {
-    if (!URI.create(tokenUrl).isAbsolute()) {
-      try {
-        return UriBuilder.fromPath(basePath).path(tokenUrl).build().toURL().toString();
-      } catch (MalformedURLException e) {
-        log.log(Level.SEVERE, "Couldn't create absolute token URL", e);
-      }
+    private static final Logger log = Logger.getLogger(OAuth.class.getName());
+
+    private String tokenUrl;
+    private String absoluteTokenUrl;
+    private OAuthFlow flow = OAuthFlow.application;
+    private OAuth20Service service;
+    private DefaultApi20 authApi;
+    private String scope;
+    private String username;
+    private String password;
+    private String code;
+    private volatile OAuth2AccessToken accessToken;
+
+    public OAuth(String basePath, String tokenUrl) {
+        this.tokenUrl = tokenUrl;
+        this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
+        authApi = new DefaultApi20() {
+            @Override
+            public String getAccessTokenEndpoint() {
+              return absoluteTokenUrl;
+            }
+
+            @Override
+            protected String getAuthorizationBaseUrl() {
+              throw new UnsupportedOperationException("Shouldn't get there !");
+            }
+        };
     }
-    return tokenUrl;
-  }
-
-  @Override
-  public void applyToParams(
-      List<Pair> queryParams,
-      Map<String, String> headerParams,
-      Map<String, String> cookieParams,
-      String payload,
-      String method,
-      URI uri)
-      throws ApiException {
-
-    if (accessToken == null) {
-      obtainAccessToken(null);
+
+    private static String createAbsoluteTokenUrl(String basePath, String tokenUrl) {
+        if (!URI.create(tokenUrl).isAbsolute()) {
+            try {
+                return UriBuilder.fromPath(basePath).path(tokenUrl).build().toURL().toString();
+            } catch (MalformedURLException e) {
+                log.log(Level.SEVERE, "Couldn't create absolute token URL", e);
+            }
+        }
+        return tokenUrl;
+    }
+
+    @Override
+    public void applyToParams(
+        List<Pair> queryParams,
+        Map<String, String> headerParams,
+        Map<String, String> cookieParams,
+        String payload,
+        String method,
+        URI uri)
+        throws ApiException {
+
+        if (accessToken == null) {
+            obtainAccessToken(null);
+        }
+        if (accessToken != null) {
+            headerParams.put("Authorization", "Bearer " + accessToken.getAccessToken());
+        }
+    }
+
+    public OAuth2AccessToken renewAccessToken() throws ApiException {
+        String refreshToken = null;
+        if (accessToken != null) {
+            refreshToken = accessToken.getRefreshToken();
+            accessToken = null;
+        }
+        return obtainAccessToken(refreshToken);
+    }
+
+    public synchronized OAuth2AccessToken obtainAccessToken(String refreshToken) throws ApiException {
+        if (service == null) {
+            log.log(Level.FINE, "service is null in obtainAccessToken.");
+            return null;
+        }
+        try {
+            if (refreshToken != null) {
+                return service.refreshAccessToken(refreshToken);
+            }
+        } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
+            log.log(Level.FINE, "Refreshing the access token using the refresh token failed", e);
+        }
+        try {
+            switch (flow) {
+                case password:
+                    if (username != null && password != null) {
+                        accessToken = service.getAccessTokenPasswordGrant(username, password, scope);
+                    }
+                    break;
+                case accessCode:
+                    if (code != null) {
+                        accessToken = service.getAccessToken(code);
+                        code = null;
+                    }
+                    break;
+                case application:
+                    accessToken = service.getAccessTokenClientCredentialsGrant(scope);
+                    break;
+                default:
+                    log.log(Level.SEVERE, "Invalid flow in obtainAccessToken: " + flow);
+            }
+        } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
+            throw new ApiException(e);
+        }
+        return accessToken;
+    }
+
+    public OAuth2AccessToken getAccessToken() {
+        return accessToken;
     }
-    if (accessToken != null) {
-      headerParams.put("Authorization", "Bearer " + accessToken.getAccessToken());
+
+    public OAuth setAccessToken(OAuth2AccessToken accessToken) {
+        this.accessToken = accessToken;
+        return this;
     }
-  }
 
-  public OAuth2AccessToken renewAccessToken() throws ApiException {
-    String refreshToken = null;
-    if (accessToken != null) {
-      refreshToken = accessToken.getRefreshToken();
-      accessToken = null;
+    public OAuth setAccessToken(String accessToken) {
+        this.accessToken = new OAuth2AccessToken(accessToken);
+        return this;
     }
-    return obtainAccessToken(refreshToken);
-  }
 
-  public synchronized OAuth2AccessToken obtainAccessToken(String refreshToken) throws ApiException {
-    if (service == null) {
-      return null;
+    public OAuth setScope(String scope) {
+       this.scope = scope;
+       return this;
     }
-    try {
-      if (refreshToken != null) {
-        return service.refreshAccessToken(refreshToken);
-      }
-    } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
-      log.log(Level.FINE, "Refreshing the access token using the refresh token failed", e);
+
+    public OAuth setCredentials(String clientId, String clientSecret, Boolean debug) {
+        if (Boolean.TRUE.equals(debug)) {
+            service = new ServiceBuilder(clientId)
+                .apiSecret(clientSecret).debug()
+                .build(authApi);
+        } else {
+            service = new ServiceBuilder(clientId)
+                .apiSecret(clientSecret)
+                .build(authApi);
+        }
+        return this;
     }
-    try {
-      switch (flow) {
-        case password:
-          if (username != null && password != null) {
-            accessToken = service.getAccessTokenPasswordGrant(username, password, scope);
-          }
-          break;
-        case accessCode:
-          if (code != null) {
-            accessToken = service.getAccessToken(code);
-            code = null;
-          }
-          break;
-        case application:
-          accessToken = service.getAccessTokenClientCredentialsGrant(scope);
-      }
-    } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
-      throw new ApiException(e);
+
+    public OAuth usePasswordFlow(String username, String password) {
+        this.flow = OAuthFlow.password;
+        this.username = username;
+        this.password = password;
+        return this;
+    }
+
+    public OAuth useAuthorizationCodeFlow(String code) {
+        this.flow = OAuthFlow.accessCode;
+        this.code = code;
+        return this;
+    }
+
+    public OAuth setFlow(OAuthFlow flow) {
+        this.flow = flow;
+        return this;
+    }
+
+    public void setBasePath(String basePath) {
+        this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
     }
-    return accessToken;
-  }
-
-  public OAuth2AccessToken getAccessToken() {
-    return accessToken;
-  }
-
-  public OAuth setAccessToken(OAuth2AccessToken accessToken) {
-    this.accessToken = accessToken;
-    return this;
-  }
-
-  public OAuth setAccessToken(String accessToken) {
-    this.accessToken = new OAuth2AccessToken(accessToken);
-    return this;
-  }
-
-  public OAuth setScope(String scope) {
-    this.scope = scope;
-    return this;
-  }
-
-  public OAuth setCredentials(String clientId, String clientSecret) {
-    service = new ServiceBuilder(clientId)
-        .apiSecret(clientSecret)
-        .build(authApi);
-    return this;
-  }
-
-  public OAuth usePasswordFlow(String username, String password) {
-    this.flow = OAuthFlow.password;
-    this.username = username;
-    this.password = password;
-    return this;
-  }
-
-  public OAuth useAuthorizationCodeFlow(String code) {
-    this.flow = OAuthFlow.accessCode;
-    this.code = code;
-    return this;
-  }
-
-  public OAuth setFlow(OAuthFlow flow) {
-    this.flow = flow;
-    return this;
-  }
-
-  public void setBasePath(String basePath) {
-    this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
-  }
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
index 270585b5b28e..fa00d428c3fd 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
@@ -174,6 +174,7 @@ dependencies {
     {{^java8}}
     compile "com.brsanthu:migbase64:2.2"
     {{/java8}}
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
index 4cb53ac02e23..d4262ef3fdd0 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
@@ -38,6 +38,7 @@ lazy val root = (project in file(".")).
       "org.apache.commons" % "commons-lang3" % "3.6",
       "commons-io" % "commons-io" % "2.5",
       {{/supportJava6}}
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model.mustache
index 02787f8bb7ff..c0664be10de0 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model.mustache
@@ -6,9 +6,21 @@ package {{package}};
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 {{/useReflectionEqualsHashCode}}
+{{#models}}
+{{#model}}
+{{#additionalPropertiesType}}
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+{{/additionalPropertiesType}}
+{{/model}}
+{{/models}}
 {{^supportJava6}}
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 {{/supportJava6}}
 {{#supportJava6}}
 import org.apache.commons.lang3.ObjectUtils;
@@ -39,9 +51,16 @@ import javax.validation.Valid;
 {{#performBeanValidation}}
 import org.hibernate.validator.constraints.*;
 {{/performBeanValidation}}
+import {{invokerPackage}}.JSON;
 
 {{#models}}
 {{#model}}
+{{#oneOf}}
+{{#-first}}
+import com.fasterxml.jackson.core.type.TypeReference;
+{{/-first}}
+{{/oneOf}}
+
 {{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#oneOf}}{{#-first}}{{>oneof_model}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>anyof_model}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>pojo}}{{/anyOf}}{{/oneOf}}{{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_anyof_doc.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_anyof_doc.mustache
new file mode 100644
index 000000000000..e360aa56e6c3
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_anyof_doc.mustache
@@ -0,0 +1,38 @@
+# {{classname}}
+
+{{#description}}
+{{&description}}
+
+{{/description}}
+## anyOf schemas
+{{#anyOf}}
+* [{{{.}}}]({{{.}}}.md)
+{{/anyOf}}
+
+{{#isNullable}}
+NOTE: this class is nullable.
+
+{{/isNullable}}
+## Example
+```java
+// Import classes:
+import {{{package}}}.{{{classname}}};
+{{#anyOf}}
+import {{{package}}}.{{{.}}};
+{{/anyOf}}
+
+public class Example {
+    public static void main(String[] args) {
+        {{classname}} example{{classname}} = new {{classname}}();
+        {{#anyOf}}
+
+        // create a new {{{.}}}
+        {{{.}}} example{{{.}}} = new {{{.}}}();
+        // set {{{classname}}} to {{{.}}}
+        example{{classname}}.setActualInstance(example{{{.}}});
+        // to get back the {{{.}}} set earlier
+        {{{.}}} test{{{.}}} = ({{{.}}}) example{{classname}}.getActualInstance();
+        {{/anyOf}}
+    }
+}
+```
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_doc.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_doc.mustache
new file mode 100644
index 000000000000..be1aedcf2f31
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_doc.mustache
@@ -0,0 +1,19 @@
+{{#models}}{{#model}}
+
+{{#isEnum}}
+{{>enum_outer_doc}}
+{{/isEnum}}
+{{^isEnum}}
+{{^oneOf.isEmpty}}
+{{>model_oneof_doc}}
+{{/oneOf.isEmpty}}
+{{^anyOf.isEmpty}}
+{{>model_anyof_doc}}
+{{/anyOf.isEmpty}}
+{{^anyOf}}
+{{^oneOf}}
+{{>pojo_doc}}
+{{/oneOf}}
+{{/anyOf}}
+{{/isEnum}}
+{{/model}}{{/models}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_oneof_doc.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_oneof_doc.mustache
new file mode 100644
index 000000000000..5fff76c9efa0
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_oneof_doc.mustache
@@ -0,0 +1,38 @@
+# {{classname}}
+
+{{#description}}
+{{&description}}
+
+{{/description}}
+## oneOf schemas
+{{#oneOf}}
+* [{{{.}}}]({{{.}}}.md)
+{{/oneOf}}
+
+{{#isNullable}}
+NOTE: this class is nullable.
+
+{{/isNullable}}
+## Example
+```java
+// Import classes:
+import {{{package}}}.{{{classname}}};
+{{#oneOf}}
+import {{{package}}}.{{{.}}};
+{{/oneOf}}
+
+public class Example {
+    public static void main(String[] args) {
+        {{classname}} example{{classname}} = new {{classname}}();
+        {{#oneOf}}
+
+        // create a new {{{.}}}
+        {{{.}}} example{{{.}}} = new {{{.}}}();
+        // set {{{classname}}} to {{{.}}}
+        example{{classname}}.setActualInstance(example{{{.}}});
+        // to get back the {{{.}}} set earlier
+        {{{.}}} test{{{.}}} = ({{{.}}}) example{{classname}}.getActualInstance();
+        {{/oneOf}}
+    }
+}
+```
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache
index fec28f2e2dce..dedc9d634f72 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache
@@ -4,21 +4,44 @@ import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.HashSet;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import {{invokerPackage}}.JSON;
 
 {{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{>xmlAnnotation}}
-@JsonDeserialize(using={{classname}}.{{classname}}Deserializer.class)
+@JsonDeserialize(using = {{classname}}.{{classname}}Deserializer.class)
+@JsonSerialize(using = {{classname}}.{{classname}}Serializer.class)
 public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-implements}}, {{{.}}}{{/vendorExtensions.x-implements}} {
     private static final Logger log = Logger.getLogger({{classname}}.class.getName());
 
+    public static class {{classname}}Serializer extends StdSerializer<{{classname}}> {
+        public {{classname}}Serializer(Class<{{classname}}> t) {
+            super(t);
+        }
+
+        public {{classname}}Serializer() {
+            this(null);
+        }
+
+        @Override
+        public void serialize({{classname}} value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeObject(value.getActualInstance());
+        }
+    }
+
     public static class {{classname}}Deserializer extends StdDeserializer<{{classname}}> {
         public {{classname}}Deserializer() {
             this({{classname}}.class);
@@ -31,13 +54,33 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
         @Override
         public {{classname}} deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             JsonNode tree = jp.readValueAsTree();
+            Object deserialized = null;
+            {{#useOneOfDiscriminatorLookup}}
+            {{#discriminator}}
+            {{classname}} new{{classname}} = new {{classname}}();
+            Map<String,Object> result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference<Map<String, Object>>() {});
+            String discriminatorValue = (String)result2.get("{{{propertyBaseName}}}");
+            switch (discriminatorValue) {
+        	{{#mappedModels}}
+                case "{{{mappingName}}}":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs({{{modelName}}}.class);
+                    new{{classname}}.setActualInstance(deserialized);
+                    return new{{classname}};
+        	{{/mappedModels}}
+                default:
+                    log.log(Level.WARNING, String.format("Failed to lookup discriminator value `%s` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", discriminatorValue));
+            }
 
+            {{/discriminator}}
+            {{/useOneOfDiscriminatorLookup}}
             int match = 0;
-            Object deserialized = null;
             {{#oneOf}}
             // deserialize {{{.}}}
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs({{{.}}}.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema '{{{.}}}'");
             } catch (Exception e) {
@@ -53,6 +96,19 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
             }
             throw new IOException(String.format("Failed deserialization for {{classname}}: %d classes match result, expected 1", match));
         }
+
+        /**
+         * Handle deserialization of the 'null' value.
+         */
+        @Override
+        public {{classname}} getNullValue(DeserializationContext ctxt) throws JsonMappingException {
+        {{#isNullable}}
+            return null;
+        {{/isNullable}}
+        {{^isNullable}}
+            throw new JsonMappingException(ctxt.getParser(), "{{classname}} cannot be null");
+        {{/isNullable}}
+        }
     }
 
     // store a list of schema names defined in oneOf
@@ -61,7 +117,21 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
     public {{classname}}() {
         super("oneOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
     }
+{{> libraries/jersey2/additional_properties }}
+    {{#additionalPropertiesType}}
+    /**
+     * Return true if this {{name}} object is equal to o.
+     */
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o) && Objects.equals(this.additionalProperties, (({{classname}})o).additionalProperties);
+    }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(getActualInstance(), isNullable(), getSchemaType(), additionalProperties);
+    }
+    {{/additionalPropertiesType}}
     {{#oneOf}}
     public {{classname}}({{{.}}} o) {
         super("oneOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
@@ -74,6 +144,16 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
         schemas.put("{{{.}}}", new GenericType<{{{.}}}>() {
         });
         {{/oneOf}}
+        JSON.registerDescendants({{classname}}.class, Collections.unmodifiableMap(schemas));
+        {{#discriminator}}
+        // Initialize and register the discriminator mappings.
+        Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+        {{#mappedModels}}
+        mappings.put("{{mappingName}}", {{modelName}}.class);
+        {{/mappedModels}}
+        mappings.put("{{name}}", {{classname}}.class);
+        JSON.registerDiscriminator({{classname}}.class, "{{propertyBaseName}}", mappings);
+        {{/discriminator}}
     }
 
     @Override
@@ -81,17 +161,24 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
         return {{classname}}.schemas;
     }
 
+    /**
+     * Set the instance that matches the oneOf child schema, check
+     * the instance parameter is valid against the oneOf child schemas.
+     *
+     * It could be an instance of the 'oneOf' schemas.
+     * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
+     */
     @Override
     public void setActualInstance(Object instance) {
-        {{#isNulalble}}
+        {{#isNullable}}
         if (instance == null) {
            super.setActualInstance(instance);
            return;
         }
 
-        {{/isNulalble}}
+        {{/isNullable}}
         {{#oneOf}}
-        if (instance instanceof {{{.}}}) {
+        if (JSON.isInstanceOf({{{.}}}.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache
index c438cd43eb72..a74a9d35f4a8 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache
@@ -99,8 +99,12 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
 
   {{^isReadOnly}}
   public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) {
-    {{#vendorExtensions.x-is-jackson-optional-nullable}}this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{name}});{{/vendorExtensions.x-is-jackson-optional-nullable}}
-    {{^vendorExtensions.x-is-jackson-optional-nullable}}this.{{name}} = {{name}};{{/vendorExtensions.x-is-jackson-optional-nullable}}
+    {{#vendorExtensions.x-is-jackson-optional-nullable}}
+    this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{name}});
+    {{/vendorExtensions.x-is-jackson-optional-nullable}}
+    {{^vendorExtensions.x-is-jackson-optional-nullable}}
+    this.{{name}} = {{name}};
+    {{/vendorExtensions.x-is-jackson-optional-nullable}}
     return this;
   }
   {{#isListContainer}}
@@ -226,8 +230,11 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
   {{/isReadOnly}}
 
   {{/vars}}
-
+{{>libraries/jersey2/additional_properties}}
 {{^supportJava6}}
+  /**
+   * Return true if this {{name}} object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
   {{#useReflectionEqualsHashCode}}
@@ -242,7 +249,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
     }{{#hasVars}}
     {{classname}} {{classVarName}} = ({{classname}}) o;
     return {{#vars}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{#hasMore}} &&
-        {{/hasMore}}{{/vars}}{{#parent}} &&
+        {{/hasMore}}{{/vars}}{{#additionalPropertiesType}}&&
+        Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} &&
         super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
     return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}}
   {{/useReflectionEqualsHashCode}}
@@ -254,7 +262,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
     return HashCodeBuilder.reflectionHashCode(this);
   {{/useReflectionEqualsHashCode}}
   {{^useReflectionEqualsHashCode}}
-    return Objects.hash({{#vars}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{#hasMore}}, {{/hasMore}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}});
+    return Objects.hash({{#vars}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{#hasMore}}, {{/hasMore}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}});
   {{/useReflectionEqualsHashCode}}
   }
 
@@ -292,6 +300,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
     {{#vars}}
     sb.append("    {{name}}: ").append(toIndentedString({{name}})).append("\n");
     {{/vars}}
+    {{#additionalPropertiesType}}
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
+    {{/additionalPropertiesType}}
     sb.append("}");
     return sb.toString();
   }
@@ -366,4 +377,15 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
     }
   };
 {{/parcelableModel}}
+{{#discriminator}}
+static {
+  // Initialize and register the discriminator mappings.
+  Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+  {{#mappedModels}}
+  mappings.put("{{mappingName}}", {{modelName}}.class);
+  {{/mappedModels}}
+  mappings.put("{{name}}", {{classname}}.class);
+  JSON.registerDiscriminator({{classname}}.class, "{{propertyBaseName}}", mappings);
+}
+{{/discriminator}}
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
index 873fb95968d5..4b6850ff2309 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
@@ -74,6 +74,7 @@
                     <argLine>-Xms512m -Xmx1500m</argLine>
                     <parallel>methods</parallel>
                     <threadCount>10</threadCount>
+                    <trimStackTrace>false</trimStackTrace>
                 </configuration>
             </plugin>
             <plugin>
@@ -181,6 +182,17 @@
                 </executions>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                     <tags>
                         <tag>
                             <name>http.response.details</name>
@@ -361,6 +373,12 @@
             <scope>provided</scope>
         </dependency>
         {{/useBeanValidation}}
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -386,9 +404,10 @@
         {{#threetenbp}}
         <threetenbp-version>2.9.10</threetenbp-version>
         {{/threetenbp}}
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
         {{#hasHttpSignatureMethods}}
-        <http-signature-version>1.4</http-signature-version>
+        <http-signature-version>1.5</http-signature-version>
         {{/hasHttpSignatureMethods}}
         {{#hasOAuthMethods}}
         <scribejava-apis-version>6.9.0</scribejava-apis-version>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache
index 5bdcf238a2c1..ee3c5901fe41 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache
@@ -1,13 +1,24 @@
+{{#withXml}}
 @XmlType(name="{{datatypeWithEnum}}")
 @XmlEnum({{dataType}}.class)
-public enum {{datatypeWithEnum}} {
+{{/withXml}}
+{{^withXml}}
+  @JsonbTypeSerializer({{datatypeWithEnum}}.Serializer.class)
+  @JsonbTypeDeserializer({{datatypeWithEnum}}.Deserializer.class)
+{{/withXml}}
+  public enum {{datatypeWithEnum}} {
 
     {{#allowableValues}}
-{{#enumVars}}@XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}) {{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
+    {{#withXml}}
+    {{#enumVars}}@XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}) {{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
+	{{/withXml}}
+	{{^withXml}}
+    {{#enumVars}}{{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}	
+	{{/withXml}}
     {{/allowableValues}}
 
 
-    private {{dataType}} value;
+    {{dataType}} value;
 
     {{datatypeWithEnum}} ({{dataType}} v) {
         value = v;
@@ -22,6 +33,7 @@ public enum {{datatypeWithEnum}} {
         return String.valueOf(value);
     }
 
+    {{#withXml}}
     public static {{datatypeWithEnum}} fromValue(String v) {
         for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) {
             if (String.valueOf(b.value).equals(v)) {
@@ -30,4 +42,25 @@ public enum {{datatypeWithEnum}} {
         }
         {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + v + "'");{{/useNullForUnknownEnumValue}}
     }
-}
+    {{/withXml}}
+    {{^withXml}}
+    public static final class Deserializer implements JsonbDeserializer<{{datatypeWithEnum}}> {
+        @Override
+        public {{datatypeWithEnum}} deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) {
+            for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) {
+                if (String.valueOf(b.value).equals(parser.getString())) {
+                    return b;
+                }
+            }
+            {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'");{{/useNullForUnknownEnumValue}}
+        }
+    }
+
+    public static final class Serializer implements JsonbSerializer<{{datatypeWithEnum}}> {
+        @Override
+        public void serialize({{datatypeWithEnum}} obj, JsonGenerator generator, SerializationContext ctx) {
+            generator.write(obj.value);
+        }
+    }
+    {{/withXml}}
+  }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/generatedAnnotation.mustache
index 49110fc1ad93..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/generatedAnnotation.mustache
@@ -1 +1 @@
-@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache
index 4ded8e94e2e9..b69cf9dbfd6c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache
@@ -1,3 +1,4 @@
+{{#withXml}}
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -5,7 +6,19 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
+{{/withXml}}
+{{^withXml}}
+import java.lang.reflect.Type;
+import javax.json.bind.annotation.JsonbTypeDeserializer;
+import javax.json.bind.annotation.JsonbTypeSerializer;
+import javax.json.bind.serializer.DeserializationContext;
+import javax.json.bind.serializer.JsonbDeserializer;
+import javax.json.bind.serializer.JsonbSerializer;
+import javax.json.bind.serializer.SerializationContext;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonParser;
 import javax.json.bind.annotation.JsonbProperty;
+{{/withXml}}
 
 {{#withXml}}
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -56,16 +69,20 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ
   {{/maximum}}
    * @return {{name}}
   **/
+  {{^withXml}}
   @JsonbProperty("{{baseName}}")
+  {{/withXml}}
 {{#vendorExtensions.x-extra-annotation}}
   {{{vendorExtensions.x-extra-annotation}}}
 {{/vendorExtensions.x-extra-annotation}}
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{dataType}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#withXml}}{{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{dataType}} {{getter}}() {
     if ({{name}} == null) {
       return null;
     }
     return {{name}}.value();
-  }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{/withXml}}{{^withXml}}{{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{datatypeWithEnum}} {{getter}}() {
+    return {{name}};
+  }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{/withXml}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
index ca7d6b7a8300..f57a1f772340 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
@@ -88,7 +88,6 @@
       <version>1.3.5</version>
       <scope>test</scope>
     </dependency>
-    
     {{^disableMultipart}}
     <dependency>
         <groupId>org.apache.cxf</groupId>
@@ -96,12 +95,16 @@
         <version>3.2.6</version>
     </dependency>
     {{/disableMultipart}}
-
     <dependency>
       <groupId>javax.json.bind</groupId>
       <artifactId>javax.json.bind-api</artifactId>
       <version>1.0</version>
     </dependency>
+    <dependency>
+        <groupId>javax.json</groupId>
+        <artifactId>javax.json-api</artifactId>
+        <version>1.1.4</version>
+    </dependency>
     <dependency>
         <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>
@@ -143,7 +146,13 @@
         <artifactId>hibernate-validator</artifactId>
         <version>5.2.2.Final</version>
     </dependency>
-{{/useBeanValidationFeature}}    
+{{/useBeanValidationFeature}}
+    <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>${javax-annotation-version}</version>
+        <scope>provided</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
@@ -168,6 +177,7 @@
 {{/useBeanValidation}}
     <cxf-version>3.2.7</cxf-version>
     <jackson-jaxrs-version>2.9.7</jackson-jaxrs-version>
+    <javax-annotation-version>1.3.2</javax-annotation-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiResponse.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiResponse.mustache
new file mode 100644
index 000000000000..1f3f3a31981b
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiResponse.mustache
@@ -0,0 +1,58 @@
+{{>licenseInfo}}
+
+package {{invokerPackage}};
+
+import java.util.List;
+import java.util.Map;
+{{#caseInsensitiveResponseHeaders}}
+import java.util.Map.Entry;		
+import java.util.TreeMap;
+{{/caseInsensitiveResponseHeaders}}
+
+/**
+ * API response returned by API call.
+ *
+ * @param <T> The type of data that is deserialized from response body
+ */
+public class ApiResponse<T> {
+    final private int statusCode;
+    final private Map<String, List<String>> headers;
+    final private T data;
+
+    /**
+     * @param statusCode The status code of HTTP response
+     * @param headers The headers of HTTP response
+     */
+    public ApiResponse(int statusCode, Map<String, List<String>> headers) {
+        this(statusCode, headers, null);
+    }
+
+    /**
+     * @param statusCode The status code of HTTP response
+     * @param headers The headers of HTTP response
+     * @param data The object deserialized from response bod
+     */
+    public ApiResponse(int statusCode, Map<String, List<String>> headers, T data) {
+        this.statusCode = statusCode;
+        {{#caseInsensitiveResponseHeaders}}
+        Map<String, List<String>> responseHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+        for(Entry<String, List<String>> entry : headers.entrySet()){
+           responseHeaders.put(entry.getKey().toLowerCase(), entry.getValue());
+        }
+        {{/caseInsensitiveResponseHeaders}}
+        this.headers = {{#caseInsensitiveResponseHeaders}}responseHeaders{{/caseInsensitiveResponseHeaders}}{{^caseInsensitiveResponseHeaders}}headers{{/caseInsensitiveResponseHeaders}};
+        this.data = data;
+    }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    public Map<String, List<String>> getHeaders() {
+        return headers;
+    }
+
+    public T getData() {
+        return data;
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache
index f574b47b4853..7257a26f95f9 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache
@@ -81,7 +81,11 @@ Please follow the [installation](#installation) instruction and execute the foll
 {{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}
 import {{{invokerPackage}}}.*;
 import {{{modelPackage}}}.*;
-import {{{package}}}.{{{classname}}};
+import {{{package}}}.{{{classname}}};{{#vendorExtensions.x-group-parameters}}
+import {{{package}}}.{{{classname}}}.*;{{/vendorExtensions.x-group-parameters}}
+{{#asyncNative}}
+import java.util.concurrent.CompletableFuture;
+{{/asyncNative}}
 
 public class {{{classname}}}Example {
 
@@ -94,7 +98,12 @@ public class {{{classname}}}Example {
         {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{description}}}
         {{/allParams}}
         try {
-            {{#returnType}}{{{returnType}}} result = {{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
+            {{^vendorExtensions.x-group-parameters}}
+            {{#returnType}}{{#asyncNative}}CompletableFuture<{{{returnType}}}>{{/asyncNative}}{{^asyncNative}}{{{returnType}}}{{/asyncNative}} result = {{/returnType}}{{^returnType}}{{#asyncNative}}CompletableFuture<Void> result = {{/asyncNative}}{{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}{{#hasParams}}
+            API{{operationId}}Request request = API{{operationId}}Request.newBuilder(){{#allParams}}
+                .{{paramName}}({{paramName}}){{/allParams}}
+                .build();{{/hasParams}}
+            {{#returnType}}{{#asyncNative}}CompletableFuture<{{{returnType}}}>{{/asyncNative}}{{^asyncNative}}{{{returnType}}}{{/asyncNative}} result = {{/returnType}}{{^returnType}}{{#asyncNative}}CompletableFuture<Void> result = {{/asyncNative}}{{/returnType}}apiInstance.{{operationId}}({{#hasParams}}request{{/hasParams}});{{/vendorExtensions.x-group-parameters}}{{#returnType}}
             System.out.println(result);{{/returnType}}
         } catch (ApiException e) {
             System.err.println("Exception when calling {{{classname}}}#{{{operationId}}}");
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache
index 7d6ed2d4bb7a..1fca38643964 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache
@@ -3,6 +3,9 @@ package {{package}};
 
 import {{invokerPackage}}.ApiClient;
 import {{invokerPackage}}.ApiException;
+{{^asyncNative}}
+import {{invokerPackage}}.ApiResponse;
+{{/asyncNative}}
 import {{invokerPackage}}.Pair;
 
 {{#imports}}
@@ -27,8 +30,8 @@ import java.util.StringJoiner;
 import java.util.List;
 import java.util.Map;
 {{/fullJavaUtil}}
-
 {{#asyncNative}}
+
 import java.util.concurrent.CompletableFuture;
 {{/asyncNative}}
 
@@ -41,7 +44,7 @@ public class {{classname}} {
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  
+
   public {{classname}}() {
     this(new ApiClient());
   }
@@ -56,6 +59,62 @@ public class {{classname}} {
   }
 
   {{#operation}}
+  {{#vendorExtensions.x-group-parameters}}
+  {{#hasParams}}
+  /**
+   * {{summary}}
+   * {{notes}}
+   * @param {{operationId}}Request {@link API{{operationId}}Request}
+   {{#returnType}}
+   * @return {{returnType}}
+   {{/returnType}}
+   * @throws ApiException if fails to make API call
+   {{#isDeprecated}}
+   * @deprecated
+   {{/isDeprecated}}
+   {{#externalDocs}}
+   * {{description}}
+   * @see <a href="{{url}}">{{summary}} Documentation</a>
+   {{/externalDocs}}
+   */
+  {{#isDeprecated}}
+  @Deprecated
+  {{/isDeprecated}}
+  public {{#returnType}}{{#asyncNative}}CompletableFuture<{{{returnType}}}>{{/asyncNative}}{{^asyncNative}}{{{returnType}}}{{/asyncNative}}{{/returnType}}{{^returnType}}{{#asyncNative}}CompletableFuture<Void>{{/asyncNative}}{{^asyncNative}}void{{/asyncNative}}{{/returnType}} {{operationId}}(API{{operationId}}Request {{operationId}}Request) throws ApiException {
+    {{#allParams}}
+    {{{dataType}}} {{paramName}} = {{operationId}}Request.{{paramName}}();
+    {{/allParams}}
+    {{#returnType}}return {{/returnType}}{{^returnType}}{{#asyncNative}}return {{/asyncNative}}{{/returnType}}{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+  }
+  {{^asyncNative}}
+
+  /**
+   * {{summary}}
+   * {{notes}}
+   * @param {{operationId}}Request {@link API{{operationId}}Request}
+   * @return ApiResponse&lt;{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Void{{/returnType}}&gt;
+   * @throws ApiException if fails to make API call
+   {{#isDeprecated}}
+   * @deprecated
+   {{/isDeprecated}}
+   {{#externalDocs}}
+   * {{description}}
+   * @see <a href="{{url}}">{{summary}} Documentation</a>
+   {{/externalDocs}}
+   */
+  {{#isDeprecated}}
+  @Deprecated
+  {{/isDeprecated}}
+  public ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo(API{{operationId}}Request {{operationId}}Request) throws ApiException {
+    {{#allParams}}
+    {{{dataType}}} {{paramName}} = {{operationId}}Request.{{paramName}}();
+    {{/allParams}}
+    return {{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+  }
+  {{/asyncNative}}
+
+  {{/hasParams}}
+  {{/vendorExtensions.x-group-parameters}}
   /**
    * {{summary}}
    * {{notes}}
@@ -77,17 +136,103 @@ public class {{classname}} {
   {{#isDeprecated}}
   @Deprecated
   {{/isDeprecated}}
-  public {{#returnType}}{{#asyncNative}}CompletableFuture<{{{returnType}}}>{{/asyncNative}}{{^asyncNative}}{{{returnType}}}{{/asyncNative}}{{/returnType}}{{^returnType}}{{#asyncNative}}CompletableFuture<Void>{{/asyncNative}}{{^asyncNative}}void{{/asyncNative}}{{/returnType}} {{operationId}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
+  public {{#returnType}}{{#asyncNative}}CompletableFuture<{{{returnType}}}>{{/asyncNative}}{{^asyncNative}}{{{returnType}}}{{/asyncNative}}{{/returnType}}{{^returnType}}{{#asyncNative}}CompletableFuture<Void>{{/asyncNative}}{{^asyncNative}}void{{/asyncNative}}{{/returnType}} {{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
+    {{^asyncNative}}
+    {{#returnType}}ApiResponse<{{{returnType}}}> localVarResponse = {{/returnType}}{{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+    {{#returnType}}
+    return localVarResponse.getData();
+    {{/returnType}}
+    {{/asyncNative}}
+    {{#asyncNative}}
+    try {
+      HttpRequest.Builder localVarRequestBuilder = {{operationId}}RequestBuilder({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+      return memberVarHttpClient.sendAsync(
+              localVarRequestBuilder.build(),
+              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
+          if (localVarResponse.statusCode()/ 100 != 2) {
+              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
+                  "{{operationId}} call received non-success response",
+                  localVarResponse.headers(),
+                  localVarResponse.body())
+              );
+          } else {
+              {{#returnType}}
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<{{{returnType}}}>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
+              {{/returnType}}
+              {{^returnType}}
+              return CompletableFuture.completedFuture(null);
+              {{/returnType}}
+          }
+      });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
+    {{/asyncNative}}
+  }
+  {{^asyncNative}}
+
+  /**
+   * {{summary}}
+   * {{notes}}
+   {{#allParams}}
+   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}{{/required}}
+   {{/allParams}}
+   * @return ApiResponse&lt;{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Void{{/returnType}}&gt;
+   * @throws ApiException if fails to make API call
+   {{#isDeprecated}}
+   * @deprecated
+   {{/isDeprecated}}
+   {{#externalDocs}}
+   * {{description}}
+   * @see <a href="{{url}}">{{summary}} Documentation</a>
+   {{/externalDocs}}
+   */
+  {{#isDeprecated}}
+  @Deprecated
+  {{/isDeprecated}}
+  public ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = {{operationId}}RequestBuilder({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+    try {
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (memberVarResponseInterceptor != null) {
+        memberVarResponseInterceptor.accept(localVarResponse);
+      }
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "{{operationId}} call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+      return new ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          {{#returnType}}memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<{{{returnType}}}>() {}){{/returnType}}{{^returnType}}null{{/returnType}}
+        );
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new ApiException(e);
+    }
+  }
+  {{/asyncNative}}
+
+  private HttpRequest.Builder {{operationId}}RequestBuilder({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
     {{#allParams}}
     {{#required}}
     // verify the required parameter '{{paramName}}' is set
     if ({{paramName}} == null) {
-    {{#asyncNative}}
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{operationId}}"));
-    {{/asyncNative}}
-    {{^asyncNative}}
-        throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{operationId}}");
-    {{/asyncNative}}
+      throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{operationId}}");
     }
     {{/required}}
     {{/allParams}}
@@ -131,89 +276,75 @@ public class {{classname}} {
     {{/bodyParam}}
     localVarRequestBuilder.header("Accept", "application/json");
 
-    {{^asyncNative}}
-    try {
-    {{/asyncNative}}
-    {{#asyncNative}}
-      {{#bodyParam}}
+    {{#bodyParam}}
     try {
-      {{/bodyParam}}
-    {{/asyncNative}}
-      {{#bodyParam}}
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes({{paramName}});
       localVarRequestBuilder.method("{{httpMethod}}", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      {{/bodyParam}}
-      {{^bodyParam}}
-      localVarRequestBuilder.method("{{httpMethod}}", HttpRequest.BodyPublishers.noBody());
-      {{/bodyParam}}
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      {{^asyncNative}}
-      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
-      if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
-      }          
-      if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "{{operationId}} call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
-      }
-      {{#returnType}}
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<{{{returnType}}}>() {});
-      {{/returnType}}
-      {{/asyncNative}}
-      {{#asyncNative}}
-      return memberVarHttpClient.sendAsync(
-              localVarRequestBuilder.build(),
-              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
-          if (localVarResponse.statusCode()/ 100 != 2) {
-              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "{{operationId}} call received non-success response",
-                  localVarResponse.headers(),
-                  localVarResponse.body())
-              );
-          } else {
-               try {
-                  return CompletableFuture.completedFuture(
-                      {{#returnType}}
-                          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<{{{returnType}}}>() {})
-                      {{/returnType}}
-                      {{^returnType}}
-                          null
-                      {{/returnType}}
-                  );
-              } catch (IOException e) {
-                  return CompletableFuture.failedFuture(new ApiException(e));
-              }
-          }
-      });
-      {{/asyncNative}}
-    {{#asyncNative}}
-    {{#bodyParam}}
     } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+      throw new ApiException(e);
     }
     {{/bodyParam}}
-    {{/asyncNative}}
-    {{^asyncNative}}
-    } catch (IOException e) {
-      throw new ApiException(e);
+    {{^bodyParam}}
+    localVarRequestBuilder.method("{{httpMethod}}", HttpRequest.BodyPublishers.noBody());
+    {{/bodyParam}}
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
     }
-    {{/asyncNative}}
-    {{^asyncNative}}
-    catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new ApiException(e);
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  {{#vendorExtensions.x-group-parameters}}
+  {{#hasParams}}
+
+  public static final class API{{operationId}}Request {
+    {{#requiredParams}}
+    private {{{dataType}}} {{paramName}}; // {{description}} (required)
+    {{/requiredParams}}
+    {{#optionalParams}}
+    private {{{dataType}}} {{paramName}}; // {{description}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}
+    {{/optionalParams}}
+
+    private API{{operationId}}Request(Builder builder) {
+      {{#requiredParams}}
+      this.{{paramName}} = builder.{{paramName}};
+      {{/requiredParams}}
+      {{#optionalParams}}
+      this.{{paramName}} = builder.{{paramName}};
+      {{/optionalParams}}
+    }
+    {{#allParams}}
+    public {{{dataType}}} {{paramName}}() {
+      return {{paramName}};
+    }
+    {{/allParams}}
+    public static Builder newBuilder() {
+      return new Builder();
+    }
+
+    public static class Builder {
+      {{#requiredParams}}
+      private {{{dataType}}} {{paramName}};
+      {{/requiredParams}}
+      {{#optionalParams}}
+      private {{{dataType}}} {{paramName}};
+      {{/optionalParams}}
+
+      {{#allParams}}
+      public Builder {{paramName}}({{{dataType}}} {{paramName}}) {
+        this.{{paramName}} = {{paramName}};
+        return this;
+      }
+      {{/allParams}}
+      public API{{operationId}}Request build() {
+        return new API{{operationId}}Request(this);
+      }
     }
-    {{/asyncNative}}
   }
+
+  {{/hasParams}}
+  {{/vendorExtensions.x-group-parameters}}
   {{/operation}}
 }
 {{/operations}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/api_doc.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/api_doc.mustache
new file mode 100644
index 000000000000..ff699f921e67
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/api_doc.mustache
@@ -0,0 +1,269 @@
+# {{classname}}{{#description}}
+
+{{description}}{{/description}}
+
+All URIs are relative to *{{basePath}}*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{^asyncNative}}
+[**{{operationId}}WithHttpInfo**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/asyncNative}}
+{{/operation}}{{/operations}}
+
+{{#operations}}
+{{#operation}}
+
+## {{operationId}}
+
+{{^vendorExtensions.x-group-parameters}}
+> {{#returnType}}{{#asyncNative}}CompletableFuture<{{{returnType}}}>{{/asyncNative}}{{^asyncNative}}{{{returnType}}}{{/asyncNative}}{{/returnType}}{{^returnType}}{{#asyncNative}}CompletableFuture<Void>{{/asyncNative}}{{^asyncNative}}void{{/asyncNative}}{{/returnType}} {{operationId}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+{{/vendorExtensions.x-group-parameters}}
+{{#vendorExtensions.x-group-parameters}}
+> {{#returnType}}{{#asyncNative}}CompletableFuture<{{{returnType}}}>{{/asyncNative}}{{^asyncNative}}{{{returnType}}}{{/asyncNative}}{{/returnType}}{{^returnType}}{{#asyncNative}}CompletableFuture<Void>{{/asyncNative}}{{^asyncNative}}void{{/asyncNative}}{{/returnType}} {{operationId}}({{#hasParams}}{{operationId}}Request{{/hasParams}})
+{{/vendorExtensions.x-group-parameters}}
+
+{{summary}}{{#notes}}
+
+{{notes}}{{/notes}}
+
+### Example
+
+```java
+// Import classes:
+import {{{invokerPackage}}}.ApiClient;
+import {{{invokerPackage}}}.ApiException;
+import {{{invokerPackage}}}.Configuration;{{#hasAuthMethods}}
+import {{{invokerPackage}}}.auth.*;{{/hasAuthMethods}}
+import {{{invokerPackage}}}.models.*;
+import {{{package}}}.{{{classname}}};{{#vendorExtensions.x-group-parameters}}
+import {{{package}}}.{{{classname}}}.*;{{/vendorExtensions.x-group-parameters}}
+{{#asyncNative}}
+import java.util.concurrent.CompletableFuture;
+{{/asyncNative}}
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("{{{basePath}}}");
+        {{#hasAuthMethods}}
+        {{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
+        // Configure HTTP basic authorization: {{{name}}}
+        HttpBasicAuth {{{name}}} = (HttpBasicAuth) defaultClient.getAuthentication("{{{name}}}");
+        {{{name}}}.setUsername("YOUR USERNAME");
+        {{{name}}}.setPassword("YOUR PASSWORD");{{/isBasicBasic}}{{#isBasicBearer}}
+        // Configure HTTP bearer authorization: {{{name}}}
+        HttpBearerAuth {{{name}}} = (HttpBearerAuth) defaultClient.getAuthentication("{{{name}}}");
+        {{{name}}}.setBearerToken("BEARER TOKEN");{{/isBasicBearer}}{{/isBasic}}{{#isApiKey}}
+        // Configure API key authorization: {{{name}}}
+        ApiKeyAuth {{{name}}} = (ApiKeyAuth) defaultClient.getAuthentication("{{{name}}}");
+        {{{name}}}.setApiKey("YOUR API KEY");
+        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+        //{{{name}}}.setApiKeyPrefix("Token");{{/isApiKey}}{{#isOAuth}}
+        // Configure OAuth2 access token for authorization: {{{name}}}
+        OAuth {{{name}}} = (OAuth) defaultClient.getAuthentication("{{{name}}}");
+        {{{name}}}.setAccessToken("YOUR ACCESS TOKEN");{{/isOAuth}}
+        {{/authMethods}}
+        {{/hasAuthMethods}}
+
+        {{{classname}}} apiInstance = new {{{classname}}}(defaultClient);
+        {{#allParams}}
+        {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{description}}}
+        {{/allParams}}
+        try {
+            {{^vendorExtensions.x-group-parameters}}
+            {{#returnType}}{{#asyncNative}}CompletableFuture<{{{returnType}}}>{{/asyncNative}}{{^asyncNative}}{{{returnType}}}{{/asyncNative}} result = {{/returnType}}{{^returnType}}{{#asyncNative}}CompletableFuture<Void> result = {{/asyncNative}}{{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+            {{/vendorExtensions.x-group-parameters}}
+            {{#vendorExtensions.x-group-parameters}}
+            {{#hasParams}}
+            API{{operationId}}Request request = API{{operationId}}Request.newBuilder(){{#allParams}}
+                .{{paramName}}({{paramName}}){{/allParams}}
+                .build();
+            {{/hasParams}}
+            {{#returnType}}{{#asyncNative}}CompletableFuture<{{{returnType}}}>{{/asyncNative}}{{^asyncNative}}{{{returnType}}}{{/asyncNative}} result = {{/returnType}}{{^returnType}}{{#asyncNative}}CompletableFuture<Void> result = {{/asyncNative}}{{/returnType}}apiInstance.{{operationId}}({{#hasParams}}request{{/hasParams}});{{/vendorExtensions.x-group-parameters}}{{#returnType}}
+            System.out.println(result);{{/returnType}}
+        } catch (ApiException e) {
+            System.err.println("Exception when calling {{{classname}}}#{{{operationId}}}");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{^vendorExtensions.x-group-parameters}}{{#allParams}}{{#-last}}
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
+{{#allParams}} **{{paramName}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} |{{^required}} [optional]{{/required}}{{^isContainer}}{{#defaultValue}} [default to {{defaultValue}}]{{/defaultValue}}{{/isContainer}}{{#allowableValues}} [enum: {{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}]{{/allowableValues}}
+{{/allParams}}
+{{/vendorExtensions.x-group-parameters}}
+{{#vendorExtensions.x-group-parameters}}
+{{#hasParams}}
+|    Name      |    Type       | Description   |     Notes    |
+|------------- | ------------- | ------------- | -------------|
+| {{operationId}}Request | [**API{{operationId}}Request**]({{classname}}.md#API{{operationId}}Request)|-|-|{{/hasParams}}
+{{/vendorExtensions.x-group-parameters}}
+
+### Return type
+
+{{#returnType}}{{#asyncNative}}CompletableFuture<{{/asyncNative}}{{#returnTypeIsPrimitive}}**{{returnType}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{returnType}}**]({{returnBaseType}}.md){{/returnTypeIsPrimitive}}{{#asyncNative}}>{{/asyncNative}}{{/returnType}}
+{{^returnType}}{{#asyncNative}}CompletableFuture<void>{{/asyncNative}}{{^asyncNative}}null{{/asyncNative}} (empty response body){{/returnType}}
+
+### Authorization
+
+{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{name}}](../README.md#{{name}}){{^-last}}, {{/-last}}{{/authMethods}}
+
+### HTTP request headers
+
+- **Content-Type**: {{#consumes}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
+- **Accept**: {{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
+
+{{#responses.0}}
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+{{#responses}}
+| **{{code}}** | {{message}} | {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} |
+{{/responses}}
+{{/responses.0}}
+{{^asyncNative}}
+
+## {{operationId}}WithHttpInfo
+
+{{^vendorExtensions.x-group-parameters}}
+> ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}} {{operationId}}WithHttpInfo({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+{{/vendorExtensions.x-group-parameters}}
+{{#vendorExtensions.x-group-parameters}}
+> ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}} {{operationId}}WithHttpInfo({{#hasParams}}{{operationId}}Request{{/hasParams}})
+{{/vendorExtensions.x-group-parameters}}
+
+{{summary}}{{#notes}}
+
+{{notes}}{{/notes}}
+
+### Example
+
+```java
+// Import classes:
+import {{{invokerPackage}}}.ApiClient;
+import {{{invokerPackage}}}.ApiException;
+import {{{invokerPackage}}}.ApiResponse;
+import {{{invokerPackage}}}.Configuration;{{#hasAuthMethods}}
+import {{{invokerPackage}}}.auth.*;{{/hasAuthMethods}}
+import {{{invokerPackage}}}.models.*;
+import {{{package}}}.{{{classname}}};{{#vendorExtensions.x-group-parameters}}
+import {{{package}}}.{{{classname}}}.*;{{/vendorExtensions.x-group-parameters}}
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("{{{basePath}}}");
+        {{#hasAuthMethods}}
+        {{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
+        // Configure HTTP basic authorization: {{{name}}}
+        HttpBasicAuth {{{name}}} = (HttpBasicAuth) defaultClient.getAuthentication("{{{name}}}");
+        {{{name}}}.setUsername("YOUR USERNAME");
+        {{{name}}}.setPassword("YOUR PASSWORD");{{/isBasicBasic}}{{#isBasicBearer}}
+        // Configure HTTP bearer authorization: {{{name}}}
+        HttpBearerAuth {{{name}}} = (HttpBearerAuth) defaultClient.getAuthentication("{{{name}}}");
+        {{{name}}}.setBearerToken("BEARER TOKEN");{{/isBasicBearer}}{{/isBasic}}{{#isApiKey}}
+        // Configure API key authorization: {{{name}}}
+        ApiKeyAuth {{{name}}} = (ApiKeyAuth) defaultClient.getAuthentication("{{{name}}}");
+        {{{name}}}.setApiKey("YOUR API KEY");
+        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+        //{{{name}}}.setApiKeyPrefix("Token");{{/isApiKey}}{{#isOAuth}}
+        // Configure OAuth2 access token for authorization: {{{name}}}
+        OAuth {{{name}}} = (OAuth) defaultClient.getAuthentication("{{{name}}}");
+        {{{name}}}.setAccessToken("YOUR ACCESS TOKEN");{{/isOAuth}}
+        {{/authMethods}}
+        {{/hasAuthMethods}}
+
+        {{{classname}}} apiInstance = new {{{classname}}}(defaultClient);
+        {{#allParams}}
+        {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{description}}}
+        {{/allParams}}
+        try {
+            {{^vendorExtensions.x-group-parameters}}
+            ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> response = apiInstance.{{{operationId}}}WithHttpInfo({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+            {{/vendorExtensions.x-group-parameters}}
+            {{#vendorExtensions.x-group-parameters}}
+            {{#hasParams}}
+            API{{operationId}}Request request = API{{operationId}}Request.newBuilder(){{#allParams}}
+                .{{paramName}}({{paramName}}){{/allParams}}
+                .build();
+            {{/hasParams}}
+            ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> response = apiInstance.{{{operationId}}}WithHttpInfo({{#hasParams}}request{{/hasParams}});
+            {{/vendorExtensions.x-group-parameters}}
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            {{#returnType}}
+            System.out.println("Response body: " + response.getData().toString());
+            {{/returnType}}
+        } catch (ApiException e) {
+            System.err.println("Exception when calling {{{classname}}}#{{{operationId}}}");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{^vendorExtensions.x-group-parameters}}{{#allParams}}{{#-last}}
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
+{{#allParams}} **{{paramName}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} |{{^required}} [optional]{{/required}}{{^isContainer}}{{#defaultValue}} [default to {{defaultValue}}]{{/defaultValue}}{{/isContainer}}{{#allowableValues}} [enum: {{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}]{{/allowableValues}}
+{{/allParams}}
+{{/vendorExtensions.x-group-parameters}}
+{{#vendorExtensions.x-group-parameters}}
+{{#hasParams}}
+|    Name      |    Type       | Description   |     Notes    |
+|------------- | ------------- | ------------- | -------------|
+| {{operationId}}Request | [**API{{operationId}}Request**]({{classname}}.md#API{{operationId}}Request)|-|-|{{/hasParams}}
+{{/vendorExtensions.x-group-parameters}}
+
+### Return type
+
+{{#returnType}}ApiResponse<{{#returnTypeIsPrimitive}}**{{returnType}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{returnType}}**]({{returnBaseType}}.md){{/returnTypeIsPrimitive}}>{{/returnType}}
+{{^returnType}}ApiResponse<Void>{{/returnType}}
+
+### Authorization
+
+{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{name}}](../README.md#{{name}}){{^-last}}, {{/-last}}{{/authMethods}}
+
+### HTTP request headers
+
+- **Content-Type**: {{#consumes}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
+- **Accept**: {{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
+
+{{#responses.0}}
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+{{#responses}}
+| **{{code}}** | {{message}} | {{#headers}} * {{baseName}} - {{description}} <br> {{/headers}}{{^headers.0}} - {{/headers.0}} |
+{{/responses}}
+{{/responses.0}}
+{{/asyncNative}}
+{{#vendorExtensions.x-group-parameters}}{{#hasParams}}
+
+<a name="API{{operationId}}Request"></a>
+## API{{operationId}}Request
+### Properties
+{{#allParams}}{{#-last}}
+|     Name      |    Type       | Description   |     Notes    |
+| ------------- | ------------- | ------------- | -------------|{{/-last}}{{/allParams}}
+{{#allParams}} **{{paramName}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}} | {{description}} |{{^required}} [optional]{{/required}}{{^isContainer}}{{#defaultValue}} [default to {{defaultValue}}]{{/defaultValue}}{{/isContainer}}{{#allowableValues}} [enum: {{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}]{{/allowableValues}}
+{{/allParams}}
+
+{{/hasParams}}{{/vendorExtensions.x-group-parameters}}
+{{/operation}}
+{{/operations}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/api_test.mustache
new file mode 100644
index 000000000000..dbfedfeb7b00
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/api_test.mustache
@@ -0,0 +1,59 @@
+{{>licenseInfo}}
+
+package {{package}};
+
+import {{invokerPackage}}.ApiException;
+{{#imports}}import {{import}};
+{{/imports}}
+import org.junit.Test;
+import org.junit.Ignore;
+
+{{^fullJavaUtil}}
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+{{/fullJavaUtil}}
+
+{{#asyncNative}}
+import java.util.concurrent.CompletableFuture;
+{{/asyncNative}}
+
+/**
+ * API tests for {{classname}}
+ */
+@Ignore
+public class {{classname}}Test {
+
+    private final {{classname}} api = new {{classname}}();
+
+    {{#operations}}{{#operation}}
+    /**
+     * {{summary}}
+     *
+     * {{notes}}
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void {{operationId}}Test() throws ApiException {
+        {{#allParams}}
+        {{{dataType}}} {{paramName}} = null;
+        {{/allParams}}
+        {{^vendorExtensions.x-group-parameters}}
+        {{#returnType}}{{#asyncNative}}CompletableFuture<{{{returnType}}}>{{/asyncNative}}{{^asyncNative}}{{{returnType}}}{{/asyncNative}} response = {{/returnType}}
+        {{^returnType}}{{#asyncNative}}CompletableFuture<Void> response = {{/asyncNative}}{{/returnType}}api.{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+        {{/vendorExtensions.x-group-parameters}}
+        {{#vendorExtensions.x-group-parameters}}{{#hasParams}}
+        {{classname}}.API{{operationId}}Request request = {{classname}}.API{{operationId}}Request.newBuilder(){{#allParams}}
+          .{{paramName}}({{paramName}}){{/allParams}}
+          .build();{{/hasParams}}
+        {{#returnType}}{{#asyncNative}}CompletableFuture<{{{returnType}}}>{{/asyncNative}}{{^asyncNative}}{{{returnType}}}{{/asyncNative}} response = {{/returnType}}
+        {{^returnType}}{{#asyncNative}}CompletableFuture<Void> response = {{/asyncNative}}{{/returnType}}api.{{operationId}}({{#hasParams}}request{{/hasParams}});
+        {{/vendorExtensions.x-group-parameters}}
+
+        // TODO: test validations
+    }
+    {{/operation}}{{/operations}}
+}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache
index cea6681a95e0..f3d5335ad5f7 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache
@@ -62,5 +62,7 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
+    compile "org.openapitools:jackson-databind-nullable:0.2.1"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/generatedAnnotation.mustache
index dc1f2cd40e96..baf5ff08b496 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/generatedAnnotation.mustache
@@ -1 +1 @@
-{{^hideGenerationTimestamp}}@javax.annotation.processing.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.processing.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache
index 7e6ebb2f950e..d9f160341c27 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache
@@ -200,6 +200,12 @@
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -216,6 +222,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <jackson-version>2.9.9</jackson-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
     </properties>
 </project>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
index 3969c08d3910..0b74114ac5e5 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
@@ -102,6 +102,23 @@ public class ApiClient {
         authentications = Collections.unmodifiableMap(authentications);
     }
 
+    /*
+     * Basic constructor with custom OkHttpClient
+     */
+    public ApiClient(OkHttpClient client) {
+        init();
+
+        httpClient = client;
+
+        // Setup authentications (key: authentication name, value: authentication).{{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
+        authentications.put("{{name}}", new HttpBasicAuth());{{/isBasicBasic}}{{^isBasicBasic}}
+        authentications.put("{{name}}", new HttpBearerAuth("{{scheme}}"));{{/isBasicBasic}}{{/isBasic}}{{#isApiKey}}
+        authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{#isKeyInQuery}}"query"{{/isKeyInQuery}}{{#isKeyInCookie}}"cookie"{{/isKeyInCookie}}, "{{keyParamName}}"));{{/isApiKey}}{{#isOAuth}}
+        authentications.put("{{name}}", new OAuth());{{/isOAuth}}{{/authMethods}}
+        // Prevent the authentications from being modified.
+        authentications = Collections.unmodifiableMap(authentications);
+    }
+
     {{#hasOAuthMethods}}
     {{#oauthMethods}}
     {{#-first}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
index 919132767757..405261e76001 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
@@ -142,6 +142,7 @@ dependencies {
     {{#threetenbp}}
     compile 'org.threeten:threetenbp:1.4.3'
     {{/threetenbp}}
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile 'junit:junit:4.13'
 }
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
index 7c137589e37f..12783935f16d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
@@ -26,6 +26,7 @@ lazy val root = (project in file(".")).
       "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
       "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
index b6d67f283507..41bbd03864bf 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -309,6 +309,7 @@
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
             <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
         </dependency>
         <!-- test dependencies -->
         <dependency>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
index 0868a2aa7c0e..2e94cb0e0b46 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
@@ -159,5 +159,6 @@ dependencies {
 {{#performBeanValidation}}
     compile "org.hibernate:hibernate-validator:6.0.19.Final"
 {{/performBeanValidation}}
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache
index 955f515fc70f..7b506a49b231 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache
@@ -48,6 +48,7 @@ lazy val root = (project in file(".")).
 {{#performBeanValidation}}
       "org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile",
 {{/performBeanValidation}}
+	"javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
index 2e68695d431a..4009b48e876c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
@@ -153,6 +153,7 @@
                 <version>3.2.0</version>
                 <configuration>
                     <doclint>none</doclint>
+                    <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -229,14 +230,12 @@
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
         </dependency>
-        {{^hideGenerationTimestamp}}
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
+            <version>${javax-annotation-version}</version>
             <scope>provided</scope>
         </dependency>
-        {{/hideGenerationTimestamp}}
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
@@ -364,6 +363,7 @@
         <jackson-threetenbp-version>2.10.0</jackson-threetenbp-version>
         {{/threetenbp}}
         {{/jackson}}
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <okio-version>1.17.5</okio-version>
         <junit-version>4.13</junit-version>
     </properties>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
index a3973d459514..302b1839d51f 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
@@ -157,5 +157,6 @@ dependencies {
     compile "commons-io:commons-io:$commons_io_version"
     compile "org.apache.commons:commons-lang3:$commons_lang3_version"
     {{/supportJava6}}
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache
index d265cf2a630c..4c079bcffd82 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache
@@ -29,6 +29,7 @@ lazy val root = (project in file(".")).
       "org.apache.commons" % "commons-lang3" % "3.5" % "compile",
       "commons-io" % "commons-io" % "2.5" % "compile",
       {{/supportJava6}}
+	  "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
index d09da29b4728..35c915d45fb8 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
@@ -164,6 +164,17 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
@@ -285,6 +296,12 @@
             <artifactId>jackson-datatype-threetenbp</artifactId>
             <version>${threetenbp-version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -300,6 +317,7 @@
         <jackson-version>2.10.4</jackson-version>
         <jackson-databind-version>2.10.4</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <threetenbp-version>2.9.10</threetenbp-version>
         {{^java8}}
         <jodatime-version>2.9.9</jodatime-version>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache
index dc6d434c3e43..2f1ed68e9963 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache
@@ -10,7 +10,8 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;{{/fullJavaUtil}}
+import java.util.Map;
+import java.util.stream.Collectors;{{/fullJavaUtil}}
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -130,7 +131,7 @@ public class {{classname}} {
         {{/hasMore}}{{/cookieParams}}{{/hasCookieParams}}{{#hasFormParams}}
 
         {{#formParams}}if ({{paramName}} != null)
-            formParams.{{^collectionFormat}}add{{/collectionFormat}}{{#collectionFormat}}put{{/collectionFormat}}("{{baseName}}", {{#isFile}}new FileSystemResource({{paramName}}){{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{#hasMore}}
+            formParams.{{^collectionFormat}}add{{/collectionFormat}}{{#collectionFormat}}put{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}new FileSystemResource({{paramName}}){{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream().map(FileSystemResource::new).collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{#hasMore}}
         {{/hasMore}}{{/formParams}}{{/hasFormParams}}
 
         final String[] accepts = { {{#hasProduces}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
index 4eb1e7d212e4..7190f95a95f9 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
@@ -153,5 +153,6 @@ dependencies {
     {{#withXml}}
     compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version"
     {{/withXml}}
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
index 708e02dffc1f..f3a1f0abda9b 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
@@ -299,6 +299,12 @@
                 <version>${jackson-threetenbp-version}</version>
             </dependency>
         {{/threetenbp}}
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -315,6 +321,7 @@
         <jackson-version>2.10.4</jackson-version>
         <jackson-databind-version>2.10.4</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         {{#joda}}
         <jodatime-version>2.9.9</jodatime-version>
         {{/joda}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
index fab2f0d9fe24..e610846f49db 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
@@ -128,5 +128,6 @@ dependencies {
     {{#threetenbp}}
     compile "org.threeten:threetenbp:$threetenbp_version"
     {{/threetenbp}}
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
index 360f53d1ae85..d55bb7c78b4a 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
@@ -17,6 +17,7 @@ lazy val root = (project in file(".")).
       {{#threetenbp}}
       "org.threeten" % "threetenbp" % "1.4.0" % "compile",
       {{/threetenbp}}
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
index 7c689ae4b6c2..d7cd63d9e12f 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
@@ -166,6 +166,17 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
@@ -264,6 +275,12 @@
             <scope>provided</scope>
         </dependency>
         {{/parcelableModel}}
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -282,6 +299,7 @@
         <threetenbp-version>1.4.0</threetenbp-version>
         {{/threetenbp}}
         <oltu-version>1.0.1</oltu-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13</junit-version>
     </properties>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
index 88f0a67004c5..6c16a9486109 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
@@ -25,6 +25,9 @@ import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
 {{#useRxJava2}}
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 {{/useRxJava2}}
+{{#useRxJava3}}
+import hu.akarnokd.rxjava3.retrofit.RxJava3CallAdapterFactory;
+{{/useRxJava3}}
 import retrofit2.converter.gson.GsonConverterFactory;
 import retrofit2.converter.scalars.ScalarsConverterFactory;
 import {{invokerPackage}}.auth.HttpBasicAuth;
@@ -53,10 +56,18 @@ public class ApiClient {
   private OkHttpClient.Builder okBuilder;
   private Retrofit.Builder adapterBuilder;
   private JSON json;
+  private OkHttpClient okHttpClient;
 
   public ApiClient() {
     apiAuthorizations = new LinkedHashMap<String, Interceptor>();
     createDefaultAdapter();
+    okBuilder = new OkHttpClient.Builder();
+  }
+
+  public ApiClient(OkHttpClient client){
+    apiAuthorizations = new LinkedHashMap<String, Interceptor>();
+    createDefaultAdapter();
+    okHttpClient = client;
   }
 
   public ApiClient(String[] authNames) {
@@ -138,7 +149,6 @@ public class ApiClient {
   {{/hasOAuthMethods}}
   public void createDefaultAdapter() {
     json = new JSON();
-    okBuilder = new OkHttpClient.Builder();
 
     String baseUrl = "{{{basePath}}}";
     if (!baseUrl.endsWith("/"))
@@ -149,18 +159,23 @@ public class ApiClient {
       .baseUrl(baseUrl)
       {{#useRxJava}}
       .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-      {{/useRxJava}}{{#useRxJava2}}
+      {{/useRxJava}}
+      {{#useRxJava2}}
       .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
       {{/useRxJava2}}
+      {{#useRxJava3}}
+      .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
+      {{/useRxJava3}}
       .addConverterFactory(ScalarsConverterFactory.create())
       .addConverterFactory(GsonCustomConverterFactory.create(json.getGson()));
   }
 
   public <S> S createService(Class<S> serviceClass) {
-    return adapterBuilder
-      .client(okBuilder.build())
-      .build()
-      .create(serviceClass);
+    if (okHttpClient != null) {
+        return adapterBuilder.client(okHttpClient).build().create(serviceClass);
+    } else {
+        return adapterBuilder.client(okBuilder.build()).build().create(serviceClass);
+    }
   }
 
   public ApiClient setDateFormat(DateFormat dateFormat) {
@@ -350,7 +365,11 @@ public class ApiClient {
       throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations");
     }
     apiAuthorizations.put(authName, authorization);
+    if(okBuilder == null){
+    	throw new RuntimeException("The ApiClient was created with a built OkHttpClient so it's not possible to add an authorization interceptor to it");
+    }
     okBuilder.addInterceptor(authorization);
+    
     return this;
   }
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api.mustache
index 44f33a514f85..a54e6ffd60f0 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api.mustache
@@ -8,10 +8,16 @@ import rx.Observable;
 {{#useRxJava2}}
 import io.reactivex.Observable;
 {{/useRxJava2}}
+{{#useRxJava3}}
+import io.reactivex.rxjava3.core.Observable;
+{{/useRxJava3}}
 {{^returnType}}
 {{#useRxJava2}}
 import io.reactivex.Completable;
 {{/useRxJava2}}
+{{#useRxJava3}}
+import io.reactivex.rxjava3.core.Completable;
+{{/useRxJava3}}
 {{/returnType}}
 {{#doNotUseRx}}
 import retrofit2.Call;
@@ -41,7 +47,7 @@ public interface {{classname}} {
 {{#allParams}}
    * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
 {{/allParams}}
-   * @return {{^doNotUseRx}}{{#useRxJava}}Observable&lt;{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}&gt;{{/useRxJava}}{{#useRxJava2}}{{#returnType}}Observable&lt;{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{returnType}}{{/isResponseFile}}&gt;{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava2}}{{/doNotUseRx}}{{#doNotUseRx}}Call&lt;{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}&gt;{{/doNotUseRx}}
+   * @return {{^doNotUseRx}}{{#useRxJava}}Observable&lt;{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}&gt;{{/useRxJava}}{{#useRxJava2}}{{#returnType}}Observable&lt;{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{returnType}}{{/isResponseFile}}&gt;{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava2}}{{#useRxJava3}}{{#returnType}}Observable&lt;{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{returnType}}{{/isResponseFile}}&gt;{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava3}}{{/doNotUseRx}}{{#doNotUseRx}}Call&lt;{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}&gt;{{/doNotUseRx}}
 {{#isDeprecated}}
    * @deprecated
 {{/isDeprecated}}
@@ -68,7 +74,7 @@ public interface {{classname}} {
   {{/prioritizedContentTypes}}
   {{/formParams}}
   @{{httpMethod}}("{{{path}}}")
-  {{^doNotUseRx}}{{#useRxJava}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}>{{/useRxJava}}{{#useRxJava2}}{{#returnType}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava2}}{{/doNotUseRx}}{{#doNotUseRx}}Call<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}>{{/doNotUseRx}} {{operationId}}({{^allParams}});{{/allParams}}
+  {{^doNotUseRx}}{{#useRxJava}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}>{{/useRxJava}}{{#useRxJava2}}{{#returnType}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava2}}{{#useRxJava3}}{{#returnType}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava3}}{{/doNotUseRx}}{{#doNotUseRx}}Call<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}>{{/doNotUseRx}} {{operationId}}({{^allParams}});{{/allParams}}
     {{#allParams}}{{>libraries/retrofit2/queryParams}}{{>libraries/retrofit2/pathParams}}{{>libraries/retrofit2/headerParams}}{{>libraries/retrofit2/bodyParams}}{{>libraries/retrofit2/formParams}}{{#hasMore}}, {{/hasMore}}{{^hasMore}}
   );{{/hasMore}}{{/allParams}}
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
index 6a7b8e8cca8d..c0c622fa034d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -122,18 +122,16 @@ ext {
     oltu_version = "1.0.1"
     retrofit_version = "2.3.0"
     {{#usePlayWS}}
+    jackson_version = "2.10.4"
+    jackson_databind_version = "2.10.4"
+    jackson_databind_nullable_version = "0.2.1"
     {{#play24}}
-    jackson_version = "2.6.6"
     play_version = "2.4.11"
     {{/play24}}
     {{#play25}}
-    jackson_version = "2.10.4"
     play_version = "2.5.14"
     {{/play25}}
     {{#play26}}
-    jackson_version = "2.10.4"
-    jackson_databind_version = "2.10.4"
-    jackson_databind_nullable_version = "0.2.1"
     play_version = "2.6.7"
     {{/play26}}
     {{/usePlayWS}}
@@ -145,6 +143,9 @@ ext {
     {{#useRxJava2}}
     rx_java_version = "2.1.1"
     {{/useRxJava2}}
+    {{#useRxJava3}}
+    rx_java_version = "3.0.4"
+    {{/useRxJava3}}
     {{#joda}}
     jodatime_version = "2.9.9"
     {{/joda}}
@@ -166,6 +167,10 @@ dependencies {
     compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
     compile "io.reactivex.rxjava2:rxjava:$rx_java_version"
     {{/useRxJava2}}
+    {{#useRxJava3}}
+    compile 'com.github.akarnokd:rxjava3-retrofit-adapter:3.0.0'
+    compile "io.reactivex.rxjava3:rxjava:$rx_java_version"
+    {{/useRxJava3}}
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "com.google.code.findbugs:jsr305:3.0.2"
     compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
@@ -193,6 +198,6 @@ dependencies {
     compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}:$jackson_version"
     {{/usePlayWS}}
-
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
index 4c85b1411d27..c7785d9e3920 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
@@ -17,24 +17,18 @@ lazy val root = (project in file(".")).
       {{#usePlayWS}}
       {{#play24}}
       "com.typesafe.play" % "play-java-ws_2.11" % "2.4.11" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.6" % "compile",
       {{/play24}}
       {{#play25}}
       "com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.4" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.4" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile",
       {{/play25}}
       {{#play26}}
       "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile",
       "javax.validation" % "validation-api" % "1.1.0.Final" % "compile",
+      {{/play26}}
+      "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       "com.fasterxml.jackson.core" % "jackson-core" % "2.10.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile",
-      {{/play26}}
-      "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       {{/usePlayWS}}
       {{#useRxJava}}
       "com.squareup.retrofit2" % "adapter-rxjava" % "2.3.0" % "compile",
@@ -44,6 +38,10 @@ lazy val root = (project in file(".")).
       "com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile",
       "io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile",
       {{/useRxJava2}}
+      {{#useRxJava3}}
+      "com.github.akarnokd" % "rxjava3-retrofit-adapter" % "3.0.0" % "compile",
+      "io.reactivex.rxjava3" % "rxjava" % "3.0.4" % "compile",
+      {{/useRxJava3}}
       "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       {{#joda}}
@@ -53,6 +51,7 @@ lazy val root = (project in file(".")).
       "org.threeten" % "threetenbp" % "1.4.0" % "compile",
       {{/threetenbp}}
       "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.11" % "test"
     )
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache
index 344fadd2e3ed..b17ac6415643 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache
@@ -1,8 +1,10 @@
 package {{invokerPackage}};
 
 import okhttp3.*;
+import okio.AsyncTimeout;
 import okio.Buffer;
 import okio.BufferedSource;
+import okio.Timeout;
 import play.libs.F;
 import play.libs.ws.WSClient;
 import play.libs.ws.WSRequest;
@@ -95,10 +97,12 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
         private WSRequest wsRequest;
 
         private final Request request;
+        private final AsyncTimeout timeout;
 
         public PlayWSCall(WSClient wsClient, Request request) {
             this.wsClient = wsClient;
             this.request = request;
+            this.timeout = new AsyncTimeout();
         }
 
         @Override
@@ -106,6 +110,11 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
             return request;
         }
 
+        @Override
+        public Timeout timeout() {
+            return timeout;
+        }
+
         @Override
         public void enqueue(final okhttp3.Callback responseCallback) {
             final Call call = this;
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
index 61bacc3bb7c4..c8591422ae8c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -139,12 +139,44 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                {{#supportJava6}}
+                    <source>1.6</source>
+                    <target>1.6</target>
+                {{/supportJava6}}
+                {{^supportJava6}}
+                {{#java8}}
+                    <source>1.8</source>
+                    <target>1.8</target>
+                {{/java8}}
+                {{^java8}}
+                    <source>1.7</source>
+                    <target>1.7</target>
+                {{/java8}}
+                {{/supportJava6}}
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
@@ -276,6 +308,18 @@
                 <version>${retrofit-version}</version>
             </dependency>
         {{/useRxJava2}}
+        {{#useRxJava3}}
+            <dependency>
+                <groupId>io.reactivex.rxjava3</groupId>
+                <artifactId>rxjava</artifactId>
+                <version>${rxjava-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.akarnokd</groupId>
+                <artifactId>rxjava3-retrofit-adapter</artifactId>
+                <version>3.0.0</version>
+            </dependency>
+        {{/useRxJava3}}
         {{#usePlayWS}}
             <!-- JSON processing: jackson -->
             <dependency>
@@ -296,7 +340,12 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind-version}</version>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openapitools</groupId>
+                <artifactId>jackson-databind-nullable</artifactId>
+                <version>${jackson-databind-nullable-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -317,11 +366,6 @@
                 <artifactId>play-java-ws_2.11</artifactId>
                 <version>${play-version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
             {{/play24}}
             {{#play25}}
             <dependency>
@@ -329,11 +373,6 @@
                 <artifactId>play-java-ws_2.11</artifactId>
                 <version>${play-version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
             {{/play25}}
             {{#play26}}
             <dependency>
@@ -346,11 +385,6 @@
                 <artifactId>validation-api</artifactId>
                 <version>1.1.0.Final</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
             {{/play26}}
         {{/usePlayWS}}
         {{#parcelableModel}}
@@ -362,6 +396,12 @@
                 <scope>provided</scope>
             </dependency>
         {{/parcelableModel}}
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -378,17 +418,14 @@
         <gson-fire-version>1.8.3</gson-fire-version>
         <swagger-annotations-version>1.5.22</swagger-annotations-version>
         {{#usePlayWS}}
-        <jackson-databind-version>2.10.3</jackson-databind-version>
+        <jackson-version>2.10.4</jackson-version>
         {{#play24}}
-        <jackson-version>2.6.6</jackson-version>
         <play-version>2.4.11</play-version>
         {{/play24}}
         {{#play25}}
-        <jackson-version>2.10.4</jackson-version>
         <play-version>2.5.15</play-version>
         {{/play25}}
         {{#play26}}
-        <jackson-version>2.10.4</jackson-version>
         <play-version>2.6.7</play-version>
         {{/play26}}
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
@@ -400,12 +437,16 @@
         {{#useRxJava2}}
         <rxjava-version>2.1.1</rxjava-version>
         {{/useRxJava2}}
+        {{#useRxJava3}}
+            <rxjava-version>3.0.4</rxjava-version>
+        {{/useRxJava3}}
         {{#joda}}
         <jodatime-version>2.9.9</jodatime-version>
         {{/joda}}
         {{#threetenbp}}
         <threetenbp-version>1.4.0</threetenbp-version>
         {{/threetenbp}}
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <oltu-version>1.0.1</oltu-version>
         <junit-version>4.13</junit-version>
     </properties>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache
index c6c76b8e8b85..742f19fd1cf7 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache
@@ -53,6 +53,7 @@ dependencies {
     compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
     {{/threetenbp}}
     compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
     testCompile "io.vertx:vertx-unit:$vertx_version"
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
index 587a6e76cc42..310db959c48d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
@@ -154,6 +154,17 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
@@ -272,6 +283,12 @@
                 <version>${jackson-version}</version>
             </dependency>
         {{/threetenbp}}
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -295,6 +312,7 @@
         <jackson-version>2.10.4</jackson-version>
         <jackson-databind>2.10.4</jackson-databind>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
     </properties>
 </project>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache
index 72b80bac81a8..f38a9b8c4501 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache
@@ -647,56 +647,4 @@ public class ApiClient {
 
          return collectionFormat.collectionToString(values);
     }
-
-    private class ApiClientHttpRequestInterceptor implements ClientHttpRequestInterceptor {
-        private final Log log = LogFactory.getLog(ApiClientHttpRequestInterceptor.class);
-
-        @Override
-        public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException {
-            logRequest(request, body);
-            ClientHttpResponse response = execution.execute(request, body);
-            logResponse(response);
-            return response;
-        }
-
-        private void logRequest(HttpRequest request, byte[] body) throws UnsupportedEncodingException {
-            log.info("URI: " + request.getURI());
-            log.info("HTTP Method: " + request.getMethod());
-            log.info("HTTP Headers: " + headersToString(request.getHeaders()));
-            log.info("Request Body: " + new String(body, StandardCharsets.UTF_8));
-        }
-
-        private void logResponse(ClientHttpResponse response) throws IOException {
-            log.info("HTTP Status Code: " + response.getRawStatusCode());
-            log.info("Status Text: " + response.getStatusText());
-            log.info("HTTP Headers: " + headersToString(response.getHeaders()));
-            log.info("Response Body: " + bodyToString(response.getBody()));
-        }
-
-        private String headersToString(HttpHeaders headers) {
-            StringBuilder builder = new StringBuilder();
-            for(Entry<String, List<String>> entry : headers.entrySet()) {
-                builder.append(entry.getKey()).append("=[");
-                for(String value : entry.getValue()) {
-                    builder.append(value).append(",");
-                }
-                builder.setLength(builder.length() - 1); // Get rid of trailing comma
-                builder.append("],");
-            }
-            builder.setLength(builder.length() - 1); // Get rid of trailing comma
-            return builder.toString();
-        }
-
-        private String bodyToString(InputStream body) throws IOException {
-            StringBuilder builder = new StringBuilder();
-            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(body, StandardCharsets.UTF_8));
-            String line = bufferedReader.readLine();
-            while (line != null) {
-                builder.append(line).append(System.lineSeparator());
-                line = bufferedReader.readLine();
-            }
-            bufferedReader.close();
-            return builder.toString();
-        }
-    }
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache
index 7b3c23d59b48..a8077006c8ff 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache
@@ -10,6 +10,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 {{/fullJavaUtil}}
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -108,7 +109,7 @@ public class {{classname}} {
 
         {{#formParams}}
         if ({{paramName}} != null)
-            formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}new FileSystemResource({{paramName}}){{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});
+            formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}new FileSystemResource({{paramName}}){{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream().map(FileSystemResource::new).collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});
         {{/formParams}}
         {{/hasFormParams}}
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
index 138270ea3f9e..b3bcdc1ecc40 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
@@ -130,6 +130,12 @@
                 <version>${jodatime-version}</version>
             </dependency>
         {{/joda}}
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -146,6 +152,7 @@
         <jackson-version>2.10.3</jackson-version>
         <jackson-databind-version>2.10.3</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
         <reactor-version>3.1.8.RELEASE</reactor-version>
         <reactor-netty-version>0.7.8.RELEASE</reactor-netty-version>
diff --git a/modules/openapi-generator/src/main/resources/Java/pom.mustache b/modules/openapi-generator/src/main/resources/Java/pom.mustache
index e9cbf546b6d7..5cae3afa36df 100644
--- a/modules/openapi-generator/src/main/resources/Java/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pom.mustache
@@ -181,6 +181,17 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                    {{#supportJava6}}
+                        <source>1.6</source>
+                    {{/supportJava6}}
+                    {{^supportJava6}}
+                    {{#java8}}
+                        <source>1.8</source>
+                    {{/java8}}
+                    {{^java8}}
+                        <source>1.7</source>
+                    {{/java8}}
+                    {{/supportJava6}}
                 </configuration>
                 <executions>
                     <execution>
@@ -356,6 +367,12 @@
                 <scope>provided</scope>
             </dependency>
         {{/parcelableModel}}
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -376,6 +393,7 @@
         {{#threetenbp}}
         <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
         {{/threetenbp}}
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13</junit-version>
     </properties>
diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/generatedAnnotation.mustache
index a47b6faa85b9..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/JavaInflector/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaInflector/generatedAnnotation.mustache
@@ -1 +1 @@
-{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache
index 1737c94615b9..879f4030f9ee 100644
--- a/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache
@@ -126,6 +126,12 @@
             <artifactId>swagger-inflector</artifactId>
             <version>${swagger-inflector-version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -142,6 +148,7 @@
         <swagger-inflector-version>1.0.14</swagger-inflector-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <logback-version>1.0.1</logback-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.8.2</junit-version>
         <slf4j-version>1.6.3</slf4j-version>
     </properties>
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/generatedAnnotation.mustache
index a47b6faa85b9..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/generatedAnnotation.mustache
@@ -1 +1 @@
-{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/generatedAnnotation.mustache
index 49110fc1ad93..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/generatedAnnotation.mustache
@@ -1 +1 @@
-@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/generatedAnnotation.mustache
index 49110fc1ad93..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/generatedAnnotation.mustache
@@ -1 +1 @@
-@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache
index 6fdc92359408..e4ff24a1d689 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache
@@ -183,7 +183,13 @@
         <artifactId>hibernate-validator</artifactId>
         <version>5.2.2.Final</version>
     </dependency>
-{{/useBeanValidationFeature}}    
+{{/useBeanValidationFeature}}
+    <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>${javax-annotation-version}</version>
+        <scope>provided</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
@@ -208,6 +214,7 @@
 {{/useBeanValidation}}
     <cxf-version>3.3.0</cxf-version>
     <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
+    <javax-annotation-version>1.3.2</javax-annotation-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
index de2adaff11de..9d8c6df2b59b 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
@@ -228,6 +228,12 @@
             <scope>provided</scope>
         </dependency>
 {{/generateSpringBootApplication}}
+    <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>${javax-annotation-version}</version>
+        <scope>provided</scope>
+    </dependency>
 {{#useSwaggerUI}}
         <dependency>
             <groupId>org.webjars</groupId>
@@ -265,6 +271,7 @@
 {{/generateSpringBootApplication}}    
     <cxf-version>3.3.0</cxf-version>
     <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
+    <javax-annotation-version>1.3.2</javax-annotation-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/generatedAnnotation.mustache
index a47b6faa85b9..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/generatedAnnotation.mustache
@@ -1 +1 @@
-{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/generatedAnnotation.mustache
index a47b6faa85b9..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/generatedAnnotation.mustache
@@ -1 +1 @@
-{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/generatedAnnotation.mustache
index a47b6faa85b9..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/generatedAnnotation.mustache
@@ -1 +1 @@
-{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/generatedAnnotation.mustache
index ad17a426e969..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/generatedAnnotation.mustache
@@ -1,3 +1 @@
-{{^hideGenerationTimestamp}}
-@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
-{{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/generatedAnnotation.mustache
index ad17a426e969..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/generatedAnnotation.mustache
@@ -1,3 +1 @@
-{{^hideGenerationTimestamp}}
-@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
-{{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/generatedAnnotation.mustache
index ad17a426e969..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/generatedAnnotation.mustache
@@ -1,3 +1 @@
-{{^hideGenerationTimestamp}}
-@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
-{{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
index cc86e5dc9d09..6c7fe9cfae2a 100644
--- a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
+++ b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
@@ -116,6 +116,7 @@ org.openapitools.codegen.languages.StaticHtmlGenerator
 org.openapitools.codegen.languages.StaticHtml2Generator
 org.openapitools.codegen.languages.Swift4Codegen
 org.openapitools.codegen.languages.Swift5ClientCodegen
+org.openapitools.codegen.languages.TypeScriptClientCodegen
 org.openapitools.codegen.languages.TypeScriptAngularClientCodegen
 org.openapitools.codegen.languages.TypeScriptAngularJsClientCodegen
 org.openapitools.codegen.languages.TypeScriptAureliaClientCodegen
diff --git a/modules/openapi-generator/src/main/resources/asciidoc-documentation/index.mustache b/modules/openapi-generator/src/main/resources/asciidoc-documentation/index.mustache
index 664cac30920a..fcab76298ef1 100644
--- a/modules/openapi-generator/src/main/resources/asciidoc-documentation/index.mustache
+++ b/modules/openapi-generator/src/main/resources/asciidoc-documentation/index.mustache
@@ -14,8 +14,13 @@
 :app-name: {{appName}}
 {{/headerAttributes}}
 
+{{#useIntroduction}}
+== Introduction
+{{/useIntroduction}}
+{{^useIntroduction}}
 [abstract]
 .Abstract
+{{/useIntroduction}}
 {{{appDescription}}}
 
 {{#specinclude}}intro.adoc{{/specinclude}}
@@ -46,9 +51,17 @@
 {{#operation}}
 
 [.{{nickname}}]
+{{#useMethodAndPath}}
+==== {{httpMethod}} {{path}}
+
+Operation Id:: {{nickname}}
+
+{{/useMethodAndPath}}
+{{^useMethodAndPath}}
 ==== {{nickname}}
     
 `{{httpMethod}} {{path}}`
+{{/useMethodAndPath}}
 
 {{{summary}}}
 
@@ -96,12 +109,14 @@
 {{/responses}}
 |===         
 
+{{^skipExamples}}
 ===== Samples
 
 {{#snippetinclude}}{{path}}/{{httpMethod}}/http-request.adoc{{/snippetinclude}}
 {{#snippetinclude}}{{path}}/{{httpMethod}}/http-response.adoc{{/snippetinclude}}
 
 {{#snippetlink}}* wiremock data, {{path}}/{{httpMethod}}/{{httpMethod}}.json{{/snippetlink}}
+{{/skipExamples}}
 
 ifdef::internal-generation[]
 ===== Implementation
diff --git a/modules/openapi-generator/src/main/resources/asciidoc-documentation/params.mustache b/modules/openapi-generator/src/main/resources/asciidoc-documentation/params.mustache
index 029f10fb5a55..7307bf155e83 100644
--- a/modules/openapi-generator/src/main/resources/asciidoc-documentation/params.mustache
+++ b/modules/openapi-generator/src/main/resources/asciidoc-documentation/params.mustache
@@ -1,9 +1,14 @@
 ===== Parameters
 
 {{#hasPathParams}}
+{{^useTableTitles}}
 ====== Path Parameters
+{{/useTableTitles}}
 
 [cols="2,3,1,1,1"]
+{{#useTableTitles}}
+.Path Parameters
+{{/useTableTitles}}
 |===         
 |Name| Description| Required| Default| Pattern
 
@@ -14,9 +19,14 @@
 {{/hasPathParams}}
 
 {{#hasBodyParam}}
-===== Body Parameter
+{{^useTableTitles}}
+====== Body Parameter
+{{/useTableTitles}}
 
 [cols="2,3,1,1,1"]
+{{#useTableTitles}}
+.Body Parameter
+{{/useTableTitles}}
 |===         
 |Name| Description| Required| Default| Pattern
 
@@ -27,9 +37,14 @@
 {{/hasBodyParam}}
 
 {{#hasFormParams}}
-===== Form Parameter
+{{^useTableTitles}}
+====== Form Parameters
+{{/useTableTitles}}
 
 [cols="2,3,1,1,1"]
+{{#useTableTitles}}
+.Form Parameters
+{{/useTableTitles}}
 |===         
 |Name| Description| Required| Default| Pattern
 
@@ -40,9 +55,14 @@
 {{/hasFormParams}}
 
 {{#hasHeaderParams}}
+{{^useTableTitles}}
 ====== Header Parameters
+{{/useTableTitles}}
 
 [cols="2,3,1,1,1"]
+{{#useTableTitles}}
+.Header Parameters
+{{/useTableTitles}}
 |===         
 |Name| Description| Required| Default| Pattern
 
@@ -53,9 +73,14 @@
 {{/hasHeaderParams}}
 
 {{#hasQueryParams}}
+{{^useTableTitles}}
 ====== Query Parameters
+{{/useTableTitles}}
 
 [cols="2,3,1,1,1"]
+{{#useTableTitles}}
+.Query Parameters
+{{/useTableTitles}}
 |===         
 |Name| Description| Required| Default| Pattern
 
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Filters/BasePathFilter.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Filters/BasePathFilter.mustache
index 8faa0782461f..b05e282c2684 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Filters/BasePathFilter.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Filters/BasePathFilter.mustache
@@ -28,7 +28,7 @@ namespace {{packageName}}.Filters
         /// <summary>
         /// Apply the filter
         /// </summary>
-        /// <param name="swaggerDoc">SwaggerDocument</param>
+        /// <param name="swaggerDoc">OpenApiDocument</param>
         /// <param name="context">FilterContext</param>
         public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
         {
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Startup.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Startup.mustache
index dbca972d966c..3c72ca2d7040 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Startup.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Startup.mustache
@@ -31,7 +31,7 @@ namespace {{packageName}}
         /// <summary>
         /// Constructor
         /// </summary>
-        /// <param name="env"></param>
+        /// <param name="configuration"></param>
         public Startup(IConfiguration configuration)
         {
             Configuration = configuration;
@@ -102,7 +102,6 @@ namespace {{packageName}}
                         Version = "{{#version}}{{{version}}}{{/version}}{{^version}}v1{{/version}}",
                     });
                     c.CustomSchemaIds(type => type.FriendlyId(true));
-                    c.DescribeAllEnumsAsStrings();
                     c.IncludeXmlComments($"{AppContext.BaseDirectory}{Path.DirectorySeparatorChar}{Assembly.GetEntryAssembly().GetName().Name}.xml");
                     {{#basePathWithoutHost}}
                     // Sets the basePath property in the Swagger document generated
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache
index 5bbe8c8c20e1..db2ff1946065 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache
@@ -21,7 +21,9 @@
 {{#cppNamespaceDeclarations}}
 namespace {{this}} {
 {{/cppNamespaceDeclarations}}
-
+{{#vendorExtensions.x-has-forward-declarations}}
+{{#vendorExtensions.x-forward-declarations}}{{.}}
+{{/vendorExtensions.x-forward-declarations}}{{/vendorExtensions.x-has-forward-declarations}}
 class {{classname}} : public {{prefix}}{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Enum{{/isEnum}} {
 public:
     {{classname}}();
diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/cmake-lists.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/cmake-lists.mustache
index b80efd48484e..7bede039c584 100644
--- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/cmake-lists.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/cmake-lists.mustache
@@ -12,13 +12,11 @@ cmake_minimum_required (VERSION 2.8)
 
 #PROJECT's NAME
 project(CppRestOpenAPIClient)
-
+set(CMAKE_VERBOSE_MAKEFILE ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 # THE LOCATION OF OUTPUT BINARIES
 set(CMAKE_LIBRARY_DIR ${PROJECT_SOURCE_DIR}/lib)
-set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_DIR})
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
@@ -27,24 +25,27 @@ endif()
 # BUILD TYPE
 message("A ${CMAKE_BUILD_TYPE} build configuration is detected")
 
-# Update require components as necessary
-#find_package(Boost 1.45.0 REQUIRED COMPONENTS ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
+if (UNIX)
+    message(STATUS "Building client library for Linux/Unix")
 
-# build and set path to cpp rest sdk
-set(CPPREST_ROOT ${PROJECT_SOURCE_DIR}/3rdParty/cpprest)
-set(CPPREST_INCLUDE_DIR ${CPPREST_ROOT}/include)
-set(CPPREST_LIBRARY_DIR ${CPPREST_ROOT}/lib)
+    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC -Wall -Wno-unused-variable")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wno-unused-variable")
 
-include_directories(${PROJECT_SOURCE_DIR} api model ${CPPREST_INCLUDE_DIR})
+    find_package(cpprestsdk REQUIRED)
+    find_package(Boost REQUIRED)
+else()
+    message(STATUS "Building client library for Windows")
 
+    find_package(cpprestsdk REQUIRED)
+    find_package(Boost REQUIRED)
+    find_package(pthreads REQUIRED)
+endif()
 
-# If using vcpkg, set include directories. Also comment out CPPREST section above since vcpkg will handle it.
-# To install required vcpkg packages execute:
-# > vcpkg install cpprestsdk cpprestsdk:x64-windows boost-uuid boost-uuid:x64-windows
-# set(VCPKG_ROOT "C:\\vcpkg\\installed\\x64-windows")
-# set(VCPKG_INCLUDE_DIR ${VCPKG_ROOT}/include)
-# set(VCPKG_LIBRARY_DIR ${VCPKG_ROOT}/lib)
-# include_directories(${PROJECT_SOURCE_DIR} api model ${VCPKG_INCLUDE_DIR})
+# Manually set the cpprestsdk paths when not using package manager
+#set(CPPREST_INCLUDE_DIR ${CPPREST_ROOT}/include)
+#set(CPPREST_LIBRARY_DIR ${CPPREST_ROOT}/lib)
+#include_directories(${CPPREST_INCLUDE_DIR})
+#link_directories(${CPPREST_LIBRARY_DIR})
 
 #SUPPORTING FILES
 set(SUPPORTING_FILES  "ApiClient" "ApiConfiguration" "ApiException" "HttpContent" "IHttpBody" "JsonBody" "ModelBase" "MultipartFormData" "Object")
@@ -52,3 +53,24 @@ set(SUPPORTING_FILES  "ApiClient" "ApiConfiguration" "ApiException" "HttpContent
 file(GLOB SOURCE_FILES  "api/*"  "model/*")
 
 add_library(${PROJECT_NAME} ${SUPPORTING_FILES} ${SOURCE_FILES})
+
+target_include_directories(
+    ${PROJECT_NAME} PRIVATE
+    ${Boost_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/model
+    ${CMAKE_CURRENT_SOURCE_DIR}/api
+)
+
+target_link_directories(
+    ${PROJECT_NAME} PRIVATE
+    ${Boost_LIBRARY_DIRS}
+)
+
+if (UNIX)
+    target_link_libraries(${PROJECT_NAME} PRIVATE cpprest pthread ${Boost_LIBRARIES} crypto)
+else()
+    target_link_libraries(${PROJECT_NAME} PRIVATE cpprestsdk::cpprest ${pthreads_LIBRARIES} ${Boost_LIBRARIES} bcrypt)
+endif()
+
+set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)
+set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache
index a103cd77763d..39e7337a3f85 100644
--- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache
@@ -222,10 +222,9 @@ bool ModelBase::fromString( const utility::string_t& val, std::shared_ptr<HttpCo
     {
         outVal = std::shared_ptr<HttpContent>(new HttpContent());
     }
-    std::shared_ptr<utility::stringstream_t> ssptr = std::make_shared<utility::stringstream_t>(val);
     if(outVal != nullptr)
     {
-        outVal->setData(ssptr);
+        outVal->setData(std::shared_ptr<std::istream>(new std::stringstream(utility::conversions::to_utf8string(val))));
     }
     else
     {
diff --git a/modules/openapi-generator/src/main/resources/dart2/class.mustache b/modules/openapi-generator/src/main/resources/dart2/class.mustache
index d64dc80606aa..6c7eca10552a 100644
--- a/modules/openapi-generator/src/main/resources/dart2/class.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/class.mustache
@@ -6,7 +6,12 @@ class {{classname}} {
   {{#min}} // range from {{min}} to {{max}}{{/min}}//{{^min}}enum {{name}}Enum { {{#values}} {{.}}, {{/values}} };{{/min}}{
   {{/allowableValues}}
   {{/vars}}
-  {{classname}}();
+
+  {{classname}}({
+  {{#vars}}
+    this.{{name}},
+  {{/vars}}
+  });
 
   @override
   String toString() {
diff --git a/modules/openapi-generator/src/main/resources/elm/fieldDecoder.mustache b/modules/openapi-generator/src/main/resources/elm/fieldDecoder.mustache
index 7495eb50c779..964b3cf9a84a 100644
--- a/modules/openapi-generator/src/main/resources/elm/fieldDecoder.mustache
+++ b/modules/openapi-generator/src/main/resources/elm/fieldDecoder.mustache
@@ -12,6 +12,6 @@
 {{#isBoolean}}Json.Decode.bool{{/isBoolean}}
 {{#isUuid}}Uuid.decoder{{/isUuid}}
 {{^isDateTime}}{{^isDate}}{{^isByteArray}}{{^isBinary}}{{^isString}}{{^isNumeric}}{{^isBoolean}}{{^isUuid}}
-{{#isDefault}}Api.Data.{{/isDefault}}{{#lambda.camelcase}}{{#isEnum}}{{classname}}{{enumName}}{{/isEnum}}{{^isEnum}}{{dataType}}{{/isEnum}}{{/lambda.camelcase}}Decoder
+{{#is2xx}}Api.Data.{{/is2xx}}{{#is3xx}}Api.Data.{{/is3xx}}{{#lambda.camelcase}}{{#isEnum}}{{classname}}{{enumName}}{{/isEnum}}{{^isEnum}}{{dataType}}{{/isEnum}}{{/lambda.camelcase}}Decoder
 {{/isUuid}}{{/isBoolean}}{{/isNumeric}}{{/isString}}{{/isBinary}}{{/isByteArray}}{{/isDate}}{{/isDateTime}}
 {{/lambda.removeWhitespace}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/elm/operation.mustache b/modules/openapi-generator/src/main/resources/elm/operation.mustache
index ed872dddc569..f83584bbd94a 100644
--- a/modules/openapi-generator/src/main/resources/elm/operation.mustache
+++ b/modules/openapi-generator/src/main/resources/elm/operation.mustache
@@ -33,7 +33,7 @@ import Uuid exposing (Uuid){{/includeUuid}}
 {-| {{{notes}}}
 -}
 {{/notes}}
-{{operationId}} : {{#allParams}}{{^required}}Maybe {{/required}}{{#isListContainer}}List {{/isListContainer}}{{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{#isModel}}Api.Data.{{/isModel}}{{dataType}}{{/datatypeWithEnum}} -> {{/allParams}}{{#authMethods}}{{#isBasicBearer}}String -> {{/isBasicBearer}}{{/authMethods}}Api.Request {{^responses}}(){{/responses}}{{#responses}}{{#isDefault}}{{^dataType}}(){{/dataType}}{{#isMapContainer}}(Dict.Dict String {{/isMapContainer}}{{#isListContainer}}(List {{/isListContainer}}{{^primitiveType}}{{^isUuid}}Api.Data.{{/isUuid}}{{/primitiveType}}{{#items}}{{#isModel}}Api.Data.{{/isModel}}{{/items}}{{dataType}}{{#isListContainer}}){{/isListContainer}}{{#isMapContainer}}){{/isMapContainer}}{{/isDefault}}{{/responses}}
+{{operationId}} : {{#allParams}}{{^required}}Maybe {{/required}}{{#isListContainer}}List {{/isListContainer}}{{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{#isModel}}Api.Data.{{/isModel}}{{dataType}}{{/datatypeWithEnum}} -> {{/allParams}}{{#authMethods}}{{#isBasicBearer}}String -> {{/isBasicBearer}}{{/authMethods}}Api.Request {{^responses}}(){{/responses}}{{#responses}}{{#is2xx}}{{^dataType}}(){{/dataType}}{{#isMapContainer}}(Dict.Dict String {{/isMapContainer}}{{#isListContainer}}(List {{/isListContainer}}{{^primitiveType}}{{^isUuid}}Api.Data.{{/isUuid}}{{/primitiveType}}{{#items}}{{#isModel}}Api.Data.{{/isModel}}{{/items}}{{dataType}}{{#isListContainer}}){{/isListContainer}}{{#isMapContainer}}){{/isMapContainer}}{{/is2xx}}{{/responses}}
 {{operationId}}{{#allParams}} {{>paramName}}{{/allParams}}{{#authMethods}}{{#isBasicBearer}} auth_token{{/isBasicBearer}}{{/authMethods}} =
     Api.request
         "{{httpMethod}}"
@@ -42,6 +42,6 @@ import Uuid exposing (Uuid){{/includeUuid}}
         [{{#queryParams}} ( "{{baseName}}", {{#required}}Just <| {{/required}}{{^required}}Maybe.map {{/required}}{{>paramToString}} {{>paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/queryParams}}]
         [{{#headerParams}} ( "{{baseName}}", {{#required}}Just <| {{/required}}{{^required}}Maybe.map {{/required}}{{>paramToString}} {{>paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/headerParams}}]
         {{#bodyParam}}({{#required}}Just ({{/required}}{{^required}}Maybe.map {{/required}}{{#isModel}}Api.Data.{{/isModel}}{{>recordFieldValueEncoder}} {{>paramName}}{{#required}}){{/required}}){{/bodyParam}}{{^bodyParam}}Nothing{{/bodyParam}}
-        {{^responses}}(Json.Decode.succeed ()){{/responses}}{{#responses}}{{#isDefault}}{{^dataType}}(Json.Decode.succeed ()){{/dataType}}{{#dataType}}{{>recordFieldValueDecoder}}{{/dataType}}{{/isDefault}}{{/responses}}{{#authMethods}}{{#isBasicBearer}}
+        {{^responses}}(Json.Decode.succeed ()){{/responses}}{{#responses}}{{#is2xx}}{{^dataType}}(Json.Decode.succeed ()){{/dataType}}{{#dataType}}{{>recordFieldValueDecoder}}{{/dataType}}{{/is2xx}}{{/responses}}{{#authMethods}}{{#isBasicBearer}}
         |> Api.withBearerToken auth_token{{/isBasicBearer}}{{/authMethods}}
 {{/operation}}{{/operations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/erlang-server/auth.mustache b/modules/openapi-generator/src/main/resources/erlang-server/auth.mustache
index c651c1c80e39..3f3e9e94553d 100644
--- a/modules/openapi-generator/src/main/resources/erlang-server/auth.mustache
+++ b/modules/openapi-generator/src/main/resources/erlang-server/auth.mustache
@@ -40,7 +40,7 @@ get_api_key(header, KeyParam, Req) ->
     Headers = cowboy_req:headers(Req),
     {
         maps:get(
-            openapi_utils:to_header(KeyParam),
+            {{packageName}}_utils:to_header(KeyParam),
             Headers,
             undefined
         ),
diff --git a/modules/openapi-generator/src/main/resources/go-experimental/api.mustache b/modules/openapi-generator/src/main/resources/go-experimental/api.mustache
index 32bfc5a13367..18a3e1139581 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/api.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/api.mustache
@@ -69,7 +69,7 @@ func (r api{{operationId}}Request) Execute() ({{#returnType}}{{{.}}}, {{/returnT
 	}
 
 	localVarPath := localBasePath + "{{{path}}}"{{#pathParams}}
-	localVarPath = strings.Replace(localVarPath, "{"+"{{baseName}}"+"}", _neturl.QueryEscape(parameterToString(r.{{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")) , -1){{/pathParams}}
+	localVarPath = strings.Replace(localVarPath, "{"+"{{baseName}}"+"}", _neturl.PathEscape(parameterToString(r.{{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")) , -1){{/pathParams}}
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache b/modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache
index 04668c66b071..9045d9fe0884 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **{{classname}}Interface** | **interface { {{#discriminator}}{{propertyGetter}}() {{propertyType}}{{/discriminator}} }** | An interface that can hold any of the proper implementing types |
 {{/vendorExtensions.x-is-one-of-interface}}
 {{^vendorExtensions.x-is-one-of-interface}}
-{{#vars}}**{{name}}** | Pointer to {{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{{dataType}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{^required}}Pointer to {{/required}}{{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{{dataType}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
 {{/vars}}
 {{/vendorExtensions.x-is-one-of-interface}}
 
diff --git a/modules/openapi-generator/src/main/resources/go-experimental/model_enum.mustache b/modules/openapi-generator/src/main/resources/go-experimental/model_enum.mustache
index b742b3e2147c..1d3c2244c098 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/model_enum.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/model_enum.mustache
@@ -26,7 +26,7 @@ func (v *{{{classname}}}) UnmarshalJSON(src []byte) error {
 		}
 	}
 
-	return fmt.Errorf("%+v is not a valid {{classname}}", *v)
+	return fmt.Errorf("%+v is not a valid {{classname}}", value)
 }
 
 // Ptr returns reference to {{{name}}} value
diff --git a/modules/openapi-generator/src/main/resources/go-experimental/model_oneof.mustache b/modules/openapi-generator/src/main/resources/go-experimental/model_oneof.mustache
index c86af51efb9c..a0322e340743 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/model_oneof.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/model_oneof.mustache
@@ -16,7 +16,6 @@ func {{{.}}}As{{classname}}(v *{{{.}}}) {{classname}} {
 // Unmarshal JSON data into one of the pointers in the struct
 func (dst *{{classname}}) UnmarshalJSON(data []byte) error {
 	var err error
-	match := 0
 	{{#isNullable}}
 	// this object is nullable so check if the payload is null or empty string
 	if string(data) == "" || string(data) == "{}" {
@@ -41,20 +40,19 @@ func (dst *{{classname}}) UnmarshalJSON(data []byte) error {
 		// try to unmarshal JSON data into {{{modelName}}}
 		err = json.Unmarshal(data, &dst.{{{modelName}}})
 		if err == nil {
-			json{{{modelName}}}, _ := json.Marshal(dst.{{{modelName}}})
-			if string(json{{{modelName}}}) == "{}" { // empty struct
-				dst.{{{modelName}}} = nil
-			} else {
-				return nil // data stored in dst.{{{modelName}}}, return on the first match
-			}
+			return nil // data stored in dst.{{{modelName}}}, return on the first match
 		} else {
 			dst.{{{modelName}}} = nil
+			return fmt.Errorf("Failed to unmarshal {{classname}} as {{{modelName}}}: %s", err.Error())
 		}
 	}
 
 	{{/mappedModels}}
 	{{/discriminator}}
+	return nil
 	{{/useOneOfDiscriminatorLookup}}
+	{{^useOneOfDiscriminatorLookup}}
+	match := 0
 	{{#oneOf}}
 	// try to unmarshal data into {{{.}}}
 	err = json.Unmarshal(data, &dst.{{{.}}})
@@ -82,6 +80,7 @@ func (dst *{{classname}}) UnmarshalJSON(data []byte) error {
 	} else { // no match
 		return fmt.Errorf("Data failed to match schemas in oneOf({{classname}})")
 	}
+	{{/useOneOfDiscriminatorLookup}}
 }
 
 // Marshal data from the first non-nil pointers in the struct to JSON
diff --git a/modules/openapi-generator/src/main/resources/go/api.mustache b/modules/openapi-generator/src/main/resources/go/api.mustache
index 7805eaae6895..17eb4b95e4f3 100644
--- a/modules/openapi-generator/src/main/resources/go/api.mustache
+++ b/modules/openapi-generator/src/main/resources/go/api.mustache
@@ -78,7 +78,7 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#hasParams
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "{{{path}}}"{{#pathParams}}
-	localVarPath = strings.Replace(localVarPath, "{"+"{{baseName}}"+"}", _neturl.QueryEscape(parameterToString({{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"{{baseName}}"+"}", _neturl.PathEscape(parameterToString({{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")) , -1)
 	{{/pathParams}}
 
 	localVarHeaderParams := make(map[string]string)
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
index e82cd10725d7..5d4e979dff84 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
@@ -243,7 +243,11 @@
 
                         <div class="tab-content">
                           <div class="tab-pane active" id="examples-{{baseName}}-{{nickname}}-0-curl">
-                            <pre class="prettyprint"><code class="language-bsh">curl -X {{vendorExtensions.x-codegen-http-method-upper-case}}{{#authMethods}}{{#isApiKey}}{{#isKeyInHeader}} -H "{{keyParamName}}: [[apiKey]]"{{/isKeyInHeader}}{{/isApiKey}}{{#isBasic}}{{#hasProduces}} -H "Accept: {{#produces}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/produces}}"{{/hasProduces}}{{#hasConsumes}} -H "Content-Type: {{#consumes}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/consumes}}"{{/hasConsumes}} -H "Authorization: Basic [[basicHash]]"{{/isBasic}}{{/authMethods}} "{{basePath}}{{path}}{{#hasQueryParams}}?{{#queryParams}}{{^-first}}&{{/-first}}{{baseName}}={{vendorExtensions.x-eg}}{{/queryParams}}{{/hasQueryParams}}"</code></pre>
+                            <pre class="prettyprint"><code class="language-bsh">curl -X {{vendorExtensions.x-codegen-http-method-upper-case}}{{#authMethods}}\
+{{#isApiKey}}{{#isKeyInHeader}}-H "{{keyParamName}}: [[apiKey]]"{{/isKeyInHeader}}{{/isApiKey}}{{^isBasicBearer}}{{#isBasic}} -H "Authorization: Basic [[basicHash]]"{{/isBasic}}{{/isBasicBearer}}{{#isBasicBearer}} -H "Authorization: Bearer [[accessToken]]"{{/isBasicBearer}}{{/authMethods}}{{#hasProduces}}\
+ -H "Accept: {{#produces}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/produces}}"{{/hasProduces}}{{#hasConsumes}}\
+ -H "Content-Type: {{#consumes}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/consumes}}"{{/hasConsumes}}\
+ "{{basePath}}{{path}}{{#hasQueryParams}}?{{#queryParams}}{{^-first}}&{{/-first}}{{baseName}}={{vendorExtensions.x-eg}}{{/queryParams}}{{/hasQueryParams}}"</code></pre>
                           </div>
                           <div class="tab-pane" id="examples-{{baseName}}-{{nickname}}-0-java">
                             <pre class="prettyprint"><code class="language-java">{{>sample_java}}</code></pre>
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_android.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_android.mustache
index 53f1864a169f..c95321e3cc01 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_android.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_android.mustache
@@ -1,12 +1,12 @@
 import {{{invokerPackage}}}.api.{{{classname}}};
 
 public class {{{classname}}}Example {
-
     public static void main(String[] args) {
         {{{classname}}} apiInstance = new {{{classname}}}();
         {{#allParams}}
         {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{unescapedDescription}}}
         {{/allParams}}
+        
         try {
             {{#returnType}}{{{returnType}}} result = {{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
             System.out.println(result);{{/returnType}}
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_csharp.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_csharp.mustache
index feb5c80ff9fa..ccc5b3fa54a7 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_csharp.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_csharp.mustache
@@ -10,18 +10,20 @@ namespace Example
     {
         public void main()
         {
-            {{#hasAuthMethods}}{{#authMethods}}{{#isBasic}}
-            // Configure HTTP basic authorization: {{{name}}}
+            {{#hasAuthMethods}}
+            {{#authMethods}}
+            {{^isBasicBearer}}{{#isBasic}}// Configure HTTP basic authorization: {{{name}}}
             Configuration.Default.Username = "YOUR_USERNAME";
-            Configuration.Default.Password = "YOUR_PASSWORD";{{/isBasic}}{{#isApiKey}}
-            // Configure API key authorization: {{{name}}}
+            Configuration.Default.Password = "YOUR_PASSWORD";{{/isBasic}}{{/isBasicBearer}}{{#isBasicBearer}}// Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";{{/isBasicBearer}}{{#isApiKey}}// Configure API key authorization: {{{name}}}
             Configuration.Default.ApiKey.Add("{{{keyParamName}}}", "YOUR_API_KEY");
             // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-            // Configuration.Default.ApiKeyPrefix.Add("{{{keyParamName}}}", "Bearer");{{/isApiKey}}{{#isOAuth}}
-            // Configure OAuth2 access token for authorization: {{{name}}}
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";{{/isOAuth}}{{/authMethods}}
+            // Configuration.Default.ApiKeyPrefix.Add("{{{keyParamName}}}", "Bearer");{{/isApiKey}}{{#isOAuth}}// Configure OAuth2 access token for authorization: {{{name}}}
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";{{/isOAuth}}
+            {{/authMethods}}
             {{/hasAuthMethods}}
-
+            
+            // Create an instance of the API class
             var apiInstance = new {{classname}}();
             {{#allParams}}
             {{#isPrimitiveType}}
@@ -32,16 +34,13 @@ namespace Example
             {{/isPrimitiveType}}
             {{/allParams}}
 
-            try
-            {
+            try {
                 {{#summary}}
                 // {{{.}}}
                 {{/summary}}
                 {{#returnType}}{{{.}}} result = {{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
                 Debug.WriteLine(result);{{/returnType}}
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 Debug.Print("Exception when calling {{classname}}.{{operationId}}: " + e.Message );
             }
         }
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_java.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_java.mustache
index 236d2873bc57..adf2e0d750d9 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_java.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_java.mustache
@@ -7,15 +7,16 @@ import java.io.File;
 import java.util.*;
 
 public class {{{classname}}}Example {
-
     public static void main(String[] args) {
-        {{#hasAuthMethods}}ApiClient defaultClient = Configuration.getDefaultApiClient();
-        {{#authMethods}}{{#isBasic}}
+        {{#hasAuthMethods}}
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        {{#authMethods}}
+        {{^isBasicBearer}}{{#isBasic}}
         // Configure HTTP basic authorization: {{{name}}}
         HttpBasicAuth {{{name}}} = (HttpBasicAuth) defaultClient.getAuthentication("{{{name}}}");
         {{{name}}}.setUsername("YOUR USERNAME");
-        {{{name}}}.setPassword("YOUR PASSWORD");{{/isBasic}}{{#isBasicBearer}}
-        // Configure HTTP bearer authorization: {{{name}}}
+        {{{name}}}.setPassword("YOUR PASSWORD");{{/isBasic}}{{/isBasicBearer}}{{#isBasicBearer}}
+        // Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
         HttpBearerAuth {{{name}}} = (HttpBearerAuth) defaultClient.getAuthentication("{{{name}}}");
         {{{name}}}.setBearerToken("BEARER TOKEN");{{/isBasicBearer}}{{#isApiKey}}
         // Configure API key authorization: {{{name}}}
@@ -28,11 +29,13 @@ public class {{{classname}}}Example {
         {{{name}}}.setAccessToken("YOUR ACCESS TOKEN");{{/isOAuth}}
         {{/authMethods}}
         {{/hasAuthMethods}}
-
+        
+        // Create an instance of the API class
         {{{classname}}} apiInstance = new {{{classname}}}();
         {{#allParams}}
         {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{unescapedDescription}}}
         {{/allParams}}
+        
         try {
             {{#returnType}}{{{returnType}}} result = {{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
             System.out.println(result);{{/returnType}}
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_js.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_js.mustache
index 362400aaaa0e..705fd26831d9 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_js.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_js.mustache
@@ -1,22 +1,26 @@
 var {{{jsModuleName}}} = require('{{{jsProjectName}}}');
 {{#hasAuthMethods}}
 var defaultClient = {{{jsModuleName}}}.ApiClient.instance;
-{{#authMethods}}{{#isBasic}}
+{{#authMethods}}{{^isBasicBearer}}{{#isBasic}}
 // Configure HTTP basic authorization: {{{name}}}
 var {{{name}}} = defaultClient.authentications['{{{name}}}'];
-{{{name}}}.username = 'YOUR USERNAME'
-{{{name}}}.password = 'YOUR PASSWORD'{{/isBasic}}{{#isApiKey}}
+{{{name}}}.username = 'YOUR USERNAME';
+{{{name}}}.password = 'YOUR PASSWORD';{{/isBasic}}{{/isBasicBearer}}{{#isBasicBearer}}
+// Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
+var {{{name}}} = defaultClient.authentications['{{{name}}}'];
+{{{name}}}.accessToken = "YOUR ACCESS TOKEN";{{/isBasicBearer}}{{#isApiKey}}
 // Configure API key authorization: {{{name}}}
 var {{{name}}} = defaultClient.authentications['{{{name}}}'];
-{{{name}}}.apiKey = "YOUR API KEY"
+{{{name}}}.apiKey = "YOUR API KEY";
 // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-//{{{name}}}.apiKeyPrefix['{{{keyParamName}}}'] = "Token"{{/isApiKey}}{{#isOAuth}}
+//{{{name}}}.apiKeyPrefix['{{{keyParamName}}}'] = "Token";{{/isApiKey}}{{#isOAuth}}
 // Configure OAuth2 access token for authorization: {{{name}}}
 var {{{name}}} = defaultClient.authentications['{{{name}}}'];
-{{{name}}}.accessToken = "YOUR ACCESS TOKEN"{{/isOAuth}}
+{{{name}}}.accessToken = "YOUR ACCESS TOKEN";{{/isOAuth}}
 {{/authMethods}}
 {{/hasAuthMethods}}
 
+// Create an instance of the API class
 var api = new {{{jsModuleName}}}.{{{classname}}}(){{#hasParams}}
 {{#hasRequiredParams}}
 {{#requiredParams}}
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_objc.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_objc.mustache
index 1a2762b56c5f..58074d2e3917 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_objc.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_objc.mustache
@@ -1,9 +1,12 @@
 {{#hasAuthMethods}}
 {{classPrefix}}Configuration *apiConfig = [{{classPrefix}}Configuration sharedConfig];
-{{#authMethods}}{{#isBasic}}// Configure HTTP basic authorization (authentication scheme: {{{name}}})
+{{#authMethods}}
+{{^isBasicBearer}}{{#isBasic}}
+// Configure HTTP basic authorization (authentication scheme: {{{name}}})
 [apiConfig setUsername:@"YOUR_USERNAME"];
-[apiConfig setPassword:@"YOUR_PASSWORD"];
-{{/isBasic}}{{#isApiKey}}
+[apiConfig setPassword:@"YOUR_PASSWORD"];{{/isBasic}}{{/isBasicBearer}}{{#isBasicBearer}}
+// Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
+[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];{{/isBasicBearer}}{{#isApiKey}}
 // Configure API key authorization: (authentication scheme: {{{name}}})
 [apiConfig setApiKey:@"YOUR_API_KEY" forApiKeyIdentifier:@"{{{keyParamName}}}"];
 // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
@@ -11,23 +14,27 @@
 {{/isApiKey}}{{#isOAuth}}
 // Configure OAuth2 access token for authorization: (authentication scheme: {{{name}}})
 [apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
-{{/isOAuth}}{{/authMethods}}
+{{/isOAuth}}
+{{/authMethods}}
 {{/hasAuthMethods}}
-{{#allParams}}{{{dataType}}} *{{paramName}} = {{{example}}}; // {{{unescapedDescription}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
-{{/allParams}}
 
+
+// Create an instance of the API class
 {{classname}} *apiInstance = [[{{classname}} alloc] init];
+{{#allParams}}
+{{{dataType}}} *{{paramName}} = {{{example}}}; // {{{unescapedDescription}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
+{{/allParams}}
 
 {{#summary}}// {{{.}}}
 {{/summary}}[apiInstance {{#vendorExtensions.x-objc-operationId}}{{vendorExtensions.x-objc-operationId}}{{/vendorExtensions.x-objc-operationId}}{{^vendorExtensions.x-objc-operationId}}{{nickname}}{{#hasParams}}With{{vendorExtensions.x-first-param-alt-name}}{{/hasParams}}{{^hasParams}}WithCompletionHandler: {{/hasParams}}{{/vendorExtensions.x-objc-operationId}}{{#allParams}}{{#secondaryParam}}
     {{paramName}}{{/secondaryParam}}:{{paramName}}{{/allParams}}
               {{#hasParams}}completionHandler: {{/hasParams}}^({{#returnBaseType}}{{{returnType}}} output, {{/returnBaseType}}NSError* error) {
 {{#returnType}}
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
+    if (output) {
+        NSLog(@"%@", output);
+    }
 {{/returnType}}
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
+    if (error) {
+        NSLog(@"Error: %@", error);
+    }
+}];
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_perl.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_perl.mustache
index 8eeb8a246a26..81c4f4250044 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_perl.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_perl.mustache
@@ -1,18 +1,24 @@
 use Data::Dumper;
 use {{{perlModuleName}}}::Configuration;
 use {{perlModuleName}}::{{classname}};
-{{#hasAuthMethods}}{{#authMethods}}{{#isBasic}}
+{{#hasAuthMethods}}
+{{#authMethods}}
+{{^isBasicBearer}}{{#isBasic}}
 # Configure HTTP basic authorization: {{{name}}}
 ${{{perlModuleName}}}::Configuration::username = 'YOUR_USERNAME';
-${{{perlModuleName}}}::Configuration::password = 'YOUR_PASSWORD';{{/isBasic}}{{#isApiKey}}
+${{{perlModuleName}}}::Configuration::password = 'YOUR_PASSWORD';{{/isBasic}}{{/isBasicBearer}}{{#isBasicBearer}}
+# Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
+${{{perlModuleName}}}::Configuration::access_token = 'YOUR_ACCESS_TOKEN';{{/isBasicBearer}}{{#isApiKey}}
 # Configure API key authorization: {{{name}}}
 ${{{perlModuleName}}}::Configuration::api_key->{'{{{keyParamName}}}'} = 'YOUR_API_KEY';
 # uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 #${{{perlModuleName}}}::Configuration::api_key_prefix->{'{{{keyParamName}}}'} = "Bearer";{{/isApiKey}}{{#isOAuth}}
 # Configure OAuth2 access token for authorization: {{{name}}}
-${{{perlModuleName}}}::Configuration::access_token = 'YOUR_ACCESS_TOKEN';{{/isOAuth}}{{/authMethods}}
+${{{perlModuleName}}}::Configuration::access_token = 'YOUR_ACCESS_TOKEN';{{/isOAuth}}
+{{/authMethods}}
 {{/hasAuthMethods}}
 
+# Create an instance of the API class
 my $api_instance = {{perlModuleName}}::{{classname}}->new();
 {{#allParams}}my ${{paramName}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}{{{perlModuleName}}}::Object::{{dataType}}->new(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; # {{{dataType}}} | {{{unescapedDescription}}}
 {{/allParams}}
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_php.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_php.mustache
index 4984056baeaf..e69eda84c10a 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_php.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_php.mustache
@@ -1,17 +1,23 @@
 <&#63;php
 require_once(__DIR__ . '/vendor/autoload.php');
-{{#hasAuthMethods}}{{#authMethods}}{{#isBasic}}
+{{#hasAuthMethods}}
+{{#authMethods}}
+{{^isBasicBearer}}{{#isBasic}}
 // Configure HTTP basic authorization: {{{name}}}
 {{phpInvokerPackage}}\Configuration::getDefaultConfiguration()->setUsername('YOUR_USERNAME');
-{{phpInvokerPackage}}\Configuration::getDefaultConfiguration()->setPassword('YOUR_PASSWORD');{{/isBasic}}{{#isApiKey}}
+{{phpInvokerPackage}}\Configuration::getDefaultConfiguration()->setPassword('YOUR_PASSWORD');{{/isBasic}}{{/isBasicBearer}}{{#isBasicBearer}}
+// Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
+{{phpInvokerPackage}}\Configuration::getDefaultConfiguration()->setAccessToken('{{{keyParamName}}}', 'YOUR_ACCESS_TOKEN');{{/isBasicBearer}}{{#isApiKey}}
 // Configure API key authorization: {{{name}}}
 {{phpInvokerPackage}}\Configuration::getDefaultConfiguration()->setApiKey('{{{keyParamName}}}', 'YOUR_API_KEY');
 // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 // {{phpInvokerPackage}}\Configuration::getDefaultConfiguration()->setApiKeyPrefix('{{{keyParamName}}}', 'Bearer');{{/isApiKey}}{{#isOAuth}}
 // Configure OAuth2 access token for authorization: {{{name}}}
-{{phpInvokerPackage}}\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');{{/isOAuth}}{{/authMethods}}
+{{phpInvokerPackage}}\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');{{/isOAuth}}
+{{/authMethods}}
 {{/hasAuthMethods}}
 
+// Create an instance of the API class
 $api_instance = new OpenAPITools\Client\Api\{{classname}}();
 {{#allParams}}${{paramName}} = {{{example}}}; // {{{dataType}}} | {{{unescapedDescription}}}
 {{/allParams}}
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_python.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_python.mustache
index 0afe46abce26..028b840f4f9e 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_python.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_python.mustache
@@ -3,19 +3,24 @@ import time
 import {{{pythonPackageName}}}
 from {{{pythonPackageName}}}.rest import ApiException
 from pprint import pprint
-{{#hasAuthMethods}}{{#authMethods}}{{#isBasic}}
+{{#hasAuthMethods}}
+{{#authMethods}}
+{{^isBasicBearer}}{{#isBasic}}
 # Configure HTTP basic authorization: {{{name}}}
 {{{pythonPackageName}}}.configuration.username = 'YOUR_USERNAME'
-{{{pythonPackageName}}}.configuration.password = 'YOUR_PASSWORD'{{/isBasic}}{{#isApiKey}}
+{{{pythonPackageName}}}.configuration.password = 'YOUR_PASSWORD'{{/isBasic}}{{/isBasicBearer}}{{#isBasicBearer}}
+# Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
+{{{pythonPackageName}}}.configuration.access_token = 'YOUR_ACCESS_TOKEN'{{/isBasicBearer}}{{#isApiKey}}
 # Configure API key authorization: {{{name}}}
 {{{pythonPackageName}}}.configuration.api_key['{{{keyParamName}}}'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # {{{pythonPackageName}}}.configuration.api_key_prefix['{{{keyParamName}}}'] = 'Bearer'{{/isApiKey}}{{#isOAuth}}
 # Configure OAuth2 access token for authorization: {{{name}}}
-{{{pythonPackageName}}}.configuration.access_token = 'YOUR_ACCESS_TOKEN'{{/isOAuth}}{{/authMethods}}
+{{{pythonPackageName}}}.configuration.access_token = 'YOUR_ACCESS_TOKEN'{{/isOAuth}}
+{{/authMethods}}
 {{/hasAuthMethods}}
 
-# create an instance of the API class
+# Create an instance of the API class
 api_instance = {{{pythonPackageName}}}.{{{classname}}}()
 {{#allParams}}{{paramName}} = {{{example}}} # {{{dataType}}} | {{{unescapedDescription}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
 {{/allParams}}
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_rust.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_rust.mustache
index 92c7ea600dcc..89a16ecc2063 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_rust.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_rust.mustache
@@ -6,6 +6,6 @@ pub fn main() {
 
     let mut context = {{classname}}::Context::default();
     let result = client.{{operationId}}({{#allParams}}{{paramName}}, {{/allParams}}&context).wait();
-    println!("{:?}", result);
 
+    println!("{:?}", result);
 }
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/generatedAnnotation.mustache
index a47b6faa85b9..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/generatedAnnotation.mustache
@@ -1 +1 @@
-{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/pom.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/pom.mustache
index 797090f033a4..fb0bb3ca7ebb 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/pom.mustache
@@ -66,6 +66,12 @@
        <artifactId>jackson-jaxrs-json-provider</artifactId>
        <version>${jackson-version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${javax-annotation-version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
@@ -82,6 +88,7 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <servlet-api-version>2.5</servlet-api-version>
     <jackson-version>2.8.9</jackson-version>
+    <javax-annotation-version>1.3.2</javax-annotation-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/generatedAnnotation.mustache
index ad17a426e969..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/generatedAnnotation.mustache
@@ -1,3 +1 @@
-{{^hideGenerationTimestamp}}
-@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
-{{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache
index 96d001c40c2e..ce81b1ee0df3 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache
@@ -15,6 +15,7 @@
       <cucumber-junit.version>1.2.5</cucumber-junit.version>
       <cucumber-java.version>1.2.5</cucumber-java.version>
       <cucumber-reporting.version>3.10.0</cucumber-reporting.version>
+      <javax-annotation-version>1.3.2</javax-annotation-version>
       <springfox-swagger2>2.6.1-SNAPSHOT</springfox-swagger2>
       <springfox-swagger-ui>2.6.0</springfox-swagger-ui>
       <slf4j-api>1.7.25</slf4j-api>
@@ -168,6 +169,12 @@
           <artifactId>commons-logging</artifactId>
           <version>1.2</version>
       </dependency>
+      <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <version>${javax-annotation-version}</version>
+          <scope>provided</scope>
+      </dependency>
       {{#pkmstInterceptor}}
       <!-- PKMST middleware dependency -->
         <dependency>
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/README.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/README.mustache
index 725ac257c096..eebddf4b1961 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/README.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/README.mustache
@@ -3,7 +3,7 @@
 ## Requires
 
 {{#jvm}}
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 {{/jvm}}
 {{#multiplatform}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache
index b5481b716305..f1fd978570b7 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache
@@ -86,6 +86,10 @@ dependencies {
     compile "org.threeten:threetenbp:1.4.0"
     {{/threetenbp}}
     {{#jvm-retrofit2}}
+    {{#hasOAuthMethods}}
+    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.0"
+    {{/hasOAuthMethods}}
+    compile "com.squareup.okhttp3:logging-interceptor:4.4.0"
     {{#useRxJava}}
     compile "io.reactivex:rxjava:$rxJavaVersion"
     compile "com.squareup.retrofit2:adapter-rxjava:$retrofitVersion"
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
index e1f5062f2e2e..1b63b0878117 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
@@ -28,6 +28,7 @@ import kotlinx.serialization.internal.CommonEnumSerializer
 {{#serializableModel}}
 import java.io.Serializable
 {{/serializableModel}}
+
 /**
  * {{{description}}}
 {{#allVars}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache
index 4f1a70a501a9..c15415189747 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache
@@ -5,9 +5,18 @@ import retrofit2.http.*
 {{#doNotUseRxAndCoroutines}}
 import retrofit2.Call
 {{/doNotUseRxAndCoroutines}}
+{{^doNotUseRxAndCoroutines}}
+{{#useCoroutines}}
+import retrofit2.Response
+{{/useCoroutines}}
+{{/doNotUseRxAndCoroutines}}
 import okhttp3.RequestBody
+{{#isResponseFile}}
 import okhttp3.ResponseBody
+{{/isResponseFile}}
+{{#isMultipart}}
 import okhttp3.MultipartBody
+{{/isMultipart}}
 {{^doNotUseRxAndCoroutines}}
 {{#useRxJava}}
 import rx.Observable
@@ -28,6 +37,17 @@ import io.reactivex.Completable
 {{#operations}}
 interface {{classname}} {
     {{#operation}}
+    /**
+     * {{summary}}
+     * {{notes}}
+     * Responses:{{#responses}}
+     *  - {{code}}: {{{message}}}{{/responses}}
+     * 
+    {{#allParams}} 
+     * @param {{paramName}} {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
+    {{/allParams}} 
+    * @return {{^useCoroutines}}[Call]<{{/useCoroutines}}{{#isResponseFile}}[ResponseBody]{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}[{{{returnType}}}]{{/returnType}}{{^returnType}}[Unit]{{/returnType}}{{/isResponseFile}}{{^useCoroutines}}>{{/useCoroutines}}
+     */
     {{#isDeprecated}}
     @Deprecated("This api was deprecated")
     {{/isDeprecated}}
@@ -46,7 +66,7 @@ interface {{classname}} {
     {{/prioritizedContentTypes}}
     {{/formParams}}
     @{{httpMethod}}("{{{path}}}")
-    {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{^allParams}}){{/allParams}}{{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, {{/hasMore}}{{^hasMore}}){{/hasMore}}{{/allParams}}: {{^doNotUseRxAndCoroutines}}{{#useRxJava}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{/isResponseFile}}>{{/useRxJava}}{{#useRxJava2}}{{#returnType}}Single<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava2}}{{#useCoroutines}}{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{/isResponseFile}}{{/useCoroutines}}{{/doNotUseRxAndCoroutines}}{{#doNotUseRxAndCoroutines}}Call<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{/isResponseFile}}>{{/doNotUseRxAndCoroutines}}
+    {{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{^allParams}}){{/allParams}}{{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, {{/hasMore}}{{^hasMore}}){{/hasMore}}{{/allParams}}: {{^doNotUseRxAndCoroutines}}{{#useRxJava}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{/isResponseFile}}>{{/useRxJava}}{{#useRxJava2}}{{#returnType}}Single<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava2}}{{#useCoroutines}}Response<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{/isResponseFile}}>{{/useCoroutines}}{{/doNotUseRxAndCoroutines}}{{#doNotUseRxAndCoroutines}}Call<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{/isResponseFile}}>{{/doNotUseRxAndCoroutines}}
 
     {{/operation}}
 }
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api_doc.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api_doc.mustache
new file mode 100644
index 000000000000..dd9e3544fe85
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api_doc.mustache
@@ -0,0 +1,83 @@
+# {{classname}}{{#description}}
+{{description}}{{/description}}
+
+All URIs are relative to *{{basePath}}*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}
+
+{{#operations}}
+{{#operation}}
+
+{{summary}}{{#notes}}
+
+{{notes}}{{/notes}}
+
+### Example
+```kotlin
+// Import classes:
+//import {{{packageName}}}.*
+//import {{{packageName}}}.infrastructure.*
+//import {{{modelPackage}}}.*
+
+val apiClient = ApiClient()
+{{#authMethods}}
+{{#isBasic}}
+{{#isBasicBasic}}
+apiClient.setCredentials("USERNAME", "PASSWORD")
+{{/isBasicBasic}}
+{{#isBasicBearer}}
+apiClient.setBearerToken("TOKEN")
+{{/isBasicBearer}}
+{{/isBasic}}
+{{/authMethods}}
+val webService = apiClient.createWebservice({{{classname}}}::class.java)
+{{#allParams}}
+val {{{paramName}}} : {{{dataType}}} = {{{example}}} // {{{dataType}}} | {{{description}}}
+{{/allParams}}
+
+{{#useCoroutines}}
+launch(Dispatchers.IO) {
+{{/useCoroutines}}
+{{#useCoroutines}}    {{/useCoroutines}}{{#returnType}}val result : {{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}} = {{/returnType}}webService.{{{operationId}}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+{{#useCoroutines}}
+}
+{{/useCoroutines}}
+```
+
+### Parameters
+{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
+{{#allParams}} **{{paramName}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}{{#generateModelDocs}}[**{{dataType}}**]({{baseType}}.md){{/generateModelDocs}}{{^generateModelDocs}}**{{dataType}}**{{/generateModelDocs}}{{/isFile}}{{/isPrimitiveType}}| {{description}} |{{^required}} [optional]{{/required}}{{#defaultValue}} [default to {{defaultValue}}]{{/defaultValue}}{{#allowableValues}} [enum: {{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}]{{/allowableValues}}
+{{/allParams}}
+
+### Return type
+
+{{#returnType}}{{#returnTypeIsPrimitive}}**{{returnType}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{#generateModelDocs}}[**{{returnType}}**]({{returnBaseType}}.md){{/generateModelDocs}}{{^generateModelDocs}}**{{returnType}}**{{/generateModelDocs}}{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}null (empty response body){{/returnType}}
+
+### Authorization
+
+{{^authMethods}}No authorization required{{/authMethods}}
+{{#authMethods}}
+{{#isBasic}}
+{{#isBasicBasic}}
+Configure {{name}}:
+    ApiClient().setCredentials("USERNAME", "PASSWORD")
+{{/isBasicBasic}}
+{{#isBasicBearer}}
+Configure {{name}}:
+    ApiClient().setBearerToken("TOKEN")
+{{/isBasicBearer}}
+{{/isBasic}}
+{{/authMethods}}
+
+### HTTP request headers
+
+ - **Content-Type**: {{#consumes}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
+ - **Accept**: {{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
+
+{{/operation}}
+{{/operations}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/ApiKeyAuth.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/ApiKeyAuth.kt.mustache
new file mode 100644
index 000000000000..12d01a017c68
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/ApiKeyAuth.kt.mustache
@@ -0,0 +1,50 @@
+package {{packageName}}.auth
+
+import java.io.IOException
+import java.net.URI
+import java.net.URISyntaxException
+
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class ApiKeyAuth(
+        private val location: String = "",
+        private val paramName: String = "",
+        private var apiKey: String = ""
+) : Interceptor {
+    
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request = chain.request()
+
+        if ("query" == location) {
+            var newQuery = request.url.toUri().query
+            val paramValue = "$paramName=$apiKey"
+            if (newQuery == null) {
+                newQuery = paramValue
+            } else {
+                newQuery += "&$paramValue"
+            }
+
+            val newUri: URI
+            try {
+                val oldUri = request.url.toUri()
+                newUri = URI(oldUri.scheme, oldUri.authority,
+                    oldUri.path, newQuery, oldUri.fragment)
+            } catch (e: URISyntaxException) {
+                throw IOException(e)
+            }
+
+            request = request.newBuilder().url(newUri.toURL()).build()
+        } else if ("header" == location) {
+            request = request.newBuilder()
+                    .addHeader(paramName, apiKey)
+                    .build()
+        } else if ("cookie" == location) {
+            request = request.newBuilder()
+                    .addHeader("Cookie", "$paramName=$apiKey")
+                    .build()
+        }
+        return chain.proceed(request)
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBasicAuth.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBasicAuth.kt.mustache
new file mode 100644
index 000000000000..fc122514388c
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBasicAuth.kt.mustache
@@ -0,0 +1,33 @@
+package {{packageName}}.auth
+
+import java.io.IOException
+
+import kotlin.jvm.Throws
+import okhttp3.Interceptor
+import okhttp3.Interceptor.Chain
+import okhttp3.Response
+import okhttp3.Credentials
+
+class HttpBasicAuth(
+    private var username: String = "",
+    private var password: String = ""
+) : Interceptor {
+
+    fun setCredentials(username: String, password: String) {
+        this.username = username
+        this.password = password
+    }
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Chain): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") == null && username.isNotBlank() && password.isNotBlank()) {
+            request = request.newBuilder()
+                .addHeader("Authorization", Credentials.basic(username, password))
+                .build()
+        }
+        return chain.proceed(request)
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache
new file mode 100644
index 000000000000..32384488b9ad
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache
@@ -0,0 +1,39 @@
+package {{packageName}}.auth
+
+import java.io.IOException
+
+import okhttp3.Interceptor
+import okhttp3.Interceptor.Chain
+import okhttp3.Response
+
+class HttpBearerAuth(
+    private var schema: String = "",
+    var bearerToken: String = ""
+) : Interceptor {
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Chain): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") == null && bearerToken.isNotBlank()) {
+            request = request.newBuilder()
+                .addHeader("Authorization", headerValue())
+                .build()
+        }
+        return chain.proceed(request)
+    }
+
+    private fun headerValue(): String {
+        return if (schema.isNotBlank()) {
+            "${upperCaseBearer()} $bearerToken"
+        } else {
+            bearerToken
+        }
+    }
+
+    private fun upperCaseBearer(): String {
+        return if (schema.toLowerCase().equals("bearer")) "Bearer" else schema
+    }
+
+}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuth.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuth.kt.mustache
new file mode 100644
index 000000000000..1764fc2d87f3
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuth.kt.mustache
@@ -0,0 +1,151 @@
+package {{packageName}}.auth
+
+import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
+import java.net.HttpURLConnection.HTTP_FORBIDDEN
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.OAuthClient
+import org.apache.oltu.oauth2.client.request.OAuthBearerClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+import org.apache.oltu.oauth2.common.message.types.GrantType
+import org.apache.oltu.oauth2.common.token.BasicOAuthToken
+
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Response
+
+class OAuth(
+        client: OkHttpClient,
+        var tokenRequestBuilder: TokenRequestBuilder
+) : Interceptor {
+
+    interface AccessTokenListener {
+        fun notify(token: BasicOAuthToken)
+    }
+
+    private var oauthClient: OAuthClient = OAuthClient(OAuthOkHttpClient(client))
+
+    @Volatile 
+    private var accessToken: String? = null
+    var authenticationRequestBuilder: AuthenticationRequestBuilder? = null
+    private var accessTokenListener: AccessTokenListener? = null
+
+    constructor(
+            requestBuilder: TokenRequestBuilder
+    ) : this(
+            OkHttpClient(), 
+            requestBuilder
+    )
+
+    constructor(
+            flow: OAuthFlow, 
+            authorizationUrl: String, 
+            tokenUrl: String, 
+            scopes: String
+    ) : this(
+            OAuthClientRequest.tokenLocation(tokenUrl).setScope(scopes)
+    ) {
+        setFlow(flow);
+        authenticationRequestBuilder = OAuthClientRequest.authorizationLocation(authorizationUrl);
+    }
+
+    fun setFlow(flow: OAuthFlow) {
+        when (flow) {
+            OAuthFlow.accessCode, OAuthFlow.implicit ->
+                tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE)
+            OAuthFlow.password ->
+                tokenRequestBuilder.setGrantType(GrantType.PASSWORD)
+            OAuthFlow.application ->
+                tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS)
+        }            
+    }
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        return retryingIntercept(chain, true)
+    }
+
+    @Throws(IOException::class)
+    private fun retryingIntercept(chain: Interceptor.Chain, updateTokenAndRetryOnAuthorizationFailure: Boolean): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") != null) {
+            return chain.proceed(request)
+        }
+
+        // If first time, get the token
+        val oAuthRequest: OAuthClientRequest
+        if (accessToken == null) {
+            updateAccessToken(null)
+        }
+
+        if (accessToken != null) {
+            // Build the request
+            val rb = request.newBuilder()
+
+            val requestAccessToken = accessToken
+            try {
+                oAuthRequest = OAuthBearerClientRequest(request.url.toString())
+                        .setAccessToken(requestAccessToken)
+                        .buildHeaderMessage()
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            }
+
+            oAuthRequest.headers.entries.forEach { header ->
+                rb.addHeader(header.key, header.value)
+            }
+            rb.url(oAuthRequest.locationUri)
+
+            //Execute the request
+            val response = chain.proceed(rb.build())
+
+            // 401/403 most likely indicates that access token has expired. Unless it happens two times in a row.
+            if ((response.code == HTTP_UNAUTHORIZED || response.code == HTTP_FORBIDDEN) && updateTokenAndRetryOnAuthorizationFailure) {
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body?.close()
+                        return retryingIntercept(chain, false)
+                    }
+                } catch (e: Exception) {
+                    response.body?.close()
+                    throw e
+                }
+            }
+            return response
+        } else {
+            return chain.proceed(chain.request())
+        }
+    }
+
+    /**
+     * Returns true if the access token has been updated
+     */
+    @Throws(IOException::class)
+    @Synchronized 
+    fun updateAccessToken(requestAccessToken: String?): Boolean {
+        if (accessToken == null || accessToken.equals(requestAccessToken)) {    
+            return try {
+                val accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage())
+                if (accessTokenResponse != null && accessTokenResponse.accessToken != null) {
+                    accessToken = accessTokenResponse.accessToken
+                    accessTokenListener?.notify(accessTokenResponse.oAuthToken as BasicOAuthToken)
+                    !accessToken.equals(requestAccessToken)
+                } else {
+                    false
+                }
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            } catch (e: OAuthProblemException) {
+                throw IOException(e)
+            }
+        }
+        return true;
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthFlow.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthFlow.kt.mustache
new file mode 100644
index 000000000000..05ad3f7e547b
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthFlow.kt.mustache
@@ -0,0 +1,5 @@
+package {{packageName}}.auth
+
+enum class OAuthFlow {
+    accessCode, implicit, password, application
+}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthOkHttpClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthOkHttpClient.kt.mustache
new file mode 100644
index 000000000000..106b0581994b
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthOkHttpClient.kt.mustache
@@ -0,0 +1,61 @@
+package {{packageName}}.auth
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.HttpClient
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.response.OAuthClientResponse
+import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody
+
+
+class OAuthOkHttpClient(
+        private var client: OkHttpClient
+) : HttpClient {
+
+    constructor() : this(OkHttpClient())
+
+    @Throws(OAuthSystemException::class, OAuthProblemException::class)
+    override fun <T : OAuthClientResponse?> execute(
+            request: OAuthClientRequest, 
+            headers: Map<String, String>?,
+            requestMethod: String, 
+            responseClass: Class<T>?): T {
+
+        var mediaType = "application/json".toMediaTypeOrNull()
+        val requestBuilder = Request.Builder().url(request.locationUri)
+
+        headers?.forEach { entry ->
+            if (entry.key.equals("Content-Type", true)) {
+                mediaType = entry.value.toMediaTypeOrNull()
+            } else {
+                requestBuilder.addHeader(entry.key, entry.value)
+            }
+        }
+
+        val body: RequestBody? = if (request.body != null) RequestBody.create(mediaType, request.body) else null
+        requestBuilder.method(requestMethod, body)
+
+        try {
+            val response = client.newCall(requestBuilder.build()).execute()
+            return OAuthClientResponseFactory.createCustomResponse(
+                    response.body?.string(), 
+                    response.body?.contentType()?.toString(),
+                    response.code,
+                    responseClass)
+        } catch (e: IOException) {
+            throw OAuthSystemException(e)
+        }
+    }
+
+    override fun shutdown() {
+        // Nothing to do here
+    }
+
+}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/bodyParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/bodyParams.mustache
index 7e7ea165b4a4..15ec80cdbadd 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/bodyParams.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/bodyParams.mustache
@@ -1 +1 @@
-{{#isBodyParam}}@Body {{{paramName}}}: {{{dataType}}}{{/isBodyParam}}
\ No newline at end of file
+{{#isBodyParam}}@Body {{{paramName}}}: {{{dataType}}}{{^required}}? = null{{/required}}{{/isBodyParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache
index 71c558c8519a..6c20b54ccf6e 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache
@@ -1,7 +1,30 @@
 package {{packageName}}.infrastructure
 
+{{#hasOAuthMethods}}
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import {{packageName}}.auth.ApiKeyAuth
+import {{packageName}}.auth.OAuth
+import {{packageName}}.auth.OAuth.AccessTokenListener
+import {{packageName}}.auth.OAuthFlow
+{{/hasOAuthMethods}}
+{{#hasAuthMethods}}
+{{#authMethods}}
+{{#isBasic}}
+{{#isBasicBasic}}
+import {{packageName}}.auth.HttpBasicAuth
+{{/isBasicBasic}}
+{{#isBasicBearer}}
+import {{packageName}}.auth.HttpBearerAuth
+{{/isBasicBearer}}
+{{/isBasic}}
+{{/authMethods}}
+{{/hasAuthMethods}}
+
+import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.converter.scalars.ScalarsConverterFactory
 {{#useRxJava}}
 import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory
@@ -10,48 +33,255 @@ import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 {{/useRxJava2}}
 {{#gson}}
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
 import retrofit2.converter.gson.GsonConverterFactory
 {{/gson}}
 {{#moshi}}
+import com.squareup.moshi.Moshi
 import retrofit2.converter.moshi.MoshiConverterFactory
 {{/moshi}}
 
 {{#nonPublicApi}}internal {{/nonPublicApi}}class ApiClient(
     private var baseUrl: String = defaultBasePath,
-    private var okHttpClient: OkHttpClient
+    private val okHttpClientBuilder: OkHttpClient.Builder? = null,
+    private val serializerBuilder: {{#gson}}Gson{{/gson}}{{#moshi}}Moshi.{{/moshi}}Builder = Serializer.{{#gson}}gson{{/gson}}{{#moshi}}moshi{{/moshi}}Builder
 ) {
-    companion object {
-        @JvmStatic
-        val defaultBasePath: String by lazy {
-            System.getProperties().getProperty("{{packageName}}.baseUrl", "{{{basePath}}}")
-        }
+    private val apiAuthorizations = mutableMapOf<String, Interceptor>()
+    var logger: ((String) -> Unit)? = null
+
+    private val retrofitBuilder: Retrofit.Builder by lazy {
+        Retrofit.Builder()
+            .baseUrl(baseUrl)
+            .addConverterFactory(ScalarsConverterFactory.create())
+            {{#gson}}
+            .addConverterFactory(GsonConverterFactory.create(serializerBuilder.create()))
+            {{/gson}}
+            {{#useRxJava}}
+            .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+            {{/useRxJava}}
+            {{#useRxJava2}}
+            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+            {{/useRxJava2}}
+            {{#moshi}}
+            .addConverterFactory(MoshiConverterFactory.create(serializerBuilder.build()))
+            {{/moshi}}
+    }
+
+    private val clientBuilder: OkHttpClient.Builder by lazy {
+        okHttpClientBuilder ?: defaultClientBuilder
+    }
+
+    private val defaultClientBuilder: OkHttpClient.Builder by lazy {
+        OkHttpClient()
+            .newBuilder()
+            .addInterceptor(HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
+                override fun log(message: String) {
+                    logger?.invoke(message)
+                }
+            }).apply {
+                level = HttpLoggingInterceptor.Level.BODY
+            })
     }
 
     init {
         normalizeBaseUrl()
     }
 
-    val retrofitBuilder: Retrofit.Builder by lazy {
+    {{#hasAuthMethods}}
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: {{#gson}}Gson{{/gson}}{{#moshi}}Moshi.{{/moshi}}Builder = Serializer.{{#gson}}gson{{/gson}}{{#moshi}}moshi{{/moshi}}Builder,
+        authNames: Array<String>
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder) {
+        authNames.forEach { authName ->
+            val auth = when (authName) {
+                {{#authMethods}}"{{name}}" -> {{#isBasic}}{{#isBasicBasic}}HttpBasicAuth(){{/isBasicBasic}}{{#isBasicBearer}}HttpBearerAuth("{{scheme}}"){{/isBasicBearer}}{{/isBasic}}{{#isApiKey}}ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{#isKeyInQuery}}"query"{{/isKeyInQuery}}{{#isKeyInCookie}}"cookie"{{/isKeyInCookie}}, "{{keyParamName}}"){{/isApiKey}}{{#isOAuth}}OAuth(OAuthFlow.{{flow}}, "{{authorizationUrl}}", "{{tokenUrl}}", "{{#scopes}}{{scope}}{{#hasMore}}, {{/hasMore}}{{/scopes}}"){{/isOAuth}}{{/authMethods}}
+                else -> throw RuntimeException("auth name $authName not found in available auth names")
+            }
+            addAuthorization(authName, auth);
+        }
+    }
 
-        Retrofit.Builder()
-        .baseUrl(baseUrl)
-        .addConverterFactory(ScalarsConverterFactory.create())
-        {{#gson}}
-        .addConverterFactory(GsonConverterFactory.create(Serializer.gson))
-        {{/gson}}
-        {{#useRxJava}}
-        .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-        {{/useRxJava}}
-        {{#useRxJava2}}
-        .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-        {{/useRxJava2}}
-        {{#moshi}}
-        .addConverterFactory(MoshiConverterFactory.create(Serializer.moshi))
-        {{/moshi}}
+    {{#authMethods}}
+    {{#isBasic}}
+    {{#isBasicBasic}}
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: {{#gson}}Gson{{/gson}}{{#moshi}}Moshi.{{/moshi}}Builder = Serializer.{{#gson}}gson{{/gson}}{{#moshi}}moshi{{/moshi}}Builder,
+        authName: String, 
+        username: String, 
+        password: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        setCredentials(username, password)
+    }
+
+    {{/isBasicBasic}}
+    {{#isBasicBearer}}
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: {{#gson}}Gson{{/gson}}{{#moshi}}Moshi.{{/moshi}}Builder = Serializer.{{#gson}}gson{{/gson}}{{#moshi}}moshi{{/moshi}}Builder,
+        authName: String, 
+        bearerToken: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        setBearerToken(bearerToken)
+    }
+
+    {{/isBasicBearer}}
+    {{/isBasic}}
+    {{/authMethods}}
+    {{#hasOAuthMethods}}
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: {{#gson}}Gson{{/gson}}{{#moshi}}Moshi.{{/moshi}}Builder = Serializer.{{#gson}}gson{{/gson}}{{#moshi}}moshi{{/moshi}}Builder,
+        authName: String, 
+        clientId: String, 
+        secret: String, 
+        username: String, 
+        password: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        getTokenEndPoint()
+            ?.setClientId(clientId)
+            ?.setClientSecret(secret)
+            ?.setUsername(username)
+            ?.setPassword(password)
+    }
+
+    {{/hasOAuthMethods}}
+    {{#authMethods}}
+    {{#isBasic}}
+    {{#isBasicBasic}}
+    fun setCredentials(username: String, password: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, HttpBasicAuth> {
+            setCredentials(username, password);
+        }
+        {{#hasOAuthMethods}}
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder.setUsername(username).setPassword(password)
+        }
+        {{/hasOAuthMethods}}    
+        return this
+    }
+
+    {{/isBasicBasic}}
+    {{^isBasicBasic}}
+    {{#hasOAuthMethods}}
+    fun setCredentials(username: String, password: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder.setUsername(username).setPassword(password)
+        }
+        return this
+    }
+    {{/hasOAuthMethods}}    
+    {{/isBasicBasic}}
+    {{#isBasicBearer}}
+    fun setBearerToken(bearerToken: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, HttpBearerAuth> {
+            this.bearerToken = bearerToken
+        }
+        return this
+    }
+
+    {{/isBasicBearer}}
+    {{/isBasic}}
+    {{/authMethods}}
+    {{/hasAuthMethods}}
+    {{#hasOAuthMethods}}
+    /**
+    * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Token request builder
+    */
+    fun getTokenEndPoint(): TokenRequestBuilder? {
+        var result: TokenRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = tokenRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Authentication request builder
+    */
+    fun getAuthorizationEndPoint(): AuthenticationRequestBuilder? {
+        var result: AuthenticationRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = authenticationRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
+    * @param accessToken Access token
+    * @return ApiClient
+    */
+    fun setAccessToken(accessToken: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            setAccessToken(accessToken)
+        }
+        return this
+    }
+
+    /**
+    * Helper method to configure the oauth accessCode/implicit flow parameters
+    * @param clientId Client ID
+    * @param clientSecret Client secret
+    * @param redirectURI Redirect URI
+    * @return ApiClient
+    */
+    fun configureAuthorizationFlow(clientId: String, clientSecret: String, redirectURI: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder
+                .setClientId(clientId)
+                .setClientSecret(clientSecret)
+                .setRedirectURI(redirectURI)
+            authenticationRequestBuilder
+                ?.setClientId(clientId)
+                ?.setRedirectURI(redirectURI)
+        }
+        return this;
+    }
+
+    /**
+    * Configures a listener which is notified when a new access token is received.
+    * @param accessTokenListener Access token listener
+    * @return ApiClient
+    */
+    fun registerAccessTokenListener(accessTokenListener: AccessTokenListener): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            registerAccessTokenListener(accessTokenListener)
+        }
+        return this;
+    }
+
+    {{/hasOAuthMethods}}
+    /**
+     * Adds an authorization to be used by the client
+     * @param authName Authentication name
+     * @param authorization Authorization interceptor
+     * @return ApiClient
+     */
+    fun addAuthorization(authName: String, authorization: Interceptor): ApiClient {
+        if (apiAuthorizations.containsKey(authName)) {
+            throw RuntimeException("auth name $authName already in api authorizations")
+        }
+        apiAuthorizations[authName] = authorization
+        clientBuilder.addInterceptor(authorization)
+        return this
+    }
+
+    fun setLogger(logger: (String) -> Unit): ApiClient {
+        this.logger = logger
+        return this
     }
 
     fun <S> createService(serviceClass: Class<S>): S {
-        return retrofitBuilder.client(okHttpClient).build().create(serviceClass)
+        return retrofitBuilder.client(clientBuilder.build()).build().create(serviceClass)
     }
 
     private fun normalizeBaseUrl() {
@@ -59,4 +289,20 @@ import retrofit2.converter.moshi.MoshiConverterFactory
             baseUrl += "/"
         }
     }
+
+    private inline fun <T, reified U> Iterable<T>.runOnFirst(callback: U.() -> Unit) {
+        for (element in this) {
+            if (element is U)  {
+                callback.invoke(element)
+                break
+            }
+        }
+    }
+
+    companion object {        
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("{{packageName}}.baseUrl", "{{{basePath}}}")
+        }
+    }
 }
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ResponseExt.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ResponseExt.kt.mustache
new file mode 100644
index 000000000000..bacdc391a690
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ResponseExt.kt.mustache
@@ -0,0 +1,35 @@
+package {{packageName}}.infrastructure
+
+{{#moshi}}
+import com.squareup.moshi.JsonDataException
+import com.squareup.moshi.Moshi
+{{/moshi}}
+{{#gson}}
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonParseException
+{{/gson}}
+import retrofit2.Response
+
+{{#moshi}}
+@Throws(JsonDataException::class)
+inline fun <reified T> Response<*>.getErrorResponse(serializerBuilder: Moshi.Builder = Serializer.moshiBuilder): T? {
+    val serializer = serializerBuilder.build()
+    val parser = serializer.adapter(T::class.java)
+    val response = errorBody()?.string()
+    if(response != null) {
+        return parser.fromJson(response)
+    }
+    return null
+}
+{{/moshi}}
+{{#gson}}
+@Throws(JsonParseException::class)
+inline fun <reified T> Response<*>.getErrorResponse(serializerBuilder: GsonBuilder = Serializer.gsonBuilder): T? {
+    val serializer = serializerBuilder.create()
+    val reader = errorBody()?.charStream()
+    if(reader != null) {
+        return serializer.fromJson(reader, T::class.java)
+    }
+    return null
+}
+{{/gson}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParams.mustache
index b5bace590c56..0ee26c9ec0f0 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParams.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}@Query("{{baseName}}") {{{paramName}}}: {{#collectionFormat}}{{#isCollectionFormatMulti}}{{{dataType}}}{{/isCollectionFormatMulti}}{{^isCollectionFormatMulti}}{{{collectionFormat.toUpperCase}}}Params{{/isCollectionFormatMulti}}{{/collectionFormat}}{{^collectionFormat}}{{{dataType}}}{{/collectionFormat}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}@Query("{{baseName}}") {{{paramName}}}: {{#collectionFormat}}{{#isCollectionFormatMulti}}{{{dataType}}}{{/isCollectionFormatMulti}}{{^isCollectionFormatMulti}}{{{collectionFormat.toUpperCase}}}Params{{/isCollectionFormatMulti}}{{/collectionFormat}}{{^collectionFormat}}{{{dataType}}}{{/collectionFormat}}{{^required}}? = null{{/required}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache
index aac93219b677..d268f23a77d3 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache
@@ -17,33 +17,33 @@ import kotlinx.serialization.internal.StringDescriptor
 
 {{#operations}}
 {{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}} @UseExperimental(UnstableDefault::class) constructor(
-        baseUrl: kotlin.String = "{{{basePath}}}",
-        httpClientEngine: HttpClientEngine? = null,
-        serializer: KotlinxSerializer)
-    : ApiClient(baseUrl, httpClientEngine, serializer) {
+    baseUrl: kotlin.String = "{{{basePath}}}",
+    httpClientEngine: HttpClientEngine? = null,
+    serializer: KotlinxSerializer
+) : ApiClient(baseUrl, httpClientEngine, serializer) {
 
     @UseExperimental(UnstableDefault::class)
     constructor(
         baseUrl: kotlin.String = "{{{basePath}}}",
         httpClientEngine: HttpClientEngine? = null,
-        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default)
-    : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
+        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default
+    ) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
 
     {{#operation}}
     /**
-    * {{summary}}
-    * {{notes}}
-    {{#allParams}}* @param {{{paramName}}} {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
-    {{/allParams}}* @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
-    */
+     * {{summary}}
+     * {{notes}}
+    {{#allParams}} * @param {{{paramName}}} {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
+    {{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+     */
     {{#returnType}}
     @Suppress("UNCHECKED_CAST")
     {{/returnType}}
-    suspend fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : HttpResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}> {
+    suspend fun {{operationId}}({{#allParams}}{{{paramName}}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}): HttpResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}> {
 
         val localVariableAuthNames = listOf<String>({{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}})
 
-        val localVariableBody = {{#hasBodyParam}}{{#bodyParam}}{{#isListContainer}}{{operationIdCamelCase}}Request({{{paramName}}}.asList()){{/isListContainer}}{{^isListContainer}}{{#isMapContainer}}{{operationIdCamelCase}}Request({{{paramName}}}){{/isMapContainer}}{{^isMapContainer}}{{{paramName}}}{{/isMapContainer}}{{/isListContainer}}{{/bodyParam}}{{/hasBodyParam}}
+        val localVariableBody = {{#hasBodyParam}}{{#bodyParam}}{{#isListContainer}}{{operationIdCamelCase}}Request({{{paramName}}}{{^isList}}.asList(){{/isList}}){{/isListContainer}}{{^isListContainer}}{{#isMapContainer}}{{operationIdCamelCase}}Request({{{paramName}}}){{/isMapContainer}}{{^isMapContainer}}{{{paramName}}}{{/isMapContainer}}{{/isListContainer}}{{/bodyParam}}{{/hasBodyParam}}
             {{^hasBodyParam}}
             {{#hasFormParams}}
             {{#isMultipart}}
@@ -78,7 +78,7 @@ import kotlinx.serialization.internal.StringDescriptor
 
         val localVariableConfig = RequestConfig(
             RequestMethod.{{httpMethod}},
-            "{{path}}"{{#pathParams}}.replace("{"+"{{baseName}}"+"}", "${{{paramName}}}"){{/pathParams}},
+            "{{path}}"{{#pathParams}}.replace("{" + "{{baseName}}" + "}", "${{{paramName}}}"){{/pathParams}},
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -87,20 +87,20 @@ import kotlinx.serialization.internal.StringDescriptor
             localVariableConfig,
             localVariableBody,
             localVariableAuthNames
-        ).{{#isListContainer}}wrap<{{operationIdCamelCase}}Response>().map { value.toTypedArray() }{{/isListContainer}}{{^isListContainer}}{{#isMapContainer}}wrap<{{operationIdCamelCase}}Response>().map { value }{{/isMapContainer}}{{^isMapContainer}}wrap(){{/isMapContainer}}{{/isListContainer}}
+        ).{{#isListContainer}}wrap<{{operationIdCamelCase}}Response>().map { value{{^isList}}.toTypedArray(){{/isList}} }{{/isListContainer}}{{^isListContainer}}{{#isMapContainer}}wrap<{{operationIdCamelCase}}Response>().map { value }{{/isMapContainer}}{{^isMapContainer}}wrap(){{/isMapContainer}}{{/isListContainer}}
     }
 
-    {{#hasBodyParam}}
-    {{#bodyParam}}
-    {{#isListContainer}}{{>serial_wrapper_request_list}}{{/isListContainer}}{{#isMapContainer}}{{>serial_wrapper_request_map}}{{/isMapContainer}}
-    {{/bodyParam}}
-    {{/hasBodyParam}}
-    {{#isListContainer}}
-    {{>serial_wrapper_response_list}}
-    {{/isListContainer}}
-    {{#isMapContainer}}
-    {{>serial_wrapper_response_map}}
-    {{/isMapContainer}}
+{{#hasBodyParam}}
+{{#bodyParam}}
+{{#isListContainer}}{{>serial_wrapper_request_list}}{{/isListContainer}}{{#isMapContainer}}{{>serial_wrapper_request_map}}{{/isMapContainer}}
+{{/bodyParam}}
+{{/hasBodyParam}}
+{{#isListContainer}}
+{{>serial_wrapper_response_list}}
+{{/isListContainer}}
+{{#isMapContainer}}
+{{>serial_wrapper_response_map}}
+{{/isMapContainer}}
 
     {{/operation}}
 
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_list.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_list.mustache
index 6b07c05f44e4..a44a242cbd2d 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_list.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_list.mustache
@@ -1,10 +1,10 @@
-@Serializable
-private class {{operationIdCamelCase}}Request(val value: List<{{#bodyParam}}{{baseType}}{{/bodyParam}}>) {
-    @Serializer({{operationIdCamelCase}}Request::class)
-    {{#nonPublicApi}}internal {{/nonPublicApi}}companion object : KSerializer<{{operationIdCamelCase}}Request> {
-        private val serializer: KSerializer<List<{{#bodyParam}}{{baseType}}{{/bodyParam}}>> = {{#bodyParam}}{{baseType}}{{/bodyParam}}.serializer().list
-            override val descriptor = StringDescriptor.withName("{{operationIdCamelCase}}Request")
-            override fun serialize(encoder: Encoder, obj: {{operationIdCamelCase}}Request) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = {{operationIdCamelCase}}Request(serializer.deserialize(decoder))
-    }
-}
\ No newline at end of file
+    @Serializable
+    private class {{operationIdCamelCase}}Request(val value: List<{{#bodyParam}}{{baseType}}{{/bodyParam}}>) {
+        @Serializer({{operationIdCamelCase}}Request::class)
+        {{#nonPublicApi}}internal {{/nonPublicApi}}companion object : KSerializer<{{operationIdCamelCase}}Request> {
+            private val serializer: KSerializer<List<{{#bodyParam}}{{baseType}}{{/bodyParam}}>> = {{#bodyParam}}{{baseType}}{{/bodyParam}}.serializer().list
+                override val descriptor = StringDescriptor.withName("{{operationIdCamelCase}}Request")
+                override fun serialize(encoder: Encoder, obj: {{operationIdCamelCase}}Request) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = {{operationIdCamelCase}}Request(serializer.deserialize(decoder))
+        }
+    }
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_map.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_map.mustache
index f3a28700adf1..5dc6864aae82 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_map.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_map.mustache
@@ -1,10 +1,10 @@
-@Serializable
-private class {{operationIdCamelCase}}Request(val value: Map<kotlin.String, {{#bodyParam}}{{baseType}}{{/bodyParam}}>) {
-    @Serializer({{operationIdCamelCase}}Request::class)
-    {{#nonPublicApi}}internal {{/nonPublicApi}}companion object : KSerializer<{{operationIdCamelCase}}Request> {
-        private val serializer: KSerializer<Map<kotlin.String, {{#bodyParam}}{{baseType}}{{/bodyParam}}>> = (kotlin.String.serializer() to {{#bodyParam}}{{baseType}}{{/bodyParam}}.serializer()).map
-            override val descriptor = StringDescriptor.withName("{{operationIdCamelCase}}Request")
-            override fun serialize(encoder: Encoder, obj: {{operationIdCamelCase}}Request) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = {{operationIdCamelCase}}Request(serializer.deserialize(decoder))
-    }
-}
\ No newline at end of file
+    @Serializable
+    private class {{operationIdCamelCase}}Request(val value: Map<kotlin.String, {{#bodyParam}}{{baseType}}{{/bodyParam}}>) {
+        @Serializer({{operationIdCamelCase}}Request::class)
+        {{#nonPublicApi}}internal {{/nonPublicApi}}companion object : KSerializer<{{operationIdCamelCase}}Request> {
+            private val serializer: KSerializer<Map<kotlin.String, {{#bodyParam}}{{baseType}}{{/bodyParam}}>> = (kotlin.String.serializer() to {{#bodyParam}}{{baseType}}{{/bodyParam}}.serializer()).map
+                override val descriptor = StringDescriptor.withName("{{operationIdCamelCase}}Request")
+                override fun serialize(encoder: Encoder, obj: {{operationIdCamelCase}}Request) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = {{operationIdCamelCase}}Request(serializer.deserialize(decoder))
+        }
+    }
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_list.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_list.mustache
index 838a8f1e53f3..a4e70a219ca4 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_list.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_list.mustache
@@ -1,10 +1,10 @@
-@Serializable
-private class {{operationIdCamelCase}}Response(val value: List<{{returnBaseType}}>) {
-    @Serializer({{operationIdCamelCase}}Response::class)
-    {{#nonPublicApi}}internal {{/nonPublicApi}}companion object : KSerializer<{{operationIdCamelCase}}Response> {
-        private val serializer: KSerializer<List<{{returnBaseType}}>> = {{returnBaseType}}.serializer().list
-            override val descriptor = StringDescriptor.withName("{{operationIdCamelCase}}Response")
-            override fun serialize(encoder: Encoder, obj: {{operationIdCamelCase}}Response) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = {{operationIdCamelCase}}Response(serializer.deserialize(decoder))
-    }
-}
\ No newline at end of file
+    @Serializable
+    private class {{operationIdCamelCase}}Response(val value: List<{{returnBaseType}}>) {
+        @Serializer({{operationIdCamelCase}}Response::class)
+        {{#nonPublicApi}}internal {{/nonPublicApi}}companion object : KSerializer<{{operationIdCamelCase}}Response> {
+            private val serializer: KSerializer<List<{{returnBaseType}}>> = {{returnBaseType}}.serializer().list
+                override val descriptor = StringDescriptor.withName("{{operationIdCamelCase}}Response")
+                override fun serialize(encoder: Encoder, obj: {{operationIdCamelCase}}Response) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = {{operationIdCamelCase}}Response(serializer.deserialize(decoder))
+        }
+    }
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_map.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_map.mustache
index c23dcadcdc5b..8253dc1f1a1c 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_map.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_map.mustache
@@ -1,10 +1,10 @@
-@Serializable
-private class {{operationIdCamelCase}}Response(val value: Map<kotlin.String, {{returnBaseType}}>) {
-    @Serializer({{operationIdCamelCase}}Response::class)
-    {{#nonPublicApi}}internal {{/nonPublicApi}}companion object : KSerializer<{{operationIdCamelCase}}Response> {
-        private val serializer: KSerializer<Map<kotlin.String, {{returnBaseType}}>> = (kotlin.String.serializer() to {{returnBaseType}}.serializer()).map
-            override val descriptor = StringDescriptor.withName("{{operationIdCamelCase}}Response")
-            override fun serialize(encoder: Encoder, obj: {{operationIdCamelCase}}Response) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = {{operationIdCamelCase}}Response(serializer.deserialize(decoder))
-    }
-}
\ No newline at end of file
+    @Serializable
+    private class {{operationIdCamelCase}}Response(val value: Map<kotlin.String, {{returnBaseType}}>) {
+        @Serializer({{operationIdCamelCase}}Response::class)
+        {{#nonPublicApi}}internal {{/nonPublicApi}}companion object : KSerializer<{{operationIdCamelCase}}Response> {
+            private val serializer: KSerializer<Map<kotlin.String, {{returnBaseType}}>> = (kotlin.String.serializer() to {{returnBaseType}}.serializer()).map
+                override val descriptor = StringDescriptor.withName("{{operationIdCamelCase}}Response")
+                override fun serialize(encoder: Encoder, obj: {{operationIdCamelCase}}Response) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = {{operationIdCamelCase}}Response(serializer.deserialize(decoder))
+        }
+    }
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache
index ad17a426e969..875d7b97afee 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/generatedAnnotation.mustache
@@ -1,3 +1 @@
-{{^hideGenerationTimestamp}}
-@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
-{{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache
index e05425fc5c89..900532923cdb 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache
@@ -8,6 +8,7 @@
     <properties>
         <kotlin.version>1.3.30</kotlin.version>
 	    <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -134,6 +135,12 @@
             <artifactId>validation-api</artifactId>
         </dependency>
         {{/useBeanValidation}}
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit5</artifactId>
diff --git a/modules/openapi-generator/src/main/resources/nodejs-express-server/controllers/Controller.mustache b/modules/openapi-generator/src/main/resources/nodejs-express-server/controllers/Controller.mustache
index 5248666fb7e0..c791a8915876 100644
--- a/modules/openapi-generator/src/main/resources/nodejs-express-server/controllers/Controller.mustache
+++ b/modules/openapi-generator/src/main/resources/nodejs-express-server/controllers/Controller.mustache
@@ -1,15 +1,16 @@
 const fs = require('fs');
 const path = require('path');
+const camelCase = require('camelcase');
 const config = require('../config');
 const logger = require('../logger');
 
 class Controller {
   static sendResponse(response, payload) {
     /**
-     * The default response-code is 200. We want to allow to change that. in That case,
-     * payload will be an object consisting of a code and a payload. If not customized
-     * send 200 and the payload as received in this method.
-     */
+    * The default response-code is 200. We want to allow to change that. in That case,
+    * payload will be an object consisting of a code and a payload. If not customized
+    * send 200 and the payload as received in this method.
+    */
     response.status(payload.code || 200);
     const responsePayload = payload.payload !== undefined ? payload.payload : payload;
     if (responsePayload instanceof Object) {
@@ -29,16 +30,16 @@ class Controller {
   }
 
   /**
-   * Files have been uploaded to the directory defined by config.js as upload directory
-   * Files have a temporary name, that was saved as 'filename' of the file object that is
-   * referenced in reuquest.files array.
-   * This method finds the file and changes it to the file name that was originally called
-   * when it was uploaded. To prevent files from being overwritten, a timestamp is added between
-   * the filename and its extension
-   * @param request
-   * @param fieldName
-   * @returns {string}
-   */
+  * Files have been uploaded to the directory defined by config.js as upload directory
+  * Files have a temporary name, that was saved as 'filename' of the file object that is
+  * referenced in reuquest.files array.
+  * This method finds the file and changes it to the file name that was originally called
+  * when it was uploaded. To prevent files from being overwritten, a timestamp is added between
+  * the filename and its extension
+  * @param request
+  * @param fieldName
+  * @returns {string}
+  */
   static collectFile(request, fieldName) {
     let uploadedFileName = '';
     if (request.files && request.files.length > 0) {
@@ -55,44 +56,25 @@ class Controller {
     return uploadedFileName;
   }
 
-  // static collectFiles(request) {
-  //   logger.info('Checking if files are expected in schema');
-  //   const requestFiles = {};
-  //   if (request.openapi.schema.requestBody !== undefined) {
-  //     const [contentType] = request.headers['content-type'].split(';');
-  //     if (contentType === 'multipart/form-data') {
-  //       const contentSchema = request.openapi.schema.requestBody.content[contentType].schema;
-  //       Object.entries(contentSchema.properties).forEach(([name, property]) => {
-  //         if (property.type === 'string' && ['binary', 'base64'].indexOf(property.format) > -1) {
-  //           const fileObject = request.files.find(file => file.fieldname === name);
-  //           const fileArray = fileObject.originalname.split('.');
-  //           const extension = fileArray.pop();
-  //           fileArray.push(`_${Date.now()}`);
-  //           const uploadedFileName = `${fileArray.join('')}.${extension}`;
-  //           fs.renameSync(path.join(config.FILE_UPLOAD_PATH, fileObject.filename),
-  //             path.join(config.FILE_UPLOAD_PATH, uploadedFileName));
-  //           requestFiles[name] = uploadedFileName;
-  //         }
-  //       });
-  //     } else if (request.openapi.schema.requestBody.content[contentType] !== undefined
-  //         && request.files !== undefined) {
-  //       [request.body] = request.files;
-  //     }
-  //   }
-  //   return requestFiles;
-  // }
+  static getRequestBodyName(request) {
+    const codeGenDefinedBodyName = request.openapi.schema['x-codegen-request-body-name'];
+    if (codeGenDefinedBodyName !== undefined) {
+      return codeGenDefinedBodyName;
+    }
+    const refObjectPath = request.openapi.schema.requestBody.content['application/json'].schema.$ref;
+    if (refObjectPath !== undefined && refObjectPath.length > 0) {
+      return (refObjectPath.substr(refObjectPath.lastIndexOf('/') + 1));
+    }
+    return 'body';
+  }
 
   static collectRequestParams(request) {
     const requestParams = {};
     if (request.openapi.schema.requestBody !== undefined) {
       const { content } = request.openapi.schema.requestBody;
       if (content['application/json'] !== undefined) {
-        const schema = request.openapi.schema.requestBody.content['application/json'];
-        if (schema.$ref) {
-          requestParams[schema.$ref.substr(schema.$ref.lastIndexOf('.'))] = request.body;
-        } else {
-          requestParams.body = request.body;
-        }
+        const requestBodyName = camelCase(this.getRequestBodyName(request));
+        requestParams[requestBodyName] = request.body;
       } else if (content['multipart/form-data'] !== undefined) {
         Object.keys(content['multipart/form-data'].schema.properties).forEach(
           (property) => {
@@ -106,14 +88,7 @@ class Controller {
         );
       }
     }
-    // if (request.openapi.schema.requestBody.content['application/json'] !== undefined) {
-    //   const schema = request.openapi.schema.requestBody.content['application/json'];
-    //   if (schema.$ref) {
-    //     requestParams[schema.$ref.substr(schema.$ref.lastIndexOf('.'))] = request.body;
-    //   } else {
-    //     requestParams.body = request.body;
-    //   }
-    // }
+
     request.openapi.schema.parameters.forEach((param) => {
       if (param.in === 'path') {
         requestParams[param.name] = request.openapi.pathParams[param.name];
diff --git a/modules/openapi-generator/src/main/resources/objc/DefaultConfiguration-body.mustache b/modules/openapi-generator/src/main/resources/objc/DefaultConfiguration-body.mustache
index ce336e66171e..d157d635b5ed 100644
--- a/modules/openapi-generator/src/main/resources/objc/DefaultConfiguration-body.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/DefaultConfiguration-body.mustache
@@ -115,6 +115,7 @@
                    },
 {{/isApiKey}}
 {{#isBasic}}
+  {{#isBasicBasic}}
                @"{{name}}":
                    @{
                        @"type": @"basic",
@@ -122,6 +123,16 @@
                        @"key": @"Authorization",
                        @"value": [self getBasicAuthToken]
                    },
+   {{/isBasicBasic}}
+   {{#isBasicBearer}}
+               @"{{name}}":
+                   @{
+                       @"type": @"bearer",
+                       @"in": @"header",
+                       @"key": @"Authorization",
+                       @"value": [self getAccessToken]
+                   },
+   {{/isBasicBearer}}
 {{/isBasic}}
 {{#isOAuth}}
                @"{{name}}":
diff --git a/modules/openapi-generator/src/main/resources/objc/Object-body.mustache b/modules/openapi-generator/src/main/resources/objc/Object-body.mustache
index 88df6d6c9ae9..2bb6d5426093 100644
--- a/modules/openapi-generator/src/main/resources/objc/Object-body.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/Object-body.mustache
@@ -8,13 +8,15 @@
  */
 - (instancetype)initWithDictionary:(NSDictionary *)dict error:(NSError **)err {
     static NSMutableSet *classNames;
+    static NSObject *lock;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         classNames = [NSMutableSet new];
+        lock = [NSObject new];
     });
     
     BOOL initSync;
-    @synchronized([self class])
+    @synchronized(lock)
     {
         NSString *className = NSStringFromClass([self class]);
         initSync = ![classNames containsObject:className];
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/.env.example b/modules/openapi-generator/src/main/resources/php-laravel/.env.example
deleted file mode 100644
index ec44a1259f0a..000000000000
--- a/modules/openapi-generator/src/main/resources/php-laravel/.env.example
+++ /dev/null
@@ -1,39 +0,0 @@
-APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=
-APP_DEBUG=true
-APP_URL=http://localhost
-
-LOG_CHANNEL=stack
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-QUEUE_DRIVER=sync
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/README.md b/modules/openapi-generator/src/main/resources/php-laravel/README.md
index 607a00a0ad2a..9e8783ef7387 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/README.md
+++ b/modules/openapi-generator/src/main/resources/php-laravel/README.md
@@ -1,7 +1,7 @@
 # OpenAPI generated server
 
 ## Requirements
-* PHP 7.1.3 or newer
+* PHP 7.2.5 or newer
 
 ## Overview
 This server was generated by the [openapi-generator](https://github.com/openapitools/openapi-generator) project.  By using the
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Console/Kernel.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Console/Kernel.php
index a8c51585931f..69914e993783 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/app/Console/Kernel.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Console/Kernel.php
@@ -24,8 +24,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')
-        //          ->hourly();
+        // $schedule->command('inspire')->hourly();
     }
 
     /**
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Exceptions/Handler.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Exceptions/Handler.php
index 043cad6bcccc..59c585dc134c 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/app/Exceptions/Handler.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Exceptions/Handler.php
@@ -2,8 +2,8 @@
 
 namespace App\Exceptions;
 
-use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -29,10 +29,12 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return void
+     *
+     * @throws \Exception
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -41,10 +43,12 @@ public function report(Exception $exception)
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
+     * @param  \Throwable  $exception
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Throwable
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Controllers/Controller.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Controllers/Controller.php
index dbaeec7be6ce..a0a2a8a34a62 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Controllers/Controller.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Controllers/Controller.php
@@ -7,20 +7,7 @@
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 
-/**
- * Class Controller
- *
- * @package App\Http\Controllers
- */
 class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
-
-    /**
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function welcome()
-    {
-        return view('welcome');
-    }
 }
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Kernel.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Kernel.php
index 3439540c908a..c3640f30b87d 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Kernel.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Kernel.php
@@ -14,11 +14,12 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \App\Http\Middleware\TrustProxies::class,
+        \Fruitcake\Cors\HandleCors::class,
+        \App\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class,
     ];
 
     /**
@@ -39,7 +40,7 @@ class Kernel extends HttpKernel
 
         'api' => [
             'throttle:60,1',
-            'bindings',
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
 
@@ -51,13 +52,15 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
+        'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
     ];
 }
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/Authenticate.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/Authenticate.php
new file mode 100644
index 000000000000..704089a7fe75
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/Authenticate.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Auth\Middleware\Authenticate as Middleware;
+
+class Authenticate extends Middleware
+{
+    /**
+     * Get the path the user should be redirected to when they are not authenticated.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return string|null
+     */
+    protected function redirectTo($request)
+    {
+        if (! $request->expectsJson()) {
+            return route('login');
+        }
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/CheckForMaintenanceMode.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/CheckForMaintenanceMode.php
new file mode 100644
index 000000000000..35b9824baefb
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/CheckForMaintenanceMode.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
+
+class CheckForMaintenanceMode extends Middleware
+{
+    /**
+     * The URIs that should be reachable while maintenance mode is enabled.
+     *
+     * @var array
+     */
+    protected $except = [
+        //
+    ];
+}
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/RedirectIfAuthenticated.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/RedirectIfAuthenticated.php
index e4cec9c8b11b..2395ddccf9e2 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Providers\RouteServiceProvider;
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
@@ -18,7 +19,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return redirect('/home');
+            return redirect(RouteServiceProvider::HOME);
         }
 
         return $next($request);
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/TrustProxies.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/TrustProxies.php
index 7daf51f1650d..14befceb0061 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/TrustProxies.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Http/Middleware/TrustProxies.php
@@ -2,15 +2,15 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Http\Request;
 use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
 {
     /**
      * The trusted proxies for this application.
      *
-     * @var array
+     * @var array|string|null
      */
     protected $proxies;
 
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/AppServiceProvider.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/AppServiceProvider.php
index 35471f6ff156..ee8ca5bcd8f7 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/AppServiceProvider.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/AppServiceProvider.php
@@ -7,21 +7,21 @@
 class AppServiceProvider extends ServiceProvider
 {
     /**
-     * Bootstrap any application services.
+     * Register any application services.
      *
      * @return void
      */
-    public function boot()
+    public function register()
     {
         //
     }
 
     /**
-     * Register any application services.
+     * Bootstrap any application services.
      *
      * @return void
      */
-    public function register()
+    public function boot()
     {
         //
     }
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/AuthServiceProvider.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/AuthServiceProvider.php
index 9784b1a3003a..30490683b9eb 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/AuthServiceProvider.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/AuthServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Gate;
 
 class AuthServiceProvider extends ServiceProvider
 {
@@ -13,7 +13,7 @@ class AuthServiceProvider extends ServiceProvider
      * @var array
      */
     protected $policies = [
-        'App\Model' => 'App\Policies\ModelPolicy',
+        // 'App\Model' => 'App\Policies\ModelPolicy',
     ];
 
     /**
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/BroadcastServiceProvider.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/BroadcastServiceProvider.php
index 352cce44a3de..395c518bc47b 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/BroadcastServiceProvider.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/BroadcastServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Broadcast;
+use Illuminate\Support\ServiceProvider;
 
 class BroadcastServiceProvider extends ServiceProvider
 {
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/EventServiceProvider.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/EventServiceProvider.php
index fca6152c3ac4..723a290d57d8 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/EventServiceProvider.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/EventServiceProvider.php
@@ -2,8 +2,10 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Event;
+use Illuminate\Auth\Events\Registered;
+use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {
@@ -13,8 +15,8 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'App\Events\Event' => [
-            'App\Listeners\EventListener',
+        Registered::class => [
+            SendEmailVerificationNotification::class,
         ],
     ];
 
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/RouteServiceProvider.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/RouteServiceProvider.php
index b36415e85f3f..540d17b43083 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/RouteServiceProvider.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/RouteServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route;
 
 class RouteServiceProvider extends ServiceProvider
 {
@@ -16,6 +16,13 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected $namespace = 'App\Http\Controllers';
 
+    /**
+     * The path to the "home" route for your application.
+     *
+     * @var string
+     */
+    public const HOME = '/home';
+
     /**
      * Define your route model bindings, pattern filters, etc.
      *
@@ -52,8 +59,8 @@ public function map()
     protected function mapWebRoutes()
     {
         Route::middleware('web')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/web.php'));
+            ->namespace($this->namespace)
+            ->group(base_path('routes/web.php'));
     }
 
     /**
@@ -65,8 +72,9 @@ protected function mapWebRoutes()
      */
     protected function mapApiRoutes()
     {
-        Route::middleware('api')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/api.php'));
+        Route::prefix('api')
+            ->middleware('api')
+            ->namespace($this->namespace)
+            ->group(base_path('routes/api.php'));
     }
 }
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/User.php b/modules/openapi-generator/src/main/resources/php-laravel/app/User.php
new file mode 100644
index 000000000000..e79dab7fea8f
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/User.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App;
+
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
+
+class User extends Authenticatable
+{
+    use Notifiable;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'name', 'email', 'password',
+    ];
+
+    /**
+     * The attributes that should be hidden for arrays.
+     *
+     * @var array
+     */
+    protected $hidden = [
+        'password', 'remember_token',
+    ];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'email_verified_at' => 'datetime',
+    ];
+}
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/bootstrap/app.php b/modules/openapi-generator/src/main/resources/php-laravel/bootstrap/app.php
index f2801adf6f14..037e17df03b0 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/bootstrap/app.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/bootstrap/app.php
@@ -12,7 +12,7 @@
 */
 
 $app = new Illuminate\Foundation\Application(
-    realpath(__DIR__.'/../')
+    $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
 );
 
 /*
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/bootstrap/cache/gitignore b/modules/openapi-generator/src/main/resources/php-laravel/bootstrap/cache/gitignore
index d6b7ef32c847..01e4a6cda9eb 100755
--- a/modules/openapi-generator/src/main/resources/php-laravel/bootstrap/cache/gitignore
+++ b/modules/openapi-generator/src/main/resources/php-laravel/bootstrap/cache/gitignore
@@ -1,2 +1,3 @@
 *
+!data/
 !.gitignore
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/bootstrap/testingAutoload.php b/modules/openapi-generator/src/main/resources/php-laravel/bootstrap/testingAutoload.php
deleted file mode 100644
index 30a59f187ef0..000000000000
--- a/modules/openapi-generator/src/main/resources/php-laravel/bootstrap/testingAutoload.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-passthru("php artisan --env='testing' migrate:fresh");
-passthru("php artisan --env='testing' db:seed");
-
-require realpath(__DIR__ . '/../vendor/autoload.php');
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/composer.mustache b/modules/openapi-generator/src/main/resources/php-laravel/composer.mustache
index cdffe692e0bd..d87c83aa97ce 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/composer.mustache
+++ b/modules/openapi-generator/src/main/resources/php-laravel/composer.mustache
@@ -8,59 +8,56 @@
   "license": "MIT",
   "type": "project",
   "require": {
-    "php": "^7.1.3",
-    "fideloper/proxy": "^4.0",
-    "laravel/framework": "5.6.*",
-    "laravel/tinker": "^1.0"
+    "php": "^7.2.5",
+    "fideloper/proxy": "^4.2",
+    "fruitcake/laravel-cors": "^1.0",
+    "guzzlehttp/guzzle": "^6.3",
+    "laravel/framework": "^7.0",
+    "laravel/tinker": "^2.0"
   },
   "require-dev": {
-    "filp/whoops": "^2.0",
-    "fzaninotto/faker": "^1.4",
-    "mockery/mockery": "^1.0",
-    "nunomaduro/collision": "^2.0",
-    "phpunit/phpunit": "^7.0",
-    "phpspec/phpspec": "^4.2",
-    "squizlabs/php_codesniffer": "^3.0"
-  },
-  "autoload": {
-    "classmap": [
-      "database/seeds",
-      "database/migrations",
-      "database/factories"
-    ],
-    "psr-4": {
-      "App\\": "app/",
-      "Tests\\": "tests/"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Tests\\": "tests/"
-    }
-  },
-  "extra": {
-    "laravel": {
-      "dont-discover": [
-      ]
-    }
-  },
-  "scripts": {
-      "post-root-package-install": [
-      "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
-    ],
-      "post-create-project-cmd": [
-      "@php artisan key:generate"
-    ],
-      "post-autoload-dump": [
-      "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-      "@php artisan package:discover"
-    ]
+    "facade/ignition": "^2.0",
+    "fzaninotto/faker": "^1.9.1",
+    "mockery/mockery": "^1.3.1",
+    "nunomaduro/collision": "^4.1",
+    "phpunit/phpunit": "^8.5"
   },
   "config": {
-    "preferred-install": "dist",
-    "sort-packages": true,
-    "optimize-autoloader": true
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
+    "extra": {
+        "laravel": {
+            "dont-discover": []
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "App\\": "app/"
+        },
+        "classmap": [
+            "database/seeds",
+            "database/factories"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "scripts": {
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover --ansi"
+        ],
+        "post-root-package-install": [
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+        ],
+        "post-create-project-cmd": [
+            "@php artisan key:generate --ansi"
+        ]
+    }
 }
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/app.php b/modules/openapi-generator/src/main/resources/php-laravel/config/app.php
index b16e7f77ee59..8409e00ea9fc 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/config/app.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/app.php
@@ -22,7 +22,7 @@
     |
     | This value determines the "environment" your application is currently
     | running in. This may determine how you prefer to configure various
-    | services your application utilizes. Set this in your ".env" file.
+    | services the application utilizes. Set this in your ".env" file.
     |
     */
 
@@ -39,7 +39,7 @@
     |
     */
 
-    'debug' => env('APP_DEBUG', false),
+    'debug' => (bool) env('APP_DEBUG', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -54,6 +54,8 @@
 
     'url' => env('APP_URL', 'http://localhost'),
 
+    'asset_url' => env('ASSET_URL', null),
+
     /*
     |--------------------------------------------------------------------------
     | Application Timezone
@@ -93,6 +95,19 @@
 
     'fallback_locale' => 'en',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Faker Locale
+    |--------------------------------------------------------------------------
+    |
+    | This locale will be used by the Faker PHP library when generating fake
+    | data for your database seeds. For example, this will be used to get
+    | localized telephone numbers, street address information and more.
+    |
+    */
+
+    'faker_locale' => 'en_US',
+
     /*
     |--------------------------------------------------------------------------
     | Encryption Key
@@ -176,6 +191,7 @@
     'aliases' => [
 
         'App' => Illuminate\Support\Facades\App::class,
+        'Arr' => Illuminate\Support\Arr::class,
         'Artisan' => Illuminate\Support\Facades\Artisan::class,
         'Auth' => Illuminate\Support\Facades\Auth::class,
         'Blade' => Illuminate\Support\Facades\Blade::class,
@@ -191,6 +207,7 @@
         'File' => Illuminate\Support\Facades\File::class,
         'Gate' => Illuminate\Support\Facades\Gate::class,
         'Hash' => Illuminate\Support\Facades\Hash::class,
+        'Http' => Illuminate\Support\Facades\Http::class,
         'Lang' => Illuminate\Support\Facades\Lang::class,
         'Log' => Illuminate\Support\Facades\Log::class,
         'Mail' => Illuminate\Support\Facades\Mail::class,
@@ -205,6 +222,7 @@
         'Schema' => Illuminate\Support\Facades\Schema::class,
         'Session' => Illuminate\Support\Facades\Session::class,
         'Storage' => Illuminate\Support\Facades\Storage::class,
+        'Str' => Illuminate\Support\Str::class,
         'URL' => Illuminate\Support\Facades\URL::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/auth.php b/modules/openapi-generator/src/main/resources/php-laravel/config/auth.php
index 781750102522..aaf982bcdcee 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/config/auth.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/auth.php
@@ -44,6 +44,7 @@
         'api' => [
             'driver' => 'token',
             'provider' => 'users',
+            'hash' => false,
         ],
     ],
 
@@ -96,7 +97,21 @@
             'provider' => 'users',
             'table' => 'password_resets',
             'expire' => 60,
+            'throttle' => 60,
         ],
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Password Confirmation Timeout
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define the amount of seconds before a password confirmation
+    | times out and the user is prompted to re-enter their password via the
+    | confirmation screen. By default, the timeout lasts for three hours.
+    |
+    */
+
+    'password_timeout' => 10800,
+
 ];
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/broadcasting.php b/modules/openapi-generator/src/main/resources/php-laravel/config/broadcasting.php
index 3ca45eaa8523..3bba1103e602 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/config/broadcasting.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/broadcasting.php
@@ -37,7 +37,7 @@
             'app_id' => env('PUSHER_APP_ID'),
             'options' => [
                 'cluster' => env('PUSHER_APP_CLUSTER'),
-                'encrypted' => true,
+                'useTLS' => true,
             ],
         ],
 
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/cache.php b/modules/openapi-generator/src/main/resources/php-laravel/config/cache.php
index fa12e5e4f7e2..4f41fdf966b5 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/config/cache.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/cache.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -11,7 +13,8 @@
     | using this caching library. This connection is used when another is
     | not explicitly specified when executing a given caching function.
     |
-    | Supported: "apc", "array", "database", "file", "memcached", "redis"
+    | Supported: "apc", "array", "database", "file",
+    |            "memcached", "redis", "dynamodb"
     |
     */
 
@@ -36,6 +39,7 @@
 
         'array' => [
             'driver' => 'array',
+            'serialize' => false,
         ],
 
         'database' => [
@@ -57,7 +61,7 @@
                 env('MEMCACHED_PASSWORD'),
             ],
             'options' => [
-                // Memcached::OPT_CONNECT_TIMEOUT  => 2000,
+                // Memcached::OPT_CONNECT_TIMEOUT => 2000,
             ],
             'servers' => [
                 [
@@ -70,7 +74,16 @@
 
         'redis' => [
             'driver' => 'redis',
-            'connection' => 'default',
+            'connection' => 'cache',
+        ],
+
+        'dynamodb' => [
+            'driver' => 'dynamodb',
+            'key' => env('AWS_ACCESS_KEY_ID'),
+            'secret' => env('AWS_SECRET_ACCESS_KEY'),
+            'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
+            'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
+            'endpoint' => env('DYNAMODB_ENDPOINT'),
         ],
 
     ],
@@ -86,9 +99,6 @@
     |
     */
 
-    'prefix' => env(
-        'CACHE_PREFIX',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_cache'
-    ),
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
 
 ];
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/cors.php b/modules/openapi-generator/src/main/resources/php-laravel/config/cors.php
new file mode 100644
index 000000000000..558369dca41b
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/cors.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cross-Origin Resource Sharing (CORS) Configuration
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure your settings for cross-origin resource sharing
+    | or "CORS". This determines what cross-origin operations may execute
+    | in web browsers. You are free to adjust these settings as needed.
+    |
+    | To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
+    |
+    */
+
+    'paths' => ['api/*'],
+
+    'allowed_methods' => ['*'],
+
+    'allowed_origins' => ['*'],
+
+    'allowed_origins_patterns' => [],
+
+    'allowed_headers' => ['*'],
+
+    'exposed_headers' => [],
+
+    'max_age' => 0,
+
+    'supports_credentials' => false,
+
+];
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/database.php b/modules/openapi-generator/src/main/resources/php-laravel/config/database.php
index cab5d068f756..b42d9b30a546 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/config/database.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/database.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -35,12 +37,15 @@
 
         'sqlite' => [
             'driver' => 'sqlite',
+            'url' => env('DATABASE_URL'),
             'database' => env('DB_DATABASE', database_path('database.sqlite')),
             'prefix' => '',
+            'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
         ],
 
         'mysql' => [
             'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '3306'),
             'database' => env('DB_DATABASE', 'forge'),
@@ -50,12 +55,17 @@
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => '',
+            'prefix_indexes' => true,
             'strict' => true,
             'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
         ],
 
         'pgsql' => [
             'driver' => 'pgsql',
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '5432'),
             'database' => env('DB_DATABASE', 'forge'),
@@ -63,12 +73,14 @@
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
             'prefix' => '',
+            'prefix_indexes' => true,
             'schema' => 'public',
             'sslmode' => 'prefer',
         ],
 
         'sqlsrv' => [
             'driver' => 'sqlsrv',
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', 'localhost'),
             'port' => env('DB_PORT', '1433'),
             'database' => env('DB_DATABASE', 'forge'),
@@ -76,6 +88,7 @@
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
             'prefix' => '',
+            'prefix_indexes' => true,
         ],
 
     ],
@@ -99,20 +112,34 @@
     |--------------------------------------------------------------------------
     |
     | Redis is an open source, fast, and advanced key-value store that also
-    | provides a richer set of commands than a typical key-value systems
+    | provides a richer body of commands than a typical key-value system
     | such as APC or Memcached. Laravel makes it easy to dig right in.
     |
     */
 
     'redis' => [
 
-        'client' => 'predis',
+        'client' => env('REDIS_CLIENT', 'phpredis'),
+
+        'options' => [
+            'cluster' => env('REDIS_CLUSTER', 'redis'),
+            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
+        ],
 
         'default' => [
+            'url' => env('REDIS_URL'),
+            'host' => env('REDIS_HOST', '127.0.0.1'),
+            'password' => env('REDIS_PASSWORD', null),
+            'port' => env('REDIS_PORT', '6379'),
+            'database' => env('REDIS_DB', '0'),
+        ],
+
+        'cache' => [
+            'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
-            'port' => env('REDIS_PORT', 6379),
-            'database' => 0,
+            'port' => env('REDIS_PORT', '6379'),
+            'database' => env('REDIS_CACHE_DB', '1'),
         ],
 
     ],
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/filesystems.php b/modules/openapi-generator/src/main/resources/php-laravel/config/filesystems.php
index 77fa5ded1dec..94c81126b227 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/config/filesystems.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/filesystems.php
@@ -37,7 +37,7 @@
     | may even configure multiple disks of the same driver. Defaults have
     | been setup for each driver as an example of the required options.
     |
-    | Supported Drivers: "local", "ftp", "sftp", "s3", "rackspace"
+    | Supported Drivers: "local", "ftp", "sftp", "s3"
     |
     */
 
@@ -62,8 +62,24 @@
             'region' => env('AWS_DEFAULT_REGION'),
             'bucket' => env('AWS_BUCKET'),
             'url' => env('AWS_URL'),
+            'endpoint' => env('AWS_ENDPOINT'),
         ],
 
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Symbolic Links
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the symbolic links that will be created when the
+    | `storage:link` Artisan command is executed. The array keys should be
+    | the locations of the links and the values should be their targets.
+    |
+    */
+
+    'links' => [
+        public_path('storage') => storage_path('app/public'),
+    ],
+
 ];
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/hashing.php b/modules/openapi-generator/src/main/resources/php-laravel/config/hashing.php
index d3c8e2fb22a6..842577087c0c 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/config/hashing.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/hashing.php
@@ -11,7 +11,7 @@
     | passwords for your application. By default, the bcrypt algorithm is
     | used; however, you remain free to modify this option if you wish.
     |
-    | Supported: "bcrypt", "argon"
+    | Supported: "bcrypt", "argon", "argon2id"
     |
     */
 
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/logging.php b/modules/openapi-generator/src/main/resources/php-laravel/config/logging.php
index 400bc7f4640c..088c204e2994 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/config/logging.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/logging.php
@@ -1,6 +1,8 @@
 <?php
 
+use Monolog\Handler\NullHandler;
 use Monolog\Handler\StreamHandler;
+use Monolog\Handler\SyslogUdpHandler;
 
 return [
 
@@ -36,6 +38,7 @@
         'stack' => [
             'driver' => 'stack',
             'channels' => ['single'],
+            'ignore_exceptions' => false,
         ],
 
         'single' => [
@@ -48,7 +51,7 @@
             'driver' => 'daily',
             'path' => storage_path('logs/laravel.log'),
             'level' => 'debug',
-            'days' => 7,
+            'days' => 14,
         ],
 
         'slack' => [
@@ -59,9 +62,20 @@
             'level' => 'critical',
         ],
 
+        'papertrail' => [
+            'driver' => 'monolog',
+            'level' => 'debug',
+            'handler' => SyslogUdpHandler::class,
+            'handler_with' => [
+                'host' => env('PAPERTRAIL_URL'),
+                'port' => env('PAPERTRAIL_PORT'),
+            ],
+        ],
+
         'stderr' => [
             'driver' => 'monolog',
             'handler' => StreamHandler::class,
+            'formatter' => env('LOG_STDERR_FORMATTER'),
             'with' => [
                 'stream' => 'php://stderr',
             ],
@@ -76,6 +90,15 @@
             'driver' => 'errorlog',
             'level' => 'debug',
         ],
+
+        'null' => [
+            'driver' => 'monolog',
+            'handler' => NullHandler::class,
+        ],
+
+        'emergency' => [
+            'path' => storage_path('logs/laravel.log'),
+        ],
     ],
 
 ];
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/mail.php b/modules/openapi-generator/src/main/resources/php-laravel/config/mail.php
index bb92224c59db..54299aabf8ad 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/config/mail.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/mail.php
@@ -4,45 +4,73 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Mail Driver
+    | Default Mailer
     |--------------------------------------------------------------------------
     |
-    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
-    | sending of e-mail. You may specify which one you're using throughout
-    | your application here. By default, Laravel is setup for SMTP mail.
-    |
-    | Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses",
-    |            "sparkpost", "log", "array"
+    | This option controls the default mailer that is used to send any email
+    | messages sent by your application. Alternative mailers may be setup
+    | and used as needed; however, this mailer will be used by default.
     |
     */
 
-    'driver' => env('MAIL_DRIVER', 'smtp'),
+    'default' => env('MAIL_MAILER', 'smtp'),
 
     /*
     |--------------------------------------------------------------------------
-    | SMTP Host Address
+    | Mailer Configurations
     |--------------------------------------------------------------------------
     |
-    | Here you may provide the host address of the SMTP server used by your
-    | applications. A default option is provided that is compatible with
-    | the Mailgun mail service which will provide reliable deliveries.
+    | Here you may configure all of the mailers used by your application plus
+    | their respective settings. Several examples have been configured for
+    | you and you are free to add your own as your application requires.
     |
-    */
-
-    'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP Host Port
-    |--------------------------------------------------------------------------
+    | Laravel supports a variety of mail "transport" drivers to be used while
+    | sending an e-mail. You will specify which one you are using for your
+    | mailers below. You are free to add additional mailers as required.
     |
-    | This is the SMTP port used by your application to deliver e-mails to
-    | users of the application. Like the host we have set this value to
-    | stay compatible with the Mailgun e-mail application by default.
+    | Supported: "smtp", "sendmail", "mailgun", "ses",
+    |            "postmark", "log", "array"
     |
     */
 
-    'port' => env('MAIL_PORT', 587),
+    'mailers' => [
+        'smtp' => [
+            'transport' => 'smtp',
+            'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+            'port' => env('MAIL_PORT', 587),
+            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
+            'username' => env('MAIL_USERNAME'),
+            'password' => env('MAIL_PASSWORD'),
+            'timeout' => null,
+            'auth_mode' => null,
+        ],
+
+        'ses' => [
+            'transport' => 'ses',
+        ],
+
+        'mailgun' => [
+            'transport' => 'mailgun',
+        ],
+
+        'postmark' => [
+            'transport' => 'postmark',
+        ],
+
+        'sendmail' => [
+            'transport' => 'sendmail',
+            'path' => '/usr/sbin/sendmail -bs',
+        ],
+
+        'log' => [
+            'transport' => 'log',
+            'channel' => env('MAIL_LOG_CHANNEL'),
+        ],
+
+        'array' => [
+            'transport' => 'array',
+        ],
+    ],
 
     /*
     |--------------------------------------------------------------------------
@@ -60,47 +88,6 @@
         'name' => env('MAIL_FROM_NAME', 'Example'),
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | E-Mail Encryption Protocol
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the encryption protocol that should be used when
-    | the application send e-mail messages. A sensible default using the
-    | transport layer security protocol should provide great security.
-    |
-    */
-
-    'encryption' => env('MAIL_ENCRYPTION', 'tls'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP Server Username
-    |--------------------------------------------------------------------------
-    |
-    | If your SMTP server requires a username for authentication, you should
-    | set it here. This will get used to authenticate with your server on
-    | connection. You may also set the "password" value below this one.
-    |
-    */
-
-    'username' => env('MAIL_USERNAME'),
-
-    'password' => env('MAIL_PASSWORD'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Sendmail System Path
-    |--------------------------------------------------------------------------
-    |
-    | When using the "sendmail" driver to send e-mails, we will need to know
-    | the path to where Sendmail lives on this server. A default path has
-    | been provided here, which will work well on most of your systems.
-    |
-    */
-
-    'sendmail' => '/usr/sbin/sendmail -bs',
-
     /*
     |--------------------------------------------------------------------------
     | Markdown Mail Settings
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/queue.php b/modules/openapi-generator/src/main/resources/php-laravel/config/queue.php
index 391304f36357..00b76d651812 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/config/queue.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/queue.php
@@ -13,7 +13,7 @@
     |
     */
 
-    'default' => env('QUEUE_DRIVER', 'sync'),
+    'default' => env('QUEUE_CONNECTION', 'sync'),
 
     /*
     |--------------------------------------------------------------------------
@@ -46,21 +46,23 @@
             'host' => 'localhost',
             'queue' => 'default',
             'retry_after' => 90,
+            'block_for' => 0,
         ],
 
         'sqs' => [
             'driver' => 'sqs',
-            'key' => env('SQS_KEY', 'your-public-key'),
-            'secret' => env('SQS_SECRET', 'your-secret-key'),
+            'key' => env('AWS_ACCESS_KEY_ID'),
+            'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
             'queue' => env('SQS_QUEUE', 'your-queue-name'),
-            'region' => env('SQS_REGION', 'us-east-1'),
+            'suffix' => env('SQS_SUFFIX'),
+            'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
         ],
 
         'redis' => [
             'driver' => 'redis',
             'connection' => 'default',
-            'queue' => 'default',
+            'queue' => env('REDIS_QUEUE', 'default'),
             'retry_after' => 90,
             'block_for' => null,
         ],
@@ -79,6 +81,7 @@
     */
 
     'failed' => [
+        'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
         'database' => env('DB_CONNECTION', 'mysql'),
         'table' => 'failed_jobs',
     ],
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/services.php b/modules/openapi-generator/src/main/resources/php-laravel/config/services.php
index aa1f7f82caeb..2a1d616c7746 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/config/services.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/services.php
@@ -8,31 +8,26 @@
     |--------------------------------------------------------------------------
     |
     | This file is for storing the credentials for third party services such
-    | as Stripe, Mailgun, SparkPost and others. This file provides a sane
-    | default location for this type of information, allowing packages
-    | to have a conventional place to find your various credentials.
+    | as Mailgun, Postmark, AWS and more. This file provides the de facto
+    | location for this type of information, allowing packages to have
+    | a conventional file to locate the various service credentials.
     |
     */
 
     'mailgun' => [
         'domain' => env('MAILGUN_DOMAIN'),
         'secret' => env('MAILGUN_SECRET'),
+        'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
     ],
 
-    'ses' => [
-        'key' => env('SES_KEY'),
-        'secret' => env('SES_SECRET'),
-        'region' => env('SES_REGION', 'us-east-1'),
-    ],
-
-    'sparkpost' => [
-        'secret' => env('SPARKPOST_SECRET'),
+    'postmark' => [
+        'token' => env('POSTMARK_TOKEN'),
     ],
 
-    'stripe' => [
-        'model' => App\User::class,
-        'key' => env('STRIPE_KEY'),
-        'secret' => env('STRIPE_SECRET'),
+    'ses' => [
+        'key' => env('AWS_ACCESS_KEY_ID'),
+        'secret' => env('AWS_SECRET_ACCESS_KEY'),
+        'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
     ],
 
 ];
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/session.php b/modules/openapi-generator/src/main/resources/php-laravel/config/session.php
index 736fb3c79eb2..da692f3b8f79 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/config/session.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/session.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -12,7 +14,7 @@
     | you may specify any of the other wonderful drivers provided here.
     |
     | Supported: "file", "cookie", "database", "apc",
-    |            "memcached", "redis", "array"
+    |            "memcached", "redis", "dynamodb", "array"
     |
     */
 
@@ -70,7 +72,7 @@
     |
     */
 
-    'connection' => null,
+    'connection' => env('SESSION_CONNECTION', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -90,13 +92,13 @@
     | Session Cache Store
     |--------------------------------------------------------------------------
     |
-    | When using the "apc" or "memcached" session drivers, you may specify a
-    | cache store that should be used for these sessions. This value must
-    | correspond with one of the application's configured cache stores.
+    | When using the "apc", "memcached", or "dynamodb" session drivers you may
+    | list a cache store that should be used for these sessions. This value
+    | must match with one of the application's configured cache "stores".
     |
     */
 
-    'store' => null,
+    'store' => env('SESSION_STORE', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -124,7 +126,7 @@
 
     'cookie' => env(
         'SESSION_COOKIE',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_session'
+        Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
     ),
 
     /*
@@ -164,7 +166,7 @@
     |
     */
 
-    'secure' => env('SESSION_SECURE_COOKIE', false),
+    'secure' => env('SESSION_SECURE_COOKIE'),
 
     /*
     |--------------------------------------------------------------------------
@@ -186,12 +188,12 @@
     |
     | This option determines how your cookies behave when cross-site requests
     | take place, and can be used to mitigate CSRF attacks. By default, we
-    | do not enable this as other CSRF protection services are in place.
+    | will set this value to "lax" since this is a secure default value.
     |
-    | Supported: "lax", "strict"
+    | Supported: "lax", "strict", "none", null
     |
     */
 
-    'same_site' => null,
+    'same_site' => 'lax',
 
 ];
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/config/view.php b/modules/openapi-generator/src/main/resources/php-laravel/config/view.php
index 2acfd9cc9c44..22b8a18d3258 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/config/view.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/config/view.php
@@ -28,6 +28,9 @@
     |
     */
 
-    'compiled' => realpath(storage_path('framework/views')),
+    'compiled' => env(
+        'VIEW_COMPILED_PATH',
+        realpath(storage_path('framework/views'))
+    ),
 
 ];
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/database/factories/UserFactory.php b/modules/openapi-generator/src/main/resources/php-laravel/database/factories/UserFactory.php
index facf2337b93e..741edead6192 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/database/factories/UserFactory.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/database/factories/UserFactory.php
@@ -1,6 +1,10 @@
 <?php
 
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\User;
 use Faker\Generator as Faker;
+use Illuminate\Support\Str;
 
 /*
 |--------------------------------------------------------------------------
@@ -13,11 +17,12 @@
 |
 */
 
-$factory->define(App\User::class, function (Faker $faker) {
+$factory->define(User::class, function (Faker $faker) {
     return [
         'name' => $faker->name,
         'email' => $faker->unique()->safeEmail,
-        'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret
-        'remember_token' => str_random(10),
+        'email_verified_at' => now(),
+        'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
+        'remember_token' => Str::random(10),
     ];
 });
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/database/gitignore b/modules/openapi-generator/src/main/resources/php-laravel/database/gitignore
index 9b1dffd90fdc..97fc976772ab 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/database/gitignore
+++ b/modules/openapi-generator/src/main/resources/php-laravel/database/gitignore
@@ -1 +1,2 @@
 *.sqlite
+*.sqlite-journal
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/database/migrations/2014_10_12_000000_create_users_table.php b/modules/openapi-generator/src/main/resources/php-laravel/database/migrations/2014_10_12_000000_create_users_table.php
index 689cbeea4717..621a24eb734b 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/database/migrations/2014_10_12_000000_create_users_table.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateUsersTable extends Migration
 {
@@ -14,9 +14,10 @@ class CreateUsersTable extends Migration
     public function up()
     {
         Schema::create('users', function (Blueprint $table) {
-            $table->increments('id');
+            $table->id();
             $table->string('name');
             $table->string('email')->unique();
+            $table->timestamp('email_verified_at')->nullable();
             $table->string('password');
             $table->rememberToken();
             $table->timestamps();
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/database/migrations/2014_10_12_100000_create_password_resets_table.php b/modules/openapi-generator/src/main/resources/php-laravel/database/migrations/2014_10_12_100000_create_password_resets_table.php
deleted file mode 100644
index 0d5cb84502cc..000000000000
--- a/modules/openapi-generator/src/main/resources/php-laravel/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreatePasswordResetsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('password_resets', function (Blueprint $table) {
-            $table->string('email')->index();
-            $table->string('token');
-            $table->timestamp('created_at')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('password_resets');
-    }
-}
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/modules/openapi-generator/src/main/resources/php-laravel/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
new file mode 100644
index 000000000000..9bddee36cb3f
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateFailedJobsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('failed_jobs', function (Blueprint $table) {
+            $table->id();
+            $table->text('connection');
+            $table->text('queue');
+            $table->longText('payload');
+            $table->longText('exception');
+            $table->timestamp('failed_at')->useCurrent();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('failed_jobs');
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/database/seeds/DatabaseSeeder.php b/modules/openapi-generator/src/main/resources/php-laravel/database/seeds/DatabaseSeeder.php
index 91cb6d1c2ded..237dfc5d0d82 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/database/seeds/DatabaseSeeder.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/database/seeds/DatabaseSeeder.php
@@ -11,6 +11,6 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        // $this->call(UsersTableSeeder::class);
+        // $this->call(UserSeeder::class);
     }
 }
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/editorconfig b/modules/openapi-generator/src/main/resources/php-laravel/editorconfig
new file mode 100644
index 000000000000..6537ca4677ee
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/env.example b/modules/openapi-generator/src/main/resources/php-laravel/env.example
new file mode 100644
index 000000000000..ac748637ae52
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/env.example
@@ -0,0 +1,46 @@
+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+LOG_CHANNEL=stack
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=laravel
+DB_USERNAME=root
+DB_PASSWORD=
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/gitattributes b/modules/openapi-generator/src/main/resources/php-laravel/gitattributes
new file mode 100644
index 000000000000..967315dd3d16
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/gitattributes
@@ -0,0 +1,5 @@
+* text=auto
+*.css linguist-vendored
+*.scss linguist-vendored
+*.js linguist-vendored
+CHANGELOG.md export-ignore
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/gitignore b/modules/openapi-generator/src/main/resources/php-laravel/gitignore
index 286a61191980..932493f11246 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/gitignore
+++ b/modules/openapi-generator/src/main/resources/php-laravel/gitignore
@@ -1,19 +1,16 @@
-# ref: https://github.com/github/gitignore/blob/master/Laravel.gitignore
-
-vendor/
-node_modules/
+/node_modules
+/public/hot
+/public/storage
+/storage/*.key
+/vendor
+.env
+.env.backup
+.phpunit.result.cache
+Homestead.json
+Homestead.yaml
 npm-debug.log
 yarn-error.log
 
-# Laravel 4 specific
-bootstrap/compiled.php
-app/storage/
-
-# Laravel 5 & Lumen specific
-public/storage
-public/hot
-storage/*.key
-.env
-Homestead.yaml
-Homestead.json
-/.vagrant
\ No newline at end of file
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+composer.lock
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/php-laravel/licenseInfo.mustache
index acdb498a673f..089da38dc4b0 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/licenseInfo.mustache
+++ b/modules/openapi-generator/src/main/resources/php-laravel/licenseInfo.mustache
@@ -1,7 +1,7 @@
 /**
  * {{{appName}}}
  * {{{appDescription}}}
- * PHP version 7.1.3
+ * PHP version 7.2.5
  *
  * {{#version}}The version of the OpenAPI document: {{{version}}}{{/version}}
  * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/package.json b/modules/openapi-generator/src/main/resources/php-laravel/package.json
index e81ab87fb216..2c35181c9b14 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/package.json
+++ b/modules/openapi-generator/src/main/resources/php-laravel/package.json
@@ -5,18 +5,17 @@
         "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
         "watch": "npm run development -- --watch",
         "watch-poll": "npm run watch -- --watch-poll",
-        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js",
         "prod": "npm run production",
         "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "devDependencies": {
-        "axios": "^0.18",
-        "bootstrap": "^4.0.0",
-        "popper.js": "^1.12",
-        "cross-env": "^5.1",
-        "jquery": "^3.2",
-        "laravel-mix": "^2.0",
-        "lodash": "^4.17.4",
-        "vue": "^2.5.7"
+        "axios": "^0.19",
+        "cross-env": "^7.0",
+        "laravel-mix": "^5.0.1",
+        "lodash": "^4.17.13",
+        "resolve-url-loader": "^3.1.0",
+        "sass": "^1.15.2",
+        "sass-loader": "^8.0.0"
     }
 }
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/phpunit.xml b/modules/openapi-generator/src/main/resources/php-laravel/phpunit.xml
index 1037dd6ad088..964ff0c5717e 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/phpunit.xml
+++ b/modules/openapi-generator/src/main/resources/php-laravel/phpunit.xml
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+>
     <testsuites>
-        <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
-        </testsuite>
-
         <testsuite name="Unit">
             <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
+        <testsuite name="Feature">
+            <directory suffix="Test.php">./tests/Feature</directory>
+        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
@@ -23,12 +18,14 @@
         </whitelist>
     </filter>
     <php>
-        <ini name="error_reporting" value="E_ALL" />
-        <env name="APP_ENV" value="testing"/>
-        <env name="BCRYPT_ROUNDS" value="4"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
-        <env name="MAIL_DRIVER" value="array"/>
+        <server name="APP_ENV" value="testing"/>
+        <server name="BCRYPT_ROUNDS" value="4"/>
+        <server name="CACHE_DRIVER" value="array"/>
+        <server name="DB_CONNECTION" value="sqlite"/>
+        <server name="DB_DATABASE" value=":memory:"/>
+        <server name="MAIL_MAILER" value="array"/>
+        <server name="QUEUE_CONNECTION" value="sync"/>
+        <server name="SESSION_DRIVER" value="array"/>
+        <server name="TELESCOPE_ENABLED" value="false"/>
     </php>
 </phpunit>
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/public/.htaccess b/modules/openapi-generator/src/main/resources/php-laravel/public/.htaccess
index b75525bedcd8..3aec5e27e5db 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/public/.htaccess
+++ b/modules/openapi-generator/src/main/resources/php-laravel/public/.htaccess
@@ -14,7 +14,7 @@
     RewriteCond %{REQUEST_URI} (.+)/$
     RewriteRule ^ %1 [L,R=301]
 
-    # Handle Front Controller...
+    # Send Requests To Front Controller...
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteRule ^ index.php [L]
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/public/css/app.css b/modules/openapi-generator/src/main/resources/php-laravel/public/css/app.css
deleted file mode 100644
index 8b4dc7e9e916..000000000000
--- a/modules/openapi-generator/src/main/resources/php-laravel/public/css/app.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@import url(https://fonts.googleapis.com/css?family=Raleway:300,400,600);/*!
- * Bootstrap v4.0.0 (https://getbootstrap.com)
- * Copyright 2011-2018 The Bootstrap Authors
- * Copyright 2011-2018 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:"Raleway",sans-serif;--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}*,:after,:before{-webkit-box-sizing:border-box;box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:Raleway,sans-serif;font-size:.9rem;font-weight:400;line-height:1.6;color:#212529;text-align:left;background-color:#f5f8fa}[tabindex="-1"]:focus{outline:0!important}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{font-style:normal;line-height:inherit}address,dl,ol,ul{margin-bottom:1rem}dl,ol,ul{margin-top:0}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]),a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-bottom:.5rem;font-family:inherit;font-weight:500;line-height:1.2;color:inherit}.h1,h1{font-size:2.25rem}.h2,h2{font-size:1.8rem}.h3,h3{font-size:1.575rem}.h4,h4{font-size:1.35rem}.h5,h5{font-size:1.125rem}.h6,h6{font-size:.9rem}.lead{font-size:1.125rem;font-weight:300}.display-1{font-size:6rem}.display-1,.display-2{font-weight:300;line-height:1.2}.display-2{font-size:5.5rem}.display-3{font-size:4.5rem}.display-3,.display-4{font-weight:300;line-height:1.2}.display-4{font-size:3.5rem}hr{margin-top:1rem;margin-bottom:1rem;border:0;border-top:1px solid rgba(0,0,0,.1)}.small,small{font-size:80%;font-weight:400}.mark,mark{padding:.2em;background-color:#fcf8e3}.list-inline,.list-unstyled{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:.5rem}.initialism{font-size:90%;text-transform:uppercase}.blockquote{margin-bottom:1rem;font-size:1.125rem}.blockquote-footer{display:block;font-size:80%;color:#6c757d}.blockquote-footer:before{content:"\2014   \A0"}.img-fluid,.img-thumbnail{max-width:100%;height:auto}.img-thumbnail{padding:.25rem;background-color:#f5f8fa;border:1px solid #dee2e6;border-radius:.25rem}.figure{display:inline-block}.figure-img{margin-bottom:.5rem;line-height:1}.figure-caption{font-size:90%;color:#6c757d}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}code{font-size:87.5%;color:#e83e8c;word-break:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:87.5%;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:100%;font-weight:700}pre{display:block;font-size:87.5%;color:#212529}pre code{font-size:inherit;color:inherit;word-break:normal}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:576px){.container{max-width:540px}}@media (min-width:768px){.container{max-width:720px}}@media (min-width:992px){.container{max-width:960px}}@media (min-width:1200px){.container{max-width:1140px}}.container-fluid{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}.no-gutters{margin-right:0;margin-left:0}.no-gutters>.col,.no-gutters>[class*=col-]{padding-right:0;padding-left:0}.col,.col-1,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-10,.col-11,.col-12,.col-auto,.col-lg,.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-auto,.col-md,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-md-auto,.col-sm,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-auto,.col-xl,.col-xl-1,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-auto{position:relative;width:100%;min-height:1px;padding-right:15px;padding-left:15px}.col{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-1,.col-auto{-webkit-box-flex:0}.col-1{-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-2{-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-2,.col-3{-webkit-box-flex:0}.col-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-4{-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-4,.col-5{-webkit-box-flex:0}.col-5{-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-6,.col-7{-webkit-box-flex:0}.col-7{-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-8{-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-8,.col-9{-webkit-box-flex:0}.col-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-10{-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-10,.col-11{-webkit-box-flex:0}.col-11{-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-1{margin-left:8.33333333%}.offset-2{margin-left:16.66666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.33333333%}.offset-5{margin-left:41.66666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.33333333%}.offset-8{margin-left:66.66666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.33333333%}.offset-11{margin-left:91.66666667%}@media (min-width:576px){.col-sm{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-sm-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-sm-1{-webkit-box-flex:0;-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-sm-2{-webkit-box-flex:0;-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-sm-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-sm-4{-webkit-box-flex:0;-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-sm-5{-webkit-box-flex:0;-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-sm-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-sm-7{-webkit-box-flex:0;-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-sm-8{-webkit-box-flex:0;-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-sm-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-sm-10{-webkit-box-flex:0;-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-sm-11{-webkit-box-flex:0;-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-sm-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-sm-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-sm-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-sm-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-sm-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-sm-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-sm-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-sm-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-sm-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-sm-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-sm-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-sm-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-sm-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-sm-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-sm-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-sm-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.33333333%}.offset-sm-2{margin-left:16.66666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.33333333%}.offset-sm-5{margin-left:41.66666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.33333333%}.offset-sm-8{margin-left:66.66666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.33333333%}.offset-sm-11{margin-left:91.66666667%}}@media (min-width:768px){.col-md{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-md-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-md-1{-webkit-box-flex:0;-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-md-2{-webkit-box-flex:0;-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-md-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-md-4{-webkit-box-flex:0;-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-md-5{-webkit-box-flex:0;-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-md-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-md-7{-webkit-box-flex:0;-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-md-8{-webkit-box-flex:0;-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-md-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-md-10{-webkit-box-flex:0;-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-md-11{-webkit-box-flex:0;-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-md-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-md-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-md-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-md-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-md-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-md-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-md-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-md-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-md-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-md-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-md-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-md-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-md-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-md-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-md-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-md-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.33333333%}.offset-md-2{margin-left:16.66666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.33333333%}.offset-md-5{margin-left:41.66666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.33333333%}.offset-md-8{margin-left:66.66666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.33333333%}.offset-md-11{margin-left:91.66666667%}}@media (min-width:992px){.col-lg{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-lg-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-lg-1{-webkit-box-flex:0;-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-lg-2{-webkit-box-flex:0;-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-lg-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-lg-4{-webkit-box-flex:0;-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-lg-5{-webkit-box-flex:0;-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-lg-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-lg-7{-webkit-box-flex:0;-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-lg-8{-webkit-box-flex:0;-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-lg-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-lg-10{-webkit-box-flex:0;-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-lg-11{-webkit-box-flex:0;-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-lg-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-lg-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-lg-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-lg-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-lg-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-lg-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-lg-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-lg-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-lg-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-lg-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-lg-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-lg-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-lg-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-lg-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-lg-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-lg-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.33333333%}.offset-lg-2{margin-left:16.66666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.33333333%}.offset-lg-5{margin-left:41.66666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.33333333%}.offset-lg-8{margin-left:66.66666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.33333333%}.offset-lg-11{margin-left:91.66666667%}}@media (min-width:1200px){.col-xl{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-xl-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-xl-1{-webkit-box-flex:0;-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-xl-2{-webkit-box-flex:0;-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-xl-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-xl-4{-webkit-box-flex:0;-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-xl-5{-webkit-box-flex:0;-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-xl-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-xl-7{-webkit-box-flex:0;-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-xl-8{-webkit-box-flex:0;-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-xl-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-xl-10{-webkit-box-flex:0;-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-xl-11{-webkit-box-flex:0;-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-xl-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-xl-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-xl-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-xl-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-xl-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-xl-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-xl-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-xl-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-xl-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-xl-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-xl-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-xl-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-xl-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-xl-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-xl-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-xl-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.33333333%}.offset-xl-2{margin-left:16.66666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.33333333%}.offset-xl-5{margin-left:41.66666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.33333333%}.offset-xl-8{margin-left:66.66666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.33333333%}.offset-xl-11{margin-left:91.66666667%}}.table{width:100%;max-width:100%;margin-bottom:1rem;background-color:transparent}.table td,.table th{padding:.75rem;vertical-align:top;border-top:1px solid #dee2e6}.table thead th{vertical-align:bottom;border-bottom:2px solid #dee2e6}.table tbody+tbody{border-top:2px solid #dee2e6}.table .table{background-color:#f5f8fa}.table-sm td,.table-sm th{padding:.3rem}.table-bordered,.table-bordered td,.table-bordered th{border:1px solid #dee2e6}.table-bordered thead td,.table-bordered thead th{border-bottom-width:2px}.table-striped tbody tr:nth-of-type(odd){background-color:rgba(0,0,0,.05)}.table-hover tbody tr:hover{background-color:rgba(0,0,0,.075)}.table-primary,.table-primary>td,.table-primary>th{background-color:#b8daff}.table-hover .table-primary:hover,.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#9fcdff}.table-secondary,.table-secondary>td,.table-secondary>th{background-color:#d6d8db}.table-hover .table-secondary:hover,.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#c8cbcf}.table-success,.table-success>td,.table-success>th{background-color:#c3e6cb}.table-hover .table-success:hover,.table-hover .table-success:hover>td,.table-hover .table-success:hover>th{background-color:#b1dfbb}.table-info,.table-info>td,.table-info>th{background-color:#bee5eb}.table-hover .table-info:hover,.table-hover .table-info:hover>td,.table-hover .table-info:hover>th{background-color:#abdde5}.table-warning,.table-warning>td,.table-warning>th{background-color:#ffeeba}.table-hover .table-warning:hover,.table-hover .table-warning:hover>td,.table-hover .table-warning:hover>th{background-color:#ffe8a1}.table-danger,.table-danger>td,.table-danger>th{background-color:#f5c6cb}.table-hover .table-danger:hover,.table-hover .table-danger:hover>td,.table-hover .table-danger:hover>th{background-color:#f1b0b7}.table-light,.table-light>td,.table-light>th{background-color:#fdfdfe}.table-hover .table-light:hover,.table-hover .table-light:hover>td,.table-hover .table-light:hover>th{background-color:#ececf6}.table-dark,.table-dark>td,.table-dark>th{background-color:#c6c8ca}.table-hover .table-dark:hover,.table-hover .table-dark:hover>td,.table-hover .table-dark:hover>th{background-color:#b9bbbe}.table-active,.table-active>td,.table-active>th,.table-hover .table-active:hover,.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(0,0,0,.075)}.table .thead-dark th{color:#f5f8fa;background-color:#212529;border-color:#32383e}.table .thead-light th{color:#495057;background-color:#e9ecef;border-color:#dee2e6}.table-dark{color:#f5f8fa;background-color:#212529}.table-dark td,.table-dark th,.table-dark thead th{border-color:#32383e}.table-dark.table-bordered{border:0}.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:hsla(0,0%,100%,.05)}.table-dark.table-hover tbody tr:hover{background-color:hsla(0,0%,100%,.075)}@media (max-width:575.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-sm>.table-bordered{border:0}}@media (max-width:767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-md>.table-bordered{border:0}}@media (max-width:991.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-lg>.table-bordered{border:0}}@media (max-width:1199.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-xl>.table-bordered{border:0}}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive>.table-bordered{border:0}.form-control{display:block;width:100%;padding:.375rem .75rem;font-size:.9rem;line-height:1.6;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;-webkit-transition:border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-box-shadow .15s ease-in-out}.form-control::-ms-expand{background-color:transparent;border:0}.form-control:focus{color:#495057;background-color:#fff;border-color:#80bdff;outline:0;-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.form-control::-webkit-input-placeholder{color:#6c757d;opacity:1}.form-control:-ms-input-placeholder,.form-control::-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::placeholder{color:#6c757d;opacity:1}.form-control:disabled,.form-control[readonly]{background-color:#e9ecef;opacity:1}select.form-control:not([size]):not([multiple]){height:calc(2.19rem + 2px)}select.form-control:focus::-ms-value{color:#495057;background-color:#fff}.form-control-file,.form-control-range{display:block;width:100%}.col-form-label{padding-top:calc(.375rem + 1px);padding-bottom:calc(.375rem + 1px);margin-bottom:0;font-size:inherit;line-height:1.6}.col-form-label-lg{padding-top:calc(.5rem + 1px);padding-bottom:calc(.5rem + 1px);font-size:1.125rem;line-height:1.5}.col-form-label-sm{padding-top:calc(.25rem + 1px);padding-bottom:calc(.25rem + 1px);font-size:.7875rem;line-height:1.5}.form-control-plaintext{display:block;width:100%;padding-top:.375rem;padding-bottom:.375rem;margin-bottom:0;line-height:1.6;background-color:transparent;border:solid transparent;border-width:1px 0}.form-control-plaintext.form-control-lg,.form-control-plaintext.form-control-sm,.input-group-lg>.form-control-plaintext.form-control,.input-group-lg>.input-group-append>.form-control-plaintext.btn,.input-group-lg>.input-group-append>.form-control-plaintext.input-group-text,.input-group-lg>.input-group-prepend>.form-control-plaintext.btn,.input-group-lg>.input-group-prepend>.form-control-plaintext.input-group-text,.input-group-sm>.form-control-plaintext.form-control,.input-group-sm>.input-group-append>.form-control-plaintext.btn,.input-group-sm>.input-group-append>.form-control-plaintext.input-group-text,.input-group-sm>.input-group-prepend>.form-control-plaintext.btn,.input-group-sm>.input-group-prepend>.form-control-plaintext.input-group-text{padding-right:0;padding-left:0}.form-control-sm,.input-group-sm>.form-control,.input-group-sm>.input-group-append>.btn,.input-group-sm>.input-group-append>.input-group-text,.input-group-sm>.input-group-prepend>.btn,.input-group-sm>.input-group-prepend>.input-group-text{padding:.25rem .5rem;font-size:.7875rem;line-height:1.5;border-radius:.2rem}.input-group-sm>.input-group-append>select.btn:not([size]):not([multiple]),.input-group-sm>.input-group-append>select.input-group-text:not([size]):not([multiple]),.input-group-sm>.input-group-prepend>select.btn:not([size]):not([multiple]),.input-group-sm>.input-group-prepend>select.input-group-text:not([size]):not([multiple]),.input-group-sm>select.form-control:not([size]):not([multiple]),select.form-control-sm:not([size]):not([multiple]){height:calc(1.68125rem + 2px)}.form-control-lg,.input-group-lg>.form-control,.input-group-lg>.input-group-append>.btn,.input-group-lg>.input-group-append>.input-group-text,.input-group-lg>.input-group-prepend>.btn,.input-group-lg>.input-group-prepend>.input-group-text{padding:.5rem 1rem;font-size:1.125rem;line-height:1.5;border-radius:.3rem}.input-group-lg>.input-group-append>select.btn:not([size]):not([multiple]),.input-group-lg>.input-group-append>select.input-group-text:not([size]):not([multiple]),.input-group-lg>.input-group-prepend>select.btn:not([size]):not([multiple]),.input-group-lg>.input-group-prepend>select.input-group-text:not([size]):not([multiple]),.input-group-lg>select.form-control:not([size]):not([multiple]),select.form-control-lg:not([size]):not([multiple]){height:calc(2.6875rem + 2px)}.form-group{margin-bottom:1rem}.form-text{display:block;margin-top:.25rem}.form-row{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-5px;margin-left:-5px}.form-row>.col,.form-row>[class*=col-]{padding-right:5px;padding-left:5px}.form-check{position:relative;display:block;padding-left:1.25rem}.form-check-input{position:absolute;margin-top:.3rem;margin-left:-1.25rem}.form-check-input:disabled~.form-check-label{color:#6c757d}.form-check-label{margin-bottom:0}.form-check-inline{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding-left:0;margin-right:.75rem}.form-check-inline .form-check-input{position:static;margin-top:0;margin-right:.3125rem;margin-left:0}.valid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#28a745}.valid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.5rem;margin-top:.1rem;font-size:.875rem;line-height:1;color:#fff;background-color:rgba(40,167,69,.8);border-radius:.2rem}.custom-select.is-valid,.form-control.is-valid,.was-validated .custom-select:valid,.was-validated .form-control:valid{border-color:#28a745}.custom-select.is-valid:focus,.form-control.is-valid:focus,.was-validated .custom-select:valid:focus,.was-validated .form-control:valid:focus{border-color:#28a745;-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.25);box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.custom-select.is-valid~.valid-feedback,.custom-select.is-valid~.valid-tooltip,.form-control.is-valid~.valid-feedback,.form-control.is-valid~.valid-tooltip,.was-validated .custom-select:valid~.valid-feedback,.was-validated .custom-select:valid~.valid-tooltip,.was-validated .form-control:valid~.valid-feedback,.was-validated .form-control:valid~.valid-tooltip{display:block}.form-check-input.is-valid~.form-check-label,.was-validated .form-check-input:valid~.form-check-label{color:#28a745}.form-check-input.is-valid~.valid-feedback,.form-check-input.is-valid~.valid-tooltip,.was-validated .form-check-input:valid~.valid-feedback,.was-validated .form-check-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid~.custom-control-label,.was-validated .custom-control-input:valid~.custom-control-label{color:#28a745}.custom-control-input.is-valid~.custom-control-label:before,.was-validated .custom-control-input:valid~.custom-control-label:before{background-color:#71dd8a}.custom-control-input.is-valid~.valid-feedback,.custom-control-input.is-valid~.valid-tooltip,.was-validated .custom-control-input:valid~.valid-feedback,.was-validated .custom-control-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid:checked~.custom-control-label:before,.was-validated .custom-control-input:valid:checked~.custom-control-label:before{background-color:#34ce57}.custom-control-input.is-valid:focus~.custom-control-label:before,.was-validated .custom-control-input:valid:focus~.custom-control-label:before{-webkit-box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(40,167,69,.25);box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(40,167,69,.25)}.custom-file-input.is-valid~.custom-file-label,.was-validated .custom-file-input:valid~.custom-file-label{border-color:#28a745}.custom-file-input.is-valid~.custom-file-label:before,.was-validated .custom-file-input:valid~.custom-file-label:before{border-color:inherit}.custom-file-input.is-valid~.valid-feedback,.custom-file-input.is-valid~.valid-tooltip,.was-validated .custom-file-input:valid~.valid-feedback,.was-validated .custom-file-input:valid~.valid-tooltip{display:block}.custom-file-input.is-valid:focus~.custom-file-label,.was-validated .custom-file-input:valid:focus~.custom-file-label{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.25);box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.invalid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#dc3545}.invalid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.5rem;margin-top:.1rem;font-size:.875rem;line-height:1;color:#fff;background-color:rgba(220,53,69,.8);border-radius:.2rem}.custom-select.is-invalid,.form-control.is-invalid,.was-validated .custom-select:invalid,.was-validated .form-control:invalid{border-color:#dc3545}.custom-select.is-invalid:focus,.form-control.is-invalid:focus,.was-validated .custom-select:invalid:focus,.was-validated .form-control:invalid:focus{border-color:#dc3545;-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.25);box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.custom-select.is-invalid~.invalid-feedback,.custom-select.is-invalid~.invalid-tooltip,.form-control.is-invalid~.invalid-feedback,.form-control.is-invalid~.invalid-tooltip,.was-validated .custom-select:invalid~.invalid-feedback,.was-validated .custom-select:invalid~.invalid-tooltip,.was-validated .form-control:invalid~.invalid-feedback,.was-validated .form-control:invalid~.invalid-tooltip{display:block}.form-check-input.is-invalid~.form-check-label,.was-validated .form-check-input:invalid~.form-check-label{color:#dc3545}.form-check-input.is-invalid~.invalid-feedback,.form-check-input.is-invalid~.invalid-tooltip,.was-validated .form-check-input:invalid~.invalid-feedback,.was-validated .form-check-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid~.custom-control-label,.was-validated .custom-control-input:invalid~.custom-control-label{color:#dc3545}.custom-control-input.is-invalid~.custom-control-label:before,.was-validated .custom-control-input:invalid~.custom-control-label:before{background-color:#efa2a9}.custom-control-input.is-invalid~.invalid-feedback,.custom-control-input.is-invalid~.invalid-tooltip,.was-validated .custom-control-input:invalid~.invalid-feedback,.was-validated .custom-control-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid:checked~.custom-control-label:before,.was-validated .custom-control-input:invalid:checked~.custom-control-label:before{background-color:#e4606d}.custom-control-input.is-invalid:focus~.custom-control-label:before,.was-validated .custom-control-input:invalid:focus~.custom-control-label:before{-webkit-box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(220,53,69,.25);box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(220,53,69,.25)}.custom-file-input.is-invalid~.custom-file-label,.was-validated .custom-file-input:invalid~.custom-file-label{border-color:#dc3545}.custom-file-input.is-invalid~.custom-file-label:before,.was-validated .custom-file-input:invalid~.custom-file-label:before{border-color:inherit}.custom-file-input.is-invalid~.invalid-feedback,.custom-file-input.is-invalid~.invalid-tooltip,.was-validated .custom-file-input:invalid~.invalid-feedback,.was-validated .custom-file-input:invalid~.invalid-tooltip{display:block}.custom-file-input.is-invalid:focus~.custom-file-label,.was-validated .custom-file-input:invalid:focus~.custom-file-label{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.25);box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-inline{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.form-inline .form-check{width:100%}@media (min-width:576px){.form-inline label{-ms-flex-align:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.form-inline .form-group,.form-inline label{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;align-items:center;margin-bottom:0}.form-inline .form-group{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-align:center}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-plaintext{display:inline-block}.form-inline .input-group{width:auto}.form-inline .form-check{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:auto;padding-left:0}.form-inline .form-check-input{position:relative;margin-top:0;margin-right:.25rem;margin-left:0}.form-inline .custom-control{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.form-inline .custom-control-label{margin-bottom:0}}.btn{display:inline-block;font-weight:400;text-align:center;white-space:nowrap;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border:1px solid transparent;padding:.375rem .75rem;font-size:.9rem;line-height:1.6;border-radius:.25rem;-webkit-transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-box-shadow .15s ease-in-out}.btn:focus,.btn:hover{text-decoration:none}.btn.focus,.btn:focus{outline:0;-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.btn.disabled,.btn:disabled{opacity:.65}.btn:not(:disabled):not(.disabled){cursor:pointer}.btn:not(:disabled):not(.disabled).active,.btn:not(:disabled):not(.disabled):active{background-image:none}a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}.btn-primary{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:hover{color:#fff;background-color:#0069d9;border-color:#0062cc}.btn-primary.focus,.btn-primary:focus{-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.5);box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:not(:disabled):not(.disabled).active,.btn-primary:not(:disabled):not(.disabled):active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#0062cc;border-color:#005cbf}.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-primary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.5);box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-secondary{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:hover{color:#fff;background-color:#5a6268;border-color:#545b62}.btn-secondary.focus,.btn-secondary:focus{-webkit-box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5);box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5)}.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:not(:disabled):not(.disabled).active,.btn-secondary:not(:disabled):not(.disabled):active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#545b62;border-color:#4e555b}.btn-secondary:not(:disabled):not(.disabled).active:focus,.btn-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5);box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5)}.btn-success{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:hover{color:#fff;background-color:#218838;border-color:#1e7e34}.btn-success.focus,.btn-success:focus{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.5);box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:not(:disabled):not(.disabled).active,.btn-success:not(:disabled):not(.disabled):active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#1e7e34;border-color:#1c7430}.btn-success:not(:disabled):not(.disabled).active:focus,.btn-success:not(:disabled):not(.disabled):active:focus,.show>.btn-success.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.5);box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-info{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:hover{color:#fff;background-color:#138496;border-color:#117a8b}.btn-info.focus,.btn-info:focus{-webkit-box-shadow:0 0 0 .2rem rgba(23,162,184,.5);box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-info.disabled,.btn-info:disabled{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:not(:disabled):not(.disabled).active,.btn-info:not(:disabled):not(.disabled):active,.show>.btn-info.dropdown-toggle{color:#fff;background-color:#117a8b;border-color:#10707f}.btn-info:not(:disabled):not(.disabled).active:focus,.btn-info:not(:disabled):not(.disabled):active:focus,.show>.btn-info.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(23,162,184,.5);box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-warning{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:hover{color:#212529;background-color:#e0a800;border-color:#d39e00}.btn-warning.focus,.btn-warning:focus{-webkit-box-shadow:0 0 0 .2rem rgba(255,193,7,.5);box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-warning.disabled,.btn-warning:disabled{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:not(:disabled):not(.disabled).active,.btn-warning:not(:disabled):not(.disabled):active,.show>.btn-warning.dropdown-toggle{color:#212529;background-color:#d39e00;border-color:#c69500}.btn-warning:not(:disabled):not(.disabled).active:focus,.btn-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-warning.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(255,193,7,.5);box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-danger{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:hover{color:#fff;background-color:#c82333;border-color:#bd2130}.btn-danger.focus,.btn-danger:focus{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.5);box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-danger.disabled,.btn-danger:disabled{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:not(:disabled):not(.disabled).active,.btn-danger:not(:disabled):not(.disabled):active,.show>.btn-danger.dropdown-toggle{color:#fff;background-color:#bd2130;border-color:#b21f2d}.btn-danger:not(:disabled):not(.disabled).active:focus,.btn-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-danger.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.5);box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-light{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:hover{color:#212529;background-color:#e2e6ea;border-color:#dae0e5}.btn-light.focus,.btn-light:focus{-webkit-box-shadow:0 0 0 .2rem rgba(248,249,250,.5);box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-light.disabled,.btn-light:disabled{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:not(:disabled):not(.disabled).active,.btn-light:not(:disabled):not(.disabled):active,.show>.btn-light.dropdown-toggle{color:#212529;background-color:#dae0e5;border-color:#d3d9df}.btn-light:not(:disabled):not(.disabled).active:focus,.btn-light:not(:disabled):not(.disabled):active:focus,.show>.btn-light.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(248,249,250,.5);box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-dark{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:hover{color:#fff;background-color:#23272b;border-color:#1d2124}.btn-dark.focus,.btn-dark:focus{-webkit-box-shadow:0 0 0 .2rem rgba(52,58,64,.5);box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-dark.disabled,.btn-dark:disabled{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:not(:disabled):not(.disabled).active,.btn-dark:not(:disabled):not(.disabled):active,.show>.btn-dark.dropdown-toggle{color:#fff;background-color:#1d2124;border-color:#171a1d}.btn-dark:not(:disabled):not(.disabled).active:focus,.btn-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-dark.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(52,58,64,.5);box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-primary{color:#007bff;background-color:transparent;background-image:none;border-color:#007bff}.btn-outline-primary:hover{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary.focus,.btn-outline-primary:focus{-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.5);box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#007bff;background-color:transparent}.btn-outline-primary:not(:disabled):not(.disabled).active,.btn-outline-primary:not(:disabled):not(.disabled):active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.5);box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-secondary{color:#6c757d;background-color:transparent;background-image:none;border-color:#6c757d}.btn-outline-secondary:hover{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary.focus,.btn-outline-secondary:focus{-webkit-box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5);box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5)}.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#6c757d;background-color:transparent}.btn-outline-secondary:not(:disabled):not(.disabled).active,.btn-outline-secondary:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5);box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5)}.btn-outline-success{color:#28a745;background-color:transparent;background-image:none;border-color:#28a745}.btn-outline-success:hover{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success.focus,.btn-outline-success:focus{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.5);box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-success.disabled,.btn-outline-success:disabled{color:#28a745;background-color:transparent}.btn-outline-success:not(:disabled):not(.disabled).active,.btn-outline-success:not(:disabled):not(.disabled):active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success:not(:disabled):not(.disabled).active:focus,.btn-outline-success:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-success.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.5);box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-info{color:#17a2b8;background-color:transparent;background-image:none;border-color:#17a2b8}.btn-outline-info:hover{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info.focus,.btn-outline-info:focus{-webkit-box-shadow:0 0 0 .2rem rgba(23,162,184,.5);box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-info.disabled,.btn-outline-info:disabled{color:#17a2b8;background-color:transparent}.btn-outline-info:not(:disabled):not(.disabled).active,.btn-outline-info:not(:disabled):not(.disabled):active,.show>.btn-outline-info.dropdown-toggle{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info:not(:disabled):not(.disabled).active:focus,.btn-outline-info:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-info.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(23,162,184,.5);box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-warning{color:#ffc107;background-color:transparent;background-image:none;border-color:#ffc107}.btn-outline-warning:hover{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning.focus,.btn-outline-warning:focus{-webkit-box-shadow:0 0 0 .2rem rgba(255,193,7,.5);box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-warning.disabled,.btn-outline-warning:disabled{color:#ffc107;background-color:transparent}.btn-outline-warning:not(:disabled):not(.disabled).active,.btn-outline-warning:not(:disabled):not(.disabled):active,.show>.btn-outline-warning.dropdown-toggle{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning:not(:disabled):not(.disabled).active:focus,.btn-outline-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-warning.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(255,193,7,.5);box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-danger{color:#dc3545;background-color:transparent;background-image:none;border-color:#dc3545}.btn-outline-danger:hover{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger.focus,.btn-outline-danger:focus{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.5);box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-danger.disabled,.btn-outline-danger:disabled{color:#dc3545;background-color:transparent}.btn-outline-danger:not(:disabled):not(.disabled).active,.btn-outline-danger:not(:disabled):not(.disabled):active,.show>.btn-outline-danger.dropdown-toggle{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger:not(:disabled):not(.disabled).active:focus,.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-danger.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.5);box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-light{color:#f8f9fa;background-color:transparent;background-image:none;border-color:#f8f9fa}.btn-outline-light:hover{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light.focus,.btn-outline-light:focus{-webkit-box-shadow:0 0 0 .2rem rgba(248,249,250,.5);box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-light.disabled,.btn-outline-light:disabled{color:#f8f9fa;background-color:transparent}.btn-outline-light:not(:disabled):not(.disabled).active,.btn-outline-light:not(:disabled):not(.disabled):active,.show>.btn-outline-light.dropdown-toggle{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light:not(:disabled):not(.disabled).active:focus,.btn-outline-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(248,249,250,.5);box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-dark{color:#343a40;background-color:transparent;background-image:none;border-color:#343a40}.btn-outline-dark:hover{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark.focus,.btn-outline-dark:focus{-webkit-box-shadow:0 0 0 .2rem rgba(52,58,64,.5);box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-dark.disabled,.btn-outline-dark:disabled{color:#343a40;background-color:transparent}.btn-outline-dark:not(:disabled):not(.disabled).active,.btn-outline-dark:not(:disabled):not(.disabled):active,.show>.btn-outline-dark.dropdown-toggle{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark:not(:disabled):not(.disabled).active:focus,.btn-outline-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-dark.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(52,58,64,.5);box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-link{font-weight:400;color:#007bff;background-color:transparent}.btn-link:hover{color:#0056b3;background-color:transparent}.btn-link.focus,.btn-link:focus,.btn-link:hover{text-decoration:underline;border-color:transparent}.btn-link.focus,.btn-link:focus{-webkit-box-shadow:none;box-shadow:none}.btn-link.disabled,.btn-link:disabled{color:#6c757d}.btn-group-lg>.btn,.btn-lg{padding:.5rem 1rem;font-size:1.125rem;line-height:1.5;border-radius:.3rem}.btn-group-sm>.btn,.btn-sm{padding:.25rem .5rem;font-size:.7875rem;line-height:1.5;border-radius:.2rem}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:.5rem}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.show{opacity:1}.collapse{display:none}.collapse.show{display:block}tr.collapse.show{display:table-row}tbody.collapse.show{display:table-row-group}.collapsing{height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}.collapsing,.dropdown,.dropup{position:relative}.dropdown-toggle:after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}.dropdown-toggle:empty:after{margin-left:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:10rem;padding:.5rem 0;margin:.125rem 0 0;font-size:.9rem;color:#212529;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.15);border-radius:.25rem}.dropup .dropdown-menu{margin-top:0;margin-bottom:.125rem}.dropup .dropdown-toggle:after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:0;border-right:.3em solid transparent;border-bottom:.3em solid;border-left:.3em solid transparent}.dropup .dropdown-toggle:empty:after{margin-left:0}.dropright .dropdown-menu{margin-top:0;margin-left:.125rem}.dropright .dropdown-toggle:after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-bottom:.3em solid transparent;border-left:.3em solid}.dropright .dropdown-toggle:empty:after{margin-left:0}.dropright .dropdown-toggle:after{vertical-align:0}.dropleft .dropdown-menu{margin-top:0;margin-right:.125rem}.dropleft .dropdown-toggle:after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";display:none}.dropleft .dropdown-toggle:before{display:inline-block;width:0;height:0;margin-right:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:.3em solid;border-bottom:.3em solid transparent}.dropleft .dropdown-toggle:empty:after{margin-left:0}.dropleft .dropdown-toggle:before{vertical-align:0}.dropdown-divider{height:0;margin:.5rem 0;overflow:hidden;border-top:1px solid #e9ecef}.dropdown-item{display:block;width:100%;padding:.25rem 1.5rem;clear:both;font-weight:400;color:#212529;text-align:inherit;white-space:nowrap;background-color:transparent;border:0}.dropdown-item:focus,.dropdown-item:hover{color:#16181b;text-decoration:none;background-color:#f8f9fa}.dropdown-item.active,.dropdown-item:active{color:#fff;text-decoration:none;background-color:#007bff}.dropdown-item.disabled,.dropdown-item:disabled{color:#6c757d;background-color:transparent}.dropdown-menu.show{display:block}.dropdown-header{display:block;padding:.5rem 1.5rem;margin-bottom:0;font-size:.7875rem;color:#6c757d;white-space:nowrap}.btn-group,.btn-group-vertical{position:relative;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:1}.btn-group-vertical .btn+.btn,.btn-group-vertical .btn+.btn-group,.btn-group-vertical .btn-group+.btn,.btn-group-vertical .btn-group+.btn-group,.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btn-toolbar .input-group{width:auto}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn-group:not(:last-child)>.btn,.btn-group>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:not(:first-child)>.btn,.btn-group>.btn:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.dropdown-toggle-split{padding-right:.5625rem;padding-left:.5625rem}.dropdown-toggle-split:after{margin-left:0}.btn-group-sm>.btn+.dropdown-toggle-split,.btn-sm+.dropdown-toggle-split{padding-right:.375rem;padding-left:.375rem}.btn-group-lg>.btn+.dropdown-toggle-split,.btn-lg+.dropdown-toggle-split{padding-right:.75rem;padding-left:.75rem}.btn-group-vertical{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.btn-group-vertical .btn,.btn-group-vertical .btn-group{width:100%}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn-group:not(:last-child)>.btn,.btn-group-vertical>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child)>.btn,.btn-group-vertical>.btn:not(:first-child){border-top-left-radius:0;border-top-right-radius:0}.btn-group-toggle>.btn,.btn-group-toggle>.btn-group>.btn{margin-bottom:0}.btn-group-toggle>.btn-group>.btn input[type=checkbox],.btn-group-toggle>.btn-group>.btn input[type=radio],.btn-group-toggle>.btn input[type=checkbox],.btn-group-toggle>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:stretch;-ms-flex-align:stretch;align-items:stretch;width:100%}.input-group>.custom-file,.input-group>.custom-select,.input-group>.form-control{position:relative;-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;width:1%;margin-bottom:0}.input-group>.custom-file:focus,.input-group>.custom-select:focus,.input-group>.form-control:focus{z-index:3}.input-group>.custom-file+.custom-file,.input-group>.custom-file+.custom-select,.input-group>.custom-file+.form-control,.input-group>.custom-select+.custom-file,.input-group>.custom-select+.custom-select,.input-group>.custom-select+.form-control,.input-group>.form-control+.custom-file,.input-group>.form-control+.custom-select,.input-group>.form-control+.form-control{margin-left:-1px}.input-group>.custom-select:not(:last-child),.input-group>.form-control:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-select:not(:first-child),.input-group>.form-control:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.input-group>.custom-file{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.input-group>.custom-file:not(:last-child) .custom-file-label,.input-group>.custom-file:not(:last-child) .custom-file-label:before{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-file:not(:first-child) .custom-file-label,.input-group>.custom-file:not(:first-child) .custom-file-label:before{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-append,.input-group-prepend{display:-webkit-box;display:-ms-flexbox;display:flex}.input-group-append .btn,.input-group-prepend .btn{position:relative;z-index:2}.input-group-append .btn+.btn,.input-group-append .btn+.input-group-text,.input-group-append .input-group-text+.btn,.input-group-append .input-group-text+.input-group-text,.input-group-prepend .btn+.btn,.input-group-prepend .btn+.input-group-text,.input-group-prepend .input-group-text+.btn,.input-group-prepend .input-group-text+.input-group-text{margin-left:-1px}.input-group-prepend{margin-right:-1px}.input-group-append{margin-left:-1px}.input-group-text{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:.375rem .75rem;margin-bottom:0;font-size:.9rem;font-weight:400;line-height:1.6;color:#495057;text-align:center;white-space:nowrap;background-color:#e9ecef;border:1px solid #ced4da;border-radius:.25rem}.input-group-text input[type=checkbox],.input-group-text input[type=radio]{margin-top:0}.input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group>.input-group-append:last-child>.input-group-text:not(:last-child),.input-group>.input-group-append:not(:last-child)>.btn,.input-group>.input-group-append:not(:last-child)>.input-group-text,.input-group>.input-group-prepend>.btn,.input-group>.input-group-prepend>.input-group-text{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0;border-bottom-left-radius:0}.custom-control{position:relative;display:block;min-height:1.6rem;padding-left:1.5rem}.custom-control-inline{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;margin-right:1rem}.custom-control-input{position:absolute;z-index:-1;opacity:0}.custom-control-input:checked~.custom-control-label:before{color:#fff;background-color:#007bff}.custom-control-input:focus~.custom-control-label:before{-webkit-box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(0,123,255,.25)}.custom-control-input:active~.custom-control-label:before{color:#fff;background-color:#b3d7ff}.custom-control-input:disabled~.custom-control-label{color:#6c757d}.custom-control-input:disabled~.custom-control-label:before{background-color:#e9ecef}.custom-control-label{margin-bottom:0}.custom-control-label:before{pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:#dee2e6}.custom-control-label:after,.custom-control-label:before{position:absolute;top:.3rem;left:0;display:block;width:1rem;height:1rem;content:""}.custom-control-label:after{background-repeat:no-repeat;background-position:50%;background-size:50% 50%}.custom-checkbox .custom-control-label:before{border-radius:.25rem}.custom-checkbox .custom-control-input:checked~.custom-control-label:before{background-color:#007bff}.custom-checkbox .custom-control-input:checked~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label:before{background-color:#007bff}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:disabled:checked~.custom-control-label:before{background-color:rgba(0,123,255,.5)}.custom-checkbox .custom-control-input:disabled:indeterminate~.custom-control-label:before{background-color:rgba(0,123,255,.5)}.custom-radio .custom-control-label:before{border-radius:50%}.custom-radio .custom-control-input:checked~.custom-control-label:before{background-color:#007bff}.custom-radio .custom-control-input:checked~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E")}.custom-radio .custom-control-input:disabled:checked~.custom-control-label:before{background-color:rgba(0,123,255,.5)}.custom-select{display:inline-block;width:100%;height:calc(2.19rem + 2px);padding:.375rem 1.75rem .375rem .75rem;line-height:1.6;color:#495057;vertical-align:middle;background:#fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center;background-size:8px 10px;border:1px solid #ced4da;border-radius:.25rem;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-select:focus{border-color:#80bdff;outline:0;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.075),0 0 5px rgba(128,189,255,.5);box-shadow:inset 0 1px 2px rgba(0,0,0,.075),0 0 5px rgba(128,189,255,.5)}.custom-select:focus::-ms-value{color:#495057;background-color:#fff}.custom-select[multiple],.custom-select[size]:not([size="1"]){height:auto;padding-right:.75rem;background-image:none}.custom-select:disabled{color:#6c757d;background-color:#e9ecef}.custom-select::-ms-expand{opacity:0}.custom-select-sm{height:calc(1.68125rem + 2px);font-size:75%}.custom-select-lg,.custom-select-sm{padding-top:.375rem;padding-bottom:.375rem}.custom-select-lg{height:calc(2.6875rem + 2px);font-size:125%}.custom-file{display:inline-block;margin-bottom:0}.custom-file,.custom-file-input{position:relative;width:100%;height:calc(2.19rem + 2px)}.custom-file-input{z-index:2;margin:0;opacity:0}.custom-file-input:focus~.custom-file-control{border-color:#80bdff;-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.custom-file-input:focus~.custom-file-control:before{border-color:#80bdff}.custom-file-input:lang(en)~.custom-file-label:after{content:"Browse"}.custom-file-label{left:0;z-index:1;height:calc(2.19rem + 2px);background-color:#fff;border:1px solid #ced4da;border-radius:.25rem}.custom-file-label,.custom-file-label:after{position:absolute;top:0;right:0;padding:.375rem .75rem;line-height:1.6;color:#495057}.custom-file-label:after{bottom:0;z-index:3;display:block;height:calc((2.19rem + 2px) - 1px * 2);content:"Browse";background-color:#e9ecef;border-left:1px solid #ced4da;border-radius:0 .25rem .25rem 0}.nav{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:.5rem 1rem}.nav-link:focus,.nav-link:hover{text-decoration:none}.nav-link.disabled{color:#6c757d}.nav-tabs{border-bottom:1px solid #dee2e6}.nav-tabs .nav-item{margin-bottom:-1px}.nav-tabs .nav-link{border:1px solid transparent;border-top-left-radius:.25rem;border-top-right-radius:.25rem}.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{border-color:#e9ecef #e9ecef #dee2e6}.nav-tabs .nav-link.disabled{color:#6c757d;background-color:transparent;border-color:transparent}.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:#495057;background-color:#f5f8fa;border-color:#dee2e6 #dee2e6 #f5f8fa}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-pills .nav-link{border-radius:.25rem}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#007bff}.nav-fill .nav-item{-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;text-align:center}.nav-justified .nav-item{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;text-align:center}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{position:relative;padding:.5rem 1rem}.navbar,.navbar>.container,.navbar>.container-fluid{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.navbar-brand{display:inline-block;padding-top:.32rem;padding-bottom:.32rem;margin-right:1rem;font-size:1.125rem;line-height:inherit;white-space:nowrap}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-nav{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-text{display:inline-block;padding-top:.5rem;padding-bottom:.5rem}.navbar-collapse{-ms-flex-preferred-size:100%;flex-basis:100%;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.navbar-toggler{padding:.25rem .75rem;font-size:1.125rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:.25rem}.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}.navbar-toggler:not(:disabled):not(.disabled){cursor:pointer}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat 50%;background-size:100% 100%}@media (max-width:575.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:576px){.navbar-expand-sm{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-sm,.navbar-expand-sm .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal}.navbar-expand-sm .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-sm .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-sm .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}.navbar-expand-sm .dropup .dropdown-menu{top:auto;bottom:100%}}@media (max-width:767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:768px){.navbar-expand-md{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-md,.navbar-expand-md .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal}.navbar-expand-md .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-md .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-md .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}.navbar-expand-md .dropup .dropdown-menu{top:auto;bottom:100%}}@media (max-width:991.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:992px){.navbar-expand-lg{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-lg,.navbar-expand-lg .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal}.navbar-expand-lg .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-lg .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}.navbar-expand-lg .dropup .dropdown-menu{top:auto;bottom:100%}}@media (max-width:1199.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:1200px){.navbar-expand-xl{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-xl,.navbar-expand-xl .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal}.navbar-expand-xl .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-xl .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-xl .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}.navbar-expand-xl .dropup .dropdown-menu{top:auto;bottom:100%}}.navbar-expand{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand>.container,.navbar-expand>.container-fluid{padding-right:0;padding-left:0}.navbar-expand .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand>.container,.navbar-expand>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-expand .dropup .dropdown-menu{top:auto;bottom:100%}.navbar-light .navbar-brand,.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(0,0,0,.9)}.navbar-light .navbar-nav .nav-link{color:rgba(0,0,0,.5)}.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(0,0,0,.7)}.navbar-light .navbar-nav .nav-link.disabled{color:rgba(0,0,0,.3)}.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .show>.nav-link{color:rgba(0,0,0,.9)}.navbar-light .navbar-toggler{color:rgba(0,0,0,.5);border-color:rgba(0,0,0,.1)}.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 0, 0, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-light .navbar-text{color:rgba(0,0,0,.5)}.navbar-light .navbar-text a,.navbar-light .navbar-text a:focus,.navbar-light .navbar-text a:hover{color:rgba(0,0,0,.9)}.navbar-dark .navbar-brand,.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}.navbar-dark .navbar-nav .nav-link{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:hsla(0,0%,100%,.75)}.navbar-dark .navbar-nav .nav-link.disabled{color:hsla(0,0%,100%,.25)}.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .show>.nav-link{color:#fff}.navbar-dark .navbar-toggler{color:hsla(0,0%,100%,.5);border-color:hsla(0,0%,100%,.1)}.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-dark .navbar-text{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-text a,.navbar-dark .navbar-text a:focus,.navbar-dark .navbar-text a:hover{color:#fff}.card{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;min-width:0;word-wrap:break-word;background-color:#fff;background-clip:border-box;border:1px solid rgba(0,0,0,.125);border-radius:.25rem}.card>hr{margin-right:0;margin-left:0}.card>.list-group:first-child .list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card>.list-group:last-child .list-group-item:last-child{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.card-body{-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;padding:1.25rem}.card-title{margin-bottom:.75rem}.card-subtitle{margin-top:-.375rem}.card-subtitle,.card-text:last-child{margin-bottom:0}.card-link:hover{text-decoration:none}.card-link+.card-link{margin-left:1.25rem}.card-header{padding:.75rem 1.25rem;margin-bottom:0;background-color:rgba(0,0,0,.03);border-bottom:1px solid rgba(0,0,0,.125)}.card-header:first-child{border-radius:calc(.25rem - 1px) calc(.25rem - 1px) 0 0}.card-header+.list-group .list-group-item:first-child{border-top:0}.card-footer{padding:.75rem 1.25rem;background-color:rgba(0,0,0,.03);border-top:1px solid rgba(0,0,0,.125)}.card-footer:last-child{border-radius:0 0 calc(.25rem - 1px) calc(.25rem - 1px)}.card-header-tabs{margin-bottom:-.75rem;border-bottom:0}.card-header-pills,.card-header-tabs{margin-right:-.625rem;margin-left:-.625rem}.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:1.25rem}.card-img{width:100%;border-radius:calc(.25rem - 1px)}.card-img-top{width:100%;border-top-left-radius:calc(.25rem - 1px);border-top-right-radius:calc(.25rem - 1px)}.card-img-bottom{width:100%;border-bottom-right-radius:calc(.25rem - 1px);border-bottom-left-radius:calc(.25rem - 1px)}.card-deck{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.card-deck .card{margin-bottom:15px}@media (min-width:576px){.card-deck{-webkit-box-orient:horizontal;-ms-flex-flow:row wrap;flex-flow:row wrap;margin-right:-15px;margin-left:-15px}.card-deck,.card-deck .card{-webkit-box-direction:normal}.card-deck .card{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-ms-flex:1 0 0%;flex:1 0 0%;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;margin-right:15px;margin-bottom:0;margin-left:15px}}.card-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.card-group>.card{margin-bottom:15px}@media (min-width:576px){.card-group{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap}.card-group>.card{-webkit-box-flex:1;-ms-flex:1 0 0%;flex:1 0 0%;margin-bottom:0}.card-group>.card+.card{margin-left:0;border-left:0}.card-group>.card:first-child{border-top-right-radius:0;border-bottom-right-radius:0}.card-group>.card:first-child .card-header,.card-group>.card:first-child .card-img-top{border-top-right-radius:0}.card-group>.card:first-child .card-footer,.card-group>.card:first-child .card-img-bottom{border-bottom-right-radius:0}.card-group>.card:last-child{border-top-left-radius:0;border-bottom-left-radius:0}.card-group>.card:last-child .card-header,.card-group>.card:last-child .card-img-top{border-top-left-radius:0}.card-group>.card:last-child .card-footer,.card-group>.card:last-child .card-img-bottom{border-bottom-left-radius:0}.card-group>.card:only-child{border-radius:.25rem}.card-group>.card:only-child .card-header,.card-group>.card:only-child .card-img-top{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card-group>.card:only-child .card-footer,.card-group>.card:only-child .card-img-bottom{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.card-group>.card:not(:first-child):not(:last-child):not(:only-child),.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-footer,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-header,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-img-top{border-radius:0}}.card-columns .card{margin-bottom:.75rem}@media (min-width:576px){.card-columns{-webkit-column-count:3;column-count:3;-webkit-column-gap:1.25rem;column-gap:1.25rem}.card-columns .card{display:inline-block;width:100%}}.breadcrumb{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#e9ecef;border-radius:.25rem}.breadcrumb-item+.breadcrumb-item:before{display:inline-block;padding-right:.5rem;padding-left:.5rem;color:#6c757d;content:"/"}.breadcrumb-item+.breadcrumb-item:hover:before{text-decoration:underline;text-decoration:none}.breadcrumb-item.active{color:#6c757d}.pagination{display:-webkit-box;display:-ms-flexbox;display:flex;padding-left:0;list-style:none;border-radius:.25rem}.page-link{position:relative;display:block;padding:.5rem .75rem;margin-left:-1px;line-height:1.25;color:#007bff;background-color:#fff;border:1px solid #dee2e6}.page-link:hover{color:#0056b3;text-decoration:none;background-color:#e9ecef;border-color:#dee2e6}.page-link:focus{z-index:2;outline:0;-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.page-link:not(:disabled):not(.disabled){cursor:pointer}.page-item:first-child .page-link{margin-left:0;border-top-left-radius:.25rem;border-bottom-left-radius:.25rem}.page-item:last-child .page-link{border-top-right-radius:.25rem;border-bottom-right-radius:.25rem}.page-item.active .page-link{z-index:1;color:#fff;background-color:#007bff;border-color:#007bff}.page-item.disabled .page-link{color:#6c757d;pointer-events:none;cursor:auto;background-color:#fff;border-color:#dee2e6}.pagination-lg .page-link{padding:.75rem 1.5rem;font-size:1.125rem;line-height:1.5}.pagination-lg .page-item:first-child .page-link{border-top-left-radius:.3rem;border-bottom-left-radius:.3rem}.pagination-lg .page-item:last-child .page-link{border-top-right-radius:.3rem;border-bottom-right-radius:.3rem}.pagination-sm .page-link{padding:.25rem .5rem;font-size:.7875rem;line-height:1.5}.pagination-sm .page-item:first-child .page-link{border-top-left-radius:.2rem;border-bottom-left-radius:.2rem}.pagination-sm .page-item:last-child .page-link{border-top-right-radius:.2rem;border-bottom-right-radius:.2rem}.badge{display:inline-block;padding:.25em .4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25rem}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.badge-pill{padding-right:.6em;padding-left:.6em;border-radius:10rem}.badge-primary{color:#fff;background-color:#007bff}.badge-primary[href]:focus,.badge-primary[href]:hover{color:#fff;text-decoration:none;background-color:#0062cc}.badge-secondary{color:#fff;background-color:#6c757d}.badge-secondary[href]:focus,.badge-secondary[href]:hover{color:#fff;text-decoration:none;background-color:#545b62}.badge-success{color:#fff;background-color:#28a745}.badge-success[href]:focus,.badge-success[href]:hover{color:#fff;text-decoration:none;background-color:#1e7e34}.badge-info{color:#fff;background-color:#17a2b8}.badge-info[href]:focus,.badge-info[href]:hover{color:#fff;text-decoration:none;background-color:#117a8b}.badge-warning{color:#212529;background-color:#ffc107}.badge-warning[href]:focus,.badge-warning[href]:hover{color:#212529;text-decoration:none;background-color:#d39e00}.badge-danger{color:#fff;background-color:#dc3545}.badge-danger[href]:focus,.badge-danger[href]:hover{color:#fff;text-decoration:none;background-color:#bd2130}.badge-light{color:#212529;background-color:#f8f9fa}.badge-light[href]:focus,.badge-light[href]:hover{color:#212529;text-decoration:none;background-color:#dae0e5}.badge-dark{color:#fff;background-color:#343a40}.badge-dark[href]:focus,.badge-dark[href]:hover{color:#fff;text-decoration:none;background-color:#1d2124}.jumbotron{padding:2rem 1rem;margin-bottom:2rem;background-color:#e9ecef;border-radius:.3rem}@media (min-width:576px){.jumbotron{padding:4rem 2rem}}.jumbotron-fluid{padding-right:0;padding-left:0;border-radius:0}.alert{position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;border:1px solid transparent;border-radius:.25rem}.alert-heading{color:inherit}.alert-link{font-weight:700}.alert-dismissible{padding-right:3.85rem}.alert-dismissible .close{position:absolute;top:0;right:0;padding:.75rem 1.25rem;color:inherit}.alert-primary{color:#004085;background-color:#cce5ff;border-color:#b8daff}.alert-primary hr{border-top-color:#9fcdff}.alert-primary .alert-link{color:#002752}.alert-secondary{color:#383d41;background-color:#e2e3e5;border-color:#d6d8db}.alert-secondary hr{border-top-color:#c8cbcf}.alert-secondary .alert-link{color:#202326}.alert-success{color:#155724;background-color:#d4edda;border-color:#c3e6cb}.alert-success hr{border-top-color:#b1dfbb}.alert-success .alert-link{color:#0b2e13}.alert-info{color:#0c5460;background-color:#d1ecf1;border-color:#bee5eb}.alert-info hr{border-top-color:#abdde5}.alert-info .alert-link{color:#062c33}.alert-warning{color:#856404;background-color:#fff3cd;border-color:#ffeeba}.alert-warning hr{border-top-color:#ffe8a1}.alert-warning .alert-link{color:#533f03}.alert-danger{color:#721c24;background-color:#f8d7da;border-color:#f5c6cb}.alert-danger hr{border-top-color:#f1b0b7}.alert-danger .alert-link{color:#491217}.alert-light{color:#818182;background-color:#fefefe;border-color:#fdfdfe}.alert-light hr{border-top-color:#ececf6}.alert-light .alert-link{color:#686868}.alert-dark{color:#1b1e21;background-color:#d6d8d9;border-color:#c6c8ca}.alert-dark hr{border-top-color:#b9bbbe}.alert-dark .alert-link{color:#040505}@-webkit-keyframes progress-bar-stripes{0%{background-position:1rem 0}to{background-position:0 0}}@keyframes progress-bar-stripes{0%{background-position:1rem 0}to{background-position:0 0}}.progress{height:1rem;overflow:hidden;font-size:.675rem;background-color:#e9ecef;border-radius:.25rem}.progress,.progress-bar{display:-webkit-box;display:-ms-flexbox;display:flex}.progress-bar{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;color:#fff;text-align:center;background-color:#007bff;-webkit-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent);background-size:1rem 1rem}.progress-bar-animated{-webkit-animation:progress-bar-stripes 1s linear infinite;animation:progress-bar-stripes 1s linear infinite}.media{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.media-body{-webkit-box-flex:1;-ms-flex:1;flex:1}.list-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0}.list-group-item-action{width:100%;color:#495057;text-align:inherit}.list-group-item-action:focus,.list-group-item-action:hover{color:#495057;text-decoration:none;background-color:#f8f9fa}.list-group-item-action:active{color:#212529;background-color:#e9ecef}.list-group-item{position:relative;display:block;padding:.75rem 1.25rem;margin-bottom:-1px;background-color:#fff;border:1px solid rgba(0,0,0,.125)}.list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.list-group-item:focus,.list-group-item:hover{z-index:1;text-decoration:none}.list-group-item.disabled,.list-group-item:disabled{color:#6c757d;background-color:#fff}.list-group-item.active{z-index:2;color:#fff;background-color:#007bff;border-color:#007bff}.list-group-flush .list-group-item{border-right:0;border-left:0;border-radius:0}.list-group-flush:first-child .list-group-item:first-child{border-top:0}.list-group-flush:last-child .list-group-item:last-child{border-bottom:0}.list-group-item-primary{color:#004085;background-color:#b8daff}.list-group-item-primary.list-group-item-action:focus,.list-group-item-primary.list-group-item-action:hover{color:#004085;background-color:#9fcdff}.list-group-item-primary.list-group-item-action.active{color:#fff;background-color:#004085;border-color:#004085}.list-group-item-secondary{color:#383d41;background-color:#d6d8db}.list-group-item-secondary.list-group-item-action:focus,.list-group-item-secondary.list-group-item-action:hover{color:#383d41;background-color:#c8cbcf}.list-group-item-secondary.list-group-item-action.active{color:#fff;background-color:#383d41;border-color:#383d41}.list-group-item-success{color:#155724;background-color:#c3e6cb}.list-group-item-success.list-group-item-action:focus,.list-group-item-success.list-group-item-action:hover{color:#155724;background-color:#b1dfbb}.list-group-item-success.list-group-item-action.active{color:#fff;background-color:#155724;border-color:#155724}.list-group-item-info{color:#0c5460;background-color:#bee5eb}.list-group-item-info.list-group-item-action:focus,.list-group-item-info.list-group-item-action:hover{color:#0c5460;background-color:#abdde5}.list-group-item-info.list-group-item-action.active{color:#fff;background-color:#0c5460;border-color:#0c5460}.list-group-item-warning{color:#856404;background-color:#ffeeba}.list-group-item-warning.list-group-item-action:focus,.list-group-item-warning.list-group-item-action:hover{color:#856404;background-color:#ffe8a1}.list-group-item-warning.list-group-item-action.active{color:#fff;background-color:#856404;border-color:#856404}.list-group-item-danger{color:#721c24;background-color:#f5c6cb}.list-group-item-danger.list-group-item-action:focus,.list-group-item-danger.list-group-item-action:hover{color:#721c24;background-color:#f1b0b7}.list-group-item-danger.list-group-item-action.active{color:#fff;background-color:#721c24;border-color:#721c24}.list-group-item-light{color:#818182;background-color:#fdfdfe}.list-group-item-light.list-group-item-action:focus,.list-group-item-light.list-group-item-action:hover{color:#818182;background-color:#ececf6}.list-group-item-light.list-group-item-action.active{color:#fff;background-color:#818182;border-color:#818182}.list-group-item-dark{color:#1b1e21;background-color:#c6c8ca}.list-group-item-dark.list-group-item-action:focus,.list-group-item-dark.list-group-item-action:hover{color:#1b1e21;background-color:#b9bbbe}.list-group-item-dark.list-group-item-action.active{color:#fff;background-color:#1b1e21;border-color:#1b1e21}.close{float:right;font-size:1.35rem;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.5}.close:focus,.close:hover{color:#000;text-decoration:none;opacity:.75}.close:not(:disabled):not(.disabled){cursor:pointer}button.close{padding:0;background-color:transparent;border:0;-webkit-appearance:none}.modal,.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;outline:0}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:.5rem;pointer-events:none}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out;-webkit-transform:translateY(-25%);transform:translateY(-25%)}.modal.show .modal-dialog{-webkit-transform:translate(0);transform:translate(0)}.modal-dialog-centered{-webkit-box-align:center;-ms-flex-align:center;align-items:center;min-height:calc(100% - 1rem)}.modal-content,.modal-dialog-centered{display:-webkit-box;display:-ms-flexbox;display:flex}.modal-content{position:relative;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:100%;pointer-events:auto;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem;outline:0}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop.show{opacity:.5}.modal-header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding:1rem;border-bottom:1px solid #e9ecef;border-top-left-radius:.3rem;border-top-right-radius:.3rem}.modal-header .close{padding:1rem;margin:-1rem -1rem -1rem auto}.modal-title{margin-bottom:0;line-height:1.6}.modal-body{position:relative;-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;padding:1rem}.modal-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;padding:1rem;border-top:1px solid #e9ecef}.modal-footer>:not(:first-child){margin-left:.25rem}.modal-footer>:not(:last-child){margin-right:.25rem}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:576px){.modal-dialog{max-width:500px;margin:1.75rem auto}.modal-dialog-centered{min-height:calc(100% - 3.5rem)}.modal-sm{max-width:300px}}@media (min-width:992px){.modal-lg{max-width:800px}}.tooltip{position:absolute;z-index:1070;display:block;margin:0;font-family:Raleway,sans-serif;font-style:normal;font-weight:400;line-height:1.6;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.7875rem;word-wrap:break-word;opacity:0}.tooltip.show{opacity:.9}.tooltip .arrow{position:absolute;display:block;width:.8rem;height:.4rem}.tooltip .arrow:before{position:absolute;content:"";border-color:transparent;border-style:solid}.bs-tooltip-auto[x-placement^=top],.bs-tooltip-top{padding:.4rem 0}.bs-tooltip-auto[x-placement^=top] .arrow,.bs-tooltip-top .arrow{bottom:0}.bs-tooltip-auto[x-placement^=top] .arrow:before,.bs-tooltip-top .arrow:before{top:0;border-width:.4rem .4rem 0;border-top-color:#000}.bs-tooltip-auto[x-placement^=right],.bs-tooltip-right{padding:0 .4rem}.bs-tooltip-auto[x-placement^=right] .arrow,.bs-tooltip-right .arrow{left:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=right] .arrow:before,.bs-tooltip-right .arrow:before{right:0;border-width:.4rem .4rem .4rem 0;border-right-color:#000}.bs-tooltip-auto[x-placement^=bottom],.bs-tooltip-bottom{padding:.4rem 0}.bs-tooltip-auto[x-placement^=bottom] .arrow,.bs-tooltip-bottom .arrow{top:0}.bs-tooltip-auto[x-placement^=bottom] .arrow:before,.bs-tooltip-bottom .arrow:before{bottom:0;border-width:0 .4rem .4rem;border-bottom-color:#000}.bs-tooltip-auto[x-placement^=left],.bs-tooltip-left{padding:0 .4rem}.bs-tooltip-auto[x-placement^=left] .arrow,.bs-tooltip-left .arrow{right:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=left] .arrow:before,.bs-tooltip-left .arrow:before{left:0;border-width:.4rem 0 .4rem .4rem;border-left-color:#000}.tooltip-inner{max-width:200px;padding:.25rem .5rem;color:#fff;text-align:center;background-color:#000;border-radius:.25rem}.popover{top:0;left:0;z-index:1060;max-width:276px;font-family:Raleway,sans-serif;font-style:normal;font-weight:400;line-height:1.6;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.7875rem;word-wrap:break-word;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem}.popover,.popover .arrow{position:absolute;display:block}.popover .arrow{width:1rem;height:.5rem;margin:0 .3rem}.popover .arrow:after,.popover .arrow:before{position:absolute;display:block;content:"";border-color:transparent;border-style:solid}.bs-popover-auto[x-placement^=top],.bs-popover-top{margin-bottom:.5rem}.bs-popover-auto[x-placement^=top] .arrow,.bs-popover-top .arrow{bottom:calc((.5rem + 1px) * -1)}.bs-popover-auto[x-placement^=top] .arrow:after,.bs-popover-auto[x-placement^=top] .arrow:before,.bs-popover-top .arrow:after,.bs-popover-top .arrow:before{border-width:.5rem .5rem 0}.bs-popover-auto[x-placement^=top] .arrow:before,.bs-popover-top .arrow:before{bottom:0;border-top-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=top] .arrow:after,.bs-popover-top .arrow:after{bottom:1px;border-top-color:#fff}.bs-popover-auto[x-placement^=right],.bs-popover-right{margin-left:.5rem}.bs-popover-auto[x-placement^=right] .arrow,.bs-popover-right .arrow{left:calc((.5rem + 1px) * -1);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=right] .arrow:after,.bs-popover-auto[x-placement^=right] .arrow:before,.bs-popover-right .arrow:after,.bs-popover-right .arrow:before{border-width:.5rem .5rem .5rem 0}.bs-popover-auto[x-placement^=right] .arrow:before,.bs-popover-right .arrow:before{left:0;border-right-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=right] .arrow:after,.bs-popover-right .arrow:after{left:1px;border-right-color:#fff}.bs-popover-auto[x-placement^=bottom],.bs-popover-bottom{margin-top:.5rem}.bs-popover-auto[x-placement^=bottom] .arrow,.bs-popover-bottom .arrow{top:calc((.5rem + 1px) * -1)}.bs-popover-auto[x-placement^=bottom] .arrow:after,.bs-popover-auto[x-placement^=bottom] .arrow:before,.bs-popover-bottom .arrow:after,.bs-popover-bottom .arrow:before{border-width:0 .5rem .5rem}.bs-popover-auto[x-placement^=bottom] .arrow:before,.bs-popover-bottom .arrow:before{top:0;border-bottom-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=bottom] .arrow:after,.bs-popover-bottom .arrow:after{top:1px;border-bottom-color:#fff}.bs-popover-auto[x-placement^=bottom] .popover-header:before,.bs-popover-bottom .popover-header:before{position:absolute;top:0;left:50%;display:block;width:1rem;margin-left:-.5rem;content:"";border-bottom:1px solid #f7f7f7}.bs-popover-auto[x-placement^=left],.bs-popover-left{margin-right:.5rem}.bs-popover-auto[x-placement^=left] .arrow,.bs-popover-left .arrow{right:calc((.5rem + 1px) * -1);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=left] .arrow:after,.bs-popover-auto[x-placement^=left] .arrow:before,.bs-popover-left .arrow:after,.bs-popover-left .arrow:before{border-width:.5rem 0 .5rem .5rem}.bs-popover-auto[x-placement^=left] .arrow:before,.bs-popover-left .arrow:before{right:0;border-left-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=left] .arrow:after,.bs-popover-left .arrow:after{right:1px;border-left-color:#fff}.popover-header{padding:.5rem .75rem;margin-bottom:0;font-size:.9rem;color:inherit;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-top-left-radius:calc(.3rem - 1px);border-top-right-radius:calc(.3rem - 1px)}.popover-header:empty{display:none}.popover-body{padding:.5rem .75rem;color:#212529}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-item{position:relative;display:none;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;-webkit-transition:-webkit-transform .6s ease;transition:-webkit-transform .6s ease;transition:transform .6s ease;transition:transform .6s ease,-webkit-transform .6s ease;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-item-next,.carousel-item-prev,.carousel-item.active{display:block}.carousel-item-next,.carousel-item-prev{position:absolute;top:0}.carousel-item-next.carousel-item-left,.carousel-item-prev.carousel-item-right{-webkit-transform:translateX(0);transform:translateX(0)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.carousel-item-next.carousel-item-left,.carousel-item-prev.carousel-item-right{-webkit-transform:translateZ(0);transform:translateZ(0)}}.active.carousel-item-right,.carousel-item-next{-webkit-transform:translateX(100%);transform:translateX(100%)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.active.carousel-item-right,.carousel-item-next{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}.active.carousel-item-left,.carousel-item-prev{-webkit-transform:translateX(-100%);transform:translateX(-100%)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.active.carousel-item-left,.carousel-item-prev{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}.carousel-control-next,.carousel-control-prev{position:absolute;top:0;bottom:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:15%;color:#fff;text-align:center;opacity:.5}.carousel-control-next:focus,.carousel-control-next:hover,.carousel-control-prev:focus,.carousel-control-prev:hover{color:#fff;text-decoration:none;outline:0;opacity:.9}.carousel-control-prev{left:0}.carousel-control-next{right:0}.carousel-control-next-icon,.carousel-control-prev-icon{display:inline-block;width:20px;height:20px;background:transparent no-repeat 50%;background-size:100% 100%}.carousel-control-prev-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E")}.carousel-control-next-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E")}.carousel-indicators{position:absolute;right:0;bottom:10px;left:0;z-index:15;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding-left:0;margin-right:15%;margin-left:15%;list-style:none}.carousel-indicators li{position:relative;-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto;width:30px;height:3px;margin-right:3px;margin-left:3px;text-indent:-999px;background-color:hsla(0,0%,100%,.5)}.carousel-indicators li:before{top:-10px}.carousel-indicators li:after,.carousel-indicators li:before{position:absolute;left:0;display:inline-block;width:100%;height:10px;content:""}.carousel-indicators li:after{bottom:-10px}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center}.align-baseline{vertical-align:baseline!important}.align-top{vertical-align:top!important}.align-middle{vertical-align:middle!important}.align-bottom{vertical-align:bottom!important}.align-text-bottom{vertical-align:text-bottom!important}.align-text-top{vertical-align:text-top!important}.bg-primary{background-color:#007bff!important}a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary:hover{background-color:#0062cc!important}.bg-secondary{background-color:#6c757d!important}a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover{background-color:#545b62!important}.bg-success{background-color:#28a745!important}a.bg-success:focus,a.bg-success:hover,button.bg-success:focus,button.bg-success:hover{background-color:#1e7e34!important}.bg-info{background-color:#17a2b8!important}a.bg-info:focus,a.bg-info:hover,button.bg-info:focus,button.bg-info:hover{background-color:#117a8b!important}.bg-warning{background-color:#ffc107!important}a.bg-warning:focus,a.bg-warning:hover,button.bg-warning:focus,button.bg-warning:hover{background-color:#d39e00!important}.bg-danger{background-color:#dc3545!important}a.bg-danger:focus,a.bg-danger:hover,button.bg-danger:focus,button.bg-danger:hover{background-color:#bd2130!important}.bg-light{background-color:#f8f9fa!important}a.bg-light:focus,a.bg-light:hover,button.bg-light:focus,button.bg-light:hover{background-color:#dae0e5!important}.bg-dark{background-color:#343a40!important}a.bg-dark:focus,a.bg-dark:hover,button.bg-dark:focus,button.bg-dark:hover{background-color:#1d2124!important}.bg-white{background-color:#fff!important}.bg-transparent{background-color:transparent!important}.border{border:1px solid #dee2e6!important}.border-top{border-top:1px solid #dee2e6!important}.border-right{border-right:1px solid #dee2e6!important}.border-bottom{border-bottom:1px solid #dee2e6!important}.border-left{border-left:1px solid #dee2e6!important}.border-0{border:0!important}.border-top-0{border-top:0!important}.border-right-0{border-right:0!important}.border-bottom-0{border-bottom:0!important}.border-left-0{border-left:0!important}.border-primary{border-color:#007bff!important}.border-secondary{border-color:#6c757d!important}.border-success{border-color:#28a745!important}.border-info{border-color:#17a2b8!important}.border-warning{border-color:#ffc107!important}.border-danger{border-color:#dc3545!important}.border-light{border-color:#f8f9fa!important}.border-dark{border-color:#343a40!important}.border-white{border-color:#fff!important}.rounded{border-radius:.25rem!important}.rounded-top{border-top-left-radius:.25rem!important}.rounded-right,.rounded-top{border-top-right-radius:.25rem!important}.rounded-bottom,.rounded-right{border-bottom-right-radius:.25rem!important}.rounded-bottom,.rounded-left{border-bottom-left-radius:.25rem!important}.rounded-left{border-top-left-radius:.25rem!important}.rounded-circle{border-radius:50%!important}.rounded-0{border-radius:0!important}.clearfix:after{display:block;clear:both;content:""}.d-none{display:none!important}.d-inline{display:inline!important}.d-inline-block{display:inline-block!important}.d-block{display:block!important}.d-table{display:table!important}.d-table-row{display:table-row!important}.d-table-cell{display:table-cell!important}.d-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}@media (min-width:576px){.d-sm-none{display:none!important}.d-sm-inline{display:inline!important}.d-sm-inline-block{display:inline-block!important}.d-sm-block{display:block!important}.d-sm-table{display:table!important}.d-sm-table-row{display:table-row!important}.d-sm-table-cell{display:table-cell!important}.d-sm-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-sm-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:768px){.d-md-none{display:none!important}.d-md-inline{display:inline!important}.d-md-inline-block{display:inline-block!important}.d-md-block{display:block!important}.d-md-table{display:table!important}.d-md-table-row{display:table-row!important}.d-md-table-cell{display:table-cell!important}.d-md-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-md-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:992px){.d-lg-none{display:none!important}.d-lg-inline{display:inline!important}.d-lg-inline-block{display:inline-block!important}.d-lg-block{display:block!important}.d-lg-table{display:table!important}.d-lg-table-row{display:table-row!important}.d-lg-table-cell{display:table-cell!important}.d-lg-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-lg-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:1200px){.d-xl-none{display:none!important}.d-xl-inline{display:inline!important}.d-xl-inline-block{display:inline-block!important}.d-xl-block{display:block!important}.d-xl-table{display:table!important}.d-xl-table-row{display:table-row!important}.d-xl-table-cell{display:table-cell!important}.d-xl-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-xl-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media print{.d-print-none{display:none!important}.d-print-inline{display:inline!important}.d-print-inline-block{display:inline-block!important}.d-print-block{display:block!important}.d-print-table{display:table!important}.d-print-table-row{display:table-row!important}.d-print-table-cell{display:table-cell!important}.d-print-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-print-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}.embed-responsive:before{display:block;content:""}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9:before{padding-top:42.85714286%}.embed-responsive-16by9:before{padding-top:56.25%}.embed-responsive-4by3:before{padding-top:75%}.embed-responsive-1by1:before{padding-top:100%}.flex-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-column,.flex-row{-webkit-box-direction:normal!important}.flex-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-row-reverse{-webkit-box-orient:horizontal!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-column-reverse,.flex-row-reverse{-webkit-box-direction:reverse!important}.flex-column-reverse{-webkit-box-orient:vertical!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}@media (min-width:576px){.flex-sm-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-sm-column,.flex-sm-row{-webkit-box-direction:normal!important}.flex-sm-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-sm-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-sm-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-sm-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-sm-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-sm-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-sm-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-sm-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-sm-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-sm-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-sm-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-sm-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-sm-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-sm-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-sm-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-sm-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-sm-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-sm-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-sm-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-sm-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-sm-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-sm-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-sm-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-sm-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-sm-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-sm-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-sm-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-sm-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:768px){.flex-md-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-md-column,.flex-md-row{-webkit-box-direction:normal!important}.flex-md-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-md-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-md-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-md-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-md-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-md-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-md-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-md-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-md-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-md-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-md-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-md-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-md-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-md-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-md-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-md-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-md-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-md-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-md-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-md-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-md-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-md-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-md-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-md-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-md-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-md-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-md-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-md-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:992px){.flex-lg-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-lg-column,.flex-lg-row{-webkit-box-direction:normal!important}.flex-lg-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-lg-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-lg-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-lg-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-lg-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-lg-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-lg-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-lg-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-lg-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-lg-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-lg-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-lg-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-lg-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-lg-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-lg-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-lg-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-lg-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-lg-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-lg-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-lg-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-lg-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-lg-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-lg-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-lg-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-lg-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-lg-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-lg-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-lg-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:1200px){.flex-xl-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-xl-column,.flex-xl-row{-webkit-box-direction:normal!important}.flex-xl-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-xl-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-xl-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-xl-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-xl-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-xl-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-xl-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-xl-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-xl-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-xl-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-xl-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-xl-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-xl-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-xl-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-xl-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-xl-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-xl-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-xl-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-xl-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-xl-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-xl-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-xl-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-xl-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-xl-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-xl-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-xl-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-xl-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-xl-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}.float-left{float:left!important}.float-right{float:right!important}.float-none{float:none!important}@media (min-width:576px){.float-sm-left{float:left!important}.float-sm-right{float:right!important}.float-sm-none{float:none!important}}@media (min-width:768px){.float-md-left{float:left!important}.float-md-right{float:right!important}.float-md-none{float:none!important}}@media (min-width:992px){.float-lg-left{float:left!important}.float-lg-right{float:right!important}.float-lg-none{float:none!important}}@media (min-width:1200px){.float-xl-left{float:left!important}.float-xl-right{float:right!important}.float-xl-none{float:none!important}}.position-static{position:static!important}.position-relative{position:relative!important}.position-absolute{position:absolute!important}.position-fixed{position:fixed!important}.position-sticky{position:-webkit-sticky!important;position:sticky!important}.fixed-top{top:0}.fixed-bottom,.fixed-top{position:fixed;right:0;left:0;z-index:1030}.fixed-bottom{bottom:0}@supports ((position:-webkit-sticky) or (position:sticky)){.sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}}.sr-only{position:absolute;width:1px;height:1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;-webkit-clip-path:inset(50%);clip-path:inset(50%);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal;-webkit-clip-path:none;clip-path:none}.w-25{width:25%!important}.w-50{width:50%!important}.w-75{width:75%!important}.w-100{width:100%!important}.h-25{height:25%!important}.h-50{height:50%!important}.h-75{height:75%!important}.h-100{height:100%!important}.mw-100{max-width:100%!important}.mh-100{max-height:100%!important}.m-0{margin:0!important}.mt-0,.my-0{margin-top:0!important}.mr-0,.mx-0{margin-right:0!important}.mb-0,.my-0{margin-bottom:0!important}.ml-0,.mx-0{margin-left:0!important}.m-1{margin:.25rem!important}.mt-1,.my-1{margin-top:.25rem!important}.mr-1,.mx-1{margin-right:.25rem!important}.mb-1,.my-1{margin-bottom:.25rem!important}.ml-1,.mx-1{margin-left:.25rem!important}.m-2{margin:.5rem!important}.mt-2,.my-2{margin-top:.5rem!important}.mr-2,.mx-2{margin-right:.5rem!important}.mb-2,.my-2{margin-bottom:.5rem!important}.ml-2,.mx-2{margin-left:.5rem!important}.m-3{margin:1rem!important}.mt-3,.my-3{margin-top:1rem!important}.mr-3,.mx-3{margin-right:1rem!important}.mb-3,.my-3{margin-bottom:1rem!important}.ml-3,.mx-3{margin-left:1rem!important}.m-4{margin:1.5rem!important}.mt-4,.my-4{margin-top:1.5rem!important}.mr-4,.mx-4{margin-right:1.5rem!important}.mb-4,.my-4{margin-bottom:1.5rem!important}.ml-4,.mx-4{margin-left:1.5rem!important}.m-5{margin:3rem!important}.mt-5,.my-5{margin-top:3rem!important}.mr-5,.mx-5{margin-right:3rem!important}.mb-5,.my-5{margin-bottom:3rem!important}.ml-5,.mx-5{margin-left:3rem!important}.p-0{padding:0!important}.pt-0,.py-0{padding-top:0!important}.pr-0,.px-0{padding-right:0!important}.pb-0,.py-0{padding-bottom:0!important}.pl-0,.px-0{padding-left:0!important}.p-1{padding:.25rem!important}.pt-1,.py-1{padding-top:.25rem!important}.pr-1,.px-1{padding-right:.25rem!important}.pb-1,.py-1{padding-bottom:.25rem!important}.pl-1,.px-1{padding-left:.25rem!important}.p-2{padding:.5rem!important}.pt-2,.py-2{padding-top:.5rem!important}.pr-2,.px-2{padding-right:.5rem!important}.pb-2,.py-2{padding-bottom:.5rem!important}.pl-2,.px-2{padding-left:.5rem!important}.p-3{padding:1rem!important}.pt-3,.py-3{padding-top:1rem!important}.pr-3,.px-3{padding-right:1rem!important}.pb-3,.py-3{padding-bottom:1rem!important}.pl-3,.px-3{padding-left:1rem!important}.p-4{padding:1.5rem!important}.pt-4,.py-4{padding-top:1.5rem!important}.pr-4,.px-4{padding-right:1.5rem!important}.pb-4,.py-4{padding-bottom:1.5rem!important}.pl-4,.px-4{padding-left:1.5rem!important}.p-5{padding:3rem!important}.pt-5,.py-5{padding-top:3rem!important}.pr-5,.px-5{padding-right:3rem!important}.pb-5,.py-5{padding-bottom:3rem!important}.pl-5,.px-5{padding-left:3rem!important}.m-auto{margin:auto!important}.mt-auto,.my-auto{margin-top:auto!important}.mr-auto,.mx-auto{margin-right:auto!important}.mb-auto,.my-auto{margin-bottom:auto!important}.ml-auto,.mx-auto{margin-left:auto!important}@media (min-width:576px){.m-sm-0{margin:0!important}.mt-sm-0,.my-sm-0{margin-top:0!important}.mr-sm-0,.mx-sm-0{margin-right:0!important}.mb-sm-0,.my-sm-0{margin-bottom:0!important}.ml-sm-0,.mx-sm-0{margin-left:0!important}.m-sm-1{margin:.25rem!important}.mt-sm-1,.my-sm-1{margin-top:.25rem!important}.mr-sm-1,.mx-sm-1{margin-right:.25rem!important}.mb-sm-1,.my-sm-1{margin-bottom:.25rem!important}.ml-sm-1,.mx-sm-1{margin-left:.25rem!important}.m-sm-2{margin:.5rem!important}.mt-sm-2,.my-sm-2{margin-top:.5rem!important}.mr-sm-2,.mx-sm-2{margin-right:.5rem!important}.mb-sm-2,.my-sm-2{margin-bottom:.5rem!important}.ml-sm-2,.mx-sm-2{margin-left:.5rem!important}.m-sm-3{margin:1rem!important}.mt-sm-3,.my-sm-3{margin-top:1rem!important}.mr-sm-3,.mx-sm-3{margin-right:1rem!important}.mb-sm-3,.my-sm-3{margin-bottom:1rem!important}.ml-sm-3,.mx-sm-3{margin-left:1rem!important}.m-sm-4{margin:1.5rem!important}.mt-sm-4,.my-sm-4{margin-top:1.5rem!important}.mr-sm-4,.mx-sm-4{margin-right:1.5rem!important}.mb-sm-4,.my-sm-4{margin-bottom:1.5rem!important}.ml-sm-4,.mx-sm-4{margin-left:1.5rem!important}.m-sm-5{margin:3rem!important}.mt-sm-5,.my-sm-5{margin-top:3rem!important}.mr-sm-5,.mx-sm-5{margin-right:3rem!important}.mb-sm-5,.my-sm-5{margin-bottom:3rem!important}.ml-sm-5,.mx-sm-5{margin-left:3rem!important}.p-sm-0{padding:0!important}.pt-sm-0,.py-sm-0{padding-top:0!important}.pr-sm-0,.px-sm-0{padding-right:0!important}.pb-sm-0,.py-sm-0{padding-bottom:0!important}.pl-sm-0,.px-sm-0{padding-left:0!important}.p-sm-1{padding:.25rem!important}.pt-sm-1,.py-sm-1{padding-top:.25rem!important}.pr-sm-1,.px-sm-1{padding-right:.25rem!important}.pb-sm-1,.py-sm-1{padding-bottom:.25rem!important}.pl-sm-1,.px-sm-1{padding-left:.25rem!important}.p-sm-2{padding:.5rem!important}.pt-sm-2,.py-sm-2{padding-top:.5rem!important}.pr-sm-2,.px-sm-2{padding-right:.5rem!important}.pb-sm-2,.py-sm-2{padding-bottom:.5rem!important}.pl-sm-2,.px-sm-2{padding-left:.5rem!important}.p-sm-3{padding:1rem!important}.pt-sm-3,.py-sm-3{padding-top:1rem!important}.pr-sm-3,.px-sm-3{padding-right:1rem!important}.pb-sm-3,.py-sm-3{padding-bottom:1rem!important}.pl-sm-3,.px-sm-3{padding-left:1rem!important}.p-sm-4{padding:1.5rem!important}.pt-sm-4,.py-sm-4{padding-top:1.5rem!important}.pr-sm-4,.px-sm-4{padding-right:1.5rem!important}.pb-sm-4,.py-sm-4{padding-bottom:1.5rem!important}.pl-sm-4,.px-sm-4{padding-left:1.5rem!important}.p-sm-5{padding:3rem!important}.pt-sm-5,.py-sm-5{padding-top:3rem!important}.pr-sm-5,.px-sm-5{padding-right:3rem!important}.pb-sm-5,.py-sm-5{padding-bottom:3rem!important}.pl-sm-5,.px-sm-5{padding-left:3rem!important}.m-sm-auto{margin:auto!important}.mt-sm-auto,.my-sm-auto{margin-top:auto!important}.mr-sm-auto,.mx-sm-auto{margin-right:auto!important}.mb-sm-auto,.my-sm-auto{margin-bottom:auto!important}.ml-sm-auto,.mx-sm-auto{margin-left:auto!important}}@media (min-width:768px){.m-md-0{margin:0!important}.mt-md-0,.my-md-0{margin-top:0!important}.mr-md-0,.mx-md-0{margin-right:0!important}.mb-md-0,.my-md-0{margin-bottom:0!important}.ml-md-0,.mx-md-0{margin-left:0!important}.m-md-1{margin:.25rem!important}.mt-md-1,.my-md-1{margin-top:.25rem!important}.mr-md-1,.mx-md-1{margin-right:.25rem!important}.mb-md-1,.my-md-1{margin-bottom:.25rem!important}.ml-md-1,.mx-md-1{margin-left:.25rem!important}.m-md-2{margin:.5rem!important}.mt-md-2,.my-md-2{margin-top:.5rem!important}.mr-md-2,.mx-md-2{margin-right:.5rem!important}.mb-md-2,.my-md-2{margin-bottom:.5rem!important}.ml-md-2,.mx-md-2{margin-left:.5rem!important}.m-md-3{margin:1rem!important}.mt-md-3,.my-md-3{margin-top:1rem!important}.mr-md-3,.mx-md-3{margin-right:1rem!important}.mb-md-3,.my-md-3{margin-bottom:1rem!important}.ml-md-3,.mx-md-3{margin-left:1rem!important}.m-md-4{margin:1.5rem!important}.mt-md-4,.my-md-4{margin-top:1.5rem!important}.mr-md-4,.mx-md-4{margin-right:1.5rem!important}.mb-md-4,.my-md-4{margin-bottom:1.5rem!important}.ml-md-4,.mx-md-4{margin-left:1.5rem!important}.m-md-5{margin:3rem!important}.mt-md-5,.my-md-5{margin-top:3rem!important}.mr-md-5,.mx-md-5{margin-right:3rem!important}.mb-md-5,.my-md-5{margin-bottom:3rem!important}.ml-md-5,.mx-md-5{margin-left:3rem!important}.p-md-0{padding:0!important}.pt-md-0,.py-md-0{padding-top:0!important}.pr-md-0,.px-md-0{padding-right:0!important}.pb-md-0,.py-md-0{padding-bottom:0!important}.pl-md-0,.px-md-0{padding-left:0!important}.p-md-1{padding:.25rem!important}.pt-md-1,.py-md-1{padding-top:.25rem!important}.pr-md-1,.px-md-1{padding-right:.25rem!important}.pb-md-1,.py-md-1{padding-bottom:.25rem!important}.pl-md-1,.px-md-1{padding-left:.25rem!important}.p-md-2{padding:.5rem!important}.pt-md-2,.py-md-2{padding-top:.5rem!important}.pr-md-2,.px-md-2{padding-right:.5rem!important}.pb-md-2,.py-md-2{padding-bottom:.5rem!important}.pl-md-2,.px-md-2{padding-left:.5rem!important}.p-md-3{padding:1rem!important}.pt-md-3,.py-md-3{padding-top:1rem!important}.pr-md-3,.px-md-3{padding-right:1rem!important}.pb-md-3,.py-md-3{padding-bottom:1rem!important}.pl-md-3,.px-md-3{padding-left:1rem!important}.p-md-4{padding:1.5rem!important}.pt-md-4,.py-md-4{padding-top:1.5rem!important}.pr-md-4,.px-md-4{padding-right:1.5rem!important}.pb-md-4,.py-md-4{padding-bottom:1.5rem!important}.pl-md-4,.px-md-4{padding-left:1.5rem!important}.p-md-5{padding:3rem!important}.pt-md-5,.py-md-5{padding-top:3rem!important}.pr-md-5,.px-md-5{padding-right:3rem!important}.pb-md-5,.py-md-5{padding-bottom:3rem!important}.pl-md-5,.px-md-5{padding-left:3rem!important}.m-md-auto{margin:auto!important}.mt-md-auto,.my-md-auto{margin-top:auto!important}.mr-md-auto,.mx-md-auto{margin-right:auto!important}.mb-md-auto,.my-md-auto{margin-bottom:auto!important}.ml-md-auto,.mx-md-auto{margin-left:auto!important}}@media (min-width:992px){.m-lg-0{margin:0!important}.mt-lg-0,.my-lg-0{margin-top:0!important}.mr-lg-0,.mx-lg-0{margin-right:0!important}.mb-lg-0,.my-lg-0{margin-bottom:0!important}.ml-lg-0,.mx-lg-0{margin-left:0!important}.m-lg-1{margin:.25rem!important}.mt-lg-1,.my-lg-1{margin-top:.25rem!important}.mr-lg-1,.mx-lg-1{margin-right:.25rem!important}.mb-lg-1,.my-lg-1{margin-bottom:.25rem!important}.ml-lg-1,.mx-lg-1{margin-left:.25rem!important}.m-lg-2{margin:.5rem!important}.mt-lg-2,.my-lg-2{margin-top:.5rem!important}.mr-lg-2,.mx-lg-2{margin-right:.5rem!important}.mb-lg-2,.my-lg-2{margin-bottom:.5rem!important}.ml-lg-2,.mx-lg-2{margin-left:.5rem!important}.m-lg-3{margin:1rem!important}.mt-lg-3,.my-lg-3{margin-top:1rem!important}.mr-lg-3,.mx-lg-3{margin-right:1rem!important}.mb-lg-3,.my-lg-3{margin-bottom:1rem!important}.ml-lg-3,.mx-lg-3{margin-left:1rem!important}.m-lg-4{margin:1.5rem!important}.mt-lg-4,.my-lg-4{margin-top:1.5rem!important}.mr-lg-4,.mx-lg-4{margin-right:1.5rem!important}.mb-lg-4,.my-lg-4{margin-bottom:1.5rem!important}.ml-lg-4,.mx-lg-4{margin-left:1.5rem!important}.m-lg-5{margin:3rem!important}.mt-lg-5,.my-lg-5{margin-top:3rem!important}.mr-lg-5,.mx-lg-5{margin-right:3rem!important}.mb-lg-5,.my-lg-5{margin-bottom:3rem!important}.ml-lg-5,.mx-lg-5{margin-left:3rem!important}.p-lg-0{padding:0!important}.pt-lg-0,.py-lg-0{padding-top:0!important}.pr-lg-0,.px-lg-0{padding-right:0!important}.pb-lg-0,.py-lg-0{padding-bottom:0!important}.pl-lg-0,.px-lg-0{padding-left:0!important}.p-lg-1{padding:.25rem!important}.pt-lg-1,.py-lg-1{padding-top:.25rem!important}.pr-lg-1,.px-lg-1{padding-right:.25rem!important}.pb-lg-1,.py-lg-1{padding-bottom:.25rem!important}.pl-lg-1,.px-lg-1{padding-left:.25rem!important}.p-lg-2{padding:.5rem!important}.pt-lg-2,.py-lg-2{padding-top:.5rem!important}.pr-lg-2,.px-lg-2{padding-right:.5rem!important}.pb-lg-2,.py-lg-2{padding-bottom:.5rem!important}.pl-lg-2,.px-lg-2{padding-left:.5rem!important}.p-lg-3{padding:1rem!important}.pt-lg-3,.py-lg-3{padding-top:1rem!important}.pr-lg-3,.px-lg-3{padding-right:1rem!important}.pb-lg-3,.py-lg-3{padding-bottom:1rem!important}.pl-lg-3,.px-lg-3{padding-left:1rem!important}.p-lg-4{padding:1.5rem!important}.pt-lg-4,.py-lg-4{padding-top:1.5rem!important}.pr-lg-4,.px-lg-4{padding-right:1.5rem!important}.pb-lg-4,.py-lg-4{padding-bottom:1.5rem!important}.pl-lg-4,.px-lg-4{padding-left:1.5rem!important}.p-lg-5{padding:3rem!important}.pt-lg-5,.py-lg-5{padding-top:3rem!important}.pr-lg-5,.px-lg-5{padding-right:3rem!important}.pb-lg-5,.py-lg-5{padding-bottom:3rem!important}.pl-lg-5,.px-lg-5{padding-left:3rem!important}.m-lg-auto{margin:auto!important}.mt-lg-auto,.my-lg-auto{margin-top:auto!important}.mr-lg-auto,.mx-lg-auto{margin-right:auto!important}.mb-lg-auto,.my-lg-auto{margin-bottom:auto!important}.ml-lg-auto,.mx-lg-auto{margin-left:auto!important}}@media (min-width:1200px){.m-xl-0{margin:0!important}.mt-xl-0,.my-xl-0{margin-top:0!important}.mr-xl-0,.mx-xl-0{margin-right:0!important}.mb-xl-0,.my-xl-0{margin-bottom:0!important}.ml-xl-0,.mx-xl-0{margin-left:0!important}.m-xl-1{margin:.25rem!important}.mt-xl-1,.my-xl-1{margin-top:.25rem!important}.mr-xl-1,.mx-xl-1{margin-right:.25rem!important}.mb-xl-1,.my-xl-1{margin-bottom:.25rem!important}.ml-xl-1,.mx-xl-1{margin-left:.25rem!important}.m-xl-2{margin:.5rem!important}.mt-xl-2,.my-xl-2{margin-top:.5rem!important}.mr-xl-2,.mx-xl-2{margin-right:.5rem!important}.mb-xl-2,.my-xl-2{margin-bottom:.5rem!important}.ml-xl-2,.mx-xl-2{margin-left:.5rem!important}.m-xl-3{margin:1rem!important}.mt-xl-3,.my-xl-3{margin-top:1rem!important}.mr-xl-3,.mx-xl-3{margin-right:1rem!important}.mb-xl-3,.my-xl-3{margin-bottom:1rem!important}.ml-xl-3,.mx-xl-3{margin-left:1rem!important}.m-xl-4{margin:1.5rem!important}.mt-xl-4,.my-xl-4{margin-top:1.5rem!important}.mr-xl-4,.mx-xl-4{margin-right:1.5rem!important}.mb-xl-4,.my-xl-4{margin-bottom:1.5rem!important}.ml-xl-4,.mx-xl-4{margin-left:1.5rem!important}.m-xl-5{margin:3rem!important}.mt-xl-5,.my-xl-5{margin-top:3rem!important}.mr-xl-5,.mx-xl-5{margin-right:3rem!important}.mb-xl-5,.my-xl-5{margin-bottom:3rem!important}.ml-xl-5,.mx-xl-5{margin-left:3rem!important}.p-xl-0{padding:0!important}.pt-xl-0,.py-xl-0{padding-top:0!important}.pr-xl-0,.px-xl-0{padding-right:0!important}.pb-xl-0,.py-xl-0{padding-bottom:0!important}.pl-xl-0,.px-xl-0{padding-left:0!important}.p-xl-1{padding:.25rem!important}.pt-xl-1,.py-xl-1{padding-top:.25rem!important}.pr-xl-1,.px-xl-1{padding-right:.25rem!important}.pb-xl-1,.py-xl-1{padding-bottom:.25rem!important}.pl-xl-1,.px-xl-1{padding-left:.25rem!important}.p-xl-2{padding:.5rem!important}.pt-xl-2,.py-xl-2{padding-top:.5rem!important}.pr-xl-2,.px-xl-2{padding-right:.5rem!important}.pb-xl-2,.py-xl-2{padding-bottom:.5rem!important}.pl-xl-2,.px-xl-2{padding-left:.5rem!important}.p-xl-3{padding:1rem!important}.pt-xl-3,.py-xl-3{padding-top:1rem!important}.pr-xl-3,.px-xl-3{padding-right:1rem!important}.pb-xl-3,.py-xl-3{padding-bottom:1rem!important}.pl-xl-3,.px-xl-3{padding-left:1rem!important}.p-xl-4{padding:1.5rem!important}.pt-xl-4,.py-xl-4{padding-top:1.5rem!important}.pr-xl-4,.px-xl-4{padding-right:1.5rem!important}.pb-xl-4,.py-xl-4{padding-bottom:1.5rem!important}.pl-xl-4,.px-xl-4{padding-left:1.5rem!important}.p-xl-5{padding:3rem!important}.pt-xl-5,.py-xl-5{padding-top:3rem!important}.pr-xl-5,.px-xl-5{padding-right:3rem!important}.pb-xl-5,.py-xl-5{padding-bottom:3rem!important}.pl-xl-5,.px-xl-5{padding-left:3rem!important}.m-xl-auto{margin:auto!important}.mt-xl-auto,.my-xl-auto{margin-top:auto!important}.mr-xl-auto,.mx-xl-auto{margin-right:auto!important}.mb-xl-auto,.my-xl-auto{margin-bottom:auto!important}.ml-xl-auto,.mx-xl-auto{margin-left:auto!important}}.text-justify{text-align:justify!important}.text-nowrap{white-space:nowrap!important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}@media (min-width:576px){.text-sm-left{text-align:left!important}.text-sm-right{text-align:right!important}.text-sm-center{text-align:center!important}}@media (min-width:768px){.text-md-left{text-align:left!important}.text-md-right{text-align:right!important}.text-md-center{text-align:center!important}}@media (min-width:992px){.text-lg-left{text-align:left!important}.text-lg-right{text-align:right!important}.text-lg-center{text-align:center!important}}@media (min-width:1200px){.text-xl-left{text-align:left!important}.text-xl-right{text-align:right!important}.text-xl-center{text-align:center!important}}.text-lowercase{text-transform:lowercase!important}.text-uppercase{text-transform:uppercase!important}.text-capitalize{text-transform:capitalize!important}.font-weight-light{font-weight:300!important}.font-weight-normal{font-weight:400!important}.font-weight-bold{font-weight:700!important}.font-italic{font-style:italic!important}.text-white{color:#fff!important}.text-primary{color:#007bff!important}a.text-primary:focus,a.text-primary:hover{color:#0062cc!important}.text-secondary{color:#6c757d!important}a.text-secondary:focus,a.text-secondary:hover{color:#545b62!important}.text-success{color:#28a745!important}a.text-success:focus,a.text-success:hover{color:#1e7e34!important}.text-info{color:#17a2b8!important}a.text-info:focus,a.text-info:hover{color:#117a8b!important}.text-warning{color:#ffc107!important}a.text-warning:focus,a.text-warning:hover{color:#d39e00!important}.text-danger{color:#dc3545!important}a.text-danger:focus,a.text-danger:hover{color:#bd2130!important}.text-light{color:#f8f9fa!important}a.text-light:focus,a.text-light:hover{color:#dae0e5!important}.text-dark{color:#343a40!important}a.text-dark:focus,a.text-dark:hover{color:#1d2124!important}.text-muted{color:#6c757d!important}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.visible{visibility:visible!important}.invisible{visibility:hidden!important}@media print{*,:after,:before{text-shadow:none!important;-webkit-box-shadow:none!important;box-shadow:none!important}a:not(.btn){text-decoration:underline}abbr[title]:after{content:" (" attr(title) ")"}pre{white-space:pre-wrap!important}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}@page{size:a3}.container,body{min-width:992px!important}.navbar{display:none}.badge{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}.navbar-laravel{background-color:#fff;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.04);box-shadow:0 2px 4px rgba(0,0,0,.04)}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/public/js/app.js b/modules/openapi-generator/src/main/resources/php-laravel/public/js/app.js
deleted file mode 100644
index c5d3189712e5..000000000000
--- a/modules/openapi-generator/src/main/resources/php-laravel/public/js/app.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{configurable:!1,enumerable:!0,get:r})},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=11)}([function(t,e,n){"use strict";var r=n(5),i=n(19),o=Object.prototype.toString;function a(t){return"[object Array]"===o.call(t)}function s(t){return null!==t&&"object"==typeof t}function u(t){return"[object Function]"===o.call(t)}function c(t,e){if(null!==t&&void 0!==t)if("object"!=typeof t&&(t=[t]),a(t))for(var n=0,r=t.length;n<r;n++)e.call(null,t[n],n,t);else for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&e.call(null,t[i],i,t)}t.exports={isArray:a,isArrayBuffer:function(t){return"[object ArrayBuffer]"===o.call(t)},isBuffer:i,isFormData:function(t){return"undefined"!=typeof FormData&&t instanceof FormData},isArrayBufferView:function(t){return"undefined"!=typeof ArrayBuffer&&ArrayBuffer.isView?ArrayBuffer.isView(t):t&&t.buffer&&t.buffer instanceof ArrayBuffer},isString:function(t){return"string"==typeof t},isNumber:function(t){return"number"==typeof t},isObject:s,isUndefined:function(t){return void 0===t},isDate:function(t){return"[object Date]"===o.call(t)},isFile:function(t){return"[object File]"===o.call(t)},isBlob:function(t){return"[object Blob]"===o.call(t)},isFunction:u,isStream:function(t){return s(t)&&u(t.pipe)},isURLSearchParams:function(t){return"undefined"!=typeof URLSearchParams&&t instanceof URLSearchParams},isStandardBrowserEnv:function(){return("undefined"==typeof navigator||"ReactNative"!==navigator.product)&&"undefined"!=typeof window&&"undefined"!=typeof document},forEach:c,merge:function t(){var e={};function n(n,r){"object"==typeof e[r]&&"object"==typeof n?e[r]=t(e[r],n):e[r]=n}for(var r=0,i=arguments.length;r<i;r++)c(arguments[r],n);return e},extend:function(t,e,n){return c(e,function(e,i){t[i]=n&&"function"==typeof e?r(e,n):e}),t},trim:function(t){return t.replace(/^\s*/,"").replace(/\s*$/,"")}}},function(t,e){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(t){"object"==typeof window&&(n=window)}t.exports=n},function(t,e,n){"use strict";(function(e){var r=n(0),i=n(21),o={"Content-Type":"application/x-www-form-urlencoded"};function a(t,e){!r.isUndefined(t)&&r.isUndefined(t["Content-Type"])&&(t["Content-Type"]=e)}var s,u={adapter:("undefined"!=typeof XMLHttpRequest?s=n(7):void 0!==e&&(s=n(7)),s),transformRequest:[function(t,e){return i(e,"Content-Type"),r.isFormData(t)||r.isArrayBuffer(t)||r.isBuffer(t)||r.isStream(t)||r.isFile(t)||r.isBlob(t)?t:r.isArrayBufferView(t)?t.buffer:r.isURLSearchParams(t)?(a(e,"application/x-www-form-urlencoded;charset=utf-8"),t.toString()):r.isObject(t)?(a(e,"application/json;charset=utf-8"),JSON.stringify(t)):t}],transformResponse:[function(t){if("string"==typeof t)try{t=JSON.parse(t)}catch(t){}return t}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,validateStatus:function(t){return t>=200&&t<300}};u.headers={common:{Accept:"application/json, text/plain, */*"}},r.forEach(["delete","get","head"],function(t){u.headers[t]={}}),r.forEach(["post","put","patch"],function(t){u.headers[t]=r.merge(o)}),t.exports=u}).call(e,n(6))},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),function(t){for(var n="undefined"!=typeof window&&"undefined"!=typeof document,r=["Edge","Trident","Firefox"],i=0,o=0;o<r.length;o+=1)if(n&&navigator.userAgent.indexOf(r[o])>=0){i=1;break}var a=n&&window.Promise?function(t){var e=!1;return function(){e||(e=!0,window.Promise.resolve().then(function(){e=!1,t()}))}}:function(t){var e=!1;return function(){e||(e=!0,setTimeout(function(){e=!1,t()},i))}};function s(t){return t&&"[object Function]"==={}.toString.call(t)}function u(t,e){if(1!==t.nodeType)return[];var n=getComputedStyle(t,null);return e?n[e]:n}function c(t){return"HTML"===t.nodeName?t:t.parentNode||t.host}function l(t){if(!t)return document.body;switch(t.nodeName){case"HTML":case"BODY":return t.ownerDocument.body;case"#document":return t.body}var e=u(t),n=e.overflow,r=e.overflowX,i=e.overflowY;return/(auto|scroll)/.test(n+i+r)?t:l(c(t))}function f(t){var e=t&&t.offsetParent,n=e&&e.nodeName;return n&&"BODY"!==n&&"HTML"!==n?-1!==["TD","TABLE"].indexOf(e.nodeName)&&"static"===u(e,"position")?f(e):e:t?t.ownerDocument.documentElement:document.documentElement}function p(t){return null!==t.parentNode?p(t.parentNode):t}function d(t,e){if(!(t&&t.nodeType&&e&&e.nodeType))return document.documentElement;var n=t.compareDocumentPosition(e)&Node.DOCUMENT_POSITION_FOLLOWING,r=n?t:e,i=n?e:t,o=document.createRange();o.setStart(r,0),o.setEnd(i,0);var a,s,u=o.commonAncestorContainer;if(t!==u&&e!==u||r.contains(i))return"BODY"===(s=(a=u).nodeName)||"HTML"!==s&&f(a.firstElementChild)!==a?f(u):u;var c=p(t);return c.host?d(c.host,e):d(t,p(e).host)}function h(t){var e="top"===(arguments.length>1&&void 0!==arguments[1]?arguments[1]:"top")?"scrollTop":"scrollLeft",n=t.nodeName;if("BODY"===n||"HTML"===n){var r=t.ownerDocument.documentElement;return(t.ownerDocument.scrollingElement||r)[e]}return t[e]}function v(t,e){var n="x"===e?"Left":"Top",r="Left"===n?"Right":"Bottom";return parseFloat(t["border"+n+"Width"],10)+parseFloat(t["border"+r+"Width"],10)}var g=void 0,m=function(){return void 0===g&&(g=-1!==navigator.appVersion.indexOf("MSIE 10")),g};function y(t,e,n,r){return Math.max(e["offset"+t],e["scroll"+t],n["client"+t],n["offset"+t],n["scroll"+t],m()?n["offset"+t]+r["margin"+("Height"===t?"Top":"Left")]+r["margin"+("Height"===t?"Bottom":"Right")]:0)}function _(){var t=document.body,e=document.documentElement,n=m()&&getComputedStyle(e);return{height:y("Height",t,e,n),width:y("Width",t,e,n)}}var b=function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")},w=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),x=function(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t},C=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t};function T(t){return C({},t,{right:t.left+t.width,bottom:t.top+t.height})}function E(t){var e={};if(m())try{e=t.getBoundingClientRect();var n=h(t,"top"),r=h(t,"left");e.top+=n,e.left+=r,e.bottom+=n,e.right+=r}catch(t){}else e=t.getBoundingClientRect();var i={left:e.left,top:e.top,width:e.right-e.left,height:e.bottom-e.top},o="HTML"===t.nodeName?_():{},a=o.width||t.clientWidth||i.right-i.left,s=o.height||t.clientHeight||i.bottom-i.top,c=t.offsetWidth-a,l=t.offsetHeight-s;if(c||l){var f=u(t);c-=v(f,"x"),l-=v(f,"y"),i.width-=c,i.height-=l}return T(i)}function A(t,e){var n=m(),r="HTML"===e.nodeName,i=E(t),o=E(e),a=l(t),s=u(e),c=parseFloat(s.borderTopWidth,10),f=parseFloat(s.borderLeftWidth,10),p=T({top:i.top-o.top-c,left:i.left-o.left-f,width:i.width,height:i.height});if(p.marginTop=0,p.marginLeft=0,!n&&r){var d=parseFloat(s.marginTop,10),v=parseFloat(s.marginLeft,10);p.top-=c-d,p.bottom-=c-d,p.left-=f-v,p.right-=f-v,p.marginTop=d,p.marginLeft=v}return(n?e.contains(a):e===a&&"BODY"!==a.nodeName)&&(p=function(t,e){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],r=h(e,"top"),i=h(e,"left"),o=n?-1:1;return t.top+=r*o,t.bottom+=r*o,t.left+=i*o,t.right+=i*o,t}(p,e)),p}function S(t,e,n,r){var i,o,a,s,f,p,v,g={top:0,left:0},m=d(t,e);if("viewport"===r)o=(i=m).ownerDocument.documentElement,a=A(i,o),s=Math.max(o.clientWidth,window.innerWidth||0),f=Math.max(o.clientHeight,window.innerHeight||0),p=h(o),v=h(o,"left"),g=T({top:p-a.top+a.marginTop,left:v-a.left+a.marginLeft,width:s,height:f});else{var y=void 0;"scrollParent"===r?"BODY"===(y=l(c(e))).nodeName&&(y=t.ownerDocument.documentElement):y="window"===r?t.ownerDocument.documentElement:r;var b=A(y,m);if("HTML"!==y.nodeName||function t(e){var n=e.nodeName;return"BODY"!==n&&"HTML"!==n&&("fixed"===u(e,"position")||t(c(e)))}(m))g=b;else{var w=_(),x=w.height,C=w.width;g.top+=b.top-b.marginTop,g.bottom=x+b.top,g.left+=b.left-b.marginLeft,g.right=C+b.left}}return g.left+=n,g.top+=n,g.right-=n,g.bottom-=n,g}function k(t,e,n,r,i){var o=arguments.length>5&&void 0!==arguments[5]?arguments[5]:0;if(-1===t.indexOf("auto"))return t;var a=S(n,r,o,i),s={top:{width:a.width,height:e.top-a.top},right:{width:a.right-e.right,height:a.height},bottom:{width:a.width,height:a.bottom-e.bottom},left:{width:e.left-a.left,height:a.height}},u=Object.keys(s).map(function(t){return C({key:t},s[t],{area:(e=s[t],e.width*e.height)});var e}).sort(function(t,e){return e.area-t.area}),c=u.filter(function(t){var e=t.width,r=t.height;return e>=n.clientWidth&&r>=n.clientHeight}),l=c.length>0?c[0].key:u[0].key,f=t.split("-")[1];return l+(f?"-"+f:"")}function O(t,e,n){return A(n,d(e,n))}function D(t){var e=getComputedStyle(t),n=parseFloat(e.marginTop)+parseFloat(e.marginBottom),r=parseFloat(e.marginLeft)+parseFloat(e.marginRight);return{width:t.offsetWidth+r,height:t.offsetHeight+n}}function I(t){var e={left:"right",right:"left",bottom:"top",top:"bottom"};return t.replace(/left|right|bottom|top/g,function(t){return e[t]})}function N(t,e,n){n=n.split("-")[0];var r=D(t),i={width:r.width,height:r.height},o=-1!==["right","left"].indexOf(n),a=o?"top":"left",s=o?"left":"top",u=o?"height":"width",c=o?"width":"height";return i[a]=e[a]+e[u]/2-r[u]/2,i[s]=n===s?e[s]-r[c]:e[I(s)],i}function j(t,e){return Array.prototype.find?t.find(e):t.filter(e)[0]}function L(t,e,n){return(void 0===n?t:t.slice(0,function(t,e,n){if(Array.prototype.findIndex)return t.findIndex(function(t){return t[e]===n});var r=j(t,function(t){return t[e]===n});return t.indexOf(r)}(t,"name",n))).forEach(function(t){t.function&&console.warn("`modifier.function` is deprecated, use `modifier.fn`!");var n=t.function||t.fn;t.enabled&&s(n)&&(e.offsets.popper=T(e.offsets.popper),e.offsets.reference=T(e.offsets.reference),e=n(e,t))}),e}function $(t,e){return t.some(function(t){var n=t.name;return t.enabled&&n===e})}function R(t){for(var e=[!1,"ms","Webkit","Moz","O"],n=t.charAt(0).toUpperCase()+t.slice(1),r=0;r<e.length-1;r++){var i=e[r],o=i?""+i+n:t;if(void 0!==document.body.style[o])return o}return null}function P(t){var e=t.ownerDocument;return e?e.defaultView:window}function M(t,e,n,r){n.updateBound=r,P(t).addEventListener("resize",n.updateBound,{passive:!0});var i=l(t);return function t(e,n,r,i){var o="BODY"===e.nodeName,a=o?e.ownerDocument.defaultView:e;a.addEventListener(n,r,{passive:!0}),o||t(l(a.parentNode),n,r,i),i.push(a)}(i,"scroll",n.updateBound,n.scrollParents),n.scrollElement=i,n.eventsEnabled=!0,n}function F(){var t,e;this.state.eventsEnabled&&(cancelAnimationFrame(this.scheduleUpdate),this.state=(t=this.reference,e=this.state,P(t).removeEventListener("resize",e.updateBound),e.scrollParents.forEach(function(t){t.removeEventListener("scroll",e.updateBound)}),e.updateBound=null,e.scrollParents=[],e.scrollElement=null,e.eventsEnabled=!1,e))}function H(t){return""!==t&&!isNaN(parseFloat(t))&&isFinite(t)}function B(t,e){Object.keys(e).forEach(function(n){var r="";-1!==["width","height","top","right","bottom","left"].indexOf(n)&&H(e[n])&&(r="px"),t.style[n]=e[n]+r})}function W(t,e,n){var r=j(t,function(t){return t.name===e}),i=!!r&&t.some(function(t){return t.name===n&&t.enabled&&t.order<r.order});if(!i){var o="`"+e+"`",a="`"+n+"`";console.warn(a+" modifier is required by "+o+" modifier in order to work, be sure to include it before "+o+"!")}return i}var q=["auto-start","auto","auto-end","top-start","top","top-end","right-start","right","right-end","bottom-end","bottom","bottom-start","left-end","left","left-start"],U=q.slice(3);function z(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=U.indexOf(t),r=U.slice(n+1).concat(U.slice(0,n));return e?r.reverse():r}var V={FLIP:"flip",CLOCKWISE:"clockwise",COUNTERCLOCKWISE:"counterclockwise"};function K(t,e,n,r){var i=[0,0],o=-1!==["right","left"].indexOf(r),a=t.split(/(\+|\-)/).map(function(t){return t.trim()}),s=a.indexOf(j(a,function(t){return-1!==t.search(/,|\s/)}));a[s]&&-1===a[s].indexOf(",")&&console.warn("Offsets separated by white space(s) are deprecated, use a comma (,) instead.");var u=/\s*,\s*|\s+/,c=-1!==s?[a.slice(0,s).concat([a[s].split(u)[0]]),[a[s].split(u)[1]].concat(a.slice(s+1))]:[a];return(c=c.map(function(t,r){var i=(1===r?!o:o)?"height":"width",a=!1;return t.reduce(function(t,e){return""===t[t.length-1]&&-1!==["+","-"].indexOf(e)?(t[t.length-1]=e,a=!0,t):a?(t[t.length-1]+=e,a=!1,t):t.concat(e)},[]).map(function(t){return function(t,e,n,r){var i=t.match(/((?:\-|\+)?\d*\.?\d*)(.*)/),o=+i[1],a=i[2];if(!o)return t;if(0===a.indexOf("%")){var s=void 0;switch(a){case"%p":s=n;break;case"%":case"%r":default:s=r}return T(s)[e]/100*o}if("vh"===a||"vw"===a)return("vh"===a?Math.max(document.documentElement.clientHeight,window.innerHeight||0):Math.max(document.documentElement.clientWidth,window.innerWidth||0))/100*o;return o}(t,i,e,n)})})).forEach(function(t,e){t.forEach(function(n,r){H(n)&&(i[e]+=n*("-"===t[r-1]?-1:1))})}),i}var Q={placement:"bottom",eventsEnabled:!0,removeOnDestroy:!1,onCreate:function(){},onUpdate:function(){},modifiers:{shift:{order:100,enabled:!0,fn:function(t){var e=t.placement,n=e.split("-")[0],r=e.split("-")[1];if(r){var i=t.offsets,o=i.reference,a=i.popper,s=-1!==["bottom","top"].indexOf(n),u=s?"left":"top",c=s?"width":"height",l={start:x({},u,o[u]),end:x({},u,o[u]+o[c]-a[c])};t.offsets.popper=C({},a,l[r])}return t}},offset:{order:200,enabled:!0,fn:function(t,e){var n=e.offset,r=t.placement,i=t.offsets,o=i.popper,a=i.reference,s=r.split("-")[0],u=void 0;return u=H(+n)?[+n,0]:K(n,o,a,s),"left"===s?(o.top+=u[0],o.left-=u[1]):"right"===s?(o.top+=u[0],o.left+=u[1]):"top"===s?(o.left+=u[0],o.top-=u[1]):"bottom"===s&&(o.left+=u[0],o.top+=u[1]),t.popper=o,t},offset:0},preventOverflow:{order:300,enabled:!0,fn:function(t,e){var n=e.boundariesElement||f(t.instance.popper);t.instance.reference===n&&(n=f(n));var r=S(t.instance.popper,t.instance.reference,e.padding,n);e.boundaries=r;var i=e.priority,o=t.offsets.popper,a={primary:function(t){var n=o[t];return o[t]<r[t]&&!e.escapeWithReference&&(n=Math.max(o[t],r[t])),x({},t,n)},secondary:function(t){var n="right"===t?"left":"top",i=o[n];return o[t]>r[t]&&!e.escapeWithReference&&(i=Math.min(o[n],r[t]-("right"===t?o.width:o.height))),x({},n,i)}};return i.forEach(function(t){var e=-1!==["left","top"].indexOf(t)?"primary":"secondary";o=C({},o,a[e](t))}),t.offsets.popper=o,t},priority:["left","right","top","bottom"],padding:5,boundariesElement:"scrollParent"},keepTogether:{order:400,enabled:!0,fn:function(t){var e=t.offsets,n=e.popper,r=e.reference,i=t.placement.split("-")[0],o=Math.floor,a=-1!==["top","bottom"].indexOf(i),s=a?"right":"bottom",u=a?"left":"top",c=a?"width":"height";return n[s]<o(r[u])&&(t.offsets.popper[u]=o(r[u])-n[c]),n[u]>o(r[s])&&(t.offsets.popper[u]=o(r[s])),t}},arrow:{order:500,enabled:!0,fn:function(t,e){var n;if(!W(t.instance.modifiers,"arrow","keepTogether"))return t;var r=e.element;if("string"==typeof r){if(!(r=t.instance.popper.querySelector(r)))return t}else if(!t.instance.popper.contains(r))return console.warn("WARNING: `arrow.element` must be child of its popper element!"),t;var i=t.placement.split("-")[0],o=t.offsets,a=o.popper,s=o.reference,c=-1!==["left","right"].indexOf(i),l=c?"height":"width",f=c?"Top":"Left",p=f.toLowerCase(),d=c?"left":"top",h=c?"bottom":"right",v=D(r)[l];s[h]-v<a[p]&&(t.offsets.popper[p]-=a[p]-(s[h]-v)),s[p]+v>a[h]&&(t.offsets.popper[p]+=s[p]+v-a[h]),t.offsets.popper=T(t.offsets.popper);var g=s[p]+s[l]/2-v/2,m=u(t.instance.popper),y=parseFloat(m["margin"+f],10),_=parseFloat(m["border"+f+"Width"],10),b=g-t.offsets.popper[p]-y-_;return b=Math.max(Math.min(a[l]-v,b),0),t.arrowElement=r,t.offsets.arrow=(x(n={},p,Math.round(b)),x(n,d,""),n),t},element:"[x-arrow]"},flip:{order:600,enabled:!0,fn:function(t,e){if($(t.instance.modifiers,"inner"))return t;if(t.flipped&&t.placement===t.originalPlacement)return t;var n=S(t.instance.popper,t.instance.reference,e.padding,e.boundariesElement),r=t.placement.split("-")[0],i=I(r),o=t.placement.split("-")[1]||"",a=[];switch(e.behavior){case V.FLIP:a=[r,i];break;case V.CLOCKWISE:a=z(r);break;case V.COUNTERCLOCKWISE:a=z(r,!0);break;default:a=e.behavior}return a.forEach(function(s,u){if(r!==s||a.length===u+1)return t;r=t.placement.split("-")[0],i=I(r);var c,l=t.offsets.popper,f=t.offsets.reference,p=Math.floor,d="left"===r&&p(l.right)>p(f.left)||"right"===r&&p(l.left)<p(f.right)||"top"===r&&p(l.bottom)>p(f.top)||"bottom"===r&&p(l.top)<p(f.bottom),h=p(l.left)<p(n.left),v=p(l.right)>p(n.right),g=p(l.top)<p(n.top),m=p(l.bottom)>p(n.bottom),y="left"===r&&h||"right"===r&&v||"top"===r&&g||"bottom"===r&&m,_=-1!==["top","bottom"].indexOf(r),b=!!e.flipVariations&&(_&&"start"===o&&h||_&&"end"===o&&v||!_&&"start"===o&&g||!_&&"end"===o&&m);(d||y||b)&&(t.flipped=!0,(d||y)&&(r=a[u+1]),b&&(o="end"===(c=o)?"start":"start"===c?"end":c),t.placement=r+(o?"-"+o:""),t.offsets.popper=C({},t.offsets.popper,N(t.instance.popper,t.offsets.reference,t.placement)),t=L(t.instance.modifiers,t,"flip"))}),t},behavior:"flip",padding:5,boundariesElement:"viewport"},inner:{order:700,enabled:!1,fn:function(t){var e=t.placement,n=e.split("-")[0],r=t.offsets,i=r.popper,o=r.reference,a=-1!==["left","right"].indexOf(n),s=-1===["top","left"].indexOf(n);return i[a?"left":"top"]=o[n]-(s?i[a?"width":"height"]:0),t.placement=I(e),t.offsets.popper=T(i),t}},hide:{order:800,enabled:!0,fn:function(t){if(!W(t.instance.modifiers,"hide","preventOverflow"))return t;var e=t.offsets.reference,n=j(t.instance.modifiers,function(t){return"preventOverflow"===t.name}).boundaries;if(e.bottom<n.top||e.left>n.right||e.top>n.bottom||e.right<n.left){if(!0===t.hide)return t;t.hide=!0,t.attributes["x-out-of-boundaries"]=""}else{if(!1===t.hide)return t;t.hide=!1,t.attributes["x-out-of-boundaries"]=!1}return t}},computeStyle:{order:850,enabled:!0,fn:function(t,e){var n=e.x,r=e.y,i=t.offsets.popper,o=j(t.instance.modifiers,function(t){return"applyStyle"===t.name}).gpuAcceleration;void 0!==o&&console.warn("WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!");var a=void 0!==o?o:e.gpuAcceleration,s=E(f(t.instance.popper)),u={position:i.position},c={left:Math.floor(i.left),top:Math.floor(i.top),bottom:Math.floor(i.bottom),right:Math.floor(i.right)},l="bottom"===n?"top":"bottom",p="right"===r?"left":"right",d=R("transform"),h=void 0,v=void 0;if(v="bottom"===l?-s.height+c.bottom:c.top,h="right"===p?-s.width+c.right:c.left,a&&d)u[d]="translate3d("+h+"px, "+v+"px, 0)",u[l]=0,u[p]=0,u.willChange="transform";else{var g="bottom"===l?-1:1,m="right"===p?-1:1;u[l]=v*g,u[p]=h*m,u.willChange=l+", "+p}var y={"x-placement":t.placement};return t.attributes=C({},y,t.attributes),t.styles=C({},u,t.styles),t.arrowStyles=C({},t.offsets.arrow,t.arrowStyles),t},gpuAcceleration:!0,x:"bottom",y:"right"},applyStyle:{order:900,enabled:!0,fn:function(t){var e,n;return B(t.instance.popper,t.styles),e=t.instance.popper,n=t.attributes,Object.keys(n).forEach(function(t){!1!==n[t]?e.setAttribute(t,n[t]):e.removeAttribute(t)}),t.arrowElement&&Object.keys(t.arrowStyles).length&&B(t.arrowElement,t.arrowStyles),t},onLoad:function(t,e,n,r,i){var o=O(0,e,t),a=k(n.placement,o,e,t,n.modifiers.flip.boundariesElement,n.modifiers.flip.padding);return e.setAttribute("x-placement",a),B(e,{position:"absolute"}),n},gpuAcceleration:void 0}}},G=function(){function t(e,n){var r=this,i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};b(this,t),this.scheduleUpdate=function(){return requestAnimationFrame(r.update)},this.update=a(this.update.bind(this)),this.options=C({},t.Defaults,i),this.state={isDestroyed:!1,isCreated:!1,scrollParents:[]},this.reference=e&&e.jquery?e[0]:e,this.popper=n&&n.jquery?n[0]:n,this.options.modifiers={},Object.keys(C({},t.Defaults.modifiers,i.modifiers)).forEach(function(e){r.options.modifiers[e]=C({},t.Defaults.modifiers[e]||{},i.modifiers?i.modifiers[e]:{})}),this.modifiers=Object.keys(this.options.modifiers).map(function(t){return C({name:t},r.options.modifiers[t])}).sort(function(t,e){return t.order-e.order}),this.modifiers.forEach(function(t){t.enabled&&s(t.onLoad)&&t.onLoad(r.reference,r.popper,r.options,t,r.state)}),this.update();var o=this.options.eventsEnabled;o&&this.enableEventListeners(),this.state.eventsEnabled=o}return w(t,[{key:"update",value:function(){return function(){if(!this.state.isDestroyed){var t={instance:this,styles:{},arrowStyles:{},attributes:{},flipped:!1,offsets:{}};t.offsets.reference=O(this.state,this.popper,this.reference),t.placement=k(this.options.placement,t.offsets.reference,this.popper,this.reference,this.options.modifiers.flip.boundariesElement,this.options.modifiers.flip.padding),t.originalPlacement=t.placement,t.offsets.popper=N(this.popper,t.offsets.reference,t.placement),t.offsets.popper.position="absolute",t=L(this.modifiers,t),this.state.isCreated?this.options.onUpdate(t):(this.state.isCreated=!0,this.options.onCreate(t))}}.call(this)}},{key:"destroy",value:function(){return function(){return this.state.isDestroyed=!0,$(this.modifiers,"applyStyle")&&(this.popper.removeAttribute("x-placement"),this.popper.style.left="",this.popper.style.position="",this.popper.style.top="",this.popper.style[R("transform")]=""),this.disableEventListeners(),this.options.removeOnDestroy&&this.popper.parentNode.removeChild(this.popper),this}.call(this)}},{key:"enableEventListeners",value:function(){return function(){this.state.eventsEnabled||(this.state=M(this.reference,this.options,this.state,this.scheduleUpdate))}.call(this)}},{key:"disableEventListeners",value:function(){return F.call(this)}}]),t}();G.Utils=("undefined"!=typeof window?window:t).PopperUtils,G.placements=q,G.Defaults=Q,e.default=G}.call(e,n(1))},function(t,e,n){var r;!function(e,n){"use strict";"object"==typeof t&&"object"==typeof t.exports?t.exports=e.document?n(e,!0):function(t){if(!t.document)throw new Error("jQuery requires a window with a document");return n(t)}:n(e)}("undefined"!=typeof window?window:this,function(n,i){"use strict";var o=[],a=n.document,s=Object.getPrototypeOf,u=o.slice,c=o.concat,l=o.push,f=o.indexOf,p={},d=p.toString,h=p.hasOwnProperty,v=h.toString,g=v.call(Object),m={};function y(t,e){var n=(e=e||a).createElement("script");n.text=t,e.head.appendChild(n).parentNode.removeChild(n)}var _=function(t,e){return new _.fn.init(t,e)},b=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,w=/^-ms-/,x=/-([a-z])/g,C=function(t,e){return e.toUpperCase()};function T(t){var e=!!t&&"length"in t&&t.length,n=_.type(t);return"function"!==n&&!_.isWindow(t)&&("array"===n||0===e||"number"==typeof e&&e>0&&e-1 in t)}_.fn=_.prototype={jquery:"3.2.1",constructor:_,length:0,toArray:function(){return u.call(this)},get:function(t){return null==t?u.call(this):t<0?this[t+this.length]:this[t]},pushStack:function(t){var e=_.merge(this.constructor(),t);return e.prevObject=this,e},each:function(t){return _.each(this,t)},map:function(t){return this.pushStack(_.map(this,function(e,n){return t.call(e,n,e)}))},slice:function(){return this.pushStack(u.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(t){var e=this.length,n=+t+(t<0?e:0);return this.pushStack(n>=0&&n<e?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:l,sort:o.sort,splice:o.splice},_.extend=_.fn.extend=function(){var t,e,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,c=!1;for("boolean"==typeof a&&(c=a,a=arguments[s]||{},s++),"object"==typeof a||_.isFunction(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(t=arguments[s]))for(e in t)n=a[e],a!==(r=t[e])&&(c&&r&&(_.isPlainObject(r)||(i=Array.isArray(r)))?(i?(i=!1,o=n&&Array.isArray(n)?n:[]):o=n&&_.isPlainObject(n)?n:{},a[e]=_.extend(c,o,r)):void 0!==r&&(a[e]=r));return a},_.extend({expando:"jQuery"+("3.2.1"+Math.random()).replace(/\D/g,""),isReady:!0,error:function(t){throw new Error(t)},noop:function(){},isFunction:function(t){return"function"===_.type(t)},isWindow:function(t){return null!=t&&t===t.window},isNumeric:function(t){var e=_.type(t);return("number"===e||"string"===e)&&!isNaN(t-parseFloat(t))},isPlainObject:function(t){var e,n;return!(!t||"[object Object]"!==d.call(t))&&(!(e=s(t))||"function"==typeof(n=h.call(e,"constructor")&&e.constructor)&&v.call(n)===g)},isEmptyObject:function(t){var e;for(e in t)return!1;return!0},type:function(t){return null==t?t+"":"object"==typeof t||"function"==typeof t?p[d.call(t)]||"object":typeof t},globalEval:function(t){y(t)},camelCase:function(t){return t.replace(w,"ms-").replace(x,C)},each:function(t,e){var n,r=0;if(T(t))for(n=t.length;r<n&&!1!==e.call(t[r],r,t[r]);r++);else for(r in t)if(!1===e.call(t[r],r,t[r]))break;return t},trim:function(t){return null==t?"":(t+"").replace(b,"")},makeArray:function(t,e){var n=e||[];return null!=t&&(T(Object(t))?_.merge(n,"string"==typeof t?[t]:t):l.call(n,t)),n},inArray:function(t,e,n){return null==e?-1:f.call(e,t,n)},merge:function(t,e){for(var n=+e.length,r=0,i=t.length;r<n;r++)t[i++]=e[r];return t.length=i,t},grep:function(t,e,n){for(var r=[],i=0,o=t.length,a=!n;i<o;i++)!e(t[i],i)!==a&&r.push(t[i]);return r},map:function(t,e,n){var r,i,o=0,a=[];if(T(t))for(r=t.length;o<r;o++)null!=(i=e(t[o],o,n))&&a.push(i);else for(o in t)null!=(i=e(t[o],o,n))&&a.push(i);return c.apply([],a)},guid:1,proxy:function(t,e){var n,r,i;if("string"==typeof e&&(n=t[e],e=t,t=n),_.isFunction(t))return r=u.call(arguments,2),(i=function(){return t.apply(e||this,r.concat(u.call(arguments)))}).guid=t.guid=t.guid||_.guid++,i},now:Date.now,support:m}),"function"==typeof Symbol&&(_.fn[Symbol.iterator]=o[Symbol.iterator]),_.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(t,e){p["[object "+e+"]"]=e.toLowerCase()});var E=function(t){var e,n,r,i,o,a,s,u,c,l,f,p,d,h,v,g,m,y,_,b="sizzle"+1*new Date,w=t.document,x=0,C=0,T=at(),E=at(),A=at(),S=function(t,e){return t===e&&(f=!0),0},k={}.hasOwnProperty,O=[],D=O.pop,I=O.push,N=O.push,j=O.slice,L=function(t,e){for(var n=0,r=t.length;n<r;n++)if(t[n]===e)return n;return-1},$="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",R="[\\x20\\t\\r\\n\\f]",P="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+R+"*("+P+")(?:"+R+"*([*^$|!~]?=)"+R+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+P+"))|)"+R+"*\\]",F=":("+P+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",H=new RegExp(R+"+","g"),B=new RegExp("^"+R+"+|((?:^|[^\\\\])(?:\\\\.)*)"+R+"+$","g"),W=new RegExp("^"+R+"*,"+R+"*"),q=new RegExp("^"+R+"*([>+~]|"+R+")"+R+"*"),U=new RegExp("="+R+"*([^\\]'\"]*?)"+R+"*\\]","g"),z=new RegExp(F),V=new RegExp("^"+P+"$"),K={ID:new RegExp("^#("+P+")"),CLASS:new RegExp("^\\.("+P+")"),TAG:new RegExp("^("+P+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+R+"*(even|odd|(([+-]|)(\\d*)n|)"+R+"*(?:([+-]|)"+R+"*(\\d+)|))"+R+"*\\)|)","i"),bool:new RegExp("^(?:"+$+")$","i"),needsContext:new RegExp("^"+R+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+R+"*((?:-\\d)?\\d*)"+R+"*\\)|)(?=[^-]|$)","i")},Q=/^(?:input|select|textarea|button)$/i,G=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,X=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,J=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+R+"?|("+R+")|.)","ig"),tt=function(t,e,n){var r="0x"+e-65536;return r!=r||n?e:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},et=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,nt=function(t,e){return e?"\0"===t?"�":t.slice(0,-1)+"\\"+t.charCodeAt(t.length-1).toString(16)+" ":"\\"+t},rt=function(){p()},it=yt(function(t){return!0===t.disabled&&("form"in t||"label"in t)},{dir:"parentNode",next:"legend"});try{N.apply(O=j.call(w.childNodes),w.childNodes),O[w.childNodes.length].nodeType}catch(t){N={apply:O.length?function(t,e){I.apply(t,j.call(e))}:function(t,e){for(var n=t.length,r=0;t[n++]=e[r++];);t.length=n-1}}}function ot(t,e,r,i){var o,s,c,l,f,h,m,y=e&&e.ownerDocument,x=e?e.nodeType:9;if(r=r||[],"string"!=typeof t||!t||1!==x&&9!==x&&11!==x)return r;if(!i&&((e?e.ownerDocument||e:w)!==d&&p(e),e=e||d,v)){if(11!==x&&(f=X.exec(t)))if(o=f[1]){if(9===x){if(!(c=e.getElementById(o)))return r;if(c.id===o)return r.push(c),r}else if(y&&(c=y.getElementById(o))&&_(e,c)&&c.id===o)return r.push(c),r}else{if(f[2])return N.apply(r,e.getElementsByTagName(t)),r;if((o=f[3])&&n.getElementsByClassName&&e.getElementsByClassName)return N.apply(r,e.getElementsByClassName(o)),r}if(n.qsa&&!A[t+" "]&&(!g||!g.test(t))){if(1!==x)y=e,m=t;else if("object"!==e.nodeName.toLowerCase()){for((l=e.getAttribute("id"))?l=l.replace(et,nt):e.setAttribute("id",l=b),s=(h=a(t)).length;s--;)h[s]="#"+l+" "+mt(h[s]);m=h.join(","),y=J.test(t)&&vt(e.parentNode)||e}if(m)try{return N.apply(r,y.querySelectorAll(m)),r}catch(t){}finally{l===b&&e.removeAttribute("id")}}}return u(t.replace(B,"$1"),e,r,i)}function at(){var t=[];return function e(n,i){return t.push(n+" ")>r.cacheLength&&delete e[t.shift()],e[n+" "]=i}}function st(t){return t[b]=!0,t}function ut(t){var e=d.createElement("fieldset");try{return!!t(e)}catch(t){return!1}finally{e.parentNode&&e.parentNode.removeChild(e),e=null}}function ct(t,e){for(var n=t.split("|"),i=n.length;i--;)r.attrHandle[n[i]]=e}function lt(t,e){var n=e&&t,r=n&&1===t.nodeType&&1===e.nodeType&&t.sourceIndex-e.sourceIndex;if(r)return r;if(n)for(;n=n.nextSibling;)if(n===e)return-1;return t?1:-1}function ft(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function pt(t){return function(e){var n=e.nodeName.toLowerCase();return("input"===n||"button"===n)&&e.type===t}}function dt(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&it(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ht(t){return st(function(e){return e=+e,st(function(n,r){for(var i,o=t([],n.length,e),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function vt(t){return t&&void 0!==t.getElementsByTagName&&t}n=ot.support={},o=ot.isXML=function(t){var e=t&&(t.ownerDocument||t).documentElement;return!!e&&"HTML"!==e.nodeName},p=ot.setDocument=function(t){var e,i,a=t?t.ownerDocument||t:w;return a!==d&&9===a.nodeType&&a.documentElement?(h=(d=a).documentElement,v=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",rt,!1):i.attachEvent&&i.attachEvent("onunload",rt)),n.attributes=ut(function(t){return t.className="i",!t.getAttribute("className")}),n.getElementsByTagName=ut(function(t){return t.appendChild(d.createComment("")),!t.getElementsByTagName("*").length}),n.getElementsByClassName=Y.test(d.getElementsByClassName),n.getById=ut(function(t){return h.appendChild(t).id=b,!d.getElementsByName||!d.getElementsByName(b).length}),n.getById?(r.filter.ID=function(t){var e=t.replace(Z,tt);return function(t){return t.getAttribute("id")===e}},r.find.ID=function(t,e){if(void 0!==e.getElementById&&v){var n=e.getElementById(t);return n?[n]:[]}}):(r.filter.ID=function(t){var e=t.replace(Z,tt);return function(t){var n=void 0!==t.getAttributeNode&&t.getAttributeNode("id");return n&&n.value===e}},r.find.ID=function(t,e){if(void 0!==e.getElementById&&v){var n,r,i,o=e.getElementById(t);if(o){if((n=o.getAttributeNode("id"))&&n.value===t)return[o];for(i=e.getElementsByName(t),r=0;o=i[r++];)if((n=o.getAttributeNode("id"))&&n.value===t)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(t,e){return void 0!==e.getElementsByTagName?e.getElementsByTagName(t):n.qsa?e.querySelectorAll(t):void 0}:function(t,e){var n,r=[],i=0,o=e.getElementsByTagName(t);if("*"===t){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(t,e){if(void 0!==e.getElementsByClassName&&v)return e.getElementsByClassName(t)},m=[],g=[],(n.qsa=Y.test(d.querySelectorAll))&&(ut(function(t){h.appendChild(t).innerHTML="<a id='"+b+"'></a><select id='"+b+"-\r\\' msallowcapture=''><option selected=''></option></select>",t.querySelectorAll("[msallowcapture^='']").length&&g.push("[*^$]="+R+"*(?:''|\"\")"),t.querySelectorAll("[selected]").length||g.push("\\["+R+"*(?:value|"+$+")"),t.querySelectorAll("[id~="+b+"-]").length||g.push("~="),t.querySelectorAll(":checked").length||g.push(":checked"),t.querySelectorAll("a#"+b+"+*").length||g.push(".#.+[+~]")}),ut(function(t){t.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var e=d.createElement("input");e.setAttribute("type","hidden"),t.appendChild(e).setAttribute("name","D"),t.querySelectorAll("[name=d]").length&&g.push("name"+R+"*[*^$|!~]?="),2!==t.querySelectorAll(":enabled").length&&g.push(":enabled",":disabled"),h.appendChild(t).disabled=!0,2!==t.querySelectorAll(":disabled").length&&g.push(":enabled",":disabled"),t.querySelectorAll("*,:x"),g.push(",.*:")})),(n.matchesSelector=Y.test(y=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ut(function(t){n.disconnectedMatch=y.call(t,"*"),y.call(t,"[s!='']:x"),m.push("!=",F)}),g=g.length&&new RegExp(g.join("|")),m=m.length&&new RegExp(m.join("|")),e=Y.test(h.compareDocumentPosition),_=e||Y.test(h.contains)?function(t,e){var n=9===t.nodeType?t.documentElement:t,r=e&&e.parentNode;return t===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):t.compareDocumentPosition&&16&t.compareDocumentPosition(r)))}:function(t,e){if(e)for(;e=e.parentNode;)if(e===t)return!0;return!1},S=e?function(t,e){if(t===e)return f=!0,0;var r=!t.compareDocumentPosition-!e.compareDocumentPosition;return r||(1&(r=(t.ownerDocument||t)===(e.ownerDocument||e)?t.compareDocumentPosition(e):1)||!n.sortDetached&&e.compareDocumentPosition(t)===r?t===d||t.ownerDocument===w&&_(w,t)?-1:e===d||e.ownerDocument===w&&_(w,e)?1:l?L(l,t)-L(l,e):0:4&r?-1:1)}:function(t,e){if(t===e)return f=!0,0;var n,r=0,i=t.parentNode,o=e.parentNode,a=[t],s=[e];if(!i||!o)return t===d?-1:e===d?1:i?-1:o?1:l?L(l,t)-L(l,e):0;if(i===o)return lt(t,e);for(n=t;n=n.parentNode;)a.unshift(n);for(n=e;n=n.parentNode;)s.unshift(n);for(;a[r]===s[r];)r++;return r?lt(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},ot.matches=function(t,e){return ot(t,null,null,e)},ot.matchesSelector=function(t,e){if((t.ownerDocument||t)!==d&&p(t),e=e.replace(U,"='$1']"),n.matchesSelector&&v&&!A[e+" "]&&(!m||!m.test(e))&&(!g||!g.test(e)))try{var r=y.call(t,e);if(r||n.disconnectedMatch||t.document&&11!==t.document.nodeType)return r}catch(t){}return ot(e,d,null,[t]).length>0},ot.contains=function(t,e){return(t.ownerDocument||t)!==d&&p(t),_(t,e)},ot.attr=function(t,e){(t.ownerDocument||t)!==d&&p(t);var i=r.attrHandle[e.toLowerCase()],o=i&&k.call(r.attrHandle,e.toLowerCase())?i(t,e,!v):void 0;return void 0!==o?o:n.attributes||!v?t.getAttribute(e):(o=t.getAttributeNode(e))&&o.specified?o.value:null},ot.escape=function(t){return(t+"").replace(et,nt)},ot.error=function(t){throw new Error("Syntax error, unrecognized expression: "+t)},ot.uniqueSort=function(t){var e,r=[],i=0,o=0;if(f=!n.detectDuplicates,l=!n.sortStable&&t.slice(0),t.sort(S),f){for(;e=t[o++];)e===t[o]&&(i=r.push(o));for(;i--;)t.splice(r[i],1)}return l=null,t},i=ot.getText=function(t){var e,n="",r=0,o=t.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof t.textContent)return t.textContent;for(t=t.firstChild;t;t=t.nextSibling)n+=i(t)}else if(3===o||4===o)return t.nodeValue}else for(;e=t[r++];)n+=i(e);return n},(r=ot.selectors={cacheLength:50,createPseudo:st,match:K,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(t){return t[1]=t[1].replace(Z,tt),t[3]=(t[3]||t[4]||t[5]||"").replace(Z,tt),"~="===t[2]&&(t[3]=" "+t[3]+" "),t.slice(0,4)},CHILD:function(t){return t[1]=t[1].toLowerCase(),"nth"===t[1].slice(0,3)?(t[3]||ot.error(t[0]),t[4]=+(t[4]?t[5]+(t[6]||1):2*("even"===t[3]||"odd"===t[3])),t[5]=+(t[7]+t[8]||"odd"===t[3])):t[3]&&ot.error(t[0]),t},PSEUDO:function(t){var e,n=!t[6]&&t[2];return K.CHILD.test(t[0])?null:(t[3]?t[2]=t[4]||t[5]||"":n&&z.test(n)&&(e=a(n,!0))&&(e=n.indexOf(")",n.length-e)-n.length)&&(t[0]=t[0].slice(0,e),t[2]=n.slice(0,e)),t.slice(0,3))}},filter:{TAG:function(t){var e=t.replace(Z,tt).toLowerCase();return"*"===t?function(){return!0}:function(t){return t.nodeName&&t.nodeName.toLowerCase()===e}},CLASS:function(t){var e=T[t+" "];return e||(e=new RegExp("(^|"+R+")"+t+"("+R+"|$)"))&&T(t,function(t){return e.test("string"==typeof t.className&&t.className||void 0!==t.getAttribute&&t.getAttribute("class")||"")})},ATTR:function(t,e,n){return function(r){var i=ot.attr(r,t);return null==i?"!="===e:!e||(i+="","="===e?i===n:"!="===e?i!==n:"^="===e?n&&0===i.indexOf(n):"*="===e?n&&i.indexOf(n)>-1:"$="===e?n&&i.slice(-n.length)===n:"~="===e?(" "+i.replace(H," ")+" ").indexOf(n)>-1:"|="===e&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(t,e,n,r,i){var o="nth"!==t.slice(0,3),a="last"!==t.slice(-4),s="of-type"===e;return 1===r&&0===i?function(t){return!!t.parentNode}:function(e,n,u){var c,l,f,p,d,h,v=o!==a?"nextSibling":"previousSibling",g=e.parentNode,m=s&&e.nodeName.toLowerCase(),y=!u&&!s,_=!1;if(g){if(o){for(;v;){for(p=e;p=p[v];)if(s?p.nodeName.toLowerCase()===m:1===p.nodeType)return!1;h=v="only"===t&&!h&&"nextSibling"}return!0}if(h=[a?g.firstChild:g.lastChild],a&&y){for(_=(d=(c=(l=(f=(p=g)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[t]||[])[0]===x&&c[1])&&c[2],p=d&&g.childNodes[d];p=++d&&p&&p[v]||(_=d=0)||h.pop();)if(1===p.nodeType&&++_&&p===e){l[t]=[x,d,_];break}}else if(y&&(_=d=(c=(l=(f=(p=e)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[t]||[])[0]===x&&c[1]),!1===_)for(;(p=++d&&p&&p[v]||(_=d=0)||h.pop())&&((s?p.nodeName.toLowerCase()!==m:1!==p.nodeType)||!++_||(y&&((l=(f=p[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[t]=[x,_]),p!==e)););return(_-=i)===r||_%r==0&&_/r>=0}}},PSEUDO:function(t,e){var n,i=r.pseudos[t]||r.setFilters[t.toLowerCase()]||ot.error("unsupported pseudo: "+t);return i[b]?i(e):i.length>1?(n=[t,t,"",e],r.setFilters.hasOwnProperty(t.toLowerCase())?st(function(t,n){for(var r,o=i(t,e),a=o.length;a--;)t[r=L(t,o[a])]=!(n[r]=o[a])}):function(t){return i(t,0,n)}):i}},pseudos:{not:st(function(t){var e=[],n=[],r=s(t.replace(B,"$1"));return r[b]?st(function(t,e,n,i){for(var o,a=r(t,null,i,[]),s=t.length;s--;)(o=a[s])&&(t[s]=!(e[s]=o))}):function(t,i,o){return e[0]=t,r(e,null,o,n),e[0]=null,!n.pop()}}),has:st(function(t){return function(e){return ot(t,e).length>0}}),contains:st(function(t){return t=t.replace(Z,tt),function(e){return(e.textContent||e.innerText||i(e)).indexOf(t)>-1}}),lang:st(function(t){return V.test(t||"")||ot.error("unsupported lang: "+t),t=t.replace(Z,tt).toLowerCase(),function(e){var n;do{if(n=v?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(n=n.toLowerCase())===t||0===n.indexOf(t+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var n=t.location&&t.location.hash;return n&&n.slice(1)===e.id},root:function(t){return t===h},focus:function(t){return t===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(t.type||t.href||~t.tabIndex)},enabled:dt(!1),disabled:dt(!0),checked:function(t){var e=t.nodeName.toLowerCase();return"input"===e&&!!t.checked||"option"===e&&!!t.selected},selected:function(t){return t.parentNode&&t.parentNode.selectedIndex,!0===t.selected},empty:function(t){for(t=t.firstChild;t;t=t.nextSibling)if(t.nodeType<6)return!1;return!0},parent:function(t){return!r.pseudos.empty(t)},header:function(t){return G.test(t.nodeName)},input:function(t){return Q.test(t.nodeName)},button:function(t){var e=t.nodeName.toLowerCase();return"input"===e&&"button"===t.type||"button"===e},text:function(t){var e;return"input"===t.nodeName.toLowerCase()&&"text"===t.type&&(null==(e=t.getAttribute("type"))||"text"===e.toLowerCase())},first:ht(function(){return[0]}),last:ht(function(t,e){return[e-1]}),eq:ht(function(t,e,n){return[n<0?n+e:n]}),even:ht(function(t,e){for(var n=0;n<e;n+=2)t.push(n);return t}),odd:ht(function(t,e){for(var n=1;n<e;n+=2)t.push(n);return t}),lt:ht(function(t,e,n){for(var r=n<0?n+e:n;--r>=0;)t.push(r);return t}),gt:ht(function(t,e,n){for(var r=n<0?n+e:n;++r<e;)t.push(r);return t})}}).pseudos.nth=r.pseudos.eq;for(e in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})r.pseudos[e]=ft(e);for(e in{submit:!0,reset:!0})r.pseudos[e]=pt(e);function gt(){}function mt(t){for(var e=0,n=t.length,r="";e<n;e++)r+=t[e].value;return r}function yt(t,e,n){var r=e.dir,i=e.next,o=i||r,a=n&&"parentNode"===o,s=C++;return e.first?function(e,n,i){for(;e=e[r];)if(1===e.nodeType||a)return t(e,n,i);return!1}:function(e,n,u){var c,l,f,p=[x,s];if(u){for(;e=e[r];)if((1===e.nodeType||a)&&t(e,n,u))return!0}else for(;e=e[r];)if(1===e.nodeType||a)if(l=(f=e[b]||(e[b]={}))[e.uniqueID]||(f[e.uniqueID]={}),i&&i===e.nodeName.toLowerCase())e=e[r]||e;else{if((c=l[o])&&c[0]===x&&c[1]===s)return p[2]=c[2];if(l[o]=p,p[2]=t(e,n,u))return!0}return!1}}function _t(t){return t.length>1?function(e,n,r){for(var i=t.length;i--;)if(!t[i](e,n,r))return!1;return!0}:t[0]}function bt(t,e,n,r,i){for(var o,a=[],s=0,u=t.length,c=null!=e;s<u;s++)(o=t[s])&&(n&&!n(o,r,i)||(a.push(o),c&&e.push(s)));return a}function wt(t,e,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),st(function(o,a,s,u){var c,l,f,p=[],d=[],h=a.length,v=o||function(t,e,n){for(var r=0,i=e.length;r<i;r++)ot(t,e[r],n);return n}(e||"*",s.nodeType?[s]:s,[]),g=!t||!o&&e?v:bt(v,p,t,s,u),m=n?i||(o?t:h||r)?[]:a:g;if(n&&n(g,m,s,u),r)for(c=bt(m,d),r(c,[],s,u),l=c.length;l--;)(f=c[l])&&(m[d[l]]=!(g[d[l]]=f));if(o){if(i||t){if(i){for(c=[],l=m.length;l--;)(f=m[l])&&c.push(g[l]=f);i(null,m=[],c,u)}for(l=m.length;l--;)(f=m[l])&&(c=i?L(o,f):p[l])>-1&&(o[c]=!(a[c]=f))}}else m=bt(m===a?m.splice(h,m.length):m),i?i(null,a,m,u):N.apply(a,m)})}function xt(t){for(var e,n,i,o=t.length,a=r.relative[t[0].type],s=a||r.relative[" "],u=a?1:0,l=yt(function(t){return t===e},s,!0),f=yt(function(t){return L(e,t)>-1},s,!0),p=[function(t,n,r){var i=!a&&(r||n!==c)||((e=n).nodeType?l(t,n,r):f(t,n,r));return e=null,i}];u<o;u++)if(n=r.relative[t[u].type])p=[yt(_t(p),n)];else{if((n=r.filter[t[u].type].apply(null,t[u].matches))[b]){for(i=++u;i<o&&!r.relative[t[i].type];i++);return wt(u>1&&_t(p),u>1&&mt(t.slice(0,u-1).concat({value:" "===t[u-2].type?"*":""})).replace(B,"$1"),n,u<i&&xt(t.slice(u,i)),i<o&&xt(t=t.slice(i)),i<o&&mt(t))}p.push(n)}return _t(p)}return gt.prototype=r.filters=r.pseudos,r.setFilters=new gt,a=ot.tokenize=function(t,e){var n,i,o,a,s,u,c,l=E[t+" "];if(l)return e?0:l.slice(0);for(s=t,u=[],c=r.preFilter;s;){n&&!(i=W.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),n=!1,(i=q.exec(s))&&(n=i.shift(),o.push({value:n,type:i[0].replace(B," ")}),s=s.slice(n.length));for(a in r.filter)!(i=K[a].exec(s))||c[a]&&!(i=c[a](i))||(n=i.shift(),o.push({value:n,type:a,matches:i}),s=s.slice(n.length));if(!n)break}return e?s.length:s?ot.error(t):E(t,u).slice(0)},s=ot.compile=function(t,e){var n,i,o,s,u,l,f=[],h=[],g=A[t+" "];if(!g){for(e||(e=a(t)),n=e.length;n--;)(g=xt(e[n]))[b]?f.push(g):h.push(g);(g=A(t,(i=h,s=(o=f).length>0,u=i.length>0,l=function(t,e,n,a,l){var f,h,g,m=0,y="0",_=t&&[],b=[],w=c,C=t||u&&r.find.TAG("*",l),T=x+=null==w?1:Math.random()||.1,E=C.length;for(l&&(c=e===d||e||l);y!==E&&null!=(f=C[y]);y++){if(u&&f){for(h=0,e||f.ownerDocument===d||(p(f),n=!v);g=i[h++];)if(g(f,e||d,n)){a.push(f);break}l&&(x=T)}s&&((f=!g&&f)&&m--,t&&_.push(f))}if(m+=y,s&&y!==m){for(h=0;g=o[h++];)g(_,b,e,n);if(t){if(m>0)for(;y--;)_[y]||b[y]||(b[y]=D.call(a));b=bt(b)}N.apply(a,b),l&&!t&&b.length>0&&m+o.length>1&&ot.uniqueSort(a)}return l&&(x=T,c=w),_},s?st(l):l))).selector=t}return g},u=ot.select=function(t,e,n,i){var o,u,c,l,f,p="function"==typeof t&&t,d=!i&&a(t=p.selector||t);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(c=u[0]).type&&9===e.nodeType&&v&&r.relative[u[1].type]){if(!(e=(r.find.ID(c.matches[0].replace(Z,tt),e)||[])[0]))return n;p&&(e=e.parentNode),t=t.slice(u.shift().value.length)}for(o=K.needsContext.test(t)?0:u.length;o--&&(c=u[o],!r.relative[l=c.type]);)if((f=r.find[l])&&(i=f(c.matches[0].replace(Z,tt),J.test(u[0].type)&&vt(e.parentNode)||e))){if(u.splice(o,1),!(t=i.length&&mt(u)))return N.apply(n,i),n;break}}return(p||s(t,d))(i,e,!v,n,!e||J.test(t)&&vt(e.parentNode)||e),n},n.sortStable=b.split("").sort(S).join("")===b,n.detectDuplicates=!!f,p(),n.sortDetached=ut(function(t){return 1&t.compareDocumentPosition(d.createElement("fieldset"))}),ut(function(t){return t.innerHTML="<a href='#'></a>","#"===t.firstChild.getAttribute("href")})||ct("type|href|height|width",function(t,e,n){if(!n)return t.getAttribute(e,"type"===e.toLowerCase()?1:2)}),n.attributes&&ut(function(t){return t.innerHTML="<input/>",t.firstChild.setAttribute("value",""),""===t.firstChild.getAttribute("value")})||ct("value",function(t,e,n){if(!n&&"input"===t.nodeName.toLowerCase())return t.defaultValue}),ut(function(t){return null==t.getAttribute("disabled")})||ct($,function(t,e,n){var r;if(!n)return!0===t[e]?e.toLowerCase():(r=t.getAttributeNode(e))&&r.specified?r.value:null}),ot}(n);_.find=E,_.expr=E.selectors,_.expr[":"]=_.expr.pseudos,_.uniqueSort=_.unique=E.uniqueSort,_.text=E.getText,_.isXMLDoc=E.isXML,_.contains=E.contains,_.escapeSelector=E.escape;var A=function(t,e,n){for(var r=[],i=void 0!==n;(t=t[e])&&9!==t.nodeType;)if(1===t.nodeType){if(i&&_(t).is(n))break;r.push(t)}return r},S=function(t,e){for(var n=[];t;t=t.nextSibling)1===t.nodeType&&t!==e&&n.push(t);return n},k=_.expr.match.needsContext;function O(t,e){return t.nodeName&&t.nodeName.toLowerCase()===e.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,I=/^.[^:#\[\.,]*$/;function N(t,e,n){return _.isFunction(e)?_.grep(t,function(t,r){return!!e.call(t,r,t)!==n}):e.nodeType?_.grep(t,function(t){return t===e!==n}):"string"!=typeof e?_.grep(t,function(t){return f.call(e,t)>-1!==n}):I.test(e)?_.filter(e,t,n):(e=_.filter(e,t),_.grep(t,function(t){return f.call(e,t)>-1!==n&&1===t.nodeType}))}_.filter=function(t,e,n){var r=e[0];return n&&(t=":not("+t+")"),1===e.length&&1===r.nodeType?_.find.matchesSelector(r,t)?[r]:[]:_.find.matches(t,_.grep(e,function(t){return 1===t.nodeType}))},_.fn.extend({find:function(t){var e,n,r=this.length,i=this;if("string"!=typeof t)return this.pushStack(_(t).filter(function(){for(e=0;e<r;e++)if(_.contains(i[e],this))return!0}));for(n=this.pushStack([]),e=0;e<r;e++)_.find(t,i[e],n);return r>1?_.uniqueSort(n):n},filter:function(t){return this.pushStack(N(this,t||[],!1))},not:function(t){return this.pushStack(N(this,t||[],!0))},is:function(t){return!!N(this,"string"==typeof t&&k.test(t)?_(t):t||[],!1).length}});var j,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(_.fn.init=function(t,e,n){var r,i;if(!t)return this;if(n=n||j,"string"==typeof t){if(!(r="<"===t[0]&&">"===t[t.length-1]&&t.length>=3?[null,t,null]:L.exec(t))||!r[1]&&e)return!e||e.jquery?(e||n).find(t):this.constructor(e).find(t);if(r[1]){if(e=e instanceof _?e[0]:e,_.merge(this,_.parseHTML(r[1],e&&e.nodeType?e.ownerDocument||e:a,!0)),D.test(r[1])&&_.isPlainObject(e))for(r in e)_.isFunction(this[r])?this[r](e[r]):this.attr(r,e[r]);return this}return(i=a.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return t.nodeType?(this[0]=t,this.length=1,this):_.isFunction(t)?void 0!==n.ready?n.ready(t):t(_):_.makeArray(t,this)}).prototype=_.fn,j=_(a);var $=/^(?:parents|prev(?:Until|All))/,R={children:!0,contents:!0,next:!0,prev:!0};function P(t,e){for(;(t=t[e])&&1!==t.nodeType;);return t}_.fn.extend({has:function(t){var e=_(t,this),n=e.length;return this.filter(function(){for(var t=0;t<n;t++)if(_.contains(this,e[t]))return!0})},closest:function(t,e){var n,r=0,i=this.length,o=[],a="string"!=typeof t&&_(t);if(!k.test(t))for(;r<i;r++)for(n=this[r];n&&n!==e;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&_.find.matchesSelector(n,t))){o.push(n);break}return this.pushStack(o.length>1?_.uniqueSort(o):o)},index:function(t){return t?"string"==typeof t?f.call(_(t),this[0]):f.call(this,t.jquery?t[0]:t):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(t,e){return this.pushStack(_.uniqueSort(_.merge(this.get(),_(t,e))))},addBack:function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}}),_.each({parent:function(t){var e=t.parentNode;return e&&11!==e.nodeType?e:null},parents:function(t){return A(t,"parentNode")},parentsUntil:function(t,e,n){return A(t,"parentNode",n)},next:function(t){return P(t,"nextSibling")},prev:function(t){return P(t,"previousSibling")},nextAll:function(t){return A(t,"nextSibling")},prevAll:function(t){return A(t,"previousSibling")},nextUntil:function(t,e,n){return A(t,"nextSibling",n)},prevUntil:function(t,e,n){return A(t,"previousSibling",n)},siblings:function(t){return S((t.parentNode||{}).firstChild,t)},children:function(t){return S(t.firstChild)},contents:function(t){return O(t,"iframe")?t.contentDocument:(O(t,"template")&&(t=t.content||t),_.merge([],t.childNodes))}},function(t,e){_.fn[t]=function(n,r){var i=_.map(this,e,n);return"Until"!==t.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=_.filter(r,i)),this.length>1&&(R[t]||_.uniqueSort(i),$.test(t)&&i.reverse()),this.pushStack(i)}});var M=/[^\x20\t\r\n\f]+/g;function F(t){return t}function H(t){throw t}function B(t,e,n,r){var i;try{t&&_.isFunction(i=t.promise)?i.call(t).done(e).fail(n):t&&_.isFunction(i=t.then)?i.call(t,e,n):e.apply(void 0,[t].slice(r))}catch(t){n.apply(void 0,[t])}}_.Callbacks=function(t){var e,n;t="string"==typeof t?(e=t,n={},_.each(e.match(M)||[],function(t,e){n[e]=!0}),n):_.extend({},t);var r,i,o,a,s=[],u=[],c=-1,l=function(){for(a=a||t.once,o=r=!0;u.length;c=-1)for(i=u.shift();++c<s.length;)!1===s[c].apply(i[0],i[1])&&t.stopOnFalse&&(c=s.length,i=!1);t.memory||(i=!1),r=!1,a&&(s=i?[]:"")},f={add:function(){return s&&(i&&!r&&(c=s.length-1,u.push(i)),function e(n){_.each(n,function(n,r){_.isFunction(r)?t.unique&&f.has(r)||s.push(r):r&&r.length&&"string"!==_.type(r)&&e(r)})}(arguments),i&&!r&&l()),this},remove:function(){return _.each(arguments,function(t,e){for(var n;(n=_.inArray(e,s,n))>-1;)s.splice(n,1),n<=c&&c--}),this},has:function(t){return t?_.inArray(t,s)>-1:s.length>0},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=i="",this},disabled:function(){return!s},lock:function(){return a=u=[],i||r||(s=i=""),this},locked:function(){return!!a},fireWith:function(t,e){return a||(e=[t,(e=e||[]).slice?e.slice():e],u.push(e),r||l()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},_.extend({Deferred:function(t){var e=[["notify","progress",_.Callbacks("memory"),_.Callbacks("memory"),2],["resolve","done",_.Callbacks("once memory"),_.Callbacks("once memory"),0,"resolved"],["reject","fail",_.Callbacks("once memory"),_.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},catch:function(t){return i.then(null,t)},pipe:function(){var t=arguments;return _.Deferred(function(n){_.each(e,function(e,r){var i=_.isFunction(t[r[4]])&&t[r[4]];o[r[1]](function(){var t=i&&i.apply(this,arguments);t&&_.isFunction(t.promise)?t.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[r[0]+"With"](this,i?[t]:arguments)})}),t=null}).promise()},then:function(t,r,i){var o=0;function a(t,e,r,i){return function(){var s=this,u=arguments,c=function(){var n,c;if(!(t<o)){if((n=r.apply(s,u))===e.promise())throw new TypeError("Thenable self-resolution");c=n&&("object"==typeof n||"function"==typeof n)&&n.then,_.isFunction(c)?i?c.call(n,a(o,e,F,i),a(o,e,H,i)):(o++,c.call(n,a(o,e,F,i),a(o,e,H,i),a(o,e,F,e.notifyWith))):(r!==F&&(s=void 0,u=[n]),(i||e.resolveWith)(s,u))}},l=i?c:function(){try{c()}catch(n){_.Deferred.exceptionHook&&_.Deferred.exceptionHook(n,l.stackTrace),t+1>=o&&(r!==H&&(s=void 0,u=[n]),e.rejectWith(s,u))}};t?l():(_.Deferred.getStackHook&&(l.stackTrace=_.Deferred.getStackHook()),n.setTimeout(l))}}return _.Deferred(function(n){e[0][3].add(a(0,n,_.isFunction(i)?i:F,n.notifyWith)),e[1][3].add(a(0,n,_.isFunction(t)?t:F)),e[2][3].add(a(0,n,_.isFunction(r)?r:H))}).promise()},promise:function(t){return null!=t?_.extend(t,i):i}},o={};return _.each(e,function(t,n){var a=n[2],s=n[5];i[n[1]]=a.add,s&&a.add(function(){r=s},e[3-t][2].disable,e[0][2].lock),a.add(n[3].fire),o[n[0]]=function(){return o[n[0]+"With"](this===o?void 0:this,arguments),this},o[n[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(t){var e=arguments.length,n=e,r=Array(n),i=u.call(arguments),o=_.Deferred(),a=function(t){return function(n){r[t]=this,i[t]=arguments.length>1?u.call(arguments):n,--e||o.resolveWith(r,i)}};if(e<=1&&(B(t,o.done(a(n)).resolve,o.reject,!e),"pending"===o.state()||_.isFunction(i[n]&&i[n].then)))return o.then();for(;n--;)B(i[n],a(n),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;_.Deferred.exceptionHook=function(t,e){n.console&&n.console.warn&&t&&W.test(t.name)&&n.console.warn("jQuery.Deferred exception: "+t.message,t.stack,e)},_.readyException=function(t){n.setTimeout(function(){throw t})};var q=_.Deferred();function U(){a.removeEventListener("DOMContentLoaded",U),n.removeEventListener("load",U),_.ready()}_.fn.ready=function(t){return q.then(t).catch(function(t){_.readyException(t)}),this},_.extend({isReady:!1,readyWait:1,ready:function(t){(!0===t?--_.readyWait:_.isReady)||(_.isReady=!0,!0!==t&&--_.readyWait>0||q.resolveWith(a,[_]))}}),_.ready.then=q.then,"complete"===a.readyState||"loading"!==a.readyState&&!a.documentElement.doScroll?n.setTimeout(_.ready):(a.addEventListener("DOMContentLoaded",U),n.addEventListener("load",U));var z=function(t,e,n,r,i,o,a){var s=0,u=t.length,c=null==n;if("object"===_.type(n)){i=!0;for(s in n)z(t,e,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,_.isFunction(r)||(a=!0),c&&(a?(e.call(t,r),e=null):(c=e,e=function(t,e,n){return c.call(_(t),n)})),e))for(;s<u;s++)e(t[s],n,a?r:r.call(t[s],s,e(t[s],n)));return i?t:c?e.call(t):u?e(t[0],n):o},V=function(t){return 1===t.nodeType||9===t.nodeType||!+t.nodeType};function K(){this.expando=_.expando+K.uid++}K.uid=1,K.prototype={cache:function(t){var e=t[this.expando];return e||(e={},V(t)&&(t.nodeType?t[this.expando]=e:Object.defineProperty(t,this.expando,{value:e,configurable:!0}))),e},set:function(t,e,n){var r,i=this.cache(t);if("string"==typeof e)i[_.camelCase(e)]=n;else for(r in e)i[_.camelCase(r)]=e[r];return i},get:function(t,e){return void 0===e?this.cache(t):t[this.expando]&&t[this.expando][_.camelCase(e)]},access:function(t,e,n){return void 0===e||e&&"string"==typeof e&&void 0===n?this.get(t,e):(this.set(t,e,n),void 0!==n?n:e)},remove:function(t,e){var n,r=t[this.expando];if(void 0!==r){if(void 0!==e){n=(e=Array.isArray(e)?e.map(_.camelCase):(e=_.camelCase(e))in r?[e]:e.match(M)||[]).length;for(;n--;)delete r[e[n]]}(void 0===e||_.isEmptyObject(r))&&(t.nodeType?t[this.expando]=void 0:delete t[this.expando])}},hasData:function(t){var e=t[this.expando];return void 0!==e&&!_.isEmptyObject(e)}};var Q=new K,G=new K,Y=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,X=/[A-Z]/g;function J(t,e,n){var r,i;if(void 0===n&&1===t.nodeType)if(r="data-"+e.replace(X,"-$&").toLowerCase(),"string"==typeof(n=t.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:Y.test(i)?JSON.parse(i):i)}catch(t){}G.set(t,e,n)}else n=void 0;return n}_.extend({hasData:function(t){return G.hasData(t)||Q.hasData(t)},data:function(t,e,n){return G.access(t,e,n)},removeData:function(t,e){G.remove(t,e)},_data:function(t,e,n){return Q.access(t,e,n)},_removeData:function(t,e){Q.remove(t,e)}}),_.fn.extend({data:function(t,e){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===t){if(this.length&&(i=G.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){for(n=a.length;n--;)a[n]&&0===(r=a[n].name).indexOf("data-")&&(r=_.camelCase(r.slice(5)),J(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof t?this.each(function(){G.set(this,t)}):z(this,function(e){var n;if(o&&void 0===e)return void 0!==(n=G.get(o,t))?n:void 0!==(n=J(o,t))?n:void 0;this.each(function(){G.set(this,t,e)})},null,e,arguments.length>1,null,!0)},removeData:function(t){return this.each(function(){G.remove(this,t)})}}),_.extend({queue:function(t,e,n){var r;if(t)return e=(e||"fx")+"queue",r=Q.get(t,e),n&&(!r||Array.isArray(n)?r=Q.access(t,e,_.makeArray(n)):r.push(n)),r||[]},dequeue:function(t,e){e=e||"fx";var n=_.queue(t,e),r=n.length,i=n.shift(),o=_._queueHooks(t,e);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===e&&n.unshift("inprogress"),delete o.stop,i.call(t,function(){_.dequeue(t,e)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(t,e){var n=e+"queueHooks";return Q.get(t,n)||Q.access(t,n,{empty:_.Callbacks("once memory").add(function(){Q.remove(t,[e+"queue",n])})})}}),_.fn.extend({queue:function(t,e){var n=2;return"string"!=typeof t&&(e=t,t="fx",n--),arguments.length<n?_.queue(this[0],t):void 0===e?this:this.each(function(){var n=_.queue(this,t,e);_._queueHooks(this,t),"fx"===t&&"inprogress"!==n[0]&&_.dequeue(this,t)})},dequeue:function(t){return this.each(function(){_.dequeue(this,t)})},clearQueue:function(t){return this.queue(t||"fx",[])},promise:function(t,e){var n,r=1,i=_.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};for("string"!=typeof t&&(e=t,t=void 0),t=t||"fx";a--;)(n=Q.get(o[a],t+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(e)}});var Z=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,tt=new RegExp("^(?:([+-])=|)("+Z+")([a-z%]*)$","i"),et=["Top","Right","Bottom","Left"],nt=function(t,e){return"none"===(t=e||t).style.display||""===t.style.display&&_.contains(t.ownerDocument,t)&&"none"===_.css(t,"display")},rt=function(t,e,n,r){var i,o,a={};for(o in e)a[o]=t.style[o],t.style[o]=e[o];i=n.apply(t,r||[]);for(o in e)t.style[o]=a[o];return i};function it(t,e,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return _.css(t,e,"")},u=s(),c=n&&n[3]||(_.cssNumber[e]?"":"px"),l=(_.cssNumber[e]||"px"!==c&&+u)&&tt.exec(_.css(t,e));if(l&&l[3]!==c){c=c||l[3],n=n||[],l=+u||1;do{l/=o=o||".5",_.style(t,e,l+c)}while(o!==(o=s()/u)&&1!==o&&--a)}return n&&(l=+l||+u||0,i=n[1]?l+(n[1]+1)*n[2]:+n[2],r&&(r.unit=c,r.start=l,r.end=i)),i}var ot={};function at(t,e){for(var n,r,i,o,a,s,u,c=[],l=0,f=t.length;l<f;l++)(r=t[l]).style&&(n=r.style.display,e?("none"===n&&(c[l]=Q.get(r,"display")||null,c[l]||(r.style.display="")),""===r.style.display&&nt(r)&&(c[l]=(o=void 0,a=void 0,void 0,u=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ot[s])||(o=a.body.appendChild(a.createElement(s)),u=_.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ot[s]=u,u)))):"none"!==n&&(c[l]="none",Q.set(r,"display",n)));for(l=0;l<f;l++)null!=c[l]&&(t[l].style.display=c[l]);return t}_.fn.extend({show:function(){return at(this,!0)},hide:function(){return at(this)},toggle:function(t){return"boolean"==typeof t?t?this.show():this.hide():this.each(function(){nt(this)?_(this).show():_(this).hide()})}});var st=/^(?:checkbox|radio)$/i,ut=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,ct=/^$|\/(?:java|ecma)script/i,lt={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ft(t,e){var n;return n=void 0!==t.getElementsByTagName?t.getElementsByTagName(e||"*"):void 0!==t.querySelectorAll?t.querySelectorAll(e||"*"):[],void 0===e||e&&O(t,e)?_.merge([t],n):n}function pt(t,e){for(var n=0,r=t.length;n<r;n++)Q.set(t[n],"globalEval",!e||Q.get(e[n],"globalEval"))}lt.optgroup=lt.option,lt.tbody=lt.tfoot=lt.colgroup=lt.caption=lt.thead,lt.th=lt.td;var dt,ht,vt=/<|&#?\w+;/;function gt(t,e,n,r,i){for(var o,a,s,u,c,l,f=e.createDocumentFragment(),p=[],d=0,h=t.length;d<h;d++)if((o=t[d])||0===o)if("object"===_.type(o))_.merge(p,o.nodeType?[o]:o);else if(vt.test(o)){for(a=a||f.appendChild(e.createElement("div")),s=(ut.exec(o)||["",""])[1].toLowerCase(),u=lt[s]||lt._default,a.innerHTML=u[1]+_.htmlPrefilter(o)+u[2],l=u[0];l--;)a=a.lastChild;_.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(e.createTextNode(o));for(f.textContent="",d=0;o=p[d++];)if(r&&_.inArray(o,r)>-1)i&&i.push(o);else if(c=_.contains(o.ownerDocument,o),a=ft(f.appendChild(o),"script"),c&&pt(a),n)for(l=0;o=a[l++];)ct.test(o.type||"")&&n.push(o);return f}dt=a.createDocumentFragment().appendChild(a.createElement("div")),(ht=a.createElement("input")).setAttribute("type","radio"),ht.setAttribute("checked","checked"),ht.setAttribute("name","t"),dt.appendChild(ht),m.checkClone=dt.cloneNode(!0).cloneNode(!0).lastChild.checked,dt.innerHTML="<textarea>x</textarea>",m.noCloneChecked=!!dt.cloneNode(!0).lastChild.defaultValue;var mt=a.documentElement,yt=/^key/,_t=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,bt=/^([^.]*)(?:\.(.+)|)/;function wt(){return!0}function xt(){return!1}function Ct(){try{return a.activeElement}catch(t){}}function Tt(t,e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=void 0);for(s in e)Tt(t,s,n,r,e[s],o);return t}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=xt;else if(!i)return t;return 1===o&&(a=i,(i=function(t){return _().off(t),a.apply(this,arguments)}).guid=a.guid||(a.guid=_.guid++)),t.each(function(){_.event.add(this,e,i,r,n)})}_.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,c,l,f,p,d,h,v,g=Q.get(t);if(g)for(n.handler&&(n=(o=n).handler,i=o.selector),i&&_.find.matchesSelector(mt,i),n.guid||(n.guid=_.guid++),(u=g.events)||(u=g.events={}),(a=g.handle)||(a=g.handle=function(e){return void 0!==_&&_.event.triggered!==e.type?_.event.dispatch.apply(t,arguments):void 0}),c=(e=(e||"").match(M)||[""]).length;c--;)d=v=(s=bt.exec(e[c])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=_.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=_.event.special[d]||{},l=_.extend({type:d,origType:v,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&_.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,l),l.handler.guid||(l.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,l):p.push(l),_.event.global[d]=!0)},remove:function(t,e,n,r,i){var o,a,s,u,c,l,f,p,d,h,v,g=Q.hasData(t)&&Q.get(t);if(g&&(u=g.events)){for(c=(e=(e||"").match(M)||[""]).length;c--;)if(d=v=(s=bt.exec(e[c])||[])[1],h=(s[2]||"").split(".").sort(),d){for(f=_.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;o--;)l=p[o],!i&&v!==l.origType||n&&n.guid!==l.guid||s&&!s.test(l.namespace)||r&&r!==l.selector&&("**"!==r||!l.selector)||(p.splice(o,1),l.selector&&p.delegateCount--,f.remove&&f.remove.call(t,l));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(t,h,g.handle)||_.removeEvent(t,d,g.handle),delete u[d])}else for(d in u)_.event.remove(t,d+e[c],n,r,!0);_.isEmptyObject(u)&&Q.remove(t,"handle events")}},dispatch:function(t){var e,n,r,i,o,a,s=_.event.fix(t),u=new Array(arguments.length),c=(Q.get(this,"events")||{})[s.type]||[],l=_.event.special[s.type]||{};for(u[0]=s,e=1;e<arguments.length;e++)u[e]=arguments[e];if(s.delegateTarget=this,!l.preDispatch||!1!==l.preDispatch.call(this,s)){for(a=_.event.handlers.call(this,s,c),e=0;(i=a[e++])&&!s.isPropagationStopped();)for(s.currentTarget=i.elem,n=0;(o=i.handlers[n++])&&!s.isImmediatePropagationStopped();)s.rnamespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((_.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,s),s.result}},handlers:function(t,e){var n,r,i,o,a,s=[],u=e.delegateCount,c=t.target;if(u&&c.nodeType&&!("click"===t.type&&t.button>=1))for(;c!==this;c=c.parentNode||this)if(1===c.nodeType&&("click"!==t.type||!0!==c.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=e[n]).selector+" "]&&(a[i]=r.needsContext?_(i,this).index(c)>-1:_.find(i,this,null,[c]).length),a[i]&&o.push(r);o.length&&s.push({elem:c,handlers:o})}return c=this,u<e.length&&s.push({elem:c,handlers:e.slice(u)}),s},addProp:function(t,e){Object.defineProperty(_.Event.prototype,t,{enumerable:!0,configurable:!0,get:_.isFunction(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(t){return t[_.expando]?t:new _.Event(t)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==Ct()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===Ct()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&O(this,"input"))return this.click(),!1},_default:function(t){return O(t.target,"a")}},beforeunload:{postDispatch:function(t){void 0!==t.result&&t.originalEvent&&(t.originalEvent.returnValue=t.result)}}}},_.removeEvent=function(t,e,n){t.removeEventListener&&t.removeEventListener(e,n)},_.Event=function(t,e){if(!(this instanceof _.Event))return new _.Event(t,e);t&&t.type?(this.originalEvent=t,this.type=t.type,this.isDefaultPrevented=t.defaultPrevented||void 0===t.defaultPrevented&&!1===t.returnValue?wt:xt,this.target=t.target&&3===t.target.nodeType?t.target.parentNode:t.target,this.currentTarget=t.currentTarget,this.relatedTarget=t.relatedTarget):this.type=t,e&&_.extend(this,e),this.timeStamp=t&&t.timeStamp||_.now(),this[_.expando]=!0},_.Event.prototype={constructor:_.Event,isDefaultPrevented:xt,isPropagationStopped:xt,isImmediatePropagationStopped:xt,isSimulated:!1,preventDefault:function(){var t=this.originalEvent;this.isDefaultPrevented=wt,t&&!this.isSimulated&&t.preventDefault()},stopPropagation:function(){var t=this.originalEvent;this.isPropagationStopped=wt,t&&!this.isSimulated&&t.stopPropagation()},stopImmediatePropagation:function(){var t=this.originalEvent;this.isImmediatePropagationStopped=wt,t&&!this.isSimulated&&t.stopImmediatePropagation(),this.stopPropagation()}},_.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,char:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(t){var e=t.button;return null==t.which&&yt.test(t.type)?null!=t.charCode?t.charCode:t.keyCode:!t.which&&void 0!==e&&_t.test(t.type)?1&e?1:2&e?3:4&e?2:0:t.which}},_.event.addProp),_.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(t,e){_.event.special[t]={delegateType:e,bindType:e,handle:function(t){var n,r=t.relatedTarget,i=t.handleObj;return r&&(r===this||_.contains(this,r))||(t.type=i.origType,n=i.handler.apply(this,arguments),t.type=e),n}}}),_.fn.extend({on:function(t,e,n,r){return Tt(this,t,e,n,r)},one:function(t,e,n,r){return Tt(this,t,e,n,r,1)},off:function(t,e,n){var r,i;if(t&&t.preventDefault&&t.handleObj)return r=t.handleObj,_(t.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof t){for(i in t)this.off(i,e,t[i]);return this}return!1!==e&&"function"!=typeof e||(n=e,e=void 0),!1===n&&(n=xt),this.each(function(){_.event.remove(this,t,n,e)})}});var Et=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,At=/<script|<style|<link/i,St=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^true\/(.*)/,Ot=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Dt(t,e){return O(t,"table")&&O(11!==e.nodeType?e:e.firstChild,"tr")&&_(">tbody",t)[0]||t}function It(t){return t.type=(null!==t.getAttribute("type"))+"/"+t.type,t}function Nt(t){var e=kt.exec(t.type);return e?t.type=e[1]:t.removeAttribute("type"),t}function jt(t,e){var n,r,i,o,a,s,u,c;if(1===e.nodeType){if(Q.hasData(t)&&(o=Q.access(t),a=Q.set(e,o),c=o.events)){delete a.handle,a.events={};for(i in c)for(n=0,r=c[i].length;n<r;n++)_.event.add(e,i,c[i][n])}G.hasData(t)&&(s=G.access(t),u=_.extend({},s),G.set(e,u))}}function Lt(t,e,n,r){e=c.apply([],e);var i,o,a,s,u,l,f=0,p=t.length,d=p-1,h=e[0],v=_.isFunction(h);if(v||p>1&&"string"==typeof h&&!m.checkClone&&St.test(h))return t.each(function(i){var o=t.eq(i);v&&(e[0]=h.call(this,i,o.html())),Lt(o,e,n,r)});if(p&&(o=(i=gt(e,t[0].ownerDocument,!1,t,r)).firstChild,1===i.childNodes.length&&(i=o),o||r)){for(s=(a=_.map(ft(i,"script"),It)).length;f<p;f++)u=i,f!==d&&(u=_.clone(u,!0,!0),s&&_.merge(a,ft(u,"script"))),n.call(t[f],u,f);if(s)for(l=a[a.length-1].ownerDocument,_.map(a,Nt),f=0;f<s;f++)u=a[f],ct.test(u.type||"")&&!Q.access(u,"globalEval")&&_.contains(l,u)&&(u.src?_._evalUrl&&_._evalUrl(u.src):y(u.textContent.replace(Ot,""),l))}return t}function $t(t,e,n){for(var r,i=e?_.filter(e,t):t,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||_.cleanData(ft(r)),r.parentNode&&(n&&_.contains(r.ownerDocument,r)&&pt(ft(r,"script")),r.parentNode.removeChild(r));return t}_.extend({htmlPrefilter:function(t){return t.replace(Et,"<$1></$2>")},clone:function(t,e,n){var r,i,o,a,s,u,c,l=t.cloneNode(!0),f=_.contains(t.ownerDocument,t);if(!(m.noCloneChecked||1!==t.nodeType&&11!==t.nodeType||_.isXMLDoc(t)))for(a=ft(l),r=0,i=(o=ft(t)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(c=u.nodeName.toLowerCase())&&st.test(s.type)?u.checked=s.checked:"input"!==c&&"textarea"!==c||(u.defaultValue=s.defaultValue);if(e)if(n)for(o=o||ft(t),a=a||ft(l),r=0,i=o.length;r<i;r++)jt(o[r],a[r]);else jt(t,l);return(a=ft(l,"script")).length>0&&pt(a,!f&&ft(t,"script")),l},cleanData:function(t){for(var e,n,r,i=_.event.special,o=0;void 0!==(n=t[o]);o++)if(V(n)){if(e=n[Q.expando]){if(e.events)for(r in e.events)i[r]?_.event.remove(n,r):_.removeEvent(n,r,e.handle);n[Q.expando]=void 0}n[G.expando]&&(n[G.expando]=void 0)}}}),_.fn.extend({detach:function(t){return $t(this,t,!0)},remove:function(t){return $t(this,t)},text:function(t){return z(this,function(t){return void 0===t?_.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=t)})},null,t,arguments.length)},append:function(){return Lt(this,arguments,function(t){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Dt(this,t).appendChild(t)})},prepend:function(){return Lt(this,arguments,function(t){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var e=Dt(this,t);e.insertBefore(t,e.firstChild)}})},before:function(){return Lt(this,arguments,function(t){this.parentNode&&this.parentNode.insertBefore(t,this)})},after:function(){return Lt(this,arguments,function(t){this.parentNode&&this.parentNode.insertBefore(t,this.nextSibling)})},empty:function(){for(var t,e=0;null!=(t=this[e]);e++)1===t.nodeType&&(_.cleanData(ft(t,!1)),t.textContent="");return this},clone:function(t,e){return t=null!=t&&t,e=null==e?t:e,this.map(function(){return _.clone(this,t,e)})},html:function(t){return z(this,function(t){var e=this[0]||{},n=0,r=this.length;if(void 0===t&&1===e.nodeType)return e.innerHTML;if("string"==typeof t&&!At.test(t)&&!lt[(ut.exec(t)||["",""])[1].toLowerCase()]){t=_.htmlPrefilter(t);try{for(;n<r;n++)1===(e=this[n]||{}).nodeType&&(_.cleanData(ft(e,!1)),e.innerHTML=t);e=0}catch(t){}}e&&this.empty().append(t)},null,t,arguments.length)},replaceWith:function(){var t=[];return Lt(this,arguments,function(e){var n=this.parentNode;_.inArray(this,t)<0&&(_.cleanData(ft(this)),n&&n.replaceChild(e,this))},t)}}),_.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(t,e){_.fn[t]=function(t){for(var n,r=[],i=_(t),o=i.length-1,a=0;a<=o;a++)n=a===o?this:this.clone(!0),_(i[a])[e](n),l.apply(r,n.get());return this.pushStack(r)}});var Rt=/^margin/,Pt=new RegExp("^("+Z+")(?!px)[a-z%]+$","i"),Mt=function(t){var e=t.ownerDocument.defaultView;return e&&e.opener||(e=n),e.getComputedStyle(t)};function Ft(t,e,n){var r,i,o,a,s=t.style;return(n=n||Mt(t))&&(""!==(a=n.getPropertyValue(e)||n[e])||_.contains(t.ownerDocument,t)||(a=_.style(t,e)),!m.pixelMarginRight()&&Pt.test(a)&&Rt.test(e)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function Ht(t,e){return{get:function(){if(!t())return(this.get=e).apply(this,arguments);delete this.get}}}!function(){function t(){if(u){u.style.cssText="box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",u.innerHTML="",mt.appendChild(s);var t=n.getComputedStyle(u);e="1%"!==t.top,o="2px"===t.marginLeft,r="4px"===t.width,u.style.marginRight="50%",i="4px"===t.marginRight,mt.removeChild(s),u=null}}var e,r,i,o,s=a.createElement("div"),u=a.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",m.clearCloneStyle="content-box"===u.style.backgroundClip,s.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",s.appendChild(u),_.extend(m,{pixelPosition:function(){return t(),e},boxSizingReliable:function(){return t(),r},pixelMarginRight:function(){return t(),i},reliableMarginLeft:function(){return t(),o}}))}();var Bt=/^(none|table(?!-c[ea]).+)/,Wt=/^--/,qt={position:"absolute",visibility:"hidden",display:"block"},Ut={letterSpacing:"0",fontWeight:"400"},zt=["Webkit","Moz","ms"],Vt=a.createElement("div").style;function Kt(t){var e=_.cssProps[t];return e||(e=_.cssProps[t]=function(t){if(t in Vt)return t;for(var e=t[0].toUpperCase()+t.slice(1),n=zt.length;n--;)if((t=zt[n]+e)in Vt)return t}(t)||t),e}function Qt(t,e,n){var r=tt.exec(e);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):e}function Gt(t,e,n,r,i){var o,a=0;for(o=n===(r?"border":"content")?4:"width"===e?1:0;o<4;o+=2)"margin"===n&&(a+=_.css(t,n+et[o],!0,i)),r?("content"===n&&(a-=_.css(t,"padding"+et[o],!0,i)),"margin"!==n&&(a-=_.css(t,"border"+et[o]+"Width",!0,i))):(a+=_.css(t,"padding"+et[o],!0,i),"padding"!==n&&(a+=_.css(t,"border"+et[o]+"Width",!0,i)));return a}function Yt(t,e,n){var r,i=Mt(t),o=Ft(t,e,i),a="border-box"===_.css(t,"boxSizing",!1,i);return Pt.test(o)?o:(r=a&&(m.boxSizingReliable()||o===t.style[e]),"auto"===o&&(o=t["offset"+e[0].toUpperCase()+e.slice(1)]),(o=parseFloat(o)||0)+Gt(t,e,n||(a?"border":"content"),r,i)+"px")}function Xt(t,e,n,r,i){return new Xt.prototype.init(t,e,n,r,i)}_.extend({cssHooks:{opacity:{get:function(t,e){if(e){var n=Ft(t,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{float:"cssFloat"},style:function(t,e,n,r){if(t&&3!==t.nodeType&&8!==t.nodeType&&t.style){var i,o,a,s=_.camelCase(e),u=Wt.test(e),c=t.style;if(u||(e=Kt(s)),a=_.cssHooks[e]||_.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(t,!1,r))?i:c[e];"string"===(o=typeof n)&&(i=tt.exec(n))&&i[1]&&(n=it(t,e,i),o="number"),null!=n&&n==n&&("number"===o&&(n+=i&&i[3]||(_.cssNumber[s]?"":"px")),m.clearCloneStyle||""!==n||0!==e.indexOf("background")||(c[e]="inherit"),a&&"set"in a&&void 0===(n=a.set(t,n,r))||(u?c.setProperty(e,n):c[e]=n))}},css:function(t,e,n,r){var i,o,a,s=_.camelCase(e);return Wt.test(e)||(e=Kt(s)),(a=_.cssHooks[e]||_.cssHooks[s])&&"get"in a&&(i=a.get(t,!0,n)),void 0===i&&(i=Ft(t,e,r)),"normal"===i&&e in Ut&&(i=Ut[e]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),_.each(["height","width"],function(t,e){_.cssHooks[e]={get:function(t,n,r){if(n)return!Bt.test(_.css(t,"display"))||t.getClientRects().length&&t.getBoundingClientRect().width?Yt(t,e,r):rt(t,qt,function(){return Yt(t,e,r)})},set:function(t,n,r){var i,o=r&&Mt(t),a=r&&Gt(t,e,r,"border-box"===_.css(t,"boxSizing",!1,o),o);return a&&(i=tt.exec(n))&&"px"!==(i[3]||"px")&&(t.style[e]=n,n=_.css(t,e)),Qt(0,n,a)}}}),_.cssHooks.marginLeft=Ht(m.reliableMarginLeft,function(t,e){if(e)return(parseFloat(Ft(t,"marginLeft"))||t.getBoundingClientRect().left-rt(t,{marginLeft:0},function(){return t.getBoundingClientRect().left}))+"px"}),_.each({margin:"",padding:"",border:"Width"},function(t,e){_.cssHooks[t+e]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[t+et[r]+e]=o[r]||o[r-2]||o[0];return i}},Rt.test(t)||(_.cssHooks[t+e].set=Qt)}),_.fn.extend({css:function(t,e){return z(this,function(t,e,n){var r,i,o={},a=0;if(Array.isArray(e)){for(r=Mt(t),i=e.length;a<i;a++)o[e[a]]=_.css(t,e[a],!1,r);return o}return void 0!==n?_.style(t,e,n):_.css(t,e)},t,e,arguments.length>1)}}),_.Tween=Xt,Xt.prototype={constructor:Xt,init:function(t,e,n,r,i,o){this.elem=t,this.prop=n,this.easing=i||_.easing._default,this.options=e,this.start=this.now=this.cur(),this.end=r,this.unit=o||(_.cssNumber[n]?"":"px")},cur:function(){var t=Xt.propHooks[this.prop];return t&&t.get?t.get(this):Xt.propHooks._default.get(this)},run:function(t){var e,n=Xt.propHooks[this.prop];return this.options.duration?this.pos=e=_.easing[this.easing](t,this.options.duration*t,0,1,this.options.duration):this.pos=e=t,this.now=(this.end-this.start)*e+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Xt.propHooks._default.set(this),this}},Xt.prototype.init.prototype=Xt.prototype,Xt.propHooks={_default:{get:function(t){var e;return 1!==t.elem.nodeType||null!=t.elem[t.prop]&&null==t.elem.style[t.prop]?t.elem[t.prop]:(e=_.css(t.elem,t.prop,""))&&"auto"!==e?e:0},set:function(t){_.fx.step[t.prop]?_.fx.step[t.prop](t):1!==t.elem.nodeType||null==t.elem.style[_.cssProps[t.prop]]&&!_.cssHooks[t.prop]?t.elem[t.prop]=t.now:_.style(t.elem,t.prop,t.now+t.unit)}}},Xt.propHooks.scrollTop=Xt.propHooks.scrollLeft={set:function(t){t.elem.nodeType&&t.elem.parentNode&&(t.elem[t.prop]=t.now)}},_.easing={linear:function(t){return t},swing:function(t){return.5-Math.cos(t*Math.PI)/2},_default:"swing"},_.fx=Xt.prototype.init,_.fx.step={};var Jt,Zt,te,ee,ne=/^(?:toggle|show|hide)$/,re=/queueHooks$/;function ie(){Zt&&(!1===a.hidden&&n.requestAnimationFrame?n.requestAnimationFrame(ie):n.setTimeout(ie,_.fx.interval),_.fx.tick())}function oe(){return n.setTimeout(function(){Jt=void 0}),Jt=_.now()}function ae(t,e){var n,r=0,i={height:t};for(e=e?1:0;r<4;r+=2-e)i["margin"+(n=et[r])]=i["padding"+n]=t;return e&&(i.opacity=i.width=t),i}function se(t,e,n){for(var r,i=(ue.tweeners[e]||[]).concat(ue.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,e,t))return r}function ue(t,e,n){var r,i,o=0,a=ue.prefilters.length,s=_.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var e=Jt||oe(),n=Math.max(0,c.startTime+c.duration-e),r=1-(n/c.duration||0),o=0,a=c.tweens.length;o<a;o++)c.tweens[o].run(r);return s.notifyWith(t,[c,r,n]),r<1&&a?n:(a||s.notifyWith(t,[c,1,0]),s.resolveWith(t,[c]),!1)},c=s.promise({elem:t,props:_.extend({},e),opts:_.extend(!0,{specialEasing:{},easing:_.easing._default},n),originalProperties:e,originalOptions:n,startTime:Jt||oe(),duration:n.duration,tweens:[],createTween:function(e,n){var r=_.Tween(t,c.opts,e,n,c.opts.specialEasing[e]||c.opts.easing);return c.tweens.push(r),r},stop:function(e){var n=0,r=e?c.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)c.tweens[n].run(1);return e?(s.notifyWith(t,[c,1,0]),s.resolveWith(t,[c,e])):s.rejectWith(t,[c,e]),this}}),l=c.props;for(!function(t,e){var n,r,i,o,a;for(n in t)if(i=e[r=_.camelCase(n)],o=t[n],Array.isArray(o)&&(i=o[1],o=t[n]=o[0]),n!==r&&(t[r]=o,delete t[n]),(a=_.cssHooks[r])&&"expand"in a){o=a.expand(o),delete t[r];for(n in o)n in t||(t[n]=o[n],e[n]=i)}else e[r]=i}(l,c.opts.specialEasing);o<a;o++)if(r=ue.prefilters[o].call(c,t,l,c.opts))return _.isFunction(r.stop)&&(_._queueHooks(c.elem,c.opts.queue).stop=_.proxy(r.stop,r)),r;return _.map(l,se,c),_.isFunction(c.opts.start)&&c.opts.start.call(t,c),c.progress(c.opts.progress).done(c.opts.done,c.opts.complete).fail(c.opts.fail).always(c.opts.always),_.fx.timer(_.extend(u,{elem:t,anim:c,queue:c.opts.queue})),c}_.Animation=_.extend(ue,{tweeners:{"*":[function(t,e){var n=this.createTween(t,e);return it(n.elem,t,tt.exec(e),n),n}]},tweener:function(t,e){_.isFunction(t)?(e=t,t=["*"]):t=t.match(M);for(var n,r=0,i=t.length;r<i;r++)n=t[r],ue.tweeners[n]=ue.tweeners[n]||[],ue.tweeners[n].unshift(e)},prefilters:[function(t,e,n){var r,i,o,a,s,u,c,l,f="width"in e||"height"in e,p=this,d={},h=t.style,v=t.nodeType&&nt(t),g=Q.get(t,"fxshow");n.queue||(null==(a=_._queueHooks(t,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,_.queue(t,"fx").length||a.empty.fire()})}));for(r in e)if(i=e[r],ne.test(i)){if(delete e[r],o=o||"toggle"===i,i===(v?"hide":"show")){if("show"!==i||!g||void 0===g[r])continue;v=!0}d[r]=g&&g[r]||_.style(t,r)}if((u=!_.isEmptyObject(e))||!_.isEmptyObject(d)){f&&1===t.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(c=g&&g.display)&&(c=Q.get(t,"display")),"none"===(l=_.css(t,"display"))&&(c?l=c:(at([t],!0),c=t.style.display||c,l=_.css(t,"display"),at([t]))),("inline"===l||"inline-block"===l&&null!=c)&&"none"===_.css(t,"float")&&(u||(p.done(function(){h.display=c}),null==c&&(l=h.display,c="none"===l?"":l)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1;for(r in d)u||(g?"hidden"in g&&(v=g.hidden):g=Q.access(t,"fxshow",{display:c}),o&&(g.hidden=!v),v&&at([t],!0),p.done(function(){v||at([t]),Q.remove(t,"fxshow");for(r in d)_.style(t,r,d[r])})),u=se(v?g[r]:0,r,p),r in g||(g[r]=u.start,v&&(u.end=u.start,u.start=0))}}],prefilter:function(t,e){e?ue.prefilters.unshift(t):ue.prefilters.push(t)}}),_.speed=function(t,e,n){var r=t&&"object"==typeof t?_.extend({},t):{complete:n||!n&&e||_.isFunction(t)&&t,duration:t,easing:n&&e||e&&!_.isFunction(e)&&e};return _.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in _.fx.speeds?r.duration=_.fx.speeds[r.duration]:r.duration=_.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){_.isFunction(r.old)&&r.old.call(this),r.queue&&_.dequeue(this,r.queue)},r},_.fn.extend({fadeTo:function(t,e,n,r){return this.filter(nt).css("opacity",0).show().end().animate({opacity:e},t,n,r)},animate:function(t,e,n,r){var i=_.isEmptyObject(t),o=_.speed(e,n,r),a=function(){var e=ue(this,_.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(t,e,n){var r=function(t){var e=t.stop;delete t.stop,e(n)};return"string"!=typeof t&&(n=e,e=t,t=void 0),e&&!1!==t&&this.queue(t||"fx",[]),this.each(function(){var e=!0,i=null!=t&&t+"queueHooks",o=_.timers,a=Q.get(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&re.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=t&&o[i].queue!==t||(o[i].anim.stop(n),e=!1,o.splice(i,1));!e&&n||_.dequeue(this,t)})},finish:function(t){return!1!==t&&(t=t||"fx"),this.each(function(){var e,n=Q.get(this),r=n[t+"queue"],i=n[t+"queueHooks"],o=_.timers,a=r?r.length:0;for(n.finish=!0,_.queue(this,t,[]),i&&i.stop&&i.stop.call(this,!0),e=o.length;e--;)o[e].elem===this&&o[e].queue===t&&(o[e].anim.stop(!0),o.splice(e,1));for(e=0;e<a;e++)r[e]&&r[e].finish&&r[e].finish.call(this);delete n.finish})}}),_.each(["toggle","show","hide"],function(t,e){var n=_.fn[e];_.fn[e]=function(t,r,i){return null==t||"boolean"==typeof t?n.apply(this,arguments):this.animate(ae(e,!0),t,r,i)}}),_.each({slideDown:ae("show"),slideUp:ae("hide"),slideToggle:ae("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(t,e){_.fn[t]=function(t,n,r){return this.animate(e,t,n,r)}}),_.timers=[],_.fx.tick=function(){var t,e=0,n=_.timers;for(Jt=_.now();e<n.length;e++)(t=n[e])()||n[e]!==t||n.splice(e--,1);n.length||_.fx.stop(),Jt=void 0},_.fx.timer=function(t){_.timers.push(t),_.fx.start()},_.fx.interval=13,_.fx.start=function(){Zt||(Zt=!0,ie())},_.fx.stop=function(){Zt=null},_.fx.speeds={slow:600,fast:200,_default:400},_.fn.delay=function(t,e){return t=_.fx&&_.fx.speeds[t]||t,e=e||"fx",this.queue(e,function(e,r){var i=n.setTimeout(e,t);r.stop=function(){n.clearTimeout(i)}})},te=a.createElement("input"),ee=a.createElement("select").appendChild(a.createElement("option")),te.type="checkbox",m.checkOn=""!==te.value,m.optSelected=ee.selected,(te=a.createElement("input")).value="t",te.type="radio",m.radioValue="t"===te.value;var ce,le=_.expr.attrHandle;_.fn.extend({attr:function(t,e){return z(this,_.attr,t,e,arguments.length>1)},removeAttr:function(t){return this.each(function(){_.removeAttr(this,t)})}}),_.extend({attr:function(t,e,n){var r,i,o=t.nodeType;if(3!==o&&8!==o&&2!==o)return void 0===t.getAttribute?_.prop(t,e,n):(1===o&&_.isXMLDoc(t)||(i=_.attrHooks[e.toLowerCase()]||(_.expr.match.bool.test(e)?ce:void 0)),void 0!==n?null===n?void _.removeAttr(t,e):i&&"set"in i&&void 0!==(r=i.set(t,n,e))?r:(t.setAttribute(e,n+""),n):i&&"get"in i&&null!==(r=i.get(t,e))?r:null==(r=_.find.attr(t,e))?void 0:r)},attrHooks:{type:{set:function(t,e){if(!m.radioValue&&"radio"===e&&O(t,"input")){var n=t.value;return t.setAttribute("type",e),n&&(t.value=n),e}}}},removeAttr:function(t,e){var n,r=0,i=e&&e.match(M);if(i&&1===t.nodeType)for(;n=i[r++];)t.removeAttribute(n)}}),ce={set:function(t,e,n){return!1===e?_.removeAttr(t,n):t.setAttribute(n,n),n}},_.each(_.expr.match.bool.source.match(/\w+/g),function(t,e){var n=le[e]||_.find.attr;le[e]=function(t,e,r){var i,o,a=e.toLowerCase();return r||(o=le[a],le[a]=i,i=null!=n(t,e,r)?a:null,le[a]=o),i}});var fe=/^(?:input|select|textarea|button)$/i,pe=/^(?:a|area)$/i;function de(t){return(t.match(M)||[]).join(" ")}function he(t){return t.getAttribute&&t.getAttribute("class")||""}_.fn.extend({prop:function(t,e){return z(this,_.prop,t,e,arguments.length>1)},removeProp:function(t){return this.each(function(){delete this[_.propFix[t]||t]})}}),_.extend({prop:function(t,e,n){var r,i,o=t.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&_.isXMLDoc(t)||(e=_.propFix[e]||e,i=_.propHooks[e]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(t,n,e))?r:t[e]=n:i&&"get"in i&&null!==(r=i.get(t,e))?r:t[e]},propHooks:{tabIndex:{get:function(t){var e=_.find.attr(t,"tabindex");return e?parseInt(e,10):fe.test(t.nodeName)||pe.test(t.nodeName)&&t.href?0:-1}}},propFix:{for:"htmlFor",class:"className"}}),m.optSelected||(_.propHooks.selected={get:function(t){var e=t.parentNode;return e&&e.parentNode&&e.parentNode.selectedIndex,null},set:function(t){var e=t.parentNode;e&&(e.selectedIndex,e.parentNode&&e.parentNode.selectedIndex)}}),_.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){_.propFix[this.toLowerCase()]=this}),_.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(_.isFunction(t))return this.each(function(e){_(this).addClass(t.call(this,e,he(this)))});if("string"==typeof t&&t)for(e=t.match(M)||[];n=this[u++];)if(i=he(n),r=1===n.nodeType&&" "+de(i)+" "){for(a=0;o=e[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=de(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(_.isFunction(t))return this.each(function(e){_(this).removeClass(t.call(this,e,he(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof t&&t)for(e=t.match(M)||[];n=this[u++];)if(i=he(n),r=1===n.nodeType&&" "+de(i)+" "){for(a=0;o=e[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");i!==(s=de(r))&&n.setAttribute("class",s)}return this},toggleClass:function(t,e){var n=typeof t;return"boolean"==typeof e&&"string"===n?e?this.addClass(t):this.removeClass(t):_.isFunction(t)?this.each(function(n){_(this).toggleClass(t.call(this,n,he(this),e),e)}):this.each(function(){var e,r,i,o;if("string"===n)for(r=0,i=_(this),o=t.match(M)||[];e=o[r++];)i.hasClass(e)?i.removeClass(e):i.addClass(e);else void 0!==t&&"boolean"!==n||((e=he(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===t?"":Q.get(this,"__className__")||""))})},hasClass:function(t){var e,n,r=0;for(e=" "+t+" ";n=this[r++];)if(1===n.nodeType&&(" "+de(he(n))+" ").indexOf(e)>-1)return!0;return!1}});var ve=/\r/g;_.fn.extend({val:function(t){var e,n,r,i=this[0];return arguments.length?(r=_.isFunction(t),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?t.call(this,n,_(this).val()):t)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=_.map(i,function(t){return null==t?"":t+""})),(e=_.valHooks[this.type]||_.valHooks[this.nodeName.toLowerCase()])&&"set"in e&&void 0!==e.set(this,i,"value")||(this.value=i))})):i?(e=_.valHooks[i.type]||_.valHooks[i.nodeName.toLowerCase()])&&"get"in e&&void 0!==(n=e.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(ve,""):null==n?"":n:void 0}}),_.extend({valHooks:{option:{get:function(t){var e=_.find.attr(t,"value");return null!=e?e:de(_.text(t))}},select:{get:function(t){var e,n,r,i=t.options,o=t.selectedIndex,a="select-one"===t.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!O(n.parentNode,"optgroup"))){if(e=_(n).val(),a)return e;s.push(e)}return s},set:function(t,e){for(var n,r,i=t.options,o=_.makeArray(e),a=i.length;a--;)((r=i[a]).selected=_.inArray(_.valHooks.option.get(r),o)>-1)&&(n=!0);return n||(t.selectedIndex=-1),o}}}}),_.each(["radio","checkbox"],function(){_.valHooks[this]={set:function(t,e){if(Array.isArray(e))return t.checked=_.inArray(_(t).val(),e)>-1}},m.checkOn||(_.valHooks[this].get=function(t){return null===t.getAttribute("value")?"on":t.value})});var ge=/^(?:focusinfocus|focusoutblur)$/;_.extend(_.event,{trigger:function(t,e,r,i){var o,s,u,c,l,f,p,d=[r||a],v=h.call(t,"type")?t.type:t,g=h.call(t,"namespace")?t.namespace.split("."):[];if(s=u=r=r||a,3!==r.nodeType&&8!==r.nodeType&&!ge.test(v+_.event.triggered)&&(v.indexOf(".")>-1&&(v=(g=v.split(".")).shift(),g.sort()),l=v.indexOf(":")<0&&"on"+v,(t=t[_.expando]?t:new _.Event(v,"object"==typeof t&&t)).isTrigger=i?2:3,t.namespace=g.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),e=null==e?[t]:_.makeArray(e,[t]),p=_.event.special[v]||{},i||!p.trigger||!1!==p.trigger.apply(r,e))){if(!i&&!p.noBubble&&!_.isWindow(r)){for(c=p.delegateType||v,ge.test(c+v)||(s=s.parentNode);s;s=s.parentNode)d.push(s),u=s;u===(r.ownerDocument||a)&&d.push(u.defaultView||u.parentWindow||n)}for(o=0;(s=d[o++])&&!t.isPropagationStopped();)t.type=o>1?c:p.bindType||v,(f=(Q.get(s,"events")||{})[t.type]&&Q.get(s,"handle"))&&f.apply(s,e),(f=l&&s[l])&&f.apply&&V(s)&&(t.result=f.apply(s,e),!1===t.result&&t.preventDefault());return t.type=v,i||t.isDefaultPrevented()||p._default&&!1!==p._default.apply(d.pop(),e)||!V(r)||l&&_.isFunction(r[v])&&!_.isWindow(r)&&((u=r[l])&&(r[l]=null),_.event.triggered=v,r[v](),_.event.triggered=void 0,u&&(r[l]=u)),t.result}},simulate:function(t,e,n){var r=_.extend(new _.Event,n,{type:t,isSimulated:!0});_.event.trigger(r,null,e)}}),_.fn.extend({trigger:function(t,e){return this.each(function(){_.event.trigger(t,e,this)})},triggerHandler:function(t,e){var n=this[0];if(n)return _.event.trigger(t,e,n,!0)}}),_.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(t,e){_.fn[e]=function(t,n){return arguments.length>0?this.on(e,null,t,n):this.trigger(e)}}),_.fn.extend({hover:function(t,e){return this.mouseenter(t).mouseleave(e||t)}}),m.focusin="onfocusin"in n,m.focusin||_.each({focus:"focusin",blur:"focusout"},function(t,e){var n=function(t){_.event.simulate(e,t.target,_.event.fix(t))};_.event.special[e]={setup:function(){var r=this.ownerDocument||this,i=Q.access(r,e);i||r.addEventListener(t,n,!0),Q.access(r,e,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=Q.access(r,e)-1;i?Q.access(r,e,i):(r.removeEventListener(t,n,!0),Q.remove(r,e))}}});var me=n.location,ye=_.now(),_e=/\?/;_.parseXML=function(t){var e;if(!t||"string"!=typeof t)return null;try{e=(new n.DOMParser).parseFromString(t,"text/xml")}catch(t){e=void 0}return e&&!e.getElementsByTagName("parsererror").length||_.error("Invalid XML: "+t),e};var be=/\[\]$/,we=/\r?\n/g,xe=/^(?:submit|button|image|reset|file)$/i,Ce=/^(?:input|select|textarea|keygen)/i;function Te(t,e,n,r){var i;if(Array.isArray(e))_.each(e,function(e,i){n||be.test(t)?r(t,i):Te(t+"["+("object"==typeof i&&null!=i?e:"")+"]",i,n,r)});else if(n||"object"!==_.type(e))r(t,e);else for(i in e)Te(t+"["+i+"]",e[i],n,r)}_.param=function(t,e){var n,r=[],i=function(t,e){var n=_.isFunction(e)?e():e;r[r.length]=encodeURIComponent(t)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(t)||t.jquery&&!_.isPlainObject(t))_.each(t,function(){i(this.name,this.value)});else for(n in t)Te(n,t[n],e,i);return r.join("&")},_.fn.extend({serialize:function(){return _.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var t=_.prop(this,"elements");return t?_.makeArray(t):this}).filter(function(){var t=this.type;return this.name&&!_(this).is(":disabled")&&Ce.test(this.nodeName)&&!xe.test(t)&&(this.checked||!st.test(t))}).map(function(t,e){var n=_(this).val();return null==n?null:Array.isArray(n)?_.map(n,function(t){return{name:e.name,value:t.replace(we,"\r\n")}}):{name:e.name,value:n.replace(we,"\r\n")}}).get()}});var Ee=/%20/g,Ae=/#.*$/,Se=/([?&])_=[^&]*/,ke=/^(.*?):[ \t]*([^\r\n]*)$/gm,Oe=/^(?:GET|HEAD)$/,De=/^\/\//,Ie={},Ne={},je="*/".concat("*"),Le=a.createElement("a");function $e(t){return function(e,n){"string"!=typeof e&&(n=e,e="*");var r,i=0,o=e.toLowerCase().match(M)||[];if(_.isFunction(n))for(;r=o[i++];)"+"===r[0]?(r=r.slice(1)||"*",(t[r]=t[r]||[]).unshift(n)):(t[r]=t[r]||[]).push(n)}}function Re(t,e,n,r){var i={},o=t===Ne;function a(s){var u;return i[s]=!0,_.each(t[s]||[],function(t,s){var c=s(e,n,r);return"string"!=typeof c||o||i[c]?o?!(u=c):void 0:(e.dataTypes.unshift(c),a(c),!1)}),u}return a(e.dataTypes[0])||!i["*"]&&a("*")}function Pe(t,e){var n,r,i=_.ajaxSettings.flatOptions||{};for(n in e)void 0!==e[n]&&((i[n]?t:r||(r={}))[n]=e[n]);return r&&_.extend(!0,t,r),t}Le.href=me.href,_.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:me.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(me.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":je,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":_.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(t,e){return e?Pe(Pe(t,_.ajaxSettings),e):Pe(_.ajaxSettings,t)},ajaxPrefilter:$e(Ie),ajaxTransport:$e(Ne),ajax:function(t,e){"object"==typeof t&&(e=t,t=void 0),e=e||{};var r,i,o,s,u,c,l,f,p,d,h=_.ajaxSetup({},e),v=h.context||h,g=h.context&&(v.nodeType||v.jquery)?_(v):_.event,m=_.Deferred(),y=_.Callbacks("once memory"),b=h.statusCode||{},w={},x={},C="canceled",T={readyState:0,getResponseHeader:function(t){var e;if(l){if(!s)for(s={};e=ke.exec(o);)s[e[1].toLowerCase()]=e[2];e=s[t.toLowerCase()]}return null==e?null:e},getAllResponseHeaders:function(){return l?o:null},setRequestHeader:function(t,e){return null==l&&(t=x[t.toLowerCase()]=x[t.toLowerCase()]||t,w[t]=e),this},overrideMimeType:function(t){return null==l&&(h.mimeType=t),this},statusCode:function(t){var e;if(t)if(l)T.always(t[T.status]);else for(e in t)b[e]=[b[e],t[e]];return this},abort:function(t){var e=t||C;return r&&r.abort(e),E(0,e),this}};if(m.promise(T),h.url=((t||h.url||me.href)+"").replace(De,me.protocol+"//"),h.type=e.method||e.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(M)||[""],null==h.crossDomain){c=a.createElement("a");try{c.href=h.url,c.href=c.href,h.crossDomain=Le.protocol+"//"+Le.host!=c.protocol+"//"+c.host}catch(t){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=_.param(h.data,h.traditional)),Re(Ie,h,e,T),l)return T;(f=_.event&&h.global)&&0==_.active++&&_.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Oe.test(h.type),i=h.url.replace(Ae,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(Ee,"+")):(d=h.url.slice(i.length),h.data&&(i+=(_e.test(i)?"&":"?")+h.data,delete h.data),!1===h.cache&&(i=i.replace(Se,"$1"),d=(_e.test(i)?"&":"?")+"_="+ye+++d),h.url=i+d),h.ifModified&&(_.lastModified[i]&&T.setRequestHeader("If-Modified-Since",_.lastModified[i]),_.etag[i]&&T.setRequestHeader("If-None-Match",_.etag[i])),(h.data&&h.hasContent&&!1!==h.contentType||e.contentType)&&T.setRequestHeader("Content-Type",h.contentType),T.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+je+"; q=0.01":""):h.accepts["*"]);for(p in h.headers)T.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(v,T,h)||l))return T.abort();if(C="abort",y.add(h.complete),T.done(h.success),T.fail(h.error),r=Re(Ne,h,e,T)){if(T.readyState=1,f&&g.trigger("ajaxSend",[T,h]),l)return T;h.async&&h.timeout>0&&(u=n.setTimeout(function(){T.abort("timeout")},h.timeout));try{l=!1,r.send(w,E)}catch(t){if(l)throw t;E(-1,t)}}else E(-1,"No Transport");function E(t,e,a,s){var c,p,d,w,x,C=e;l||(l=!0,u&&n.clearTimeout(u),r=void 0,o=s||"",T.readyState=t>0?4:0,c=t>=200&&t<300||304===t,a&&(w=function(t,e,n){for(var r,i,o,a,s=t.contents,u=t.dataTypes;"*"===u[0];)u.shift(),void 0===r&&(r=t.mimeType||e.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||t.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(h,T,a)),w=function(t,e,n,r){var i,o,a,s,u,c={},l=t.dataTypes.slice();if(l[1])for(a in t.converters)c[a.toLowerCase()]=t.converters[a];for(o=l.shift();o;)if(t.responseFields[o]&&(n[t.responseFields[o]]=e),!u&&r&&t.dataFilter&&(e=t.dataFilter(e,t.dataType)),u=o,o=l.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=c[u+" "+o]||c["* "+o]))for(i in c)if((s=i.split(" "))[1]===o&&(a=c[u+" "+s[0]]||c["* "+s[0]])){!0===a?a=c[i]:!0!==c[i]&&(o=s[0],l.unshift(s[1]));break}if(!0!==a)if(a&&t.throws)e=a(e);else try{e=a(e)}catch(t){return{state:"parsererror",error:a?t:"No conversion from "+u+" to "+o}}}return{state:"success",data:e}}(h,w,T,c),c?(h.ifModified&&((x=T.getResponseHeader("Last-Modified"))&&(_.lastModified[i]=x),(x=T.getResponseHeader("etag"))&&(_.etag[i]=x)),204===t||"HEAD"===h.type?C="nocontent":304===t?C="notmodified":(C=w.state,p=w.data,c=!(d=w.error))):(d=C,!t&&C||(C="error",t<0&&(t=0))),T.status=t,T.statusText=(e||C)+"",c?m.resolveWith(v,[p,C,T]):m.rejectWith(v,[T,C,d]),T.statusCode(b),b=void 0,f&&g.trigger(c?"ajaxSuccess":"ajaxError",[T,h,c?p:d]),y.fireWith(v,[T,C]),f&&(g.trigger("ajaxComplete",[T,h]),--_.active||_.event.trigger("ajaxStop")))}return T},getJSON:function(t,e,n){return _.get(t,e,n,"json")},getScript:function(t,e){return _.get(t,void 0,e,"script")}}),_.each(["get","post"],function(t,e){_[e]=function(t,n,r,i){return _.isFunction(n)&&(i=i||r,r=n,n=void 0),_.ajax(_.extend({url:t,type:e,dataType:i,data:n,success:r},_.isPlainObject(t)&&t))}}),_._evalUrl=function(t){return _.ajax({url:t,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,throws:!0})},_.fn.extend({wrapAll:function(t){var e;return this[0]&&(_.isFunction(t)&&(t=t.call(this[0])),e=_(t,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&e.insertBefore(this[0]),e.map(function(){for(var t=this;t.firstElementChild;)t=t.firstElementChild;return t}).append(this)),this},wrapInner:function(t){return _.isFunction(t)?this.each(function(e){_(this).wrapInner(t.call(this,e))}):this.each(function(){var e=_(this),n=e.contents();n.length?n.wrapAll(t):e.append(t)})},wrap:function(t){var e=_.isFunction(t);return this.each(function(n){_(this).wrapAll(e?t.call(this,n):t)})},unwrap:function(t){return this.parent(t).not("body").each(function(){_(this).replaceWith(this.childNodes)}),this}}),_.expr.pseudos.hidden=function(t){return!_.expr.pseudos.visible(t)},_.expr.pseudos.visible=function(t){return!!(t.offsetWidth||t.offsetHeight||t.getClientRects().length)},_.ajaxSettings.xhr=function(){try{return new n.XMLHttpRequest}catch(t){}};var Me={0:200,1223:204},Fe=_.ajaxSettings.xhr();m.cors=!!Fe&&"withCredentials"in Fe,m.ajax=Fe=!!Fe,_.ajaxTransport(function(t){var e,r;if(m.cors||Fe&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");for(a in i)s.setRequestHeader(a,i[a]);e=function(t){return function(){e&&(e=r=s.onload=s.onerror=s.onabort=s.onreadystatechange=null,"abort"===t?s.abort():"error"===t?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Me[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=e(),r=s.onerror=e("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&n.setTimeout(function(){e&&r()})},e=e("abort");try{s.send(t.hasContent&&t.data||null)}catch(t){if(e)throw t}},abort:function(){e&&e()}}}),_.ajaxPrefilter(function(t){t.crossDomain&&(t.contents.script=!1)}),_.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(t){return _.globalEval(t),t}}}),_.ajaxPrefilter("script",function(t){void 0===t.cache&&(t.cache=!1),t.crossDomain&&(t.type="GET")}),_.ajaxTransport("script",function(t){var e,n;if(t.crossDomain)return{send:function(r,i){e=_("<script>").prop({charset:t.scriptCharset,src:t.url}).on("load error",n=function(t){e.remove(),n=null,t&&i("error"===t.type?404:200,t.type)}),a.head.appendChild(e[0])},abort:function(){n&&n()}}});var He,Be=[],We=/(=)\?(?=&|$)|\?\?/;_.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var t=Be.pop()||_.expando+"_"+ye++;return this[t]=!0,t}}),_.ajaxPrefilter("json jsonp",function(t,e,r){var i,o,a,s=!1!==t.jsonp&&(We.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&We.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=_.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(We,"$1"+i):!1!==t.jsonp&&(t.url+=(_e.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||_.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=n[i],n[i]=function(){a=arguments},r.always(function(){void 0===o?_(n).removeProp(i):n[i]=o,t[i]&&(t.jsonpCallback=e.jsonpCallback,Be.push(i)),a&&_.isFunction(o)&&o(a[0]),a=o=void 0}),"script"}),m.createHTMLDocument=((He=a.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===He.childNodes.length),_.parseHTML=function(t,e,n){return"string"!=typeof t?[]:("boolean"==typeof e&&(n=e,e=!1),e||(m.createHTMLDocument?((r=(e=a.implementation.createHTMLDocument("")).createElement("base")).href=a.location.href,e.head.appendChild(r)):e=a),i=D.exec(t),o=!n&&[],i?[e.createElement(i[1])]:(i=gt([t],e,o),o&&o.length&&_(o).remove(),_.merge([],i.childNodes)));var r,i,o},_.fn.load=function(t,e,n){var r,i,o,a=this,s=t.indexOf(" ");return s>-1&&(r=de(t.slice(s)),t=t.slice(0,s)),_.isFunction(e)?(n=e,e=void 0):e&&"object"==typeof e&&(i="POST"),a.length>0&&_.ajax({url:t,type:i||"GET",dataType:"html",data:e}).done(function(t){o=arguments,a.html(r?_("<div>").append(_.parseHTML(t)).find(r):t)}).always(n&&function(t,e){a.each(function(){n.apply(this,o||[t.responseText,e,t])})}),this},_.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(t,e){_.fn[e]=function(t){return this.on(e,t)}}),_.expr.pseudos.animated=function(t){return _.grep(_.timers,function(e){return t===e.elem}).length},_.offset={setOffset:function(t,e,n){var r,i,o,a,s,u,c=_.css(t,"position"),l=_(t),f={};"static"===c&&(t.style.position="relative"),s=l.offset(),o=_.css(t,"top"),u=_.css(t,"left"),("absolute"===c||"fixed"===c)&&(o+u).indexOf("auto")>-1?(a=(r=l.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),_.isFunction(e)&&(e=e.call(t,n,_.extend({},s))),null!=e.top&&(f.top=e.top-s.top+a),null!=e.left&&(f.left=e.left-s.left+i),"using"in e?e.using.call(t,f):l.css(f)}},_.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){_.offset.setOffset(this,t,e)});var e,n,r,i,o=this[0];return o?o.getClientRects().length?(r=o.getBoundingClientRect(),n=(e=o.ownerDocument).documentElement,i=e.defaultView,{top:r.top+i.pageYOffset-n.clientTop,left:r.left+i.pageXOffset-n.clientLeft}):{top:0,left:0}:void 0},position:function(){if(this[0]){var t,e,n=this[0],r={top:0,left:0};return"fixed"===_.css(n,"position")?e=n.getBoundingClientRect():(t=this.offsetParent(),e=this.offset(),O(t[0],"html")||(r=t.offset()),r={top:r.top+_.css(t[0],"borderTopWidth",!0),left:r.left+_.css(t[0],"borderLeftWidth",!0)}),{top:e.top-r.top-_.css(n,"marginTop",!0),left:e.left-r.left-_.css(n,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){for(var t=this.offsetParent;t&&"static"===_.css(t,"position");)t=t.offsetParent;return t||mt})}}),_.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,e){var n="pageYOffset"===e;_.fn[t]=function(r){return z(this,function(t,r,i){var o;if(_.isWindow(t)?o=t:9===t.nodeType&&(o=t.defaultView),void 0===i)return o?o[e]:t[r];o?o.scrollTo(n?o.pageXOffset:i,n?i:o.pageYOffset):t[r]=i},t,r,arguments.length)}}),_.each(["top","left"],function(t,e){_.cssHooks[e]=Ht(m.pixelPosition,function(t,n){if(n)return n=Ft(t,e),Pt.test(n)?_(t).position()[e]+"px":n})}),_.each({Height:"height",Width:"width"},function(t,e){_.each({padding:"inner"+t,content:e,"":"outer"+t},function(n,r){_.fn[r]=function(i,o){var a=arguments.length&&(n||"boolean"!=typeof i),s=n||(!0===i||!0===o?"margin":"border");return z(this,function(e,n,i){var o;return _.isWindow(e)?0===r.indexOf("outer")?e["inner"+t]:e.document.documentElement["client"+t]:9===e.nodeType?(o=e.documentElement,Math.max(e.body["scroll"+t],o["scroll"+t],e.body["offset"+t],o["offset"+t],o["client"+t])):void 0===i?_.css(e,n,s):_.style(e,n,i,s)},e,a?i:void 0,a)}})}),_.fn.extend({bind:function(t,e,n){return this.on(t,null,e,n)},unbind:function(t,e){return this.off(t,null,e)},delegate:function(t,e,n,r){return this.on(e,t,n,r)},undelegate:function(t,e,n){return 1===arguments.length?this.off(t,"**"):this.off(e,t||"**",n)}}),_.holdReady=function(t){t?_.readyWait++:_.ready(!0)},_.isArray=Array.isArray,_.parseJSON=JSON.parse,_.nodeName=O,void 0===(r=function(){return _}.apply(e,[]))||(t.exports=r);var qe=n.jQuery,Ue=n.$;return _.noConflict=function(t){return n.$===_&&(n.$=Ue),t&&n.jQuery===_&&(n.jQuery=qe),_},i||(n.jQuery=n.$=_),_})},function(t,e,n){"use strict";t.exports=function(t,e){return function(){for(var n=new Array(arguments.length),r=0;r<n.length;r++)n[r]=arguments[r];return t.apply(e,n)}}},function(t,e){var n,r,i=t.exports={};function o(){throw new Error("setTimeout has not been defined")}function a(){throw new Error("clearTimeout has not been defined")}function s(t){if(n===setTimeout)return setTimeout(t,0);if((n===o||!n)&&setTimeout)return n=setTimeout,setTimeout(t,0);try{return n(t,0)}catch(e){try{return n.call(null,t,0)}catch(e){return n.call(this,t,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:o}catch(t){n=o}try{r="function"==typeof clearTimeout?clearTimeout:a}catch(t){r=a}}();var u,c=[],l=!1,f=-1;function p(){l&&u&&(l=!1,u.length?c=u.concat(c):f=-1,c.length&&d())}function d(){if(!l){var t=s(p);l=!0;for(var e=c.length;e;){for(u=c,c=[];++f<e;)u&&u[f].run();f=-1,e=c.length}u=null,l=!1,function(t){if(r===clearTimeout)return clearTimeout(t);if((r===a||!r)&&clearTimeout)return r=clearTimeout,clearTimeout(t);try{r(t)}catch(e){try{return r.call(null,t)}catch(e){return r.call(this,t)}}}(t)}}function h(t,e){this.fun=t,this.array=e}function v(){}i.nextTick=function(t){var e=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)e[n-1]=arguments[n];c.push(new h(t,e)),1!==c.length||l||s(d)},h.prototype.run=function(){this.fun.apply(null,this.array)},i.title="browser",i.browser=!0,i.env={},i.argv=[],i.version="",i.versions={},i.on=v,i.addListener=v,i.once=v,i.off=v,i.removeListener=v,i.removeAllListeners=v,i.emit=v,i.prependListener=v,i.prependOnceListener=v,i.listeners=function(t){return[]},i.binding=function(t){throw new Error("process.binding is not supported")},i.cwd=function(){return"/"},i.chdir=function(t){throw new Error("process.chdir is not supported")},i.umask=function(){return 0}},function(t,e,n){"use strict";var r=n(0),i=n(22),o=n(24),a=n(25),s=n(26),u=n(8),c="undefined"!=typeof window&&window.btoa&&window.btoa.bind(window)||n(27);t.exports=function(t){return new Promise(function(e,l){var f=t.data,p=t.headers;r.isFormData(f)&&delete p["Content-Type"];var d=new XMLHttpRequest,h="onreadystatechange",v=!1;if("undefined"==typeof window||!window.XDomainRequest||"withCredentials"in d||s(t.url)||(d=new window.XDomainRequest,h="onload",v=!0,d.onprogress=function(){},d.ontimeout=function(){}),t.auth){var g=t.auth.username||"",m=t.auth.password||"";p.Authorization="Basic "+c(g+":"+m)}if(d.open(t.method.toUpperCase(),o(t.url,t.params,t.paramsSerializer),!0),d.timeout=t.timeout,d[h]=function(){if(d&&(4===d.readyState||v)&&(0!==d.status||d.responseURL&&0===d.responseURL.indexOf("file:"))){var n="getAllResponseHeaders"in d?a(d.getAllResponseHeaders()):null,r={data:t.responseType&&"text"!==t.responseType?d.response:d.responseText,status:1223===d.status?204:d.status,statusText:1223===d.status?"No Content":d.statusText,headers:n,config:t,request:d};i(e,l,r),d=null}},d.onerror=function(){l(u("Network Error",t,null,d)),d=null},d.ontimeout=function(){l(u("timeout of "+t.timeout+"ms exceeded",t,"ECONNABORTED",d)),d=null},r.isStandardBrowserEnv()){var y=n(28),_=(t.withCredentials||s(t.url))&&t.xsrfCookieName?y.read(t.xsrfCookieName):void 0;_&&(p[t.xsrfHeaderName]=_)}if("setRequestHeader"in d&&r.forEach(p,function(t,e){void 0===f&&"content-type"===e.toLowerCase()?delete p[e]:d.setRequestHeader(e,t)}),t.withCredentials&&(d.withCredentials=!0),t.responseType)try{d.responseType=t.responseType}catch(e){if("json"!==t.responseType)throw e}"function"==typeof t.onDownloadProgress&&d.addEventListener("progress",t.onDownloadProgress),"function"==typeof t.onUploadProgress&&d.upload&&d.upload.addEventListener("progress",t.onUploadProgress),t.cancelToken&&t.cancelToken.promise.then(function(t){d&&(d.abort(),l(t),d=null)}),void 0===f&&(f=null),d.send(f)})}},function(t,e,n){"use strict";var r=n(23);t.exports=function(t,e,n,i,o){var a=new Error(t);return r(a,e,n,i,o)}},function(t,e,n){"use strict";t.exports=function(t){return!(!t||!t.__CANCEL__)}},function(t,e,n){"use strict";function r(t){this.message=t}r.prototype.toString=function(){return"Cancel"+(this.message?": "+this.message:"")},r.prototype.__CANCEL__=!0,t.exports=r},function(t,e,n){n(12),t.exports=n(43)},function(t,e,n){n(13),window.Vue=n(36),Vue.component("example-component",n(39));new Vue({el:"#app"})},function(t,e,n){window._=n(14),window.Popper=n(3).default;try{window.$=window.jQuery=n(4),n(16)}catch(t){}window.axios=n(17),window.axios.defaults.headers.common["X-Requested-With"]="XMLHttpRequest";var r=document.head.querySelector('meta[name="csrf-token"]');r?window.axios.defaults.headers.common["X-CSRF-TOKEN"]=r.content:console.error("CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token")},function(t,e,n){(function(t,r){var i;(function(){var o,a=200,s="Unsupported core-js use. Try https://npms.io/search?q=ponyfill.",u="Expected a function",c="__lodash_hash_undefined__",l=500,f="__lodash_placeholder__",p=1,d=2,h=4,v=1,g=2,m=1,y=2,_=4,b=8,w=16,x=32,C=64,T=128,E=256,A=512,S=30,k="...",O=800,D=16,I=1,N=2,j=1/0,L=9007199254740991,$=1.7976931348623157e308,R=NaN,P=4294967295,M=P-1,F=P>>>1,H=[["ary",T],["bind",m],["bindKey",y],["curry",b],["curryRight",w],["flip",A],["partial",x],["partialRight",C],["rearg",E]],B="[object Arguments]",W="[object Array]",q="[object AsyncFunction]",U="[object Boolean]",z="[object Date]",V="[object DOMException]",K="[object Error]",Q="[object Function]",G="[object GeneratorFunction]",Y="[object Map]",X="[object Number]",J="[object Null]",Z="[object Object]",tt="[object Promise]",et="[object Proxy]",nt="[object RegExp]",rt="[object Set]",it="[object String]",ot="[object Symbol]",at="[object Undefined]",st="[object WeakMap]",ut="[object WeakSet]",ct="[object ArrayBuffer]",lt="[object DataView]",ft="[object Float32Array]",pt="[object Float64Array]",dt="[object Int8Array]",ht="[object Int16Array]",vt="[object Int32Array]",gt="[object Uint8Array]",mt="[object Uint8ClampedArray]",yt="[object Uint16Array]",_t="[object Uint32Array]",bt=/\b__p \+= '';/g,wt=/\b(__p \+=) '' \+/g,xt=/(__e\(.*?\)|\b__t\)) \+\n'';/g,Ct=/&(?:amp|lt|gt|quot|#39);/g,Tt=/[&<>"']/g,Et=RegExp(Ct.source),At=RegExp(Tt.source),St=/<%-([\s\S]+?)%>/g,kt=/<%([\s\S]+?)%>/g,Ot=/<%=([\s\S]+?)%>/g,Dt=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,It=/^\w*$/,Nt=/^\./,jt=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,Lt=/[\\^$.*+?()[\]{}|]/g,$t=RegExp(Lt.source),Rt=/^\s+|\s+$/g,Pt=/^\s+/,Mt=/\s+$/,Ft=/\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,Ht=/\{\n\/\* \[wrapped with (.+)\] \*/,Bt=/,? & /,Wt=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g,qt=/\\(\\)?/g,Ut=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,zt=/\w*$/,Vt=/^[-+]0x[0-9a-f]+$/i,Kt=/^0b[01]+$/i,Qt=/^\[object .+?Constructor\]$/,Gt=/^0o[0-7]+$/i,Yt=/^(?:0|[1-9]\d*)$/,Xt=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,Jt=/($^)/,Zt=/['\n\r\u2028\u2029\\]/g,te="\\ud800-\\udfff",ee="\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff",ne="\\u2700-\\u27bf",re="a-z\\xdf-\\xf6\\xf8-\\xff",ie="A-Z\\xc0-\\xd6\\xd8-\\xde",oe="\\ufe0e\\ufe0f",ae="\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",se="['’]",ue="["+te+"]",ce="["+ae+"]",le="["+ee+"]",fe="\\d+",pe="["+ne+"]",de="["+re+"]",he="[^"+te+ae+fe+ne+re+ie+"]",ve="\\ud83c[\\udffb-\\udfff]",ge="[^"+te+"]",me="(?:\\ud83c[\\udde6-\\uddff]){2}",ye="[\\ud800-\\udbff][\\udc00-\\udfff]",_e="["+ie+"]",be="\\u200d",we="(?:"+de+"|"+he+")",xe="(?:"+_e+"|"+he+")",Ce="(?:['’](?:d|ll|m|re|s|t|ve))?",Te="(?:['’](?:D|LL|M|RE|S|T|VE))?",Ee="(?:"+le+"|"+ve+")"+"?",Ae="["+oe+"]?",Se=Ae+Ee+("(?:"+be+"(?:"+[ge,me,ye].join("|")+")"+Ae+Ee+")*"),ke="(?:"+[pe,me,ye].join("|")+")"+Se,Oe="(?:"+[ge+le+"?",le,me,ye,ue].join("|")+")",De=RegExp(se,"g"),Ie=RegExp(le,"g"),Ne=RegExp(ve+"(?="+ve+")|"+Oe+Se,"g"),je=RegExp([_e+"?"+de+"+"+Ce+"(?="+[ce,_e,"$"].join("|")+")",xe+"+"+Te+"(?="+[ce,_e+we,"$"].join("|")+")",_e+"?"+we+"+"+Ce,_e+"+"+Te,"\\d*(?:(?:1ST|2ND|3RD|(?![123])\\dTH)\\b)","\\d*(?:(?:1st|2nd|3rd|(?![123])\\dth)\\b)",fe,ke].join("|"),"g"),Le=RegExp("["+be+te+ee+oe+"]"),$e=/[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,Re=["Array","Buffer","DataView","Date","Error","Float32Array","Float64Array","Function","Int8Array","Int16Array","Int32Array","Map","Math","Object","Promise","RegExp","Set","String","Symbol","TypeError","Uint8Array","Uint8ClampedArray","Uint16Array","Uint32Array","WeakMap","_","clearTimeout","isFinite","parseInt","setTimeout"],Pe=-1,Me={};Me[ft]=Me[pt]=Me[dt]=Me[ht]=Me[vt]=Me[gt]=Me[mt]=Me[yt]=Me[_t]=!0,Me[B]=Me[W]=Me[ct]=Me[U]=Me[lt]=Me[z]=Me[K]=Me[Q]=Me[Y]=Me[X]=Me[Z]=Me[nt]=Me[rt]=Me[it]=Me[st]=!1;var Fe={};Fe[B]=Fe[W]=Fe[ct]=Fe[lt]=Fe[U]=Fe[z]=Fe[ft]=Fe[pt]=Fe[dt]=Fe[ht]=Fe[vt]=Fe[Y]=Fe[X]=Fe[Z]=Fe[nt]=Fe[rt]=Fe[it]=Fe[ot]=Fe[gt]=Fe[mt]=Fe[yt]=Fe[_t]=!0,Fe[K]=Fe[Q]=Fe[st]=!1;var He={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},Be=parseFloat,We=parseInt,qe="object"==typeof t&&t&&t.Object===Object&&t,Ue="object"==typeof self&&self&&self.Object===Object&&self,ze=qe||Ue||Function("return this")(),Ve="object"==typeof e&&e&&!e.nodeType&&e,Ke=Ve&&"object"==typeof r&&r&&!r.nodeType&&r,Qe=Ke&&Ke.exports===Ve,Ge=Qe&&qe.process,Ye=function(){try{return Ge&&Ge.binding&&Ge.binding("util")}catch(t){}}(),Xe=Ye&&Ye.isArrayBuffer,Je=Ye&&Ye.isDate,Ze=Ye&&Ye.isMap,tn=Ye&&Ye.isRegExp,en=Ye&&Ye.isSet,nn=Ye&&Ye.isTypedArray;function rn(t,e){return t.set(e[0],e[1]),t}function on(t,e){return t.add(e),t}function an(t,e,n){switch(n.length){case 0:return t.call(e);case 1:return t.call(e,n[0]);case 2:return t.call(e,n[0],n[1]);case 3:return t.call(e,n[0],n[1],n[2])}return t.apply(e,n)}function sn(t,e,n,r){for(var i=-1,o=null==t?0:t.length;++i<o;){var a=t[i];e(r,a,n(a),t)}return r}function un(t,e){for(var n=-1,r=null==t?0:t.length;++n<r&&!1!==e(t[n],n,t););return t}function cn(t,e){for(var n=null==t?0:t.length;n--&&!1!==e(t[n],n,t););return t}function ln(t,e){for(var n=-1,r=null==t?0:t.length;++n<r;)if(!e(t[n],n,t))return!1;return!0}function fn(t,e){for(var n=-1,r=null==t?0:t.length,i=0,o=[];++n<r;){var a=t[n];e(a,n,t)&&(o[i++]=a)}return o}function pn(t,e){return!!(null==t?0:t.length)&&xn(t,e,0)>-1}function dn(t,e,n){for(var r=-1,i=null==t?0:t.length;++r<i;)if(n(e,t[r]))return!0;return!1}function hn(t,e){for(var n=-1,r=null==t?0:t.length,i=Array(r);++n<r;)i[n]=e(t[n],n,t);return i}function vn(t,e){for(var n=-1,r=e.length,i=t.length;++n<r;)t[i+n]=e[n];return t}function gn(t,e,n,r){var i=-1,o=null==t?0:t.length;for(r&&o&&(n=t[++i]);++i<o;)n=e(n,t[i],i,t);return n}function mn(t,e,n,r){var i=null==t?0:t.length;for(r&&i&&(n=t[--i]);i--;)n=e(n,t[i],i,t);return n}function yn(t,e){for(var n=-1,r=null==t?0:t.length;++n<r;)if(e(t[n],n,t))return!0;return!1}var _n=An("length");function bn(t,e,n){var r;return n(t,function(t,n,i){if(e(t,n,i))return r=n,!1}),r}function wn(t,e,n,r){for(var i=t.length,o=n+(r?1:-1);r?o--:++o<i;)if(e(t[o],o,t))return o;return-1}function xn(t,e,n){return e==e?function(t,e,n){var r=n-1,i=t.length;for(;++r<i;)if(t[r]===e)return r;return-1}(t,e,n):wn(t,Tn,n)}function Cn(t,e,n,r){for(var i=n-1,o=t.length;++i<o;)if(r(t[i],e))return i;return-1}function Tn(t){return t!=t}function En(t,e){var n=null==t?0:t.length;return n?On(t,e)/n:R}function An(t){return function(e){return null==e?o:e[t]}}function Sn(t){return function(e){return null==t?o:t[e]}}function kn(t,e,n,r,i){return i(t,function(t,i,o){n=r?(r=!1,t):e(n,t,i,o)}),n}function On(t,e){for(var n,r=-1,i=t.length;++r<i;){var a=e(t[r]);a!==o&&(n=n===o?a:n+a)}return n}function Dn(t,e){for(var n=-1,r=Array(t);++n<t;)r[n]=e(n);return r}function In(t){return function(e){return t(e)}}function Nn(t,e){return hn(e,function(e){return t[e]})}function jn(t,e){return t.has(e)}function Ln(t,e){for(var n=-1,r=t.length;++n<r&&xn(e,t[n],0)>-1;);return n}function $n(t,e){for(var n=t.length;n--&&xn(e,t[n],0)>-1;);return n}var Rn=Sn({"À":"A","Á":"A","Â":"A","Ã":"A","Ä":"A","Å":"A","à":"a","á":"a","â":"a","ã":"a","ä":"a","å":"a","Ç":"C","ç":"c","Ð":"D","ð":"d","È":"E","É":"E","Ê":"E","Ë":"E","è":"e","é":"e","ê":"e","ë":"e","Ì":"I","Í":"I","Î":"I","Ï":"I","ì":"i","í":"i","î":"i","ï":"i","Ñ":"N","ñ":"n","Ò":"O","Ó":"O","Ô":"O","Õ":"O","Ö":"O","Ø":"O","ò":"o","ó":"o","ô":"o","õ":"o","ö":"o","ø":"o","Ù":"U","Ú":"U","Û":"U","Ü":"U","ù":"u","ú":"u","û":"u","ü":"u","Ý":"Y","ý":"y","ÿ":"y","Æ":"Ae","æ":"ae","Þ":"Th","þ":"th","ß":"ss","Ā":"A","Ă":"A","Ą":"A","ā":"a","ă":"a","ą":"a","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","ć":"c","ĉ":"c","ċ":"c","č":"c","Ď":"D","Đ":"D","ď":"d","đ":"d","Ē":"E","Ĕ":"E","Ė":"E","Ę":"E","Ě":"E","ē":"e","ĕ":"e","ė":"e","ę":"e","ě":"e","Ĝ":"G","Ğ":"G","Ġ":"G","Ģ":"G","ĝ":"g","ğ":"g","ġ":"g","ģ":"g","Ĥ":"H","Ħ":"H","ĥ":"h","ħ":"h","Ĩ":"I","Ī":"I","Ĭ":"I","Į":"I","İ":"I","ĩ":"i","ī":"i","ĭ":"i","į":"i","ı":"i","Ĵ":"J","ĵ":"j","Ķ":"K","ķ":"k","ĸ":"k","Ĺ":"L","Ļ":"L","Ľ":"L","Ŀ":"L","Ł":"L","ĺ":"l","ļ":"l","ľ":"l","ŀ":"l","ł":"l","Ń":"N","Ņ":"N","Ň":"N","Ŋ":"N","ń":"n","ņ":"n","ň":"n","ŋ":"n","Ō":"O","Ŏ":"O","Ő":"O","ō":"o","ŏ":"o","ő":"o","Ŕ":"R","Ŗ":"R","Ř":"R","ŕ":"r","ŗ":"r","ř":"r","Ś":"S","Ŝ":"S","Ş":"S","Š":"S","ś":"s","ŝ":"s","ş":"s","š":"s","Ţ":"T","Ť":"T","Ŧ":"T","ţ":"t","ť":"t","ŧ":"t","Ũ":"U","Ū":"U","Ŭ":"U","Ů":"U","Ű":"U","Ų":"U","ũ":"u","ū":"u","ŭ":"u","ů":"u","ű":"u","ų":"u","Ŵ":"W","ŵ":"w","Ŷ":"Y","ŷ":"y","Ÿ":"Y","Ź":"Z","Ż":"Z","Ž":"Z","ź":"z","ż":"z","ž":"z","IJ":"IJ","ij":"ij","Œ":"Oe","œ":"oe","ʼn":"'n","ſ":"s"}),Pn=Sn({"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"});function Mn(t){return"\\"+He[t]}function Fn(t){return Le.test(t)}function Hn(t){var e=-1,n=Array(t.size);return t.forEach(function(t,r){n[++e]=[r,t]}),n}function Bn(t,e){return function(n){return t(e(n))}}function Wn(t,e){for(var n=-1,r=t.length,i=0,o=[];++n<r;){var a=t[n];a!==e&&a!==f||(t[n]=f,o[i++]=n)}return o}function qn(t){var e=-1,n=Array(t.size);return t.forEach(function(t){n[++e]=t}),n}function Un(t){return Fn(t)?function(t){var e=Ne.lastIndex=0;for(;Ne.test(t);)++e;return e}(t):_n(t)}function zn(t){return Fn(t)?t.match(Ne)||[]:t.split("")}var Vn=Sn({"&amp;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#39;":"'"});var Kn=function t(e){var n,r=(e=null==e?ze:Kn.defaults(ze.Object(),e,Kn.pick(ze,Re))).Array,i=e.Date,te=e.Error,ee=e.Function,ne=e.Math,re=e.Object,ie=e.RegExp,oe=e.String,ae=e.TypeError,se=r.prototype,ue=ee.prototype,ce=re.prototype,le=e["__core-js_shared__"],fe=ue.toString,pe=ce.hasOwnProperty,de=0,he=(n=/[^.]+$/.exec(le&&le.keys&&le.keys.IE_PROTO||""))?"Symbol(src)_1."+n:"",ve=ce.toString,ge=fe.call(re),me=ze._,ye=ie("^"+fe.call(pe).replace(Lt,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),_e=Qe?e.Buffer:o,be=e.Symbol,we=e.Uint8Array,xe=_e?_e.allocUnsafe:o,Ce=Bn(re.getPrototypeOf,re),Te=re.create,Ee=ce.propertyIsEnumerable,Ae=se.splice,Se=be?be.isConcatSpreadable:o,ke=be?be.iterator:o,Oe=be?be.toStringTag:o,Ne=function(){try{var t=Wo(re,"defineProperty");return t({},"",{}),t}catch(t){}}(),Le=e.clearTimeout!==ze.clearTimeout&&e.clearTimeout,He=i&&i.now!==ze.Date.now&&i.now,qe=e.setTimeout!==ze.setTimeout&&e.setTimeout,Ue=ne.ceil,Ve=ne.floor,Ke=re.getOwnPropertySymbols,Ge=_e?_e.isBuffer:o,Ye=e.isFinite,_n=se.join,Sn=Bn(re.keys,re),Qn=ne.max,Gn=ne.min,Yn=i.now,Xn=e.parseInt,Jn=ne.random,Zn=se.reverse,tr=Wo(e,"DataView"),er=Wo(e,"Map"),nr=Wo(e,"Promise"),rr=Wo(e,"Set"),ir=Wo(e,"WeakMap"),or=Wo(re,"create"),ar=ir&&new ir,sr={},ur=va(tr),cr=va(er),lr=va(nr),fr=va(rr),pr=va(ir),dr=be?be.prototype:o,hr=dr?dr.valueOf:o,vr=dr?dr.toString:o;function gr(t){if(Ns(t)&&!ws(t)&&!(t instanceof br)){if(t instanceof _r)return t;if(pe.call(t,"__wrapped__"))return ga(t)}return new _r(t)}var mr=function(){function t(){}return function(e){if(!Is(e))return{};if(Te)return Te(e);t.prototype=e;var n=new t;return t.prototype=o,n}}();function yr(){}function _r(t,e){this.__wrapped__=t,this.__actions__=[],this.__chain__=!!e,this.__index__=0,this.__values__=o}function br(t){this.__wrapped__=t,this.__actions__=[],this.__dir__=1,this.__filtered__=!1,this.__iteratees__=[],this.__takeCount__=P,this.__views__=[]}function wr(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e<n;){var r=t[e];this.set(r[0],r[1])}}function xr(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e<n;){var r=t[e];this.set(r[0],r[1])}}function Cr(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e<n;){var r=t[e];this.set(r[0],r[1])}}function Tr(t){var e=-1,n=null==t?0:t.length;for(this.__data__=new Cr;++e<n;)this.add(t[e])}function Er(t){var e=this.__data__=new xr(t);this.size=e.size}function Ar(t,e){var n=ws(t),r=!n&&bs(t),i=!n&&!r&&Es(t),o=!n&&!r&&!i&&Hs(t),a=n||r||i||o,s=a?Dn(t.length,oe):[],u=s.length;for(var c in t)!e&&!pe.call(t,c)||a&&("length"==c||i&&("offset"==c||"parent"==c)||o&&("buffer"==c||"byteLength"==c||"byteOffset"==c)||Go(c,u))||s.push(c);return s}function Sr(t){var e=t.length;return e?t[Ti(0,e-1)]:o}function kr(t,e){return la(oo(t),Pr(e,0,t.length))}function Or(t){return la(oo(t))}function Dr(t,e,n){(n===o||ms(t[e],n))&&(n!==o||e in t)||$r(t,e,n)}function Ir(t,e,n){var r=t[e];pe.call(t,e)&&ms(r,n)&&(n!==o||e in t)||$r(t,e,n)}function Nr(t,e){for(var n=t.length;n--;)if(ms(t[n][0],e))return n;return-1}function jr(t,e,n,r){return Wr(t,function(t,i,o){e(r,t,n(t),o)}),r}function Lr(t,e){return t&&ao(e,uu(e),t)}function $r(t,e,n){"__proto__"==e&&Ne?Ne(t,e,{configurable:!0,enumerable:!0,value:n,writable:!0}):t[e]=n}function Rr(t,e){for(var n=-1,i=e.length,a=r(i),s=null==t;++n<i;)a[n]=s?o:ru(t,e[n]);return a}function Pr(t,e,n){return t==t&&(n!==o&&(t=t<=n?t:n),e!==o&&(t=t>=e?t:e)),t}function Mr(t,e,n,r,i,a){var s,u=e&p,c=e&d,l=e&h;if(n&&(s=i?n(t,r,i,a):n(t)),s!==o)return s;if(!Is(t))return t;var f,v,g,m,y,_,b,w,x,C=ws(t);if(C){if(b=t,w=b.length,x=b.constructor(w),w&&"string"==typeof b[0]&&pe.call(b,"index")&&(x.index=b.index,x.input=b.input),s=x,!u)return oo(t,s)}else{var T=zo(t),E=T==Q||T==G;if(Es(t))return Zi(t,u);if(T==Z||T==B||E&&!i){if(s=c||E?{}:Ko(t),!u)return c?(g=t,_=t,m=(y=s)&&ao(_,cu(_),y),ao(g,Uo(g),m)):(f=t,v=Lr(s,t),ao(f,qo(f),v))}else{if(!Fe[T])return i?t:{};s=function(t,e,n,r){var i,o,a,s,u,c,l,f=t.constructor;switch(e){case ct:return to(t);case U:case z:return new f(+t);case lt:return c=t,l=r?to(c.buffer):c.buffer,new c.constructor(l,c.byteOffset,c.byteLength);case ft:case pt:case dt:case ht:case vt:case gt:case mt:case yt:case _t:return eo(t,r);case Y:return u=t,gn(r?n(Hn(u),p):Hn(u),rn,new u.constructor);case X:case it:return new f(t);case nt:return(s=new(a=t).constructor(a.source,zt.exec(a))).lastIndex=a.lastIndex,s;case rt:return o=t,gn(r?n(qn(o),p):qn(o),on,new o.constructor);case ot:return i=t,hr?re(hr.call(i)):{}}}(t,T,Mr,u)}}a||(a=new Er);var A=a.get(t);if(A)return A;a.set(t,s);var S=C?o:(l?c?$o:Lo:c?cu:uu)(t);return un(S||t,function(r,i){S&&(r=t[i=r]),Ir(s,i,Mr(r,e,n,i,t,a))}),s}function Fr(t,e,n){var r=n.length;if(null==t)return!r;for(t=re(t);r--;){var i=n[r],a=e[i],s=t[i];if(s===o&&!(i in t)||!a(s))return!1}return!0}function Hr(t,e,n){if("function"!=typeof t)throw new ae(u);return aa(function(){t.apply(o,n)},e)}function Br(t,e,n,r){var i=-1,o=pn,s=!0,u=t.length,c=[],l=e.length;if(!u)return c;n&&(e=hn(e,In(n))),r?(o=dn,s=!1):e.length>=a&&(o=jn,s=!1,e=new Tr(e));t:for(;++i<u;){var f=t[i],p=null==n?f:n(f);if(f=r||0!==f?f:0,s&&p==p){for(var d=l;d--;)if(e[d]===p)continue t;c.push(f)}else o(e,p,r)||c.push(f)}return c}gr.templateSettings={escape:St,evaluate:kt,interpolate:Ot,variable:"",imports:{_:gr}},gr.prototype=yr.prototype,gr.prototype.constructor=gr,_r.prototype=mr(yr.prototype),_r.prototype.constructor=_r,br.prototype=mr(yr.prototype),br.prototype.constructor=br,wr.prototype.clear=function(){this.__data__=or?or(null):{},this.size=0},wr.prototype.delete=function(t){var e=this.has(t)&&delete this.__data__[t];return this.size-=e?1:0,e},wr.prototype.get=function(t){var e=this.__data__;if(or){var n=e[t];return n===c?o:n}return pe.call(e,t)?e[t]:o},wr.prototype.has=function(t){var e=this.__data__;return or?e[t]!==o:pe.call(e,t)},wr.prototype.set=function(t,e){var n=this.__data__;return this.size+=this.has(t)?0:1,n[t]=or&&e===o?c:e,this},xr.prototype.clear=function(){this.__data__=[],this.size=0},xr.prototype.delete=function(t){var e=this.__data__,n=Nr(e,t);return!(n<0||(n==e.length-1?e.pop():Ae.call(e,n,1),--this.size,0))},xr.prototype.get=function(t){var e=this.__data__,n=Nr(e,t);return n<0?o:e[n][1]},xr.prototype.has=function(t){return Nr(this.__data__,t)>-1},xr.prototype.set=function(t,e){var n=this.__data__,r=Nr(n,t);return r<0?(++this.size,n.push([t,e])):n[r][1]=e,this},Cr.prototype.clear=function(){this.size=0,this.__data__={hash:new wr,map:new(er||xr),string:new wr}},Cr.prototype.delete=function(t){var e=Ho(this,t).delete(t);return this.size-=e?1:0,e},Cr.prototype.get=function(t){return Ho(this,t).get(t)},Cr.prototype.has=function(t){return Ho(this,t).has(t)},Cr.prototype.set=function(t,e){var n=Ho(this,t),r=n.size;return n.set(t,e),this.size+=n.size==r?0:1,this},Tr.prototype.add=Tr.prototype.push=function(t){return this.__data__.set(t,c),this},Tr.prototype.has=function(t){return this.__data__.has(t)},Er.prototype.clear=function(){this.__data__=new xr,this.size=0},Er.prototype.delete=function(t){var e=this.__data__,n=e.delete(t);return this.size=e.size,n},Er.prototype.get=function(t){return this.__data__.get(t)},Er.prototype.has=function(t){return this.__data__.has(t)},Er.prototype.set=function(t,e){var n=this.__data__;if(n instanceof xr){var r=n.__data__;if(!er||r.length<a-1)return r.push([t,e]),this.size=++n.size,this;n=this.__data__=new Cr(r)}return n.set(t,e),this.size=n.size,this};var Wr=co(Yr),qr=co(Xr,!0);function Ur(t,e){var n=!0;return Wr(t,function(t,r,i){return n=!!e(t,r,i)}),n}function zr(t,e,n){for(var r=-1,i=t.length;++r<i;){var a=t[r],s=e(a);if(null!=s&&(u===o?s==s&&!Fs(s):n(s,u)))var u=s,c=a}return c}function Vr(t,e){var n=[];return Wr(t,function(t,r,i){e(t,r,i)&&n.push(t)}),n}function Kr(t,e,n,r,i){var o=-1,a=t.length;for(n||(n=Qo),i||(i=[]);++o<a;){var s=t[o];e>0&&n(s)?e>1?Kr(s,e-1,n,r,i):vn(i,s):r||(i[i.length]=s)}return i}var Qr=lo(),Gr=lo(!0);function Yr(t,e){return t&&Qr(t,e,uu)}function Xr(t,e){return t&&Gr(t,e,uu)}function Jr(t,e){return fn(e,function(e){return ks(t[e])})}function Zr(t,e){for(var n=0,r=(e=Gi(e,t)).length;null!=t&&n<r;)t=t[ha(e[n++])];return n&&n==r?t:o}function ti(t,e,n){var r=e(t);return ws(t)?r:vn(r,n(t))}function ei(t){return null==t?t===o?at:J:Oe&&Oe in re(t)?function(t){var e=pe.call(t,Oe),n=t[Oe];try{t[Oe]=o;var r=!0}catch(t){}var i=ve.call(t);return r&&(e?t[Oe]=n:delete t[Oe]),i}(t):(e=t,ve.call(e));var e}function ni(t,e){return t>e}function ri(t,e){return null!=t&&pe.call(t,e)}function ii(t,e){return null!=t&&e in re(t)}function oi(t,e,n){for(var i=n?dn:pn,a=t[0].length,s=t.length,u=s,c=r(s),l=1/0,f=[];u--;){var p=t[u];u&&e&&(p=hn(p,In(e))),l=Gn(p.length,l),c[u]=!n&&(e||a>=120&&p.length>=120)?new Tr(u&&p):o}p=t[0];var d=-1,h=c[0];t:for(;++d<a&&f.length<l;){var v=p[d],g=e?e(v):v;if(v=n||0!==v?v:0,!(h?jn(h,g):i(f,g,n))){for(u=s;--u;){var m=c[u];if(!(m?jn(m,g):i(t[u],g,n)))continue t}h&&h.push(g),f.push(v)}}return f}function ai(t,e,n){var r=null==(t=ia(t,e=Gi(e,t)))?t:t[ha(Sa(e))];return null==r?o:an(r,t,n)}function si(t){return Ns(t)&&ei(t)==B}function ui(t,e,n,r,i){return t===e||(null==t||null==e||!Ns(t)&&!Ns(e)?t!=t&&e!=e:function(t,e,n,r,i,a){var s=ws(t),u=ws(e),c=s?W:zo(t),l=u?W:zo(e),f=(c=c==B?Z:c)==Z,p=(l=l==B?Z:l)==Z,d=c==l;if(d&&Es(t)){if(!Es(e))return!1;s=!0,f=!1}if(d&&!f)return a||(a=new Er),s||Hs(t)?No(t,e,n,r,i,a):function(t,e,n,r,i,o,a){switch(n){case lt:if(t.byteLength!=e.byteLength||t.byteOffset!=e.byteOffset)return!1;t=t.buffer,e=e.buffer;case ct:return!(t.byteLength!=e.byteLength||!o(new we(t),new we(e)));case U:case z:case X:return ms(+t,+e);case K:return t.name==e.name&&t.message==e.message;case nt:case it:return t==e+"";case Y:var s=Hn;case rt:var u=r&v;if(s||(s=qn),t.size!=e.size&&!u)return!1;var c=a.get(t);if(c)return c==e;r|=g,a.set(t,e);var l=No(s(t),s(e),r,i,o,a);return a.delete(t),l;case ot:if(hr)return hr.call(t)==hr.call(e)}return!1}(t,e,c,n,r,i,a);if(!(n&v)){var h=f&&pe.call(t,"__wrapped__"),m=p&&pe.call(e,"__wrapped__");if(h||m){var y=h?t.value():t,_=m?e.value():e;return a||(a=new Er),i(y,_,n,r,a)}}return!!d&&(a||(a=new Er),function(t,e,n,r,i,a){var s=n&v,u=Lo(t),c=u.length,l=Lo(e).length;if(c!=l&&!s)return!1;for(var f=c;f--;){var p=u[f];if(!(s?p in e:pe.call(e,p)))return!1}var d=a.get(t);if(d&&a.get(e))return d==e;var h=!0;a.set(t,e),a.set(e,t);for(var g=s;++f<c;){p=u[f];var m=t[p],y=e[p];if(r)var _=s?r(y,m,p,e,t,a):r(m,y,p,t,e,a);if(!(_===o?m===y||i(m,y,n,r,a):_)){h=!1;break}g||(g="constructor"==p)}if(h&&!g){var b=t.constructor,w=e.constructor;b!=w&&"constructor"in t&&"constructor"in e&&!("function"==typeof b&&b instanceof b&&"function"==typeof w&&w instanceof w)&&(h=!1)}return a.delete(t),a.delete(e),h}(t,e,n,r,i,a))}(t,e,n,r,ui,i))}function ci(t,e,n,r){var i=n.length,a=i,s=!r;if(null==t)return!a;for(t=re(t);i--;){var u=n[i];if(s&&u[2]?u[1]!==t[u[0]]:!(u[0]in t))return!1}for(;++i<a;){var c=(u=n[i])[0],l=t[c],f=u[1];if(s&&u[2]){if(l===o&&!(c in t))return!1}else{var p=new Er;if(r)var d=r(l,f,c,t,e,p);if(!(d===o?ui(f,l,v|g,r,p):d))return!1}}return!0}function li(t){return!(!Is(t)||he&&he in t)&&(ks(t)?ye:Qt).test(va(t))}function fi(t){return"function"==typeof t?t:null==t?Lu:"object"==typeof t?ws(t)?mi(t[0],t[1]):gi(t):qu(t)}function pi(t){if(!ta(t))return Sn(t);var e=[];for(var n in re(t))pe.call(t,n)&&"constructor"!=n&&e.push(n);return e}function di(t){if(!Is(t))return function(t){var e=[];if(null!=t)for(var n in re(t))e.push(n);return e}(t);var e=ta(t),n=[];for(var r in t)("constructor"!=r||!e&&pe.call(t,r))&&n.push(r);return n}function hi(t,e){return t<e}function vi(t,e){var n=-1,i=Cs(t)?r(t.length):[];return Wr(t,function(t,r,o){i[++n]=e(t,r,o)}),i}function gi(t){var e=Bo(t);return 1==e.length&&e[0][2]?na(e[0][0],e[0][1]):function(n){return n===t||ci(n,t,e)}}function mi(t,e){return Xo(t)&&ea(e)?na(ha(t),e):function(n){var r=ru(n,t);return r===o&&r===e?iu(n,t):ui(e,r,v|g)}}function yi(t,e,n,r,i){t!==e&&Qr(e,function(a,s){if(Is(a))i||(i=new Er),function(t,e,n,r,i,a,s){var u=t[n],c=e[n],l=s.get(c);if(l)Dr(t,n,l);else{var f=a?a(u,c,n+"",t,e,s):o,p=f===o;if(p){var d=ws(c),h=!d&&Es(c),v=!d&&!h&&Hs(c);f=c,d||h||v?ws(u)?f=u:Ts(u)?f=oo(u):h?(p=!1,f=Zi(c,!0)):v?(p=!1,f=eo(c,!0)):f=[]:$s(c)||bs(c)?(f=u,bs(u)?f=Qs(u):(!Is(u)||r&&ks(u))&&(f=Ko(c))):p=!1}p&&(s.set(c,f),i(f,c,r,a,s),s.delete(c)),Dr(t,n,f)}}(t,e,s,n,yi,r,i);else{var u=r?r(t[s],a,s+"",t,e,i):o;u===o&&(u=a),Dr(t,s,u)}},cu)}function _i(t,e){var n=t.length;if(n)return Go(e+=e<0?n:0,n)?t[e]:o}function bi(t,e,n){var r=-1;return e=hn(e.length?e:[Lu],In(Fo())),function(t,e){var n=t.length;for(t.sort(e);n--;)t[n]=t[n].value;return t}(vi(t,function(t,n,i){return{criteria:hn(e,function(e){return e(t)}),index:++r,value:t}}),function(t,e){return function(t,e,n){for(var r=-1,i=t.criteria,o=e.criteria,a=i.length,s=n.length;++r<a;){var u=no(i[r],o[r]);if(u){if(r>=s)return u;var c=n[r];return u*("desc"==c?-1:1)}}return t.index-e.index}(t,e,n)})}function wi(t,e,n){for(var r=-1,i=e.length,o={};++r<i;){var a=e[r],s=Zr(t,a);n(s,a)&&Oi(o,Gi(a,t),s)}return o}function xi(t,e,n,r){var i=r?Cn:xn,o=-1,a=e.length,s=t;for(t===e&&(e=oo(e)),n&&(s=hn(t,In(n)));++o<a;)for(var u=0,c=e[o],l=n?n(c):c;(u=i(s,l,u,r))>-1;)s!==t&&Ae.call(s,u,1),Ae.call(t,u,1);return t}function Ci(t,e){for(var n=t?e.length:0,r=n-1;n--;){var i=e[n];if(n==r||i!==o){var o=i;Go(i)?Ae.call(t,i,1):Bi(t,i)}}return t}function Ti(t,e){return t+Ve(Jn()*(e-t+1))}function Ei(t,e){var n="";if(!t||e<1||e>L)return n;do{e%2&&(n+=t),(e=Ve(e/2))&&(t+=t)}while(e);return n}function Ai(t,e){return sa(ra(t,e,Lu),t+"")}function Si(t){return Sr(mu(t))}function ki(t,e){var n=mu(t);return la(n,Pr(e,0,n.length))}function Oi(t,e,n,r){if(!Is(t))return t;for(var i=-1,a=(e=Gi(e,t)).length,s=a-1,u=t;null!=u&&++i<a;){var c=ha(e[i]),l=n;if(i!=s){var f=u[c];(l=r?r(f,c,u):o)===o&&(l=Is(f)?f:Go(e[i+1])?[]:{})}Ir(u,c,l),u=u[c]}return t}var Di=ar?function(t,e){return ar.set(t,e),t}:Lu,Ii=Ne?function(t,e){return Ne(t,"toString",{configurable:!0,enumerable:!1,value:Iu(e),writable:!0})}:Lu;function Ni(t){return la(mu(t))}function ji(t,e,n){var i=-1,o=t.length;e<0&&(e=-e>o?0:o+e),(n=n>o?o:n)<0&&(n+=o),o=e>n?0:n-e>>>0,e>>>=0;for(var a=r(o);++i<o;)a[i]=t[i+e];return a}function Li(t,e){var n;return Wr(t,function(t,r,i){return!(n=e(t,r,i))}),!!n}function $i(t,e,n){var r=0,i=null==t?r:t.length;if("number"==typeof e&&e==e&&i<=F){for(;r<i;){var o=r+i>>>1,a=t[o];null!==a&&!Fs(a)&&(n?a<=e:a<e)?r=o+1:i=o}return i}return Ri(t,e,Lu,n)}function Ri(t,e,n,r){e=n(e);for(var i=0,a=null==t?0:t.length,s=e!=e,u=null===e,c=Fs(e),l=e===o;i<a;){var f=Ve((i+a)/2),p=n(t[f]),d=p!==o,h=null===p,v=p==p,g=Fs(p);if(s)var m=r||v;else m=l?v&&(r||d):u?v&&d&&(r||!h):c?v&&d&&!h&&(r||!g):!h&&!g&&(r?p<=e:p<e);m?i=f+1:a=f}return Gn(a,M)}function Pi(t,e){for(var n=-1,r=t.length,i=0,o=[];++n<r;){var a=t[n],s=e?e(a):a;if(!n||!ms(s,u)){var u=s;o[i++]=0===a?0:a}}return o}function Mi(t){return"number"==typeof t?t:Fs(t)?R:+t}function Fi(t){if("string"==typeof t)return t;if(ws(t))return hn(t,Fi)+"";if(Fs(t))return vr?vr.call(t):"";var e=t+"";return"0"==e&&1/t==-j?"-0":e}function Hi(t,e,n){var r=-1,i=pn,o=t.length,s=!0,u=[],c=u;if(n)s=!1,i=dn;else if(o>=a){var l=e?null:Ao(t);if(l)return qn(l);s=!1,i=jn,c=new Tr}else c=e?[]:u;t:for(;++r<o;){var f=t[r],p=e?e(f):f;if(f=n||0!==f?f:0,s&&p==p){for(var d=c.length;d--;)if(c[d]===p)continue t;e&&c.push(p),u.push(f)}else i(c,p,n)||(c!==u&&c.push(p),u.push(f))}return u}function Bi(t,e){return null==(t=ia(t,e=Gi(e,t)))||delete t[ha(Sa(e))]}function Wi(t,e,n,r){return Oi(t,e,n(Zr(t,e)),r)}function qi(t,e,n,r){for(var i=t.length,o=r?i:-1;(r?o--:++o<i)&&e(t[o],o,t););return n?ji(t,r?0:o,r?o+1:i):ji(t,r?o+1:0,r?i:o)}function Ui(t,e){var n=t;return n instanceof br&&(n=n.value()),gn(e,function(t,e){return e.func.apply(e.thisArg,vn([t],e.args))},n)}function zi(t,e,n){var i=t.length;if(i<2)return i?Hi(t[0]):[];for(var o=-1,a=r(i);++o<i;)for(var s=t[o],u=-1;++u<i;)u!=o&&(a[o]=Br(a[o]||s,t[u],e,n));return Hi(Kr(a,1),e,n)}function Vi(t,e,n){for(var r=-1,i=t.length,a=e.length,s={};++r<i;){var u=r<a?e[r]:o;n(s,t[r],u)}return s}function Ki(t){return Ts(t)?t:[]}function Qi(t){return"function"==typeof t?t:Lu}function Gi(t,e){return ws(t)?t:Xo(t,e)?[t]:da(Gs(t))}var Yi=Ai;function Xi(t,e,n){var r=t.length;return n=n===o?r:n,!e&&n>=r?t:ji(t,e,n)}var Ji=Le||function(t){return ze.clearTimeout(t)};function Zi(t,e){if(e)return t.slice();var n=t.length,r=xe?xe(n):new t.constructor(n);return t.copy(r),r}function to(t){var e=new t.constructor(t.byteLength);return new we(e).set(new we(t)),e}function eo(t,e){var n=e?to(t.buffer):t.buffer;return new t.constructor(n,t.byteOffset,t.length)}function no(t,e){if(t!==e){var n=t!==o,r=null===t,i=t==t,a=Fs(t),s=e!==o,u=null===e,c=e==e,l=Fs(e);if(!u&&!l&&!a&&t>e||a&&s&&c&&!u&&!l||r&&s&&c||!n&&c||!i)return 1;if(!r&&!a&&!l&&t<e||l&&n&&i&&!r&&!a||u&&n&&i||!s&&i||!c)return-1}return 0}function ro(t,e,n,i){for(var o=-1,a=t.length,s=n.length,u=-1,c=e.length,l=Qn(a-s,0),f=r(c+l),p=!i;++u<c;)f[u]=e[u];for(;++o<s;)(p||o<a)&&(f[n[o]]=t[o]);for(;l--;)f[u++]=t[o++];return f}function io(t,e,n,i){for(var o=-1,a=t.length,s=-1,u=n.length,c=-1,l=e.length,f=Qn(a-u,0),p=r(f+l),d=!i;++o<f;)p[o]=t[o];for(var h=o;++c<l;)p[h+c]=e[c];for(;++s<u;)(d||o<a)&&(p[h+n[s]]=t[o++]);return p}function oo(t,e){var n=-1,i=t.length;for(e||(e=r(i));++n<i;)e[n]=t[n];return e}function ao(t,e,n,r){var i=!n;n||(n={});for(var a=-1,s=e.length;++a<s;){var u=e[a],c=r?r(n[u],t[u],u,n,t):o;c===o&&(c=t[u]),i?$r(n,u,c):Ir(n,u,c)}return n}function so(t,e){return function(n,r){var i=ws(n)?sn:jr,o=e?e():{};return i(n,t,Fo(r,2),o)}}function uo(t){return Ai(function(e,n){var r=-1,i=n.length,a=i>1?n[i-1]:o,s=i>2?n[2]:o;for(a=t.length>3&&"function"==typeof a?(i--,a):o,s&&Yo(n[0],n[1],s)&&(a=i<3?o:a,i=1),e=re(e);++r<i;){var u=n[r];u&&t(e,u,r,a)}return e})}function co(t,e){return function(n,r){if(null==n)return n;if(!Cs(n))return t(n,r);for(var i=n.length,o=e?i:-1,a=re(n);(e?o--:++o<i)&&!1!==r(a[o],o,a););return n}}function lo(t){return function(e,n,r){for(var i=-1,o=re(e),a=r(e),s=a.length;s--;){var u=a[t?s:++i];if(!1===n(o[u],u,o))break}return e}}function fo(t){return function(e){var n=Fn(e=Gs(e))?zn(e):o,r=n?n[0]:e.charAt(0),i=n?Xi(n,1).join(""):e.slice(1);return r[t]()+i}}function po(t){return function(e){return gn(ku(bu(e).replace(De,"")),t,"")}}function ho(t){return function(){var e=arguments;switch(e.length){case 0:return new t;case 1:return new t(e[0]);case 2:return new t(e[0],e[1]);case 3:return new t(e[0],e[1],e[2]);case 4:return new t(e[0],e[1],e[2],e[3]);case 5:return new t(e[0],e[1],e[2],e[3],e[4]);case 6:return new t(e[0],e[1],e[2],e[3],e[4],e[5]);case 7:return new t(e[0],e[1],e[2],e[3],e[4],e[5],e[6])}var n=mr(t.prototype),r=t.apply(n,e);return Is(r)?r:n}}function vo(t){return function(e,n,r){var i=re(e);if(!Cs(e)){var a=Fo(n,3);e=uu(e),n=function(t){return a(i[t],t,i)}}var s=t(e,n,r);return s>-1?i[a?e[s]:s]:o}}function go(t){return jo(function(e){var n=e.length,r=n,i=_r.prototype.thru;for(t&&e.reverse();r--;){var a=e[r];if("function"!=typeof a)throw new ae(u);if(i&&!s&&"wrapper"==Po(a))var s=new _r([],!0)}for(r=s?r:n;++r<n;){var c=Po(a=e[r]),l="wrapper"==c?Ro(a):o;s=l&&Jo(l[0])&&l[1]==(T|b|x|E)&&!l[4].length&&1==l[9]?s[Po(l[0])].apply(s,l[3]):1==a.length&&Jo(a)?s[c]():s.thru(a)}return function(){var t=arguments,r=t[0];if(s&&1==t.length&&ws(r))return s.plant(r).value();for(var i=0,o=n?e[i].apply(this,t):r;++i<n;)o=e[i].call(this,o);return o}})}function mo(t,e,n,i,a,s,u,c,l,f){var p=e&T,d=e&m,h=e&y,v=e&(b|w),g=e&A,_=h?o:ho(t);return function m(){for(var y=arguments.length,b=r(y),w=y;w--;)b[w]=arguments[w];if(v)var x=Mo(m),C=function(t,e){for(var n=t.length,r=0;n--;)t[n]===e&&++r;return r}(b,x);if(i&&(b=ro(b,i,a,v)),s&&(b=io(b,s,u,v)),y-=C,v&&y<f){var T=Wn(b,x);return To(t,e,mo,m.placeholder,n,b,T,c,l,f-y)}var E=d?n:this,A=h?E[t]:t;return y=b.length,c?b=function(t,e){for(var n=t.length,r=Gn(e.length,n),i=oo(t);r--;){var a=e[r];t[r]=Go(a,n)?i[a]:o}return t}(b,c):g&&y>1&&b.reverse(),p&&l<y&&(b.length=l),this&&this!==ze&&this instanceof m&&(A=_||ho(A)),A.apply(E,b)}}function yo(t,e){return function(n,r){return i=n,o=t,a=e(r),s={},Yr(i,function(t,e,n){o(s,a(t),e,n)}),s;var i,o,a,s}}function _o(t,e){return function(n,r){var i;if(n===o&&r===o)return e;if(n!==o&&(i=n),r!==o){if(i===o)return r;"string"==typeof n||"string"==typeof r?(n=Fi(n),r=Fi(r)):(n=Mi(n),r=Mi(r)),i=t(n,r)}return i}}function bo(t){return jo(function(e){return e=hn(e,In(Fo())),Ai(function(n){var r=this;return t(e,function(t){return an(t,r,n)})})})}function wo(t,e){var n=(e=e===o?" ":Fi(e)).length;if(n<2)return n?Ei(e,t):e;var r=Ei(e,Ue(t/Un(e)));return Fn(e)?Xi(zn(r),0,t).join(""):r.slice(0,t)}function xo(t){return function(e,n,i){return i&&"number"!=typeof i&&Yo(e,n,i)&&(n=i=o),e=Us(e),n===o?(n=e,e=0):n=Us(n),function(t,e,n,i){for(var o=-1,a=Qn(Ue((e-t)/(n||1)),0),s=r(a);a--;)s[i?a:++o]=t,t+=n;return s}(e,n,i=i===o?e<n?1:-1:Us(i),t)}}function Co(t){return function(e,n){return"string"==typeof e&&"string"==typeof n||(e=Ks(e),n=Ks(n)),t(e,n)}}function To(t,e,n,r,i,a,s,u,c,l){var f=e&b;e|=f?x:C,(e&=~(f?C:x))&_||(e&=~(m|y));var p=[t,e,i,f?a:o,f?s:o,f?o:a,f?o:s,u,c,l],d=n.apply(o,p);return Jo(t)&&oa(d,p),d.placeholder=r,ua(d,t,e)}function Eo(t){var e=ne[t];return function(t,n){if(t=Ks(t),n=null==n?0:Gn(zs(n),292)){var r=(Gs(t)+"e").split("e");return+((r=(Gs(e(r[0]+"e"+(+r[1]+n)))+"e").split("e"))[0]+"e"+(+r[1]-n))}return e(t)}}var Ao=rr&&1/qn(new rr([,-0]))[1]==j?function(t){return new rr(t)}:Fu;function So(t){return function(e){var n,r,i,o,a=zo(e);return a==Y?Hn(e):a==rt?(n=e,r=-1,i=Array(n.size),n.forEach(function(t){i[++r]=[t,t]}),i):(o=e,hn(t(e),function(t){return[t,o[t]]}))}}function ko(t,e,n,i,a,s,c,l){var p=e&y;if(!p&&"function"!=typeof t)throw new ae(u);var d=i?i.length:0;if(d||(e&=~(x|C),i=a=o),c=c===o?c:Qn(zs(c),0),l=l===o?l:zs(l),d-=a?a.length:0,e&C){var h=i,v=a;i=a=o}var g,A,S,k,O,D,I,N,j,L,$,R,P,M=p?o:Ro(t),F=[t,e,n,i,a,h,v,s,c,l];if(M&&function(t,e){var n=t[1],r=e[1],i=n|r,o=i<(m|y|T),a=r==T&&n==b||r==T&&n==E&&t[7].length<=e[8]||r==(T|E)&&e[7].length<=e[8]&&n==b;if(!o&&!a)return t;r&m&&(t[2]=e[2],i|=n&m?0:_);var s=e[3];if(s){var u=t[3];t[3]=u?ro(u,s,e[4]):s,t[4]=u?Wn(t[3],f):e[4]}(s=e[5])&&(u=t[5],t[5]=u?io(u,s,e[6]):s,t[6]=u?Wn(t[5],f):e[6]),(s=e[7])&&(t[7]=s),r&T&&(t[8]=null==t[8]?e[8]:Gn(t[8],e[8])),null==t[9]&&(t[9]=e[9]),t[0]=e[0],t[1]=i}(F,M),t=F[0],e=F[1],n=F[2],i=F[3],a=F[4],!(l=F[9]=F[9]===o?p?0:t.length:Qn(F[9]-d,0))&&e&(b|w)&&(e&=~(b|w)),e&&e!=m)e==b||e==w?(I=e,N=l,j=ho(D=t),H=function t(){for(var e=arguments.length,n=r(e),i=e,a=Mo(t);i--;)n[i]=arguments[i];var s=e<3&&n[0]!==a&&n[e-1]!==a?[]:Wn(n,a);return(e-=s.length)<N?To(D,I,mo,t.placeholder,o,n,s,o,o,N-e):an(this&&this!==ze&&this instanceof t?j:D,this,n)}):e!=x&&e!=(m|x)||a.length?H=mo.apply(o,F):(A=n,S=i,k=e&m,O=ho(g=t),H=function t(){for(var e=-1,n=arguments.length,i=-1,o=S.length,a=r(o+n),s=this&&this!==ze&&this instanceof t?O:g;++i<o;)a[i]=S[i];for(;n--;)a[i++]=arguments[++e];return an(s,k?A:this,a)});else var H=($=n,R=e&m,P=ho(L=t),function t(){return(this&&this!==ze&&this instanceof t?P:L).apply(R?$:this,arguments)});return ua((M?Di:oa)(H,F),t,e)}function Oo(t,e,n,r){return t===o||ms(t,ce[n])&&!pe.call(r,n)?e:t}function Do(t,e,n,r,i,a){return Is(t)&&Is(e)&&(a.set(e,t),yi(t,e,o,Do,a),a.delete(e)),t}function Io(t){return $s(t)?o:t}function No(t,e,n,r,i,a){var s=n&v,u=t.length,c=e.length;if(u!=c&&!(s&&c>u))return!1;var l=a.get(t);if(l&&a.get(e))return l==e;var f=-1,p=!0,d=n&g?new Tr:o;for(a.set(t,e),a.set(e,t);++f<u;){var h=t[f],m=e[f];if(r)var y=s?r(m,h,f,e,t,a):r(h,m,f,t,e,a);if(y!==o){if(y)continue;p=!1;break}if(d){if(!yn(e,function(t,e){if(!jn(d,e)&&(h===t||i(h,t,n,r,a)))return d.push(e)})){p=!1;break}}else if(h!==m&&!i(h,m,n,r,a)){p=!1;break}}return a.delete(t),a.delete(e),p}function jo(t){return sa(ra(t,o,xa),t+"")}function Lo(t){return ti(t,uu,qo)}function $o(t){return ti(t,cu,Uo)}var Ro=ar?function(t){return ar.get(t)}:Fu;function Po(t){for(var e=t.name+"",n=sr[e],r=pe.call(sr,e)?n.length:0;r--;){var i=n[r],o=i.func;if(null==o||o==t)return i.name}return e}function Mo(t){return(pe.call(gr,"placeholder")?gr:t).placeholder}function Fo(){var t=gr.iteratee||$u;return t=t===$u?fi:t,arguments.length?t(arguments[0],arguments[1]):t}function Ho(t,e){var n,r,i=t.__data__;return("string"==(r=typeof(n=e))||"number"==r||"symbol"==r||"boolean"==r?"__proto__"!==n:null===n)?i["string"==typeof e?"string":"hash"]:i.map}function Bo(t){for(var e=uu(t),n=e.length;n--;){var r=e[n],i=t[r];e[n]=[r,i,ea(i)]}return e}function Wo(t,e){var n,r=null==(n=t)?o:n[e];return li(r)?r:o}var qo=Ke?function(t){return null==t?[]:(t=re(t),fn(Ke(t),function(e){return Ee.call(t,e)}))}:Vu,Uo=Ke?function(t){for(var e=[];t;)vn(e,qo(t)),t=Ce(t);return e}:Vu,zo=ei;function Vo(t,e,n){for(var r=-1,i=(e=Gi(e,t)).length,o=!1;++r<i;){var a=ha(e[r]);if(!(o=null!=t&&n(t,a)))break;t=t[a]}return o||++r!=i?o:!!(i=null==t?0:t.length)&&Ds(i)&&Go(a,i)&&(ws(t)||bs(t))}function Ko(t){return"function"!=typeof t.constructor||ta(t)?{}:mr(Ce(t))}function Qo(t){return ws(t)||bs(t)||!!(Se&&t&&t[Se])}function Go(t,e){return!!(e=null==e?L:e)&&("number"==typeof t||Yt.test(t))&&t>-1&&t%1==0&&t<e}function Yo(t,e,n){if(!Is(n))return!1;var r=typeof e;return!!("number"==r?Cs(n)&&Go(e,n.length):"string"==r&&e in n)&&ms(n[e],t)}function Xo(t,e){if(ws(t))return!1;var n=typeof t;return!("number"!=n&&"symbol"!=n&&"boolean"!=n&&null!=t&&!Fs(t))||It.test(t)||!Dt.test(t)||null!=e&&t in re(e)}function Jo(t){var e=Po(t),n=gr[e];if("function"!=typeof n||!(e in br.prototype))return!1;if(t===n)return!0;var r=Ro(n);return!!r&&t===r[0]}(tr&&zo(new tr(new ArrayBuffer(1)))!=lt||er&&zo(new er)!=Y||nr&&zo(nr.resolve())!=tt||rr&&zo(new rr)!=rt||ir&&zo(new ir)!=st)&&(zo=function(t){var e=ei(t),n=e==Z?t.constructor:o,r=n?va(n):"";if(r)switch(r){case ur:return lt;case cr:return Y;case lr:return tt;case fr:return rt;case pr:return st}return e});var Zo=le?ks:Ku;function ta(t){var e=t&&t.constructor;return t===("function"==typeof e&&e.prototype||ce)}function ea(t){return t==t&&!Is(t)}function na(t,e){return function(n){return null!=n&&n[t]===e&&(e!==o||t in re(n))}}function ra(t,e,n){return e=Qn(e===o?t.length-1:e,0),function(){for(var i=arguments,o=-1,a=Qn(i.length-e,0),s=r(a);++o<a;)s[o]=i[e+o];o=-1;for(var u=r(e+1);++o<e;)u[o]=i[o];return u[e]=n(s),an(t,this,u)}}function ia(t,e){return e.length<2?t:Zr(t,ji(e,0,-1))}var oa=ca(Di),aa=qe||function(t,e){return ze.setTimeout(t,e)},sa=ca(Ii);function ua(t,e,n){var r,i,o,a=e+"";return sa(t,function(t,e){var n=e.length;if(!n)return t;var r=n-1;return e[r]=(n>1?"& ":"")+e[r],e=e.join(n>2?", ":" "),t.replace(Ft,"{\n/* [wrapped with "+e+"] */\n")}(a,(o=a.match(Ht),r=o?o[1].split(Bt):[],i=n,un(H,function(t){var e="_."+t[0];i&t[1]&&!pn(r,e)&&r.push(e)}),r.sort())))}function ca(t){var e=0,n=0;return function(){var r=Yn(),i=D-(r-n);if(n=r,i>0){if(++e>=O)return arguments[0]}else e=0;return t.apply(o,arguments)}}function la(t,e){var n=-1,r=t.length,i=r-1;for(e=e===o?r:e;++n<e;){var a=Ti(n,i),s=t[a];t[a]=t[n],t[n]=s}return t.length=e,t}var fa,pa,da=(fa=fs(function(t){var e=[];return Nt.test(t)&&e.push(""),t.replace(jt,function(t,n,r,i){e.push(r?i.replace(qt,"$1"):n||t)}),e},function(t){return pa.size===l&&pa.clear(),t}),pa=fa.cache,fa);function ha(t){if("string"==typeof t||Fs(t))return t;var e=t+"";return"0"==e&&1/t==-j?"-0":e}function va(t){if(null!=t){try{return fe.call(t)}catch(t){}try{return t+""}catch(t){}}return""}function ga(t){if(t instanceof br)return t.clone();var e=new _r(t.__wrapped__,t.__chain__);return e.__actions__=oo(t.__actions__),e.__index__=t.__index__,e.__values__=t.__values__,e}var ma=Ai(function(t,e){return Ts(t)?Br(t,Kr(e,1,Ts,!0)):[]}),ya=Ai(function(t,e){var n=Sa(e);return Ts(n)&&(n=o),Ts(t)?Br(t,Kr(e,1,Ts,!0),Fo(n,2)):[]}),_a=Ai(function(t,e){var n=Sa(e);return Ts(n)&&(n=o),Ts(t)?Br(t,Kr(e,1,Ts,!0),o,n):[]});function ba(t,e,n){var r=null==t?0:t.length;if(!r)return-1;var i=null==n?0:zs(n);return i<0&&(i=Qn(r+i,0)),wn(t,Fo(e,3),i)}function wa(t,e,n){var r=null==t?0:t.length;if(!r)return-1;var i=r-1;return n!==o&&(i=zs(n),i=n<0?Qn(r+i,0):Gn(i,r-1)),wn(t,Fo(e,3),i,!0)}function xa(t){return null!=t&&t.length?Kr(t,1):[]}function Ca(t){return t&&t.length?t[0]:o}var Ta=Ai(function(t){var e=hn(t,Ki);return e.length&&e[0]===t[0]?oi(e):[]}),Ea=Ai(function(t){var e=Sa(t),n=hn(t,Ki);return e===Sa(n)?e=o:n.pop(),n.length&&n[0]===t[0]?oi(n,Fo(e,2)):[]}),Aa=Ai(function(t){var e=Sa(t),n=hn(t,Ki);return(e="function"==typeof e?e:o)&&n.pop(),n.length&&n[0]===t[0]?oi(n,o,e):[]});function Sa(t){var e=null==t?0:t.length;return e?t[e-1]:o}var ka=Ai(Oa);function Oa(t,e){return t&&t.length&&e&&e.length?xi(t,e):t}var Da=jo(function(t,e){var n=null==t?0:t.length,r=Rr(t,e);return Ci(t,hn(e,function(t){return Go(t,n)?+t:t}).sort(no)),r});function Ia(t){return null==t?t:Zn.call(t)}var Na=Ai(function(t){return Hi(Kr(t,1,Ts,!0))}),ja=Ai(function(t){var e=Sa(t);return Ts(e)&&(e=o),Hi(Kr(t,1,Ts,!0),Fo(e,2))}),La=Ai(function(t){var e=Sa(t);return e="function"==typeof e?e:o,Hi(Kr(t,1,Ts,!0),o,e)});function $a(t){if(!t||!t.length)return[];var e=0;return t=fn(t,function(t){if(Ts(t))return e=Qn(t.length,e),!0}),Dn(e,function(e){return hn(t,An(e))})}function Ra(t,e){if(!t||!t.length)return[];var n=$a(t);return null==e?n:hn(n,function(t){return an(e,o,t)})}var Pa=Ai(function(t,e){return Ts(t)?Br(t,e):[]}),Ma=Ai(function(t){return zi(fn(t,Ts))}),Fa=Ai(function(t){var e=Sa(t);return Ts(e)&&(e=o),zi(fn(t,Ts),Fo(e,2))}),Ha=Ai(function(t){var e=Sa(t);return e="function"==typeof e?e:o,zi(fn(t,Ts),o,e)}),Ba=Ai($a);var Wa=Ai(function(t){var e=t.length,n=e>1?t[e-1]:o;return Ra(t,n="function"==typeof n?(t.pop(),n):o)});function qa(t){var e=gr(t);return e.__chain__=!0,e}function Ua(t,e){return e(t)}var za=jo(function(t){var e=t.length,n=e?t[0]:0,r=this.__wrapped__,i=function(e){return Rr(e,t)};return!(e>1||this.__actions__.length)&&r instanceof br&&Go(n)?((r=r.slice(n,+n+(e?1:0))).__actions__.push({func:Ua,args:[i],thisArg:o}),new _r(r,this.__chain__).thru(function(t){return e&&!t.length&&t.push(o),t})):this.thru(i)});var Va=so(function(t,e,n){pe.call(t,n)?++t[n]:$r(t,n,1)});var Ka=vo(ba),Qa=vo(wa);function Ga(t,e){return(ws(t)?un:Wr)(t,Fo(e,3))}function Ya(t,e){return(ws(t)?cn:qr)(t,Fo(e,3))}var Xa=so(function(t,e,n){pe.call(t,n)?t[n].push(e):$r(t,n,[e])});var Ja=Ai(function(t,e,n){var i=-1,o="function"==typeof e,a=Cs(t)?r(t.length):[];return Wr(t,function(t){a[++i]=o?an(e,t,n):ai(t,e,n)}),a}),Za=so(function(t,e,n){$r(t,n,e)});function ts(t,e){return(ws(t)?hn:vi)(t,Fo(e,3))}var es=so(function(t,e,n){t[n?0:1].push(e)},function(){return[[],[]]});var ns=Ai(function(t,e){if(null==t)return[];var n=e.length;return n>1&&Yo(t,e[0],e[1])?e=[]:n>2&&Yo(e[0],e[1],e[2])&&(e=[e[0]]),bi(t,Kr(e,1),[])}),rs=He||function(){return ze.Date.now()};function is(t,e,n){return e=n?o:e,e=t&&null==e?t.length:e,ko(t,T,o,o,o,o,e)}function os(t,e){var n;if("function"!=typeof e)throw new ae(u);return t=zs(t),function(){return--t>0&&(n=e.apply(this,arguments)),t<=1&&(e=o),n}}var as=Ai(function(t,e,n){var r=m;if(n.length){var i=Wn(n,Mo(as));r|=x}return ko(t,r,e,n,i)}),ss=Ai(function(t,e,n){var r=m|y;if(n.length){var i=Wn(n,Mo(ss));r|=x}return ko(e,r,t,n,i)});function us(t,e,n){var r,i,a,s,c,l,f=0,p=!1,d=!1,h=!0;if("function"!=typeof t)throw new ae(u);function v(e){var n=r,a=i;return r=i=o,f=e,s=t.apply(a,n)}function g(t){var n=t-l;return l===o||n>=e||n<0||d&&t-f>=a}function m(){var t,n,r=rs();if(g(r))return y(r);c=aa(m,(n=e-((t=r)-l),d?Gn(n,a-(t-f)):n))}function y(t){return c=o,h&&r?v(t):(r=i=o,s)}function _(){var t,n=rs(),a=g(n);if(r=arguments,i=this,l=n,a){if(c===o)return f=t=l,c=aa(m,e),p?v(t):s;if(d)return c=aa(m,e),v(l)}return c===o&&(c=aa(m,e)),s}return e=Ks(e)||0,Is(n)&&(p=!!n.leading,a=(d="maxWait"in n)?Qn(Ks(n.maxWait)||0,e):a,h="trailing"in n?!!n.trailing:h),_.cancel=function(){c!==o&&Ji(c),f=0,r=l=i=c=o},_.flush=function(){return c===o?s:y(rs())},_}var cs=Ai(function(t,e){return Hr(t,1,e)}),ls=Ai(function(t,e,n){return Hr(t,Ks(e)||0,n)});function fs(t,e){if("function"!=typeof t||null!=e&&"function"!=typeof e)throw new ae(u);var n=function(){var r=arguments,i=e?e.apply(this,r):r[0],o=n.cache;if(o.has(i))return o.get(i);var a=t.apply(this,r);return n.cache=o.set(i,a)||o,a};return n.cache=new(fs.Cache||Cr),n}function ps(t){if("function"!=typeof t)throw new ae(u);return function(){var e=arguments;switch(e.length){case 0:return!t.call(this);case 1:return!t.call(this,e[0]);case 2:return!t.call(this,e[0],e[1]);case 3:return!t.call(this,e[0],e[1],e[2])}return!t.apply(this,e)}}fs.Cache=Cr;var ds=Yi(function(t,e){var n=(e=1==e.length&&ws(e[0])?hn(e[0],In(Fo())):hn(Kr(e,1),In(Fo()))).length;return Ai(function(r){for(var i=-1,o=Gn(r.length,n);++i<o;)r[i]=e[i].call(this,r[i]);return an(t,this,r)})}),hs=Ai(function(t,e){var n=Wn(e,Mo(hs));return ko(t,x,o,e,n)}),vs=Ai(function(t,e){var n=Wn(e,Mo(vs));return ko(t,C,o,e,n)}),gs=jo(function(t,e){return ko(t,E,o,o,o,e)});function ms(t,e){return t===e||t!=t&&e!=e}var ys=Co(ni),_s=Co(function(t,e){return t>=e}),bs=si(function(){return arguments}())?si:function(t){return Ns(t)&&pe.call(t,"callee")&&!Ee.call(t,"callee")},ws=r.isArray,xs=Xe?In(Xe):function(t){return Ns(t)&&ei(t)==ct};function Cs(t){return null!=t&&Ds(t.length)&&!ks(t)}function Ts(t){return Ns(t)&&Cs(t)}var Es=Ge||Ku,As=Je?In(Je):function(t){return Ns(t)&&ei(t)==z};function Ss(t){if(!Ns(t))return!1;var e=ei(t);return e==K||e==V||"string"==typeof t.message&&"string"==typeof t.name&&!$s(t)}function ks(t){if(!Is(t))return!1;var e=ei(t);return e==Q||e==G||e==q||e==et}function Os(t){return"number"==typeof t&&t==zs(t)}function Ds(t){return"number"==typeof t&&t>-1&&t%1==0&&t<=L}function Is(t){var e=typeof t;return null!=t&&("object"==e||"function"==e)}function Ns(t){return null!=t&&"object"==typeof t}var js=Ze?In(Ze):function(t){return Ns(t)&&zo(t)==Y};function Ls(t){return"number"==typeof t||Ns(t)&&ei(t)==X}function $s(t){if(!Ns(t)||ei(t)!=Z)return!1;var e=Ce(t);if(null===e)return!0;var n=pe.call(e,"constructor")&&e.constructor;return"function"==typeof n&&n instanceof n&&fe.call(n)==ge}var Rs=tn?In(tn):function(t){return Ns(t)&&ei(t)==nt};var Ps=en?In(en):function(t){return Ns(t)&&zo(t)==rt};function Ms(t){return"string"==typeof t||!ws(t)&&Ns(t)&&ei(t)==it}function Fs(t){return"symbol"==typeof t||Ns(t)&&ei(t)==ot}var Hs=nn?In(nn):function(t){return Ns(t)&&Ds(t.length)&&!!Me[ei(t)]};var Bs=Co(hi),Ws=Co(function(t,e){return t<=e});function qs(t){if(!t)return[];if(Cs(t))return Ms(t)?zn(t):oo(t);if(ke&&t[ke])return function(t){for(var e,n=[];!(e=t.next()).done;)n.push(e.value);return n}(t[ke]());var e=zo(t);return(e==Y?Hn:e==rt?qn:mu)(t)}function Us(t){return t?(t=Ks(t))===j||t===-j?(t<0?-1:1)*$:t==t?t:0:0===t?t:0}function zs(t){var e=Us(t),n=e%1;return e==e?n?e-n:e:0}function Vs(t){return t?Pr(zs(t),0,P):0}function Ks(t){if("number"==typeof t)return t;if(Fs(t))return R;if(Is(t)){var e="function"==typeof t.valueOf?t.valueOf():t;t=Is(e)?e+"":e}if("string"!=typeof t)return 0===t?t:+t;t=t.replace(Rt,"");var n=Kt.test(t);return n||Gt.test(t)?We(t.slice(2),n?2:8):Vt.test(t)?R:+t}function Qs(t){return ao(t,cu(t))}function Gs(t){return null==t?"":Fi(t)}var Ys=uo(function(t,e){if(ta(e)||Cs(e))ao(e,uu(e),t);else for(var n in e)pe.call(e,n)&&Ir(t,n,e[n])}),Xs=uo(function(t,e){ao(e,cu(e),t)}),Js=uo(function(t,e,n,r){ao(e,cu(e),t,r)}),Zs=uo(function(t,e,n,r){ao(e,uu(e),t,r)}),tu=jo(Rr);var eu=Ai(function(t){return t.push(o,Oo),an(Js,o,t)}),nu=Ai(function(t){return t.push(o,Do),an(fu,o,t)});function ru(t,e,n){var r=null==t?o:Zr(t,e);return r===o?n:r}function iu(t,e){return null!=t&&Vo(t,e,ii)}var ou=yo(function(t,e,n){t[e]=n},Iu(Lu)),au=yo(function(t,e,n){pe.call(t,e)?t[e].push(n):t[e]=[n]},Fo),su=Ai(ai);function uu(t){return Cs(t)?Ar(t):pi(t)}function cu(t){return Cs(t)?Ar(t,!0):di(t)}var lu=uo(function(t,e,n){yi(t,e,n)}),fu=uo(function(t,e,n,r){yi(t,e,n,r)}),pu=jo(function(t,e){var n={};if(null==t)return n;var r=!1;e=hn(e,function(e){return e=Gi(e,t),r||(r=e.length>1),e}),ao(t,$o(t),n),r&&(n=Mr(n,p|d|h,Io));for(var i=e.length;i--;)Bi(n,e[i]);return n});var du=jo(function(t,e){return null==t?{}:wi(n=t,e,function(t,e){return iu(n,e)});var n});function hu(t,e){if(null==t)return{};var n=hn($o(t),function(t){return[t]});return e=Fo(e),wi(t,n,function(t,n){return e(t,n[0])})}var vu=So(uu),gu=So(cu);function mu(t){return null==t?[]:Nn(t,uu(t))}var yu=po(function(t,e,n){return e=e.toLowerCase(),t+(n?_u(e):e)});function _u(t){return Su(Gs(t).toLowerCase())}function bu(t){return(t=Gs(t))&&t.replace(Xt,Rn).replace(Ie,"")}var wu=po(function(t,e,n){return t+(n?"-":"")+e.toLowerCase()}),xu=po(function(t,e,n){return t+(n?" ":"")+e.toLowerCase()}),Cu=fo("toLowerCase");var Tu=po(function(t,e,n){return t+(n?"_":"")+e.toLowerCase()});var Eu=po(function(t,e,n){return t+(n?" ":"")+Su(e)});var Au=po(function(t,e,n){return t+(n?" ":"")+e.toUpperCase()}),Su=fo("toUpperCase");function ku(t,e,n){return t=Gs(t),(e=n?o:e)===o?(r=t,$e.test(r)?t.match(je)||[]:t.match(Wt)||[]):t.match(e)||[];var r}var Ou=Ai(function(t,e){try{return an(t,o,e)}catch(t){return Ss(t)?t:new te(t)}}),Du=jo(function(t,e){return un(e,function(e){e=ha(e),$r(t,e,as(t[e],t))}),t});function Iu(t){return function(){return t}}var Nu=go(),ju=go(!0);function Lu(t){return t}function $u(t){return fi("function"==typeof t?t:Mr(t,p))}var Ru=Ai(function(t,e){return function(n){return ai(n,t,e)}}),Pu=Ai(function(t,e){return function(n){return ai(t,n,e)}});function Mu(t,e,n){var r=uu(e),i=Jr(e,r);null!=n||Is(e)&&(i.length||!r.length)||(n=e,e=t,t=this,i=Jr(e,uu(e)));var o=!(Is(n)&&"chain"in n&&!n.chain),a=ks(t);return un(i,function(n){var r=e[n];t[n]=r,a&&(t.prototype[n]=function(){var e=this.__chain__;if(o||e){var n=t(this.__wrapped__);return(n.__actions__=oo(this.__actions__)).push({func:r,args:arguments,thisArg:t}),n.__chain__=e,n}return r.apply(t,vn([this.value()],arguments))})}),t}function Fu(){}var Hu=bo(hn),Bu=bo(ln),Wu=bo(yn);function qu(t){return Xo(t)?An(ha(t)):(e=t,function(t){return Zr(t,e)});var e}var Uu=xo(),zu=xo(!0);function Vu(){return[]}function Ku(){return!1}var Qu=_o(function(t,e){return t+e},0),Gu=Eo("ceil"),Yu=_o(function(t,e){return t/e},1),Xu=Eo("floor");var Ju,Zu=_o(function(t,e){return t*e},1),tc=Eo("round"),ec=_o(function(t,e){return t-e},0);return gr.after=function(t,e){if("function"!=typeof e)throw new ae(u);return t=zs(t),function(){if(--t<1)return e.apply(this,arguments)}},gr.ary=is,gr.assign=Ys,gr.assignIn=Xs,gr.assignInWith=Js,gr.assignWith=Zs,gr.at=tu,gr.before=os,gr.bind=as,gr.bindAll=Du,gr.bindKey=ss,gr.castArray=function(){if(!arguments.length)return[];var t=arguments[0];return ws(t)?t:[t]},gr.chain=qa,gr.chunk=function(t,e,n){e=(n?Yo(t,e,n):e===o)?1:Qn(zs(e),0);var i=null==t?0:t.length;if(!i||e<1)return[];for(var a=0,s=0,u=r(Ue(i/e));a<i;)u[s++]=ji(t,a,a+=e);return u},gr.compact=function(t){for(var e=-1,n=null==t?0:t.length,r=0,i=[];++e<n;){var o=t[e];o&&(i[r++]=o)}return i},gr.concat=function(){var t=arguments.length;if(!t)return[];for(var e=r(t-1),n=arguments[0],i=t;i--;)e[i-1]=arguments[i];return vn(ws(n)?oo(n):[n],Kr(e,1))},gr.cond=function(t){var e=null==t?0:t.length,n=Fo();return t=e?hn(t,function(t){if("function"!=typeof t[1])throw new ae(u);return[n(t[0]),t[1]]}):[],Ai(function(n){for(var r=-1;++r<e;){var i=t[r];if(an(i[0],this,n))return an(i[1],this,n)}})},gr.conforms=function(t){return e=Mr(t,p),n=uu(e),function(t){return Fr(t,e,n)};var e,n},gr.constant=Iu,gr.countBy=Va,gr.create=function(t,e){var n=mr(t);return null==e?n:Lr(n,e)},gr.curry=function t(e,n,r){var i=ko(e,b,o,o,o,o,o,n=r?o:n);return i.placeholder=t.placeholder,i},gr.curryRight=function t(e,n,r){var i=ko(e,w,o,o,o,o,o,n=r?o:n);return i.placeholder=t.placeholder,i},gr.debounce=us,gr.defaults=eu,gr.defaultsDeep=nu,gr.defer=cs,gr.delay=ls,gr.difference=ma,gr.differenceBy=ya,gr.differenceWith=_a,gr.drop=function(t,e,n){var r=null==t?0:t.length;return r?ji(t,(e=n||e===o?1:zs(e))<0?0:e,r):[]},gr.dropRight=function(t,e,n){var r=null==t?0:t.length;return r?ji(t,0,(e=r-(e=n||e===o?1:zs(e)))<0?0:e):[]},gr.dropRightWhile=function(t,e){return t&&t.length?qi(t,Fo(e,3),!0,!0):[]},gr.dropWhile=function(t,e){return t&&t.length?qi(t,Fo(e,3),!0):[]},gr.fill=function(t,e,n,r){var i=null==t?0:t.length;return i?(n&&"number"!=typeof n&&Yo(t,e,n)&&(n=0,r=i),function(t,e,n,r){var i=t.length;for((n=zs(n))<0&&(n=-n>i?0:i+n),(r=r===o||r>i?i:zs(r))<0&&(r+=i),r=n>r?0:Vs(r);n<r;)t[n++]=e;return t}(t,e,n,r)):[]},gr.filter=function(t,e){return(ws(t)?fn:Vr)(t,Fo(e,3))},gr.flatMap=function(t,e){return Kr(ts(t,e),1)},gr.flatMapDeep=function(t,e){return Kr(ts(t,e),j)},gr.flatMapDepth=function(t,e,n){return n=n===o?1:zs(n),Kr(ts(t,e),n)},gr.flatten=xa,gr.flattenDeep=function(t){return null!=t&&t.length?Kr(t,j):[]},gr.flattenDepth=function(t,e){return null!=t&&t.length?Kr(t,e=e===o?1:zs(e)):[]},gr.flip=function(t){return ko(t,A)},gr.flow=Nu,gr.flowRight=ju,gr.fromPairs=function(t){for(var e=-1,n=null==t?0:t.length,r={};++e<n;){var i=t[e];r[i[0]]=i[1]}return r},gr.functions=function(t){return null==t?[]:Jr(t,uu(t))},gr.functionsIn=function(t){return null==t?[]:Jr(t,cu(t))},gr.groupBy=Xa,gr.initial=function(t){return null!=t&&t.length?ji(t,0,-1):[]},gr.intersection=Ta,gr.intersectionBy=Ea,gr.intersectionWith=Aa,gr.invert=ou,gr.invertBy=au,gr.invokeMap=Ja,gr.iteratee=$u,gr.keyBy=Za,gr.keys=uu,gr.keysIn=cu,gr.map=ts,gr.mapKeys=function(t,e){var n={};return e=Fo(e,3),Yr(t,function(t,r,i){$r(n,e(t,r,i),t)}),n},gr.mapValues=function(t,e){var n={};return e=Fo(e,3),Yr(t,function(t,r,i){$r(n,r,e(t,r,i))}),n},gr.matches=function(t){return gi(Mr(t,p))},gr.matchesProperty=function(t,e){return mi(t,Mr(e,p))},gr.memoize=fs,gr.merge=lu,gr.mergeWith=fu,gr.method=Ru,gr.methodOf=Pu,gr.mixin=Mu,gr.negate=ps,gr.nthArg=function(t){return t=zs(t),Ai(function(e){return _i(e,t)})},gr.omit=pu,gr.omitBy=function(t,e){return hu(t,ps(Fo(e)))},gr.once=function(t){return os(2,t)},gr.orderBy=function(t,e,n,r){return null==t?[]:(ws(e)||(e=null==e?[]:[e]),ws(n=r?o:n)||(n=null==n?[]:[n]),bi(t,e,n))},gr.over=Hu,gr.overArgs=ds,gr.overEvery=Bu,gr.overSome=Wu,gr.partial=hs,gr.partialRight=vs,gr.partition=es,gr.pick=du,gr.pickBy=hu,gr.property=qu,gr.propertyOf=function(t){return function(e){return null==t?o:Zr(t,e)}},gr.pull=ka,gr.pullAll=Oa,gr.pullAllBy=function(t,e,n){return t&&t.length&&e&&e.length?xi(t,e,Fo(n,2)):t},gr.pullAllWith=function(t,e,n){return t&&t.length&&e&&e.length?xi(t,e,o,n):t},gr.pullAt=Da,gr.range=Uu,gr.rangeRight=zu,gr.rearg=gs,gr.reject=function(t,e){return(ws(t)?fn:Vr)(t,ps(Fo(e,3)))},gr.remove=function(t,e){var n=[];if(!t||!t.length)return n;var r=-1,i=[],o=t.length;for(e=Fo(e,3);++r<o;){var a=t[r];e(a,r,t)&&(n.push(a),i.push(r))}return Ci(t,i),n},gr.rest=function(t,e){if("function"!=typeof t)throw new ae(u);return Ai(t,e=e===o?e:zs(e))},gr.reverse=Ia,gr.sampleSize=function(t,e,n){return e=(n?Yo(t,e,n):e===o)?1:zs(e),(ws(t)?kr:ki)(t,e)},gr.set=function(t,e,n){return null==t?t:Oi(t,e,n)},gr.setWith=function(t,e,n,r){return r="function"==typeof r?r:o,null==t?t:Oi(t,e,n,r)},gr.shuffle=function(t){return(ws(t)?Or:Ni)(t)},gr.slice=function(t,e,n){var r=null==t?0:t.length;return r?(n&&"number"!=typeof n&&Yo(t,e,n)?(e=0,n=r):(e=null==e?0:zs(e),n=n===o?r:zs(n)),ji(t,e,n)):[]},gr.sortBy=ns,gr.sortedUniq=function(t){return t&&t.length?Pi(t):[]},gr.sortedUniqBy=function(t,e){return t&&t.length?Pi(t,Fo(e,2)):[]},gr.split=function(t,e,n){return n&&"number"!=typeof n&&Yo(t,e,n)&&(e=n=o),(n=n===o?P:n>>>0)?(t=Gs(t))&&("string"==typeof e||null!=e&&!Rs(e))&&!(e=Fi(e))&&Fn(t)?Xi(zn(t),0,n):t.split(e,n):[]},gr.spread=function(t,e){if("function"!=typeof t)throw new ae(u);return e=null==e?0:Qn(zs(e),0),Ai(function(n){var r=n[e],i=Xi(n,0,e);return r&&vn(i,r),an(t,this,i)})},gr.tail=function(t){var e=null==t?0:t.length;return e?ji(t,1,e):[]},gr.take=function(t,e,n){return t&&t.length?ji(t,0,(e=n||e===o?1:zs(e))<0?0:e):[]},gr.takeRight=function(t,e,n){var r=null==t?0:t.length;return r?ji(t,(e=r-(e=n||e===o?1:zs(e)))<0?0:e,r):[]},gr.takeRightWhile=function(t,e){return t&&t.length?qi(t,Fo(e,3),!1,!0):[]},gr.takeWhile=function(t,e){return t&&t.length?qi(t,Fo(e,3)):[]},gr.tap=function(t,e){return e(t),t},gr.throttle=function(t,e,n){var r=!0,i=!0;if("function"!=typeof t)throw new ae(u);return Is(n)&&(r="leading"in n?!!n.leading:r,i="trailing"in n?!!n.trailing:i),us(t,e,{leading:r,maxWait:e,trailing:i})},gr.thru=Ua,gr.toArray=qs,gr.toPairs=vu,gr.toPairsIn=gu,gr.toPath=function(t){return ws(t)?hn(t,ha):Fs(t)?[t]:oo(da(Gs(t)))},gr.toPlainObject=Qs,gr.transform=function(t,e,n){var r=ws(t),i=r||Es(t)||Hs(t);if(e=Fo(e,4),null==n){var o=t&&t.constructor;n=i?r?new o:[]:Is(t)&&ks(o)?mr(Ce(t)):{}}return(i?un:Yr)(t,function(t,r,i){return e(n,t,r,i)}),n},gr.unary=function(t){return is(t,1)},gr.union=Na,gr.unionBy=ja,gr.unionWith=La,gr.uniq=function(t){return t&&t.length?Hi(t):[]},gr.uniqBy=function(t,e){return t&&t.length?Hi(t,Fo(e,2)):[]},gr.uniqWith=function(t,e){return e="function"==typeof e?e:o,t&&t.length?Hi(t,o,e):[]},gr.unset=function(t,e){return null==t||Bi(t,e)},gr.unzip=$a,gr.unzipWith=Ra,gr.update=function(t,e,n){return null==t?t:Wi(t,e,Qi(n))},gr.updateWith=function(t,e,n,r){return r="function"==typeof r?r:o,null==t?t:Wi(t,e,Qi(n),r)},gr.values=mu,gr.valuesIn=function(t){return null==t?[]:Nn(t,cu(t))},gr.without=Pa,gr.words=ku,gr.wrap=function(t,e){return hs(Qi(e),t)},gr.xor=Ma,gr.xorBy=Fa,gr.xorWith=Ha,gr.zip=Ba,gr.zipObject=function(t,e){return Vi(t||[],e||[],Ir)},gr.zipObjectDeep=function(t,e){return Vi(t||[],e||[],Oi)},gr.zipWith=Wa,gr.entries=vu,gr.entriesIn=gu,gr.extend=Xs,gr.extendWith=Js,Mu(gr,gr),gr.add=Qu,gr.attempt=Ou,gr.camelCase=yu,gr.capitalize=_u,gr.ceil=Gu,gr.clamp=function(t,e,n){return n===o&&(n=e,e=o),n!==o&&(n=(n=Ks(n))==n?n:0),e!==o&&(e=(e=Ks(e))==e?e:0),Pr(Ks(t),e,n)},gr.clone=function(t){return Mr(t,h)},gr.cloneDeep=function(t){return Mr(t,p|h)},gr.cloneDeepWith=function(t,e){return Mr(t,p|h,e="function"==typeof e?e:o)},gr.cloneWith=function(t,e){return Mr(t,h,e="function"==typeof e?e:o)},gr.conformsTo=function(t,e){return null==e||Fr(t,e,uu(e))},gr.deburr=bu,gr.defaultTo=function(t,e){return null==t||t!=t?e:t},gr.divide=Yu,gr.endsWith=function(t,e,n){t=Gs(t),e=Fi(e);var r=t.length,i=n=n===o?r:Pr(zs(n),0,r);return(n-=e.length)>=0&&t.slice(n,i)==e},gr.eq=ms,gr.escape=function(t){return(t=Gs(t))&&At.test(t)?t.replace(Tt,Pn):t},gr.escapeRegExp=function(t){return(t=Gs(t))&&$t.test(t)?t.replace(Lt,"\\$&"):t},gr.every=function(t,e,n){var r=ws(t)?ln:Ur;return n&&Yo(t,e,n)&&(e=o),r(t,Fo(e,3))},gr.find=Ka,gr.findIndex=ba,gr.findKey=function(t,e){return bn(t,Fo(e,3),Yr)},gr.findLast=Qa,gr.findLastIndex=wa,gr.findLastKey=function(t,e){return bn(t,Fo(e,3),Xr)},gr.floor=Xu,gr.forEach=Ga,gr.forEachRight=Ya,gr.forIn=function(t,e){return null==t?t:Qr(t,Fo(e,3),cu)},gr.forInRight=function(t,e){return null==t?t:Gr(t,Fo(e,3),cu)},gr.forOwn=function(t,e){return t&&Yr(t,Fo(e,3))},gr.forOwnRight=function(t,e){return t&&Xr(t,Fo(e,3))},gr.get=ru,gr.gt=ys,gr.gte=_s,gr.has=function(t,e){return null!=t&&Vo(t,e,ri)},gr.hasIn=iu,gr.head=Ca,gr.identity=Lu,gr.includes=function(t,e,n,r){t=Cs(t)?t:mu(t),n=n&&!r?zs(n):0;var i=t.length;return n<0&&(n=Qn(i+n,0)),Ms(t)?n<=i&&t.indexOf(e,n)>-1:!!i&&xn(t,e,n)>-1},gr.indexOf=function(t,e,n){var r=null==t?0:t.length;if(!r)return-1;var i=null==n?0:zs(n);return i<0&&(i=Qn(r+i,0)),xn(t,e,i)},gr.inRange=function(t,e,n){return e=Us(e),n===o?(n=e,e=0):n=Us(n),t=Ks(t),(r=t)>=Gn(i=e,a=n)&&r<Qn(i,a);var r,i,a},gr.invoke=su,gr.isArguments=bs,gr.isArray=ws,gr.isArrayBuffer=xs,gr.isArrayLike=Cs,gr.isArrayLikeObject=Ts,gr.isBoolean=function(t){return!0===t||!1===t||Ns(t)&&ei(t)==U},gr.isBuffer=Es,gr.isDate=As,gr.isElement=function(t){return Ns(t)&&1===t.nodeType&&!$s(t)},gr.isEmpty=function(t){if(null==t)return!0;if(Cs(t)&&(ws(t)||"string"==typeof t||"function"==typeof t.splice||Es(t)||Hs(t)||bs(t)))return!t.length;var e=zo(t);if(e==Y||e==rt)return!t.size;if(ta(t))return!pi(t).length;for(var n in t)if(pe.call(t,n))return!1;return!0},gr.isEqual=function(t,e){return ui(t,e)},gr.isEqualWith=function(t,e,n){var r=(n="function"==typeof n?n:o)?n(t,e):o;return r===o?ui(t,e,o,n):!!r},gr.isError=Ss,gr.isFinite=function(t){return"number"==typeof t&&Ye(t)},gr.isFunction=ks,gr.isInteger=Os,gr.isLength=Ds,gr.isMap=js,gr.isMatch=function(t,e){return t===e||ci(t,e,Bo(e))},gr.isMatchWith=function(t,e,n){return n="function"==typeof n?n:o,ci(t,e,Bo(e),n)},gr.isNaN=function(t){return Ls(t)&&t!=+t},gr.isNative=function(t){if(Zo(t))throw new te(s);return li(t)},gr.isNil=function(t){return null==t},gr.isNull=function(t){return null===t},gr.isNumber=Ls,gr.isObject=Is,gr.isObjectLike=Ns,gr.isPlainObject=$s,gr.isRegExp=Rs,gr.isSafeInteger=function(t){return Os(t)&&t>=-L&&t<=L},gr.isSet=Ps,gr.isString=Ms,gr.isSymbol=Fs,gr.isTypedArray=Hs,gr.isUndefined=function(t){return t===o},gr.isWeakMap=function(t){return Ns(t)&&zo(t)==st},gr.isWeakSet=function(t){return Ns(t)&&ei(t)==ut},gr.join=function(t,e){return null==t?"":_n.call(t,e)},gr.kebabCase=wu,gr.last=Sa,gr.lastIndexOf=function(t,e,n){var r=null==t?0:t.length;if(!r)return-1;var i=r;return n!==o&&(i=(i=zs(n))<0?Qn(r+i,0):Gn(i,r-1)),e==e?function(t,e,n){for(var r=n+1;r--;)if(t[r]===e)return r;return r}(t,e,i):wn(t,Tn,i,!0)},gr.lowerCase=xu,gr.lowerFirst=Cu,gr.lt=Bs,gr.lte=Ws,gr.max=function(t){return t&&t.length?zr(t,Lu,ni):o},gr.maxBy=function(t,e){return t&&t.length?zr(t,Fo(e,2),ni):o},gr.mean=function(t){return En(t,Lu)},gr.meanBy=function(t,e){return En(t,Fo(e,2))},gr.min=function(t){return t&&t.length?zr(t,Lu,hi):o},gr.minBy=function(t,e){return t&&t.length?zr(t,Fo(e,2),hi):o},gr.stubArray=Vu,gr.stubFalse=Ku,gr.stubObject=function(){return{}},gr.stubString=function(){return""},gr.stubTrue=function(){return!0},gr.multiply=Zu,gr.nth=function(t,e){return t&&t.length?_i(t,zs(e)):o},gr.noConflict=function(){return ze._===this&&(ze._=me),this},gr.noop=Fu,gr.now=rs,gr.pad=function(t,e,n){t=Gs(t);var r=(e=zs(e))?Un(t):0;if(!e||r>=e)return t;var i=(e-r)/2;return wo(Ve(i),n)+t+wo(Ue(i),n)},gr.padEnd=function(t,e,n){t=Gs(t);var r=(e=zs(e))?Un(t):0;return e&&r<e?t+wo(e-r,n):t},gr.padStart=function(t,e,n){t=Gs(t);var r=(e=zs(e))?Un(t):0;return e&&r<e?wo(e-r,n)+t:t},gr.parseInt=function(t,e,n){return n||null==e?e=0:e&&(e=+e),Xn(Gs(t).replace(Pt,""),e||0)},gr.random=function(t,e,n){if(n&&"boolean"!=typeof n&&Yo(t,e,n)&&(e=n=o),n===o&&("boolean"==typeof e?(n=e,e=o):"boolean"==typeof t&&(n=t,t=o)),t===o&&e===o?(t=0,e=1):(t=Us(t),e===o?(e=t,t=0):e=Us(e)),t>e){var r=t;t=e,e=r}if(n||t%1||e%1){var i=Jn();return Gn(t+i*(e-t+Be("1e-"+((i+"").length-1))),e)}return Ti(t,e)},gr.reduce=function(t,e,n){var r=ws(t)?gn:kn,i=arguments.length<3;return r(t,Fo(e,4),n,i,Wr)},gr.reduceRight=function(t,e,n){var r=ws(t)?mn:kn,i=arguments.length<3;return r(t,Fo(e,4),n,i,qr)},gr.repeat=function(t,e,n){return e=(n?Yo(t,e,n):e===o)?1:zs(e),Ei(Gs(t),e)},gr.replace=function(){var t=arguments,e=Gs(t[0]);return t.length<3?e:e.replace(t[1],t[2])},gr.result=function(t,e,n){var r=-1,i=(e=Gi(e,t)).length;for(i||(i=1,t=o);++r<i;){var a=null==t?o:t[ha(e[r])];a===o&&(r=i,a=n),t=ks(a)?a.call(t):a}return t},gr.round=tc,gr.runInContext=t,gr.sample=function(t){return(ws(t)?Sr:Si)(t)},gr.size=function(t){if(null==t)return 0;if(Cs(t))return Ms(t)?Un(t):t.length;var e=zo(t);return e==Y||e==rt?t.size:pi(t).length},gr.snakeCase=Tu,gr.some=function(t,e,n){var r=ws(t)?yn:Li;return n&&Yo(t,e,n)&&(e=o),r(t,Fo(e,3))},gr.sortedIndex=function(t,e){return $i(t,e)},gr.sortedIndexBy=function(t,e,n){return Ri(t,e,Fo(n,2))},gr.sortedIndexOf=function(t,e){var n=null==t?0:t.length;if(n){var r=$i(t,e);if(r<n&&ms(t[r],e))return r}return-1},gr.sortedLastIndex=function(t,e){return $i(t,e,!0)},gr.sortedLastIndexBy=function(t,e,n){return Ri(t,e,Fo(n,2),!0)},gr.sortedLastIndexOf=function(t,e){if(null!=t&&t.length){var n=$i(t,e,!0)-1;if(ms(t[n],e))return n}return-1},gr.startCase=Eu,gr.startsWith=function(t,e,n){return t=Gs(t),n=null==n?0:Pr(zs(n),0,t.length),e=Fi(e),t.slice(n,n+e.length)==e},gr.subtract=ec,gr.sum=function(t){return t&&t.length?On(t,Lu):0},gr.sumBy=function(t,e){return t&&t.length?On(t,Fo(e,2)):0},gr.template=function(t,e,n){var r=gr.templateSettings;n&&Yo(t,e,n)&&(e=o),t=Gs(t),e=Js({},e,r,Oo);var i,a,s=Js({},e.imports,r.imports,Oo),u=uu(s),c=Nn(s,u),l=0,f=e.interpolate||Jt,p="__p += '",d=ie((e.escape||Jt).source+"|"+f.source+"|"+(f===Ot?Ut:Jt).source+"|"+(e.evaluate||Jt).source+"|$","g"),h="//# sourceURL="+("sourceURL"in e?e.sourceURL:"lodash.templateSources["+ ++Pe+"]")+"\n";t.replace(d,function(e,n,r,o,s,u){return r||(r=o),p+=t.slice(l,u).replace(Zt,Mn),n&&(i=!0,p+="' +\n__e("+n+") +\n'"),s&&(a=!0,p+="';\n"+s+";\n__p += '"),r&&(p+="' +\n((__t = ("+r+")) == null ? '' : __t) +\n'"),l=u+e.length,e}),p+="';\n";var v=e.variable;v||(p="with (obj) {\n"+p+"\n}\n"),p=(a?p.replace(bt,""):p).replace(wt,"$1").replace(xt,"$1;"),p="function("+(v||"obj")+") {\n"+(v?"":"obj || (obj = {});\n")+"var __t, __p = ''"+(i?", __e = _.escape":"")+(a?", __j = Array.prototype.join;\nfunction print() { __p += __j.call(arguments, '') }\n":";\n")+p+"return __p\n}";var g=Ou(function(){return ee(u,h+"return "+p).apply(o,c)});if(g.source=p,Ss(g))throw g;return g},gr.times=function(t,e){if((t=zs(t))<1||t>L)return[];var n=P,r=Gn(t,P);e=Fo(e),t-=P;for(var i=Dn(r,e);++n<t;)e(n);return i},gr.toFinite=Us,gr.toInteger=zs,gr.toLength=Vs,gr.toLower=function(t){return Gs(t).toLowerCase()},gr.toNumber=Ks,gr.toSafeInteger=function(t){return t?Pr(zs(t),-L,L):0===t?t:0},gr.toString=Gs,gr.toUpper=function(t){return Gs(t).toUpperCase()},gr.trim=function(t,e,n){if((t=Gs(t))&&(n||e===o))return t.replace(Rt,"");if(!t||!(e=Fi(e)))return t;var r=zn(t),i=zn(e);return Xi(r,Ln(r,i),$n(r,i)+1).join("")},gr.trimEnd=function(t,e,n){if((t=Gs(t))&&(n||e===o))return t.replace(Mt,"");if(!t||!(e=Fi(e)))return t;var r=zn(t);return Xi(r,0,$n(r,zn(e))+1).join("")},gr.trimStart=function(t,e,n){if((t=Gs(t))&&(n||e===o))return t.replace(Pt,"");if(!t||!(e=Fi(e)))return t;var r=zn(t);return Xi(r,Ln(r,zn(e))).join("")},gr.truncate=function(t,e){var n=S,r=k;if(Is(e)){var i="separator"in e?e.separator:i;n="length"in e?zs(e.length):n,r="omission"in e?Fi(e.omission):r}var a=(t=Gs(t)).length;if(Fn(t)){var s=zn(t);a=s.length}if(n>=a)return t;var u=n-Un(r);if(u<1)return r;var c=s?Xi(s,0,u).join(""):t.slice(0,u);if(i===o)return c+r;if(s&&(u+=c.length-u),Rs(i)){if(t.slice(u).search(i)){var l,f=c;for(i.global||(i=ie(i.source,Gs(zt.exec(i))+"g")),i.lastIndex=0;l=i.exec(f);)var p=l.index;c=c.slice(0,p===o?u:p)}}else if(t.indexOf(Fi(i),u)!=u){var d=c.lastIndexOf(i);d>-1&&(c=c.slice(0,d))}return c+r},gr.unescape=function(t){return(t=Gs(t))&&Et.test(t)?t.replace(Ct,Vn):t},gr.uniqueId=function(t){var e=++de;return Gs(t)+e},gr.upperCase=Au,gr.upperFirst=Su,gr.each=Ga,gr.eachRight=Ya,gr.first=Ca,Mu(gr,(Ju={},Yr(gr,function(t,e){pe.call(gr.prototype,e)||(Ju[e]=t)}),Ju),{chain:!1}),gr.VERSION="4.17.4",un(["bind","bindKey","curry","curryRight","partial","partialRight"],function(t){gr[t].placeholder=gr}),un(["drop","take"],function(t,e){br.prototype[t]=function(n){n=n===o?1:Qn(zs(n),0);var r=this.__filtered__&&!e?new br(this):this.clone();return r.__filtered__?r.__takeCount__=Gn(n,r.__takeCount__):r.__views__.push({size:Gn(n,P),type:t+(r.__dir__<0?"Right":"")}),r},br.prototype[t+"Right"]=function(e){return this.reverse()[t](e).reverse()}}),un(["filter","map","takeWhile"],function(t,e){var n=e+1,r=n==I||3==n;br.prototype[t]=function(t){var e=this.clone();return e.__iteratees__.push({iteratee:Fo(t,3),type:n}),e.__filtered__=e.__filtered__||r,e}}),un(["head","last"],function(t,e){var n="take"+(e?"Right":"");br.prototype[t]=function(){return this[n](1).value()[0]}}),un(["initial","tail"],function(t,e){var n="drop"+(e?"":"Right");br.prototype[t]=function(){return this.__filtered__?new br(this):this[n](1)}}),br.prototype.compact=function(){return this.filter(Lu)},br.prototype.find=function(t){return this.filter(t).head()},br.prototype.findLast=function(t){return this.reverse().find(t)},br.prototype.invokeMap=Ai(function(t,e){return"function"==typeof t?new br(this):this.map(function(n){return ai(n,t,e)})}),br.prototype.reject=function(t){return this.filter(ps(Fo(t)))},br.prototype.slice=function(t,e){t=zs(t);var n=this;return n.__filtered__&&(t>0||e<0)?new br(n):(t<0?n=n.takeRight(-t):t&&(n=n.drop(t)),e!==o&&(n=(e=zs(e))<0?n.dropRight(-e):n.take(e-t)),n)},br.prototype.takeRightWhile=function(t){return this.reverse().takeWhile(t).reverse()},br.prototype.toArray=function(){return this.take(P)},Yr(br.prototype,function(t,e){var n=/^(?:filter|find|map|reject)|While$/.test(e),r=/^(?:head|last)$/.test(e),i=gr[r?"take"+("last"==e?"Right":""):e],a=r||/^find/.test(e);i&&(gr.prototype[e]=function(){var e=this.__wrapped__,s=r?[1]:arguments,u=e instanceof br,c=s[0],l=u||ws(e),f=function(t){var e=i.apply(gr,vn([t],s));return r&&p?e[0]:e};l&&n&&"function"==typeof c&&1!=c.length&&(u=l=!1);var p=this.__chain__,d=!!this.__actions__.length,h=a&&!p,v=u&&!d;if(!a&&l){e=v?e:new br(this);var g=t.apply(e,s);return g.__actions__.push({func:Ua,args:[f],thisArg:o}),new _r(g,p)}return h&&v?t.apply(this,s):(g=this.thru(f),h?r?g.value()[0]:g.value():g)})}),un(["pop","push","shift","sort","splice","unshift"],function(t){var e=se[t],n=/^(?:push|sort|unshift)$/.test(t)?"tap":"thru",r=/^(?:pop|shift)$/.test(t);gr.prototype[t]=function(){var t=arguments;if(r&&!this.__chain__){var i=this.value();return e.apply(ws(i)?i:[],t)}return this[n](function(n){return e.apply(ws(n)?n:[],t)})}}),Yr(br.prototype,function(t,e){var n=gr[e];if(n){var r=n.name+"";(sr[r]||(sr[r]=[])).push({name:e,func:n})}}),sr[mo(o,y).name]=[{name:"wrapper",func:o}],br.prototype.clone=function(){var t=new br(this.__wrapped__);return t.__actions__=oo(this.__actions__),t.__dir__=this.__dir__,t.__filtered__=this.__filtered__,t.__iteratees__=oo(this.__iteratees__),t.__takeCount__=this.__takeCount__,t.__views__=oo(this.__views__),t},br.prototype.reverse=function(){if(this.__filtered__){var t=new br(this);t.__dir__=-1,t.__filtered__=!0}else(t=this.clone()).__dir__*=-1;return t},br.prototype.value=function(){var t=this.__wrapped__.value(),e=this.__dir__,n=ws(t),r=e<0,i=n?t.length:0,o=function(t,e,n){for(var r=-1,i=n.length;++r<i;){var o=n[r],a=o.size;switch(o.type){case"drop":t+=a;break;case"dropRight":e-=a;break;case"take":e=Gn(e,t+a);break;case"takeRight":t=Qn(t,e-a)}}return{start:t,end:e}}(0,i,this.__views__),a=o.start,s=o.end,u=s-a,c=r?s:a-1,l=this.__iteratees__,f=l.length,p=0,d=Gn(u,this.__takeCount__);if(!n||!r&&i==u&&d==u)return Ui(t,this.__actions__);var h=[];t:for(;u--&&p<d;){for(var v=-1,g=t[c+=e];++v<f;){var m=l[v],y=m.iteratee,_=m.type,b=y(g);if(_==N)g=b;else if(!b){if(_==I)continue t;break t}}h[p++]=g}return h},gr.prototype.at=za,gr.prototype.chain=function(){return qa(this)},gr.prototype.commit=function(){return new _r(this.value(),this.__chain__)},gr.prototype.next=function(){this.__values__===o&&(this.__values__=qs(this.value()));var t=this.__index__>=this.__values__.length;return{done:t,value:t?o:this.__values__[this.__index__++]}},gr.prototype.plant=function(t){for(var e,n=this;n instanceof yr;){var r=ga(n);r.__index__=0,r.__values__=o,e?i.__wrapped__=r:e=r;var i=r;n=n.__wrapped__}return i.__wrapped__=t,e},gr.prototype.reverse=function(){var t=this.__wrapped__;if(t instanceof br){var e=t;return this.__actions__.length&&(e=new br(this)),(e=e.reverse()).__actions__.push({func:Ua,args:[Ia],thisArg:o}),new _r(e,this.__chain__)}return this.thru(Ia)},gr.prototype.toJSON=gr.prototype.valueOf=gr.prototype.value=function(){return Ui(this.__wrapped__,this.__actions__)},gr.prototype.first=gr.prototype.head,ke&&(gr.prototype[ke]=function(){return this}),gr}();ze._=Kn,(i=function(){return Kn}.call(e,n,e,r))===o||(r.exports=i)}).call(this)}).call(e,n(1),n(15)(t))},function(t,e){t.exports=function(t){return t.webpackPolyfill||(t.deprecate=function(){},t.paths=[],t.children||(t.children=[]),Object.defineProperty(t,"loaded",{enumerable:!0,get:function(){return t.l}}),Object.defineProperty(t,"id",{enumerable:!0,get:function(){return t.i}}),t.webpackPolyfill=1),t}},function(t,e,n){(function(t,e,n){"use strict";function r(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function i(t,e,n){return e&&r(t.prototype,e),n&&r(t,n),t}function o(){return(o=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t}).apply(this,arguments)}e=e&&e.hasOwnProperty("default")?e.default:e,n=n&&n.hasOwnProperty("default")?n.default:n;var a,s,u,c,l,f,p,d,h,v,g,m,y,_,b,w,x,C,T,E,A,S,k,O,D,I,N,j,L,$,R,P,M,F,H,B,W,q,U,z,V,K,Q,G,Y,X,J,Z,tt,et,nt,rt,it,ot,at,st,ut,ct,lt,ft,pt,dt,ht,vt,gt,mt,yt,_t,bt,wt,xt,Ct,Tt,Et,At,St,kt,Ot,Dt,It,Nt,jt,Lt,$t,Rt,Pt,Mt,Ft,Ht,Bt,Wt,qt,Ut,zt,Vt,Kt,Qt,Gt,Yt,Xt,Jt,Zt,te,ee,ne,re,ie,oe,ae,se,ue,ce,le,fe,pe,de,he,ve,ge,me,ye,_e,be,we,xe,Ce,Te,Ee,Ae,Se,ke,Oe,De,Ie,Ne,je,Le,$e,Re,Pe,Me,Fe,He,Be,We,qe,Ue,ze,Ve,Ke,Qe,Ge,Ye,Xe,Je,Ze,tn,en,nn,rn,on,an,sn,un,cn,ln,fn,pn,dn,hn,vn,gn,mn,yn,_n,bn,wn,xn=function(t){var e=!1;function n(e){var n=this,i=!1;return t(this).one(r.TRANSITION_END,function(){i=!0}),setTimeout(function(){i||r.triggerTransitionEnd(n)},e),this}var r={TRANSITION_END:"bsTransitionEnd",getUID:function(t){do{t+=~~(1e6*Math.random())}while(document.getElementById(t));return t},getSelectorFromElement:function(e){var n,r=e.getAttribute("data-target");r&&"#"!==r||(r=e.getAttribute("href")||""),"#"===r.charAt(0)&&(n=r,r=n="function"==typeof t.escapeSelector?t.escapeSelector(n).substr(1):n.replace(/(:|\.|\[|\]|,|=|@)/g,"\\$1"));try{return t(document).find(r).length>0?r:null}catch(t){return null}},reflow:function(t){return t.offsetHeight},triggerTransitionEnd:function(n){t(n).trigger(e.end)},supportsTransitionEnd:function(){return Boolean(e)},isElement:function(t){return(t[0]||t).nodeType},typeCheckConfig:function(t,e,n){for(var i in n)if(Object.prototype.hasOwnProperty.call(n,i)){var o=n[i],a=e[i],s=a&&r.isElement(a)?"element":(u=a,{}.toString.call(u).match(/\s([a-zA-Z]+)/)[1].toLowerCase());if(!new RegExp(o).test(s))throw new Error(t.toUpperCase()+': Option "'+i+'" provided type "'+s+'" but expected type "'+o+'".')}var u}};return e=("undefined"==typeof window||!window.QUnit)&&{end:"transitionend"},t.fn.emulateTransitionEnd=n,r.supportsTransitionEnd()&&(t.event.special[r.TRANSITION_END]={bindType:e.end,delegateType:e.end,handle:function(e){if(t(e.target).is(this))return e.handleObj.handler.apply(this,arguments)}}),r}(e),Cn=(s="alert",c="."+(u="bs.alert"),l=(a=e).fn[s],f={CLOSE:"close"+c,CLOSED:"closed"+c,CLICK_DATA_API:"click"+c+".data-api"},p="alert",d="fade",h="show",v=function(){function t(t){this._element=t}var e=t.prototype;return e.close=function(t){t=t||this._element;var e=this._getRootElement(t);this._triggerCloseEvent(e).isDefaultPrevented()||this._removeElement(e)},e.dispose=function(){a.removeData(this._element,u),this._element=null},e._getRootElement=function(t){var e=xn.getSelectorFromElement(t),n=!1;return e&&(n=a(e)[0]),n||(n=a(t).closest("."+p)[0]),n},e._triggerCloseEvent=function(t){var e=a.Event(f.CLOSE);return a(t).trigger(e),e},e._removeElement=function(t){var e=this;a(t).removeClass(h),xn.supportsTransitionEnd()&&a(t).hasClass(d)?a(t).one(xn.TRANSITION_END,function(n){return e._destroyElement(t,n)}).emulateTransitionEnd(150):this._destroyElement(t)},e._destroyElement=function(t){a(t).detach().trigger(f.CLOSED).remove()},t._jQueryInterface=function(e){return this.each(function(){var n=a(this),r=n.data(u);r||(r=new t(this),n.data(u,r)),"close"===e&&r[e](this)})},t._handleDismiss=function(t){return function(e){e&&e.preventDefault(),t.close(this)}},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}}]),t}(),a(document).on(f.CLICK_DATA_API,'[data-dismiss="alert"]',v._handleDismiss(new v)),a.fn[s]=v._jQueryInterface,a.fn[s].Constructor=v,a.fn[s].noConflict=function(){return a.fn[s]=l,v._jQueryInterface},v),Tn=(m="button",_="."+(y="bs.button"),b=".data-api",w=(g=e).fn[m],x="active",C="btn",T="focus",E='[data-toggle^="button"]',A='[data-toggle="buttons"]',S="input",k=".active",O=".btn",D={CLICK_DATA_API:"click"+_+b,FOCUS_BLUR_DATA_API:"focus"+_+b+" blur"+_+b},I=function(){function t(t){this._element=t}var e=t.prototype;return e.toggle=function(){var t=!0,e=!0,n=g(this._element).closest(A)[0];if(n){var r=g(this._element).find(S)[0];if(r){if("radio"===r.type)if(r.checked&&g(this._element).hasClass(x))t=!1;else{var i=g(n).find(k)[0];i&&g(i).removeClass(x)}if(t){if(r.hasAttribute("disabled")||n.hasAttribute("disabled")||r.classList.contains("disabled")||n.classList.contains("disabled"))return;r.checked=!g(this._element).hasClass(x),g(r).trigger("change")}r.focus(),e=!1}}e&&this._element.setAttribute("aria-pressed",!g(this._element).hasClass(x)),t&&g(this._element).toggleClass(x)},e.dispose=function(){g.removeData(this._element,y),this._element=null},t._jQueryInterface=function(e){return this.each(function(){var n=g(this).data(y);n||(n=new t(this),g(this).data(y,n)),"toggle"===e&&n[e]()})},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}}]),t}(),g(document).on(D.CLICK_DATA_API,E,function(t){t.preventDefault();var e=t.target;g(e).hasClass(C)||(e=g(e).closest(O)),I._jQueryInterface.call(g(e),"toggle")}).on(D.FOCUS_BLUR_DATA_API,E,function(t){var e=g(t.target).closest(O)[0];g(e).toggleClass(T,/^focus(in)?$/.test(t.type))}),g.fn[m]=I._jQueryInterface,g.fn[m].Constructor=I,g.fn[m].noConflict=function(){return g.fn[m]=w,I._jQueryInterface},I),En=(j="carousel",$="."+(L="bs.carousel"),R=(N=e).fn[j],P={interval:5e3,keyboard:!0,slide:!1,pause:"hover",wrap:!0},M={interval:"(number|boolean)",keyboard:"boolean",slide:"(boolean|string)",pause:"(string|boolean)",wrap:"boolean"},F="next",H="prev",B="left",W="right",q={SLIDE:"slide"+$,SLID:"slid"+$,KEYDOWN:"keydown"+$,MOUSEENTER:"mouseenter"+$,MOUSELEAVE:"mouseleave"+$,TOUCHEND:"touchend"+$,LOAD_DATA_API:"load"+$+".data-api",CLICK_DATA_API:"click"+$+".data-api"},U="carousel",z="active",V="slide",K="carousel-item-right",Q="carousel-item-left",G="carousel-item-next",Y="carousel-item-prev",X={ACTIVE:".active",ACTIVE_ITEM:".active.carousel-item",ITEM:".carousel-item",NEXT_PREV:".carousel-item-next, .carousel-item-prev",INDICATORS:".carousel-indicators",DATA_SLIDE:"[data-slide], [data-slide-to]",DATA_RIDE:'[data-ride="carousel"]'},J=function(){function t(t,e){this._items=null,this._interval=null,this._activeElement=null,this._isPaused=!1,this._isSliding=!1,this.touchTimeout=null,this._config=this._getConfig(e),this._element=N(t)[0],this._indicatorsElement=N(this._element).find(X.INDICATORS)[0],this._addEventListeners()}var e=t.prototype;return e.next=function(){this._isSliding||this._slide(F)},e.nextWhenVisible=function(){!document.hidden&&N(this._element).is(":visible")&&"hidden"!==N(this._element).css("visibility")&&this.next()},e.prev=function(){this._isSliding||this._slide(H)},e.pause=function(t){t||(this._isPaused=!0),N(this._element).find(X.NEXT_PREV)[0]&&xn.supportsTransitionEnd()&&(xn.triggerTransitionEnd(this._element),this.cycle(!0)),clearInterval(this._interval),this._interval=null},e.cycle=function(t){t||(this._isPaused=!1),this._interval&&(clearInterval(this._interval),this._interval=null),this._config.interval&&!this._isPaused&&(this._interval=setInterval((document.visibilityState?this.nextWhenVisible:this.next).bind(this),this._config.interval))},e.to=function(t){var e=this;this._activeElement=N(this._element).find(X.ACTIVE_ITEM)[0];var n=this._getItemIndex(this._activeElement);if(!(t>this._items.length-1||t<0))if(this._isSliding)N(this._element).one(q.SLID,function(){return e.to(t)});else{if(n===t)return this.pause(),void this.cycle();var r=t>n?F:H;this._slide(r,this._items[t])}},e.dispose=function(){N(this._element).off($),N.removeData(this._element,L),this._items=null,this._config=null,this._element=null,this._interval=null,this._isPaused=null,this._isSliding=null,this._activeElement=null,this._indicatorsElement=null},e._getConfig=function(t){return t=o({},P,t),xn.typeCheckConfig(j,t,M),t},e._addEventListeners=function(){var t=this;this._config.keyboard&&N(this._element).on(q.KEYDOWN,function(e){return t._keydown(e)}),"hover"===this._config.pause&&(N(this._element).on(q.MOUSEENTER,function(e){return t.pause(e)}).on(q.MOUSELEAVE,function(e){return t.cycle(e)}),"ontouchstart"in document.documentElement&&N(this._element).on(q.TOUCHEND,function(){t.pause(),t.touchTimeout&&clearTimeout(t.touchTimeout),t.touchTimeout=setTimeout(function(e){return t.cycle(e)},500+t._config.interval)}))},e._keydown=function(t){if(!/input|textarea/i.test(t.target.tagName))switch(t.which){case 37:t.preventDefault(),this.prev();break;case 39:t.preventDefault(),this.next()}},e._getItemIndex=function(t){return this._items=N.makeArray(N(t).parent().find(X.ITEM)),this._items.indexOf(t)},e._getItemByDirection=function(t,e){var n=t===F,r=t===H,i=this._getItemIndex(e),o=this._items.length-1;if((r&&0===i||n&&i===o)&&!this._config.wrap)return e;var a=(i+(t===H?-1:1))%this._items.length;return-1===a?this._items[this._items.length-1]:this._items[a]},e._triggerSlideEvent=function(t,e){var n=this._getItemIndex(t),r=this._getItemIndex(N(this._element).find(X.ACTIVE_ITEM)[0]),i=N.Event(q.SLIDE,{relatedTarget:t,direction:e,from:r,to:n});return N(this._element).trigger(i),i},e._setActiveIndicatorElement=function(t){if(this._indicatorsElement){N(this._indicatorsElement).find(X.ACTIVE).removeClass(z);var e=this._indicatorsElement.children[this._getItemIndex(t)];e&&N(e).addClass(z)}},e._slide=function(t,e){var n,r,i,o=this,a=N(this._element).find(X.ACTIVE_ITEM)[0],s=this._getItemIndex(a),u=e||a&&this._getItemByDirection(t,a),c=this._getItemIndex(u),l=Boolean(this._interval);if(t===F?(n=Q,r=G,i=B):(n=K,r=Y,i=W),u&&N(u).hasClass(z))this._isSliding=!1;else if(!this._triggerSlideEvent(u,i).isDefaultPrevented()&&a&&u){this._isSliding=!0,l&&this.pause(),this._setActiveIndicatorElement(u);var f=N.Event(q.SLID,{relatedTarget:u,direction:i,from:s,to:c});xn.supportsTransitionEnd()&&N(this._element).hasClass(V)?(N(u).addClass(r),xn.reflow(u),N(a).addClass(n),N(u).addClass(n),N(a).one(xn.TRANSITION_END,function(){N(u).removeClass(n+" "+r).addClass(z),N(a).removeClass(z+" "+r+" "+n),o._isSliding=!1,setTimeout(function(){return N(o._element).trigger(f)},0)}).emulateTransitionEnd(600)):(N(a).removeClass(z),N(u).addClass(z),this._isSliding=!1,N(this._element).trigger(f)),l&&this.cycle()}},t._jQueryInterface=function(e){return this.each(function(){var n=N(this).data(L),r=o({},P,N(this).data());"object"==typeof e&&(r=o({},r,e));var i="string"==typeof e?e:r.slide;if(n||(n=new t(this,r),N(this).data(L,n)),"number"==typeof e)n.to(e);else if("string"==typeof i){if(void 0===n[i])throw new TypeError('No method named "'+i+'"');n[i]()}else r.interval&&(n.pause(),n.cycle())})},t._dataApiClickHandler=function(e){var n=xn.getSelectorFromElement(this);if(n){var r=N(n)[0];if(r&&N(r).hasClass(U)){var i=o({},N(r).data(),N(this).data()),a=this.getAttribute("data-slide-to");a&&(i.interval=!1),t._jQueryInterface.call(N(r),i),a&&N(r).data(L).to(a),e.preventDefault()}}},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return P}}]),t}(),N(document).on(q.CLICK_DATA_API,X.DATA_SLIDE,J._dataApiClickHandler),N(window).on(q.LOAD_DATA_API,function(){N(X.DATA_RIDE).each(function(){var t=N(this);J._jQueryInterface.call(t,t.data())})}),N.fn[j]=J._jQueryInterface,N.fn[j].Constructor=J,N.fn[j].noConflict=function(){return N.fn[j]=R,J._jQueryInterface},J),An=(tt="collapse",nt="."+(et="bs.collapse"),rt=(Z=e).fn[tt],it={toggle:!0,parent:""},ot={toggle:"boolean",parent:"(string|element)"},at={SHOW:"show"+nt,SHOWN:"shown"+nt,HIDE:"hide"+nt,HIDDEN:"hidden"+nt,CLICK_DATA_API:"click"+nt+".data-api"},st="show",ut="collapse",ct="collapsing",lt="collapsed",ft="width",pt="height",dt={ACTIVES:".show, .collapsing",DATA_TOGGLE:'[data-toggle="collapse"]'},ht=function(){function t(t,e){this._isTransitioning=!1,this._element=t,this._config=this._getConfig(e),this._triggerArray=Z.makeArray(Z('[data-toggle="collapse"][href="#'+t.id+'"],[data-toggle="collapse"][data-target="#'+t.id+'"]'));for(var n=Z(dt.DATA_TOGGLE),r=0;r<n.length;r++){var i=n[r],o=xn.getSelectorFromElement(i);null!==o&&Z(o).filter(t).length>0&&(this._selector=o,this._triggerArray.push(i))}this._parent=this._config.parent?this._getParent():null,this._config.parent||this._addAriaAndCollapsedClass(this._element,this._triggerArray),this._config.toggle&&this.toggle()}var e=t.prototype;return e.toggle=function(){Z(this._element).hasClass(st)?this.hide():this.show()},e.show=function(){var e,n,r=this;if(!this._isTransitioning&&!Z(this._element).hasClass(st)&&(this._parent&&0===(e=Z.makeArray(Z(this._parent).find(dt.ACTIVES).filter('[data-parent="'+this._config.parent+'"]'))).length&&(e=null),!(e&&(n=Z(e).not(this._selector).data(et))&&n._isTransitioning))){var i=Z.Event(at.SHOW);if(Z(this._element).trigger(i),!i.isDefaultPrevented()){e&&(t._jQueryInterface.call(Z(e).not(this._selector),"hide"),n||Z(e).data(et,null));var o=this._getDimension();Z(this._element).removeClass(ut).addClass(ct),this._element.style[o]=0,this._triggerArray.length>0&&Z(this._triggerArray).removeClass(lt).attr("aria-expanded",!0),this.setTransitioning(!0);var a=function(){Z(r._element).removeClass(ct).addClass(ut).addClass(st),r._element.style[o]="",r.setTransitioning(!1),Z(r._element).trigger(at.SHOWN)};if(xn.supportsTransitionEnd()){var s="scroll"+(o[0].toUpperCase()+o.slice(1));Z(this._element).one(xn.TRANSITION_END,a).emulateTransitionEnd(600),this._element.style[o]=this._element[s]+"px"}else a()}}},e.hide=function(){var t=this;if(!this._isTransitioning&&Z(this._element).hasClass(st)){var e=Z.Event(at.HIDE);if(Z(this._element).trigger(e),!e.isDefaultPrevented()){var n=this._getDimension();if(this._element.style[n]=this._element.getBoundingClientRect()[n]+"px",xn.reflow(this._element),Z(this._element).addClass(ct).removeClass(ut).removeClass(st),this._triggerArray.length>0)for(var r=0;r<this._triggerArray.length;r++){var i=this._triggerArray[r],o=xn.getSelectorFromElement(i);if(null!==o)Z(o).hasClass(st)||Z(i).addClass(lt).attr("aria-expanded",!1)}this.setTransitioning(!0);var a=function(){t.setTransitioning(!1),Z(t._element).removeClass(ct).addClass(ut).trigger(at.HIDDEN)};this._element.style[n]="",xn.supportsTransitionEnd()?Z(this._element).one(xn.TRANSITION_END,a).emulateTransitionEnd(600):a()}}},e.setTransitioning=function(t){this._isTransitioning=t},e.dispose=function(){Z.removeData(this._element,et),this._config=null,this._parent=null,this._element=null,this._triggerArray=null,this._isTransitioning=null},e._getConfig=function(t){return(t=o({},it,t)).toggle=Boolean(t.toggle),xn.typeCheckConfig(tt,t,ot),t},e._getDimension=function(){return Z(this._element).hasClass(ft)?ft:pt},e._getParent=function(){var e=this,n=null;xn.isElement(this._config.parent)?(n=this._config.parent,void 0!==this._config.parent.jquery&&(n=this._config.parent[0])):n=Z(this._config.parent)[0];var r='[data-toggle="collapse"][data-parent="'+this._config.parent+'"]';return Z(n).find(r).each(function(n,r){e._addAriaAndCollapsedClass(t._getTargetFromElement(r),[r])}),n},e._addAriaAndCollapsedClass=function(t,e){if(t){var n=Z(t).hasClass(st);e.length>0&&Z(e).toggleClass(lt,!n).attr("aria-expanded",n)}},t._getTargetFromElement=function(t){var e=xn.getSelectorFromElement(t);return e?Z(e)[0]:null},t._jQueryInterface=function(e){return this.each(function(){var n=Z(this),r=n.data(et),i=o({},it,n.data(),"object"==typeof e&&e);if(!r&&i.toggle&&/show|hide/.test(e)&&(i.toggle=!1),r||(r=new t(this,i),n.data(et,r)),"string"==typeof e){if(void 0===r[e])throw new TypeError('No method named "'+e+'"');r[e]()}})},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return it}}]),t}(),Z(document).on(at.CLICK_DATA_API,dt.DATA_TOGGLE,function(t){"A"===t.currentTarget.tagName&&t.preventDefault();var e=Z(this),n=xn.getSelectorFromElement(this);Z(n).each(function(){var t=Z(this),n=t.data(et)?"toggle":e.data();ht._jQueryInterface.call(t,n)})}),Z.fn[tt]=ht._jQueryInterface,Z.fn[tt].Constructor=ht,Z.fn[tt].noConflict=function(){return Z.fn[tt]=rt,ht._jQueryInterface},ht),Sn=(gt="dropdown",yt="."+(mt="bs.dropdown"),_t=".data-api",bt=(vt=e).fn[gt],wt=new RegExp("38|40|27"),xt={HIDE:"hide"+yt,HIDDEN:"hidden"+yt,SHOW:"show"+yt,SHOWN:"shown"+yt,CLICK:"click"+yt,CLICK_DATA_API:"click"+yt+_t,KEYDOWN_DATA_API:"keydown"+yt+_t,KEYUP_DATA_API:"keyup"+yt+_t},Ct="disabled",Tt="show",Et="dropup",At="dropright",St="dropleft",kt="dropdown-menu-right",Ot="dropdown-menu-left",Dt="position-static",It='[data-toggle="dropdown"]',Nt=".dropdown form",jt=".dropdown-menu",Lt=".navbar-nav",$t=".dropdown-menu .dropdown-item:not(.disabled)",Rt="top-start",Pt="top-end",Mt="bottom-start",Ft="bottom-end",Ht="right-start",Bt="left-start",Wt={offset:0,flip:!0,boundary:"scrollParent"},qt={offset:"(number|string|function)",flip:"boolean",boundary:"(string|element)"},Ut=function(){function t(t,e){this._element=t,this._popper=null,this._config=this._getConfig(e),this._menu=this._getMenuElement(),this._inNavbar=this._detectNavbar(),this._addEventListeners()}var e=t.prototype;return e.toggle=function(){if(!this._element.disabled&&!vt(this._element).hasClass(Ct)){var e=t._getParentFromElement(this._element),r=vt(this._menu).hasClass(Tt);if(t._clearMenus(),!r){var i={relatedTarget:this._element},o=vt.Event(xt.SHOW,i);if(vt(e).trigger(o),!o.isDefaultPrevented()){if(!this._inNavbar){if(void 0===n)throw new TypeError("Bootstrap dropdown require Popper.js (https://popper.js.org)");var a=this._element;vt(e).hasClass(Et)&&(vt(this._menu).hasClass(Ot)||vt(this._menu).hasClass(kt))&&(a=e),"scrollParent"!==this._config.boundary&&vt(e).addClass(Dt),this._popper=new n(a,this._menu,this._getPopperConfig())}"ontouchstart"in document.documentElement&&0===vt(e).closest(Lt).length&&vt("body").children().on("mouseover",null,vt.noop),this._element.focus(),this._element.setAttribute("aria-expanded",!0),vt(this._menu).toggleClass(Tt),vt(e).toggleClass(Tt).trigger(vt.Event(xt.SHOWN,i))}}}},e.dispose=function(){vt.removeData(this._element,mt),vt(this._element).off(yt),this._element=null,this._menu=null,null!==this._popper&&(this._popper.destroy(),this._popper=null)},e.update=function(){this._inNavbar=this._detectNavbar(),null!==this._popper&&this._popper.scheduleUpdate()},e._addEventListeners=function(){var t=this;vt(this._element).on(xt.CLICK,function(e){e.preventDefault(),e.stopPropagation(),t.toggle()})},e._getConfig=function(t){return t=o({},this.constructor.Default,vt(this._element).data(),t),xn.typeCheckConfig(gt,t,this.constructor.DefaultType),t},e._getMenuElement=function(){if(!this._menu){var e=t._getParentFromElement(this._element);this._menu=vt(e).find(jt)[0]}return this._menu},e._getPlacement=function(){var t=vt(this._element).parent(),e=Mt;return t.hasClass(Et)?(e=Rt,vt(this._menu).hasClass(kt)&&(e=Pt)):t.hasClass(At)?e=Ht:t.hasClass(St)?e=Bt:vt(this._menu).hasClass(kt)&&(e=Ft),e},e._detectNavbar=function(){return vt(this._element).closest(".navbar").length>0},e._getPopperConfig=function(){var t=this,e={};return"function"==typeof this._config.offset?e.fn=function(e){return e.offsets=o({},e.offsets,t._config.offset(e.offsets)||{}),e}:e.offset=this._config.offset,{placement:this._getPlacement(),modifiers:{offset:e,flip:{enabled:this._config.flip},preventOverflow:{boundariesElement:this._config.boundary}}}},t._jQueryInterface=function(e){return this.each(function(){var n=vt(this).data(mt);if(n||(n=new t(this,"object"==typeof e?e:null),vt(this).data(mt,n)),"string"==typeof e){if(void 0===n[e])throw new TypeError('No method named "'+e+'"');n[e]()}})},t._clearMenus=function(e){if(!e||3!==e.which&&("keyup"!==e.type||9===e.which))for(var n=vt.makeArray(vt(It)),r=0;r<n.length;r++){var i=t._getParentFromElement(n[r]),o=vt(n[r]).data(mt),a={relatedTarget:n[r]};if(o){var s=o._menu;if(vt(i).hasClass(Tt)&&!(e&&("click"===e.type&&/input|textarea/i.test(e.target.tagName)||"keyup"===e.type&&9===e.which)&&vt.contains(i,e.target))){var u=vt.Event(xt.HIDE,a);vt(i).trigger(u),u.isDefaultPrevented()||("ontouchstart"in document.documentElement&&vt("body").children().off("mouseover",null,vt.noop),n[r].setAttribute("aria-expanded","false"),vt(s).removeClass(Tt),vt(i).removeClass(Tt).trigger(vt.Event(xt.HIDDEN,a)))}}}},t._getParentFromElement=function(t){var e,n=xn.getSelectorFromElement(t);return n&&(e=vt(n)[0]),e||t.parentNode},t._dataApiKeydownHandler=function(e){if((/input|textarea/i.test(e.target.tagName)?!(32===e.which||27!==e.which&&(40!==e.which&&38!==e.which||vt(e.target).closest(jt).length)):wt.test(e.which))&&(e.preventDefault(),e.stopPropagation(),!this.disabled&&!vt(this).hasClass(Ct))){var n=t._getParentFromElement(this),r=vt(n).hasClass(Tt);if((r||27===e.which&&32===e.which)&&(!r||27!==e.which&&32!==e.which)){var i=vt(n).find($t).get();if(0!==i.length){var o=i.indexOf(e.target);38===e.which&&o>0&&o--,40===e.which&&o<i.length-1&&o++,o<0&&(o=0),i[o].focus()}}else{if(27===e.which){var a=vt(n).find(It)[0];vt(a).trigger("focus")}vt(this).trigger("click")}}},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return Wt}},{key:"DefaultType",get:function(){return qt}}]),t}(),vt(document).on(xt.KEYDOWN_DATA_API,It,Ut._dataApiKeydownHandler).on(xt.KEYDOWN_DATA_API,jt,Ut._dataApiKeydownHandler).on(xt.CLICK_DATA_API+" "+xt.KEYUP_DATA_API,Ut._clearMenus).on(xt.CLICK_DATA_API,It,function(t){t.preventDefault(),t.stopPropagation(),Ut._jQueryInterface.call(vt(this),"toggle")}).on(xt.CLICK_DATA_API,Nt,function(t){t.stopPropagation()}),vt.fn[gt]=Ut._jQueryInterface,vt.fn[gt].Constructor=Ut,vt.fn[gt].noConflict=function(){return vt.fn[gt]=bt,Ut._jQueryInterface},Ut),kn=(Vt="modal",Qt="."+(Kt="bs.modal"),Gt=(zt=e).fn[Vt],Yt={backdrop:!0,keyboard:!0,focus:!0,show:!0},Xt={backdrop:"(boolean|string)",keyboard:"boolean",focus:"boolean",show:"boolean"},Jt={HIDE:"hide"+Qt,HIDDEN:"hidden"+Qt,SHOW:"show"+Qt,SHOWN:"shown"+Qt,FOCUSIN:"focusin"+Qt,RESIZE:"resize"+Qt,CLICK_DISMISS:"click.dismiss"+Qt,KEYDOWN_DISMISS:"keydown.dismiss"+Qt,MOUSEUP_DISMISS:"mouseup.dismiss"+Qt,MOUSEDOWN_DISMISS:"mousedown.dismiss"+Qt,CLICK_DATA_API:"click"+Qt+".data-api"},Zt="modal-scrollbar-measure",te="modal-backdrop",ee="modal-open",ne="fade",re="show",ie={DIALOG:".modal-dialog",DATA_TOGGLE:'[data-toggle="modal"]',DATA_DISMISS:'[data-dismiss="modal"]',FIXED_CONTENT:".fixed-top, .fixed-bottom, .is-fixed, .sticky-top",STICKY_CONTENT:".sticky-top",NAVBAR_TOGGLER:".navbar-toggler"},oe=function(){function t(t,e){this._config=this._getConfig(e),this._element=t,this._dialog=zt(t).find(ie.DIALOG)[0],this._backdrop=null,this._isShown=!1,this._isBodyOverflowing=!1,this._ignoreBackdropClick=!1,this._originalBodyPadding=0,this._scrollbarWidth=0}var e=t.prototype;return e.toggle=function(t){return this._isShown?this.hide():this.show(t)},e.show=function(t){var e=this;if(!this._isTransitioning&&!this._isShown){xn.supportsTransitionEnd()&&zt(this._element).hasClass(ne)&&(this._isTransitioning=!0);var n=zt.Event(Jt.SHOW,{relatedTarget:t});zt(this._element).trigger(n),this._isShown||n.isDefaultPrevented()||(this._isShown=!0,this._checkScrollbar(),this._setScrollbar(),this._adjustDialog(),zt(document.body).addClass(ee),this._setEscapeEvent(),this._setResizeEvent(),zt(this._element).on(Jt.CLICK_DISMISS,ie.DATA_DISMISS,function(t){return e.hide(t)}),zt(this._dialog).on(Jt.MOUSEDOWN_DISMISS,function(){zt(e._element).one(Jt.MOUSEUP_DISMISS,function(t){zt(t.target).is(e._element)&&(e._ignoreBackdropClick=!0)})}),this._showBackdrop(function(){return e._showElement(t)}))}},e.hide=function(t){var e=this;if(t&&t.preventDefault(),!this._isTransitioning&&this._isShown){var n=zt.Event(Jt.HIDE);if(zt(this._element).trigger(n),this._isShown&&!n.isDefaultPrevented()){this._isShown=!1;var r=xn.supportsTransitionEnd()&&zt(this._element).hasClass(ne);r&&(this._isTransitioning=!0),this._setEscapeEvent(),this._setResizeEvent(),zt(document).off(Jt.FOCUSIN),zt(this._element).removeClass(re),zt(this._element).off(Jt.CLICK_DISMISS),zt(this._dialog).off(Jt.MOUSEDOWN_DISMISS),r?zt(this._element).one(xn.TRANSITION_END,function(t){return e._hideModal(t)}).emulateTransitionEnd(300):this._hideModal()}}},e.dispose=function(){zt.removeData(this._element,Kt),zt(window,document,this._element,this._backdrop).off(Qt),this._config=null,this._element=null,this._dialog=null,this._backdrop=null,this._isShown=null,this._isBodyOverflowing=null,this._ignoreBackdropClick=null,this._scrollbarWidth=null},e.handleUpdate=function(){this._adjustDialog()},e._getConfig=function(t){return t=o({},Yt,t),xn.typeCheckConfig(Vt,t,Xt),t},e._showElement=function(t){var e=this,n=xn.supportsTransitionEnd()&&zt(this._element).hasClass(ne);this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE||document.body.appendChild(this._element),this._element.style.display="block",this._element.removeAttribute("aria-hidden"),this._element.scrollTop=0,n&&xn.reflow(this._element),zt(this._element).addClass(re),this._config.focus&&this._enforceFocus();var r=zt.Event(Jt.SHOWN,{relatedTarget:t}),i=function(){e._config.focus&&e._element.focus(),e._isTransitioning=!1,zt(e._element).trigger(r)};n?zt(this._dialog).one(xn.TRANSITION_END,i).emulateTransitionEnd(300):i()},e._enforceFocus=function(){var t=this;zt(document).off(Jt.FOCUSIN).on(Jt.FOCUSIN,function(e){document!==e.target&&t._element!==e.target&&0===zt(t._element).has(e.target).length&&t._element.focus()})},e._setEscapeEvent=function(){var t=this;this._isShown&&this._config.keyboard?zt(this._element).on(Jt.KEYDOWN_DISMISS,function(e){27===e.which&&(e.preventDefault(),t.hide())}):this._isShown||zt(this._element).off(Jt.KEYDOWN_DISMISS)},e._setResizeEvent=function(){var t=this;this._isShown?zt(window).on(Jt.RESIZE,function(e){return t.handleUpdate(e)}):zt(window).off(Jt.RESIZE)},e._hideModal=function(){var t=this;this._element.style.display="none",this._element.setAttribute("aria-hidden",!0),this._isTransitioning=!1,this._showBackdrop(function(){zt(document.body).removeClass(ee),t._resetAdjustments(),t._resetScrollbar(),zt(t._element).trigger(Jt.HIDDEN)})},e._removeBackdrop=function(){this._backdrop&&(zt(this._backdrop).remove(),this._backdrop=null)},e._showBackdrop=function(t){var e=this,n=zt(this._element).hasClass(ne)?ne:"";if(this._isShown&&this._config.backdrop){var r=xn.supportsTransitionEnd()&&n;if(this._backdrop=document.createElement("div"),this._backdrop.className=te,n&&zt(this._backdrop).addClass(n),zt(this._backdrop).appendTo(document.body),zt(this._element).on(Jt.CLICK_DISMISS,function(t){e._ignoreBackdropClick?e._ignoreBackdropClick=!1:t.target===t.currentTarget&&("static"===e._config.backdrop?e._element.focus():e.hide())}),r&&xn.reflow(this._backdrop),zt(this._backdrop).addClass(re),!t)return;if(!r)return void t();zt(this._backdrop).one(xn.TRANSITION_END,t).emulateTransitionEnd(150)}else if(!this._isShown&&this._backdrop){zt(this._backdrop).removeClass(re);var i=function(){e._removeBackdrop(),t&&t()};xn.supportsTransitionEnd()&&zt(this._element).hasClass(ne)?zt(this._backdrop).one(xn.TRANSITION_END,i).emulateTransitionEnd(150):i()}else t&&t()},e._adjustDialog=function(){var t=this._element.scrollHeight>document.documentElement.clientHeight;!this._isBodyOverflowing&&t&&(this._element.style.paddingLeft=this._scrollbarWidth+"px"),this._isBodyOverflowing&&!t&&(this._element.style.paddingRight=this._scrollbarWidth+"px")},e._resetAdjustments=function(){this._element.style.paddingLeft="",this._element.style.paddingRight=""},e._checkScrollbar=function(){var t=document.body.getBoundingClientRect();this._isBodyOverflowing=t.left+t.right<window.innerWidth,this._scrollbarWidth=this._getScrollbarWidth()},e._setScrollbar=function(){var t=this;if(this._isBodyOverflowing){zt(ie.FIXED_CONTENT).each(function(e,n){var r=zt(n)[0].style.paddingRight,i=zt(n).css("padding-right");zt(n).data("padding-right",r).css("padding-right",parseFloat(i)+t._scrollbarWidth+"px")}),zt(ie.STICKY_CONTENT).each(function(e,n){var r=zt(n)[0].style.marginRight,i=zt(n).css("margin-right");zt(n).data("margin-right",r).css("margin-right",parseFloat(i)-t._scrollbarWidth+"px")}),zt(ie.NAVBAR_TOGGLER).each(function(e,n){var r=zt(n)[0].style.marginRight,i=zt(n).css("margin-right");zt(n).data("margin-right",r).css("margin-right",parseFloat(i)+t._scrollbarWidth+"px")});var e=document.body.style.paddingRight,n=zt("body").css("padding-right");zt("body").data("padding-right",e).css("padding-right",parseFloat(n)+this._scrollbarWidth+"px")}},e._resetScrollbar=function(){zt(ie.FIXED_CONTENT).each(function(t,e){var n=zt(e).data("padding-right");void 0!==n&&zt(e).css("padding-right",n).removeData("padding-right")}),zt(ie.STICKY_CONTENT+", "+ie.NAVBAR_TOGGLER).each(function(t,e){var n=zt(e).data("margin-right");void 0!==n&&zt(e).css("margin-right",n).removeData("margin-right")});var t=zt("body").data("padding-right");void 0!==t&&zt("body").css("padding-right",t).removeData("padding-right")},e._getScrollbarWidth=function(){var t=document.createElement("div");t.className=Zt,document.body.appendChild(t);var e=t.getBoundingClientRect().width-t.clientWidth;return document.body.removeChild(t),e},t._jQueryInterface=function(e,n){return this.each(function(){var r=zt(this).data(Kt),i=o({},t.Default,zt(this).data(),"object"==typeof e&&e);if(r||(r=new t(this,i),zt(this).data(Kt,r)),"string"==typeof e){if(void 0===r[e])throw new TypeError('No method named "'+e+'"');r[e](n)}else i.show&&r.show(n)})},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return Yt}}]),t}(),zt(document).on(Jt.CLICK_DATA_API,ie.DATA_TOGGLE,function(t){var e,n=this,r=xn.getSelectorFromElement(this);r&&(e=zt(r)[0]);var i=zt(e).data(Kt)?"toggle":o({},zt(e).data(),zt(this).data());"A"!==this.tagName&&"AREA"!==this.tagName||t.preventDefault();var a=zt(e).one(Jt.SHOW,function(t){t.isDefaultPrevented()||a.one(Jt.HIDDEN,function(){zt(n).is(":visible")&&n.focus()})});oe._jQueryInterface.call(zt(e),i,this)}),zt.fn[Vt]=oe._jQueryInterface,zt.fn[Vt].Constructor=oe,zt.fn[Vt].noConflict=function(){return zt.fn[Vt]=Gt,oe._jQueryInterface},oe),On=(se="tooltip",ce="."+(ue="bs.tooltip"),le=(ae=e).fn[se],fe="bs-tooltip",pe=new RegExp("(^|\\s)"+fe+"\\S+","g"),de={animation:"boolean",template:"string",title:"(string|element|function)",trigger:"string",delay:"(number|object)",html:"boolean",selector:"(string|boolean)",placement:"(string|function)",offset:"(number|string)",container:"(string|element|boolean)",fallbackPlacement:"(string|array)",boundary:"(string|element)"},he={AUTO:"auto",TOP:"top",RIGHT:"right",BOTTOM:"bottom",LEFT:"left"},ve={animation:!0,template:'<div class="tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,selector:!1,placement:"top",offset:0,container:!1,fallbackPlacement:"flip",boundary:"scrollParent"},ge="show",me="out",ye={HIDE:"hide"+ce,HIDDEN:"hidden"+ce,SHOW:"show"+ce,SHOWN:"shown"+ce,INSERTED:"inserted"+ce,CLICK:"click"+ce,FOCUSIN:"focusin"+ce,FOCUSOUT:"focusout"+ce,MOUSEENTER:"mouseenter"+ce,MOUSELEAVE:"mouseleave"+ce},_e="fade",be="show",we=".tooltip-inner",xe=".arrow",Ce="hover",Te="focus",Ee="click",Ae="manual",Se=function(){function t(t,e){if(void 0===n)throw new TypeError("Bootstrap tooltips require Popper.js (https://popper.js.org)");this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._popper=null,this.element=t,this.config=this._getConfig(e),this.tip=null,this._setListeners()}var e=t.prototype;return e.enable=function(){this._isEnabled=!0},e.disable=function(){this._isEnabled=!1},e.toggleEnabled=function(){this._isEnabled=!this._isEnabled},e.toggle=function(t){if(this._isEnabled)if(t){var e=this.constructor.DATA_KEY,n=ae(t.currentTarget).data(e);n||(n=new this.constructor(t.currentTarget,this._getDelegateConfig()),ae(t.currentTarget).data(e,n)),n._activeTrigger.click=!n._activeTrigger.click,n._isWithActiveTrigger()?n._enter(null,n):n._leave(null,n)}else{if(ae(this.getTipElement()).hasClass(be))return void this._leave(null,this);this._enter(null,this)}},e.dispose=function(){clearTimeout(this._timeout),ae.removeData(this.element,this.constructor.DATA_KEY),ae(this.element).off(this.constructor.EVENT_KEY),ae(this.element).closest(".modal").off("hide.bs.modal"),this.tip&&ae(this.tip).remove(),this._isEnabled=null,this._timeout=null,this._hoverState=null,this._activeTrigger=null,null!==this._popper&&this._popper.destroy(),this._popper=null,this.element=null,this.config=null,this.tip=null},e.show=function(){var e=this;if("none"===ae(this.element).css("display"))throw new Error("Please use show on visible elements");var r=ae.Event(this.constructor.Event.SHOW);if(this.isWithContent()&&this._isEnabled){ae(this.element).trigger(r);var i=ae.contains(this.element.ownerDocument.documentElement,this.element);if(r.isDefaultPrevented()||!i)return;var o=this.getTipElement(),a=xn.getUID(this.constructor.NAME);o.setAttribute("id",a),this.element.setAttribute("aria-describedby",a),this.setContent(),this.config.animation&&ae(o).addClass(_e);var s="function"==typeof this.config.placement?this.config.placement.call(this,o,this.element):this.config.placement,u=this._getAttachment(s);this.addAttachmentClass(u);var c=!1===this.config.container?document.body:ae(this.config.container);ae(o).data(this.constructor.DATA_KEY,this),ae.contains(this.element.ownerDocument.documentElement,this.tip)||ae(o).appendTo(c),ae(this.element).trigger(this.constructor.Event.INSERTED),this._popper=new n(this.element,o,{placement:u,modifiers:{offset:{offset:this.config.offset},flip:{behavior:this.config.fallbackPlacement},arrow:{element:xe},preventOverflow:{boundariesElement:this.config.boundary}},onCreate:function(t){t.originalPlacement!==t.placement&&e._handlePopperPlacementChange(t)},onUpdate:function(t){e._handlePopperPlacementChange(t)}}),ae(o).addClass(be),"ontouchstart"in document.documentElement&&ae("body").children().on("mouseover",null,ae.noop);var l=function(){e.config.animation&&e._fixTransition();var t=e._hoverState;e._hoverState=null,ae(e.element).trigger(e.constructor.Event.SHOWN),t===me&&e._leave(null,e)};xn.supportsTransitionEnd()&&ae(this.tip).hasClass(_e)?ae(this.tip).one(xn.TRANSITION_END,l).emulateTransitionEnd(t._TRANSITION_DURATION):l()}},e.hide=function(t){var e=this,n=this.getTipElement(),r=ae.Event(this.constructor.Event.HIDE),i=function(){e._hoverState!==ge&&n.parentNode&&n.parentNode.removeChild(n),e._cleanTipClass(),e.element.removeAttribute("aria-describedby"),ae(e.element).trigger(e.constructor.Event.HIDDEN),null!==e._popper&&e._popper.destroy(),t&&t()};ae(this.element).trigger(r),r.isDefaultPrevented()||(ae(n).removeClass(be),"ontouchstart"in document.documentElement&&ae("body").children().off("mouseover",null,ae.noop),this._activeTrigger[Ee]=!1,this._activeTrigger[Te]=!1,this._activeTrigger[Ce]=!1,xn.supportsTransitionEnd()&&ae(this.tip).hasClass(_e)?ae(n).one(xn.TRANSITION_END,i).emulateTransitionEnd(150):i(),this._hoverState="")},e.update=function(){null!==this._popper&&this._popper.scheduleUpdate()},e.isWithContent=function(){return Boolean(this.getTitle())},e.addAttachmentClass=function(t){ae(this.getTipElement()).addClass(fe+"-"+t)},e.getTipElement=function(){return this.tip=this.tip||ae(this.config.template)[0],this.tip},e.setContent=function(){var t=ae(this.getTipElement());this.setElementContent(t.find(we),this.getTitle()),t.removeClass(_e+" "+be)},e.setElementContent=function(t,e){var n=this.config.html;"object"==typeof e&&(e.nodeType||e.jquery)?n?ae(e).parent().is(t)||t.empty().append(e):t.text(ae(e).text()):t[n?"html":"text"](e)},e.getTitle=function(){var t=this.element.getAttribute("data-original-title");return t||(t="function"==typeof this.config.title?this.config.title.call(this.element):this.config.title),t},e._getAttachment=function(t){return he[t.toUpperCase()]},e._setListeners=function(){var t=this;this.config.trigger.split(" ").forEach(function(e){if("click"===e)ae(t.element).on(t.constructor.Event.CLICK,t.config.selector,function(e){return t.toggle(e)});else if(e!==Ae){var n=e===Ce?t.constructor.Event.MOUSEENTER:t.constructor.Event.FOCUSIN,r=e===Ce?t.constructor.Event.MOUSELEAVE:t.constructor.Event.FOCUSOUT;ae(t.element).on(n,t.config.selector,function(e){return t._enter(e)}).on(r,t.config.selector,function(e){return t._leave(e)})}ae(t.element).closest(".modal").on("hide.bs.modal",function(){return t.hide()})}),this.config.selector?this.config=o({},this.config,{trigger:"manual",selector:""}):this._fixTitle()},e._fixTitle=function(){var t=typeof this.element.getAttribute("data-original-title");(this.element.getAttribute("title")||"string"!==t)&&(this.element.setAttribute("data-original-title",this.element.getAttribute("title")||""),this.element.setAttribute("title",""))},e._enter=function(t,e){var n=this.constructor.DATA_KEY;(e=e||ae(t.currentTarget).data(n))||(e=new this.constructor(t.currentTarget,this._getDelegateConfig()),ae(t.currentTarget).data(n,e)),t&&(e._activeTrigger["focusin"===t.type?Te:Ce]=!0),ae(e.getTipElement()).hasClass(be)||e._hoverState===ge?e._hoverState=ge:(clearTimeout(e._timeout),e._hoverState=ge,e.config.delay&&e.config.delay.show?e._timeout=setTimeout(function(){e._hoverState===ge&&e.show()},e.config.delay.show):e.show())},e._leave=function(t,e){var n=this.constructor.DATA_KEY;(e=e||ae(t.currentTarget).data(n))||(e=new this.constructor(t.currentTarget,this._getDelegateConfig()),ae(t.currentTarget).data(n,e)),t&&(e._activeTrigger["focusout"===t.type?Te:Ce]=!1),e._isWithActiveTrigger()||(clearTimeout(e._timeout),e._hoverState=me,e.config.delay&&e.config.delay.hide?e._timeout=setTimeout(function(){e._hoverState===me&&e.hide()},e.config.delay.hide):e.hide())},e._isWithActiveTrigger=function(){for(var t in this._activeTrigger)if(this._activeTrigger[t])return!0;return!1},e._getConfig=function(t){return"number"==typeof(t=o({},this.constructor.Default,ae(this.element).data(),t)).delay&&(t.delay={show:t.delay,hide:t.delay}),"number"==typeof t.title&&(t.title=t.title.toString()),"number"==typeof t.content&&(t.content=t.content.toString()),xn.typeCheckConfig(se,t,this.constructor.DefaultType),t},e._getDelegateConfig=function(){var t={};if(this.config)for(var e in this.config)this.constructor.Default[e]!==this.config[e]&&(t[e]=this.config[e]);return t},e._cleanTipClass=function(){var t=ae(this.getTipElement()),e=t.attr("class").match(pe);null!==e&&e.length>0&&t.removeClass(e.join(""))},e._handlePopperPlacementChange=function(t){this._cleanTipClass(),this.addAttachmentClass(this._getAttachment(t.placement))},e._fixTransition=function(){var t=this.getTipElement(),e=this.config.animation;null===t.getAttribute("x-placement")&&(ae(t).removeClass(_e),this.config.animation=!1,this.hide(),this.show(),this.config.animation=e)},t._jQueryInterface=function(e){return this.each(function(){var n=ae(this).data(ue),r="object"==typeof e&&e;if((n||!/dispose|hide/.test(e))&&(n||(n=new t(this,r),ae(this).data(ue,n)),"string"==typeof e)){if(void 0===n[e])throw new TypeError('No method named "'+e+'"');n[e]()}})},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return ve}},{key:"NAME",get:function(){return se}},{key:"DATA_KEY",get:function(){return ue}},{key:"Event",get:function(){return ye}},{key:"EVENT_KEY",get:function(){return ce}},{key:"DefaultType",get:function(){return de}}]),t}(),ae.fn[se]=Se._jQueryInterface,ae.fn[se].Constructor=Se,ae.fn[se].noConflict=function(){return ae.fn[se]=le,Se._jQueryInterface},Se),Dn=(Oe="popover",Ie="."+(De="bs.popover"),Ne=(ke=e).fn[Oe],je="bs-popover",Le=new RegExp("(^|\\s)"+je+"\\S+","g"),$e=o({},On.Default,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'}),Re=o({},On.DefaultType,{content:"(string|element|function)"}),Pe="fade",Me="show",Fe=".popover-header",He=".popover-body",Be={HIDE:"hide"+Ie,HIDDEN:"hidden"+Ie,SHOW:"show"+Ie,SHOWN:"shown"+Ie,INSERTED:"inserted"+Ie,CLICK:"click"+Ie,FOCUSIN:"focusin"+Ie,FOCUSOUT:"focusout"+Ie,MOUSEENTER:"mouseenter"+Ie,MOUSELEAVE:"mouseleave"+Ie},We=function(t){var e,n;function r(){return t.apply(this,arguments)||this}n=t,(e=r).prototype=Object.create(n.prototype),e.prototype.constructor=e,e.__proto__=n;var o=r.prototype;return o.isWithContent=function(){return this.getTitle()||this._getContent()},o.addAttachmentClass=function(t){ke(this.getTipElement()).addClass(je+"-"+t)},o.getTipElement=function(){return this.tip=this.tip||ke(this.config.template)[0],this.tip},o.setContent=function(){var t=ke(this.getTipElement());this.setElementContent(t.find(Fe),this.getTitle());var e=this._getContent();"function"==typeof e&&(e=e.call(this.element)),this.setElementContent(t.find(He),e),t.removeClass(Pe+" "+Me)},o._getContent=function(){return this.element.getAttribute("data-content")||this.config.content},o._cleanTipClass=function(){var t=ke(this.getTipElement()),e=t.attr("class").match(Le);null!==e&&e.length>0&&t.removeClass(e.join(""))},r._jQueryInterface=function(t){return this.each(function(){var e=ke(this).data(De),n="object"==typeof t?t:null;if((e||!/destroy|hide/.test(t))&&(e||(e=new r(this,n),ke(this).data(De,e)),"string"==typeof t)){if(void 0===e[t])throw new TypeError('No method named "'+t+'"');e[t]()}})},i(r,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return $e}},{key:"NAME",get:function(){return Oe}},{key:"DATA_KEY",get:function(){return De}},{key:"Event",get:function(){return Be}},{key:"EVENT_KEY",get:function(){return Ie}},{key:"DefaultType",get:function(){return Re}}]),r}(On),ke.fn[Oe]=We._jQueryInterface,ke.fn[Oe].Constructor=We,ke.fn[Oe].noConflict=function(){return ke.fn[Oe]=Ne,We._jQueryInterface},We),In=(Ue="scrollspy",Ve="."+(ze="bs.scrollspy"),Ke=(qe=e).fn[Ue],Qe={offset:10,method:"auto",target:""},Ge={offset:"number",method:"string",target:"(string|element)"},Ye={ACTIVATE:"activate"+Ve,SCROLL:"scroll"+Ve,LOAD_DATA_API:"load"+Ve+".data-api"},Xe="dropdown-item",Je="active",Ze={DATA_SPY:'[data-spy="scroll"]',ACTIVE:".active",NAV_LIST_GROUP:".nav, .list-group",NAV_LINKS:".nav-link",NAV_ITEMS:".nav-item",LIST_ITEMS:".list-group-item",DROPDOWN:".dropdown",DROPDOWN_ITEMS:".dropdown-item",DROPDOWN_TOGGLE:".dropdown-toggle"},tn="offset",en="position",nn=function(){function t(t,e){var n=this;this._element=t,this._scrollElement="BODY"===t.tagName?window:t,this._config=this._getConfig(e),this._selector=this._config.target+" "+Ze.NAV_LINKS+","+this._config.target+" "+Ze.LIST_ITEMS+","+this._config.target+" "+Ze.DROPDOWN_ITEMS,this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,qe(this._scrollElement).on(Ye.SCROLL,function(t){return n._process(t)}),this.refresh(),this._process()}var e=t.prototype;return e.refresh=function(){var t=this,e=this._scrollElement===this._scrollElement.window?tn:en,n="auto"===this._config.method?e:this._config.method,r=n===en?this._getScrollTop():0;this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight(),qe.makeArray(qe(this._selector)).map(function(t){var e,i=xn.getSelectorFromElement(t);if(i&&(e=qe(i)[0]),e){var o=e.getBoundingClientRect();if(o.width||o.height)return[qe(e)[n]().top+r,i]}return null}).filter(function(t){return t}).sort(function(t,e){return t[0]-e[0]}).forEach(function(e){t._offsets.push(e[0]),t._targets.push(e[1])})},e.dispose=function(){qe.removeData(this._element,ze),qe(this._scrollElement).off(Ve),this._element=null,this._scrollElement=null,this._config=null,this._selector=null,this._offsets=null,this._targets=null,this._activeTarget=null,this._scrollHeight=null},e._getConfig=function(t){if("string"!=typeof(t=o({},Qe,t)).target){var e=qe(t.target).attr("id");e||(e=xn.getUID(Ue),qe(t.target).attr("id",e)),t.target="#"+e}return xn.typeCheckConfig(Ue,t,Ge),t},e._getScrollTop=function(){return this._scrollElement===window?this._scrollElement.pageYOffset:this._scrollElement.scrollTop},e._getScrollHeight=function(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)},e._getOffsetHeight=function(){return this._scrollElement===window?window.innerHeight:this._scrollElement.getBoundingClientRect().height},e._process=function(){var t=this._getScrollTop()+this._config.offset,e=this._getScrollHeight(),n=this._config.offset+e-this._getOffsetHeight();if(this._scrollHeight!==e&&this.refresh(),t>=n){var r=this._targets[this._targets.length-1];this._activeTarget!==r&&this._activate(r)}else{if(this._activeTarget&&t<this._offsets[0]&&this._offsets[0]>0)return this._activeTarget=null,void this._clear();for(var i=this._offsets.length;i--;){this._activeTarget!==this._targets[i]&&t>=this._offsets[i]&&(void 0===this._offsets[i+1]||t<this._offsets[i+1])&&this._activate(this._targets[i])}}},e._activate=function(t){this._activeTarget=t,this._clear();var e=this._selector.split(",");e=e.map(function(e){return e+'[data-target="'+t+'"],'+e+'[href="'+t+'"]'});var n=qe(e.join(","));n.hasClass(Xe)?(n.closest(Ze.DROPDOWN).find(Ze.DROPDOWN_TOGGLE).addClass(Je),n.addClass(Je)):(n.addClass(Je),n.parents(Ze.NAV_LIST_GROUP).prev(Ze.NAV_LINKS+", "+Ze.LIST_ITEMS).addClass(Je),n.parents(Ze.NAV_LIST_GROUP).prev(Ze.NAV_ITEMS).children(Ze.NAV_LINKS).addClass(Je)),qe(this._scrollElement).trigger(Ye.ACTIVATE,{relatedTarget:t})},e._clear=function(){qe(this._selector).filter(Ze.ACTIVE).removeClass(Je)},t._jQueryInterface=function(e){return this.each(function(){var n=qe(this).data(ze);if(n||(n=new t(this,"object"==typeof e&&e),qe(this).data(ze,n)),"string"==typeof e){if(void 0===n[e])throw new TypeError('No method named "'+e+'"');n[e]()}})},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return Qe}}]),t}(),qe(window).on(Ye.LOAD_DATA_API,function(){for(var t=qe.makeArray(qe(Ze.DATA_SPY)),e=t.length;e--;){var n=qe(t[e]);nn._jQueryInterface.call(n,n.data())}}),qe.fn[Ue]=nn._jQueryInterface,qe.fn[Ue].Constructor=nn,qe.fn[Ue].noConflict=function(){return qe.fn[Ue]=Ke,nn._jQueryInterface},nn),Nn=(an="."+(on="bs.tab"),sn=(rn=e).fn.tab,un={HIDE:"hide"+an,HIDDEN:"hidden"+an,SHOW:"show"+an,SHOWN:"shown"+an,CLICK_DATA_API:"click.bs.tab.data-api"},cn="dropdown-menu",ln="active",fn="disabled",pn="fade",dn="show",hn=".dropdown",vn=".nav, .list-group",gn=".active",mn="> li > .active",yn='[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',_n=".dropdown-toggle",bn="> .dropdown-menu .active",wn=function(){function t(t){this._element=t}var e=t.prototype;return e.show=function(){var t=this;if(!(this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE&&rn(this._element).hasClass(ln)||rn(this._element).hasClass(fn))){var e,n,r=rn(this._element).closest(vn)[0],i=xn.getSelectorFromElement(this._element);if(r){var o="UL"===r.nodeName?mn:gn;n=(n=rn.makeArray(rn(r).find(o)))[n.length-1]}var a=rn.Event(un.HIDE,{relatedTarget:this._element}),s=rn.Event(un.SHOW,{relatedTarget:n});if(n&&rn(n).trigger(a),rn(this._element).trigger(s),!s.isDefaultPrevented()&&!a.isDefaultPrevented()){i&&(e=rn(i)[0]),this._activate(this._element,r);var u=function(){var e=rn.Event(un.HIDDEN,{relatedTarget:t._element}),r=rn.Event(un.SHOWN,{relatedTarget:n});rn(n).trigger(e),rn(t._element).trigger(r)};e?this._activate(e,e.parentNode,u):u()}}},e.dispose=function(){rn.removeData(this._element,on),this._element=null},e._activate=function(t,e,n){var r=this,i=("UL"===e.nodeName?rn(e).find(mn):rn(e).children(gn))[0],o=n&&xn.supportsTransitionEnd()&&i&&rn(i).hasClass(pn),a=function(){return r._transitionComplete(t,i,n)};i&&o?rn(i).one(xn.TRANSITION_END,a).emulateTransitionEnd(150):a()},e._transitionComplete=function(t,e,n){if(e){rn(e).removeClass(dn+" "+ln);var r=rn(e.parentNode).find(bn)[0];r&&rn(r).removeClass(ln),"tab"===e.getAttribute("role")&&e.setAttribute("aria-selected",!1)}if(rn(t).addClass(ln),"tab"===t.getAttribute("role")&&t.setAttribute("aria-selected",!0),xn.reflow(t),rn(t).addClass(dn),t.parentNode&&rn(t.parentNode).hasClass(cn)){var i=rn(t).closest(hn)[0];i&&rn(i).find(_n).addClass(ln),t.setAttribute("aria-expanded",!0)}n&&n()},t._jQueryInterface=function(e){return this.each(function(){var n=rn(this),r=n.data(on);if(r||(r=new t(this),n.data(on,r)),"string"==typeof e){if(void 0===r[e])throw new TypeError('No method named "'+e+'"');r[e]()}})},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}}]),t}(),rn(document).on(un.CLICK_DATA_API,yn,function(t){t.preventDefault(),wn._jQueryInterface.call(rn(this),"show")}),rn.fn.tab=wn._jQueryInterface,rn.fn.tab.Constructor=wn,rn.fn.tab.noConflict=function(){return rn.fn.tab=sn,wn._jQueryInterface},wn);!function(t){if(void 0===t)throw new TypeError("Bootstrap's JavaScript requires jQuery. jQuery must be included before Bootstrap's JavaScript.");var e=t.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1===e[0]&&9===e[1]&&e[2]<1||e[0]>=4)throw new Error("Bootstrap's JavaScript requires at least jQuery v1.9.1 but less than v4.0.0")}(e),t.Util=xn,t.Alert=Cn,t.Button=Tn,t.Carousel=En,t.Collapse=An,t.Dropdown=Sn,t.Modal=kn,t.Popover=Dn,t.Scrollspy=In,t.Tab=Nn,t.Tooltip=On,Object.defineProperty(t,"__esModule",{value:!0})})(e,n(4),n(3))},function(t,e,n){t.exports=n(18)},function(t,e,n){"use strict";var r=n(0),i=n(5),o=n(20),a=n(2);function s(t){var e=new o(t),n=i(o.prototype.request,e);return r.extend(n,o.prototype,e),r.extend(n,e),n}var u=s(a);u.Axios=o,u.create=function(t){return s(r.merge(a,t))},u.Cancel=n(10),u.CancelToken=n(34),u.isCancel=n(9),u.all=function(t){return Promise.all(t)},u.spread=n(35),t.exports=u,t.exports.default=u},function(t,e){function n(t){return!!t.constructor&&"function"==typeof t.constructor.isBuffer&&t.constructor.isBuffer(t)}t.exports=function(t){return null!=t&&(n(t)||"function"==typeof(e=t).readFloatLE&&"function"==typeof e.slice&&n(e.slice(0,0))||!!t._isBuffer);var e}},function(t,e,n){"use strict";var r=n(2),i=n(0),o=n(29),a=n(30);function s(t){this.defaults=t,this.interceptors={request:new o,response:new o}}s.prototype.request=function(t){"string"==typeof t&&(t=i.merge({url:arguments[0]},arguments[1])),(t=i.merge(r,this.defaults,{method:"get"},t)).method=t.method.toLowerCase();var e=[a,void 0],n=Promise.resolve(t);for(this.interceptors.request.forEach(function(t){e.unshift(t.fulfilled,t.rejected)}),this.interceptors.response.forEach(function(t){e.push(t.fulfilled,t.rejected)});e.length;)n=n.then(e.shift(),e.shift());return n},i.forEach(["delete","get","head","options"],function(t){s.prototype[t]=function(e,n){return this.request(i.merge(n||{},{method:t,url:e}))}}),i.forEach(["post","put","patch"],function(t){s.prototype[t]=function(e,n,r){return this.request(i.merge(r||{},{method:t,url:e,data:n}))}}),t.exports=s},function(t,e,n){"use strict";var r=n(0);t.exports=function(t,e){r.forEach(t,function(n,r){r!==e&&r.toUpperCase()===e.toUpperCase()&&(t[e]=n,delete t[r])})}},function(t,e,n){"use strict";var r=n(8);t.exports=function(t,e,n){var i=n.config.validateStatus;n.status&&i&&!i(n.status)?e(r("Request failed with status code "+n.status,n.config,null,n.request,n)):t(n)}},function(t,e,n){"use strict";t.exports=function(t,e,n,r,i){return t.config=e,n&&(t.code=n),t.request=r,t.response=i,t}},function(t,e,n){"use strict";var r=n(0);function i(t){return encodeURIComponent(t).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}t.exports=function(t,e,n){if(!e)return t;var o;if(n)o=n(e);else if(r.isURLSearchParams(e))o=e.toString();else{var a=[];r.forEach(e,function(t,e){null!==t&&void 0!==t&&(r.isArray(t)&&(e+="[]"),r.isArray(t)||(t=[t]),r.forEach(t,function(t){r.isDate(t)?t=t.toISOString():r.isObject(t)&&(t=JSON.stringify(t)),a.push(i(e)+"="+i(t))}))}),o=a.join("&")}return o&&(t+=(-1===t.indexOf("?")?"?":"&")+o),t}},function(t,e,n){"use strict";var r=n(0),i=["age","authorization","content-length","content-type","etag","expires","from","host","if-modified-since","if-unmodified-since","last-modified","location","max-forwards","proxy-authorization","referer","retry-after","user-agent"];t.exports=function(t){var e,n,o,a={};return t?(r.forEach(t.split("\n"),function(t){if(o=t.indexOf(":"),e=r.trim(t.substr(0,o)).toLowerCase(),n=r.trim(t.substr(o+1)),e){if(a[e]&&i.indexOf(e)>=0)return;a[e]="set-cookie"===e?(a[e]?a[e]:[]).concat([n]):a[e]?a[e]+", "+n:n}}),a):a}},function(t,e,n){"use strict";var r=n(0);t.exports=r.isStandardBrowserEnv()?function(){var t,e=/(msie|trident)/i.test(navigator.userAgent),n=document.createElement("a");function i(t){var r=t;return e&&(n.setAttribute("href",r),r=n.href),n.setAttribute("href",r),{href:n.href,protocol:n.protocol?n.protocol.replace(/:$/,""):"",host:n.host,search:n.search?n.search.replace(/^\?/,""):"",hash:n.hash?n.hash.replace(/^#/,""):"",hostname:n.hostname,port:n.port,pathname:"/"===n.pathname.charAt(0)?n.pathname:"/"+n.pathname}}return t=i(window.location.href),function(e){var n=r.isString(e)?i(e):e;return n.protocol===t.protocol&&n.host===t.host}}():function(){return!0}},function(t,e,n){"use strict";var r="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";function i(){this.message="String contains an invalid character"}i.prototype=new Error,i.prototype.code=5,i.prototype.name="InvalidCharacterError",t.exports=function(t){for(var e,n,o=String(t),a="",s=0,u=r;o.charAt(0|s)||(u="=",s%1);a+=u.charAt(63&e>>8-s%1*8)){if((n=o.charCodeAt(s+=.75))>255)throw new i;e=e<<8|n}return a}},function(t,e,n){"use strict";var r=n(0);t.exports=r.isStandardBrowserEnv()?{write:function(t,e,n,i,o,a){var s=[];s.push(t+"="+encodeURIComponent(e)),r.isNumber(n)&&s.push("expires="+new Date(n).toGMTString()),r.isString(i)&&s.push("path="+i),r.isString(o)&&s.push("domain="+o),!0===a&&s.push("secure"),document.cookie=s.join("; ")},read:function(t){var e=document.cookie.match(new RegExp("(^|;\\s*)("+t+")=([^;]*)"));return e?decodeURIComponent(e[3]):null},remove:function(t){this.write(t,"",Date.now()-864e5)}}:{write:function(){},read:function(){return null},remove:function(){}}},function(t,e,n){"use strict";var r=n(0);function i(){this.handlers=[]}i.prototype.use=function(t,e){return this.handlers.push({fulfilled:t,rejected:e}),this.handlers.length-1},i.prototype.eject=function(t){this.handlers[t]&&(this.handlers[t]=null)},i.prototype.forEach=function(t){r.forEach(this.handlers,function(e){null!==e&&t(e)})},t.exports=i},function(t,e,n){"use strict";var r=n(0),i=n(31),o=n(9),a=n(2),s=n(32),u=n(33);function c(t){t.cancelToken&&t.cancelToken.throwIfRequested()}t.exports=function(t){return c(t),t.baseURL&&!s(t.url)&&(t.url=u(t.baseURL,t.url)),t.headers=t.headers||{},t.data=i(t.data,t.headers,t.transformRequest),t.headers=r.merge(t.headers.common||{},t.headers[t.method]||{},t.headers||{}),r.forEach(["delete","get","head","post","put","patch","common"],function(e){delete t.headers[e]}),(t.adapter||a.adapter)(t).then(function(e){return c(t),e.data=i(e.data,e.headers,t.transformResponse),e},function(e){return o(e)||(c(t),e&&e.response&&(e.response.data=i(e.response.data,e.response.headers,t.transformResponse))),Promise.reject(e)})}},function(t,e,n){"use strict";var r=n(0);t.exports=function(t,e,n){return r.forEach(n,function(n){t=n(t,e)}),t}},function(t,e,n){"use strict";t.exports=function(t){return/^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(t)}},function(t,e,n){"use strict";t.exports=function(t,e){return e?t.replace(/\/+$/,"")+"/"+e.replace(/^\/+/,""):t}},function(t,e,n){"use strict";var r=n(10);function i(t){if("function"!=typeof t)throw new TypeError("executor must be a function.");var e;this.promise=new Promise(function(t){e=t});var n=this;t(function(t){n.reason||(n.reason=new r(t),e(n.reason))})}i.prototype.throwIfRequested=function(){if(this.reason)throw this.reason},i.source=function(){var t;return{token:new i(function(e){t=e}),cancel:t}},t.exports=i},function(t,e,n){"use strict";t.exports=function(t){return function(e){return t.apply(null,e)}}},function(t,e,n){"use strict";(function(e,n){var r=Object.freeze({});function i(t){return void 0===t||null===t}function o(t){return void 0!==t&&null!==t}function a(t){return!0===t}function s(t){return"string"==typeof t||"number"==typeof t||"symbol"==typeof t||"boolean"==typeof t}function u(t){return null!==t&&"object"==typeof t}var c=Object.prototype.toString;function l(t){return"[object Object]"===c.call(t)}function f(t){return"[object RegExp]"===c.call(t)}function p(t){var e=parseFloat(String(t));return e>=0&&Math.floor(e)===e&&isFinite(t)}function d(t){return null==t?"":"object"==typeof t?JSON.stringify(t,null,2):String(t)}function h(t){var e=parseFloat(t);return isNaN(e)?t:e}function v(t,e){for(var n=Object.create(null),r=t.split(","),i=0;i<r.length;i++)n[r[i]]=!0;return e?function(t){return n[t.toLowerCase()]}:function(t){return n[t]}}var g=v("slot,component",!0),m=v("key,ref,slot,slot-scope,is");function y(t,e){if(t.length){var n=t.indexOf(e);if(n>-1)return t.splice(n,1)}}var _=Object.prototype.hasOwnProperty;function b(t,e){return _.call(t,e)}function w(t){var e=Object.create(null);return function(n){return e[n]||(e[n]=t(n))}}var x=/-(\w)/g,C=w(function(t){return t.replace(x,function(t,e){return e?e.toUpperCase():""})}),T=w(function(t){return t.charAt(0).toUpperCase()+t.slice(1)}),E=/\B([A-Z])/g,A=w(function(t){return t.replace(E,"-$1").toLowerCase()});function S(t,e){function n(n){var r=arguments.length;return r?r>1?t.apply(e,arguments):t.call(e,n):t.call(e)}return n._length=t.length,n}function k(t,e){e=e||0;for(var n=t.length-e,r=new Array(n);n--;)r[n]=t[n+e];return r}function O(t,e){for(var n in e)t[n]=e[n];return t}function D(t){for(var e={},n=0;n<t.length;n++)t[n]&&O(e,t[n]);return e}function I(t,e,n){}var N=function(t,e,n){return!1},j=function(t){return t};function L(t,e){if(t===e)return!0;var n=u(t),r=u(e);if(!n||!r)return!n&&!r&&String(t)===String(e);try{var i=Array.isArray(t),o=Array.isArray(e);if(i&&o)return t.length===e.length&&t.every(function(t,n){return L(t,e[n])});if(i||o)return!1;var a=Object.keys(t),s=Object.keys(e);return a.length===s.length&&a.every(function(n){return L(t[n],e[n])})}catch(t){return!1}}function $(t,e){for(var n=0;n<t.length;n++)if(L(t[n],e))return n;return-1}function R(t){var e=!1;return function(){e||(e=!0,t.apply(this,arguments))}}var P="data-server-rendered",M=["component","directive","filter"],F=["beforeCreate","created","beforeMount","mounted","beforeUpdate","updated","beforeDestroy","destroyed","activated","deactivated","errorCaptured"],H={optionMergeStrategies:Object.create(null),silent:!1,productionTip:!1,devtools:!1,performance:!1,errorHandler:null,warnHandler:null,ignoredElements:[],keyCodes:Object.create(null),isReservedTag:N,isReservedAttr:N,isUnknownElement:N,getTagNamespace:I,parsePlatformTagName:j,mustUseProp:N,_lifecycleHooks:F};function B(t){var e=(t+"").charCodeAt(0);return 36===e||95===e}function W(t,e,n,r){Object.defineProperty(t,e,{value:n,enumerable:!!r,writable:!0,configurable:!0})}var q=/[^\w.$]/;var U,z="__proto__"in{},V="undefined"!=typeof window,K="undefined"!=typeof WXEnvironment&&!!WXEnvironment.platform,Q=K&&WXEnvironment.platform.toLowerCase(),G=V&&window.navigator.userAgent.toLowerCase(),Y=G&&/msie|trident/.test(G),X=G&&G.indexOf("msie 9.0")>0,J=G&&G.indexOf("edge/")>0,Z=G&&G.indexOf("android")>0||"android"===Q,tt=G&&/iphone|ipad|ipod|ios/.test(G)||"ios"===Q,et=(G&&/chrome\/\d+/.test(G),{}.watch),nt=!1;if(V)try{var rt={};Object.defineProperty(rt,"passive",{get:function(){nt=!0}}),window.addEventListener("test-passive",null,rt)}catch(t){}var it=function(){return void 0===U&&(U=!V&&void 0!==e&&"server"===e.process.env.VUE_ENV),U},ot=V&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__;function at(t){return"function"==typeof t&&/native code/.test(t.toString())}var st,ut="undefined"!=typeof Symbol&&at(Symbol)&&"undefined"!=typeof Reflect&&at(Reflect.ownKeys);st="undefined"!=typeof Set&&at(Set)?Set:function(){function t(){this.set=Object.create(null)}return t.prototype.has=function(t){return!0===this.set[t]},t.prototype.add=function(t){this.set[t]=!0},t.prototype.clear=function(){this.set=Object.create(null)},t}();var ct=I,lt=0,ft=function(){this.id=lt++,this.subs=[]};ft.prototype.addSub=function(t){this.subs.push(t)},ft.prototype.removeSub=function(t){y(this.subs,t)},ft.prototype.depend=function(){ft.target&&ft.target.addDep(this)},ft.prototype.notify=function(){for(var t=this.subs.slice(),e=0,n=t.length;e<n;e++)t[e].update()},ft.target=null;var pt=[];var dt=function(t,e,n,r,i,o,a,s){this.tag=t,this.data=e,this.children=n,this.text=r,this.elm=i,this.ns=void 0,this.context=o,this.fnContext=void 0,this.fnOptions=void 0,this.fnScopeId=void 0,this.key=e&&e.key,this.componentOptions=a,this.componentInstance=void 0,this.parent=void 0,this.raw=!1,this.isStatic=!1,this.isRootInsert=!0,this.isComment=!1,this.isCloned=!1,this.isOnce=!1,this.asyncFactory=s,this.asyncMeta=void 0,this.isAsyncPlaceholder=!1},ht={child:{configurable:!0}};ht.child.get=function(){return this.componentInstance},Object.defineProperties(dt.prototype,ht);var vt=function(t){void 0===t&&(t="");var e=new dt;return e.text=t,e.isComment=!0,e};function gt(t){return new dt(void 0,void 0,void 0,String(t))}function mt(t,e){var n=t.componentOptions,r=new dt(t.tag,t.data,t.children,t.text,t.elm,t.context,n,t.asyncFactory);return r.ns=t.ns,r.isStatic=t.isStatic,r.key=t.key,r.isComment=t.isComment,r.fnContext=t.fnContext,r.fnOptions=t.fnOptions,r.fnScopeId=t.fnScopeId,r.isCloned=!0,e&&(t.children&&(r.children=yt(t.children,!0)),n&&n.children&&(n.children=yt(n.children,!0))),r}function yt(t,e){for(var n=t.length,r=new Array(n),i=0;i<n;i++)r[i]=mt(t[i],e);return r}var _t=Array.prototype,bt=Object.create(_t);["push","pop","shift","unshift","splice","sort","reverse"].forEach(function(t){var e=_t[t];W(bt,t,function(){for(var n=[],r=arguments.length;r--;)n[r]=arguments[r];var i,o=e.apply(this,n),a=this.__ob__;switch(t){case"push":case"unshift":i=n;break;case"splice":i=n.slice(2)}return i&&a.observeArray(i),a.dep.notify(),o})});var wt=Object.getOwnPropertyNames(bt),xt={shouldConvert:!0},Ct=function(t){(this.value=t,this.dep=new ft,this.vmCount=0,W(t,"__ob__",this),Array.isArray(t))?((z?Tt:Et)(t,bt,wt),this.observeArray(t)):this.walk(t)};function Tt(t,e,n){t.__proto__=e}function Et(t,e,n){for(var r=0,i=n.length;r<i;r++){var o=n[r];W(t,o,e[o])}}function At(t,e){var n;if(u(t)&&!(t instanceof dt))return b(t,"__ob__")&&t.__ob__ instanceof Ct?n=t.__ob__:xt.shouldConvert&&!it()&&(Array.isArray(t)||l(t))&&Object.isExtensible(t)&&!t._isVue&&(n=new Ct(t)),e&&n&&n.vmCount++,n}function St(t,e,n,r,i){var o=new ft,a=Object.getOwnPropertyDescriptor(t,e);if(!a||!1!==a.configurable){var s=a&&a.get,u=a&&a.set,c=!i&&At(n);Object.defineProperty(t,e,{enumerable:!0,configurable:!0,get:function(){var e=s?s.call(t):n;return ft.target&&(o.depend(),c&&(c.dep.depend(),Array.isArray(e)&&function t(e){for(var n=void 0,r=0,i=e.length;r<i;r++)(n=e[r])&&n.__ob__&&n.__ob__.dep.depend(),Array.isArray(n)&&t(n)}(e))),e},set:function(e){var r=s?s.call(t):n;e===r||e!=e&&r!=r||(u?u.call(t,e):n=e,c=!i&&At(e),o.notify())}})}}function kt(t,e,n){if(Array.isArray(t)&&p(e))return t.length=Math.max(t.length,e),t.splice(e,1,n),n;if(e in t&&!(e in Object.prototype))return t[e]=n,n;var r=t.__ob__;return t._isVue||r&&r.vmCount?n:r?(St(r.value,e,n),r.dep.notify(),n):(t[e]=n,n)}function Ot(t,e){if(Array.isArray(t)&&p(e))t.splice(e,1);else{var n=t.__ob__;t._isVue||n&&n.vmCount||b(t,e)&&(delete t[e],n&&n.dep.notify())}}Ct.prototype.walk=function(t){for(var e=Object.keys(t),n=0;n<e.length;n++)St(t,e[n],t[e[n]])},Ct.prototype.observeArray=function(t){for(var e=0,n=t.length;e<n;e++)At(t[e])};var Dt=H.optionMergeStrategies;function It(t,e){if(!e)return t;for(var n,r,i,o=Object.keys(e),a=0;a<o.length;a++)r=t[n=o[a]],i=e[n],b(t,n)?l(r)&&l(i)&&It(r,i):kt(t,n,i);return t}function Nt(t,e,n){return n?function(){var r="function"==typeof e?e.call(n,n):e,i="function"==typeof t?t.call(n,n):t;return r?It(r,i):i}:e?t?function(){return It("function"==typeof e?e.call(this,this):e,"function"==typeof t?t.call(this,this):t)}:e:t}function jt(t,e){return e?t?t.concat(e):Array.isArray(e)?e:[e]:t}function Lt(t,e,n,r){var i=Object.create(t||null);return e?O(i,e):i}Dt.data=function(t,e,n){return n?Nt(t,e,n):e&&"function"!=typeof e?t:Nt(t,e)},F.forEach(function(t){Dt[t]=jt}),M.forEach(function(t){Dt[t+"s"]=Lt}),Dt.watch=function(t,e,n,r){if(t===et&&(t=void 0),e===et&&(e=void 0),!e)return Object.create(t||null);if(!t)return e;var i={};O(i,t);for(var o in e){var a=i[o],s=e[o];a&&!Array.isArray(a)&&(a=[a]),i[o]=a?a.concat(s):Array.isArray(s)?s:[s]}return i},Dt.props=Dt.methods=Dt.inject=Dt.computed=function(t,e,n,r){if(!t)return e;var i=Object.create(null);return O(i,t),e&&O(i,e),i},Dt.provide=Nt;var $t=function(t,e){return void 0===e?t:e};function Rt(t,e,n){"function"==typeof e&&(e=e.options),function(t,e){var n=t.props;if(n){var r,i,o={};if(Array.isArray(n))for(r=n.length;r--;)"string"==typeof(i=n[r])&&(o[C(i)]={type:null});else if(l(n))for(var a in n)i=n[a],o[C(a)]=l(i)?i:{type:i};t.props=o}}(e),function(t,e){var n=t.inject;if(n){var r=t.inject={};if(Array.isArray(n))for(var i=0;i<n.length;i++)r[n[i]]={from:n[i]};else if(l(n))for(var o in n){var a=n[o];r[o]=l(a)?O({from:o},a):{from:a}}}}(e),function(t){var e=t.directives;if(e)for(var n in e){var r=e[n];"function"==typeof r&&(e[n]={bind:r,update:r})}}(e);var r=e.extends;if(r&&(t=Rt(t,r,n)),e.mixins)for(var i=0,o=e.mixins.length;i<o;i++)t=Rt(t,e.mixins[i],n);var a,s={};for(a in t)u(a);for(a in e)b(t,a)||u(a);function u(r){var i=Dt[r]||$t;s[r]=i(t[r],e[r],n,r)}return s}function Pt(t,e,n,r){if("string"==typeof n){var i=t[e];if(b(i,n))return i[n];var o=C(n);if(b(i,o))return i[o];var a=T(o);return b(i,a)?i[a]:i[n]||i[o]||i[a]}}function Mt(t,e,n,r){var i=e[t],o=!b(n,t),a=n[t];if(Ht(Boolean,i.type)&&(o&&!b(i,"default")?a=!1:Ht(String,i.type)||""!==a&&a!==A(t)||(a=!0)),void 0===a){a=function(t,e,n){if(!b(e,"default"))return;var r=e.default;0;if(t&&t.$options.propsData&&void 0===t.$options.propsData[n]&&void 0!==t._props[n])return t._props[n];return"function"==typeof r&&"Function"!==Ft(e.type)?r.call(t):r}(r,i,t);var s=xt.shouldConvert;xt.shouldConvert=!0,At(a),xt.shouldConvert=s}return a}function Ft(t){var e=t&&t.toString().match(/^\s*function (\w+)/);return e?e[1]:""}function Ht(t,e){if(!Array.isArray(e))return Ft(e)===Ft(t);for(var n=0,r=e.length;n<r;n++)if(Ft(e[n])===Ft(t))return!0;return!1}function Bt(t,e,n){if(e)for(var r=e;r=r.$parent;){var i=r.$options.errorCaptured;if(i)for(var o=0;o<i.length;o++)try{if(!1===i[o].call(r,t,e,n))return}catch(t){Wt(t,r,"errorCaptured hook")}}Wt(t,e,n)}function Wt(t,e,n){if(H.errorHandler)try{return H.errorHandler.call(null,t,e,n)}catch(t){qt(t,null,"config.errorHandler")}qt(t,e,n)}function qt(t,e,n){if(!V&&!K||"undefined"==typeof console)throw t;console.error(t)}var Ut,zt,Vt=[],Kt=!1;function Qt(){Kt=!1;var t=Vt.slice(0);Vt.length=0;for(var e=0;e<t.length;e++)t[e]()}var Gt=!1;if(void 0!==n&&at(n))zt=function(){n(Qt)};else if("undefined"==typeof MessageChannel||!at(MessageChannel)&&"[object MessageChannelConstructor]"!==MessageChannel.toString())zt=function(){setTimeout(Qt,0)};else{var Yt=new MessageChannel,Xt=Yt.port2;Yt.port1.onmessage=Qt,zt=function(){Xt.postMessage(1)}}if("undefined"!=typeof Promise&&at(Promise)){var Jt=Promise.resolve();Ut=function(){Jt.then(Qt),tt&&setTimeout(I)}}else Ut=zt;function Zt(t,e){var n;if(Vt.push(function(){if(t)try{t.call(e)}catch(t){Bt(t,e,"nextTick")}else n&&n(e)}),Kt||(Kt=!0,Gt?zt():Ut()),!t&&"undefined"!=typeof Promise)return new Promise(function(t){n=t})}var te=new st;function ee(t){!function t(e,n){var r,i;var o=Array.isArray(e);if(!o&&!u(e)||Object.isFrozen(e))return;if(e.__ob__){var a=e.__ob__.dep.id;if(n.has(a))return;n.add(a)}if(o)for(r=e.length;r--;)t(e[r],n);else for(i=Object.keys(e),r=i.length;r--;)t(e[i[r]],n)}(t,te),te.clear()}var ne,re=w(function(t){var e="&"===t.charAt(0),n="~"===(t=e?t.slice(1):t).charAt(0),r="!"===(t=n?t.slice(1):t).charAt(0);return{name:t=r?t.slice(1):t,once:n,capture:r,passive:e}});function ie(t){function e(){var t=arguments,n=e.fns;if(!Array.isArray(n))return n.apply(null,arguments);for(var r=n.slice(),i=0;i<r.length;i++)r[i].apply(null,t)}return e.fns=t,e}function oe(t,e,n,r,o){var a,s,u,c;for(a in t)s=t[a],u=e[a],c=re(a),i(s)||(i(u)?(i(s.fns)&&(s=t[a]=ie(s)),n(c.name,s,c.once,c.capture,c.passive,c.params)):s!==u&&(u.fns=s,t[a]=u));for(a in e)i(t[a])&&r((c=re(a)).name,e[a],c.capture)}function ae(t,e,n){var r;t instanceof dt&&(t=t.data.hook||(t.data.hook={}));var s=t[e];function u(){n.apply(this,arguments),y(r.fns,u)}i(s)?r=ie([u]):o(s.fns)&&a(s.merged)?(r=s).fns.push(u):r=ie([s,u]),r.merged=!0,t[e]=r}function se(t,e,n,r,i){if(o(e)){if(b(e,n))return t[n]=e[n],i||delete e[n],!0;if(b(e,r))return t[n]=e[r],i||delete e[r],!0}return!1}function ue(t){return s(t)?[gt(t)]:Array.isArray(t)?function t(e,n){var r=[];var u,c,l,f;for(u=0;u<e.length;u++)i(c=e[u])||"boolean"==typeof c||(l=r.length-1,f=r[l],Array.isArray(c)?c.length>0&&(ce((c=t(c,(n||"")+"_"+u))[0])&&ce(f)&&(r[l]=gt(f.text+c[0].text),c.shift()),r.push.apply(r,c)):s(c)?ce(f)?r[l]=gt(f.text+c):""!==c&&r.push(gt(c)):ce(c)&&ce(f)?r[l]=gt(f.text+c.text):(a(e._isVList)&&o(c.tag)&&i(c.key)&&o(n)&&(c.key="__vlist"+n+"_"+u+"__"),r.push(c)));return r}(t):void 0}function ce(t){return o(t)&&o(t.text)&&!1===t.isComment}function le(t,e){return(t.__esModule||ut&&"Module"===t[Symbol.toStringTag])&&(t=t.default),u(t)?e.extend(t):t}function fe(t){return t.isComment&&t.asyncFactory}function pe(t){if(Array.isArray(t))for(var e=0;e<t.length;e++){var n=t[e];if(o(n)&&(o(n.componentOptions)||fe(n)))return n}}function de(t,e,n){n?ne.$once(t,e):ne.$on(t,e)}function he(t,e){ne.$off(t,e)}function ve(t,e,n){ne=t,oe(e,n||{},de,he),ne=void 0}function ge(t,e){var n={};if(!t)return n;for(var r=0,i=t.length;r<i;r++){var o=t[r],a=o.data;if(a&&a.attrs&&a.attrs.slot&&delete a.attrs.slot,o.context!==e&&o.fnContext!==e||!a||null==a.slot)(n.default||(n.default=[])).push(o);else{var s=a.slot,u=n[s]||(n[s]=[]);"template"===o.tag?u.push.apply(u,o.children||[]):u.push(o)}}for(var c in n)n[c].every(me)&&delete n[c];return n}function me(t){return t.isComment&&!t.asyncFactory||" "===t.text}function ye(t,e){e=e||{};for(var n=0;n<t.length;n++)Array.isArray(t[n])?ye(t[n],e):e[t[n].key]=t[n].fn;return e}var _e=null;function be(t){for(;t&&(t=t.$parent);)if(t._inactive)return!0;return!1}function we(t,e){if(e){if(t._directInactive=!1,be(t))return}else if(t._directInactive)return;if(t._inactive||null===t._inactive){t._inactive=!1;for(var n=0;n<t.$children.length;n++)we(t.$children[n]);xe(t,"activated")}}function xe(t,e){var n=t.$options[e];if(n)for(var r=0,i=n.length;r<i;r++)try{n[r].call(t)}catch(n){Bt(n,t,e+" hook")}t._hasHookEvent&&t.$emit("hook:"+e)}var Ce=[],Te=[],Ee={},Ae=!1,Se=!1,ke=0;function Oe(){var t,e;for(Se=!0,Ce.sort(function(t,e){return t.id-e.id}),ke=0;ke<Ce.length;ke++)e=(t=Ce[ke]).id,Ee[e]=null,t.run();var n=Te.slice(),r=Ce.slice();ke=Ce.length=Te.length=0,Ee={},Ae=Se=!1,function(t){for(var e=0;e<t.length;e++)t[e]._inactive=!0,we(t[e],!0)}(n),function(t){var e=t.length;for(;e--;){var n=t[e],r=n.vm;r._watcher===n&&r._isMounted&&xe(r,"updated")}}(r),ot&&H.devtools&&ot.emit("flush")}var De=0,Ie=function(t,e,n,r,i){this.vm=t,i&&(t._watcher=this),t._watchers.push(this),r?(this.deep=!!r.deep,this.user=!!r.user,this.lazy=!!r.lazy,this.sync=!!r.sync):this.deep=this.user=this.lazy=this.sync=!1,this.cb=n,this.id=++De,this.active=!0,this.dirty=this.lazy,this.deps=[],this.newDeps=[],this.depIds=new st,this.newDepIds=new st,this.expression="","function"==typeof e?this.getter=e:(this.getter=function(t){if(!q.test(t)){var e=t.split(".");return function(t){for(var n=0;n<e.length;n++){if(!t)return;t=t[e[n]]}return t}}}(e),this.getter||(this.getter=function(){})),this.value=this.lazy?void 0:this.get()};Ie.prototype.get=function(){var t,e;t=this,ft.target&&pt.push(ft.target),ft.target=t;var n=this.vm;try{e=this.getter.call(n,n)}catch(t){if(!this.user)throw t;Bt(t,n,'getter for watcher "'+this.expression+'"')}finally{this.deep&&ee(e),ft.target=pt.pop(),this.cleanupDeps()}return e},Ie.prototype.addDep=function(t){var e=t.id;this.newDepIds.has(e)||(this.newDepIds.add(e),this.newDeps.push(t),this.depIds.has(e)||t.addSub(this))},Ie.prototype.cleanupDeps=function(){for(var t=this.deps.length;t--;){var e=this.deps[t];this.newDepIds.has(e.id)||e.removeSub(this)}var n=this.depIds;this.depIds=this.newDepIds,this.newDepIds=n,this.newDepIds.clear(),n=this.deps,this.deps=this.newDeps,this.newDeps=n,this.newDeps.length=0},Ie.prototype.update=function(){this.lazy?this.dirty=!0:this.sync?this.run():function(t){var e=t.id;if(null==Ee[e]){if(Ee[e]=!0,Se){for(var n=Ce.length-1;n>ke&&Ce[n].id>t.id;)n--;Ce.splice(n+1,0,t)}else Ce.push(t);Ae||(Ae=!0,Zt(Oe))}}(this)},Ie.prototype.run=function(){if(this.active){var t=this.get();if(t!==this.value||u(t)||this.deep){var e=this.value;if(this.value=t,this.user)try{this.cb.call(this.vm,t,e)}catch(t){Bt(t,this.vm,'callback for watcher "'+this.expression+'"')}else this.cb.call(this.vm,t,e)}}},Ie.prototype.evaluate=function(){this.value=this.get(),this.dirty=!1},Ie.prototype.depend=function(){for(var t=this.deps.length;t--;)this.deps[t].depend()},Ie.prototype.teardown=function(){if(this.active){this.vm._isBeingDestroyed||y(this.vm._watchers,this);for(var t=this.deps.length;t--;)this.deps[t].removeSub(this);this.active=!1}};var Ne={enumerable:!0,configurable:!0,get:I,set:I};function je(t,e,n){Ne.get=function(){return this[e][n]},Ne.set=function(t){this[e][n]=t},Object.defineProperty(t,n,Ne)}function Le(t){t._watchers=[];var e=t.$options;e.props&&function(t,e){var n=t.$options.propsData||{},r=t._props={},i=t.$options._propKeys=[],o=!t.$parent;xt.shouldConvert=o;var a=function(o){i.push(o);var a=Mt(o,e,n,t);St(r,o,a),o in t||je(t,"_props",o)};for(var s in e)a(s);xt.shouldConvert=!0}(t,e.props),e.methods&&function(t,e){t.$options.props;for(var n in e)t[n]=null==e[n]?I:S(e[n],t)}(t,e.methods),e.data?function(t){var e=t.$options.data;l(e=t._data="function"==typeof e?function(t,e){try{return t.call(e,e)}catch(t){return Bt(t,e,"data()"),{}}}(e,t):e||{})||(e={});var n=Object.keys(e),r=t.$options.props,i=(t.$options.methods,n.length);for(;i--;){var o=n[i];0,r&&b(r,o)||B(o)||je(t,"_data",o)}At(e,!0)}(t):At(t._data={},!0),e.computed&&function(t,e){var n=t._computedWatchers=Object.create(null),r=it();for(var i in e){var o=e[i],a="function"==typeof o?o:o.get;0,r||(n[i]=new Ie(t,a||I,I,$e)),i in t||Re(t,i,o)}}(t,e.computed),e.watch&&e.watch!==et&&function(t,e){for(var n in e){var r=e[n];if(Array.isArray(r))for(var i=0;i<r.length;i++)Me(t,n,r[i]);else Me(t,n,r)}}(t,e.watch)}var $e={lazy:!0};function Re(t,e,n){var r=!it();"function"==typeof n?(Ne.get=r?Pe(e):n,Ne.set=I):(Ne.get=n.get?r&&!1!==n.cache?Pe(e):n.get:I,Ne.set=n.set?n.set:I),Object.defineProperty(t,e,Ne)}function Pe(t){return function(){var e=this._computedWatchers&&this._computedWatchers[t];if(e)return e.dirty&&e.evaluate(),ft.target&&e.depend(),e.value}}function Me(t,e,n,r){return l(n)&&(r=n,n=n.handler),"string"==typeof n&&(n=t[n]),t.$watch(e,n,r)}function Fe(t,e){if(t){for(var n=Object.create(null),r=ut?Reflect.ownKeys(t).filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}):Object.keys(t),i=0;i<r.length;i++){for(var o=r[i],a=t[o].from,s=e;s;){if(s._provided&&a in s._provided){n[o]=s._provided[a];break}s=s.$parent}if(!s)if("default"in t[o]){var u=t[o].default;n[o]="function"==typeof u?u.call(e):u}else 0}return n}}function He(t,e){var n,r,i,a,s;if(Array.isArray(t)||"string"==typeof t)for(n=new Array(t.length),r=0,i=t.length;r<i;r++)n[r]=e(t[r],r);else if("number"==typeof t)for(n=new Array(t),r=0;r<t;r++)n[r]=e(r+1,r);else if(u(t))for(a=Object.keys(t),n=new Array(a.length),r=0,i=a.length;r<i;r++)s=a[r],n[r]=e(t[s],s,r);return o(n)&&(n._isVList=!0),n}function Be(t,e,n,r){var i,o=this.$scopedSlots[t];if(o)n=n||{},r&&(n=O(O({},r),n)),i=o(n)||e;else{var a=this.$slots[t];a&&(a._rendered=!0),i=a||e}var s=n&&n.slot;return s?this.$createElement("template",{slot:s},i):i}function We(t){return Pt(this.$options,"filters",t)||j}function qe(t,e,n,r){var i=H.keyCodes[e]||n;return i?Array.isArray(i)?-1===i.indexOf(t):i!==t:r?A(r)!==e:void 0}function Ue(t,e,n,r,i){if(n)if(u(n)){var o;Array.isArray(n)&&(n=D(n));var a=function(a){if("class"===a||"style"===a||m(a))o=t;else{var s=t.attrs&&t.attrs.type;o=r||H.mustUseProp(e,s,a)?t.domProps||(t.domProps={}):t.attrs||(t.attrs={})}a in o||(o[a]=n[a],i&&((t.on||(t.on={}))["update:"+a]=function(t){n[a]=t}))};for(var s in n)a(s)}else;return t}function ze(t,e){var n=this._staticTrees||(this._staticTrees=[]),r=n[t];return r&&!e?Array.isArray(r)?yt(r):mt(r):(Ke(r=n[t]=this.$options.staticRenderFns[t].call(this._renderProxy,null,this),"__static__"+t,!1),r)}function Ve(t,e,n){return Ke(t,"__once__"+e+(n?"_"+n:""),!0),t}function Ke(t,e,n){if(Array.isArray(t))for(var r=0;r<t.length;r++)t[r]&&"string"!=typeof t[r]&&Qe(t[r],e+"_"+r,n);else Qe(t,e,n)}function Qe(t,e,n){t.isStatic=!0,t.key=e,t.isOnce=n}function Ge(t,e){if(e)if(l(e)){var n=t.on=t.on?O({},t.on):{};for(var r in e){var i=n[r],o=e[r];n[r]=i?[].concat(i,o):o}}else;return t}function Ye(t){t._o=Ve,t._n=h,t._s=d,t._l=He,t._t=Be,t._q=L,t._i=$,t._m=ze,t._f=We,t._k=qe,t._b=Ue,t._v=gt,t._e=vt,t._u=ye,t._g=Ge}function Xe(t,e,n,i,o){var s=o.options;this.data=t,this.props=e,this.children=n,this.parent=i,this.listeners=t.on||r,this.injections=Fe(s.inject,i),this.slots=function(){return ge(n,i)};var u=Object.create(i),c=a(s._compiled),l=!c;c&&(this.$options=s,this.$slots=this.slots(),this.$scopedSlots=t.scopedSlots||r),s._scopeId?this._c=function(t,e,n,r){var o=an(u,t,e,n,r,l);return o&&(o.fnScopeId=s._scopeId,o.fnContext=i),o}:this._c=function(t,e,n,r){return an(u,t,e,n,r,l)}}function Je(t,e){for(var n in e)t[C(n)]=e[n]}Ye(Xe.prototype);var Ze={init:function(t,e,n,r){if(!t.componentInstance||t.componentInstance._isDestroyed)(t.componentInstance=function(t,e,n,r){var i={_isComponent:!0,parent:e,_parentVnode:t,_parentElm:n||null,_refElm:r||null},a=t.data.inlineTemplate;o(a)&&(i.render=a.render,i.staticRenderFns=a.staticRenderFns);return new t.componentOptions.Ctor(i)}(t,_e,n,r)).$mount(e?t.elm:void 0,e);else if(t.data.keepAlive){var i=t;Ze.prepatch(i,i)}},prepatch:function(t,e){var n=e.componentOptions;!function(t,e,n,i,o){var a=!!(o||t.$options._renderChildren||i.data.scopedSlots||t.$scopedSlots!==r);if(t.$options._parentVnode=i,t.$vnode=i,t._vnode&&(t._vnode.parent=i),t.$options._renderChildren=o,t.$attrs=i.data&&i.data.attrs||r,t.$listeners=n||r,e&&t.$options.props){xt.shouldConvert=!1;for(var s=t._props,u=t.$options._propKeys||[],c=0;c<u.length;c++){var l=u[c];s[l]=Mt(l,t.$options.props,e,t)}xt.shouldConvert=!0,t.$options.propsData=e}if(n){var f=t.$options._parentListeners;t.$options._parentListeners=n,ve(t,n,f)}a&&(t.$slots=ge(o,i.context),t.$forceUpdate())}(e.componentInstance=t.componentInstance,n.propsData,n.listeners,e,n.children)},insert:function(t){var e,n=t.context,r=t.componentInstance;r._isMounted||(r._isMounted=!0,xe(r,"mounted")),t.data.keepAlive&&(n._isMounted?((e=r)._inactive=!1,Te.push(e)):we(r,!0))},destroy:function(t){var e=t.componentInstance;e._isDestroyed||(t.data.keepAlive?function t(e,n){if(!(n&&(e._directInactive=!0,be(e))||e._inactive)){e._inactive=!0;for(var r=0;r<e.$children.length;r++)t(e.$children[r]);xe(e,"deactivated")}}(e,!0):e.$destroy())}},tn=Object.keys(Ze);function en(t,e,n,s,c){if(!i(t)){var l=n.$options._base;if(u(t)&&(t=l.extend(t)),"function"==typeof t){var f,p,d,h,v,g,m;if(i(t.cid)&&void 0===(t=function(t,e,n){if(a(t.error)&&o(t.errorComp))return t.errorComp;if(o(t.resolved))return t.resolved;if(a(t.loading)&&o(t.loadingComp))return t.loadingComp;if(!o(t.contexts)){var r=t.contexts=[n],s=!0,c=function(){for(var t=0,e=r.length;t<e;t++)r[t].$forceUpdate()},l=R(function(n){t.resolved=le(n,e),s||c()}),f=R(function(e){o(t.errorComp)&&(t.error=!0,c())}),p=t(l,f);return u(p)&&("function"==typeof p.then?i(t.resolved)&&p.then(l,f):o(p.component)&&"function"==typeof p.component.then&&(p.component.then(l,f),o(p.error)&&(t.errorComp=le(p.error,e)),o(p.loading)&&(t.loadingComp=le(p.loading,e),0===p.delay?t.loading=!0:setTimeout(function(){i(t.resolved)&&i(t.error)&&(t.loading=!0,c())},p.delay||200)),o(p.timeout)&&setTimeout(function(){i(t.resolved)&&f(null)},p.timeout))),s=!1,t.loading?t.loadingComp:t.resolved}t.contexts.push(n)}(f=t,l,n)))return p=f,d=e,h=n,v=s,g=c,(m=vt()).asyncFactory=p,m.asyncMeta={data:d,context:h,children:v,tag:g},m;e=e||{},vn(t),o(e.model)&&function(t,e){var n=t.model&&t.model.prop||"value",r=t.model&&t.model.event||"input";(e.props||(e.props={}))[n]=e.model.value;var i=e.on||(e.on={});o(i[r])?i[r]=[e.model.callback].concat(i[r]):i[r]=e.model.callback}(t.options,e);var y=function(t,e,n){var r=e.options.props;if(!i(r)){var a={},s=t.attrs,u=t.props;if(o(s)||o(u))for(var c in r){var l=A(c);se(a,u,c,l,!0)||se(a,s,c,l,!1)}return a}}(e,t);if(a(t.options.functional))return function(t,e,n,i,a){var s=t.options,u={},c=s.props;if(o(c))for(var l in c)u[l]=Mt(l,c,e||r);else o(n.attrs)&&Je(u,n.attrs),o(n.props)&&Je(u,n.props);var f=new Xe(n,u,a,i,t),p=s.render.call(null,f._c,f);return p instanceof dt&&(p.fnContext=i,p.fnOptions=s,n.slot&&((p.data||(p.data={})).slot=n.slot)),p}(t,y,e,n,s);var _=e.on;if(e.on=e.nativeOn,a(t.options.abstract)){var b=e.slot;e={},b&&(e.slot=b)}!function(t){t.hook||(t.hook={});for(var e=0;e<tn.length;e++){var n=tn[e],r=t.hook[n],i=Ze[n];t.hook[n]=r?nn(i,r):i}}(e);var w=t.options.name||c;return new dt("vue-component-"+t.cid+(w?"-"+w:""),e,void 0,void 0,void 0,n,{Ctor:t,propsData:y,listeners:_,tag:c,children:s},f)}}}function nn(t,e){return function(n,r,i,o){t(n,r,i,o),e(n,r,i,o)}}var rn=1,on=2;function an(t,e,n,r,u,c){return(Array.isArray(n)||s(n))&&(u=r,r=n,n=void 0),a(c)&&(u=on),function(t,e,n,r,s){if(o(n)&&o(n.__ob__))return vt();o(n)&&o(n.is)&&(e=n.is);if(!e)return vt();0;Array.isArray(r)&&"function"==typeof r[0]&&((n=n||{}).scopedSlots={default:r[0]},r.length=0);s===on?r=ue(r):s===rn&&(r=function(t){for(var e=0;e<t.length;e++)if(Array.isArray(t[e]))return Array.prototype.concat.apply([],t);return t}(r));var u,c;if("string"==typeof e){var l;c=t.$vnode&&t.$vnode.ns||H.getTagNamespace(e),u=H.isReservedTag(e)?new dt(H.parsePlatformTagName(e),n,r,void 0,void 0,t):o(l=Pt(t.$options,"components",e))?en(l,n,t,r,e):new dt(e,n,r,void 0,void 0,t)}else u=en(e,n,t,r);return o(u)?(c&&function t(e,n,r){e.ns=n;"foreignObject"===e.tag&&(n=void 0,r=!0);if(o(e.children))for(var s=0,u=e.children.length;s<u;s++){var c=e.children[s];o(c.tag)&&(i(c.ns)||a(r))&&t(c,n,r)}}(u,c),u):vt()}(t,e,n,r,u)}var sn,un,cn,ln,fn,pn,dn,hn=0;function vn(t){var e=t.options;if(t.super){var n=vn(t.super);if(n!==t.superOptions){t.superOptions=n;var r=function(t){var e,n=t.options,r=t.extendOptions,i=t.sealedOptions;for(var o in n)n[o]!==i[o]&&(e||(e={}),e[o]=gn(n[o],r[o],i[o]));return e}(t);r&&O(t.extendOptions,r),(e=t.options=Rt(n,t.extendOptions)).name&&(e.components[e.name]=t)}}return e}function gn(t,e,n){if(Array.isArray(t)){var r=[];n=Array.isArray(n)?n:[n],e=Array.isArray(e)?e:[e];for(var i=0;i<t.length;i++)(e.indexOf(t[i])>=0||n.indexOf(t[i])<0)&&r.push(t[i]);return r}return t}function mn(t){this._init(t)}function yn(t){t.cid=0;var e=1;t.extend=function(t){t=t||{};var n=this,r=n.cid,i=t._Ctor||(t._Ctor={});if(i[r])return i[r];var o=t.name||n.options.name;var a=function(t){this._init(t)};return(a.prototype=Object.create(n.prototype)).constructor=a,a.cid=e++,a.options=Rt(n.options,t),a.super=n,a.options.props&&function(t){var e=t.options.props;for(var n in e)je(t.prototype,"_props",n)}(a),a.options.computed&&function(t){var e=t.options.computed;for(var n in e)Re(t.prototype,n,e[n])}(a),a.extend=n.extend,a.mixin=n.mixin,a.use=n.use,M.forEach(function(t){a[t]=n[t]}),o&&(a.options.components[o]=a),a.superOptions=n.options,a.extendOptions=t,a.sealedOptions=O({},a.options),i[r]=a,a}}function _n(t){return t&&(t.Ctor.options.name||t.tag)}function bn(t,e){return Array.isArray(t)?t.indexOf(e)>-1:"string"==typeof t?t.split(",").indexOf(e)>-1:!!f(t)&&t.test(e)}function wn(t,e){var n=t.cache,r=t.keys,i=t._vnode;for(var o in n){var a=n[o];if(a){var s=_n(a.componentOptions);s&&!e(s)&&xn(n,o,r,i)}}}function xn(t,e,n,r){var i=t[e];!i||r&&i.tag===r.tag||i.componentInstance.$destroy(),t[e]=null,y(n,e)}mn.prototype._init=function(t){var e,n,i,o,a=this;a._uid=hn++,a._isVue=!0,t&&t._isComponent?function(t,e){var n=t.$options=Object.create(t.constructor.options),r=e._parentVnode;n.parent=e.parent,n._parentVnode=r,n._parentElm=e._parentElm,n._refElm=e._refElm;var i=r.componentOptions;n.propsData=i.propsData,n._parentListeners=i.listeners,n._renderChildren=i.children,n._componentTag=i.tag,e.render&&(n.render=e.render,n.staticRenderFns=e.staticRenderFns)}(a,t):a.$options=Rt(vn(a.constructor),t||{},a),a._renderProxy=a,a._self=a,function(t){var e=t.$options,n=e.parent;if(n&&!e.abstract){for(;n.$options.abstract&&n.$parent;)n=n.$parent;n.$children.push(t)}t.$parent=n,t.$root=n?n.$root:t,t.$children=[],t.$refs={},t._watcher=null,t._inactive=null,t._directInactive=!1,t._isMounted=!1,t._isDestroyed=!1,t._isBeingDestroyed=!1}(a),function(t){t._events=Object.create(null),t._hasHookEvent=!1;var e=t.$options._parentListeners;e&&ve(t,e)}(a),function(t){t._vnode=null,t._staticTrees=null;var e=t.$options,n=t.$vnode=e._parentVnode,i=n&&n.context;t.$slots=ge(e._renderChildren,i),t.$scopedSlots=r,t._c=function(e,n,r,i){return an(t,e,n,r,i,!1)},t.$createElement=function(e,n,r,i){return an(t,e,n,r,i,!0)};var o=n&&n.data;St(t,"$attrs",o&&o.attrs||r,0,!0),St(t,"$listeners",e._parentListeners||r,0,!0)}(a),xe(a,"beforeCreate"),(n=Fe((e=a).$options.inject,e))&&(xt.shouldConvert=!1,Object.keys(n).forEach(function(t){St(e,t,n[t])}),xt.shouldConvert=!0),Le(a),(o=(i=a).$options.provide)&&(i._provided="function"==typeof o?o.call(i):o),xe(a,"created"),a.$options.el&&a.$mount(a.$options.el)},sn=mn,un={get:function(){return this._data}},cn={get:function(){return this._props}},Object.defineProperty(sn.prototype,"$data",un),Object.defineProperty(sn.prototype,"$props",cn),sn.prototype.$set=kt,sn.prototype.$delete=Ot,sn.prototype.$watch=function(t,e,n){if(l(e))return Me(this,t,e,n);(n=n||{}).user=!0;var r=new Ie(this,t,e,n);return n.immediate&&e.call(this,r.value),function(){r.teardown()}},fn=/^hook:/,(ln=mn).prototype.$on=function(t,e){if(Array.isArray(t))for(var n=0,r=t.length;n<r;n++)this.$on(t[n],e);else(this._events[t]||(this._events[t]=[])).push(e),fn.test(t)&&(this._hasHookEvent=!0);return this},ln.prototype.$once=function(t,e){var n=this;function r(){n.$off(t,r),e.apply(n,arguments)}return r.fn=e,n.$on(t,r),n},ln.prototype.$off=function(t,e){if(!arguments.length)return this._events=Object.create(null),this;if(Array.isArray(t)){for(var n=0,r=t.length;n<r;n++)this.$off(t[n],e);return this}var i=this._events[t];if(!i)return this;if(!e)return this._events[t]=null,this;if(e)for(var o,a=i.length;a--;)if((o=i[a])===e||o.fn===e){i.splice(a,1);break}return this},ln.prototype.$emit=function(t){var e=this._events[t];if(e){e=e.length>1?k(e):e;for(var n=k(arguments,1),r=0,i=e.length;r<i;r++)try{e[r].apply(this,n)}catch(e){Bt(e,this,'event handler for "'+t+'"')}}return this},(pn=mn).prototype._update=function(t,e){var n=this;n._isMounted&&xe(n,"beforeUpdate");var r=n.$el,i=n._vnode,o=_e;_e=n,n._vnode=t,i?n.$el=n.__patch__(i,t):(n.$el=n.__patch__(n.$el,t,e,!1,n.$options._parentElm,n.$options._refElm),n.$options._parentElm=n.$options._refElm=null),_e=o,r&&(r.__vue__=null),n.$el&&(n.$el.__vue__=n),n.$vnode&&n.$parent&&n.$vnode===n.$parent._vnode&&(n.$parent.$el=n.$el)},pn.prototype.$forceUpdate=function(){this._watcher&&this._watcher.update()},pn.prototype.$destroy=function(){var t=this;if(!t._isBeingDestroyed){xe(t,"beforeDestroy"),t._isBeingDestroyed=!0;var e=t.$parent;!e||e._isBeingDestroyed||t.$options.abstract||y(e.$children,t),t._watcher&&t._watcher.teardown();for(var n=t._watchers.length;n--;)t._watchers[n].teardown();t._data.__ob__&&t._data.__ob__.vmCount--,t._isDestroyed=!0,t.__patch__(t._vnode,null),xe(t,"destroyed"),t.$off(),t.$el&&(t.$el.__vue__=null),t.$vnode&&(t.$vnode.parent=null)}},Ye((dn=mn).prototype),dn.prototype.$nextTick=function(t){return Zt(t,this)},dn.prototype._render=function(){var t,e=this,n=e.$options,i=n.render,o=n._parentVnode;if(e._isMounted)for(var a in e.$slots){var s=e.$slots[a];(s._rendered||s[0]&&s[0].elm)&&(e.$slots[a]=yt(s,!0))}e.$scopedSlots=o&&o.data.scopedSlots||r,e.$vnode=o;try{t=i.call(e._renderProxy,e.$createElement)}catch(n){Bt(n,e,"render"),t=e._vnode}return t instanceof dt||(t=vt()),t.parent=o,t};var Cn,Tn,En,An=[String,RegExp,Array],Sn={KeepAlive:{name:"keep-alive",abstract:!0,props:{include:An,exclude:An,max:[String,Number]},created:function(){this.cache=Object.create(null),this.keys=[]},destroyed:function(){for(var t in this.cache)xn(this.cache,t,this.keys)},watch:{include:function(t){wn(this,function(e){return bn(t,e)})},exclude:function(t){wn(this,function(e){return!bn(t,e)})}},render:function(){var t=this.$slots.default,e=pe(t),n=e&&e.componentOptions;if(n){var r=_n(n),i=this.include,o=this.exclude;if(i&&(!r||!bn(i,r))||o&&r&&bn(o,r))return e;var a=this.cache,s=this.keys,u=null==e.key?n.Ctor.cid+(n.tag?"::"+n.tag:""):e.key;a[u]?(e.componentInstance=a[u].componentInstance,y(s,u),s.push(u)):(a[u]=e,s.push(u),this.max&&s.length>parseInt(this.max)&&xn(a,s[0],s,this._vnode)),e.data.keepAlive=!0}return e||t&&t[0]}}};Cn=mn,En={get:function(){return H}},Object.defineProperty(Cn,"config",En),Cn.util={warn:ct,extend:O,mergeOptions:Rt,defineReactive:St},Cn.set=kt,Cn.delete=Ot,Cn.nextTick=Zt,Cn.options=Object.create(null),M.forEach(function(t){Cn.options[t+"s"]=Object.create(null)}),Cn.options._base=Cn,O(Cn.options.components,Sn),Cn.use=function(t){var e=this._installedPlugins||(this._installedPlugins=[]);if(e.indexOf(t)>-1)return this;var n=k(arguments,1);return n.unshift(this),"function"==typeof t.install?t.install.apply(t,n):"function"==typeof t&&t.apply(null,n),e.push(t),this},Cn.mixin=function(t){return this.options=Rt(this.options,t),this},yn(Cn),Tn=Cn,M.forEach(function(t){Tn[t]=function(e,n){return n?("component"===t&&l(n)&&(n.name=n.name||e,n=this.options._base.extend(n)),"directive"===t&&"function"==typeof n&&(n={bind:n,update:n}),this.options[t+"s"][e]=n,n):this.options[t+"s"][e]}}),Object.defineProperty(mn.prototype,"$isServer",{get:it}),Object.defineProperty(mn.prototype,"$ssrContext",{get:function(){return this.$vnode&&this.$vnode.ssrContext}}),mn.version="2.5.13";var kn=v("style,class"),On=v("input,textarea,option,select,progress"),Dn=function(t,e,n){return"value"===n&&On(t)&&"button"!==e||"selected"===n&&"option"===t||"checked"===n&&"input"===t||"muted"===n&&"video"===t},In=v("contenteditable,draggable,spellcheck"),Nn=v("allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,default,defaultchecked,defaultmuted,defaultselected,defer,disabled,enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,required,reversed,scoped,seamless,selected,sortable,translate,truespeed,typemustmatch,visible"),jn="http://www.w3.org/1999/xlink",Ln=function(t){return":"===t.charAt(5)&&"xlink"===t.slice(0,5)},$n=function(t){return Ln(t)?t.slice(6,t.length):""},Rn=function(t){return null==t||!1===t};function Pn(t){for(var e=t.data,n=t,r=t;o(r.componentInstance);)(r=r.componentInstance._vnode)&&r.data&&(e=Mn(r.data,e));for(;o(n=n.parent);)n&&n.data&&(e=Mn(e,n.data));return function(t,e){if(o(t)||o(e))return Fn(t,Hn(e));return""}(e.staticClass,e.class)}function Mn(t,e){return{staticClass:Fn(t.staticClass,e.staticClass),class:o(t.class)?[t.class,e.class]:e.class}}function Fn(t,e){return t?e?t+" "+e:t:e||""}function Hn(t){return Array.isArray(t)?function(t){for(var e,n="",r=0,i=t.length;r<i;r++)o(e=Hn(t[r]))&&""!==e&&(n&&(n+=" "),n+=e);return n}(t):u(t)?function(t){var e="";for(var n in t)t[n]&&(e&&(e+=" "),e+=n);return e}(t):"string"==typeof t?t:""}var Bn={svg:"http://www.w3.org/2000/svg",math:"http://www.w3.org/1998/Math/MathML"},Wn=v("html,body,base,head,link,meta,style,title,address,article,aside,footer,header,h1,h2,h3,h4,h5,h6,hgroup,nav,section,div,dd,dl,dt,figcaption,figure,picture,hr,img,li,main,ol,p,pre,ul,a,b,abbr,bdi,bdo,br,cite,code,data,dfn,em,i,kbd,mark,q,rp,rt,rtc,ruby,s,samp,small,span,strong,sub,sup,time,u,var,wbr,area,audio,map,track,video,embed,object,param,source,canvas,script,noscript,del,ins,caption,col,colgroup,table,thead,tbody,td,th,tr,button,datalist,fieldset,form,input,label,legend,meter,optgroup,option,output,progress,select,textarea,details,dialog,menu,menuitem,summary,content,element,shadow,template,blockquote,iframe,tfoot"),qn=v("svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font-face,foreignObject,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view",!0),Un=function(t){return Wn(t)||qn(t)};function zn(t){return qn(t)?"svg":"math"===t?"math":void 0}var Vn=Object.create(null);var Kn=v("text,number,password,search,email,tel,url");function Qn(t){if("string"==typeof t){var e=document.querySelector(t);return e||document.createElement("div")}return t}var Gn=Object.freeze({createElement:function(t,e){var n=document.createElement(t);return"select"!==t?n:(e.data&&e.data.attrs&&void 0!==e.data.attrs.multiple&&n.setAttribute("multiple","multiple"),n)},createElementNS:function(t,e){return document.createElementNS(Bn[t],e)},createTextNode:function(t){return document.createTextNode(t)},createComment:function(t){return document.createComment(t)},insertBefore:function(t,e,n){t.insertBefore(e,n)},removeChild:function(t,e){t.removeChild(e)},appendChild:function(t,e){t.appendChild(e)},parentNode:function(t){return t.parentNode},nextSibling:function(t){return t.nextSibling},tagName:function(t){return t.tagName},setTextContent:function(t,e){t.textContent=e},setAttribute:function(t,e,n){t.setAttribute(e,n)}}),Yn={create:function(t,e){Xn(e)},update:function(t,e){t.data.ref!==e.data.ref&&(Xn(t,!0),Xn(e))},destroy:function(t){Xn(t,!0)}};function Xn(t,e){var n=t.data.ref;if(n){var r=t.context,i=t.componentInstance||t.elm,o=r.$refs;e?Array.isArray(o[n])?y(o[n],i):o[n]===i&&(o[n]=void 0):t.data.refInFor?Array.isArray(o[n])?o[n].indexOf(i)<0&&o[n].push(i):o[n]=[i]:o[n]=i}}var Jn=new dt("",{},[]),Zn=["create","activate","update","remove","destroy"];function tr(t,e){return t.key===e.key&&(t.tag===e.tag&&t.isComment===e.isComment&&o(t.data)===o(e.data)&&function(t,e){if("input"!==t.tag)return!0;var n,r=o(n=t.data)&&o(n=n.attrs)&&n.type,i=o(n=e.data)&&o(n=n.attrs)&&n.type;return r===i||Kn(r)&&Kn(i)}(t,e)||a(t.isAsyncPlaceholder)&&t.asyncFactory===e.asyncFactory&&i(e.asyncFactory.error))}function er(t,e,n){var r,i,a={};for(r=e;r<=n;++r)o(i=t[r].key)&&(a[i]=r);return a}var nr={create:rr,update:rr,destroy:function(t){rr(t,Jn)}};function rr(t,e){(t.data.directives||e.data.directives)&&function(t,e){var n,r,i,o=t===Jn,a=e===Jn,s=or(t.data.directives,t.context),u=or(e.data.directives,e.context),c=[],l=[];for(n in u)r=s[n],i=u[n],r?(i.oldValue=r.value,ar(i,"update",e,t),i.def&&i.def.componentUpdated&&l.push(i)):(ar(i,"bind",e,t),i.def&&i.def.inserted&&c.push(i));if(c.length){var f=function(){for(var n=0;n<c.length;n++)ar(c[n],"inserted",e,t)};o?ae(e,"insert",f):f()}l.length&&ae(e,"postpatch",function(){for(var n=0;n<l.length;n++)ar(l[n],"componentUpdated",e,t)});if(!o)for(n in s)u[n]||ar(s[n],"unbind",t,t,a)}(t,e)}var ir=Object.create(null);function or(t,e){var n,r,i,o=Object.create(null);if(!t)return o;for(n=0;n<t.length;n++)(r=t[n]).modifiers||(r.modifiers=ir),o[(i=r,i.rawName||i.name+"."+Object.keys(i.modifiers||{}).join("."))]=r,r.def=Pt(e.$options,"directives",r.name);return o}function ar(t,e,n,r,i){var o=t.def&&t.def[e];if(o)try{o(n.elm,t,n,r,i)}catch(r){Bt(r,n.context,"directive "+t.name+" "+e+" hook")}}var sr=[Yn,nr];function ur(t,e){var n=e.componentOptions;if(!(o(n)&&!1===n.Ctor.options.inheritAttrs||i(t.data.attrs)&&i(e.data.attrs))){var r,a,s=e.elm,u=t.data.attrs||{},c=e.data.attrs||{};o(c.__ob__)&&(c=e.data.attrs=O({},c));for(r in c)a=c[r],u[r]!==a&&cr(s,r,a);(Y||J)&&c.value!==u.value&&cr(s,"value",c.value);for(r in u)i(c[r])&&(Ln(r)?s.removeAttributeNS(jn,$n(r)):In(r)||s.removeAttribute(r))}}function cr(t,e,n){if(Nn(e))Rn(n)?t.removeAttribute(e):(n="allowfullscreen"===e&&"EMBED"===t.tagName?"true":e,t.setAttribute(e,n));else if(In(e))t.setAttribute(e,Rn(n)||"false"===n?"false":"true");else if(Ln(e))Rn(n)?t.removeAttributeNS(jn,$n(e)):t.setAttributeNS(jn,e,n);else if(Rn(n))t.removeAttribute(e);else{if(Y&&!X&&"TEXTAREA"===t.tagName&&"placeholder"===e&&!t.__ieph){var r=function(e){e.stopImmediatePropagation(),t.removeEventListener("input",r)};t.addEventListener("input",r),t.__ieph=!0}t.setAttribute(e,n)}}var lr={create:ur,update:ur};function fr(t,e){var n=e.elm,r=e.data,a=t.data;if(!(i(r.staticClass)&&i(r.class)&&(i(a)||i(a.staticClass)&&i(a.class)))){var s=Pn(e),u=n._transitionClasses;o(u)&&(s=Fn(s,Hn(u))),s!==n._prevClass&&(n.setAttribute("class",s),n._prevClass=s)}}var pr,dr,hr,vr,gr,mr,yr={create:fr,update:fr},_r=/[\w).+\-_$\]]/;function br(t){var e,n,r,i,o,a=!1,s=!1,u=!1,c=!1,l=0,f=0,p=0,d=0;for(r=0;r<t.length;r++)if(n=e,e=t.charCodeAt(r),a)39===e&&92!==n&&(a=!1);else if(s)34===e&&92!==n&&(s=!1);else if(u)96===e&&92!==n&&(u=!1);else if(c)47===e&&92!==n&&(c=!1);else if(124!==e||124===t.charCodeAt(r+1)||124===t.charCodeAt(r-1)||l||f||p){switch(e){case 34:s=!0;break;case 39:a=!0;break;case 96:u=!0;break;case 40:p++;break;case 41:p--;break;case 91:f++;break;case 93:f--;break;case 123:l++;break;case 125:l--}if(47===e){for(var h=r-1,v=void 0;h>=0&&" "===(v=t.charAt(h));h--);v&&_r.test(v)||(c=!0)}}else void 0===i?(d=r+1,i=t.slice(0,r).trim()):g();function g(){(o||(o=[])).push(t.slice(d,r).trim()),d=r+1}if(void 0===i?i=t.slice(0,r).trim():0!==d&&g(),o)for(r=0;r<o.length;r++)i=wr(i,o[r]);return i}function wr(t,e){var n=e.indexOf("(");return n<0?'_f("'+e+'")('+t+")":'_f("'+e.slice(0,n)+'")('+t+","+e.slice(n+1)}function xr(t){console.error("[Vue compiler]: "+t)}function Cr(t,e){return t?t.map(function(t){return t[e]}).filter(function(t){return t}):[]}function Tr(t,e,n){(t.props||(t.props=[])).push({name:e,value:n}),t.plain=!1}function Er(t,e,n){(t.attrs||(t.attrs=[])).push({name:e,value:n}),t.plain=!1}function Ar(t,e,n){t.attrsMap[e]=n,t.attrsList.push({name:e,value:n})}function Sr(t,e,n,i,o,a){var s;(i=i||r).capture&&(delete i.capture,e="!"+e),i.once&&(delete i.once,e="~"+e),i.passive&&(delete i.passive,e="&"+e),"click"===e&&(i.right?(e="contextmenu",delete i.right):i.middle&&(e="mouseup")),i.native?(delete i.native,s=t.nativeEvents||(t.nativeEvents={})):s=t.events||(t.events={});var u={value:n};i!==r&&(u.modifiers=i);var c=s[e];Array.isArray(c)?o?c.unshift(u):c.push(u):s[e]=c?o?[u,c]:[c,u]:u,t.plain=!1}function kr(t,e,n){var r=Or(t,":"+e)||Or(t,"v-bind:"+e);if(null!=r)return br(r);if(!1!==n){var i=Or(t,e);if(null!=i)return JSON.stringify(i)}}function Or(t,e,n){var r;if(null!=(r=t.attrsMap[e]))for(var i=t.attrsList,o=0,a=i.length;o<a;o++)if(i[o].name===e){i.splice(o,1);break}return n&&delete t.attrsMap[e],r}function Dr(t,e,n){var r=n||{},i=r.number,o="$$v";r.trim&&(o="(typeof $$v === 'string'? $$v.trim(): $$v)"),i&&(o="_n("+o+")");var a=Ir(e,o);t.model={value:"("+e+")",expression:'"'+e+'"',callback:"function ($$v) {"+a+"}"}}function Ir(t,e){var n=function(t){if(pr=t.length,t.indexOf("[")<0||t.lastIndexOf("]")<pr-1)return(vr=t.lastIndexOf("."))>-1?{exp:t.slice(0,vr),key:'"'+t.slice(vr+1)+'"'}:{exp:t,key:null};dr=t,vr=gr=mr=0;for(;!jr();)Lr(hr=Nr())?Rr(hr):91===hr&&$r(hr);return{exp:t.slice(0,gr),key:t.slice(gr+1,mr)}}(t);return null===n.key?t+"="+e:"$set("+n.exp+", "+n.key+", "+e+")"}function Nr(){return dr.charCodeAt(++vr)}function jr(){return vr>=pr}function Lr(t){return 34===t||39===t}function $r(t){var e=1;for(gr=vr;!jr();)if(Lr(t=Nr()))Rr(t);else if(91===t&&e++,93===t&&e--,0===e){mr=vr;break}}function Rr(t){for(var e=t;!jr()&&(t=Nr())!==e;);}var Pr,Mr="__r",Fr="__c";function Hr(t,e,n,r,i){var o,a,s,u,c;e=(o=e)._withTask||(o._withTask=function(){Gt=!0;var t=o.apply(null,arguments);return Gt=!1,t}),n&&(a=e,s=t,u=r,c=Pr,e=function t(){null!==a.apply(null,arguments)&&Br(s,t,u,c)}),Pr.addEventListener(t,e,nt?{capture:r,passive:i}:r)}function Br(t,e,n,r){(r||Pr).removeEventListener(t,e._withTask||e,n)}function Wr(t,e){if(!i(t.data.on)||!i(e.data.on)){var n=e.data.on||{},r=t.data.on||{};Pr=e.elm,function(t){if(o(t[Mr])){var e=Y?"change":"input";t[e]=[].concat(t[Mr],t[e]||[]),delete t[Mr]}o(t[Fr])&&(t.change=[].concat(t[Fr],t.change||[]),delete t[Fr])}(n),oe(n,r,Hr,Br,e.context),Pr=void 0}}var qr={create:Wr,update:Wr};function Ur(t,e){if(!i(t.data.domProps)||!i(e.data.domProps)){var n,r,a,s,u=e.elm,c=t.data.domProps||{},l=e.data.domProps||{};o(l.__ob__)&&(l=e.data.domProps=O({},l));for(n in c)i(l[n])&&(u[n]="");for(n in l){if(r=l[n],"textContent"===n||"innerHTML"===n){if(e.children&&(e.children.length=0),r===c[n])continue;1===u.childNodes.length&&u.removeChild(u.childNodes[0])}if("value"===n){u._value=r;var f=i(r)?"":String(r);s=f,(a=u).composing||"OPTION"!==a.tagName&&!function(t,e){var n=!0;try{n=document.activeElement!==t}catch(t){}return n&&t.value!==e}(a,s)&&!function(t,e){var n=t.value,r=t._vModifiers;if(o(r)){if(r.lazy)return!1;if(r.number)return h(n)!==h(e);if(r.trim)return n.trim()!==e.trim()}return n!==e}(a,s)||(u.value=f)}else u[n]=r}}}var zr={create:Ur,update:Ur},Vr=w(function(t){var e={},n=/:(.+)/;return t.split(/;(?![^(]*\))/g).forEach(function(t){if(t){var r=t.split(n);r.length>1&&(e[r[0].trim()]=r[1].trim())}}),e});function Kr(t){var e=Qr(t.style);return t.staticStyle?O(t.staticStyle,e):e}function Qr(t){return Array.isArray(t)?D(t):"string"==typeof t?Vr(t):t}var Gr,Yr=/^--/,Xr=/\s*!important$/,Jr=function(t,e,n){if(Yr.test(e))t.style.setProperty(e,n);else if(Xr.test(n))t.style.setProperty(e,n.replace(Xr,""),"important");else{var r=ti(e);if(Array.isArray(n))for(var i=0,o=n.length;i<o;i++)t.style[r]=n[i];else t.style[r]=n}},Zr=["Webkit","Moz","ms"],ti=w(function(t){if(Gr=Gr||document.createElement("div").style,"filter"!==(t=C(t))&&t in Gr)return t;for(var e=t.charAt(0).toUpperCase()+t.slice(1),n=0;n<Zr.length;n++){var r=Zr[n]+e;if(r in Gr)return r}});function ei(t,e){var n=e.data,r=t.data;if(!(i(n.staticStyle)&&i(n.style)&&i(r.staticStyle)&&i(r.style))){var a,s,u=e.elm,c=r.staticStyle,l=r.normalizedStyle||r.style||{},f=c||l,p=Qr(e.data.style)||{};e.data.normalizedStyle=o(p.__ob__)?O({},p):p;var d=function(t,e){var n,r={};if(e)for(var i=t;i.componentInstance;)(i=i.componentInstance._vnode)&&i.data&&(n=Kr(i.data))&&O(r,n);(n=Kr(t.data))&&O(r,n);for(var o=t;o=o.parent;)o.data&&(n=Kr(o.data))&&O(r,n);return r}(e,!0);for(s in f)i(d[s])&&Jr(u,s,"");for(s in d)(a=d[s])!==f[s]&&Jr(u,s,null==a?"":a)}}var ni={create:ei,update:ei};function ri(t,e){if(e&&(e=e.trim()))if(t.classList)e.indexOf(" ")>-1?e.split(/\s+/).forEach(function(e){return t.classList.add(e)}):t.classList.add(e);else{var n=" "+(t.getAttribute("class")||"")+" ";n.indexOf(" "+e+" ")<0&&t.setAttribute("class",(n+e).trim())}}function ii(t,e){if(e&&(e=e.trim()))if(t.classList)e.indexOf(" ")>-1?e.split(/\s+/).forEach(function(e){return t.classList.remove(e)}):t.classList.remove(e),t.classList.length||t.removeAttribute("class");else{for(var n=" "+(t.getAttribute("class")||"")+" ",r=" "+e+" ";n.indexOf(r)>=0;)n=n.replace(r," ");(n=n.trim())?t.setAttribute("class",n):t.removeAttribute("class")}}function oi(t){if(t){if("object"==typeof t){var e={};return!1!==t.css&&O(e,ai(t.name||"v")),O(e,t),e}return"string"==typeof t?ai(t):void 0}}var ai=w(function(t){return{enterClass:t+"-enter",enterToClass:t+"-enter-to",enterActiveClass:t+"-enter-active",leaveClass:t+"-leave",leaveToClass:t+"-leave-to",leaveActiveClass:t+"-leave-active"}}),si=V&&!X,ui="transition",ci="animation",li="transition",fi="transitionend",pi="animation",di="animationend";si&&(void 0===window.ontransitionend&&void 0!==window.onwebkittransitionend&&(li="WebkitTransition",fi="webkitTransitionEnd"),void 0===window.onanimationend&&void 0!==window.onwebkitanimationend&&(pi="WebkitAnimation",di="webkitAnimationEnd"));var hi=V?window.requestAnimationFrame?window.requestAnimationFrame.bind(window):setTimeout:function(t){return t()};function vi(t){hi(function(){hi(t)})}function gi(t,e){var n=t._transitionClasses||(t._transitionClasses=[]);n.indexOf(e)<0&&(n.push(e),ri(t,e))}function mi(t,e){t._transitionClasses&&y(t._transitionClasses,e),ii(t,e)}function yi(t,e,n){var r=bi(t,e),i=r.type,o=r.timeout,a=r.propCount;if(!i)return n();var s=i===ui?fi:di,u=0,c=function(){t.removeEventListener(s,l),n()},l=function(e){e.target===t&&++u>=a&&c()};setTimeout(function(){u<a&&c()},o+1),t.addEventListener(s,l)}var _i=/\b(transform|all)(,|$)/;function bi(t,e){var n,r=window.getComputedStyle(t),i=r[li+"Delay"].split(", "),o=r[li+"Duration"].split(", "),a=wi(i,o),s=r[pi+"Delay"].split(", "),u=r[pi+"Duration"].split(", "),c=wi(s,u),l=0,f=0;return e===ui?a>0&&(n=ui,l=a,f=o.length):e===ci?c>0&&(n=ci,l=c,f=u.length):f=(n=(l=Math.max(a,c))>0?a>c?ui:ci:null)?n===ui?o.length:u.length:0,{type:n,timeout:l,propCount:f,hasTransform:n===ui&&_i.test(r[li+"Property"])}}function wi(t,e){for(;t.length<e.length;)t=t.concat(t);return Math.max.apply(null,e.map(function(e,n){return xi(e)+xi(t[n])}))}function xi(t){return 1e3*Number(t.slice(0,-1))}function Ci(t,e){var n=t.elm;o(n._leaveCb)&&(n._leaveCb.cancelled=!0,n._leaveCb());var r=oi(t.data.transition);if(!i(r)&&!o(n._enterCb)&&1===n.nodeType){for(var a=r.css,s=r.type,c=r.enterClass,l=r.enterToClass,f=r.enterActiveClass,p=r.appearClass,d=r.appearToClass,v=r.appearActiveClass,g=r.beforeEnter,m=r.enter,y=r.afterEnter,_=r.enterCancelled,b=r.beforeAppear,w=r.appear,x=r.afterAppear,C=r.appearCancelled,T=r.duration,E=_e,A=_e.$vnode;A&&A.parent;)E=(A=A.parent).context;var S=!E._isMounted||!t.isRootInsert;if(!S||w||""===w){var k=S&&p?p:c,O=S&&v?v:f,D=S&&d?d:l,I=S&&b||g,N=S&&"function"==typeof w?w:m,j=S&&x||y,L=S&&C||_,$=h(u(T)?T.enter:T);0;var P=!1!==a&&!X,M=Ai(N),F=n._enterCb=R(function(){P&&(mi(n,D),mi(n,O)),F.cancelled?(P&&mi(n,k),L&&L(n)):j&&j(n),n._enterCb=null});t.data.show||ae(t,"insert",function(){var e=n.parentNode,r=e&&e._pending&&e._pending[t.key];r&&r.tag===t.tag&&r.elm._leaveCb&&r.elm._leaveCb(),N&&N(n,F)}),I&&I(n),P&&(gi(n,k),gi(n,O),vi(function(){gi(n,D),mi(n,k),F.cancelled||M||(Ei($)?setTimeout(F,$):yi(n,s,F))})),t.data.show&&(e&&e(),N&&N(n,F)),P||M||F()}}}function Ti(t,e){var n=t.elm;o(n._enterCb)&&(n._enterCb.cancelled=!0,n._enterCb());var r=oi(t.data.transition);if(i(r)||1!==n.nodeType)return e();if(!o(n._leaveCb)){var a=r.css,s=r.type,c=r.leaveClass,l=r.leaveToClass,f=r.leaveActiveClass,p=r.beforeLeave,d=r.leave,v=r.afterLeave,g=r.leaveCancelled,m=r.delayLeave,y=r.duration,_=!1!==a&&!X,b=Ai(d),w=h(u(y)?y.leave:y);0;var x=n._leaveCb=R(function(){n.parentNode&&n.parentNode._pending&&(n.parentNode._pending[t.key]=null),_&&(mi(n,l),mi(n,f)),x.cancelled?(_&&mi(n,c),g&&g(n)):(e(),v&&v(n)),n._leaveCb=null});m?m(C):C()}function C(){x.cancelled||(t.data.show||((n.parentNode._pending||(n.parentNode._pending={}))[t.key]=t),p&&p(n),_&&(gi(n,c),gi(n,f),vi(function(){gi(n,l),mi(n,c),x.cancelled||b||(Ei(w)?setTimeout(x,w):yi(n,s,x))})),d&&d(n,x),_||b||x())}}function Ei(t){return"number"==typeof t&&!isNaN(t)}function Ai(t){if(i(t))return!1;var e=t.fns;return o(e)?Ai(Array.isArray(e)?e[0]:e):(t._length||t.length)>1}function Si(t,e){!0!==e.data.show&&Ci(e)}var ki=function(t){var e,n,r={},u=t.modules,c=t.nodeOps;for(e=0;e<Zn.length;++e)for(r[Zn[e]]=[],n=0;n<u.length;++n)o(u[n][Zn[e]])&&r[Zn[e]].push(u[n][Zn[e]]);function l(t){var e=c.parentNode(t);o(e)&&c.removeChild(e,t)}function f(t,e,n,i,s){if(t.isRootInsert=!s,!function(t,e,n,i){var s=t.data;if(o(s)){var u=o(t.componentInstance)&&s.keepAlive;if(o(s=s.hook)&&o(s=s.init)&&s(t,!1,n,i),o(t.componentInstance))return p(t,e),a(u)&&function(t,e,n,i){for(var a,s=t;s.componentInstance;)if(s=s.componentInstance._vnode,o(a=s.data)&&o(a=a.transition)){for(a=0;a<r.activate.length;++a)r.activate[a](Jn,s);e.push(s);break}d(n,t.elm,i)}(t,e,n,i),!0}}(t,e,n,i)){var u=t.data,l=t.children,f=t.tag;o(f)?(t.elm=t.ns?c.createElementNS(t.ns,f):c.createElement(f,t),y(t),h(t,l,e),o(u)&&m(t,e),d(n,t.elm,i)):a(t.isComment)?(t.elm=c.createComment(t.text),d(n,t.elm,i)):(t.elm=c.createTextNode(t.text),d(n,t.elm,i))}}function p(t,e){o(t.data.pendingInsert)&&(e.push.apply(e,t.data.pendingInsert),t.data.pendingInsert=null),t.elm=t.componentInstance.$el,g(t)?(m(t,e),y(t)):(Xn(t),e.push(t))}function d(t,e,n){o(t)&&(o(n)?n.parentNode===t&&c.insertBefore(t,e,n):c.appendChild(t,e))}function h(t,e,n){if(Array.isArray(e))for(var r=0;r<e.length;++r)f(e[r],n,t.elm,null,!0);else s(t.text)&&c.appendChild(t.elm,c.createTextNode(String(t.text)))}function g(t){for(;t.componentInstance;)t=t.componentInstance._vnode;return o(t.tag)}function m(t,n){for(var i=0;i<r.create.length;++i)r.create[i](Jn,t);o(e=t.data.hook)&&(o(e.create)&&e.create(Jn,t),o(e.insert)&&n.push(t))}function y(t){var e;if(o(e=t.fnScopeId))c.setAttribute(t.elm,e,"");else for(var n=t;n;)o(e=n.context)&&o(e=e.$options._scopeId)&&c.setAttribute(t.elm,e,""),n=n.parent;o(e=_e)&&e!==t.context&&e!==t.fnContext&&o(e=e.$options._scopeId)&&c.setAttribute(t.elm,e,"")}function _(t,e,n,r,i,o){for(;r<=i;++r)f(n[r],o,t,e)}function b(t){var e,n,i=t.data;if(o(i))for(o(e=i.hook)&&o(e=e.destroy)&&e(t),e=0;e<r.destroy.length;++e)r.destroy[e](t);if(o(e=t.children))for(n=0;n<t.children.length;++n)b(t.children[n])}function w(t,e,n,r){for(;n<=r;++n){var i=e[n];o(i)&&(o(i.tag)?(x(i),b(i)):l(i.elm))}}function x(t,e){if(o(e)||o(t.data)){var n,i=r.remove.length+1;for(o(e)?e.listeners+=i:e=function(t,e){function n(){0==--n.listeners&&l(t)}return n.listeners=e,n}(t.elm,i),o(n=t.componentInstance)&&o(n=n._vnode)&&o(n.data)&&x(n,e),n=0;n<r.remove.length;++n)r.remove[n](t,e);o(n=t.data.hook)&&o(n=n.remove)?n(t,e):e()}else l(t.elm)}function C(t,e,n,r){for(var i=n;i<r;i++){var a=e[i];if(o(a)&&tr(t,a))return i}}function T(t,e,n,s){if(t!==e){var u=e.elm=t.elm;if(a(t.isAsyncPlaceholder))o(e.asyncFactory.resolved)?S(t.elm,e,n):e.isAsyncPlaceholder=!0;else if(a(e.isStatic)&&a(t.isStatic)&&e.key===t.key&&(a(e.isCloned)||a(e.isOnce)))e.componentInstance=t.componentInstance;else{var l,p=e.data;o(p)&&o(l=p.hook)&&o(l=l.prepatch)&&l(t,e);var d=t.children,h=e.children;if(o(p)&&g(e)){for(l=0;l<r.update.length;++l)r.update[l](t,e);o(l=p.hook)&&o(l=l.update)&&l(t,e)}i(e.text)?o(d)&&o(h)?d!==h&&function(t,e,n,r,a){for(var s,u,l,p=0,d=0,h=e.length-1,v=e[0],g=e[h],m=n.length-1,y=n[0],b=n[m],x=!a;p<=h&&d<=m;)i(v)?v=e[++p]:i(g)?g=e[--h]:tr(v,y)?(T(v,y,r),v=e[++p],y=n[++d]):tr(g,b)?(T(g,b,r),g=e[--h],b=n[--m]):tr(v,b)?(T(v,b,r),x&&c.insertBefore(t,v.elm,c.nextSibling(g.elm)),v=e[++p],b=n[--m]):tr(g,y)?(T(g,y,r),x&&c.insertBefore(t,g.elm,v.elm),g=e[--h],y=n[++d]):(i(s)&&(s=er(e,p,h)),i(u=o(y.key)?s[y.key]:C(y,e,p,h))?f(y,r,t,v.elm):tr(l=e[u],y)?(T(l,y,r),e[u]=void 0,x&&c.insertBefore(t,l.elm,v.elm)):f(y,r,t,v.elm),y=n[++d]);p>h?_(t,i(n[m+1])?null:n[m+1].elm,n,d,m,r):d>m&&w(0,e,p,h)}(u,d,h,n,s):o(h)?(o(t.text)&&c.setTextContent(u,""),_(u,null,h,0,h.length-1,n)):o(d)?w(0,d,0,d.length-1):o(t.text)&&c.setTextContent(u,""):t.text!==e.text&&c.setTextContent(u,e.text),o(p)&&o(l=p.hook)&&o(l=l.postpatch)&&l(t,e)}}}function E(t,e,n){if(a(n)&&o(t.parent))t.parent.data.pendingInsert=e;else for(var r=0;r<e.length;++r)e[r].data.hook.insert(e[r])}var A=v("attrs,class,staticClass,staticStyle,key");function S(t,e,n,r){var i,s=e.tag,u=e.data,c=e.children;if(r=r||u&&u.pre,e.elm=t,a(e.isComment)&&o(e.asyncFactory))return e.isAsyncPlaceholder=!0,!0;if(o(u)&&(o(i=u.hook)&&o(i=i.init)&&i(e,!0),o(i=e.componentInstance)))return p(e,n),!0;if(o(s)){if(o(c))if(t.hasChildNodes())if(o(i=u)&&o(i=i.domProps)&&o(i=i.innerHTML)){if(i!==t.innerHTML)return!1}else{for(var l=!0,f=t.firstChild,d=0;d<c.length;d++){if(!f||!S(f,c[d],n,r)){l=!1;break}f=f.nextSibling}if(!l||f)return!1}else h(e,c,n);if(o(u)){var v=!1;for(var g in u)if(!A(g)){v=!0,m(e,n);break}!v&&u.class&&ee(u.class)}}else t.data!==e.text&&(t.data=e.text);return!0}return function(t,e,n,s,u,l){if(!i(e)){var p,d=!1,h=[];if(i(t))d=!0,f(e,h,u,l);else{var v=o(t.nodeType);if(!v&&tr(t,e))T(t,e,h,s);else{if(v){if(1===t.nodeType&&t.hasAttribute(P)&&(t.removeAttribute(P),n=!0),a(n)&&S(t,e,h))return E(e,h,!0),t;p=t,t=new dt(c.tagName(p).toLowerCase(),{},[],void 0,p)}var m=t.elm,y=c.parentNode(m);if(f(e,h,m._leaveCb?null:y,c.nextSibling(m)),o(e.parent))for(var _=e.parent,x=g(e);_;){for(var C=0;C<r.destroy.length;++C)r.destroy[C](_);if(_.elm=e.elm,x){for(var A=0;A<r.create.length;++A)r.create[A](Jn,_);var k=_.data.hook.insert;if(k.merged)for(var O=1;O<k.fns.length;O++)k.fns[O]()}else Xn(_);_=_.parent}o(y)?w(0,[t],0,0):o(t.tag)&&b(t)}}return E(e,h,d),e.elm}o(t)&&b(t)}}({nodeOps:Gn,modules:[lr,yr,qr,zr,ni,V?{create:Si,activate:Si,remove:function(t,e){!0!==t.data.show?Ti(t,e):e()}}:{}].concat(sr)});X&&document.addEventListener("selectionchange",function(){var t=document.activeElement;t&&t.vmodel&&Ri(t,"input")});var Oi={inserted:function(t,e,n,r){"select"===n.tag?(r.elm&&!r.elm._vOptions?ae(n,"postpatch",function(){Oi.componentUpdated(t,e,n)}):Di(t,e,n.context),t._vOptions=[].map.call(t.options,ji)):("textarea"===n.tag||Kn(t.type))&&(t._vModifiers=e.modifiers,e.modifiers.lazy||(t.addEventListener("change",$i),Z||(t.addEventListener("compositionstart",Li),t.addEventListener("compositionend",$i)),X&&(t.vmodel=!0)))},componentUpdated:function(t,e,n){if("select"===n.tag){Di(t,e,n.context);var r=t._vOptions,i=t._vOptions=[].map.call(t.options,ji);if(i.some(function(t,e){return!L(t,r[e])}))(t.multiple?e.value.some(function(t){return Ni(t,i)}):e.value!==e.oldValue&&Ni(e.value,i))&&Ri(t,"change")}}};function Di(t,e,n){Ii(t,e,n),(Y||J)&&setTimeout(function(){Ii(t,e,n)},0)}function Ii(t,e,n){var r=e.value,i=t.multiple;if(!i||Array.isArray(r)){for(var o,a,s=0,u=t.options.length;s<u;s++)if(a=t.options[s],i)o=$(r,ji(a))>-1,a.selected!==o&&(a.selected=o);else if(L(ji(a),r))return void(t.selectedIndex!==s&&(t.selectedIndex=s));i||(t.selectedIndex=-1)}}function Ni(t,e){return e.every(function(e){return!L(e,t)})}function ji(t){return"_value"in t?t._value:t.value}function Li(t){t.target.composing=!0}function $i(t){t.target.composing&&(t.target.composing=!1,Ri(t.target,"input"))}function Ri(t,e){var n=document.createEvent("HTMLEvents");n.initEvent(e,!0,!0),t.dispatchEvent(n)}function Pi(t){return!t.componentInstance||t.data&&t.data.transition?t:Pi(t.componentInstance._vnode)}var Mi={model:Oi,show:{bind:function(t,e,n){var r=e.value,i=(n=Pi(n)).data&&n.data.transition,o=t.__vOriginalDisplay="none"===t.style.display?"":t.style.display;r&&i?(n.data.show=!0,Ci(n,function(){t.style.display=o})):t.style.display=r?o:"none"},update:function(t,e,n){var r=e.value;r!==e.oldValue&&((n=Pi(n)).data&&n.data.transition?(n.data.show=!0,r?Ci(n,function(){t.style.display=t.__vOriginalDisplay}):Ti(n,function(){t.style.display="none"})):t.style.display=r?t.__vOriginalDisplay:"none")},unbind:function(t,e,n,r,i){i||(t.style.display=t.__vOriginalDisplay)}}},Fi={name:String,appear:Boolean,css:Boolean,mode:String,type:String,enterClass:String,leaveClass:String,enterToClass:String,leaveToClass:String,enterActiveClass:String,leaveActiveClass:String,appearClass:String,appearActiveClass:String,appearToClass:String,duration:[Number,String,Object]};function Hi(t){var e=t&&t.componentOptions;return e&&e.Ctor.options.abstract?Hi(pe(e.children)):t}function Bi(t){var e={},n=t.$options;for(var r in n.propsData)e[r]=t[r];var i=n._parentListeners;for(var o in i)e[C(o)]=i[o];return e}function Wi(t,e){if(/\d-keep-alive$/.test(e.tag))return t("keep-alive",{props:e.componentOptions.propsData})}var qi={name:"transition",props:Fi,abstract:!0,render:function(t){var e=this,n=this.$slots.default;if(n&&(n=n.filter(function(t){return t.tag||fe(t)})).length){0;var r=this.mode;0;var i=n[0];if(function(t){for(;t=t.parent;)if(t.data.transition)return!0}(this.$vnode))return i;var o=Hi(i);if(!o)return i;if(this._leaving)return Wi(t,i);var a="__transition-"+this._uid+"-";o.key=null==o.key?o.isComment?a+"comment":a+o.tag:s(o.key)?0===String(o.key).indexOf(a)?o.key:a+o.key:o.key;var u,c,l=(o.data||(o.data={})).transition=Bi(this),f=this._vnode,p=Hi(f);if(o.data.directives&&o.data.directives.some(function(t){return"show"===t.name})&&(o.data.show=!0),p&&p.data&&(u=o,(c=p).key!==u.key||c.tag!==u.tag)&&!fe(p)&&(!p.componentInstance||!p.componentInstance._vnode.isComment)){var d=p.data.transition=O({},l);if("out-in"===r)return this._leaving=!0,ae(d,"afterLeave",function(){e._leaving=!1,e.$forceUpdate()}),Wi(t,i);if("in-out"===r){if(fe(o))return f;var h,v=function(){h()};ae(l,"afterEnter",v),ae(l,"enterCancelled",v),ae(d,"delayLeave",function(t){h=t})}}return i}}},Ui=O({tag:String,moveClass:String},Fi);function zi(t){t.elm._moveCb&&t.elm._moveCb(),t.elm._enterCb&&t.elm._enterCb()}function Vi(t){t.data.newPos=t.elm.getBoundingClientRect()}function Ki(t){var e=t.data.pos,n=t.data.newPos,r=e.left-n.left,i=e.top-n.top;if(r||i){t.data.moved=!0;var o=t.elm.style;o.transform=o.WebkitTransform="translate("+r+"px,"+i+"px)",o.transitionDuration="0s"}}delete Ui.mode;var Qi={Transition:qi,TransitionGroup:{props:Ui,render:function(t){for(var e=this.tag||this.$vnode.data.tag||"span",n=Object.create(null),r=this.prevChildren=this.children,i=this.$slots.default||[],o=this.children=[],a=Bi(this),s=0;s<i.length;s++){var u=i[s];if(u.tag)if(null!=u.key&&0!==String(u.key).indexOf("__vlist"))o.push(u),n[u.key]=u,(u.data||(u.data={})).transition=a;else;}if(r){for(var c=[],l=[],f=0;f<r.length;f++){var p=r[f];p.data.transition=a,p.data.pos=p.elm.getBoundingClientRect(),n[p.key]?c.push(p):l.push(p)}this.kept=t(e,null,c),this.removed=l}return t(e,null,o)},beforeUpdate:function(){this.__patch__(this._vnode,this.kept,!1,!0),this._vnode=this.kept},updated:function(){var t=this.prevChildren,e=this.moveClass||(this.name||"v")+"-move";t.length&&this.hasMove(t[0].elm,e)&&(t.forEach(zi),t.forEach(Vi),t.forEach(Ki),this._reflow=document.body.offsetHeight,t.forEach(function(t){if(t.data.moved){var n=t.elm,r=n.style;gi(n,e),r.transform=r.WebkitTransform=r.transitionDuration="",n.addEventListener(fi,n._moveCb=function t(r){r&&!/transform$/.test(r.propertyName)||(n.removeEventListener(fi,t),n._moveCb=null,mi(n,e))})}}))},methods:{hasMove:function(t,e){if(!si)return!1;if(this._hasMove)return this._hasMove;var n=t.cloneNode();t._transitionClasses&&t._transitionClasses.forEach(function(t){ii(n,t)}),ri(n,e),n.style.display="none",this.$el.appendChild(n);var r=bi(n);return this.$el.removeChild(n),this._hasMove=r.hasTransform}}}};mn.config.mustUseProp=Dn,mn.config.isReservedTag=Un,mn.config.isReservedAttr=kn,mn.config.getTagNamespace=zn,mn.config.isUnknownElement=function(t){if(!V)return!0;if(Un(t))return!1;if(t=t.toLowerCase(),null!=Vn[t])return Vn[t];var e=document.createElement(t);return t.indexOf("-")>-1?Vn[t]=e.constructor===window.HTMLUnknownElement||e.constructor===window.HTMLElement:Vn[t]=/HTMLUnknownElement/.test(e.toString())},O(mn.options.directives,Mi),O(mn.options.components,Qi),mn.prototype.__patch__=V?ki:I,mn.prototype.$mount=function(t,e){return t=t&&V?Qn(t):void 0,r=t,i=e,(n=this).$el=r,n.$options.render||(n.$options.render=vt),xe(n,"beforeMount"),new Ie(n,function(){n._update(n._render(),i)},I,null,!0),i=!1,null==n.$vnode&&(n._isMounted=!0,xe(n,"mounted")),n;var n,r,i},mn.nextTick(function(){H.devtools&&ot&&ot.emit("init",mn)},0);var Gi=/\{\{((?:.|\n)+?)\}\}/g,Yi=/[-.*+?^${}()|[\]\/\\]/g,Xi=w(function(t){var e=t[0].replace(Yi,"\\$&"),n=t[1].replace(Yi,"\\$&");return new RegExp(e+"((?:.|\\n)+?)"+n,"g")});function Ji(t,e){var n=e?Xi(e):Gi;if(n.test(t)){for(var r,i,o,a=[],s=[],u=n.lastIndex=0;r=n.exec(t);){(i=r.index)>u&&(s.push(o=t.slice(u,i)),a.push(JSON.stringify(o)));var c=br(r[1].trim());a.push("_s("+c+")"),s.push({"@binding":c}),u=i+r[0].length}return u<t.length&&(s.push(o=t.slice(u)),a.push(JSON.stringify(o))),{expression:a.join("+"),tokens:s}}}var Zi={staticKeys:["staticClass"],transformNode:function(t,e){e.warn;var n=Or(t,"class");n&&(t.staticClass=JSON.stringify(n));var r=kr(t,"class",!1);r&&(t.classBinding=r)},genData:function(t){var e="";return t.staticClass&&(e+="staticClass:"+t.staticClass+","),t.classBinding&&(e+="class:"+t.classBinding+","),e}};var to,eo={staticKeys:["staticStyle"],transformNode:function(t,e){e.warn;var n=Or(t,"style");n&&(t.staticStyle=JSON.stringify(Vr(n)));var r=kr(t,"style",!1);r&&(t.styleBinding=r)},genData:function(t){var e="";return t.staticStyle&&(e+="staticStyle:"+t.staticStyle+","),t.styleBinding&&(e+="style:("+t.styleBinding+"),"),e}},no=function(t){return(to=to||document.createElement("div")).innerHTML=t,to.textContent},ro=v("area,base,br,col,embed,frame,hr,img,input,isindex,keygen,link,meta,param,source,track,wbr"),io=v("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source"),oo=v("address,article,aside,base,blockquote,body,caption,col,colgroup,dd,details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,title,tr,track"),ao=/^\s*([^\s"'<>\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,so="[a-zA-Z_][\\w\\-\\.]*",uo="((?:"+so+"\\:)?"+so+")",co=new RegExp("^<"+uo),lo=/^\s*(\/?)>/,fo=new RegExp("^<\\/"+uo+"[^>]*>"),po=/^<!DOCTYPE [^>]+>/i,ho=/^<!--/,vo=/^<!\[/,go=!1;"x".replace(/x(.)?/g,function(t,e){go=""===e});var mo=v("script,style,textarea",!0),yo={},_o={"&lt;":"<","&gt;":">","&quot;":'"',"&amp;":"&","&#10;":"\n","&#9;":"\t"},bo=/&(?:lt|gt|quot|amp);/g,wo=/&(?:lt|gt|quot|amp|#10|#9);/g,xo=v("pre,textarea",!0),Co=function(t,e){return t&&xo(t)&&"\n"===e[0]};var To,Eo,Ao,So,ko,Oo,Do,Io,No=/^@|^v-on:/,jo=/^v-|^@|^:/,Lo=/(.*?)\s+(?:in|of)\s+(.*)/,$o=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,Ro=/^\(|\)$/g,Po=/:(.*)$/,Mo=/^:|^v-bind:/,Fo=/\.[^.]+/g,Ho=w(no);function Bo(t,e,n){return{type:1,tag:t,attrsList:e,attrsMap:function(t){for(var e={},n=0,r=t.length;n<r;n++)e[t[n].name]=t[n].value;return e}(e),parent:n,children:[]}}function Wo(t,e){To=e.warn||xr,Oo=e.isPreTag||N,Do=e.mustUseProp||N,Io=e.getTagNamespace||N,Ao=Cr(e.modules,"transformNode"),So=Cr(e.modules,"preTransformNode"),ko=Cr(e.modules,"postTransformNode"),Eo=e.delimiters;var n,r,i=[],o=!1!==e.preserveWhitespace,a=!1,s=!1;function u(t){t.pre&&(a=!1),Oo(t.tag)&&(s=!1);for(var n=0;n<ko.length;n++)ko[n](t,e)}return function(t,e){for(var n,r,i=[],o=e.expectHTML,a=e.isUnaryTag||N,s=e.canBeLeftOpenTag||N,u=0;t;){if(n=t,r&&mo(r)){var c=0,l=r.toLowerCase(),f=yo[l]||(yo[l]=new RegExp("([\\s\\S]*?)(</"+l+"[^>]*>)","i")),p=t.replace(f,function(t,n,r){return c=r.length,mo(l)||"noscript"===l||(n=n.replace(/<!--([\s\S]*?)-->/g,"$1").replace(/<!\[CDATA\[([\s\S]*?)]]>/g,"$1")),Co(l,n)&&(n=n.slice(1)),e.chars&&e.chars(n),""});u+=t.length-p.length,t=p,A(l,u-c,u)}else{var d=t.indexOf("<");if(0===d){if(ho.test(t)){var h=t.indexOf("--\x3e");if(h>=0){e.shouldKeepComment&&e.comment(t.substring(4,h)),C(h+3);continue}}if(vo.test(t)){var v=t.indexOf("]>");if(v>=0){C(v+2);continue}}var g=t.match(po);if(g){C(g[0].length);continue}var m=t.match(fo);if(m){var y=u;C(m[0].length),A(m[1],y,u);continue}var _=T();if(_){E(_),Co(r,t)&&C(1);continue}}var b=void 0,w=void 0,x=void 0;if(d>=0){for(w=t.slice(d);!(fo.test(w)||co.test(w)||ho.test(w)||vo.test(w)||(x=w.indexOf("<",1))<0);)d+=x,w=t.slice(d);b=t.substring(0,d),C(d)}d<0&&(b=t,t=""),e.chars&&b&&e.chars(b)}if(t===n){e.chars&&e.chars(t);break}}function C(e){u+=e,t=t.substring(e)}function T(){var e=t.match(co);if(e){var n,r,i={tagName:e[1],attrs:[],start:u};for(C(e[0].length);!(n=t.match(lo))&&(r=t.match(ao));)C(r[0].length),i.attrs.push(r);if(n)return i.unarySlash=n[1],C(n[0].length),i.end=u,i}}function E(t){var n=t.tagName,u=t.unarySlash;o&&("p"===r&&oo(n)&&A(r),s(n)&&r===n&&A(n));for(var c,l,f,p=a(n)||!!u,d=t.attrs.length,h=new Array(d),v=0;v<d;v++){var g=t.attrs[v];go&&-1===g[0].indexOf('""')&&(""===g[3]&&delete g[3],""===g[4]&&delete g[4],""===g[5]&&delete g[5]);var m=g[3]||g[4]||g[5]||"",y="a"===n&&"href"===g[1]?e.shouldDecodeNewlinesForHref:e.shouldDecodeNewlines;h[v]={name:g[1],value:(c=m,l=y,f=l?wo:bo,c.replace(f,function(t){return _o[t]}))}}p||(i.push({tag:n,lowerCasedTag:n.toLowerCase(),attrs:h}),r=n),e.start&&e.start(n,h,p,t.start,t.end)}function A(t,n,o){var a,s;if(null==n&&(n=u),null==o&&(o=u),t&&(s=t.toLowerCase()),t)for(a=i.length-1;a>=0&&i[a].lowerCasedTag!==s;a--);else a=0;if(a>=0){for(var c=i.length-1;c>=a;c--)e.end&&e.end(i[c].tag,n,o);i.length=a,r=a&&i[a-1].tag}else"br"===s?e.start&&e.start(t,[],!0,n,o):"p"===s&&(e.start&&e.start(t,[],!1,n,o),e.end&&e.end(t,n,o))}A()}(t,{warn:To,expectHTML:e.expectHTML,isUnaryTag:e.isUnaryTag,canBeLeftOpenTag:e.canBeLeftOpenTag,shouldDecodeNewlines:e.shouldDecodeNewlines,shouldDecodeNewlinesForHref:e.shouldDecodeNewlinesForHref,shouldKeepComment:e.comments,start:function(t,o,c){var l=r&&r.ns||Io(t);Y&&"svg"===l&&(o=function(t){for(var e=[],n=0;n<t.length;n++){var r=t[n];Ko.test(r.name)||(r.name=r.name.replace(Qo,""),e.push(r))}return e}(o));var f,p,d,h,v,g=Bo(t,o,r);l&&(g.ns=l),"style"!==(f=g).tag&&("script"!==f.tag||f.attrsMap.type&&"text/javascript"!==f.attrsMap.type)||it()||(g.forbidden=!0);for(var m=0;m<So.length;m++)g=So[m](g,e)||g;function y(t){0}if(a||(null!=Or(p=g,"v-pre")&&(p.pre=!0),g.pre&&(a=!0)),Oo(g.tag)&&(s=!0),a?function(t){var e=t.attrsList.length;if(e)for(var n=t.attrs=new Array(e),r=0;r<e;r++)n[r]={name:t.attrsList[r].name,value:JSON.stringify(t.attrsList[r].value)};else t.pre||(t.plain=!0)}(g):g.processed||(Uo(g),function(t){var e=Or(t,"v-if");if(e)t.if=e,zo(t,{exp:e,block:t});else{null!=Or(t,"v-else")&&(t.else=!0);var n=Or(t,"v-else-if");n&&(t.elseif=n)}}(g),null!=Or(d=g,"v-once")&&(d.once=!0),qo(g,e)),n?i.length||n.if&&(g.elseif||g.else)&&(y(),zo(n,{exp:g.elseif,block:g})):(n=g,y()),r&&!g.forbidden)if(g.elseif||g.else)h=g,(v=function(t){var e=t.length;for(;e--;){if(1===t[e].type)return t[e];t.pop()}}(r.children))&&v.if&&zo(v,{exp:h.elseif,block:h});else if(g.slotScope){r.plain=!1;var _=g.slotTarget||'"default"';(r.scopedSlots||(r.scopedSlots={}))[_]=g}else r.children.push(g),g.parent=r;c?u(g):(r=g,i.push(g))},end:function(){var t=i[i.length-1],e=t.children[t.children.length-1];e&&3===e.type&&" "===e.text&&!s&&t.children.pop(),i.length-=1,r=i[i.length-1],u(t)},chars:function(t){if(r&&(!Y||"textarea"!==r.tag||r.attrsMap.placeholder!==t)){var e,n,i=r.children;if(t=s||t.trim()?"script"===(e=r).tag||"style"===e.tag?t:Ho(t):o&&i.length?" ":"")!a&&" "!==t&&(n=Ji(t,Eo))?i.push({type:2,expression:n.expression,tokens:n.tokens,text:t}):" "===t&&i.length&&" "===i[i.length-1].text||i.push({type:3,text:t})}},comment:function(t){r.children.push({type:3,text:t,isComment:!0})}}),n}function qo(t,e){var n,r,i,o;(r=kr(n=t,"key"))&&(n.key=r),t.plain=!t.key&&!t.attrsList.length,(o=kr(i=t,"ref"))&&(i.ref=o,i.refInFor=function(t){for(var e=t;e;){if(void 0!==e.for)return!0;e=e.parent}return!1}(i)),function(t){if("slot"===t.tag)t.slotName=kr(t,"name");else{var e;"template"===t.tag?(e=Or(t,"scope"),t.slotScope=e||Or(t,"slot-scope")):(e=Or(t,"slot-scope"))&&(t.slotScope=e);var n=kr(t,"slot");n&&(t.slotTarget='""'===n?'"default"':n,"template"===t.tag||t.slotScope||Er(t,"slot",n))}}(t),function(t){var e;(e=kr(t,"is"))&&(t.component=e);null!=Or(t,"inline-template")&&(t.inlineTemplate=!0)}(t);for(var a=0;a<Ao.length;a++)t=Ao[a](t,e)||t;!function(t){var e,n,r,i,o,a,s,u=t.attrsList;for(e=0,n=u.length;e<n;e++){if(r=i=u[e].name,o=u[e].value,jo.test(r))if(t.hasBindings=!0,(a=Vo(r))&&(r=r.replace(Fo,"")),Mo.test(r))r=r.replace(Mo,""),o=br(o),s=!1,a&&(a.prop&&(s=!0,"innerHtml"===(r=C(r))&&(r="innerHTML")),a.camel&&(r=C(r)),a.sync&&Sr(t,"update:"+C(r),Ir(o,"$event"))),s||!t.component&&Do(t.tag,t.attrsMap.type,r)?Tr(t,r,o):Er(t,r,o);else if(No.test(r))r=r.replace(No,""),Sr(t,r,o,a,!1);else{var c=(r=r.replace(jo,"")).match(Po),l=c&&c[1];l&&(r=r.slice(0,-(l.length+1))),p=r,d=i,h=o,v=l,g=a,((f=t).directives||(f.directives=[])).push({name:p,rawName:d,value:h,arg:v,modifiers:g}),f.plain=!1}else Er(t,r,JSON.stringify(o)),!t.component&&"muted"===r&&Do(t.tag,t.attrsMap.type,r)&&Tr(t,r,"true")}var f,p,d,h,v,g}(t)}function Uo(t){var e;if(e=Or(t,"v-for")){var n=function(t){var e=t.match(Lo);if(!e)return;var n={};n.for=e[2].trim();var r=e[1].trim().replace(Ro,""),i=r.match($o);i?(n.alias=r.replace($o,""),n.iterator1=i[1].trim(),i[2]&&(n.iterator2=i[2].trim())):n.alias=r;return n}(e);n&&O(t,n)}}function zo(t,e){t.ifConditions||(t.ifConditions=[]),t.ifConditions.push(e)}function Vo(t){var e=t.match(Fo);if(e){var n={};return e.forEach(function(t){n[t.slice(1)]=!0}),n}}var Ko=/^xmlns:NS\d+/,Qo=/^NS\d+:/;function Go(t){return Bo(t.tag,t.attrsList.slice(),t.parent)}var Yo=[Zi,eo,{preTransformNode:function(t,e){if("input"===t.tag){var n=t.attrsMap;if(n["v-model"]&&(n["v-bind:type"]||n[":type"])){var r=kr(t,"type"),i=Or(t,"v-if",!0),o=i?"&&("+i+")":"",a=null!=Or(t,"v-else",!0),s=Or(t,"v-else-if",!0),u=Go(t);Uo(u),Ar(u,"type","checkbox"),qo(u,e),u.processed=!0,u.if="("+r+")==='checkbox'"+o,zo(u,{exp:u.if,block:u});var c=Go(t);Or(c,"v-for",!0),Ar(c,"type","radio"),qo(c,e),zo(u,{exp:"("+r+")==='radio'"+o,block:c});var l=Go(t);return Or(l,"v-for",!0),Ar(l,":type",r),qo(l,e),zo(u,{exp:i,block:l}),a?u.else=!0:s&&(u.elseif=s),u}}}}];var Xo,Jo,Zo,ta={expectHTML:!0,modules:Yo,directives:{model:function(t,e,n){n;var r,i,o,a,s,u,c,l,f,p,d,h,v,g,m,y,_=e.value,b=e.modifiers,w=t.tag,x=t.attrsMap.type;if(t.component)return Dr(t,_,b),!1;if("select"===w)v=t,g=_,y=(y='var $$selectedVal = Array.prototype.filter.call($event.target.options,function(o){return o.selected}).map(function(o){var val = "_value" in o ? o._value : o.value;return '+((m=b)&&m.number?"_n(val)":"val")+"});")+" "+Ir(g,"$event.target.multiple ? $$selectedVal : $$selectedVal[0]"),Sr(v,"change",y,null,!0);else if("input"===w&&"checkbox"===x)u=t,c=_,f=(l=b)&&l.number,p=kr(u,"value")||"null",d=kr(u,"true-value")||"true",h=kr(u,"false-value")||"false",Tr(u,"checked","Array.isArray("+c+")?_i("+c+","+p+")>-1"+("true"===d?":("+c+")":":_q("+c+","+d+")")),Sr(u,"change","var $$a="+c+",$$el=$event.target,$$c=$$el.checked?("+d+"):("+h+");if(Array.isArray($$a)){var $$v="+(f?"_n("+p+")":p)+",$$i=_i($$a,$$v);if($$el.checked){$$i<0&&("+c+"=$$a.concat([$$v]))}else{$$i>-1&&("+c+"=$$a.slice(0,$$i).concat($$a.slice($$i+1)))}}else{"+Ir(c,"$$c")+"}",null,!0);else if("input"===w&&"radio"===x)r=t,i=_,a=(o=b)&&o.number,s=kr(r,"value")||"null",Tr(r,"checked","_q("+i+","+(s=a?"_n("+s+")":s)+")"),Sr(r,"change",Ir(i,s),null,!0);else if("input"===w||"textarea"===w)!function(t,e,n){var r=t.attrsMap.type,i=n||{},o=i.lazy,a=i.number,s=i.trim,u=!o&&"range"!==r,c=o?"change":"range"===r?Mr:"input",l="$event.target.value";s&&(l="$event.target.value.trim()"),a&&(l="_n("+l+")");var f=Ir(e,l);u&&(f="if($event.target.composing)return;"+f),Tr(t,"value","("+e+")"),Sr(t,c,f,null,!0),(s||a)&&Sr(t,"blur","$forceUpdate()")}(t,_,b);else if(!H.isReservedTag(w))return Dr(t,_,b),!1;return!0},text:function(t,e){e.value&&Tr(t,"textContent","_s("+e.value+")")},html:function(t,e){e.value&&Tr(t,"innerHTML","_s("+e.value+")")}},isPreTag:function(t){return"pre"===t},isUnaryTag:ro,mustUseProp:Dn,canBeLeftOpenTag:io,isReservedTag:Un,getTagNamespace:zn,staticKeys:(Xo=Yo,Xo.reduce(function(t,e){return t.concat(e.staticKeys||[])},[]).join(","))},ea=w(function(t){return v("type,tag,attrsList,attrsMap,plain,parent,children,attrs"+(t?","+t:""))});function na(t,e){t&&(Jo=ea(e.staticKeys||""),Zo=e.isReservedTag||N,function t(e){e.static=function(t){if(2===t.type)return!1;if(3===t.type)return!0;return!(!t.pre&&(t.hasBindings||t.if||t.for||g(t.tag)||!Zo(t.tag)||function(t){for(;t.parent;){if("template"!==(t=t.parent).tag)return!1;if(t.for)return!0}return!1}(t)||!Object.keys(t).every(Jo)))}(e);if(1===e.type){if(!Zo(e.tag)&&"slot"!==e.tag&&null==e.attrsMap["inline-template"])return;for(var n=0,r=e.children.length;n<r;n++){var i=e.children[n];t(i),i.static||(e.static=!1)}if(e.ifConditions)for(var o=1,a=e.ifConditions.length;o<a;o++){var s=e.ifConditions[o].block;t(s),s.static||(e.static=!1)}}}(t),function t(e,n){if(1===e.type){if((e.static||e.once)&&(e.staticInFor=n),e.static&&e.children.length&&(1!==e.children.length||3!==e.children[0].type))return void(e.staticRoot=!0);if(e.staticRoot=!1,e.children)for(var r=0,i=e.children.length;r<i;r++)t(e.children[r],n||!!e.for);if(e.ifConditions)for(var o=1,a=e.ifConditions.length;o<a;o++)t(e.ifConditions[o].block,n)}}(t,!1))}var ra=/^\s*([\w$_]+|\([^)]*?\))\s*=>|^function\s*\(/,ia=/^\s*[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['.*?']|\[".*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*\s*$/,oa={esc:27,tab:9,enter:13,space:32,up:38,left:37,right:39,down:40,delete:[8,46]},aa=function(t){return"if("+t+")return null;"},sa={stop:"$event.stopPropagation();",prevent:"$event.preventDefault();",self:aa("$event.target !== $event.currentTarget"),ctrl:aa("!$event.ctrlKey"),shift:aa("!$event.shiftKey"),alt:aa("!$event.altKey"),meta:aa("!$event.metaKey"),left:aa("'button' in $event && $event.button !== 0"),middle:aa("'button' in $event && $event.button !== 1"),right:aa("'button' in $event && $event.button !== 2")};function ua(t,e,n){var r=e?"nativeOn:{":"on:{";for(var i in t)r+='"'+i+'":'+ca(i,t[i])+",";return r.slice(0,-1)+"}"}function ca(t,e){if(!e)return"function(){}";if(Array.isArray(e))return"["+e.map(function(e){return ca(t,e)}).join(",")+"]";var n=ia.test(e.value),r=ra.test(e.value);if(e.modifiers){var i="",o="",a=[];for(var s in e.modifiers)if(sa[s])o+=sa[s],oa[s]&&a.push(s);else if("exact"===s){var u=e.modifiers;o+=aa(["ctrl","shift","alt","meta"].filter(function(t){return!u[t]}).map(function(t){return"$event."+t+"Key"}).join("||"))}else a.push(s);return a.length&&(i+="if(!('button' in $event)&&"+a.map(la).join("&&")+")return null;"),o&&(i+=o),"function($event){"+i+(n?e.value+"($event)":r?"("+e.value+")($event)":e.value)+"}"}return n||r?e.value:"function($event){"+e.value+"}"}function la(t){var e=parseInt(t,10);if(e)return"$event.keyCode!=="+e;var n=oa[t];return"_k($event.keyCode,"+JSON.stringify(t)+","+JSON.stringify(n)+",$event.key)"}var fa={on:function(t,e){t.wrapListeners=function(t){return"_g("+t+","+e.value+")"}},bind:function(t,e){t.wrapData=function(n){return"_b("+n+",'"+t.tag+"',"+e.value+","+(e.modifiers&&e.modifiers.prop?"true":"false")+(e.modifiers&&e.modifiers.sync?",true":"")+")"}},cloak:I},pa=function(t){this.options=t,this.warn=t.warn||xr,this.transforms=Cr(t.modules,"transformCode"),this.dataGenFns=Cr(t.modules,"genData"),this.directives=O(O({},fa),t.directives);var e=t.isReservedTag||N;this.maybeComponent=function(t){return!e(t.tag)},this.onceId=0,this.staticRenderFns=[]};function da(t,e){var n=new pa(e);return{render:"with(this){return "+(t?ha(t,n):'_c("div")')+"}",staticRenderFns:n.staticRenderFns}}function ha(t,e){if(t.staticRoot&&!t.staticProcessed)return va(t,e);if(t.once&&!t.onceProcessed)return ga(t,e);if(t.for&&!t.forProcessed)return function(t,e,n,r){var i=t.for,o=t.alias,a=t.iterator1?","+t.iterator1:"",s=t.iterator2?","+t.iterator2:"";0;return t.forProcessed=!0,(r||"_l")+"(("+i+"),function("+o+a+s+"){return "+(n||ha)(t,e)+"})"}(t,e);if(t.if&&!t.ifProcessed)return ma(t,e);if("template"!==t.tag||t.slotTarget){if("slot"===t.tag)return function(t,e){var n=t.slotName||'"default"',r=ba(t,e),i="_t("+n+(r?","+r:""),o=t.attrs&&"{"+t.attrs.map(function(t){return C(t.name)+":"+t.value}).join(",")+"}",a=t.attrsMap["v-bind"];!o&&!a||r||(i+=",null");o&&(i+=","+o);a&&(i+=(o?"":",null")+","+a);return i+")"}(t,e);var n;if(t.component)a=t.component,u=e,c=(s=t).inlineTemplate?null:ba(s,u,!0),n="_c("+a+","+ya(s,u)+(c?","+c:"")+")";else{var r=t.plain?void 0:ya(t,e),i=t.inlineTemplate?null:ba(t,e,!0);n="_c('"+t.tag+"'"+(r?","+r:"")+(i?","+i:"")+")"}for(var o=0;o<e.transforms.length;o++)n=e.transforms[o](t,n);return n}return ba(t,e)||"void 0";var a,s,u,c}function va(t,e){return t.staticProcessed=!0,e.staticRenderFns.push("with(this){return "+ha(t,e)+"}"),"_m("+(e.staticRenderFns.length-1)+(t.staticInFor?",true":"")+")"}function ga(t,e){if(t.onceProcessed=!0,t.if&&!t.ifProcessed)return ma(t,e);if(t.staticInFor){for(var n="",r=t.parent;r;){if(r.for){n=r.key;break}r=r.parent}return n?"_o("+ha(t,e)+","+e.onceId+++","+n+")":ha(t,e)}return va(t,e)}function ma(t,e,n,r){return t.ifProcessed=!0,function t(e,n,r,i){if(!e.length)return i||"_e()";var o=e.shift();return o.exp?"("+o.exp+")?"+a(o.block)+":"+t(e,n,r,i):""+a(o.block);function a(t){return r?r(t,n):t.once?ga(t,n):ha(t,n)}}(t.ifConditions.slice(),e,n,r)}function ya(t,e){var n,r,i="{",o=function(t,e){var n=t.directives;if(!n)return;var r,i,o,a,s="directives:[",u=!1;for(r=0,i=n.length;r<i;r++){o=n[r],a=!0;var c=e.directives[o.name];c&&(a=!!c(t,o,e.warn)),a&&(u=!0,s+='{name:"'+o.name+'",rawName:"'+o.rawName+'"'+(o.value?",value:("+o.value+"),expression:"+JSON.stringify(o.value):"")+(o.arg?',arg:"'+o.arg+'"':"")+(o.modifiers?",modifiers:"+JSON.stringify(o.modifiers):"")+"},")}if(u)return s.slice(0,-1)+"]"}(t,e);o&&(i+=o+","),t.key&&(i+="key:"+t.key+","),t.ref&&(i+="ref:"+t.ref+","),t.refInFor&&(i+="refInFor:true,"),t.pre&&(i+="pre:true,"),t.component&&(i+='tag:"'+t.tag+'",');for(var a=0;a<e.dataGenFns.length;a++)i+=e.dataGenFns[a](t);if(t.attrs&&(i+="attrs:{"+Ca(t.attrs)+"},"),t.props&&(i+="domProps:{"+Ca(t.props)+"},"),t.events&&(i+=ua(t.events,!1,e.warn)+","),t.nativeEvents&&(i+=ua(t.nativeEvents,!0,e.warn)+","),t.slotTarget&&!t.slotScope&&(i+="slot:"+t.slotTarget+","),t.scopedSlots&&(i+=(n=t.scopedSlots,r=e,"scopedSlots:_u(["+Object.keys(n).map(function(t){return _a(t,n[t],r)}).join(",")+"]),")),t.model&&(i+="model:{value:"+t.model.value+",callback:"+t.model.callback+",expression:"+t.model.expression+"},"),t.inlineTemplate){var s=function(t,e){var n=t.children[0];0;if(1===n.type){var r=da(n,e.options);return"inlineTemplate:{render:function(){"+r.render+"},staticRenderFns:["+r.staticRenderFns.map(function(t){return"function(){"+t+"}"}).join(",")+"]}"}}(t,e);s&&(i+=s+",")}return i=i.replace(/,$/,"")+"}",t.wrapData&&(i=t.wrapData(i)),t.wrapListeners&&(i=t.wrapListeners(i)),i}function _a(t,e,n){return e.for&&!e.forProcessed?(r=t,o=n,a=(i=e).for,s=i.alias,u=i.iterator1?","+i.iterator1:"",c=i.iterator2?","+i.iterator2:"",i.forProcessed=!0,"_l(("+a+"),function("+s+u+c+"){return "+_a(r,i,o)+"})"):"{key:"+t+",fn:"+("function("+String(e.slotScope)+"){return "+("template"===e.tag?e.if?e.if+"?"+(ba(e,n)||"undefined")+":undefined":ba(e,n)||"undefined":ha(e,n))+"}")+"}";var r,i,o,a,s,u,c}function ba(t,e,n,r,i){var o=t.children;if(o.length){var a=o[0];if(1===o.length&&a.for&&"template"!==a.tag&&"slot"!==a.tag)return(r||ha)(a,e);var s=n?function(t,e){for(var n=0,r=0;r<t.length;r++){var i=t[r];if(1===i.type){if(wa(i)||i.ifConditions&&i.ifConditions.some(function(t){return wa(t.block)})){n=2;break}(e(i)||i.ifConditions&&i.ifConditions.some(function(t){return e(t.block)}))&&(n=1)}}return n}(o,e.maybeComponent):0,u=i||xa;return"["+o.map(function(t){return u(t,e)}).join(",")+"]"+(s?","+s:"")}}function wa(t){return void 0!==t.for||"template"===t.tag||"slot"===t.tag}function xa(t,e){return 1===t.type?ha(t,e):3===t.type&&t.isComment?(r=t,"_e("+JSON.stringify(r.text)+")"):"_v("+(2===(n=t).type?n.expression:Ta(JSON.stringify(n.text)))+")";var n,r}function Ca(t){for(var e="",n=0;n<t.length;n++){var r=t[n];e+='"'+r.name+'":'+Ta(r.value)+","}return e.slice(0,-1)}function Ta(t){return t.replace(/\u2028/g,"\\u2028").replace(/\u2029/g,"\\u2029")}new RegExp("\\b"+"do,if,for,let,new,try,var,case,else,with,await,break,catch,class,const,super,throw,while,yield,delete,export,import,return,switch,default,extends,finally,continue,debugger,function,arguments".split(",").join("\\b|\\b")+"\\b"),new RegExp("\\b"+"delete,typeof,void".split(",").join("\\s*\\([^\\)]*\\)|\\b")+"\\s*\\([^\\)]*\\)");function Ea(t,e){try{return new Function(t)}catch(n){return e.push({err:n,code:t}),I}}var Aa,Sa,ka=(Aa=function(t,e){var n=Wo(t.trim(),e);!1!==e.optimize&&na(n,e);var r=da(n,e);return{ast:n,render:r.render,staticRenderFns:r.staticRenderFns}},function(t){function e(e,n){var r=Object.create(t),i=[],o=[];if(r.warn=function(t,e){(e?o:i).push(t)},n){n.modules&&(r.modules=(t.modules||[]).concat(n.modules)),n.directives&&(r.directives=O(Object.create(t.directives||null),n.directives));for(var a in n)"modules"!==a&&"directives"!==a&&(r[a]=n[a])}var s=Aa(e,r);return s.errors=i,s.tips=o,s}return{compile:e,compileToFunctions:(n=e,r=Object.create(null),function(t,e,i){(e=O({},e)).warn,delete e.warn;var o=e.delimiters?String(e.delimiters)+t:t;if(r[o])return r[o];var a=n(t,e),s={},u=[];return s.render=Ea(a.render,u),s.staticRenderFns=a.staticRenderFns.map(function(t){return Ea(t,u)}),r[o]=s})};var n,r})(ta).compileToFunctions;function Oa(t){return(Sa=Sa||document.createElement("div")).innerHTML=t?'<a href="\n"/>':'<div a="\n"/>',Sa.innerHTML.indexOf("&#10;")>0}var Da=!!V&&Oa(!1),Ia=!!V&&Oa(!0),Na=w(function(t){var e=Qn(t);return e&&e.innerHTML}),ja=mn.prototype.$mount;mn.prototype.$mount=function(t,e){if((t=t&&Qn(t))===document.body||t===document.documentElement)return this;var n=this.$options;if(!n.render){var r=n.template;if(r)if("string"==typeof r)"#"===r.charAt(0)&&(r=Na(r));else{if(!r.nodeType)return this;r=r.innerHTML}else t&&(r=function(t){if(t.outerHTML)return t.outerHTML;var e=document.createElement("div");return e.appendChild(t.cloneNode(!0)),e.innerHTML}(t));if(r){0;var i=ka(r,{shouldDecodeNewlines:Da,shouldDecodeNewlinesForHref:Ia,delimiters:n.delimiters,comments:n.comments},this),o=i.render,a=i.staticRenderFns;n.render=o,n.staticRenderFns=a}}return ja.call(this,t,e)},mn.compile=ka,t.exports=mn}).call(e,n(1),n(37).setImmediate)},function(t,e,n){var r=Function.prototype.apply;function i(t,e){this._id=t,this._clearFn=e}e.setTimeout=function(){return new i(r.call(setTimeout,window,arguments),clearTimeout)},e.setInterval=function(){return new i(r.call(setInterval,window,arguments),clearInterval)},e.clearTimeout=e.clearInterval=function(t){t&&t.close()},i.prototype.unref=i.prototype.ref=function(){},i.prototype.close=function(){this._clearFn.call(window,this._id)},e.enroll=function(t,e){clearTimeout(t._idleTimeoutId),t._idleTimeout=e},e.unenroll=function(t){clearTimeout(t._idleTimeoutId),t._idleTimeout=-1},e._unrefActive=e.active=function(t){clearTimeout(t._idleTimeoutId);var e=t._idleTimeout;e>=0&&(t._idleTimeoutId=setTimeout(function(){t._onTimeout&&t._onTimeout()},e))},n(38),e.setImmediate=setImmediate,e.clearImmediate=clearImmediate},function(t,e,n){(function(t,e){!function(t,n){"use strict";if(!t.setImmediate){var r,i,o,a,s,u=1,c={},l=!1,f=t.document,p=Object.getPrototypeOf&&Object.getPrototypeOf(t);p=p&&p.setTimeout?p:t,"[object process]"==={}.toString.call(t.process)?r=function(t){e.nextTick(function(){h(t)})}:!function(){if(t.postMessage&&!t.importScripts){var e=!0,n=t.onmessage;return t.onmessage=function(){e=!1},t.postMessage("","*"),t.onmessage=n,e}}()?t.MessageChannel?((o=new MessageChannel).port1.onmessage=function(t){h(t.data)},r=function(t){o.port2.postMessage(t)}):f&&"onreadystatechange"in f.createElement("script")?(i=f.documentElement,r=function(t){var e=f.createElement("script");e.onreadystatechange=function(){h(t),e.onreadystatechange=null,i.removeChild(e),e=null},i.appendChild(e)}):r=function(t){setTimeout(h,0,t)}:(a="setImmediate$"+Math.random()+"$",s=function(e){e.source===t&&"string"==typeof e.data&&0===e.data.indexOf(a)&&h(+e.data.slice(a.length))},t.addEventListener?t.addEventListener("message",s,!1):t.attachEvent("onmessage",s),r=function(e){t.postMessage(a+e,"*")}),p.setImmediate=function(t){"function"!=typeof t&&(t=new Function(""+t));for(var e=new Array(arguments.length-1),n=0;n<e.length;n++)e[n]=arguments[n+1];var i={callback:t,args:e};return c[u]=i,r(u),u++},p.clearImmediate=d}function d(t){delete c[t]}function h(t){if(l)setTimeout(h,0,t);else{var e=c[t];if(e){l=!0;try{!function(t){var e=t.callback,r=t.args;switch(r.length){case 0:e();break;case 1:e(r[0]);break;case 2:e(r[0],r[1]);break;case 3:e(r[0],r[1],r[2]);break;default:e.apply(n,r)}}(e)}finally{d(t),l=!1}}}}}("undefined"==typeof self?void 0===t?this:t:self)}).call(e,n(1),n(6))},function(t,e,n){var r=n(40)(n(41),n(42),!1,null,null,null);t.exports=r.exports},function(t,e){t.exports=function(t,e,n,r,i,o){var a,s=t=t||{},u=typeof t.default;"object"!==u&&"function"!==u||(a=t,s=t.default);var c,l="function"==typeof s?s.options:s;if(e&&(l.render=e.render,l.staticRenderFns=e.staticRenderFns,l._compiled=!0),n&&(l.functional=!0),i&&(l._scopeId=i),o?(c=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),r&&r.call(this,t),t&&t._registeredComponents&&t._registeredComponents.add(o)},l._ssrRegister=c):r&&(c=r),c){var f=l.functional,p=f?l.render:l.beforeCreate;f?(l._injectStyles=c,l.render=function(t,e){return c.call(e),p(t,e)}):l.beforeCreate=p?[].concat(p,c):[c]}return{esModule:a,exports:s,options:l}}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default={mounted:function(){console.log("Component mounted.")}}},function(t,e){t.exports={render:function(){this.$createElement;this._self._c;return this._m(0)},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"container"},[e("div",{staticClass:"row"},[e("div",{staticClass:"col-md-8 col-md-offset-2"},[e("div",{staticClass:"panel panel-default"},[e("div",{staticClass:"panel-heading"},[this._v("Example Component")]),this._v(" "),e("div",{staticClass:"panel-body"},[this._v("\n                    I'm an example component!\n                ")])])])])])}]}},function(t,e){}]);
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/public/web.config b/modules/openapi-generator/src/main/resources/php-laravel/public/web.config
index 624c1760fcb2..d3711d7c5b8e 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/public/web.config
+++ b/modules/openapi-generator/src/main/resources/php-laravel/public/web.config
@@ -1,3 +1,8 @@
+<!--
+    Rewrites requires Microsoft URL Rewrite Module for IIS
+    Download: https://www.microsoft.com/en-us/download/details.aspx?id=47337
+    Debug Help: https://docs.microsoft.com/en-us/iis/extensions/url-rewrite-module/using-failed-request-tracing-to-trace-rewrite-rules
+-->
 <configuration>
   <system.webServer>
     <rewrite>
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/js/app.js b/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/js/app.js
deleted file mode 100644
index 98eca79fdf20..000000000000
--- a/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/js/app.js
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/**
- * First we will load all of this project's JavaScript dependencies which
- * includes Vue and other libraries. It is a great starting point when
- * building robust, powerful web applications using Vue and Laravel.
- */
-
-require('./bootstrap');
-
-window.Vue = require('vue');
-
-/**
- * Next, we will create a fresh Vue application instance and attach it to
- * the page. Then, you may begin adding components to this application
- * or customize the JavaScript scaffolding to fit your unique needs.
- */
-
-Vue.component('example-component', require('./components/ExampleComponent.vue'));
-
-const app = new Vue({
-    el: '#app'
-});
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/js/bootstrap.js b/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/js/bootstrap.js
deleted file mode 100644
index fb0f1eded394..000000000000
--- a/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/js/bootstrap.js
+++ /dev/null
@@ -1,56 +0,0 @@
-
-window._ = require('lodash');
-window.Popper = require('popper.js').default;
-
-/**
- * We'll load jQuery and the Bootstrap jQuery plugin which provides support
- * for JavaScript based Bootstrap features such as modals and tabs. This
- * code may be modified to fit the specific needs of your application.
- */
-
-try {
-    window.$ = window.jQuery = require('jquery');
-
-    require('bootstrap');
-} catch (e) {}
-
-/**
- * We'll load the axios HTTP library which allows us to easily issue requests
- * to our Laravel back-end. This library automatically handles sending the
- * CSRF token as a header based on the value of the "XSRF" token cookie.
- */
-
-window.axios = require('axios');
-
-window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
-
-/**
- * Next we will register the CSRF Token as a common header with Axios so that
- * all outgoing HTTP requests automatically have it attached. This is just
- * a simple convenience so we don't have to attach every token manually.
- */
-
-let token = document.head.querySelector('meta[name="csrf-token"]');
-
-if (token) {
-    window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content;
-} else {
-    console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token');
-}
-
-/**
- * Echo exposes an expressive API for subscribing to channels and listening
- * for events that are broadcast by Laravel. Echo and event broadcasting
- * allows your team to easily build robust real-time web applications.
- */
-
-// import Echo from 'laravel-echo'
-
-// window.Pusher = require('pusher-js');
-
-// window.Echo = new Echo({
-//     broadcaster: 'pusher',
-//     key: process.env.MIX_PUSHER_APP_KEY,
-//     cluster: process.env.MIX_PUSHER_APP_CLUSTER,
-//     encrypted: true
-// });
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/js/components/ExampleComponent.vue b/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/js/components/ExampleComponent.vue
deleted file mode 100644
index 2805329ab7c6..000000000000
--- a/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/js/components/ExampleComponent.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-    <div class="container">
-        <div class="row justify-content-center">
-            <div class="col-md-8">
-                <div class="card card-default">
-                    <div class="card-header">Example Component</div>
-
-                    <div class="card-body">
-                        I'm an example component.
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-    export default {
-        mounted() {
-            console.log('Component mounted.')
-        }
-    }
-</script>
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/sass/_variables.scss b/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/sass/_variables.scss
deleted file mode 100644
index 70ecfdb39d0d..000000000000
--- a/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/sass/_variables.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-
-// Body
-$body-bg: #f5f8fa;
-
-// Typography
-$font-family-sans-serif: "Raleway", sans-serif;
-$font-size-base: 0.9rem;
-$line-height-base: 1.6;
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/sass/app.scss b/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/sass/app.scss
deleted file mode 100644
index 0077cb141b67..000000000000
--- a/modules/openapi-generator/src/main/resources/php-laravel/resources/assets/sass/app.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-
-// Fonts
-@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
-
-// Variables
-@import "variables";
-
-// Bootstrap
-@import '~bootstrap/scss/bootstrap';
-
-.navbar-laravel {
-  background-color: #fff;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
-}
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/resources/js/app.js b/modules/openapi-generator/src/main/resources/php-laravel/resources/js/app.js
new file mode 100644
index 000000000000..40c55f65c256
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/resources/js/app.js
@@ -0,0 +1 @@
+require('./bootstrap');
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/resources/js/bootstrap.js b/modules/openapi-generator/src/main/resources/php-laravel/resources/js/bootstrap.js
new file mode 100644
index 000000000000..6922577695e6
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/resources/js/bootstrap.js
@@ -0,0 +1,28 @@
+window._ = require('lodash');
+
+/**
+ * We'll load the axios HTTP library which allows us to easily issue requests
+ * to our Laravel back-end. This library automatically handles sending the
+ * CSRF token as a header based on the value of the "XSRF" token cookie.
+ */
+
+window.axios = require('axios');
+
+window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
+
+/**
+ * Echo exposes an expressive API for subscribing to channels and listening
+ * for events that are broadcast by Laravel. Echo and event broadcasting
+ * allows your team to easily build robust real-time web applications.
+ */
+
+// import Echo from 'laravel-echo';
+
+// window.Pusher = require('pusher-js');
+
+// window.Echo = new Echo({
+//     broadcaster: 'pusher',
+//     key: process.env.MIX_PUSHER_APP_KEY,
+//     cluster: process.env.MIX_PUSHER_APP_CLUSTER,
+//     forceTLS: true
+// });
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/resources/lang/en/passwords.php b/modules/openapi-generator/src/main/resources/php-laravel/resources/lang/en/passwords.php
index e5544d201665..2345a56b5a69 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/resources/lang/en/passwords.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/resources/lang/en/passwords.php
@@ -13,10 +13,10 @@
     |
     */
 
-    'password' => 'Passwords must be at least six characters and match the confirmation.',
     'reset' => 'Your password has been reset!',
-    'sent' => 'We have e-mailed your password reset link!',
+    'sent' => 'We have emailed your password reset link!',
+    'throttled' => 'Please wait before retrying.',
     'token' => 'This password reset token is invalid.',
-    'user' => "We can't find a user with that e-mail address.",
+    'user' => "We can't find a user with that email address.",
 
 ];
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/resources/lang/en/validation.php b/modules/openapi-generator/src/main/resources/php-laravel/resources/lang/en/validation.php
index 0d47547aa9b8..a65914f9d0f2 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/resources/lang/en/validation.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/resources/lang/en/validation.php
@@ -13,105 +13,110 @@
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
+    'accepted' => 'The :attribute must be accepted.',
+    'active_url' => 'The :attribute is not a valid URL.',
+    'after' => 'The :attribute must be a date after :date.',
+    'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+    'alpha' => 'The :attribute may only contain letters.',
+    'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.',
+    'alpha_num' => 'The :attribute may only contain letters and numbers.',
+    'array' => 'The :attribute must be an array.',
+    'before' => 'The :attribute must be a date before :date.',
+    'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+    'between' => [
         'numeric' => 'The :attribute must be between :min and :max.',
-        'file'    => 'The :attribute must be between :min and :max kilobytes.',
-        'string'  => 'The :attribute must be between :min and :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+        'file' => 'The :attribute must be between :min and :max kilobytes.',
+        'string' => 'The :attribute must be between :min and :max characters.',
+        'array' => 'The :attribute must have between :min and :max items.',
     ],
-    'boolean'              => 'The :attribute field must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute must be a valid email address.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'gt'                   => [
+    'boolean' => 'The :attribute field must be true or false.',
+    'confirmed' => 'The :attribute confirmation does not match.',
+    'date' => 'The :attribute is not a valid date.',
+    'date_equals' => 'The :attribute must be a date equal to :date.',
+    'date_format' => 'The :attribute does not match the format :format.',
+    'different' => 'The :attribute and :other must be different.',
+    'digits' => 'The :attribute must be :digits digits.',
+    'digits_between' => 'The :attribute must be between :min and :max digits.',
+    'dimensions' => 'The :attribute has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'email' => 'The :attribute must be a valid email address.',
+    'ends_with' => 'The :attribute must end with one of the following: :values.',
+    'exists' => 'The selected :attribute is invalid.',
+    'file' => 'The :attribute must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
         'numeric' => 'The :attribute must be greater than :value.',
-        'file'    => 'The :attribute must be greater than :value kilobytes.',
-        'string'  => 'The :attribute must be greater than :value characters.',
-        'array'   => 'The :attribute must have more than :value items.',
+        'file' => 'The :attribute must be greater than :value kilobytes.',
+        'string' => 'The :attribute must be greater than :value characters.',
+        'array' => 'The :attribute must have more than :value items.',
     ],
-    'gte'                  => [
+    'gte' => [
         'numeric' => 'The :attribute must be greater than or equal :value.',
-        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be greater than or equal :value characters.',
-        'array'   => 'The :attribute must have :value items or more.',
+        'file' => 'The :attribute must be greater than or equal :value kilobytes.',
+        'string' => 'The :attribute must be greater than or equal :value characters.',
+        'array' => 'The :attribute must have :value items or more.',
     ],
-    'image'                => 'The :attribute must be an image.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'lt'                   => [
+    'image' => 'The :attribute must be an image.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field does not exist in :other.',
+    'integer' => 'The :attribute must be an integer.',
+    'ip' => 'The :attribute must be a valid IP address.',
+    'ipv4' => 'The :attribute must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute must be a valid IPv6 address.',
+    'json' => 'The :attribute must be a valid JSON string.',
+    'lt' => [
         'numeric' => 'The :attribute must be less than :value.',
-        'file'    => 'The :attribute must be less than :value kilobytes.',
-        'string'  => 'The :attribute must be less than :value characters.',
-        'array'   => 'The :attribute must have less than :value items.',
+        'file' => 'The :attribute must be less than :value kilobytes.',
+        'string' => 'The :attribute must be less than :value characters.',
+        'array' => 'The :attribute must have less than :value items.',
     ],
-    'lte'                  => [
+    'lte' => [
         'numeric' => 'The :attribute must be less than or equal :value.',
-        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be less than or equal :value characters.',
-        'array'   => 'The :attribute must not have more than :value items.',
+        'file' => 'The :attribute must be less than or equal :value kilobytes.',
+        'string' => 'The :attribute must be less than or equal :value characters.',
+        'array' => 'The :attribute must not have more than :value items.',
     ],
-    'max'                  => [
+    'max' => [
         'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+        'file' => 'The :attribute may not be greater than :max kilobytes.',
+        'string' => 'The :attribute may not be greater than :max characters.',
+        'array' => 'The :attribute may not have more than :max items.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
+    'mimes' => 'The :attribute must be a file of type: :values.',
+    'mimetypes' => 'The :attribute must be a file of type: :values.',
+    'min' => [
         'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+        'file' => 'The :attribute must be at least :min kilobytes.',
+        'string' => 'The :attribute must be at least :min characters.',
+        'array' => 'The :attribute must have at least :min items.',
     ],
-    'not_in'               => 'The selected :attribute is invalid.',
-    'not_regex'            => 'The :attribute format is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute format is invalid.',
+    'numeric' => 'The :attribute must be a number.',
+    'password' => 'The password is incorrect.',
+    'present' => 'The :attribute field must be present.',
+    'regex' => 'The :attribute format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
+    'same' => 'The :attribute and :other must match.',
+    'size' => [
         'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+        'file' => 'The :attribute must be :size kilobytes.',
+        'string' => 'The :attribute must be :size characters.',
+        'array' => 'The :attribute must contain :size items.',
     ],
-    'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
+    'starts_with' => 'The :attribute must start with one of the following: :values.',
+    'string' => 'The :attribute must be a string.',
+    'timezone' => 'The :attribute must be a valid zone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'url' => 'The :attribute format is invalid.',
+    'uuid' => 'The :attribute must be a valid UUID.',
 
     /*
     |--------------------------------------------------------------------------
@@ -135,9 +140,9 @@
     | Custom Validation Attributes
     |--------------------------------------------------------------------------
     |
-    | The following language lines are used to swap attribute place-holders
-    | with something more reader friendly such as E-Mail Address instead
-    | of "email". This simply helps us make messages a little cleaner.
+    | The following language lines are used to swap our attribute placeholder
+    | with something more reader friendly such as "E-Mail Address" instead
+    | of "email". This simply helps us make our message more expressive.
     |
     */
 
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/resources/sass/app.scss b/modules/openapi-generator/src/main/resources/php-laravel/resources/sass/app.scss
new file mode 100644
index 000000000000..8337712ea57f
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/resources/sass/app.scss
@@ -0,0 +1 @@
+//
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/resources/views/welcome.blade.php b/modules/openapi-generator/src/main/resources/php-laravel/resources/views/welcome.blade.php
index a246e106a598..3fb48cc02c90 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/resources/views/welcome.blade.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/resources/views/welcome.blade.php
@@ -1,22 +1,21 @@
-<!doctype html>
-<html lang="{{ app()->getLocale() }}">
+<!DOCTYPE html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         <title>Laravel</title>
 
         <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
+        <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet">
 
         <!-- Styles -->
         <style>
             html, body {
                 background-color: #fff;
                 color: #636b6f;
-                font-family: 'Raleway', sans-serif;
-                font-weight: 100;
+                font-family: 'Nunito', sans-serif;
+                font-weight: 200;
                 height: 100vh;
                 margin: 0;
             }
@@ -52,7 +51,7 @@
             .links > a {
                 color: #636b6f;
                 padding: 0 25px;
-                font-size: 12px;
+                font-size: 13px;
                 font-weight: 600;
                 letter-spacing: .1rem;
                 text-decoration: none;
@@ -72,7 +71,10 @@
                         <a href="{{ url('/home') }}">Home</a>
                     @else
                         <a href="{{ route('login') }}">Login</a>
-                        <a href="{{ route('register') }}">Register</a>
+
+                        @if (Route::has('register'))
+                            <a href="{{ route('register') }}">Register</a>
+                        @endif
                     @endauth
                 </div>
             @endif
@@ -83,10 +85,13 @@
                 </div>
 
                 <div class="links">
-                    <a href="https://laravel.com/docs">Documentation</a>
+                    <a href="https://laravel.com/docs">Docs</a>
                     <a href="https://laracasts.com">Laracasts</a>
                     <a href="https://laravel-news.com">News</a>
+                    <a href="https://blog.laravel.com">Blog</a>
+                    <a href="https://nova.laravel.com">Nova</a>
                     <a href="https://forge.laravel.com">Forge</a>
+                    <a href="https://vapor.laravel.com">Vapor</a>
                     <a href="https://github.com/laravel/laravel">GitHub</a>
                 </div>
             </div>
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/routes/api.mustache b/modules/openapi-generator/src/main/resources/php-laravel/routes/api.mustache
index 686bdda97082..2d6005d80afd 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/routes/api.mustache
+++ b/modules/openapi-generator/src/main/resources/php-laravel/routes/api.mustache
@@ -1,6 +1,10 @@
 <?php
 
 {{>licenseInfo}}
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Route;
+
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
@@ -17,3 +21,6 @@ Route::{{httpMethod}}('{{{basePathWithoutHost}}}{{{path}}}', '{{classname}}@{{op
 {{/apis}}
 {{/apiInfo}}
 
+Route::middleware('auth:api')->get('/user', function (Request $request) {
+    return $request->user();
+});
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/routes/channels.mustache b/modules/openapi-generator/src/main/resources/php-laravel/routes/channels.mustache
index d404b938075e..6169fe1eef94 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/routes/channels.mustache
+++ b/modules/openapi-generator/src/main/resources/php-laravel/routes/channels.mustache
@@ -2,6 +2,8 @@
 
 {{>licenseInfo}}
 
+use Illuminate\Support\Facades\Broadcast;
+
 Broadcast::channel('App.User.{id}', function ($user, $id) {
     return (int) $user->id === (int) $id;
 });
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/routes/console.mustache b/modules/openapi-generator/src/main/resources/php-laravel/routes/console.mustache
index 97991b490e29..f710e363ef78 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/routes/console.mustache
+++ b/modules/openapi-generator/src/main/resources/php-laravel/routes/console.mustache
@@ -2,6 +2,9 @@
 
 {{>licenseInfo}}
 
+use Illuminate\Foundation\Inspiring;
+use Illuminate\Support\Facades\Artisan;
+
 Artisan::command('inspire', function () {
     $this->comment(Inspiring::quote());
 })->describe('Display an inspiring quote');
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/routes/web.mustache b/modules/openapi-generator/src/main/resources/php-laravel/routes/web.mustache
index 3214729b376c..7a000a716bf4 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/routes/web.mustache
+++ b/modules/openapi-generator/src/main/resources/php-laravel/routes/web.mustache
@@ -2,4 +2,8 @@
 
 {{>licenseInfo}}
 
-Route::get('/', 'Controller@welcome');
\ No newline at end of file
+use Illuminate\Support\Facades\Route;
+
+Route::get('/', function () {
+    return view('welcome');
+});
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/storage/framework/cache/data/gitignore b/modules/openapi-generator/src/main/resources/php-laravel/storage/framework/cache/data/gitignore
new file mode 100644
index 000000000000..d6b7ef32c847
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/storage/framework/cache/data/gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/styleci.yml b/modules/openapi-generator/src/main/resources/php-laravel/styleci.yml
new file mode 100644
index 000000000000..1db61d96e756
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/styleci.yml
@@ -0,0 +1,13 @@
+php:
+  preset: laravel
+  disabled:
+    - unused_use
+  finder:
+    not-name:
+      - index.php
+      - server.php
+js:
+  finder:
+    not-name:
+      - webpack.mix.js
+css: true
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/tests/Feature/ExampleTest.php b/modules/openapi-generator/src/main/resources/php-laravel/tests/Feature/ExampleTest.php
index f31e495ca33f..cdb5111934c5 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/tests/Feature/ExampleTest.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/tests/Feature/ExampleTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature;
 
-use Tests\TestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class ExampleTest extends TestCase
 {
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/tests/Unit/ExampleTest.php b/modules/openapi-generator/src/main/resources/php-laravel/tests/Unit/ExampleTest.php
index e9fe19c664dd..358cfc8834ab 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/tests/Unit/ExampleTest.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/tests/Unit/ExampleTest.php
@@ -2,8 +2,7 @@
 
 namespace Tests\Unit;
 
-use Tests\TestCase;
-use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\TestCase;
 
 class ExampleTest extends TestCase
 {
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/webpack.mix.js b/modules/openapi-generator/src/main/resources/php-laravel/webpack.mix.js
index 72fdbb16d60b..8a923cbb4baf 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/webpack.mix.js
+++ b/modules/openapi-generator/src/main/resources/php-laravel/webpack.mix.js
@@ -1,4 +1,4 @@
-let mix = require('laravel-mix');
+const mix = require('laravel-mix');
 
 /*
  |--------------------------------------------------------------------------
@@ -11,5 +11,5 @@ let mix = require('laravel-mix');
  |
  */
 
-mix.js('resources/assets/js/app.js', 'public/js')
-   .sass('resources/assets/sass/app.scss', 'public/css');
+mix.js('resources/js/app.js', 'public/js')
+    .sass('resources/sass/app.scss', 'public/css');
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/README.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/README.mustache
index 99317cce997c..6746071f556f 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/README.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/README.mustache
@@ -13,13 +13,13 @@ This server has been generated with [Nyholm PSR-7](https://github.com/Nyholm/psr
 This server has been generated with [Guzzle PSR-7](https://github.com/guzzle/psr7) implementation and [Guzzle HTTP Factory](https://github.com/http-interop/http-factory-guzzle).
 {{/isGuzzlePsr7}}
 {{#isZendDiactoros}}
-This server has been generated with [Zend Diactoros](https://github.com/zendframework/zend-diactoros).
+This server has been generated with [Laminas (Zend) PSR-7 implementation](https://github.com/laminas/laminas-diactoros).
 {{/isZendDiactoros}}
 
 ## Requirements
 
 * Web server with URL rewriting
-* PHP 7.1 or newer
+* PHP 7.2 or newer
 
 This package contains `.htaccess` for Apache configuration.
 If you use another server(Nginx, HHVM, IIS, lighttpd) check out [Web Servers](https://www.slimframework.com/docs/v3/start/web-servers.html) doc.
@@ -46,9 +46,9 @@ $ php -S localhost:8888 -t php-slim-server
 
 ### PHPUnit
 
-This package uses PHPUnit 6 or 7(depends from your PHP version) for unit testing.
+This package uses PHPUnit 8 or 9(depends from your PHP version) for unit testing.
 [Test folder]({{testBasePath}}) contains templates which you can fill with real test assertions.
-How to write tests read at [PHPUnit Manual - Chapter 2. Writing Tests for PHPUnit](https://phpunit.de/manual/6.5/en/writing-tests-for-phpunit.html).
+How to write tests read at [2. Writing Tests for PHPUnit - PHPUnit 8.5 Manual](https://phpunit.readthedocs.io/en/8.5/writing-tests-for-phpunit.html).
 
 #### Run
 
@@ -57,14 +57,12 @@ Command | Target
 `$ composer test` | All tests
 `$ composer test-apis` | Apis tests
 `$ composer test-models` | Models tests
-`$ composer test-mock` | Mock feature tests
-`$ composer test-utils` | Utils tests
 
 #### Config
 
 Package contains fully functional config `./phpunit.xml.dist` file. Create `./phpunit.xml` in root folder to override it.
 
-Quote from [3. The Command-Line Test Runner — PHPUnit 7.4 Manual](https://phpunit.readthedocs.io/en/7.4/textui.html#command-line-options):
+Quote from [3. The Command-Line Test Runner — PHPUnit 8.5 Manual](https://phpunit.readthedocs.io/en/8.5/textui.html#command-line-options):
 
 > If phpunit.xml or phpunit.xml.dist (in that order) exist in the current working directory and --configuration is not used, the configuration will be automatically read from that file.
 
@@ -112,7 +110,13 @@ Switch on option in `./index.php`:
 +++ $app->addErrorMiddleware(true, true, true);
 ```
 
-## [Mock Server Documentation]({{docsBasePath}}/MockServer.md)
+## Mock Server
+For a quick start uncomment [mocker middleware config](index.php#L62-L89).
+
+Used packages:
+* [Openapi Data Mocker](https://github.com/ybelenko/openapi-data-mocker) - first implementation of OAS3 fake data generator.
+* [Openapi Data Mocker Server Middleware](https://github.com/ybelenko/openapi-data-mocker-server-middleware) - PSR-15 HTTP server middleware.
+* [Openapi Data Mocker Interfaces](https://github.com/ybelenko/openapi-data-mocker-interfaces) - package with mocking interfaces.
 
 {{#generateApiDocs}}
 ## API Endpoints
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/SlimRouter.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/SlimRouter.mustache
index d67b154d06d8..10b458d4fd0f 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/SlimRouter.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/SlimRouter.mustache
@@ -1,48 +1,37 @@
 <?php
 
-/**
- * SlimRouter
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{invokerPackage}};
 
 use Slim\Factory\AppFactory;
 use Slim\Interfaces\RouteInterface;
+use Slim\Exception\HttpNotImplementedException;
 use Psr\Container\ContainerInterface;
 use InvalidArgumentException;
 use Dyorg\TokenAuthentication;
 use Dyorg\TokenAuthentication\TokenSearch;
 use Psr\Http\Message\ServerRequestInterface;
 use {{invokerPackage}}\Middleware\JsonBodyParserMiddleware;
-use {{mockPackage}}\OpenApiDataMocker;
-use {{mockPackage}}\OpenApiDataMockerMiddleware;
+use OpenAPIServer\Mock\OpenApiDataMocker;
+use OpenAPIServer\Mock\OpenApiDataMockerRouteMiddleware;
+{{#isSlimPsr7}}
+use Slim\Psr7\Factory\ResponseFactory;
+{{/isSlimPsr7}}
+{{#isNyholmPsr7}}
+use Nyholm\Psr7\Factory\Psr17Factory
+{{/isNyholmPsr7}}
+{{#isGuzzlePsr7}}
+use GuzzleHttp\Psr7\HttpFactory;
+{{/isGuzzlePsr7}}
+{{#isZendDiactoros}}
+use Zend\Diactoros\ResponseFactory;
+{{/isZendDiactoros}}
 use Exception;
 
 /**
@@ -74,8 +63,6 @@ class SlimRouter
             'responses' => [
             {{#responses}}
                 '{{#isDefault}}default{{/isDefault}}{{^isDefault}}{{code}}{{/isDefault}}' => [
-                    'code' => {{code}},
-                    'message' => '{{message}}',
                     'jsonSchema' => '{{{jsonSchema}}}',
                 ],
             {{/responses}}
@@ -143,7 +130,8 @@ class SlimRouter
      *
      * @param ContainerInterface|array $settings Either a ContainerInterface or an associative array of app settings
      *
-     * @throws Exception When implementation class doesn't exists
+     * @throws HttpNotImplementedException When implementation class doesn't exists
+     * @throws Exception when not supported authorization schema type provided
      */
     public function __construct($settings = [])
     {
@@ -160,15 +148,15 @@ class SlimRouter
         $authPackage = '{{authPackage}}';
         $basicAuthenticator = function (ServerRequestInterface &$request, TokenSearch $tokenSearch) use ($authPackage) {
             $message = "How about extending {{abstractNamePrefix}}Authenticator{{abstractNameSuffix}} class by {$authPackage}\BasicAuthenticator?";
-            throw new Exception($message);
+            throw new HttpNotImplementedException($request, $message);
         };
         $apiKeyAuthenticator = function (ServerRequestInterface &$request, TokenSearch $tokenSearch) use ($authPackage) {
             $message = "How about extending {{abstractNamePrefix}}Authenticator{{abstractNameSuffix}} class by {$authPackage}\ApiKeyAuthenticator?";
-            throw new Exception($message);
+            throw new HttpNotImplementedException($request, $message);
         };
         $oAuthAuthenticator = function (ServerRequestInterface &$request, TokenSearch $tokenSearch) use ($authPackage) {
             $message = "How about extending {{abstractNamePrefix}}Authenticator{{abstractNameSuffix}} class by {$authPackage}\OAuthAuthenticator?";
-            throw new Exception($message);
+            throw new HttpNotImplementedException($request, $message);
         };
         {{/hasAuthMethods}}
 
@@ -177,15 +165,25 @@ class SlimRouter
         // mocker options
         $mockerOptions = $this->getSetting($settings, 'mockerOptions', null);
         $dataMocker = $mockerOptions['dataMocker'] ?? new OpenApiDataMocker();
-        $getMockResponseCallback = $mockerOptions['getMockResponseCallback'] ?? null;
+        {{#isSlimPsr7}}
+        $responseFactory = new ResponseFactory();
+        {{/isSlimPsr7}}
+        {{#isNyholmPsr7}}
+        $responseFactory = new Psr17Factory();
+        {{/isNyholmPsr7}}
+        {{#isGuzzlePsr7}}
+        $responseFactory = new HttpFactory();
+        {{/isGuzzlePsr7}}
+        {{#isZendDiactoros}}
+        $responseFactory = new ResponseFactory();
+        {{/isZendDiactoros}}
+        $getMockStatusCodeCallback = $mockerOptions['getMockStatusCodeCallback'] ?? null;
         $mockAfterCallback = $mockerOptions['afterCallback'] ?? null;
 
         foreach ($this->operations as $operation) {
             $callback = function ($request, $response, $arguments) use ($operation) {
                 $message = "How about extending {$operation['classname']} by {$operation['apiPackage']}\\{$operation['userClassname']} class implementing {$operation['operationId']} as a {$operation['httpMethod']} method?";
-                throw new Exception($message);
-                $response->getBody()->write($message);
-                return $response->withStatus(501);
+                throw new HttpNotImplementedException($request, $message);
             };
             $middlewares = [new JsonBodyParserMiddleware()];
 
@@ -247,8 +245,11 @@ class SlimRouter
             }
             {{/hasAuthMethods}}
 
-            if (is_callable($getMockResponseCallback)) {
-                $middlewares[] = new OpenApiDataMockerMiddleware($dataMocker, $operation['responses'], $getMockResponseCallback, $mockAfterCallback);
+            if (is_callable($getMockStatusCodeCallback)) {
+                $mockSchemaResponses = array_map(function ($item) {
+                    return json_decode($item['jsonSchema'], true);
+                }, $operation['responses']);
+                $middlewares[] = new OpenApiDataMockerRouteMiddleware($dataMocker, $mockSchemaResponses, $responseFactory, $getMockStatusCodeCallback, $mockAfterCallback);
             }
 
             $this->addRoute(
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/abstract_authenticator.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/abstract_authenticator.mustache
index 40e9aee27802..82fd8f648eac 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/abstract_authenticator.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/abstract_authenticator.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * {{abstractNamePrefix}}Authenticator{{abstractNameSuffix}}
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{authPackage}};
 
 use Psr\Container\ContainerInterface;
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache
index 1148da4ec0e9..f2a4a686f53a 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/api.mustache
@@ -1,31 +1,6 @@
 <?php
 
-/**
- * {{classname}}
- *
- * PHP version 7.1
- *
- * @package {{apiPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- {{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
@@ -37,7 +12,7 @@ namespace {{apiPackage}};
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Exception;
+use Slim\Exception\HttpNotImplementedException;
 
 /**
  * {{classname}} Class Doc Comment
@@ -84,7 +59,7 @@ abstract class {{classname}}
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function {{operationId}}(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
@@ -125,10 +100,7 @@ abstract class {{classname}}
         $body = $request->getParsedBody();
         {{/hasBodyParam}}
         $message = "How about implementing {{nickname}} as a {{httpMethod}} method in {{apiPackage}}\{{userClassname}} class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
     {{/operation}}
     {{/operations}}
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache
index d25f0d08ea87..fb17fbe2f67e 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache
@@ -1,37 +1,12 @@
 <?php
 
-{{#operations}}/**
- * {{userClassname}}Test
- *
- * PHP version 7.1
- *
- * @package {{apiPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- {{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Please update the test case below to test the endpoint.
- */
+ */{{#operations}}
 namespace {{apiPackage}};
 
 use PHPUnit\Framework\TestCase;
@@ -52,28 +27,28 @@ class {{userClassname}}Test extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
     {{#operation}}
@@ -87,6 +62,9 @@ class {{userClassname}}Test extends TestCase
      */
     public function test{{operationIdCamelCase}}()
     {
+        $this->markTestIncomplete(
+            'Test of "{{operationId}}" method has not been implemented yet.'
+        );
     }
     {{/operation}}
 }
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/base_model.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/base_model.mustache
new file mode 100644
index 000000000000..a40df85841c9
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/base_model.mustache
@@ -0,0 +1,319 @@
+<?php
+
+{{>licenseInfo}}
+
+/**
+ * NOTE: This class is auto generated by the openapi generator program.
+ * https://github.com/openapitools/openapi-generator
+ * Do not edit the class manually.
+ */
+
+declare(strict_types=1);
+
+namespace {{invokerPackage}};
+
+use OpenAPIServer\Mock\OpenApiModelInterface;
+use OpenAPIServer\Mock\OpenApiDataMockerInterface as IMocker;
+use InvalidArgumentException;
+use StdClass;
+
+/**
+ * BaseModel.
+ */
+class BaseModel implements OpenApiModelInterface
+{
+    // phpcs:disable Generic.Commenting.DocComment
+
+    /**
+     * @var string Constant with OAS schema of current class.
+     * Should be overwritten by inherited class.
+     */
+    protected const MODEL_SCHEMA =
+    <<<'SCHEMA'
+    {
+        "type" : "object",
+        "properties": {}
+    }
+SCHEMA;
+
+    /** @var string[] Valid OAS data types */
+    protected const VALID_OAS_DATA_TYPES = [
+        IMocker::DATA_TYPE_INTEGER,
+        IMocker::DATA_TYPE_NUMBER,
+        IMocker::DATA_TYPE_STRING,
+        IMocker::DATA_TYPE_BOOLEAN,
+        IMocker::DATA_TYPE_ARRAY,
+        IMocker::DATA_TYPE_OBJECT,
+    ];
+
+    /**
+     * @var string Models namespace.
+     * Can be required for data deserialization when model contains referenced schemas.
+     */
+    protected const MODELS_NAMESPACE = '\{{modelPackage}}';
+
+    /**
+     * @var mixed Data container.
+     * PHP has restrictions on variable names, while OAS is much more permissive.
+     * This container helps to store unusual properties like '123_prop' without renaming.
+     */
+    protected $dataContainer;
+    // phpcs:enable
+
+    /**
+     * Model constructor.
+     */
+    public function __construct()
+    {
+        $schema = static::getOpenApiSchema();
+        $modelType = (array_key_exists('type', $schema)) ? $schema['type'] : null;
+        $this->validateModelType($modelType, true);
+
+        // set initial data
+        switch ($modelType) {
+            case IMocker::DATA_TYPE_OBJECT:
+            case IMocker::DATA_TYPE_ARRAY:
+                $this->dataContainer = [];
+                break;
+            case IMocker::DATA_TYPE_INTEGER:
+            case IMocker::DATA_TYPE_NUMBER:
+            case IMocker::DATA_TYPE_STRING:
+            case IMocker::DATA_TYPE_BOOLEAN:
+            default:
+                // scalar type
+                $this->dataContainer = null;
+        }
+    }
+
+    /**
+     * Gets OAS 3.0 schema mapped to current class.
+     *
+     * @return array
+     */
+    public static function getOpenApiSchema(): array
+    {
+        return json_decode(static::MODEL_SCHEMA, true);
+    }
+
+    /**
+     * Creates new instance from provided data.
+     *
+     * @param mixed $data Data with values for new instance.
+     *
+     * @return OpenApiModelInterface
+     */
+    public static function createFromData($data): OpenApiModelInterface
+    {
+        $instance = new static();
+        $instance->setData($data);
+        return $instance;
+    }
+
+    /**
+     * Sets instance data.
+     *
+     * @param mixed $data Data with values for new instance.
+     *
+     * @throws \InvalidArgumentException When value for array type is invalid.
+     *
+     * @return void
+     */
+    public function setData($data): void
+    {
+        $schema = (array) static::getOpenApiSchema();
+        $modelType = (array_key_exists('type', $schema)) ? $schema['type'] : null;
+        switch ($modelType) {
+            case IMocker::DATA_TYPE_ARRAY:
+                // data for array OAS type should be straight indexed array
+                if (is_array($data)) {
+                    $arr = [];
+                    for ($i = 0; $i < count($data); $i++) {
+                        if (isset($data[$i])) {
+                            $arr[$i] = $data[$i];
+                        }
+                    }
+
+                    if (count($arr) === count($data)) {
+                        $this->dataContainer = $arr;
+                        return;
+                    }
+                }
+
+                throw new InvalidArgumentException(
+                    sprintf('Invalid data for %s model because it accepts straight indexed arrays only', static::class)
+                );
+                break;
+            case IMocker::DATA_TYPE_OBJECT:
+                foreach ($data as $key => $value) {
+                    // this action handles __set method
+                    $this->{$key} = $value;
+                }
+                break;
+            case IMocker::DATA_TYPE_INTEGER:
+            case IMocker::DATA_TYPE_NUMBER:
+            case IMocker::DATA_TYPE_STRING:
+            case IMocker::DATA_TYPE_BOOLEAN:
+            default:
+                $this->dataContainer = $data;
+                break;
+        }
+    }
+
+    /**
+     * Returns instance data.
+     *
+     * @return mixed
+     */
+    public function getData()
+    {
+        $data = null;
+        $schema = (array) static::getOpenApiSchema();
+        $modelType = (array_key_exists('type', $schema)) ? $schema['type'] : null;
+        switch ($modelType) {
+            case IMocker::DATA_TYPE_OBJECT:
+                // need to convert data container to object
+                $data = new StdClass();
+                $definedProps = (array_key_exists('properties', $schema)) ? $schema['properties'] : null;
+                if (is_array($definedProps) || is_object($definedProps)) {
+                    foreach ($definedProps as $propName => $propSchema) {
+                        if (array_key_exists($propName, $this->dataContainer)) {
+                            $data->{$propName} = $this->dataContainer[$propName];
+                        } elseif (array_key_exists('required', $schema) && in_array($propName, $schema['required'])) {
+                            // property is required but not set
+                            $data->{$propName} = null;
+                        }
+                    }
+                }
+                break;
+            case IMocker::DATA_TYPE_INTEGER:
+            case IMocker::DATA_TYPE_NUMBER:
+            case IMocker::DATA_TYPE_STRING:
+            case IMocker::DATA_TYPE_BOOLEAN:
+            case IMocker::DATA_TYPE_ARRAY:
+            default:
+                $data = $this->dataContainer;
+        }
+        return $data;
+    }
+
+    /**
+     * Writes data to inaccessible (protected or private) or non-existing properties.
+     * Ref @link https://www.php.net/manual/en/language.oop5.overloading.php#object.set
+     *
+     * @param string $param Property name.
+     * @param mixed  $value Property value.
+     *
+     * @throws \InvalidArgumentException When property doesn't exist in related OAS schema.
+     *
+     * @return void
+     */
+    public function __set(string $param, $value): void
+    {
+        $schema = (array) static::getOpenApiSchema();
+        $modelType = (array_key_exists('type', $schema)) ? $schema['type'] : null;
+        switch ($modelType) {
+            case IMocker::DATA_TYPE_OBJECT:
+                $definedProps = (array_key_exists('properties', $schema)) ? (array) $schema['properties'] : null;
+                if (is_array($definedProps) && !in_array($param, array_keys($definedProps))) {
+                    throw new InvalidArgumentException(
+                        sprintf('Cannot set %s property of %s model because it doesn\'t exist in related OAS schema', $param, static::class)
+                    );
+                }
+                $this->dataContainer[$param] = $value;
+                break;
+            case IMocker::DATA_TYPE_INTEGER:
+            case IMocker::DATA_TYPE_NUMBER:
+            case IMocker::DATA_TYPE_STRING:
+            case IMocker::DATA_TYPE_BOOLEAN:
+            case IMocker::DATA_TYPE_ARRAY:
+            default:
+                // scalar type and array cannot use property assignation
+                throw new InvalidArgumentException(
+                    sprintf('Cannot set %s property of %s model because it\'s %s type. Use setData method instead', $param, static::class, $modelType)
+                );
+        }
+    }
+
+    /**
+     * Reads data from inaccessible (protected or private) or non-existing properties.
+     * Ref @link https://www.php.net/manual/en/language.oop5.overloading.php#object.get
+     *
+     * @param string $param Property name.
+     *
+     * @throws \InvalidArgumentException When property doesn't exist in related OAS schema.
+     *
+     * @return mixed Property value
+     */
+    public function __get(string $param)
+    {
+        $schema = (array) static::getOpenApiSchema();
+        $modelType = (array_key_exists('type', $schema)) ? $schema['type'] : null;
+        $definedProps = (array_key_exists('properties', $schema)) ? (array) $schema['properties'] : null;
+        if (!in_array($modelType, [null, IMocker::DATA_TYPE_OBJECT])) {
+            // scalar type
+            throw new InvalidArgumentException(
+                sprintf('Cannot get %s property of %s model because getter is for object OAS type only', $param, static::class)
+            );
+        }
+
+        if (
+            is_array($definedProps)
+            && in_array($param, array_keys($definedProps))
+        ) {
+            return $this->dataContainer[$param];
+        } elseif ($definedProps === null) {
+            // props are undefined
+            return (isset($this->dataContainer[$param])) ? $this->dataContainer[$param] : null;
+        }
+
+        throw new InvalidArgumentException(
+            sprintf('Cannot get %s property of %s model because it doesn\'t exist in related OAS schema', $param, static::class)
+        );
+    }
+
+    /**
+     * Serializes the object to a value that can be serialized natively by json_encode().
+     * Ref @link https://www.php.net/manual/en/jsonserializable.jsonserialize.php
+     *
+     * @return mixed Returns data which can be serialized by json_encode(), which is a value of any type other than a resource.
+     */
+    public function jsonSerialize()
+    {
+        return $this->getData();
+    }
+
+    /**
+     * Checks if type is valid OAS data type.
+     *
+     * @param string|null $type           Model type.
+     * @param bool        $throwException Throws InvalidArgumentException when set to true and processed type is invalid.
+     *
+     * @throws \InvalidArgumentException When $throwException set to TRUE.
+     *
+     * @return bool
+     */
+    protected function validateModelType(?string $type = null, bool $throwException = true): bool
+    {
+        $isValid = in_array($type, static::VALID_OAS_DATA_TYPES);
+        if ($type !== null && $isValid === false && $throwException) {
+            throw new InvalidArgumentException(
+                sprintf(
+                    'Invalid OAS schema of %s model, "type" must be one of %s',
+                    static::class,
+                    implode(', ', static::VALID_OAS_DATA_TYPES)
+                )
+            );
+        }
+        return $isValid;
+    }
+
+    /**
+     * Returns models namespace.
+     *
+     * @return string
+     */
+    public static function getModelsNamespace(): string
+    {
+        return static::MODELS_NAMESPACE . stripslashes('\\');
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/base_model_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/base_model_test.mustache
new file mode 100644
index 000000000000..6c182d5403cc
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/base_model_test.mustache
@@ -0,0 +1,586 @@
+<?php
+
+{{>licenseInfo}}
+
+/**
+ * NOTE: This class is auto generated by the openapi generator program.
+ * https://github.com/openapitools/openapi-generator
+ * Do not edit the class manually.
+ */
+
+namespace {{invokerPackage}};
+
+use PHPUnit\Framework\TestCase;
+use {{invokerPackage}}\BaseModel;
+use OpenAPIServer\Mock\OpenApiModelInterface;
+use InvalidArgumentException;
+use StdClass;
+
+/**
+ * BaseModelTest
+ *
+ * phpcs:disable Squiz.Commenting,Generic.Commenting,PEAR.Commenting
+ * @coversDefaultClass \{{invokerPackage}}\BaseModel
+ */
+class BaseModelTest extends TestCase
+{
+
+    /**
+     * @covers ::__construct
+     * @covers ::validateModelType
+     * @dataProvider provideClassesAndDefaultData
+     */
+    public function testConstructorAndDefaultData($className, $expectedJson)
+    {
+        $item = new $className();
+        $this->assertEquals($expectedJson, json_encode($item->getData()));
+    }
+
+    public function provideClassesAndDefaultData()
+    {
+        return [
+            'boolean model' => [BasicBooleanTestClass::class, json_encode(null)],
+            'integer model' => [BasicIntegerTestClass::class, json_encode(null)],
+            'number model' => [BasicNumberTestClass::class, json_encode(null)],
+            'string model' => [BasicStringTestClass::class, json_encode(null)],
+            'array model' => [BasicArrayTestClass::class, json_encode([])],
+            'object model' => [BasicObjectTestClass::class, json_encode(new StdClass())],
+            'missing type model' => [MissingTypeTestClass::class, json_encode(null)],
+        ];
+    }
+
+    /**
+     * @covers ::__construct
+     * @covers ::validateModelType
+     * @dataProvider provideInvalidClasses
+     */
+    public function testConstructorWithInvalidTypes($className)
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $item = new $className();
+    }
+
+    public function provideInvalidClasses()
+    {
+        return [
+            'unknown type model' => [UnknownTypeTestClass::class],
+        ];
+    }
+
+    /**
+     * @covers ::getOpenApiSchema
+     */
+    public function testGetOpenApiSchema()
+    {
+        foreach (
+            [
+                BaseModel::getOpenApiSchema(),
+                CatRefTestClass::getOpenApiSchema(),
+                DogRefTestClass::getOpenApiSchema(),
+                BasicArrayTestClass::getOpenApiSchema(),
+                BasicBooleanTestClass::getOpenApiSchema(),
+                BasicIntegerTestClass::getOpenApiSchema(),
+                BasicNumberTestClass::getOpenApiSchema(),
+                BasicObjectTestClass::getOpenApiSchema(),
+                BasicStringTestClass::getOpenApiSchema(),
+            ] as $schema
+        ) {
+            $this->assertTrue(is_array($schema) || is_object($schema));
+        }
+    }
+
+    /**
+     * @covers ::createFromData
+     * @covers ::__set
+     * @covers ::__get
+     * @dataProvider provideCreateFromDataArguments
+     */
+    public function testCreateFromData($modelClass, $data)
+    {
+        $item = $modelClass::createFromData($data);
+        $this->assertInstanceOf($modelClass, $item);
+        $this->assertInstanceOf(OpenApiModelInterface::class, $item);
+        foreach ($data as $propName => $propValue) {
+            $this->assertSame($propValue, $item->{$propName});
+        }
+    }
+
+    public function provideCreateFromDataArguments()
+    {
+        return [
+            'CatRefTestClass' => [
+                CatRefTestClass::class,
+                [
+                    'className' => 'cheshire',
+                    'color' => 'gray',
+                    'declawed' => true,
+                ],
+            ],
+            'DogRefTestClass' => [
+                DogRefTestClass::class,
+                [
+                    'className' => 'bulldog',
+                    'color' => 'black',
+                    'declawed' => false,
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @covers ::setData
+     * @covers ::getData
+     * @dataProvider provideScalarModels
+     */
+    public function testSetDataScalar($className, array $setDataValues, array $expectedDataValues)
+    {
+        $item = new $className();
+        for ($i = 0; $i < count($setDataValues); $i++) {
+            if ($i > 0) {
+                // value should be previous
+                $this->assertSame($expectedDataValues[$i - 1], $item->getData());
+            } else {
+                // initial value should be null
+                $this->assertNull($item->getData());
+            }
+            $item->setData($setDataValues[$i]);
+            // values should be overwritten
+            $this->assertSame($expectedDataValues[$i], $item->getData());
+        }
+    }
+
+    public function provideScalarModels()
+    {
+        return [
+            'boolean model' => [
+                BasicBooleanTestClass::class,
+                [false, true, false],
+                [false, true, false],
+            ],
+            'integer model' => [
+                BasicIntegerTestClass::class,
+                [-50, 322, 100500, -1000, 0],
+                [-50, 322, 100500, -1000, 0],
+            ],
+            'number model' => [
+                BasicNumberTestClass::class,
+                [-50.324, 322.756, 100500.09, -1000.43, 0],
+                [-50.324, 322.756, 100500.09, -1000.43, 0],
+            ],
+            'string model' => [
+                BasicStringTestClass::class,
+                ['foobar', 'hello world', '100', '-56', 'true', 'null', 'false'],
+                ['foobar', 'hello world', '100', '-56', 'true', 'null', 'false'],
+            ],
+        ];
+    }
+
+    /**
+     * @covers ::setData
+     * @covers ::getData
+     */
+    public function testSetDataOfArray()
+    {
+        $basic = new BasicArrayTestClass();
+        $data = ['foo', 'bar', 'baz'];
+        $basic->setData($data);
+        $this->assertEquals($data, $basic->getData());
+    }
+
+    /**
+     * @covers ::setData
+     * @dataProvider provideInvalidDataForArrayModel
+     */
+    public function testSetDataOfArrayWithInvalidData($className, $data)
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $item = new $className();
+        $item->setData($data);
+    }
+
+    public function provideInvalidDataForArrayModel()
+    {
+        $obj = new StdClass();
+        $obj->foo = 'bar';
+        $obj->baz = 'baf';
+        $arr = [];
+        $arr[5] = 'foo';
+        $arr[6] = 'bar';
+        return [
+            'array with spaced indexes data' => [
+                BasicArrayTestClass::class,
+                $arr,
+            ],
+            'assoc array data' => [
+                BasicArrayTestClass::class,
+                ['foo' => 'bar', 'baz' => 'baf'],
+            ],
+            'object data' => [
+                BasicArrayTestClass::class,
+                $obj,
+            ],
+        ];
+    }
+
+    /**
+     * @covers ::setData
+     * @covers ::getData
+     */
+    public function testSetDataOfObject()
+    {
+        $basic = new BasicObjectTestClass();
+        $data = ['foo' => 'bar'];
+        $basic->setData($data);
+        $this->assertSame('bar', $basic->foo);
+    }
+
+    /**
+     * @covers ::getData
+     */
+    public function testGetDataOfObject()
+    {
+        $catItem = new CatRefTestClass();
+        $catItem->setData([
+            'color' => 'grey',
+            'declawed' => false,
+        ]);
+        $data = $catItem->getData();
+        $this->assertInstanceOf(StdClass::class, $data);
+        $this->assertSame('grey', $data->color);
+        $this->assertSame(false, $data->declawed);
+    }
+
+    /**
+     * @covers ::__set
+     * @covers ::__get
+     */
+    public function testSetter()
+    {
+        $item = new CatRefTestClass();
+        $item->className = 'cheshire';
+        $item->color = 'black';
+        $item->declawed = false;
+        $this->assertSame('cheshire', $item->className);
+        $this->assertSame('black', $item->color);
+        $this->assertSame(false, $item->declawed);
+    }
+
+    /**
+     * @covers ::__set
+     * @dataProvider provideScalarsAndArray
+     */
+    public function testSetterOfScalarAndArray($className)
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $item = new $className();
+        $item->foo = 'bar';
+    }
+
+    public function provideScalarsAndArray()
+    {
+        return [
+            'boolean model' => [BasicBooleanTestClass::class],
+            'integer model' => [BasicIntegerTestClass::class],
+            'number model' => [BasicNumberTestClass::class],
+            'string model' => [BasicStringTestClass::class],
+            'array model' => [BasicArrayTestClass::class],
+        ];
+    }
+
+    /**
+     * @covers ::__set
+     */
+    public function testSetterWithUnknownProp()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(
+            sprintf(
+                'Cannot set unknownProp property of %s model because it doesn\'t exist in related OAS schema',
+                CatRefTestClass::class
+            )
+        );
+        $item = new CatRefTestClass();
+        $item->unknownProp = 'foobar';
+    }
+
+    /**
+     * @covers ::__get
+     */
+    public function testGetterWithUnknownProp()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(
+            sprintf(
+                'Cannot get unknownProp property of %s model because it doesn\'t exist in related OAS schema',
+                CatRefTestClass::class
+            )
+        );
+        $item = new CatRefTestClass();
+        $unknownProp = $item->unknownProp;
+    }
+
+    /**
+     * @covers ::__get
+     * @dataProvider provideScalarsAndArray
+     */
+    public function testGetterOfScalarAndArray($className)
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $item = new $className();
+        $bar = $item->foo;
+    }
+
+    /**
+     * @covers ::__set
+     * @covers ::__get
+     */
+    public function testSetterAndGetterOfBasicObject()
+    {
+        $item = new BasicObjectTestClass();
+        $item->unknown = 'foo';
+        $this->assertEquals('foo', $item->unknown);
+    }
+
+    /**
+     * @covers ::jsonSerialize
+     * @dataProvider provideJsonSerializeArguments
+     */
+    public function testJsonSerialize($className, $data, $expectedJson)
+    {
+        $item = $className::createFromData($data);
+        $this->assertEquals($expectedJson, json_encode($item));
+    }
+
+    public function provideJsonSerializeArguments()
+    {
+        return [
+            'model with all props' => [
+                CatRefTestClass::class,
+                [
+                    'className' => 'cheshire',
+                    'color' => 'black',
+                    'declawed' => false,
+                ],
+                json_encode([
+                    'className' => 'cheshire',
+                    'color' => 'black',
+                    'declawed' => false,
+                ]),
+            ],
+            'model with required props' => [
+                CatRefTestClass::class,
+                [
+                    'className' => 'cheshire',
+                ],
+                json_encode([
+                    'className' => 'cheshire',
+                ]),
+            ],
+            'model with missed required prop' => [
+                CatRefTestClass::class,
+                [
+                    'color' => 'black',
+                ],
+                json_encode([
+                    'className' => null,
+                    'color' => 'black',
+                ]),
+            ],
+            'model with schema serialized as assoc array' => [
+                DogRefTestClass::class,
+                [
+                    'className' => 'bulldog',
+                    'color' => 'gray',
+                    'declawed' => false,
+                ],
+                json_encode([
+                    'className' => 'bulldog',
+                    'color' => 'gray',
+                    'declawed' => false,
+                ]),
+            ],
+            'model of basic array' => [
+                BasicArrayTestClass::class,
+                ['hello', 'world'],
+                json_encode(['hello', 'world']),
+            ],
+            'model of basic boolean' => [
+                BasicBooleanTestClass::class,
+                false,
+                json_encode(false),
+            ],
+            'model of basic integer' => [
+                BasicIntegerTestClass::class,
+                -500,
+                json_encode(-500),
+            ],
+            'model of basic number' => [
+                BasicNumberTestClass::class,
+                -3.1434,
+                json_encode(-3.1434),
+            ],
+            'model of basic object' => [
+                BasicObjectTestClass::class,
+                new \StdClass(),
+                json_encode(new \StdClass()),
+            ],
+            'model of basic string' => [
+                BasicStringTestClass::class,
+                'foobar',
+                json_encode('foobar'),
+            ],
+        ];
+    }
+
+    /**
+     * @covers ::getModelsNamespace
+     * @dataProvider provideTestClasses
+     */
+    public function testGetModelsNamespace($classname)
+    {
+        $this->assertTrue(method_exists($classname, 'getModelsNamespace'));
+        $getModelsNamespace = $classname . '::getModelsNamespace';
+        $namespace = $getModelsNamespace();
+        $this->assertIsString($namespace);
+    }
+
+    public function provideTestClasses()
+    {
+        return [
+            [BasicArrayTestClass::class],
+            [BasicBooleanTestClass::class],
+            [BasicIntegerTestClass::class],
+            [BasicNumberTestClass::class],
+            [BasicObjectTestClass::class],
+            [BasicStringTestClass::class],
+            [CatRefTestClass::class],
+            [DogRefTestClass::class],
+        ];
+    }
+}
+
+// phpcs:disable PSR1.Classes.ClassDeclaration.MultipleClasses
+class BasicArrayTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "array"
+}
+SCHEMA;
+}
+
+class BasicBooleanTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "boolean"
+}
+SCHEMA;
+}
+
+class BasicIntegerTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "integer"
+}
+SCHEMA;
+}
+
+class BasicNumberTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "number"
+}
+SCHEMA;
+}
+
+class BasicObjectTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "object"
+}
+SCHEMA;
+}
+
+class BasicStringTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "string"
+}
+SCHEMA;
+}
+
+class CatRefTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "required" : [ "className" ],
+    "type" : "object",
+    "properties" : {
+        "className" : {
+            "type" : "string"
+        },
+        "color" : {
+            "type" : "string",
+            "default" : "red"
+        },
+        "declawed" : {
+            "type" : "boolean"
+        }
+    },
+    "discriminator" : {
+        "propertyName" : "className"
+    }
+}
+SCHEMA;
+}
+
+class ClassWithoutGetSchemaMethod
+{
+
+}
+
+class DogRefTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "required" : [ "className" ],
+    "type" : "object",
+    "properties" : {
+        "className" : {
+            "type" : "string"
+        },
+        "color" : {
+            "type" : "string",
+            "default" : "black"
+        },
+        "declawed" : {
+            "type" : "boolean"
+        }
+    },
+    "discriminator" : {
+        "propertyName" : "className"
+    }
+}
+SCHEMA;
+}
+
+class MissingTypeTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{}
+SCHEMA;
+}
+
+class UnknownTypeTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "foobar"
+}
+SCHEMA;
+}
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/composer.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/composer.mustache
index 10b4ec4a10cc..78373208494a 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/composer.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/composer.mustache
@@ -8,27 +8,29 @@
     }
   ],
   "require": {
-    "php": "^7.1",
-    "slim/slim": "^4.0",
+    "php": "^7.2",
+    "slim/slim": "^4.5.0",
     "dyorg/slim-token-authentication": "dev-slim4",
+    "ybelenko/openapi-data-mocker": "^1.0",
+    "ybelenko/openapi-data-mocker-server-middleware": "^1.0",
     {{#isSlimPsr7}}
-    "slim/psr7": "^0.4.0"
+    "slim/psr7": "^1.1.0"
     {{/isSlimPsr7}}
     {{#isNyholmPsr7}}
-    "nyholm/psr7": "^1.1.0",
-    "nyholm/psr7-server": "^0.3.0"
+    "nyholm/psr7": "^1.3.0",
+    "nyholm/psr7-server": "^0.4.1"
     {{/isNyholmPsr7}}
     {{#isGuzzlePsr7}}
     "guzzlehttp/psr7": "^1.6.1",
     "http-interop/http-factory-guzzle": "^1.0.0"
     {{/isGuzzlePsr7}}
     {{#isZendDiactoros}}
-    "zendframework/zend-diactoros": "^2.1.3"
+    "laminas/laminas-diactoros": "^2.3.0"
     {{/isZendDiactoros}}
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.0 || ^7.0",
-    "overtrue/phplint": "^1.0",
+    "phpunit/phpunit": "^8.0 || ^9.0",
+    "overtrue/phplint": "^2.0.2",
     "squizlabs/php_codesniffer": "^3.5"
   },
   "autoload": {
@@ -46,8 +48,6 @@
     ],
     "test-apis": "phpunit --testsuite Apis",
     "test-models": "phpunit --testsuite Models",
-    "test-mock": "phpunit --testsuite Mock",
-    "test-utils": "phpunit --testsuite Utils",
     "phpcs": "phpcs",
     "phplint": "phplint ./ --exclude=vendor"
   }
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/gitignore b/modules/openapi-generator/src/main/resources/php-slim4-server/gitignore
index 3203d7d7814e..2424ad0dc928 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/gitignore
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/gitignore
@@ -12,6 +12,7 @@ composer.lock
 
 # Do not commit local PHPUnit config
 /phpunit.xml
+/.phpunit.result.cache
 
 # Do not commit local PHP_CodeSniffer config
 /phpcs.xml
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/index.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/index.mustache
index cb98beb8f30c..1175d76e7bfa 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/index.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/index.mustache
@@ -1,22 +1,18 @@
 <?php
 
-{{#apiInfo}}/**
- * {{appName}}
- *
- * PHP version 7.1
- *
- * @package {{apiPackage}}
- * @author  OpenAPI Generator team
- * @version {{appVersion}}
- * @link    https://github.com/openapitools/openapi-generator
- */
+{{>licenseInfo}}
+
+/**
+ * NOTE: This class is auto generated by the openapi generator program.
+ * https://github.com/openapitools/openapi-generator
+ */{{#apiInfo}}
 
 require_once __DIR__ . '/vendor/autoload.php';
 
 use {{invokerPackage}}\SlimRouter;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use {{mockPackage}}\OpenApiDataMocker;
+use OpenAPIServer\Mock\OpenApiDataMocker;
 {{/apiInfo}}
 
 $config = [];
@@ -57,21 +53,28 @@ $config['tokenAuthenticationOptions'] = [
 /**
  * Mocker Middleware options.
  */
+$mocker = new OpenApiDataMocker();
+$mocker->setModelsNamespace('{{modelPackage}}\\');
 $config['mockerOptions'] = [
-    // 'dataMocker' => new OpenApiDataMocker(),
+    // 'dataMocker' => $mocker,
 
-    // 'getMockResponseCallback' => function (ServerRequestInterface $request, array $responses) {
+    // 'getMockStatusCodeCallback' => function (ServerRequestInterface $request, $responses) {
     //     // check if client clearly asks for mocked response
+    //     $pingHeader = 'X-{{invokerPackage}}-Mock';
+    //     $pingHeaderCode = 'X-{{invokerPackage}}-Mock-Code';
     //     if (
-    //         $request->hasHeader('X-{{invokerPackage}}-Mock')
-    //         && $request->getHeader('X-{{invokerPackage}}-Mock')[0] === 'ping'
+    //         $request->hasHeader($pingHeader)
+    //         && $request->getHeader($pingHeader)[0] === 'ping'
     //     ) {
-    //         if (array_key_exists('default', $responses)) {
-    //             return $responses['default'];
+    //         $responses = (array) $responses;
+    //         $requestedResponseCode = ($request->hasHeader($pingHeaderCode)) ? $request->getHeader($pingHeaderCode)[0] : 'default';
+    //         if (array_key_exists($requestedResponseCode, $responses)) {
+    //             return $requestedResponseCode;
     //         }
 
-    //         // return first response
-    //         return $responses[array_key_first($responses)];
+    //         // return first response key
+    //         reset($responses);
+    //         return key($responses);
     //     }
 
     //     return false;
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/json_body_parser_middleware.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/json_body_parser_middleware.mustache
index 55ad7b637fd0..509ec7247c91 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/json_body_parser_middleware.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/json_body_parser_middleware.mustache
@@ -1,36 +1,12 @@
 <?php
 
-/**
- * JsonBodyParserMiddleware
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Do not edit the class manually.
- */
+ */{{#apiInfo}}
 namespace {{invokerPackage}}\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/licenseInfo.mustache
new file mode 100644
index 000000000000..cf26381b5f5b
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/licenseInfo.mustache
@@ -0,0 +1,23 @@
+/**
+ {{#appName}}
+ * {{{appName}}}
+ {{/appName}}
+ * PHP version 7.2
+ *
+ * @package {{invokerPackage}}
+ * @author  OpenAPI Generator team
+ * @link    https://github.com/openapitools/openapi-generator
+ */
+
+/**
+ {{#appDescription}}
+ * {{{appDescription}}}
+ {{/appDescription}}
+ {{#version}}
+ * The version of the OpenAPI document: {{{version}}}
+ {{/version}}
+ {{#infoEmail}}
+ * Contact: {{{infoEmail}}}
+ {{/infoEmail}}
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/mock_server.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/mock_server.mustache
deleted file mode 100644
index 15d8c2dcadff..000000000000
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/mock_server.mustache
+++ /dev/null
@@ -1,135 +0,0 @@
-# {{packageName}} - PHP Slim 4 Server library for {{appName}}
-
-## Mock Server Documentation
-
-### Mocker Options
-To enable mock server uncomment these lines in `index.php` config file:
-
-```php
-/**
- * Mocker Middleware options.
- */
-$config['mockerOptions'] = [
-    'dataMocker' => new OpenApiDataMocker(),
-
-    'getMockResponseCallback' => function (ServerRequestInterface $request, array $responses) {
-        // check if client clearly asks for mocked response
-        if (
-            $request->hasHeader('X-{{invokerPackage}}-Mock')
-            && $request->getHeader('X-{{invokerPackage}}-Mock')[0] === 'ping'
-        ) {
-            if (array_key_exists('default', $responses)) {
-                return $responses['default'];
-            }
-
-            // return first response
-            return $responses[array_key_first($responses)];
-        }
-
-        return false;
-    },
-
-    'afterCallback' => function ($request, $response) {
-        // mark mocked response to distinguish real and fake responses
-        return $response->withHeader('X-{{invokerPackage}}-Mock', 'pong');
-    },
-];
-```
-
-* `dataMocker` is mocker class instance. To create custom data mocker extend `{{mockPackage}}\{{interfaceNamePrefix}}OpenApiDataMocker{{interfaceNameSuffix}}`.
-* `getMockResponseCallback` is callback before mock data generation. Above example shows how to enable mock feature for only requests with `{{X-{{invokerPackage}}}}-mock: ping` HTTP header. Adjust requests filtering to fit your project requirements. This function must return single response schema from `$responses` array parameter. **Mock feature is disabled when callback returns anything beside array.**
-* `afterCallback` is callback executed after mock data generation. Most obvious use case is append specific HTTP headers to distinguish real and fake responses. **This function must always return response instance.**
-
-### Supported features
-
-All data types supported except specific string formats: `email`, `uuid`, `password` which are poorly implemented.
-
-#### Data Types Support
-
-| Data Type | Data Format |      Supported     |
-|:---------:|:-----------:|:------------------:|
-| `integer` | `int32`     | :white_check_mark: |
-| `integer` | `int64`     | :white_check_mark: |
-| `number`  | `float`     | :white_check_mark: |
-| `number`  | `double`    |                    |
-| `string`  | `byte`      | :white_check_mark: |
-| `string`  | `binary`    | :white_check_mark: |
-| `boolean` |             | :white_check_mark: |
-| `string`  | `date`      | :white_check_mark: |
-| `string`  | `date-time` | :white_check_mark: |
-| `string`  | `password`  | :white_check_mark: |
-| `string`  | `email`     | :white_check_mark: |
-| `string`  | `uuid`      | :white_check_mark: |
-
-#### Data Options Support
-
-| Data Type   |         Option         |      Supported     |
-|:-----------:|:----------------------:|:------------------:|
-| `string`    | `minLength`            | :white_check_mark: |
-| `string`    | `maxLength`            | :white_check_mark: |
-| `string`    | `enum`                 | :white_check_mark: |
-| `string`    | `pattern`              |                    |
-| `integer`   | `minimum`              | :white_check_mark: |
-| `integer`   | `maximum`              | :white_check_mark: |
-| `integer`   | `exclusiveMinimum`     | :white_check_mark: |
-| `integer`   | `exclusiveMaximum`     | :white_check_mark: |
-| `number`    | `minimum`              | :white_check_mark: |
-| `number`    | `maximum`              | :white_check_mark: |
-| `number`    | `exclusiveMinimum`     | :white_check_mark: |
-| `number`    | `exclusiveMaximum`     | :white_check_mark: |
-| `array`     | `items`                | :white_check_mark: |
-| `array`     | `additionalItems`      |                    |
-| `array`     | `minItems`             | :white_check_mark: |
-| `array`     | `maxItems`             | :white_check_mark: |
-| `array`     | `uniqueItems`          |                    |
-| `object`    | `properties`           | :white_check_mark: |
-| `object`    | `maxProperties`        |                    |
-| `object`    | `minProperties`        |                    |
-| `object`    | `patternProperties`    |                    |
-| `object`    | `additionalProperties` |                    |
-| `object`    | `required`             |                    |
-| `*`         | `$ref`                 | :white_check_mark: |
-| `*`         | `allOf`                |                    |
-| `*`         | `anyOf`                |                    |
-| `*`         | `oneOf`                |                    |
-| `*`         | `not`                  |                    |
-
-### Known Limitations
-
-Avoid circular refs in your schema. Schema below can cause infinite loop and `Out of Memory` PHP error:
-```yml
-# ModelA has reference to ModelB while ModelB has reference to ModelA.
-# Mock server will produce huge nested JSON example and ended with `Out of Memory` error.
-definitions:
-  ModelA:
-    type: object
-    properties:
-      model_b:
-        $ref: '#/definitions/ModelB'
-  ModelB:
-    type: array
-    items:
-      $ref: '#/definitions/ModelA'
-```
-
-Don't ref scalar types, because generator will not produce models which mock server can find. So schema below will cause error:
-```yml
-# generated build contains only `OuterComposite` model class which referenced to not existed `OuterNumber`, `OuterString`, `OuterBoolean` classes
-# mock server cannot mock `OuterComposite` model and throws exception
-definitions:
-  OuterComposite:
-    type: object
-    properties:
-      my_number:
-        $ref: '#/definitions/OuterNumber'
-      my_string:
-        $ref: '#/definitions/OuterString'
-      my_boolean:
-        $ref: '#/definitions/OuterBoolean'
-  OuterNumber:
-    type: number
-  OuterString:
-    type: string
-  OuterBoolean:
-    type: boolean
-```
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/model.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/model.mustache
index 67112c852270..53f70127a776 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/model.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/model.mustache
@@ -1,22 +1,14 @@
 <?php
 
-{{#models}}{{#model}}/**
- * {{classname}}
- *
- * PHP version 7.1
- *
- * @package {{modelPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
- */
+ */{{#models}}{{#model}}
 namespace {{modelPackage}};
 
-use {{interfacesPackage}}\{{interfaceNamePrefix}}Model{{interfaceNameSuffix}};
+use {{invokerPackage}}\BaseModel;
 
 /**
  * {{classname}}
@@ -25,27 +17,20 @@ use {{interfacesPackage}}\{{interfaceNamePrefix}}Model{{interfaceNameSuffix}};
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
-class {{classname}} implements {{interfaceNamePrefix}}Model{{interfaceNameSuffix}}
+class {{classname}} extends BaseModel
 {
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{{{modelJson}}}
-SCHEMA;
-    {{#vars}}
-
-    /** @var {{dataType}} ${{name}} {{#description}}{{description}}{{/description}}*/
-    private ${{name}};
-    {{/vars}}
+    /**
+     * @var string Models namespace.
+     * Can be required for data deserialization when model contains referenced schemas.
+     */
+    protected const MODELS_NAMESPACE = '\{{modelPackage}}';
 
     /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
+     * @var string Constant with OAS schema of current class.
+     * Should be overwritten by inherited class.
      */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{{{modelJson}}}
+SCHEMA;
 }
 {{/model}}{{/models}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/model_interface.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/model_interface.mustache
deleted file mode 100644
index eb440ee5598b..000000000000
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/model_interface.mustache
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * {{interfaceNamePrefix}}Model{{interfaceNameSuffix}}
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace {{interfacesPackage}};
-
-/**
- * {{interfaceNamePrefix}}Model{{interfaceNameSuffix}} Class Doc Comment
- *
- * @package {{interfacesPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-interface {{interfaceNamePrefix}}Model{{interfaceNameSuffix}}
-{
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false);
-}
-{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache
index 39ced58f6a42..218a941c3460 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache
@@ -1,39 +1,13 @@
 <?php
 
-{{#models}}
-{{#model}}
-/**
- * {{classname}}Test
- *
- * PHP version 7.1
- *
- * @package {{modelPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- {{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
+{{>licenseInfo}}
 
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  * Please update the test case below to test the model.
- */
+ */{{#models}}
+{{#model}}
 namespace {{modelPackage}};
 
 use PHPUnit\Framework\TestCase;
@@ -54,28 +28,28 @@ class {{classname}}Test extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -85,6 +59,15 @@ class {{classname}}Test extends TestCase
     public function test{{classname}}()
     {
         $test{{classname}} = new {{classname}}();
+        $namespacedClassname = {{classname}}::getModelsNamespace() . '\\{{classname}}';
+        $this->assertSame('\\' . {{classname}}::class, $namespacedClassname);
+        $this->assertTrue(
+            class_exists($namespacedClassname),
+            sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
+        );
+        $this->markTestIncomplete(
+            'Test of "{{classname}}" model has not been implemented yet.'
+        );
     }
 {{#vars}}
 
@@ -93,6 +76,9 @@ class {{classname}}Test extends TestCase
      */
     public function testProperty{{nameInCamelCase}}()
     {
+        $this->markTestIncomplete(
+            'Test of "{{name}}" property in "{{classname}}" model has not been implemented yet.'
+        );
     }
 {{/vars}}
 
@@ -102,9 +88,7 @@ class {{classname}}Test extends TestCase
      */
     public function testGetOpenApiSchema()
     {
-        $schemaObject = {{classname}}::getOpenApiSchema();
-        $schemaArr = {{classname}}::getOpenApiSchema(true);
-        $this->assertIsObject($schemaObject);
+        $schemaArr = {{classname}}::getOpenApiSchema();
         $this->assertIsArray($schemaArr);
     }
 }
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait.mustache
deleted file mode 100644
index 7f068fa1c77f..000000000000
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait.mustache
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * {{traitNamePrefix}}ModelUtils{{traitNameSuffix}}
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace {{utilsPackage}};
-
-use {{utilsPackage}}\{{traitNamePrefix}}StringUtils{{traitNameSuffix}};
-
-/**
- * {{traitNamePrefix}}ModelUtils{{traitNameSuffix}} Class Doc Comment
- * This class duplicates functionality of ModelUtils.java and AbstractPhpCodegen.java classes.
- *
- * @package {{utilsPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-trait {{traitNamePrefix}}ModelUtils{{traitNameSuffix}}
-{
-    use {{traitNamePrefix}}StringUtils{{traitNameSuffix}};
-
-    /**
-     * Parses model class name from provided ref.
-     * @link https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#reference-object
-     * This method doesn't check that class exists and autoloaded.
-     * This is recreated method of @link modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java class.
-     *
-     * @param string $ref Reference, eg. #/components/schemas/Pet
-     *
-     * @return string|null classname or null on fail
-     */
-    public static function getSimpleRef($ref)
-    {
-        $model = null;
-        if (stripos($ref, '#/components/') === 0) {
-            // starts with #/components/
-            $model = substr($ref, strrpos($ref, '/') + 1);
-        } elseif (stripos($ref, '#/definitions/') === 0) {
-            // starts with #/definitions/
-            $model = substr($ref, strrpos($ref, '/') + 1);
-        }
-
-        return $model;
-    }
-
-    /**
-     * Output the proper model name (capitalized).
-     * In case the name belongs to the TypeSystem it won't be renamed.
-     * This is recreated method of @link modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java class.
-     *
-     * @param string      $name            the name of the model
-     * @param string|null $modelNamePrefix modelNamePrefix generator option
-     * @param string|null $modelNameSuffix modelNameSuffix generator option
-     *
-     * @return string capitalized model name
-     */
-    public static function toModelName(
-        $name,
-        $modelNamePrefix = {{#modelNamePrefix}}'{{modelNamePrefix}}'{{/modelNamePrefix}}{{^modelNamePrefix}}null{{/modelNamePrefix}},
-        $modelNameSuffix = {{#modelNameSuffix}}'{{modelNameSuffix}}'{{/modelNameSuffix}}{{^modelNameSuffix}}null{{/modelNameSuffix}}
-    ) {
-        if (is_string($name) === false  || empty($name)) {
-            return null;
-        }
-
-        // remove [
-        $name = str_replace(']', '', $name);
-
-        // Note: backslash ("\\") is allowed for e.g. "\\DateTime"
-        $name = preg_replace('/[^\w\\\\]+/', '_', $name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
-
-        // remove underscores from start and end
-        $name = trim($name, '_');
-
-        // remove dollar sign
-        $name = str_replace('$', '', $name);
-
-        // model name cannot use reserved keyword
-        if (self::isReservedWord($name)) {
-            $name = 'model_' . $name; // e.g. return => ModelReturn (after camelize)
-        }
-
-        // model name starts with number
-        if (preg_match('/^\d.*/', $name) === 1) {
-            $name = 'model_' . $name; // e.g. 200Response => Model200Response (after camelize)
-        }
-
-        // add prefix and/or suffic only if name does not start wth \ (e.g. \DateTime)
-        if (preg_match('/^\\\\.*/', $name) !== 1) {
-            if (is_string($modelNamePrefix) && !empty($modelNamePrefix)) {
-                $name = $modelNamePrefix . '_' . $name;
-            }
-
-            if (is_string($modelNameSuffix) && !empty($modelNameSuffix)) {
-                $name = $name . '_' . $modelNameSuffix;
-            }
-        }
-
-        // camelize the model name
-        // phone_number => PhoneNumber
-        return self::camelize($name);
-    }
-}
-{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait_test.mustache
deleted file mode 100644
index f3d365eba67e..000000000000
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/model_utils_trait_test.mustache
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * {{traitNamePrefix}}ModelUtils{{traitNameSuffix}}Test
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace {{utilsPackage}};
-
-use {{utilsPackage}}\{{traitNamePrefix}}ModelUtils{{traitNameSuffix}} as ModelUtils;
-use PHPUnit\Framework\TestCase;
-
-/**
- * {{traitNamePrefix}}ModelUtils{{traitNameSuffix}}Test Class Doc Comment
- *
- * @package {{utilsPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \{{utilsPackage}}\{{traitNamePrefix}}ModelUtils{{traitNameSuffix}}
- */
-class {{traitNamePrefix}}ModelUtils{{traitNameSuffix}}Test extends TestCase
-{
-    /**
-     * @covers ::getSimpleRef
-     * @dataProvider provideRefs
-     */
-    public function testGetSimpleRef($ref, $expectedRef)
-    {
-        $this->assertSame($expectedRef, ModelUtils::getSimpleRef($ref));
-    }
-
-    public function provideRefs()
-    {
-        return [
-            'Reference Object OAS 3.0' => [
-                '#/components/schemas/Pet', 'Pet',
-            ],
-            'Reference Object Swagger 2.0' => [
-                '#/definitions/Pet', 'Pet',
-            ],
-            'Underscored classname' => [
-                '#/components/schemas/_foobar_Objects', '_foobar_Objects',
-            ],
-            'Relative Documents With Embedded Schema' => [
-                'definitions.json#/Pet', null,
-            ],
-            'null as argument' => [
-                null, null,
-            ],
-            'number as argument' => [
-                156, null,
-            ],
-        ];
-    }
-
-    /**
-     * @covers ::toModelName
-     * @dataProvider provideModelNames
-     */
-    public function testToModelName($name, $prefix, $suffix, $expectedModel)
-    {
-        $this->assertSame($expectedModel, ModelUtils::toModelName($name, $prefix, $suffix));
-    }
-
-    public function provideModelNames()
-    {
-        return [
-            // fixtures from modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/StringUtilsTest.java
-            ['abcd', null, null, 'Abcd'],
-            ['some-value', null, null, 'SomeValue'],
-            ['some_value', null, null, 'SomeValue'],
-            ['$type', null, null, 'Type'],
-            ['123', null, null, 'Model123'],
-            ['$123', null, null, 'Model123'],
-            ['return', null, null, 'ModelReturn'],
-            ['200Response', null, null, 'Model200Response'],
-            ['abcd', 'SuperModel', null, 'SuperModelAbcd'],
-            ['abcd', null, 'WithEnd', 'AbcdWithEnd'],
-            ['abcd', 'WithStart', 'AndEnd', 'WithStartAbcdAndEnd'],
-            ['_foobar_Objects', null, null, 'FoobarObjects'],
-            [null, null, null, null],
-        ];
-    }
-}
-{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker.mustache
deleted file mode 100644
index 5cb7ec947f4c..000000000000
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker.mustache
+++ /dev/null
@@ -1,633 +0,0 @@
-<?php
-
-/**
- * OpenApiDataMocker
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace {{mockPackage}};
-
-use {{mockPackage}}\{{interfaceNamePrefix}}OpenApiDataMocker{{interfaceNameSuffix}} as IMocker;
-use {{utilsPackage}}\{{traitNamePrefix}}ModelUtils{{traitNameSuffix}};
-use StdClass;
-use DateTime;
-use InvalidArgumentException;
-
-/**
- * OpenApiDataMocker Class Doc Comment
- *
- * @package {{mockPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-final class OpenApiDataMocker implements IMocker
-{
-    use {{traitNamePrefix}}ModelUtils{{traitNameSuffix}};
-
-    /**
-     * Mocks OpenApi Data.
-     * @see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#data-types
-     *
-     * @param $dataType   string     OpenApi data type. Use constants from {{interfaceNamePrefix}}OpenApiDataMocker{{interfaceNameSuffix}} class
-     * @param $dataFormat string     (optional) OpenApi data format
-     * @param $options    array|null (optional) OpenApi data options
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return mixed
-     */
-    public function mock($dataType, $dataFormat = null, $options = [])
-    {
-        switch ($dataType) {
-            case IMocker::DATA_TYPE_INTEGER:
-            case IMocker::DATA_TYPE_NUMBER:
-                $minimum = $options['minimum'] ?? null;
-                $maximum = $options['maximum'] ?? null;
-                $exclusiveMinimum = $options['exclusiveMinimum'] ?? false;
-                $exclusiveMaximum = $options['exclusiveMaximum'] ?? false;
-                if ($dataType === IMocker::DATA_TYPE_INTEGER) {
-                    return $this->mockInteger($dataFormat, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-                }
-                return $this->mockNumber($dataFormat, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-            case IMocker::DATA_TYPE_STRING:
-                $minLength = $options['minLength'] ?? 0;
-                $maxLength = $options['maxLength'] ?? null;
-                $enum = $options['enum'] ?? null;
-                return $this->mockString($dataFormat, $minLength, $maxLength, $enum);
-            case IMocker::DATA_TYPE_BOOLEAN:
-                return $this->mockBoolean();
-            case IMocker::DATA_TYPE_ARRAY:
-                $items = $options['items'] ?? null;
-                $minItems = $options['minItems'] ?? 0;
-                $maxItems = $options['maxItems'] ?? null;
-                $uniqueItems = $options['uniqueItems'] ?? false;
-                return $this->mockArray($items, $minItems, $maxItems, $uniqueItems);
-            case IMocker::DATA_TYPE_OBJECT:
-                $properties = $options['properties'] ?? null;
-                $minProperties = $options['minProperties'] ?? 0;
-                $maxProperties = $options['maxProperties'] ?? null;
-                $additionalProperties = $options['additionalProperties'] ?? null;
-                $required = $options['required'] ?? null;
-                return $this->mockObject($properties, $minProperties, $maxProperties, $additionalProperties, $required);
-            default:
-                throw new InvalidArgumentException('"dataType" must be one of ' . implode(', ', [
-                    IMocker::DATA_TYPE_INTEGER,
-                    IMocker::DATA_TYPE_NUMBER,
-                    IMocker::DATA_TYPE_STRING,
-                    IMocker::DATA_TYPE_BOOLEAN,
-                    IMocker::DATA_TYPE_ARRAY,
-                    IMocker::DATA_TYPE_OBJECT,
-                ]));
-        }
-    }
-
-    /**
-     * Shortcut to mock integer type
-     * Equivalent to mockData(DATA_TYPE_INTEGER);
-     *
-     * @param string|null $dataFormat       (optional) int32 or int64
-     * @param number|null $minimum          (optional) Default is 0
-     * @param number|null $maximum          (optional) Default is mt_getrandmax()
-     * @param bool|null   $exclusiveMinimum (optional) Default is false
-     * @param bool|null   $exclusiveMaximum (optional) Default is false
-     *
-     * @throws \InvalidArgumentException when $maximum less than $minimum or invalid arguments provided
-     *
-     * @return int
-     */
-    public function mockInteger(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false
-    ) {
-        $dataFormat = is_string($dataFormat) ? strtolower($dataFormat) : $dataFormat;
-        switch ($dataFormat) {
-            case IMocker::DATA_FORMAT_INT32:
-                // -2147483647..2147483647
-                $minimum = is_numeric($minimum) ? max($minimum, -2147483647) : -2147483647;
-                $maximum = is_numeric($maximum) ? min($maximum, 2147483647) : 2147483647;
-                break;
-            case IMocker::DATA_FORMAT_INT64:
-                // -9223372036854775807..9223372036854775807
-                $minimum = is_numeric($minimum) ? max($minimum, -9223372036854775807) : -9223372036854775807;
-                $maximum = is_numeric($maximum) ? min($maximum, 9223372036854775807) : 9223372036854775807;
-                break;
-            default:
-                // do nothing, unsupported format
-        }
-
-        return $this->getRandomNumber($minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum, 0);
-    }
-
-    /**
-     * Shortcut to mock number type
-     * Equivalent to mockData(DATA_TYPE_NUMBER);
-     *
-     * @param string|null $dataFormat       (optional) float or double
-     * @param number|null $minimum          (optional) Default is 0
-     * @param number|null $maximum          (optional) Default is mt_getrandmax()
-     * @param bool|null   $exclusiveMinimum (optional) Default is false
-     * @param bool|null   $exclusiveMaximum (optional) Default is false
-     *
-     * @throws \InvalidArgumentException when $maximum less than $minimum or invalid arguments provided
-     *
-     * @return float
-     */
-    public function mockNumber(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false
-    ) {
-        return $this->getRandomNumber($minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum, 4);
-    }
-
-    /**
-     * Shortcut to mock string type
-     * Equivalent to mockData(DATA_TYPE_STRING);
-     *
-     * @param string|null $dataFormat (optional) one of byte, binary, date, date-time, password
-     * @param int|null    $minLength  (optional) Default is 0
-     * @param int|null    $maxLength  (optional) Default is 100 chars
-     * @param array       $enum       (optional) This array should have at least one element.
-     * Elements in the array should be unique.
-     * @param string|null $pattern    (optional) This string should be a valid regular expression, according to the ECMA 262 regular expression dialect.
-     * Recall: regular expressions are not implicitly anchored.
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return string
-     */
-    public function mockString(
-        $dataFormat = null,
-        $minLength = 0,
-        $maxLength = null,
-        $enum = null,
-        $pattern = null
-    ) {
-        $str = '';
-        $getLoremIpsum = function ($length) {
-            return str_pad(
-                '',
-                $length,
-                'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ',
-                \STR_PAD_RIGHT
-            );
-        };
-        $truncateOrPad = function ($text, $min = null, $max = null, $glue = '') {
-            if ($max !== null && mb_strlen($text) > $max) {
-                // truncate
-                $text = substr($text, 0, $max);
-            } elseif ($min !== null && mb_strlen($text) < $min) {
-                // pad
-                $text = str_pad('', $min, $text . $glue, \STR_PAD_RIGHT);
-            }
-            return $text;
-        };
-
-        if ($enum !== null) {
-            if (
-                is_array($enum) === false
-                || empty($enum)
-                || count($enum) > count(array_unique($enum))
-            ) {
-                throw new InvalidArgumentException('"enum" must be an array. This array should have at least one element. Elements in the array should be unique.');
-            }
-
-            // return random variant
-            return $enum[mt_rand(0, count($enum) - 1)];
-        }
-
-        if ($minLength !== 0 && $minLength !== null) {
-            if (is_int($minLength) === false) {
-                throw new InvalidArgumentException('"minLength" must be an integer');
-            } elseif ($minLength < 0) {
-                throw new InvalidArgumentException('"minLength" must be greater than, or equal to, 0');
-            }
-        } else {
-            $minLength = 0;
-        }
-
-        if ($maxLength !== null) {
-            if (is_int($maxLength) === false) {
-                throw new InvalidArgumentException('"maxLength" must be an integer');
-            } elseif ($maxLength < 0) {
-                throw new InvalidArgumentException('"maxLength" must be greater than, or equal to, 0');
-            }
-        } else {
-            // since we don't need huge texts by default, lets cut them down to 100 chars
-            $maxLength = 100;
-        }
-
-        if ($maxLength < $minLength) {
-            throw new InvalidArgumentException('"maxLength" value cannot be less than "minLength"');
-        }
-
-        switch ($dataFormat) {
-            case IMocker::DATA_FORMAT_BYTE:
-            case IMocker::DATA_FORMAT_BINARY:
-                // base64 encoded string
-                $inputLength = 1;
-                $str = base64_encode($getLoremIpsum($inputLength));
-                while (mb_strlen($str) < $minLength) {
-                    $inputLength++;
-                    $str = base64_encode($getLoremIpsum($inputLength));
-                }
-
-                // base64 encoding produces strings devided by 4, so resulted string can exceed maxLength parameter
-                // I think truncated(invalid) base64 string is better than oversized, cause this data is fake anyway
-                $str = $truncateOrPad($str, null, $maxLength, '. ');
-                break;
-            case IMocker::DATA_FORMAT_DATE:
-            case IMocker::DATA_FORMAT_DATE_TIME:
-                // min unix timestamp is 0 and max is 2147483647 for 32bit systems which equals 2038-01-19 03:14:07
-                $date = DateTime::createFromFormat('U', mt_rand(0, 2147483647));
-                $str = ($dataFormat === IMocker::DATA_FORMAT_DATE) ? $date->format('Y-m-d') : $date->format('Y-m-d\TH:i:sP');
-
-                // truncate or pad datestring to fit minLength and maxLength
-                $str = $truncateOrPad($str, $minLength, $maxLength, ' ');
-                break;
-            case IMocker::DATA_FORMAT_PASSWORD:
-                // use list of most popular passwords
-                $obviousPassList = [
-                    'qwerty',
-                    'qwerty12345',
-                    'hello',
-                    '12345',
-                    '0000',
-                    'qwerty12345!',
-                    'qwertyuiop[]',
-                ];
-                $str = $obviousPassList[mt_rand(0, count($obviousPassList) - 1)];
-
-                // truncate or pad password to fit minLength and maxLength
-                $str = $truncateOrPad($str, $minLength, $maxLength);
-                break;
-            case IMocker::DATA_FORMAT_UUID:
-                // use php built-in uniqid function
-                $str = uniqid();
-
-                // truncate or pad password to fit minLength and maxLength
-                $str = $truncateOrPad($str, $minLength, $maxLength);
-                break;
-            case IMocker::DATA_FORMAT_EMAIL:
-                // just for visionary purpose, not related to real persons
-                $fakeEmailList = [
-                    'johndoe',
-                    'lhoswald',
-                    'ojsimpson',
-                    'mlking',
-                    'jfkennedy',
-                ];
-                $str = $fakeEmailList[mt_rand(0, count($fakeEmailList) - 1)] . '@example.com';
-
-                // truncate or pad email to fit minLength and maxLength
-                $str = $truncateOrPad($str, $minLength, $maxLength);
-                break;
-            default:
-                $str = $getLoremIpsum(mt_rand($minLength, $maxLength));
-        }
-
-        return $str;
-    }
-
-    /**
-     * Shortcut to mock boolean type
-     * Equivalent to mockData(DATA_TYPE_BOOLEAN);
-     *
-     * @return bool
-     */
-    public function mockBoolean()
-    {
-        return (bool) mt_rand(0, 1);
-    }
-
-    /**
-     * Shortcut to mock array type
-     * Equivalent to mockData(DATA_TYPE_ARRAY);
-     *
-     * @param object|array $items       Object or assoc array of described items
-     * @param int|null     $minItems    (optional) An array instance is valid against "minItems" if its size is greater than, or equal to, the value of this keyword.
-     * @param int|null     $maxItems    (optional) An array instance is valid against "maxItems" if its size is less than, or equal to, the value of this keyword
-     * @param bool|null    $uniqueItems (optional) If it has boolean value true, the instance validates successfully if all of its elements are unique
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return array
-     */
-    public function mockArray(
-        $items,
-        $minItems = 0,
-        $maxItems = null,
-        $uniqueItems = false
-    ) {
-        $arr = [];
-        $minSize = 0;
-        $maxSize = \PHP_INT_MAX;
-
-        if (
-            (is_array($items) === false && is_object($items) === false)
-            || (is_array($items) && array_key_exists('type', $items) === false)
-            || (is_object($items) && isset($items->type) === false)
-        ) {
-            new InvalidArgumentException('"items" must be object or assoc array with "type" key');
-        }
-
-        if ($minItems !== null) {
-            if (is_integer($minItems) === false || $minItems < 0) {
-                throw new InvalidArgumentException('"mitItems" must be an integer. This integer must be greater than, or equal to, 0');
-            }
-            $minSize = $minItems;
-        }
-
-        if ($maxItems !== null) {
-            if (is_integer($maxItems) === false || $maxItems < 0) {
-                throw new InvalidArgumentException('"maxItems" must be an integer. This integer must be greater than, or equal to, 0.');
-            }
-            if ($maxItems < $minItems) {
-                throw new InvalidArgumentException('"maxItems" value cannot be less than "minItems"');
-            }
-            $maxSize = $maxItems;
-        }
-
-        $options = $this->extractSchemaProperties($items);
-        $dataType = $options['type'];
-        $dataFormat = $options['format'] ?? null;
-        $ref = $options['$ref'] ?? null;
-
-        // always generate smallest possible array to avoid huge JSON responses
-        $arrSize = ($maxSize < 1) ? $maxSize : max($minSize, 1);
-        while (count($arr) < $arrSize) {
-            $data = $this->mockFromRef($ref);
-            $arr[] = ($data) ? $data : $this->mock($dataType, $dataFormat, $options);
-        }
-        return $arr;
-    }
-
-    /**
-     * Shortcut to mock object type.
-     * Equivalent to mockData(DATA_TYPE_OBJECT);
-     *
-     * @param object|array           $properties           Object or array of described properties
-     * @param int|null               $minProperties        (optional) An object instance is valid against "minProperties" if its number of properties is greater than, or equal to, the value of this keyword.
-     * @param int|null               $maxProperties        (optional) An object instance is valid against "maxProperties" if its number of properties is less than, or equal to, the value of this keyword.
-     * @param bool|object|array|null $additionalProperties (optional) If "additionalProperties" is true, validation always succeeds.
-     * If "additionalProperties" is false, validation succeeds only if the instance is an object and all properties on the instance were covered by "properties" and/or "patternProperties".
-     * If "additionalProperties" is an object, validate the value as a schema to all of the properties that weren't validated by "properties" nor "patternProperties".
-     * @param array|null             $required             (optional) This array MUST have at least one element.  Elements of this array must be strings, and MUST be unique.
-     * An object instance is valid if its property set contains all elements in this array value.
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return object
-     */
-    public function mockObject(
-        $properties,
-        $minProperties = 0,
-        $maxProperties = null,
-        $additionalProperties = null,
-        $required = null
-    ) {
-        $obj = new StdClass();
-
-        if (is_object($properties) === false && is_array($properties) === false) {
-            throw new InvalidArgumentException('The value of "properties" must be an array or object');
-        }
-
-        foreach ($properties as $propName => $propValue) {
-            if (is_object($propValue) === false && is_array($propValue) === false) {
-                throw new InvalidArgumentException('Each value of "properties" must be an array or object');
-            }
-        }
-
-        if ($minProperties !== null) {
-            if (is_integer($minProperties) === false || $minProperties < 0) {
-                throw new InvalidArgumentException('"minProperties" must be an integer. This integer must be greater than, or equal to, 0');
-            }
-        }
-
-        if ($maxProperties !== null) {
-            if (is_integer($maxProperties) === false || $maxProperties < 0) {
-                throw new InvalidArgumentException('"maxProperties" must be an integer. This integer must be greater than, or equal to, 0.');
-            }
-            if ($maxProperties < $minProperties) {
-                throw new InvalidArgumentException('"maxProperties" value cannot be less than "minProperties"');
-            }
-        }
-
-        if ($additionalProperties !== null) {
-            if (is_bool($additionalProperties) === false && is_object($additionalProperties) === false && is_array($additionalProperties) === false) {
-                throw new InvalidArgumentException('The value of "additionalProperties" must be a boolean or object or array.');
-            }
-        }
-
-        if ($required !== null) {
-            if (
-                is_array($required) === false
-                || count($required) > count(array_unique($required))
-            ) {
-                throw new InvalidArgumentException('The value of "required" must be an array. Elements of this array must be unique.');
-            }
-            foreach ($required as $requiredPropName) {
-                if (is_string($requiredPropName) === false) {
-                    throw new InvalidArgumentException('Elements of "required" array must be strings');
-                }
-            }
-        }
-
-        foreach ($properties as $propName => $propValue) {
-            $options = $this->extractSchemaProperties($propValue);
-            $dataType = $options['type'];
-            $dataFormat = $options['format'] ?? null;
-            $ref = $options['$ref'] ?? null;
-            $data = $this->mockFromRef($ref);
-            $obj->$propName = ($data) ? $data : $this->mock($dataType, $dataFormat, $options);
-        }
-
-        return $obj;
-    }
-
-    /**
-     * Mocks OpenApi Data from schema.
-     *
-     * @param array|object $schema OpenAPI schema
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return mixed
-     */
-    public function mockFromSchema($schema)
-    {
-        $props = $this->extractSchemaProperties($schema);
-        if (array_key_exists('$ref', $props) && !empty($props['$ref'])) {
-            return $this->mockFromRef($props['$ref']);
-        } elseif ($props['type'] === null) {
-            throw new InvalidArgumentException('"schema" must be object or assoc array with "type" property');
-        }
-        return $this->mock($props['type'], $props['format'], $props);
-    }
-
-    /**
-     * Mock data by referenced schema.
-     * TODO: this method will return model instance, not an StdClass
-     *
-     * @param string|null $ref Ref to model, eg. #/components/schemas/User
-     *
-     * @return mixed
-     */
-    public function mockFromRef($ref)
-    {
-        $data = null;
-        if (is_string($ref) && !empty($ref)) {
-            $refName = static::getSimpleRef($ref);
-            $modelName = static::toModelName($refName);
-            $modelClass = '{{modelPackage}}\\' . $modelName;
-            if (!class_exists($modelClass) || !method_exists($modelClass, 'getOpenApiSchema')) {
-                throw new InvalidArgumentException(sprintf(
-                    'Model %s not found or method %s doesn\'t exist',
-                    $modelClass,
-                    $modelClass . '::getOpenApiSchema'
-                ));
-            }
-            $data = $this->mockFromSchema($modelClass::getOpenApiSchema(true));
-        }
-
-        return $data;
-    }
-
-    /**
-     * @internal Extract OAS properties from array or object.
-     * @codeCoverageIgnore
-     *
-     * @param array|object $val Processed array or object
-     *
-     * @return array
-     */
-    private function extractSchemaProperties($val)
-    {
-        $props = [
-            'type' => null,
-            'format' => null,
-        ];
-        foreach (
-            [
-                'type',
-                'format',
-                'minimum',
-                'maximum',
-                'exclusiveMinimum',
-                'exclusiveMaximum',
-                'minLength',
-                'maxLength',
-                'pattern',
-                'enum',
-                'items',
-                'minItems',
-                'maxItems',
-                'uniqueItems',
-                'properties',
-                'minProperties',
-                'maxProperties',
-                'additionalProperties',
-                'required',
-                'example',
-                '$ref',
-            ] as $propName
-        ) {
-            if (is_array($val) && array_key_exists($propName, $val)) {
-                $props[$propName] = $val[$propName];
-            } elseif (is_object($val) && isset($val->$propName)) {
-                $props[$propName] = $val->$propName;
-            }
-        }
-        return $props;
-    }
-
-    /**
-     * @internal
-     * @codeCoverageIgnore
-     *
-     * @return float|int
-     */
-    protected function getRandomNumber(
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false,
-        $maxDecimals = 4
-    ) {
-        $min = 0;
-        $max = mt_getrandmax();
-
-        if ($minimum !== null) {
-            if (is_numeric($minimum) === false) {
-                throw new InvalidArgumentException('"minimum" must be a number');
-            }
-            $min = $minimum;
-        }
-
-        if ($maximum !== null) {
-            if (is_numeric($maximum) === false) {
-                throw new InvalidArgumentException('"maximum" must be a number');
-            }
-            $max = $maximum;
-        }
-
-        if ($exclusiveMinimum !== false) {
-            if (is_bool($exclusiveMinimum) === false) {
-                throw new InvalidArgumentException('"exclusiveMinimum" must be a boolean');
-            } elseif ($minimum === null) {
-                throw new InvalidArgumentException('If "exclusiveMinimum" is present, "minimum" must also be present');
-            }
-            $min += 1;
-        }
-
-        if ($exclusiveMaximum !== false) {
-            if (is_bool($exclusiveMaximum) === false) {
-                throw new InvalidArgumentException('"exclusiveMaximum" must be a boolean');
-            } elseif ($maximum === null) {
-                throw new InvalidArgumentException('If "exclusiveMaximum" is present, "maximum" must also be present');
-            }
-            $max -= 1;
-        }
-
-        if ($max < $min) {
-            throw new InvalidArgumentException('"maximum" value cannot be less than "minimum"');
-        }
-
-        if ($maxDecimals > 0) {
-            return round($min + mt_rand() / mt_getrandmax() * ($max - $min), $maxDecimals);
-        }
-        return mt_rand((int) $min, (int) $max);
-    }
-}
-{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_interface.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_interface.mustache
deleted file mode 100644
index eaa28ba2b428..000000000000
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_interface.mustache
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-
-/**
- * {{interfaceNamePrefix}}OpenApiDataMocker{{interfaceNameSuffix}}
- * @ref https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#data-types
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace {{mockPackage}};
-
-use InvalidArgumentException;
-
-/**
- * {{interfaceNamePrefix}}OpenApiDataMocker{{interfaceNameSuffix}} Class Doc Comment
- *
- * @package {{mockPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-interface {{interfaceNamePrefix}}OpenApiDataMocker{{interfaceNameSuffix}}
-{
-    /** @var string DATA_TYPE_INTEGER  */
-    public const DATA_TYPE_INTEGER = 'integer';
-
-    /** @var string DATA_TYPE_NUMBER  */
-    public const DATA_TYPE_NUMBER = 'number';
-
-    /** @var string DATA_TYPE_STRING */
-    public const DATA_TYPE_STRING = 'string';
-
-    /** @var string DATA_TYPE_BOOLEAN */
-    public const DATA_TYPE_BOOLEAN = 'boolean';
-
-    /** @var string DATA_TYPE_FILE */
-    public const DATA_TYPE_FILE = 'file';
-
-    /** @var string DATA_TYPE_ARRAY */
-    public const DATA_TYPE_ARRAY = 'array';
-
-    /** @var string DATA_TYPE_OBJECT */
-    public const DATA_TYPE_OBJECT = 'object';
-
-    /** @var string DATA_FORMAT_INT32 Signed 32 bits */
-    public const DATA_FORMAT_INT32 = 'int32';
-
-    /** @var string DATA_FORMAT_INT64 Signed 64 bits */
-    public const DATA_FORMAT_INT64 = 'int64';
-
-    /** @var string DATA_FORMAT_FLOAT */
-    public const DATA_FORMAT_FLOAT = 'float';
-
-    /** @var string DATA_FORMAT_DOUBLE */
-    public const DATA_FORMAT_DOUBLE = 'double';
-
-    /** @var string DATA_FORMAT_BYTE base64 encoded characters */
-    public const DATA_FORMAT_BYTE = 'byte';
-
-    /** @var string DATA_FORMAT_BINARY Any sequence of octets */
-    public const DATA_FORMAT_BINARY = 'binary';
-
-    /** @var string DATA_FORMAT_DATE As defined by full-date [RFC3339](http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14) */
-    public const DATA_FORMAT_DATE = 'date';
-
-    /** @var string DATA_FORMAT_DATE_TIME As defined by date-time [RFC3339](http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14) */
-    public const DATA_FORMAT_DATE_TIME = 'date-time';
-
-    /** @var string DATA_FORMAT_PASSWORD Used to hint UIs the input needs to be obscured. */
-    public const DATA_FORMAT_PASSWORD = 'password';
-
-    /** @var string DATA_FORMAT_EMAIL */
-    public const DATA_FORMAT_EMAIL = 'email';
-
-    /** @var string DATA_FORMAT_UUID */
-    public const DATA_FORMAT_UUID = 'uuid';
-
-    /**
-     * Mocks OpenApi Data.
-     * @see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#data-types
-     *
-     * @param $dataType   string     OpenApi data type. Use constants from this class
-     * @param $dataFormat string     (optional) OpenApi data format
-     * @param $options    array|null (optional) OpenApi data options
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return mixed
-     */
-    public function mock(
-        $dataType,
-        $dataFormat = null,
-        $options = []
-    );
-
-    /**
-     * Shortcut to mock integer type
-     * Equivalent to mockData(DATA_TYPE_INTEGER);
-     *
-     * @param string|null $dataFormat       (optional) int32 or int64
-     * @param number|null $minimum          (optional) Default is 0
-     * @param number|null $maximum          (optional) Default is mt_getrandmax()
-     * @param bool|null   $exclusiveMinimum (optional) Default is false
-     * @param bool|null   $exclusiveMaximum (optional) Default is false
-     *
-     * @throws \InvalidArgumentException when $maximum less than $minimum or invalid arguments provided
-     *
-     * @return int
-     */
-    public function mockInteger(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false
-    );
-
-    /**
-     * Shortcut to mock number type
-     * Equivalent to mockData(DATA_TYPE_NUMBER);
-     *
-     * @param string|null $dataFormat       (optional) float or double
-     * @param number|null $minimum          (optional) Default is 0
-     * @param number|null $maximum          (optional) Default is mt_getrandmax()
-     * @param bool|null   $exclusiveMinimum (optional) Default is false
-     * @param bool|null   $exclusiveMaximum (optional) Default is false
-     *
-     * @throws \InvalidArgumentException when $maximum less than $minimum or invalid arguments provided
-     *
-     * @return float
-     */
-    public function mockNumber(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false
-    );
-
-    /**
-     * Shortcut to mock string type
-     * Equivalent to mockData(DATA_TYPE_STRING);
-     *
-     * @param string|null $dataFormat (optional) one of byte, binary, date, date-time, password
-     * @param int|null    $minLength  (optional) Default is 0
-     * @param int|null    $maxLength  (optional) Default is 100 chars
-     * @param array       $enum       (optional) This array should have at least one element.
-     * Elements in the array should be unique.
-     * @param string|null $pattern    (optional) This string should be a valid regular expression, according to the ECMA 262 regular expression dialect.
-     * Recall: regular expressions are not implicitly anchored.
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return string
-     */
-    public function mockString(
-        $dataFormat = null,
-        $minLength = 0,
-        $maxLength = null,
-        $enum = null,
-        $pattern = null
-    );
-
-    /**
-     * Shortcut to mock boolean type
-     * Equivalent to mockData(DATA_TYPE_BOOLEAN);
-     *
-     * @return bool
-     */
-    public function mockBoolean();
-
-    /**
-     * Shortcut to mock array type
-     * Equivalent to mockData(DATA_TYPE_ARRAY);
-     *
-     * @param object|array $items       Object or assoc array of described items
-     * @param int|null     $minItems    (optional) An array instance is valid against "minItems" if its size is greater than, or equal to, the value of this keyword.
-     * @param int|null     $maxItems    (optional) An array instance is valid against "maxItems" if its size is less than, or equal to, the value of this keyword
-     * @param bool|null    $uniqueItems (optional) If it has boolean value true, the instance validates successfully if all of its elements are unique
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return array
-     */
-    public function mockArray(
-        $items,
-        $minItems = 0,
-        $maxItems = null,
-        $uniqueItems = false
-    );
-
-    /**
-     * Shortcut to mock object type.
-     * Equivalent to mockData(DATA_TYPE_OBJECT);
-     *
-     * @param object|array           $properties           Object or array of described properties
-     * @param int|null               $minProperties        (optional) An object instance is valid against "minProperties" if its number of properties is greater than, or equal to, the value of this keyword.
-     * @param int|null               $maxProperties        (optional) An object instance is valid against "maxProperties" if its number of properties is less than, or equal to, the value of this keyword.
-     * @param bool|object|array|null $additionalProperties (optional) If "additionalProperties" is true, validation always succeeds.
-     * If "additionalProperties" is false, validation succeeds only if the instance is an object and all properties on the instance were covered by "properties" and/or "patternProperties".
-     * If "additionalProperties" is an object, validate the value as a schema to all of the properties that weren't validated by "properties" nor "patternProperties".
-     * @param array|null             $required             (optional) This array MUST have at least one element.  Elements of this array must be strings, and MUST be unique.
-     * An object instance is valid if its property set contains all elements in this array value.
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return object
-     */
-    public function mockObject(
-        $properties,
-        $minProperties = 0,
-        $maxProperties = null,
-        $additionalProperties = null,
-        $required = null
-    );
-
-    /**
-     * Mocks OpenApi Data from schema.
-     *
-     * @param array|object $schema OpenAPI schema
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return mixed
-     */
-    public function mockFromSchema($schema);
-
-    /**
-     * Mock data by referenced schema.
-     * TODO: this method will return model instance, not an StdClass
-     *
-     * @param string|null $ref Ref to model, eg. #/components/schemas/User
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return mixed
-     */
-    public function mockFromRef($ref);
-}
-{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware.mustache
deleted file mode 100644
index c7c6192f7685..000000000000
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware.mustache
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-/**
- * OpenApiDataMockerMiddleware
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace {{mockPackage}};
-
-use Slim\Factory\AppFactory;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use {{mockPackage}}\{{interfaceNamePrefix}}OpenApiDataMocker{{interfaceNameSuffix}};
-use InvalidArgumentException;
-
-/**
- * OpenApiDataMockerMiddleware Class Doc Comment
- *
- * @package {{mockPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-final class OpenApiDataMockerMiddleware implements MiddlewareInterface
-{
-    /**
-     * @var {{interfaceNamePrefix}}OpenApiDataMocker{{interfaceNameSuffix}} DataMocker.
-     */
-    private $mocker;
-
-    /**
-     * @var array Array of responses schemas.
-     */
-    private $responses;
-
-    /**
-     * @var callable|null Custom callback to select mocked response.
-     */
-    private $getMockResponseCallback;
-
-    /**
-     * @var callable|null Custom after callback.
-     */
-    private $afterCallback;
-
-    /**
-     * Class constructor.
-     *
-     * @param {{interfaceNamePrefix}}OpenApiDataMocker{{interfaceNameSuffix}} $mocker                  DataMocker.
-     * @param array                      $responses               Array of responses schemas.
-     * @param callable|null              $getMockResponseCallback Custom callback to select mocked response.
-     * Mock feature is disabled when this argument is null.
-     * @example $getMockResponseCallback = function (ServerRequestInterface $request, array $responses) {
-     *     // check if client clearly asks for mocked response
-     *     if (
-     *         $request->hasHeader('X-{{invokerPackage}}-Mock')
-     *         && $request->header('X-{{invokerPackage}}-Mock')[0] === 'ping'
-     *     ) {
-     *         return $responses[array_key_first($responses)];
-     *     }
-     *     return false;
-     * };
-     * @param callable|null              $afterCallback           After callback.
-     * Function must return response instance.
-     * @example $afterCallback = function (ServerRequestInterface $request, ResponseInterface $response) {
-     *     // mark mocked response to distinguish real and fake responses
-     *     return $response->withHeader('X-{{invokerPackage}}-Mock', 'pong');
-     * };
-     */
-    public function __construct(
-        {{interfaceNamePrefix}}OpenApiDataMocker{{interfaceNameSuffix}} $mocker,
-        array $responses,
-        $getMockResponseCallback = null,
-        $afterCallback = null
-    ) {
-        $this->mocker = $mocker;
-        $this->responses = $responses;
-        if (is_callable($getMockResponseCallback)) {
-            $this->getMockResponseCallback = $getMockResponseCallback;
-        } elseif ($getMockResponseCallback !== null) {
-            // wrong argument type
-            throw new InvalidArgumentException('\$getMockResponseCallback must be closure or null');
-        }
-
-        if (is_callable($afterCallback)) {
-            $this->afterCallback = $afterCallback;
-        } elseif ($afterCallback !== null) {
-            // wrong argument type
-            throw new InvalidArgumentException('\$afterCallback must be closure or null');
-        }
-    }
-
-    /**
-     * Parse incoming JSON input into a native PHP format
-     *
-     * @param ServerRequestInterface  $request HTTP request
-     * @param RequestHandlerInterface $handler Request handler
-     *
-     * @return ResponseInterface HTTP response
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $customCallback = $this->getMockResponseCallback;
-        $customAfterCallback = $this->afterCallback;
-        $mockedResponse = (is_callable($customCallback)) ? $customCallback($request, $this->responses) : null;
-        if (
-            is_array($mockedResponse)
-            && array_key_exists('code', $mockedResponse)
-            && array_key_exists('jsonSchema', $mockedResponse)
-        ) {
-            // response schema succesfully selected, we can mock it now
-            $statusCode = ($mockedResponse['code'] === 0) ? 200 : $mockedResponse['code'];
-            $contentType = '*/*';
-            $response = AppFactory::determineResponseFactory()->createResponse($statusCode);
-            $responseSchema = json_decode($mockedResponse['jsonSchema'], true);
-
-            if (is_array($responseSchema) && array_key_exists('headers', $responseSchema)) {
-                // response schema contains headers definitions, apply them one by one
-                foreach ($responseSchema['headers'] as $headerName => $headerDefinition) {
-                    $response = $response->withHeader($headerName, $this->mocker->mockFromSchema($headerDefinition['schema']));
-                }
-            }
-
-            if (
-                is_array($responseSchema)
-                && array_key_exists('content', $responseSchema)
-                && !empty($responseSchema['content'])
-            ) {
-                // response schema contains body definition
-                $responseContentSchema = null;
-                foreach ($responseSchema['content'] as $schemaContentType => $schemaDefinition) {
-                    // we can respond in JSON format when any(*/*) content-type allowed
-                    // or JSON(application/json) content-type specifically defined
-                    if (
-                        $schemaContentType === '*/*'
-                        || strtolower(substr($schemaContentType, 0, 16)) === 'application/json'
-                    ) {
-                        $contentType = 'application/json';
-                        $responseContentSchema = $schemaDefinition['schema'];
-                    }
-                }
-
-                if ($contentType === 'application/json') {
-                    $responseBody = $this->mocker->mockFromSchema($responseContentSchema);
-                    $response->getBody()->write(json_encode($responseBody));
-                } else {
-                    // notify developer that only application/json response supported so far
-                    $response->getBody()->write('Mock feature supports only "application/json" content-type!');
-                }
-            }
-
-            // after callback applied only when mocked response schema has been selected
-            if (is_callable($customAfterCallback)) {
-                $response = $customAfterCallback($request, $response);
-            }
-
-            // no reason to execute following middlewares (auth, validation etc.)
-            // return mocked response and end connection
-            return $response
-                ->withHeader('Content-Type', $contentType);
-        }
-
-        // no response selected, mock feature disabled
-        // execute following middlewares
-        return $handler->handle($request);
-    }
-}
-{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware_test.mustache
deleted file mode 100644
index 2ea22728930a..000000000000
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_middleware_test.mustache
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-
-/**
- * OpenApiDataMockerMiddlewareTest
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#invokerPackage}}
- * {{{invokerPackage}}}
- *
- {{/invokerPackage}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace {{mockPackage}};
-
-use {{mockPackage}}\OpenApiDataMockerMiddleware;
-use {{mockPackage}}\OpenApiDataMocker;
-use Slim\Factory\AppFactory;
-use Slim\Factory\ServerRequestCreatorFactory;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use PHPUnit\Framework\TestCase;
-use StdClass;
-
-/**
- * OpenApiDataMockerMiddlewareTest Class Doc Comment
- *
- * @package {{mockPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \{{mockPackage}}\OpenApiDataMockerMiddleware
- */
-class OpenApiDataMockerMiddlewareTest extends TestCase
-{
-    /**
-     * @covers ::__construct
-     * @dataProvider provideConstructCorrectArguments
-     */
-    public function testConstructor(
-        $mocker,
-        $responses,
-        $getMockResponseCallback,
-        $afterCallback
-    ) {
-        $middleware = new OpenApiDataMockerMiddleware($mocker, $responses, $getMockResponseCallback, $afterCallback);
-        $this->assertInstanceOf(OpenApiDataMockerMiddleware::class, $middleware);
-        $this->assertNotNull($middleware);
-    }
-
-    public function provideConstructCorrectArguments()
-    {
-        $getMockResponseCallback = function () {
-            return false;
-        };
-        $afterCallback = function () {
-            return false;
-        };
-        return [
-            [new OpenApiDataMocker(), [], null, null],
-            [new OpenApiDataMocker(), [], $getMockResponseCallback, $afterCallback],
-        ];
-    }
-
-    /**
-     * @covers ::__construct
-     * @dataProvider provideConstructInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @expectedException \TypeError
-     */
-    public function testConstructorWithInvalidArguments(
-        $mocker,
-        $responses,
-        $getMockResponseCallback,
-        $afterCallback
-    ) {
-        $middleware = new OpenApiDataMockerMiddleware($mocker, $responses, $getMockResponseCallback, $afterCallback);
-    }
-
-    public function provideConstructInvalidArguments()
-    {
-        return [
-            'getMockResponseCallback not callable' => [
-                new OpenApiDataMocker(), [], 'foobar', null,
-            ],
-            'afterCallback not callable' => [
-                new OpenApiDataMocker(), [], null, 'foobar',
-            ],
-        ];
-    }
-
-    /**
-     * @covers ::process
-     * @dataProvider provideProcessArguments
-     */
-    public function testProcess(
-        $mocker,
-        $responses,
-        $getMockResponseCallback,
-        $afterCallback,
-        $request,
-        $expectedStatusCode,
-        $expectedHeaders,
-        $notExpectedHeaders,
-        $expectedBody
-    ) {
-
-        // Create a stub for the RequestHandlerInterface interface.
-        $handler = $this->createMock(RequestHandlerInterface::class);
-        $handler->method('handle')
-             ->willReturn(AppFactory::determineResponseFactory()->createResponse());
-
-        $middleware = new OpenApiDataMockerMiddleware(
-            $mocker,
-            $responses,
-            $getMockResponseCallback,
-            $afterCallback
-        );
-        $response = $middleware->process($request, $handler);
-
-        // check status code
-        $this->assertSame($expectedStatusCode, $response->getStatusCode());
-
-        // check http headers in request
-        foreach ($expectedHeaders as $expectedHeader => $expectedHeaderValue) {
-            $this->assertTrue($response->hasHeader($expectedHeader));
-            if ($expectedHeaderValue !== '*') {
-                $this->assertSame($expectedHeaderValue, $response->getHeader($expectedHeader)[0]);
-            }
-        }
-        foreach ($notExpectedHeaders as $notExpectedHeader) {
-            $this->assertFalse($response->hasHeader($notExpectedHeader));
-        }
-
-        // check body
-        if (is_array($expectedBody)) {
-            // random values, check keys only
-            foreach ($expectedBody as $attribute => $value) {
-                $this->assertObjectHasAttribute($attribute, json_decode((string) $response->getBody(), false));
-            }
-        } else {
-            $this->assertEquals($expectedBody, (string) $response->getBody());
-        }
-    }
-
-    public function provideProcessArguments()
-    {
-        $mocker = new OpenApiDataMocker();
-        $isMockResponseRequired = function (ServerRequestInterface $request) {
-            $mockHttpHeader = 'X-{{invokerPackage}}-Mock';
-            return $request->hasHeader($mockHttpHeader)
-                && $request->getHeader($mockHttpHeader)[0] === 'ping';
-        };
-
-        $getMockResponseCallback = function (ServerRequestInterface $request, array $responses) use ($isMockResponseRequired) {
-            if ($isMockResponseRequired($request)) {
-                if (array_key_exists('default', $responses)) {
-                    return $responses['default'];
-                }
-
-                // return first response
-                return $responses[array_key_first($responses)];
-            }
-
-            return false;
-        };
-
-        $afterCallback = function ($request, $response) use ($isMockResponseRequired) {
-            if ($isMockResponseRequired($request)) {
-                $response = $response->withHeader('X-{{invokerPackage}}-Mock', 'pong');
-            }
-
-            return $response;
-        };
-
-        $responses = [
-            '400' => [
-                'code' => 400,
-                'jsonSchema' => json_encode([
-                    'description' => 'Bad Request Response',
-                    'content' => new StdClass(),
-                ]),
-            ],
-            'default' => [
-                'code' => 201,
-                'jsonSchema' => json_encode([
-                    'description' => 'Success Response',
-                    'headers' => [
-                        'X-Location' => ['schema' => ['type' => 'string']],
-                        'X-Created-Id' => ['schema' => ['type' => 'integer']],
-                    ],
-                    'content' => [
-                        'application/json;encoding=utf-8' => ['schema' => ['type' => 'object', 'properties' => ['id' => ['type' => 'integer'], 'className' => ['type' => 'string'], 'declawed' => ['type' => 'boolean']]]],
-                    ],
-                ]),
-            ],
-        ];
-
-        $responsesXmlOnly = [
-            'default' => [
-                'code' => 201,
-                'jsonSchema' => json_encode([
-                    'description' => 'Success Response',
-                    'content' => [
-                        'application/xml' => [
-                            'schema' => [
-                                'type' => 'string',
-                            ],
-                        ],
-                    ],
-                ]),
-            ],
-        ];
-
-        $requestFactory = ServerRequestCreatorFactory::create();
-
-        return [
-            'callbacks null' => [
-                $mocker,
-                $responses,
-                null,
-                null,
-                $requestFactory->createServerRequestFromGlobals(),
-                200,
-                [],
-                ['X-{{invokerPackage}}-Mock', 'x-location', 'x-created-id'],
-                '',
-            ],
-            'xml not supported' => [
-                $mocker,
-                $responsesXmlOnly,
-                $getMockResponseCallback,
-                $afterCallback,
-                $requestFactory
-                    ->createServerRequestFromGlobals()
-                    ->withHeader('X-{{invokerPackage}}-Mock', 'ping'),
-                201,
-                ['X-{{invokerPackage}}-Mock' => 'pong', 'content-type' => '*/*'],
-                ['x-location', 'x-created-id'],
-                'Mock feature supports only "application/json" content-type!',
-            ],
-            'mock response default schema' => [
-                $mocker,
-                $responses,
-                $getMockResponseCallback,
-                $afterCallback,
-                $requestFactory
-                    ->createServerRequestFromGlobals()
-                    ->withHeader('X-{{invokerPackage}}-Mock', 'ping'),
-                201,
-                ['X-{{invokerPackage}}-Mock' => 'pong', 'content-type' => 'application/json', 'x-location' => '*', 'x-created-id' => '*'],
-                [],
-                [
-                    'id' => 1,
-                    'className' => 'cat',
-                    'declawed' => false,
-                ],
-            ],
-        ];
-    }
-}
-{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_test.mustache
deleted file mode 100644
index e02fa3ed3c94..000000000000
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/openapi_data_mocker_test.mustache
+++ /dev/null
@@ -1,1257 +0,0 @@
-<?php
-
-/**
- * OpenApiDataMockerTest
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace {{mockPackage}};
-
-use {{mockPackage}}\OpenApiDataMocker;
-use {{mockPackage}}\{{interfaceNamePrefix}}OpenApiDataMocker{{interfaceNameSuffix}} as IMocker;
-use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\Constraint\IsType;
-use StdClass;
-use DateTime;
-
-/**
- * OpenApiDataMockerTest Class Doc Comment
- *
- * @package {{mockPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \{{mockPackage}}\OpenApiDataMocker
- */
-class OpenApiDataMockerTest extends TestCase
-{
-    /**
-     * @covers ::mock
-     * @dataProvider provideMockCorrectArguments
-     */
-    public function testMockCorrectArguments($dataType, $dataFormat, $options, $expectedType)
-    {
-        $mocker = new OpenApiDataMocker();
-        $data = $mocker->mock($dataType, $dataFormat, $options);
-        $this->assertInternalType($expectedType, $data);
-    }
-
-    public function provideMockCorrectArguments()
-    {
-        return [
-            [IMocker::DATA_TYPE_INTEGER, null, null, IsType::TYPE_INT],
-            [IMocker::DATA_TYPE_NUMBER, null, null, IsType::TYPE_FLOAT],
-            [IMocker::DATA_TYPE_STRING, null, null, IsType::TYPE_STRING],
-            [IMocker::DATA_TYPE_BOOLEAN, null, null, IsType::TYPE_BOOL],
-            [IMocker::DATA_TYPE_ARRAY, null, [
-                'items' => [
-                    'type' => IMocker::DATA_TYPE_INTEGER,
-                ],
-            ], IsType::TYPE_ARRAY],
-            [IMocker::DATA_TYPE_OBJECT, null, [
-                'properties' => [
-                    'username' => [
-                        'type' => IMocker::DATA_TYPE_INTEGER,
-                    ],
-                ],
-            ], IsType::TYPE_OBJECT],
-        ];
-    }
-
-    /**
-     * @covers ::mock
-     * @dataProvider provideMockInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage "dataType" must be one of integer, number, string, boolean, array, object
-     */
-    public function testMockInvalidArguments($dataType, $dataFormat, $options)
-    {
-        $mocker = new OpenApiDataMocker();
-        $data = $mocker->mock($dataType, $dataFormat, $options);
-    }
-
-    public function provideMockInvalidArguments()
-    {
-        return [
-            ['foobar', null, null],
-            [3.14, null, null],
-            [null, null, null],
-        ];
-    }
-
-    /**
-     * @covers ::mock
-     */
-    public function testMockWithStringEnumOptions()
-    {
-        $mocker = new OpenApiDataMocker();
-        $string = $mocker->mock(IMocker::DATA_TYPE_STRING, null, [
-            'enum' => ['foobar', 'foobaz', 'helloworld'],
-        ]);
-        $this->assertContains($string, ['foobar', 'foobaz', 'helloworld']);
-    }
-
-    /**
-     * @dataProvider provideMockIntegerCorrectArguments
-     * @covers ::mockInteger
-     */
-    public function testMockIntegerWithCorrectArguments(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false,
-        $matchingInternalTypes = [],
-        $notMatchingInternalTypes = []
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $integer = $mocker->mockInteger($dataFormat, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-
-        $this->internalAssertNumber(
-            $integer,
-            $minimum,
-            $maximum,
-            $exclusiveMinimum,
-            $exclusiveMaximum,
-            $matchingInternalTypes,
-            $notMatchingInternalTypes
-        );
-    }
-
-    public function provideMockIntegerCorrectArguments()
-    {
-        $types = [
-            IsType::TYPE_INT,
-            IsType::TYPE_NUMERIC,
-            IsType::TYPE_SCALAR,
-        ];
-        $notTypes = [
-            IsType::TYPE_ARRAY,
-            IsType::TYPE_BOOL,
-            IsType::TYPE_FLOAT,
-            IsType::TYPE_NULL,
-            IsType::TYPE_OBJECT,
-            IsType::TYPE_RESOURCE,
-            IsType::TYPE_STRING,
-            IsType::TYPE_CALLABLE,
-        ];
-
-        return [
-            [null, -100, 100, false, false, $types, $notTypes],
-            [null, -100, null, false, false, $types, $notTypes],
-            [null, null, 100, false, false, $types, $notTypes],
-            [null, -99.5, null, true, false, $types, $notTypes],
-            [null, null, 99.5, false, true, $types, $notTypes],
-            [null, -99.5, 99.5, true, true, $types, $notTypes],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockIntegerInvalidArguments
-     * @covers ::mockInteger
-     * @expectedException \InvalidArgumentException
-     */
-    public function testMockIntegerWithInvalidArguments(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $integer = $mocker->mockInteger($dataFormat, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-    }
-
-    public function provideMockIntegerInvalidArguments()
-    {
-        return [
-            [null, 'foo', null, false, false],
-            [null, null, false, false, false],
-            [null, null, null, true, false],
-            [null, null, null, false, true],
-            [null, 100, -100, false, false],
-        ];
-    }
-
-    /**
-     * @covers ::mockInteger
-     * @dataProvider provideMockIntegerFormats
-     */
-    public function testMockIntegerWithFormats(
-        $dataFormat,
-        $minimum,
-        $maximum,
-        $expectedMin,
-        $expectedMax
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $integer = $mocker->mockInteger($dataFormat, $minimum, $maximum);
-        $this->assertGreaterThanOrEqual($expectedMin, $integer);
-        $this->assertLessThanOrEqual($expectedMax, $integer);
-    }
-
-    public function provideMockIntegerFormats()
-    {
-        return [
-            [IMocker::DATA_FORMAT_INT32, -2147483648, 2147483648, -2147483647, 2147483647],
-            [IMocker::DATA_FORMAT_INT64, '-9223372036854775808', '9223372036854775808', -9223372036854775807, 9223372036854775807],
-            [IMocker::DATA_FORMAT_INT32, -10, 10, -10, 10],
-            [IMocker::DATA_FORMAT_INT64, -10, 10, -10, 10],
-            [IMocker::DATA_FORMAT_INT32, -9223372036854775807, 9223372036854775807, -2147483647, 2147483647],
-            [strtoupper(IMocker::DATA_FORMAT_INT32), -2147483648, 2147483648, -2147483647, 2147483647],
-            [strtoupper(IMocker::DATA_FORMAT_INT64), '-9223372036854775808', '9223372036854775808', -9223372036854775807, 9223372036854775807],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockNumberCorrectArguments
-     * @covers ::mockNumber
-     */
-    public function testMockNumberWithCorrectArguments(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false,
-        $matchingInternalTypes = [],
-        $notMatchingInternalTypes = []
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $number = $mocker->mockNumber($dataFormat, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-
-        $this->internalAssertNumber(
-            $number,
-            $minimum,
-            $maximum,
-            $exclusiveMinimum,
-            $exclusiveMaximum,
-            $matchingInternalTypes,
-            $notMatchingInternalTypes
-        );
-    }
-
-    public function provideMockNumberCorrectArguments()
-    {
-        $types = [
-            IsType::TYPE_SCALAR,
-            IsType::TYPE_NUMERIC,
-            IsType::TYPE_FLOAT,
-        ];
-        $notTypes = [
-            IsType::TYPE_INT,
-            IsType::TYPE_ARRAY,
-            IsType::TYPE_BOOL,
-            IsType::TYPE_NULL,
-            IsType::TYPE_OBJECT,
-            IsType::TYPE_RESOURCE,
-            IsType::TYPE_STRING,
-            IsType::TYPE_CALLABLE,
-        ];
-
-        return [
-            [null, -100, 100, false, false, $types, $notTypes],
-            [null, -100, null, false, false, $types, $notTypes],
-            [null, null, 100, false, false, $types, $notTypes],
-            [null, -99.5, null, true, false, $types, $notTypes],
-            [null, null, 99.5, false, true, $types, $notTypes],
-            [null, -99.5, 99.5, true, true, $types, $notTypes],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockNumberInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @covers ::mockNumber
-     */
-    public function testMockNumberWithInvalidArguments(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $number = $mocker->mockNumber($dataFormat, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-    }
-
-    public function provideMockNumberInvalidArguments()
-    {
-        return [
-            [null, 'foo', null, false, false],
-            [null, null, false, false, false],
-            [null, null, null, true, false],
-            [null, null, null, false, true],
-            [null, 100, -100, false, false],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockStringCorrectArguments
-     * @covers ::mockString
-     */
-    public function testMockStringWithCorrectArguments(
-        $dataFormat = null,
-        $minLength = 0,
-        $maxLength = null,
-        $enum = null,
-        $matchingInternalTypes = [],
-        $notMatchingInternalTypes = []
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $str = $mocker->mockString($dataFormat, $minLength, $maxLength, $enum);
-
-        $this->internalAssertString(
-            $str,
-            $minLength,
-            $maxLength,
-            $enum,
-            $matchingInternalTypes,
-            $notMatchingInternalTypes
-        );
-    }
-
-    public function provideMockStringCorrectArguments()
-    {
-        $types = [
-            IsType::TYPE_SCALAR,
-            IsType::TYPE_STRING,
-        ];
-        $notTypes = [
-            IsType::TYPE_FLOAT,
-            IsType::TYPE_INT,
-            IsType::TYPE_ARRAY,
-            IsType::TYPE_BOOL,
-            IsType::TYPE_NULL,
-            IsType::TYPE_OBJECT,
-            IsType::TYPE_RESOURCE,
-            IsType::TYPE_CALLABLE,
-        ];
-
-        return [
-            [null, 0, null, null, $types, $notTypes],
-            [null, 10, null, null, $types, $notTypes],
-            [null, 0, 100, null, $types, $notTypes],
-            [null, 10, 50, null, $types, $notTypes],
-            [null, 10, 10, null, $types, $notTypes],
-            [null, 0, 0, null, $types, $notTypes],
-            [null, null, null, null, $types, $notTypes],
-            [null, null, null, ['foobar', 'foobaz', 'hello world'], $types, $notTypes],
-            [null, null, null, ['foobar'], $types, $notTypes],
-            [IMocker::DATA_FORMAT_PASSWORD, 0, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_PASSWORD, 10, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_PASSWORD, 0, 100, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_PASSWORD, 10, 50, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_PASSWORD, 10, 10, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_PASSWORD, 0, 0, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, null, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 10, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 10, 10, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, null, 8, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 16, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 25, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 25, 25, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, null, 20, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 30, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 1, 1, null, $types, $notTypes],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockStringInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @covers ::mockString
-     */
-    public function testMockStringWithInvalidArguments(
-        $dataFormat = null,
-        $minLength = 0,
-        $maxLength = null,
-        $enum = null
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $str = $mocker->mockString($dataFormat, $minLength, $maxLength, $enum);
-    }
-
-    public function provideMockStringInvalidArguments()
-    {
-        return [
-            'negative minLength' => [null, -10, null],
-            'negative maxLength' => [null, 0, -10],
-            'both minLength maxLength negative' => [null, -10, -10],
-            'decimal minLength and maxLength' => [null, 0.5, 0.5],
-            'string minLength' => [null, '10', null],
-            'string maxLength' => [null, 0, '50'],
-            'string minLength and maxLength' => [null, '10', '50'],
-            'maxLength less than minLength' => [null, 50, 10],
-            'enum is string' => [null, null, null, 'foobar'],
-            'enum is empty array' => [null, null, null, []],
-            'enum array is not unique' => [null, null, null, ['foobar', 'foobaz', 'foobar']],
-        ];
-    }
-
-    /**
-     * @covers ::mock
-     * @covers ::mockString
-     * @dataProvider provideMockStringByteFormatArguments
-     */
-    public function testMockStringWithByteFormat(
-        $dataFormat,
-        $minLength,
-        $maxLength
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $str = $mocker->mockString($dataFormat, $minLength, $maxLength);
-        $str2 = $mocker->mock(IMocker::DATA_TYPE_STRING, $dataFormat, ['minLength' => $minLength, 'maxLength' => $maxLength]);
-        $base64pattern = '/^[\w\+\/\=]*$/';
-        $this->assertRegExp($base64pattern, $str);
-        $this->assertRegExp($base64pattern, $str2);
-        if ($minLength !== null) {
-            $this->assertGreaterThanOrEqual($minLength, mb_strlen($str));
-            $this->assertGreaterThanOrEqual($minLength, mb_strlen($str2));
-        }
-        if ($maxLength !== null) {
-            $this->assertLessThanOrEqual($maxLength, mb_strlen($str));
-            $this->assertLessThanOrEqual($maxLength, mb_strlen($str2));
-        }
-    }
-
-    public function provideMockStringByteFormatArguments()
-    {
-        return [
-            [IMocker::DATA_FORMAT_BYTE, null, null],
-            [IMocker::DATA_FORMAT_BYTE, 10, null],
-            [IMocker::DATA_FORMAT_BYTE, 10, 10],
-            [IMocker::DATA_FORMAT_BYTE, null, 12],
-        ];
-    }
-
-    /**
-     * @covers ::mock
-     * @covers ::mockString
-     * @dataProvider provideMockStringBinaryFormatArguments
-     */
-    public function testMockStringWithBinaryFormat(
-        $dataFormat,
-        $minLength,
-        $maxLength
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $str = $mocker->mockString($dataFormat, $minLength, $maxLength);
-        $str2 = $mocker->mock(IMocker::DATA_TYPE_STRING, $dataFormat, ['minLength' => $minLength, 'maxLength' => $maxLength]);
-        if ($minLength !== null) {
-            $this->assertGreaterThanOrEqual($minLength, strlen($str));
-            $this->assertGreaterThanOrEqual($minLength, strlen($str2));
-        }
-        if ($maxLength !== null) {
-            $this->assertLessThanOrEqual($maxLength, strlen($str));
-            $this->assertLessThanOrEqual($maxLength, strlen($str2));
-        }
-    }
-
-    public function provideMockStringBinaryFormatArguments()
-    {
-        return [
-            [IMocker::DATA_FORMAT_BINARY, 0, null],
-            [IMocker::DATA_FORMAT_BINARY, 10, null],
-            [IMocker::DATA_FORMAT_BINARY, 0, 100],
-            [IMocker::DATA_FORMAT_BINARY, 10, 50],
-            [IMocker::DATA_FORMAT_BINARY, 10, 10],
-            [IMocker::DATA_FORMAT_BINARY, 0, 0],
-        ];
-    }
-
-    /**
-     * @covers ::mock
-     * @covers ::mockString
-     * @dataProvider provideMockStringDateFormatArguments
-     */
-    public function testMockStringWithDateAndDateTimeFormat(
-        $dataFormat,
-        $minLength,
-        $maxLength,
-        $dtFormat
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $str = $mocker->mockString($dataFormat, $minLength, $maxLength);
-        $str2 = $mocker->mock(IMocker::DATA_TYPE_STRING, $dataFormat, ['minLength' => $minLength, 'maxLength' => $maxLength]);
-
-        if ($dtFormat !== null) {
-            $date = DateTime::createFromFormat($dtFormat, $str);
-            $date2 = DateTime::createFromFormat($dtFormat, $str2);
-            $this->assertInstanceOf(DateTime::class, $date);
-            $this->assertInstanceOf(DateTime::class, $date2);
-        }
-        if ($minLength !== null) {
-            $this->assertGreaterThanOrEqual($minLength, mb_strlen($str));
-            $this->assertGreaterThanOrEqual($minLength, mb_strlen($str2));
-        }
-        if ($maxLength !== null) {
-            $this->assertLessThanOrEqual($maxLength, mb_strlen($str));
-            $this->assertLessThanOrEqual($maxLength, mb_strlen($str2));
-        }
-    }
-
-    public function provideMockStringDateFormatArguments()
-    {
-        return [
-            [IMocker::DATA_FORMAT_DATE, null, null, 'Y-m-d'],
-            [IMocker::DATA_FORMAT_DATE, 10, null, 'Y-m-d'],
-            [IMocker::DATA_FORMAT_DATE, 10, 10, 'Y-m-d'],
-            [IMocker::DATA_FORMAT_DATE, null, 8, null],
-            [IMocker::DATA_FORMAT_DATE, 16, null, null],
-            [IMocker::DATA_FORMAT_DATE_TIME, null, null, 'Y-m-d\TH:i:sP'],
-            [IMocker::DATA_FORMAT_DATE_TIME, 25, null, 'Y-m-d\TH:i:sP'],
-            [IMocker::DATA_FORMAT_DATE_TIME, 25, 25, 'Y-m-d\TH:i:sP'],
-            [IMocker::DATA_FORMAT_DATE_TIME, null, 20, null],
-            [IMocker::DATA_FORMAT_DATE_TIME, 30, null, null],
-        ];
-    }
-
-    /**
-     * @covers ::mock
-     * @covers ::mockString
-     * @dataProvider provideMockStringUuidFormatArguments
-     */
-    public function testMockStringWithUuidFormat(
-        $minLength,
-        $maxLength
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $arr = [];
-        $arr2 = [];
-        $hexPattern = '/^[a-f0-9]*$/';
-
-        while (count($arr) < 100 && count($arr2) < 100) {
-            $str = $mocker->mockString(IMocker::DATA_FORMAT_UUID, $minLength, $maxLength);
-            $str2 = $mocker->mock(IMocker::DATA_TYPE_STRING, IMocker::DATA_FORMAT_UUID, ['minLength' => $minLength, 'maxLength' => $maxLength]);
-            $arr[] = $str;
-            $arr2[] = $str2;
-
-            $this->assertRegExp($hexPattern, $str);
-            $this->assertRegExp($hexPattern, $str2);
-
-            if ($minLength !== null) {
-                $this->assertGreaterThanOrEqual($minLength, mb_strlen($str));
-                $this->assertGreaterThanOrEqual($minLength, mb_strlen($str2));
-            }
-            if ($maxLength !== null) {
-                $this->assertLessThanOrEqual($maxLength, mb_strlen($str));
-                $this->assertLessThanOrEqual($maxLength, mb_strlen($str2));
-            }
-        }
-    }
-
-    public function provideMockStringUuidFormatArguments()
-    {
-        return [
-            [null, null],
-            [10, null],
-            [10, 10],
-            [null, 8],
-            [16, null],
-            [null, null],
-            [25, null],
-            [25, 25],
-            [null, 20],
-            [30, null],
-            [1, 1],
-        ];
-    }
-
-    /**
-     * @covers ::mockBoolean
-     */
-    public function testMockBoolean()
-    {
-        $mocker = new OpenApiDataMocker();
-        $bool = $mocker->mockBoolean();
-
-        $matchingInternalTypes = [
-            IsType::TYPE_SCALAR,
-            IsType::TYPE_BOOL,
-        ];
-
-        foreach ($matchingInternalTypes as $matchType) {
-            $this->assertInternalType($matchType, $bool);
-        }
-
-        $notMatchingInternalTypes = [
-            IsType::TYPE_NUMERIC,
-            IsType::TYPE_FLOAT,
-            IsType::TYPE_INT,
-            IsType::TYPE_ARRAY,
-            IsType::TYPE_STRING,
-            IsType::TYPE_NULL,
-            IsType::TYPE_OBJECT,
-            IsType::TYPE_RESOURCE,
-            IsType::TYPE_CALLABLE,
-        ];
-
-        foreach ($notMatchingInternalTypes as $notMatchType) {
-            $this->assertNotInternalType($notMatchType, $bool);
-        }
-    }
-
-    private function internalAssertNumber(
-        $number,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false,
-        $matchingInternalTypes = [],
-        $notMatchingInternalTypes = []
-    ) {
-        foreach ($matchingInternalTypes as $matchType) {
-            $this->assertInternalType($matchType, $number);
-        }
-
-        foreach ($notMatchingInternalTypes as $notMatchType) {
-            $this->assertNotInternalType($notMatchType, $number);
-        }
-
-        if ($minimum !== null) {
-            if ($exclusiveMinimum) {
-                $this->assertGreaterThan($minimum, $number);
-            } else {
-                $this->assertGreaterThanOrEqual($minimum, $number);
-            }
-        }
-
-        if ($maximum !== null) {
-            if ($exclusiveMaximum) {
-                $this->assertLessThan($maximum, $number);
-            } else {
-                $this->assertLessThanOrEqual($maximum, $number);
-            }
-        }
-    }
-
-    private function internalAssertString(
-        $str,
-        $minLength = null,
-        $maxLength = null,
-        $enum = null,
-        $matchingInternalTypes = [],
-        $notMatchingInternalTypes = []
-    ) {
-        foreach ($matchingInternalTypes as $matchType) {
-            $this->assertInternalType($matchType, $str);
-        }
-
-        foreach ($notMatchingInternalTypes as $notMatchType) {
-            $this->assertNotInternalType($notMatchType, $str);
-        }
-
-        if ($minLength !== null) {
-            $this->assertGreaterThanOrEqual($minLength, mb_strlen($str, 'UTF-8'));
-        }
-
-        if ($maxLength !== null) {
-            $this->assertLessThanOrEqual($maxLength, mb_strlen($str, 'UTF-8'));
-        }
-
-        if (is_array($enum) && !empty($enum)) {
-            $this->assertContains($str, $enum);
-        }
-    }
-
-    /**
-     * @dataProvider provideMockArrayCorrectArguments
-     * @covers ::mockArray
-     */
-    public function testMockArrayFlattenWithCorrectArguments(
-        $items,
-        $minItems,
-        $maxItems,
-        $uniqueItems,
-        $expectedItemsType = null,
-        $expectedArraySize = null
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $arr = $mocker->mockArray($items, $minItems, $maxItems, $uniqueItems);
-
-        $this->assertIsArray($arr);
-        if ($expectedArraySize !== null) {
-            $this->assertCount($expectedArraySize, $arr);
-        }
-        if ($expectedItemsType && $expectedArraySize > 0) {
-            $this->assertContainsOnly($expectedItemsType, $arr, true);
-        }
-
-        if (is_array($items)) {
-            $dataType = $items['type'];
-            $dataFormat = $items['dataFormat'] ?? null;
-
-            // items field numeric properties
-            $minimum = $items['minimum'] ?? null;
-            $maximum = $items['maximum'] ?? null;
-            $exclusiveMinimum = $items['exclusiveMinimum'] ?? null;
-            $exclusiveMaximum = $items['exclusiveMaximum'] ?? null;
-
-            // items field string properties
-            $minLength = $items['minLength'] ?? null;
-            $maxLength = $items['maxLength'] ?? null;
-            $enum = $items['enum'] ?? null;
-            $pattern = $items['pattern'] ?? null;
-
-            // items field array properties
-            $subItems = $items['items'] ?? null;
-            $subMinItems = $items['minItems'] ?? null;
-            $subMaxItems = $items['maxItems'] ?? null;
-            $subUniqueItems = $items['uniqueItems'] ?? null;
-        } else {
-            // is object
-            $dataType = $items->type;
-            $dataFormat = $items->dataFormat ?? null;
-
-            // items field numeric properties
-            $minimum = $items->minimum ?? null;
-            $maximum = $items->maximum ?? null;
-            $exclusiveMinimum = $items->exclusiveMinimum ?? null;
-            $exclusiveMaximum = $items->exclusiveMaximum ?? null;
-
-            // items field string properties
-            $minLength = $items->minLength ?? null;
-            $maxLength = $items->maxLength ?? null;
-            $enum = $items->enum ?? null;
-            $pattern = $items->pattern ?? null;
-
-            // items field array properties
-            $subItems = $items->items ?? null;
-            $subMinItems = $items->minItems ?? null;
-            $subMaxItems = $items->maxItems ?? null;
-            $subUniqueItems = $items->uniqueItems ?? null;
-        }
-
-
-        foreach ($arr as $item) {
-            switch ($dataType) {
-                case IMocker::DATA_TYPE_INTEGER:
-                    $this->internalAssertNumber($item, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-                    break;
-                case IMocker::DATA_TYPE_NUMBER:
-                    $this->internalAssertNumber($item, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-                    break;
-                case IMocker::DATA_TYPE_STRING:
-                    $this->internalAssertString($item, $minLength, $maxLength);
-                    break;
-                case IMocker::DATA_TYPE_BOOLEAN:
-                    $this->assertInternalType(IsType::TYPE_BOOL, $item);
-                    break;
-                case IMocker::DATA_TYPE_ARRAY:
-                    $this->testMockArrayFlattenWithCorrectArguments($subItems, $subMinItems, $subMaxItems, $subUniqueItems);
-                    break;
-            }
-        }
-    }
-
-    public function provideMockArrayCorrectArguments()
-    {
-        $intItems = ['type' => IMocker::DATA_TYPE_INTEGER, 'minimum' => 5, 'maximum' => 10];
-        $floatItems = ['type' => IMocker::DATA_TYPE_NUMBER, 'minimum' => -32.4, 'maximum' => 88.6, 'exclusiveMinimum' => true, 'exclusiveMaximum' => true];
-        $strItems = ['type' => IMocker::DATA_TYPE_STRING, 'minLength' => 20, 'maxLength' => 50];
-        $boolItems = (object) ['type' => IMocker::DATA_TYPE_BOOLEAN];
-        $arrayItems = (object) ['type' => IMocker::DATA_TYPE_ARRAY, 'items' => ['type' => IMocker::DATA_TYPE_STRING, 'minItems' => 3, 'maxItems' => 10]];
-        $objectItems = (object) ['type' => IMocker::DATA_TYPE_OBJECT, 'properties' => (object)['username' => ['type' => IMocker::DATA_TYPE_STRING]]];
-        $expectedInt = IsType::TYPE_INT;
-        $expectedFloat = IsType::TYPE_FLOAT;
-        $expectedStr = IsType::TYPE_STRING;
-        $expectedBool = IsType::TYPE_BOOL;
-        $expectedArray = IsType::TYPE_ARRAY;
-        $expectedObject = IsType::TYPE_OBJECT;
-
-        return [
-            'empty array' => [
-                $strItems, null, 0, false, null, 0,
-            ],
-            'empty array, limit zero' => [
-                $strItems, 0, 0, false, null, 0,
-            ],
-            'array of one string as default size' => [
-                $strItems, null, null, false, $expectedStr, 1,
-            ],
-            'array of one string, limit one' => [
-                $strItems, 1, 1, false, $expectedStr, 1,
-            ],
-            'array of two strings' => [
-                $strItems, 2, null, false, $expectedStr, 2,
-            ],
-            'array of five strings, limit ten' => [
-                $strItems, 5, 10, false, $expectedStr, 5,
-            ],
-            'array of five strings, limit five' => [
-                $strItems, 5, 5, false, $expectedStr, 5,
-            ],
-            'array of one string, limit five' => [
-                $strItems, null, 5, false, $expectedStr, 1,
-            ],
-            'array of one integer' => [
-                $intItems, null, null, false, $expectedInt, 1,
-            ],
-            'array of one float' => [
-                $floatItems, null, null, false, $expectedFloat, 1,
-            ],
-            'array of one boolean' => [
-                $boolItems, null, null, false, $expectedBool, 1,
-            ],
-            'array of one array of strings' => [
-                $arrayItems, null, null, false, $expectedArray, 1,
-            ],
-            'array of one object' => [
-                $objectItems, null, null, false, $expectedObject, 1
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockArrayInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @covers ::mockArray
-     */
-    public function testMockArrayWithInvalidArguments(
-        $items,
-        $minItems,
-        $maxItems,
-        $uniqueItems
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $arr = $mocker->mockArray($items, $minItems, $maxItems, $uniqueItems);
-    }
-
-    public function provideMockArrayInvalidArguments()
-    {
-        $intItems = ['type' => IMocker::DATA_TYPE_INTEGER];
-
-        return [
-            'items is nor array' => [
-                'foobar', null, null, false,
-            ],
-            'items doesnt have "type" key' => [
-                ['foobar' => 'foobaz'], null, null, false,
-            ],
-            'minItems is not integer' => [
-                $intItems, 3.12, null, false,
-            ],
-            'minItems is negative' => [
-                $intItems, -10, null, false,
-            ],
-            'minItems is not number' => [
-                $intItems, '1', null, false,
-            ],
-            'maxItems is not integer' => [
-                $intItems, null, 3.12, false,
-            ],
-            'maxItems is negative' => [
-                $intItems, null, -10, false,
-            ],
-            'maxItems is not number' => [
-                $intItems, null, 'foobaz', false,
-            ],
-            'maxItems less than minItems' => [
-                $intItems, 5, 2, false,
-            ],
-            'items with ref to unknown class' => [
-                ['$ref' => '#/components/schemas/UnknownClass'], null, null, false,
-            ],
-            'items with ref to class without getOpenApiSchema method' => [
-                ['$ref' => '#/components/schemas/ClassWithoutGetSchemaMethod'], null, null, false,
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockArrayWithRefArguments
-     * @covers ::mockArray
-     */
-    public function testMockArrayWithRef($items, $expectedStructure)
-    {
-        $mocker = new OpenApiDataMocker();
-        $arr = $mocker->mockArray($items);
-        $this->assertIsArray($arr);
-        $this->assertCount(1, $arr);
-        foreach ($arr as $item) {
-            // TODO: replace with assertInstanceOf assertion
-            $this->assertInternalType(IsType::TYPE_OBJECT, $item);
-            foreach ($expectedStructure as $expectedProp => $expectedType) {
-                $this->assertInternalType($expectedType, $item->$expectedProp);
-            }
-        }
-    }
-
-    public function provideMockArrayWithRefArguments()
-    {
-        return [
-            'items with ref to CatRefTestClass' => [
-                ['$ref' => '#/components/schemas/CatRefTestClass'],
-                [
-                    'className' => IsType::TYPE_STRING,
-                    'color' => IsType::TYPE_STRING,
-                    'declawed' => IsType::TYPE_BOOL,
-                ],
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockObjectCorrectArguments
-     * @covers ::mockObject
-     */
-    public function testMockObjectWithCorrectArguments(
-        $properties,
-        $minProperties,
-        $maxProperties,
-        $additionalProperties,
-        $required,
-        $expectedKeys
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $obj = $mocker->mockObject(
-            $properties,
-            $minProperties,
-            $maxProperties,
-            $additionalProperties,
-            $required
-        );
-
-        $this->assertInternalType(IsType::TYPE_OBJECT, $obj);
-        $this->assertSame($expectedKeys, array_keys(get_object_vars($obj)));
-    }
-
-    public function provideMockObjectCorrectArguments()
-    {
-        $additionProps = [
-            'extra' => [
-                'type' => IMocker::DATA_TYPE_STRING,
-            ],
-        ];
-        return [
-            'empty object' => [
-                [], 1, 10, true, null, [],
-            ],
-            'empty object from StdClass' => [
-                new StdClass(), 1, 5, false, null, [],
-            ],
-            'object with username property' => [
-                [
-                    'username' => [
-                        'type' => IMocker::DATA_TYPE_STRING,
-                    ],
-                ], 0, 5, $additionProps, null, ['username'],
-            ],
-            'object with foobar property' => [
-                (object) [
-                    'foobar' => [
-                        'type' => IMocker::DATA_TYPE_INTEGER,
-                    ],
-                ], 1, 1, (object) $additionProps, null, ['foobar'],
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockObjectInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @covers ::mockObject
-     */
-    public function testMockObjectWithInvalidArguments(
-        $properties,
-        $minProperties,
-        $maxProperties,
-        $additionalProperties,
-        $required
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $obj = $mocker->mockObject($properties, $minProperties, $maxProperties, $additionalProperties, $required);
-    }
-
-    public function provideMockObjectInvalidArguments()
-    {
-        return [
-            'properties cannot be null' => [
-                null, 0, 10, false, null,
-            ],
-            'properties cannot be a string' => [
-                'foobar', 0, 10, false, null,
-            ],
-            'property value cannot be a string' => [
-                ['username' => 'foobar'], 0, 10, false, null,
-            ],
-            'minProperties is not integer' => [
-                [], 3.12, null, false, null,
-            ],
-            'minProperties is negative' => [
-                [], -10, null, false, null,
-            ],
-            'minProperties is not number' => [
-                [], '1', null, false, null,
-            ],
-            'maxProperties is not integer' => [
-                [], null, 3.12, false, null,
-            ],
-            'maxProperties is negative' => [
-                [], null, -10, false, null,
-            ],
-            'maxProperties is not number' => [
-                [], null, 'foobaz', false, null,
-            ],
-            'maxProperties less than minProperties' => [
-                [], 5, 2, false, null,
-            ],
-            'additionalProperties is not object|array|boolean' => [
-                [], null, null, 'foobar', null,
-            ],
-            'required is object, not array' => [
-                [], null, null, null, new StdClass(),
-            ],
-            'required is not array' => [
-                [], null, null, null, 'foobar',
-            ],
-            'required array with duplicates' => [
-                [], null, null, null, ['username', 'username'],
-            ],
-            'required array of non-strings' => [
-                [], null, null, null, [1, 2, 3],
-            ],
-        ];
-    }
-
-    /**
-     * @covers ::mockObject
-     */
-    public function testMockObjectWithReferencedProps()
-    {
-        $mocker = new OpenApiDataMocker();
-        $obj = $mocker->mockObject(
-            (object) [
-                'cat' => [
-                    '$ref' => '#/components/schemas/CatRefTestClass',
-                ],
-            ]
-        );
-        $this->assertInternalType(IsType::TYPE_OBJECT, $obj->cat);
-        $this->assertInternalType(IsType::TYPE_STRING, $obj->cat->className);
-        $this->assertInternalType(IsType::TYPE_STRING, $obj->cat->color);
-        $this->assertInternalType(IsType::TYPE_BOOL, $obj->cat->declawed);
-    }
-
-    /**
-     * @dataProvider provideMockFromSchemaCorrectArguments
-     * @covers ::mockFromSchema
-     */
-    public function testMockFromSchemaWithCorrectArguments($schema, $expectedType)
-    {
-        $mocker = new OpenApiDataMocker();
-        $data = $mocker->mockFromSchema($schema);
-        $this->assertInternalType($expectedType, $data);
-    }
-
-    public function provideMockFromSchemaCorrectArguments()
-    {
-        return [
-            'string from object' => [
-                (object) ['type' => IMocker::DATA_TYPE_STRING],
-                IsType::TYPE_STRING,
-            ],
-            'string from array' => [
-                ['type' => IMocker::DATA_TYPE_STRING],
-                IsType::TYPE_STRING,
-            ],
-            'integer from object' => [
-                (object) ['type' => IMocker::DATA_TYPE_INTEGER],
-                IsType::TYPE_INT,
-            ],
-            'integer from array' => [
-                ['type' => IMocker::DATA_TYPE_INTEGER],
-                IsType::TYPE_INT,
-            ],
-            'number from object' => [
-                (object) ['type' => IMocker::DATA_TYPE_NUMBER],
-                IsType::TYPE_FLOAT,
-            ],
-            'number from array' => [
-                ['type' => IMocker::DATA_TYPE_NUMBER],
-                IsType::TYPE_FLOAT,
-            ],
-            'string from object' => [
-                (object) ['type' => IMocker::DATA_TYPE_STRING],
-                IsType::TYPE_STRING,
-            ],
-            'string from array' => [
-                ['type' => IMocker::DATA_TYPE_STRING],
-                IsType::TYPE_STRING,
-            ],
-            'boolean from object' => [
-                (object) ['type' => IMocker::DATA_TYPE_BOOLEAN],
-                IsType::TYPE_BOOL,
-            ],
-            'boolean from array' => [
-                ['type' => IMocker::DATA_TYPE_BOOLEAN],
-                IsType::TYPE_BOOL,
-            ],
-            'array of strings from object' => [
-                (object) [
-                    'type' => IMocker::DATA_TYPE_ARRAY,
-                    'items' => ['type' => IMocker::DATA_TYPE_STRING],
-                ],
-                IsType::TYPE_ARRAY,
-            ],
-            'array of strings from array' => [
-                [
-                    'type' => IMocker::DATA_TYPE_ARRAY,
-                    'items' => ['type' => IMocker::DATA_TYPE_STRING],
-                ],
-                IsType::TYPE_ARRAY,
-            ],
-            'object with username prop from object' => [
-                (object) [
-                    'type' => IMocker::DATA_TYPE_OBJECT,
-                    'properties' => ['username' => ['type' => IMocker::DATA_TYPE_STRING]],
-                ],
-                IsType::TYPE_OBJECT,
-            ],
-            'object with username prop from array' => [
-                [
-                    'type' => IMocker::DATA_TYPE_OBJECT,
-                    'properties' => ['username' => ['type' => IMocker::DATA_TYPE_STRING]],
-                ],
-                IsType::TYPE_OBJECT,
-            ],
-            'referenced class' => [
-                ['$ref' => '#/components/schemas/CatRefTestClass'],
-                IsType::TYPE_OBJECT,
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockFromSchemaInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @covers ::mockFromSchema
-     */
-    public function testMockFromSchemaWithInvalidArguments($schema)
-    {
-        $mocker = new OpenApiDataMocker();
-        $data = $mocker->mockFromSchema($schema);
-    }
-
-
-    public function provideMockFromSchemaInvalidArguments()
-    {
-        return [
-            'null' => [null],
-            'numeric' => [3.14],
-            'empty array' => [[]],
-            'empty object' => [(object) []],
-            'string' => ['foobar'],
-            'DateTime object' => [new DateTime()],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockFromRefCorrectArguments
-     * @covers ::mockFromRef
-     */
-    public function testMockFromRefWithCorrectArguments($ref, $expectedStructure)
-    {
-        $mocker = new OpenApiDataMocker();
-        $data = $mocker->mockFromRef($ref);
-        foreach ($expectedStructure as $expectedProp => $expectedType) {
-            $this->assertInternalType($expectedType, $data->$expectedProp);
-        }
-    }
-
-    public function provideMockFromRefCorrectArguments()
-    {
-        return [
-            'CatRefTestClass model' => [
-                '#/components/schemas/CatRefTestClass',
-                [
-                    'className' => IsType::TYPE_STRING,
-                    'color' => IsType::TYPE_STRING,
-                    'declawed' => IsType::TYPE_BOOL,
-                ]
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockFromRefInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @covers ::mockFromRef
-     */
-    public function testMockFromRefWithInvalidArguments($ref)
-    {
-        $mocker = new OpenApiDataMocker();
-        $data = $mocker->mockFromRef($ref);
-    }
-
-    public function provideMockFromRefInvalidArguments()
-    {
-        return [
-            'ref to unknown class' => ['#/components/schemas/UnknownClass'],
-            'ref to class without getOpenApiSchema method' => ['#/components/schemas/ClassWithoutGetSchemaMethod'],
-        ];
-    }
-}
-
-namespace {{modelPackage}};
-
-// phpcs:disable PSR1.Classes.ClassDeclaration.MultipleClasses
-final class CatRefTestClass
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-    "required" : [ "className" ],
-    "type" : "object",
-    "properties" : {
-        "className" : {
-            "type" : "string"
-        },
-        "color" : {
-            "type" : "string",
-            "default" : "red"
-        },
-        "declawed" : {
-            "type" : "boolean"
-        }
-    },
-    "discriminator" : {
-        "propertyName" : "className"
-    }
-}
-SCHEMA;
-
-    public static function getOpenApiSchema()
-    {
-        return json_decode(static::MODEL_SCHEMA, true);
-    }
-}
-
-final class ClassWithoutGetSchemaMethod
-{
-}
-{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/phpunit.xml.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/phpunit.xml.mustache
index 82f864390833..c8e5d27ca2a7 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/phpunit.xml.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/phpunit.xml.mustache
@@ -15,21 +15,15 @@
             <directory>{{apiTestPath}}</directory>
         </testsuite>
         <testsuite name="Models">
+            <file>./{{testBasePath}}/BaseModelTest.php</file>
             <directory>{{modelTestPath}}</directory>
         </testsuite>
-        <testsuite name="Mock">
-            <directory>{{mockTestPath}}</directory>
-        </testsuite>
-        <testsuite name="Utils">
-            <directory>{{utilsTestPath}}</directory>
-        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">{{apiSrcPath}}</directory>
+            <file>./{{srcBasePath}}/BaseModel.php</file>
             <directory suffix=".php">{{modelSrcPath}}</directory>
-            <directory suffix=".php">{{mockSrcPath}}</directory>
-            <directory suffix=".php">{{utilsSrcPath}}</directory>
         </whitelist>
     </filter>
     <php>
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait.mustache
deleted file mode 100644
index 6d5d15feff63..000000000000
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait.mustache
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/**
- * {{traitNamePrefix}}StringUtils{{traitNameSuffix}}
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace {{utilsPackage}};
-
-/**
- * {{traitNamePrefix}}StringUtils{{traitNameSuffix}} Class Doc Comment
- * This class duplicates functionality of StringUtils.java and AbstractPhpCodegen.java classes.
- *
- * @package {{utilsPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-trait {{traitNamePrefix}}StringUtils{{traitNameSuffix}}
-{
-    /**
-     * Camelize name (parameter, property, method, etc)
-     * This is recreated method of @link modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java class.
-     *
-     * @param string $word                 string to be camelize
-     * @param bool   $lowercaseFirstLetter lower case for first letter if set to true
-     *
-     * @return string camelized string
-     */
-    public static function camelize($word, $lowercaseFirstLetter = false)
-    {
-        // Replace all slashes with dots (package separator)
-        $p = '/\/(.?)/';
-        $word = preg_replace($p, '.$1', $word);
-
-        // case out dots
-        $parts = explode('.', $word);
-        $str = '';
-        foreach ($parts as $z) {
-            if (strlen($z) > 0) {
-                $str .= strtoupper(substr($z, 0, 1)) . substr($z, 1);
-            }
-        }
-        $word = $str;
-
-        // Uppercase the class name.
-        $p = '/(\.?)(\w)([^\.]*)$/';
-        $word = preg_replace_callback($p, function ($matches) {
-            $rep = $matches[1] . strtoupper($matches[2]) . $matches[3];
-            $rep = preg_replace('/\$/', '\\\$', $rep);
-            return $rep;
-        }, $word);
-
-        // Remove all underscores (underscore_case to camelCase)
-        $p = '/(_)(.)/';
-        while (preg_match($p, $word, $matches) === 1) {
-            $original = $matches[2][0];
-            $upperCase = strtoupper($original);
-            if ($original === $upperCase) {
-                $word = preg_replace($p, '$2', $word);
-            } else {
-                $word = preg_replace($p, $upperCase, $word);
-            }
-        }
-
-        // Remove all hyphens (hyphen-case to camelCase)
-        $p = '/(-)(.)/';
-        while (preg_match($p, $word, $matches) === 1) {
-            $upperCase = strtoupper($matches[2][0]);
-            $word = preg_replace($p, $upperCase, $word);
-        }
-
-        if ($lowercaseFirstLetter === true && strlen($word) > 0) {
-            $i = 0;
-            $charAt = substr($word, $i, 1);
-            while (
-                $i + 1 < strlen($word)
-                && !(
-                    ($charAt >= 'a' && $charAt <= 'z')
-                    || ($charAt >= 'A' && $charAt <= 'Z')
-                )
-            ) {
-                $i++;
-                $charAt = substr($word, $i, 1);
-            }
-            $i++;
-            $word = strtolower(substr($word, 0, $i)) . substr($word, $i);
-        }
-
-        // remove all underscore
-        $word = str_replace('_', '', $word);
-
-        return $word;
-    }
-
-    /**
-     * Checks whether string is reserved php keyword.
-     * This is recreated method of @link modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java class.
-     *
-     * @param string $word Checked string
-     *
-     * @return bool
-     */
-    public static function isReservedWord($word)
-    {
-        if (is_string($word) === false) {
-            return false;
-        }
-        // __halt_compiler is ommited because class names with underscores not allowed anyway
-        return in_array(
-            strtolower($word),
-            ['abstract', 'and', 'array', 'as', 'break', 'callable', 'case', 'catch', 'class', 'clone', 'const', 'continue', 'declare', 'default', 'die', 'do', 'echo', 'else', 'elseif', 'empty', 'enddeclare', 'endfor', 'endforeach', 'endif', 'endswitch', 'endwhile', 'eval', 'exit', 'extends', 'final', 'for', 'foreach', 'function', 'global', 'goto', 'if', 'implements', 'include', 'include_once', 'instanceof', 'insteadof', 'interface', 'isset', 'list', 'namespace', 'new', 'or', 'print', 'private', 'protected', 'public', 'require', 'require_once', 'return', 'static', 'switch', 'throw', 'trait', 'try', 'unset', 'use', 'var', 'while', 'xor']
-        );
-    }
-}
-{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait_test.mustache
deleted file mode 100644
index 9698d6bcf6c9..000000000000
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/string_utils_trait_test.mustache
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/**
- * {{traitNamePrefix}}StringUtils{{traitNameSuffix}}Test
- *
- * PHP version 7.1
- *
- * @package {{invokerPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**{{#apiInfo}}{{#appName}}
- * {{{appName}}}
- *
- {{/appName}}
- {{#appDescription}}
- * {{{appDescription}}}
- {{/appDescription}}
- {{#version}}
- * The version of the OpenAPI document: {{{version}}}
- {{/version}}
- {{#infoEmail}}
- * Contact: {{{infoEmail}}}
- {{/infoEmail}}
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace {{utilsPackage}};
-
-use {{utilsPackage}}\{{traitNamePrefix}}StringUtils{{traitNameSuffix}} as StringUtils;
-use PHPUnit\Framework\TestCase;
-
-/**
- * {{traitNamePrefix}}StringUtils{{traitNameSuffix}}Test Class Doc Comment
- *
- * @package {{utilsPackage}}
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \{{utilsPackage}}\{{traitNamePrefix}}StringUtils{{traitNameSuffix}}
- */
-class {{traitNamePrefix}}StringUtils{{traitNameSuffix}}Test extends TestCase
-{
-    /**
-     * @covers ::camelize
-     * @dataProvider provideWordsForCamelizeTest
-     */
-    public function testCamelize($word, $lowercaseFirstLetter, $expectedWord)
-    {
-        $this->assertSame($expectedWord, StringUtils::camelize($word, $lowercaseFirstLetter));
-    }
-
-    public function provideWordsForCamelizeTest()
-    {
-        return [
-            // fixtures from modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/StringUtilsTest.java
-            ['openApiServer/model/pet', null, 'OpenApiServerModelPet'],
-            ['abcd', null, 'Abcd'],
-            ['some-value', null, 'SomeValue'],
-            ['some-Value', null, 'SomeValue'],
-            ['some_value', null, 'SomeValue'],
-            ['some_Value', null, 'SomeValue'],
-            ['$type', null, '$Type'],
-
-            ['abcd', true, 'abcd'],
-            ['some-value', true, 'someValue'],
-            ['some_value', true, 'someValue'],
-            ['Abcd', true, 'abcd'],
-            ['$type', true, '$type'],
-
-            ['123', true, '123'],
-            ['$123', true, '$123'],
-        ];
-    }
-
-    /**
-     * @covers ::isReservedWord
-     * @dataProvider provideWordsForIsReservedTest
-     */
-    public function testisReservedWord($word, $expected)
-    {
-        $this->assertSame($expected, StringUtils::isReservedWord($word));
-    }
-
-    public function provideWordsForIsReservedTest()
-    {
-        return [
-            ['return', true],
-            ['switch', true],
-            ['class', true],
-            ['interface', true],
-            ['ABSTRACT', true],
-            ['Trait', true],
-            ['final', true],
-            ['foobar', false],
-            ['DateTime', false],
-            ['Pet', false],
-            [123, false],
-            [null, false],
-        ];
-    }
-}
-{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/php-ze-ph/README.md.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/README.md.mustache
index 973240bb44ed..1cc1e36e9c29 100644
--- a/modules/openapi-generator/src/main/resources/php-ze-ph/README.md.mustache
+++ b/modules/openapi-generator/src/main/resources/php-ze-ph/README.md.mustache
@@ -5,7 +5,7 @@ Generated by the [OpenAPI Generator](https://openapi-generator.tech) project.
 ## Overview
 This server stub aims to provide light, yet comprehensive structure for your API project using:
 
-- PHP: >=7.1
+- PHP: >=7.2
 - [Zend Expressive](https://zendframework.github.io/zend-expressive): >=3.2
 - [Path Handler](https://github.com/Articus/PathHandler): >=0.4
 
diff --git a/modules/openapi-generator/src/main/resources/php-ze-ph/composer.json.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/composer.json.mustache
index c603ff4ac436..8306bc621e18 100644
--- a/modules/openapi-generator/src/main/resources/php-ze-ph/composer.json.mustache
+++ b/modules/openapi-generator/src/main/resources/php-ze-ph/composer.json.mustache
@@ -5,7 +5,7 @@
     "version": "{{artifactVersion}}",
     "type": "project",
     "require": {
-        "php": "^7.1",
+        "php": "^7.2",
         "ext-yaml": "^2.0",
         "zendframework/zend-expressive": "^3.2",
         "zendframework/zend-diactoros": "^2.1",
diff --git a/modules/openapi-generator/src/main/resources/php/.travis.yml b/modules/openapi-generator/src/main/resources/php/.travis.yml
index cf85d27981a5..b4b1d0a6b5a6 100644
--- a/modules/openapi-generator/src/main/resources/php/.travis.yml
+++ b/modules/openapi-generator/src/main/resources/php/.travis.yml
@@ -1,6 +1,10 @@
 language: php
+# Bionic environment has preinstalled PHP from 7.1 to 7.4
+# https://docs.travis-ci.com/user/reference/bionic/#php-support
+dist: bionic
 php:
-    - 7.1
     - 7.2
+    - 7.3
+    - 7.4
 before_install: "composer install"
 script: "vendor/bin/phpunit"
diff --git a/modules/openapi-generator/src/main/resources/php/ApiException.mustache b/modules/openapi-generator/src/main/resources/php/ApiException.mustache
index 68020161c2fc..185be1a0a0a2 100644
--- a/modules/openapi-generator/src/main/resources/php/ApiException.mustache
+++ b/modules/openapi-generator/src/main/resources/php/ApiException.mustache
@@ -1,7 +1,7 @@
 <?php
 /**
  * ApiException
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  {{invokerPackage}}
diff --git a/modules/openapi-generator/src/main/resources/php/Configuration.mustache b/modules/openapi-generator/src/main/resources/php/Configuration.mustache
index 565b61662e7e..c5885598ae3f 100644
--- a/modules/openapi-generator/src/main/resources/php/Configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/php/Configuration.mustache
@@ -1,7 +1,7 @@
 <?php
 /**
  * Configuration
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  {{invokerPackage}}
@@ -20,7 +20,7 @@ namespace {{invokerPackage}};
 
 /**
  * Configuration Class Doc Comment
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  {{invokerPackage}}
@@ -427,35 +427,35 @@ class Configuration
      */
     public function getHostSettings()
     {
-        return array(
+        return [
         {{#servers}}
-          array(
-            "url" => "{{{url}}}",
-            "description" => "{{{description}}}{{^description}}No description provided{{/description}}",
-            {{#variables}}
-            {{#-first}}
-            "variables" => array(
-            {{/-first}}
-              "{{{name}}}" => array(
-                  "description" => "{{{description}}}{{^description}}No description provided{{/description}}",
-                  "default_value" => "{{{defaultValue}}}",
-                  {{#enumValues}}
-                  {{#-first}}
-                  "enum_values" => array(
-                  {{/-first}}
-                    "{{{.}}}"{{^-last}},{{/-last}}
-                  {{#-last}}
-                  )
-                  {{/-last}}
-                  {{/enumValues}}
-                ){{^-last}},{{/-last}}
-              {{#-last}}
-              )
-              {{/-last}}
-            {{/variables}}
-          ){{^-last}},{{/-last}}
+            [
+                "url" => "{{{url}}}",
+                "description" => "{{{description}}}{{^description}}No description provided{{/description}}",
+                {{#variables}}
+                {{#-first}}
+                "variables" => [
+                {{/-first}}
+                    "{{{name}}}" => [
+                        "description" => "{{{description}}}{{^description}}No description provided{{/description}}",
+                        "default_value" => "{{{defaultValue}}}",
+                        {{#enumValues}}
+                        {{#-first}}
+                        "enum_values" => [
+                        {{/-first}}
+                            "{{{.}}}"{{^-last}},{{/-last}}
+                        {{#-last}}
+                        ]
+                        {{/-last}}
+                        {{/enumValues}}
+                    ]{{^-last}},{{/-last}}
+                {{#-last}}
+                ]
+                {{/-last}}
+                {{/variables}}
+            ]{{^-last}},{{/-last}}
         {{/servers}}
-        );
+        ];
     }
 
     /**
@@ -468,7 +468,7 @@ class Configuration
     public function getHostFromSettings($index, $variables = null)
     {
         if (null === $variables) {
-            $variables = array();
+            $variables = [];
         }
 
         $hosts = $this->getHostSettings();
@@ -484,7 +484,7 @@ class Configuration
         // go through variable and assign a value
         foreach ($host["variables"] as $name => $variable) {
             if (array_key_exists($name, $variables)) { // check to see if it's in the variables provided by the user
-                if (in_array($variables[$name], $variable["enum_values"])) { // check to see if the value is in the enum
+                if (in_array($variables[$name], $variable["enum_values"], true)) { // check to see if the value is in the enum
                     $url = str_replace("{".$name."}", $variables[$name], $url);
                 } else {
                     throw new \InvalidArgumentException("The variable `$name` in the host URL has invalid value ".$variables[$name].". Must be ".join(',', $variable["enum_values"]).".");
diff --git a/modules/openapi-generator/src/main/resources/php/HeaderSelector.mustache b/modules/openapi-generator/src/main/resources/php/HeaderSelector.mustache
index baa2cb00bf76..2fdc0ab204fc 100644
--- a/modules/openapi-generator/src/main/resources/php/HeaderSelector.mustache
+++ b/modules/openapi-generator/src/main/resources/php/HeaderSelector.mustache
@@ -1,7 +1,7 @@
 <?php
 /**
  * ApiException
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  {{invokerPackage}}
diff --git a/modules/openapi-generator/src/main/resources/php/ModelInterface.mustache b/modules/openapi-generator/src/main/resources/php/ModelInterface.mustache
index 63e3a42956c0..fb19c248437a 100644
--- a/modules/openapi-generator/src/main/resources/php/ModelInterface.mustache
+++ b/modules/openapi-generator/src/main/resources/php/ModelInterface.mustache
@@ -2,7 +2,7 @@
 /**
  * ModelInterface
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  {{modelPackage}}
diff --git a/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache b/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache
index edfda4e12f5f..2694de44fe76 100644
--- a/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache
+++ b/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache
@@ -2,7 +2,7 @@
 /**
  * ObjectSerializer
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  {{invokerPackage}}
@@ -192,7 +192,7 @@ class ObjectSerializer
     {
         if ($value instanceof \DateTime) { // datetime in ISO8601 format
             return $value->format(self::$dateTimeFormat);
-        } else if (is_bool($value)) {
+        } elseif (is_bool($value)) {
             return $value ? 'true' : 'false';
         } else {
             return $value;
@@ -252,6 +252,11 @@ class ObjectSerializer
             return null;
         } elseif (strcasecmp(substr($class, -2), '[]') === 0) {
             $data = is_string($data) ? json_decode($data) : $data;
+            
+            if (!is_array($data)) {
+                throw new \InvalidArgumentException("Invalid array '$class'");
+            }
+            
             $subClass = substr($class, 0, -2);
             $values = [];
             foreach ($data as $key => $value) {
diff --git a/modules/openapi-generator/src/main/resources/php/README.mustache b/modules/openapi-generator/src/main/resources/php/README.mustache
index 565eddfdd337..2bb063c5396a 100644
--- a/modules/openapi-generator/src/main/resources/php/README.mustache
+++ b/modules/openapi-generator/src/main/resources/php/README.mustache
@@ -20,7 +20,7 @@ For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
 
 ## Requirements
 
-PHP 7.1 and later
+PHP 7.2 and later
 
 ## Installation & Usage
 
diff --git a/modules/openapi-generator/src/main/resources/php/api.mustache b/modules/openapi-generator/src/main/resources/php/api.mustache
index 86843bfc5f2b..1f83befded22 100644
--- a/modules/openapi-generator/src/main/resources/php/api.mustache
+++ b/modules/openapi-generator/src/main/resources/php/api.mustache
@@ -1,7 +1,7 @@
 <?php
 /**
  * {{classname}}
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  {{invokerPackage}}
diff --git a/modules/openapi-generator/src/main/resources/php/api_test.mustache b/modules/openapi-generator/src/main/resources/php/api_test.mustache
index e3ba5e0ce608..e8c8905c961c 100644
--- a/modules/openapi-generator/src/main/resources/php/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php/api_test.mustache
@@ -1,7 +1,7 @@
 <?php
 /**
  * {{classname}}Test
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  {{invokerPackage}}
@@ -37,28 +37,28 @@ use PHPUnit\Framework\TestCase;
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
     {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/php/composer.mustache b/modules/openapi-generator/src/main/resources/php/composer.mustache
index e3c49a516a41..fdfd0e2438aa 100644
--- a/modules/openapi-generator/src/main/resources/php/composer.mustache
+++ b/modules/openapi-generator/src/main/resources/php/composer.mustache
@@ -22,14 +22,14 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.2",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "guzzlehttp/guzzle": "^6.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.4",
+        "phpunit/phpunit": "^8.0 || ^9.0",
         "friendsofphp/php-cs-fixer": "^2.12"
     },
     "autoload": {
diff --git a/modules/openapi-generator/src/main/resources/php/gitignore b/modules/openapi-generator/src/main/resources/php/gitignore
index edcf63f6aee1..e2316dd486c6 100644
--- a/modules/openapi-generator/src/main/resources/php/gitignore
+++ b/modules/openapi-generator/src/main/resources/php/gitignore
@@ -5,4 +5,10 @@ composer.phar
 
 # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
-composer.lock
\ No newline at end of file
+composer.lock
+
+# php-cs-fixer cache
+.php_cs.cache
+
+# PHPUnit cache
+.phpunit.result.cache
diff --git a/modules/openapi-generator/src/main/resources/php/model.mustache b/modules/openapi-generator/src/main/resources/php/model.mustache
index 7515deb62873..45157dd05209 100644
--- a/modules/openapi-generator/src/main/resources/php/model.mustache
+++ b/modules/openapi-generator/src/main/resources/php/model.mustache
@@ -4,7 +4,7 @@
 /**
  * {{classname}}
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  {{invokerPackage}}
diff --git a/modules/openapi-generator/src/main/resources/php/model_test.mustache b/modules/openapi-generator/src/main/resources/php/model_test.mustache
index eb34ea8f9a78..848a24b5492b 100644
--- a/modules/openapi-generator/src/main/resources/php/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php/model_test.mustache
@@ -4,7 +4,7 @@
 /**
  * {{classname}}Test
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  {{invokerPackage}}
@@ -38,28 +38,28 @@ class {{classname}}Test extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache b/modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache
index ed875bc5e827..31fd8a32a838 100644
--- a/modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache
@@ -44,16 +44,24 @@ $FunctionPath = 'Api', 'Model', 'Client' | ForEach-Object {Join-Path "$ScriptDir
 $Manifest = @{
     Path = "$ScriptDir\src\{{{packageName}}}\{{{packageName}}}.psd1"
 
-    Author = 'OpenAPI Generator Team'
-    CompanyName = 'openapitools.org'
+    Author = '{{{author}}}'
+    CompanyName = '{{{companyName}}}'
     Description = '{{{packageName}}} - the PowerShell module for {{{appName}}}'
 
+    {{#psData}}
+    PrivateData = @{
+        PSData = @{
+            {{{.}}}
+        }
+    }
+
+    {{/psData}}
     ModuleVersion = '{{{packageVersion}}}'
 
     RootModule = '{{{packageName}}}.psm1'
     Guid = '{{packageGuid}}' # Has to be static, otherwise each new build will be considered different module
 
-    PowerShellVersion = '3.0'
+    PowerShellVersion = '{{{powershellVersion}}}'
 
     FunctionsToExport = $FunctionPath | Get-ChildItem -Filter *.ps1 | Get-FunctionsToExport
 
diff --git a/modules/openapi-generator/src/main/resources/powershell/README.mustache b/modules/openapi-generator/src/main/resources/powershell/README.mustache
index 357274b65430..92a130fbddd5 100644
--- a/modules/openapi-generator/src/main/resources/powershell/README.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/README.mustache
@@ -18,7 +18,7 @@ This PowerShell module is automatically generated by the [OpenAPI Generator](htt
 
 <a name="frameworks-supported"></a>
 ## Frameworks supported
-- PowerShell 5.0 or later
+- PowerShell {{{powershellVersion}}} or later
 
 <a name="dependencies"></a>
 ## Dependencies
diff --git a/modules/openapi-generator/src/main/resources/powershell/api.mustache b/modules/openapi-generator/src/main/resources/powershell/api.mustache
index ba001e99c338..114d14c81cec 100644
--- a/modules/openapi-generator/src/main/resources/powershell/api.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/api.mustache
@@ -172,7 +172,7 @@ function {{{vendorExtensions.x-powershell-method-name}}} {
 
         {{/isNullable}}
         {{/required}}
-        $LocalVarBodyParameter = ${{{paramName}}} | ConvertTo-Json
+        $LocalVarBodyParameter = ${{{paramName}}} | ConvertTo-Json -Depth 100
 
         {{/bodyParam}}
         {{#authMethods}}
@@ -225,12 +225,12 @@ function {{{vendorExtensions.x-powershell-method-name}}} {
 
         {{#vendorExtensions.x-ps-return-type-one-of}}
         # process oneOf response
-        $LocalVarResult["Response"] = ConvertFrom-{{apiNamePrefix}}JsonTo{{returnType}} (ConvertTo-Json $LocalVarResult["Response"])
+        $LocalVarResult["Response"] = ConvertFrom-{{apiNamePrefix}}JsonTo{{returnType}} (ConvertTo-Json $LocalVarResult["Response"] -Depth 100)
 
         {{/vendorExtensions.x-ps-return-type-one-of}}
         {{#vendorExtensions.x-ps-return-type-any-of}}
         # process anyOf response
-        $LocalVarResult["Response"] = ConvertFrom-{{apiNamePrefix}}JsonTo{{returnType}} (ConvertTo-Json $LocalVarResult["Response"])
+        $LocalVarResult["Response"] = ConvertFrom-{{apiNamePrefix}}JsonTo{{returnType}} (ConvertTo-Json $LocalVarResult["Response"] -Depth 100)
 
         {{/vendorExtensions.x-ps-return-type-any-of}}
         if ($WithHttpInfo.IsPresent) {
diff --git a/modules/openapi-generator/src/main/resources/powershell/api_test.mustache b/modules/openapi-generator/src/main/resources/powershell/api_test.mustache
index 9c3362aad55e..3d7d526cf9c9 100644
--- a/modules/openapi-generator/src/main/resources/powershell/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/api_test.mustache
@@ -4,7 +4,7 @@ Describe -tag '{{{packageName}}}' -name '{{{apiNamePrefix}}}{{{classname}}}' {
 {{#operation}}
     Context '{{{vendorExtensions.x-powershell-method-name}}}' {
         It 'Test {{{vendorExtensions.x-powershell-method-name}}}' {
-            #$TestResult = Invoke-PetApiGetPetById{{#allParams}} -{{{paramName}}} "TEST_VALUE"{{/allParams}}
+            #$TestResult = {{{vendorExtensions.x-powershell-method-name}}}{{#allParams}} -{{{paramName}}} "TEST_VALUE"{{/allParams}}
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
diff --git a/modules/openapi-generator/src/main/resources/powershell/model_oneof.mustache b/modules/openapi-generator/src/main/resources/powershell/model_oneof.mustache
index e71d77814d25..39a1044c1f3f 100644
--- a/modules/openapi-generator/src/main/resources/powershell/model_oneof.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/model_oneof.mustache
@@ -65,7 +65,7 @@ function ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{classname}}} {
                 Write-Debug "Failed to match '{{{modelName}}}' defined in oneOf ({{{apiNamePrefix}}}{{{classname}}}) using the discriminator lookup ({{{mappingName}}}). Proceeding with the typical oneOf type matching."
             }
         }
-    
+
         {{/mappedModels}}
         {{/discriminator}}
         {{/useOneOfDiscriminatorLookup}}
diff --git a/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache b/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache
index ab7098fe9f9e..95310597e615 100644
--- a/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache
@@ -8,9 +8,16 @@
 {{#description}}{{{description}}}{{/description}}{{^description}}No description available.{{/description}}
 
 {{#allVars}}
+{{^discardReadOnly}}
 .PARAMETER {{{name}}}
 {{#description}}{{{description}}}{{/description}}{{^description}}No description available.{{/description}}
-
+{{/discardReadOnly}}
+{{#discardReadOnly}}
+{{^isReadOnly}}
+.PARAMETER {{{name}}}
+{{#description}}{{{description}}}{{/description}}{{^description}}No description available.{{/description}}
+{{/isReadOnly}}
+{{/discardReadOnly}}
 {{/allVars}}
 .OUTPUTS
 
@@ -20,6 +27,26 @@
 function Initialize-{{{apiNamePrefix}}}{{{classname}}} {
     [CmdletBinding()]
     Param (
+{{#discardReadOnly}}
+    {{#allVars}}
+    {{^isReadOnly}}
+        [Parameter(ValueFromPipelineByPropertyName = $true)]
+        {{#pattern}}
+        [ValidatePattern("{{{.}}}")]
+        {{/pattern}}
+        {{#isEnum}}
+        {{#allowableValues}}
+        [ValidateSet({{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}})]
+        {{/allowableValues}}
+        {{/isEnum}}
+        [{{vendorExtensions.x-powershell-data-type}}]
+        {{=<% %>=}}
+        ${<%name%>}<%^vendorExtensions.x-powershell-last-writable%>,<%/vendorExtensions.x-powershell-last-writable%>
+        <%={{ }}=%>
+    {{/isReadOnly}}
+{{/allVars}}
+{{/discardReadOnly}}
+{{^discardReadOnly}}        
 {{#allVars}}
         [Parameter(Position = {{vendorExtensions.x-index}}, ValueFromPipelineByPropertyName = $true)]
         {{#pattern}}
@@ -35,13 +62,75 @@ function Initialize-{{{apiNamePrefix}}}{{{classname}}} {
         ${<%name%>}<%^-last%>,<%/-last%>
         <%={{ }}=%>
 {{/allVars}}
+{{/discardReadOnly}}
     )
 
     Process {
         'Creating PSCustomObject: {{{packageName}}} => {{{apiNamePrefix}}}{{{classname}}}' | Write-Debug
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
+        {{^discardReadOnly}}
+        {{#vars}}
+        {{^isNullable}}
+        {{#required}}
+        if (!${{{name}}}) {
+            throw "invalid value for '{{{name}}}', '{{{name}}}' cannot be null."
+        }
+
+        {{/required}}
+        {{/isNullable}}
+        {{#hasValidation}}
+        {{#maxLength}}
+        if ({{^required}}!${{{name}}} -and {{/required}}${{{name}}}.length -gt {{{maxLength}}}) {
+            throw "invalid value for '{{{name}}}', the character length must be smaller than or equal to {{{maxLength}}}."
+        }
+
+        {{/maxLength}}
+        {{#minLength}}
+        if ({{^required}}!${{{name}}} -and {{/required}}${{{name}}}.length -lt {{{minLength}}}) {
+            throw "invalid value for '{{{name}}}', the character length must be great than or equal to {{{minLength}}}."
+        }
+
+        {{/minLength}}
+        {{#maximum}}
+        if ({{^required}}!${{{name}}} -and {{/required}}${{{name}}} {{#exclusiveMaximum}}-ge{{/exclusiveMaximum}}{{^exclusiveMaximum}}-gt{{/exclusiveMaximum}} {{{maximum}}}) {
+          throw "invalid value for '{{{name}}}', must be smaller than {{^exclusiveMaximum}}or equal to {{/exclusiveMaximum}}{{{maximum}}}."
+        }
+
+        {{/maximum}}
+        {{#minimum}}
+        if ({{^required}}!${{{name}}} -and {{/required}}${{{name}}} {{#exclusiveMinimum}}-le{{/exclusiveMinimum}}{{^exclusiveMinimum}}-lt{{/exclusiveMinimum}} {{{minimum}}}) {
+          throw "invalid value for '{{{name}}}', must be greater than {{^exclusiveMinimum}}or equal to {{/exclusiveMinimum}}{{{minimum}}}."
+        }
+
+        {{/minimum}}
+        {{#maxItems}}
+        if ({{^required}}!${{{name}}} -and {{/required}}${{{name}}}.length -gt {{{maxItems}}}) {
+            throw "invalid value for '{{{name}}}', number of items must be less than or equal to {{{maxItems}}}."
+        }
+
+        {{/maxItems}}
+        {{#minItems}}
+        if ({{^required}}!${{{name}}} -and {{/required}}${{{name}}}.length -lt {{{minItems}}}) {
+            throw "invalid value for '{{{name}}}', number of items must be greater than or equal to {{{minItems}}}."
+        }
+
+        {{/minItems}}
+        {{/hasValidation}}
+        {{/vars}} 
+
+        $PSO = [PSCustomObject]@{
+            {{=<< >>=}}
+            <<#allVars>>
+            "<<baseName>>" = ${<<name>>}
+            <</allVars>>
+            <<={{ }}=>>
+        }
+
+        {{/discardReadOnly}}
+        {{#discardReadOnly}}
         {{#vars}}
+        {{^isReadOnly}}
         {{^isNullable}}
         {{#required}}
         if (!${{{name}}}) {
@@ -88,14 +177,19 @@ function Initialize-{{{apiNamePrefix}}}{{{classname}}} {
 
         {{/minItems}}
         {{/hasValidation}}
+        {{/isReadOnly}}
         {{/vars}}
+        
         $PSO = [PSCustomObject]@{
             {{=<< >>=}}
             <<#allVars>>
+            <<^isReadOnly>>
             "<<baseName>>" = ${<<name>>}
+            <</isReadOnly>>
             <</allVars>>
             <<={{ }}=>>
         }
+        {{/discardReadOnly}}
 
         return $PSO
     }
@@ -157,7 +251,7 @@ function ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{classname}}} {
 
         {{/-first}}
         if (!([bool]($JsonParameters.PSobject.Properties.name -match "{{{baseName}}}"))) {
-            throw "Error! JSON cannot be serialized due to the required property `{{{baseName}}}` missing." 
+            throw "Error! JSON cannot be serialized due to the required property `{{{baseName}}}` missing."
         } else {
             ${{name}} = $JsonParameters.PSobject.Properties["{{{baseName}}}"].value
         }
diff --git a/modules/openapi-generator/src/main/resources/python/api.mustache b/modules/openapi-generator/src/main/resources/python/api.mustache
index 18ced57845ee..1dcbb8607863 100644
--- a/modules/openapi-generator/src/main/resources/python/api.mustache
+++ b/modules/openapi-generator/src/main/resources/python/api.mustache
@@ -103,6 +103,10 @@ class {{classname}}(object):
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -137,7 +141,8 @@ class {{classname}}(object):
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -266,6 +271,7 @@ class {{classname}}(object):
             {{#servers.0}}
             _host=local_var_host,
             {{/servers.0}}
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 {{/operation}}
 {{/operations}}
diff --git a/modules/openapi-generator/src/main/resources/python/api_client.mustache b/modules/openapi-generator/src/main/resources/python/api_client.mustache
index 66d3577f3c25..7eb04b6943df 100644
--- a/modules/openapi-generator/src/main/resources/python/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/python/api_client.mustache
@@ -132,7 +132,8 @@ class ApiClient(object):
             query_params=None, header_params=None, body=None, post_params=None,
             files=None, response_type=None, auth_settings=None,
             _return_http_data_only=None, collection_formats=None,
-            _preload_content=True, _request_timeout=None, _host=None):
+            _preload_content=True, _request_timeout=None, _host=None,
+            _request_auth=None):
 
         config = self.configuration
 
@@ -173,7 +174,9 @@ class ApiClient(object):
             post_params.extend(self.files_parameters(files))
 
         # auth setting
-        self.update_params_for_auth(header_params, query_params, auth_settings)
+        self.update_params_for_auth(
+            header_params, query_params, auth_settings,
+            request_auth=_request_auth)
 
         # body
         if body:
@@ -347,7 +350,8 @@ class ApiClient(object):
                  body=None, post_params=None, files=None,
                  response_type=None, auth_settings=None, async_req=None,
                  _return_http_data_only=None, collection_formats=None,
-                 _preload_content=True, _request_timeout=None, _host=None):
+                 _preload_content=True, _request_timeout=None, _host=None,
+                 _request_auth=None):
         """Makes the HTTP request (synchronous) and returns deserialized data.
 
         To make an async_req request, set the async_req parameter.
@@ -377,6 +381,10 @@ class ApiClient(object):
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_token: dict, optional
         :return:
             If async_req parameter is True,
             the request will be called asynchronously.
@@ -390,7 +398,8 @@ class ApiClient(object):
                                    body, post_params, files,
                                    response_type, auth_settings,
                                    _return_http_data_only, collection_formats,
-                                   _preload_content, _request_timeout, _host)
+                                   _preload_content, _request_timeout, _host,
+                                   _request_auth)
 
         return self.pool.apply_async(self.__call_api, (resource_path,
                                                        method, path_params,
@@ -403,7 +412,7 @@ class ApiClient(object):
                                                        collection_formats,
                                                        _preload_content,
                                                        _request_timeout,
-                                                       _host))
+                                                       _host, _request_auth))
 
     def request(self, method, url, query_params=None, headers=None,
                 post_params=None, body=None, _preload_content=True,
@@ -550,29 +559,45 @@ class ApiClient(object):
         else:
             return content_types[0]
 
-    def update_params_for_auth(self, headers, querys, auth_settings):
+    def update_params_for_auth(self, headers, querys, auth_settings,
+                               request_auth=None):
         """Updates header and query params based on authentication setting.
 
         :param headers: Header parameters dict to be updated.
         :param querys: Query parameters tuple list to be updated.
         :param auth_settings: Authentication setting identifiers list.
+        :param request_auth: if set, the provided settings will
+                             override the token in the configuration.
         """
         if not auth_settings:
             return
 
+        if request_auth:
+            self._apply_auth_params(headers, querys, request_auth)
+            return
+
         for auth in auth_settings:
             auth_setting = self.configuration.auth_settings().get(auth)
             if auth_setting:
-                if auth_setting['in'] == 'cookie':
-                    headers['Cookie'] = auth_setting['value']
-                elif auth_setting['in'] == 'header':
-                    headers[auth_setting['key']] = auth_setting['value']
-                elif auth_setting['in'] == 'query':
-                    querys.append((auth_setting['key'], auth_setting['value']))
-                else:
-                    raise ApiValueError(
-                        'Authentication token must be in `query` or `header`'
-                    )
+                self._apply_auth_params(headers, querys, auth_setting)
+
+    def _apply_auth_params(self, headers, querys, auth_setting):
+        """Updates the request parameters based on a single auth_setting
+
+        :param headers: Header parameters dict to be updated.
+        :param querys: Query parameters tuple list to be updated.
+        :param auth_setting: auth settings for the endpoint
+        """
+        if auth_setting['in'] == 'cookie':
+            headers['Cookie'] = auth_setting['value']
+        elif auth_setting['in'] == 'header':
+            headers[auth_setting['key']] = auth_setting['value']
+        elif auth_setting['in'] == 'query':
+            querys.append((auth_setting['key'], auth_setting['value']))
+        else:
+            raise ApiValueError(
+                'Authentication token must be in `query` or `header`'
+            )
 
     def __deserialize_file(self, response):
         """Deserializes body to file
diff --git a/modules/openapi-generator/src/main/resources/python/configuration.mustache b/modules/openapi-generator/src/main/resources/python/configuration.mustache
index d1705eed25d2..8025a1b655ad 100644
--- a/modules/openapi-generator/src/main/resources/python/configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/python/configuration.mustache
@@ -67,6 +67,15 @@ class Configuration(object):
     :param signing_info: Configuration parameters for the HTTP signature security scheme.
         Must be an instance of {{{packageName}}}.signing.HttpSigningConfiguration
 {{/hasHttpSignatureMethods}}
+    :param server_index: Index to servers configuration.
+    :param server_variables: Mapping with string values to replace variables in
+      templated server configuration. The validation of enums is performed for
+      variables with defined enum values before.
+    :param server_operation_index: Mapping from operation ID to an index to server
+      configuration.
+    :param server_operation_variables: Mapping from operation ID to a mapping with
+      string values to replace variables in templated server configuration.
+      The validation of enums is performed for variables with defined enum values before.
 
 {{#hasAuthMethods}}
     :Example:
@@ -155,7 +164,7 @@ conf = {{{packageName}}}.Configuration(
 
     _default = None
 
-    def __init__(self, host="{{{basePath}}}",
+    def __init__(self, host=None,
                  api_key=None, api_key_prefix=None,
                  username=None, password=None,
                  discard_unknown_keys=False,
@@ -163,12 +172,22 @@ conf = {{{packageName}}}.Configuration(
 {{#hasHttpSignatureMethods}}
                  signing_info=None,
 {{/hasHttpSignatureMethods}}
+                 server_index=None, server_variables=None,
+                 server_operation_index=None, server_operation_variables=None,
                  ):
         """Constructor
         """
-        self.host = host
+        self._base_path = "{{{basePath}}}" if host is None else host
         """Default Base url
         """
+        self.server_index = 0 if server_index is None and host is None else server_index
+        self.server_operation_index = server_operation_index or {}
+        """Default server index
+        """
+        self.server_variables = server_variables or {}
+        self.server_operation_variables = server_operation_variables or {}
+        """Default server variables
+        """
         self.temp_folder_path = None
         """Temp file folder for downloading files
         """
@@ -280,7 +299,7 @@ conf = {{{packageName}}}.Configuration(
         self.retries = None
         """Adding retries to override urllib3 default value 3
         """
-        # Disable client side validation
+        # Enable client side validation
         self.client_side_validation = True
 
     def __deepcopy__(self, memo):
@@ -423,15 +442,16 @@ conf = {{{packageName}}}.Configuration(
         self.__logger_format = value
         self.logger_formatter = logging.Formatter(self.__logger_format)
 
-    def get_api_key_with_prefix(self, identifier):
+    def get_api_key_with_prefix(self, identifier, alias=None):
         """Gets API key (with prefix if set).
 
         :param identifier: The identifier of apiKey.
+        :param alias: The alternative identifier of apiKey.
         :return: The token for api key authentication.
         """
         if self.refresh_api_key_hook is not None:
             self.refresh_api_key_hook(self)
-        key = self.api_key.get(identifier)
+        key = self.api_key.get(identifier, self.api_key.get(alias) if alias is not None else None)
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
@@ -462,12 +482,15 @@ conf = {{{packageName}}}.Configuration(
         auth = {}
 {{#authMethods}}
 {{#isApiKey}}
-        if '{{keyParamName}}' in self.api_key:
+        if '{{name}}' in self.api_key{{#vendorExtensions.x-auth-id-alias}} or '{{.}}' in self.api_key{{/vendorExtensions.x-auth-id-alias}}:
             auth['{{name}}'] = {
                 'type': 'api_key',
                 'in': {{#isKeyInCookie}}'cookie'{{/isKeyInCookie}}{{#isKeyInHeader}}'header'{{/isKeyInHeader}}{{#isKeyInQuery}}'query'{{/isKeyInQuery}},
                 'key': '{{keyParamName}}',
-                'value': self.get_api_key_with_prefix('{{keyParamName}}')
+                'value': self.get_api_key_with_prefix(
+                    '{{name}}',{{#vendorExtensions.x-auth-id-alias}}
+                    alias='{{.}}',{{/vendorExtensions.x-auth-id-alias}}
+                ),
             }
 {{/isApiKey}}
 {{#isBasic}}
@@ -561,14 +584,18 @@ conf = {{{packageName}}}.Configuration(
             {{/servers}}
         ]
 
-    def get_host_from_settings(self, index, variables=None):
+    def get_host_from_settings(self, index, variables=None, servers=None):
         """Gets host URL based on the index and variables
         :param index: array index of the host settings
         :param variables: hash of variable and the corresponding value
+        :param servers: an array of host settings or None
         :return: URL based on host settings
         """
+        if index is None:
+            return self._base_path
+
         variables = {} if variables is None else variables
-        servers = self.get_host_settings()
+        servers = self.get_host_settings() if servers is None else servers
 
         try:
             server = servers[index]
@@ -580,7 +607,7 @@ conf = {{{packageName}}}.Configuration(
         url = server['url']
 
         # go through variables and replace placeholders
-        for variable_name, variable in server['variables'].items():
+        for variable_name, variable in server.get('variables', {}).items():
             used_value = variables.get(
                 variable_name, variable['default_value'])
 
@@ -595,3 +622,14 @@ conf = {{{packageName}}}.Configuration(
             url = url.replace("{" + variable_name + "}", used_value)
 
         return url
+
+    @property
+    def host(self):
+        """Return generated host."""
+        return self.get_host_from_settings(self.server_index, variables=self.server_variables)
+
+    @host.setter
+    def host(self, value):
+        """Fix base path."""
+        self._base_path = value
+        self.server_index = None
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/__init__apis.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/__init__apis.mustache
index b5b7065e1ed2..da3937f8c542 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/__init__apis.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/__init__apis.mustache
@@ -2,18 +2,21 @@
 
 # flake8: noqa
 
-# import all apis into this package
-# if you have many ampis here with many many models used in each api this may
-# raise a RecursionError
-# to avoid this, import only the api that you directly need like:
-# from {{packagename}}.api.pet_api import PetApi
+# Import all APIs into this package.
+# If you have many APIs here with many many models used in each API this may
+# raise a `RecursionError`.
+# In order to avoid this, import only the API that you directly need like:
+#
+#   from {{packagename}}.api.pet_api import PetApi
+#
 # or import this package, but before doing it, use:
-# import sys
-# sys.setrecursionlimit(n)
+#
+#   import sys
+#   sys.setrecursionlimit(n)
 
-# import apis into api package
+# Import APIs into API package:
 {{#apiInfo}}
 {{#apis}}
 from {{apiPackage}}.{{classVarName}} import {{classname}}
 {{/apis}}
-{{/apiInfo}}
\ No newline at end of file
+{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/api.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/api.mustache
index 92e909165d6e..ad5decabf012 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/api.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/api.mustache
@@ -10,11 +10,7 @@ import sys  # noqa: F401
 # python 2 and python 3 compatibility library
 import six
 
-from {{packageName}}.api_client import ApiClient
-from {{packageName}}.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from {{packageName}}.api_client import ApiClient, Endpoint
 from {{packageName}}.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -103,9 +99,9 @@ class {{classname}}(object):
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -131,7 +127,7 @@ class {{classname}}(object):
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
 {{#requiredParams}}
             kwargs['{{paramName}}'] = \
                 {{paramName}}
@@ -160,13 +156,37 @@ class {{classname}}(object):
 {{#-first}}
                 'servers': [
 {{/-first}}
-                    '{{{url}}}'{{^-last}},{{/-last}}
+                    {
+                        'url': "{{{url}}}",
+                        'description': "{{{description}}}{{^description}}No description provided{{/description}}",
+                        {{#variables}}
+                        {{#-first}}
+                        'variables': {
+                        {{/-first}}
+                            '{{{name}}}': {
+                                'description': "{{{description}}}{{^description}}No description provided{{/description}}",
+                                'default_value': "{{{defaultValue}}}",
+                                {{#enumValues}}
+                                {{#-first}}
+                                'enum_values': [
+                                {{/-first}}
+                                    "{{{.}}}"{{^-last}},{{/-last}}
+                                {{#-last}}
+                                ]
+                                {{/-last}}
+                                {{/enumValues}}
+                                }{{^-last}},{{/-last}}
+                        {{#-last}}
+                            }
+                        {{/-last}}
+                        {{/variables}}
+                    },
 {{#-last}}
                 ]
 {{/-last}}
 {{/servers}}
 {{^servers}}
-                'servers': [],
+                'servers': None,
 {{/servers}}
             },
             params_map={
@@ -293,223 +313,3 @@ class {{classname}}(object):
         )
 {{/operation}}
 {{/operations}}
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/api_client.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/api_client.mustache
index d17177a8328b..d3b0b6f60e97 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/api_client.mustache
@@ -18,16 +18,20 @@ import tornado.gen
 
 from {{packageName}} import rest
 from {{packageName}}.configuration import Configuration
-from {{packageName}}.exceptions import ApiValueError, ApiException
+from {{packageName}}.exceptions import ApiTypeError, ApiValueError, ApiException
 from {{packageName}}.model_utils import (
     ModelNormal,
     ModelSimple,
     ModelComposed,
+    check_allowed_values,
+    check_validations,
     date,
     datetime,
     deserialize_file,
     file_type,
+    int,
     model_to_dict,
+    none_type,
     str,
     validate_and_convert_types
 )
@@ -597,3 +601,231 @@ class ApiClient(object):
                     raise ApiValueError(
                         'Authentication token must be in `query` or `header`'
                     )
+
+
+class Endpoint(object):
+    def __init__(self, settings=None, params_map=None, root_map=None,
+                 headers_map=None, api_client=None, callable=None):
+        """Creates an endpoint
+
+        Args:
+            settings (dict): see below key value pairs
+                'response_type' (tuple/None): response type
+                'auth' (list): a list of auth type keys
+                'endpoint_path' (str): the endpoint path
+                'operation_id' (str): endpoint string identifier
+                'http_method' (str): POST/PUT/PATCH/GET etc
+                'servers' (list): list of str servers that this endpoint is at
+            params_map (dict): see below key value pairs
+                'all' (list): list of str endpoint parameter names
+                'required' (list): list of required parameter names
+                'nullable' (list): list of nullable parameter names
+                'enum' (list): list of parameters with enum values
+                'validation' (list): list of parameters with validations
+            root_map
+                'validations' (dict): the dict mapping endpoint parameter tuple
+                    paths to their validation dictionaries
+                'allowed_values' (dict): the dict mapping endpoint parameter
+                    tuple paths to their allowed_values (enum) dictionaries
+                'openapi_types' (dict): param_name to openapi type
+                'attribute_map' (dict): param_name to camelCase name
+                'location_map' (dict): param_name to  'body', 'file', 'form',
+                    'header', 'path', 'query'
+                collection_format_map (dict): param_name to `csv` etc.
+            headers_map (dict): see below key value pairs
+                'accept' (list): list of Accept header strings
+                'content_type' (list): list of Content-Type header strings
+            api_client (ApiClient) api client instance
+            callable (function): the function which is invoked when the
+                Endpoint is called
+        """
+        self.settings = settings
+        self.params_map = params_map
+        self.params_map['all'].extend([
+            'async_req',
+            '_host_index',
+            '_preload_content',
+            '_request_timeout',
+            '_return_http_data_only',
+            '_check_input_type',
+            '_check_return_type'
+        ])
+        self.params_map['nullable'].extend(['_request_timeout'])
+        self.validations = root_map['validations']
+        self.allowed_values = root_map['allowed_values']
+        self.openapi_types = root_map['openapi_types']
+        extra_types = {
+            'async_req': (bool,),
+            '_host_index': (none_type, int),
+            '_preload_content': (bool,),
+            '_request_timeout': (none_type, int, (int,), [int]),
+            '_return_http_data_only': (bool,),
+            '_check_input_type': (bool,),
+            '_check_return_type': (bool,)
+        }
+        self.openapi_types.update(extra_types)
+        self.attribute_map = root_map['attribute_map']
+        self.location_map = root_map['location_map']
+        self.collection_format_map = root_map['collection_format_map']
+        self.headers_map = headers_map
+        self.api_client = api_client
+        self.callable = callable
+
+    def __validate_inputs(self, kwargs):
+        for param in self.params_map['enum']:
+            if param in kwargs:
+                check_allowed_values(
+                    self.allowed_values,
+                    (param,),
+                    kwargs[param]
+                )
+
+        for param in self.params_map['validation']:
+            if param in kwargs:
+                check_validations(
+                    self.validations,
+                    (param,),
+                    kwargs[param],
+                    configuration=self.api_client.configuration
+                )
+
+        if kwargs['_check_input_type'] is False:
+            return
+
+        for key, value in six.iteritems(kwargs):
+            fixed_val = validate_and_convert_types(
+                value,
+                self.openapi_types[key],
+                [key],
+                False,
+                kwargs['_check_input_type'],
+                configuration=self.api_client.configuration
+            )
+            kwargs[key] = fixed_val
+
+    def __gather_params(self, kwargs):
+        params = {
+            'body': None,
+            'collection_format': {},
+            'file': {},
+            'form': [],
+            'header': {},
+            'path': {},
+            'query': []
+        }
+
+        for param_name, param_value in six.iteritems(kwargs):
+            param_location = self.location_map.get(param_name)
+            if param_location is None:
+                continue
+            if param_location:
+                if param_location == 'body':
+                    params['body'] = param_value
+                    continue
+                base_name = self.attribute_map[param_name]
+                if (param_location == 'form' and
+                        self.openapi_types[param_name] == (file_type,)):
+                    params['file'][param_name] = [param_value]
+                elif (param_location == 'form' and
+                        self.openapi_types[param_name] == ([file_type],)):
+                    # param_value is already a list
+                    params['file'][param_name] = param_value
+                elif param_location in {'form', 'query'}:
+                    param_value_full = (base_name, param_value)
+                    params[param_location].append(param_value_full)
+                if param_location not in {'form', 'query'}:
+                    params[param_location][base_name] = param_value
+                collection_format = self.collection_format_map.get(param_name)
+                if collection_format:
+                    params['collection_format'][base_name] = collection_format
+
+        return params
+
+    def __call__(self, *args, **kwargs):
+        """ This method is invoked when endpoints are called
+        Example:
+        pet_api = PetApi()
+        pet_api.add_pet  # this is an instance of the class Endpoint
+        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
+        which then invokes the callable functions stored in that endpoint at
+        pet_api.add_pet.callable or self.callable in this class
+        """
+        return self.callable(self, *args, **kwargs)
+
+    def call_with_http_info(self, **kwargs):
+
+        try:
+            index = self.api_client.configuration.server_operation_index.get(
+                self.settings['operation_id'], self.api_client.configuration.server_index
+            ) if kwargs['_host_index'] is None else kwargs['_host_index']
+            server_variables = self.api_client.configuration.server_operation_variables.get(
+                self.settings['operation_id'], self.api_client.configuration.server_variables
+            )
+            _host = self.api_client.configuration.get_host_from_settings(
+                index, variables=server_variables, servers=self.settings['servers']
+            )
+        except IndexError:
+            if self.settings['servers']:
+                raise ApiValueError(
+                    "Invalid host index. Must be 0 <= index < %s" %
+                    len(self.settings['servers'])
+                )
+            _host = None
+
+        for key, value in six.iteritems(kwargs):
+            if key not in self.params_map['all']:
+                raise ApiTypeError(
+                    "Got an unexpected parameter '%s'"
+                    " to method `%s`" %
+                    (key, self.settings['operation_id'])
+                )
+            # only throw this nullable ApiValueError if _check_input_type
+            # is False, if _check_input_type==True we catch this case
+            # in self.__validate_inputs
+            if (key not in self.params_map['nullable'] and value is None
+                    and kwargs['_check_input_type'] is False):
+                raise ApiValueError(
+                    "Value may not be None for non-nullable parameter `%s`"
+                    " when calling `%s`" %
+                    (key, self.settings['operation_id'])
+                )
+
+        for key in self.params_map['required']:
+            if key not in kwargs.keys():
+                raise ApiValueError(
+                    "Missing the required parameter `%s` when calling "
+                    "`%s`" % (key, self.settings['operation_id'])
+                )
+
+        self.__validate_inputs(kwargs)
+
+        params = self.__gather_params(kwargs)
+
+        accept_headers_list = self.headers_map['accept']
+        if accept_headers_list:
+            params['header']['Accept'] = self.api_client.select_header_accept(
+                accept_headers_list)
+
+        content_type_headers_list = self.headers_map['content_type']
+        if content_type_headers_list:
+            header_list = self.api_client.select_header_content_type(
+                content_type_headers_list)
+            params['header']['Content-Type'] = header_list
+
+        return self.api_client.call_api(
+            self.settings['endpoint_path'], self.settings['http_method'],
+            params['path'],
+            params['query'],
+            params['header'],
+            body=params['body'],
+            post_params=params['form'],
+            files=params['file'],
+            response_type=self.settings['response_type'],
+            auth_settings=self.settings['auth'],
+            async_req=kwargs['async_req'],
+            _check_type=kwargs['_check_return_type'],
+            _return_http_data_only=kwargs['_return_http_data_only'],
+            _preload_content=kwargs['_preload_content'],
+            _request_timeout=kwargs['_request_timeout'],
+            _host=_host,
+            collection_formats=params['collection_format'])
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/model_simple.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/model_simple.mustache
index 95b8a81715b2..bc582ff796d3 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/model_simple.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/model_simple.mustache
@@ -11,6 +11,8 @@ class {{unescapedDescription}}(ModelSimple):
 
 {{> python-experimental/model_templates/classvars }}
 
+    attribute_map = {}
+
     _composed_schemas = None
 
 {{> python-experimental/model_templates/method_init_normal}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache
index b1db9b329c6c..58859114bdc1 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache
@@ -951,7 +951,7 @@ def is_type_nullable(input_type):
     if issubclass(input_type, OpenApiModel) and input_type._nullable:
         return True
     if issubclass(input_type, ModelComposed):
-        # If oneOf/anyOf, check if the 'null' type is one of the allowed types.          
+        # If oneOf/anyOf, check if the 'null' type is one of the allowed types.
         for t in input_type._composed_schemas.get('oneOf', ()):
             if is_type_nullable(t): return True
         for t in input_type._composed_schemas.get('anyOf', ()):
@@ -975,7 +975,7 @@ def is_valid_type(input_class_simple, valid_classes):
             input_class_simple is none_type):
         for valid_class in valid_classes:
             if input_class_simple is none_type and is_type_nullable(valid_class):
-                # Schema is oneOf/anyOf and the 'null' type is one of the allowed types.            
+                # Schema is oneOf/anyOf and the 'null' type is one of the allowed types.
                 return True
             if not (issubclass(valid_class, OpenApiModel) and valid_class.discriminator):
                 continue
@@ -1138,6 +1138,8 @@ def model_to_dict(model_instance, serialize=True):
                     if hasattr(item[1], '_data_store') else item,
                     value.items()
                 ))
+            elif isinstance(value, ModelSimple):
+                result[attr] = value.value
             elif hasattr(value, '_data_store'):
                 result[attr] = model_to_dict(value, serialize=serialize)
             else:
diff --git a/modules/openapi-generator/src/main/resources/python/python_doc_auth_partial.mustache b/modules/openapi-generator/src/main/resources/python/python_doc_auth_partial.mustache
index 3086d770b183..460c2df938dd 100644
--- a/modules/openapi-generator/src/main/resources/python/python_doc_auth_partial.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python_doc_auth_partial.mustache
@@ -95,11 +95,11 @@ configuration = {{{packageName}}}.Configuration(
 configuration = {{{packageName}}}.Configuration(
     host = "{{{basePath}}}",
     api_key = {
-        '{{{keyParamName}}}': 'YOUR_API_KEY'
+        '{{name}}': 'YOUR_API_KEY'
     }
 )
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['{{{keyParamName}}}'] = 'Bearer'
+# configuration.api_key_prefix['{{name}}'] = 'Bearer'
 {{/isApiKey}}
 {{#isOAuth}}
 
diff --git a/modules/openapi-generator/src/main/resources/r/api.mustache b/modules/openapi-generator/src/main/resources/r/api.mustache
index b3057454cdb9..a32d43ba2e63 100644
--- a/modules/openapi-generator/src/main/resources/r/api.mustache
+++ b/modules/openapi-generator/src/main/resources/r/api.mustache
@@ -271,7 +271,9 @@
       if (httr::status_code(resp) >= 200 && httr::status_code(resp) <= 299) {
         {{#returnType}}
         {{#isPrimitiveType}}
-        content <- httr::content(resp, "text", encoding = "UTF-8")
+        content <- httr::content(
+            resp, "text", encoding = "UTF-8", simplifyVector = FALSE
+        )
         ApiResponse$new(content,resp)
         {{/isPrimitiveType}}
         {{^isPrimitiveType}}
diff --git a/modules/openapi-generator/src/main/resources/r/api_client.mustache b/modules/openapi-generator/src/main/resources/r/api_client.mustache
index 22fd994ab642..8a403315fa15 100644
--- a/modules/openapi-generator/src/main/resources/r/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/r/api_client.mustache
@@ -166,7 +166,9 @@ ApiClient  <- R6::R6Class(
       else if (exists(returnType, pkgEnv) && !(c(returnType) %in% primitiveTypes)) {
         returnType <- get(returnType, envir = as.environment(pkgEnv))
         returnObj <- returnType$new()
-        returnObj$fromJSON(jsonlite::toJSON(obj, digits = NA))
+        returnObj$fromJSON(
+          jsonlite::toJSON(obj, digits = NA, auto_unbox = TRUE)
+        )
       } 
 
       # To handle primitive type
diff --git a/modules/openapi-generator/src/main/resources/r/api_test.mustache b/modules/openapi-generator/src/main/resources/r/api_test.mustache
index 6b0bbcf87164..1b7e184d85fb 100644
--- a/modules/openapi-generator/src/main/resources/r/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/r/api_test.mustache
@@ -17,7 +17,7 @@ test_that("{{{operationId}}}", {
   # {{notes}}
   {{/notes}}
 {{#allParams}}
-  # @param {{{dataType}}}  {{{paramName}}}  {{{description}}} {{^required}} (optional){{/required}}
+  # @param {{{paramName}}} {{{dataType}}} {{{description}}}{{^required}} (optional){{/required}}
 {{/allParams}}
   # @return [{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}]
 
diff --git a/modules/openapi-generator/src/main/resources/r/model.mustache b/modules/openapi-generator/src/main/resources/r/model.mustache
index bf04a1221447..aba9d1b987be 100644
--- a/modules/openapi-generator/src/main/resources/r/model.mustache
+++ b/modules/openapi-generator/src/main/resources/r/model.mustache
@@ -3,15 +3,21 @@
 {{>partial_header}}
 #' @docType class
 #' @title {{classname}}
+#'
 #' @description {{classname}} Class
+#'
 #' @format An \code{R6Class} generator object
+#'
 {{#vars}}
 #' @field {{baseName}} {{title}} {{#isContainer}}{{#isListContainer}}list( {{/isListContainer}}{{#isMapContainer}}named list( {{/isMapContainer}}{{/isContainer}}{{^isPrimitiveType}}\link{{=<% %>=}}{<%/isPrimitiveType%><%={{ }}=%>{{#isContainer}}{{#items}}{{dataType}}{{/items}}{{/isContainer}}{{^isContainer}}{{dataType}}{{/isContainer}}{{=<% %>=}}<%^isPrimitiveType%>}<%={{ }}=%>{{/isPrimitiveType}}{{#isContainer}}{{#isListContainer}} ){{/isListContainer}}{{#isMapContainer}} ){{/isMapContainer}}{{/isContainer}} {{^required}}[optional]{{/required}}
 #'
 {{/vars}}
-#'
 #' @importFrom R6 R6Class
 #' @importFrom jsonlite fromJSON toJSON
+{{#isEnum}}
+{{>modelEnum}}
+{{/isEnum}}
+{{^isEnum}}
 #' @export
 {{classname}} <- R6::R6Class(
   '{{classname}}',
@@ -19,7 +25,9 @@
     {{#vars}}
     `{{{baseName}}}` = NULL,
     {{/vars}}
-    initialize = function({{#requiredVars}}`{{baseName}}`{{#hasMore}}, {{/hasMore}}{{/requiredVars}}{{#optionalVars}}{{#-first}}{{#requiredVars.0}}, {{/requiredVars.0}}{{/-first}}`{{baseName}}`={{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}NULL{{/defaultValue}}{{^-last}}, {{/-last}}{{/optionalVars}}, ...){
+    initialize = function(
+        {{#requiredVars}}`{{baseName}}`, {{/requiredVars}}{{#optionalVars}}`{{baseName}}`={{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}NULL{{/defaultValue}}, {{/optionalVars}}...
+    ) {
       local.optional.var <- list(...)
       {{#requiredVars}}
       if (!missing(`{{baseName}}`)) {
@@ -159,6 +167,7 @@
         {{/isContainer}}
       }
       {{/vars}}
+      self
     },
     toJSONString = function() {
       jsoncontent <- c(
@@ -241,5 +250,7 @@
     }
   )
 )
+{{/isEnum}}
 {{/model}}
 {{/models}}
+
diff --git a/modules/openapi-generator/src/main/resources/r/modelEnum.mustache b/modules/openapi-generator/src/main/resources/r/modelEnum.mustache
new file mode 100644
index 000000000000..c648c0365fcc
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/r/modelEnum.mustache
@@ -0,0 +1,48 @@
+#' @export
+{{#allowableValues}}
+{{classname}} <- R6::R6Class(
+    "{{classname}}",
+    public = list(
+        initialize = function(...) {
+            local.optional.var <- list(...)
+            val <- unlist(local.optional.var)
+            enumvec <- .parse_{{name}}()
+
+            stopifnot(length(val) == 1L)
+
+            if (!val %in% enumvec)
+                stop("Use one of the valid values: ",
+                    paste0(enumvec, collapse = ", "))
+            private$value <- val
+        },
+        toJSON = function() {
+            jsonlite::toJSON(private$value, auto_unbox = TRUE)
+        },
+        fromJSON = function({{classname}}Json) {
+            private$value <- jsonlite::fromJSON({{classname}}Json,
+                simplifyVector = FALSE)
+            self
+        },
+        toJSONString = function() {
+            as.character(jsonlite::toJSON(private$value,
+                auto_unbox = TRUE))
+        },
+        fromJSONString = function({{classname}}Json) {
+            private$value <- jsonlite::fromJSON({{classname}}Json,
+                simplifyVector = FALSE)
+            self
+        }
+    ),
+    private = list(
+        value = NULL
+    )
+)
+
+# add to utils.R
+.parse_{{name}} <- function(vals) {
+    res <- gsub("^\\[|\\]$", "",
+        "{{{values}}}"
+    )
+    unlist(strsplit(res, ", "))
+}
+{{/allowableValues}}
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/gemspec.mustache b/modules/openapi-generator/src/main/resources/ruby-client/gemspec.mustache
index 0fe63c2e47bc..06334b127cb7 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/gemspec.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/gemspec.mustache
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
   {{^isFaraday}}
   s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1'
   {{/isFaraday}}
-  s.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0'
 
   s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
 
diff --git a/modules/openapi-generator/src/main/resources/rust-server/client-imports.mustache b/modules/openapi-generator/src/main/resources/rust-server/client-imports.mustache
index 673a6856f437..f4a0bbd93cc1 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/client-imports.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/client-imports.mustache
@@ -9,13 +9,14 @@ use std::io::{ErrorKind, Read};
 use std::error::Error;
 use std::future::Future;
 use std::fmt;
+use std::marker::PhantomData;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 use std::str;
 use std::str::FromStr;
 use std::string::ToString;
 use std::task::{Context, Poll};
-use swagger::{ApiError, AuthData, BodyExt, Connector, Has, XSpanIdString};
+use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, XSpanIdString};
 use url::form_urlencoded;
 
 {{#apiUsesMultipartFormData}}
diff --git a/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache b/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
index 506cf8c8654a..386c68eebc2f 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
@@ -27,49 +27,57 @@ fn into_base_path(input: impl TryInto<Uri, Error=hyper::http::uri::InvalidUri>,
 }
 
 /// A client that implements the API by making HTTP calls out to a server.
-pub struct Client<S> where
+pub struct Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Inner service
     client_service: S,
 
     /// Base path of the API
     base_path: String,
+
+    /// Marker
+    marker: PhantomData<fn(C)>,
 }
 
-impl<S> fmt::Debug for Client<S> where
+impl<S, C> fmt::Debug for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Client {{ base_path: {} }}", self.base_path)
     }
 }
 
-impl<S> Clone for Client<S> where
+impl<S, C> Clone for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn clone(&self) -> Self {
         Self {
             client_service: self.client_service.clone(),
             base_path: self.base_path.clone(),
+            marker: PhantomData,
         }
     }
 }
 
-impl<C> Client<hyper::client::Client<C, Body>> where
-      C: hyper::client::connect::Connect + Clone + Send + Sync + 'static
+impl<Connector, C> Client<DropContextService<hyper::client::Client<Connector, Body>, C>, C> where
+    Connector: hyper::client::connect::Connect + Clone + Send + Sync + 'static,
+    C: Clone + Send + Sync + 'static,
 {
     /// Create a client with a custom implementation of hyper::client::Connect.
     ///
@@ -88,14 +96,16 @@ impl<C> Client<hyper::client::Client<C, Body>> where
     pub fn try_new_with_connector(
         base_path: &str,
         protocol: Option<&'static str>,
-        connector: C,
+        connector: Connector,
     ) -> Result<Self, ClientInitError>
     {
         let client_service = hyper::client::Client::builder().build(connector);
+        let client_service = DropContextService::new(client_service);
 
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, protocol)?,
+            marker: PhantomData,
         })
     }
 }
@@ -126,7 +136,9 @@ impl Service<Request<Body>> for HyperClient {
     }
 }
 
-impl Client<HyperClient> {
+impl<C> Client<DropContextService<HyperClient, C>, C> where
+    C: Clone + Send + Sync + 'static,
+{
     /// Create an HTTP client.
     ///
     /// # Arguments
@@ -156,14 +168,18 @@ impl Client<HyperClient> {
             }
         };
 
+        let client_service = DropContextService::new(client_service);
+
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
 
-impl Client<hyper::client::Client<hyper::client::HttpConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<hyper::client::HttpConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create an HTTP client.
     ///
@@ -184,7 +200,8 @@ type HttpsConnector = hyper_tls::HttpsConnector<hyper::client::HttpConnector>;
 #[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
 type HttpsConnector = hyper_openssl::HttpsConnector<hyper::client::HttpConnector>;
 
-impl Client<hyper::client::Client<HttpsConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<HttpsConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create a client with a TLS connection to the server
     ///
@@ -249,12 +266,13 @@ impl Client<hyper::client::Client<HttpsConnector, Body>>
     }
 }
 
-impl<S> Client<S> where
+impl<S, C> Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Constructor for creating a `Client` by passing in a pre-made `hyper::service::Service` /
     /// `tower::Service`
@@ -268,6 +286,7 @@ impl<S> Client<S> where
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
@@ -313,13 +332,13 @@ impl Error for ClientInitError {
 }
 
 #[async_trait]
-impl<C, S> Api<C> for Client<S> where
-    C: Has<XSpanIdString> {{#hasAuthMethods}}+ Has<Option<AuthData>>{{/hasAuthMethods}} + Clone + Send + Sync + 'static,
+impl<S, C> Api<C> for Client<S, C> where
     S: Service<
-       Request<Body>,
+       (Request<Body>, C),
        Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Has<XSpanIdString> {{#hasAuthMethods}}+ Has<Option<AuthData>>{{/hasAuthMethods}} + Clone + Send + Sync + 'static,
 {
     fn poll_ready(&self, cx: &mut Context) -> Poll<Result<(), crate::ServiceError>> {
         match self.client_service.clone().poll_ready(cx) {
diff --git a/modules/openapi-generator/src/main/resources/rust-server/client-operation.mustache b/modules/openapi-generator/src/main/resources/rust-server/client-operation.mustache
index a027811c122a..8db0196e44b1 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/client-operation.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/client-operation.mustache
@@ -36,7 +36,23 @@
   {{^required}}
             if let Some(param_{{{paramName}}}) = param_{{{paramName}}} {
   {{/required}}
-                query_string.append_pair("{{{baseName}}}", &param_{{{paramName}}}{{#isListContainer}}.iter().map(ToString::to_string).collect::<Vec<String>>().join(","){{/isListContainer}}{{^isListContainer}}.to_string(){{/isListContainer}});
+                query_string.append_pair("{{{baseName}}}",
+  {{#vendorExtensions}}
+    {{#x-consumes-json}}
+                    &match serde_json::to_string(&param_{{{paramName}}}) {
+                        Ok(str) => str,
+                        Err(e) => return Err(ApiError(format!("Unable to serialize {{{paramName}}} to string: {}", e))),
+                    });
+    {{/x-consumes-json}}
+    {{^x-consumes-json}}
+      {{#isListContainer}}
+                    &param_{{{paramName}}}.iter().map(ToString::to_string).collect::<Vec<String>>().join(","));
+      {{/isListContainer}}
+      {{^isListContainer}}
+                    &param_{{{paramName}}}.to_string());
+      {{/isListContainer}}
+    {{/x-consumes-json}}
+  {{/vendorExtensions}}
   {{^required}}
             }
   {{/required}}
@@ -87,7 +103,7 @@
           {{#jsonSchema}}
             let {{{paramName}}}_str = match serde_json::to_string(&param_{{{paramName}}}) {
                 Ok(str) => str,
-                Err(e) => return Err(ApiError(format!("Unable to parse {{{paramName}}} to string: {}", e))),
+                Err(e) => return Err(ApiError(format!("Unable to serialize {{{paramName}}} to string: {}", e))),
             };
 
             let {{{paramName}}}_vec = {{{paramName}}}_str.as_bytes().to_vec();
@@ -134,6 +150,7 @@
         };
 
         *request.body_mut() = Body::from(body_string);
+
         request.headers_mut().insert(CONTENT_TYPE, match HeaderValue::from_str(&multipart_header) {
             Ok(h) => h,
             Err(e) => return Err(ApiError(format!("Unable to create header: {} - {}", multipart_header, e)))
@@ -365,7 +382,7 @@
 {{/isMapContainer}}
 
 {{/headerParams}}
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -373,18 +390,29 @@
             {{{code}}} => {
 {{#headers}}
                 let response_{{{name}}} = match response.headers().get(HeaderName::from_static("{{{nameInLowerCase}}}")) {
-                    Some(response_{{{name}}}) => response_{{{name}}}.clone(),
-                    None => {
-                        return Err(ApiError(String::from("Required response header {{{baseName}}} for response {{{code}}} was not found.")));
-                    }
-                };
-                let response_{{{name}}} = match TryInto::<header::IntoHeaderValue<{{{dataType}}}>>::try_into(response_{{{name}}}) {
-                    Ok(value) => value,
-                    Err(e) => {
-                        return Err(ApiError(format!("Invalid response header {{baseName}} for response {{code}} - {}", e)));
-                    },
+                    Some(response_{{{name}}}) => {
+                        let response_{{{name}}} = response_{{{name}}}.clone();
+                        let response_{{{name}}} = match TryInto::<header::IntoHeaderValue<{{{dataType}}}>>::try_into(response_{{{name}}}) {
+                            Ok(value) => value,
+                            Err(e) => {
+                                return Err(ApiError(format!("Invalid response header {{baseName}} for response {{code}} - {}", e)));
+                            },
+                        };
+                        let response_{{{name}}} = response_{{{name}}}.0;
+  {{#required}}
+                        response_{{{name}}}
+  {{/required}}
+  {{^required}}
+                        Some(response_{{{name}}})
+  {{/required}}
+                        },
+  {{#required}}
+                    None => return Err(ApiError(String::from("Required response header {{{baseName}}} for response {{{code}}} was not found."))),
+  {{/required}}
+  {{^required}}
+                    None => None,
+  {{/required}}
                 };
-                let response_{{{name}}} = response_{{{name}}}.0;
 
 {{/headers}}
                 let body = response.into_body();
diff --git a/modules/openapi-generator/src/main/resources/rust-server/response.mustache b/modules/openapi-generator/src/main/resources/rust-server/response.mustache
index ca2dbe7a6a6c..9269eea6386f 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/response.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/response.mustache
@@ -38,7 +38,17 @@ pub enum {{{operationId}}}Response {
       {{/hasHeaders}}
     {{/dataType}}
     {{#headers}}
-        {{{name}}}: {{{datatype}}}{{^-last}},{{/-last}}
+        {{{name}}}:
+      {{^required}}
+        Option<
+      {{/required}}
+        {{{datatype}}}
+      {{^required}}
+        >
+      {{/required}}
+        {{^-last}}
+        ,
+        {{/-last}}
       {{#-last}}
     }
       {{/-last}}
diff --git a/modules/openapi-generator/src/main/resources/rust-server/server-callbacks.mustache b/modules/openapi-generator/src/main/resources/rust-server/server-callbacks.mustache
index c51299077f73..51ae0fcadd9b 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/server-callbacks.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/server-callbacks.mustache
@@ -17,45 +17,53 @@ use crate::{{{operationId}}}Response;
 {{/apiInfo}}
 
 /// A client that implements the API by making HTTP calls out to a server.
-pub struct Client<S> where
+pub struct Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>,
            Error=hyper::Error> + Clone + Send + Sync,
     S::Future: Send + 'static,
+    C: Clone + Send + Sync + 'static
 {
     /// Inner service
     client_service: S,
+
+    /// Marker
+    marker: PhantomData<fn(C)>,
 }
 
-impl<S> fmt::Debug for Client<S> where
+impl<S, C> fmt::Debug for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>,
            Error=hyper::Error> + Clone + Send + Sync,
     S::Future: Send + 'static,
+    C: Clone + Send + Sync + 'static
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Client")
     }
 }
 
-impl<S> Clone for Client<S> where
+impl<S, C> Clone for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>,
            Error=hyper::Error> + Clone + Send + Sync,
     S::Future: Send + 'static,
+    C: Clone + Send + Sync + 'static
 {
     fn clone(&self) -> Self {
         Self {
             client_service: self.client_service.clone(),
+            marker: PhantomData,
         }
     }
 }
 
-impl<C> Client<hyper::client::Client<C, Body>> where
-      C: hyper::client::connect::Connect + Clone + Send + Sync + 'static
+impl<Connector, C> Client<DropContextService<hyper::client::Client<Connector, Body>, C>, C> where
+    Connector: hyper::client::connect::Connect + Clone + Send + Sync + 'static,
+    C: Clone + Send + Sync + 'static
 {
     /// Create a client with a custom implementation of hyper::client::Connect.
     ///
@@ -69,17 +77,20 @@ impl<C> Client<hyper::client::Client<C, Body>> where
     /// # Arguments
     ///
     /// * `connector` - Implementation of `hyper::client::Connect` to use for the client
-    pub fn new_with_connector(connector: C) -> Self
+    pub fn new_with_connector(connector: Connector) -> Self
     {
         let client_service = hyper::client::Client::builder().build(connector);
+        let client_service = DropContextService::new(client_service);
 
         Self {
             client_service,
+            marker: PhantomData,
         }
     }
 }
 
-impl Client<hyper::client::Client<hyper::client::HttpConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<hyper::client::HttpConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create an HTTP client.
     pub fn new_http() -> Self {
@@ -94,7 +105,8 @@ type HttpConnector = hyper_tls::HttpsConnector<hyper::client::HttpConnector>;
 #[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
 type HttpsConnector = hyper_openssl::HttpsConnector<hyper::client::HttpConnector>;
 
-impl Client<hyper::client::Client<HttpsConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<HttpsConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create a client with a TLS connection to the server.
     #[cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))]
@@ -155,12 +167,13 @@ impl Client<hyper::client::Client<HttpsConnector, Body>>
     }
 }
 
-impl<S> Client<S> where
+impl<S, C> Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>,
            Error=hyper::Error> + Clone + Send + Sync,
     S::Future: Send + 'static,
+    C: Clone + Send + Sync + 'static
 {
     /// Constructor for creating a `Client` by passing in a pre-made `swagger::Service`
     ///
@@ -170,19 +183,20 @@ impl<S> Client<S> where
     ) -> Self {
         Client {
             client_service,
+            marker: PhantomData,
         }
     }
 }
 
 #[async_trait]
-impl<C, S> CallbackApi<C> for Client<S> where
-    C: Has<XSpanIdString> {{#hasAuthMethods}}+ Has<Option<AuthData>>{{/hasAuthMethods}} + Send + Sync,
+impl<S, C> CallbackApi<C> for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>,
            Error=hyper::Error> + Clone + Send + Sync,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Has<XSpanIdString> {{#hasAuthMethods}}+ Has<Option<AuthData>>{{/hasAuthMethods}} + Clone + Send + Sync,
 {
     fn poll_ready(&self, cx: &mut Context) -> Poll<Result<(), crate::ServiceError>> {
         match self.client_service.clone().poll_ready(cx) {
diff --git a/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache b/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache
index 8243908defd7..106a0f71970e 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache
@@ -121,43 +121,83 @@
   {{/-last}}
 {{/headerParams}}
 {{#queryParams}}
-{{#-first}}
+  {{#-first}}
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = form_urlencoded::parse(uri.query().unwrap_or_default().as_bytes()).collect::<Vec<_>>();
-{{/-first}}
+  {{/-first}}
                 let param_{{{paramName}}} = query_params.iter().filter(|e| e.0 == "{{{baseName}}}").map(|e| e.1.to_owned())
-{{#isListContainer}}
+  {{#isListContainer}}
+    {{^vendorExtensions.x-consumes-json}}
                     .filter_map(|param_{{{paramName}}}| param_{{{paramName}}}.parse().ok())
                     .collect::<Vec<_>>();
-{{^required}}
+      {{^required}}
                 let param_{{{paramName}}} = if !param_{{{paramName}}}.is_empty() {
                     Some(param_{{{paramName}}})
                 } else {
                     None
                 };
-{{/required}}
-{{/isListContainer}}
-{{^isListContainer}}
+      {{/required}}
+    {{/vendorExtensions.x-consumes-json}}
+    {{#vendorExtensions.x-consumes-json}}
                     .nth(0);
-{{#required}}
                 let param_{{{paramName}}} = match param_{{{paramName}}} {
-                    Some(param_{{{paramName}}}) => match param_{{{paramName}}}.parse::<{{{dataType}}}>() {
-                        Ok(param_{{{paramName}}}) => param_{{{paramName}}},
-                        Err(e) => return Ok(Response::builder()
-                                        .status(StatusCode::BAD_REQUEST)
-                                        .body(Body::from(format!("Couldn't parse query parameter {{{baseName}}} - doesn't match schema: {}", e)))
-                                        .expect("Unable to create Bad Request response for invalid query parameter {{{baseName}}}")),
+                    Some(param_{{{paramName}}}) => {
+                        let param_{{{paramName}}} =
+                            serde_json::from_str::<{{{dataType}}}>
+                                (&param_{{{paramName}}});
+                        match param_{{{paramName}}} {
+                            Ok(param_{{{paramName}}}) => Some(param_{{{paramName}}}),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter {{{baseName}}} - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter {{{baseName}}}")),
+                        }
                     },
+                    None => None,
+                };
+      {{#required}}
+                let param_{{{paramName}}} = match param_{{{paramName}}} {
+                    Some(param_{{{paramName}}}) => param_{{{paramName}}},
                     None => return Ok(Response::builder()
-                                        .status(StatusCode::BAD_REQUEST)
-                                        .body(Body::from("Missing required query parameter {{{baseName}}}"))
-                                        .expect("Unable to create Bad Request response for missing qeury parameter {{{baseName}}}")),
+                        .status(StatusCode::BAD_REQUEST)
+                        .body(Body::from("Missing required query parameter {{{baseName}}}"))
+                        .expect("Unable to create Bad Request response for missing query parameter {{{baseName}}}")),
                 };
-{{/required}}
-{{^required}}
-                let param_{{{paramName}}} = param_{{{paramName}}}.and_then(|param_{{{paramName}}}| param_{{{paramName}}}.parse::<{{{baseType}}}>().ok());
-{{/required}}
-{{/isListContainer}}
+      {{/required}}
+    {{/vendorExtensions.x-consumes-json}}
+  {{/isListContainer}}
+  {{^isListContainer}}
+                    .nth(0);
+                let param_{{{paramName}}} = match param_{{{paramName}}} {
+                    Some(param_{{{paramName}}}) => {
+                        let param_{{{paramName}}} =
+    {{#vendorExtensions.x-consumes-json}}
+                            serde_json::from_str::<{{{dataType}}}>
+    {{/vendorExtensions.x-consumes-json}}
+    {{^vendorExtensions.x-consumes-json}}
+                            <{{{dataType}}} as std::str::FromStr>::from_str
+    {{/vendorExtensions.x-consumes-json}}
+                                (&param_{{{paramName}}});
+                        match param_{{{paramName}}} {
+                            Ok(param_{{{paramName}}}) => Some(param_{{{paramName}}}),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter {{{baseName}}} - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter {{{baseName}}}")),
+                        }
+                    },
+                    None => None,
+                };
+    {{#required}}
+                let param_{{{paramName}}} = match param_{{{paramName}}} {
+                    Some(param_{{{paramName}}}) => param_{{{paramName}}},
+                    None => return Ok(Response::builder()
+                        .status(StatusCode::BAD_REQUEST)
+                        .body(Body::from("Missing required query parameter {{{baseName}}}"))
+                        .expect("Unable to create Bad Request response for missing query parameter {{{baseName}}}")),
+                };
+    {{/required}}
+  {{/isListContainer}}
   {{#-last}}
 
   {{/-last}}
@@ -496,6 +536,9 @@
 {{/dataType}}
                                                 => {
 {{#headers}}
+  {{^required}}
+                                                    if let Some({{{name}}}) = {{{name}}} {
+  {{/required}}
                                                     let {{{name}}} = match header::IntoHeaderValue({{{name}}}).try_into() {
                                                         Ok(val) => val,
                                                         Err(e) => {
@@ -506,14 +549,15 @@
                                                         }
                                                     };
 
-{{/headers}}
-                                                    *response.status_mut() = StatusCode::from_u16({{{code}}}).expect("Unable to turn {{{code}}} into a StatusCode");
-{{#headers}}
                                                     response.headers_mut().insert(
                                                         HeaderName::from_static("{{{nameInLowerCase}}}"),
                                                         {{name}}
                                                     );
+  {{^required}}
+                                                    }
+  {{/required}}
 {{/headers}}
+                                                    *response.status_mut() = StatusCode::from_u16({{{code}}}).expect("Unable to turn {{{code}}} into a StatusCode");
 {{#produces}}
 {{#-first}}
 {{#dataType}}
diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
index 15df4868d15b..62d63e1b9b14 100644
--- a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
@@ -1,27 +1,10 @@
 {{>partial_header}}
-#[allow(unused_imports)]
-use std::rc::Rc;
-use std::borrow::Borrow;
-use std::option::Option;
 
 use reqwest;
 
+use crate::apis::ResponseContent;
 use super::{Error, configuration};
 
-{{^supportAsync}}
-pub struct {{{classname}}}Client {
-    configuration: Rc<configuration::Configuration>,
-}
-
-impl {{{classname}}}Client {
-    pub fn new(configuration: Rc<configuration::Configuration>) -> {{{classname}}}Client {
-        {{{classname}}}Client {
-            configuration,
-        }
-    }
-}
-
-{{/supportAsync}}
 {{#operations}}
 {{#operation}}
 {{#vendorExtensions.x-group-parameters}}
@@ -44,241 +27,282 @@ pub struct {{{operationIdCamelCase}}}Params {
 {{/operation}}
 {{/operations}}
 
-{{^supportAsync}}
-pub trait {{{classname}}} {
+{{#supportMultipleResponses}}
 {{#operations}}
 {{#operation}}
-    {{#vendorExtensions.x-group-parameters}}
-    fn {{{operationId}}}(&self{{#allParams}}{{#-first}}, params: {{{operationIdCamelCase}}}Params{{/-first}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error>;
-    {{/vendorExtensions.x-group-parameters}}
-    {{^vendorExtensions.x-group-parameters}}
-    fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{^required}}Option<{{/required}}{{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{^required}}>{{/required}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error>;
-    {{/vendorExtensions.x-group-parameters}}
+/// struct for typed successes of method `{{operationId}}`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum {{{operationIdCamelCase}}}Success {
+    {{#responses}}
+    {{#is2xx}}
+    Status{{code}}({{#isEnum}}{{{enumName}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}),
+    {{/is2xx}}
+    {{#is3xx}}
+    Status{{code}}({{#isEnum}}{{{enumName}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}),
+    {{/is3xx}}
+    {{/responses}}
+    UnknownValue(serde_json::Value),
+}
+
 {{/operation}}
 {{/operations}}
+{{/supportMultipleResponses}}
+{{#operations}}
+{{#operation}}
+/// struct for typed errors of method `{{operationId}}`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum {{{operationIdCamelCase}}}Error {
+    {{#responses}}
+    {{#is4xx}}
+    Status{{code}}({{#isEnum}}{{{enumName}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}),
+    {{/is4xx}}
+    {{#is5xx}}
+    Status{{code}}({{#isEnum}}{{{enumName}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}),
+    {{/is5xx}}
+    {{#isDefault}}
+    DefaultResponse({{#isEnum}}{{{enumName}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}),
+    {{/isDefault}}
+    {{/responses}}
+    UnknownValue(serde_json::Value),
 }
 
-impl {{{classname}}} for {{{classname}}}Client {
-{{/supportAsync}}
+{{/operation}}
+{{/operations}}
+
 {{#operations}}
 {{#operation}}
-    {{#vendorExtensions.x-group-parameters}}
-    {{#supportAsync}}pub async {{/supportAsync}}fn {{{operationId}}}({{^supportAsync}}&self{{/supportAsync}}{{#supportAsync}}configuration: &configuration::Configuration{{/supportAsync}}{{#allParams}}{{#-first}}, params: {{{operationIdCamelCase}}}Params{{/-first}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error> {
-        // unbox the parameters
-        {{#allParams}}
-        let {{paramName}} = params.{{paramName}};
-        {{/allParams}}
+{{#description}}
+/// {{{.}}}
+{{/description}}
+{{#notes}}
+/// {{{.}}}
+{{/notes}}
+{{#vendorExtensions.x-group-parameters}}
+pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: &configuration::Configuration{{#allParams}}{{#-first}}, params: {{{operationIdCamelCase}}}Params{{/-first}}{{/allParams}}) -> Result<{{#supportMultipleResponses}}ResponseContent<{{{operationIdCamelCase}}}Success>{{/supportMultipleResponses}}{{^supportMultipleResponses}}{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}{{/supportMultipleResponses}}, Error<{{{operationIdCamelCase}}}Error>> {
+    // unbox the parameters
+    {{#allParams}}
+    let {{paramName}} = params.{{paramName}};
+    {{/allParams}}
 
-    {{/vendorExtensions.x-group-parameters}}
-    {{^vendorExtensions.x-group-parameters}}
-    {{#supportAsync}}pub async {{/supportAsync}}fn {{{operationId}}}({{^supportAsync}}&self{{/supportAsync}}{{#supportAsync}}configuration: &configuration::Configuration{{/supportAsync}}, {{#allParams}}{{{paramName}}}: {{^required}}Option<{{/required}}{{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{^required}}>{{/required}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error> {
-    {{/vendorExtensions.x-group-parameters}}
-        {{^supportAsync}}
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        {{/supportAsync}}
-        let client = &configuration.client;
+{{/vendorExtensions.x-group-parameters}}
+{{^vendorExtensions.x-group-parameters}}
+pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: &configuration::Configuration, {{#allParams}}{{{paramName}}}: {{^required}}Option<{{/required}}{{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{^required}}>{{/required}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{#supportMultipleResponses}}ResponseContent<{{{operationIdCamelCase}}}Success>{{/supportMultipleResponses}}{{^supportMultipleResponses}}{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}{{/supportMultipleResponses}}, Error<{{{operationIdCamelCase}}}Error>> {
+{{/vendorExtensions.x-group-parameters}}
 
-        let uri_str = format!("{}{{{path}}}", configuration.base_path{{#pathParams}}, {{{baseName}}}={{#isString}}crate::apis::urlencode({{/isString}}{{{paramName}}}{{^required}}.unwrap(){{/required}}{{#required}}{{#isNullable}}.unwrap(){{/isNullable}}{{/required}}{{#isListContainer}}.join(",").as_ref(){{/isListContainer}}{{#isString}}){{/isString}}{{/pathParams}});
-        let mut req_builder = client.{{{httpMethod}}}(uri_str.as_str());
+    let client = &configuration.client;
 
-        {{#queryParams}}
-        {{#required}}
-        req_builder = req_builder.query(&[("{{{baseName}}}", &{{{paramName}}}{{#isListContainer}}.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(","){{/isListContainer}}.to_string())]);
-        {{/required}}
-        {{^required}}
-        if let Some(ref s) = {{{paramName}}} {
-            req_builder = req_builder.query(&[("{{{baseName}}}", &s{{#isListContainer}}.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(","){{/isListContainer}}.to_string())]);
-        }
-        {{/required}}
-        {{/queryParams}}
-        {{#hasAuthMethods}}
-        {{#authMethods}}
-        {{#isApiKey}}
-        {{#isKeyInQuery}}
-        if let Some(ref apikey) = configuration.api_key {
-            let key = apikey.key.clone();
-            let val = match apikey.prefix {
-                Some(ref prefix) => format!("{} {}", prefix, key),
-                None => key,
-            };
-            req_builder = req_builder.query(&[("{{{keyParamName}}}", val)]);
-        }
-        {{/isKeyInQuery}}
-        {{/isApiKey}}
-        {{/authMethods}}
-        {{/hasAuthMethods}}
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        {{#hasHeaderParams}}
-        {{#headerParams}}
-        {{#required}}
-        {{^isNullable}}
-        req_builder = req_builder.header("{{{baseName}}}", {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string());
-        {{/isNullable}}
-        {{#isNullable}}
-        match {{{paramName}}} {
-            Some(param_value) => { req_builder = req_builder.header("{{{baseName}}}", param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); },
-            None => { req_builder = req_builder.header("{{{baseName}}}", ""); },
-        }
-        {{/isNullable}}
-        {{/required}}
-        {{^required}}
-        if let Some(param_value) = {{{paramName}}} {
-            req_builder = req_builder.header("{{{baseName}}}", param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string());
-        }
-        {{/required}}
-        {{/headerParams}}
-        {{/hasHeaderParams}}
-        {{#hasAuthMethods}}
-        {{#authMethods}}
-        {{#isApiKey}}
-        {{#isKeyInHeader}}
-        if let Some(ref apikey) = configuration.api_key {
-            let key = apikey.key.clone();
-            let val = match apikey.prefix {
-                Some(ref prefix) => format!("{} {}", prefix, key),
-                None => key,
-            };
-            req_builder = req_builder.header("{{{keyParamName}}}", val);
-        };
-        {{/isKeyInHeader}}
-        {{/isApiKey}}
-        {{#isBasic}}
-        {{#isBasicBasic}}
-        if let Some(ref auth_conf) = configuration.basic_auth {
-            req_builder = req_builder.basic_auth(auth_conf.0.to_owned(), auth_conf.1.to_owned());
-        };
-        {{/isBasicBasic}}
-        {{#isBasicBearer}}
-        if let Some(ref token) = configuration.bearer_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
+    let uri_str = format!("{}{{{path}}}", configuration.base_path{{#pathParams}}, {{{baseName}}}={{#isString}}crate::apis::urlencode({{/isString}}{{{paramName}}}{{^required}}.unwrap(){{/required}}{{#required}}{{#isNullable}}.unwrap(){{/isNullable}}{{/required}}{{#isListContainer}}.join(",").as_ref(){{/isListContainer}}{{#isString}}){{/isString}}{{/pathParams}});
+    let mut req_builder = client.{{{httpMethod}}}(uri_str.as_str());
+
+    {{#queryParams}}
+    {{#required}}
+    req_builder = req_builder.query(&[("{{{baseName}}}", &{{{paramName}}}{{#isListContainer}}.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(","){{/isListContainer}}.to_string())]);
+    {{/required}}
+    {{^required}}
+    if let Some(ref s) = {{{paramName}}} {
+        req_builder = req_builder.query(&[("{{{baseName}}}", &s{{#isListContainer}}.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(","){{/isListContainer}}.to_string())]);
+    }
+    {{/required}}
+    {{/queryParams}}
+    {{#hasAuthMethods}}
+    {{#authMethods}}
+    {{#isApiKey}}
+    {{#isKeyInQuery}}
+    if let Some(ref apikey) = configuration.api_key {
+        let key = apikey.key.clone();
+        let val = match apikey.prefix {
+            Some(ref prefix) => format!("{} {}", prefix, key),
+            None => key,
         };
-        {{/isBasicBearer}}
-        {{/isBasic}}
-        {{#isOAuth}}
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
+        req_builder = req_builder.query(&[("{{{keyParamName}}}", val)]);
+    }
+    {{/isKeyInQuery}}
+    {{/isApiKey}}
+    {{/authMethods}}
+    {{/hasAuthMethods}}
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    {{#hasHeaderParams}}
+    {{#headerParams}}
+    {{#required}}
+    {{^isNullable}}
+    req_builder = req_builder.header("{{{baseName}}}", {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string());
+    {{/isNullable}}
+    {{#isNullable}}
+    match {{{paramName}}} {
+        Some(param_value) => { req_builder = req_builder.header("{{{baseName}}}", param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); },
+        None => { req_builder = req_builder.header("{{{baseName}}}", ""); },
+    }
+    {{/isNullable}}
+    {{/required}}
+    {{^required}}
+    if let Some(param_value) = {{{paramName}}} {
+        req_builder = req_builder.header("{{{baseName}}}", param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string());
+    }
+    {{/required}}
+    {{/headerParams}}
+    {{/hasHeaderParams}}
+    {{#hasAuthMethods}}
+    {{#authMethods}}
+    {{#isApiKey}}
+    {{#isKeyInHeader}}
+    if let Some(ref apikey) = configuration.api_key {
+        let key = apikey.key.clone();
+        let val = match apikey.prefix {
+            Some(ref prefix) => format!("{} {}", prefix, key),
+            None => key,
         };
-        {{/isOAuth}}
-        {{/authMethods}}
-        {{/hasAuthMethods}}
-        {{#isMultipart}}
-        {{#hasFormParams}}
-        let mut form = reqwest::multipart::Form::new();
-        {{#formParams}}
-        {{#isFile}}
-        {{^supportAsync}}
-        {{#required}}
-        {{^isNullable}}
-        form = form.file("{{{baseName}}}", {{{paramName}}})?;
-        {{/isNullable}}
-        {{#isNullable}}
-        match {{{paramName}}} {
-            Some(param_value) => { form = form.file("{{{baseName}}}", param_value)?; },
-            None => { unimplemented!("Required nullable form file param not supported"); },
-        }
-        {{/isNullable}}
-        {{/required}}
-        {{^required}}
-        if let Some(param_value) = {{{paramName}}} {
-            form = form.file("{{{baseName}}}", param_value)?;
-        }
-        {{/required}}
-        {{/supportAsync}}
-        {{#supportAsync}}
-        // TODO: support file upload for '{{{baseName}}}' parameter
-        {{/supportAsync}}
-        {{/isFile}}
-        {{^isFile}}
-        {{#required}}
-        {{^isNullable}}
-        form = form.text("{{{baseName}}}", {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string());
-        {{/isNullable}}
-        {{#isNullable}}
-        match {{{paramName}}} {
-            Some(param_value) => { form = form.text("{{{baseName}}}", param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); },
-            None => { form = form.text("{{{baseName}}}", ""); },
-        }
-        {{/isNullable}}
-        {{/required}}
-        {{^required}}
-        if let Some(param_value) = {{{paramName}}} {
-            form = form.text("{{{baseName}}}", param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string());
-        }
-        {{/required}}
-        {{/isFile}}
-        {{/formParams}}
-        req_builder = req_builder.multipart(form);
-        {{/hasFormParams}}
-        {{/isMultipart}}
-        {{^isMultipart}}
-        {{#hasFormParams}}
-        let mut form_params = std::collections::HashMap::new();
-        {{#formParams}}
-        {{#isFile}}
-        {{#required}}
-        {{^isNullable}}
+        req_builder = req_builder.header("{{{keyParamName}}}", val);
+    };
+    {{/isKeyInHeader}}
+    {{/isApiKey}}
+    {{#isBasic}}
+    {{#isBasicBasic}}
+    if let Some(ref auth_conf) = configuration.basic_auth {
+        req_builder = req_builder.basic_auth(auth_conf.0.to_owned(), auth_conf.1.to_owned());
+    };
+    {{/isBasicBasic}}
+    {{#isBasicBearer}}
+    if let Some(ref token) = configuration.bearer_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+    {{/isBasicBearer}}
+    {{/isBasic}}
+    {{#isOAuth}}
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+    {{/isOAuth}}
+    {{/authMethods}}
+    {{/hasAuthMethods}}
+    {{#isMultipart}}
+    {{#hasFormParams}}
+    let mut form = reqwest::multipart::Form::new();
+    {{#formParams}}
+    {{#isFile}}
+    {{^supportAsync}}
+    {{#required}}
+    {{^isNullable}}
+    form = form.file("{{{baseName}}}", {{{paramName}}})?;
+    {{/isNullable}}
+    {{#isNullable}}
+    match {{{paramName}}} {
+        Some(param_value) => { form = form.file("{{{baseName}}}", param_value)?; },
+        None => { unimplemented!("Required nullable form file param not supported"); },
+    }
+    {{/isNullable}}
+    {{/required}}
+    {{^required}}
+    if let Some(param_value) = {{{paramName}}} {
+        form = form.file("{{{baseName}}}", param_value)?;
+    }
+    {{/required}}
+    {{/supportAsync}}
+    {{#supportAsync}}
+    // TODO: support file upload for '{{{baseName}}}' parameter
+    {{/supportAsync}}
+    {{/isFile}}
+    {{^isFile}}
+    {{#required}}
+    {{^isNullable}}
+    form = form.text("{{{baseName}}}", {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string());
+    {{/isNullable}}
+    {{#isNullable}}
+    match {{{paramName}}} {
+        Some(param_value) => { form = form.text("{{{baseName}}}", param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); },
+        None => { form = form.text("{{{baseName}}}", ""); },
+    }
+    {{/isNullable}}
+    {{/required}}
+    {{^required}}
+    if let Some(param_value) = {{{paramName}}} {
+        form = form.text("{{{baseName}}}", param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string());
+    }
+    {{/required}}
+    {{/isFile}}
+    {{/formParams}}
+    req_builder = req_builder.multipart(form);
+    {{/hasFormParams}}
+    {{/isMultipart}}
+    {{^isMultipart}}
+    {{#hasFormParams}}
+    let mut form_params = std::collections::HashMap::new();
+    {{#formParams}}
+    {{#isFile}}
+    {{#required}}
+    {{^isNullable}}
+    form_params.insert("{{{baseName}}}", unimplemented!("File form param not supported with x-www-form-urlencoded content"));
+    {{/isNullable}}
+    {{#isNullable}}
+    match {{{paramName}}} {
+        Some(param_value) => { form_params.insert("{{{baseName}}}", unimplemented!("File form param not supported with x-www-form-urlencoded content")); },
+        None => { unimplemented!("Required nullable file form param not supported with x-www-form-urlencoded content"); },
+    }
+    {{/isNullable}}
+    {{/required}}
+    {{^required}}
+    if let Some(param_value) = {{{paramName}}} {
         form_params.insert("{{{baseName}}}", unimplemented!("File form param not supported with x-www-form-urlencoded content"));
-        {{/isNullable}}
-        {{#isNullable}}
-        match {{{paramName}}} {
-            Some(param_value) => { form_params.insert("{{{baseName}}}", unimplemented!("File form param not supported with x-www-form-urlencoded content")); },
-            None => { unimplemented!("Required nullable file form param not supported with x-www-form-urlencoded content"); },
-        }
-        {{/isNullable}}
-        {{/required}}
-        {{^required}}
-        if let Some(param_value) = {{{paramName}}} {
-            form_params.insert("{{{baseName}}}", unimplemented!("File form param not supported with x-www-form-urlencoded content"));
-        }
-        {{/required}}
-        {{/isFile}}
-        {{^isFile}}
-        {{#required}}
-        {{^isNullable}}
-        form_params.insert("{{{baseName}}}", {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string());
-        {{/isNullable}}
-        {{#isNullable}}
-        match {{{paramName}}} {
-            Some(param_value) => { form_params.insert("{{{baseName}}}", param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); },
-            None => { form_params.insert("{{{baseName}}}", ""); },
-        }
-        {{/isNullable}}
-        {{/required}}
-        {{^required}}
-        if let Some(param_value) = {{{paramName}}} {
-            form_params.insert("{{{baseName}}}", param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string());
-        }
-        {{/required}}
-        {{/isFile}}
-        {{/formParams}}
-        req_builder = req_builder.form(&form_params);
-        {{/hasFormParams}}
-        {{/isMultipart}}
-        {{#hasBodyParam}}
-        {{#bodyParams}}
-        req_builder = req_builder.json(&{{{paramName}}});
-        {{/bodyParams}}
-        {{/hasBodyParam}}
+    }
+    {{/required}}
+    {{/isFile}}
+    {{^isFile}}
+    {{#required}}
+    {{^isNullable}}
+    form_params.insert("{{{baseName}}}", {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string());
+    {{/isNullable}}
+    {{#isNullable}}
+    match {{{paramName}}} {
+        Some(param_value) => { form_params.insert("{{{baseName}}}", param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); },
+        None => { form_params.insert("{{{baseName}}}", ""); },
+    }
+    {{/isNullable}}
+    {{/required}}
+    {{^required}}
+    if let Some(param_value) = {{{paramName}}} {
+        form_params.insert("{{{baseName}}}", param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string());
+    }
+    {{/required}}
+    {{/isFile}}
+    {{/formParams}}
+    req_builder = req_builder.form(&form_params);
+    {{/hasFormParams}}
+    {{/isMultipart}}
+    {{#hasBodyParam}}
+    {{#bodyParams}}
+    req_builder = req_builder.json(&{{{paramName}}});
+    {{/bodyParams}}
+    {{/hasBodyParam}}
 
-        let req = req_builder.build()?;
+    let req = req_builder.build()?;
+    let {{^supportAsync}}mut {{/supportAsync}}resp = client.execute(req){{#supportAsync}}.await{{/supportAsync}}?;
+
+    let status = resp.status();
+    let content = resp.text(){{#supportAsync}}.await{{/supportAsync}}?;
+
+    if status.is_success() {
+        {{^supportMultipleResponses}}
         {{^returnType}}
-        client.execute(req){{#supportAsync}}.await{{/supportAsync}}?.error_for_status()?;
         Ok(())
         {{/returnType}}
         {{#returnType}}
-        {{#supportAsync}}
-        Ok(client.execute(req).await?.error_for_status()?.json::<{{{.}}}>().await?)
-        {{/supportAsync}}
-        {{^supportAsync}}
-        Ok(client.execute(req)?.error_for_status()?.json()?)
-        {{/supportAsync}}
+        serde_json::from_str(&content).map_err(Error::from)
         {{/returnType}}
+        {{/supportMultipleResponses}}
+        {{#supportMultipleResponses}}
+        let entity: Option<{{{operationIdCamelCase}}}Success> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+        {{/supportMultipleResponses}}
+    } else {
+        let entity: Option<{{{operationIdCamelCase}}}Error> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
 {{/operation}}
 {{/operations}}
-{{^supportAsync}}
-}
-{{/supportAsync}}
diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache
index 28ac207d4823..aba222c337dd 100644
--- a/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache
@@ -1,26 +1,34 @@
 use reqwest;
 use serde_json;
 
+#[derive(Debug, Clone)]
+pub struct ResponseContent<T> {
+    pub status: reqwest::StatusCode,
+    pub content: String,
+    pub entity: Option<T>,
+}
+
 #[derive(Debug)]
-pub enum Error {
+pub enum Error<T> {
     Reqwest(reqwest::Error),
     Serde(serde_json::Error),
     Io(std::io::Error),
+    ResponseError(ResponseContent<T>),
 }
 
-impl From<reqwest::Error> for Error {
+impl <T> From<reqwest::Error> for Error<T> {
     fn from(e: reqwest::Error) -> Self {
         Error::Reqwest(e)
     }
 }
 
-impl From<serde_json::Error> for Error {
+impl <T> From<serde_json::Error> for Error<T> {
     fn from(e: serde_json::Error) -> Self {
         Error::Serde(e)
     }
 }
 
-impl From<std::io::Error> for Error {
+impl <T> From<std::io::Error> for Error<T> {
     fn from(e: std::io::Error) -> Self {
         Error::Io(e)
     }
@@ -32,30 +40,8 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
 
 {{#apiInfo}}
 {{#apis}}
-mod {{{classFilename}}};
-{{#operations}}
-{{#operation}}
-{{^supportAsync}}
-{{#-first}}
-pub use self::{{{classFilename}}}::{ {{{classname}}}, {{{classname}}}Client };
-{{/-first}}
-{{/supportAsync}}
-{{#supportAsync}}
-pub use self::{{{classFilename}}}::{ {{{operationId}}} };
-{{/supportAsync}}
-{{#vendorExtensions.x-group-parameters}}
-{{#allParams}}
-{{#-first}}
-pub use self::{{{classFilename}}}::{{{operationIdCamelCase}}}Params as {{{classname}}}{{{operationIdCamelCase}}}Params;
-{{/-first}}
-{{/allParams}}
-{{/vendorExtensions.x-group-parameters}}
-{{/operation}}
-{{/operations}}
+pub mod {{{classFilename}}};
 {{/apis}}
 {{/apiInfo}}
 
-{{^supportAsync}}
-pub mod client;
-{{/supportAsync}}
 pub mod configuration;
diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache
deleted file mode 100644
index 60be0f295fba..000000000000
--- a/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache
+++ /dev/null
@@ -1,52 +0,0 @@
-use std::rc::Rc;
-
-use super::configuration::Configuration;
-
-pub struct APIClient {
-{{#apiInfo}}
-{{#apis}}
-{{#operations}}
-{{#operation}}
-    {{#-last}}
-    {{{classFilename}}}: Box<dyn crate::apis::{{{classname}}}>,
-    {{/-last}}
-{{/operation}}
-{{/operations}}
-{{/apis}}
-{{/apiInfo}}
-}
-
-impl APIClient {
-    pub fn new(configuration: Configuration) -> APIClient {
-        let rc = Rc::new(configuration);
-
-        APIClient {
-{{#apiInfo}}
-{{#apis}}
-{{#operations}}
-{{#operation}}
-            {{#-last}}
-            {{{classFilename}}}: Box::new(crate::apis::{{{classname}}}Client::new(rc.clone())),
-            {{/-last}}
-{{/operation}}
-{{/operations}}
-{{/apis}}
-{{/apiInfo}}
-        }
-    }
-
-{{#apiInfo}}
-{{#apis}}
-{{#operations}}
-{{#operation}}
-{{#-last}}
-    pub fn {{{classFilename}}}(&self) -> &dyn crate::apis::{{{classname}}}{
-        self.{{{classFilename}}}.as_ref()
-    }
-
-{{/-last}}
-{{/operation}}
-{{/operations}}
-{{/apis}}
-{{/apiInfo}}
-}
diff --git a/modules/openapi-generator/src/main/resources/scala-akka-client/responseState.mustache b/modules/openapi-generator/src/main/resources/scala-akka-client/responseState.mustache
index d1b3798e6de1..5b4285523469 100644
--- a/modules/openapi-generator/src/main/resources/scala-akka-client/responseState.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-akka-client/responseState.mustache
@@ -1 +1 @@
-{{#isDefault}}Success{{/isDefault}}{{^isDefault}}Error{{/isDefault}}
\ No newline at end of file
+{{#is2xx}}Success{{/is2xx}}{{#is3xx}}Success{{/is3xx}}{{#is4xx}}Error{{/is4xx}}{{#is5xx}}Error{{/is5xx}}{{#isDefault}}Error{{/isDefault}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/scala-play-server/build.sbt.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/build.sbt.mustache
index 6e5f6cb339c8..837877524711 100644
--- a/modules/openapi-generator/src/main/resources/scala-play-server/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-play-server/build.sbt.mustache
@@ -11,6 +11,7 @@ libraryDependencies ++= Seq(
 {{#useSwaggerUI}}
   "org.webjars" % "swagger-ui" % "3.1.5",
 {{/useSwaggerUI}}
+  "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
   "org.scalatest"          %% "scalatest"          % "3.0.4" % Test,
   "org.scalatestplus.play" %% "scalatestplus-play" % "3.1.2" % Test
 )
diff --git a/modules/openapi-generator/src/main/resources/scala-play-server/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/generatedAnnotation.mustache
index 9b5d96902a8c..86e315a62084 100644
--- a/modules/openapi-generator/src/main/resources/scala-play-server/generatedAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-play-server/generatedAnnotation.mustache
@@ -1 +1 @@
-{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = Array("{{generatorClass}}"), date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
+@javax.annotation.Generated(value = Array("{{generatorClass}}"){{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/api.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/api.mustache
index 196a51a96f0d..e67b67018c59 100644
--- a/modules/openapi-generator/src/main/resources/scala-sttp/api.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-sttp/api.mustache
@@ -4,42 +4,40 @@ package {{package}}
 {{#imports}}
 import {{import}}
 {{/imports}}
-import {{invokerPackage}}._
-import alias._
+import {{invokerPackage}}.JsonSupport._
 import sttp.client._
 import sttp.model.Method
 
 {{#operations}}
 object {{classname}} {
 
-  def apply(baseUrl: String = "{{{basePath}}}")(implicit serializer: SttpSerializer) = new {{classname}}(baseUrl)
+def apply(baseUrl: String = "{{{basePath}}}") = new {{classname}}(baseUrl)
 }
 
-class {{classname}}(baseUrl: String)(implicit serializer: SttpSerializer) {
-
-  import Helpers._
-  import serializer._
+class {{classname}}(baseUrl: String) {
 
 {{#operation}}
 {{#javadocRenderer}}
 {{>javadoc}}
 {{/javadocRenderer}}
-  def {{operationId}}({{>methodParameters}}): ApiRequestT[{{>operationReturnType}}] =
+  def {{operationId}}({{>methodParameters}}): Request[{{#separateErrorChannel}}Either[ResponseError[Exception], {{>operationReturnType}}]{{/separateErrorChannel}}{{^separateErrorChannel}}{{>operationReturnType}}{{/separateErrorChannel}}, Nothing] =
     basicRequest
       .method(Method.{{httpMethod.toUpperCase}}, uri"$baseUrl{{{path}}}{{#queryParams.0}}?{{#queryParams}}{{baseName}}=${{{paramName}}}{{^-last}}&{{/-last}}{{/queryParams}}{{/queryParams.0}}{{#isApiKey}}{{#isKeyInQuery}}{{^queryParams.0}}?{{/queryParams.0}}{{#queryParams.0}}&{{/queryParams.0}}{{keyParamName}}=${apiKey.value}&{{/isKeyInQuery}}{{/isApiKey}}")
       .contentType({{#consumes.0}}"{{{mediaType}}}"{{/consumes.0}}{{^consumes}}"application/json"{{/consumes}}){{#headerParams}}
       .header({{>paramCreation}}){{/headerParams}}{{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
-      .auth.withCredentials(basicAuth.user, basicAuth.password){{/isBasicBasic}}{{#isBasicBearer}}
-      .auth.bearer(bearerToken.token){{/isBasicBearer}}{{/isBasic}}{{#isApiKey}}{{#isKeyInHeader}}
-      .header("{{keyParamName}}", apiKey.value){{/isKeyInHeader}}{{#isKeyInCookie}}
-      .cookie("{{keyParamName}}", apiKey.value){{/isKeyInCookie}}{{/isApiKey}}{{/authMethods}}{{#formParams.0}}
+      .auth.withCredentials(username, password){{/isBasicBasic}}{{#isBasicBearer}}
+      .auth.bearer(bearerToken){{/isBasicBearer}}{{/isBasic}}{{#isApiKey}}{{#isKeyInHeader}}
+      .header("{{keyParamName}}", apiKey){{/isKeyInHeader}}{{#isKeyInCookie}}
+      .cookie("{{keyParamName}}", apiKey){{/isKeyInCookie}}{{/isApiKey}}{{/authMethods}}{{#formParams.0}}{{^isMultipart}}
       .body(Map({{#formParams}}
-        {{>paramFormCreation}},{{/formParams}}
-      )){{/formParams.0}}{{#bodyParam}}
+        {{>paramFormCreation}}{{#hasMore}}, {{/hasMore}}{{/formParams}}
+      )){{/isMultipart}}{{#isMultipart}}
+      .multipartBody(Seq({{#formParams}}
+        {{>paramMultipartCreation}}{{#hasMore}}, {{/hasMore}}{{/formParams}}
+      ).flatten){{/isMultipart}}{{/formParams.0}}{{#bodyParam}}
       .body({{paramName}}){{/bodyParam}}
-      .response(asJson[{{>operationReturnType}}])
+      .response({{#separateErrorChannel}}asJson{{/separateErrorChannel}}{{^separateErrorChannel}}asJsonAlwaysUnsafe{{/separateErrorChannel}}[{{>operationReturnType}}])
 
 {{/operation}}
 }
-
 {{/operations}}
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/apiInvoker.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/apiInvoker.mustache
deleted file mode 100644
index af26ef8f2bb6..000000000000
--- a/modules/openapi-generator/src/main/resources/scala-sttp/apiInvoker.mustache
+++ /dev/null
@@ -1,50 +0,0 @@
-{{>licenseInfo}}
-package {{invokerPackage}}
-
-import org.json4s._
-import sttp.client._
-import sttp.model.StatusCode
-import {{{apiPackage}}}.EnumsSerializers
-import sttp.client.json4s.SttpJson4sApi
-import sttp.client.monad.MonadError
-
-class SttpSerializer(implicit val format: Formats = DefaultFormats ++ EnumsSerializers.all ++ Serializers.all,
-                     implicit val serialization: org.json4s.Serialization = org.json4s.jackson.Serialization) extends SttpJson4sApi
-
-class HttpException(val statusCode: StatusCode, val statusText: String, val message: String) extends Exception(s"[$statusCode] $statusText: $message")
-
-object Helpers {
-
-  // Helper to handle Optional header parameters
-  implicit class optionalParams(val request: RequestT[Identity, Either[String, String], Nothing]) extends AnyVal {
-    def header( header: String, optValue: Option[Any]): RequestT[Identity, Either[String, String], Nothing] = {
-      optValue.map( value => request.header(header, value.toString)).getOrElse(request)
-    }
-  }
-
-}
-
-object ApiInvoker {
-
-  /**
-    * Allows request execution without calling apiInvoker.execute(request)
-    * request.result can be used to get a monad wrapped content.
-    *
-    * @param request the apiRequest to be executed
-    */
-  implicit class ApiRequestImprovements[R[_], T](request: RequestT[Identity, Either[ResponseError[Exception], T], Nothing]) {
-
-    def result(implicit backend: SttpBackend[R, Nothing, Nothing]): R[T] = {
-      val responseT = request.send()
-      val ME: MonadError[R] = backend.responseMonad
-      ME.flatMap(responseT) {
-        response =>
-          response.body match {
-            case Left(ex) => ME.error[T](new HttpException(response.code, response.statusText, ex.body))
-            case Right(value) => ME.unit(value)
-          }
-      }
-    }
-  }
-
-}
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/build.sbt.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/build.sbt.mustache
index 00fe48b731da..a20ba532f446 100644
--- a/modules/openapi-generator/src/main/resources/scala-sttp/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-sttp/build.sbt.mustache
@@ -2,20 +2,24 @@ version := "{{artifactVersion}}"
 name := "{{artifactId}}"
 organization := "{{groupId}}"
 
-scalaVersion := "2.13.0"
-
-crossScalaVersions := Seq(scalaVersion.value, "2.12.10",  "2.11.12")
+scalaVersion := "2.13.2"
+crossScalaVersions := Seq(scalaVersion.value, "2.12.10")
 
 libraryDependencies ++= Seq(
-  "com.softwaremill.sttp.client" %% "core" % "2.0.0",
-  "com.softwaremill.sttp.client" %% "json4s" % "2.0.0",
+  "com.softwaremill.sttp.client" %% "core" % "{{sttpClientVersion}}",
 {{#joda}}
-  "joda-time" % "joda-time" % "2.10.1",
+  "joda-time" % "joda-time" % "{{jodaTimeVersion}}",
 {{/joda}}
-  "org.json4s" %% "json4s-jackson" % "3.6.7",
-  // test dependencies
-  "org.scalatest" %% "scalatest" % "3.0.8" % Test,
-  "junit" % "junit" % "4.13" % "test"
+{{#json4s}}
+  "com.softwaremill.sttp.client" %% "json4s" % "{{sttpClientVersion}}",
+  "org.json4s" %% "json4s-jackson" % "{{json4sVersion}}"
+{{/json4s}}
+{{#circe}}
+  "com.softwaremill.sttp.client" %% "circe" % "{{sttpClientVersion}}",
+  "io.circe" %% "circe-core" % "{{circeVersion}}",
+  "io.circe" %% "circe-generic" % "{{circeVersion}}",
+  "io.circe" %% "circe-parser" % "{{circeVersion}}"
+{{/circe}}
 )
 
 scalacOptions := Seq(
@@ -23,5 +27,3 @@ scalacOptions := Seq(
   "-deprecation",
   "-feature"
 )
-
-publishArtifact in (Compile, packageDoc) := false
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/dateSerializers.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/dateSerializers.mustache
new file mode 100644
index 000000000000..779e7a428de8
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/scala-sttp/dateSerializers.mustache
@@ -0,0 +1,76 @@
+package {{invokerPackage}}
+
+{{#java8}}
+import java.time.{LocalDate, LocalDateTime, OffsetDateTime, ZoneId}
+import java.time.format.DateTimeFormatter
+import scala.util.Try
+{{/java8}}
+{{#joda}}
+import org.joda.time.DateTime
+import org.joda.time.format.ISODateTimeFormat
+{{/joda}}
+
+{{#json4s}}
+object DateSerializers {
+    import org.json4s.{Serializer, CustomSerializer, JNull}
+    import org.json4s.JsonAST.JString
+    {{#java8}}
+      case object DateTimeSerializer extends CustomSerializer[OffsetDateTime](_ => ( {
+        case JString(s) =>
+          Try(OffsetDateTime.parse(s, DateTimeFormatter.ISO_OFFSET_DATE_TIME)) orElse
+            Try(LocalDateTime.parse(s).atZone(ZoneId.systemDefault()).toOffsetDateTime) getOrElse (null)
+        case JNull => null
+      }, {
+        case d: OffsetDateTime =>
+          JString(d.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME))
+      }))
+
+      case object LocalDateSerializer extends CustomSerializer[LocalDate]( _ => ( {
+        case JString(s) => LocalDate.parse(s)
+        case JNull => null
+      }, {
+        case d: LocalDate =>
+         JString(d.format(DateTimeFormatter.ISO_LOCAL_DATE))
+      }))
+    {{/java8}}
+    {{#joda}}
+      case object DateTimeSerializer extends CustomSerializer[DateTime](_ => ( {
+        case JString(s) =>
+          ISODateTimeFormat.dateOptionalTimeParser().parseDateTime(s)
+        case JNull => null
+      }, {
+        case d: org.joda.time.DateTime =>
+          JString(ISODateTimeFormat.dateTime().print(d))
+      })
+      )
+
+      case object LocalDateSerializer extends CustomSerializer[org.joda.time.LocalDate](_ => ( {
+        case JString(s) => org.joda.time.format.DateTimeFormat.forPattern("yyyy-MM-dd").parseLocalDate(s)
+        case JNull => null
+      }, {
+        case d: org.joda.time.LocalDate => JString(d.toString("yyyy-MM-dd"))
+      }))
+    {{/joda}}
+
+  def all: Seq[Serializer[_]] = Seq[Serializer[_]]() :+ LocalDateSerializer :+ DateTimeSerializer
+}
+{{/json4s}}
+{{#circe}}
+trait DateSerializers {
+    import io.circe.{Decoder, Encoder}
+    {{#java8}}
+    implicit val isoOffsetDateTimeDecoder: Decoder[OffsetDateTime] = Decoder.decodeOffsetDateTimeWithFormatter(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    implicit val isoOffsetDateTimeEncoder: Encoder[OffsetDateTime] = Encoder.encodeOffsetDateTimeWithFormatter(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+
+    implicit val localDateDecoder: Decoder[LocalDate] = Decoder.decodeLocalDateWithFormatter(DateTimeFormatter.ISO_LOCAL_DATE)
+    implicit val localDateEncoder: Encoder[LocalDate] = Encoder.encodeLocalDateWithFormatter(DateTimeFormatter.ISO_LOCAL_DATE)
+    {{/java8}}
+    {{#joda}}
+    implicit val dateTimeDecoder: Decoder[DateTime] = Decoder.decodeString.map(ISODateTimeFormat.dateOptionalTimeParser().parseDateTime(_))
+    implicit val dateTimeEncoder: Encoder[DateTime] = Encoder.encodeString.contramap(ISODateTimeFormat.dateTime().print(_))
+
+    implicit val localDateDecoder: Decoder[org.joda.time.LocalDate] = Decoder.decodeString.map(org.joda.time.format.DateTimeFormat.forPattern("yyyy-MM-dd").parseLocalDate(_))
+    implicit val localDateEncoder: Encoder[org.joda.time.LocalDate] = Encoder.encodeString.contramap(_.toString("yyyy-MM-dd"))
+    {{/joda}}
+}
+{{/circe}}
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/enumsSerializers.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/enumsSerializers.mustache
deleted file mode 100644
index 8c7e6f2e41e5..000000000000
--- a/modules/openapi-generator/src/main/resources/scala-sttp/enumsSerializers.mustache
+++ /dev/null
@@ -1,42 +0,0 @@
-{{>licenseInfo}}
-package {{apiPackage}}
-
-{{#models.0}}
-import {{modelPackage}}._
-{{/models.0}}
-import org.json4s._
-import scala.reflect.ClassTag
-
-object EnumsSerializers {
-
-  def all: Seq[Serializer[_]] = Seq[Serializer[_]](){{#models}}{{#model}}{{#hasEnums}}{{#vars}}{{#isEnum}} :+
-    new EnumNameSerializer({{classname}}Enums.{{datatypeWithEnum}}){{/isEnum}}{{/vars}}{{/hasEnums}}{{/model}}{{/models}}
-
-  private class EnumNameSerializer[E <: Enumeration: ClassTag](enum: E)
-    extends Serializer[E#Value] {
-    import JsonDSL._
-
-    val EnumerationClass: Class[E#Value] = classOf[E#Value]
-
-    def deserialize(implicit format: Formats):
-    PartialFunction[(TypeInfo, JValue), E#Value] = {
-      case (t @ TypeInfo(EnumerationClass, _), json) if isValid(json) =>
-        json match {
-          case JString(value) =>
-            enum.withName(value)
-          case value =>
-            throw new MappingException(s"Can't convert $value to $EnumerationClass")
-        }
-    }
-
-    private[this] def isValid(json: JValue) = json match {
-      case JString(value) if enum.values.exists(_.toString == value) => true
-      case _ => false
-    }
-
-    def serialize(implicit format: Formats): PartialFunction[Any, JValue] = {
-      case i: E#Value => i.toString
-    }
-  }
-
-}
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/jsonSupport.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/jsonSupport.mustache
new file mode 100644
index 000000000000..57c3ab4204cb
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/scala-sttp/jsonSupport.mustache
@@ -0,0 +1,53 @@
+{{>licenseInfo}}
+package {{invokerPackage}}
+
+{{#models.0}}
+import {{modelPackage}}._
+{{/models.0}}
+{{#json4s}}
+import org.json4s._
+import sttp.client.json4s.SttpJson4sApi
+import scala.reflect.ClassTag
+
+object JsonSupport extends SttpJson4sApi {
+  def enumSerializers: Seq[Serializer[_]] = Seq[Serializer[_]](){{#models}}{{#model}}{{#hasEnums}}{{#vars}}{{#isEnum}} :+
+    new EnumNameSerializer({{classname}}Enums.{{datatypeWithEnum}}){{/isEnum}}{{/vars}}{{/hasEnums}}{{/model}}{{/models}}
+
+  private class EnumNameSerializer[E <: Enumeration: ClassTag](enum: E) extends Serializer[E#Value] {
+    import JsonDSL._
+    val EnumerationClass: Class[E#Value] = classOf[E#Value]
+
+    def deserialize(implicit format: Formats): PartialFunction[(TypeInfo, JValue), E#Value] = {
+      case (t @ TypeInfo(EnumerationClass, _), json) if isValid(json) =>
+        json match {
+          case JString(value) => enum.withName(value)
+          case value => throw new MappingException(s"Can't convert $value to $EnumerationClass")
+        }
+    }
+
+    private[this] def isValid(json: JValue) = json match {
+      case JString(value) if enum.values.exists(_.toString == value) => true
+      case _ => false
+    }
+
+    def serialize(implicit format: Formats): PartialFunction[Any, JValue] = {
+      case i: E#Value => i.toString
+      }
+    }
+
+  implicit val format: Formats = DefaultFormats ++ enumSerializers ++ DateSerializers.all
+  implicit val serialization: org.json4s.Serialization = org.json4s.jackson.Serialization
+}
+{{/json4s}}
+{{#circe}}
+import io.circe.{Decoder, Encoder}
+import io.circe.generic.AutoDerivation
+import sttp.client.circe.SttpCirceApi
+
+object JsonSupport extends SttpCirceApi with AutoDerivation with DateSerializers {
+{{#models}}{{#model}}{{#hasEnums}}{{#vars}}{{#isEnum}}
+  implicit val {{classname}}{{datatypeWithEnum}}Decoder: Decoder[{{classname}}Enums.{{datatypeWithEnum}}] = Decoder.decodeEnumeration({{classname}}Enums.{{datatypeWithEnum}})
+  implicit val {{classname}}{{datatypeWithEnum}}Encoder: Encoder[{{classname}}Enums.{{datatypeWithEnum}}] = Encoder.encodeEnumeration({{classname}}Enums.{{datatypeWithEnum}})
+{{/isEnum}}{{/vars}}{{/hasEnums}}{{/model}}{{/models}}
+}
+{{/circe}}
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/methodParameters.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/methodParameters.mustache
index 54dc2f92a51f..84bfa5818619 100644
--- a/modules/openapi-generator/src/main/resources/scala-sttp/methodParameters.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-sttp/methodParameters.mustache
@@ -1 +1 @@
-{{#allParams}}{{paramName}}: {{#required}}{{dataType}}{{/required}}{{^required}}{{#isContainer}}{{dataType}}{{/isContainer}}{{^isContainer}}Option[{{dataType}}]{{/isContainer}}{{/required}}{{^defaultValue}}{{^required}}{{^isContainer}} = None{{/isContainer}}{{/required}}{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#authMethods.0}})(implicit {{#authMethods}}{{#isApiKey}}apiKey: ApiKeyValue{{/isApiKey}}{{#isBasic}}{{#isBasicBasic}}basicAuth: BasicCredentials{{/isBasicBasic}}{{#isBasicBearer}}bearerToken: BearerToken{{/isBasicBearer}}{{/isBasic}}{{#hasMore}}, {{/hasMore}}{{/authMethods}}{{/authMethods.0}}
\ No newline at end of file
+{{#authMethods.0}}{{#authMethods}}{{#isApiKey}}apiKey: String{{/isApiKey}}{{#isBasic}}{{#isBasicBasic}}username: String, password: String{{/isBasicBasic}}{{#isBasicBearer}}bearerToken: String{{/isBasicBearer}}{{/isBasic}}{{#hasMore}}, {{/hasMore}}{{/authMethods}})({{/authMethods.0}}{{#allParams}}{{paramName}}: {{#required}}{{dataType}}{{/required}}{{^required}}{{#isContainer}}{{dataType}}{{/isContainer}}{{^isContainer}}Option[{{dataType}}]{{/isContainer}}{{/required}}{{^defaultValue}}{{^required}}{{^isContainer}} = None{{/isContainer}}{{/required}}{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/allParams}}
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/model.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/model.mustache
index 1f4da5283e32..f2cf27962348 100644
--- a/modules/openapi-generator/src/main/resources/scala-sttp/model.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-sttp/model.mustache
@@ -4,7 +4,6 @@ package {{package}}
 {{#imports}}
 import {{import}}
 {{/imports}}
-import {{invokerPackage}}.ApiModel
 
 {{#models}}
 {{#model}}
@@ -23,7 +22,7 @@ case class {{classname}}(
   {{/description}}
   {{{name}}}: {{^required}}Option[{{/required}}{{^isEnum}}{{dataType}}{{/isEnum}}{{#isEnum}}{{classname}}Enums.{{datatypeWithEnum}}{{/isEnum}}{{^required}}] = None{{/required}}{{#hasMore}},{{/hasMore}}
   {{/vars}}
-) extends ApiModel
+)
 
 {{#hasEnums}}
 object {{classname}}Enums {
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/paramMultipartCreation.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/paramMultipartCreation.mustache
new file mode 100644
index 000000000000..edfb7b0766b3
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/scala-sttp/paramMultipartCreation.mustache
@@ -0,0 +1,16 @@
+{{#required}}
+    {{#isFile}}
+        multipartFile("{{baseName}}", {{#isContainer}}ArrayValues({{{paramName}}}{{#collectionFormat}}, {{collectionFormat.toUpperCase}}{{/collectionFormat}}){{/isContainer}}{{^isContainer}}{{{paramName}}}{{/isContainer}})
+    {{/isFile}}
+    {{^isFile}}
+        multipart("{{baseName}}", {{paramName}})
+    {{/isFile}}
+{{/required}}
+{{^required}}
+    {{#isFile}}
+        {{paramName}}.map(multipartFile("{{baseName}}", _))
+    {{/isFile}}
+    {{^isFile}}
+        {{paramName}}.map(multipart("{{baseName}}", {{#isContainer}}ArrayValues(_{{#collectionFormat}}, {{collectionFormat.toUpperCase}}{{/collectionFormat}}){{/isContainer}}{{^isContainer}}_{{/isContainer}}))
+    {{/isFile}}
+{{/required}}
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/project/build.properties.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/project/build.properties.mustache
new file mode 100644
index 000000000000..654fe70c42c7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/scala-sttp/project/build.properties.mustache
@@ -0,0 +1 @@
+sbt.version=1.3.12
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/requests.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/requests.mustache
deleted file mode 100644
index a39706e43f4b..000000000000
--- a/modules/openapi-generator/src/main/resources/scala-sttp/requests.mustache
+++ /dev/null
@@ -1,48 +0,0 @@
-{{>licenseInfo}}
-package {{invokerPackage}}
-
-import sttp.client.{Identity, RequestT, ResponseError}
-
-/**
- * This trait needs to be added to any model defined by the api.
- */
-trait ApiModel
-
-/**
- * Sttp type aliases
- */
-object alias {
-  type ApiRequestT[T] = RequestT[Identity, Either[ResponseError[Exception], T], Nothing]
-}
-
-/**
- * Single trait defining a credential that can be transformed to a paramName / paramValue tupple
- */
-sealed trait Credentials {
-  def asQueryParam: Option[(String, String)] = None
-}
-
-sealed case class BasicCredentials(user: String, password: String) extends Credentials
-
-sealed case class BearerToken(token: String) extends Credentials
-
-sealed case class ApiKeyCredentials(key: ApiKeyValue, keyName: String, location: ApiKeyLocation) extends Credentials {
-  override def asQueryParam: Option[(String, String)] = location match {
-    case ApiKeyLocations.QUERY => Some((keyName, key.value))
-    case _ => None
-  }
-}
-
-sealed case class ApiKeyValue(value: String)
-
-sealed trait ApiKeyLocation
-
-object ApiKeyLocations {
-
-  case object QUERY extends ApiKeyLocation
-
-  case object HEADER extends ApiKeyLocation
-
-  case object COOKIE extends ApiKeyLocation
-
-}
diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/serializers.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/serializers.mustache
deleted file mode 100644
index a17d77069157..000000000000
--- a/modules/openapi-generator/src/main/resources/scala-sttp/serializers.mustache
+++ /dev/null
@@ -1,57 +0,0 @@
-package {{invokerPackage}}
-
-{{#java8}}
-import java.time.{LocalDate, LocalDateTime, OffsetDateTime, ZoneId}
-import java.time.format.DateTimeFormatter
-import scala.util.Try
-{{/java8}}
-{{#joda}}
-import org.joda.time.DateTime
-import org.joda.time.format.ISODateTimeFormat
-{{/joda}}
-import org.json4s.{Serializer, CustomSerializer, JNull}
-import org.json4s.JsonAST.JString
-
-object Serializers {
-
-{{#java8}}
-  case object DateTimeSerializer extends CustomSerializer[OffsetDateTime](_ => ( {
-    case JString(s) =>
-      Try(OffsetDateTime.parse(s, DateTimeFormatter.ISO_OFFSET_DATE_TIME)) orElse
-        Try(LocalDateTime.parse(s).atZone(ZoneId.systemDefault()).toOffsetDateTime) getOrElse (null)
-    case JNull => null
-  }, {
-    case d: OffsetDateTime =>
-      JString(d.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME))
-  }))
-
-  case object LocalDateSerializer extends CustomSerializer[LocalDate]( _ => ( {
-    case JString(s) => LocalDate.parse(s)
-    case JNull => null
-  }, {
-    case d: LocalDate =>
-     JString(d.format(DateTimeFormatter.ISO_LOCAL_DATE))
-  }))
-{{/java8}}
-{{#joda}}
-  case object DateTimeSerializer extends CustomSerializer[DateTime](_ => ( {
-    case JString(s) =>
-      ISODateTimeFormat.dateOptionalTimeParser().parseDateTime(s)
-    case JNull => null
-  }, {
-    case d: org.joda.time.DateTime =>
-      JString(ISODateTimeFormat.dateTime().print(d))
-  })
-  )
-
-  case object LocalDateSerializer extends CustomSerializer[org.joda.time.LocalDate](_ => ( {
-    case JString(s) => org.joda.time.format.DateTimeFormat.forPattern("yyyy-MM-dd").parseLocalDate(s)
-    case JNull => null
-  }, {
-    case d: org.joda.time.LocalDate => JString(d.toString("yyyy-MM-dd"))
-  }))
-{{/joda}}
-
-  def all: Seq[Serializer[_]] = Seq[Serializer[_]]() :+ LocalDateSerializer :+ DateTimeSerializer
-
-}
diff --git a/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache b/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache
index bb900d741586..086bf4bce74f 100644
--- a/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache
+++ b/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache
@@ -31,7 +31,7 @@
 {{/allVars}}
 
 {{#hasVars}}
-    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init({{#allVars}}{{name}}: {{{datatypeWithEnum}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allVars}}) {
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init({{#allVars}}{{name}}: {{{datatypeWithEnum}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}? = nil{{/required}}{{#hasMore}}, {{/hasMore}}{{/allVars}}) {
         {{#allVars}}
         self.{{name}} = {{name}}
         {{/allVars}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
index 872ea6a262ff..33087c984bf8 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
@@ -107,6 +107,10 @@ export class {{classname}} {
         }
 
         if (typeof value === "object") {
+            {{#isQueryParamObjectFormatJson}}
+            httpParams = httpParams.append(key, JSON.stringify(value));
+            {{/isQueryParamObjectFormatJson}}
+            {{^isQueryParamObjectFormatJson}}
             if (Array.isArray(value)) {
                 (value as any[]).forEach( elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
             } else if (value instanceof Date) {
@@ -118,8 +122,9 @@ export class {{classname}} {
                 }
             } else {
                 Object.keys(value).forEach( k => httpParams = this.addToHttpParamsRecursive(
-                    httpParams, value[k], key != null ? `${key}.${k}` : k));
+                    httpParams, value[k], key != null ? `${key}{{#isQueryParamObjectFormatDot}}.{{/isQueryParamObjectFormatDot}}{{#isQueryParamObjectFormatKey}}[{{/isQueryParamObjectFormatKey}}${k}{{#isQueryParamObjectFormatKey}}]{{/isQueryParamObjectFormatKey}}` : k));
             }
+            {{/isQueryParamObjectFormatJson}}
         } else if (key != null) {
             httpParams = httpParams.append(key, value);
         } else {
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/api.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/api.mustache
index d209bdae09ff..19ce266882df 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/api.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/api.mustache
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 {{>licenseInfo}}
 
 {{^withSeparateModelsAndApi}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache
index e1fecd41c99e..10bb9f957615 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache
@@ -1,5 +1,6 @@
 {{#withSeparateModelsAndApi}}
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 {{>licenseInfo}}
 
 import * as globalImportUrl from 'url';
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache
index 5ff1902dd45a..519b7c7d948c 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 {{>licenseInfo}}
 
 import { Configuration } from "./configuration";
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache
index d99f998ea3c4..49fc09da60a7 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/configuration.mustache
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 {{>licenseInfo}}
 
 export interface ConfigurationParameters {
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/index.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/index.mustache
index 9c8794b3f282..b96435d71a77 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/index.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/index.mustache
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 {{>licenseInfo}}
 
 export * from "./api";
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/model.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/model.mustache
index db2738d890fd..976a611b2f24 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/model.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/model.mustache
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 {{>licenseInfo}}
 {{#withSeparateModelsAndApi}}{{#hasAllOf}}{{#allOf}}
 import { {{class}} } from './{{filename}}';{{/allOf}}{{/hasAllOf}}{{#hasOneOf}}{{#oneOf}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
index 32f0a1c54bb5..be03f0eb1771 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
@@ -98,7 +98,7 @@ export class {{classname}} extends runtime.BaseAPI {
 
         {{/required}}
         {{/allParams}}
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         {{#queryParams}}
         {{#isListContainer}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-jquery/api.mustache b/modules/openapi-generator/src/main/resources/typescript-jquery/api.mustache
index f27bfde09e44..77345329ad4e 100644
--- a/modules/openapi-generator/src/main/resources/typescript-jquery/api.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-jquery/api.mustache
@@ -82,6 +82,7 @@ export class {{classname}} {
         {{#isListContainer}}
         if ({{paramName}}) {
         {{#isCollectionFormatMulti}}
+            queryParameters['{{baseName}}'] = [];
             {{paramName}}.forEach((element: any) => {
                 queryParameters['{{baseName}}'].push(element);
             });
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
index 4aae18a02f0e..ab1847d6703a 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
@@ -1,7 +1,7 @@
 // tslint:disable
 {{>licenseInfo}}
 import { Observable } from 'rxjs';
-import { BaseAPI{{#hasHttpHeaders}}, HttpHeaders{{/hasHttpHeaders}}{{#hasQueryParams}}, HttpQuery{{/hasQueryParams}}{{#hasRequiredParams}}, throwIfNullOrUndefined{{/hasRequiredParams}}{{#hasPathParams}}, encodeURI{{/hasPathParams}}{{#hasListContainers}}, COLLECTION_FORMATS{{/hasListContainers}} } from '../runtime';
+import { BaseAPI{{#hasHttpHeaders}}, HttpHeaders{{/hasHttpHeaders}}{{#hasQueryParams}}, HttpQuery{{/hasQueryParams}}{{#hasRequiredParams}}, throwIfNullOrUndefined{{/hasRequiredParams}}{{#hasPathParams}}, encodeURI{{/hasPathParams}}{{#hasListContainers}}, COLLECTION_FORMATS{{/hasListContainers}}, OperationOpts, RawAjaxResponse } from '../runtime';
 {{#imports.0}}
 import {
     {{#imports}}
@@ -37,7 +37,12 @@ export class {{classname}} extends BaseAPI {
      * {{&summary}}
      {{/summary}}
      */
-    {{nickname}} = ({{#allParams.0}}{ {{#allParams}}{{paramName}}{{#vendorExtensions.x-param-name-alternative}}: {{vendorExtensions.x-param-name-alternative}}{{/vendorExtensions.x-param-name-alternative}}{{^-last}}, {{/-last}}{{/allParams}} }: {{operationIdCamelCase}}Request{{/allParams.0}}): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> => {
+    {{nickname}}({{#allParams.0}}{ {{#allParams}}{{paramName}}{{#vendorExtensions.x-param-name-alternative}}: {{vendorExtensions.x-param-name-alternative}}{{/vendorExtensions.x-param-name-alternative}}{{^-last}}, {{/-last}}{{/allParams}} }: {{operationIdCamelCase}}Request{{/allParams.0}}): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>
+{{#withProgressSubscriber}}
+    {{nickname}}({{#allParams.0}}{ {{#allParams}}{{paramName}}{{#vendorExtensions.x-param-name-alternative}}: {{vendorExtensions.x-param-name-alternative}}{{/vendorExtensions.x-param-name-alternative}}{{^-last}}, {{/-last}}{{/allParams}} }: {{operationIdCamelCase}}Request, {{/allParams.0}}opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>
+{{/withProgressSubscriber}}
+    {{nickname}}({{#allParams.0}}{ {{#allParams}}{{paramName}}{{#vendorExtensions.x-param-name-alternative}}: {{vendorExtensions.x-param-name-alternative}}{{/vendorExtensions.x-param-name-alternative}}{{^-last}}, {{/-last}}{{/allParams}} }: {{operationIdCamelCase}}Request, {{/allParams.0}}opts?: OperationOpts): Observable<{{#returnType}}RawAjaxResponse<{{{returnType}}}>{{/returnType}}{{^returnType}}void | RawAjaxResponse<void>{{/returnType}}>
+    {{nickname}}({{#allParams.0}}{ {{#allParams}}{{paramName}}{{#vendorExtensions.x-param-name-alternative}}: {{vendorExtensions.x-param-name-alternative}}{{/vendorExtensions.x-param-name-alternative}}{{^-last}}, {{/-last}}{{/allParams}} }: {{operationIdCamelCase}}Request, {{/allParams.0}}opts?: OperationOpts): Observable<{{#returnType}}{{{returnType}}} | RawAjaxResponse<{{{returnType}}}>{{/returnType}}{{^returnType}}void | RawAjaxResponse<void>{{/returnType}}> {
         {{#hasParams}}
         {{#allParams}}
         {{#required}}
@@ -177,7 +182,7 @@ export class {{classname}} extends BaseAPI {
 
         {{/hasFormParams}}
         return this.request<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>({
-            path: '{{{path}}}'{{#pathParams}}.replace({{=<% %>=}}'{<%baseName%>}'<%={{ }}=%>, encodeURI({{> paramNamePartial}})){{/pathParams}},
+            url: '{{{path}}}'{{#pathParams}}.replace({{=<% %>=}}'{<%baseName%>}'<%={{ }}=%>, encodeURI({{> paramNamePartial}})){{/pathParams}},
             method: '{{httpMethod}}',
             {{#hasHttpHeaders}}
             headers,
@@ -204,9 +209,12 @@ export class {{classname}} extends BaseAPI {
             body: formData,
             {{/hasFormParams}}
 {{#isResponseFile}}
-            responseType: 'blob'
+            responseType: 'blob',
 {{/isResponseFile}}
-        });
+{{#withProgressSubscriber}}
+            progressSubscriber: opts?.progressSubscriber,
+{{/withProgressSubscriber}}
+        }, opts?.responseOpts);
     };
 
     {{/operation}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/package.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/package.mustache
index 89f0f03561c8..26c1529a3a2d 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/package.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/package.mustache
@@ -6,14 +6,14 @@
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
   "scripts" : {
-    "build": "tsc --outDir dist/",
+    "build": "node_modules/.bin/tsc --outDir dist/",
     "prepare": "npm run build"
   },
   "dependencies": {
     "rxjs": "^6.3.3"
   },
   "devDependencies": {
-    "typescript": "^3.0.1"
+    "typescript": "^3.7"
   }{{#npmRepository}},{{/npmRepository}}
 {{#npmRepository}}
   "publishConfig": {
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
index db845a859459..400f7df8eb9a 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
@@ -1,6 +1,6 @@
 // tslint:disable
 {{>licenseInfo}}
-import { Observable, of } from 'rxjs';
+import { Observable, of, Subscriber } from 'rxjs';
 import { ajax, AjaxRequest, AjaxResponse } from 'rxjs/ajax';
 import { map, concatMap } from 'rxjs/operators';
 
@@ -19,11 +19,11 @@ export class Configuration {
     constructor(private configuration: ConfigurationParameters = {}) {}
 
     get basePath(): string {
-        return this.configuration.basePath || BASE_PATH;
+        return this.configuration.basePath ?? BASE_PATH;
     }
 
     get middleware(): Middleware[] {
-        return this.configuration.middleware || [];
+        return this.configuration.middleware ?? [];
     }
 
     get username(): string | undefined {
@@ -36,18 +36,12 @@ export class Configuration {
 
     get apiKey(): ((name: string) => string) | undefined {
         const { apiKey } = this.configuration;
-        if (!apiKey) {
-            return undefined;
-        }
-        return typeof apiKey === 'string' ? () => apiKey : apiKey;
+        return apiKey ? (typeof apiKey === 'string' ? () => apiKey : apiKey) : undefined;
     }
 
     get accessToken(): ((name: string, scopes?: string[]) => string) | undefined {
         const { accessToken } = this.configuration;
-        if (!accessToken) {
-            return undefined;
-        }
-        return typeof accessToken === 'string' ? () => accessToken : accessToken;
+        return accessToken ? (typeof accessToken === 'string' ? () => accessToken : accessToken) : undefined;
     }
 }
 
@@ -73,31 +67,35 @@ export class BaseAPI {
     withPostMiddleware = (postMiddlewares: Array<Middleware['post']>) =>
         this.withMiddleware(postMiddlewares.map((post) => ({ post })));
 
-    protected request = <T>(requestOpts: RequestOpts): Observable<T> =>
-        this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
+    protected request<T>(requestOpts: RequestOpts): Observable<T>
+    protected request<T>(requestOpts: RequestOpts, responseOpts?: ResponseOpts): Observable<RawAjaxResponse<T>>
+    protected request<T>(requestOpts: RequestOpts, responseOpts?: ResponseOpts): Observable<T | RawAjaxResponse<T>> {
+        return this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
             map((res) => {
-                if (res.status >= 200 && res.status < 300) {
-                    return res.response as T;
+                const { status, response } = res;
+                if (status >= 200 && status < 300) {
+                    return responseOpts?.respone === 'raw' ? res : response;
                 }
                 throw res;
             })
         );
+    }
 
-    private createRequestArgs = (requestOpts: RequestOpts): RequestArgs => {
-        let url = this.configuration.basePath + requestOpts.path;
-        if (requestOpts.query !== undefined && Object.keys(requestOpts.query).length !== 0) {
-            // only add the queryString to the URL if there are query parameters.
-            // this is done to avoid urls ending with a '?' character which buggy webservers
-            // do not handle correctly sometimes.
-            url += '?' + queryString(requestOpts.query);
-        }
+    private createRequestArgs = ({ url: baseUrl, query, method, headers, body, responseType{{#withProgressSubscriber}}, progressSubscriber{{/withProgressSubscriber}} }: RequestOpts): RequestArgs => {
+        // only add the queryString to the URL if there are query parameters.
+        // this is done to avoid urls ending with a '?' character which buggy webservers
+        // do not handle correctly sometimes.
+        const url = `${this.configuration.basePath}${baseUrl}${query && Object.keys(query).length ? `?${queryString(query)}`: ''}`;
 
         return {
             url,
-            method: requestOpts.method,
-            headers: requestOpts.headers,
-            body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
-            responseType: requestOpts.responseType || 'json',
+            method,
+            headers,
+            body: body instanceof FormData ? body : JSON.stringify(body),
+            responseType: responseType ?? 'json',
+            {{#withProgressSubscriber}}
+            progressSubscriber,
+            {{/withProgressSubscriber}}
         };
     }
 
@@ -146,24 +144,41 @@ export type HttpHeaders = { [key: string]: string };
 export type HttpQuery = Partial<{ [key: string]: string | number | null | boolean | Array<string | number | null | boolean> }>; // partial is needed for strict mode
 export type HttpBody = Json | FormData;
 
-export interface RequestOpts {
-    path: string;
+export interface RequestOpts extends AjaxRequest {
+    query?: HttpQuery; // additional prop
+    // the following props have improved types over AjaxRequest 
     method: HttpMethod;
     headers?: HttpHeaders;
-    query?: HttpQuery;
     body?: HttpBody;
     responseType?: 'json' | 'blob' | 'arraybuffer' | 'text';
+    {{#withProgressSubscriber}}
+    progressSubscriber?: Subscriber<ProgressEvent>;
+    {{/withProgressSubscriber}}
+}
+
+export interface ResponseOpts {
+    respone?: 'raw';
+}
+
+export interface OperationOpts {
+    {{#withProgressSubscriber}}
+    progressSubscriber?: Subscriber<ProgressEvent>;
+    {{/withProgressSubscriber}}
+    responseOpts?: ResponseOpts;
+}
+
+// AjaxResponse with typed response 
+export interface RawAjaxResponse<T> extends AjaxResponse {
+    response: T;
 }
 
-export const encodeURI = (value: any) => encodeURIComponent(String(value));
+export const encodeURI = (value: any) => encodeURIComponent(`${value}`);
 
-const queryString = (params: HttpQuery): string => Object.keys(params)
-    .map((key) => {
-        const value = params[key];
-        return (value instanceof Array)
-            ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
-            : `${encodeURI(key)}=${encodeURI(value)}`;
-    })
+const queryString = (params: HttpQuery): string => Object.entries(params)
+    .map(([key, value]) => value instanceof Array
+        ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
+        : `${encodeURI(key)}=${encodeURI(value)}`
+    )
     .join('&');
 
 // alias fallback for not being a breaking change
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/tsconfig.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/tsconfig.mustache
index 328c7d4e141a..0779a8b0037f 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/tsconfig.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/tsconfig.mustache
@@ -6,12 +6,13 @@
     "moduleResolution": "node",
     "outDir": "dist",
     "rootDir": ".",
-    {{^supportsES6}}
     "lib": [
+      {{^supportsES6}}
       "es6",
-      "dom"
+      {{/supportsES6}}
+      "dom",
+      "es2017"
     ],
-    {{/supportsES6}}
     "typeRoots": [
       "node_modules/@types"
     ]
diff --git a/modules/openapi-generator/src/main/resources/typescript/.gitignore.mustache b/modules/openapi-generator/src/main/resources/typescript/.gitignore.mustache
new file mode 100644
index 000000000000..1521c8b7652b
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/.gitignore.mustache
@@ -0,0 +1 @@
+dist
diff --git a/modules/openapi-generator/src/main/resources/typescript/README.mustache b/modules/openapi-generator/src/main/resources/typescript/README.mustache
new file mode 100644
index 000000000000..d1c61395920d
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/README.mustache
@@ -0,0 +1,30 @@
+## {{npmName}}@{{npmVersion}}
+
+This generator creates TypeScript/JavaScript client that utilizes {{framework}}. 
+
+### Building
+
+To build and compile the typescript sources to javascript use:
+```
+npm install
+npm run build
+```
+
+### Publishing
+
+First build the package then run ```npm publish```
+
+### Consuming
+
+navigate to the folder of your consuming project and run one of the following commands.
+
+_published:_
+
+```
+npm install {{npmName}}@{{npmVersion}} --save
+```
+
+_unPublished (not recommended):_
+
+```
+npm install PATH_TO_GENERATED_PACKAGE --save
diff --git a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache
new file mode 100644
index 000000000000..3bebe096502b
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache
@@ -0,0 +1,221 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi{{extensionForDeno}}';
+import {Configuration} from '../configuration{{extensionForDeno}}';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http{{extensionForDeno}}';
+{{#platforms}}
+{{#node}}
+import * as FormData from "form-data";
+{{/node}}
+{{/platforms}}
+import {ObjectSerializer} from '../models/ObjectSerializer{{extensionForDeno}}';
+import {ApiException} from './exception{{extensionForDeno}}';
+import {isCodeInRange} from '../util{{extensionForDeno}}';
+{{#useInversify}}
+import { injectable } from "inversify";
+{{/useInversify}}
+
+{{#imports}}
+import { {{classname}} } from '..{{filename}}{{extensionForDeno}}';
+{{/imports}}
+{{#operations}}
+
+/**
+ * {{#description}}{{{description}}}{{/description}}{{^description}}no description{{/description}}
+ */
+{{#useInversify}}
+@injectable()
+{{/useInversify}}
+export class {{classname}}RequestFactory extends BaseAPIRequestFactory {
+	
+	{{#operation}}
+    /**
+     {{#notes}}
+     * {{&notes}}
+     {{/notes}}
+     {{#summary}}
+     * {{&summary}}
+     {{/summary}}
+     {{#allParams}}
+     * @param {{paramName}} {{description}}
+     {{/allParams}}
+     */
+    public async {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		{{#allParams}}
+		
+		{{#required}}
+        // verify required parameter '{{paramName}}' is not null or undefined
+        if ({{paramName}} === null || {{paramName}} === undefined) {
+            throw new RequiredError('Required parameter {{paramName}} was null or undefined when calling {{nickname}}.');
+        }
+
+		{{/required}}
+		{{/allParams}}
+		
+		// Path Params
+    	const localVarPath = '{{{path}}}'{{#pathParams}}
+            .replace('{' + '{{baseName}}' + '}', encodeURIComponent(String({{paramName}}))){{/pathParams}};
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.{{httpMethod}});
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+		{{#queryParams}}
+        if ({{paramName}} !== undefined) {
+        	requestContext.setQueryParam("{{baseName}}", ObjectSerializer.serialize({{paramName}}, "{{{dataType}}}", "{{dataFormat}}"));
+        }
+		{{/queryParams}}
+	
+		// Header Params
+		{{#headerParams}}
+		requestContext.setHeaderParam("{{baseName}}", ObjectSerializer.serialize({{paramName}}, "{{{dataType}}}", "{{dataFormat}}"));
+		{{/headerParams}}
+	
+		// Form Params
+	    {{#hasFormParams}}
+		let localVarFormParams = new FormData();
+		{{/hasFormParams}}	
+
+		{{#formParams}}
+        {{#isListContainer}}
+        if ({{paramName}}) {
+        {{#isCollectionFormatMulti}}
+            {{paramName}}.forEach((element) => {
+                localVarFormParams.append('{{baseName}}', element as any);
+            })
+        {{/isCollectionFormatMulti}}
+        {{^isCollectionFormatMulti}}
+        // TODO: replace .append with .set
+                localVarFormParams.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"]));
+        {{/isCollectionFormatMulti}}
+        }
+        {{/isListContainer}}
+        {{^isListContainer}}
+        if ({{paramName}} !== undefined) {
+        // TODO: replace .append with .set
+             {{^isFile}}
+             localVarFormParams.append('{{baseName}}', {{paramName}} as any);
+             {{/isFile}}
+             {{#isFile}}
+             {{#platforms}}
+             {{#node}}
+             localVarFormParams.append('{{baseName}}', {{paramName}}.data, {{paramName}}.name);
+             {{/node}}
+             {{^node}}
+             localVarFormParams.append('{{baseName}}', {{paramName}}, {{paramName}}.name);
+             {{/node}}
+             {{/platforms}}
+             {{/isFile}}
+        }
+        {{/isListContainer}}
+		{{/formParams}}		
+	    {{#hasFormParams}}
+		requestContext.setBody(localVarFormParams);
+		{{/hasFormParams}}	
+
+		// Body Params
+	    {{#bodyParam}}
+        const contentType = ObjectSerializer.getPreferredMediaType([{{#consumes}}
+            "{{{mediaType}}}"{{#hasMore}},{{/hasMore}}
+        {{/consumes}}]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize({{paramName}}, "{{{dataType}}}", "{{dataFormat}}"),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+	    {{/bodyParam}}
+
+        {{#hasAuthMethods}}
+        let authMethod = null;
+        {{/hasAuthMethods}}
+        // Apply auth methods
+        {{#authMethods}}
+        authMethod = config.authMethods["{{name}}"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+        {{/authMethods}}
+
+        return requestContext;
+    }
+
+    {{/operation}}
+}
+{{/operations}}
+
+
+{{#operations}}
+
+{{#useInversify}}
+@injectable()
+{{/useInversify}}
+export class {{classname}}ResponseProcessor {
+
+    {{#operation}}
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to {{nickname}}
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async {{nickname}}(response: ResponseContext): Promise<{{#returnType}}{{{returnType}}}{{/returnType}} {{^returnType}}void{{/returnType}}> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        {{#responses}}
+        if (isCodeInRange("{{code}}", response.httpStatusCode)) {
+            {{#dataType}}
+            {{#isBinary}}
+            const body: {{{dataType}}} = await response.getBodyAsFile() as any as {{{returnType}}};
+            {{/isBinary}}
+            {{^isBinary}}
+            const body: {{{dataType}}} = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "{{{dataType}}}", "{{returnFormat}}"
+            ) as {{{dataType}}};
+            {{/isBinary}}
+            {{#is2xx}}
+            return body;
+            {{/is2xx}}
+            {{^is2xx}}
+            throw new ApiException<{{{dataType}}}>({{code}}, body);
+            {{/is2xx}}
+            {{/dataType}}
+            {{^dataType}}
+            {{#is2xx}}
+            return;
+            {{/is2xx}}
+            {{^is2xx}}
+            throw new ApiException<string>(response.httpStatusCode, "{{message}}");
+            {{/is2xx}}
+            {{/dataType}}
+        }
+        {{/responses}}
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            {{#returnType}}
+            {{#isBinary}}
+            const body: {{{returnType}}} = await response.getBodyAsFile() as any as {{{returnType}}};
+            {{/isBinary}}
+            {{^isBinary}}
+            const body: {{{returnType}}} = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "{{{returnType}}}", "{{returnFormat}}"
+            ) as {{{returnType}}};
+            {{/isBinary}}
+            return body;
+            {{/returnType}}
+            {{^returnType}}
+            return;
+            {{/returnType}}
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+	{{/operation}}
+}
+{{/operations}}
diff --git a/modules/openapi-generator/src/main/resources/typescript/api/baseapi.mustache b/modules/openapi-generator/src/main/resources/typescript/api/baseapi.mustache
new file mode 100644
index 000000000000..e33b699f1e76
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/api/baseapi.mustache
@@ -0,0 +1,44 @@
+import { Configuration } from '../configuration{{extensionForDeno}}'
+{{#useInversify}}
+import { injectable, inject } from "inversify";
+import { AbstractConfiguration } from "../services/configuration";
+{{/useInversify}}
+
+/**
+ *
+ * @export
+ */
+export const COLLECTION_FORMATS = {
+    csv: ",",
+    ssv: " ",
+    tsv: "\t",
+    pipes: "|",
+};
+
+
+/**
+ * 
+ * @export
+ * @class BaseAPI
+ */
+{{#useInversify}}
+@injectable()
+{{/useInversify}}
+export class BaseAPIRequestFactory {
+
+    constructor({{#useInversify}}@inject(AbstractConfiguration) {{/useInversify}}protected configuration: Configuration) {
+    }
+};
+
+/**
+ * 
+ * @export
+ * @class RequiredError
+ * @extends {Error}
+ */
+export class RequiredError extends Error {
+    name: "RequiredError" = "RequiredError";
+    constructor(public field: string, msg?: string) {
+        super(msg);
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/typescript/api/exception.mustache b/modules/openapi-generator/src/main/resources/typescript/api/exception.mustache
new file mode 100644
index 000000000000..b76dca5aa4bc
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/api/exception.mustache
@@ -0,0 +1,14 @@
+/**
+ * Represents an error caused by an api call i.e. it has attributes for a HTTP status code 
+ * and the returned body object.
+ *
+ * Example
+ * API returns a ErrorMessageObject whenever HTTP status code is not in [200, 299]
+ * => ApiException(404, someErrorMessageObject)
+ *
+ */
+export class ApiException<T> extends Error {
+	public constructor(public code: number, public body: T) {
+        super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body))  
+	}
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/api/middleware.mustache b/modules/openapi-generator/src/main/resources/typescript/api/middleware.mustache
new file mode 100644
index 000000000000..ee3a45bddcd9
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/api/middleware.mustache
@@ -0,0 +1,66 @@
+import {RequestContext, ResponseContext} from './http/http{{extensionForDeno}}';
+import { Observable, from } from {{#useRxJS}}'rxjs'{{/useRxJS}}{{^useRxJS}}'./rxjsStub{{extensionForDeno}}'{{/useRxJS}};
+
+/**
+ * Defines the contract for a middleware intercepting requests before
+ * they are sent (but after the RequestContext was created)
+ * and before the ResponseContext is unwrapped.
+ *
+ */
+export interface Middleware {
+	/**
+	 * Modifies the request before the request is sent. 
+	 *
+	 * @param context RequestContext of a request which is about to be sent to the server
+	 * @returns an observable of the updated request context
+	 *
+	 */
+    pre(context: RequestContext): Observable<RequestContext>;
+    /**
+     * Modifies the returned response before it is deserialized.
+     *
+     * @param context ResponseContext of a sent request
+     * @returns an observable of the modified response context
+     */
+    post(context: ResponseContext): Observable<ResponseContext>;
+}
+
+export class PromiseMiddlewareWrapper implements Middleware {
+
+    public constructor(private middleware: PromiseMiddleware) {
+
+    }
+
+    pre(context: RequestContext): Observable<RequestContext> {
+        return from(this.middleware.pre(context));
+    }
+    
+    post(context: ResponseContext): Observable<ResponseContext> {
+        return from(this.middleware.post(context));
+    }
+
+}
+
+/**
+ * Defines the contract for a middleware intercepting requests before
+ * they are sent (but after the RequestContext was created)
+ * and before the ResponseContext is unwrapped.
+ *
+ */
+export interface PromiseMiddleware {
+	/**
+	 * Modifies the request before the request is sent. 
+	 *
+	 * @param context RequestContext of a request which is about to be sent to the server
+	 * @returns an observable of the updated request context
+	 *
+	 */
+    pre(context: RequestContext): Promise<RequestContext>;
+        /**
+     * Modifies the returned response before it is deserialized.
+     *
+     * @param context ResponseContext of a sent request
+     * @returns an observable of the modified response context
+     */
+    post(context: ResponseContext): Promise<ResponseContext>;
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/auth/auth.mustache b/modules/openapi-generator/src/main/resources/typescript/auth/auth.mustache
new file mode 100644
index 000000000000..bab1d5b1bfa2
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/auth/auth.mustache
@@ -0,0 +1,161 @@
+// typings for btoa are incorrect
+{{#platforms}}
+{{#node}}
+//@ts-ignore
+import * as btoa from "btoa";
+{{/node}}
+{{/platforms}}
+import { RequestContext } from "../http/http{{extensionForDeno}}";
+{{#useInversify}}
+import { injectable, inject, named } from "inversify";
+import { AbstractTokenProvider } from "../services/configuration";
+{{/useInversify}}
+
+/**
+ * Interface authentication schemes.
+ */
+export interface SecurityAuthentication {
+    /*
+     * @return returns the name of the security authentication as specified in OAI
+     */
+    getName(): string;
+
+    /**
+     * Applies the authentication scheme to the request context
+     *
+     * @params context the request context which should use this authentication scheme
+     */
+    applySecurityAuthentication(context: RequestContext): void | Promise<void>;
+}
+
+{{#useInversify}}
+export const AuthApiKey = Symbol("auth.api_key");
+export const AuthUsername = Symbol("auth.username");
+export const AuthPassword = Symbol("auth.password");
+
+{{/useInversify}}
+export interface TokenProvider {
+  getToken(): Promise<string> | string;
+}
+
+{{#authMethods}}
+/**
+ * Applies {{type}} authentication to the request context.
+ */
+{{#useInversify}}
+@injectable()
+{{/useInversify}}
+export class {{#lambda.pascalcase}}{{name}}{{/lambda.pascalcase}}Authentication implements SecurityAuthentication {
+    {{#isApiKey}}
+    /**
+     * Configures this api key authentication with the necessary properties
+     *
+     * @param apiKey: The api key to be used for every request
+     */
+    public constructor({{#useInversify}}@inject(AuthApiKey) @named("{{name}}") {{/useInversify}}private apiKey: string) {}
+    {{/isApiKey}}
+    {{#isBasicBasic}}
+    /**
+     * Configures the http authentication with the required details.
+     *
+     * @param username username for http basic authentication
+     * @param password password for http basic authentication
+     */
+    public constructor(
+        {{#useInversify}}@inject(AuthUsername) @named("{{name}}") {{/useInversify}}private username: string,
+        {{#useInversify}}@inject(AuthPassword) @named("{{name}}") {{/useInversify}}private password: string
+    ) {}
+    {{/isBasicBasic}}
+    {{#isBasicBearer}}
+    /**
+     * Configures the http authentication with the required details.
+     *
+     * @param tokenProvider service that can provide the up-to-date token when needed
+     */
+    public constructor({{#useInversify}}@inject(AbstractTokenProvider) @named("{{name}}") {{/useInversify}}private tokenProvider: TokenProvider) {}
+    {{/isBasicBearer}}
+    {{#isOAuth}}
+    // TODO: How to handle oauth2 authentication!
+    public constructor() {}
+    {{/isOAuth}}
+
+    public getName(): string {
+        return "{{name}}";
+    }
+
+    public {{#isBasicBearer}}async {{/isBasicBearer}}applySecurityAuthentication(context: RequestContext) {
+        {{#isApiKey}}
+        context.{{#isKeyInHeader}}setHeaderParam{{/isKeyInHeader}}{{#isKeyInQuery}}addCookie{{/isKeyInQuery}}{{#isKeyInCookie}}setQueryParam{{/isKeyInCookie}}("{{keyParamName}}", this.apiKey);
+        {{/isApiKey}}
+        {{#isBasicBasic}}
+        let comb = this.username + ":" + this.password;
+        context.setHeaderParam("Authorization", "Basic " + btoa(comb));
+        {{/isBasicBasic}}
+        {{#isBasicBearer}}
+        context.setHeaderParam("Authorization", "Bearer " + await this.tokenProvider.getToken());
+        {{/isBasicBearer}}
+        {{#isOAuth}}
+        // TODO
+        {{/isOAuth}}
+    }
+}
+
+{{/authMethods}}
+
+export type AuthMethods = {
+    {{#authMethods}}
+    "{{name}}"?: SecurityAuthentication{{#hasMore}},{{/hasMore}}
+    {{/authMethods}}
+}
+{{#useInversify}}
+
+export const authMethodServices = {
+    {{#authMethods}}
+    "{{name}}": {{#lambda.pascalcase}}{{name}}{{/lambda.pascalcase}}Authentication{{#hasMore}},{{/hasMore}}
+    {{/authMethods}}
+}
+{{/useInversify}}
+
+export type ApiKeyConfiguration = string;
+export type HttpBasicConfiguration = { "username": string, "password": string };
+export type HttpBearerConfiguration = { tokenProvider: TokenProvider };
+export type OAuth2Configuration = string;
+
+export type AuthMethodsConfiguration = {
+    {{#authMethods}}
+    "{{name}}"?: {{#isApiKey}}ApiKeyConfiguration{{/isApiKey}}{{#isBasicBasic}}HttpBasicConfiguration{{/isBasicBasic}}{{#isBasicBearer}}HttpBearerConfiguration{{/isBasicBearer}}{{#isOAuth}}OAuth2Configuration{{/isOAuth}}{{#hasMore}},{{/hasMore}}
+    {{/authMethods}}
+}
+
+/**
+ * Creates the authentication methods from a swagger description.
+ *
+ */
+export function configureAuthMethods(config: AuthMethodsConfiguration | undefined): AuthMethods {
+    let authMethods: AuthMethods = {}
+
+    if (!config) {
+        return authMethods;
+    }
+
+    {{#authMethods}}
+    if (config["{{name}}"]) {
+        authMethods["{{name}}"] = new {{#lambda.pascalcase}}{{name}}{{/lambda.pascalcase}}Authentication(
+            {{#isApiKey}}
+            config["{{name}}"]
+            {{/isApiKey}}
+            {{#isBasicBasic}}
+            config["{{name}}"]["username"],
+            config["{{name}}"]["password"]
+            {{/isBasicBasic}}
+            {{#isBasicBearer}}
+            config["{{name}}"]["tokenProvider"]
+            {{/isBasicBearer}}
+            {{#isOAuth}}
+            {{/isOAuth}}
+        );
+    }
+
+    {{/authMethods}}
+    return authMethods;
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache
new file mode 100644
index 000000000000..38f46ded384c
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache
@@ -0,0 +1,73 @@
+import { HttpLibrary } from "./http/http{{extensionForDeno}}";
+import { Middleware, PromiseMiddleware, PromiseMiddlewareWrapper } from "./middleware{{extensionForDeno}}";
+{{#frameworks}}
+{{#fetch-api}}
+import { IsomorphicFetchHttpLibrary as DefaultHttpLibrary } from "./http/isomorphic-fetch{{extensionForDeno}}";
+{{/fetch-api}}
+{{#jquery}}
+import { JQueryHttpLibrary as DefaultHttpLibrary } from "./http/jquery";
+{{/jquery}}
+{{/frameworks}}
+import { BaseServerConfiguration, server1 } from "./servers{{extensionForDeno}}";
+import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth{{extensionForDeno}}";
+
+export interface Configuration {
+    readonly baseServer: BaseServerConfiguration;
+    readonly httpApi: HttpLibrary;
+    readonly middleware: Middleware[];
+    readonly authMethods: AuthMethods;
+}
+
+
+/**
+ * Interface with which a configuration object can be configured.
+ */
+export interface ConfigurationParameters {
+    /**
+     * Default server to use
+     */
+    baseServer?: BaseServerConfiguration;
+    /**
+     * HTTP library to use e.g. IsomorphicFetch
+     */
+    httpApi?: HttpLibrary;
+    /**
+     * The middlewares which will be applied to requests and responses
+     */
+    middleware?: Middleware[];
+    /**
+     * Configures all middlewares using the promise api instead of observables (which Middleware uses)
+     */
+    promiseMiddleware?: PromiseMiddleware[];
+    /**
+     * Configuration for the available authentication methods
+     */
+    authMethods?: AuthMethodsConfiguration
+}
+
+/**
+ * Configuration factory function
+ *
+ * If a property is not included in conf, a default is used:
+ *    - baseServer: server1
+ *    - httpApi: IsomorphicFetchHttpLibrary
+ *    - middleware: []
+ *    - promiseMiddleware: []
+ *    - authMethods: {}
+ *
+ * @param conf partial configuration
+ */
+export function createConfiguration(conf: ConfigurationParameters = {}): Configuration {
+    const configuration: Configuration = {
+        baseServer: conf.baseServer !== undefined ? conf.baseServer : server1,
+        httpApi: conf.httpApi || new DefaultHttpLibrary(),
+        middleware: conf.middleware || [],
+        authMethods: configureAuthMethods(conf.authMethods)
+    };
+    if (conf.promiseMiddleware) {
+        conf.promiseMiddleware.forEach(
+            m => configuration.middleware.push(new PromiseMiddlewareWrapper(m))
+        );
+    }
+    return configuration;
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/git_push.sh.mustache b/modules/openapi-generator/src/main/resources/typescript/git_push.sh.mustache
new file mode 100755
index 000000000000..8a32e53995d6
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/openapi-generator/src/main/resources/typescript/http/http.mustache b/modules/openapi-generator/src/main/resources/typescript/http/http.mustache
new file mode 100644
index 000000000000..efb155c7df7d
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/http/http.mustache
@@ -0,0 +1,302 @@
+{{#platforms}}
+{{#node}}
+// TODO: evaluate if we can easily get rid of this library
+import * as FormData from "form-data";
+{{/node}}
+{{/platforms}}
+{{#platforms}}
+{{^deno}}
+// typings of url-parse are incorrect...
+// @ts-ignore 
+import * as URLParse from "url-parse";
+{{/deno}}
+{{/platforms}}
+import { Observable, from } from {{#useRxJS}}'rxjs'{{/useRxJS}}{{^useRxJS}}'../rxjsStub{{extensionForDeno}}'{{/useRxJS}};
+
+{{#platforms}}
+{{^deno}}
+{{#frameworks}}
+{{#fetch-api}}
+export * from './isomorphic-fetch';
+{{/fetch-api}}
+{{#jquery}}
+export * from './jquery';
+{{/jquery}}
+{{/frameworks}}
+{{/deno}}
+{{/platforms}}
+
+/**
+ * Represents an HTTP method.
+ */
+export enum HttpMethod {
+    GET = "GET",
+    HEAD = "HEAD",
+    POST = "POST",
+    PUT = "PUT",
+    DELETE = "DELETE",
+    CONNECT = "CONNECT",
+    OPTIONS = "OPTIONS",
+    TRACE = "TRACE",
+    PATCH = "PATCH"
+}
+
+/**
+ * Represents an HTTP file which will be transferred from or to a server.
+ */
+{{#platforms}}
+{{#node}}
+export type HttpFile = {
+    data: {{{fileContentDataType}}},
+    name: string
+};
+{{/node}}
+{{^node}}
+export type HttpFile = {{{fileContentDataType}}} & { readonly name: string };
+{{/node}}
+{{/platforms}}
+
+{{#platforms}}
+{{#deno}}
+/**
+ * URLParse Wrapper for Deno
+ */
+class URLParse {
+    private url: URL;
+    constructor(address: string, _parser: boolean) {
+        this.url = new URL(address);
+    }
+    public set(_part: 'query', obj: {[key: string]: string | undefined}) {
+        for (const key in obj) {
+            const value = obj[key];
+            if (value) {
+              this.url.searchParams.set(key, value);
+            } else {
+              this.url.searchParams.set(key, "");
+            }
+        }
+    }
+    public get query() {
+        const obj: {[key: string]: string} = {};
+        for (const [key, value] of this.url.searchParams.entries()) {
+            obj[key] = value;
+        }
+        return obj;
+    }
+    public toString() {
+        return this.url.toString();
+    }
+}
+{{/deno}}
+{{/platforms}}
+
+export class HttpException extends Error {
+    public constructor(msg: string) {
+        super(msg);
+    }
+}
+
+/**
+ * Represents the body of an outgoing HTTP request.
+ */
+export type RequestBody = undefined | string | FormData;
+
+/**
+ * Represents an HTTP request context
+ */
+export class RequestContext {
+    private headers: { [key: string]: string } = {};
+    private body: RequestBody = undefined;
+    private url: URLParse;
+
+	/**
+	 * Creates the request context using a http method and request resource url
+	 *
+	 * @param url url of the requested resource
+	 * @param httpMethod http method
+	 */
+    public constructor(url: string, private httpMethod: HttpMethod) {
+        this.url = new URLParse(url, true);
+    }
+    
+    /*
+     * Returns the url set in the constructor including the query string
+     *
+     */
+    public getUrl(): string {
+    	return this.url.toString();
+    }
+    
+    /**
+     * Replaces the url set in the constructor with this url.
+     *
+     */
+    public setUrl(url: string) {
+        this.url = new URLParse(url, true);
+    }
+
+    /**
+     * Sets the body of the http request either as a string or FormData
+     *
+     * Note that setting a body on a HTTP GET, HEAD, DELETE, CONNECT or TRACE
+     * request is discouraged.
+     * https://httpwg.org/http-core/draft-ietf-httpbis-semantics-latest.html#rfc.section.7.3.1
+     *
+     * @param body the body of the request
+     */
+    public setBody(body: RequestBody) {
+        this.body = body;
+    }
+
+    public getHttpMethod(): HttpMethod {
+    	return this.httpMethod;
+    }
+    
+    public getHeaders(): { [key: string]: string } {
+    	return this.headers;
+    }
+
+    public getBody(): RequestBody {
+        return this.body;
+    }
+
+	public setQueryParam(name: string, value: string) {
+        let queryObj = this.url.query;
+        queryObj[name] = value;
+        this.url.set("query", queryObj);
+    }
+
+	/**
+	 *	Sets a cookie with the name and value. NO check  for duplicate cookies is performed
+	 *
+	 */
+    public addCookie(name: string, value: string): void {
+        if (!this.headers["Cookie"]) {
+            this.headers["Cookie"] = "";
+        }
+        this.headers["Cookie"] += name + "=" + value + "; ";
+    }
+
+    public setHeaderParam(key: string, value: string): void  { 
+        this.headers[key] = value;
+    }
+}
+
+export interface ResponseBody {
+    text(): Promise<string>;
+    binary(): Promise<{{{fileContentDataType}}}>;
+}
+
+
+/**
+ * Helper class to generate a `ResponseBody` from binary data
+ */
+export class SelfDecodingBody implements ResponseBody {
+    constructor(private dataSource: Promise<{{{fileContentDataType}}}>) {}
+
+    binary(): Promise<{{{fileContentDataType}}}> {
+        return this.dataSource;
+    }
+
+    async text(): Promise<string> {
+        const data: {{{fileContentDataType}}} = await this.dataSource;
+        {{#platforms}}
+        {{#node}}
+        return data.toString();
+        {{/node}}
+        {{#browser}}
+        // @ts-ignore
+        if (data.text) {
+            // @ts-ignore
+            return data.text();
+        }
+
+        return new Promise<string>((resolve, reject) => {
+            const reader = new FileReader();
+            reader.addEventListener("load", () => resolve(reader.result as string));
+            reader.addEventListener("error", () => reject(reader.error));
+            reader.readAsText(data);
+        });
+        {{/browser}}
+        {{#deno}}
+        return data.text();
+        {{/deno}}
+        {{/platforms}}
+    }
+}
+
+export class ResponseContext {
+    public constructor(
+        public httpStatusCode: number,
+        public headers: { [key: string]: string },
+        public body: ResponseBody
+    ) {}
+
+    /**
+     * Parse header value in the form `value; param1="value1"`
+     *
+     * E.g. for Content-Type or Content-Disposition
+     * Parameter names are converted to lower case
+     * The first parameter is returned with the key `""`
+     */
+    public getParsedHeader(headerName: string): { [parameter: string]: string } {
+        const result: { [parameter: string]: string } = {};
+        if (!this.headers[headerName]) {
+            return result;
+        }
+
+        const parameters = this.headers[headerName].split(";");
+        for (const parameter of parameters) {
+            let [key, value] = parameter.split("=", 2);
+            key = key.toLowerCase().trim();
+            if (value === undefined) {
+                result[""] = key;
+            } else {
+                value = value.trim();
+                if (value.startsWith('"') && value.endsWith('"')) {
+                    value = value.substring(1, value.length - 1);
+                }
+                result[key] = value;
+            }
+        }
+        return result;
+    }
+
+    public async getBodyAsFile(): Promise<HttpFile> {
+        const data = await this.body.binary();
+        const fileName = this.getParsedHeader("content-disposition")["filename"] || "";
+        {{#platforms}}
+        {{#node}}
+        return { data, name: fileName };
+        {{/node}}
+        {{^node}}
+        const contentType = this.headers["content-type"] || "";
+        try {
+            return new File([data], fileName, { type: contentType });
+        } catch (error) {
+            /** Fallback for when the File constructor is not available */
+            return Object.assign(data, {
+                name: fileName,
+                type: contentType
+            });
+        }
+        {{/node}}
+        {{/platforms}}
+    }
+}
+
+export interface HttpLibrary {
+    send(request: RequestContext): Observable<ResponseContext>;
+}
+
+export interface PromiseHttpLibrary {
+    send(request: RequestContext): Promise<ResponseContext>;
+}
+
+export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLibrary {
+  return {
+    send(request: RequestContext): Observable<ResponseContext> {
+      return from(promiseHttpLibrary.send(request));
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/http/isomorphic-fetch.mustache b/modules/openapi-generator/src/main/resources/typescript/http/isomorphic-fetch.mustache
new file mode 100644
index 000000000000..7646836694b3
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/http/isomorphic-fetch.mustache
@@ -0,0 +1,53 @@
+import {HttpLibrary, RequestContext, ResponseContext} from './http{{extensionForDeno}}';
+import { from, Observable } from {{#useRxJS}}'rxjs'{{/useRxJS}}{{^useRxJS}}'../rxjsStub{{extensionForDeno}}'{{/useRxJS}};
+{{#platforms}}
+{{#node}}
+import fetch from "node-fetch";
+{{/node}}
+{{#browser}}
+import "whatwg-fetch";
+{{/browser}}
+{{/platforms}}
+
+export class IsomorphicFetchHttpLibrary implements HttpLibrary {
+
+    public send(request: RequestContext): Observable<ResponseContext> {
+        let method = request.getHttpMethod().toString();
+        let body = request.getBody();
+
+        const resultPromise = fetch(request.getUrl(), {
+            method: method,
+            body: body as any,
+            headers: request.getHeaders(),
+            {{#platforms}}
+            {{#browser}}
+            credentials: "same-origin"
+            {{/browser}}
+            {{/platforms}}
+        }).then((resp: any) => {
+            const headers: { [name: string]: string } = {};
+            resp.headers.forEach((value: string, name: string) => {
+              headers[name] = value;
+            });
+
+            {{#platforms}}
+            {{#node}}
+            const body = {
+              text: () => resp.text(),
+              binary: () => resp.buffer()
+            };
+            {{/node}}
+            {{^node}}
+            const body = {
+              text: () => resp.text(),
+              binary: () => resp.blob()
+            };
+            {{/node}}
+            {{/platforms}}
+            return new ResponseContext(resp.status, headers, body);
+        });
+
+        return from<Promise<ResponseContext>>(resultPromise);
+
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/typescript/http/jquery.mustache b/modules/openapi-generator/src/main/resources/typescript/http/jquery.mustache
new file mode 100644
index 000000000000..3c67c5bd6f18
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/http/jquery.mustache
@@ -0,0 +1,87 @@
+import { HttpLibrary, RequestContext, ResponseContext, HttpException, SelfDecodingBody } from './http';
+import * as e6p from 'es6-promise'
+import { from, Observable } from {{#useRxJS}}'rxjs'{{/useRxJS}}{{^useRxJS}}'../rxjsStub'{{/useRxJS}};
+e6p.polyfill();
+import * as $ from 'jquery';
+
+
+export class JQueryHttpLibrary implements HttpLibrary {
+
+    public send(request: RequestContext): Observable<ResponseContext> {
+        let method = request.getHttpMethod().toString();
+        let body = request.getBody();
+        let headerParams = request.getHeaders()
+
+        let requestOptions: any = {
+            url: request.getUrl(),
+            type: method,
+            headers: request.getHeaders(),
+            processData: false,
+            xhrFields: { withCredentials: true },
+            data: body
+        };
+
+		// If we want a blob, we have to set the xhrFields' responseType AND add a 
+		// custom converter to overwrite the default deserialization of JQuery...
+        requestOptions["xhrFields"] = { responseType: 'blob' };
+        requestOptions["converters"] = {} 
+        requestOptions["converters"]["* blob"] = (result:any) => result;
+        requestOptions["dataType"] = "blob";
+
+
+        if (request.getHeaders()['Content-Type']) {
+            requestOptions.contentType = headerParams['Content-Type'];
+        }
+        requestOptions.dataFilter = ((headerParams: { [key:string]: string}) => {
+            return (data: string, type: string) => {
+                if (headerParams["Accept"] == "application/json" && data == "") {
+                    return "{}"
+                } else {
+                    return data
+                }
+            }
+        })(headerParams);
+        
+        if (request.getHeaders()["Cookie"]) {
+            throw new HttpException("Setting the \"Cookie\"-Header field is blocked by every major browser when using jquery.ajax requests. Please switch to another library like fetch to enable this option");
+        }
+
+        if (body && body.constructor.name == "FormData") {
+            requestOptions.contentType = false;
+        }
+        
+        const sentRequest = $.ajax(requestOptions);
+        
+        const resultPromise = new Promise<ResponseContext>((resolve, reject) => {
+            sentRequest.done((data, _, jqXHR) => {
+                const result = new ResponseContext(
+                    jqXHR.status,
+                    this.getResponseHeaders(jqXHR),
+                    new SelfDecodingBody(Promise.resolve(data))
+                );
+                resolve(result);
+            })
+            sentRequest.fail((jqXHR: any) => {
+                const headers = this.getResponseHeaders(jqXHR)
+                const result = new ResponseContext(jqXHR.status, headers, jqXHR.responseText);
+                resolve(result);
+            })    
+        })
+        return from(resultPromise);
+    }
+
+    private getResponseHeaders(jqXHR: any): { [key: string]: string } {
+        const responseHeaders: { [key: string]: string } = {};
+        var headers = jqXHR.getAllResponseHeaders();
+        headers = headers.split("\n");
+        headers.forEach(function (header: any) {
+          header = header.split(": ");
+          var key = header.shift();
+          if (key.length == 0) return
+          // chrome60+ force lowercase, other browsers can be different
+          key = key.toLowerCase(); 
+          responseHeaders[key] = header.join(": ");
+        });
+        return responseHeaders
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache b/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache
new file mode 100644
index 000000000000..7d7d66936ff4
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/http/servers.mustache
@@ -0,0 +1,55 @@
+import { RequestContext, HttpMethod } from "./http/http{{extensionForDeno}}";
+
+export interface BaseServerConfiguration {
+    makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext;
+}
+
+/**
+ *
+ * Represents the configuration of a server including its
+ * url template and variable configuration based on the url.
+ *
+ */
+export class ServerConfiguration<T extends { [key: string]: string }> implements BaseServerConfiguration {
+    public constructor(private url: string, private variableConfiguration: T) {}
+
+    /**
+     * Sets the value of the variables of this server.
+     *
+     * @param variableConfiguration a partial variable configuration for the variables contained in the url
+     */
+    public setVariables(variableConfiguration: Partial<T>) {
+        Object.assign(this.variableConfiguration, variableConfiguration);
+    }
+
+	public getConfiguration(): T {
+		return this.variableConfiguration
+	}
+
+	private getUrl() {
+		let replacedUrl = this.url;
+		for (const key in this.variableConfiguration) {
+			var re = new RegExp("{" + key + "}","g");
+			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+		}
+		return replacedUrl
+	}
+
+	/**
+	 * Creates a new request context for this server using the url with variables
+	 * replaced with their respective values and the endpoint of the request appended.
+	 *
+	 * @param endpoint the endpoint to be queried on the server
+	 * @param httpMethod httpMethod to be used
+	 *
+	 */	
+	public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
+		return new RequestContext(this.getUrl() + endpoint, httpMethod);		
+	}
+}
+
+{{#servers}}
+export const server{{-index}} = new ServerConfiguration<{ {{#variables}} "{{name}}": {{#enumValues}}"{{.}}"{{^-last}} | {{/-last}}{{/enumValues}}{{^enumValues}}string{{/enumValues}}{{^-last}},{{/-last}} {{/variables}} }>("{{url}}", { {{#variables}} "{{name}}": "{{defaultValue}}" {{^-last}},{{/-last}}{{/variables}} })
+{{/servers}}
+
+export const servers = [{{#servers}}server{{-index}}{{^-last}}, {{/-last}}{{/servers}}];
diff --git a/modules/openapi-generator/src/main/resources/typescript/index.mustache b/modules/openapi-generator/src/main/resources/typescript/index.mustache
new file mode 100644
index 000000000000..3e4d0907d0e4
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/index.mustache
@@ -0,0 +1,39 @@
+export * from "./http/http{{extensionForDeno}}";
+export * from "./auth/auth{{extensionForDeno}}";
+export * from "./models/all{{extensionForDeno}}";
+export { createConfiguration, Configuration } from "./configuration{{extensionForDeno}}"
+export * from "./apis/exception{{extensionForDeno}}";
+export * from "./servers{{extensionForDeno}}";
+
+{{#useRxJS}}
+export { Middleware } from './middleware{{extensionForDeno}}';
+{{/useRxJS}}
+{{^useRxJS}}
+export { PromiseMiddleware as Middleware } from './middleware{{extensionForDeno}}';
+{{/useRxJS}}
+{{#useObjectParameters}}
+export { {{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}{{classname}}{{operationIdCamelCase}}Request, {{/operation}}Object{{classname}} as {{classname}}{{^-last}}, {{/-last}} {{/operations}}{{/apis}}{{/apiInfo}}} from './types/ObjectParamAPI{{extensionForDeno}}';
+{{/useObjectParameters}}
+{{^useObjectParameters}}
+{{#useRxJS}}
+export { {{#apiInfo}}{{#apis}}{{#operations}}Observable{{classname}} as {{classname}}{{^-last}}, {{/-last}} {{/operations}}{{/apis}}{{/apiInfo}}} from './types/ObservableAPI{{extensionForDeno}}';
+{{/useRxJS}}
+{{^useRxJS}}
+export { {{#apiInfo}}{{#apis}}{{#operations}}Promise{{classname}} as {{classname}}{{^-last}}, {{/-last}} {{/operations}}{{/apis}}{{/apiInfo}}} from './types/PromiseAPI{{extensionForDeno}}';
+{{/useRxJS}}
+{{/useObjectParameters}}
+
+{{#useInversify}}
+export * from "./services/index{{extensionForDeno}}";
+{{#useObjectParameters}}
+export { {{#apiInfo}}{{#apis}}{{#operations}}AbstractObject{{classname}} as Abstract{{classname}}{{^-last}}, {{/-last}} {{/operations}}{{/apis}}{{/apiInfo}}} from './services/ObjectParamAPI';
+{{/useObjectParameters}}
+{{^useObjectParameters}}
+{{#useRxJS}}
+export { {{#apiInfo}}{{#apis}}{{#operations}}AbstractObservable{{classname}} as Abstract{{classname}}{{^-last}}, {{/-last}} {{/operations}}{{/apis}}{{/apiInfo}}} from './services/ObservableAPI{{extensionForDeno}}';
+{{/useRxJS}}
+{{^useRxJS}}
+export { {{#apiInfo}}{{#apis}}{{#operations}}AbstractPromise{{classname}} as Abstract{{classname}}{{^-last}}, {{/-last}} {{/operations}}{{/apis}}{{/apiInfo}}} from './services/PromiseAPI{{extensionForDeno}}';
+{{/useRxJS}}
+{{/useObjectParameters}}
+{{/useInversify}}
diff --git a/modules/openapi-generator/src/main/resources/typescript/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/typescript/licenseInfo.mustache
new file mode 100644
index 000000000000..469fb03940fe
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/licenseInfo.mustache
@@ -0,0 +1,11 @@
+/**
+ * {{{appName}}}
+ * {{{appDescription}}}
+ *
+ * {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
+ * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
diff --git a/modules/openapi-generator/src/main/resources/typescript/model/ObjectSerializer.mustache b/modules/openapi-generator/src/main/resources/typescript/model/ObjectSerializer.mustache
new file mode 100644
index 000000000000..8fa4417f4a6a
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/model/ObjectSerializer.mustache
@@ -0,0 +1,240 @@
+{{#models}}
+{{#model}}
+export * from './{{{ classFilename }}}{{extensionForDeno}}';
+{{/model}}
+{{/models}}
+
+{{#models}}
+{{#model}}
+import { {{classname}}{{#hasEnums}}{{#vars}}{{#isEnum}}, {{classname}}{{enumName}} {{/isEnum}} {{/vars}}{{/hasEnums}} } from './{{{ classFilename }}}{{extensionForDeno}}';
+{{/model}}
+{{/models}}
+
+/* tslint:disable:no-unused-variable */
+let primitives = [
+                    "string",
+                    "boolean",
+                    "double",
+                    "integer",
+                    "long",
+                    "float",
+                    "number",
+                    "any"
+                 ];
+
+const supportedMediaTypes: { [mediaType: string]: number } = {
+  "application/json": Infinity,
+  "application/octet-stream": 0
+}
+
+                 
+let enumsMap: Set<string> = new Set<string>([
+    {{#models}}
+        {{#model}}
+            {{#hasEnums}}
+                {{#vars}}
+                    {{#isEnum}}
+					"{{classname}}{{enumName}}",
+                    {{/isEnum}}
+                {{/vars}}
+            {{/hasEnums}}
+        {{/model}}
+    {{/models}}
+]);
+
+let typeMap: {[index: string]: any} = {
+    {{#models}}
+        {{#model}}
+    "{{classname}}": {{classname}},
+        {{/model}}
+    {{/models}}
+}
+
+export class ObjectSerializer {
+    public static findCorrectType(data: any, expectedType: string) {
+        if (data == undefined) {
+            return expectedType;
+        } else if (primitives.indexOf(expectedType.toLowerCase()) !== -1) {
+            return expectedType;
+        } else if (expectedType === "Date") {
+            return expectedType;
+        } else {
+            if (enumsMap.has(expectedType)) {
+                return expectedType;
+            }
+
+            if (!typeMap[expectedType]) {
+                return expectedType; // w/e we don't know the type
+            }
+
+            // Check the discriminator
+            let discriminatorProperty = typeMap[expectedType].discriminator;
+            if (discriminatorProperty == null) {
+                return expectedType; // the type does not have a discriminator. use it.
+            } else {
+                if (data[discriminatorProperty]) {
+                    var discriminatorType = data[discriminatorProperty];
+                    if(typeMap[discriminatorType]){
+                        return discriminatorType; // use the type given in the discriminator
+                    } else {
+                        return expectedType; // discriminator did not map to a type
+                    }
+                } else {
+                    return expectedType; // discriminator was not present (or an empty string)
+                }
+            }
+        }
+    }
+
+    public static serialize(data: any, type: string, format: string) {
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.serialize(date, subType, format));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            if (format == "date") {
+                let month = data.getMonth()+1
+                month = month < 10 ? "0" + month.toString() : month.toString()
+                let day = data.getDate();
+                day = day < 10 ? "0" + day.toString() : day.toString();
+
+                return data.getFullYear() + "-" + month + "-" + day;
+            } else {
+                return data.toISOString();
+            }
+        } else {
+            if (enumsMap.has(type)) {
+                return data;
+            }
+            if (!typeMap[type]) { // in case we dont know the type
+                return data;
+            }
+            
+            // Get the actual type of this object
+            type = this.findCorrectType(data, type);
+
+            // get the map for the correct type.
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            let instance: {[index: string]: any} = {};
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type, attributeType.format);
+            }
+            return instance;
+        }
+    }
+
+    public static deserialize(data: any, type: string, format: string) {
+        // polymorphism may change the actual type.
+        type = ObjectSerializer.findCorrectType(data, type);
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.deserialize(date, subType, format));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            return new Date(data);
+        } else {
+            if (enumsMap.has(type)) {// is Enum
+                return data;
+            }
+
+            if (!typeMap[type]) { // dont know the type
+                return data;
+            }
+            let instance = new typeMap[type]();
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.name] = ObjectSerializer.deserialize(data[attributeType.baseName], attributeType.type, attributeType.format);
+            }
+            return instance;
+        }
+    }
+
+
+    /**
+     * Normalize media type
+     *
+     * We currently do not handle any media types attributes, i.e. anything
+     * after a semicolon. All content is assumed to be UTF-8 compatible.
+     */
+    public static normalizeMediaType(mediaType: string | undefined): string | undefined {
+        if (mediaType === undefined) {
+            return undefined;
+        }
+        return mediaType.split(";")[0].trim().toLowerCase();
+    }
+
+    /**
+     * From a list of possible media types, choose the one we can handle best.
+     *
+     * The order of the given media types does not have any impact on the choice
+     * made.
+     */
+    public static getPreferredMediaType(mediaTypes: Array<string>): string {
+        /** According to OAS 3 we should default to json */
+        if (!mediaTypes) {
+            return "application/json";
+        }
+
+        const normalMediaTypes = mediaTypes.map(this.normalizeMediaType);
+        let selectedMediaType: string | undefined = undefined;
+        let selectedRank: number = -Infinity;
+        for (const mediaType of normalMediaTypes) {
+            if (supportedMediaTypes[mediaType!] > selectedRank) {
+                selectedMediaType = mediaType;
+                selectedRank = supportedMediaTypes[mediaType!];
+            }
+        }
+
+        if (selectedMediaType === undefined) {
+            throw new Error("None of the given media types are supported: " + mediaTypes.join(", "));
+        }
+
+        return selectedMediaType!;
+    }
+
+    /**
+     * Convert data to a string according the given media type
+     */
+    public static stringify(data: any, mediaType: string): string {
+        if (mediaType === "application/json") {
+            return JSON.stringify(data);
+        }
+
+        throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.stringify.");
+    }
+
+    /**
+     * Parse data from a string according to the given media type
+     */
+    public static parse(rawData: string, mediaType: string | undefined) {
+        if (mediaType === undefined) {
+            throw new Error("Cannot parse content. No Content-Type defined.");
+        }
+
+        if (mediaType === "application/json") {
+            return JSON.parse(rawData);
+        }
+
+        throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.parse.");
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/typescript/model/model.mustache b/modules/openapi-generator/src/main/resources/typescript/model/model.mustache
new file mode 100644
index 000000000000..b8df9a3a3724
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/model/model.mustache
@@ -0,0 +1,79 @@
+{{>licenseInfo}}
+{{#models}}
+{{#model}}
+{{#tsImports}}
+import { {{classname}} } from './{{filename}}{{extensionForDeno}}';
+{{/tsImports}}
+import { HttpFile } from '../http/http{{extensionForDeno}}';
+
+{{#description}}
+/**
+* {{{description}}}
+*/
+{{/description}}
+export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
+{{#vars}}
+{{#description}}
+    /**
+    * {{{description}}}
+    */
+{{/description}}
+    '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}};
+{{/vars}}
+
+    {{#discriminator}}
+    static readonly discriminator: string | undefined = "{{discriminatorName}}";
+    {{/discriminator}}
+    {{^discriminator}}
+    static readonly discriminator: string | undefined = undefined;
+    {{/discriminator}}
+
+    {{^isArrayModel}}
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {{#vars}}
+        {
+            "name": "{{name}}",
+            "baseName": "{{baseName}}",
+            "type": "{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}",
+            "format": "{{dataFormat}}"
+        }{{#hasMore}},
+        {{/hasMore}}
+        {{/vars}}
+    ];
+
+    static getAttributeTypeMap() {
+        {{#parent}}
+        return super.getAttributeTypeMap().concat({{classname}}.attributeTypeMap);
+        {{/parent}}
+        {{^parent}}
+        return {{classname}}.attributeTypeMap;
+        {{/parent}}
+    }
+    {{/isArrayModel}}    
+    
+    public constructor() {
+        {{#parent}}
+        super();
+        {{/parent}}
+        {{#allVars}}
+        {{#discriminatorValue}}
+        this.{{name}} = "{{discriminatorValue}}";
+        {{/discriminatorValue}}
+        {{/allVars}}
+        {{#discriminatorName}}
+        this.{{discriminatorName}} = "{{classname}}";
+        {{/discriminatorName}}
+    }
+}
+
+{{#hasEnums}}
+
+{{#vars}}
+{{#isEnum}}
+export type {{classname}}{{enumName}} ={{#allowableValues}}{{#values}} "{{.}}" {{^-last}}|{{/-last}}{{/values}}{{/allowableValues}};
+{{/isEnum}}
+{{/vars}}
+
+{{/hasEnums}}
+{{/model}}
+{{/models}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/model/models_all.mustache b/modules/openapi-generator/src/main/resources/typescript/model/models_all.mustache
new file mode 100644
index 000000000000..43782db7ef55
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/model/models_all.mustache
@@ -0,0 +1,5 @@
+{{#models}}
+{{#model}}
+export * from './{{{ classFilename }}}{{extensionForDeno}}'
+{{/model}}
+{{/models}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/package.mustache b/modules/openapi-generator/src/main/resources/typescript/package.mustache
new file mode 100644
index 000000000000..0adbf68d9a14
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/package.mustache
@@ -0,0 +1,61 @@
+{
+  "name": "{{npmName}}",
+  "version": "{{npmVersion}}",
+  "description": "OpenAPI client for {{npmName}}",
+  "author": "OpenAPI-Generator Contributors",
+  "keywords": [
+    "fetch",
+    "typescript",
+    "openapi-client",
+    "openapi-generator"
+  ],
+  "license": "Unlicense",
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
+  "scripts": {
+    "build": "tsc",
+    "prepublishOnly": "npm run build"
+  },
+  "dependencies": {
+    {{#frameworks}}
+      {{#fetch-api}}
+        {{#platforms}}
+          {{#node}}
+    "node-fetch": "^2.6.0",
+    "@types/node-fetch": "^2.5.7",
+          {{/node}}
+          {{#browser}}
+    "whatwg-fetch": "^3.0.0",
+          {{/browser}}
+        {{/platforms}}
+      {{/fetch-api}}
+      {{#jquery}}
+    "@types/jquery": "^3.3.29",
+    "jquery": "^3.4.1",
+      {{/jquery}}
+    {{/frameworks}}
+    {{#platforms}}
+      {{#node}}
+    "@types/node": "*",
+    "form-data": "^2.5.0",
+    "btoa": "^1.2.1",
+      {{/node}}
+    {{/platforms}}
+    {{#useRxJS}}
+    "rxjs": "^6.4.0",
+    {{/useRxJS}}
+    {{#useInversify}}
+    "inversify": "^5.0.1",
+    {{/useInversify}}
+    "es6-promise": "^4.2.4",
+    "url-parse": "^1.4.3"
+  },
+  "devDependencies": {
+    "typescript": "^3.9.3"
+  }{{#npmRepository}},{{/npmRepository}}
+{{#npmRepository}}
+  "publishConfig":{
+    "registry":"{{npmRepository}}"
+  }
+{{/npmRepository}}
+}
diff --git a/modules/openapi-generator/src/main/resources/typescript/rxjsStub.mustache b/modules/openapi-generator/src/main/resources/typescript/rxjsStub.mustache
new file mode 100644
index 000000000000..4c73715a2486
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/rxjsStub.mustache
@@ -0,0 +1,27 @@
+export class Observable<T> {
+  constructor(private promise: Promise<T>) {}
+
+  toPromise() {
+    return this.promise;
+  }
+
+  pipe<S>(callback: (value: T) => S | Promise<S>): Observable<S> {
+    return new Observable(this.promise.then(callback));
+  }
+}
+
+export function from<T>(promise: Promise<any>) {
+  return new Observable(promise);
+}
+
+export function of<T>(value: T) {
+  return new Observable<T>(Promise.resolve(value));
+}
+
+export function mergeMap<T, S>(callback: (value: T) => Observable<S>) {
+  return (value: T) => callback(value).toPromise();
+}
+
+export function map(callback: any) {
+  return callback;
+}
diff --git a/modules/openapi-generator/src/main/resources/typescript/services/ObjectParamAPI.mustache b/modules/openapi-generator/src/main/resources/typescript/services/ObjectParamAPI.mustache
new file mode 100644
index 000000000000..1c34257dcfa7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/services/ObjectParamAPI.mustache
@@ -0,0 +1,35 @@
+import type { HttpFile } from '../http/http';
+import type { Configuration } from '../configuration'
+import type * as req from "../types/ObjectParamAPI";
+{{#useRxJS}}
+import type { Observable } from 'rxjs';
+{{/useRxJS}}
+
+{{#models}}
+{{#model}}
+import type { {{{ classname }}} } from '../models/{{{ classFilename }}}';
+{{/model}}
+{{/models}}
+{{#apiInfo}}
+{{#apis}}
+{{#operations}}
+
+
+export abstract class AbstractObject{{classname}} {
+    {{#operation}}
+    /**
+     {{#notes}}
+     * {{&notes}}
+     {{/notes}}
+     {{#summary}}
+     * {{&summary}}
+     {{/summary}}
+     * @param param the request object
+     */
+    public abstract {{nickname}}(param: req.{{classname}}{{operationIdCamelCase}}Request, options?: Configuration): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>;
+
+    {{/operation}}
+}
+{{/operations}}
+{{/apis}}
+{{/apiInfo}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/services/ObservableAPI.mustache b/modules/openapi-generator/src/main/resources/typescript/services/ObservableAPI.mustache
new file mode 100644
index 000000000000..209436b07b41
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/services/ObservableAPI.mustache
@@ -0,0 +1,23 @@
+import type { HttpFile } from "../http/http";
+import type { Observable } from {{#useRxJS}}"rxjs"{{/useRxJS}}{{^useRxJS}}"../rxjsStub"{{/useRxJS}};
+import type { Configuration } from "../configuration";
+
+{{#models}}
+{{#model}}
+import { {{{ classname }}} } from "../models/{{{ classFilename }}}";
+{{/model}}
+{{/models}}
+{{#apiInfo}}
+{{#apis}}
+{{#operations}}
+
+
+export abstract class AbstractObservable{{classname}} {
+    {{#operation}}
+    public abstract {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: Configuration): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>;
+
+    {{/operation}}
+}
+{{/operations}}
+{{/apis}}
+{{/apiInfo}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/services/PromiseAPI.mustache b/modules/openapi-generator/src/main/resources/typescript/services/PromiseAPI.mustache
new file mode 100644
index 000000000000..d3403ff707a4
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/services/PromiseAPI.mustache
@@ -0,0 +1,22 @@
+import type { HttpFile } from "../http/http";
+import type { Configuration } from "../configuration";
+
+{{#models}}
+{{#model}}
+import { {{{ classname }}} } from "../models/{{{ classFilename }}}";
+{{/model}}
+{{/models}}
+{{#apiInfo}}
+{{#apis}}
+{{#operations}}
+
+
+export abstract class AbstractPromise{{classname}} {
+    {{#operation}}
+    public abstract {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: Configuration): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>;
+
+    {{/operation}}
+}
+{{/operations}}
+{{/apis}}
+{{/apiInfo}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/services/api.mustache b/modules/openapi-generator/src/main/resources/typescript/services/api.mustache
new file mode 100644
index 000000000000..8992017a7065
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/services/api.mustache
@@ -0,0 +1,23 @@
+import type { Configuration } from "../configuration";
+import type { HttpFile, RequestContext, ResponseContext } from "../http/http";
+
+{{#imports}}
+import { {{classname}} } from "..{{filename}}";
+{{/imports}}
+{{#operations}}
+
+export abstract class Abstract{{classname}}RequestFactory {
+    {{#operation}}
+    public abstract {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: Configuration): Promise<RequestContext>;
+
+    {{/operation}}
+}
+
+
+export abstract class Abstract{{classname}}ResponseProcessor {
+    {{#operation}}
+     public abstract {{nickname}}(response: ResponseContext): Promise<{{#returnType}}{{{returnType}}}{{/returnType}} {{^returnType}}void{{/returnType}}>;
+
+    {{/operation}}
+}
+{{/operations}}
diff --git a/modules/openapi-generator/src/main/resources/typescript/services/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript/services/configuration.mustache
new file mode 100644
index 000000000000..06e8dc992fcc
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/services/configuration.mustache
@@ -0,0 +1,21 @@
+import type { AbstractServerConfiguration } from "./http";
+import type { HttpLibrary, RequestContext } from "../http/http";
+import type { Middleware } from "../middleware";
+import type { AuthMethods, TokenProvider } from "../auth/auth";
+import type { Configuration } from "../configuration";
+
+export abstract class AbstractConfiguration implements Configuration {
+    abstract get baseServer(): AbstractServerConfiguration;
+    abstract get httpApi(): HttpLibrary;
+    abstract get middleware(): Middleware[];
+    abstract get authMethods(): AuthMethods;
+}
+
+export abstract class AbstractAuthMethod {
+    public abstract getName(): string;
+    public abstract applySecurityAuthentication(context: RequestContext): void | Promise<void>;
+};
+
+export abstract class AbstractTokenProvider implements TokenProvider {
+    public abstract getToken(): string | Promise<string>;
+}
diff --git a/modules/openapi-generator/src/main/resources/typescript/services/http.mustache b/modules/openapi-generator/src/main/resources/typescript/services/http.mustache
new file mode 100644
index 000000000000..89bda7bf3e3d
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/services/http.mustache
@@ -0,0 +1,20 @@
+{{#useRxJS}}
+import type { Observable } from "rxjs";
+{{/useRxJS}}
+import type { {{^useRxJS}}Promise{{/useRxJS}}HttpLibrary, HttpMethod, RequestContext, ResponseContext } from "../http/http";
+import type { {{^useRxJS}}Promise{{/useRxJS}}Middleware } from "../middleware";
+import type { BaseServerConfiguration } from "../servers";
+
+export abstract class AbstractHttpLibrary implements {{^useRxJS}}Promise{{/useRxJS}}HttpLibrary {
+    public abstract send(request: RequestContext): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<ResponseContext>;
+};
+
+export abstract class AbstractMiddleware implements {{^useRxJS}}Promise{{/useRxJS}}Middleware {
+    public abstract pre(context: RequestContext): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<RequestContext>;
+    public abstract post(context: ResponseContext): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<ResponseContext>;
+}
+
+export abstract class AbstractServerConfiguration implements BaseServerConfiguration {
+    public abstract makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext;
+};
+
diff --git a/modules/openapi-generator/src/main/resources/typescript/services/index.mustache b/modules/openapi-generator/src/main/resources/typescript/services/index.mustache
new file mode 100644
index 000000000000..0b662f5d4d33
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/services/index.mustache
@@ -0,0 +1,165 @@
+import { inject, injectable, multiInject, optional, interfaces } from "inversify";
+
+import { Configuration } from "../configuration";
+import { ServerConfiguration, servers } from "../servers";
+import { HttpLibrary{{^useRxJS}}, wrapHttpLibrary{{/useRxJS}} } from "../http/http";
+import { Middleware{{^useRxJS}}, PromiseMiddlewareWrapper{{/useRxJS}} } from "../middleware";
+import { authMethodServices, AuthMethods } from "../auth/auth";
+
+{{#frameworks}}
+{{#fetch-api}}
+import { IsomorphicFetchHttpLibrary as DefaultHttpLibrary } from "../http/isomorphic-fetch";
+{{/fetch-api}}
+{{#jquery}}
+import { JQueryHttpLibrary as DefaultHttpLibrary } from "../http/jquery";
+{{/jquery}}
+{{/frameworks}}
+
+import { AbstractHttpLibrary, AbstractMiddleware, AbstractServerConfiguration } from "./http";
+import { AbstractConfiguration, AbstractAuthMethod, AbstractTokenProvider } from "./configuration";
+
+export { AbstractHttpLibrary, AbstractMiddleware, AbstractServerConfiguration, AbstractConfiguration, AbstractAuthMethod, AbstractTokenProvider };
+
+{{#useObjectParameters}}
+import * as apis from "../types/ObjectParamAPI";
+import * as apiServices from "./ObjectParamAPI";
+{{/useObjectParameters}}
+{{^useObjectParameters}}
+{{#useRxJS}}
+import * as apis from "../types/ObservableAPI";
+import * as apiServices from "./ObservableAPI";
+{{/useRxJS}}
+{{^useRxJS}}
+import * as apis from "../types/PromiseAPI";
+import * as apiServices from "./PromiseAPI";
+{{/useRxJS}}
+{{/useObjectParameters}}
+
+@injectable()
+class InjectableConfiguration implements AbstractConfiguration {
+    public httpApi: HttpLibrary = new DefaultHttpLibrary();
+    public middleware: Middleware[] = [];
+    public authMethods: AuthMethods = {};
+
+    constructor(
+        @inject(AbstractServerConfiguration) @optional() public baseServer: AbstractServerConfiguration = servers[0],
+        @inject(AbstractHttpLibrary) @optional() httpApi: AbstractHttpLibrary,
+        @multiInject(AbstractMiddleware) @optional() middleware: AbstractMiddleware[] = [],
+        @multiInject(AbstractAuthMethod) @optional() securityConfiguration: AbstractAuthMethod[] = []
+    ) {
+        {{#useRxJS}}
+        this.httpApi = httpApi || new DefaultHttpLibrary();
+        this.middleware = middleware;
+        {{/useRxJS}}
+        {{^useRxJS}}
+        this.httpApi = httpApi === undefined ? new DefaultHttpLibrary() : wrapHttpLibrary(httpApi);
+        for (const _middleware of middleware) {
+            this.middleware.push(new PromiseMiddlewareWrapper(_middleware));
+        }
+        {{/useRxJS}}
+        for (const authMethod of securityConfiguration) {
+            const authName = authMethod.getName();
+            // @ts-ignore
+            if (authMethodServices[authName] !== undefined) {
+              // @ts-ignore
+              this.authMethods[authName] = authMethod;
+            }
+        }
+    }
+}
+
+/**
+ * Helper class to simplify binding the services
+ */
+export class ApiServiceBinder {
+    constructor(private container: interfaces.Container) {
+        this.container.bind(AbstractConfiguration).to(InjectableConfiguration);
+    }
+
+    /**
+     * Allows you to bind a server configuration without having to import the service identifier.
+     */
+    public get bindServerConfiguration() {
+        return this.container.bind(AbstractServerConfiguration);
+    }
+
+    /**
+     * Use one of the predefined server configurations.
+     *
+     * To customize the server variables you can call `setVariables` on the
+     * return value;
+     */
+    public bindServerConfigurationToPredefined(idx: number) {
+        this.bindServerConfiguration.toConstantValue(servers[idx]);
+        return servers[idx];
+    }
+
+    /**
+     * Explicitly define the service base url
+     */
+    public bindServerConfigurationToURL(url: string) {
+        return this.bindServerConfiguration.toConstantValue(
+            new ServerConfiguration<{}>(url, {})
+        );
+    }
+
+    /**
+     * Allows you to bind a http library without having to import the service identifier.
+     */
+    public get bindHttpLibrary() {
+      return this.container.bind(AbstractHttpLibrary);
+    }
+
+    /**
+     * Allows you to bind a middleware without having to import the service identifier.
+     *
+     * You can bind multiple middlewares by calling this multiple method times.
+     */
+    public get bindMiddleware() {
+        return this.container.bind(AbstractMiddleware);
+    }
+
+    /**
+     * Allows you to bind an auth method without having to import the service identifier.
+     *
+     * Note: The name of the bound auth method needs to be known in the specs,
+     * because the name is used to decide for which endpoints to apply the authentication.
+     */
+    public get bindAuthMethod() {
+        return this.container.bind(AbstractAuthMethod);
+    }
+
+    /**
+     * Use one of the predefined auth methods.
+     *
+     * Make sure that you have injected all dependencies for it.
+     */
+    public bindAuthMethodToPredefined(name: keyof AuthMethods) {
+        return this.bindAuthMethod.to(authMethodServices[name]);
+    }
+
+    /**
+     * Bind all the apis to their respective service identifiers
+     *
+     * If you want to only bind some of the apis, you need to do that manually.
+     */
+    public bindAllApiServices() {
+        {{#apiInfo}}
+        {{#apis}}
+        {{#operations}}
+        {{#useObjectParameters}}
+        this.container.bind(apiServices.AbstractObject{{classname}}).to(apis.Object{{classname}}).inSingletonScope();
+        {{/useObjectParameters}}
+        {{^useObjectParameters}}
+        {{#useRxJS}}
+        this.container.bind(apiServices.AbstractObservable{{classname}}).to(apis.Observable{{classname}}).inSingletonScope();
+        {{/useRxJS}}
+        {{^useRxJS}}
+        this.container.bind(apiServices.AbstractPromise{{classname}}).to(apis.Promise{{classname}}).inSingletonScope();
+        {{/useRxJS}}
+        {{/useObjectParameters}}
+        {{/operations}}
+        {{/apis}}
+        {{/apiInfo}}
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/typescript/tsconfig.mustache b/modules/openapi-generator/src/main/resources/typescript/tsconfig.mustache
new file mode 100644
index 000000000000..674e7a64d3ae
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/tsconfig.mustache
@@ -0,0 +1,40 @@
+{
+  "compilerOptions": {
+    "strict": true,
+    /* Basic Options */
+    "target": "{{#supportsES6}}es6{{/supportsES6}}{{^supportsES6}}es5{{/supportsES6}}",
+    "module": "{{#supportsES6}}es6{{/supportsES6}}{{^supportsES6}}commonjs{{/supportsES6}}",
+    "moduleResolution": "node",
+    "declaration": true,
+ 
+    /* Additional Checks */
+     "noUnusedLocals": false,                /* Report errors on unused locals. */ // TODO: reenable (unused imports!)
+     "noUnusedParameters": false,            /* Report errors on unused parameters. */ // TODO: set to true again
+     "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+     "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    "removeComments": true,
+    "sourceMap": true,
+    "outDir": "./dist",
+    "noLib": false,
+    {{#platforms}}
+    {{#node}}
+    "lib": [ "es6" ],
+    {{/node}}
+    {{#browser}}
+    "lib": [ "es6", "dom" ],
+    {{/browser}}
+    {{/platforms}}
+    {{#useInversify}}
+    "experimentalDecorators": true,
+    {{/useInversify}}
+  },
+  "exclude": [
+  	"dist",
+    "node_modules"
+  ],
+  "filesGlob": [
+    "./**/*.ts",
+  ]
+  
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/types/ObjectParamAPI.mustache b/modules/openapi-generator/src/main/resources/typescript/types/ObjectParamAPI.mustache
new file mode 100644
index 000000000000..9d8e23f8b2d2
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/types/ObjectParamAPI.mustache
@@ -0,0 +1,63 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http{{extensionForDeno}}';
+import * as models from '../models/all{{extensionForDeno}}';
+import { Configuration} from '../configuration{{extensionForDeno}}'
+{{#useRxJS}}
+import { Observable } from 'rxjs';
+{{/useRxJS}}
+
+{{#models}}
+{{#model}}
+import { {{{ classname }}} } from '../models/{{{ classFilename }}}{{extensionForDeno}}';
+{{/model}}
+{{/models}}
+{{#apiInfo}}
+{{#apis}}
+
+{{#operations}}
+import { Observable{{classname}} } from "./ObservableAPI{{extensionForDeno}}";
+import { {{classname}}RequestFactory, {{classname}}ResponseProcessor} from "../apis/{{classname}}{{extensionForDeno}}";
+
+{{#operation}}
+export interface {{classname}}{{operationIdCamelCase}}Request {
+    {{#allParams}}
+    /**
+     * {{description}}
+     * @type {{dataType}}
+     * @memberof {{classname}}{{nickname}}
+     */
+    {{paramName}}{{^required}}?{{/required}}: {{{dataType}}}
+    {{/allParams}}
+}
+
+{{/operation}}
+
+export class Object{{classname}} {
+    private api: Observable{{classname}}
+
+    public constructor(configuration: Configuration, requestFactory?: {{classname}}RequestFactory, responseProcessor?: {{classname}}ResponseProcessor) {
+        this.api = new Observable{{classname}}(configuration, requestFactory, responseProcessor);
+	}
+
+{{#operation}}
+    /**
+     {{#notes}}
+     * {{&notes}}
+     {{/notes}}
+     {{#summary}}
+     * {{&summary}}
+     {{/summary}}
+     * @param param the request object
+     */
+    public {{nickname}}(param: {{classname}}{{operationIdCamelCase}}Request, options?: Configuration): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
+        return this.api.{{nickname}}({{#allParams}}param.{{paramName}}, {{/allParams}} options){{^useRxJS}}.toPromise(){{/useRxJS}};
+    }
+	
+{{/operation}}
+
+}
+
+{{/operations}}
+
+
+{{/apis}}
+{{/apiInfo}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache b/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache
new file mode 100644
index 000000000000..d0cadf56fbd6
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache
@@ -0,0 +1,93 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http{{extensionForDeno}}';
+import * as models from '../models/all{{extensionForDeno}}';
+import { Configuration} from '../configuration{{extensionForDeno}}'
+import { Observable, of, from } from {{#useRxJS}}'rxjs'{{/useRxJS}}{{^useRxJS}}'../rxjsStub{{extensionForDeno}}'{{/useRxJS}};
+import {mergeMap, map} from  {{#useRxJS}}'rxjs/operators'{{/useRxJS}}{{^useRxJS}}'../rxjsStub{{extensionForDeno}}'{{/useRxJS}};
+{{#useInversify}}
+import { injectable, inject, optional } from "inversify";
+import { AbstractConfiguration } from "../services/configuration{{extensionForDeno}}";
+{{/useInversify}}
+
+{{#models}}
+{{#model}}
+import { {{{ classname }}} } from '../models/{{{ classFilename }}}{{extensionForDeno}}';
+{{/model}}
+{{/models}}
+{{#apiInfo}}
+{{#apis}}
+
+{{#operations}}
+import { {{classname}}RequestFactory, {{classname}}ResponseProcessor} from "../apis/{{classname}}{{extensionForDeno}}";
+{{#useInversify}}
+import { Abstract{{classname}}RequestFactory, Abstract{{classname}}ResponseProcessor } from "../apis/{{classname}}.service{{extensionForDeno}}";
+
+@injectable()
+{{/useInversify}}
+export class Observable{{classname}} {
+    {{#useInversify}}
+    private requestFactory: Abstract{{classname}}RequestFactory;
+    private responseProcessor: Abstract{{classname}}ResponseProcessor;
+    {{/useInversify}}
+    {{^useInversify}}
+    private requestFactory: {{classname}}RequestFactory;
+    private responseProcessor: {{classname}}ResponseProcessor;
+    {{/useInversify}}
+    private configuration: Configuration;
+
+    public constructor(
+        {{#useInversify}}
+        @inject(AbstractConfiguration) configuration: Configuration,
+        @inject(Abstract{{classname}}RequestFactory) @optional() requestFactory?: Abstract{{classname}}RequestFactory,
+        @inject(Abstract{{classname}}ResponseProcessor) @optional() responseProcessor?: Abstract{{classname}}ResponseProcessor
+        {{/useInversify}}
+        {{^useInversify}}
+        configuration: Configuration,
+        requestFactory?: {{classname}}RequestFactory,
+        responseProcessor?: {{classname}}ResponseProcessor
+        {{/useInversify}}
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new {{classname}}RequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new {{classname}}ResponseProcessor();
+    }
+
+{{#operation}}
+    /**
+     {{#notes}}
+     * {{&notes}}
+     {{/notes}}
+     {{#summary}}
+     * {{&summary}}
+     {{/summary}}
+     {{#allParams}}
+     * @param {{paramName}} {{description}}
+     {{/allParams}}
+     */
+    public {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: Configuration): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
+    	const requestContextPromise = this.requestFactory.{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.{{nickname}}(rsp)));
+	    	}));
+    }
+	
+{{/operation}}
+
+}
+
+{{/operations}}
+
+
+{{/apis}}
+{{/apiInfo}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/types/PromiseAPI.mustache b/modules/openapi-generator/src/main/resources/typescript/types/PromiseAPI.mustache
new file mode 100644
index 000000000000..7e57347176b5
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/types/PromiseAPI.mustache
@@ -0,0 +1,69 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http{{extensionForDeno}}';
+import * as models from '../models/all{{extensionForDeno}}';
+import { Configuration} from '../configuration{{extensionForDeno}}'
+{{#useInversify}}
+import { injectable, inject, optional } from "inversify";
+import { AbstractConfiguration } from "../services/configuration";
+{{/useInversify}}
+
+{{#models}}
+{{#model}}
+import { {{{ classname }}} } from '../models/{{{ classFilename }}}{{extensionForDeno}}';
+{{/model}}
+{{/models}}
+{{#apiInfo}}
+{{#apis}}
+import { Observable{{classname}} } from './ObservableAPI{{extensionForDeno}}';
+
+
+{{#operations}}
+import { {{classname}}RequestFactory, {{classname}}ResponseProcessor} from "../apis/{{classname}}{{extensionForDeno}}";
+{{#useInversify}}
+import { Abstract{{classname}}RequestFactory, Abstract{{classname}}ResponseProcessor } from "../apis/{{classname}}.service";
+
+@injectable()
+{{/useInversify}}
+export class Promise{{classname}} {
+    private api: Observable{{classname}}
+
+    public constructor(
+        {{#useInversify}}
+        @inject(AbstractConfiguration) configuration: Configuration,
+        @inject(Abstract{{classname}}RequestFactory) @optional() requestFactory?: Abstract{{classname}}RequestFactory,
+        @inject(Abstract{{classname}}ResponseProcessor) @optional() responseProcessor?: Abstract{{classname}}ResponseProcessor
+        {{/useInversify}}
+        {{^useInversify}}
+        configuration: Configuration,
+        requestFactory?: {{classname}}RequestFactory,
+        responseProcessor?: {{classname}}ResponseProcessor
+        {{/useInversify}}
+    ) {
+        this.api = new Observable{{classname}}(configuration, requestFactory, responseProcessor);
+    }
+
+{{#operation}}
+    /**
+     {{#notes}}
+     * {{&notes}}
+     {{/notes}}
+     {{#summary}}
+     * {{&summary}}
+     {{/summary}}
+     {{#allParams}}
+     * @param {{paramName}} {{description}}
+     {{/allParams}}
+     */
+    public {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: Configuration): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
+    	const result = this.api.{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options);
+        return result.toPromise();
+    }
+	
+{{/operation}}
+
+}
+
+{{/operations}}
+
+
+{{/apis}}
+{{/apiInfo}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript/util.mustache b/modules/openapi-generator/src/main/resources/typescript/util.mustache
new file mode 100644
index 000000000000..d1888434535c
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript/util.mustache
@@ -0,0 +1,28 @@
+/**
+ * Returns if a specific http code is in a given code range
+ * where the code range is defined as a combination of digits 
+ * and "X" (the letter X) with a length of 3
+ *
+ * @param codeRange string with length 3 consisting of digits and "X" (the letter X)
+ * @param code the http status code to be checked against the code range
+ */
+export function isCodeInRange(codeRange: string, code: number): boolean {
+	// This is how the default value is encoded in OAG
+	if (codeRange === "0") {
+		return true;
+	}
+	if (codeRange == code.toString()) {
+		return true;
+	} else {
+		const codeString = code.toString();
+		if (codeString.length != codeRange.length) {
+			return false;
+		}
+		for (let i = 0; i < codeString.length; i++) {
+			if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
index be2c3022d141..6d61c93b3efc 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
@@ -26,7 +26,6 @@
 import io.swagger.v3.oas.models.responses.ApiResponse;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
 import org.openapitools.codegen.*;
-import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile;
 import org.openapitools.codegen.config.CodegenConfigurator;
 import org.openapitools.codegen.languages.AbstractJavaCodegen;
 import org.openapitools.codegen.languages.JavaClientCodegen;
@@ -410,7 +409,7 @@ public void testJdkHttpClient() throws Exception {
         DefaultGenerator generator = new DefaultGenerator();
         List<File> files = generator.opts(clientOptInput).generate();
 
-        Assert.assertEquals(files.size(), 27);
+        Assert.assertEquals(files.size(), 28);
         validateJavaSourceFiles(files);
 
         TestUtils.assertFileContains(Paths.get(output + "/src/main/java/xyz/abcdef/api/DefaultApi.java"),
@@ -507,6 +506,34 @@ public void testAuthorizationScopeValues_Issue392() {
         assertEquals(postScopes.size(), 2, "POST scopes don't match. actual:" + postScopes);
     }
 
+    @Test
+    public void testAuthorizationScopeValues_Issue6733() throws IOException {
+        File output = Files.createTempDirectory("test").toFile();
+        output.deleteOnExit();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("java")
+                .setLibrary(JavaClientCodegen.RESTEASY)
+                .setValidateSpec(false)
+                .setInputSpec("src/test/resources/3_0/regression-6734.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+
+        DefaultGenerator generator = new DefaultGenerator();
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true");
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false");
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false");
+        generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true");
+        // tests if NPE will crash generation when path in yaml arent provided
+        generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false");
+        generator.setGenerateMetadata(false);
+        List<File> files = generator.opts(clientOptInput).generate();
+
+        Assert.assertEquals(files.size(), 1);
+        files.forEach(File::deleteOnExit);
+    }
+
     @Test
     public void testAuthorizationsHasMoreWhenFiltered() {
         final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue4584.yaml");
@@ -574,6 +601,7 @@ public void testImportMapping() throws IOException {
         importMappings.put("TypeAlias", "foo.bar.TypeAlias");
 
         File output = Files.createTempDirectory("test").toFile();
+        output.deleteOnExit();
 
         final CodegenConfigurator configurator = new CodegenConfigurator()
                 .setGeneratorName("java")
@@ -594,6 +622,7 @@ public void testImportMapping() throws IOException {
         generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false");
         generator.setGenerateMetadata(false);
         List<File> files = generator.opts(clientOptInput).generate();
+        files.forEach(File::deleteOnExit);
 
         Assert.assertEquals(files.size(), 1);
         TestUtils.ensureContainsFile(files, output, "src/main/java/org/openapitools/client/model/ParentType.java");
@@ -811,4 +840,91 @@ public void testAnyType() {
         Assert.assertFalse(cp9.isFreeFormObject);
         Assert.assertFalse(cp9.isAnyType);
     }
+
+    /**
+     * See https://github.com/OpenAPITools/openapi-generator/issues/4803
+     */
+    @Test
+    public void testRestTemplateFormMultipart() throws IOException {
+
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(JavaClientCodegen.JAVA8_MODE, true);
+        properties.put(CodegenConstants.API_PACKAGE, "xyz.abcdef.api");
+
+
+        File output = Files.createTempDirectory("test").toFile();
+        output.deleteOnExit();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("java")
+                .setLibrary(JavaClientCodegen.RESTTEMPLATE)
+                .setAdditionalProperties(properties)
+                .setInputSpec("src/test/resources/3_0/form-multipart-binary-array.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+
+        DefaultGenerator generator = new DefaultGenerator();
+        List<File> files = generator.opts(configurator.toClientOptInput()).generate();
+        files.forEach(File::deleteOnExit);
+
+
+        Path defaultApi = Paths.get(output + "/src/main/java/xyz/abcdef/api/MultipartApi.java");
+        TestUtils.assertFileContains(defaultApi,
+                //multiple files
+                "multipartArrayWithHttpInfo(List<File> files)",
+                "formParams.put(\"files\", files.stream().map(FileSystemResource::new).collect(Collectors.toList()));",
+
+                //mixed
+                "multipartMixedWithHttpInfo(File file, MultipartMixedMarker marker)",
+                "formParams.add(\"file\", new FileSystemResource(file));",
+
+                //single file
+                "multipartSingleWithHttpInfo(File file)",
+                "formParams.add(\"file\", new FileSystemResource(file));"
+                );
+    }
+
+    /**
+     * See https://github.com/OpenAPITools/openapi-generator/issues/4803
+     */
+    @Test
+    public void testWebClientFormMultipart() throws IOException {
+
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(JavaClientCodegen.JAVA8_MODE, true);
+        properties.put(CodegenConstants.API_PACKAGE, "xyz.abcdef.api");
+
+
+        File output = Files.createTempDirectory("test").toFile();
+        output.deleteOnExit();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("java")
+                .setLibrary(JavaClientCodegen.WEBCLIENT)
+                .setAdditionalProperties(properties)
+                .setInputSpec("src/test/resources/3_0/form-multipart-binary-array.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+
+        DefaultGenerator generator = new DefaultGenerator();
+        List<File> files = generator.opts(configurator.toClientOptInput()).generate();
+        files.forEach(File::deleteOnExit);
+
+
+        Path defaultApi = Paths.get(output + "/src/main/java/xyz/abcdef/api/MultipartApi.java");
+        TestUtils.assertFileContains(defaultApi,
+                //multiple files
+                "multipartArray(List<File> files)",
+                "formParams.addAll(\"files\", files.stream().map(FileSystemResource::new).collect(Collectors.toList()));",
+
+                //mixed
+                "multipartMixed(File file, MultipartMixedMarker marker)",
+                "formParams.add(\"file\", new FileSystemResource(file));",
+
+                //single file
+                "multipartSingle(File file)",
+                "formParams.add(\"file\", new FileSystemResource(file));"
+        );
+    }
+
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java
index d6b3e5f6e5fe..62b8353d69c1 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java
@@ -1,21 +1,11 @@
 package org.openapitools.codegen.kotlin.spring;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.testing.Helpers;
-import io.swagger.parser.OpenAPIParser;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.info.Info;
-import io.swagger.v3.oas.models.servers.Server;
-import io.swagger.v3.parser.core.models.ParseOptions;
+
 import org.apache.commons.io.FileUtils;
 import org.openapitools.codegen.*;
-import org.openapitools.codegen.config.CodegenConfigurator;
 import org.openapitools.codegen.kotlin.KotlinTestUtils;
-import org.openapitools.codegen.languages.AbstractJavaCodegen;
-import org.openapitools.codegen.languages.JavaClientCodegen;
 import org.openapitools.codegen.languages.KotlinSpringServerCodegen;
-import org.openapitools.codegen.languages.SpringCodegen;
-import org.openapitools.codegen.languages.features.CXFServerFeatures;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -24,6 +14,10 @@
 import java.util.Collections;
 import java.util.List;
 
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.servers.Server;
+
 public class KotlinSpringServerCodegenTest {
 
     @Test(description = "test embedded enum array")
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularClientOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularClientOptionsProvider.java
index 7553e379e4f2..ca8c7f491e97 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularClientOptionsProvider.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularClientOptionsProvider.java
@@ -42,6 +42,7 @@ public class TypeScriptAngularClientOptionsProvider implements OptionsProvider {
     public static final String PREPEND_FORM_OR_BODY_PARAMETERS_VALUE = "true";
     public static final String FILE_NAMING_VALUE = "camelCase";
     public static final String API_MODULE_PREFIX = "";
+    public static final String QUERY_PARAM_OBJECT_FORMAT_VALUE = "dot";
     public static String SERVICE_SUFFIX = "Service";
     public static String SERVICE_FILE_SUFFIX = ".service";
     public static String MODEL_SUFFIX = "";
@@ -83,6 +84,7 @@ public Map<String, String> createOptions() {
                 .put(TypeScriptAngularClientCodegen.FILE_NAMING, FILE_NAMING_VALUE)
                 .put(CodegenConstants.LEGACY_DISCRIMINATOR_BEHAVIOR, "true")
                 .put(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT, "true")
+                .put(TypeScriptAngularClientCodegen.QUERY_PARAM_OBJECT_FORMAT, QUERY_PARAM_OBJECT_FORMAT_VALUE)
                 .build();
     }
 
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpBooleanPropertyTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpBooleanPropertyTest.java
new file mode 100644
index 000000000000..c500dda77060
--- /dev/null
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpBooleanPropertyTest.java
@@ -0,0 +1,29 @@
+package org.openapitools.codegen.scala;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openapitools.codegen.languages.ScalaSttpClientCodegen;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SttpBooleanPropertyTest {
+    @Test
+    public void shouldUseDefaultValueIfAdditionalPropertiesAreEmpty() {
+        ScalaSttpClientCodegen.BooleanProperty booleanProperty = new ScalaSttpClientCodegen.BooleanProperty("k1", "desc", false);
+        Map<String, Object> additionalProperties = new HashMap<>();
+        booleanProperty.updateAdditionalProperties(additionalProperties);
+
+        Assert.assertEquals(false, additionalProperties.get("k1"));
+    }
+
+    @Test
+    public void shouldUseGivenValueIfProvided() {
+        ScalaSttpClientCodegen.BooleanProperty booleanProperty = new ScalaSttpClientCodegen.BooleanProperty("k1", "desc", false);
+        Map<String, Object> additionalProperties = new HashMap<>();
+        additionalProperties.put("k1", true);
+        booleanProperty.updateAdditionalProperties(additionalProperties);
+
+        Assert.assertEquals(true, additionalProperties.get("k1"));
+    }
+}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpJsonLibraryPropertyTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpJsonLibraryPropertyTest.java
new file mode 100644
index 000000000000..d8473cb8f5d6
--- /dev/null
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpJsonLibraryPropertyTest.java
@@ -0,0 +1,39 @@
+package org.openapitools.codegen.scala;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openapitools.codegen.languages.ScalaSttpClientCodegen;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SttpJsonLibraryPropertyTest {
+    @Test
+    public void shouldUseJson4sByDefault() {
+        ScalaSttpClientCodegen.JsonLibraryProperty property = new ScalaSttpClientCodegen.JsonLibraryProperty();
+        Map<String, Object> additionalProperties = new HashMap<>();
+        property.updateAdditionalProperties(additionalProperties);
+        Assert.assertEquals(true, additionalProperties.get("json4s"));
+        Assert.assertEquals(false, additionalProperties.get("circe"));
+    }
+
+    @Test
+    public void shouldUseJson4sIfExplicitlyAskTo() {
+        ScalaSttpClientCodegen.JsonLibraryProperty property = new ScalaSttpClientCodegen.JsonLibraryProperty();
+        Map<String, Object> additionalProperties = new HashMap<>();
+        additionalProperties.put("jsonLibrary", "json4s");
+        property.updateAdditionalProperties(additionalProperties);
+        Assert.assertEquals(true, additionalProperties.get("json4s"));
+        Assert.assertEquals(false, additionalProperties.get("circe"));
+    }
+
+    @Test
+    public void shouldUseCirceIfExplicitlyAskTo() {
+        ScalaSttpClientCodegen.JsonLibraryProperty property = new ScalaSttpClientCodegen.JsonLibraryProperty();
+        Map<String, Object> additionalProperties = new HashMap<>();
+        additionalProperties.put("jsonLibrary", "circe");
+        property.updateAdditionalProperties(additionalProperties);
+        Assert.assertEquals(false, additionalProperties.get("json4s"));
+        Assert.assertEquals(true, additionalProperties.get("circe"));
+    }
+}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpPackagePropertyTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpPackagePropertyTest.java
new file mode 100644
index 000000000000..7aa451975221
--- /dev/null
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpPackagePropertyTest.java
@@ -0,0 +1,59 @@
+package org.openapitools.codegen.scala;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.languages.ScalaSttpClientCodegen;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SttpPackagePropertyTest {
+    @Test
+    public void shouldUseDefaultPackageNameIfAdditionalPropertiesAreEmpty(){
+        ScalaSttpClientCodegen.PackageProperty property = new ScalaSttpClientCodegen.PackageProperty();
+        Map<String, Object> additionalProperties = new HashMap<>();
+        property.updateAdditionalProperties(additionalProperties);
+
+        Assert.assertEquals(ScalaSttpClientCodegen.DEFAULT_PACKAGE_NAME + ".api",
+                additionalProperties.get(CodegenConstants.API_PACKAGE));
+        Assert.assertEquals(ScalaSttpClientCodegen.DEFAULT_PACKAGE_NAME + ".model",
+                additionalProperties.get(CodegenConstants.MODEL_PACKAGE));
+        Assert.assertEquals(ScalaSttpClientCodegen.DEFAULT_PACKAGE_NAME + ".core",
+                additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
+    }
+
+    @Test
+    public void shouldUseCustomMainPackageNameIfProvided(){
+        ScalaSttpClientCodegen.PackageProperty property = new ScalaSttpClientCodegen.PackageProperty();
+        Map<String, Object> additionalProperties = new HashMap<>();
+        String customPackageName = "my.custom.pkg.name";
+        additionalProperties.put("mainPackage", customPackageName);
+        property.updateAdditionalProperties(additionalProperties);
+
+        Assert.assertEquals(customPackageName + ".api",
+                additionalProperties.get(CodegenConstants.API_PACKAGE));
+        Assert.assertEquals(customPackageName + ".model",
+                additionalProperties.get(CodegenConstants.MODEL_PACKAGE));
+        Assert.assertEquals(customPackageName + ".core",
+                additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
+    }
+
+    @Test
+    public void shouldAllowToMixCustomPackages(){
+        ScalaSttpClientCodegen.PackageProperty property = new ScalaSttpClientCodegen.PackageProperty();
+        Map<String, Object> additionalProperties = new HashMap<>();
+        String customPackageName = "my.custom.pkg.name";
+        additionalProperties.put("mainPackage", customPackageName);
+        String otherCustomPackageName = "some.other.custom.pkg.api";
+        additionalProperties.put(CodegenConstants.API_PACKAGE, otherCustomPackageName);
+        property.updateAdditionalProperties(additionalProperties);
+
+        Assert.assertEquals(otherCustomPackageName,
+                additionalProperties.get(CodegenConstants.API_PACKAGE));
+        Assert.assertEquals(customPackageName + ".model",
+                additionalProperties.get(CodegenConstants.MODEL_PACKAGE));
+        Assert.assertEquals(customPackageName + ".core",
+                additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
+    }
+}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpStringPropertyTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpStringPropertyTest.java
new file mode 100644
index 000000000000..f0db3bdafd31
--- /dev/null
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scala/SttpStringPropertyTest.java
@@ -0,0 +1,30 @@
+package org.openapitools.codegen.scala;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openapitools.codegen.languages.ScalaSttpClientCodegen;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SttpStringPropertyTest {
+
+    @Test
+    public void shouldUseDefaultValueIfAdditionalPropertiesAreEmpty(){
+        ScalaSttpClientCodegen.StringProperty property = new ScalaSttpClientCodegen.StringProperty("k1", "desc", "default");
+        Map<String, Object> additionalProperties = new HashMap<>();
+        property.updateAdditionalProperties(additionalProperties);
+
+        Assert.assertEquals("default", additionalProperties.get("k1"));
+    }
+
+    @Test
+    public void shouldUseGivenValueIfProvided(){
+        ScalaSttpClientCodegen.StringProperty property = new ScalaSttpClientCodegen.StringProperty("k1", "desc", "default");
+        Map<String, Object> additionalProperties = new HashMap<>();
+        additionalProperties.put("k1", "custom");
+        property.updateAdditionalProperties(additionalProperties);
+
+        Assert.assertEquals("custom", additionalProperties.get("k1"));
+    }
+}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularClientOptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularClientOptionsTest.java
index 92aa51c846d0..9bc5eafb1bd7 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularClientOptionsTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularClientOptionsTest.java
@@ -45,5 +45,6 @@ protected void verifyOptions() {
         verify(clientCodegen).setSupportsES6(Boolean.valueOf(TypeScriptAngularClientOptionsProvider.SUPPORTS_ES6_VALUE));
         verify(clientCodegen).setStringEnums(Boolean.parseBoolean(TypeScriptAngularClientOptionsProvider.STRING_ENUMS_VALUE));
         verify(clientCodegen).setPrependFormOrBodyParameters(Boolean.valueOf(TypeScriptAngularClientOptionsProvider.PREPEND_FORM_OR_BODY_PARAMETERS_VALUE));
+        verify(clientCodegen).setQueryParamObjectFormat(TypeScriptAngularClientOptionsProvider.QUERY_PARAM_OBJECT_FORMAT_VALUE);
     }
 }
diff --git a/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/api.mustache b/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/api.mustache
index e448729450da..1559a304ce8a 100644
--- a/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/api.mustache
+++ b/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/api.mustache
@@ -22,22 +22,22 @@ import java.util.Map;
 {{>generatedAnnotation}}
 {{#operations}}
 public class {{classname}} {
-  private ApiClient {{localVariablePrefix}}apiClient;
+  private ApiClient apiClient;
 
   public {{classname}}() {
     this(Configuration.getDefaultApiClient());
   }
 
   public {{classname}}(ApiClient apiClient) {
-    this.{{localVariablePrefix}}apiClient = apiClient;
+    this.apiClient = apiClient;
   }
 
   public ApiClient getApiClient() {
-    return {{localVariablePrefix}}apiClient;
+    return apiClient;
   }
 
   public void setApiClient(ApiClient apiClient) {
-    this.{{localVariablePrefix}}apiClient = apiClient;
+    this.apiClient = apiClient;
   }
 
   {{#operation}}
@@ -53,7 +53,7 @@ public class {{classname}} {
    * @throws ApiException if fails to make API call
    */
   public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
-    Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
+    Object localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
     {{#allParams}}{{#required}}
     // verify the required parameter '{{paramName}}' is set
     if ({{paramName}} == null) {
@@ -61,43 +61,43 @@ public class {{classname}} {
     }
     {{/required}}{{/allParams}}
     // create path and map variables
-    String {{localVariablePrefix}}localVarPath = "{{{path}}}".replaceAll("\\{format\\}","json"){{#pathParams}}
-      .replaceAll("\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
+    String localVarPath = "{{{path}}}".replaceAll("\\{format\\}","json"){{#pathParams}}
+      .replaceAll("\\{" + "{{baseName}}" + "\\}", apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
 
     // query params
-    {{javaUtilPrefix}}List<Pair> {{localVariablePrefix}}localVarQueryParams = new {{javaUtilPrefix}}ArrayList<Pair>();
-    {{javaUtilPrefix}}Map<String, String> {{localVariablePrefix}}localVarHeaderParams = new {{javaUtilPrefix}}HashMap<String, String>();
-    {{javaUtilPrefix}}Map<String, Object> {{localVariablePrefix}}localVarFormParams = new {{javaUtilPrefix}}HashMap<String, Object>();
+    {{javaUtilPrefix}}List<Pair> localVarQueryParams = new {{javaUtilPrefix}}ArrayList<Pair>();
+    {{javaUtilPrefix}}Map<String, String> localVarHeaderParams = new {{javaUtilPrefix}}HashMap<String, String>();
+    {{javaUtilPrefix}}Map<String, Object> localVarFormParams = new {{javaUtilPrefix}}HashMap<String, Object>();
 
     {{#queryParams}}
-    {{localVariablePrefix}}localVarQueryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));
     {{/queryParams}}
 
     {{#headerParams}}if ({{paramName}} != null)
-      {{localVariablePrefix}}localVarHeaderParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));
+      localVarHeaderParams.put("{{baseName}}", apiClient.parameterToString({{paramName}}));
     {{/headerParams}}
 
     {{#formParams}}if ({{paramName}} != null)
-      {{localVariablePrefix}}localVarFormParams.put("{{baseName}}", {{paramName}});
+      localVarFormParams.put("{{baseName}}", {{paramName}});
     {{/formParams}}
 
-    final String[] {{localVariablePrefix}}localVarAccepts = {
+    final String[] localVarAccepts = {
       {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
     };
-    final String {{localVariablePrefix}}localVarAccept = {{localVariablePrefix}}apiClient.selectHeaderAccept({{localVariablePrefix}}localVarAccepts);
+    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
-    final String[] {{localVariablePrefix}}localVarContentTypes = {
+    final String[] localVarContentTypes = {
       {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
     };
-    final String {{localVariablePrefix}}localVarContentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}localVarContentTypes);
+    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] {{localVariablePrefix}}localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+    String[] localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
 
     {{#returnType}}
-    GenericType<{{{returnType}}}> {{localVariablePrefix}}localVarReturnType = new GenericType<{{{returnType}}}>() {};
-    return {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}localVarPath, "{{httpMethod}}", {{localVariablePrefix}}localVarQueryParams, {{localVariablePrefix}}localVarPostBody, {{localVariablePrefix}}localVarHeaderParams, {{localVariablePrefix}}localVarFormParams, {{localVariablePrefix}}localVarAccept, {{localVariablePrefix}}localVarContentType, {{localVariablePrefix}}localVarAuthNames, {{localVariablePrefix}}localVarReturnType);
+    GenericType<{{{returnType}}}> localVarReturnType = new GenericType<{{{returnType}}}>() {};
+    return apiClient.invokeAPI(localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
     {{/returnType}}{{^returnType}}
-    {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}localVarPath, "{{httpMethod}}", {{localVariablePrefix}}localVarQueryParams, {{localVariablePrefix}}localVarPostBody, {{localVariablePrefix}}localVarHeaderParams, {{localVariablePrefix}}localVarFormParams, {{localVariablePrefix}}localVarAccept, {{localVariablePrefix}}localVarContentType, {{localVariablePrefix}}localVarAuthNames, null);
+    apiClient.invokeAPI(localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
     {{/returnType}}
   }
   {{/operation}}
diff --git a/modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml b/modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
new file mode 100644
index 000000000000..50a7fcd7d497
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
@@ -0,0 +1,113 @@
+openapi: 3.0.0
+info:
+  description: This specification shows how to use x-auth-id-alias extension for API keys.
+  version: 1.0.0
+  title: OpenAPI Extension x-auth-id-alias
+  license:
+    name: Apache-2.0
+    url: 'https://www.apache.org/licenses/LICENSE-2.0.html'
+tags:
+  - name: usage
+    description: Show usage of x-auth-id-alias
+components:
+  securitySchemes:
+    api_key:
+      type: apiKey
+      name: X-Api-Key
+      in: header
+    api_key_query:
+      type: apiKey
+      name: api_key
+      # Test key aliasing
+      x-auth-id-alias: api_key
+      in: query
+paths:
+  /both:
+    get:
+      tags:
+        - usage
+      summary: Use both API keys
+      description: Use both API keys
+      operationId: bothKeys
+      security:
+        - api_key_query: []
+          api_key: []
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                type: object
+  /any:
+    get:
+      tags:
+        - usage
+      summary: Use any API key
+      description: Use any API key
+      operationId: anyKey
+      security:
+        - api_key_query: []
+        - api_key: []
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                type: object
+  /query:
+    get:
+      tags:
+        - usage
+      summary: Use API key in query
+      description: Use API key in query
+      operationId: keyInQuery
+      security:
+        - api_key_query: []
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                type: object
+  /header:
+    get:
+      tags:
+        - usage
+      summary: Use API key in header
+      description: Use API key in header
+      operationId: keyInHeader
+      security:
+        - api_key: []
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                type: object
+servers:
+  - url: 'http://{server}.swagger.io:{port}/v2'
+    description: petstore server
+    variables:
+      server:
+        enum:
+          - 'petstore'
+          - 'qa-petstore'
+          - 'dev-petstore'
+        default: 'petstore'
+      port:
+        enum:
+          - 80
+          - 8080
+        default: 80
+  - url: https://localhost:8080/{version}
+    description: The local server
+    variables:
+      version:
+        enum:
+          - 'v1'
+          - 'v2'
+        default: 'v2'
diff --git a/modules/openapi-generator/src/test/resources/3_0/features/dynamic-servers.yaml b/modules/openapi-generator/src/test/resources/3_0/features/dynamic-servers.yaml
new file mode 100644
index 000000000000..4e5ccde6d3ee
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/features/dynamic-servers.yaml
@@ -0,0 +1,92 @@
+openapi: 3.0.0
+info:
+  description: This specification shows how to use dynamic servers.
+  version: 1.0.0
+  title: OpenAPI Extension with dynamic servers
+  license:
+    name: Apache-2.0
+    url: 'https://www.apache.org/licenses/LICENSE-2.0.html'
+tags:
+  - name: usage
+    description: Show usage of dynamic servers
+servers:
+  - url: 'http://{server}.swagger.io:{port}/v2'
+    description: petstore server
+    variables:
+      server:
+        enum:
+          - 'petstore'
+          - 'qa-petstore'
+          - 'dev-petstore'
+        default: 'petstore'
+      port:
+        enum:
+          - '80'
+          - '8080'
+        default: '80'
+  - url: https://localhost:8080/{version}
+    description: The local server
+    variables:
+      version:
+        enum:
+          - 'v1'
+          - 'v2'
+          - 'v3'
+        default: 'v1'
+paths:
+  /default:
+    get:
+      tags:
+        - usage
+      summary: Use default server
+      description: Use default server
+      operationId: defaultServer
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                type: object
+  /custom:
+    get:
+      tags:
+        - usage
+      servers:
+        - url: https://{server}.swagger.io:{port}/v2
+          variables:
+            server:
+              enum:
+                - 'custom-petstore'
+                - 'custom-qa-petstore'
+                - 'custom-dev-petstore'
+              default: 'custom-petstore'
+            port:
+              enum:
+                - '80'
+                - '8080'
+              default: '8080'
+        - url: https://localhost:8081/{version}
+          description: The local custom server
+          variables:
+            version:
+              enum:
+                - 'v1'
+                - 'v2'
+                - 'v3'
+              default: 'v2'
+        - url: https://third.example.com/{prefix}
+          description: The local custom server
+          variables:
+            prefix:
+              default: 'custom'
+      summary: Use custom server
+      description: Use custom server
+      operationId: customServer
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                type: object
diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
new file mode 100644
index 000000000000..a0f064611b15
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -0,0 +1,2098 @@
+openapi: 3.0.0
+info:
+  description: >-
+    This spec is mainly for testing Petstore server and contains fake endpoints,
+    models. Please do not use this for any other purpose. Special characters: "
+    \
+  version: 1.0.0
+  title: OpenAPI Petstore
+  license:
+    name: Apache-2.0
+    url: 'https://www.apache.org/licenses/LICENSE-2.0.html'
+tags:
+  - name: pet
+    description: Everything about your Pets
+  - name: store
+    description: Access to Petstore orders
+  - name: user
+    description: Operations about user
+paths:
+  /foo:
+    get:
+      responses:
+        default:
+          description: response
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  string:
+                    $ref: '#/components/schemas/Foo'
+  /pet:
+    servers:
+    - url: 'http://petstore.swagger.io/v2'
+    - url: 'http://path-server-test.petstore.local/v2'
+    post:
+      tags:
+        - pet
+      summary: Add a new pet to the store
+      description: ''
+      operationId: addPet
+      responses:
+        '405':
+          description: Invalid input
+      security:
+        - http_signature_test: []
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+      requestBody:
+        $ref: '#/components/requestBodies/Pet'
+    put:
+      tags:
+        - pet
+      summary: Update an existing pet
+      description: ''
+      operationId: updatePet
+      responses:
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Pet not found
+        '405':
+          description: Validation exception
+      security:
+        - http_signature_test: []
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+      requestBody:
+        $ref: '#/components/requestBodies/Pet'
+  /pet/findByStatus:
+    get:
+      tags:
+        - pet
+      summary: Finds Pets by status
+      description: Multiple status values can be provided with comma separated strings
+      operationId: findPetsByStatus
+      parameters:
+        - name: status
+          in: query
+          description: Status values that need to be considered for filter
+          required: true
+          style: form
+          explode: false
+          schema:
+            type: array
+            items:
+              type: string
+              enum:
+                - available
+                - pending
+                - sold
+              default: available
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/xml:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Pet'
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Pet'
+        '400':
+          description: Invalid status value
+      security:
+        - http_signature_test: []
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+  /pet/findByTags:
+    get:
+      tags:
+        - pet
+      summary: Finds Pets by tags
+      description: >-
+        Multiple tags can be provided with comma separated strings. Use tag1,
+        tag2, tag3 for testing.
+      operationId: findPetsByTags
+      parameters:
+        - name: tags
+          in: query
+          description: Tags to filter by
+          required: true
+          style: form
+          explode: false
+          schema:
+            type: array
+            items:
+              type: string
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/xml:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Pet'
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Pet'
+        '400':
+          description: Invalid tag value
+      security:
+        - http_signature_test: []
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+      deprecated: true
+  '/pet/{petId}':
+    get:
+      tags:
+        - pet
+      summary: Find pet by ID
+      description: Returns a single pet
+      operationId: getPetById
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet to return
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/Pet'
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Pet'
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Pet not found
+      security:
+        - api_key: []
+    post:
+      tags:
+        - pet
+      summary: Updates a pet in the store with form data
+      description: ''
+      operationId: updatePetWithForm
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet that needs to be updated
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '405':
+          description: Invalid input
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+      requestBody:
+        content:
+          application/x-www-form-urlencoded:
+            schema:
+              type: object
+              properties:
+                name:
+                  description: Updated name of the pet
+                  type: string
+                status:
+                  description: Updated status of the pet
+                  type: string
+    delete:
+      tags:
+        - pet
+      summary: Deletes a pet
+      description: ''
+      operationId: deletePet
+      parameters:
+        - name: api_key
+          in: header
+          required: false
+          schema:
+            type: string
+        - name: petId
+          in: path
+          description: Pet id to delete
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '400':
+          description: Invalid pet value
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+  '/pet/{petId}/uploadImage':
+    post:
+      tags:
+        - pet
+      summary: uploads an image
+      description: ''
+      operationId: uploadFile
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet to update
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ApiResponse'
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                additionalMetadata:
+                  description: Additional data to pass to server
+                  type: string
+                file:
+                  description: file to upload
+                  type: string
+                  format: binary
+  /store/inventory:
+    get:
+      tags:
+        - store
+      summary: Returns pet inventories by status
+      description: Returns a map of status codes to quantities
+      operationId: getInventory
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                type: object
+                additionalProperties:
+                  type: integer
+                  format: int32
+      security:
+        - api_key: []
+  /store/order:
+    post:
+      tags:
+        - store
+      summary: Place an order for a pet
+      description: ''
+      operationId: placeOrder
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/Order'
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+        '400':
+          description: Invalid Order
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Order'
+        description: order placed for purchasing the pet
+        required: true
+  '/store/order/{order_id}':
+    get:
+      tags:
+        - store
+      summary: Find purchase order by ID
+      description: >-
+        For valid response try integer IDs with value <= 5 or > 10. Other values
+        will generated exceptions
+      operationId: getOrderById
+      parameters:
+        - name: order_id
+          in: path
+          description: ID of pet that needs to be fetched
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 1
+            maximum: 5
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/Order'
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Order not found
+    delete:
+      tags:
+        - store
+      summary: Delete purchase order by ID
+      description: >-
+        For valid response try integer IDs with value < 1000. Anything above
+        1000 or nonintegers will generate API errors
+      operationId: deleteOrder
+      parameters:
+        - name: order_id
+          in: path
+          description: ID of the order that needs to be deleted
+          required: true
+          schema:
+            type: string
+      responses:
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Order not found
+  /user:
+    post:
+      tags:
+        - user
+      summary: Create user
+      description: This can only be done by the logged in user.
+      operationId: createUser
+      responses:
+        default:
+          description: successful operation
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/User'
+        description: Created user object
+        required: true
+  /user/createWithArray:
+    post:
+      tags:
+        - user
+      summary: Creates list of users with given input array
+      description: ''
+      operationId: createUsersWithArrayInput
+      responses:
+        default:
+          description: successful operation
+      requestBody:
+        $ref: '#/components/requestBodies/UserArray'
+  /user/createWithList:
+    post:
+      tags:
+        - user
+      summary: Creates list of users with given input array
+      description: ''
+      operationId: createUsersWithListInput
+      responses:
+        default:
+          description: successful operation
+      requestBody:
+        $ref: '#/components/requestBodies/UserArray'
+  /user/login:
+    get:
+      tags:
+        - user
+      summary: Logs user into the system
+      description: ''
+      operationId: loginUser
+      parameters:
+        - name: username
+          in: query
+          description: The user name for login
+          required: true
+          schema:
+            type: string
+        - name: password
+          in: query
+          description: The password for login in clear text
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: successful operation
+          headers:
+            X-Rate-Limit:
+              description: calls per hour allowed by the user
+              schema:
+                type: integer
+                format: int32
+            X-Expires-After:
+              description: date in UTC when token expires
+              schema:
+                type: string
+                format: date-time
+          content:
+            application/xml:
+              schema:
+                type: string
+            application/json:
+              schema:
+                type: string
+        '400':
+          description: Invalid username/password supplied
+  /user/logout:
+    get:
+      tags:
+        - user
+      summary: Logs out current logged in user session
+      description: ''
+      operationId: logoutUser
+      responses:
+        default:
+          description: successful operation
+  '/user/{username}':
+    get:
+      tags:
+        - user
+      summary: Get user by user name
+      description: ''
+      operationId: getUserByName
+      parameters:
+        - name: username
+          in: path
+          description: The name that needs to be fetched. Use user1 for testing.
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/User'
+            application/json:
+              schema:
+                $ref: '#/components/schemas/User'
+        '400':
+          description: Invalid username supplied
+        '404':
+          description: User not found
+    put:
+      tags:
+        - user
+      summary: Updated user
+      description: This can only be done by the logged in user.
+      operationId: updateUser
+      parameters:
+        - name: username
+          in: path
+          description: name that need to be deleted
+          required: true
+          schema:
+            type: string
+      responses:
+        '400':
+          description: Invalid user supplied
+        '404':
+          description: User not found
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/User'
+        description: Updated user object
+        required: true
+    delete:
+      tags:
+        - user
+      summary: Delete user
+      description: This can only be done by the logged in user.
+      operationId: deleteUser
+      parameters:
+        - name: username
+          in: path
+          description: The name that needs to be deleted
+          required: true
+          schema:
+            type: string
+      responses:
+        '400':
+          description: Invalid username supplied
+        '404':
+          description: User not found
+  /fake_classname_test:
+    patch:
+      tags:
+        - 'fake_classname_tags 123#$%^'
+      summary: To test class name in snake case
+      description: To test class name in snake case
+      operationId: testClassname
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Client'
+      security:
+        - api_key_query: []
+      requestBody:
+        $ref: '#/components/requestBodies/Client'
+  /fake:
+    patch:
+      tags:
+        - fake
+      summary: To test "client" model
+      description: To test "client" model
+      operationId: testClientModel
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Client'
+      requestBody:
+        $ref: '#/components/requestBodies/Client'
+    get:
+      tags:
+        - fake
+      summary: To test enum parameters
+      description: To test enum parameters
+      operationId: testEnumParameters
+      parameters:
+        - name: enum_header_string_array
+          in: header
+          description: Header parameter enum test (string array)
+          schema:
+            type: array
+            items:
+              type: string
+              default: $
+              enum:
+                - '>'
+                - $
+        - name: enum_header_string
+          in: header
+          description: Header parameter enum test (string)
+          schema:
+            type: string
+            enum:
+              - _abc
+              - '-efg'
+              - (xyz)
+            default: '-efg'
+        - name: enum_query_string_array
+          in: query
+          description: Query parameter enum test (string array)
+          schema:
+            type: array
+            items:
+              type: string
+              default: $
+              enum:
+                - '>'
+                - $
+        - name: enum_query_string
+          in: query
+          description: Query parameter enum test (string)
+          schema:
+            type: string
+            enum:
+              - _abc
+              - '-efg'
+              - (xyz)
+            default: '-efg'
+        - name: enum_query_integer
+          in: query
+          description: Query parameter enum test (double)
+          schema:
+            type: integer
+            format: int32
+            enum:
+              - 1
+              - -2
+        - name: enum_query_double
+          in: query
+          description: Query parameter enum test (double)
+          schema:
+            type: number
+            format: double
+            enum:
+              - 1.1
+              - -1.2
+      responses:
+        '400':
+          description: Invalid request
+        '404':
+          description: Not found
+      requestBody:
+        content:
+          application/x-www-form-urlencoded:
+            schema:
+              type: object
+              properties:
+                enum_form_string_array:
+                  description: Form parameter enum test (string array)
+                  type: array
+                  items:
+                    type: string
+                    default: $
+                    enum:
+                      - '>'
+                      - $
+                enum_form_string:
+                  description: Form parameter enum test (string)
+                  type: string
+                  enum:
+                    - _abc
+                    - '-efg'
+                    - (xyz)
+                  default: '-efg'
+    post:
+      tags:
+        - fake
+      summary: |
+        Fake endpoint for testing various parameters
+        假端點
+        偽のエンドポイント
+        가짜 엔드 포인트
+      description: |
+        Fake endpoint for testing various parameters
+        假端點
+        偽のエンドポイント
+        가짜 엔드 포인트
+      operationId: testEndpointParameters
+      responses:
+        '400':
+          description: Invalid username supplied
+        '404':
+          description: User not found
+      security:
+        - http_basic_test: []
+      requestBody:
+        content:
+          application/x-www-form-urlencoded:
+            schema:
+              type: object
+              properties:
+                integer:
+                  description: None
+                  type: integer
+                  minimum: 10
+                  maximum: 100
+                int32:
+                  description: None
+                  type: integer
+                  format: int32
+                  minimum: 20
+                  maximum: 200
+                int64:
+                  description: None
+                  type: integer
+                  format: int64
+                number:
+                  description: None
+                  type: number
+                  minimum: 32.1
+                  maximum: 543.2
+                float:
+                  description: None
+                  type: number
+                  format: float
+                  maximum: 987.6
+                double:
+                  description: None
+                  type: number
+                  format: double
+                  minimum: 67.8
+                  maximum: 123.4
+                string:
+                  description: None
+                  type: string
+                  pattern: '/[a-z]/i'
+                pattern_without_delimiter:
+                  description: None
+                  type: string
+                  pattern: '^[A-Z].*'
+                byte:
+                  description: None
+                  type: string
+                  format: byte
+                binary:
+                  description: None
+                  type: string
+                  format: binary
+                date:
+                  description: None
+                  type: string
+                  format: date
+                dateTime:
+                  description: None
+                  type: string
+                  format: date-time
+                  default: '2010-02-01T10:20:10.11111+01:00'
+                  example: '2020-02-02T20:20:20.22222Z'
+                password:
+                  description: None
+                  type: string
+                  format: password
+                  minLength: 10
+                  maxLength: 64
+                callback:
+                  description: None
+                  type: string
+              required:
+                - number
+                - double
+                - pattern_without_delimiter
+                - byte
+    delete:
+      tags:
+        - fake
+      security:
+        - bearer_test: []
+      summary: Fake endpoint to test group parameters (optional)
+      description: Fake endpoint to test group parameters (optional)
+      operationId: testGroupParameters
+      x-group-parameters: true
+      parameters:
+        - name: required_string_group
+          in: query
+          description: Required String in group parameters
+          required: true
+          schema:
+            type: integer
+        - name: required_boolean_group
+          in: header
+          description: Required Boolean in group parameters
+          required: true
+          schema:
+            type: boolean
+        - name: required_int64_group
+          in: query
+          description: Required Integer in group parameters
+          required: true
+          schema:
+            type: integer
+            format: int64
+        - name: string_group
+          in: query
+          description: String in group parameters
+          schema:
+            type: integer
+        - name: boolean_group
+          in: header
+          description: Boolean in group parameters
+          schema:
+            type: boolean
+        - name: int64_group
+          in: query
+          description: Integer in group parameters
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '400':
+          description: Someting wrong
+  /fake/outer/number:
+    post:
+      tags:
+        - fake
+      description: Test serialization of outer number types
+      operationId: fakeOuterNumberSerialize
+      responses:
+        '200':
+          description: Output number
+          content:
+            '*/*':
+              schema:
+                $ref: '#/components/schemas/OuterNumber'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OuterNumber'
+        description: Input number as post body
+  /fake/outer/string:
+    post:
+      tags:
+        - fake
+      description: Test serialization of outer string types
+      operationId: fakeOuterStringSerialize
+      responses:
+        '200':
+          description: Output string
+          content:
+            '*/*':
+              schema:
+                $ref: '#/components/schemas/OuterString'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OuterString'
+        description: Input string as post body
+  /fake/outer/boolean:
+    post:
+      tags:
+        - fake
+      description: Test serialization of outer boolean types
+      operationId: fakeOuterBooleanSerialize
+      responses:
+        '200':
+          description: Output boolean
+          content:
+            '*/*':
+              schema:
+                $ref: '#/components/schemas/OuterBoolean'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OuterBoolean'
+        description: Input boolean as post body
+  /fake/outer/composite:
+    post:
+      tags:
+        - fake
+      description: Test serialization of object with outer number type
+      operationId: fakeOuterCompositeSerialize
+      responses:
+        '200':
+          description: Output composite
+          content:
+            '*/*':
+              schema:
+                $ref: '#/components/schemas/OuterComposite'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OuterComposite'
+        description: Input composite as post body
+  /fake/jsonFormData:
+    get:
+      tags:
+        - fake
+      summary: test json serialization of form data
+      description: ''
+      operationId: testJsonFormData
+      responses:
+        '200':
+          description: successful operation
+      requestBody:
+        content:
+          application/x-www-form-urlencoded:
+            schema:
+              type: object
+              properties:
+                param:
+                  description: field1
+                  type: string
+                param2:
+                  description: field2
+                  type: string
+              required:
+                - param
+                - param2
+  /fake/inline-additionalProperties:
+    post:
+      tags:
+        - fake
+      summary: test inline additionalProperties
+      description: ''
+      operationId: testInlineAdditionalProperties
+      responses:
+        '200':
+          description: successful operation
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              additionalProperties:
+                type: string
+        description: request body
+        required: true
+  /fake/body-with-query-params:
+    put:
+      tags:
+        - fake
+      operationId: testBodyWithQueryParams
+      parameters:
+        - name: query
+          in: query
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Success
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/User'
+        required: true
+  /another-fake/dummy:
+    patch:
+      tags:
+        - $another-fake?
+      summary: To test special tags
+      description: To test special tags and operation ID starting with number
+      operationId: '123_test_@#$%_special_tags'
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Client'
+      requestBody:
+        $ref: '#/components/requestBodies/Client'
+  /fake/body-with-file-schema:
+    put:
+      tags:
+        - fake
+      description: >-
+        For this test, the body for this request much reference a schema named
+        `File`.
+      operationId: testBodyWithFileSchema
+      responses:
+        '200':
+          description: Success
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/FileSchemaTestClass'
+        required: true
+  /fake/test-query-paramters:
+    put:
+      tags:
+        - fake
+      description: To test the collection format in query parameters
+      operationId: testQueryParameterCollectionFormat
+      parameters:
+        - name: pipe
+          in: query
+          required: true
+          schema:
+            type: array
+            items:
+              type: string
+        - name: ioutil
+          in: query
+          required: true
+          style: form
+          explode: false
+          schema:
+            type: array
+            items:
+              type: string
+        - name: http
+          in: query
+          required: true
+          style: spaceDelimited
+          schema:
+            type: array
+            items:
+              type: string
+        - name: url
+          in: query
+          required: true
+          style: form
+          explode: false
+          schema:
+            type: array
+            items:
+              type: string
+        - name: context
+          in: query
+          required: true
+          explode: true
+          schema:
+            type: array
+            items:
+              type: string
+      responses:
+        "200":
+          description: Success
+  '/fake/{petId}/uploadImageWithRequiredFile':
+    post:
+      tags:
+        - pet
+      summary: uploads an image (required)
+      description: ''
+      operationId: uploadFileWithRequiredFile
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet to update
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ApiResponse'
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                additionalMetadata:
+                  description: Additional data to pass to server
+                  type: string
+                requiredFile:
+                  description: file to upload
+                  type: string
+                  format: binary
+              required:
+                - requiredFile
+  /fake/health:
+    get:
+      tags:
+        - fake
+      summary: Health check endpoint
+      responses:
+        200:
+          description: The instance started successfully
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/HealthCheckResult'
+  /fake/array-of-enums:
+    get:
+      tags:
+        - fake
+      summary: Array of Enums
+      operationId: getArrayOfEnums
+      responses:
+        200:
+          description: Got named array of enums
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ArrayOfEnums'
+servers:
+  - url: 'http://{server}.swagger.io:{port}/v2'
+    description: petstore server
+    variables:
+      server:
+        enum:
+          - 'petstore'
+          - 'qa-petstore'
+          - 'dev-petstore'
+        default: 'petstore'
+      port:
+        enum:
+          - 80
+          - 8080
+        default: 80
+  - url: https://localhost:8080/{version}
+    description: The local server
+    variables:
+      version:
+        enum:
+          - 'v1'
+          - 'v2'
+        default: 'v2'
+components:
+  requestBodies:
+    UserArray:
+      content:
+        application/json:
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/User'
+      description: List of user object
+      required: true
+    Client:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Client'
+      description: client model
+      required: true
+    Pet:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Pet'
+        application/xml:
+          schema:
+            $ref: '#/components/schemas/Pet'
+      description: Pet object that needs to be added to the store
+      required: true
+  securitySchemes:
+    petstore_auth:
+      type: oauth2
+      flows:
+        implicit:
+          authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog'
+          scopes:
+            'write:pets': modify pets in your account
+            'read:pets': read your pets
+    api_key:
+      type: apiKey
+      name: api_key
+      in: header
+    api_key_query:
+      type: apiKey
+      name: api_key_query
+      in: query
+    http_basic_test:
+      type: http
+      scheme: basic
+    bearer_test:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+    http_signature_test:
+      # Test the 'HTTP signature' security scheme.
+      # Each HTTP request is cryptographically signed as specified
+      # in https://datatracker.ietf.org/doc/draft-cavage-http-signatures/
+      type: http
+      scheme: signature
+  schemas:
+    Foo:
+      type: object
+      properties:
+        bar:
+          $ref: '#/components/schemas/Bar'
+    Bar:
+      type: string
+      default: bar
+    Order:
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+        petId:
+          type: integer
+          format: int64
+        quantity:
+          type: integer
+          format: int32
+        shipDate:
+          type: string
+          format: date-time
+          example: '2020-02-02T20:20:20.000222Z'
+        status:
+          type: string
+          description: Order Status
+          enum:
+            - placed
+            - approved
+            - delivered
+        complete:
+          type: boolean
+          default: false
+      xml:
+        name: Order
+    Category:
+      type: object
+      required:
+        - name
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+          default: default-name
+      xml:
+        name: Category
+    User:
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+          x-is-unique: true
+        username:
+          type: string
+        firstName:
+          type: string
+        lastName:
+          type: string
+        email:
+          type: string
+        password:
+          type: string
+        phone:
+          type: string
+        userStatus:
+          type: integer
+          format: int32
+          description: User Status
+        objectWithNoDeclaredProps:
+          type: object
+          # Note: the 'additionalProperties' keyword is not specified, which is
+          # equivalent to allowing undeclared properties of any type.
+          description: test code generation for objects
+            Value must be a map of strings to values. It cannot be the 'null' value.
+        objectWithNoDeclaredPropsNullable:
+          type: object
+          # Note: the 'additionalProperties' keyword is not specified, which is
+          # equivalent to allowing undeclared properties of any type.
+          description: test code generation for nullable objects.
+            Value must be a map of strings to values or the 'null' value.
+          nullable: true
+        anyTypeProp:
+          description: test code generation for any type
+            Here the 'type' attribute is not specified, which means the value can be anything,
+            including the null value, string, number, boolean, array or object.
+            See https://github.com/OAI/OpenAPI-Specification/issues/1389
+        # TODO: this should be supported, currently there are some issues in the code generation.
+        #anyTypeExceptNullProp:
+        #  description: any type except 'null'
+        #    Here the 'type' attribute is not specified, which means the value can be anything,
+        #    including the null value, string, number, boolean, array or object.
+        #  not:
+        #    type: 'null'
+        anyTypePropNullable:
+          description: test code generation for any type
+            Here the 'type' attribute is not specified, which means the value can be anything,
+            including the null value, string, number, boolean, array or object.
+            The 'nullable' attribute does not change the allowed values.
+          nullable: true
+      xml:
+        name: User
+    Tag:
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+      xml:
+        name: Tag
+    Pet:
+      type: object
+      required:
+        - name
+        - photoUrls
+      properties:
+        id:
+          type: integer
+          format: int64
+          x-is-unique: true
+        category:
+          $ref: '#/components/schemas/Category'
+        name:
+          type: string
+          example: doggie
+        photoUrls:
+          type: array
+          xml:
+            name: photoUrl
+            wrapped: true
+          items:
+            type: string
+        tags:
+          type: array
+          xml:
+            name: tag
+            wrapped: true
+          items:
+            $ref: '#/components/schemas/Tag'
+        status:
+          type: string
+          description: pet status in the store
+          enum:
+            - available
+            - pending
+            - sold
+      xml:
+        name: Pet
+    ApiResponse:
+      type: object
+      properties:
+        code:
+          type: integer
+          format: int32
+        type:
+          type: string
+        message:
+          type: string
+    Return:
+      description: Model for testing reserved words
+      properties:
+        return:
+          type: integer
+          format: int32
+      xml:
+        name: Return
+    Name:
+      description: Model for testing model name same as property name
+      required:
+        - name
+      properties:
+        name:
+          type: integer
+          format: int32
+        snake_case:
+          readOnly: true
+          type: integer
+          format: int32
+        property:
+          type: string
+        123Number:
+          type: integer
+          readOnly: true
+      xml:
+        name: Name
+    200_response:
+      description: Model for testing model name starting with number
+      properties:
+        name:
+          type: integer
+          format: int32
+        class:
+          type: string
+      xml:
+        name: Name
+    ClassModel:
+      description: Model for testing model with "_class" property
+      properties:
+        _class:
+          type: string
+    Dog:
+      allOf:
+        - $ref: '#/components/schemas/Animal'
+        - type: object
+          properties:
+            breed:
+              type: string
+    Cat:
+      allOf:
+        - $ref: '#/components/schemas/Animal'
+        - $ref: '#/components/schemas/Address'
+        - type: object
+          properties:
+            declawed:
+              type: boolean
+    Address:
+      type: object
+      additionalProperties:
+         type: integer
+    Animal:
+      type: object
+      discriminator:
+        propertyName: className
+      required:
+        - className
+      properties:
+        className:
+          type: string
+        color:
+          type: string
+          default: red
+    AnimalFarm:
+      type: array
+      items:
+        $ref: '#/components/schemas/Animal'
+    format_test:
+      type: object
+      required:
+        - number
+        - byte
+        - date
+        - password
+      properties:
+        integer:
+          type: integer
+          maximum: 100
+          minimum: 10
+          multipleOf: 2
+        int32:
+          type: integer
+          format: int32
+          maximum: 200
+          minimum: 20
+        int64:
+          type: integer
+          format: int64
+        number:
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+          multipleOf: 32.5
+        float:
+          type: number
+          format: float
+          maximum: 987.6
+          minimum: 54.3
+        double:
+          type: number
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+        string:
+          type: string
+          pattern: '/[a-z]/i'
+        byte:
+          type: string
+          format: byte
+        binary:
+          type: string
+          format: binary
+        date:
+          type: string
+          format: date
+          example: '2020-02-02'
+        dateTime:
+          type: string
+          format: date-time
+          example: '2007-12-03T10:15:30+01:00'
+        uuid:
+          type: string
+          format: uuid
+          example: 72f98069-206d-4f12-9f12-3d1e525a8e84
+        password:
+          type: string
+          format: password
+          maxLength: 64
+          minLength: 10
+        pattern_with_digits:
+          description: A string that is a 10 digit number. Can have leading zeros.
+          type: string
+          pattern: '^\d{10}$'
+        pattern_with_digits_and_delimiter:
+          description: A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.
+          type: string
+          pattern: '/^image_\d{1,3}$/i'
+    EnumClass:
+      type: string
+      default: '-efg'
+      enum:
+        - _abc
+        - '-efg'
+        - (xyz)
+    Enum_Test:
+      type: object
+      required:
+        - enum_string_required
+      properties:
+        enum_string:
+          type: string
+          enum:
+            - UPPER
+            - lower
+            - ''
+        enum_string_required:
+          type: string
+          enum:
+            - UPPER
+            - lower
+            - ''
+        enum_integer:
+          type: integer
+          format: int32
+          enum:
+            - 1
+            - -1
+        enum_number:
+          type: number
+          format: double
+          enum:
+            - 1.1
+            - -1.2
+        outerEnum:
+          $ref: '#/components/schemas/OuterEnum'
+        outerEnumInteger:
+          $ref: '#/components/schemas/OuterEnumInteger'
+        outerEnumDefaultValue:
+          $ref: '#/components/schemas/OuterEnumDefaultValue'
+        outerEnumIntegerDefaultValue:
+          $ref: '#/components/schemas/OuterEnumIntegerDefaultValue'
+    AdditionalPropertiesClass:
+      type: object
+      properties:
+        map_property:
+          type: object
+          additionalProperties:
+            type: string
+        map_of_map_property:
+          type: object
+          additionalProperties:
+            type: object
+            additionalProperties:
+              type: string
+        anytype_1: {}
+        map_with_undeclared_properties_anytype_1:
+          type: object
+        map_with_undeclared_properties_anytype_2:
+          type: object
+          properties: {}
+        map_with_undeclared_properties_anytype_3:
+          type: object
+          additionalProperties: true
+        empty_map:
+          type: object
+          description: an object with no declared properties and no undeclared
+            properties, hence it's an empty map.
+          additionalProperties: false
+        map_with_undeclared_properties_string:
+          type: object
+          additionalProperties:
+            type: string
+    MixedPropertiesAndAdditionalPropertiesClass:
+      type: object
+      properties:
+        uuid:
+          type: string
+          format: uuid
+        dateTime:
+          type: string
+          format: date-time
+        map:
+          type: object
+          additionalProperties:
+            $ref: '#/components/schemas/Animal'
+    List:
+      type: object
+      properties:
+        123-list:
+          type: string
+    Client:
+      type: object
+      properties:
+        client:
+          type: string
+    ReadOnlyFirst:
+      type: object
+      properties:
+        bar:
+          type: string
+          readOnly: true
+        baz:
+          type: string
+    hasOnlyReadOnly:
+      type: object
+      properties:
+        bar:
+          type: string
+          readOnly: true
+        foo:
+          type: string
+          readOnly: true
+    Capitalization:
+      type: object
+      properties:
+        smallCamel:
+          type: string
+        CapitalCamel:
+          type: string
+        small_Snake:
+          type: string
+        Capital_Snake:
+          type: string
+        SCA_ETH_Flow_Points:
+          type: string
+        ATT_NAME:
+          description: |
+            Name of the pet
+          type: string
+    MapTest:
+      type: object
+      properties:
+        map_map_of_string:
+          type: object
+          additionalProperties:
+            type: object
+            additionalProperties:
+              type: string
+        map_of_enum_string:
+          type: object
+          additionalProperties:
+            type: string
+            enum:
+              - UPPER
+              - lower
+        direct_map:
+          type: object
+          additionalProperties:
+            type: boolean
+        indirect_map:
+          $ref: '#/components/schemas/StringBooleanMap'
+    ArrayTest:
+      type: object
+      properties:
+        array_of_string:
+          type: array
+          items:
+            type: string
+        array_array_of_integer:
+          type: array
+          items:
+            type: array
+            items:
+              type: integer
+              format: int64
+        array_array_of_model:
+          type: array
+          items:
+            type: array
+            items:
+              $ref: '#/components/schemas/ReadOnlyFirst'
+    NumberOnly:
+      type: object
+      properties:
+        JustNumber:
+          type: number
+    ArrayOfNumberOnly:
+      type: object
+      properties:
+        ArrayNumber:
+          type: array
+          items:
+            type: number
+    ArrayOfArrayOfNumberOnly:
+      type: object
+      properties:
+        ArrayArrayNumber:
+          type: array
+          items:
+            type: array
+            items:
+              type: number
+    EnumArrays:
+      type: object
+      properties:
+        just_symbol:
+          type: string
+          enum:
+            - '>='
+            - $
+        array_enum:
+          type: array
+          items:
+            type: string
+            enum:
+              - fish
+              - crab
+    OuterEnum:
+      nullable: true
+      type: string
+      enum:
+        - placed
+        - approved
+        - delivered
+    OuterEnumInteger:
+      type: integer
+      enum:
+      - 0
+      - 1
+      - 2
+    OuterEnumDefaultValue:
+      type: string
+      enum:
+      - placed
+      - approved
+      - delivered
+      default: placed
+    OuterEnumIntegerDefaultValue:
+      type: integer
+      enum:
+      - 0
+      - 1
+      - 2
+      default: 0
+    OuterComposite:
+      type: object
+      properties:
+        my_number:
+          $ref: '#/components/schemas/OuterNumber'
+        my_string:
+          $ref: '#/components/schemas/OuterString'
+        my_boolean:
+          $ref: '#/components/schemas/OuterBoolean'
+    OuterNumber:
+      type: number
+    OuterString:
+      type: string
+    OuterBoolean:
+      type: boolean
+      x-codegen-body-parameter-name: boolean_post_body
+    StringBooleanMap:
+      additionalProperties:
+        type: boolean
+    FileSchemaTestClass:
+      type: object
+      properties:
+        file:
+          $ref: '#/components/schemas/File'
+        files:
+          type: array
+          items:
+            $ref: '#/components/schemas/File'
+    File:
+      type: object
+      description: Must be named `File` for test.
+      properties:
+        sourceURI:
+          description: Test capitalization
+          type: string
+    _special_model.name_:
+      properties:
+        '$special[property.name]':
+          type: integer
+          format: int64
+      xml:
+        name: '$special[model.name]'
+    HealthCheckResult:
+      type: object
+      properties:
+        NullableMessage:
+          nullable: true
+          type: string
+      description: Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
+    NullableClass:
+      type: object
+      properties:
+        integer_prop:
+          type: integer
+          nullable: true
+        number_prop:
+          type: number
+          nullable: true
+        boolean_prop:
+          type: boolean
+          nullable: true
+        string_prop:
+          type: string
+          nullable: true
+        date_prop:
+          type: string
+          format: date
+          nullable: true
+        datetime_prop:
+          type: string
+          format: date-time
+          nullable: true
+        array_nullable_prop:
+          type: array
+          nullable: true
+          items:
+            type: object
+        array_and_items_nullable_prop:
+          type: array
+          nullable: true
+          items:
+            type: object
+            nullable: true
+        array_items_nullable:
+          type: array
+          items:
+            type: object
+            nullable: true
+        object_nullable_prop:
+          type: object
+          nullable: true
+          additionalProperties:
+            type: object
+        object_and_items_nullable_prop:
+          type: object
+          nullable: true
+          additionalProperties:
+            type: object
+            nullable: true
+        object_items_nullable:
+          type: object
+          additionalProperties:
+            type: object
+            nullable: true
+      additionalProperties:
+        type: object
+        nullable: true
+    fruit:
+      properties:
+        color:
+          type: string
+      oneOf:
+        - $ref: '#/components/schemas/apple'
+        - $ref: '#/components/schemas/banana'
+      # Below additionalProperties is set to false to validate the use
+      # case when a composed schema has additionalProperties set to false.
+      additionalProperties: false
+    apple:
+      type: object
+      properties:
+        cultivar:
+          type: string
+          pattern: ^[a-zA-Z\s]*$
+        origin:
+          type: string
+          pattern: /^[A-Z\s]*$/i
+      nullable: true
+    banana:
+      type: object
+      properties:
+        lengthCm:
+          type: number
+    mammal:
+      oneOf:
+        - $ref: '#/components/schemas/whale'
+        - $ref: '#/components/schemas/zebra'
+        - $ref: '#/components/schemas/Pig'
+      discriminator:
+        propertyName: className
+    whale:
+      type: object
+      properties:
+        hasBaleen:
+          type: boolean
+        hasTeeth:
+          type: boolean
+        className:
+          type: string
+      required:
+        - className
+    zebra:
+      type: object
+      properties:
+        type:
+          type: string
+          enum:
+            - plains
+            - mountain
+            - grevys
+        className:
+          type: string
+      required:
+        - className
+      additionalProperties: true
+    Pig:
+      oneOf:
+        - $ref: '#/components/schemas/BasquePig'
+        - $ref: '#/components/schemas/DanishPig'
+      discriminator:
+        propertyName: className
+    BasquePig:
+      type: object
+      properties:
+        className:
+          type: string
+      required:
+        - className
+    DanishPig:
+      type: object
+      properties:
+        className:
+          type: string
+      required:
+        - className
+    gmFruit:
+       properties:
+          color:
+             type: string
+       anyOf:
+          - $ref: '#/components/schemas/apple'
+          - $ref: '#/components/schemas/banana'
+       additionalProperties: false
+    fruitReq:
+       oneOf:
+          - type: 'null'
+          - $ref: '#/components/schemas/appleReq'
+          - $ref: '#/components/schemas/bananaReq'
+       additionalProperties: false
+    appleReq:
+      type: object
+      properties:
+        cultivar:
+          type: string
+        mealy:
+          type: boolean
+      required:
+        - cultivar
+      additionalProperties: false
+    bananaReq:
+      type: object
+      properties:
+        lengthCm:
+          type: number
+        sweet:
+          type: boolean
+      required:
+        - lengthCm
+      additionalProperties: false
+    # go-experimental is unable to make Triangle and Quadrilateral models
+    # correctly https://github.com/OpenAPITools/openapi-generator/issues/6149
+    Drawing:
+      type: object
+      properties:
+        mainShape:
+          # A property whose value is a 'oneOf' type, and the type is referenced instead
+          # of being defined inline. The value cannot be null.
+          $ref: '#/components/schemas/Shape'
+        shapeOrNull:
+          # A property whose value is a 'oneOf' type, and the type is referenced instead
+          # of being defined inline. The value may be null because ShapeOrNull has 'null'
+          # type as a child schema of 'oneOf'.
+          $ref: '#/components/schemas/ShapeOrNull'
+        nullableShape:
+          # A property whose value is a 'oneOf' type, and the type is referenced instead
+          # of being defined inline. The value may be null because NullableShape has the
+          # 'nullable: true' attribute. For this specific scenario this is exactly the
+          # same thing as 'shapeOrNull'.
+          $ref: '#/components/schemas/NullableShape'
+        shapes:
+          type: array
+          items:
+            $ref: '#/components/schemas/Shape'
+      additionalProperties:
+        # Here the additional properties are specified using a referenced schema.
+        # This is just to validate the generated code works when using $ref
+        # under 'additionalProperties'.
+        $ref: '#/components/schemas/fruit'
+    Shape:
+      oneOf:
+        - $ref: '#/components/schemas/Triangle'
+        - $ref: '#/components/schemas/Quadrilateral'
+      discriminator:
+        propertyName: shapeType
+    ShapeOrNull:
+      description: The value may be a shape or the 'null' value.
+        This is introduced in OAS schema >= 3.1.
+      oneOf:
+        - type: 'null'
+        - $ref: '#/components/schemas/Triangle'
+        - $ref: '#/components/schemas/Quadrilateral'
+      discriminator:
+        propertyName: shapeType
+    NullableShape:
+      description: The value may be a shape or the 'null' value.
+        The 'nullable' attribute was introduced in OAS schema >= 3.0
+        and has been deprecated in OAS schema >= 3.1.
+      oneOf:
+        - $ref: '#/components/schemas/Triangle'
+        - $ref: '#/components/schemas/Quadrilateral'
+      discriminator:
+        propertyName: shapeType
+      nullable: true
+    ShapeInterface:
+      properties:
+        shapeType:
+          type: string
+      required:
+        - shapeType
+    TriangleInterface:
+      properties:
+        triangleType:
+          type: string
+      required:
+        - triangleType
+    Triangle:
+      oneOf:
+        - $ref: '#/components/schemas/EquilateralTriangle'
+        - $ref: '#/components/schemas/IsoscelesTriangle'
+        - $ref: '#/components/schemas/ScaleneTriangle'
+      discriminator:
+        propertyName: triangleType
+      # Note: the 'additionalProperties' keyword is not specified, which is
+      # equivalent to allowing undeclared properties of any type.
+    EquilateralTriangle:
+      allOf:
+        - $ref: '#/components/schemas/ShapeInterface'
+        - $ref: '#/components/schemas/TriangleInterface'
+    IsoscelesTriangle:
+      allOf:
+        - $ref: '#/components/schemas/ShapeInterface'
+        - $ref: '#/components/schemas/TriangleInterface'
+      additionalProperties: false
+    ScaleneTriangle:
+      allOf:
+        - $ref: '#/components/schemas/ShapeInterface'
+        - $ref: '#/components/schemas/TriangleInterface'
+    QuadrilateralInterface:
+      properties:
+        quadrilateralType:
+          type: string
+      required:
+        - quadrilateralType
+    Quadrilateral:
+      oneOf:
+        - $ref: '#/components/schemas/SimpleQuadrilateral'
+        - $ref: '#/components/schemas/ComplexQuadrilateral'
+      discriminator:
+        propertyName: quadrilateralType
+    SimpleQuadrilateral:
+      allOf:
+        - $ref: '#/components/schemas/ShapeInterface'
+        - $ref: '#/components/schemas/QuadrilateralInterface'
+    ComplexQuadrilateral:
+      allOf:
+        - $ref: '#/components/schemas/ShapeInterface'
+        - $ref: '#/components/schemas/QuadrilateralInterface'
+    GrandparentAnimal:
+      type: object
+      required:
+        - pet_type
+      properties:
+        pet_type:
+          type: string
+      discriminator:
+        propertyName: pet_type
+    ParentPet:
+      type: object
+      allOf:
+        - $ref: '#/components/schemas/GrandparentAnimal'
+    ChildCat:
+      allOf:
+        - $ref: '#/components/schemas/ParentPet'
+        - type: object
+          properties:
+            name:
+              type: string
+    ArrayOfEnums:
+      type: array
+      items:
+        $ref: '#/components/schemas/OuterEnum'
+    DateTimeTest:
+      type: string
+      default: '2010-01-01T10:10:10.000111+01:00'
+      example: '2010-01-01T10:10:10.000111+01:00'
+      format: date-time
diff --git a/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index a0f064611b15..1e22fe1eccc9 100644
--- a/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -1112,6 +1112,19 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/ArrayOfEnums'
+  /fake/additional-properties-with-array-of-enums:
+    get:
+      tags:
+        - fake
+      summary: Additional Properties with Array of Enums
+      operationId: getAdditionalPropertiesWithArrayOfEnums
+      responses:
+        200:
+          description: Got object with additional properties with array of enums
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AdditionalPropertiesWithArrayOfEnums'
 servers:
   - url: 'http://{server}.swagger.io:{port}/v2'
     description: petstore server
@@ -2091,6 +2104,12 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/OuterEnum'
+    AdditionalPropertiesWithArrayOfEnums:
+      type: object
+      additionalProperties:
+        type: array
+        items:
+          $ref: '#/components/schemas/EnumClass'
     DateTimeTest:
       type: string
       default: '2010-01-01T10:10:10.000111+01:00'
diff --git a/modules/openapi-generator/src/test/resources/3_0/regression-6734.yaml b/modules/openapi-generator/src/test/resources/3_0/regression-6734.yaml
new file mode 100644
index 000000000000..bc12a06da2ec
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/regression-6734.yaml
@@ -0,0 +1,21 @@
+openapi: 3.0.0
+info:
+  version: 1.0.0
+  title: Whatever this is
+  description: whatever this description is
+
+servers:
+  - url: http://127.0.0.1:8080/{basePath}
+    variables:
+      basePath:
+        default: v1
+
+components:
+  schemas:
+    MyModel:
+      type: object
+      description: Description of a model
+      properties:
+        sortOrder:
+          type: string
+          enum: [asc, desc]
diff --git a/modules/openapi-generator/src/test/resources/3_0/rust-server/openapi-v3.yaml b/modules/openapi-generator/src/test/resources/3_0/rust-server/openapi-v3.yaml
index 4f224edf40c5..f059f8dba910 100644
--- a/modules/openapi-generator/src/test/resources/3_0/rust-server/openapi-v3.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/rust-server/openapi-v3.yaml
@@ -227,6 +227,7 @@ paths:
             Success-Info:
               schema:
                 type: String
+              required: true
             Bool-Header:
               schema:
                 type: bool
@@ -390,6 +391,20 @@ paths:
       responses:
         '200':
           description: Success
+  /json-complex-query-param:
+    get:
+      parameters:
+        - name: list-of-strings
+          in: query
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/StringObject'
+      responses:
+        '200':
+          description: Success
 
 components:
   securitySchemes:
@@ -521,6 +536,13 @@ components:
       type: boolean
     OptionalObjectHeader:
       type: integer
+    AdditionalPropertiesWithList:
+      type: object
+      maxProperties: 1
+      additionalProperties:
+        type: list
+        items:
+          type: string
     NullableTest:
       type: object
       required:
diff --git a/modules/openapi-generator/src/test/resources/sampleConfig.json b/modules/openapi-generator/src/test/resources/sampleConfig.json
index 1c59ab4e5461..d88bd26dd822 100644
--- a/modules/openapi-generator/src/test/resources/sampleConfig.json
+++ b/modules/openapi-generator/src/test/resources/sampleConfig.json
@@ -29,6 +29,5 @@
     "importMappings" : {
         "type1" : "import1"
     },
-    "languageSpecificPrimitives" : [ "rolex" ],
-    "localVariablePrefix" : "_"
+    "languageSpecificPrimitives" : [ "rolex" ]
 }
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 27484540fbd6..18eca9b433ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -731,7 +731,7 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/client/petstore/java/feign10x</module>
+                <module>samples/client/petstore/java/feign</module>
             </modules>
         </profile>
         <profile>
@@ -916,7 +916,7 @@
             </modules>
         </profile>
         <profile>
-            <id>typescript-fetch-client-tests-default</id>
+            <id>typescript-client-tests-default</id>
             <activation>
                 <property>
                     <name>env</name>
@@ -924,11 +924,11 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/client/petstore/typescript-fetch/tests/default</module>
+                <module>samples/openapi3/client/petstore/typescript/tests/default</module>
             </modules>
         </profile>
         <profile>
-            <id>typescript-fetch-client-builds-default</id>
+            <id>typescript-client-tests-deno</id>
             <activation>
                 <property>
                     <name>env</name>
@@ -936,11 +936,11 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/client/petstore/typescript-fetch/builds/default</module>
+                <module>samples/openapi3/client/petstore/typescript/tests/deno</module>
             </modules>
         </profile>
         <profile>
-            <id>typescript-fetch-client-builds-es6-target</id>
+            <id>typescript-client-tests-jquery</id>
             <activation>
                 <property>
                     <name>env</name>
@@ -948,11 +948,11 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
+                <module>samples/openapi3/client/petstore/typescript/tests/jquery</module>
             </modules>
         </profile>
         <profile>
-            <id>typescript-fetch-client-builds-with-npm-version</id>
+            <id>typescript-fetch-client-tests-default</id>
             <activation>
                 <property>
                     <name>env</name>
@@ -960,11 +960,11 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>
+                <module>samples/client/petstore/typescript-fetch/tests/default</module>
             </modules>
         </profile>
         <profile>
-            <id>typescript-fetch-client-builds-prefix-parameter-interfaces</id>
+            <id>typescript-fetch-client-builds-default</id>
             <activation>
                 <property>
                     <name>env</name>
@@ -972,11 +972,23 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces</module>
+                <module>samples/client/petstore/typescript-fetch/builds/default</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>typescript-fetch-client-builds-es6-target</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
             </modules>
         </profile>
         <profile>
-            <id>typescript-angularjs-client</id>
+            <id>typescript-fetch-client-builds-with-npm-version</id>
             <activation>
                 <property>
                     <name>env</name>
@@ -984,7 +996,19 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/client/petstore/typescript-angularjs</module>
+                <module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>typescript-fetch-client-builds-prefix-parameter-interfaces</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces</module>
             </modules>
         </profile>
         <profile>
@@ -1156,9 +1180,8 @@
                 <module>samples/server/petstore/python-aiohttp</module>
                 <module>samples/server/petstore/python-aiohttp-srclayout</module>
                 <module>samples/server/petstore/python-flask</module>
-                <module>samples/server/petstore/python-flask-python2</module>
-                <module>samples/server/petstore/php-slim</module>
                 <module>samples/server/petstore/php-slim4</module>
+                <module>samples/server/petstore/php-laravel</module>
                 <module>samples/server/petstore/rust-server</module>
                 <!-- clients -->
                 <module>samples/client/petstore/perl</module>
@@ -1170,7 +1193,6 @@
                 <module>samples/client/petstore/rust/reqwest/petstore</module>
                 <module>samples/client/petstore/rust/reqwest/petstore-async</module>
                 <module>samples/client/petstore/php/OpenAPIClient-php</module>
-                <module>samples/openapi3/client/petstore/php/OpenAPIClient-php</module>
                 <!--<module>samples/client/petstore/javascript-apollo</module>-->
                 <module>samples/client/petstore/javascript-es6</module>
                 <module>samples/client/petstore/javascript-promise-es6</module>
@@ -1181,6 +1203,15 @@
                 <module>samples/client/petstore/python-tornado</module>
                 <module>samples/openapi3/client/petstore/python</module>
                 <module>samples/openapi3/client/petstore/python-experimental</module>
+                <module>samples/openapi3/client/petstore/typescript/builds/default</module>
+                <module>samples/openapi3/client/petstore/typescript/tests/default</module>
+                <module>samples/openapi3/client/petstore/typescript/builds/jquery</module>
+                <module>samples/openapi3/client/petstore/typescript/tests/jquery</module>
+                <module>samples/openapi3/client/petstore/typescript/builds/object_params</module>
+                <module>samples/openapi3/client/petstore/typescript/tests/object_params</module>
+                <module>samples/openapi3/client/petstore/typescript/builds/inversify</module>
+                <module>samples/openapi3/client/petstore/typescript/tests/inversify</module>
+                <module>samples/openapi3/client/petstore/typescript/tests/deno</module>
                 <module>samples/client/petstore/typescript-fetch/builds/default</module>
                 <module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
                 <module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>
@@ -1189,8 +1220,6 @@
                 <module>samples/client/petstore/typescript-axios/tests/default</module>-->
                 <module>samples/client/petstore/typescript-node/npm</module>
                 <module>samples/client/petstore/typescript-rxjs/builds/with-npm-version</module>
-                <!-- comment out due to github rate limit error
-                <module>samples/client/petstore/typescript-angularjs</module>-->
                 <!-- comment out due to error `npm run build`
                 <module>samples/client/petstore/typescript-jquery/npm</module>-->
                 <!--<module>samples/client/petstore/typescript-angular-v2/npm</module>-->
@@ -1222,14 +1251,14 @@
                 <module>samples/client/petstore/scala-httpclient</module>
                 <module>samples/client/petstore/scalaz</module>
                 <module>samples/client/petstore/clojure</module>
-                <module>samples/client/petstore/java/feign10x</module>
+                <module>samples/client/petstore/java/feign</module>
                 <module>samples/client/petstore/java/jersey1</module>
                 <module>samples/client/petstore/java/jersey2-java8</module>
                 <module>samples/openapi3/client/petstore/java/jersey2-java8</module>
                 <module>samples/client/petstore/java/okhttp-gson</module>
                 <module>samples/client/petstore/java/retrofit2</module>
-                <module>samples/client/petstore/java/retrofit2rx</module>
-                <module>samples/client/petstore/java/retrofit2-play25</module>
+                <module>samples/client/petstore/java/retrofit2rx2</module>
+                <module>samples/client/petstore/java/retrofit2rx3</module>
                 <module>samples/client/petstore/java/retrofit2-play26</module>
                 <module>samples/client/petstore/jaxrs-cxf-client</module>
                 <module>samples/client/petstore/java/resttemplate</module>
@@ -1316,7 +1345,6 @@
                 <module>samples/client/petstore/java/jersey1</module>
                 <module>samples/client/petstore/java/okhttp-gson</module>
                 <module>samples/client/petstore/java/retrofit2</module>
-                <module>samples/client/petstore/java/retrofit2rx</module>
                 <module>samples/client/petstore/jaxrs-cxf-client</module>
                 <module>samples/client/petstore/java/resttemplate</module>
                 <module>samples/client/petstore/java/resttemplate-withXml</module>
diff --git a/run-in-docker.sh b/run-in-docker.sh
index c59a0fda72f6..ce2e0f87ff0b 100755
--- a/run-in-docker.sh
+++ b/run-in-docker.sh
@@ -15,7 +15,7 @@ docker run --rm -it \
         -w /gen \
         -e GEN_DIR=/gen \
         -e MAVEN_CONFIG=/var/maven/.m2 \
-        -e MAVEN_OPTS="-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=/var/maven/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" \
+        -e MAVEN_OPTS="-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=/var/maven/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true -Djacoco.skip=true" \
         -u "$(id -u):$(id -g)" \
         -v "${PWD}:/gen" \
         -v "${PWD}/CI/run-in-docker-settings.xml:/var/maven/.m2/settings.xml" \
diff --git a/samples/client/petstore/R/R/api_client.R b/samples/client/petstore/R/R/api_client.R
index f6b8544aacd5..fe61ecfbde93 100644
--- a/samples/client/petstore/R/R/api_client.R
+++ b/samples/client/petstore/R/R/api_client.R
@@ -164,7 +164,9 @@ ApiClient  <- R6::R6Class(
       else if (exists(returnType, pkgEnv) && !(c(returnType) %in% primitiveTypes)) {
         returnType <- get(returnType, envir = as.environment(pkgEnv))
         returnObj <- returnType$new()
-        returnObj$fromJSON(jsonlite::toJSON(obj, digits = NA))
+        returnObj$fromJSON(
+          jsonlite::toJSON(obj, digits = NA, auto_unbox = TRUE)
+        )
       } 
 
       # To handle primitive type
diff --git a/samples/client/petstore/R/R/category.R b/samples/client/petstore/R/R/category.R
index 6ff2f1510cc9..7c74320d1acf 100644
--- a/samples/client/petstore/R/R/category.R
+++ b/samples/client/petstore/R/R/category.R
@@ -8,13 +8,15 @@
 
 #' @docType class
 #' @title Category
+#'
 #' @description Category Class
+#'
 #' @format An \code{R6Class} generator object
+#'
 #' @field id  integer [optional]
 #'
 #' @field name  character [optional]
 #'
-#'
 #' @importFrom R6 R6Class
 #' @importFrom jsonlite fromJSON toJSON
 #' @export
@@ -23,7 +25,9 @@ Category <- R6::R6Class(
   public = list(
     `id` = NULL,
     `name` = NULL,
-    initialize = function(`id`=NULL, `name`=NULL, ...){
+    initialize = function(
+        `id`=NULL, `name`=NULL, ...
+    ) {
       local.optional.var <- list(...)
       if (!is.null(`id`)) {
         stopifnot(is.numeric(`id`), length(`id`) == 1)
@@ -55,6 +59,7 @@ Category <- R6::R6Class(
       if (!is.null(CategoryObject$`name`)) {
         self$`name` <- CategoryObject$`name`
       }
+      self
     },
     toJSONString = function() {
       jsoncontent <- c(
@@ -84,3 +89,4 @@ Category <- R6::R6Class(
     }
   )
 )
+
diff --git a/samples/client/petstore/R/R/model_api_response.R b/samples/client/petstore/R/R/model_api_response.R
index ddf573164b77..c7cdbb76c2a4 100644
--- a/samples/client/petstore/R/R/model_api_response.R
+++ b/samples/client/petstore/R/R/model_api_response.R
@@ -8,15 +8,17 @@
 
 #' @docType class
 #' @title ModelApiResponse
+#'
 #' @description ModelApiResponse Class
+#'
 #' @format An \code{R6Class} generator object
+#'
 #' @field code  integer [optional]
 #'
 #' @field type  character [optional]
 #'
 #' @field message  character [optional]
 #'
-#'
 #' @importFrom R6 R6Class
 #' @importFrom jsonlite fromJSON toJSON
 #' @export
@@ -26,7 +28,9 @@ ModelApiResponse <- R6::R6Class(
     `code` = NULL,
     `type` = NULL,
     `message` = NULL,
-    initialize = function(`code`=NULL, `type`=NULL, `message`=NULL, ...){
+    initialize = function(
+        `code`=NULL, `type`=NULL, `message`=NULL, ...
+    ) {
       local.optional.var <- list(...)
       if (!is.null(`code`)) {
         stopifnot(is.numeric(`code`), length(`code`) == 1)
@@ -69,6 +73,7 @@ ModelApiResponse <- R6::R6Class(
       if (!is.null(ModelApiResponseObject$`message`)) {
         self$`message` <- ModelApiResponseObject$`message`
       }
+      self
     },
     toJSONString = function() {
       jsoncontent <- c(
@@ -106,3 +111,4 @@ ModelApiResponse <- R6::R6Class(
     }
   )
 )
+
diff --git a/samples/client/petstore/R/R/order.R b/samples/client/petstore/R/R/order.R
index a5acac3bfffd..3218835cc35c 100644
--- a/samples/client/petstore/R/R/order.R
+++ b/samples/client/petstore/R/R/order.R
@@ -8,8 +8,11 @@
 
 #' @docType class
 #' @title Order
+#'
 #' @description Order Class
+#'
 #' @format An \code{R6Class} generator object
+#'
 #' @field id  integer [optional]
 #'
 #' @field petId  integer [optional]
@@ -22,7 +25,6 @@
 #'
 #' @field complete  character [optional]
 #'
-#'
 #' @importFrom R6 R6Class
 #' @importFrom jsonlite fromJSON toJSON
 #' @export
@@ -35,7 +37,9 @@ Order <- R6::R6Class(
     `shipDate` = NULL,
     `status` = NULL,
     `complete` = NULL,
-    initialize = function(`id`=NULL, `petId`=NULL, `quantity`=NULL, `shipDate`=NULL, `status`=NULL, `complete`=FALSE, ...){
+    initialize = function(
+        `id`=NULL, `petId`=NULL, `quantity`=NULL, `shipDate`=NULL, `status`=NULL, `complete`=FALSE, ...
+    ) {
       local.optional.var <- list(...)
       if (!is.null(`id`)) {
         stopifnot(is.numeric(`id`), length(`id`) == 1)
@@ -110,6 +114,7 @@ Order <- R6::R6Class(
       if (!is.null(OrderObject$`complete`)) {
         self$`complete` <- OrderObject$`complete`
       }
+      self
     },
     toJSONString = function() {
       jsoncontent <- c(
@@ -171,3 +176,4 @@ Order <- R6::R6Class(
     }
   )
 )
+
diff --git a/samples/client/petstore/R/R/pet.R b/samples/client/petstore/R/R/pet.R
index 760463d67baf..509d16934e1f 100644
--- a/samples/client/petstore/R/R/pet.R
+++ b/samples/client/petstore/R/R/pet.R
@@ -8,8 +8,11 @@
 
 #' @docType class
 #' @title Pet
+#'
 #' @description Pet Class
+#'
 #' @format An \code{R6Class} generator object
+#'
 #' @field id  integer [optional]
 #'
 #' @field category  \link{Category} [optional]
@@ -22,7 +25,6 @@
 #'
 #' @field status  character [optional]
 #'
-#'
 #' @importFrom R6 R6Class
 #' @importFrom jsonlite fromJSON toJSON
 #' @export
@@ -35,7 +37,9 @@ Pet <- R6::R6Class(
     `photoUrls` = NULL,
     `tags` = NULL,
     `status` = NULL,
-    initialize = function(`name`, `photoUrls`, `id`=NULL, `category`=NULL, `tags`=NULL, `status`=NULL, ...){
+    initialize = function(
+        `name`, `photoUrls`, `id`=NULL, `category`=NULL, `tags`=NULL, `status`=NULL, ...
+    ) {
       local.optional.var <- list(...)
       if (!missing(`name`)) {
         stopifnot(is.character(`name`), length(`name`) == 1)
@@ -115,6 +119,7 @@ Pet <- R6::R6Class(
       if (!is.null(PetObject$`status`)) {
         self$`status` <- PetObject$`status`
       }
+      self
     },
     toJSONString = function() {
       jsoncontent <- c(
@@ -176,3 +181,4 @@ Pet <- R6::R6Class(
     }
   )
 )
+
diff --git a/samples/client/petstore/R/R/tag.R b/samples/client/petstore/R/R/tag.R
index 5644807f5c60..56b89c6b4254 100644
--- a/samples/client/petstore/R/R/tag.R
+++ b/samples/client/petstore/R/R/tag.R
@@ -8,13 +8,15 @@
 
 #' @docType class
 #' @title Tag
+#'
 #' @description Tag Class
+#'
 #' @format An \code{R6Class} generator object
+#'
 #' @field id  integer [optional]
 #'
 #' @field name  character [optional]
 #'
-#'
 #' @importFrom R6 R6Class
 #' @importFrom jsonlite fromJSON toJSON
 #' @export
@@ -23,7 +25,9 @@ Tag <- R6::R6Class(
   public = list(
     `id` = NULL,
     `name` = NULL,
-    initialize = function(`id`=NULL, `name`=NULL, ...){
+    initialize = function(
+        `id`=NULL, `name`=NULL, ...
+    ) {
       local.optional.var <- list(...)
       if (!is.null(`id`)) {
         stopifnot(is.numeric(`id`), length(`id`) == 1)
@@ -55,6 +59,7 @@ Tag <- R6::R6Class(
       if (!is.null(TagObject$`name`)) {
         self$`name` <- TagObject$`name`
       }
+      self
     },
     toJSONString = function() {
       jsoncontent <- c(
@@ -84,3 +89,4 @@ Tag <- R6::R6Class(
     }
   )
 )
+
diff --git a/samples/client/petstore/R/R/user.R b/samples/client/petstore/R/R/user.R
index 2afd3de04c6e..bf88bee40277 100644
--- a/samples/client/petstore/R/R/user.R
+++ b/samples/client/petstore/R/R/user.R
@@ -8,8 +8,11 @@
 
 #' @docType class
 #' @title User
+#'
 #' @description User Class
+#'
 #' @format An \code{R6Class} generator object
+#'
 #' @field id  integer [optional]
 #'
 #' @field username  character [optional]
@@ -26,7 +29,6 @@
 #'
 #' @field userStatus  integer [optional]
 #'
-#'
 #' @importFrom R6 R6Class
 #' @importFrom jsonlite fromJSON toJSON
 #' @export
@@ -41,7 +43,9 @@ User <- R6::R6Class(
     `password` = NULL,
     `phone` = NULL,
     `userStatus` = NULL,
-    initialize = function(`id`=NULL, `username`=NULL, `firstName`=NULL, `lastName`=NULL, `email`=NULL, `password`=NULL, `phone`=NULL, `userStatus`=NULL, ...){
+    initialize = function(
+        `id`=NULL, `username`=NULL, `firstName`=NULL, `lastName`=NULL, `email`=NULL, `password`=NULL, `phone`=NULL, `userStatus`=NULL, ...
+    ) {
       local.optional.var <- list(...)
       if (!is.null(`id`)) {
         stopifnot(is.numeric(`id`), length(`id`) == 1)
@@ -139,6 +143,7 @@ User <- R6::R6Class(
       if (!is.null(UserObject$`userStatus`)) {
         self$`userStatus` <- UserObject$`userStatus`
       }
+      self
     },
     toJSONString = function() {
       jsoncontent <- c(
@@ -216,3 +221,4 @@ User <- R6::R6Class(
     }
   )
 )
+
diff --git a/samples/client/petstore/R/tests/testthat/test_order.R b/samples/client/petstore/R/tests/testthat/test_order.R
index 5fb144f9372b..33b87520254d 100644
--- a/samples/client/petstore/R/tests/testthat/test_order.R
+++ b/samples/client/petstore/R/tests/testthat/test_order.R
@@ -12,11 +12,11 @@ test_that("id", {
   #expect_equal(model.instance$`id`, "EXPECTED_RESULT")
 })
 
-test_that("pet_id", {
-  # tests for the property `pet_id` (integer)
+test_that("petId", {
+  # tests for the property `petId` (integer)
 
   # uncomment below to test the property 
-  #expect_equal(model.instance$`pet_id`, "EXPECTED_RESULT")
+  #expect_equal(model.instance$`petId`, "EXPECTED_RESULT")
 })
 
 test_that("quantity", {
@@ -26,11 +26,11 @@ test_that("quantity", {
   #expect_equal(model.instance$`quantity`, "EXPECTED_RESULT")
 })
 
-test_that("ship_date", {
-  # tests for the property `ship_date` (character)
+test_that("shipDate", {
+  # tests for the property `shipDate` (character)
 
   # uncomment below to test the property 
-  #expect_equal(model.instance$`ship_date`, "EXPECTED_RESULT")
+  #expect_equal(model.instance$`shipDate`, "EXPECTED_RESULT")
 })
 
 test_that("status", {
diff --git a/samples/client/petstore/R/tests/testthat/test_pet.R b/samples/client/petstore/R/tests/testthat/test_pet.R
index 8d3ce54a55d1..ac3e4f31dd10 100644
--- a/samples/client/petstore/R/tests/testthat/test_pet.R
+++ b/samples/client/petstore/R/tests/testthat/test_pet.R
@@ -26,15 +26,15 @@ test_that("name", {
   #expect_equal(model.instance$`name`, "EXPECTED_RESULT")
 })
 
-test_that("photo_urls", {
-  # tests for the property `photo_urls` (character)
+test_that("photoUrls", {
+  # tests for the property `photoUrls` (array[character])
 
   # uncomment below to test the property 
-  #expect_equal(model.instance$`photo_urls`, "EXPECTED_RESULT")
+  #expect_equal(model.instance$`photoUrls`, "EXPECTED_RESULT")
 })
 
 test_that("tags", {
-  # tests for the property `tags` (Tag)
+  # tests for the property `tags` (array[Tag])
 
   # uncomment below to test the property 
   #expect_equal(model.instance$`tags`, "EXPECTED_RESULT")
diff --git a/samples/client/petstore/R/tests/testthat/test_pet_api.R b/samples/client/petstore/R/tests/testthat/test_pet_api.R
index 021f6228af90..7fbdd1a70deb 100644
--- a/samples/client/petstore/R/tests/testthat/test_pet_api.R
+++ b/samples/client/petstore/R/tests/testthat/test_pet_api.R
@@ -7,9 +7,9 @@ api.instance <- PetApi$new()
 
 test_that("AddPet", {
   # tests for AddPet
+  # base path: http://petstore.swagger.io/v2
   # Add a new pet to the store
-  # @param body Pet object that needs to be added to the store
-  # @param [Hash] opts the optional parameters
+  # @param body Pet Pet object that needs to be added to the store
   # @return [Void]
 
   # uncomment below to test the operation
@@ -18,10 +18,10 @@ test_that("AddPet", {
 
 test_that("DeletePet", {
   # tests for DeletePet
+  # base path: http://petstore.swagger.io/v2
   # Deletes a pet
-  # @param pet.id Pet id to delete
-  # @param [Hash] opts the optional parameters
-  # @option opts [character] :api.key 
+  # @param pet.id integer Pet id to delete
+  # @param api.key character  (optional)
   # @return [Void]
 
   # uncomment below to test the operation
@@ -30,11 +30,11 @@ test_that("DeletePet", {
 
 test_that("FindPetsByStatus", {
   # tests for FindPetsByStatus
+  # base path: http://petstore.swagger.io/v2
   # Finds Pets by status
   # Multiple status values can be provided with comma separated strings
-  # @param status Status values that need to be considered for filter
-  # @param [Hash] opts the optional parameters
-  # @return [Pet]
+  # @param status array[character] Status values that need to be considered for filter
+  # @return [array[Pet]]
 
   # uncomment below to test the operation
   #expect_equal(result, "EXPECTED_RESULT")
@@ -42,11 +42,11 @@ test_that("FindPetsByStatus", {
 
 test_that("FindPetsByTags", {
   # tests for FindPetsByTags
+  # base path: http://petstore.swagger.io/v2
   # Finds Pets by tags
   # Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-  # @param tags Tags to filter by
-  # @param [Hash] opts the optional parameters
-  # @return [Pet]
+  # @param tags array[character] Tags to filter by
+  # @return [array[Pet]]
 
   # uncomment below to test the operation
   #expect_equal(result, "EXPECTED_RESULT")
@@ -54,10 +54,10 @@ test_that("FindPetsByTags", {
 
 test_that("GetPetById", {
   # tests for GetPetById
+  # base path: http://petstore.swagger.io/v2
   # Find pet by ID
   # Returns a single pet
-  # @param pet.id ID of pet to return
-  # @param [Hash] opts the optional parameters
+  # @param pet.id integer ID of pet to return
   # @return [Pet]
 
   # uncomment below to test the operation
@@ -66,9 +66,9 @@ test_that("GetPetById", {
 
 test_that("UpdatePet", {
   # tests for UpdatePet
+  # base path: http://petstore.swagger.io/v2
   # Update an existing pet
-  # @param body Pet object that needs to be added to the store
-  # @param [Hash] opts the optional parameters
+  # @param body Pet Pet object that needs to be added to the store
   # @return [Void]
 
   # uncomment below to test the operation
@@ -77,11 +77,11 @@ test_that("UpdatePet", {
 
 test_that("UpdatePetWithForm", {
   # tests for UpdatePetWithForm
+  # base path: http://petstore.swagger.io/v2
   # Updates a pet in the store with form data
-  # @param pet.id ID of pet that needs to be updated
-  # @param [Hash] opts the optional parameters
-  # @option opts [character] :name Updated name of the pet
-  # @option opts [character] :status Updated status of the pet
+  # @param pet.id integer ID of pet that needs to be updated
+  # @param name character Updated name of the pet (optional)
+  # @param status character Updated status of the pet (optional)
   # @return [Void]
 
   # uncomment below to test the operation
@@ -90,11 +90,11 @@ test_that("UpdatePetWithForm", {
 
 test_that("UploadFile", {
   # tests for UploadFile
+  # base path: http://petstore.swagger.io/v2
   # uploads an image
-  # @param pet.id ID of pet to update
-  # @param [Hash] opts the optional parameters
-  # @option opts [character] :additional.metadata Additional data to pass to server
-  # @option opts [data.frame] :file file to upload
+  # @param pet.id integer ID of pet to update
+  # @param additional.metadata character Additional data to pass to server (optional)
+  # @param file data.frame file to upload (optional)
   # @return [ModelApiResponse]
 
   # uncomment below to test the operation
diff --git a/samples/client/petstore/R/tests/testthat/test_petstore.R b/samples/client/petstore/R/tests/testthat/test_petstore.R
index 2e24b32f1241..941c30af7e56 100644
--- a/samples/client/petstore/R/tests/testthat/test_petstore.R
+++ b/samples/client/petstore/R/tests/testthat/test_petstore.R
@@ -1,31 +1,67 @@
 context("basic functionality")
 petApi <- PetApi$new()
 petId <- 123321
+pet <- Pet$new("name_test",
+  photoUrls = list("photo_test", "second test"),
+  category = Category$new(id=450, name="test_cat"),
+  id = petId,
+  tags = list(
+    Tag$new(id=123, name="tag_test"), Tag$new(id=456, name="unknown")
+  ),
+  status = "available"
+)
+result <- petApi$AddPet(pet)
+
 test_that("AddPet", {
-  pet <- Pet$new("name_test", list("photo_test", "second test"),
-                 petId, Category$new(id=450, name="test_cat"),
-                 list(Tag$new(id=123, name="tag_test"), Tag$new(id=456, name="unknown")), 
-                 "available")
-  #pet <- Pet$new("name_test", 
-  #               list("photo_test", "second test"),
-  #               category=Category$new(id=450, name="test_cat"),
-  #               id=petId,
-  #               tags=list(Tag$new(id=123, name="tag_test"), Tag$new(id=456, name="unknown")),
-  #               status="available")
-  result <-petApi$AddPet(pet)
   expect_equal(petId, 123321)
   expect_equal(result, NULL)
 })
 
-test_that("Test Pet", {
-  pet <- Pet$new("name_test", list("photo_test", "second test"),
-                 petId, Category$new(id=450, name="test_cat"),
-                 list(Tag$new(id=123, name="tag_test"), Tag$new(id=456, name="unknown")), 
-                 "available")
+test_that("Test toJSON toJSON fromJSON fromJSONString", {
+  pet0 <- Pet$new()
+  jsonpet <- pet0$toJSON()
+  pet2 <- pet0$fromJSON(
+    jsonlite::toJSON(jsonpet, auto_unbox=TRUE)
+  )
+  expect_equal(pet0, pet2)
+  jsonpet <- pet0$toJSONString()
+  pet2 <- pet0$fromJSON(
+    jsonpet
+  )
+  expect_equal(pet0, pet2)
+
+  jsonpet <- pet0$toJSONString()
+  pet2 <- pet0$fromJSONString(
+    jsonpet
+  )
+  expect_equal(pet0, pet2)
+
+  pet1 <- Pet$new("name_test",
+    list("photo_test", "second test"),
+    category = Category$new(id=450, name="test_cat"),
+    id = petId,
+    tags = list(
+      Tag$new(id=123, name="tag_test"), Tag$new(id=456, name="unknown")
+    ),
+    status = "available"
+  )
+  jsonpet <- pet1$toJSON()
+  pet2 <- pet1$fromJSON(
+    jsonlite::toJSON(jsonpet, auto_unbox=TRUE)
+  )
+  expect_equal(pet1, pet2)
 
-  pet2 <- Pet$new()
-  #pet2$fromJSON(jsonlite::toJSON(pet$toJSON(), auto_unbox=TRUE))
-  #expect_equal(pet, pet2)
+  jsonpet <- pet1$toJSONString()
+  pet2 <- pet1$fromJSON(
+    jsonpet
+  )
+  expect_equal(pet1, pet2)
+
+  jsonpet <- pet1$toJSONString()
+  pet2 <- pet1$fromJSONString(
+    jsonpet
+  )
+  expect_equal(pet1, pet2)
 })
 
 test_that("Test Category", {
@@ -33,16 +69,26 @@ test_that("Test Category", {
   c2 <- Category$new()
   c2$fromJSON(jsonlite::toJSON(c1$toJSON(), auto_unbox=TRUE))
   expect_equal(c1, c2)
+  c2$fromJSONString(c1$toJSONString())
+  expect_equal(c1, c2)
 })
 
 test_that("GetPetById", {
   response <- petApi$GetPetById(petId)
   expect_equal(response$id, petId)
   expect_equal(response$name, "name_test")
-  #expect_equal(response$category, Category$new(id=450, name="test_cat"))
-  expect_equal(response$photoUrls, list("photo_test", "second test"))
+  expect_equal(
+    response$photoUrls,
+    list("photo_test", "second test")
+  )
   expect_equal(response$status, "available")
-  expect_equal(response$tags, list(Tag$new(id=123, name="tag_test"), Tag$new(id=456, name="unknown")))
+  expect_equal(response$category, Category$new(id=450, name="test_cat"))
+
+  expect_equal(pet$tags, response$tags)
+  expect_equal(
+    response$tags,
+    list(Tag$new(id=123, name="tag_test"), Tag$new(id=456, name="unknown"))
+  )
 })
 
 #test_that("GetPetById", {
diff --git a/samples/client/petstore/R/tests/testthat/test_store_api.R b/samples/client/petstore/R/tests/testthat/test_store_api.R
index e1290358b43f..1ebb3f82a639 100644
--- a/samples/client/petstore/R/tests/testthat/test_store_api.R
+++ b/samples/client/petstore/R/tests/testthat/test_store_api.R
@@ -7,10 +7,10 @@ api.instance <- StoreApi$new()
 
 test_that("DeleteOrder", {
   # tests for DeleteOrder
+  # base path: http://petstore.swagger.io/v2
   # Delete purchase order by ID
   # For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-  # @param order.id ID of the order that needs to be deleted
-  # @param [Hash] opts the optional parameters
+  # @param order.id character ID of the order that needs to be deleted
   # @return [Void]
 
   # uncomment below to test the operation
@@ -19,10 +19,10 @@ test_that("DeleteOrder", {
 
 test_that("GetInventory", {
   # tests for GetInventory
+  # base path: http://petstore.swagger.io/v2
   # Returns pet inventories by status
   # Returns a map of status codes to quantities
-  # @param [Hash] opts the optional parameters
-  # @return [integer]
+  # @return [map(integer)]
 
   # uncomment below to test the operation
   #expect_equal(result, "EXPECTED_RESULT")
@@ -30,10 +30,10 @@ test_that("GetInventory", {
 
 test_that("GetOrderById", {
   # tests for GetOrderById
+  # base path: http://petstore.swagger.io/v2
   # Find purchase order by ID
   # For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-  # @param order.id ID of pet that needs to be fetched
-  # @param [Hash] opts the optional parameters
+  # @param order.id integer ID of pet that needs to be fetched
   # @return [Order]
 
   # uncomment below to test the operation
@@ -42,9 +42,9 @@ test_that("GetOrderById", {
 
 test_that("PlaceOrder", {
   # tests for PlaceOrder
+  # base path: http://petstore.swagger.io/v2
   # Place an order for a pet
-  # @param body order placed for purchasing the pet
-  # @param [Hash] opts the optional parameters
+  # @param body Order order placed for purchasing the pet
   # @return [Order]
 
   # uncomment below to test the operation
diff --git a/samples/client/petstore/R/tests/testthat/test_user.R b/samples/client/petstore/R/tests/testthat/test_user.R
index 401196a90d76..9929623b42f8 100644
--- a/samples/client/petstore/R/tests/testthat/test_user.R
+++ b/samples/client/petstore/R/tests/testthat/test_user.R
@@ -19,18 +19,18 @@ test_that("username", {
   #expect_equal(model.instance$`username`, "EXPECTED_RESULT")
 })
 
-test_that("first_name", {
-  # tests for the property `first_name` (character)
+test_that("firstName", {
+  # tests for the property `firstName` (character)
 
   # uncomment below to test the property 
-  #expect_equal(model.instance$`first_name`, "EXPECTED_RESULT")
+  #expect_equal(model.instance$`firstName`, "EXPECTED_RESULT")
 })
 
-test_that("last_name", {
-  # tests for the property `last_name` (character)
+test_that("lastName", {
+  # tests for the property `lastName` (character)
 
   # uncomment below to test the property 
-  #expect_equal(model.instance$`last_name`, "EXPECTED_RESULT")
+  #expect_equal(model.instance$`lastName`, "EXPECTED_RESULT")
 })
 
 test_that("email", {
@@ -54,11 +54,11 @@ test_that("phone", {
   #expect_equal(model.instance$`phone`, "EXPECTED_RESULT")
 })
 
-test_that("user_status", {
-  # tests for the property `user_status` (integer)
+test_that("userStatus", {
+  # tests for the property `userStatus` (integer)
   # User Status
 
   # uncomment below to test the property 
-  #expect_equal(model.instance$`user_status`, "EXPECTED_RESULT")
+  #expect_equal(model.instance$`userStatus`, "EXPECTED_RESULT")
 })
 
diff --git a/samples/client/petstore/R/tests/testthat/test_user_api.R b/samples/client/petstore/R/tests/testthat/test_user_api.R
index 283c7c7e964f..8b8c3ba38477 100644
--- a/samples/client/petstore/R/tests/testthat/test_user_api.R
+++ b/samples/client/petstore/R/tests/testthat/test_user_api.R
@@ -7,10 +7,10 @@ api.instance <- UserApi$new()
 
 test_that("CreateUser", {
   # tests for CreateUser
+  # base path: http://petstore.swagger.io/v2
   # Create user
   # This can only be done by the logged in user.
-  # @param body Created user object
-  # @param [Hash] opts the optional parameters
+  # @param body User Created user object
   # @return [Void]
 
   # uncomment below to test the operation
@@ -19,9 +19,9 @@ test_that("CreateUser", {
 
 test_that("CreateUsersWithArrayInput", {
   # tests for CreateUsersWithArrayInput
+  # base path: http://petstore.swagger.io/v2
   # Creates list of users with given input array
-  # @param body List of user object
-  # @param [Hash] opts the optional parameters
+  # @param body array[User] List of user object
   # @return [Void]
 
   # uncomment below to test the operation
@@ -30,9 +30,9 @@ test_that("CreateUsersWithArrayInput", {
 
 test_that("CreateUsersWithListInput", {
   # tests for CreateUsersWithListInput
+  # base path: http://petstore.swagger.io/v2
   # Creates list of users with given input array
-  # @param body List of user object
-  # @param [Hash] opts the optional parameters
+  # @param body array[User] List of user object
   # @return [Void]
 
   # uncomment below to test the operation
@@ -41,10 +41,10 @@ test_that("CreateUsersWithListInput", {
 
 test_that("DeleteUser", {
   # tests for DeleteUser
+  # base path: http://petstore.swagger.io/v2
   # Delete user
   # This can only be done by the logged in user.
-  # @param username The name that needs to be deleted
-  # @param [Hash] opts the optional parameters
+  # @param username character The name that needs to be deleted
   # @return [Void]
 
   # uncomment below to test the operation
@@ -53,9 +53,9 @@ test_that("DeleteUser", {
 
 test_that("GetUserByName", {
   # tests for GetUserByName
+  # base path: http://petstore.swagger.io/v2
   # Get user by user name
-  # @param username The name that needs to be fetched. Use user1 for testing.
-  # @param [Hash] opts the optional parameters
+  # @param username character The name that needs to be fetched. Use user1 for testing.
   # @return [User]
 
   # uncomment below to test the operation
@@ -64,10 +64,10 @@ test_that("GetUserByName", {
 
 test_that("LoginUser", {
   # tests for LoginUser
+  # base path: http://petstore.swagger.io/v2
   # Logs user into the system
-  # @param username The user name for login
-  # @param password The password for login in clear text
-  # @param [Hash] opts the optional parameters
+  # @param username character The user name for login
+  # @param password character The password for login in clear text
   # @return [character]
 
   # uncomment below to test the operation
@@ -76,8 +76,8 @@ test_that("LoginUser", {
 
 test_that("LogoutUser", {
   # tests for LogoutUser
+  # base path: http://petstore.swagger.io/v2
   # Logs out current logged in user session
-  # @param [Hash] opts the optional parameters
   # @return [Void]
 
   # uncomment below to test the operation
@@ -86,11 +86,11 @@ test_that("LogoutUser", {
 
 test_that("UpdateUser", {
   # tests for UpdateUser
+  # base path: http://petstore.swagger.io/v2
   # Updated user
   # This can only be done by the logged in user.
-  # @param username name that need to be deleted
-  # @param body Updated user object
-  # @param [Hash] opts the optional parameters
+  # @param username character name that need to be deleted
+  # @param body User Updated user object
   # @return [Void]
 
   # uncomment below to test the operation
diff --git a/samples/client/petstore/R/testthat.R b/samples/client/petstore/R/testthat.R
deleted file mode 100644
index d67bd9cf2380..000000000000
--- a/samples/client/petstore/R/testthat.R
+++ /dev/null
@@ -1,4 +0,0 @@
-library(testthat)
-library(petstore)
-
-test_check("petstore")
diff --git a/samples/client/petstore/c/.openapi-generator/FILES b/samples/client/petstore/c/.openapi-generator/FILES
new file mode 100644
index 000000000000..0bfa6c555b1c
--- /dev/null
+++ b/samples/client/petstore/c/.openapi-generator/FILES
@@ -0,0 +1,34 @@
+README.md
+api/PetAPI.c
+api/PetAPI.h
+api/StoreAPI.c
+api/StoreAPI.h
+api/UserAPI.c
+api/UserAPI.h
+external/cJSON.c
+external/cJSON.h
+external/cJSON.licence
+include/apiClient.h
+include/binary.h
+include/keyValuePair.h
+include/list.h
+libcurl.licence
+model/api_response.c
+model/api_response.h
+model/category.c
+model/category.h
+model/object.c
+model/object.h
+model/order.c
+model/order.h
+model/pet.c
+model/pet.h
+model/tag.c
+model/tag.h
+model/user.c
+model/user.h
+src/apiClient.c
+src/apiKey.c
+src/binary.c
+src/list.c
+uncrustify-rules.cfg
diff --git a/samples/client/petstore/c/.openapi-generator/VERSION b/samples/client/petstore/c/.openapi-generator/VERSION
index b5d898602c2c..d99e7162d01f 100644
--- a/samples/client/petstore/c/.openapi-generator/VERSION
+++ b/samples/client/petstore/c/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/c/api/PetAPI.c b/samples/client/petstore/c/api/PetAPI.c
index 20fda9e2d950..37ac5b1dc32a 100644
--- a/samples/client/petstore/c/api/PetAPI.c
+++ b/samples/client/petstore/c/api/PetAPI.c
@@ -3,7 +3,7 @@
 #include <ctype.h>
 #include "PetAPI.h"
 
-
+#define MAX_NUMBER_LENGTH 16
 #define MAX_BUFFER_LENGTH 4096
 #define intToStr(dst, src) \
     do {\
diff --git a/samples/client/petstore/c/api/StoreAPI.c b/samples/client/petstore/c/api/StoreAPI.c
index 6cbf1ff318ee..8439ec11d7d2 100644
--- a/samples/client/petstore/c/api/StoreAPI.c
+++ b/samples/client/petstore/c/api/StoreAPI.c
@@ -3,7 +3,7 @@
 #include <ctype.h>
 #include "StoreAPI.h"
 
-
+#define MAX_NUMBER_LENGTH 16
 #define MAX_BUFFER_LENGTH 4096
 #define intToStr(dst, src) \
     do {\
diff --git a/samples/client/petstore/c/api/UserAPI.c b/samples/client/petstore/c/api/UserAPI.c
index 4f73981f55e0..7c652752fb54 100644
--- a/samples/client/petstore/c/api/UserAPI.c
+++ b/samples/client/petstore/c/api/UserAPI.c
@@ -3,7 +3,7 @@
 #include <ctype.h>
 #include "UserAPI.h"
 
-
+#define MAX_NUMBER_LENGTH 16
 #define MAX_BUFFER_LENGTH 4096
 #define intToStr(dst, src) \
     do {\
diff --git a/samples/client/petstore/cpp-restsdk/CMakeLists.txt b/samples/client/petstore/cpp-restsdk/CMakeLists.txt
index 6aec7474b595..27ceccc45fd6 100644
--- a/samples/client/petstore/cpp-restsdk/CMakeLists.txt
+++ b/samples/client/petstore/cpp-restsdk/CMakeLists.txt
@@ -4,34 +4,54 @@ project(cpprest-petstore)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+if (UNIX)
+    message(STATUS "Building for Linux/Unix")
 
-set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC -Wall -Wno-unused-variable")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++14 -Wall -Wno-unused-variable")
+    set(CMAKE_BUILD_TYPE Debug)
+    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC -Wall -Wno-unused-variable -pg -g3")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wno-unused-variable -pg -g3")
+
+    find_package(cpprestsdk REQUIRED)
+    find_package(Boost REQUIRED)
+else()
+    message(STATUS "Building for Windows")
+
+    find_package(cpprestsdk REQUIRED)
+    find_package(Boost REQUIRED)
+    find_package(pthreads REQUIRED)
+endif()
 
-set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -pg -g3")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg -g3")
-set(CMAKE_BUILD_TYPE Debug)
-set(CMAKE_PREFIX_PATH /usr/lib/x86_64-linux-gnu/cmake)
-find_package(cpprestsdk REQUIRED)
-find_package(Boost REQUIRED)
 add_subdirectory(client)
 
 file(GLOB SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
 )
-include_directories(
+
+add_executable(${PROJECT_NAME} ${SRCS})
+add_dependencies(${PROJECT_NAME} CppRestOpenAPIClient )
+
+target_include_directories(
+    ${PROJECT_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/client
     ${CMAKE_CURRENT_SOURCE_DIR}/client/model
     ${CMAKE_CURRENT_SOURCE_DIR}/client/api
+    ${Boost_INCLUDE_DIRS}
 )
 
-link_directories(
+target_link_directories(
+    ${PROJECT_NAME} PRIVATE
     ${Boost_LIBRARY_DIRS}
 )
-add_executable(${PROJECT_NAME} ${SRCS})
-add_dependencies(${PROJECT_NAME} CppRestOpenAPIClient )
-target_link_libraries(${PROJECT_NAME}  CppRestOpenAPIClient cpprest pthread boost_system crypto)
+
+if (UNIX)
+    target_link_libraries(${PROJECT_NAME} PRIVATE CppRestOpenAPIClient cpprest pthread ${Boost_LIBRARIES} crypto)
+else()
+    target_link_libraries(${PROJECT_NAME} PRIVATE CppRestOpenAPIClient cpprestsdk::cpprest ${pthreads_LIBRARIES} ${Boost_LIBRARIES} bcrypt)
+endif()
+
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
 
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+if (UNIX)
+    install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+endif()
diff --git a/samples/client/petstore/cpp-restsdk/PetApiTests.cpp b/samples/client/petstore/cpp-restsdk/PetApiTests.cpp
index c8a1bdad1a09..6eae22d088c5 100644
--- a/samples/client/petstore/cpp-restsdk/PetApiTests.cpp
+++ b/samples/client/petstore/cpp-restsdk/PetApiTests.cpp
@@ -4,10 +4,10 @@
 #include <thread>
 #include <functional>
 
-OAIPetApiTests::OAIPetApiTests(std::string host, std::string basePath){
+OAIPetApiTests::OAIPetApiTests(utility::string_t host, utility::string_t basePath){
     apiconfiguration = std::make_shared<ApiConfiguration>();
     apiconfiguration->setBaseUrl(host + basePath);
-    apiconfiguration->setUserAgent(U("OpenAPI Client"));
+    apiconfiguration->setUserAgent(utility::conversions::to_string_t("OpenAPI Client"));
     apiclient = std::make_shared<ApiClient>(apiconfiguration);
     api = std::make_shared<PetApi>(apiclient);
 }
@@ -25,8 +25,8 @@ void OAIPetApiTests::runTests(){
 void OAIPetApiTests::testAddPet(){
     auto req = std::make_shared<Pet>();
     req->setId(12345);
-    req->setName("cpprest-pet");
-    req->setStatus(U("123"));
+    req->setName(utility::conversions::to_string_t("cpprest-pet"));
+    req->setStatus(utility::conversions::to_string_t("123"));
 
     std::function<void()> responseCallback = []()
     {
@@ -49,7 +49,7 @@ void OAIPetApiTests::testAddPet(){
 
 void OAIPetApiTests::testFindPetsByStatus(){
     auto req = std::vector<utility::string_t>();
-    req.push_back(U("123"));
+    req.push_back(utility::conversions::to_string_t("123"));
     auto reqTask = api->findPetsByStatus(req)
             .then([=](std::vector<std::shared_ptr<Pet>> pets)
             {
diff --git a/samples/client/petstore/cpp-restsdk/PetApiTests.h b/samples/client/petstore/cpp-restsdk/PetApiTests.h
index 7727a6437fd1..34af5c236e75 100644
--- a/samples/client/petstore/cpp-restsdk/PetApiTests.h
+++ b/samples/client/petstore/cpp-restsdk/PetApiTests.h
@@ -14,7 +14,7 @@ using namespace org::openapitools::client::api;
 class OAIPetApiTests
 {
 public:
-    explicit OAIPetApiTests(std::string host = U("http://petstore.swagger.io"), std::string basePath = U("/v2"));
+    explicit OAIPetApiTests(utility::string_t host = utility::conversions::to_string_t("http://petstore.swagger.io"), utility::string_t basePath = utility::conversions::to_string_t("/v2"));
 
     virtual ~OAIPetApiTests();
 public:
diff --git a/samples/client/petstore/cpp-restsdk/client/CMakeLists.txt b/samples/client/petstore/cpp-restsdk/client/CMakeLists.txt
index 86565fec65e0..ad1d5754ad17 100644
--- a/samples/client/petstore/cpp-restsdk/client/CMakeLists.txt
+++ b/samples/client/petstore/cpp-restsdk/client/CMakeLists.txt
@@ -12,13 +12,11 @@ cmake_minimum_required (VERSION 2.8)
 
 #PROJECT's NAME
 project(CppRestOpenAPIClient)
-
+set(CMAKE_VERBOSE_MAKEFILE ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 # THE LOCATION OF OUTPUT BINARIES
 set(CMAKE_LIBRARY_DIR ${PROJECT_SOURCE_DIR}/lib)
-set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_DIR})
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
@@ -27,24 +25,27 @@ endif()
 # BUILD TYPE
 message("A ${CMAKE_BUILD_TYPE} build configuration is detected")
 
-# Update require components as necessary
-#find_package(Boost 1.45.0 REQUIRED COMPONENTS ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
+if (UNIX)
+    message(STATUS "Building client library for Linux/Unix")
 
-# build and set path to cpp rest sdk
-set(CPPREST_ROOT ${PROJECT_SOURCE_DIR}/3rdParty/cpprest)
-set(CPPREST_INCLUDE_DIR ${CPPREST_ROOT}/include)
-set(CPPREST_LIBRARY_DIR ${CPPREST_ROOT}/lib)
+    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fPIC -Wall -Wno-unused-variable")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wno-unused-variable")
 
-include_directories(${PROJECT_SOURCE_DIR} api model ${CPPREST_INCLUDE_DIR})
+    find_package(cpprestsdk REQUIRED)
+    find_package(Boost REQUIRED)
+else()
+    message(STATUS "Building client library for Windows")
 
+    find_package(cpprestsdk REQUIRED)
+    find_package(Boost REQUIRED)
+    find_package(pthreads REQUIRED)
+endif()
 
-# If using vcpkg, set include directories. Also comment out CPPREST section above since vcpkg will handle it.
-# To install required vcpkg packages execute:
-# > vcpkg install cpprestsdk cpprestsdk:x64-windows boost-uuid boost-uuid:x64-windows
-# set(VCPKG_ROOT "C:\\vcpkg\\installed\\x64-windows")
-# set(VCPKG_INCLUDE_DIR ${VCPKG_ROOT}/include)
-# set(VCPKG_LIBRARY_DIR ${VCPKG_ROOT}/lib)
-# include_directories(${PROJECT_SOURCE_DIR} api model ${VCPKG_INCLUDE_DIR})
+# Manually set the cpprestsdk paths when not using package manager
+#set(CPPREST_INCLUDE_DIR ${CPPREST_ROOT}/include)
+#set(CPPREST_LIBRARY_DIR ${CPPREST_ROOT}/lib)
+#include_directories(${CPPREST_INCLUDE_DIR})
+#link_directories(${CPPREST_LIBRARY_DIR})
 
 #SUPPORTING FILES
 set(SUPPORTING_FILES  "ApiClient" "ApiConfiguration" "ApiException" "HttpContent" "IHttpBody" "JsonBody" "ModelBase" "MultipartFormData" "Object")
@@ -52,3 +53,24 @@ set(SUPPORTING_FILES  "ApiClient" "ApiConfiguration" "ApiException" "HttpContent
 file(GLOB SOURCE_FILES  "api/*"  "model/*")
 
 add_library(${PROJECT_NAME} ${SUPPORTING_FILES} ${SOURCE_FILES})
+
+target_include_directories(
+    ${PROJECT_NAME} PRIVATE
+    ${Boost_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/model
+    ${CMAKE_CURRENT_SOURCE_DIR}/api
+)
+
+target_link_directories(
+    ${PROJECT_NAME} PRIVATE
+    ${Boost_LIBRARY_DIRS}
+)
+
+if (UNIX)
+    target_link_libraries(${PROJECT_NAME} PRIVATE cpprest pthread ${Boost_LIBRARIES} crypto)
+else()
+    target_link_libraries(${PROJECT_NAME} PRIVATE cpprestsdk::cpprest ${pthreads_LIBRARIES} ${Boost_LIBRARIES} bcrypt)
+endif()
+
+set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)
+set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
diff --git a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp
index 0c55be94d872..e6ebe5555269 100644
--- a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp
@@ -233,10 +233,9 @@ bool ModelBase::fromString( const utility::string_t& val, std::shared_ptr<HttpCo
     {
         outVal = std::shared_ptr<HttpContent>(new HttpContent());
     }
-    std::shared_ptr<utility::stringstream_t> ssptr = std::make_shared<utility::stringstream_t>(val);
     if(outVal != nullptr)
     {
-        outVal->setData(ssptr);
+        outVal->setData(std::shared_ptr<std::istream>(new std::stringstream(utility::conversions::to_utf8string(val))));
     }
     else
     {
diff --git a/samples/client/petstore/dart2/petstore/test/pet_test.dart b/samples/client/petstore/dart2/petstore/test/pet_test.dart
index b978022e5651..5898c221607c 100644
--- a/samples/client/petstore/dart2/petstore/test/pet_test.dart
+++ b/samples/client/petstore/dart2/petstore/test/pet_test.dart
@@ -25,11 +25,12 @@ void main() {
         ..id = 124321
         ..name = 'Jose'
     ];
-    return Pet()
-      ..id = id
-      ..category = category
-      ..tags = tags
-      ..name = name
+    return Pet(
+      id : id,
+      category: category,
+      tags: tags,
+      name: name,
+    )
       ..status = status
       ..photoUrls = ['https://petstore.com/sample/photo1.jpg'];
   }
diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/model/api_response.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/model/api_response.dart
index c5b6886be8b2..ddc3cafb99db 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/lib/model/api_response.dart
+++ b/samples/client/petstore/dart2/petstore_client_lib/lib/model/api_response.dart
@@ -7,7 +7,12 @@ class ApiResponse {
   String type = null;
   
   String message = null;
-  ApiResponse();
+
+  ApiResponse({
+    this.code,
+    this.type,
+    this.message,
+  });
 
   @override
   String toString() {
diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/model/category.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/model/category.dart
index 686ad33cac82..3bcb27396bc5 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/lib/model/category.dart
+++ b/samples/client/petstore/dart2/petstore_client_lib/lib/model/category.dart
@@ -5,7 +5,11 @@ class Category {
   int id = null;
   
   String name = null;
-  Category();
+
+  Category({
+    this.id,
+    this.name,
+  });
 
   @override
   String toString() {
diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/model/order.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/model/order.dart
index 34370b21e3b8..f313282411e8 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/lib/model/order.dart
+++ b/samples/client/petstore/dart2/petstore_client_lib/lib/model/order.dart
@@ -14,7 +14,15 @@ class Order {
   //enum statusEnum {  placed,  approved,  delivered,  };{
   
   bool complete = false;
-  Order();
+
+  Order({
+    this.id,
+    this.petId,
+    this.quantity,
+    this.shipDate,
+    this.status,
+    this.complete,
+  });
 
   @override
   String toString() {
diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/model/pet.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/model/pet.dart
index 92a096c4027d..4b9c7869e656 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/lib/model/pet.dart
+++ b/samples/client/petstore/dart2/petstore_client_lib/lib/model/pet.dart
@@ -14,7 +14,15 @@ class Pet {
   /* pet status in the store */
   String status = null;
   //enum statusEnum {  available,  pending,  sold,  };{
-  Pet();
+
+  Pet({
+    this.id,
+    this.category,
+    this.name,
+    this.photoUrls,
+    this.tags,
+    this.status,
+  });
 
   @override
   String toString() {
diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/model/tag.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/model/tag.dart
index 5b758c01b7af..743382dc408b 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/lib/model/tag.dart
+++ b/samples/client/petstore/dart2/petstore_client_lib/lib/model/tag.dart
@@ -5,7 +5,11 @@ class Tag {
   int id = null;
   
   String name = null;
-  Tag();
+
+  Tag({
+    this.id,
+    this.name,
+  });
 
   @override
   String toString() {
diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/model/user.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/model/user.dart
index 685ffadb4ee7..b7ce4924183c 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/lib/model/user.dart
+++ b/samples/client/petstore/dart2/petstore_client_lib/lib/model/user.dart
@@ -17,7 +17,17 @@ class User {
   String phone = null;
   /* User Status */
   int userStatus = null;
-  User();
+
+  User({
+    this.id,
+    this.username,
+    this.firstName,
+    this.lastName,
+    this.email,
+    this.password,
+    this.phone,
+    this.userStatus,
+  });
 
   @override
   String toString() {
diff --git a/samples/client/petstore/go-experimental/go-petstore/api_pet.go b/samples/client/petstore/go-experimental/go-petstore/api_pet.go
index 23fceb74703d..ca72aa94e251 100644
--- a/samples/client/petstore/go-experimental/go-petstore/api_pet.go
+++ b/samples/client/petstore/go-experimental/go-petstore/api_pet.go
@@ -171,7 +171,7 @@ func (r apiDeletePetRequest) Execute() (*_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(r.petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(r.petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -480,7 +480,7 @@ func (r apiGetPetByIdRequest) Execute() (Pet, *_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(r.petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(r.petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -704,7 +704,7 @@ func (r apiUpdatePetWithFormRequest) Execute() (*_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(r.petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(r.petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -813,7 +813,7 @@ func (r apiUploadFileRequest) Execute() (ApiResponse, *_nethttp.Response, error)
 	}
 
 	localVarPath := localBasePath + "/pet/{petId}/uploadImage"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(r.petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(r.petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -939,7 +939,7 @@ func (r apiUploadFileWithRequiredFileRequest) Execute() (ApiResponse, *_nethttp.
 	}
 
 	localVarPath := localBasePath + "/fake/{petId}/uploadImageWithRequiredFile"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(r.petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(r.petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/client/petstore/go-experimental/go-petstore/api_store.go b/samples/client/petstore/go-experimental/go-petstore/api_store.go
index 8aa77c5689d7..62a33bb3543e 100644
--- a/samples/client/petstore/go-experimental/go-petstore/api_store.go
+++ b/samples/client/petstore/go-experimental/go-petstore/api_store.go
@@ -67,7 +67,7 @@ func (r apiDeleteOrderRequest) Execute() (*_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/store/order/{order_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.QueryEscape(parameterToString(r.orderId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.PathEscape(parameterToString(r.orderId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -269,7 +269,7 @@ func (r apiGetOrderByIdRequest) Execute() (Order, *_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/store/order/{order_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.QueryEscape(parameterToString(r.orderId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.PathEscape(parameterToString(r.orderId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/client/petstore/go-experimental/go-petstore/api_user.go b/samples/client/petstore/go-experimental/go-petstore/api_user.go
index 899dbb68b3f1..e3f19d8850dc 100644
--- a/samples/client/petstore/go-experimental/go-petstore/api_user.go
+++ b/samples/client/petstore/go-experimental/go-petstore/api_user.go
@@ -362,7 +362,7 @@ func (r apiDeleteUserRequest) Execute() (*_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(r.username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(r.username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -453,7 +453,7 @@ func (r apiGetUserByNameRequest) Execute() (User, *_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(r.username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(r.username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -763,7 +763,7 @@ func (r apiUpdateUserRequest) Execute() (*_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(r.username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(r.username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Animal.md b/samples/client/petstore/go-experimental/go-petstore/docs/Animal.md
index dd124c1d2615..293f75c51717 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Animal.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Animal.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ClassName** | Pointer to **string** |  | 
+**ClassName** | **string** |  | 
 **Color** | Pointer to **string** |  | [optional] [default to "red"]
 
 ## Methods
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Category.md b/samples/client/petstore/go-experimental/go-petstore/docs/Category.md
index 0fa542e093ae..0d3f6d4ff226 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Category.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Category.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Id** | Pointer to **int64** |  | [optional] 
-**Name** | Pointer to **string** |  | [default to "default-name"]
+**Name** | **string** |  | [default to "default-name"]
 
 ## Methods
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/EnumTest.md b/samples/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
index 7a9e5c61a594..131b8e110a04 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EnumString** | Pointer to **string** |  | [optional] 
-**EnumStringRequired** | Pointer to **string** |  | 
+**EnumStringRequired** | **string** |  | 
 **EnumInteger** | Pointer to **int32** |  | [optional] 
 **EnumNumber** | Pointer to **float64** |  | [optional] 
 **OuterEnum** | Pointer to [**OuterEnum**](OuterEnum.md) |  | [optional] 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/FormatTest.md b/samples/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
index de43da0fcf31..9235479afc1d 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
@@ -7,16 +7,16 @@ Name | Type | Description | Notes
 **Integer** | Pointer to **int32** |  | [optional] 
 **Int32** | Pointer to **int32** |  | [optional] 
 **Int64** | Pointer to **int64** |  | [optional] 
-**Number** | Pointer to **float32** |  | 
+**Number** | **float32** |  | 
 **Float** | Pointer to **float32** |  | [optional] 
 **Double** | Pointer to **float64** |  | [optional] 
 **String** | Pointer to **string** |  | [optional] 
-**Byte** | Pointer to **string** |  | 
+**Byte** | **string** |  | 
 **Binary** | Pointer to [***os.File**](*os.File.md) |  | [optional] 
-**Date** | Pointer to **string** |  | 
+**Date** | **string** |  | 
 **DateTime** | Pointer to [**time.Time**](time.Time.md) |  | [optional] 
 **Uuid** | Pointer to **string** |  | [optional] 
-**Password** | Pointer to **string** |  | 
+**Password** | **string** |  | 
 **BigDecimal** | Pointer to **float64** |  | [optional] 
 
 ## Methods
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Name.md b/samples/client/petstore/go-experimental/go-petstore/docs/Name.md
index 52fb687af7be..18cf04789d6e 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Name.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Name.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | Pointer to **int32** |  | 
+**Name** | **int32** |  | 
 **SnakeCase** | Pointer to **int32** |  | [optional] [readonly] 
 **Property** | Pointer to **string** |  | [optional] 
 **Var123Number** | Pointer to **int32** |  | [optional] [readonly] 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Pet.md b/samples/client/petstore/go-experimental/go-petstore/docs/Pet.md
index 6b4776422396..a6eae34657d3 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Pet.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Pet.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Id** | Pointer to **int64** |  | [optional] 
 **Category** | Pointer to [**Category**](Category.md) |  | [optional] 
-**Name** | Pointer to **string** |  | 
-**PhotoUrls** | Pointer to **[]string** |  | 
+**Name** | **string** |  | 
+**PhotoUrls** | **[]string** |  | 
 **Tags** | Pointer to [**[]Tag**](Tag.md) |  | [optional] 
 **Status** | Pointer to **string** | pet status in the store | [optional] 
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderDefault.md b/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderDefault.md
index 726e9723fc3c..34b38a6065fa 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderDefault.md
@@ -4,11 +4,11 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**StringItem** | Pointer to **string** |  | [default to "what"]
-**NumberItem** | Pointer to **float32** |  | 
-**IntegerItem** | Pointer to **int32** |  | 
-**BoolItem** | Pointer to **bool** |  | [default to true]
-**ArrayItem** | Pointer to **[]int32** |  | 
+**StringItem** | **string** |  | [default to "what"]
+**NumberItem** | **float32** |  | 
+**IntegerItem** | **int32** |  | 
+**BoolItem** | **bool** |  | [default to true]
+**ArrayItem** | **[]int32** |  | 
 
 ## Methods
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderExample.md b/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderExample.md
index c6da08c1d253..259aae8df561 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderExample.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderExample.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**StringItem** | Pointer to **string** |  | 
-**NumberItem** | Pointer to **float32** |  | 
-**FloatItem** | Pointer to **float32** |  | 
-**IntegerItem** | Pointer to **int32** |  | 
-**BoolItem** | Pointer to **bool** |  | 
-**ArrayItem** | Pointer to **[]int32** |  | 
+**StringItem** | **string** |  | 
+**NumberItem** | **float32** |  | 
+**FloatItem** | **float32** |  | 
+**IntegerItem** | **int32** |  | 
+**BoolItem** | **bool** |  | 
+**ArrayItem** | **[]int32** |  | 
 
 ## Methods
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_enum_class.go b/samples/client/petstore/go-experimental/go-petstore/model_enum_class.go
index 8d68d80f50a3..d64ca138f85a 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_enum_class.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_enum_class.go
@@ -38,7 +38,7 @@ func (v *EnumClass) UnmarshalJSON(src []byte) error {
 		}
 	}
 
-	return fmt.Errorf("%+v is not a valid EnumClass", *v)
+	return fmt.Errorf("%+v is not a valid EnumClass", value)
 }
 
 // Ptr returns reference to EnumClass value
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_outer_enum.go b/samples/client/petstore/go-experimental/go-petstore/model_outer_enum.go
index 009d021b853b..8160a2d09fc7 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_outer_enum.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_outer_enum.go
@@ -38,7 +38,7 @@ func (v *OuterEnum) UnmarshalJSON(src []byte) error {
 		}
 	}
 
-	return fmt.Errorf("%+v is not a valid OuterEnum", *v)
+	return fmt.Errorf("%+v is not a valid OuterEnum", value)
 }
 
 // Ptr returns reference to OuterEnum value
diff --git a/samples/client/petstore/go/go-petstore-withXml/api_pet.go b/samples/client/petstore/go/go-petstore-withXml/api_pet.go
index d64b54c6c5b3..8c108eeccb02 100644
--- a/samples/client/petstore/go/go-petstore-withXml/api_pet.go
+++ b/samples/client/petstore/go/go-petstore-withXml/api_pet.go
@@ -117,7 +117,7 @@ func (a *PetApiService) DeletePet(ctx _context.Context, petId int64, localVarOpt
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -343,7 +343,7 @@ func (a *PetApiService) GetPetById(ctx _context.Context, petId int64) (Pet, *_ne
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -505,7 +505,7 @@ func (a *PetApiService) UpdatePetWithForm(ctx _context.Context, petId int64, loc
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -588,7 +588,7 @@ func (a *PetApiService) UploadFile(ctx _context.Context, petId int64, localVarOp
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/pet/{petId}/uploadImage"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -691,7 +691,7 @@ func (a *PetApiService) UploadFileWithRequiredFile(ctx _context.Context, petId i
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/fake/{petId}/uploadImageWithRequiredFile"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/client/petstore/go/go-petstore-withXml/api_store.go b/samples/client/petstore/go/go-petstore-withXml/api_store.go
index feab7bf82e2b..cf96b3c6c085 100644
--- a/samples/client/petstore/go/go-petstore-withXml/api_store.go
+++ b/samples/client/petstore/go/go-petstore-withXml/api_store.go
@@ -43,7 +43,7 @@ func (a *StoreApiService) DeleteOrder(ctx _context.Context, orderId string) (*_n
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/store/order/{order_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.QueryEscape(parameterToString(orderId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.PathEscape(parameterToString(orderId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -199,7 +199,7 @@ func (a *StoreApiService) GetOrderById(ctx _context.Context, orderId int64) (Ord
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/store/order/{order_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.QueryEscape(parameterToString(orderId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.PathEscape(parameterToString(orderId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/client/petstore/go/go-petstore-withXml/api_user.go b/samples/client/petstore/go/go-petstore-withXml/api_user.go
index 924258a7148f..5b17e8b94725 100644
--- a/samples/client/petstore/go/go-petstore-withXml/api_user.go
+++ b/samples/client/petstore/go/go-petstore-withXml/api_user.go
@@ -242,7 +242,7 @@ func (a *UserApiService) DeleteUser(ctx _context.Context, username string) (*_ne
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -310,7 +310,7 @@ func (a *UserApiService) GetUserByName(ctx _context.Context, username string) (U
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -528,7 +528,7 @@ func (a *UserApiService) UpdateUser(ctx _context.Context, username string, body
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/client/petstore/go/go-petstore/api_pet.go b/samples/client/petstore/go/go-petstore/api_pet.go
index 6f7892f21879..f3595ea67b45 100644
--- a/samples/client/petstore/go/go-petstore/api_pet.go
+++ b/samples/client/petstore/go/go-petstore/api_pet.go
@@ -116,7 +116,7 @@ func (a *PetApiService) DeletePet(ctx _context.Context, petId int64, localVarOpt
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -342,7 +342,7 @@ func (a *PetApiService) GetPetById(ctx _context.Context, petId int64) (Pet, *_ne
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -504,7 +504,7 @@ func (a *PetApiService) UpdatePetWithForm(ctx _context.Context, petId int64, loc
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -587,7 +587,7 @@ func (a *PetApiService) UploadFile(ctx _context.Context, petId int64, localVarOp
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/pet/{petId}/uploadImage"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -690,7 +690,7 @@ func (a *PetApiService) UploadFileWithRequiredFile(ctx _context.Context, petId i
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/fake/{petId}/uploadImageWithRequiredFile"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/client/petstore/go/go-petstore/api_store.go b/samples/client/petstore/go/go-petstore/api_store.go
index c061e263fd81..5dac058c0a9f 100644
--- a/samples/client/petstore/go/go-petstore/api_store.go
+++ b/samples/client/petstore/go/go-petstore/api_store.go
@@ -42,7 +42,7 @@ func (a *StoreApiService) DeleteOrder(ctx _context.Context, orderId string) (*_n
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/store/order/{order_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.QueryEscape(parameterToString(orderId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.PathEscape(parameterToString(orderId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -198,7 +198,7 @@ func (a *StoreApiService) GetOrderById(ctx _context.Context, orderId int64) (Ord
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/store/order/{order_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.QueryEscape(parameterToString(orderId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.PathEscape(parameterToString(orderId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/client/petstore/go/go-petstore/api_user.go b/samples/client/petstore/go/go-petstore/api_user.go
index 6388ba4c3385..712ff7cf55a3 100644
--- a/samples/client/petstore/go/go-petstore/api_user.go
+++ b/samples/client/petstore/go/go-petstore/api_user.go
@@ -241,7 +241,7 @@ func (a *UserApiService) DeleteUser(ctx _context.Context, username string) (*_ne
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -309,7 +309,7 @@ func (a *UserApiService) GetUserByName(ctx _context.Context, username string) (U
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -527,7 +527,7 @@ func (a *UserApiService) UpdateUser(ctx _context.Context, username string, body
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/client/petstore/java/feign10x/.gitignore b/samples/client/petstore/java/feign/.gitignore
similarity index 100%
rename from samples/client/petstore/java/feign10x/.gitignore
rename to samples/client/petstore/java/feign/.gitignore
diff --git a/samples/client/petstore/java/retrofit2-play24/.openapi-generator-ignore b/samples/client/petstore/java/feign/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/.openapi-generator-ignore
rename to samples/client/petstore/java/feign/.openapi-generator-ignore
diff --git a/samples/client/petstore/java/feign10x/.openapi-generator/FILES b/samples/client/petstore/java/feign/.openapi-generator/FILES
similarity index 100%
rename from samples/client/petstore/java/feign10x/.openapi-generator/FILES
rename to samples/client/petstore/java/feign/.openapi-generator/FILES
diff --git a/samples/client/petstore/java/feign10x/.openapi-generator/VERSION b/samples/client/petstore/java/feign/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore/java/feign10x/.openapi-generator/VERSION
rename to samples/client/petstore/java/feign/.openapi-generator/VERSION
diff --git a/samples/client/petstore/java/feign10x/.travis.yml b/samples/client/petstore/java/feign/.travis.yml
similarity index 100%
rename from samples/client/petstore/java/feign10x/.travis.yml
rename to samples/client/petstore/java/feign/.travis.yml
diff --git a/samples/client/petstore/java/feign/README.md b/samples/client/petstore/java/feign/README.md
new file mode 100644
index 000000000000..646dfdc4e2b6
--- /dev/null
+++ b/samples/client/petstore/java/feign/README.md
@@ -0,0 +1,43 @@
+# petstore-feign
+
+## Requirements
+
+Building the API client library requires [Maven](https://maven.apache.org/) to be installed.
+
+## Installation & Usage
+
+To install the API client library to your local Maven repository, simply execute:
+
+```shell
+mvn install
+```
+
+To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
+
+```shell
+mvn deploy
+```
+
+Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
+
+After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
+
+```xml
+<dependency>
+    <groupId>org.openapitools</groupId>
+    <artifactId>petstore-feign</artifactId>
+    <version>1.0.0</version>
+    <scope>compile</scope>
+</dependency>
+
+```
+
+## Recommendation
+
+It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues.
+
+## Author
+
+
+
+
diff --git a/samples/client/petstore/java/feign10x/api/openapi.yaml b/samples/client/petstore/java/feign/api/openapi.yaml
similarity index 100%
rename from samples/client/petstore/java/feign10x/api/openapi.yaml
rename to samples/client/petstore/java/feign/api/openapi.yaml
diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle
new file mode 100644
index 000000000000..5e255fb6e1ad
--- /dev/null
+++ b/samples/client/petstore/java/feign/build.gradle
@@ -0,0 +1,125 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
+group = 'org.openapitools'
+version = '1.0.0'
+
+buildscript {
+    repositories {
+        maven { url "https://repo1.maven.org/maven2" }
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+    }
+}
+
+repositories {
+    jcenter()
+}
+
+
+if(hasProperty('target') && target == 'android') {
+
+    apply plugin: 'com.android.library'
+    apply plugin: 'com.github.dcendents.android-maven'
+
+    android {
+        compileSdkVersion 25
+        buildToolsVersion '25.0.2'
+        defaultConfig {
+            minSdkVersion 14
+            targetSdkVersion 25
+        }
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
+        }
+
+        // Rename the aar correctly
+        libraryVariants.all { variant ->
+            variant.outputs.each { output ->
+                def outputFile = output.outputFile
+                if (outputFile != null && outputFile.name.endsWith('.aar')) {
+                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
+                    output.outputFile = new File(outputFile.parent, fileName)
+                }
+            }
+        }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
+    }
+
+    afterEvaluate {
+        android.libraryVariants.all { variant ->
+            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
+            task.description = "Create jar artifact for ${variant.name}"
+            task.dependsOn variant.javaCompile
+            task.from variant.javaCompile.destinationDir
+            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
+            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
+            artifacts.add('archives', task);
+        }
+    }
+
+    task sourcesJar(type: Jar) {
+        from android.sourceSets.main.java.srcDirs
+        classifier = 'sources'
+    }
+
+    artifacts {
+        archives sourcesJar
+    }
+
+} else {
+
+    apply plugin: 'java'
+    apply plugin: 'maven'
+
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+
+    install {
+        repositories.mavenInstaller {
+            pom.artifactId = 'petstore-feign'
+        }
+    }
+
+    task execute(type:JavaExec) {
+       main = System.getProperty('mainClass')
+       classpath = sourceSets.main.runtimeClasspath
+    }
+}
+
+ext {
+    swagger_annotations_version = "1.5.24"
+    jackson_version = "2.10.3"
+    jackson_databind_version = "2.10.3"
+    jackson_databind_nullable_version = "0.2.1"
+    jackson_threetenbp_version = "2.9.10"
+    feign_version = "11.0"
+    feign_form_version = "3.8.0"
+    junit_version = "4.13"
+    oltu_version = "1.0.1"
+}
+
+dependencies {
+    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
+    compile "io.github.openfeign:feign-core:$feign_version"
+    compile "io.github.openfeign:feign-jackson:$feign_version"
+    compile "io.github.openfeign:feign-slf4j:$feign_version"
+    compile "io.github.openfeign.form:feign-form:$feign_form_version"
+    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
+    compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
+    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version"
+    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile "com.brsanthu:migbase64:2.2"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
+    testCompile "junit:junit:$junit_version"
+}
diff --git a/samples/client/petstore/java/feign/build.sbt b/samples/client/petstore/java/feign/build.sbt
new file mode 100644
index 000000000000..7cb8c67a8baf
--- /dev/null
+++ b/samples/client/petstore/java/feign/build.sbt
@@ -0,0 +1,28 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "org.openapitools",
+    name := "petstore-feign",
+    version := "1.0.0",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "io.swagger" % "swagger-annotations" % "1.5.24" % "compile",
+      "io.github.openfeign" % "feign-core" % "11.0" % "compile",
+      "io.github.openfeign" % "feign-jackson" % "11.0" % "compile",
+      "io.github.openfeign" % "feign-slf4j" % "11.0" % "compile",
+      "io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
+      "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
+      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "com.brsanthu" % "migbase64" % "2.2" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
+      "junit" % "junit" % "4.13" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
+    )
+  )
diff --git a/samples/client/petstore/java/retrofit2-play24/.gitignore b/samples/client/petstore/java/feign/feign10x/.gitignore
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/.gitignore
rename to samples/client/petstore/java/feign/feign10x/.gitignore
diff --git a/samples/client/petstore/java/feign10x/.openapi-generator-ignore b/samples/client/petstore/java/feign/feign10x/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore/java/feign10x/.openapi-generator-ignore
rename to samples/client/petstore/java/feign/feign10x/.openapi-generator-ignore
diff --git a/samples/client/petstore/java/feign/feign10x/.openapi-generator/FILES b/samples/client/petstore/java/feign/feign10x/.openapi-generator/FILES
new file mode 100644
index 000000000000..1e341310444b
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/.openapi-generator/FILES
@@ -0,0 +1,80 @@
+.gitignore
+.travis.yml
+README.md
+api/openapi.yaml
+build.gradle
+build.sbt
+git_push.sh
+gradle.properties
+gradle/wrapper/gradle-wrapper.jar
+gradle/wrapper/gradle-wrapper.properties
+gradlew
+gradlew.bat
+pom.xml
+settings.gradle
+src/main/AndroidManifest.xml
+src/main/java/org/openapitools/client/ApiClient.java
+src/main/java/org/openapitools/client/CustomInstantDeserializer.java
+src/main/java/org/openapitools/client/EncodingUtils.java
+src/main/java/org/openapitools/client/ParamExpander.java
+src/main/java/org/openapitools/client/RFC3339DateFormat.java
+src/main/java/org/openapitools/client/ServerConfiguration.java
+src/main/java/org/openapitools/client/ServerVariable.java
+src/main/java/org/openapitools/client/StringUtil.java
+src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+src/main/java/org/openapitools/client/api/FakeApi.java
+src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+src/main/java/org/openapitools/client/api/PetApi.java
+src/main/java/org/openapitools/client/api/StoreApi.java
+src/main/java/org/openapitools/client/api/UserApi.java
+src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
+src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+src/main/java/org/openapitools/client/auth/OAuth.java
+src/main/java/org/openapitools/client/auth/OAuthFlow.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+src/main/java/org/openapitools/client/model/Animal.java
+src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+src/main/java/org/openapitools/client/model/ArrayTest.java
+src/main/java/org/openapitools/client/model/BigCat.java
+src/main/java/org/openapitools/client/model/BigCatAllOf.java
+src/main/java/org/openapitools/client/model/Capitalization.java
+src/main/java/org/openapitools/client/model/Cat.java
+src/main/java/org/openapitools/client/model/CatAllOf.java
+src/main/java/org/openapitools/client/model/Category.java
+src/main/java/org/openapitools/client/model/ClassModel.java
+src/main/java/org/openapitools/client/model/Client.java
+src/main/java/org/openapitools/client/model/Dog.java
+src/main/java/org/openapitools/client/model/DogAllOf.java
+src/main/java/org/openapitools/client/model/EnumArrays.java
+src/main/java/org/openapitools/client/model/EnumClass.java
+src/main/java/org/openapitools/client/model/EnumTest.java
+src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+src/main/java/org/openapitools/client/model/FormatTest.java
+src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+src/main/java/org/openapitools/client/model/MapTest.java
+src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+src/main/java/org/openapitools/client/model/Model200Response.java
+src/main/java/org/openapitools/client/model/ModelApiResponse.java
+src/main/java/org/openapitools/client/model/ModelReturn.java
+src/main/java/org/openapitools/client/model/Name.java
+src/main/java/org/openapitools/client/model/NumberOnly.java
+src/main/java/org/openapitools/client/model/Order.java
+src/main/java/org/openapitools/client/model/OuterComposite.java
+src/main/java/org/openapitools/client/model/OuterEnum.java
+src/main/java/org/openapitools/client/model/Pet.java
+src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/client/model/SpecialModelName.java
+src/main/java/org/openapitools/client/model/Tag.java
+src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+src/main/java/org/openapitools/client/model/TypeHolderExample.java
+src/main/java/org/openapitools/client/model/User.java
+src/main/java/org/openapitools/client/model/XmlItem.java
diff --git a/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION b/samples/client/petstore/java/feign/feign10x/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
rename to samples/client/petstore/java/feign/feign10x/.openapi-generator/VERSION
diff --git a/samples/client/petstore/java/retrofit2-play24/.travis.yml b/samples/client/petstore/java/feign/feign10x/.travis.yml
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/.travis.yml
rename to samples/client/petstore/java/feign/feign10x/.travis.yml
diff --git a/samples/client/petstore/java/feign10x/README.md b/samples/client/petstore/java/feign/feign10x/README.md
similarity index 100%
rename from samples/client/petstore/java/feign10x/README.md
rename to samples/client/petstore/java/feign/feign10x/README.md
diff --git a/samples/client/petstore/java/retrofit2-play24/api/openapi.yaml b/samples/client/petstore/java/feign/feign10x/api/openapi.yaml
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/api/openapi.yaml
rename to samples/client/petstore/java/feign/feign10x/api/openapi.yaml
diff --git a/samples/client/petstore/java/feign/feign10x/build.gradle b/samples/client/petstore/java/feign/feign10x/build.gradle
new file mode 100644
index 000000000000..68f46df20fd9
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/build.gradle
@@ -0,0 +1,125 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
+group = 'org.openapitools'
+version = '1.0.0'
+
+buildscript {
+    repositories {
+        maven { url "https://repo1.maven.org/maven2" }
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+    }
+}
+
+repositories {
+    jcenter()
+}
+
+
+if(hasProperty('target') && target == 'android') {
+
+    apply plugin: 'com.android.library'
+    apply plugin: 'com.github.dcendents.android-maven'
+
+    android {
+        compileSdkVersion 25
+        buildToolsVersion '25.0.2'
+        defaultConfig {
+            minSdkVersion 14
+            targetSdkVersion 25
+        }
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
+        }
+
+        // Rename the aar correctly
+        libraryVariants.all { variant ->
+            variant.outputs.each { output ->
+                def outputFile = output.outputFile
+                if (outputFile != null && outputFile.name.endsWith('.aar')) {
+                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
+                    output.outputFile = new File(outputFile.parent, fileName)
+                }
+            }
+        }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
+    }
+
+    afterEvaluate {
+        android.libraryVariants.all { variant ->
+            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
+            task.description = "Create jar artifact for ${variant.name}"
+            task.dependsOn variant.javaCompile
+            task.from variant.javaCompile.destinationDir
+            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
+            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
+            artifacts.add('archives', task);
+        }
+    }
+
+    task sourcesJar(type: Jar) {
+        from android.sourceSets.main.java.srcDirs
+        classifier = 'sources'
+    }
+
+    artifacts {
+        archives sourcesJar
+    }
+
+} else {
+
+    apply plugin: 'java'
+    apply plugin: 'maven'
+
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+
+    install {
+        repositories.mavenInstaller {
+            pom.artifactId = 'petstore-feign-10x'
+        }
+    }
+
+    task execute(type:JavaExec) {
+       main = System.getProperty('mainClass')
+       classpath = sourceSets.main.runtimeClasspath
+    }
+}
+
+ext {
+    swagger_annotations_version = "1.5.24"
+    jackson_version = "2.10.3"
+    jackson_databind_version = "2.10.3"
+    jackson_databind_nullable_version = "0.2.1"
+    jackson_threetenbp_version = "2.9.10"
+    feign_version = "9.7.0"
+    feign_form_version = "2.1.0"
+    junit_version = "4.13"
+    oltu_version = "1.0.1"
+}
+
+dependencies {
+    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
+    compile "io.github.openfeign:feign-core:$feign_version"
+    compile "io.github.openfeign:feign-jackson:$feign_version"
+    compile "io.github.openfeign:feign-slf4j:$feign_version"
+    compile "io.github.openfeign.form:feign-form:$feign_form_version"
+    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
+    compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
+    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version"
+    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile "com.brsanthu:migbase64:2.2"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
+    testCompile "junit:junit:$junit_version"
+}
diff --git a/samples/client/petstore/java/feign/feign10x/build.sbt b/samples/client/petstore/java/feign/feign10x/build.sbt
new file mode 100644
index 000000000000..596ffa60fe3a
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/build.sbt
@@ -0,0 +1,28 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "org.openapitools",
+    name := "petstore-feign-10x",
+    version := "1.0.0",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "io.swagger" % "swagger-annotations" % "1.5.24" % "compile",
+      "io.github.openfeign" % "feign-core" % "9.7.0" % "compile",
+      "io.github.openfeign" % "feign-jackson" % "9.7.0" % "compile",
+      "io.github.openfeign" % "feign-slf4j" % "9.7.0" % "compile",
+      "io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
+      "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
+      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "com.brsanthu" % "migbase64" % "2.2" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
+      "junit" % "junit" % "4.13" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
+    )
+  )
diff --git a/samples/client/petstore/java/feign10x/git_push.sh b/samples/client/petstore/java/feign/feign10x/git_push.sh
similarity index 100%
rename from samples/client/petstore/java/feign10x/git_push.sh
rename to samples/client/petstore/java/feign/feign10x/git_push.sh
diff --git a/samples/client/petstore/java/feign10x/gradle.properties b/samples/client/petstore/java/feign/feign10x/gradle.properties
similarity index 100%
rename from samples/client/petstore/java/feign10x/gradle.properties
rename to samples/client/petstore/java/feign/feign10x/gradle.properties
diff --git a/samples/client/petstore/java/feign10x/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java/feign/feign10x/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from samples/client/petstore/java/feign10x/gradle/wrapper/gradle-wrapper.jar
rename to samples/client/petstore/java/feign/feign10x/gradle/wrapper/gradle-wrapper.jar
diff --git a/samples/client/petstore/java/feign10x/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/feign/feign10x/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from samples/client/petstore/java/feign10x/gradle/wrapper/gradle-wrapper.properties
rename to samples/client/petstore/java/feign/feign10x/gradle/wrapper/gradle-wrapper.properties
diff --git a/samples/client/petstore/java/feign10x/gradlew b/samples/client/petstore/java/feign/feign10x/gradlew
similarity index 100%
rename from samples/client/petstore/java/feign10x/gradlew
rename to samples/client/petstore/java/feign/feign10x/gradlew
diff --git a/samples/client/petstore/java/feign10x/gradlew.bat b/samples/client/petstore/java/feign/feign10x/gradlew.bat
similarity index 100%
rename from samples/client/petstore/java/feign10x/gradlew.bat
rename to samples/client/petstore/java/feign/feign10x/gradlew.bat
diff --git a/samples/client/petstore/java/feign/feign10x/pom.xml b/samples/client/petstore/java/feign/feign10x/pom.xml
new file mode 100644
index 000000000000..5016e9ac36f5
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/pom.xml
@@ -0,0 +1,319 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>petstore-feign-10x</artifactId>
+    <packaging>jar</packaging>
+    <name>petstore-feign-10x</name>
+    <version>1.0.0</version>
+    <url>https://github.com/openapitools/openapi-generator</url>
+    <description>OpenAPI Java</description>
+    <scm>
+        <connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
+        <developerConnection>scm:git:git@github.com:openapitools/openapi-generator.git</developerConnection>
+        <url>https://github.com/openapitools/openapi-generator</url>
+    </scm>
+
+    <licenses>
+        <license>
+            <name>Unlicense</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>OpenAPI-Generator Contributors</name>
+            <email>team@openapitools.org</email>
+            <organization>OpenAPITools.org</organization>
+            <organizationUrl>http://openapitools.org</organizationUrl>
+        </developer>
+    </developers>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M4</version>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>loggerPath</name>
+                            <value>conf/log4j.properties</value>
+                        </property>
+                    </systemProperties>
+                    <argLine>-Xms512m -Xmx1500m</argLine>
+                    <parallel>methods</parallel>
+                    <threadCount>10</threadCount>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- attach test jar -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.10</version>
+                <executions>
+                    <execution>
+                        <id>add_sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add_test_sources</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    <fork>true</fork>
+                    <meminitial>128m</meminitial>
+                    <maxmem>512m</maxmem>
+                    <compilerArgs>
+                        <arg>-Xlint:all</arg>
+                        <arg>-J-Xss4m</arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.1.1</version>
+                <configuration>
+                    <doclint>none</doclint>
+                        <source>1.7</source>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>sign-artifacts</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.5</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations-version}</version>
+        </dependency>
+
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
+        <!-- HTTP client: Netflix Feign -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-core</artifactId>
+            <version>${feign-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-jackson</artifactId>
+            <version>${feign-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-slf4j</artifactId>
+            <version>${feign-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign.form</groupId>
+            <artifactId>feign-form</artifactId>
+            <version>${feign-form-version}</version>
+        </dependency>
+
+        <!-- JSON processing: jackson -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson-databind-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>${jackson-databind-nullable-version}</version>
+        </dependency>
+            <dependency>
+                <groupId>com.github.joschi.jackson</groupId>
+                <artifactId>jackson-datatype-threetenbp</artifactId>
+                <version>${jackson-threetenbp-version}</version>
+            </dependency>
+        <dependency>
+            <groupId>org.apache.oltu.oauth2</groupId>
+            <artifactId>org.apache.oltu.oauth2.client</artifactId>
+            <version>${oltu-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <version>3.6.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>1.7.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.7</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <swagger-annotations-version>1.5.24</swagger-annotations-version>
+        <feign-version>9.7.0</feign-version>
+        <feign-form-version>2.1.0</feign-form-version>
+        <jackson-version>2.10.3</jackson-version>
+        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <jackson-databind-version>2.10.3</jackson-databind-version>
+        <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
+        <junit-version>4.13</junit-version>
+        <maven-plugin-version>1.0.0</maven-plugin-version>
+        <oltu-version>1.0.1</oltu-version>
+    </properties>
+</project>
diff --git a/samples/client/petstore/java/feign10x/settings.gradle b/samples/client/petstore/java/feign/feign10x/settings.gradle
similarity index 100%
rename from samples/client/petstore/java/feign10x/settings.gradle
rename to samples/client/petstore/java/feign/feign10x/settings.gradle
diff --git a/samples/client/petstore/java/feign10x/src/main/AndroidManifest.xml b/samples/client/petstore/java/feign/feign10x/src/main/AndroidManifest.xml
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/AndroidManifest.xml
rename to samples/client/petstore/java/feign/feign10x/src/main/AndroidManifest.xml
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ApiClient.java
new file mode 100644
index 000000000000..4e256daf6b29
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ApiClient.java
@@ -0,0 +1,355 @@
+package org.openapitools.client;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+
+import org.threeten.bp.*;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import org.openapitools.jackson.nullable.JsonNullableModule;
+import com.fasterxml.jackson.datatype.threetenbp.ThreeTenModule;
+
+import feign.Feign;
+import feign.RequestInterceptor;
+import feign.form.FormEncoder;
+import feign.jackson.JacksonDecoder;
+import feign.jackson.JacksonEncoder;
+import feign.slf4j.Slf4jLogger;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.auth.OAuth.AccessTokenListener;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ApiClient {
+  public interface Api {}
+
+  protected ObjectMapper objectMapper;
+  private String basePath = "http://petstore.swagger.io:80/v2";
+  private Map<String, RequestInterceptor> apiAuthorizations;
+  private Feign.Builder feignBuilder;
+
+  public ApiClient() {
+    objectMapper = createObjectMapper();
+    apiAuthorizations = new LinkedHashMap<String, RequestInterceptor>();
+    feignBuilder = Feign.builder()
+                .encoder(new FormEncoder(new JacksonEncoder(objectMapper)))
+                .decoder(new JacksonDecoder(objectMapper))
+                .logger(new Slf4jLogger());
+  }
+
+  public ApiClient(String[] authNames) {
+    this();
+    for(String authName : authNames) {
+      RequestInterceptor auth;
+      if ("api_key".equals(authName)) {
+        auth = new ApiKeyAuth("header", "api_key");
+      } else if ("api_key_query".equals(authName)) {
+        auth = new ApiKeyAuth("query", "api_key_query");
+      } else if ("http_basic_test".equals(authName)) {
+        auth = new HttpBasicAuth();
+      } else if ("petstore_auth".equals(authName)) {
+        auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
+      } else {
+        throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
+      }
+      addAuthorization(authName, auth);
+    }
+  }
+
+  /**
+   * Basic constructor for single auth name
+   * @param authName
+   */
+  public ApiClient(String authName) {
+    this(new String[]{authName});
+  }
+
+  /**
+   * Helper constructor for single api key
+   * @param authName
+   * @param apiKey
+   */
+  public ApiClient(String authName, String apiKey) {
+    this(authName);
+    this.setApiKey(apiKey);
+  }
+
+  /**
+   * Helper constructor for single basic auth or password oauth2
+   * @param authName
+   * @param username
+   * @param password
+   */
+  public ApiClient(String authName, String username, String password) {
+    this(authName);
+    this.setCredentials(username,  password);
+  }
+
+  /**
+   * Helper constructor for single password oauth2
+   * @param authName
+   * @param clientId
+   * @param secret
+   * @param username
+   * @param password
+   */
+  public ApiClient(String authName, String clientId, String secret, String username, String password) {
+    this(authName);
+    this.getTokenEndPoint()
+           .setClientId(clientId)
+           .setClientSecret(secret)
+           .setUsername(username)
+           .setPassword(password);
+  }
+
+  public String getBasePath() {
+    return basePath;
+  }
+
+  public ApiClient setBasePath(String basePath) {
+    this.basePath = basePath;
+    return this;
+  }
+
+  public Map<String, RequestInterceptor> getApiAuthorizations() {
+    return apiAuthorizations;
+  }
+
+  public void setApiAuthorizations(Map<String, RequestInterceptor> apiAuthorizations) {
+    this.apiAuthorizations = apiAuthorizations;
+  }
+
+  public Feign.Builder getFeignBuilder() {
+    return feignBuilder;
+  }
+
+  public ApiClient setFeignBuilder(Feign.Builder feignBuilder) {
+    this.feignBuilder = feignBuilder;
+    return this;
+  }
+
+  private ObjectMapper createObjectMapper() {
+    ObjectMapper objectMapper = new ObjectMapper();
+    objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+    objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
+    objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+    objectMapper.disable(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE);
+    objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    objectMapper.setDateFormat(new RFC3339DateFormat());
+    ThreeTenModule module = new ThreeTenModule();
+    module.addDeserializer(Instant.class, CustomInstantDeserializer.INSTANT);
+    module.addDeserializer(OffsetDateTime.class, CustomInstantDeserializer.OFFSET_DATE_TIME);
+    module.addDeserializer(ZonedDateTime.class, CustomInstantDeserializer.ZONED_DATE_TIME);
+    objectMapper.registerModule(module);
+    JsonNullableModule jnm = new JsonNullableModule();
+    objectMapper.registerModule(jnm);
+    return objectMapper;
+  }
+
+  public ObjectMapper getObjectMapper(){
+    return objectMapper;
+  }
+
+  /**
+   * Creates a feign client for given API interface.
+   *
+   * Usage:
+   *    ApiClient apiClient = new ApiClient();
+   *    apiClient.setBasePath("http://localhost:8080");
+   *    XYZApi api = apiClient.buildClient(XYZApi.class);
+   *    XYZResponse response = api.someMethod(...);
+   * @param <T> Type
+   * @param clientClass Client class
+   * @return The Client
+   */
+  public <T extends Api> T buildClient(Class<T> clientClass) {
+    return feignBuilder.target(clientClass, basePath);
+  }
+
+  /**
+   * Select the Accept header's value from the given accepts array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use all of them (joining into a string)
+   *
+   * @param accepts The accepts array to select from
+   * @return The Accept header to use. If the given array is empty,
+   *   null will be returned (not to set the Accept header explicitly).
+   */
+  public String selectHeaderAccept(String[] accepts) {
+    if (accepts.length == 0) return null;
+    if (StringUtil.containsIgnoreCase(accepts, "application/json")) return "application/json";
+    return StringUtil.join(accepts, ",");
+  }
+
+  /**
+   * Select the Content-Type header's value from the given array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use the first one of the array.
+   *
+   * @param contentTypes The Content-Type array to select from
+   * @return The Content-Type header to use. If the given array is empty,
+   *   JSON will be used.
+   */
+  public String selectHeaderContentType(String[] contentTypes) {
+    if (contentTypes.length == 0) return "application/json";
+    if (StringUtil.containsIgnoreCase(contentTypes, "application/json")) return "application/json";
+    return contentTypes[0];
+  }
+
+
+  /**
+   * Helper method to configure the bearer token.
+   * @param bearerToken the bearer token.
+   */
+  public void setBearerToken(String bearerToken) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof HttpBearerAuth) {
+        ((HttpBearerAuth) apiAuthorization).setBearerToken(bearerToken);
+        return;
+      }
+    }
+    throw new RuntimeException("No Bearer authentication configured!");
+  }
+
+  /**
+   * Helper method to configure the first api key found
+   * @param apiKey API key
+   */
+  public void setApiKey(String apiKey) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof ApiKeyAuth) {
+        ApiKeyAuth keyAuth = (ApiKeyAuth) apiAuthorization;
+        keyAuth.setApiKey(apiKey);
+        return ;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Helper method to configure the username/password for basic auth or password OAuth
+   * @param username Username
+   * @param password Password
+   */
+  public void setCredentials(String username, String password) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof HttpBasicAuth) {
+        HttpBasicAuth basicAuth = (HttpBasicAuth) apiAuthorization;
+        basicAuth.setCredentials(username, password);
+        return;
+      }
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.getTokenRequestBuilder().setUsername(username).setPassword(password);
+        return;
+      }
+    }
+    throw new RuntimeException("No Basic authentication or OAuth configured!");
+  }
+
+  /**
+   * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+   * @return Token request builder
+   */
+  public TokenRequestBuilder getTokenEndPoint() {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        return oauth.getTokenRequestBuilder();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+   * @return Authentication request builder
+   */
+  public AuthenticationRequestBuilder getAuthorizationEndPoint() {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        return oauth.getAuthenticationRequestBuilder();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
+   * @param accessToken Access Token
+   * @param expiresIn Validity period in seconds
+   */
+  public void setAccessToken(String accessToken, Long expiresIn) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.setAccessToken(accessToken, expiresIn);
+        return;
+      }
+    }
+  }
+
+  /**
+   * Helper method to configure the oauth accessCode/implicit flow parameters
+   * @param clientId Client ID
+   * @param clientSecret Client secret
+   * @param redirectURI Redirect URI
+   */
+  public void configureAuthorizationFlow(String clientId, String clientSecret, String redirectURI) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.getTokenRequestBuilder()
+                .setClientId(clientId)
+                .setClientSecret(clientSecret)
+                .setRedirectURI(redirectURI);
+        oauth.getAuthenticationRequestBuilder()
+                .setClientId(clientId)
+                .setRedirectURI(redirectURI);
+        return;
+      }
+    }
+  }
+
+  /**
+   * Configures a listener which is notified when a new access token is received.
+   * @param accessTokenListener Acesss token listener
+   */
+  public void registerAccessTokenListener(AccessTokenListener accessTokenListener) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.registerAccessTokenListener(accessTokenListener);
+        return;
+      }
+    }
+  }
+
+  /**
+   * Gets request interceptor based on authentication name
+   * @param authName Authentiation name
+   * @return Request Interceptor
+   */
+  public RequestInterceptor getAuthorization(String authName) {
+    return apiAuthorizations.get(authName);
+  }
+
+  /**
+   * Adds an authorization to be used by the client
+   * @param authName Authentication name
+   * @param authorization Request interceptor
+   */
+  public void addAuthorization(String authName, RequestInterceptor authorization) {
+    if (apiAuthorizations.containsKey(authName)) {
+      throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations");
+    }
+    apiAuthorizations.put(authName, authorization);
+    feignBuilder.requestInterceptor(authorization);
+  }
+
+}
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/CustomInstantDeserializer.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
rename to samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/EncodingUtils.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/EncodingUtils.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/EncodingUtils.java
rename to samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/EncodingUtils.java
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ParamExpander.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ParamExpander.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ParamExpander.java
rename to samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ParamExpander.java
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/RFC3339DateFormat.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/RFC3339DateFormat.java
rename to samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/RFC3339DateFormat.java
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ServerConfiguration.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ServerConfiguration.java
rename to samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ServerConfiguration.java
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ServerVariable.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ServerVariable.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ServerVariable.java
rename to samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ServerVariable.java
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/StringUtil.java
new file mode 100644
index 000000000000..4dc60597910a
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/StringUtil.java
@@ -0,0 +1,83 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class StringUtil {
+  /**
+   * Check if the given array contains the given value (with case-insensitive comparison).
+   *
+   * @param array The array
+   * @param value The value to search
+   * @return true if the array contains the value
+   */
+  public static boolean containsIgnoreCase(String[] array, String value) {
+    for (String str : array) {
+      if (value == null && str == null) {
+        return true;
+      }
+      if (value != null && value.equalsIgnoreCase(str)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Join an array of strings with the given separator.
+   * <p>
+   * Note: This might be replaced by utility method from commons-lang or guava someday
+   * if one of those libraries is added as dependency.
+   * </p>
+   *
+   * @param array     The array of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(String[] array, String separator) {
+    int len = array.length;
+    if (len == 0) {
+      return "";
+    }
+
+    StringBuilder out = new StringBuilder();
+    out.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      out.append(separator).append(array[i]);
+    }
+    return out.toString();
+  }
+
+  /**
+   * Join a list of strings with the given separator.
+   *
+   * @param list      The list of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(Collection<String> list, String separator) {
+    Iterator<String> iterator = list.iterator();
+    StringBuilder out = new StringBuilder();
+    if (iterator.hasNext()) {
+      out.append(iterator.next());
+    }
+    while (iterator.hasNext()) {
+      out.append(separator).append(iterator.next());
+    }
+    return out.toString();
+  }
+}
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
new file mode 100644
index 000000000000..2cefc6e4185b
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -0,0 +1,30 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.EncodingUtils;
+
+import org.openapitools.client.model.Client;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import feign.*;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public interface AnotherFakeApi extends ApiClient.Api {
+
+
+  /**
+   * To test special tags
+   * To test special tags and operation ID starting with number
+   * @param body client model (required)
+   * @return Client
+   */
+  @RequestLine("PATCH /another-fake/dummy")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  Client call123testSpecialTags(Client body);
+}
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/FakeApi.java
new file mode 100644
index 000000000000..d1d0e6ed88e5
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -0,0 +1,422 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.EncodingUtils;
+
+import java.math.BigDecimal;
+import org.openapitools.client.model.Client;
+import java.io.File;
+import org.openapitools.client.model.FileSchemaTestClass;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+import org.openapitools.client.model.OuterComposite;
+import org.openapitools.client.model.User;
+import org.openapitools.client.model.XmlItem;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import feign.*;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public interface FakeApi extends ApiClient.Api {
+
+
+  /**
+   * creates an XmlItem
+   * this route creates an XmlItem
+   * @param xmlItem XmlItem Body (required)
+   */
+  @RequestLine("POST /fake/create_xml_item")
+  @Headers({
+    "Content-Type: application/xml",
+    "Accept: application/json",
+  })
+  void createXmlItem(XmlItem xmlItem);
+
+  /**
+   * 
+   * Test serialization of outer boolean types
+   * @param body Input boolean as post body (optional)
+   * @return Boolean
+   */
+  @RequestLine("POST /fake/outer/boolean")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: */*",
+  })
+  Boolean fakeOuterBooleanSerialize(Boolean body);
+
+  /**
+   * 
+   * Test serialization of object with outer number type
+   * @param body Input composite as post body (optional)
+   * @return OuterComposite
+   */
+  @RequestLine("POST /fake/outer/composite")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: */*",
+  })
+  OuterComposite fakeOuterCompositeSerialize(OuterComposite body);
+
+  /**
+   * 
+   * Test serialization of outer number types
+   * @param body Input number as post body (optional)
+   * @return BigDecimal
+   */
+  @RequestLine("POST /fake/outer/number")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: */*",
+  })
+  BigDecimal fakeOuterNumberSerialize(BigDecimal body);
+
+  /**
+   * 
+   * Test serialization of outer string types
+   * @param body Input string as post body (optional)
+   * @return String
+   */
+  @RequestLine("POST /fake/outer/string")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: */*",
+  })
+  String fakeOuterStringSerialize(String body);
+
+  /**
+   * 
+   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+   * @param body  (required)
+   */
+  @RequestLine("PUT /fake/body-with-file-schema")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  void testBodyWithFileSchema(FileSchemaTestClass body);
+
+  /**
+   * 
+   * 
+   * @param query  (required)
+   * @param body  (required)
+   */
+  @RequestLine("PUT /fake/body-with-query-params?query={query}")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  void testBodyWithQueryParams(@Param("query") String query, User body);
+
+  /**
+   * 
+   * 
+   * Note, this is equivalent to the other <code>testBodyWithQueryParams</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link TestBodyWithQueryParamsQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param body  (required)
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>query -  (required)</li>
+   *   </ul>
+   */
+  @RequestLine("PUT /fake/body-with-query-params?query={query}")
+  @Headers({
+  "Content-Type: application/json",
+  "Accept: application/json",
+  })
+  void testBodyWithQueryParams(User body, @QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>testBodyWithQueryParams</code> method in a fluent style.
+   */
+  public static class TestBodyWithQueryParamsQueryParams extends HashMap<String, Object> {
+    public TestBodyWithQueryParamsQueryParams query(final String value) {
+      put("query", EncodingUtils.encode(value));
+      return this;
+    }
+  }
+
+  /**
+   * To test \&quot;client\&quot; model
+   * To test \&quot;client\&quot; model
+   * @param body client model (required)
+   * @return Client
+   */
+  @RequestLine("PATCH /fake")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  Client testClientModel(Client body);
+
+  /**
+   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+   * @param number None (required)
+   * @param _double None (required)
+   * @param patternWithoutDelimiter None (required)
+   * @param _byte None (required)
+   * @param integer None (optional)
+   * @param int32 None (optional)
+   * @param int64 None (optional)
+   * @param _float None (optional)
+   * @param string None (optional)
+   * @param binary None (optional)
+   * @param date None (optional)
+   * @param dateTime None (optional)
+   * @param password None (optional)
+   * @param paramCallback None (optional)
+   */
+  @RequestLine("POST /fake")
+  @Headers({
+    "Content-Type: application/x-www-form-urlencoded",
+    "Accept: application/json",
+  })
+  void testEndpointParameters(@Param("number") BigDecimal number, @Param("_double") Double _double, @Param("patternWithoutDelimiter") String patternWithoutDelimiter, @Param("_byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("_float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("paramCallback") String paramCallback);
+
+  /**
+   * To test enum parameters
+   * To test enum parameters
+   * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
+   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
+   * @param enumQueryStringArray Query parameter enum test (string array) (optional)
+   * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
+   * @param enumQueryInteger Query parameter enum test (double) (optional)
+   * @param enumQueryDouble Query parameter enum test (double) (optional)
+   * @param enumFormStringArray Form parameter enum test (string array) (optional)
+   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   */
+  @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}")
+  @Headers({
+    "Content-Type: application/x-www-form-urlencoded",
+    "Accept: application/json",
+    "enum_header_string_array: {enumHeaderStringArray}",
+    
+    "enum_header_string: {enumHeaderString}"
+  })
+  void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumQueryStringArray") List<String> enumQueryStringArray, @Param("enumQueryString") String enumQueryString, @Param("enumQueryInteger") Integer enumQueryInteger, @Param("enumQueryDouble") Double enumQueryDouble, @Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString);
+
+  /**
+   * To test enum parameters
+   * To test enum parameters
+   * Note, this is equivalent to the other <code>testEnumParameters</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link TestEnumParametersQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
+   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
+   * @param enumFormStringArray Form parameter enum test (string array) (optional)
+   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>enumQueryStringArray - Query parameter enum test (string array) (optional)</li>
+   *   <li>enumQueryString - Query parameter enum test (string) (optional, default to -efg)</li>
+   *   <li>enumQueryInteger - Query parameter enum test (double) (optional)</li>
+   *   <li>enumQueryDouble - Query parameter enum test (double) (optional)</li>
+   *   </ul>
+   */
+  @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}")
+  @Headers({
+  "Content-Type: application/x-www-form-urlencoded",
+  "Accept: application/json",
+      "enum_header_string_array: {enumHeaderStringArray}",
+      
+      "enum_header_string: {enumHeaderString}"
+  })
+  void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString, @QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>testEnumParameters</code> method in a fluent style.
+   */
+  public static class TestEnumParametersQueryParams extends HashMap<String, Object> {
+    public TestEnumParametersQueryParams enumQueryStringArray(final List<String> value) {
+      put("enum_query_string_array", EncodingUtils.encodeCollection(value, "csv"));
+      return this;
+    }
+    public TestEnumParametersQueryParams enumQueryString(final String value) {
+      put("enum_query_string", EncodingUtils.encode(value));
+      return this;
+    }
+    public TestEnumParametersQueryParams enumQueryInteger(final Integer value) {
+      put("enum_query_integer", EncodingUtils.encode(value));
+      return this;
+    }
+    public TestEnumParametersQueryParams enumQueryDouble(final Double value) {
+      put("enum_query_double", EncodingUtils.encode(value));
+      return this;
+    }
+  }
+
+  /**
+   * Fake endpoint to test group parameters (optional)
+   * Fake endpoint to test group parameters (optional)
+   * @param requiredStringGroup Required String in group parameters (required)
+   * @param requiredBooleanGroup Required Boolean in group parameters (required)
+   * @param requiredInt64Group Required Integer in group parameters (required)
+   * @param stringGroup String in group parameters (optional)
+   * @param booleanGroup Boolean in group parameters (optional)
+   * @param int64Group Integer in group parameters (optional)
+   */
+  @RequestLine("DELETE /fake?required_string_group={requiredStringGroup}&required_int64_group={requiredInt64Group}&string_group={stringGroup}&int64_group={int64Group}")
+  @Headers({
+    "Accept: application/json",
+    "required_boolean_group: {requiredBooleanGroup}",
+    
+    "boolean_group: {booleanGroup}"
+  })
+  void testGroupParameters(@Param("requiredStringGroup") Integer requiredStringGroup, @Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("requiredInt64Group") Long requiredInt64Group, @Param("stringGroup") Integer stringGroup, @Param("booleanGroup") Boolean booleanGroup, @Param("int64Group") Long int64Group);
+
+  /**
+   * Fake endpoint to test group parameters (optional)
+   * Fake endpoint to test group parameters (optional)
+   * Note, this is equivalent to the other <code>testGroupParameters</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link TestGroupParametersQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param requiredBooleanGroup Required Boolean in group parameters (required)
+   * @param booleanGroup Boolean in group parameters (optional)
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>requiredStringGroup - Required String in group parameters (required)</li>
+   *   <li>requiredInt64Group - Required Integer in group parameters (required)</li>
+   *   <li>stringGroup - String in group parameters (optional)</li>
+   *   <li>int64Group - Integer in group parameters (optional)</li>
+   *   </ul>
+   */
+  @RequestLine("DELETE /fake?required_string_group={requiredStringGroup}&required_int64_group={requiredInt64Group}&string_group={stringGroup}&int64_group={int64Group}")
+  @Headers({
+  "Accept: application/json",
+      "required_boolean_group: {requiredBooleanGroup}",
+      
+      "boolean_group: {booleanGroup}"
+  })
+  void testGroupParameters(@Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("booleanGroup") Boolean booleanGroup, @QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>testGroupParameters</code> method in a fluent style.
+   */
+  public static class TestGroupParametersQueryParams extends HashMap<String, Object> {
+    public TestGroupParametersQueryParams requiredStringGroup(final Integer value) {
+      put("required_string_group", EncodingUtils.encode(value));
+      return this;
+    }
+    public TestGroupParametersQueryParams requiredInt64Group(final Long value) {
+      put("required_int64_group", EncodingUtils.encode(value));
+      return this;
+    }
+    public TestGroupParametersQueryParams stringGroup(final Integer value) {
+      put("string_group", EncodingUtils.encode(value));
+      return this;
+    }
+    public TestGroupParametersQueryParams int64Group(final Long value) {
+      put("int64_group", EncodingUtils.encode(value));
+      return this;
+    }
+  }
+
+  /**
+   * test inline additionalProperties
+   * 
+   * @param param request body (required)
+   */
+  @RequestLine("POST /fake/inline-additionalProperties")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  void testInlineAdditionalProperties(Map<String, String> param);
+
+  /**
+   * test json serialization of form data
+   * 
+   * @param param field1 (required)
+   * @param param2 field2 (required)
+   */
+  @RequestLine("GET /fake/jsonFormData")
+  @Headers({
+    "Content-Type: application/x-www-form-urlencoded",
+    "Accept: application/json",
+  })
+  void testJsonFormData(@Param("param") String param, @Param("param2") String param2);
+
+  /**
+   * 
+   * To test the collection format in query parameters
+   * @param pipe  (required)
+   * @param ioutil  (required)
+   * @param http  (required)
+   * @param url  (required)
+   * @param context  (required)
+   */
+  @RequestLine("PUT /fake/test-query-paramters?pipe={pipe}&ioutil={ioutil}&http={http}&url={url}&context={context}")
+  @Headers({
+    "Accept: application/json",
+  })
+  void testQueryParameterCollectionFormat(@Param("pipe") List<String> pipe, @Param("ioutil") List<String> ioutil, @Param("http") List<String> http, @Param("url") List<String> url, @Param("context") List<String> context);
+
+  /**
+   * 
+   * To test the collection format in query parameters
+   * Note, this is equivalent to the other <code>testQueryParameterCollectionFormat</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link TestQueryParameterCollectionFormatQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>pipe -  (required)</li>
+   *   <li>ioutil -  (required)</li>
+   *   <li>http -  (required)</li>
+   *   <li>url -  (required)</li>
+   *   <li>context -  (required)</li>
+   *   </ul>
+   */
+  @RequestLine("PUT /fake/test-query-paramters?pipe={pipe}&ioutil={ioutil}&http={http}&url={url}&context={context}")
+  @Headers({
+  "Accept: application/json",
+  })
+  void testQueryParameterCollectionFormat(@QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>testQueryParameterCollectionFormat</code> method in a fluent style.
+   */
+  public static class TestQueryParameterCollectionFormatQueryParams extends HashMap<String, Object> {
+    public TestQueryParameterCollectionFormatQueryParams pipe(final List<String> value) {
+      put("pipe", EncodingUtils.encodeCollection(value, "csv"));
+      return this;
+    }
+    public TestQueryParameterCollectionFormatQueryParams ioutil(final List<String> value) {
+      put("ioutil", EncodingUtils.encodeCollection(value, "csv"));
+      return this;
+    }
+    public TestQueryParameterCollectionFormatQueryParams http(final List<String> value) {
+      put("http", EncodingUtils.encodeCollection(value, "ssv"));
+      return this;
+    }
+    public TestQueryParameterCollectionFormatQueryParams url(final List<String> value) {
+      put("url", EncodingUtils.encodeCollection(value, "csv"));
+      return this;
+    }
+    public TestQueryParameterCollectionFormatQueryParams context(final List<String> value) {
+      put("context", EncodingUtils.encodeCollection(value, "multi"));
+      return this;
+    }
+  }
+}
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
new file mode 100644
index 000000000000..c22fbfa8d744
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -0,0 +1,30 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.EncodingUtils;
+
+import org.openapitools.client.model.Client;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import feign.*;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public interface FakeClassnameTags123Api extends ApiClient.Api {
+
+
+  /**
+   * To test class name in snake case
+   * To test class name in snake case
+   * @param body client model (required)
+   * @return Client
+   */
+  @RequestLine("PATCH /fake_classname_test")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  Client testClassname(Client body);
+}
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/PetApi.java
new file mode 100644
index 000000000000..b954226800ac
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/PetApi.java
@@ -0,0 +1,201 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.EncodingUtils;
+
+import java.io.File;
+import org.openapitools.client.model.ModelApiResponse;
+import org.openapitools.client.model.Pet;
+import java.util.Set;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import feign.*;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public interface PetApi extends ApiClient.Api {
+
+
+  /**
+   * Add a new pet to the store
+   * 
+   * @param body Pet object that needs to be added to the store (required)
+   */
+  @RequestLine("POST /pet")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  void addPet(Pet body);
+
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   */
+  @RequestLine("DELETE /pet/{petId}")
+  @Headers({
+    "Accept: application/json",
+    "api_key: {apiKey}"
+  })
+  void deletePet(@Param("petId") Long petId, @Param("apiKey") String apiKey);
+
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for filter (required)
+   * @return List&lt;Pet&gt;
+   */
+  @RequestLine("GET /pet/findByStatus?status={status}")
+  @Headers({
+    "Accept: application/json",
+  })
+  List<Pet> findPetsByStatus(@Param("status") List<String> status);
+
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * Note, this is equivalent to the other <code>findPetsByStatus</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link FindPetsByStatusQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>status - Status values that need to be considered for filter (required)</li>
+   *   </ul>
+   * @return List&lt;Pet&gt;
+   */
+  @RequestLine("GET /pet/findByStatus?status={status}")
+  @Headers({
+  "Accept: application/json",
+  })
+  List<Pet> findPetsByStatus(@QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>findPetsByStatus</code> method in a fluent style.
+   */
+  public static class FindPetsByStatusQueryParams extends HashMap<String, Object> {
+    public FindPetsByStatusQueryParams status(final List<String> value) {
+      put("status", EncodingUtils.encodeCollection(value, "csv"));
+      return this;
+    }
+  }
+
+  /**
+   * Finds Pets by tags
+   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by (required)
+   * @return Set&lt;Pet&gt;
+   */
+  @RequestLine("GET /pet/findByTags?tags={tags}")
+  @Headers({
+    "Accept: application/json",
+  })
+  Set<Pet> findPetsByTags(@Param("tags") Set<String> tags);
+
+  /**
+   * Finds Pets by tags
+   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+   * Note, this is equivalent to the other <code>findPetsByTags</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link FindPetsByTagsQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>tags - Tags to filter by (required)</li>
+   *   </ul>
+   * @return Set&lt;Pet&gt;
+   */
+  @RequestLine("GET /pet/findByTags?tags={tags}")
+  @Headers({
+  "Accept: application/json",
+  })
+  Set<Pet> findPetsByTags(@QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>findPetsByTags</code> method in a fluent style.
+   */
+  public static class FindPetsByTagsQueryParams extends HashMap<String, Object> {
+    public FindPetsByTagsQueryParams tags(final Set<String> value) {
+      put("tags", EncodingUtils.encodeCollection(value, "csv"));
+      return this;
+    }
+  }
+
+  /**
+   * Find pet by ID
+   * Returns a single pet
+   * @param petId ID of pet to return (required)
+   * @return Pet
+   */
+  @RequestLine("GET /pet/{petId}")
+  @Headers({
+    "Accept: application/json",
+  })
+  Pet getPetById(@Param("petId") Long petId);
+
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (required)
+   */
+  @RequestLine("PUT /pet")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  void updatePet(Pet body);
+
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
+   */
+  @RequestLine("POST /pet/{petId}")
+  @Headers({
+    "Content-Type: application/x-www-form-urlencoded",
+    "Accept: application/json",
+  })
+  void updatePetWithForm(@Param("petId") Long petId, @Param("name") String name, @Param("status") String status);
+
+  /**
+   * uploads an image
+   * 
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
+   * @return ModelApiResponse
+   */
+  @RequestLine("POST /pet/{petId}/uploadImage")
+  @Headers({
+    "Content-Type: multipart/form-data",
+    "Accept: application/json",
+  })
+  ModelApiResponse uploadFile(@Param("petId") Long petId, @Param("additionalMetadata") String additionalMetadata, @Param("file") File file);
+
+  /**
+   * uploads an image (required)
+   * 
+   * @param petId ID of pet to update (required)
+   * @param requiredFile file to upload (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @return ModelApiResponse
+   */
+  @RequestLine("POST /fake/{petId}/uploadImageWithRequiredFile")
+  @Headers({
+    "Content-Type: multipart/form-data",
+    "Accept: application/json",
+  })
+  ModelApiResponse uploadFileWithRequiredFile(@Param("petId") Long petId, @Param("requiredFile") File requiredFile, @Param("additionalMetadata") String additionalMetadata);
+}
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/StoreApi.java
new file mode 100644
index 000000000000..5ba8227e99b6
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -0,0 +1,64 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.EncodingUtils;
+
+import org.openapitools.client.model.Order;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import feign.*;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public interface StoreApi extends ApiClient.Api {
+
+
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted (required)
+   */
+  @RequestLine("DELETE /store/order/{orderId}")
+  @Headers({
+    "Accept: application/json",
+  })
+  void deleteOrder(@Param("orderId") String orderId);
+
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Map&lt;String, Integer&gt;
+   */
+  @RequestLine("GET /store/inventory")
+  @Headers({
+    "Accept: application/json",
+  })
+  Map<String, Integer> getInventory();
+
+  /**
+   * Find purchase order by ID
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched (required)
+   * @return Order
+   */
+  @RequestLine("GET /store/order/{orderId}")
+  @Headers({
+    "Accept: application/json",
+  })
+  Order getOrderById(@Param("orderId") Long orderId);
+
+  /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (required)
+   * @return Order
+   */
+  @RequestLine("POST /store/order")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: application/json",
+  })
+  Order placeOrder(Order body);
+}
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/UserApi.java
new file mode 100644
index 000000000000..40b6010dab2e
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/UserApi.java
@@ -0,0 +1,149 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.EncodingUtils;
+
+import org.openapitools.client.model.User;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import feign.*;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public interface UserApi extends ApiClient.Api {
+
+
+  /**
+   * Create user
+   * This can only be done by the logged in user.
+   * @param body Created user object (required)
+   */
+  @RequestLine("POST /user")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: application/json",
+  })
+  void createUser(User body);
+
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   */
+  @RequestLine("POST /user/createWithArray")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: application/json",
+  })
+  void createUsersWithArrayInput(List<User> body);
+
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   */
+  @RequestLine("POST /user/createWithList")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: application/json",
+  })
+  void createUsersWithListInput(List<User> body);
+
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   */
+  @RequestLine("DELETE /user/{username}")
+  @Headers({
+    "Accept: application/json",
+  })
+  void deleteUser(@Param("username") String username);
+
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return User
+   */
+  @RequestLine("GET /user/{username}")
+  @Headers({
+    "Accept: application/json",
+  })
+  User getUserByName(@Param("username") String username);
+
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login (required)
+   * @param password The password for login in clear text (required)
+   * @return String
+   */
+  @RequestLine("GET /user/login?username={username}&password={password}")
+  @Headers({
+    "Accept: application/json",
+  })
+  String loginUser(@Param("username") String username, @Param("password") String password);
+
+  /**
+   * Logs user into the system
+   * 
+   * Note, this is equivalent to the other <code>loginUser</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link LoginUserQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>username - The user name for login (required)</li>
+   *   <li>password - The password for login in clear text (required)</li>
+   *   </ul>
+   * @return String
+   */
+  @RequestLine("GET /user/login?username={username}&password={password}")
+  @Headers({
+  "Accept: application/json",
+  })
+  String loginUser(@QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>loginUser</code> method in a fluent style.
+   */
+  public static class LoginUserQueryParams extends HashMap<String, Object> {
+    public LoginUserQueryParams username(final String value) {
+      put("username", EncodingUtils.encode(value));
+      return this;
+    }
+    public LoginUserQueryParams password(final String value) {
+      put("password", EncodingUtils.encode(value));
+      return this;
+    }
+  }
+
+  /**
+   * Logs out current logged in user session
+   * 
+   */
+  @RequestLine("GET /user/logout")
+  @Headers({
+    "Accept: application/json",
+  })
+  void logoutUser();
+
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (required)
+   */
+  @RequestLine("PUT /user/{username}")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: application/json",
+  })
+  void updateUser(@Param("username") String username, User body);
+}
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
rename to samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
rename to samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
rename to samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/auth/OAuth.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/OAuth.java
rename to samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/auth/OAuth.java
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/OAuthFlow.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/auth/OAuthFlow.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/OAuthFlow.java
rename to samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/auth/OAuthFlow.java
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
new file mode 100644
index 000000000000..f84a72518f68
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -0,0 +1,106 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesAnyType
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesAnyType name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
+    return Objects.equals(this.name, additionalPropertiesAnyType.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesAnyType {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
new file mode 100644
index 000000000000..3104ead59eed
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -0,0 +1,107 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesArray
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesArray.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesArray extends HashMap<String, List> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesArray name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
+    return Objects.equals(this.name, additionalPropertiesArray.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesArray {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
new file mode 100644
index 000000000000..b485c4825c27
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -0,0 +1,106 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesBoolean
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesBoolean name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
+    return Objects.equals(this.name, additionalPropertiesBoolean.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesBoolean {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
new file mode 100644
index 000000000000..8dffb4999596
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -0,0 +1,480 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesClass
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_STRING,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_NUMBER,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_INTEGER,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_BOOLEAN,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_INTEGER,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_ANYTYPE,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_STRING,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_ANYTYPE,
+  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE1,
+  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
+  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesClass {
+  public static final String JSON_PROPERTY_MAP_STRING = "map_string";
+  private Map<String, String> mapString = null;
+
+  public static final String JSON_PROPERTY_MAP_NUMBER = "map_number";
+  private Map<String, BigDecimal> mapNumber = null;
+
+  public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer";
+  private Map<String, Integer> mapInteger = null;
+
+  public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean";
+  private Map<String, Boolean> mapBoolean = null;
+
+  public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer";
+  private Map<String, List<Integer>> mapArrayInteger = null;
+
+  public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype";
+  private Map<String, List<Object>> mapArrayAnytype = null;
+
+  public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string";
+  private Map<String, Map<String, String>> mapMapString = null;
+
+  public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype";
+  private Map<String, Map<String, Object>> mapMapAnytype = null;
+
+  public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1";
+  private Object anytype1;
+
+  public static final String JSON_PROPERTY_ANYTYPE2 = "anytype_2";
+  private Object anytype2;
+
+  public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3";
+  private Object anytype3;
+
+
+  public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
+    
+    this.mapString = mapString;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) {
+    if (this.mapString == null) {
+      this.mapString = new HashMap<String, String>();
+    }
+    this.mapString.put(key, mapStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapString
+   * @return mapString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, String> getMapString() {
+    return mapString;
+  }
+
+
+  public void setMapString(Map<String, String> mapString) {
+    this.mapString = mapString;
+  }
+
+
+  public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
+    
+    this.mapNumber = mapNumber;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) {
+    if (this.mapNumber == null) {
+      this.mapNumber = new HashMap<String, BigDecimal>();
+    }
+    this.mapNumber.put(key, mapNumberItem);
+    return this;
+  }
+
+   /**
+   * Get mapNumber
+   * @return mapNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, BigDecimal> getMapNumber() {
+    return mapNumber;
+  }
+
+
+  public void setMapNumber(Map<String, BigDecimal> mapNumber) {
+    this.mapNumber = mapNumber;
+  }
+
+
+  public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
+    
+    this.mapInteger = mapInteger;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) {
+    if (this.mapInteger == null) {
+      this.mapInteger = new HashMap<String, Integer>();
+    }
+    this.mapInteger.put(key, mapIntegerItem);
+    return this;
+  }
+
+   /**
+   * Get mapInteger
+   * @return mapInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Integer> getMapInteger() {
+    return mapInteger;
+  }
+
+
+  public void setMapInteger(Map<String, Integer> mapInteger) {
+    this.mapInteger = mapInteger;
+  }
+
+
+  public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
+    
+    this.mapBoolean = mapBoolean;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) {
+    if (this.mapBoolean == null) {
+      this.mapBoolean = new HashMap<String, Boolean>();
+    }
+    this.mapBoolean.put(key, mapBooleanItem);
+    return this;
+  }
+
+   /**
+   * Get mapBoolean
+   * @return mapBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Boolean> getMapBoolean() {
+    return mapBoolean;
+  }
+
+
+  public void setMapBoolean(Map<String, Boolean> mapBoolean) {
+    this.mapBoolean = mapBoolean;
+  }
+
+
+  public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
+    
+    this.mapArrayInteger = mapArrayInteger;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer> mapArrayIntegerItem) {
+    if (this.mapArrayInteger == null) {
+      this.mapArrayInteger = new HashMap<String, List<Integer>>();
+    }
+    this.mapArrayInteger.put(key, mapArrayIntegerItem);
+    return this;
+  }
+
+   /**
+   * Get mapArrayInteger
+   * @return mapArrayInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, List<Integer>> getMapArrayInteger() {
+    return mapArrayInteger;
+  }
+
+
+  public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
+    this.mapArrayInteger = mapArrayInteger;
+  }
+
+
+  public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
+    
+    this.mapArrayAnytype = mapArrayAnytype;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object> mapArrayAnytypeItem) {
+    if (this.mapArrayAnytype == null) {
+      this.mapArrayAnytype = new HashMap<String, List<Object>>();
+    }
+    this.mapArrayAnytype.put(key, mapArrayAnytypeItem);
+    return this;
+  }
+
+   /**
+   * Get mapArrayAnytype
+   * @return mapArrayAnytype
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, List<Object>> getMapArrayAnytype() {
+    return mapArrayAnytype;
+  }
+
+
+  public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
+    this.mapArrayAnytype = mapArrayAnytype;
+  }
+
+
+  public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> mapMapString) {
+    
+    this.mapMapString = mapMapString;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, String> mapMapStringItem) {
+    if (this.mapMapString == null) {
+      this.mapMapString = new HashMap<String, Map<String, String>>();
+    }
+    this.mapMapString.put(key, mapMapStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapMapString
+   * @return mapMapString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Map<String, String>> getMapMapString() {
+    return mapMapString;
+  }
+
+
+  public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
+    this.mapMapString = mapMapString;
+  }
+
+
+  public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
+    
+    this.mapMapAnytype = mapMapAnytype;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Object> mapMapAnytypeItem) {
+    if (this.mapMapAnytype == null) {
+      this.mapMapAnytype = new HashMap<String, Map<String, Object>>();
+    }
+    this.mapMapAnytype.put(key, mapMapAnytypeItem);
+    return this;
+  }
+
+   /**
+   * Get mapMapAnytype
+   * @return mapMapAnytype
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Map<String, Object>> getMapMapAnytype() {
+    return mapMapAnytype;
+  }
+
+
+  public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
+    this.mapMapAnytype = mapMapAnytype;
+  }
+
+
+  public AdditionalPropertiesClass anytype1(Object anytype1) {
+    
+    this.anytype1 = anytype1;
+    return this;
+  }
+
+   /**
+   * Get anytype1
+   * @return anytype1
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Object getAnytype1() {
+    return anytype1;
+  }
+
+
+  public void setAnytype1(Object anytype1) {
+    this.anytype1 = anytype1;
+  }
+
+
+  public AdditionalPropertiesClass anytype2(Object anytype2) {
+    
+    this.anytype2 = anytype2;
+    return this;
+  }
+
+   /**
+   * Get anytype2
+   * @return anytype2
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ANYTYPE2)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Object getAnytype2() {
+    return anytype2;
+  }
+
+
+  public void setAnytype2(Object anytype2) {
+    this.anytype2 = anytype2;
+  }
+
+
+  public AdditionalPropertiesClass anytype3(Object anytype3) {
+    
+    this.anytype3 = anytype3;
+    return this;
+  }
+
+   /**
+   * Get anytype3
+   * @return anytype3
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ANYTYPE3)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Object getAnytype3() {
+    return anytype3;
+  }
+
+
+  public void setAnytype3(Object anytype3) {
+    this.anytype3 = anytype3;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
+    return Objects.equals(this.mapString, additionalPropertiesClass.mapString) &&
+        Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) &&
+        Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) &&
+        Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) &&
+        Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) &&
+        Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) &&
+        Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) &&
+        Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) &&
+        Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) &&
+        Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) &&
+        Objects.equals(this.anytype3, additionalPropertiesClass.anytype3);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesClass {\n");
+    sb.append("    mapString: ").append(toIndentedString(mapString)).append("\n");
+    sb.append("    mapNumber: ").append(toIndentedString(mapNumber)).append("\n");
+    sb.append("    mapInteger: ").append(toIndentedString(mapInteger)).append("\n");
+    sb.append("    mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n");
+    sb.append("    mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n");
+    sb.append("    mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n");
+    sb.append("    mapMapString: ").append(toIndentedString(mapMapString)).append("\n");
+    sb.append("    mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n");
+    sb.append("    anytype1: ").append(toIndentedString(anytype1)).append("\n");
+    sb.append("    anytype2: ").append(toIndentedString(anytype2)).append("\n");
+    sb.append("    anytype3: ").append(toIndentedString(anytype3)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
new file mode 100644
index 000000000000..d09eacadf3e9
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -0,0 +1,106 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesInteger
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesInteger.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesInteger name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
+    return Objects.equals(this.name, additionalPropertiesInteger.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesInteger {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
new file mode 100644
index 000000000000..93480b7f4966
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -0,0 +1,107 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesNumber
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesNumber.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesNumber name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
+    return Objects.equals(this.name, additionalPropertiesNumber.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesNumber {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
new file mode 100644
index 000000000000..4afc16a07bb9
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -0,0 +1,106 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesObject
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesObject.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesObject name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o;
+    return Objects.equals(this.name, additionalPropertiesObject.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesObject {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
new file mode 100644
index 000000000000..8533c0b77ae3
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -0,0 +1,106 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesString
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesString.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesString extends HashMap<String, String> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesString name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o;
+    return Objects.equals(this.name, additionalPropertiesString.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesString {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Animal.java
new file mode 100644
index 000000000000..83270058d077
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Animal.java
@@ -0,0 +1,144 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.BigCat;
+import org.openapitools.client.model.Cat;
+import org.openapitools.client.model.Dog;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Animal
+ */
+@JsonPropertyOrder({
+  Animal.JSON_PROPERTY_CLASS_NAME,
+  Animal.JSON_PROPERTY_COLOR
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
+  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+})
+
+public class Animal {
+  public static final String JSON_PROPERTY_CLASS_NAME = "className";
+  protected String className;
+
+  public static final String JSON_PROPERTY_COLOR = "color";
+  private String color = "red";
+
+
+  public Animal className(String className) {
+    
+    this.className = className;
+    return this;
+  }
+
+   /**
+   * Get className
+   * @return className
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getClassName() {
+    return className;
+  }
+
+
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  public Animal color(String color) {
+    
+    this.color = color;
+    return this;
+  }
+
+   /**
+   * Get color
+   * @return color
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_COLOR)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getColor() {
+    return color;
+  }
+
+
+  public void setColor(String color) {
+    this.color = color;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Animal animal = (Animal) o;
+    return Objects.equals(this.className, animal.className) &&
+        Objects.equals(this.color, animal.color);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, color);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
new file mode 100644
index 000000000000..5dc5abf29846
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -0,0 +1,113 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * ArrayOfArrayOfNumberOnly
+ */
+@JsonPropertyOrder({
+  ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ArrayOfArrayOfNumberOnly {
+  public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
+  private List<List<BigDecimal>> arrayArrayNumber = null;
+
+
+  public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
+    
+    this.arrayArrayNumber = arrayArrayNumber;
+    return this;
+  }
+
+  public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
+    if (this.arrayArrayNumber == null) {
+      this.arrayArrayNumber = new ArrayList<List<BigDecimal>>();
+    }
+    this.arrayArrayNumber.add(arrayArrayNumberItem);
+    return this;
+  }
+
+   /**
+   * Get arrayArrayNumber
+   * @return arrayArrayNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<List<BigDecimal>> getArrayArrayNumber() {
+    return arrayArrayNumber;
+  }
+
+
+  public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
+    this.arrayArrayNumber = arrayArrayNumber;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o;
+    return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayArrayNumber);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayOfArrayOfNumberOnly {\n");
+    sb.append("    arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
new file mode 100644
index 000000000000..c237ea37a6e2
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -0,0 +1,113 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * ArrayOfNumberOnly
+ */
+@JsonPropertyOrder({
+  ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ArrayOfNumberOnly {
+  public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
+  private List<BigDecimal> arrayNumber = null;
+
+
+  public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
+    
+    this.arrayNumber = arrayNumber;
+    return this;
+  }
+
+  public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
+    if (this.arrayNumber == null) {
+      this.arrayNumber = new ArrayList<BigDecimal>();
+    }
+    this.arrayNumber.add(arrayNumberItem);
+    return this;
+  }
+
+   /**
+   * Get arrayNumber
+   * @return arrayNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<BigDecimal> getArrayNumber() {
+    return arrayNumber;
+  }
+
+
+  public void setArrayNumber(List<BigDecimal> arrayNumber) {
+    this.arrayNumber = arrayNumber;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o;
+    return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayNumber);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayOfNumberOnly {\n");
+    sb.append("    arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
new file mode 100644
index 000000000000..8ca28d3862b8
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -0,0 +1,191 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.openapitools.client.model.ReadOnlyFirst;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * ArrayTest
+ */
+@JsonPropertyOrder({
+  ArrayTest.JSON_PROPERTY_ARRAY_OF_STRING,
+  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
+  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ArrayTest {
+  public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
+  private List<String> arrayOfString = null;
+
+  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
+  private List<List<Long>> arrayArrayOfInteger = null;
+
+  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
+  private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
+
+
+  public ArrayTest arrayOfString(List<String> arrayOfString) {
+    
+    this.arrayOfString = arrayOfString;
+    return this;
+  }
+
+  public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
+    if (this.arrayOfString == null) {
+      this.arrayOfString = new ArrayList<String>();
+    }
+    this.arrayOfString.add(arrayOfStringItem);
+    return this;
+  }
+
+   /**
+   * Get arrayOfString
+   * @return arrayOfString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<String> getArrayOfString() {
+    return arrayOfString;
+  }
+
+
+  public void setArrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+  }
+
+
+  public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+    return this;
+  }
+
+  public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
+    if (this.arrayArrayOfInteger == null) {
+      this.arrayArrayOfInteger = new ArrayList<List<Long>>();
+    }
+    this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
+    return this;
+  }
+
+   /**
+   * Get arrayArrayOfInteger
+   * @return arrayArrayOfInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<List<Long>> getArrayArrayOfInteger() {
+    return arrayArrayOfInteger;
+  }
+
+
+  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+  }
+
+
+  public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    
+    this.arrayArrayOfModel = arrayArrayOfModel;
+    return this;
+  }
+
+  public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
+    if (this.arrayArrayOfModel == null) {
+      this.arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
+    }
+    this.arrayArrayOfModel.add(arrayArrayOfModelItem);
+    return this;
+  }
+
+   /**
+   * Get arrayArrayOfModel
+   * @return arrayArrayOfModel
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
+    return arrayArrayOfModel;
+  }
+
+
+  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayTest arrayTest = (ArrayTest) o;
+    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
+        Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
+        Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayTest {\n");
+    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
+    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
+    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/BigCat.java
new file mode 100644
index 000000000000..f038a3a46ad7
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/BigCat.java
@@ -0,0 +1,151 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.BigCatAllOf;
+import org.openapitools.client.model.Cat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * BigCat
+ */
+@JsonPropertyOrder({
+  BigCat.JSON_PROPERTY_KIND
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+})
+
+public class BigCat extends Cat {
+  /**
+   * Gets or Sets kind
+   */
+  public enum KindEnum {
+    LIONS("lions"),
+    
+    TIGERS("tigers"),
+    
+    LEOPARDS("leopards"),
+    
+    JAGUARS("jaguars");
+
+    private String value;
+
+    KindEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static KindEnum fromValue(String value) {
+      for (KindEnum b : KindEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_KIND = "kind";
+  private KindEnum kind;
+
+
+  public BigCat kind(KindEnum kind) {
+    
+    this.kind = kind;
+    return this;
+  }
+
+   /**
+   * Get kind
+   * @return kind
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_KIND)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public KindEnum getKind() {
+    return kind;
+  }
+
+
+  public void setKind(KindEnum kind) {
+    this.kind = kind;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    BigCat bigCat = (BigCat) o;
+    return Objects.equals(this.kind, bigCat.kind) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(kind, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class BigCat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/BigCatAllOf.java
new file mode 100644
index 000000000000..e3b6b0fdd04e
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -0,0 +1,141 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * BigCatAllOf
+ */
+@JsonPropertyOrder({
+  BigCatAllOf.JSON_PROPERTY_KIND
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class BigCatAllOf {
+  /**
+   * Gets or Sets kind
+   */
+  public enum KindEnum {
+    LIONS("lions"),
+    
+    TIGERS("tigers"),
+    
+    LEOPARDS("leopards"),
+    
+    JAGUARS("jaguars");
+
+    private String value;
+
+    KindEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static KindEnum fromValue(String value) {
+      for (KindEnum b : KindEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_KIND = "kind";
+  private KindEnum kind;
+
+
+  public BigCatAllOf kind(KindEnum kind) {
+    
+    this.kind = kind;
+    return this;
+  }
+
+   /**
+   * Get kind
+   * @return kind
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_KIND)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public KindEnum getKind() {
+    return kind;
+  }
+
+
+  public void setKind(KindEnum kind) {
+    this.kind = kind;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    BigCatAllOf bigCatAllOf = (BigCatAllOf) o;
+    return Objects.equals(this.kind, bigCatAllOf.kind);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(kind);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class BigCatAllOf {\n");
+    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
new file mode 100644
index 000000000000..d253e541dede
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -0,0 +1,257 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Capitalization
+ */
+@JsonPropertyOrder({
+  Capitalization.JSON_PROPERTY_SMALL_CAMEL,
+  Capitalization.JSON_PROPERTY_CAPITAL_CAMEL,
+  Capitalization.JSON_PROPERTY_SMALL_SNAKE,
+  Capitalization.JSON_PROPERTY_CAPITAL_SNAKE,
+  Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
+  Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Capitalization {
+  public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
+  private String smallCamel;
+
+  public static final String JSON_PROPERTY_CAPITAL_CAMEL = "CapitalCamel";
+  private String capitalCamel;
+
+  public static final String JSON_PROPERTY_SMALL_SNAKE = "small_Snake";
+  private String smallSnake;
+
+  public static final String JSON_PROPERTY_CAPITAL_SNAKE = "Capital_Snake";
+  private String capitalSnake;
+
+  public static final String JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points";
+  private String scAETHFlowPoints;
+
+  public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME";
+  private String ATT_NAME;
+
+
+  public Capitalization smallCamel(String smallCamel) {
+    
+    this.smallCamel = smallCamel;
+    return this;
+  }
+
+   /**
+   * Get smallCamel
+   * @return smallCamel
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getSmallCamel() {
+    return smallCamel;
+  }
+
+
+  public void setSmallCamel(String smallCamel) {
+    this.smallCamel = smallCamel;
+  }
+
+
+  public Capitalization capitalCamel(String capitalCamel) {
+    
+    this.capitalCamel = capitalCamel;
+    return this;
+  }
+
+   /**
+   * Get capitalCamel
+   * @return capitalCamel
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getCapitalCamel() {
+    return capitalCamel;
+  }
+
+
+  public void setCapitalCamel(String capitalCamel) {
+    this.capitalCamel = capitalCamel;
+  }
+
+
+  public Capitalization smallSnake(String smallSnake) {
+    
+    this.smallSnake = smallSnake;
+    return this;
+  }
+
+   /**
+   * Get smallSnake
+   * @return smallSnake
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getSmallSnake() {
+    return smallSnake;
+  }
+
+
+  public void setSmallSnake(String smallSnake) {
+    this.smallSnake = smallSnake;
+  }
+
+
+  public Capitalization capitalSnake(String capitalSnake) {
+    
+    this.capitalSnake = capitalSnake;
+    return this;
+  }
+
+   /**
+   * Get capitalSnake
+   * @return capitalSnake
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getCapitalSnake() {
+    return capitalSnake;
+  }
+
+
+  public void setCapitalSnake(String capitalSnake) {
+    this.capitalSnake = capitalSnake;
+  }
+
+
+  public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
+    
+    this.scAETHFlowPoints = scAETHFlowPoints;
+    return this;
+  }
+
+   /**
+   * Get scAETHFlowPoints
+   * @return scAETHFlowPoints
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getScAETHFlowPoints() {
+    return scAETHFlowPoints;
+  }
+
+
+  public void setScAETHFlowPoints(String scAETHFlowPoints) {
+    this.scAETHFlowPoints = scAETHFlowPoints;
+  }
+
+
+  public Capitalization ATT_NAME(String ATT_NAME) {
+    
+    this.ATT_NAME = ATT_NAME;
+    return this;
+  }
+
+   /**
+   * Name of the pet 
+   * @return ATT_NAME
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getATTNAME() {
+    return ATT_NAME;
+  }
+
+
+  public void setATTNAME(String ATT_NAME) {
+    this.ATT_NAME = ATT_NAME;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Capitalization capitalization = (Capitalization) o;
+    return Objects.equals(this.smallCamel, capitalization.smallCamel) &&
+        Objects.equals(this.capitalCamel, capitalization.capitalCamel) &&
+        Objects.equals(this.smallSnake, capitalization.smallSnake) &&
+        Objects.equals(this.capitalSnake, capitalization.capitalSnake) &&
+        Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) &&
+        Objects.equals(this.ATT_NAME, capitalization.ATT_NAME);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Capitalization {\n");
+    sb.append("    smallCamel: ").append(toIndentedString(smallCamel)).append("\n");
+    sb.append("    capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n");
+    sb.append("    smallSnake: ").append(toIndentedString(smallSnake)).append("\n");
+    sb.append("    capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n");
+    sb.append("    scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n");
+    sb.append("    ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Cat.java
new file mode 100644
index 000000000000..e07f10082d0e
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Cat.java
@@ -0,0 +1,114 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.BigCat;
+import org.openapitools.client.model.CatAllOf;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Cat
+ */
+@JsonPropertyOrder({
+  Cat.JSON_PROPERTY_DECLAWED
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
+})
+
+public class Cat extends Animal {
+  public static final String JSON_PROPERTY_DECLAWED = "declawed";
+  private Boolean declawed;
+
+
+  public Cat declawed(Boolean declawed) {
+    
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DECLAWED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isDeclawed() {
+    return declawed;
+  }
+
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Cat cat = (Cat) o;
+    return Objects.equals(this.declawed, cat.declawed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
new file mode 100644
index 000000000000..26285427f96c
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -0,0 +1,102 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * CatAllOf
+ */
+@JsonPropertyOrder({
+  CatAllOf.JSON_PROPERTY_DECLAWED
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class CatAllOf {
+  public static final String JSON_PROPERTY_DECLAWED = "declawed";
+  private Boolean declawed;
+
+
+  public CatAllOf declawed(Boolean declawed) {
+    
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DECLAWED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isDeclawed() {
+    return declawed;
+  }
+
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return Objects.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Category.java
new file mode 100644
index 000000000000..de74329bc521
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Category.java
@@ -0,0 +1,132 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Category
+ */
+@JsonPropertyOrder({
+  Category.JSON_PROPERTY_ID,
+  Category.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Category {
+  public static final String JSON_PROPERTY_ID = "id";
+  private Long id;
+
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name = "default-name";
+
+
+  public Category id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public Category name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Category category = (Category) o;
+    return Objects.equals(this.id, category.id) &&
+        Objects.equals(this.name, category.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
new file mode 100644
index 000000000000..bac4aec70b57
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -0,0 +1,103 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Model for testing model with \&quot;_class\&quot; property
+ */
+@ApiModel(description = "Model for testing model with \"_class\" property")
+@JsonPropertyOrder({
+  ClassModel.JSON_PROPERTY_PROPERTY_CLASS
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ClassModel {
+  public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
+  private String propertyClass;
+
+
+  public ClassModel propertyClass(String propertyClass) {
+    
+    this.propertyClass = propertyClass;
+    return this;
+  }
+
+   /**
+   * Get propertyClass
+   * @return propertyClass
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getPropertyClass() {
+    return propertyClass;
+  }
+
+
+  public void setPropertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ClassModel classModel = (ClassModel) o;
+    return Objects.equals(this.propertyClass, classModel.propertyClass);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(propertyClass);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ClassModel {\n");
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Client.java
new file mode 100644
index 000000000000..6bb0d3fab73e
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Client.java
@@ -0,0 +1,102 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Client
+ */
+@JsonPropertyOrder({
+  Client.JSON_PROPERTY_CLIENT
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Client {
+  public static final String JSON_PROPERTY_CLIENT = "client";
+  private String client;
+
+
+  public Client client(String client) {
+    
+    this.client = client;
+    return this;
+  }
+
+   /**
+   * Get client
+   * @return client
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CLIENT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getClient() {
+    return client;
+  }
+
+
+  public void setClient(String client) {
+    this.client = client;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Client client = (Client) o;
+    return Objects.equals(this.client, client.client);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(client);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Client {\n");
+    sb.append("    client: ").append(toIndentedString(client)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Dog.java
new file mode 100644
index 000000000000..edf33abb2b57
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Dog.java
@@ -0,0 +1,112 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Dog
+ */
+@JsonPropertyOrder({
+  Dog.JSON_PROPERTY_BREED
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+})
+
+public class Dog extends Animal {
+  public static final String JSON_PROPERTY_BREED = "breed";
+  private String breed;
+
+
+  public Dog breed(String breed) {
+    
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BREED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getBreed() {
+    return breed;
+  }
+
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Dog dog = (Dog) o;
+    return Objects.equals(this.breed, dog.breed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
new file mode 100644
index 000000000000..147bb4d9b761
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -0,0 +1,102 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * DogAllOf
+ */
+@JsonPropertyOrder({
+  DogAllOf.JSON_PROPERTY_BREED
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class DogAllOf {
+  public static final String JSON_PROPERTY_BREED = "breed";
+  private String breed;
+
+
+  public DogAllOf breed(String breed) {
+    
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BREED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getBreed() {
+    return breed;
+  }
+
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return Objects.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
new file mode 100644
index 000000000000..42c75cb2727d
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -0,0 +1,213 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * EnumArrays
+ */
+@JsonPropertyOrder({
+  EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
+  EnumArrays.JSON_PROPERTY_ARRAY_ENUM
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class EnumArrays {
+  /**
+   * Gets or Sets justSymbol
+   */
+  public enum JustSymbolEnum {
+    GREATER_THAN_OR_EQUAL_TO(">="),
+    
+    DOLLAR("$");
+
+    private String value;
+
+    JustSymbolEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static JustSymbolEnum fromValue(String value) {
+      for (JustSymbolEnum b : JustSymbolEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_JUST_SYMBOL = "just_symbol";
+  private JustSymbolEnum justSymbol;
+
+  /**
+   * Gets or Sets arrayEnum
+   */
+  public enum ArrayEnumEnum {
+    FISH("fish"),
+    
+    CRAB("crab");
+
+    private String value;
+
+    ArrayEnumEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static ArrayEnumEnum fromValue(String value) {
+      for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
+  private List<ArrayEnumEnum> arrayEnum = null;
+
+
+  public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
+    
+    this.justSymbol = justSymbol;
+    return this;
+  }
+
+   /**
+   * Get justSymbol
+   * @return justSymbol
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public JustSymbolEnum getJustSymbol() {
+    return justSymbol;
+  }
+
+
+  public void setJustSymbol(JustSymbolEnum justSymbol) {
+    this.justSymbol = justSymbol;
+  }
+
+
+  public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
+    
+    this.arrayEnum = arrayEnum;
+    return this;
+  }
+
+  public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
+    if (this.arrayEnum == null) {
+      this.arrayEnum = new ArrayList<ArrayEnumEnum>();
+    }
+    this.arrayEnum.add(arrayEnumItem);
+    return this;
+  }
+
+   /**
+   * Get arrayEnum
+   * @return arrayEnum
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<ArrayEnumEnum> getArrayEnum() {
+    return arrayEnum;
+  }
+
+
+  public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
+    this.arrayEnum = arrayEnum;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    EnumArrays enumArrays = (EnumArrays) o;
+    return Objects.equals(this.justSymbol, enumArrays.justSymbol) &&
+        Objects.equals(this.arrayEnum, enumArrays.arrayEnum);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(justSymbol, arrayEnum);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EnumArrays {\n");
+    sb.append("    justSymbol: ").append(toIndentedString(justSymbol)).append("\n");
+    sb.append("    arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/EnumClass.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumClass.java
rename to samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/EnumClass.java
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
new file mode 100644
index 000000000000..75f53d11450c
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -0,0 +1,370 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.OuterEnum;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * EnumTest
+ */
+@JsonPropertyOrder({
+  EnumTest.JSON_PROPERTY_ENUM_STRING,
+  EnumTest.JSON_PROPERTY_ENUM_STRING_REQUIRED,
+  EnumTest.JSON_PROPERTY_ENUM_INTEGER,
+  EnumTest.JSON_PROPERTY_ENUM_NUMBER,
+  EnumTest.JSON_PROPERTY_OUTER_ENUM
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class EnumTest {
+  /**
+   * Gets or Sets enumString
+   */
+  public enum EnumStringEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower"),
+    
+    EMPTY("");
+
+    private String value;
+
+    EnumStringEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumStringEnum fromValue(String value) {
+      for (EnumStringEnum b : EnumStringEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ENUM_STRING = "enum_string";
+  private EnumStringEnum enumString;
+
+  /**
+   * Gets or Sets enumStringRequired
+   */
+  public enum EnumStringRequiredEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower"),
+    
+    EMPTY("");
+
+    private String value;
+
+    EnumStringRequiredEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumStringRequiredEnum fromValue(String value) {
+      for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ENUM_STRING_REQUIRED = "enum_string_required";
+  private EnumStringRequiredEnum enumStringRequired;
+
+  /**
+   * Gets or Sets enumInteger
+   */
+  public enum EnumIntegerEnum {
+    NUMBER_1(1),
+    
+    NUMBER_MINUS_1(-1);
+
+    private Integer value;
+
+    EnumIntegerEnum(Integer value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Integer getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumIntegerEnum fromValue(Integer value) {
+      for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer";
+  private EnumIntegerEnum enumInteger;
+
+  /**
+   * Gets or Sets enumNumber
+   */
+  public enum EnumNumberEnum {
+    NUMBER_1_DOT_1(1.1),
+    
+    NUMBER_MINUS_1_DOT_2(-1.2);
+
+    private Double value;
+
+    EnumNumberEnum(Double value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Double getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumNumberEnum fromValue(Double value) {
+      for (EnumNumberEnum b : EnumNumberEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ENUM_NUMBER = "enum_number";
+  private EnumNumberEnum enumNumber;
+
+  public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum";
+  private OuterEnum outerEnum;
+
+
+  public EnumTest enumString(EnumStringEnum enumString) {
+    
+    this.enumString = enumString;
+    return this;
+  }
+
+   /**
+   * Get enumString
+   * @return enumString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ENUM_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public EnumStringEnum getEnumString() {
+    return enumString;
+  }
+
+
+  public void setEnumString(EnumStringEnum enumString) {
+    this.enumString = enumString;
+  }
+
+
+  public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    
+    this.enumStringRequired = enumStringRequired;
+    return this;
+  }
+
+   /**
+   * Get enumStringRequired
+   * @return enumStringRequired
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public EnumStringRequiredEnum getEnumStringRequired() {
+    return enumStringRequired;
+  }
+
+
+  public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    this.enumStringRequired = enumStringRequired;
+  }
+
+
+  public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
+    
+    this.enumInteger = enumInteger;
+    return this;
+  }
+
+   /**
+   * Get enumInteger
+   * @return enumInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public EnumIntegerEnum getEnumInteger() {
+    return enumInteger;
+  }
+
+
+  public void setEnumInteger(EnumIntegerEnum enumInteger) {
+    this.enumInteger = enumInteger;
+  }
+
+
+  public EnumTest enumNumber(EnumNumberEnum enumNumber) {
+    
+    this.enumNumber = enumNumber;
+    return this;
+  }
+
+   /**
+   * Get enumNumber
+   * @return enumNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public EnumNumberEnum getEnumNumber() {
+    return enumNumber;
+  }
+
+
+  public void setEnumNumber(EnumNumberEnum enumNumber) {
+    this.enumNumber = enumNumber;
+  }
+
+
+  public EnumTest outerEnum(OuterEnum outerEnum) {
+    
+    this.outerEnum = outerEnum;
+    return this;
+  }
+
+   /**
+   * Get outerEnum
+   * @return outerEnum
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OuterEnum getOuterEnum() {
+    return outerEnum;
+  }
+
+
+  public void setOuterEnum(OuterEnum outerEnum) {
+    this.outerEnum = outerEnum;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    EnumTest enumTest = (EnumTest) o;
+    return Objects.equals(this.enumString, enumTest.enumString) &&
+        Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
+        Objects.equals(this.enumInteger, enumTest.enumInteger) &&
+        Objects.equals(this.enumNumber, enumTest.enumNumber) &&
+        Objects.equals(this.outerEnum, enumTest.outerEnum);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EnumTest {\n");
+    sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
+    sb.append("    enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
+    sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
+    sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
+    sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
new file mode 100644
index 000000000000..aae40c4a5a6e
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -0,0 +1,143 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * FileSchemaTestClass
+ */
+@JsonPropertyOrder({
+  FileSchemaTestClass.JSON_PROPERTY_FILE,
+  FileSchemaTestClass.JSON_PROPERTY_FILES
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class FileSchemaTestClass {
+  public static final String JSON_PROPERTY_FILE = "file";
+  private java.io.File file;
+
+  public static final String JSON_PROPERTY_FILES = "files";
+  private List<java.io.File> files = null;
+
+
+  public FileSchemaTestClass file(java.io.File file) {
+    
+    this.file = file;
+    return this;
+  }
+
+   /**
+   * Get file
+   * @return file
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FILE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public java.io.File getFile() {
+    return file;
+  }
+
+
+  public void setFile(java.io.File file) {
+    this.file = file;
+  }
+
+
+  public FileSchemaTestClass files(List<java.io.File> files) {
+    
+    this.files = files;
+    return this;
+  }
+
+  public FileSchemaTestClass addFilesItem(java.io.File filesItem) {
+    if (this.files == null) {
+      this.files = new ArrayList<java.io.File>();
+    }
+    this.files.add(filesItem);
+    return this;
+  }
+
+   /**
+   * Get files
+   * @return files
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FILES)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<java.io.File> getFiles() {
+    return files;
+  }
+
+
+  public void setFiles(List<java.io.File> files) {
+    this.files = files;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o;
+    return Objects.equals(this.file, fileSchemaTestClass.file) &&
+        Objects.equals(this.files, fileSchemaTestClass.files);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(file, files);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FileSchemaTestClass {\n");
+    sb.append("    file: ").append(toIndentedString(file)).append("\n");
+    sb.append("    files: ").append(toIndentedString(files)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
new file mode 100644
index 000000000000..d24c2298054f
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -0,0 +1,516 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.File;
+import java.math.BigDecimal;
+import java.util.UUID;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * FormatTest
+ */
+@JsonPropertyOrder({
+  FormatTest.JSON_PROPERTY_INTEGER,
+  FormatTest.JSON_PROPERTY_INT32,
+  FormatTest.JSON_PROPERTY_INT64,
+  FormatTest.JSON_PROPERTY_NUMBER,
+  FormatTest.JSON_PROPERTY_FLOAT,
+  FormatTest.JSON_PROPERTY_DOUBLE,
+  FormatTest.JSON_PROPERTY_STRING,
+  FormatTest.JSON_PROPERTY_BYTE,
+  FormatTest.JSON_PROPERTY_BINARY,
+  FormatTest.JSON_PROPERTY_DATE,
+  FormatTest.JSON_PROPERTY_DATE_TIME,
+  FormatTest.JSON_PROPERTY_UUID,
+  FormatTest.JSON_PROPERTY_PASSWORD,
+  FormatTest.JSON_PROPERTY_BIG_DECIMAL
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class FormatTest {
+  public static final String JSON_PROPERTY_INTEGER = "integer";
+  private Integer integer;
+
+  public static final String JSON_PROPERTY_INT32 = "int32";
+  private Integer int32;
+
+  public static final String JSON_PROPERTY_INT64 = "int64";
+  private Long int64;
+
+  public static final String JSON_PROPERTY_NUMBER = "number";
+  private BigDecimal number;
+
+  public static final String JSON_PROPERTY_FLOAT = "float";
+  private Float _float;
+
+  public static final String JSON_PROPERTY_DOUBLE = "double";
+  private Double _double;
+
+  public static final String JSON_PROPERTY_STRING = "string";
+  private String string;
+
+  public static final String JSON_PROPERTY_BYTE = "byte";
+  private byte[] _byte;
+
+  public static final String JSON_PROPERTY_BINARY = "binary";
+  private File binary;
+
+  public static final String JSON_PROPERTY_DATE = "date";
+  private LocalDate date;
+
+  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
+  private OffsetDateTime dateTime;
+
+  public static final String JSON_PROPERTY_UUID = "uuid";
+  private UUID uuid;
+
+  public static final String JSON_PROPERTY_PASSWORD = "password";
+  private String password;
+
+  public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
+  private BigDecimal bigDecimal;
+
+
+  public FormatTest integer(Integer integer) {
+    
+    this.integer = integer;
+    return this;
+  }
+
+   /**
+   * Get integer
+   * minimum: 10
+   * maximum: 100
+   * @return integer
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getInteger() {
+    return integer;
+  }
+
+
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+
+  public FormatTest int32(Integer int32) {
+    
+    this.int32 = int32;
+    return this;
+  }
+
+   /**
+   * Get int32
+   * minimum: 20
+   * maximum: 200
+   * @return int32
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_INT32)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getInt32() {
+    return int32;
+  }
+
+
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+
+  public FormatTest int64(Long int64) {
+    
+    this.int64 = int64;
+    return this;
+  }
+
+   /**
+   * Get int64
+   * @return int64
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_INT64)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getInt64() {
+    return int64;
+  }
+
+
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+
+  public FormatTest number(BigDecimal number) {
+    
+    this.number = number;
+    return this;
+  }
+
+   /**
+   * Get number
+   * minimum: 32.1
+   * maximum: 543.2
+   * @return number
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public BigDecimal getNumber() {
+    return number;
+  }
+
+
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+
+  public FormatTest _float(Float _float) {
+    
+    this._float = _float;
+    return this;
+  }
+
+   /**
+   * Get _float
+   * minimum: 54.3
+   * maximum: 987.6
+   * @return _float
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FLOAT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Float getFloat() {
+    return _float;
+  }
+
+
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+
+  public FormatTest _double(Double _double) {
+    
+    this._double = _double;
+    return this;
+  }
+
+   /**
+   * Get _double
+   * minimum: 67.8
+   * maximum: 123.4
+   * @return _double
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DOUBLE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Double getDouble() {
+    return _double;
+  }
+
+
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+
+  public FormatTest string(String string) {
+    
+    this.string = string;
+    return this;
+  }
+
+   /**
+   * Get string
+   * @return string
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getString() {
+    return string;
+  }
+
+
+  public void setString(String string) {
+    this.string = string;
+  }
+
+
+  public FormatTest _byte(byte[] _byte) {
+    
+    this._byte = _byte;
+    return this;
+  }
+
+   /**
+   * Get _byte
+   * @return _byte
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_BYTE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public byte[] getByte() {
+    return _byte;
+  }
+
+
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+
+  public FormatTest binary(File binary) {
+    
+    this.binary = binary;
+    return this;
+  }
+
+   /**
+   * Get binary
+   * @return binary
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BINARY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public File getBinary() {
+    return binary;
+  }
+
+
+  public void setBinary(File binary) {
+    this.binary = binary;
+  }
+
+
+  public FormatTest date(LocalDate date) {
+    
+    this.date = date;
+    return this;
+  }
+
+   /**
+   * Get date
+   * @return date
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_DATE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public LocalDate getDate() {
+    return date;
+  }
+
+
+  public void setDate(LocalDate date) {
+    this.date = date;
+  }
+
+
+  public FormatTest dateTime(OffsetDateTime dateTime) {
+    
+    this.dateTime = dateTime;
+    return this;
+  }
+
+   /**
+   * Get dateTime
+   * @return dateTime
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DATE_TIME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OffsetDateTime getDateTime() {
+    return dateTime;
+  }
+
+
+  public void setDateTime(OffsetDateTime dateTime) {
+    this.dateTime = dateTime;
+  }
+
+
+  public FormatTest uuid(UUID uuid) {
+    
+    this.uuid = uuid;
+    return this;
+  }
+
+   /**
+   * Get uuid
+   * @return uuid
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty(JSON_PROPERTY_UUID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public UUID getUuid() {
+    return uuid;
+  }
+
+
+  public void setUuid(UUID uuid) {
+    this.uuid = uuid;
+  }
+
+
+  public FormatTest password(String password) {
+    
+    this.password = password;
+    return this;
+  }
+
+   /**
+   * Get password
+   * @return password
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_PASSWORD)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getPassword() {
+    return password;
+  }
+
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  public FormatTest bigDecimal(BigDecimal bigDecimal) {
+    
+    this.bigDecimal = bigDecimal;
+    return this;
+  }
+
+   /**
+   * Get bigDecimal
+   * @return bigDecimal
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getBigDecimal() {
+    return bigDecimal;
+  }
+
+
+  public void setBigDecimal(BigDecimal bigDecimal) {
+    this.bigDecimal = bigDecimal;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FormatTest formatTest = (FormatTest) o;
+    return Objects.equals(this.integer, formatTest.integer) &&
+        Objects.equals(this.int32, formatTest.int32) &&
+        Objects.equals(this.int64, formatTest.int64) &&
+        Objects.equals(this.number, formatTest.number) &&
+        Objects.equals(this._float, formatTest._float) &&
+        Objects.equals(this._double, formatTest._double) &&
+        Objects.equals(this.string, formatTest.string) &&
+        Arrays.equals(this._byte, formatTest._byte) &&
+        Objects.equals(this.binary, formatTest.binary) &&
+        Objects.equals(this.date, formatTest.date) &&
+        Objects.equals(this.dateTime, formatTest.dateTime) &&
+        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this.password, formatTest.password) &&
+        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
+    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
+    sb.append("    number: ").append(toIndentedString(number)).append("\n");
+    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
+    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
+    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
+    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
+    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
new file mode 100644
index 000000000000..741ab2441d34
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -0,0 +1,115 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * HasOnlyReadOnly
+ */
+@JsonPropertyOrder({
+  HasOnlyReadOnly.JSON_PROPERTY_BAR,
+  HasOnlyReadOnly.JSON_PROPERTY_FOO
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class HasOnlyReadOnly {
+  public static final String JSON_PROPERTY_BAR = "bar";
+  private String bar;
+
+  public static final String JSON_PROPERTY_FOO = "foo";
+  private String foo;
+
+
+   /**
+   * Get bar
+   * @return bar
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BAR)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getBar() {
+    return bar;
+  }
+
+
+
+
+   /**
+   * Get foo
+   * @return foo
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FOO)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getFoo() {
+    return foo;
+  }
+
+
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o;
+    return Objects.equals(this.bar, hasOnlyReadOnly.bar) &&
+        Objects.equals(this.foo, hasOnlyReadOnly.foo);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, foo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class HasOnlyReadOnly {\n");
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    foo: ").append(toIndentedString(foo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
new file mode 100644
index 000000000000..9621c8220b71
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
@@ -0,0 +1,265 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * MapTest
+ */
+@JsonPropertyOrder({
+  MapTest.JSON_PROPERTY_MAP_MAP_OF_STRING,
+  MapTest.JSON_PROPERTY_MAP_OF_ENUM_STRING,
+  MapTest.JSON_PROPERTY_DIRECT_MAP,
+  MapTest.JSON_PROPERTY_INDIRECT_MAP
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class MapTest {
+  public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
+  private Map<String, Map<String, String>> mapMapOfString = null;
+
+  /**
+   * Gets or Sets inner
+   */
+  public enum InnerEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower");
+
+    private String value;
+
+    InnerEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static InnerEnum fromValue(String value) {
+      for (InnerEnum b : InnerEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string";
+  private Map<String, InnerEnum> mapOfEnumString = null;
+
+  public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map";
+  private Map<String, Boolean> directMap = null;
+
+  public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
+  private Map<String, Boolean> indirectMap = null;
+
+
+  public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
+    
+    this.mapMapOfString = mapMapOfString;
+    return this;
+  }
+
+  public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
+    if (this.mapMapOfString == null) {
+      this.mapMapOfString = new HashMap<String, Map<String, String>>();
+    }
+    this.mapMapOfString.put(key, mapMapOfStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapMapOfString
+   * @return mapMapOfString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Map<String, String>> getMapMapOfString() {
+    return mapMapOfString;
+  }
+
+
+  public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
+    this.mapMapOfString = mapMapOfString;
+  }
+
+
+  public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
+    
+    this.mapOfEnumString = mapOfEnumString;
+    return this;
+  }
+
+  public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
+    if (this.mapOfEnumString == null) {
+      this.mapOfEnumString = new HashMap<String, InnerEnum>();
+    }
+    this.mapOfEnumString.put(key, mapOfEnumStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapOfEnumString
+   * @return mapOfEnumString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, InnerEnum> getMapOfEnumString() {
+    return mapOfEnumString;
+  }
+
+
+  public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
+    this.mapOfEnumString = mapOfEnumString;
+  }
+
+
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+
+  public MapTest indirectMap(Map<String, Boolean> indirectMap) {
+    
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+  public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
+    if (this.indirectMap == null) {
+      this.indirectMap = new HashMap<String, Boolean>();
+    }
+    this.indirectMap.put(key, indirectMapItem);
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Boolean> getIndirectMap() {
+    return indirectMap;
+  }
+
+
+  public void setIndirectMap(Map<String, Boolean> indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MapTest mapTest = (MapTest) o;
+    return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MapTest {\n");
+    sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
+    sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
new file mode 100644
index 000000000000..3ccd9310b55c
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -0,0 +1,178 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.openapitools.client.model.Animal;
+import org.threeten.bp.OffsetDateTime;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * MixedPropertiesAndAdditionalPropertiesClass
+ */
+@JsonPropertyOrder({
+  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_UUID,
+  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
+  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class MixedPropertiesAndAdditionalPropertiesClass {
+  public static final String JSON_PROPERTY_UUID = "uuid";
+  private UUID uuid;
+
+  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
+  private OffsetDateTime dateTime;
+
+  public static final String JSON_PROPERTY_MAP = "map";
+  private Map<String, Animal> map = null;
+
+
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+    
+    this.uuid = uuid;
+    return this;
+  }
+
+   /**
+   * Get uuid
+   * @return uuid
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_UUID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public UUID getUuid() {
+    return uuid;
+  }
+
+
+  public void setUuid(UUID uuid) {
+    this.uuid = uuid;
+  }
+
+
+  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+    
+    this.dateTime = dateTime;
+    return this;
+  }
+
+   /**
+   * Get dateTime
+   * @return dateTime
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DATE_TIME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OffsetDateTime getDateTime() {
+    return dateTime;
+  }
+
+
+  public void setDateTime(OffsetDateTime dateTime) {
+    this.dateTime = dateTime;
+  }
+
+
+  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+    
+    this.map = map;
+    return this;
+  }
+
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
+    if (this.map == null) {
+      this.map = new HashMap<String, Animal>();
+    }
+    this.map.put(key, mapItem);
+    return this;
+  }
+
+   /**
+   * Get map
+   * @return map
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Animal> getMap() {
+    return map;
+  }
+
+
+  public void setMap(Map<String, Animal> map) {
+    this.map = map;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
+    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
+        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
+        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(uuid, dateTime, map);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
new file mode 100644
index 000000000000..3b952b2730bf
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -0,0 +1,134 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Model for testing model name starting with number
+ */
+@ApiModel(description = "Model for testing model name starting with number")
+@JsonPropertyOrder({
+  Model200Response.JSON_PROPERTY_NAME,
+  Model200Response.JSON_PROPERTY_PROPERTY_CLASS
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Model200Response {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private Integer name;
+
+  public static final String JSON_PROPERTY_PROPERTY_CLASS = "class";
+  private String propertyClass;
+
+
+  public Model200Response name(Integer name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getName() {
+    return name;
+  }
+
+
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+
+  public Model200Response propertyClass(String propertyClass) {
+    
+    this.propertyClass = propertyClass;
+    return this;
+  }
+
+   /**
+   * Get propertyClass
+   * @return propertyClass
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getPropertyClass() {
+    return propertyClass;
+  }
+
+
+  public void setPropertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Model200Response _200response = (Model200Response) o;
+    return Objects.equals(this.name, _200response.name) &&
+        Objects.equals(this.propertyClass, _200response.propertyClass);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, propertyClass);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
new file mode 100644
index 000000000000..dd401709d75d
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -0,0 +1,164 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * ModelApiResponse
+ */
+@JsonPropertyOrder({
+  ModelApiResponse.JSON_PROPERTY_CODE,
+  ModelApiResponse.JSON_PROPERTY_TYPE,
+  ModelApiResponse.JSON_PROPERTY_MESSAGE
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ModelApiResponse {
+  public static final String JSON_PROPERTY_CODE = "code";
+  private Integer code;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private String type;
+
+  public static final String JSON_PROPERTY_MESSAGE = "message";
+  private String message;
+
+
+  public ModelApiResponse code(Integer code) {
+    
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * Get code
+   * @return code
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CODE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getCode() {
+    return code;
+  }
+
+
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+
+
+  public ModelApiResponse type(String type) {
+    
+    this.type = type;
+    return this;
+  }
+
+   /**
+   * Get type
+   * @return type
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getType() {
+    return type;
+  }
+
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+
+  public ModelApiResponse message(String message) {
+    
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * Get message
+   * @return message
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MESSAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getMessage() {
+    return message;
+  }
+
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelApiResponse _apiResponse = (ModelApiResponse) o;
+    return Objects.equals(this.code, _apiResponse.code) &&
+        Objects.equals(this.type, _apiResponse.type) &&
+        Objects.equals(this.message, _apiResponse.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(code, type, message);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelApiResponse {\n");
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
new file mode 100644
index 000000000000..733ec3718a15
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -0,0 +1,103 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Model for testing reserved words
+ */
+@ApiModel(description = "Model for testing reserved words")
+@JsonPropertyOrder({
+  ModelReturn.JSON_PROPERTY_RETURN
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ModelReturn {
+  public static final String JSON_PROPERTY_RETURN = "return";
+  private Integer _return;
+
+
+  public ModelReturn _return(Integer _return) {
+    
+    this._return = _return;
+    return this;
+  }
+
+   /**
+   * Get _return
+   * @return _return
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_RETURN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getReturn() {
+    return _return;
+  }
+
+
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelReturn _return = (ModelReturn) o;
+    return Objects.equals(this._return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Name.java
new file mode 100644
index 000000000000..8c03d816bff7
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Name.java
@@ -0,0 +1,177 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Model for testing model name same as property name
+ */
+@ApiModel(description = "Model for testing model name same as property name")
+@JsonPropertyOrder({
+  Name.JSON_PROPERTY_NAME,
+  Name.JSON_PROPERTY_SNAKE_CASE,
+  Name.JSON_PROPERTY_PROPERTY,
+  Name.JSON_PROPERTY_123NUMBER
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Name {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private Integer name;
+
+  public static final String JSON_PROPERTY_SNAKE_CASE = "snake_case";
+  private Integer snakeCase;
+
+  public static final String JSON_PROPERTY_PROPERTY = "property";
+  private String property;
+
+  public static final String JSON_PROPERTY_123NUMBER = "123Number";
+  private Integer _123number;
+
+
+  public Name name(Integer name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Integer getName() {
+    return name;
+  }
+
+
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+
+   /**
+   * Get snakeCase
+   * @return snakeCase
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+
+
+
+
+  public Name property(String property) {
+    
+    this.property = property;
+    return this;
+  }
+
+   /**
+   * Get property
+   * @return property
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PROPERTY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getProperty() {
+    return property;
+  }
+
+
+  public void setProperty(String property) {
+    this.property = property;
+  }
+
+
+   /**
+   * Get _123number
+   * @return _123number
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_123NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer get123number() {
+    return _123number;
+  }
+
+
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Name name = (Name) o;
+    return Objects.equals(this.name, name.name) &&
+        Objects.equals(this.snakeCase, name.snakeCase) &&
+        Objects.equals(this.property, name.property) &&
+        Objects.equals(this._123number, name._123number);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, snakeCase, property, _123number);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
+    sb.append("    property: ").append(toIndentedString(property)).append("\n");
+    sb.append("    _123number: ").append(toIndentedString(_123number)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
new file mode 100644
index 000000000000..45f21901673f
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -0,0 +1,103 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * NumberOnly
+ */
+@JsonPropertyOrder({
+  NumberOnly.JSON_PROPERTY_JUST_NUMBER
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class NumberOnly {
+  public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
+  private BigDecimal justNumber;
+
+
+  public NumberOnly justNumber(BigDecimal justNumber) {
+    
+    this.justNumber = justNumber;
+    return this;
+  }
+
+   /**
+   * Get justNumber
+   * @return justNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getJustNumber() {
+    return justNumber;
+  }
+
+
+  public void setJustNumber(BigDecimal justNumber) {
+    this.justNumber = justNumber;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    NumberOnly numberOnly = (NumberOnly) o;
+    return Objects.equals(this.justNumber, numberOnly.justNumber);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(justNumber);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class NumberOnly {\n");
+    sb.append("    justNumber: ").append(toIndentedString(justNumber)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Order.java
new file mode 100644
index 000000000000..3d5229525795
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Order.java
@@ -0,0 +1,295 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.threeten.bp.OffsetDateTime;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Order
+ */
+@JsonPropertyOrder({
+  Order.JSON_PROPERTY_ID,
+  Order.JSON_PROPERTY_PET_ID,
+  Order.JSON_PROPERTY_QUANTITY,
+  Order.JSON_PROPERTY_SHIP_DATE,
+  Order.JSON_PROPERTY_STATUS,
+  Order.JSON_PROPERTY_COMPLETE
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Order {
+  public static final String JSON_PROPERTY_ID = "id";
+  private Long id;
+
+  public static final String JSON_PROPERTY_PET_ID = "petId";
+  private Long petId;
+
+  public static final String JSON_PROPERTY_QUANTITY = "quantity";
+  private Integer quantity;
+
+  public static final String JSON_PROPERTY_SHIP_DATE = "shipDate";
+  private OffsetDateTime shipDate;
+
+  /**
+   * Order Status
+   */
+  public enum StatusEnum {
+    PLACED("placed"),
+    
+    APPROVED("approved"),
+    
+    DELIVERED("delivered");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static StatusEnum fromValue(String value) {
+      for (StatusEnum b : StatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_STATUS = "status";
+  private StatusEnum status;
+
+  public static final String JSON_PROPERTY_COMPLETE = "complete";
+  private Boolean complete = false;
+
+
+  public Order id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public Order petId(Long petId) {
+    
+    this.petId = petId;
+    return this;
+  }
+
+   /**
+   * Get petId
+   * @return petId
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PET_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getPetId() {
+    return petId;
+  }
+
+
+  public void setPetId(Long petId) {
+    this.petId = petId;
+  }
+
+
+  public Order quantity(Integer quantity) {
+    
+    this.quantity = quantity;
+    return this;
+  }
+
+   /**
+   * Get quantity
+   * @return quantity
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_QUANTITY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getQuantity() {
+    return quantity;
+  }
+
+
+  public void setQuantity(Integer quantity) {
+    this.quantity = quantity;
+  }
+
+
+  public Order shipDate(OffsetDateTime shipDate) {
+    
+    this.shipDate = shipDate;
+    return this;
+  }
+
+   /**
+   * Get shipDate
+   * @return shipDate
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SHIP_DATE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OffsetDateTime getShipDate() {
+    return shipDate;
+  }
+
+
+  public void setShipDate(OffsetDateTime shipDate) {
+    this.shipDate = shipDate;
+  }
+
+
+  public Order status(StatusEnum status) {
+    
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * Order Status
+   * @return status
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "Order Status")
+  @JsonProperty(JSON_PROPERTY_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public StatusEnum getStatus() {
+    return status;
+  }
+
+
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+
+  public Order complete(Boolean complete) {
+    
+    this.complete = complete;
+    return this;
+  }
+
+   /**
+   * Get complete
+   * @return complete
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_COMPLETE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isComplete() {
+    return complete;
+  }
+
+
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Order order = (Order) o;
+    return Objects.equals(this.id, order.id) &&
+        Objects.equals(this.petId, order.petId) &&
+        Objects.equals(this.quantity, order.quantity) &&
+        Objects.equals(this.shipDate, order.shipDate) &&
+        Objects.equals(this.status, order.status) &&
+        Objects.equals(this.complete, order.complete);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Order {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
+    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
+    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
new file mode 100644
index 000000000000..b644cc6817dc
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -0,0 +1,165 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * OuterComposite
+ */
+@JsonPropertyOrder({
+  OuterComposite.JSON_PROPERTY_MY_NUMBER,
+  OuterComposite.JSON_PROPERTY_MY_STRING,
+  OuterComposite.JSON_PROPERTY_MY_BOOLEAN
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class OuterComposite {
+  public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
+  private BigDecimal myNumber;
+
+  public static final String JSON_PROPERTY_MY_STRING = "my_string";
+  private String myString;
+
+  public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean";
+  private Boolean myBoolean;
+
+
+  public OuterComposite myNumber(BigDecimal myNumber) {
+    
+    this.myNumber = myNumber;
+    return this;
+  }
+
+   /**
+   * Get myNumber
+   * @return myNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MY_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getMyNumber() {
+    return myNumber;
+  }
+
+
+  public void setMyNumber(BigDecimal myNumber) {
+    this.myNumber = myNumber;
+  }
+
+
+  public OuterComposite myString(String myString) {
+    
+    this.myString = myString;
+    return this;
+  }
+
+   /**
+   * Get myString
+   * @return myString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MY_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getMyString() {
+    return myString;
+  }
+
+
+  public void setMyString(String myString) {
+    this.myString = myString;
+  }
+
+
+  public OuterComposite myBoolean(Boolean myBoolean) {
+    
+    this.myBoolean = myBoolean;
+    return this;
+  }
+
+   /**
+   * Get myBoolean
+   * @return myBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isMyBoolean() {
+    return myBoolean;
+  }
+
+
+  public void setMyBoolean(Boolean myBoolean) {
+    this.myBoolean = myBoolean;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    OuterComposite outerComposite = (OuterComposite) o;
+    return Objects.equals(this.myNumber, outerComposite.myNumber) &&
+        Objects.equals(this.myString, outerComposite.myString) &&
+        Objects.equals(this.myBoolean, outerComposite.myBoolean);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(myNumber, myString, myBoolean);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OuterComposite {\n");
+    sb.append("    myNumber: ").append(toIndentedString(myNumber)).append("\n");
+    sb.append("    myString: ").append(toIndentedString(myString)).append("\n");
+    sb.append("    myBoolean: ").append(toIndentedString(myBoolean)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/OuterEnum.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterEnum.java
rename to samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/OuterEnum.java
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Pet.java
new file mode 100644
index 000000000000..26446f5b488e
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Pet.java
@@ -0,0 +1,311 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.openapitools.client.model.Category;
+import org.openapitools.client.model.Tag;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Pet
+ */
+@JsonPropertyOrder({
+  Pet.JSON_PROPERTY_ID,
+  Pet.JSON_PROPERTY_CATEGORY,
+  Pet.JSON_PROPERTY_NAME,
+  Pet.JSON_PROPERTY_PHOTO_URLS,
+  Pet.JSON_PROPERTY_TAGS,
+  Pet.JSON_PROPERTY_STATUS
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Pet {
+  public static final String JSON_PROPERTY_ID = "id";
+  private Long id;
+
+  public static final String JSON_PROPERTY_CATEGORY = "category";
+  private Category category;
+
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+  public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
+  private Set<String> photoUrls = new LinkedHashSet<String>();
+
+  public static final String JSON_PROPERTY_TAGS = "tags";
+  private List<Tag> tags = null;
+
+  /**
+   * pet status in the store
+   */
+  public enum StatusEnum {
+    AVAILABLE("available"),
+    
+    PENDING("pending"),
+    
+    SOLD("sold");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static StatusEnum fromValue(String value) {
+      for (StatusEnum b : StatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_STATUS = "status";
+  private StatusEnum status;
+
+
+  public Pet id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public Pet category(Category category) {
+    
+    this.category = category;
+    return this;
+  }
+
+   /**
+   * Get category
+   * @return category
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CATEGORY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Category getCategory() {
+    return category;
+  }
+
+
+  public void setCategory(Category category) {
+    this.category = category;
+  }
+
+
+  public Pet name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  public Pet photoUrls(Set<String> photoUrls) {
+    
+    this.photoUrls = photoUrls;
+    return this;
+  }
+
+  public Pet addPhotoUrlsItem(String photoUrlsItem) {
+    this.photoUrls.add(photoUrlsItem);
+    return this;
+  }
+
+   /**
+   * Get photoUrls
+   * @return photoUrls
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Set<String> getPhotoUrls() {
+    return photoUrls;
+  }
+
+
+  public void setPhotoUrls(Set<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+
+  public Pet tags(List<Tag> tags) {
+    
+    this.tags = tags;
+    return this;
+  }
+
+  public Pet addTagsItem(Tag tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<Tag>();
+    }
+    this.tags.add(tagsItem);
+    return this;
+  }
+
+   /**
+   * Get tags
+   * @return tags
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_TAGS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Tag> getTags() {
+    return tags;
+  }
+
+
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+
+  public Pet status(StatusEnum status) {
+    
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * pet status in the store
+   * @return status
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty(JSON_PROPERTY_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public StatusEnum getStatus() {
+    return status;
+  }
+
+
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Pet pet = (Pet) o;
+    return Objects.equals(this.id, pet.id) &&
+        Objects.equals(this.category, pet.category) &&
+        Objects.equals(this.name, pet.name) &&
+        Objects.equals(this.photoUrls, pet.photoUrls) &&
+        Objects.equals(this.tags, pet.tags) &&
+        Objects.equals(this.status, pet.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, category, name, photoUrls, tags, status);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Pet {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
new file mode 100644
index 000000000000..e5f23ef5dcfe
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -0,0 +1,124 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * ReadOnlyFirst
+ */
+@JsonPropertyOrder({
+  ReadOnlyFirst.JSON_PROPERTY_BAR,
+  ReadOnlyFirst.JSON_PROPERTY_BAZ
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ReadOnlyFirst {
+  public static final String JSON_PROPERTY_BAR = "bar";
+  private String bar;
+
+  public static final String JSON_PROPERTY_BAZ = "baz";
+  private String baz;
+
+
+   /**
+   * Get bar
+   * @return bar
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BAR)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getBar() {
+    return bar;
+  }
+
+
+
+
+  public ReadOnlyFirst baz(String baz) {
+    
+    this.baz = baz;
+    return this;
+  }
+
+   /**
+   * Get baz
+   * @return baz
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BAZ)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getBaz() {
+    return baz;
+  }
+
+
+  public void setBaz(String baz) {
+    this.baz = baz;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
+    return Objects.equals(this.bar, readOnlyFirst.bar) &&
+        Objects.equals(this.baz, readOnlyFirst.baz);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, baz);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ReadOnlyFirst {\n");
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    baz: ").append(toIndentedString(baz)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
new file mode 100644
index 000000000000..e60f8a8104d6
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -0,0 +1,102 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * SpecialModelName
+ */
+@JsonPropertyOrder({
+  SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class SpecialModelName {
+  public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
+  private Long $specialPropertyName;
+
+
+  public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
+    
+    this.$specialPropertyName = $specialPropertyName;
+    return this;
+  }
+
+   /**
+   * Get $specialPropertyName
+   * @return $specialPropertyName
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long get$SpecialPropertyName() {
+    return $specialPropertyName;
+  }
+
+
+  public void set$SpecialPropertyName(Long $specialPropertyName) {
+    this.$specialPropertyName = $specialPropertyName;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SpecialModelName $specialModelName = (SpecialModelName) o;
+    return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash($specialPropertyName);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    sb.append("    $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Tag.java
new file mode 100644
index 000000000000..b15dc0d14fc6
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/Tag.java
@@ -0,0 +1,133 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Tag
+ */
+@JsonPropertyOrder({
+  Tag.JSON_PROPERTY_ID,
+  Tag.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Tag {
+  public static final String JSON_PROPERTY_ID = "id";
+  private Long id;
+
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public Tag id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public Tag name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Tag tag = (Tag) o;
+    return Objects.equals(this.id, tag.id) &&
+        Objects.equals(this.name, tag.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Tag {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
new file mode 100644
index 000000000000..27199d76de1f
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -0,0 +1,229 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * TypeHolderDefault
+ */
+@JsonPropertyOrder({
+  TypeHolderDefault.JSON_PROPERTY_STRING_ITEM,
+  TypeHolderDefault.JSON_PROPERTY_NUMBER_ITEM,
+  TypeHolderDefault.JSON_PROPERTY_INTEGER_ITEM,
+  TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
+  TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class TypeHolderDefault {
+  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
+  private String stringItem = "what";
+
+  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
+  private BigDecimal numberItem;
+
+  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
+  private Integer integerItem;
+
+  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
+  private Boolean boolItem = true;
+
+  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
+  private List<Integer> arrayItem = new ArrayList<Integer>();
+
+
+  public TypeHolderDefault stringItem(String stringItem) {
+    
+    this.stringItem = stringItem;
+    return this;
+  }
+
+   /**
+   * Get stringItem
+   * @return stringItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getStringItem() {
+    return stringItem;
+  }
+
+
+  public void setStringItem(String stringItem) {
+    this.stringItem = stringItem;
+  }
+
+
+  public TypeHolderDefault numberItem(BigDecimal numberItem) {
+    
+    this.numberItem = numberItem;
+    return this;
+  }
+
+   /**
+   * Get numberItem
+   * @return numberItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public BigDecimal getNumberItem() {
+    return numberItem;
+  }
+
+
+  public void setNumberItem(BigDecimal numberItem) {
+    this.numberItem = numberItem;
+  }
+
+
+  public TypeHolderDefault integerItem(Integer integerItem) {
+    
+    this.integerItem = integerItem;
+    return this;
+  }
+
+   /**
+   * Get integerItem
+   * @return integerItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Integer getIntegerItem() {
+    return integerItem;
+  }
+
+
+  public void setIntegerItem(Integer integerItem) {
+    this.integerItem = integerItem;
+  }
+
+
+  public TypeHolderDefault boolItem(Boolean boolItem) {
+    
+    this.boolItem = boolItem;
+    return this;
+  }
+
+   /**
+   * Get boolItem
+   * @return boolItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Boolean isBoolItem() {
+    return boolItem;
+  }
+
+
+  public void setBoolItem(Boolean boolItem) {
+    this.boolItem = boolItem;
+  }
+
+
+  public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
+    
+    this.arrayItem = arrayItem;
+    return this;
+  }
+
+  public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
+    this.arrayItem.add(arrayItemItem);
+    return this;
+  }
+
+   /**
+   * Get arrayItem
+   * @return arrayItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public List<Integer> getArrayItem() {
+    return arrayItem;
+  }
+
+
+  public void setArrayItem(List<Integer> arrayItem) {
+    this.arrayItem = arrayItem;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o;
+    return Objects.equals(this.stringItem, typeHolderDefault.stringItem) &&
+        Objects.equals(this.numberItem, typeHolderDefault.numberItem) &&
+        Objects.equals(this.integerItem, typeHolderDefault.integerItem) &&
+        Objects.equals(this.boolItem, typeHolderDefault.boolItem) &&
+        Objects.equals(this.arrayItem, typeHolderDefault.arrayItem);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class TypeHolderDefault {\n");
+    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
+    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
+    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
+    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
+    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
new file mode 100644
index 000000000000..f87fb944b9b4
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -0,0 +1,259 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * TypeHolderExample
+ */
+@JsonPropertyOrder({
+  TypeHolderExample.JSON_PROPERTY_STRING_ITEM,
+  TypeHolderExample.JSON_PROPERTY_NUMBER_ITEM,
+  TypeHolderExample.JSON_PROPERTY_FLOAT_ITEM,
+  TypeHolderExample.JSON_PROPERTY_INTEGER_ITEM,
+  TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
+  TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class TypeHolderExample {
+  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
+  private String stringItem;
+
+  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
+  private BigDecimal numberItem;
+
+  public static final String JSON_PROPERTY_FLOAT_ITEM = "float_item";
+  private Float floatItem;
+
+  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
+  private Integer integerItem;
+
+  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
+  private Boolean boolItem;
+
+  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
+  private List<Integer> arrayItem = new ArrayList<Integer>();
+
+
+  public TypeHolderExample stringItem(String stringItem) {
+    
+    this.stringItem = stringItem;
+    return this;
+  }
+
+   /**
+   * Get stringItem
+   * @return stringItem
+  **/
+  @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getStringItem() {
+    return stringItem;
+  }
+
+
+  public void setStringItem(String stringItem) {
+    this.stringItem = stringItem;
+  }
+
+
+  public TypeHolderExample numberItem(BigDecimal numberItem) {
+    
+    this.numberItem = numberItem;
+    return this;
+  }
+
+   /**
+   * Get numberItem
+   * @return numberItem
+  **/
+  @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public BigDecimal getNumberItem() {
+    return numberItem;
+  }
+
+
+  public void setNumberItem(BigDecimal numberItem) {
+    this.numberItem = numberItem;
+  }
+
+
+  public TypeHolderExample floatItem(Float floatItem) {
+    
+    this.floatItem = floatItem;
+    return this;
+  }
+
+   /**
+   * Get floatItem
+   * @return floatItem
+  **/
+  @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Float getFloatItem() {
+    return floatItem;
+  }
+
+
+  public void setFloatItem(Float floatItem) {
+    this.floatItem = floatItem;
+  }
+
+
+  public TypeHolderExample integerItem(Integer integerItem) {
+    
+    this.integerItem = integerItem;
+    return this;
+  }
+
+   /**
+   * Get integerItem
+   * @return integerItem
+  **/
+  @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Integer getIntegerItem() {
+    return integerItem;
+  }
+
+
+  public void setIntegerItem(Integer integerItem) {
+    this.integerItem = integerItem;
+  }
+
+
+  public TypeHolderExample boolItem(Boolean boolItem) {
+    
+    this.boolItem = boolItem;
+    return this;
+  }
+
+   /**
+   * Get boolItem
+   * @return boolItem
+  **/
+  @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Boolean isBoolItem() {
+    return boolItem;
+  }
+
+
+  public void setBoolItem(Boolean boolItem) {
+    this.boolItem = boolItem;
+  }
+
+
+  public TypeHolderExample arrayItem(List<Integer> arrayItem) {
+    
+    this.arrayItem = arrayItem;
+    return this;
+  }
+
+  public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
+    this.arrayItem.add(arrayItemItem);
+    return this;
+  }
+
+   /**
+   * Get arrayItem
+   * @return arrayItem
+  **/
+  @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public List<Integer> getArrayItem() {
+    return arrayItem;
+  }
+
+
+  public void setArrayItem(List<Integer> arrayItem) {
+    this.arrayItem = arrayItem;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TypeHolderExample typeHolderExample = (TypeHolderExample) o;
+    return Objects.equals(this.stringItem, typeHolderExample.stringItem) &&
+        Objects.equals(this.numberItem, typeHolderExample.numberItem) &&
+        Objects.equals(this.floatItem, typeHolderExample.floatItem) &&
+        Objects.equals(this.integerItem, typeHolderExample.integerItem) &&
+        Objects.equals(this.boolItem, typeHolderExample.boolItem) &&
+        Objects.equals(this.arrayItem, typeHolderExample.arrayItem);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class TypeHolderExample {\n");
+    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
+    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
+    sb.append("    floatItem: ").append(toIndentedString(floatItem)).append("\n");
+    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
+    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
+    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/User.java
new file mode 100644
index 000000000000..eafdd902c04d
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/User.java
@@ -0,0 +1,319 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * User
+ */
+@JsonPropertyOrder({
+  User.JSON_PROPERTY_ID,
+  User.JSON_PROPERTY_USERNAME,
+  User.JSON_PROPERTY_FIRST_NAME,
+  User.JSON_PROPERTY_LAST_NAME,
+  User.JSON_PROPERTY_EMAIL,
+  User.JSON_PROPERTY_PASSWORD,
+  User.JSON_PROPERTY_PHONE,
+  User.JSON_PROPERTY_USER_STATUS
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class User {
+  public static final String JSON_PROPERTY_ID = "id";
+  private Long id;
+
+  public static final String JSON_PROPERTY_USERNAME = "username";
+  private String username;
+
+  public static final String JSON_PROPERTY_FIRST_NAME = "firstName";
+  private String firstName;
+
+  public static final String JSON_PROPERTY_LAST_NAME = "lastName";
+  private String lastName;
+
+  public static final String JSON_PROPERTY_EMAIL = "email";
+  private String email;
+
+  public static final String JSON_PROPERTY_PASSWORD = "password";
+  private String password;
+
+  public static final String JSON_PROPERTY_PHONE = "phone";
+  private String phone;
+
+  public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
+  private Integer userStatus;
+
+
+  public User id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public User username(String username) {
+    
+    this.username = username;
+    return this;
+  }
+
+   /**
+   * Get username
+   * @return username
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_USERNAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getUsername() {
+    return username;
+  }
+
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+
+  public User firstName(String firstName) {
+    
+    this.firstName = firstName;
+    return this;
+  }
+
+   /**
+   * Get firstName
+   * @return firstName
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FIRST_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getFirstName() {
+    return firstName;
+  }
+
+
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+
+  public User lastName(String lastName) {
+    
+    this.lastName = lastName;
+    return this;
+  }
+
+   /**
+   * Get lastName
+   * @return lastName
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_LAST_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getLastName() {
+    return lastName;
+  }
+
+
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+
+  public User email(String email) {
+    
+    this.email = email;
+    return this;
+  }
+
+   /**
+   * Get email
+   * @return email
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_EMAIL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getEmail() {
+    return email;
+  }
+
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+
+  public User password(String password) {
+    
+    this.password = password;
+    return this;
+  }
+
+   /**
+   * Get password
+   * @return password
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PASSWORD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getPassword() {
+    return password;
+  }
+
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  public User phone(String phone) {
+    
+    this.phone = phone;
+    return this;
+  }
+
+   /**
+   * Get phone
+   * @return phone
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PHONE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getPhone() {
+    return phone;
+  }
+
+
+  public void setPhone(String phone) {
+    this.phone = phone;
+  }
+
+
+  public User userStatus(Integer userStatus) {
+    
+    this.userStatus = userStatus;
+    return this;
+  }
+
+   /**
+   * User Status
+   * @return userStatus
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "User Status")
+  @JsonProperty(JSON_PROPERTY_USER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getUserStatus() {
+    return userStatus;
+  }
+
+
+  public void setUserStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    User user = (User) o;
+    return Objects.equals(this.id, user.id) &&
+        Objects.equals(this.username, user.username) &&
+        Objects.equals(this.firstName, user.firstName) &&
+        Objects.equals(this.lastName, user.lastName) &&
+        Objects.equals(this.email, user.email) &&
+        Objects.equals(this.password, user.password) &&
+        Objects.equals(this.phone, user.phone) &&
+        Objects.equals(this.userStatus, user.userStatus);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class User {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    username: ").append(toIndentedString(username)).append("\n");
+    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
+    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
+    sb.append("    email: ").append(toIndentedString(email)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
+    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
new file mode 100644
index 000000000000..59b3ac5879a6
--- /dev/null
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -0,0 +1,1045 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * XmlItem
+ */
+@JsonPropertyOrder({
+  XmlItem.JSON_PROPERTY_ATTRIBUTE_STRING,
+  XmlItem.JSON_PROPERTY_ATTRIBUTE_NUMBER,
+  XmlItem.JSON_PROPERTY_ATTRIBUTE_INTEGER,
+  XmlItem.JSON_PROPERTY_ATTRIBUTE_BOOLEAN,
+  XmlItem.JSON_PROPERTY_WRAPPED_ARRAY,
+  XmlItem.JSON_PROPERTY_NAME_STRING,
+  XmlItem.JSON_PROPERTY_NAME_NUMBER,
+  XmlItem.JSON_PROPERTY_NAME_INTEGER,
+  XmlItem.JSON_PROPERTY_NAME_BOOLEAN,
+  XmlItem.JSON_PROPERTY_NAME_ARRAY,
+  XmlItem.JSON_PROPERTY_NAME_WRAPPED_ARRAY,
+  XmlItem.JSON_PROPERTY_PREFIX_STRING,
+  XmlItem.JSON_PROPERTY_PREFIX_NUMBER,
+  XmlItem.JSON_PROPERTY_PREFIX_INTEGER,
+  XmlItem.JSON_PROPERTY_PREFIX_BOOLEAN,
+  XmlItem.JSON_PROPERTY_PREFIX_ARRAY,
+  XmlItem.JSON_PROPERTY_PREFIX_WRAPPED_ARRAY,
+  XmlItem.JSON_PROPERTY_NAMESPACE_STRING,
+  XmlItem.JSON_PROPERTY_NAMESPACE_NUMBER,
+  XmlItem.JSON_PROPERTY_NAMESPACE_INTEGER,
+  XmlItem.JSON_PROPERTY_NAMESPACE_BOOLEAN,
+  XmlItem.JSON_PROPERTY_NAMESPACE_ARRAY,
+  XmlItem.JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY,
+  XmlItem.JSON_PROPERTY_PREFIX_NS_STRING,
+  XmlItem.JSON_PROPERTY_PREFIX_NS_NUMBER,
+  XmlItem.JSON_PROPERTY_PREFIX_NS_INTEGER,
+  XmlItem.JSON_PROPERTY_PREFIX_NS_BOOLEAN,
+  XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
+  XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class XmlItem {
+  public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
+  private String attributeString;
+
+  public static final String JSON_PROPERTY_ATTRIBUTE_NUMBER = "attribute_number";
+  private BigDecimal attributeNumber;
+
+  public static final String JSON_PROPERTY_ATTRIBUTE_INTEGER = "attribute_integer";
+  private Integer attributeInteger;
+
+  public static final String JSON_PROPERTY_ATTRIBUTE_BOOLEAN = "attribute_boolean";
+  private Boolean attributeBoolean;
+
+  public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array";
+  private List<Integer> wrappedArray = null;
+
+  public static final String JSON_PROPERTY_NAME_STRING = "name_string";
+  private String nameString;
+
+  public static final String JSON_PROPERTY_NAME_NUMBER = "name_number";
+  private BigDecimal nameNumber;
+
+  public static final String JSON_PROPERTY_NAME_INTEGER = "name_integer";
+  private Integer nameInteger;
+
+  public static final String JSON_PROPERTY_NAME_BOOLEAN = "name_boolean";
+  private Boolean nameBoolean;
+
+  public static final String JSON_PROPERTY_NAME_ARRAY = "name_array";
+  private List<Integer> nameArray = null;
+
+  public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array";
+  private List<Integer> nameWrappedArray = null;
+
+  public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string";
+  private String prefixString;
+
+  public static final String JSON_PROPERTY_PREFIX_NUMBER = "prefix_number";
+  private BigDecimal prefixNumber;
+
+  public static final String JSON_PROPERTY_PREFIX_INTEGER = "prefix_integer";
+  private Integer prefixInteger;
+
+  public static final String JSON_PROPERTY_PREFIX_BOOLEAN = "prefix_boolean";
+  private Boolean prefixBoolean;
+
+  public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array";
+  private List<Integer> prefixArray = null;
+
+  public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array";
+  private List<Integer> prefixWrappedArray = null;
+
+  public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string";
+  private String namespaceString;
+
+  public static final String JSON_PROPERTY_NAMESPACE_NUMBER = "namespace_number";
+  private BigDecimal namespaceNumber;
+
+  public static final String JSON_PROPERTY_NAMESPACE_INTEGER = "namespace_integer";
+  private Integer namespaceInteger;
+
+  public static final String JSON_PROPERTY_NAMESPACE_BOOLEAN = "namespace_boolean";
+  private Boolean namespaceBoolean;
+
+  public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array";
+  private List<Integer> namespaceArray = null;
+
+  public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array";
+  private List<Integer> namespaceWrappedArray = null;
+
+  public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string";
+  private String prefixNsString;
+
+  public static final String JSON_PROPERTY_PREFIX_NS_NUMBER = "prefix_ns_number";
+  private BigDecimal prefixNsNumber;
+
+  public static final String JSON_PROPERTY_PREFIX_NS_INTEGER = "prefix_ns_integer";
+  private Integer prefixNsInteger;
+
+  public static final String JSON_PROPERTY_PREFIX_NS_BOOLEAN = "prefix_ns_boolean";
+  private Boolean prefixNsBoolean;
+
+  public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array";
+  private List<Integer> prefixNsArray = null;
+
+  public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
+  private List<Integer> prefixNsWrappedArray = null;
+
+
+  public XmlItem attributeString(String attributeString) {
+    
+    this.attributeString = attributeString;
+    return this;
+  }
+
+   /**
+   * Get attributeString
+   * @return attributeString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getAttributeString() {
+    return attributeString;
+  }
+
+
+  public void setAttributeString(String attributeString) {
+    this.attributeString = attributeString;
+  }
+
+
+  public XmlItem attributeNumber(BigDecimal attributeNumber) {
+    
+    this.attributeNumber = attributeNumber;
+    return this;
+  }
+
+   /**
+   * Get attributeNumber
+   * @return attributeNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getAttributeNumber() {
+    return attributeNumber;
+  }
+
+
+  public void setAttributeNumber(BigDecimal attributeNumber) {
+    this.attributeNumber = attributeNumber;
+  }
+
+
+  public XmlItem attributeInteger(Integer attributeInteger) {
+    
+    this.attributeInteger = attributeInteger;
+    return this;
+  }
+
+   /**
+   * Get attributeInteger
+   * @return attributeInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getAttributeInteger() {
+    return attributeInteger;
+  }
+
+
+  public void setAttributeInteger(Integer attributeInteger) {
+    this.attributeInteger = attributeInteger;
+  }
+
+
+  public XmlItem attributeBoolean(Boolean attributeBoolean) {
+    
+    this.attributeBoolean = attributeBoolean;
+    return this;
+  }
+
+   /**
+   * Get attributeBoolean
+   * @return attributeBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isAttributeBoolean() {
+    return attributeBoolean;
+  }
+
+
+  public void setAttributeBoolean(Boolean attributeBoolean) {
+    this.attributeBoolean = attributeBoolean;
+  }
+
+
+  public XmlItem wrappedArray(List<Integer> wrappedArray) {
+    
+    this.wrappedArray = wrappedArray;
+    return this;
+  }
+
+  public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
+    if (this.wrappedArray == null) {
+      this.wrappedArray = new ArrayList<Integer>();
+    }
+    this.wrappedArray.add(wrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get wrappedArray
+   * @return wrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getWrappedArray() {
+    return wrappedArray;
+  }
+
+
+  public void setWrappedArray(List<Integer> wrappedArray) {
+    this.wrappedArray = wrappedArray;
+  }
+
+
+  public XmlItem nameString(String nameString) {
+    
+    this.nameString = nameString;
+    return this;
+  }
+
+   /**
+   * Get nameString
+   * @return nameString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getNameString() {
+    return nameString;
+  }
+
+
+  public void setNameString(String nameString) {
+    this.nameString = nameString;
+  }
+
+
+  public XmlItem nameNumber(BigDecimal nameNumber) {
+    
+    this.nameNumber = nameNumber;
+    return this;
+  }
+
+   /**
+   * Get nameNumber
+   * @return nameNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getNameNumber() {
+    return nameNumber;
+  }
+
+
+  public void setNameNumber(BigDecimal nameNumber) {
+    this.nameNumber = nameNumber;
+  }
+
+
+  public XmlItem nameInteger(Integer nameInteger) {
+    
+    this.nameInteger = nameInteger;
+    return this;
+  }
+
+   /**
+   * Get nameInteger
+   * @return nameInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getNameInteger() {
+    return nameInteger;
+  }
+
+
+  public void setNameInteger(Integer nameInteger) {
+    this.nameInteger = nameInteger;
+  }
+
+
+  public XmlItem nameBoolean(Boolean nameBoolean) {
+    
+    this.nameBoolean = nameBoolean;
+    return this;
+  }
+
+   /**
+   * Get nameBoolean
+   * @return nameBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isNameBoolean() {
+    return nameBoolean;
+  }
+
+
+  public void setNameBoolean(Boolean nameBoolean) {
+    this.nameBoolean = nameBoolean;
+  }
+
+
+  public XmlItem nameArray(List<Integer> nameArray) {
+    
+    this.nameArray = nameArray;
+    return this;
+  }
+
+  public XmlItem addNameArrayItem(Integer nameArrayItem) {
+    if (this.nameArray == null) {
+      this.nameArray = new ArrayList<Integer>();
+    }
+    this.nameArray.add(nameArrayItem);
+    return this;
+  }
+
+   /**
+   * Get nameArray
+   * @return nameArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getNameArray() {
+    return nameArray;
+  }
+
+
+  public void setNameArray(List<Integer> nameArray) {
+    this.nameArray = nameArray;
+  }
+
+
+  public XmlItem nameWrappedArray(List<Integer> nameWrappedArray) {
+    
+    this.nameWrappedArray = nameWrappedArray;
+    return this;
+  }
+
+  public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
+    if (this.nameWrappedArray == null) {
+      this.nameWrappedArray = new ArrayList<Integer>();
+    }
+    this.nameWrappedArray.add(nameWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get nameWrappedArray
+   * @return nameWrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getNameWrappedArray() {
+    return nameWrappedArray;
+  }
+
+
+  public void setNameWrappedArray(List<Integer> nameWrappedArray) {
+    this.nameWrappedArray = nameWrappedArray;
+  }
+
+
+  public XmlItem prefixString(String prefixString) {
+    
+    this.prefixString = prefixString;
+    return this;
+  }
+
+   /**
+   * Get prefixString
+   * @return prefixString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getPrefixString() {
+    return prefixString;
+  }
+
+
+  public void setPrefixString(String prefixString) {
+    this.prefixString = prefixString;
+  }
+
+
+  public XmlItem prefixNumber(BigDecimal prefixNumber) {
+    
+    this.prefixNumber = prefixNumber;
+    return this;
+  }
+
+   /**
+   * Get prefixNumber
+   * @return prefixNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getPrefixNumber() {
+    return prefixNumber;
+  }
+
+
+  public void setPrefixNumber(BigDecimal prefixNumber) {
+    this.prefixNumber = prefixNumber;
+  }
+
+
+  public XmlItem prefixInteger(Integer prefixInteger) {
+    
+    this.prefixInteger = prefixInteger;
+    return this;
+  }
+
+   /**
+   * Get prefixInteger
+   * @return prefixInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getPrefixInteger() {
+    return prefixInteger;
+  }
+
+
+  public void setPrefixInteger(Integer prefixInteger) {
+    this.prefixInteger = prefixInteger;
+  }
+
+
+  public XmlItem prefixBoolean(Boolean prefixBoolean) {
+    
+    this.prefixBoolean = prefixBoolean;
+    return this;
+  }
+
+   /**
+   * Get prefixBoolean
+   * @return prefixBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isPrefixBoolean() {
+    return prefixBoolean;
+  }
+
+
+  public void setPrefixBoolean(Boolean prefixBoolean) {
+    this.prefixBoolean = prefixBoolean;
+  }
+
+
+  public XmlItem prefixArray(List<Integer> prefixArray) {
+    
+    this.prefixArray = prefixArray;
+    return this;
+  }
+
+  public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
+    if (this.prefixArray == null) {
+      this.prefixArray = new ArrayList<Integer>();
+    }
+    this.prefixArray.add(prefixArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixArray
+   * @return prefixArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getPrefixArray() {
+    return prefixArray;
+  }
+
+
+  public void setPrefixArray(List<Integer> prefixArray) {
+    this.prefixArray = prefixArray;
+  }
+
+
+  public XmlItem prefixWrappedArray(List<Integer> prefixWrappedArray) {
+    
+    this.prefixWrappedArray = prefixWrappedArray;
+    return this;
+  }
+
+  public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
+    if (this.prefixWrappedArray == null) {
+      this.prefixWrappedArray = new ArrayList<Integer>();
+    }
+    this.prefixWrappedArray.add(prefixWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixWrappedArray
+   * @return prefixWrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getPrefixWrappedArray() {
+    return prefixWrappedArray;
+  }
+
+
+  public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
+    this.prefixWrappedArray = prefixWrappedArray;
+  }
+
+
+  public XmlItem namespaceString(String namespaceString) {
+    
+    this.namespaceString = namespaceString;
+    return this;
+  }
+
+   /**
+   * Get namespaceString
+   * @return namespaceString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getNamespaceString() {
+    return namespaceString;
+  }
+
+
+  public void setNamespaceString(String namespaceString) {
+    this.namespaceString = namespaceString;
+  }
+
+
+  public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
+    
+    this.namespaceNumber = namespaceNumber;
+    return this;
+  }
+
+   /**
+   * Get namespaceNumber
+   * @return namespaceNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getNamespaceNumber() {
+    return namespaceNumber;
+  }
+
+
+  public void setNamespaceNumber(BigDecimal namespaceNumber) {
+    this.namespaceNumber = namespaceNumber;
+  }
+
+
+  public XmlItem namespaceInteger(Integer namespaceInteger) {
+    
+    this.namespaceInteger = namespaceInteger;
+    return this;
+  }
+
+   /**
+   * Get namespaceInteger
+   * @return namespaceInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getNamespaceInteger() {
+    return namespaceInteger;
+  }
+
+
+  public void setNamespaceInteger(Integer namespaceInteger) {
+    this.namespaceInteger = namespaceInteger;
+  }
+
+
+  public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
+    
+    this.namespaceBoolean = namespaceBoolean;
+    return this;
+  }
+
+   /**
+   * Get namespaceBoolean
+   * @return namespaceBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isNamespaceBoolean() {
+    return namespaceBoolean;
+  }
+
+
+  public void setNamespaceBoolean(Boolean namespaceBoolean) {
+    this.namespaceBoolean = namespaceBoolean;
+  }
+
+
+  public XmlItem namespaceArray(List<Integer> namespaceArray) {
+    
+    this.namespaceArray = namespaceArray;
+    return this;
+  }
+
+  public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
+    if (this.namespaceArray == null) {
+      this.namespaceArray = new ArrayList<Integer>();
+    }
+    this.namespaceArray.add(namespaceArrayItem);
+    return this;
+  }
+
+   /**
+   * Get namespaceArray
+   * @return namespaceArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getNamespaceArray() {
+    return namespaceArray;
+  }
+
+
+  public void setNamespaceArray(List<Integer> namespaceArray) {
+    this.namespaceArray = namespaceArray;
+  }
+
+
+  public XmlItem namespaceWrappedArray(List<Integer> namespaceWrappedArray) {
+    
+    this.namespaceWrappedArray = namespaceWrappedArray;
+    return this;
+  }
+
+  public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
+    if (this.namespaceWrappedArray == null) {
+      this.namespaceWrappedArray = new ArrayList<Integer>();
+    }
+    this.namespaceWrappedArray.add(namespaceWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get namespaceWrappedArray
+   * @return namespaceWrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getNamespaceWrappedArray() {
+    return namespaceWrappedArray;
+  }
+
+
+  public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
+    this.namespaceWrappedArray = namespaceWrappedArray;
+  }
+
+
+  public XmlItem prefixNsString(String prefixNsString) {
+    
+    this.prefixNsString = prefixNsString;
+    return this;
+  }
+
+   /**
+   * Get prefixNsString
+   * @return prefixNsString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getPrefixNsString() {
+    return prefixNsString;
+  }
+
+
+  public void setPrefixNsString(String prefixNsString) {
+    this.prefixNsString = prefixNsString;
+  }
+
+
+  public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
+    
+    this.prefixNsNumber = prefixNsNumber;
+    return this;
+  }
+
+   /**
+   * Get prefixNsNumber
+   * @return prefixNsNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getPrefixNsNumber() {
+    return prefixNsNumber;
+  }
+
+
+  public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
+    this.prefixNsNumber = prefixNsNumber;
+  }
+
+
+  public XmlItem prefixNsInteger(Integer prefixNsInteger) {
+    
+    this.prefixNsInteger = prefixNsInteger;
+    return this;
+  }
+
+   /**
+   * Get prefixNsInteger
+   * @return prefixNsInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getPrefixNsInteger() {
+    return prefixNsInteger;
+  }
+
+
+  public void setPrefixNsInteger(Integer prefixNsInteger) {
+    this.prefixNsInteger = prefixNsInteger;
+  }
+
+
+  public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
+    
+    this.prefixNsBoolean = prefixNsBoolean;
+    return this;
+  }
+
+   /**
+   * Get prefixNsBoolean
+   * @return prefixNsBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isPrefixNsBoolean() {
+    return prefixNsBoolean;
+  }
+
+
+  public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
+    this.prefixNsBoolean = prefixNsBoolean;
+  }
+
+
+  public XmlItem prefixNsArray(List<Integer> prefixNsArray) {
+    
+    this.prefixNsArray = prefixNsArray;
+    return this;
+  }
+
+  public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
+    if (this.prefixNsArray == null) {
+      this.prefixNsArray = new ArrayList<Integer>();
+    }
+    this.prefixNsArray.add(prefixNsArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixNsArray
+   * @return prefixNsArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getPrefixNsArray() {
+    return prefixNsArray;
+  }
+
+
+  public void setPrefixNsArray(List<Integer> prefixNsArray) {
+    this.prefixNsArray = prefixNsArray;
+  }
+
+
+  public XmlItem prefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
+    
+    this.prefixNsWrappedArray = prefixNsWrappedArray;
+    return this;
+  }
+
+  public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
+    if (this.prefixNsWrappedArray == null) {
+      this.prefixNsWrappedArray = new ArrayList<Integer>();
+    }
+    this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixNsWrappedArray
+   * @return prefixNsWrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getPrefixNsWrappedArray() {
+    return prefixNsWrappedArray;
+  }
+
+
+  public void setPrefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
+    this.prefixNsWrappedArray = prefixNsWrappedArray;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    XmlItem xmlItem = (XmlItem) o;
+    return Objects.equals(this.attributeString, xmlItem.attributeString) &&
+        Objects.equals(this.attributeNumber, xmlItem.attributeNumber) &&
+        Objects.equals(this.attributeInteger, xmlItem.attributeInteger) &&
+        Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) &&
+        Objects.equals(this.wrappedArray, xmlItem.wrappedArray) &&
+        Objects.equals(this.nameString, xmlItem.nameString) &&
+        Objects.equals(this.nameNumber, xmlItem.nameNumber) &&
+        Objects.equals(this.nameInteger, xmlItem.nameInteger) &&
+        Objects.equals(this.nameBoolean, xmlItem.nameBoolean) &&
+        Objects.equals(this.nameArray, xmlItem.nameArray) &&
+        Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) &&
+        Objects.equals(this.prefixString, xmlItem.prefixString) &&
+        Objects.equals(this.prefixNumber, xmlItem.prefixNumber) &&
+        Objects.equals(this.prefixInteger, xmlItem.prefixInteger) &&
+        Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) &&
+        Objects.equals(this.prefixArray, xmlItem.prefixArray) &&
+        Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) &&
+        Objects.equals(this.namespaceString, xmlItem.namespaceString) &&
+        Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) &&
+        Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) &&
+        Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) &&
+        Objects.equals(this.namespaceArray, xmlItem.namespaceArray) &&
+        Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) &&
+        Objects.equals(this.prefixNsString, xmlItem.prefixNsString) &&
+        Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) &&
+        Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) &&
+        Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) &&
+        Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) &&
+        Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class XmlItem {\n");
+    sb.append("    attributeString: ").append(toIndentedString(attributeString)).append("\n");
+    sb.append("    attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n");
+    sb.append("    attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n");
+    sb.append("    attributeBoolean: ").append(toIndentedString(attributeBoolean)).append("\n");
+    sb.append("    wrappedArray: ").append(toIndentedString(wrappedArray)).append("\n");
+    sb.append("    nameString: ").append(toIndentedString(nameString)).append("\n");
+    sb.append("    nameNumber: ").append(toIndentedString(nameNumber)).append("\n");
+    sb.append("    nameInteger: ").append(toIndentedString(nameInteger)).append("\n");
+    sb.append("    nameBoolean: ").append(toIndentedString(nameBoolean)).append("\n");
+    sb.append("    nameArray: ").append(toIndentedString(nameArray)).append("\n");
+    sb.append("    nameWrappedArray: ").append(toIndentedString(nameWrappedArray)).append("\n");
+    sb.append("    prefixString: ").append(toIndentedString(prefixString)).append("\n");
+    sb.append("    prefixNumber: ").append(toIndentedString(prefixNumber)).append("\n");
+    sb.append("    prefixInteger: ").append(toIndentedString(prefixInteger)).append("\n");
+    sb.append("    prefixBoolean: ").append(toIndentedString(prefixBoolean)).append("\n");
+    sb.append("    prefixArray: ").append(toIndentedString(prefixArray)).append("\n");
+    sb.append("    prefixWrappedArray: ").append(toIndentedString(prefixWrappedArray)).append("\n");
+    sb.append("    namespaceString: ").append(toIndentedString(namespaceString)).append("\n");
+    sb.append("    namespaceNumber: ").append(toIndentedString(namespaceNumber)).append("\n");
+    sb.append("    namespaceInteger: ").append(toIndentedString(namespaceInteger)).append("\n");
+    sb.append("    namespaceBoolean: ").append(toIndentedString(namespaceBoolean)).append("\n");
+    sb.append("    namespaceArray: ").append(toIndentedString(namespaceArray)).append("\n");
+    sb.append("    namespaceWrappedArray: ").append(toIndentedString(namespaceWrappedArray)).append("\n");
+    sb.append("    prefixNsString: ").append(toIndentedString(prefixNsString)).append("\n");
+    sb.append("    prefixNsNumber: ").append(toIndentedString(prefixNsNumber)).append("\n");
+    sb.append("    prefixNsInteger: ").append(toIndentedString(prefixNsInteger)).append("\n");
+    sb.append("    prefixNsBoolean: ").append(toIndentedString(prefixNsBoolean)).append("\n");
+    sb.append("    prefixNsArray: ").append(toIndentedString(prefixNsArray)).append("\n");
+    sb.append("    prefixNsWrappedArray: ").append(toIndentedString(prefixNsWrappedArray)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/StringUtilTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/StringUtilTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/StringUtilTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/StringUtilTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/FakeApiTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/api/FakeApiTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/FakeApiTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/PetApiTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/api/PetApiTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/PetApiTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/StoreApiTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/api/StoreApiTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/StoreApiTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/UserApiTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/api/UserApiTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/UserApiTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AnimalTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/AnimalTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/AnimalTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ArrayTestTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ArrayTestTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ArrayTestTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ArrayTestTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/BigCatTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/BigCatTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/BigCatTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/BigCatTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/CapitalizationTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/CapitalizationTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/CapitalizationTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/CapitalizationTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/CatAllOfTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/CatAllOfTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/CatAllOfTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/CatAllOfTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/CatTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/CatTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/CatTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/CatTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/CategoryTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/CategoryTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/CategoryTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ClassModelTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ClassModelTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ClassModelTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ClassModelTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ClientTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ClientTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ClientTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ClientTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/DogAllOfTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/DogAllOfTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/DogAllOfTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/DogAllOfTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/DogTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/DogTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/DogTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/DogTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/EnumArraysTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/EnumArraysTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/EnumArraysTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/EnumArraysTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/EnumClassTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/EnumClassTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/EnumClassTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/EnumClassTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/EnumTestTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/EnumTestTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/EnumTestTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/EnumTestTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/FormatTestTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/FormatTestTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/FormatTestTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/FormatTestTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/MapTestTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/MapTestTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/MapTestTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/MapTestTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/Model200ResponseTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ModelReturnTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ModelReturnTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ModelReturnTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ModelReturnTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/NameTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/NameTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/NameTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/NameTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/NumberOnlyTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/OrderTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/OrderTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/OrderTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/OuterCompositeTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/OuterEnumTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/OuterEnumTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/OuterEnumTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/OuterEnumTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/PetTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/PetTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/PetTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/TagTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/TagTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/TagTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/UserTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/UserTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/UserTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/UserTest.java
diff --git a/samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/XmlItemTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/XmlItemTest.java
similarity index 100%
rename from samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/XmlItemTest.java
rename to samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/model/XmlItemTest.java
diff --git a/samples/client/petstore/java/retrofit2-play24/git_push.sh b/samples/client/petstore/java/feign/git_push.sh
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/git_push.sh
rename to samples/client/petstore/java/feign/git_push.sh
diff --git a/samples/client/petstore/java/retrofit2-play24/gradle.properties b/samples/client/petstore/java/feign/gradle.properties
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/gradle.properties
rename to samples/client/petstore/java/feign/gradle.properties
diff --git a/samples/client/petstore/java/retrofit2-play24/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/gradle/wrapper/gradle-wrapper.jar
rename to samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.jar
diff --git a/samples/client/petstore/java/retrofit2-play24/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/gradle/wrapper/gradle-wrapper.properties
rename to samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.properties
diff --git a/samples/client/petstore/java/retrofit2-play24/gradlew b/samples/client/petstore/java/feign/gradlew
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/gradlew
rename to samples/client/petstore/java/feign/gradlew
diff --git a/samples/client/petstore/java/retrofit2-play24/gradlew.bat b/samples/client/petstore/java/feign/gradlew.bat
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/gradlew.bat
rename to samples/client/petstore/java/feign/gradlew.bat
diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml
new file mode 100644
index 000000000000..f39214ac8926
--- /dev/null
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -0,0 +1,319 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>petstore-feign</artifactId>
+    <packaging>jar</packaging>
+    <name>petstore-feign</name>
+    <version>1.0.0</version>
+    <url>https://github.com/openapitools/openapi-generator</url>
+    <description>OpenAPI Java</description>
+    <scm>
+        <connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
+        <developerConnection>scm:git:git@github.com:openapitools/openapi-generator.git</developerConnection>
+        <url>https://github.com/openapitools/openapi-generator</url>
+    </scm>
+
+    <licenses>
+        <license>
+            <name>Unlicense</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>OpenAPI-Generator Contributors</name>
+            <email>team@openapitools.org</email>
+            <organization>OpenAPITools.org</organization>
+            <organizationUrl>http://openapitools.org</organizationUrl>
+        </developer>
+    </developers>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M4</version>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>loggerPath</name>
+                            <value>conf/log4j.properties</value>
+                        </property>
+                    </systemProperties>
+                    <argLine>-Xms512m -Xmx1500m</argLine>
+                    <parallel>methods</parallel>
+                    <threadCount>10</threadCount>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- attach test jar -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.10</version>
+                <executions>
+                    <execution>
+                        <id>add_sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add_test_sources</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    <fork>true</fork>
+                    <meminitial>128m</meminitial>
+                    <maxmem>512m</maxmem>
+                    <compilerArgs>
+                        <arg>-Xlint:all</arg>
+                        <arg>-J-Xss4m</arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.1.1</version>
+                <configuration>
+                    <doclint>none</doclint>
+                        <source>1.7</source>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>sign-artifacts</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.5</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations-version}</version>
+        </dependency>
+
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
+        <!-- HTTP client: Netflix Feign -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-core</artifactId>
+            <version>${feign-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-jackson</artifactId>
+            <version>${feign-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-slf4j</artifactId>
+            <version>${feign-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign.form</groupId>
+            <artifactId>feign-form</artifactId>
+            <version>${feign-form-version}</version>
+        </dependency>
+
+        <!-- JSON processing: jackson -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson-databind-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>${jackson-databind-nullable-version}</version>
+        </dependency>
+            <dependency>
+                <groupId>com.github.joschi.jackson</groupId>
+                <artifactId>jackson-datatype-threetenbp</artifactId>
+                <version>${jackson-threetenbp-version}</version>
+            </dependency>
+        <dependency>
+            <groupId>org.apache.oltu.oauth2</groupId>
+            <artifactId>org.apache.oltu.oauth2.client</artifactId>
+            <version>${oltu-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <version>3.6.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>1.7.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.7</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <swagger-annotations-version>1.5.24</swagger-annotations-version>
+        <feign-version>11.0</feign-version>
+        <feign-form-version>3.8.0</feign-form-version>
+        <jackson-version>2.10.3</jackson-version>
+        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <jackson-databind-version>2.10.3</jackson-databind-version>
+        <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
+        <junit-version>4.13</junit-version>
+        <maven-plugin-version>1.0.0</maven-plugin-version>
+        <oltu-version>1.0.1</oltu-version>
+    </properties>
+</project>
diff --git a/samples/client/petstore/java/feign/settings.gradle b/samples/client/petstore/java/feign/settings.gradle
new file mode 100644
index 000000000000..56240d668423
--- /dev/null
+++ b/samples/client/petstore/java/feign/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "petstore-feign"
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/AndroidManifest.xml b/samples/client/petstore/java/feign/src/main/AndroidManifest.xml
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/src/main/AndroidManifest.xml
rename to samples/client/petstore/java/feign/src/main/AndroidManifest.xml
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java
new file mode 100644
index 000000000000..4e256daf6b29
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java
@@ -0,0 +1,355 @@
+package org.openapitools.client;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+
+import org.threeten.bp.*;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import org.openapitools.jackson.nullable.JsonNullableModule;
+import com.fasterxml.jackson.datatype.threetenbp.ThreeTenModule;
+
+import feign.Feign;
+import feign.RequestInterceptor;
+import feign.form.FormEncoder;
+import feign.jackson.JacksonDecoder;
+import feign.jackson.JacksonEncoder;
+import feign.slf4j.Slf4jLogger;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.auth.OAuth.AccessTokenListener;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ApiClient {
+  public interface Api {}
+
+  protected ObjectMapper objectMapper;
+  private String basePath = "http://petstore.swagger.io:80/v2";
+  private Map<String, RequestInterceptor> apiAuthorizations;
+  private Feign.Builder feignBuilder;
+
+  public ApiClient() {
+    objectMapper = createObjectMapper();
+    apiAuthorizations = new LinkedHashMap<String, RequestInterceptor>();
+    feignBuilder = Feign.builder()
+                .encoder(new FormEncoder(new JacksonEncoder(objectMapper)))
+                .decoder(new JacksonDecoder(objectMapper))
+                .logger(new Slf4jLogger());
+  }
+
+  public ApiClient(String[] authNames) {
+    this();
+    for(String authName : authNames) {
+      RequestInterceptor auth;
+      if ("api_key".equals(authName)) {
+        auth = new ApiKeyAuth("header", "api_key");
+      } else if ("api_key_query".equals(authName)) {
+        auth = new ApiKeyAuth("query", "api_key_query");
+      } else if ("http_basic_test".equals(authName)) {
+        auth = new HttpBasicAuth();
+      } else if ("petstore_auth".equals(authName)) {
+        auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
+      } else {
+        throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
+      }
+      addAuthorization(authName, auth);
+    }
+  }
+
+  /**
+   * Basic constructor for single auth name
+   * @param authName
+   */
+  public ApiClient(String authName) {
+    this(new String[]{authName});
+  }
+
+  /**
+   * Helper constructor for single api key
+   * @param authName
+   * @param apiKey
+   */
+  public ApiClient(String authName, String apiKey) {
+    this(authName);
+    this.setApiKey(apiKey);
+  }
+
+  /**
+   * Helper constructor for single basic auth or password oauth2
+   * @param authName
+   * @param username
+   * @param password
+   */
+  public ApiClient(String authName, String username, String password) {
+    this(authName);
+    this.setCredentials(username,  password);
+  }
+
+  /**
+   * Helper constructor for single password oauth2
+   * @param authName
+   * @param clientId
+   * @param secret
+   * @param username
+   * @param password
+   */
+  public ApiClient(String authName, String clientId, String secret, String username, String password) {
+    this(authName);
+    this.getTokenEndPoint()
+           .setClientId(clientId)
+           .setClientSecret(secret)
+           .setUsername(username)
+           .setPassword(password);
+  }
+
+  public String getBasePath() {
+    return basePath;
+  }
+
+  public ApiClient setBasePath(String basePath) {
+    this.basePath = basePath;
+    return this;
+  }
+
+  public Map<String, RequestInterceptor> getApiAuthorizations() {
+    return apiAuthorizations;
+  }
+
+  public void setApiAuthorizations(Map<String, RequestInterceptor> apiAuthorizations) {
+    this.apiAuthorizations = apiAuthorizations;
+  }
+
+  public Feign.Builder getFeignBuilder() {
+    return feignBuilder;
+  }
+
+  public ApiClient setFeignBuilder(Feign.Builder feignBuilder) {
+    this.feignBuilder = feignBuilder;
+    return this;
+  }
+
+  private ObjectMapper createObjectMapper() {
+    ObjectMapper objectMapper = new ObjectMapper();
+    objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+    objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
+    objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+    objectMapper.disable(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE);
+    objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    objectMapper.setDateFormat(new RFC3339DateFormat());
+    ThreeTenModule module = new ThreeTenModule();
+    module.addDeserializer(Instant.class, CustomInstantDeserializer.INSTANT);
+    module.addDeserializer(OffsetDateTime.class, CustomInstantDeserializer.OFFSET_DATE_TIME);
+    module.addDeserializer(ZonedDateTime.class, CustomInstantDeserializer.ZONED_DATE_TIME);
+    objectMapper.registerModule(module);
+    JsonNullableModule jnm = new JsonNullableModule();
+    objectMapper.registerModule(jnm);
+    return objectMapper;
+  }
+
+  public ObjectMapper getObjectMapper(){
+    return objectMapper;
+  }
+
+  /**
+   * Creates a feign client for given API interface.
+   *
+   * Usage:
+   *    ApiClient apiClient = new ApiClient();
+   *    apiClient.setBasePath("http://localhost:8080");
+   *    XYZApi api = apiClient.buildClient(XYZApi.class);
+   *    XYZResponse response = api.someMethod(...);
+   * @param <T> Type
+   * @param clientClass Client class
+   * @return The Client
+   */
+  public <T extends Api> T buildClient(Class<T> clientClass) {
+    return feignBuilder.target(clientClass, basePath);
+  }
+
+  /**
+   * Select the Accept header's value from the given accepts array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use all of them (joining into a string)
+   *
+   * @param accepts The accepts array to select from
+   * @return The Accept header to use. If the given array is empty,
+   *   null will be returned (not to set the Accept header explicitly).
+   */
+  public String selectHeaderAccept(String[] accepts) {
+    if (accepts.length == 0) return null;
+    if (StringUtil.containsIgnoreCase(accepts, "application/json")) return "application/json";
+    return StringUtil.join(accepts, ",");
+  }
+
+  /**
+   * Select the Content-Type header's value from the given array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use the first one of the array.
+   *
+   * @param contentTypes The Content-Type array to select from
+   * @return The Content-Type header to use. If the given array is empty,
+   *   JSON will be used.
+   */
+  public String selectHeaderContentType(String[] contentTypes) {
+    if (contentTypes.length == 0) return "application/json";
+    if (StringUtil.containsIgnoreCase(contentTypes, "application/json")) return "application/json";
+    return contentTypes[0];
+  }
+
+
+  /**
+   * Helper method to configure the bearer token.
+   * @param bearerToken the bearer token.
+   */
+  public void setBearerToken(String bearerToken) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof HttpBearerAuth) {
+        ((HttpBearerAuth) apiAuthorization).setBearerToken(bearerToken);
+        return;
+      }
+    }
+    throw new RuntimeException("No Bearer authentication configured!");
+  }
+
+  /**
+   * Helper method to configure the first api key found
+   * @param apiKey API key
+   */
+  public void setApiKey(String apiKey) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof ApiKeyAuth) {
+        ApiKeyAuth keyAuth = (ApiKeyAuth) apiAuthorization;
+        keyAuth.setApiKey(apiKey);
+        return ;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Helper method to configure the username/password for basic auth or password OAuth
+   * @param username Username
+   * @param password Password
+   */
+  public void setCredentials(String username, String password) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof HttpBasicAuth) {
+        HttpBasicAuth basicAuth = (HttpBasicAuth) apiAuthorization;
+        basicAuth.setCredentials(username, password);
+        return;
+      }
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.getTokenRequestBuilder().setUsername(username).setPassword(password);
+        return;
+      }
+    }
+    throw new RuntimeException("No Basic authentication or OAuth configured!");
+  }
+
+  /**
+   * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+   * @return Token request builder
+   */
+  public TokenRequestBuilder getTokenEndPoint() {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        return oauth.getTokenRequestBuilder();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+   * @return Authentication request builder
+   */
+  public AuthenticationRequestBuilder getAuthorizationEndPoint() {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        return oauth.getAuthenticationRequestBuilder();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
+   * @param accessToken Access Token
+   * @param expiresIn Validity period in seconds
+   */
+  public void setAccessToken(String accessToken, Long expiresIn) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.setAccessToken(accessToken, expiresIn);
+        return;
+      }
+    }
+  }
+
+  /**
+   * Helper method to configure the oauth accessCode/implicit flow parameters
+   * @param clientId Client ID
+   * @param clientSecret Client secret
+   * @param redirectURI Redirect URI
+   */
+  public void configureAuthorizationFlow(String clientId, String clientSecret, String redirectURI) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.getTokenRequestBuilder()
+                .setClientId(clientId)
+                .setClientSecret(clientSecret)
+                .setRedirectURI(redirectURI);
+        oauth.getAuthenticationRequestBuilder()
+                .setClientId(clientId)
+                .setRedirectURI(redirectURI);
+        return;
+      }
+    }
+  }
+
+  /**
+   * Configures a listener which is notified when a new access token is received.
+   * @param accessTokenListener Acesss token listener
+   */
+  public void registerAccessTokenListener(AccessTokenListener accessTokenListener) {
+    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.registerAccessTokenListener(accessTokenListener);
+        return;
+      }
+    }
+  }
+
+  /**
+   * Gets request interceptor based on authentication name
+   * @param authName Authentiation name
+   * @return Request Interceptor
+   */
+  public RequestInterceptor getAuthorization(String authName) {
+    return apiAuthorizations.get(authName);
+  }
+
+  /**
+   * Adds an authorization to be used by the client
+   * @param authName Authentication name
+   * @param authorization Request interceptor
+   */
+  public void addAuthorization(String authName, RequestInterceptor authorization) {
+    if (apiAuthorizations.containsKey(authName)) {
+      throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations");
+    }
+    apiAuthorizations.put(authName, authorization);
+    feignBuilder.requestInterceptor(authorization);
+  }
+
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/CustomInstantDeserializer.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
new file mode 100644
index 000000000000..83d4514b071b
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/CustomInstantDeserializer.java
@@ -0,0 +1,232 @@
+package org.openapitools.client;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonTokenId;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils;
+import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase;
+import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction;
+import com.fasterxml.jackson.datatype.threetenbp.function.Function;
+import org.threeten.bp.DateTimeException;
+import org.threeten.bp.DateTimeUtils;
+import org.threeten.bp.Instant;
+import org.threeten.bp.OffsetDateTime;
+import org.threeten.bp.ZoneId;
+import org.threeten.bp.ZonedDateTime;
+import org.threeten.bp.format.DateTimeFormatter;
+import org.threeten.bp.temporal.Temporal;
+import org.threeten.bp.temporal.TemporalAccessor;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+
+/**
+ * Deserializer for ThreeTen temporal {@link Instant}s, {@link OffsetDateTime}, and {@link ZonedDateTime}s.
+ * Adapted from the jackson threetenbp InstantDeserializer to add support for deserializing rfc822 format.
+ *
+ * @author Nick Williams
+ */
+public class CustomInstantDeserializer<T extends Temporal>
+    extends ThreeTenDateTimeDeserializerBase<T> {
+  private static final long serialVersionUID = 1L;
+
+  public static final CustomInstantDeserializer<Instant> INSTANT = new CustomInstantDeserializer<Instant>(
+      Instant.class, DateTimeFormatter.ISO_INSTANT,
+      new Function<TemporalAccessor, Instant>() {
+        @Override
+        public Instant apply(TemporalAccessor temporalAccessor) {
+          return Instant.from(temporalAccessor);
+        }
+      },
+      new Function<FromIntegerArguments, Instant>() {
+        @Override
+        public Instant apply(FromIntegerArguments a) {
+          return Instant.ofEpochMilli(a.value);
+        }
+      },
+      new Function<FromDecimalArguments, Instant>() {
+        @Override
+        public Instant apply(FromDecimalArguments a) {
+          return Instant.ofEpochSecond(a.integer, a.fraction);
+        }
+      },
+      null
+  );
+
+  public static final CustomInstantDeserializer<OffsetDateTime> OFFSET_DATE_TIME = new CustomInstantDeserializer<OffsetDateTime>(
+      OffsetDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME,
+      new Function<TemporalAccessor, OffsetDateTime>() {
+        @Override
+        public OffsetDateTime apply(TemporalAccessor temporalAccessor) {
+          return OffsetDateTime.from(temporalAccessor);
+        }
+      },
+      new Function<FromIntegerArguments, OffsetDateTime>() {
+        @Override
+        public OffsetDateTime apply(FromIntegerArguments a) {
+          return OffsetDateTime.ofInstant(Instant.ofEpochMilli(a.value), a.zoneId);
+        }
+      },
+      new Function<FromDecimalArguments, OffsetDateTime>() {
+        @Override
+        public OffsetDateTime apply(FromDecimalArguments a) {
+          return OffsetDateTime.ofInstant(Instant.ofEpochSecond(a.integer, a.fraction), a.zoneId);
+        }
+      },
+      new BiFunction<OffsetDateTime, ZoneId, OffsetDateTime>() {
+        @Override
+        public OffsetDateTime apply(OffsetDateTime d, ZoneId z) {
+          return d.withOffsetSameInstant(z.getRules().getOffset(d.toLocalDateTime()));
+        }
+      }
+  );
+
+  public static final CustomInstantDeserializer<ZonedDateTime> ZONED_DATE_TIME = new CustomInstantDeserializer<ZonedDateTime>(
+      ZonedDateTime.class, DateTimeFormatter.ISO_ZONED_DATE_TIME,
+      new Function<TemporalAccessor, ZonedDateTime>() {
+        @Override
+        public ZonedDateTime apply(TemporalAccessor temporalAccessor) {
+          return ZonedDateTime.from(temporalAccessor);
+        }
+      },
+      new Function<FromIntegerArguments, ZonedDateTime>() {
+        @Override
+        public ZonedDateTime apply(FromIntegerArguments a) {
+          return ZonedDateTime.ofInstant(Instant.ofEpochMilli(a.value), a.zoneId);
+        }
+      },
+      new Function<FromDecimalArguments, ZonedDateTime>() {
+        @Override
+        public ZonedDateTime apply(FromDecimalArguments a) {
+          return ZonedDateTime.ofInstant(Instant.ofEpochSecond(a.integer, a.fraction), a.zoneId);
+        }
+      },
+      new BiFunction<ZonedDateTime, ZoneId, ZonedDateTime>() {
+        @Override
+        public ZonedDateTime apply(ZonedDateTime zonedDateTime, ZoneId zoneId) {
+          return zonedDateTime.withZoneSameInstant(zoneId);
+        }
+      }
+  );
+
+  protected final Function<FromIntegerArguments, T> fromMilliseconds;
+
+  protected final Function<FromDecimalArguments, T> fromNanoseconds;
+
+  protected final Function<TemporalAccessor, T> parsedToValue;
+
+  protected final BiFunction<T, ZoneId, T> adjust;
+
+  protected CustomInstantDeserializer(Class<T> supportedType,
+                    DateTimeFormatter parser,
+                    Function<TemporalAccessor, T> parsedToValue,
+                    Function<FromIntegerArguments, T> fromMilliseconds,
+                    Function<FromDecimalArguments, T> fromNanoseconds,
+                    BiFunction<T, ZoneId, T> adjust) {
+    super(supportedType, parser);
+    this.parsedToValue = parsedToValue;
+    this.fromMilliseconds = fromMilliseconds;
+    this.fromNanoseconds = fromNanoseconds;
+    this.adjust = adjust == null ? new BiFunction<T, ZoneId, T>() {
+      @Override
+      public T apply(T t, ZoneId zoneId) {
+        return t;
+      }
+    } : adjust;
+  }
+
+  @SuppressWarnings("unchecked")
+  protected CustomInstantDeserializer(CustomInstantDeserializer<T> base, DateTimeFormatter f) {
+    super((Class<T>) base.handledType(), f);
+    parsedToValue = base.parsedToValue;
+    fromMilliseconds = base.fromMilliseconds;
+    fromNanoseconds = base.fromNanoseconds;
+    adjust = base.adjust;
+  }
+
+  @Override
+  protected JsonDeserializer<T> withDateFormat(DateTimeFormatter dtf) {
+    if (dtf == _formatter) {
+      return this;
+    }
+    return new CustomInstantDeserializer<T>(this, dtf);
+  }
+
+  @Override
+  public T deserialize(JsonParser parser, DeserializationContext context) throws IOException {
+    //NOTE: Timestamps contain no timezone info, and are always in configured TZ. Only
+    //string values have to be adjusted to the configured TZ.
+    switch (parser.getCurrentTokenId()) {
+      case JsonTokenId.ID_NUMBER_FLOAT: {
+        BigDecimal value = parser.getDecimalValue();
+        long seconds = value.longValue();
+        int nanoseconds = DecimalUtils.extractNanosecondDecimal(value, seconds);
+        return fromNanoseconds.apply(new FromDecimalArguments(
+            seconds, nanoseconds, getZone(context)));
+      }
+
+      case JsonTokenId.ID_NUMBER_INT: {
+        long timestamp = parser.getLongValue();
+        if (context.isEnabled(DeserializationFeature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS)) {
+          return this.fromNanoseconds.apply(new FromDecimalArguments(
+              timestamp, 0, this.getZone(context)
+          ));
+        }
+        return this.fromMilliseconds.apply(new FromIntegerArguments(
+            timestamp, this.getZone(context)
+        ));
+      }
+
+      case JsonTokenId.ID_STRING: {
+        String string = parser.getText().trim();
+        if (string.length() == 0) {
+          return null;
+        }
+        if (string.endsWith("+0000")) {
+          string = string.substring(0, string.length() - 5) + "Z";
+        }
+        T value;
+        try {
+          TemporalAccessor acc = _formatter.parse(string);
+          value = parsedToValue.apply(acc);
+          if (context.isEnabled(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)) {
+            return adjust.apply(value, this.getZone(context));
+          }
+        } catch (DateTimeException e) {
+          throw _peelDTE(e);
+        }
+        return value;
+      }
+    }
+    throw context.mappingException("Expected type float, integer, or string.");
+  }
+
+  private ZoneId getZone(DeserializationContext context) {
+    // Instants are always in UTC, so don't waste compute cycles
+    return (_valueClass == Instant.class) ? null : DateTimeUtils.toZoneId(context.getTimeZone());
+  }
+
+  private static class FromIntegerArguments {
+    public final long value;
+    public final ZoneId zoneId;
+
+    private FromIntegerArguments(long value, ZoneId zoneId) {
+      this.value = value;
+      this.zoneId = zoneId;
+    }
+  }
+
+  private static class FromDecimalArguments {
+    public final long integer;
+    public final int fraction;
+    public final ZoneId zoneId;
+
+    private FromDecimalArguments(long integer, int fraction, ZoneId zoneId) {
+      this.integer = integer;
+      this.fraction = fraction;
+      this.zoneId = zoneId;
+    }
+  }
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/EncodingUtils.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/EncodingUtils.java
new file mode 100644
index 000000000000..c5a76a97857a
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/EncodingUtils.java
@@ -0,0 +1,86 @@
+package org.openapitools.client;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+* Utilities to support Swagger encoding formats in Feign.
+*/
+public final class EncodingUtils {
+
+  /**
+   * Private constructor. Do not construct this class.
+   */
+  private EncodingUtils() {}
+
+  /**
+   * <p>Encodes a collection of query parameters according to the Swagger
+   * collection format.</p>
+   *
+   * <p>Of the various collection formats defined by Swagger ("csv", "tsv",
+   * etc), Feign only natively supports "multi". This utility generates the
+   * other format types so it will be properly processed by Feign.</p>
+   *
+   * <p>Note, as part of reformatting, it URL encodes the parameters as
+   * well.</p>
+   * @param parameters The collection object to be formatted. This object will
+   *                   not be changed.
+   * @param collectionFormat The Swagger collection format (eg, "csv", "tsv",
+   *                         "pipes"). See the
+   *                         <a href="http://swagger.io/specification/#parameter-object-44">
+   *                         OpenAPI Spec</a> for more details.
+   * @return An object that will be correctly formatted by Feign.
+   */
+  public static Object encodeCollection(Collection<?> parameters,
+                                     String collectionFormat) {
+    if (parameters == null) {
+      return parameters;
+    }
+    List<String> stringValues = new ArrayList<>(parameters.size());
+    for (Object parameter : parameters) {
+      // ignore null values (same behavior as Feign)
+      if (parameter != null) {
+        stringValues.add(encode(parameter));
+      }
+    }
+    // Feign natively handles single-element lists and the "multi" format.
+    if (stringValues.size() < 2 || "multi".equals(collectionFormat)) {
+      return stringValues;
+    }
+    // Otherwise return a formatted String
+    String[] stringArray = stringValues.toArray(new String[0]);
+    switch (collectionFormat) {
+      case "csv":
+      default:
+        return StringUtil.join(stringArray, ",");
+      case "ssv":
+        return StringUtil.join(stringArray, " ");
+      case "tsv":
+        return StringUtil.join(stringArray, "\t");
+      case "pipes":
+        return StringUtil.join(stringArray, "|");
+    }
+  }
+
+  /**
+   * URL encode a single query parameter.
+   * @param parameter The query parameter to encode. This object will not be
+   *                  changed.
+   * @return The URL encoded string representation of the parameter. If the
+   *         parameter is null, returns null.
+   */
+  public static String encode(Object parameter) {
+    if (parameter == null) {
+      return null;
+    }
+    try {
+      return URLEncoder.encode(parameter.toString(), "UTF-8").replaceAll("\\+", "%20");
+    } catch (UnsupportedEncodingException e) {
+      // Should never happen, UTF-8 is always supported
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ParamExpander.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ParamExpander.java
new file mode 100644
index 000000000000..2331d87fdbd7
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ParamExpander.java
@@ -0,0 +1,22 @@
+package org.openapitools.client;
+
+import feign.Param;
+
+import java.text.DateFormat;
+import java.util.Date;
+
+/**
+ * Param Expander to convert {@link Date} to RFC3339
+ */
+public class ParamExpander implements Param.Expander {
+
+  private static final DateFormat dateformat = new RFC3339DateFormat();
+
+  @Override
+  public String expand(Object value) {
+    if (value instanceof Date) {
+      return dateformat.format(value);
+    }
+    return value.toString();
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/RFC3339DateFormat.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/RFC3339DateFormat.java
rename to samples/client/petstore/java/feign/src/main/java/org/openapitools/client/RFC3339DateFormat.java
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ServerConfiguration.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/ServerConfiguration.java
rename to samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ServerConfiguration.java
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/ServerVariable.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ServerVariable.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/ServerVariable.java
rename to samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ServerVariable.java
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/StringUtil.java
new file mode 100644
index 000000000000..4dc60597910a
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/StringUtil.java
@@ -0,0 +1,83 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class StringUtil {
+  /**
+   * Check if the given array contains the given value (with case-insensitive comparison).
+   *
+   * @param array The array
+   * @param value The value to search
+   * @return true if the array contains the value
+   */
+  public static boolean containsIgnoreCase(String[] array, String value) {
+    for (String str : array) {
+      if (value == null && str == null) {
+        return true;
+      }
+      if (value != null && value.equalsIgnoreCase(str)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Join an array of strings with the given separator.
+   * <p>
+   * Note: This might be replaced by utility method from commons-lang or guava someday
+   * if one of those libraries is added as dependency.
+   * </p>
+   *
+   * @param array     The array of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(String[] array, String separator) {
+    int len = array.length;
+    if (len == 0) {
+      return "";
+    }
+
+    StringBuilder out = new StringBuilder();
+    out.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      out.append(separator).append(array[i]);
+    }
+    return out.toString();
+  }
+
+  /**
+   * Join a list of strings with the given separator.
+   *
+   * @param list      The list of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(Collection<String> list, String separator) {
+    Iterator<String> iterator = list.iterator();
+    StringBuilder out = new StringBuilder();
+    if (iterator.hasNext()) {
+      out.append(iterator.next());
+    }
+    while (iterator.hasNext()) {
+      out.append(separator).append(iterator.next());
+    }
+    return out.toString();
+  }
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
new file mode 100644
index 000000000000..2cefc6e4185b
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -0,0 +1,30 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.EncodingUtils;
+
+import org.openapitools.client.model.Client;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import feign.*;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public interface AnotherFakeApi extends ApiClient.Api {
+
+
+  /**
+   * To test special tags
+   * To test special tags and operation ID starting with number
+   * @param body client model (required)
+   * @return Client
+   */
+  @RequestLine("PATCH /another-fake/dummy")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  Client call123testSpecialTags(Client body);
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java
new file mode 100644
index 000000000000..d1d0e6ed88e5
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -0,0 +1,422 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.EncodingUtils;
+
+import java.math.BigDecimal;
+import org.openapitools.client.model.Client;
+import java.io.File;
+import org.openapitools.client.model.FileSchemaTestClass;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+import org.openapitools.client.model.OuterComposite;
+import org.openapitools.client.model.User;
+import org.openapitools.client.model.XmlItem;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import feign.*;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public interface FakeApi extends ApiClient.Api {
+
+
+  /**
+   * creates an XmlItem
+   * this route creates an XmlItem
+   * @param xmlItem XmlItem Body (required)
+   */
+  @RequestLine("POST /fake/create_xml_item")
+  @Headers({
+    "Content-Type: application/xml",
+    "Accept: application/json",
+  })
+  void createXmlItem(XmlItem xmlItem);
+
+  /**
+   * 
+   * Test serialization of outer boolean types
+   * @param body Input boolean as post body (optional)
+   * @return Boolean
+   */
+  @RequestLine("POST /fake/outer/boolean")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: */*",
+  })
+  Boolean fakeOuterBooleanSerialize(Boolean body);
+
+  /**
+   * 
+   * Test serialization of object with outer number type
+   * @param body Input composite as post body (optional)
+   * @return OuterComposite
+   */
+  @RequestLine("POST /fake/outer/composite")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: */*",
+  })
+  OuterComposite fakeOuterCompositeSerialize(OuterComposite body);
+
+  /**
+   * 
+   * Test serialization of outer number types
+   * @param body Input number as post body (optional)
+   * @return BigDecimal
+   */
+  @RequestLine("POST /fake/outer/number")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: */*",
+  })
+  BigDecimal fakeOuterNumberSerialize(BigDecimal body);
+
+  /**
+   * 
+   * Test serialization of outer string types
+   * @param body Input string as post body (optional)
+   * @return String
+   */
+  @RequestLine("POST /fake/outer/string")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: */*",
+  })
+  String fakeOuterStringSerialize(String body);
+
+  /**
+   * 
+   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+   * @param body  (required)
+   */
+  @RequestLine("PUT /fake/body-with-file-schema")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  void testBodyWithFileSchema(FileSchemaTestClass body);
+
+  /**
+   * 
+   * 
+   * @param query  (required)
+   * @param body  (required)
+   */
+  @RequestLine("PUT /fake/body-with-query-params?query={query}")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  void testBodyWithQueryParams(@Param("query") String query, User body);
+
+  /**
+   * 
+   * 
+   * Note, this is equivalent to the other <code>testBodyWithQueryParams</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link TestBodyWithQueryParamsQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param body  (required)
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>query -  (required)</li>
+   *   </ul>
+   */
+  @RequestLine("PUT /fake/body-with-query-params?query={query}")
+  @Headers({
+  "Content-Type: application/json",
+  "Accept: application/json",
+  })
+  void testBodyWithQueryParams(User body, @QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>testBodyWithQueryParams</code> method in a fluent style.
+   */
+  public static class TestBodyWithQueryParamsQueryParams extends HashMap<String, Object> {
+    public TestBodyWithQueryParamsQueryParams query(final String value) {
+      put("query", EncodingUtils.encode(value));
+      return this;
+    }
+  }
+
+  /**
+   * To test \&quot;client\&quot; model
+   * To test \&quot;client\&quot; model
+   * @param body client model (required)
+   * @return Client
+   */
+  @RequestLine("PATCH /fake")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  Client testClientModel(Client body);
+
+  /**
+   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+   * @param number None (required)
+   * @param _double None (required)
+   * @param patternWithoutDelimiter None (required)
+   * @param _byte None (required)
+   * @param integer None (optional)
+   * @param int32 None (optional)
+   * @param int64 None (optional)
+   * @param _float None (optional)
+   * @param string None (optional)
+   * @param binary None (optional)
+   * @param date None (optional)
+   * @param dateTime None (optional)
+   * @param password None (optional)
+   * @param paramCallback None (optional)
+   */
+  @RequestLine("POST /fake")
+  @Headers({
+    "Content-Type: application/x-www-form-urlencoded",
+    "Accept: application/json",
+  })
+  void testEndpointParameters(@Param("number") BigDecimal number, @Param("_double") Double _double, @Param("patternWithoutDelimiter") String patternWithoutDelimiter, @Param("_byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("_float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("paramCallback") String paramCallback);
+
+  /**
+   * To test enum parameters
+   * To test enum parameters
+   * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
+   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
+   * @param enumQueryStringArray Query parameter enum test (string array) (optional)
+   * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
+   * @param enumQueryInteger Query parameter enum test (double) (optional)
+   * @param enumQueryDouble Query parameter enum test (double) (optional)
+   * @param enumFormStringArray Form parameter enum test (string array) (optional)
+   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   */
+  @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}")
+  @Headers({
+    "Content-Type: application/x-www-form-urlencoded",
+    "Accept: application/json",
+    "enum_header_string_array: {enumHeaderStringArray}",
+    
+    "enum_header_string: {enumHeaderString}"
+  })
+  void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumQueryStringArray") List<String> enumQueryStringArray, @Param("enumQueryString") String enumQueryString, @Param("enumQueryInteger") Integer enumQueryInteger, @Param("enumQueryDouble") Double enumQueryDouble, @Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString);
+
+  /**
+   * To test enum parameters
+   * To test enum parameters
+   * Note, this is equivalent to the other <code>testEnumParameters</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link TestEnumParametersQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
+   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
+   * @param enumFormStringArray Form parameter enum test (string array) (optional)
+   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>enumQueryStringArray - Query parameter enum test (string array) (optional)</li>
+   *   <li>enumQueryString - Query parameter enum test (string) (optional, default to -efg)</li>
+   *   <li>enumQueryInteger - Query parameter enum test (double) (optional)</li>
+   *   <li>enumQueryDouble - Query parameter enum test (double) (optional)</li>
+   *   </ul>
+   */
+  @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}")
+  @Headers({
+  "Content-Type: application/x-www-form-urlencoded",
+  "Accept: application/json",
+      "enum_header_string_array: {enumHeaderStringArray}",
+      
+      "enum_header_string: {enumHeaderString}"
+  })
+  void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString, @QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>testEnumParameters</code> method in a fluent style.
+   */
+  public static class TestEnumParametersQueryParams extends HashMap<String, Object> {
+    public TestEnumParametersQueryParams enumQueryStringArray(final List<String> value) {
+      put("enum_query_string_array", EncodingUtils.encodeCollection(value, "csv"));
+      return this;
+    }
+    public TestEnumParametersQueryParams enumQueryString(final String value) {
+      put("enum_query_string", EncodingUtils.encode(value));
+      return this;
+    }
+    public TestEnumParametersQueryParams enumQueryInteger(final Integer value) {
+      put("enum_query_integer", EncodingUtils.encode(value));
+      return this;
+    }
+    public TestEnumParametersQueryParams enumQueryDouble(final Double value) {
+      put("enum_query_double", EncodingUtils.encode(value));
+      return this;
+    }
+  }
+
+  /**
+   * Fake endpoint to test group parameters (optional)
+   * Fake endpoint to test group parameters (optional)
+   * @param requiredStringGroup Required String in group parameters (required)
+   * @param requiredBooleanGroup Required Boolean in group parameters (required)
+   * @param requiredInt64Group Required Integer in group parameters (required)
+   * @param stringGroup String in group parameters (optional)
+   * @param booleanGroup Boolean in group parameters (optional)
+   * @param int64Group Integer in group parameters (optional)
+   */
+  @RequestLine("DELETE /fake?required_string_group={requiredStringGroup}&required_int64_group={requiredInt64Group}&string_group={stringGroup}&int64_group={int64Group}")
+  @Headers({
+    "Accept: application/json",
+    "required_boolean_group: {requiredBooleanGroup}",
+    
+    "boolean_group: {booleanGroup}"
+  })
+  void testGroupParameters(@Param("requiredStringGroup") Integer requiredStringGroup, @Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("requiredInt64Group") Long requiredInt64Group, @Param("stringGroup") Integer stringGroup, @Param("booleanGroup") Boolean booleanGroup, @Param("int64Group") Long int64Group);
+
+  /**
+   * Fake endpoint to test group parameters (optional)
+   * Fake endpoint to test group parameters (optional)
+   * Note, this is equivalent to the other <code>testGroupParameters</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link TestGroupParametersQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param requiredBooleanGroup Required Boolean in group parameters (required)
+   * @param booleanGroup Boolean in group parameters (optional)
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>requiredStringGroup - Required String in group parameters (required)</li>
+   *   <li>requiredInt64Group - Required Integer in group parameters (required)</li>
+   *   <li>stringGroup - String in group parameters (optional)</li>
+   *   <li>int64Group - Integer in group parameters (optional)</li>
+   *   </ul>
+   */
+  @RequestLine("DELETE /fake?required_string_group={requiredStringGroup}&required_int64_group={requiredInt64Group}&string_group={stringGroup}&int64_group={int64Group}")
+  @Headers({
+  "Accept: application/json",
+      "required_boolean_group: {requiredBooleanGroup}",
+      
+      "boolean_group: {booleanGroup}"
+  })
+  void testGroupParameters(@Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("booleanGroup") Boolean booleanGroup, @QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>testGroupParameters</code> method in a fluent style.
+   */
+  public static class TestGroupParametersQueryParams extends HashMap<String, Object> {
+    public TestGroupParametersQueryParams requiredStringGroup(final Integer value) {
+      put("required_string_group", EncodingUtils.encode(value));
+      return this;
+    }
+    public TestGroupParametersQueryParams requiredInt64Group(final Long value) {
+      put("required_int64_group", EncodingUtils.encode(value));
+      return this;
+    }
+    public TestGroupParametersQueryParams stringGroup(final Integer value) {
+      put("string_group", EncodingUtils.encode(value));
+      return this;
+    }
+    public TestGroupParametersQueryParams int64Group(final Long value) {
+      put("int64_group", EncodingUtils.encode(value));
+      return this;
+    }
+  }
+
+  /**
+   * test inline additionalProperties
+   * 
+   * @param param request body (required)
+   */
+  @RequestLine("POST /fake/inline-additionalProperties")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  void testInlineAdditionalProperties(Map<String, String> param);
+
+  /**
+   * test json serialization of form data
+   * 
+   * @param param field1 (required)
+   * @param param2 field2 (required)
+   */
+  @RequestLine("GET /fake/jsonFormData")
+  @Headers({
+    "Content-Type: application/x-www-form-urlencoded",
+    "Accept: application/json",
+  })
+  void testJsonFormData(@Param("param") String param, @Param("param2") String param2);
+
+  /**
+   * 
+   * To test the collection format in query parameters
+   * @param pipe  (required)
+   * @param ioutil  (required)
+   * @param http  (required)
+   * @param url  (required)
+   * @param context  (required)
+   */
+  @RequestLine("PUT /fake/test-query-paramters?pipe={pipe}&ioutil={ioutil}&http={http}&url={url}&context={context}")
+  @Headers({
+    "Accept: application/json",
+  })
+  void testQueryParameterCollectionFormat(@Param("pipe") List<String> pipe, @Param("ioutil") List<String> ioutil, @Param("http") List<String> http, @Param("url") List<String> url, @Param("context") List<String> context);
+
+  /**
+   * 
+   * To test the collection format in query parameters
+   * Note, this is equivalent to the other <code>testQueryParameterCollectionFormat</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link TestQueryParameterCollectionFormatQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>pipe -  (required)</li>
+   *   <li>ioutil -  (required)</li>
+   *   <li>http -  (required)</li>
+   *   <li>url -  (required)</li>
+   *   <li>context -  (required)</li>
+   *   </ul>
+   */
+  @RequestLine("PUT /fake/test-query-paramters?pipe={pipe}&ioutil={ioutil}&http={http}&url={url}&context={context}")
+  @Headers({
+  "Accept: application/json",
+  })
+  void testQueryParameterCollectionFormat(@QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>testQueryParameterCollectionFormat</code> method in a fluent style.
+   */
+  public static class TestQueryParameterCollectionFormatQueryParams extends HashMap<String, Object> {
+    public TestQueryParameterCollectionFormatQueryParams pipe(final List<String> value) {
+      put("pipe", EncodingUtils.encodeCollection(value, "csv"));
+      return this;
+    }
+    public TestQueryParameterCollectionFormatQueryParams ioutil(final List<String> value) {
+      put("ioutil", EncodingUtils.encodeCollection(value, "csv"));
+      return this;
+    }
+    public TestQueryParameterCollectionFormatQueryParams http(final List<String> value) {
+      put("http", EncodingUtils.encodeCollection(value, "ssv"));
+      return this;
+    }
+    public TestQueryParameterCollectionFormatQueryParams url(final List<String> value) {
+      put("url", EncodingUtils.encodeCollection(value, "csv"));
+      return this;
+    }
+    public TestQueryParameterCollectionFormatQueryParams context(final List<String> value) {
+      put("context", EncodingUtils.encodeCollection(value, "multi"));
+      return this;
+    }
+  }
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
new file mode 100644
index 000000000000..c22fbfa8d744
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -0,0 +1,30 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.EncodingUtils;
+
+import org.openapitools.client.model.Client;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import feign.*;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public interface FakeClassnameTags123Api extends ApiClient.Api {
+
+
+  /**
+   * To test class name in snake case
+   * To test class name in snake case
+   * @param body client model (required)
+   * @return Client
+   */
+  @RequestLine("PATCH /fake_classname_test")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  Client testClassname(Client body);
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java
new file mode 100644
index 000000000000..b954226800ac
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java
@@ -0,0 +1,201 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.EncodingUtils;
+
+import java.io.File;
+import org.openapitools.client.model.ModelApiResponse;
+import org.openapitools.client.model.Pet;
+import java.util.Set;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import feign.*;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public interface PetApi extends ApiClient.Api {
+
+
+  /**
+   * Add a new pet to the store
+   * 
+   * @param body Pet object that needs to be added to the store (required)
+   */
+  @RequestLine("POST /pet")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  void addPet(Pet body);
+
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   */
+  @RequestLine("DELETE /pet/{petId}")
+  @Headers({
+    "Accept: application/json",
+    "api_key: {apiKey}"
+  })
+  void deletePet(@Param("petId") Long petId, @Param("apiKey") String apiKey);
+
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for filter (required)
+   * @return List&lt;Pet&gt;
+   */
+  @RequestLine("GET /pet/findByStatus?status={status}")
+  @Headers({
+    "Accept: application/json",
+  })
+  List<Pet> findPetsByStatus(@Param("status") List<String> status);
+
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * Note, this is equivalent to the other <code>findPetsByStatus</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link FindPetsByStatusQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>status - Status values that need to be considered for filter (required)</li>
+   *   </ul>
+   * @return List&lt;Pet&gt;
+   */
+  @RequestLine("GET /pet/findByStatus?status={status}")
+  @Headers({
+  "Accept: application/json",
+  })
+  List<Pet> findPetsByStatus(@QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>findPetsByStatus</code> method in a fluent style.
+   */
+  public static class FindPetsByStatusQueryParams extends HashMap<String, Object> {
+    public FindPetsByStatusQueryParams status(final List<String> value) {
+      put("status", EncodingUtils.encodeCollection(value, "csv"));
+      return this;
+    }
+  }
+
+  /**
+   * Finds Pets by tags
+   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by (required)
+   * @return Set&lt;Pet&gt;
+   */
+  @RequestLine("GET /pet/findByTags?tags={tags}")
+  @Headers({
+    "Accept: application/json",
+  })
+  Set<Pet> findPetsByTags(@Param("tags") Set<String> tags);
+
+  /**
+   * Finds Pets by tags
+   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+   * Note, this is equivalent to the other <code>findPetsByTags</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link FindPetsByTagsQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>tags - Tags to filter by (required)</li>
+   *   </ul>
+   * @return Set&lt;Pet&gt;
+   */
+  @RequestLine("GET /pet/findByTags?tags={tags}")
+  @Headers({
+  "Accept: application/json",
+  })
+  Set<Pet> findPetsByTags(@QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>findPetsByTags</code> method in a fluent style.
+   */
+  public static class FindPetsByTagsQueryParams extends HashMap<String, Object> {
+    public FindPetsByTagsQueryParams tags(final Set<String> value) {
+      put("tags", EncodingUtils.encodeCollection(value, "csv"));
+      return this;
+    }
+  }
+
+  /**
+   * Find pet by ID
+   * Returns a single pet
+   * @param petId ID of pet to return (required)
+   * @return Pet
+   */
+  @RequestLine("GET /pet/{petId}")
+  @Headers({
+    "Accept: application/json",
+  })
+  Pet getPetById(@Param("petId") Long petId);
+
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (required)
+   */
+  @RequestLine("PUT /pet")
+  @Headers({
+    "Content-Type: application/json",
+    "Accept: application/json",
+  })
+  void updatePet(Pet body);
+
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
+   */
+  @RequestLine("POST /pet/{petId}")
+  @Headers({
+    "Content-Type: application/x-www-form-urlencoded",
+    "Accept: application/json",
+  })
+  void updatePetWithForm(@Param("petId") Long petId, @Param("name") String name, @Param("status") String status);
+
+  /**
+   * uploads an image
+   * 
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
+   * @return ModelApiResponse
+   */
+  @RequestLine("POST /pet/{petId}/uploadImage")
+  @Headers({
+    "Content-Type: multipart/form-data",
+    "Accept: application/json",
+  })
+  ModelApiResponse uploadFile(@Param("petId") Long petId, @Param("additionalMetadata") String additionalMetadata, @Param("file") File file);
+
+  /**
+   * uploads an image (required)
+   * 
+   * @param petId ID of pet to update (required)
+   * @param requiredFile file to upload (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @return ModelApiResponse
+   */
+  @RequestLine("POST /fake/{petId}/uploadImageWithRequiredFile")
+  @Headers({
+    "Content-Type: multipart/form-data",
+    "Accept: application/json",
+  })
+  ModelApiResponse uploadFileWithRequiredFile(@Param("petId") Long petId, @Param("requiredFile") File requiredFile, @Param("additionalMetadata") String additionalMetadata);
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/StoreApi.java
new file mode 100644
index 000000000000..5ba8227e99b6
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -0,0 +1,64 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.EncodingUtils;
+
+import org.openapitools.client.model.Order;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import feign.*;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public interface StoreApi extends ApiClient.Api {
+
+
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted (required)
+   */
+  @RequestLine("DELETE /store/order/{orderId}")
+  @Headers({
+    "Accept: application/json",
+  })
+  void deleteOrder(@Param("orderId") String orderId);
+
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Map&lt;String, Integer&gt;
+   */
+  @RequestLine("GET /store/inventory")
+  @Headers({
+    "Accept: application/json",
+  })
+  Map<String, Integer> getInventory();
+
+  /**
+   * Find purchase order by ID
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched (required)
+   * @return Order
+   */
+  @RequestLine("GET /store/order/{orderId}")
+  @Headers({
+    "Accept: application/json",
+  })
+  Order getOrderById(@Param("orderId") Long orderId);
+
+  /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (required)
+   * @return Order
+   */
+  @RequestLine("POST /store/order")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: application/json",
+  })
+  Order placeOrder(Order body);
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/UserApi.java
new file mode 100644
index 000000000000..40b6010dab2e
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/UserApi.java
@@ -0,0 +1,149 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.EncodingUtils;
+
+import org.openapitools.client.model.User;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import feign.*;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public interface UserApi extends ApiClient.Api {
+
+
+  /**
+   * Create user
+   * This can only be done by the logged in user.
+   * @param body Created user object (required)
+   */
+  @RequestLine("POST /user")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: application/json",
+  })
+  void createUser(User body);
+
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   */
+  @RequestLine("POST /user/createWithArray")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: application/json",
+  })
+  void createUsersWithArrayInput(List<User> body);
+
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   */
+  @RequestLine("POST /user/createWithList")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: application/json",
+  })
+  void createUsersWithListInput(List<User> body);
+
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   */
+  @RequestLine("DELETE /user/{username}")
+  @Headers({
+    "Accept: application/json",
+  })
+  void deleteUser(@Param("username") String username);
+
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return User
+   */
+  @RequestLine("GET /user/{username}")
+  @Headers({
+    "Accept: application/json",
+  })
+  User getUserByName(@Param("username") String username);
+
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login (required)
+   * @param password The password for login in clear text (required)
+   * @return String
+   */
+  @RequestLine("GET /user/login?username={username}&password={password}")
+  @Headers({
+    "Accept: application/json",
+  })
+  String loginUser(@Param("username") String username, @Param("password") String password);
+
+  /**
+   * Logs user into the system
+   * 
+   * Note, this is equivalent to the other <code>loginUser</code> method,
+   * but with the query parameters collected into a single Map parameter. This
+   * is convenient for services with optional query parameters, especially when
+   * used with the {@link LoginUserQueryParams} class that allows for
+   * building up this map in a fluent style.
+   * @param queryParams Map of query parameters as name-value pairs
+   *   <p>The following elements may be specified in the query map:</p>
+   *   <ul>
+   *   <li>username - The user name for login (required)</li>
+   *   <li>password - The password for login in clear text (required)</li>
+   *   </ul>
+   * @return String
+   */
+  @RequestLine("GET /user/login?username={username}&password={password}")
+  @Headers({
+  "Accept: application/json",
+  })
+  String loginUser(@QueryMap(encoded=true) Map<String, Object> queryParams);
+
+  /**
+   * A convenience class for generating query parameters for the
+   * <code>loginUser</code> method in a fluent style.
+   */
+  public static class LoginUserQueryParams extends HashMap<String, Object> {
+    public LoginUserQueryParams username(final String value) {
+      put("username", EncodingUtils.encode(value));
+      return this;
+    }
+    public LoginUserQueryParams password(final String value) {
+      put("password", EncodingUtils.encode(value));
+      return this;
+    }
+  }
+
+  /**
+   * Logs out current logged in user session
+   * 
+   */
+  @RequestLine("GET /user/logout")
+  @Headers({
+    "Accept: application/json",
+  })
+  void logoutUser();
+
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (required)
+   */
+  @RequestLine("PUT /user/{username}")
+  @Headers({
+    "Content-Type: */*",
+    "Accept: application/json",
+  })
+  void updateUser(@Param("username") String username, User body);
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
new file mode 100644
index 000000000000..44511e4641c8
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
@@ -0,0 +1,43 @@
+package org.openapitools.client.auth;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+public class ApiKeyAuth implements RequestInterceptor {
+    private final String location;
+    private final String paramName;
+
+    private String apiKey;
+
+    public ApiKeyAuth(String location, String paramName) {
+        this.location = location;
+        this.paramName = paramName;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public String getParamName() {
+        return paramName;
+    }
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    @Override
+    public void apply(RequestTemplate template) {
+        if ("query".equals(location)) {
+            template.query(paramName, apiKey);
+        } else if ("header".equals(location)) {
+            template.header(paramName, apiKey);
+        } else if ("cookie".equals(location)) {
+            template.header("Cookie", String.format("%s=%s", paramName, apiKey));
+        }
+    }
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
new file mode 100644
index 000000000000..b275826472ac
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
@@ -0,0 +1,41 @@
+package org.openapitools.client.auth;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import feign.auth.BasicAuthRequestInterceptor;
+
+/**
+ * An interceptor that adds the request header needed to use HTTP basic authentication.
+ */
+public class HttpBasicAuth implements RequestInterceptor {
+
+    private String username;
+    private String password;
+    
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void setCredentials(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+  @Override
+  public void apply(RequestTemplate template) {
+      RequestInterceptor requestInterceptor = new BasicAuthRequestInterceptor(username, password);
+      requestInterceptor.apply(template);
+  }
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
new file mode 100644
index 000000000000..d4c9cbe6361e
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
@@ -0,0 +1,43 @@
+package org.openapitools.client.auth;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+/**
+ * An interceptor that adds the request header needed to use HTTP bearer authentication.
+ */
+public class HttpBearerAuth implements RequestInterceptor {
+  private final String scheme;
+  private String bearerToken;
+
+  public HttpBearerAuth(String scheme) {
+    this.scheme = scheme;
+  }
+
+  /**
+   * Gets the token, which together with the scheme, will be sent as the value of the Authorization header.
+   */
+  public String getBearerToken() {
+    return bearerToken;
+  }
+
+  /**
+   * Sets the token, which together with the scheme, will be sent as the value of the Authorization header.
+   */
+  public void setBearerToken(String bearerToken) {
+    this.bearerToken = bearerToken;
+  }
+
+  @Override
+  public void apply(RequestTemplate template) {
+    if(bearerToken == null) {
+      return;
+    }
+
+    template.header("Authorization", (scheme != null ? upperCaseBearer(scheme) + " " : "") + bearerToken);
+  }
+
+  private static String upperCaseBearer(String scheme) {
+    return ("bearer".equalsIgnoreCase(scheme)) ? "Bearer" : scheme;
+  }
+}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/OAuth.java
new file mode 100644
index 000000000000..f59ad4a94ba8
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -0,0 +1,198 @@
+package org.openapitools.client.auth;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.oltu.oauth2.client.HttpClient;
+import org.apache.oltu.oauth2.client.OAuthClient;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+import org.apache.oltu.oauth2.client.response.OAuthClientResponse;
+import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory;
+import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse;
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
+import org.apache.oltu.oauth2.common.message.types.GrantType;
+import org.apache.oltu.oauth2.common.token.BasicOAuthToken;
+
+import feign.Client;
+import feign.Request.HttpMethod;
+import feign.Request.Options;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import feign.Response;
+import feign.RetryableException;
+import feign.Util;
+import org.openapitools.client.StringUtil;
+
+
+public class OAuth implements RequestInterceptor {
+
+    static final int MILLIS_PER_SECOND = 1000;
+
+    public interface AccessTokenListener {
+        void notify(BasicOAuthToken token);
+    }
+
+    private volatile String accessToken;
+    private Long expirationTimeMillis;
+    private OAuthClient oauthClient;
+    private TokenRequestBuilder tokenRequestBuilder;
+    private AuthenticationRequestBuilder authenticationRequestBuilder;
+    private AccessTokenListener accessTokenListener;
+
+    public OAuth(Client client, TokenRequestBuilder requestBuilder) {
+        this.oauthClient = new OAuthClient(new OAuthFeignClient(client));
+        this.tokenRequestBuilder = requestBuilder;
+    }
+
+    public OAuth(Client client, OAuthFlow flow, String authorizationUrl, String tokenUrl, String scopes) {
+        this(client, OAuthClientRequest.tokenLocation(tokenUrl).setScope(scopes));
+
+        switch(flow) {
+        case accessCode:
+        case implicit:
+            tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE);
+            break;
+        case password:
+            tokenRequestBuilder.setGrantType(GrantType.PASSWORD);
+            break;
+        case application:
+            tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS);
+            break;
+        default:
+            break;
+        }
+        authenticationRequestBuilder = OAuthClientRequest.authorizationLocation(authorizationUrl);
+    }
+
+    public OAuth(OAuthFlow flow, String authorizationUrl, String tokenUrl, String scopes) {
+        this(new Client.Default(null, null), flow, authorizationUrl, tokenUrl, scopes);
+    }
+
+    @Override
+    public void apply(RequestTemplate template) {
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (template.headers().containsKey("Authorization")) {
+            return;
+        }
+        // If first time, get the token
+        if (expirationTimeMillis == null || System.currentTimeMillis() >= expirationTimeMillis) {
+            updateAccessToken(template);
+        }
+        if (getAccessToken() != null) {
+            template.header("Authorization", "Bearer " + getAccessToken());
+        }
+    }
+
+    public synchronized void updateAccessToken(RequestTemplate template) {
+        OAuthJSONAccessTokenResponse accessTokenResponse;
+        try {
+            accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
+        } catch (Exception e) {
+            throw new RetryableException(0, e.getMessage(), HttpMethod.POST, e, null, template.request());
+        }
+        if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
+            setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());
+            if (accessTokenListener != null) {
+                accessTokenListener.notify((BasicOAuthToken) accessTokenResponse.getOAuthToken());
+            }
+        }
+    }
+
+    public synchronized void registerAccessTokenListener(AccessTokenListener accessTokenListener) {
+        this.accessTokenListener = accessTokenListener;
+    }
+
+    public synchronized String getAccessToken() {
+        return accessToken;
+    }
+
+    public synchronized void setAccessToken(String accessToken, Long expiresIn) {
+        this.accessToken = accessToken;
+        this.expirationTimeMillis = expiresIn == null ? null : System.currentTimeMillis() + expiresIn * MILLIS_PER_SECOND;
+    }
+
+    public TokenRequestBuilder getTokenRequestBuilder() {
+        return tokenRequestBuilder;
+    }
+
+    public void setTokenRequestBuilder(TokenRequestBuilder tokenRequestBuilder) {
+        this.tokenRequestBuilder = tokenRequestBuilder;
+    }
+
+    public AuthenticationRequestBuilder getAuthenticationRequestBuilder() {
+        return authenticationRequestBuilder;
+    }
+
+    public void setAuthenticationRequestBuilder(AuthenticationRequestBuilder authenticationRequestBuilder) {
+        this.authenticationRequestBuilder = authenticationRequestBuilder;
+    }
+
+    public OAuthClient getOauthClient() {
+        return oauthClient;
+    }
+
+    public void setOauthClient(OAuthClient oauthClient) {
+        this.oauthClient = oauthClient;
+    }
+
+    public void setOauthClient(Client client) {
+        this.oauthClient = new OAuthClient( new OAuthFeignClient(client));
+    }
+
+    public static class OAuthFeignClient implements HttpClient {
+
+        private Client client;
+
+        public OAuthFeignClient() {
+            this.client = new Client.Default(null, null);
+        }
+
+        public OAuthFeignClient(Client client) {
+            this.client = client;
+        }
+
+        public <T extends OAuthClientResponse> T execute(OAuthClientRequest request, Map<String, String> headers,
+                String requestMethod, Class<T> responseClass)
+                        throws OAuthSystemException, OAuthProblemException {
+
+            RequestTemplate req = new RequestTemplate()
+                    .append(request.getLocationUri())
+                    .method(requestMethod)
+                    .body(request.getBody());
+
+            for (Entry<String, String> entry : headers.entrySet()) {
+                req.header(entry.getKey(), entry.getValue());
+            }
+            Response feignResponse;
+            String body = "";
+            try {
+                feignResponse = client.execute(req.request(), new Options());
+                body = Util.toString(feignResponse.body().asReader());
+            } catch (IOException e) {
+                throw new OAuthSystemException(e);
+            }
+
+            String contentType = null;
+            Collection<String> contentTypeHeader =  feignResponse.headers().get("Content-Type");
+            if(contentTypeHeader != null) {
+                contentType = StringUtil.join(contentTypeHeader.toArray(new String[0]), ";");
+            }
+
+            return OAuthClientResponseFactory.createCustomResponse(
+                    body,
+                    contentType,
+                    feignResponse.status(),
+                    responseClass
+            );
+        }
+
+        public void shutdown() {
+            // Nothing to do here
+        }
+    }
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/auth/OAuthFlow.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/OAuthFlow.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/auth/OAuthFlow.java
rename to samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/OAuthFlow.java
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
new file mode 100644
index 000000000000..f84a72518f68
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -0,0 +1,106 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesAnyType
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesAnyType name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
+    return Objects.equals(this.name, additionalPropertiesAnyType.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesAnyType {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
new file mode 100644
index 000000000000..3104ead59eed
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -0,0 +1,107 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesArray
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesArray.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesArray extends HashMap<String, List> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesArray name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
+    return Objects.equals(this.name, additionalPropertiesArray.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesArray {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
new file mode 100644
index 000000000000..b485c4825c27
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -0,0 +1,106 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesBoolean
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesBoolean name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
+    return Objects.equals(this.name, additionalPropertiesBoolean.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesBoolean {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
new file mode 100644
index 000000000000..8dffb4999596
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -0,0 +1,480 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesClass
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_STRING,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_NUMBER,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_INTEGER,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_BOOLEAN,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_INTEGER,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_ANYTYPE,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_STRING,
+  AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_ANYTYPE,
+  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE1,
+  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
+  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesClass {
+  public static final String JSON_PROPERTY_MAP_STRING = "map_string";
+  private Map<String, String> mapString = null;
+
+  public static final String JSON_PROPERTY_MAP_NUMBER = "map_number";
+  private Map<String, BigDecimal> mapNumber = null;
+
+  public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer";
+  private Map<String, Integer> mapInteger = null;
+
+  public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean";
+  private Map<String, Boolean> mapBoolean = null;
+
+  public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer";
+  private Map<String, List<Integer>> mapArrayInteger = null;
+
+  public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype";
+  private Map<String, List<Object>> mapArrayAnytype = null;
+
+  public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string";
+  private Map<String, Map<String, String>> mapMapString = null;
+
+  public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype";
+  private Map<String, Map<String, Object>> mapMapAnytype = null;
+
+  public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1";
+  private Object anytype1;
+
+  public static final String JSON_PROPERTY_ANYTYPE2 = "anytype_2";
+  private Object anytype2;
+
+  public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3";
+  private Object anytype3;
+
+
+  public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
+    
+    this.mapString = mapString;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) {
+    if (this.mapString == null) {
+      this.mapString = new HashMap<String, String>();
+    }
+    this.mapString.put(key, mapStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapString
+   * @return mapString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, String> getMapString() {
+    return mapString;
+  }
+
+
+  public void setMapString(Map<String, String> mapString) {
+    this.mapString = mapString;
+  }
+
+
+  public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
+    
+    this.mapNumber = mapNumber;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) {
+    if (this.mapNumber == null) {
+      this.mapNumber = new HashMap<String, BigDecimal>();
+    }
+    this.mapNumber.put(key, mapNumberItem);
+    return this;
+  }
+
+   /**
+   * Get mapNumber
+   * @return mapNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, BigDecimal> getMapNumber() {
+    return mapNumber;
+  }
+
+
+  public void setMapNumber(Map<String, BigDecimal> mapNumber) {
+    this.mapNumber = mapNumber;
+  }
+
+
+  public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
+    
+    this.mapInteger = mapInteger;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) {
+    if (this.mapInteger == null) {
+      this.mapInteger = new HashMap<String, Integer>();
+    }
+    this.mapInteger.put(key, mapIntegerItem);
+    return this;
+  }
+
+   /**
+   * Get mapInteger
+   * @return mapInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Integer> getMapInteger() {
+    return mapInteger;
+  }
+
+
+  public void setMapInteger(Map<String, Integer> mapInteger) {
+    this.mapInteger = mapInteger;
+  }
+
+
+  public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
+    
+    this.mapBoolean = mapBoolean;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) {
+    if (this.mapBoolean == null) {
+      this.mapBoolean = new HashMap<String, Boolean>();
+    }
+    this.mapBoolean.put(key, mapBooleanItem);
+    return this;
+  }
+
+   /**
+   * Get mapBoolean
+   * @return mapBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Boolean> getMapBoolean() {
+    return mapBoolean;
+  }
+
+
+  public void setMapBoolean(Map<String, Boolean> mapBoolean) {
+    this.mapBoolean = mapBoolean;
+  }
+
+
+  public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
+    
+    this.mapArrayInteger = mapArrayInteger;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer> mapArrayIntegerItem) {
+    if (this.mapArrayInteger == null) {
+      this.mapArrayInteger = new HashMap<String, List<Integer>>();
+    }
+    this.mapArrayInteger.put(key, mapArrayIntegerItem);
+    return this;
+  }
+
+   /**
+   * Get mapArrayInteger
+   * @return mapArrayInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, List<Integer>> getMapArrayInteger() {
+    return mapArrayInteger;
+  }
+
+
+  public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
+    this.mapArrayInteger = mapArrayInteger;
+  }
+
+
+  public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
+    
+    this.mapArrayAnytype = mapArrayAnytype;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object> mapArrayAnytypeItem) {
+    if (this.mapArrayAnytype == null) {
+      this.mapArrayAnytype = new HashMap<String, List<Object>>();
+    }
+    this.mapArrayAnytype.put(key, mapArrayAnytypeItem);
+    return this;
+  }
+
+   /**
+   * Get mapArrayAnytype
+   * @return mapArrayAnytype
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, List<Object>> getMapArrayAnytype() {
+    return mapArrayAnytype;
+  }
+
+
+  public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
+    this.mapArrayAnytype = mapArrayAnytype;
+  }
+
+
+  public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> mapMapString) {
+    
+    this.mapMapString = mapMapString;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, String> mapMapStringItem) {
+    if (this.mapMapString == null) {
+      this.mapMapString = new HashMap<String, Map<String, String>>();
+    }
+    this.mapMapString.put(key, mapMapStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapMapString
+   * @return mapMapString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Map<String, String>> getMapMapString() {
+    return mapMapString;
+  }
+
+
+  public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
+    this.mapMapString = mapMapString;
+  }
+
+
+  public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
+    
+    this.mapMapAnytype = mapMapAnytype;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Object> mapMapAnytypeItem) {
+    if (this.mapMapAnytype == null) {
+      this.mapMapAnytype = new HashMap<String, Map<String, Object>>();
+    }
+    this.mapMapAnytype.put(key, mapMapAnytypeItem);
+    return this;
+  }
+
+   /**
+   * Get mapMapAnytype
+   * @return mapMapAnytype
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Map<String, Object>> getMapMapAnytype() {
+    return mapMapAnytype;
+  }
+
+
+  public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
+    this.mapMapAnytype = mapMapAnytype;
+  }
+
+
+  public AdditionalPropertiesClass anytype1(Object anytype1) {
+    
+    this.anytype1 = anytype1;
+    return this;
+  }
+
+   /**
+   * Get anytype1
+   * @return anytype1
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Object getAnytype1() {
+    return anytype1;
+  }
+
+
+  public void setAnytype1(Object anytype1) {
+    this.anytype1 = anytype1;
+  }
+
+
+  public AdditionalPropertiesClass anytype2(Object anytype2) {
+    
+    this.anytype2 = anytype2;
+    return this;
+  }
+
+   /**
+   * Get anytype2
+   * @return anytype2
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ANYTYPE2)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Object getAnytype2() {
+    return anytype2;
+  }
+
+
+  public void setAnytype2(Object anytype2) {
+    this.anytype2 = anytype2;
+  }
+
+
+  public AdditionalPropertiesClass anytype3(Object anytype3) {
+    
+    this.anytype3 = anytype3;
+    return this;
+  }
+
+   /**
+   * Get anytype3
+   * @return anytype3
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ANYTYPE3)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Object getAnytype3() {
+    return anytype3;
+  }
+
+
+  public void setAnytype3(Object anytype3) {
+    this.anytype3 = anytype3;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
+    return Objects.equals(this.mapString, additionalPropertiesClass.mapString) &&
+        Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) &&
+        Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) &&
+        Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) &&
+        Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) &&
+        Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) &&
+        Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) &&
+        Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) &&
+        Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) &&
+        Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) &&
+        Objects.equals(this.anytype3, additionalPropertiesClass.anytype3);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesClass {\n");
+    sb.append("    mapString: ").append(toIndentedString(mapString)).append("\n");
+    sb.append("    mapNumber: ").append(toIndentedString(mapNumber)).append("\n");
+    sb.append("    mapInteger: ").append(toIndentedString(mapInteger)).append("\n");
+    sb.append("    mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n");
+    sb.append("    mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n");
+    sb.append("    mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n");
+    sb.append("    mapMapString: ").append(toIndentedString(mapMapString)).append("\n");
+    sb.append("    mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n");
+    sb.append("    anytype1: ").append(toIndentedString(anytype1)).append("\n");
+    sb.append("    anytype2: ").append(toIndentedString(anytype2)).append("\n");
+    sb.append("    anytype3: ").append(toIndentedString(anytype3)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
new file mode 100644
index 000000000000..d09eacadf3e9
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -0,0 +1,106 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesInteger
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesInteger.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesInteger name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
+    return Objects.equals(this.name, additionalPropertiesInteger.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesInteger {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
new file mode 100644
index 000000000000..93480b7f4966
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -0,0 +1,107 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesNumber
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesNumber.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesNumber name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
+    return Objects.equals(this.name, additionalPropertiesNumber.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesNumber {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
new file mode 100644
index 000000000000..4afc16a07bb9
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -0,0 +1,106 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesObject
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesObject.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesObject name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o;
+    return Objects.equals(this.name, additionalPropertiesObject.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesObject {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
new file mode 100644
index 000000000000..8533c0b77ae3
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -0,0 +1,106 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * AdditionalPropertiesString
+ */
+@JsonPropertyOrder({
+  AdditionalPropertiesString.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesString extends HashMap<String, String> {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public AdditionalPropertiesString name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o;
+    return Objects.equals(this.name, additionalPropertiesString.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesString {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
new file mode 100644
index 000000000000..83270058d077
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
@@ -0,0 +1,144 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.BigCat;
+import org.openapitools.client.model.Cat;
+import org.openapitools.client.model.Dog;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Animal
+ */
+@JsonPropertyOrder({
+  Animal.JSON_PROPERTY_CLASS_NAME,
+  Animal.JSON_PROPERTY_COLOR
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
+  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+})
+
+public class Animal {
+  public static final String JSON_PROPERTY_CLASS_NAME = "className";
+  protected String className;
+
+  public static final String JSON_PROPERTY_COLOR = "color";
+  private String color = "red";
+
+
+  public Animal className(String className) {
+    
+    this.className = className;
+    return this;
+  }
+
+   /**
+   * Get className
+   * @return className
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getClassName() {
+    return className;
+  }
+
+
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  public Animal color(String color) {
+    
+    this.color = color;
+    return this;
+  }
+
+   /**
+   * Get color
+   * @return color
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_COLOR)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getColor() {
+    return color;
+  }
+
+
+  public void setColor(String color) {
+    this.color = color;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Animal animal = (Animal) o;
+    return Objects.equals(this.className, animal.className) &&
+        Objects.equals(this.color, animal.color);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, color);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
new file mode 100644
index 000000000000..5dc5abf29846
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -0,0 +1,113 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * ArrayOfArrayOfNumberOnly
+ */
+@JsonPropertyOrder({
+  ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ArrayOfArrayOfNumberOnly {
+  public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
+  private List<List<BigDecimal>> arrayArrayNumber = null;
+
+
+  public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
+    
+    this.arrayArrayNumber = arrayArrayNumber;
+    return this;
+  }
+
+  public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
+    if (this.arrayArrayNumber == null) {
+      this.arrayArrayNumber = new ArrayList<List<BigDecimal>>();
+    }
+    this.arrayArrayNumber.add(arrayArrayNumberItem);
+    return this;
+  }
+
+   /**
+   * Get arrayArrayNumber
+   * @return arrayArrayNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<List<BigDecimal>> getArrayArrayNumber() {
+    return arrayArrayNumber;
+  }
+
+
+  public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
+    this.arrayArrayNumber = arrayArrayNumber;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o;
+    return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayArrayNumber);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayOfArrayOfNumberOnly {\n");
+    sb.append("    arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
new file mode 100644
index 000000000000..c237ea37a6e2
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -0,0 +1,113 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * ArrayOfNumberOnly
+ */
+@JsonPropertyOrder({
+  ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ArrayOfNumberOnly {
+  public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
+  private List<BigDecimal> arrayNumber = null;
+
+
+  public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
+    
+    this.arrayNumber = arrayNumber;
+    return this;
+  }
+
+  public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
+    if (this.arrayNumber == null) {
+      this.arrayNumber = new ArrayList<BigDecimal>();
+    }
+    this.arrayNumber.add(arrayNumberItem);
+    return this;
+  }
+
+   /**
+   * Get arrayNumber
+   * @return arrayNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<BigDecimal> getArrayNumber() {
+    return arrayNumber;
+  }
+
+
+  public void setArrayNumber(List<BigDecimal> arrayNumber) {
+    this.arrayNumber = arrayNumber;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o;
+    return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayNumber);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayOfNumberOnly {\n");
+    sb.append("    arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
new file mode 100644
index 000000000000..8ca28d3862b8
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -0,0 +1,191 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.openapitools.client.model.ReadOnlyFirst;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * ArrayTest
+ */
+@JsonPropertyOrder({
+  ArrayTest.JSON_PROPERTY_ARRAY_OF_STRING,
+  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
+  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ArrayTest {
+  public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
+  private List<String> arrayOfString = null;
+
+  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
+  private List<List<Long>> arrayArrayOfInteger = null;
+
+  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
+  private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
+
+
+  public ArrayTest arrayOfString(List<String> arrayOfString) {
+    
+    this.arrayOfString = arrayOfString;
+    return this;
+  }
+
+  public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
+    if (this.arrayOfString == null) {
+      this.arrayOfString = new ArrayList<String>();
+    }
+    this.arrayOfString.add(arrayOfStringItem);
+    return this;
+  }
+
+   /**
+   * Get arrayOfString
+   * @return arrayOfString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<String> getArrayOfString() {
+    return arrayOfString;
+  }
+
+
+  public void setArrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+  }
+
+
+  public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+    return this;
+  }
+
+  public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
+    if (this.arrayArrayOfInteger == null) {
+      this.arrayArrayOfInteger = new ArrayList<List<Long>>();
+    }
+    this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
+    return this;
+  }
+
+   /**
+   * Get arrayArrayOfInteger
+   * @return arrayArrayOfInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<List<Long>> getArrayArrayOfInteger() {
+    return arrayArrayOfInteger;
+  }
+
+
+  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+  }
+
+
+  public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    
+    this.arrayArrayOfModel = arrayArrayOfModel;
+    return this;
+  }
+
+  public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
+    if (this.arrayArrayOfModel == null) {
+      this.arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
+    }
+    this.arrayArrayOfModel.add(arrayArrayOfModelItem);
+    return this;
+  }
+
+   /**
+   * Get arrayArrayOfModel
+   * @return arrayArrayOfModel
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
+    return arrayArrayOfModel;
+  }
+
+
+  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayTest arrayTest = (ArrayTest) o;
+    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
+        Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
+        Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayTest {\n");
+    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
+    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
+    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/BigCat.java
new file mode 100644
index 000000000000..f038a3a46ad7
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/BigCat.java
@@ -0,0 +1,151 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.BigCatAllOf;
+import org.openapitools.client.model.Cat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * BigCat
+ */
+@JsonPropertyOrder({
+  BigCat.JSON_PROPERTY_KIND
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+})
+
+public class BigCat extends Cat {
+  /**
+   * Gets or Sets kind
+   */
+  public enum KindEnum {
+    LIONS("lions"),
+    
+    TIGERS("tigers"),
+    
+    LEOPARDS("leopards"),
+    
+    JAGUARS("jaguars");
+
+    private String value;
+
+    KindEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static KindEnum fromValue(String value) {
+      for (KindEnum b : KindEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_KIND = "kind";
+  private KindEnum kind;
+
+
+  public BigCat kind(KindEnum kind) {
+    
+    this.kind = kind;
+    return this;
+  }
+
+   /**
+   * Get kind
+   * @return kind
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_KIND)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public KindEnum getKind() {
+    return kind;
+  }
+
+
+  public void setKind(KindEnum kind) {
+    this.kind = kind;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    BigCat bigCat = (BigCat) o;
+    return Objects.equals(this.kind, bigCat.kind) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(kind, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class BigCat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/BigCatAllOf.java
new file mode 100644
index 000000000000..e3b6b0fdd04e
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -0,0 +1,141 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * BigCatAllOf
+ */
+@JsonPropertyOrder({
+  BigCatAllOf.JSON_PROPERTY_KIND
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class BigCatAllOf {
+  /**
+   * Gets or Sets kind
+   */
+  public enum KindEnum {
+    LIONS("lions"),
+    
+    TIGERS("tigers"),
+    
+    LEOPARDS("leopards"),
+    
+    JAGUARS("jaguars");
+
+    private String value;
+
+    KindEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static KindEnum fromValue(String value) {
+      for (KindEnum b : KindEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_KIND = "kind";
+  private KindEnum kind;
+
+
+  public BigCatAllOf kind(KindEnum kind) {
+    
+    this.kind = kind;
+    return this;
+  }
+
+   /**
+   * Get kind
+   * @return kind
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_KIND)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public KindEnum getKind() {
+    return kind;
+  }
+
+
+  public void setKind(KindEnum kind) {
+    this.kind = kind;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    BigCatAllOf bigCatAllOf = (BigCatAllOf) o;
+    return Objects.equals(this.kind, bigCatAllOf.kind);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(kind);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class BigCatAllOf {\n");
+    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
new file mode 100644
index 000000000000..d253e541dede
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -0,0 +1,257 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Capitalization
+ */
+@JsonPropertyOrder({
+  Capitalization.JSON_PROPERTY_SMALL_CAMEL,
+  Capitalization.JSON_PROPERTY_CAPITAL_CAMEL,
+  Capitalization.JSON_PROPERTY_SMALL_SNAKE,
+  Capitalization.JSON_PROPERTY_CAPITAL_SNAKE,
+  Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
+  Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Capitalization {
+  public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
+  private String smallCamel;
+
+  public static final String JSON_PROPERTY_CAPITAL_CAMEL = "CapitalCamel";
+  private String capitalCamel;
+
+  public static final String JSON_PROPERTY_SMALL_SNAKE = "small_Snake";
+  private String smallSnake;
+
+  public static final String JSON_PROPERTY_CAPITAL_SNAKE = "Capital_Snake";
+  private String capitalSnake;
+
+  public static final String JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points";
+  private String scAETHFlowPoints;
+
+  public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME";
+  private String ATT_NAME;
+
+
+  public Capitalization smallCamel(String smallCamel) {
+    
+    this.smallCamel = smallCamel;
+    return this;
+  }
+
+   /**
+   * Get smallCamel
+   * @return smallCamel
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getSmallCamel() {
+    return smallCamel;
+  }
+
+
+  public void setSmallCamel(String smallCamel) {
+    this.smallCamel = smallCamel;
+  }
+
+
+  public Capitalization capitalCamel(String capitalCamel) {
+    
+    this.capitalCamel = capitalCamel;
+    return this;
+  }
+
+   /**
+   * Get capitalCamel
+   * @return capitalCamel
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getCapitalCamel() {
+    return capitalCamel;
+  }
+
+
+  public void setCapitalCamel(String capitalCamel) {
+    this.capitalCamel = capitalCamel;
+  }
+
+
+  public Capitalization smallSnake(String smallSnake) {
+    
+    this.smallSnake = smallSnake;
+    return this;
+  }
+
+   /**
+   * Get smallSnake
+   * @return smallSnake
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getSmallSnake() {
+    return smallSnake;
+  }
+
+
+  public void setSmallSnake(String smallSnake) {
+    this.smallSnake = smallSnake;
+  }
+
+
+  public Capitalization capitalSnake(String capitalSnake) {
+    
+    this.capitalSnake = capitalSnake;
+    return this;
+  }
+
+   /**
+   * Get capitalSnake
+   * @return capitalSnake
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getCapitalSnake() {
+    return capitalSnake;
+  }
+
+
+  public void setCapitalSnake(String capitalSnake) {
+    this.capitalSnake = capitalSnake;
+  }
+
+
+  public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
+    
+    this.scAETHFlowPoints = scAETHFlowPoints;
+    return this;
+  }
+
+   /**
+   * Get scAETHFlowPoints
+   * @return scAETHFlowPoints
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getScAETHFlowPoints() {
+    return scAETHFlowPoints;
+  }
+
+
+  public void setScAETHFlowPoints(String scAETHFlowPoints) {
+    this.scAETHFlowPoints = scAETHFlowPoints;
+  }
+
+
+  public Capitalization ATT_NAME(String ATT_NAME) {
+    
+    this.ATT_NAME = ATT_NAME;
+    return this;
+  }
+
+   /**
+   * Name of the pet 
+   * @return ATT_NAME
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getATTNAME() {
+    return ATT_NAME;
+  }
+
+
+  public void setATTNAME(String ATT_NAME) {
+    this.ATT_NAME = ATT_NAME;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Capitalization capitalization = (Capitalization) o;
+    return Objects.equals(this.smallCamel, capitalization.smallCamel) &&
+        Objects.equals(this.capitalCamel, capitalization.capitalCamel) &&
+        Objects.equals(this.smallSnake, capitalization.smallSnake) &&
+        Objects.equals(this.capitalSnake, capitalization.capitalSnake) &&
+        Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) &&
+        Objects.equals(this.ATT_NAME, capitalization.ATT_NAME);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Capitalization {\n");
+    sb.append("    smallCamel: ").append(toIndentedString(smallCamel)).append("\n");
+    sb.append("    capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n");
+    sb.append("    smallSnake: ").append(toIndentedString(smallSnake)).append("\n");
+    sb.append("    capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n");
+    sb.append("    scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n");
+    sb.append("    ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
new file mode 100644
index 000000000000..e07f10082d0e
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
@@ -0,0 +1,114 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.BigCat;
+import org.openapitools.client.model.CatAllOf;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Cat
+ */
+@JsonPropertyOrder({
+  Cat.JSON_PROPERTY_DECLAWED
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
+})
+
+public class Cat extends Animal {
+  public static final String JSON_PROPERTY_DECLAWED = "declawed";
+  private Boolean declawed;
+
+
+  public Cat declawed(Boolean declawed) {
+    
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DECLAWED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isDeclawed() {
+    return declawed;
+  }
+
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Cat cat = (Cat) o;
+    return Objects.equals(this.declawed, cat.declawed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
new file mode 100644
index 000000000000..26285427f96c
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -0,0 +1,102 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * CatAllOf
+ */
+@JsonPropertyOrder({
+  CatAllOf.JSON_PROPERTY_DECLAWED
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class CatAllOf {
+  public static final String JSON_PROPERTY_DECLAWED = "declawed";
+  private Boolean declawed;
+
+
+  public CatAllOf declawed(Boolean declawed) {
+    
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DECLAWED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isDeclawed() {
+    return declawed;
+  }
+
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return Objects.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
new file mode 100644
index 000000000000..de74329bc521
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
@@ -0,0 +1,132 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Category
+ */
+@JsonPropertyOrder({
+  Category.JSON_PROPERTY_ID,
+  Category.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Category {
+  public static final String JSON_PROPERTY_ID = "id";
+  private Long id;
+
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name = "default-name";
+
+
+  public Category id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public Category name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Category category = (Category) o;
+    return Objects.equals(this.id, category.id) &&
+        Objects.equals(this.name, category.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
new file mode 100644
index 000000000000..bac4aec70b57
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -0,0 +1,103 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Model for testing model with \&quot;_class\&quot; property
+ */
+@ApiModel(description = "Model for testing model with \"_class\" property")
+@JsonPropertyOrder({
+  ClassModel.JSON_PROPERTY_PROPERTY_CLASS
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ClassModel {
+  public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
+  private String propertyClass;
+
+
+  public ClassModel propertyClass(String propertyClass) {
+    
+    this.propertyClass = propertyClass;
+    return this;
+  }
+
+   /**
+   * Get propertyClass
+   * @return propertyClass
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getPropertyClass() {
+    return propertyClass;
+  }
+
+
+  public void setPropertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ClassModel classModel = (ClassModel) o;
+    return Objects.equals(this.propertyClass, classModel.propertyClass);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(propertyClass);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ClassModel {\n");
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
new file mode 100644
index 000000000000..6bb0d3fab73e
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
@@ -0,0 +1,102 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Client
+ */
+@JsonPropertyOrder({
+  Client.JSON_PROPERTY_CLIENT
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Client {
+  public static final String JSON_PROPERTY_CLIENT = "client";
+  private String client;
+
+
+  public Client client(String client) {
+    
+    this.client = client;
+    return this;
+  }
+
+   /**
+   * Get client
+   * @return client
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CLIENT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getClient() {
+    return client;
+  }
+
+
+  public void setClient(String client) {
+    this.client = client;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Client client = (Client) o;
+    return Objects.equals(this.client, client.client);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(client);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Client {\n");
+    sb.append("    client: ").append(toIndentedString(client)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
new file mode 100644
index 000000000000..edf33abb2b57
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
@@ -0,0 +1,112 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Dog
+ */
+@JsonPropertyOrder({
+  Dog.JSON_PROPERTY_BREED
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+})
+
+public class Dog extends Animal {
+  public static final String JSON_PROPERTY_BREED = "breed";
+  private String breed;
+
+
+  public Dog breed(String breed) {
+    
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BREED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getBreed() {
+    return breed;
+  }
+
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Dog dog = (Dog) o;
+    return Objects.equals(this.breed, dog.breed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
new file mode 100644
index 000000000000..147bb4d9b761
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -0,0 +1,102 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * DogAllOf
+ */
+@JsonPropertyOrder({
+  DogAllOf.JSON_PROPERTY_BREED
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class DogAllOf {
+  public static final String JSON_PROPERTY_BREED = "breed";
+  private String breed;
+
+
+  public DogAllOf breed(String breed) {
+    
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BREED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getBreed() {
+    return breed;
+  }
+
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return Objects.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
new file mode 100644
index 000000000000..42c75cb2727d
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -0,0 +1,213 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * EnumArrays
+ */
+@JsonPropertyOrder({
+  EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
+  EnumArrays.JSON_PROPERTY_ARRAY_ENUM
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class EnumArrays {
+  /**
+   * Gets or Sets justSymbol
+   */
+  public enum JustSymbolEnum {
+    GREATER_THAN_OR_EQUAL_TO(">="),
+    
+    DOLLAR("$");
+
+    private String value;
+
+    JustSymbolEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static JustSymbolEnum fromValue(String value) {
+      for (JustSymbolEnum b : JustSymbolEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_JUST_SYMBOL = "just_symbol";
+  private JustSymbolEnum justSymbol;
+
+  /**
+   * Gets or Sets arrayEnum
+   */
+  public enum ArrayEnumEnum {
+    FISH("fish"),
+    
+    CRAB("crab");
+
+    private String value;
+
+    ArrayEnumEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static ArrayEnumEnum fromValue(String value) {
+      for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
+  private List<ArrayEnumEnum> arrayEnum = null;
+
+
+  public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
+    
+    this.justSymbol = justSymbol;
+    return this;
+  }
+
+   /**
+   * Get justSymbol
+   * @return justSymbol
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public JustSymbolEnum getJustSymbol() {
+    return justSymbol;
+  }
+
+
+  public void setJustSymbol(JustSymbolEnum justSymbol) {
+    this.justSymbol = justSymbol;
+  }
+
+
+  public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
+    
+    this.arrayEnum = arrayEnum;
+    return this;
+  }
+
+  public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
+    if (this.arrayEnum == null) {
+      this.arrayEnum = new ArrayList<ArrayEnumEnum>();
+    }
+    this.arrayEnum.add(arrayEnumItem);
+    return this;
+  }
+
+   /**
+   * Get arrayEnum
+   * @return arrayEnum
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<ArrayEnumEnum> getArrayEnum() {
+    return arrayEnum;
+  }
+
+
+  public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
+    this.arrayEnum = arrayEnum;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    EnumArrays enumArrays = (EnumArrays) o;
+    return Objects.equals(this.justSymbol, enumArrays.justSymbol) &&
+        Objects.equals(this.arrayEnum, enumArrays.arrayEnum);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(justSymbol, arrayEnum);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EnumArrays {\n");
+    sb.append("    justSymbol: ").append(toIndentedString(justSymbol)).append("\n");
+    sb.append("    arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumClass.java
new file mode 100644
index 000000000000..e9102d974276
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumClass.java
@@ -0,0 +1,60 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Gets or Sets EnumClass
+ */
+public enum EnumClass {
+  
+  _ABC("_abc"),
+  
+  _EFG("-efg"),
+  
+  _XYZ_("(xyz)");
+
+  private String value;
+
+  EnumClass(String value) {
+    this.value = value;
+  }
+
+  @JsonValue
+  public String getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  @JsonCreator
+  public static EnumClass fromValue(String value) {
+    for (EnumClass b : EnumClass.values()) {
+      if (b.value.equals(value)) {
+        return b;
+      }
+    }
+    throw new IllegalArgumentException("Unexpected value '" + value + "'");
+  }
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
new file mode 100644
index 000000000000..75f53d11450c
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -0,0 +1,370 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.OuterEnum;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * EnumTest
+ */
+@JsonPropertyOrder({
+  EnumTest.JSON_PROPERTY_ENUM_STRING,
+  EnumTest.JSON_PROPERTY_ENUM_STRING_REQUIRED,
+  EnumTest.JSON_PROPERTY_ENUM_INTEGER,
+  EnumTest.JSON_PROPERTY_ENUM_NUMBER,
+  EnumTest.JSON_PROPERTY_OUTER_ENUM
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class EnumTest {
+  /**
+   * Gets or Sets enumString
+   */
+  public enum EnumStringEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower"),
+    
+    EMPTY("");
+
+    private String value;
+
+    EnumStringEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumStringEnum fromValue(String value) {
+      for (EnumStringEnum b : EnumStringEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ENUM_STRING = "enum_string";
+  private EnumStringEnum enumString;
+
+  /**
+   * Gets or Sets enumStringRequired
+   */
+  public enum EnumStringRequiredEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower"),
+    
+    EMPTY("");
+
+    private String value;
+
+    EnumStringRequiredEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumStringRequiredEnum fromValue(String value) {
+      for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ENUM_STRING_REQUIRED = "enum_string_required";
+  private EnumStringRequiredEnum enumStringRequired;
+
+  /**
+   * Gets or Sets enumInteger
+   */
+  public enum EnumIntegerEnum {
+    NUMBER_1(1),
+    
+    NUMBER_MINUS_1(-1);
+
+    private Integer value;
+
+    EnumIntegerEnum(Integer value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Integer getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumIntegerEnum fromValue(Integer value) {
+      for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer";
+  private EnumIntegerEnum enumInteger;
+
+  /**
+   * Gets or Sets enumNumber
+   */
+  public enum EnumNumberEnum {
+    NUMBER_1_DOT_1(1.1),
+    
+    NUMBER_MINUS_1_DOT_2(-1.2);
+
+    private Double value;
+
+    EnumNumberEnum(Double value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Double getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumNumberEnum fromValue(Double value) {
+      for (EnumNumberEnum b : EnumNumberEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ENUM_NUMBER = "enum_number";
+  private EnumNumberEnum enumNumber;
+
+  public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum";
+  private OuterEnum outerEnum;
+
+
+  public EnumTest enumString(EnumStringEnum enumString) {
+    
+    this.enumString = enumString;
+    return this;
+  }
+
+   /**
+   * Get enumString
+   * @return enumString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ENUM_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public EnumStringEnum getEnumString() {
+    return enumString;
+  }
+
+
+  public void setEnumString(EnumStringEnum enumString) {
+    this.enumString = enumString;
+  }
+
+
+  public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    
+    this.enumStringRequired = enumStringRequired;
+    return this;
+  }
+
+   /**
+   * Get enumStringRequired
+   * @return enumStringRequired
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public EnumStringRequiredEnum getEnumStringRequired() {
+    return enumStringRequired;
+  }
+
+
+  public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    this.enumStringRequired = enumStringRequired;
+  }
+
+
+  public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
+    
+    this.enumInteger = enumInteger;
+    return this;
+  }
+
+   /**
+   * Get enumInteger
+   * @return enumInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public EnumIntegerEnum getEnumInteger() {
+    return enumInteger;
+  }
+
+
+  public void setEnumInteger(EnumIntegerEnum enumInteger) {
+    this.enumInteger = enumInteger;
+  }
+
+
+  public EnumTest enumNumber(EnumNumberEnum enumNumber) {
+    
+    this.enumNumber = enumNumber;
+    return this;
+  }
+
+   /**
+   * Get enumNumber
+   * @return enumNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public EnumNumberEnum getEnumNumber() {
+    return enumNumber;
+  }
+
+
+  public void setEnumNumber(EnumNumberEnum enumNumber) {
+    this.enumNumber = enumNumber;
+  }
+
+
+  public EnumTest outerEnum(OuterEnum outerEnum) {
+    
+    this.outerEnum = outerEnum;
+    return this;
+  }
+
+   /**
+   * Get outerEnum
+   * @return outerEnum
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OuterEnum getOuterEnum() {
+    return outerEnum;
+  }
+
+
+  public void setOuterEnum(OuterEnum outerEnum) {
+    this.outerEnum = outerEnum;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    EnumTest enumTest = (EnumTest) o;
+    return Objects.equals(this.enumString, enumTest.enumString) &&
+        Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
+        Objects.equals(this.enumInteger, enumTest.enumInteger) &&
+        Objects.equals(this.enumNumber, enumTest.enumNumber) &&
+        Objects.equals(this.outerEnum, enumTest.outerEnum);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EnumTest {\n");
+    sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
+    sb.append("    enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
+    sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
+    sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
+    sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
new file mode 100644
index 000000000000..aae40c4a5a6e
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -0,0 +1,143 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * FileSchemaTestClass
+ */
+@JsonPropertyOrder({
+  FileSchemaTestClass.JSON_PROPERTY_FILE,
+  FileSchemaTestClass.JSON_PROPERTY_FILES
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class FileSchemaTestClass {
+  public static final String JSON_PROPERTY_FILE = "file";
+  private java.io.File file;
+
+  public static final String JSON_PROPERTY_FILES = "files";
+  private List<java.io.File> files = null;
+
+
+  public FileSchemaTestClass file(java.io.File file) {
+    
+    this.file = file;
+    return this;
+  }
+
+   /**
+   * Get file
+   * @return file
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FILE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public java.io.File getFile() {
+    return file;
+  }
+
+
+  public void setFile(java.io.File file) {
+    this.file = file;
+  }
+
+
+  public FileSchemaTestClass files(List<java.io.File> files) {
+    
+    this.files = files;
+    return this;
+  }
+
+  public FileSchemaTestClass addFilesItem(java.io.File filesItem) {
+    if (this.files == null) {
+      this.files = new ArrayList<java.io.File>();
+    }
+    this.files.add(filesItem);
+    return this;
+  }
+
+   /**
+   * Get files
+   * @return files
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FILES)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<java.io.File> getFiles() {
+    return files;
+  }
+
+
+  public void setFiles(List<java.io.File> files) {
+    this.files = files;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o;
+    return Objects.equals(this.file, fileSchemaTestClass.file) &&
+        Objects.equals(this.files, fileSchemaTestClass.files);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(file, files);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FileSchemaTestClass {\n");
+    sb.append("    file: ").append(toIndentedString(file)).append("\n");
+    sb.append("    files: ").append(toIndentedString(files)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
new file mode 100644
index 000000000000..d24c2298054f
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -0,0 +1,516 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.File;
+import java.math.BigDecimal;
+import java.util.UUID;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * FormatTest
+ */
+@JsonPropertyOrder({
+  FormatTest.JSON_PROPERTY_INTEGER,
+  FormatTest.JSON_PROPERTY_INT32,
+  FormatTest.JSON_PROPERTY_INT64,
+  FormatTest.JSON_PROPERTY_NUMBER,
+  FormatTest.JSON_PROPERTY_FLOAT,
+  FormatTest.JSON_PROPERTY_DOUBLE,
+  FormatTest.JSON_PROPERTY_STRING,
+  FormatTest.JSON_PROPERTY_BYTE,
+  FormatTest.JSON_PROPERTY_BINARY,
+  FormatTest.JSON_PROPERTY_DATE,
+  FormatTest.JSON_PROPERTY_DATE_TIME,
+  FormatTest.JSON_PROPERTY_UUID,
+  FormatTest.JSON_PROPERTY_PASSWORD,
+  FormatTest.JSON_PROPERTY_BIG_DECIMAL
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class FormatTest {
+  public static final String JSON_PROPERTY_INTEGER = "integer";
+  private Integer integer;
+
+  public static final String JSON_PROPERTY_INT32 = "int32";
+  private Integer int32;
+
+  public static final String JSON_PROPERTY_INT64 = "int64";
+  private Long int64;
+
+  public static final String JSON_PROPERTY_NUMBER = "number";
+  private BigDecimal number;
+
+  public static final String JSON_PROPERTY_FLOAT = "float";
+  private Float _float;
+
+  public static final String JSON_PROPERTY_DOUBLE = "double";
+  private Double _double;
+
+  public static final String JSON_PROPERTY_STRING = "string";
+  private String string;
+
+  public static final String JSON_PROPERTY_BYTE = "byte";
+  private byte[] _byte;
+
+  public static final String JSON_PROPERTY_BINARY = "binary";
+  private File binary;
+
+  public static final String JSON_PROPERTY_DATE = "date";
+  private LocalDate date;
+
+  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
+  private OffsetDateTime dateTime;
+
+  public static final String JSON_PROPERTY_UUID = "uuid";
+  private UUID uuid;
+
+  public static final String JSON_PROPERTY_PASSWORD = "password";
+  private String password;
+
+  public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
+  private BigDecimal bigDecimal;
+
+
+  public FormatTest integer(Integer integer) {
+    
+    this.integer = integer;
+    return this;
+  }
+
+   /**
+   * Get integer
+   * minimum: 10
+   * maximum: 100
+   * @return integer
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getInteger() {
+    return integer;
+  }
+
+
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+
+  public FormatTest int32(Integer int32) {
+    
+    this.int32 = int32;
+    return this;
+  }
+
+   /**
+   * Get int32
+   * minimum: 20
+   * maximum: 200
+   * @return int32
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_INT32)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getInt32() {
+    return int32;
+  }
+
+
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+
+  public FormatTest int64(Long int64) {
+    
+    this.int64 = int64;
+    return this;
+  }
+
+   /**
+   * Get int64
+   * @return int64
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_INT64)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getInt64() {
+    return int64;
+  }
+
+
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+
+  public FormatTest number(BigDecimal number) {
+    
+    this.number = number;
+    return this;
+  }
+
+   /**
+   * Get number
+   * minimum: 32.1
+   * maximum: 543.2
+   * @return number
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public BigDecimal getNumber() {
+    return number;
+  }
+
+
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+
+  public FormatTest _float(Float _float) {
+    
+    this._float = _float;
+    return this;
+  }
+
+   /**
+   * Get _float
+   * minimum: 54.3
+   * maximum: 987.6
+   * @return _float
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FLOAT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Float getFloat() {
+    return _float;
+  }
+
+
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+
+  public FormatTest _double(Double _double) {
+    
+    this._double = _double;
+    return this;
+  }
+
+   /**
+   * Get _double
+   * minimum: 67.8
+   * maximum: 123.4
+   * @return _double
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DOUBLE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Double getDouble() {
+    return _double;
+  }
+
+
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+
+  public FormatTest string(String string) {
+    
+    this.string = string;
+    return this;
+  }
+
+   /**
+   * Get string
+   * @return string
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getString() {
+    return string;
+  }
+
+
+  public void setString(String string) {
+    this.string = string;
+  }
+
+
+  public FormatTest _byte(byte[] _byte) {
+    
+    this._byte = _byte;
+    return this;
+  }
+
+   /**
+   * Get _byte
+   * @return _byte
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_BYTE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public byte[] getByte() {
+    return _byte;
+  }
+
+
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+
+  public FormatTest binary(File binary) {
+    
+    this.binary = binary;
+    return this;
+  }
+
+   /**
+   * Get binary
+   * @return binary
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BINARY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public File getBinary() {
+    return binary;
+  }
+
+
+  public void setBinary(File binary) {
+    this.binary = binary;
+  }
+
+
+  public FormatTest date(LocalDate date) {
+    
+    this.date = date;
+    return this;
+  }
+
+   /**
+   * Get date
+   * @return date
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_DATE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public LocalDate getDate() {
+    return date;
+  }
+
+
+  public void setDate(LocalDate date) {
+    this.date = date;
+  }
+
+
+  public FormatTest dateTime(OffsetDateTime dateTime) {
+    
+    this.dateTime = dateTime;
+    return this;
+  }
+
+   /**
+   * Get dateTime
+   * @return dateTime
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DATE_TIME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OffsetDateTime getDateTime() {
+    return dateTime;
+  }
+
+
+  public void setDateTime(OffsetDateTime dateTime) {
+    this.dateTime = dateTime;
+  }
+
+
+  public FormatTest uuid(UUID uuid) {
+    
+    this.uuid = uuid;
+    return this;
+  }
+
+   /**
+   * Get uuid
+   * @return uuid
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty(JSON_PROPERTY_UUID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public UUID getUuid() {
+    return uuid;
+  }
+
+
+  public void setUuid(UUID uuid) {
+    this.uuid = uuid;
+  }
+
+
+  public FormatTest password(String password) {
+    
+    this.password = password;
+    return this;
+  }
+
+   /**
+   * Get password
+   * @return password
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_PASSWORD)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getPassword() {
+    return password;
+  }
+
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  public FormatTest bigDecimal(BigDecimal bigDecimal) {
+    
+    this.bigDecimal = bigDecimal;
+    return this;
+  }
+
+   /**
+   * Get bigDecimal
+   * @return bigDecimal
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getBigDecimal() {
+    return bigDecimal;
+  }
+
+
+  public void setBigDecimal(BigDecimal bigDecimal) {
+    this.bigDecimal = bigDecimal;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FormatTest formatTest = (FormatTest) o;
+    return Objects.equals(this.integer, formatTest.integer) &&
+        Objects.equals(this.int32, formatTest.int32) &&
+        Objects.equals(this.int64, formatTest.int64) &&
+        Objects.equals(this.number, formatTest.number) &&
+        Objects.equals(this._float, formatTest._float) &&
+        Objects.equals(this._double, formatTest._double) &&
+        Objects.equals(this.string, formatTest.string) &&
+        Arrays.equals(this._byte, formatTest._byte) &&
+        Objects.equals(this.binary, formatTest.binary) &&
+        Objects.equals(this.date, formatTest.date) &&
+        Objects.equals(this.dateTime, formatTest.dateTime) &&
+        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this.password, formatTest.password) &&
+        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
+    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
+    sb.append("    number: ").append(toIndentedString(number)).append("\n");
+    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
+    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
+    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
+    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
+    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
new file mode 100644
index 000000000000..741ab2441d34
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -0,0 +1,115 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * HasOnlyReadOnly
+ */
+@JsonPropertyOrder({
+  HasOnlyReadOnly.JSON_PROPERTY_BAR,
+  HasOnlyReadOnly.JSON_PROPERTY_FOO
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class HasOnlyReadOnly {
+  public static final String JSON_PROPERTY_BAR = "bar";
+  private String bar;
+
+  public static final String JSON_PROPERTY_FOO = "foo";
+  private String foo;
+
+
+   /**
+   * Get bar
+   * @return bar
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BAR)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getBar() {
+    return bar;
+  }
+
+
+
+
+   /**
+   * Get foo
+   * @return foo
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FOO)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getFoo() {
+    return foo;
+  }
+
+
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o;
+    return Objects.equals(this.bar, hasOnlyReadOnly.bar) &&
+        Objects.equals(this.foo, hasOnlyReadOnly.foo);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, foo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class HasOnlyReadOnly {\n");
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    foo: ").append(toIndentedString(foo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
new file mode 100644
index 000000000000..9621c8220b71
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
@@ -0,0 +1,265 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * MapTest
+ */
+@JsonPropertyOrder({
+  MapTest.JSON_PROPERTY_MAP_MAP_OF_STRING,
+  MapTest.JSON_PROPERTY_MAP_OF_ENUM_STRING,
+  MapTest.JSON_PROPERTY_DIRECT_MAP,
+  MapTest.JSON_PROPERTY_INDIRECT_MAP
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class MapTest {
+  public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
+  private Map<String, Map<String, String>> mapMapOfString = null;
+
+  /**
+   * Gets or Sets inner
+   */
+  public enum InnerEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower");
+
+    private String value;
+
+    InnerEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static InnerEnum fromValue(String value) {
+      for (InnerEnum b : InnerEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string";
+  private Map<String, InnerEnum> mapOfEnumString = null;
+
+  public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map";
+  private Map<String, Boolean> directMap = null;
+
+  public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
+  private Map<String, Boolean> indirectMap = null;
+
+
+  public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
+    
+    this.mapMapOfString = mapMapOfString;
+    return this;
+  }
+
+  public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
+    if (this.mapMapOfString == null) {
+      this.mapMapOfString = new HashMap<String, Map<String, String>>();
+    }
+    this.mapMapOfString.put(key, mapMapOfStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapMapOfString
+   * @return mapMapOfString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Map<String, String>> getMapMapOfString() {
+    return mapMapOfString;
+  }
+
+
+  public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
+    this.mapMapOfString = mapMapOfString;
+  }
+
+
+  public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
+    
+    this.mapOfEnumString = mapOfEnumString;
+    return this;
+  }
+
+  public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
+    if (this.mapOfEnumString == null) {
+      this.mapOfEnumString = new HashMap<String, InnerEnum>();
+    }
+    this.mapOfEnumString.put(key, mapOfEnumStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapOfEnumString
+   * @return mapOfEnumString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, InnerEnum> getMapOfEnumString() {
+    return mapOfEnumString;
+  }
+
+
+  public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
+    this.mapOfEnumString = mapOfEnumString;
+  }
+
+
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+
+  public MapTest indirectMap(Map<String, Boolean> indirectMap) {
+    
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+  public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
+    if (this.indirectMap == null) {
+      this.indirectMap = new HashMap<String, Boolean>();
+    }
+    this.indirectMap.put(key, indirectMapItem);
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Boolean> getIndirectMap() {
+    return indirectMap;
+  }
+
+
+  public void setIndirectMap(Map<String, Boolean> indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MapTest mapTest = (MapTest) o;
+    return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MapTest {\n");
+    sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
+    sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
new file mode 100644
index 000000000000..3ccd9310b55c
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -0,0 +1,178 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.openapitools.client.model.Animal;
+import org.threeten.bp.OffsetDateTime;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * MixedPropertiesAndAdditionalPropertiesClass
+ */
+@JsonPropertyOrder({
+  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_UUID,
+  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
+  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class MixedPropertiesAndAdditionalPropertiesClass {
+  public static final String JSON_PROPERTY_UUID = "uuid";
+  private UUID uuid;
+
+  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
+  private OffsetDateTime dateTime;
+
+  public static final String JSON_PROPERTY_MAP = "map";
+  private Map<String, Animal> map = null;
+
+
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+    
+    this.uuid = uuid;
+    return this;
+  }
+
+   /**
+   * Get uuid
+   * @return uuid
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_UUID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public UUID getUuid() {
+    return uuid;
+  }
+
+
+  public void setUuid(UUID uuid) {
+    this.uuid = uuid;
+  }
+
+
+  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+    
+    this.dateTime = dateTime;
+    return this;
+  }
+
+   /**
+   * Get dateTime
+   * @return dateTime
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DATE_TIME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OffsetDateTime getDateTime() {
+    return dateTime;
+  }
+
+
+  public void setDateTime(OffsetDateTime dateTime) {
+    this.dateTime = dateTime;
+  }
+
+
+  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+    
+    this.map = map;
+    return this;
+  }
+
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
+    if (this.map == null) {
+      this.map = new HashMap<String, Animal>();
+    }
+    this.map.put(key, mapItem);
+    return this;
+  }
+
+   /**
+   * Get map
+   * @return map
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Map<String, Animal> getMap() {
+    return map;
+  }
+
+
+  public void setMap(Map<String, Animal> map) {
+    this.map = map;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
+    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
+        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
+        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(uuid, dateTime, map);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
new file mode 100644
index 000000000000..3b952b2730bf
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -0,0 +1,134 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Model for testing model name starting with number
+ */
+@ApiModel(description = "Model for testing model name starting with number")
+@JsonPropertyOrder({
+  Model200Response.JSON_PROPERTY_NAME,
+  Model200Response.JSON_PROPERTY_PROPERTY_CLASS
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Model200Response {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private Integer name;
+
+  public static final String JSON_PROPERTY_PROPERTY_CLASS = "class";
+  private String propertyClass;
+
+
+  public Model200Response name(Integer name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getName() {
+    return name;
+  }
+
+
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+
+  public Model200Response propertyClass(String propertyClass) {
+    
+    this.propertyClass = propertyClass;
+    return this;
+  }
+
+   /**
+   * Get propertyClass
+   * @return propertyClass
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getPropertyClass() {
+    return propertyClass;
+  }
+
+
+  public void setPropertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Model200Response _200response = (Model200Response) o;
+    return Objects.equals(this.name, _200response.name) &&
+        Objects.equals(this.propertyClass, _200response.propertyClass);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, propertyClass);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
new file mode 100644
index 000000000000..dd401709d75d
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -0,0 +1,164 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * ModelApiResponse
+ */
+@JsonPropertyOrder({
+  ModelApiResponse.JSON_PROPERTY_CODE,
+  ModelApiResponse.JSON_PROPERTY_TYPE,
+  ModelApiResponse.JSON_PROPERTY_MESSAGE
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ModelApiResponse {
+  public static final String JSON_PROPERTY_CODE = "code";
+  private Integer code;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private String type;
+
+  public static final String JSON_PROPERTY_MESSAGE = "message";
+  private String message;
+
+
+  public ModelApiResponse code(Integer code) {
+    
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * Get code
+   * @return code
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CODE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getCode() {
+    return code;
+  }
+
+
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+
+
+  public ModelApiResponse type(String type) {
+    
+    this.type = type;
+    return this;
+  }
+
+   /**
+   * Get type
+   * @return type
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getType() {
+    return type;
+  }
+
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+
+  public ModelApiResponse message(String message) {
+    
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * Get message
+   * @return message
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MESSAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getMessage() {
+    return message;
+  }
+
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelApiResponse _apiResponse = (ModelApiResponse) o;
+    return Objects.equals(this.code, _apiResponse.code) &&
+        Objects.equals(this.type, _apiResponse.type) &&
+        Objects.equals(this.message, _apiResponse.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(code, type, message);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelApiResponse {\n");
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
new file mode 100644
index 000000000000..733ec3718a15
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -0,0 +1,103 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Model for testing reserved words
+ */
+@ApiModel(description = "Model for testing reserved words")
+@JsonPropertyOrder({
+  ModelReturn.JSON_PROPERTY_RETURN
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ModelReturn {
+  public static final String JSON_PROPERTY_RETURN = "return";
+  private Integer _return;
+
+
+  public ModelReturn _return(Integer _return) {
+    
+    this._return = _return;
+    return this;
+  }
+
+   /**
+   * Get _return
+   * @return _return
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_RETURN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getReturn() {
+    return _return;
+  }
+
+
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelReturn _return = (ModelReturn) o;
+    return Objects.equals(this._return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
new file mode 100644
index 000000000000..8c03d816bff7
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
@@ -0,0 +1,177 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Model for testing model name same as property name
+ */
+@ApiModel(description = "Model for testing model name same as property name")
+@JsonPropertyOrder({
+  Name.JSON_PROPERTY_NAME,
+  Name.JSON_PROPERTY_SNAKE_CASE,
+  Name.JSON_PROPERTY_PROPERTY,
+  Name.JSON_PROPERTY_123NUMBER
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Name {
+  public static final String JSON_PROPERTY_NAME = "name";
+  private Integer name;
+
+  public static final String JSON_PROPERTY_SNAKE_CASE = "snake_case";
+  private Integer snakeCase;
+
+  public static final String JSON_PROPERTY_PROPERTY = "property";
+  private String property;
+
+  public static final String JSON_PROPERTY_123NUMBER = "123Number";
+  private Integer _123number;
+
+
+  public Name name(Integer name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Integer getName() {
+    return name;
+  }
+
+
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+
+   /**
+   * Get snakeCase
+   * @return snakeCase
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+
+
+
+
+  public Name property(String property) {
+    
+    this.property = property;
+    return this;
+  }
+
+   /**
+   * Get property
+   * @return property
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PROPERTY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getProperty() {
+    return property;
+  }
+
+
+  public void setProperty(String property) {
+    this.property = property;
+  }
+
+
+   /**
+   * Get _123number
+   * @return _123number
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_123NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer get123number() {
+    return _123number;
+  }
+
+
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Name name = (Name) o;
+    return Objects.equals(this.name, name.name) &&
+        Objects.equals(this.snakeCase, name.snakeCase) &&
+        Objects.equals(this.property, name.property) &&
+        Objects.equals(this._123number, name._123number);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, snakeCase, property, _123number);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
+    sb.append("    property: ").append(toIndentedString(property)).append("\n");
+    sb.append("    _123number: ").append(toIndentedString(_123number)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
new file mode 100644
index 000000000000..45f21901673f
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -0,0 +1,103 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * NumberOnly
+ */
+@JsonPropertyOrder({
+  NumberOnly.JSON_PROPERTY_JUST_NUMBER
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class NumberOnly {
+  public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
+  private BigDecimal justNumber;
+
+
+  public NumberOnly justNumber(BigDecimal justNumber) {
+    
+    this.justNumber = justNumber;
+    return this;
+  }
+
+   /**
+   * Get justNumber
+   * @return justNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getJustNumber() {
+    return justNumber;
+  }
+
+
+  public void setJustNumber(BigDecimal justNumber) {
+    this.justNumber = justNumber;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    NumberOnly numberOnly = (NumberOnly) o;
+    return Objects.equals(this.justNumber, numberOnly.justNumber);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(justNumber);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class NumberOnly {\n");
+    sb.append("    justNumber: ").append(toIndentedString(justNumber)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
new file mode 100644
index 000000000000..3d5229525795
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
@@ -0,0 +1,295 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.threeten.bp.OffsetDateTime;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Order
+ */
+@JsonPropertyOrder({
+  Order.JSON_PROPERTY_ID,
+  Order.JSON_PROPERTY_PET_ID,
+  Order.JSON_PROPERTY_QUANTITY,
+  Order.JSON_PROPERTY_SHIP_DATE,
+  Order.JSON_PROPERTY_STATUS,
+  Order.JSON_PROPERTY_COMPLETE
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Order {
+  public static final String JSON_PROPERTY_ID = "id";
+  private Long id;
+
+  public static final String JSON_PROPERTY_PET_ID = "petId";
+  private Long petId;
+
+  public static final String JSON_PROPERTY_QUANTITY = "quantity";
+  private Integer quantity;
+
+  public static final String JSON_PROPERTY_SHIP_DATE = "shipDate";
+  private OffsetDateTime shipDate;
+
+  /**
+   * Order Status
+   */
+  public enum StatusEnum {
+    PLACED("placed"),
+    
+    APPROVED("approved"),
+    
+    DELIVERED("delivered");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static StatusEnum fromValue(String value) {
+      for (StatusEnum b : StatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_STATUS = "status";
+  private StatusEnum status;
+
+  public static final String JSON_PROPERTY_COMPLETE = "complete";
+  private Boolean complete = false;
+
+
+  public Order id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public Order petId(Long petId) {
+    
+    this.petId = petId;
+    return this;
+  }
+
+   /**
+   * Get petId
+   * @return petId
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PET_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getPetId() {
+    return petId;
+  }
+
+
+  public void setPetId(Long petId) {
+    this.petId = petId;
+  }
+
+
+  public Order quantity(Integer quantity) {
+    
+    this.quantity = quantity;
+    return this;
+  }
+
+   /**
+   * Get quantity
+   * @return quantity
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_QUANTITY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getQuantity() {
+    return quantity;
+  }
+
+
+  public void setQuantity(Integer quantity) {
+    this.quantity = quantity;
+  }
+
+
+  public Order shipDate(OffsetDateTime shipDate) {
+    
+    this.shipDate = shipDate;
+    return this;
+  }
+
+   /**
+   * Get shipDate
+   * @return shipDate
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SHIP_DATE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OffsetDateTime getShipDate() {
+    return shipDate;
+  }
+
+
+  public void setShipDate(OffsetDateTime shipDate) {
+    this.shipDate = shipDate;
+  }
+
+
+  public Order status(StatusEnum status) {
+    
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * Order Status
+   * @return status
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "Order Status")
+  @JsonProperty(JSON_PROPERTY_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public StatusEnum getStatus() {
+    return status;
+  }
+
+
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+
+  public Order complete(Boolean complete) {
+    
+    this.complete = complete;
+    return this;
+  }
+
+   /**
+   * Get complete
+   * @return complete
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_COMPLETE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isComplete() {
+    return complete;
+  }
+
+
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Order order = (Order) o;
+    return Objects.equals(this.id, order.id) &&
+        Objects.equals(this.petId, order.petId) &&
+        Objects.equals(this.quantity, order.quantity) &&
+        Objects.equals(this.shipDate, order.shipDate) &&
+        Objects.equals(this.status, order.status) &&
+        Objects.equals(this.complete, order.complete);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Order {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
+    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
+    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
new file mode 100644
index 000000000000..b644cc6817dc
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -0,0 +1,165 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * OuterComposite
+ */
+@JsonPropertyOrder({
+  OuterComposite.JSON_PROPERTY_MY_NUMBER,
+  OuterComposite.JSON_PROPERTY_MY_STRING,
+  OuterComposite.JSON_PROPERTY_MY_BOOLEAN
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class OuterComposite {
+  public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
+  private BigDecimal myNumber;
+
+  public static final String JSON_PROPERTY_MY_STRING = "my_string";
+  private String myString;
+
+  public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean";
+  private Boolean myBoolean;
+
+
+  public OuterComposite myNumber(BigDecimal myNumber) {
+    
+    this.myNumber = myNumber;
+    return this;
+  }
+
+   /**
+   * Get myNumber
+   * @return myNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MY_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getMyNumber() {
+    return myNumber;
+  }
+
+
+  public void setMyNumber(BigDecimal myNumber) {
+    this.myNumber = myNumber;
+  }
+
+
+  public OuterComposite myString(String myString) {
+    
+    this.myString = myString;
+    return this;
+  }
+
+   /**
+   * Get myString
+   * @return myString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MY_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getMyString() {
+    return myString;
+  }
+
+
+  public void setMyString(String myString) {
+    this.myString = myString;
+  }
+
+
+  public OuterComposite myBoolean(Boolean myBoolean) {
+    
+    this.myBoolean = myBoolean;
+    return this;
+  }
+
+   /**
+   * Get myBoolean
+   * @return myBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isMyBoolean() {
+    return myBoolean;
+  }
+
+
+  public void setMyBoolean(Boolean myBoolean) {
+    this.myBoolean = myBoolean;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    OuterComposite outerComposite = (OuterComposite) o;
+    return Objects.equals(this.myNumber, outerComposite.myNumber) &&
+        Objects.equals(this.myString, outerComposite.myString) &&
+        Objects.equals(this.myBoolean, outerComposite.myBoolean);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(myNumber, myString, myBoolean);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OuterComposite {\n");
+    sb.append("    myNumber: ").append(toIndentedString(myNumber)).append("\n");
+    sb.append("    myString: ").append(toIndentedString(myString)).append("\n");
+    sb.append("    myBoolean: ").append(toIndentedString(myBoolean)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnum.java
new file mode 100644
index 000000000000..308646a320c7
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnum.java
@@ -0,0 +1,60 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Gets or Sets OuterEnum
+ */
+public enum OuterEnum {
+  
+  PLACED("placed"),
+  
+  APPROVED("approved"),
+  
+  DELIVERED("delivered");
+
+  private String value;
+
+  OuterEnum(String value) {
+    this.value = value;
+  }
+
+  @JsonValue
+  public String getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  @JsonCreator
+  public static OuterEnum fromValue(String value) {
+    for (OuterEnum b : OuterEnum.values()) {
+      if (b.value.equals(value)) {
+        return b;
+      }
+    }
+    throw new IllegalArgumentException("Unexpected value '" + value + "'");
+  }
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
new file mode 100644
index 000000000000..26446f5b488e
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
@@ -0,0 +1,311 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.openapitools.client.model.Category;
+import org.openapitools.client.model.Tag;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Pet
+ */
+@JsonPropertyOrder({
+  Pet.JSON_PROPERTY_ID,
+  Pet.JSON_PROPERTY_CATEGORY,
+  Pet.JSON_PROPERTY_NAME,
+  Pet.JSON_PROPERTY_PHOTO_URLS,
+  Pet.JSON_PROPERTY_TAGS,
+  Pet.JSON_PROPERTY_STATUS
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Pet {
+  public static final String JSON_PROPERTY_ID = "id";
+  private Long id;
+
+  public static final String JSON_PROPERTY_CATEGORY = "category";
+  private Category category;
+
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+  public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
+  private Set<String> photoUrls = new LinkedHashSet<String>();
+
+  public static final String JSON_PROPERTY_TAGS = "tags";
+  private List<Tag> tags = null;
+
+  /**
+   * pet status in the store
+   */
+  public enum StatusEnum {
+    AVAILABLE("available"),
+    
+    PENDING("pending"),
+    
+    SOLD("sold");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static StatusEnum fromValue(String value) {
+      for (StatusEnum b : StatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_STATUS = "status";
+  private StatusEnum status;
+
+
+  public Pet id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public Pet category(Category category) {
+    
+    this.category = category;
+    return this;
+  }
+
+   /**
+   * Get category
+   * @return category
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CATEGORY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Category getCategory() {
+    return category;
+  }
+
+
+  public void setCategory(Category category) {
+    this.category = category;
+  }
+
+
+  public Pet name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  public Pet photoUrls(Set<String> photoUrls) {
+    
+    this.photoUrls = photoUrls;
+    return this;
+  }
+
+  public Pet addPhotoUrlsItem(String photoUrlsItem) {
+    this.photoUrls.add(photoUrlsItem);
+    return this;
+  }
+
+   /**
+   * Get photoUrls
+   * @return photoUrls
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Set<String> getPhotoUrls() {
+    return photoUrls;
+  }
+
+
+  public void setPhotoUrls(Set<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+
+  public Pet tags(List<Tag> tags) {
+    
+    this.tags = tags;
+    return this;
+  }
+
+  public Pet addTagsItem(Tag tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<Tag>();
+    }
+    this.tags.add(tagsItem);
+    return this;
+  }
+
+   /**
+   * Get tags
+   * @return tags
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_TAGS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Tag> getTags() {
+    return tags;
+  }
+
+
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+
+  public Pet status(StatusEnum status) {
+    
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * pet status in the store
+   * @return status
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty(JSON_PROPERTY_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public StatusEnum getStatus() {
+    return status;
+  }
+
+
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Pet pet = (Pet) o;
+    return Objects.equals(this.id, pet.id) &&
+        Objects.equals(this.category, pet.category) &&
+        Objects.equals(this.name, pet.name) &&
+        Objects.equals(this.photoUrls, pet.photoUrls) &&
+        Objects.equals(this.tags, pet.tags) &&
+        Objects.equals(this.status, pet.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, category, name, photoUrls, tags, status);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Pet {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
new file mode 100644
index 000000000000..e5f23ef5dcfe
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -0,0 +1,124 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * ReadOnlyFirst
+ */
+@JsonPropertyOrder({
+  ReadOnlyFirst.JSON_PROPERTY_BAR,
+  ReadOnlyFirst.JSON_PROPERTY_BAZ
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ReadOnlyFirst {
+  public static final String JSON_PROPERTY_BAR = "bar";
+  private String bar;
+
+  public static final String JSON_PROPERTY_BAZ = "baz";
+  private String baz;
+
+
+   /**
+   * Get bar
+   * @return bar
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BAR)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getBar() {
+    return bar;
+  }
+
+
+
+
+  public ReadOnlyFirst baz(String baz) {
+    
+    this.baz = baz;
+    return this;
+  }
+
+   /**
+   * Get baz
+   * @return baz
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BAZ)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getBaz() {
+    return baz;
+  }
+
+
+  public void setBaz(String baz) {
+    this.baz = baz;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
+    return Objects.equals(this.bar, readOnlyFirst.bar) &&
+        Objects.equals(this.baz, readOnlyFirst.baz);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, baz);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ReadOnlyFirst {\n");
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    baz: ").append(toIndentedString(baz)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
new file mode 100644
index 000000000000..e60f8a8104d6
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -0,0 +1,102 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * SpecialModelName
+ */
+@JsonPropertyOrder({
+  SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class SpecialModelName {
+  public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
+  private Long $specialPropertyName;
+
+
+  public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
+    
+    this.$specialPropertyName = $specialPropertyName;
+    return this;
+  }
+
+   /**
+   * Get $specialPropertyName
+   * @return $specialPropertyName
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long get$SpecialPropertyName() {
+    return $specialPropertyName;
+  }
+
+
+  public void set$SpecialPropertyName(Long $specialPropertyName) {
+    this.$specialPropertyName = $specialPropertyName;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SpecialModelName $specialModelName = (SpecialModelName) o;
+    return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash($specialPropertyName);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    sb.append("    $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
new file mode 100644
index 000000000000..b15dc0d14fc6
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
@@ -0,0 +1,133 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Tag
+ */
+@JsonPropertyOrder({
+  Tag.JSON_PROPERTY_ID,
+  Tag.JSON_PROPERTY_NAME
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Tag {
+  public static final String JSON_PROPERTY_ID = "id";
+  private Long id;
+
+  public static final String JSON_PROPERTY_NAME = "name";
+  private String name;
+
+
+  public Tag id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public Tag name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Tag tag = (Tag) o;
+    return Objects.equals(this.id, tag.id) &&
+        Objects.equals(this.name, tag.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Tag {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
new file mode 100644
index 000000000000..27199d76de1f
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -0,0 +1,229 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * TypeHolderDefault
+ */
+@JsonPropertyOrder({
+  TypeHolderDefault.JSON_PROPERTY_STRING_ITEM,
+  TypeHolderDefault.JSON_PROPERTY_NUMBER_ITEM,
+  TypeHolderDefault.JSON_PROPERTY_INTEGER_ITEM,
+  TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
+  TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class TypeHolderDefault {
+  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
+  private String stringItem = "what";
+
+  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
+  private BigDecimal numberItem;
+
+  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
+  private Integer integerItem;
+
+  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
+  private Boolean boolItem = true;
+
+  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
+  private List<Integer> arrayItem = new ArrayList<Integer>();
+
+
+  public TypeHolderDefault stringItem(String stringItem) {
+    
+    this.stringItem = stringItem;
+    return this;
+  }
+
+   /**
+   * Get stringItem
+   * @return stringItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getStringItem() {
+    return stringItem;
+  }
+
+
+  public void setStringItem(String stringItem) {
+    this.stringItem = stringItem;
+  }
+
+
+  public TypeHolderDefault numberItem(BigDecimal numberItem) {
+    
+    this.numberItem = numberItem;
+    return this;
+  }
+
+   /**
+   * Get numberItem
+   * @return numberItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public BigDecimal getNumberItem() {
+    return numberItem;
+  }
+
+
+  public void setNumberItem(BigDecimal numberItem) {
+    this.numberItem = numberItem;
+  }
+
+
+  public TypeHolderDefault integerItem(Integer integerItem) {
+    
+    this.integerItem = integerItem;
+    return this;
+  }
+
+   /**
+   * Get integerItem
+   * @return integerItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Integer getIntegerItem() {
+    return integerItem;
+  }
+
+
+  public void setIntegerItem(Integer integerItem) {
+    this.integerItem = integerItem;
+  }
+
+
+  public TypeHolderDefault boolItem(Boolean boolItem) {
+    
+    this.boolItem = boolItem;
+    return this;
+  }
+
+   /**
+   * Get boolItem
+   * @return boolItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Boolean isBoolItem() {
+    return boolItem;
+  }
+
+
+  public void setBoolItem(Boolean boolItem) {
+    this.boolItem = boolItem;
+  }
+
+
+  public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
+    
+    this.arrayItem = arrayItem;
+    return this;
+  }
+
+  public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
+    this.arrayItem.add(arrayItemItem);
+    return this;
+  }
+
+   /**
+   * Get arrayItem
+   * @return arrayItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public List<Integer> getArrayItem() {
+    return arrayItem;
+  }
+
+
+  public void setArrayItem(List<Integer> arrayItem) {
+    this.arrayItem = arrayItem;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o;
+    return Objects.equals(this.stringItem, typeHolderDefault.stringItem) &&
+        Objects.equals(this.numberItem, typeHolderDefault.numberItem) &&
+        Objects.equals(this.integerItem, typeHolderDefault.integerItem) &&
+        Objects.equals(this.boolItem, typeHolderDefault.boolItem) &&
+        Objects.equals(this.arrayItem, typeHolderDefault.arrayItem);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class TypeHolderDefault {\n");
+    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
+    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
+    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
+    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
+    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
new file mode 100644
index 000000000000..f87fb944b9b4
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -0,0 +1,259 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * TypeHolderExample
+ */
+@JsonPropertyOrder({
+  TypeHolderExample.JSON_PROPERTY_STRING_ITEM,
+  TypeHolderExample.JSON_PROPERTY_NUMBER_ITEM,
+  TypeHolderExample.JSON_PROPERTY_FLOAT_ITEM,
+  TypeHolderExample.JSON_PROPERTY_INTEGER_ITEM,
+  TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
+  TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class TypeHolderExample {
+  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
+  private String stringItem;
+
+  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
+  private BigDecimal numberItem;
+
+  public static final String JSON_PROPERTY_FLOAT_ITEM = "float_item";
+  private Float floatItem;
+
+  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
+  private Integer integerItem;
+
+  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
+  private Boolean boolItem;
+
+  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
+  private List<Integer> arrayItem = new ArrayList<Integer>();
+
+
+  public TypeHolderExample stringItem(String stringItem) {
+    
+    this.stringItem = stringItem;
+    return this;
+  }
+
+   /**
+   * Get stringItem
+   * @return stringItem
+  **/
+  @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getStringItem() {
+    return stringItem;
+  }
+
+
+  public void setStringItem(String stringItem) {
+    this.stringItem = stringItem;
+  }
+
+
+  public TypeHolderExample numberItem(BigDecimal numberItem) {
+    
+    this.numberItem = numberItem;
+    return this;
+  }
+
+   /**
+   * Get numberItem
+   * @return numberItem
+  **/
+  @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public BigDecimal getNumberItem() {
+    return numberItem;
+  }
+
+
+  public void setNumberItem(BigDecimal numberItem) {
+    this.numberItem = numberItem;
+  }
+
+
+  public TypeHolderExample floatItem(Float floatItem) {
+    
+    this.floatItem = floatItem;
+    return this;
+  }
+
+   /**
+   * Get floatItem
+   * @return floatItem
+  **/
+  @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Float getFloatItem() {
+    return floatItem;
+  }
+
+
+  public void setFloatItem(Float floatItem) {
+    this.floatItem = floatItem;
+  }
+
+
+  public TypeHolderExample integerItem(Integer integerItem) {
+    
+    this.integerItem = integerItem;
+    return this;
+  }
+
+   /**
+   * Get integerItem
+   * @return integerItem
+  **/
+  @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Integer getIntegerItem() {
+    return integerItem;
+  }
+
+
+  public void setIntegerItem(Integer integerItem) {
+    this.integerItem = integerItem;
+  }
+
+
+  public TypeHolderExample boolItem(Boolean boolItem) {
+    
+    this.boolItem = boolItem;
+    return this;
+  }
+
+   /**
+   * Get boolItem
+   * @return boolItem
+  **/
+  @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Boolean isBoolItem() {
+    return boolItem;
+  }
+
+
+  public void setBoolItem(Boolean boolItem) {
+    this.boolItem = boolItem;
+  }
+
+
+  public TypeHolderExample arrayItem(List<Integer> arrayItem) {
+    
+    this.arrayItem = arrayItem;
+    return this;
+  }
+
+  public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
+    this.arrayItem.add(arrayItemItem);
+    return this;
+  }
+
+   /**
+   * Get arrayItem
+   * @return arrayItem
+  **/
+  @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public List<Integer> getArrayItem() {
+    return arrayItem;
+  }
+
+
+  public void setArrayItem(List<Integer> arrayItem) {
+    this.arrayItem = arrayItem;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TypeHolderExample typeHolderExample = (TypeHolderExample) o;
+    return Objects.equals(this.stringItem, typeHolderExample.stringItem) &&
+        Objects.equals(this.numberItem, typeHolderExample.numberItem) &&
+        Objects.equals(this.floatItem, typeHolderExample.floatItem) &&
+        Objects.equals(this.integerItem, typeHolderExample.integerItem) &&
+        Objects.equals(this.boolItem, typeHolderExample.boolItem) &&
+        Objects.equals(this.arrayItem, typeHolderExample.arrayItem);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class TypeHolderExample {\n");
+    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
+    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
+    sb.append("    floatItem: ").append(toIndentedString(floatItem)).append("\n");
+    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
+    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
+    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
new file mode 100644
index 000000000000..eafdd902c04d
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
@@ -0,0 +1,319 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * User
+ */
+@JsonPropertyOrder({
+  User.JSON_PROPERTY_ID,
+  User.JSON_PROPERTY_USERNAME,
+  User.JSON_PROPERTY_FIRST_NAME,
+  User.JSON_PROPERTY_LAST_NAME,
+  User.JSON_PROPERTY_EMAIL,
+  User.JSON_PROPERTY_PASSWORD,
+  User.JSON_PROPERTY_PHONE,
+  User.JSON_PROPERTY_USER_STATUS
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class User {
+  public static final String JSON_PROPERTY_ID = "id";
+  private Long id;
+
+  public static final String JSON_PROPERTY_USERNAME = "username";
+  private String username;
+
+  public static final String JSON_PROPERTY_FIRST_NAME = "firstName";
+  private String firstName;
+
+  public static final String JSON_PROPERTY_LAST_NAME = "lastName";
+  private String lastName;
+
+  public static final String JSON_PROPERTY_EMAIL = "email";
+  private String email;
+
+  public static final String JSON_PROPERTY_PASSWORD = "password";
+  private String password;
+
+  public static final String JSON_PROPERTY_PHONE = "phone";
+  private String phone;
+
+  public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
+  private Integer userStatus;
+
+
+  public User id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public User username(String username) {
+    
+    this.username = username;
+    return this;
+  }
+
+   /**
+   * Get username
+   * @return username
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_USERNAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getUsername() {
+    return username;
+  }
+
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+
+  public User firstName(String firstName) {
+    
+    this.firstName = firstName;
+    return this;
+  }
+
+   /**
+   * Get firstName
+   * @return firstName
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FIRST_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getFirstName() {
+    return firstName;
+  }
+
+
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+
+  public User lastName(String lastName) {
+    
+    this.lastName = lastName;
+    return this;
+  }
+
+   /**
+   * Get lastName
+   * @return lastName
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_LAST_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getLastName() {
+    return lastName;
+  }
+
+
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+
+  public User email(String email) {
+    
+    this.email = email;
+    return this;
+  }
+
+   /**
+   * Get email
+   * @return email
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_EMAIL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getEmail() {
+    return email;
+  }
+
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+
+  public User password(String password) {
+    
+    this.password = password;
+    return this;
+  }
+
+   /**
+   * Get password
+   * @return password
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PASSWORD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getPassword() {
+    return password;
+  }
+
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  public User phone(String phone) {
+    
+    this.phone = phone;
+    return this;
+  }
+
+   /**
+   * Get phone
+   * @return phone
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PHONE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getPhone() {
+    return phone;
+  }
+
+
+  public void setPhone(String phone) {
+    this.phone = phone;
+  }
+
+
+  public User userStatus(Integer userStatus) {
+    
+    this.userStatus = userStatus;
+    return this;
+  }
+
+   /**
+   * User Status
+   * @return userStatus
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "User Status")
+  @JsonProperty(JSON_PROPERTY_USER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getUserStatus() {
+    return userStatus;
+  }
+
+
+  public void setUserStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    User user = (User) o;
+    return Objects.equals(this.id, user.id) &&
+        Objects.equals(this.username, user.username) &&
+        Objects.equals(this.firstName, user.firstName) &&
+        Objects.equals(this.lastName, user.lastName) &&
+        Objects.equals(this.email, user.email) &&
+        Objects.equals(this.password, user.password) &&
+        Objects.equals(this.phone, user.phone) &&
+        Objects.equals(this.userStatus, user.userStatus);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class User {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    username: ").append(toIndentedString(username)).append("\n");
+    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
+    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
+    sb.append("    email: ").append(toIndentedString(email)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
+    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
new file mode 100644
index 000000000000..59b3ac5879a6
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -0,0 +1,1045 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * XmlItem
+ */
+@JsonPropertyOrder({
+  XmlItem.JSON_PROPERTY_ATTRIBUTE_STRING,
+  XmlItem.JSON_PROPERTY_ATTRIBUTE_NUMBER,
+  XmlItem.JSON_PROPERTY_ATTRIBUTE_INTEGER,
+  XmlItem.JSON_PROPERTY_ATTRIBUTE_BOOLEAN,
+  XmlItem.JSON_PROPERTY_WRAPPED_ARRAY,
+  XmlItem.JSON_PROPERTY_NAME_STRING,
+  XmlItem.JSON_PROPERTY_NAME_NUMBER,
+  XmlItem.JSON_PROPERTY_NAME_INTEGER,
+  XmlItem.JSON_PROPERTY_NAME_BOOLEAN,
+  XmlItem.JSON_PROPERTY_NAME_ARRAY,
+  XmlItem.JSON_PROPERTY_NAME_WRAPPED_ARRAY,
+  XmlItem.JSON_PROPERTY_PREFIX_STRING,
+  XmlItem.JSON_PROPERTY_PREFIX_NUMBER,
+  XmlItem.JSON_PROPERTY_PREFIX_INTEGER,
+  XmlItem.JSON_PROPERTY_PREFIX_BOOLEAN,
+  XmlItem.JSON_PROPERTY_PREFIX_ARRAY,
+  XmlItem.JSON_PROPERTY_PREFIX_WRAPPED_ARRAY,
+  XmlItem.JSON_PROPERTY_NAMESPACE_STRING,
+  XmlItem.JSON_PROPERTY_NAMESPACE_NUMBER,
+  XmlItem.JSON_PROPERTY_NAMESPACE_INTEGER,
+  XmlItem.JSON_PROPERTY_NAMESPACE_BOOLEAN,
+  XmlItem.JSON_PROPERTY_NAMESPACE_ARRAY,
+  XmlItem.JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY,
+  XmlItem.JSON_PROPERTY_PREFIX_NS_STRING,
+  XmlItem.JSON_PROPERTY_PREFIX_NS_NUMBER,
+  XmlItem.JSON_PROPERTY_PREFIX_NS_INTEGER,
+  XmlItem.JSON_PROPERTY_PREFIX_NS_BOOLEAN,
+  XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
+  XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class XmlItem {
+  public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
+  private String attributeString;
+
+  public static final String JSON_PROPERTY_ATTRIBUTE_NUMBER = "attribute_number";
+  private BigDecimal attributeNumber;
+
+  public static final String JSON_PROPERTY_ATTRIBUTE_INTEGER = "attribute_integer";
+  private Integer attributeInteger;
+
+  public static final String JSON_PROPERTY_ATTRIBUTE_BOOLEAN = "attribute_boolean";
+  private Boolean attributeBoolean;
+
+  public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array";
+  private List<Integer> wrappedArray = null;
+
+  public static final String JSON_PROPERTY_NAME_STRING = "name_string";
+  private String nameString;
+
+  public static final String JSON_PROPERTY_NAME_NUMBER = "name_number";
+  private BigDecimal nameNumber;
+
+  public static final String JSON_PROPERTY_NAME_INTEGER = "name_integer";
+  private Integer nameInteger;
+
+  public static final String JSON_PROPERTY_NAME_BOOLEAN = "name_boolean";
+  private Boolean nameBoolean;
+
+  public static final String JSON_PROPERTY_NAME_ARRAY = "name_array";
+  private List<Integer> nameArray = null;
+
+  public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array";
+  private List<Integer> nameWrappedArray = null;
+
+  public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string";
+  private String prefixString;
+
+  public static final String JSON_PROPERTY_PREFIX_NUMBER = "prefix_number";
+  private BigDecimal prefixNumber;
+
+  public static final String JSON_PROPERTY_PREFIX_INTEGER = "prefix_integer";
+  private Integer prefixInteger;
+
+  public static final String JSON_PROPERTY_PREFIX_BOOLEAN = "prefix_boolean";
+  private Boolean prefixBoolean;
+
+  public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array";
+  private List<Integer> prefixArray = null;
+
+  public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array";
+  private List<Integer> prefixWrappedArray = null;
+
+  public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string";
+  private String namespaceString;
+
+  public static final String JSON_PROPERTY_NAMESPACE_NUMBER = "namespace_number";
+  private BigDecimal namespaceNumber;
+
+  public static final String JSON_PROPERTY_NAMESPACE_INTEGER = "namespace_integer";
+  private Integer namespaceInteger;
+
+  public static final String JSON_PROPERTY_NAMESPACE_BOOLEAN = "namespace_boolean";
+  private Boolean namespaceBoolean;
+
+  public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array";
+  private List<Integer> namespaceArray = null;
+
+  public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array";
+  private List<Integer> namespaceWrappedArray = null;
+
+  public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string";
+  private String prefixNsString;
+
+  public static final String JSON_PROPERTY_PREFIX_NS_NUMBER = "prefix_ns_number";
+  private BigDecimal prefixNsNumber;
+
+  public static final String JSON_PROPERTY_PREFIX_NS_INTEGER = "prefix_ns_integer";
+  private Integer prefixNsInteger;
+
+  public static final String JSON_PROPERTY_PREFIX_NS_BOOLEAN = "prefix_ns_boolean";
+  private Boolean prefixNsBoolean;
+
+  public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array";
+  private List<Integer> prefixNsArray = null;
+
+  public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
+  private List<Integer> prefixNsWrappedArray = null;
+
+
+  public XmlItem attributeString(String attributeString) {
+    
+    this.attributeString = attributeString;
+    return this;
+  }
+
+   /**
+   * Get attributeString
+   * @return attributeString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getAttributeString() {
+    return attributeString;
+  }
+
+
+  public void setAttributeString(String attributeString) {
+    this.attributeString = attributeString;
+  }
+
+
+  public XmlItem attributeNumber(BigDecimal attributeNumber) {
+    
+    this.attributeNumber = attributeNumber;
+    return this;
+  }
+
+   /**
+   * Get attributeNumber
+   * @return attributeNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getAttributeNumber() {
+    return attributeNumber;
+  }
+
+
+  public void setAttributeNumber(BigDecimal attributeNumber) {
+    this.attributeNumber = attributeNumber;
+  }
+
+
+  public XmlItem attributeInteger(Integer attributeInteger) {
+    
+    this.attributeInteger = attributeInteger;
+    return this;
+  }
+
+   /**
+   * Get attributeInteger
+   * @return attributeInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getAttributeInteger() {
+    return attributeInteger;
+  }
+
+
+  public void setAttributeInteger(Integer attributeInteger) {
+    this.attributeInteger = attributeInteger;
+  }
+
+
+  public XmlItem attributeBoolean(Boolean attributeBoolean) {
+    
+    this.attributeBoolean = attributeBoolean;
+    return this;
+  }
+
+   /**
+   * Get attributeBoolean
+   * @return attributeBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isAttributeBoolean() {
+    return attributeBoolean;
+  }
+
+
+  public void setAttributeBoolean(Boolean attributeBoolean) {
+    this.attributeBoolean = attributeBoolean;
+  }
+
+
+  public XmlItem wrappedArray(List<Integer> wrappedArray) {
+    
+    this.wrappedArray = wrappedArray;
+    return this;
+  }
+
+  public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
+    if (this.wrappedArray == null) {
+      this.wrappedArray = new ArrayList<Integer>();
+    }
+    this.wrappedArray.add(wrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get wrappedArray
+   * @return wrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getWrappedArray() {
+    return wrappedArray;
+  }
+
+
+  public void setWrappedArray(List<Integer> wrappedArray) {
+    this.wrappedArray = wrappedArray;
+  }
+
+
+  public XmlItem nameString(String nameString) {
+    
+    this.nameString = nameString;
+    return this;
+  }
+
+   /**
+   * Get nameString
+   * @return nameString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getNameString() {
+    return nameString;
+  }
+
+
+  public void setNameString(String nameString) {
+    this.nameString = nameString;
+  }
+
+
+  public XmlItem nameNumber(BigDecimal nameNumber) {
+    
+    this.nameNumber = nameNumber;
+    return this;
+  }
+
+   /**
+   * Get nameNumber
+   * @return nameNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getNameNumber() {
+    return nameNumber;
+  }
+
+
+  public void setNameNumber(BigDecimal nameNumber) {
+    this.nameNumber = nameNumber;
+  }
+
+
+  public XmlItem nameInteger(Integer nameInteger) {
+    
+    this.nameInteger = nameInteger;
+    return this;
+  }
+
+   /**
+   * Get nameInteger
+   * @return nameInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getNameInteger() {
+    return nameInteger;
+  }
+
+
+  public void setNameInteger(Integer nameInteger) {
+    this.nameInteger = nameInteger;
+  }
+
+
+  public XmlItem nameBoolean(Boolean nameBoolean) {
+    
+    this.nameBoolean = nameBoolean;
+    return this;
+  }
+
+   /**
+   * Get nameBoolean
+   * @return nameBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isNameBoolean() {
+    return nameBoolean;
+  }
+
+
+  public void setNameBoolean(Boolean nameBoolean) {
+    this.nameBoolean = nameBoolean;
+  }
+
+
+  public XmlItem nameArray(List<Integer> nameArray) {
+    
+    this.nameArray = nameArray;
+    return this;
+  }
+
+  public XmlItem addNameArrayItem(Integer nameArrayItem) {
+    if (this.nameArray == null) {
+      this.nameArray = new ArrayList<Integer>();
+    }
+    this.nameArray.add(nameArrayItem);
+    return this;
+  }
+
+   /**
+   * Get nameArray
+   * @return nameArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getNameArray() {
+    return nameArray;
+  }
+
+
+  public void setNameArray(List<Integer> nameArray) {
+    this.nameArray = nameArray;
+  }
+
+
+  public XmlItem nameWrappedArray(List<Integer> nameWrappedArray) {
+    
+    this.nameWrappedArray = nameWrappedArray;
+    return this;
+  }
+
+  public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
+    if (this.nameWrappedArray == null) {
+      this.nameWrappedArray = new ArrayList<Integer>();
+    }
+    this.nameWrappedArray.add(nameWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get nameWrappedArray
+   * @return nameWrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getNameWrappedArray() {
+    return nameWrappedArray;
+  }
+
+
+  public void setNameWrappedArray(List<Integer> nameWrappedArray) {
+    this.nameWrappedArray = nameWrappedArray;
+  }
+
+
+  public XmlItem prefixString(String prefixString) {
+    
+    this.prefixString = prefixString;
+    return this;
+  }
+
+   /**
+   * Get prefixString
+   * @return prefixString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getPrefixString() {
+    return prefixString;
+  }
+
+
+  public void setPrefixString(String prefixString) {
+    this.prefixString = prefixString;
+  }
+
+
+  public XmlItem prefixNumber(BigDecimal prefixNumber) {
+    
+    this.prefixNumber = prefixNumber;
+    return this;
+  }
+
+   /**
+   * Get prefixNumber
+   * @return prefixNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getPrefixNumber() {
+    return prefixNumber;
+  }
+
+
+  public void setPrefixNumber(BigDecimal prefixNumber) {
+    this.prefixNumber = prefixNumber;
+  }
+
+
+  public XmlItem prefixInteger(Integer prefixInteger) {
+    
+    this.prefixInteger = prefixInteger;
+    return this;
+  }
+
+   /**
+   * Get prefixInteger
+   * @return prefixInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getPrefixInteger() {
+    return prefixInteger;
+  }
+
+
+  public void setPrefixInteger(Integer prefixInteger) {
+    this.prefixInteger = prefixInteger;
+  }
+
+
+  public XmlItem prefixBoolean(Boolean prefixBoolean) {
+    
+    this.prefixBoolean = prefixBoolean;
+    return this;
+  }
+
+   /**
+   * Get prefixBoolean
+   * @return prefixBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isPrefixBoolean() {
+    return prefixBoolean;
+  }
+
+
+  public void setPrefixBoolean(Boolean prefixBoolean) {
+    this.prefixBoolean = prefixBoolean;
+  }
+
+
+  public XmlItem prefixArray(List<Integer> prefixArray) {
+    
+    this.prefixArray = prefixArray;
+    return this;
+  }
+
+  public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
+    if (this.prefixArray == null) {
+      this.prefixArray = new ArrayList<Integer>();
+    }
+    this.prefixArray.add(prefixArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixArray
+   * @return prefixArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getPrefixArray() {
+    return prefixArray;
+  }
+
+
+  public void setPrefixArray(List<Integer> prefixArray) {
+    this.prefixArray = prefixArray;
+  }
+
+
+  public XmlItem prefixWrappedArray(List<Integer> prefixWrappedArray) {
+    
+    this.prefixWrappedArray = prefixWrappedArray;
+    return this;
+  }
+
+  public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
+    if (this.prefixWrappedArray == null) {
+      this.prefixWrappedArray = new ArrayList<Integer>();
+    }
+    this.prefixWrappedArray.add(prefixWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixWrappedArray
+   * @return prefixWrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getPrefixWrappedArray() {
+    return prefixWrappedArray;
+  }
+
+
+  public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
+    this.prefixWrappedArray = prefixWrappedArray;
+  }
+
+
+  public XmlItem namespaceString(String namespaceString) {
+    
+    this.namespaceString = namespaceString;
+    return this;
+  }
+
+   /**
+   * Get namespaceString
+   * @return namespaceString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getNamespaceString() {
+    return namespaceString;
+  }
+
+
+  public void setNamespaceString(String namespaceString) {
+    this.namespaceString = namespaceString;
+  }
+
+
+  public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
+    
+    this.namespaceNumber = namespaceNumber;
+    return this;
+  }
+
+   /**
+   * Get namespaceNumber
+   * @return namespaceNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getNamespaceNumber() {
+    return namespaceNumber;
+  }
+
+
+  public void setNamespaceNumber(BigDecimal namespaceNumber) {
+    this.namespaceNumber = namespaceNumber;
+  }
+
+
+  public XmlItem namespaceInteger(Integer namespaceInteger) {
+    
+    this.namespaceInteger = namespaceInteger;
+    return this;
+  }
+
+   /**
+   * Get namespaceInteger
+   * @return namespaceInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getNamespaceInteger() {
+    return namespaceInteger;
+  }
+
+
+  public void setNamespaceInteger(Integer namespaceInteger) {
+    this.namespaceInteger = namespaceInteger;
+  }
+
+
+  public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
+    
+    this.namespaceBoolean = namespaceBoolean;
+    return this;
+  }
+
+   /**
+   * Get namespaceBoolean
+   * @return namespaceBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isNamespaceBoolean() {
+    return namespaceBoolean;
+  }
+
+
+  public void setNamespaceBoolean(Boolean namespaceBoolean) {
+    this.namespaceBoolean = namespaceBoolean;
+  }
+
+
+  public XmlItem namespaceArray(List<Integer> namespaceArray) {
+    
+    this.namespaceArray = namespaceArray;
+    return this;
+  }
+
+  public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
+    if (this.namespaceArray == null) {
+      this.namespaceArray = new ArrayList<Integer>();
+    }
+    this.namespaceArray.add(namespaceArrayItem);
+    return this;
+  }
+
+   /**
+   * Get namespaceArray
+   * @return namespaceArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getNamespaceArray() {
+    return namespaceArray;
+  }
+
+
+  public void setNamespaceArray(List<Integer> namespaceArray) {
+    this.namespaceArray = namespaceArray;
+  }
+
+
+  public XmlItem namespaceWrappedArray(List<Integer> namespaceWrappedArray) {
+    
+    this.namespaceWrappedArray = namespaceWrappedArray;
+    return this;
+  }
+
+  public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
+    if (this.namespaceWrappedArray == null) {
+      this.namespaceWrappedArray = new ArrayList<Integer>();
+    }
+    this.namespaceWrappedArray.add(namespaceWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get namespaceWrappedArray
+   * @return namespaceWrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getNamespaceWrappedArray() {
+    return namespaceWrappedArray;
+  }
+
+
+  public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
+    this.namespaceWrappedArray = namespaceWrappedArray;
+  }
+
+
+  public XmlItem prefixNsString(String prefixNsString) {
+    
+    this.prefixNsString = prefixNsString;
+    return this;
+  }
+
+   /**
+   * Get prefixNsString
+   * @return prefixNsString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getPrefixNsString() {
+    return prefixNsString;
+  }
+
+
+  public void setPrefixNsString(String prefixNsString) {
+    this.prefixNsString = prefixNsString;
+  }
+
+
+  public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
+    
+    this.prefixNsNumber = prefixNsNumber;
+    return this;
+  }
+
+   /**
+   * Get prefixNsNumber
+   * @return prefixNsNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public BigDecimal getPrefixNsNumber() {
+    return prefixNsNumber;
+  }
+
+
+  public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
+    this.prefixNsNumber = prefixNsNumber;
+  }
+
+
+  public XmlItem prefixNsInteger(Integer prefixNsInteger) {
+    
+    this.prefixNsInteger = prefixNsInteger;
+    return this;
+  }
+
+   /**
+   * Get prefixNsInteger
+   * @return prefixNsInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Integer getPrefixNsInteger() {
+    return prefixNsInteger;
+  }
+
+
+  public void setPrefixNsInteger(Integer prefixNsInteger) {
+    this.prefixNsInteger = prefixNsInteger;
+  }
+
+
+  public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
+    
+    this.prefixNsBoolean = prefixNsBoolean;
+    return this;
+  }
+
+   /**
+   * Get prefixNsBoolean
+   * @return prefixNsBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Boolean isPrefixNsBoolean() {
+    return prefixNsBoolean;
+  }
+
+
+  public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
+    this.prefixNsBoolean = prefixNsBoolean;
+  }
+
+
+  public XmlItem prefixNsArray(List<Integer> prefixNsArray) {
+    
+    this.prefixNsArray = prefixNsArray;
+    return this;
+  }
+
+  public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
+    if (this.prefixNsArray == null) {
+      this.prefixNsArray = new ArrayList<Integer>();
+    }
+    this.prefixNsArray.add(prefixNsArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixNsArray
+   * @return prefixNsArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getPrefixNsArray() {
+    return prefixNsArray;
+  }
+
+
+  public void setPrefixNsArray(List<Integer> prefixNsArray) {
+    this.prefixNsArray = prefixNsArray;
+  }
+
+
+  public XmlItem prefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
+    
+    this.prefixNsWrappedArray = prefixNsWrappedArray;
+    return this;
+  }
+
+  public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
+    if (this.prefixNsWrappedArray == null) {
+      this.prefixNsWrappedArray = new ArrayList<Integer>();
+    }
+    this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixNsWrappedArray
+   * @return prefixNsWrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public List<Integer> getPrefixNsWrappedArray() {
+    return prefixNsWrappedArray;
+  }
+
+
+  public void setPrefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
+    this.prefixNsWrappedArray = prefixNsWrappedArray;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    XmlItem xmlItem = (XmlItem) o;
+    return Objects.equals(this.attributeString, xmlItem.attributeString) &&
+        Objects.equals(this.attributeNumber, xmlItem.attributeNumber) &&
+        Objects.equals(this.attributeInteger, xmlItem.attributeInteger) &&
+        Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) &&
+        Objects.equals(this.wrappedArray, xmlItem.wrappedArray) &&
+        Objects.equals(this.nameString, xmlItem.nameString) &&
+        Objects.equals(this.nameNumber, xmlItem.nameNumber) &&
+        Objects.equals(this.nameInteger, xmlItem.nameInteger) &&
+        Objects.equals(this.nameBoolean, xmlItem.nameBoolean) &&
+        Objects.equals(this.nameArray, xmlItem.nameArray) &&
+        Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) &&
+        Objects.equals(this.prefixString, xmlItem.prefixString) &&
+        Objects.equals(this.prefixNumber, xmlItem.prefixNumber) &&
+        Objects.equals(this.prefixInteger, xmlItem.prefixInteger) &&
+        Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) &&
+        Objects.equals(this.prefixArray, xmlItem.prefixArray) &&
+        Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) &&
+        Objects.equals(this.namespaceString, xmlItem.namespaceString) &&
+        Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) &&
+        Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) &&
+        Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) &&
+        Objects.equals(this.namespaceArray, xmlItem.namespaceArray) &&
+        Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) &&
+        Objects.equals(this.prefixNsString, xmlItem.prefixNsString) &&
+        Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) &&
+        Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) &&
+        Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) &&
+        Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) &&
+        Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class XmlItem {\n");
+    sb.append("    attributeString: ").append(toIndentedString(attributeString)).append("\n");
+    sb.append("    attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n");
+    sb.append("    attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n");
+    sb.append("    attributeBoolean: ").append(toIndentedString(attributeBoolean)).append("\n");
+    sb.append("    wrappedArray: ").append(toIndentedString(wrappedArray)).append("\n");
+    sb.append("    nameString: ").append(toIndentedString(nameString)).append("\n");
+    sb.append("    nameNumber: ").append(toIndentedString(nameNumber)).append("\n");
+    sb.append("    nameInteger: ").append(toIndentedString(nameInteger)).append("\n");
+    sb.append("    nameBoolean: ").append(toIndentedString(nameBoolean)).append("\n");
+    sb.append("    nameArray: ").append(toIndentedString(nameArray)).append("\n");
+    sb.append("    nameWrappedArray: ").append(toIndentedString(nameWrappedArray)).append("\n");
+    sb.append("    prefixString: ").append(toIndentedString(prefixString)).append("\n");
+    sb.append("    prefixNumber: ").append(toIndentedString(prefixNumber)).append("\n");
+    sb.append("    prefixInteger: ").append(toIndentedString(prefixInteger)).append("\n");
+    sb.append("    prefixBoolean: ").append(toIndentedString(prefixBoolean)).append("\n");
+    sb.append("    prefixArray: ").append(toIndentedString(prefixArray)).append("\n");
+    sb.append("    prefixWrappedArray: ").append(toIndentedString(prefixWrappedArray)).append("\n");
+    sb.append("    namespaceString: ").append(toIndentedString(namespaceString)).append("\n");
+    sb.append("    namespaceNumber: ").append(toIndentedString(namespaceNumber)).append("\n");
+    sb.append("    namespaceInteger: ").append(toIndentedString(namespaceInteger)).append("\n");
+    sb.append("    namespaceBoolean: ").append(toIndentedString(namespaceBoolean)).append("\n");
+    sb.append("    namespaceArray: ").append(toIndentedString(namespaceArray)).append("\n");
+    sb.append("    namespaceWrappedArray: ").append(toIndentedString(namespaceWrappedArray)).append("\n");
+    sb.append("    prefixNsString: ").append(toIndentedString(prefixNsString)).append("\n");
+    sb.append("    prefixNsNumber: ").append(toIndentedString(prefixNsNumber)).append("\n");
+    sb.append("    prefixNsInteger: ").append(toIndentedString(prefixNsInteger)).append("\n");
+    sb.append("    prefixNsBoolean: ").append(toIndentedString(prefixNsBoolean)).append("\n");
+    sb.append("    prefixNsArray: ").append(toIndentedString(prefixNsArray)).append("\n");
+    sb.append("    prefixNsWrappedArray: ").append(toIndentedString(prefixNsWrappedArray)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
new file mode 100644
index 000000000000..b5e26401d2f3
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
@@ -0,0 +1,40 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.model.Client;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for AnotherFakeApi
+ */
+public class AnotherFakeApiTest {
+
+    private AnotherFakeApi api;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().buildClient(AnotherFakeApi.class);
+    }
+
+    
+    /**
+     * To test special tags
+     *
+     * To test special tags and operation ID starting with number
+     */
+    @Test
+    public void call123testSpecialTagsTest() {
+        Client body = null;
+        // Client response = api.call123testSpecialTags(body);
+
+        // TODO: test validations
+    }
+
+    
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/FakeApiTest.java
new file mode 100644
index 000000000000..52f9af36b6ed
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -0,0 +1,342 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import java.math.BigDecimal;
+import org.openapitools.client.model.Client;
+import java.io.File;
+import org.openapitools.client.model.FileSchemaTestClass;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+import org.openapitools.client.model.OuterComposite;
+import org.openapitools.client.model.User;
+import org.openapitools.client.model.XmlItem;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for FakeApi
+ */
+public class FakeApiTest {
+
+    private FakeApi api;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().buildClient(FakeApi.class);
+    }
+
+    
+    /**
+     * creates an XmlItem
+     *
+     * this route creates an XmlItem
+     */
+    @Test
+    public void createXmlItemTest() {
+        XmlItem xmlItem = null;
+        // api.createXmlItem(xmlItem);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * 
+     *
+     * Test serialization of outer boolean types
+     */
+    @Test
+    public void fakeOuterBooleanSerializeTest() {
+        Boolean body = null;
+        // Boolean response = api.fakeOuterBooleanSerialize(body);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * 
+     *
+     * Test serialization of object with outer number type
+     */
+    @Test
+    public void fakeOuterCompositeSerializeTest() {
+        OuterComposite body = null;
+        // OuterComposite response = api.fakeOuterCompositeSerialize(body);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * 
+     *
+     * Test serialization of outer number types
+     */
+    @Test
+    public void fakeOuterNumberSerializeTest() {
+        BigDecimal body = null;
+        // BigDecimal response = api.fakeOuterNumberSerialize(body);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * 
+     *
+     * Test serialization of outer string types
+     */
+    @Test
+    public void fakeOuterStringSerializeTest() {
+        String body = null;
+        // String response = api.fakeOuterStringSerialize(body);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * 
+     *
+     * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+     */
+    @Test
+    public void testBodyWithFileSchemaTest() {
+        FileSchemaTestClass body = null;
+        // api.testBodyWithFileSchema(body);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * 
+     *
+     * 
+     */
+    @Test
+    public void testBodyWithQueryParamsTest() {
+        String query = null;
+        User body = null;
+        // api.testBodyWithQueryParams(query, body);
+
+        // TODO: test validations
+    }
+
+    /**
+     * 
+     *
+     * 
+     *
+     * This tests the overload of the method that uses a Map for query parameters instead of
+     * listing them out individually.
+     */
+    @Test
+    public void testBodyWithQueryParamsTestQueryMap() {
+        User body = null;
+        FakeApi.TestBodyWithQueryParamsQueryParams queryParams = new FakeApi.TestBodyWithQueryParamsQueryParams()
+            .query(null);
+        // api.testBodyWithQueryParams(body, queryParams);
+
+    // TODO: test validations
+    }
+    
+    /**
+     * To test \&quot;client\&quot; model
+     *
+     * To test \&quot;client\&quot; model
+     */
+    @Test
+    public void testClientModelTest() {
+        Client body = null;
+        // Client response = api.testClientModel(body);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+     *
+     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+     */
+    @Test
+    public void testEndpointParametersTest() {
+        BigDecimal number = null;
+        Double _double = null;
+        String patternWithoutDelimiter = null;
+        byte[] _byte = null;
+        Integer integer = null;
+        Integer int32 = null;
+        Long int64 = null;
+        Float _float = null;
+        String string = null;
+        File binary = null;
+        LocalDate date = null;
+        OffsetDateTime dateTime = null;
+        String password = null;
+        String paramCallback = null;
+        // api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * To test enum parameters
+     *
+     * To test enum parameters
+     */
+    @Test
+    public void testEnumParametersTest() {
+        List<String> enumHeaderStringArray = null;
+        String enumHeaderString = null;
+        List<String> enumQueryStringArray = null;
+        String enumQueryString = null;
+        Integer enumQueryInteger = null;
+        Double enumQueryDouble = null;
+        List<String> enumFormStringArray = null;
+        String enumFormString = null;
+        // api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+
+        // TODO: test validations
+    }
+
+    /**
+     * To test enum parameters
+     *
+     * To test enum parameters
+     *
+     * This tests the overload of the method that uses a Map for query parameters instead of
+     * listing them out individually.
+     */
+    @Test
+    public void testEnumParametersTestQueryMap() {
+        List<String> enumHeaderStringArray = null;
+        String enumHeaderString = null;
+        List<String> enumFormStringArray = null;
+        String enumFormString = null;
+        FakeApi.TestEnumParametersQueryParams queryParams = new FakeApi.TestEnumParametersQueryParams()
+            .enumQueryStringArray(null)
+            .enumQueryString(null)
+            .enumQueryInteger(null)
+            .enumQueryDouble(null);
+        // api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumFormStringArray, enumFormString, queryParams);
+
+    // TODO: test validations
+    }
+    
+    /**
+     * Fake endpoint to test group parameters (optional)
+     *
+     * Fake endpoint to test group parameters (optional)
+     */
+    @Test
+    public void testGroupParametersTest() {
+        Integer requiredStringGroup = null;
+        Boolean requiredBooleanGroup = null;
+        Long requiredInt64Group = null;
+        Integer stringGroup = null;
+        Boolean booleanGroup = null;
+        Long int64Group = null;
+        // api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+
+        // TODO: test validations
+    }
+
+    /**
+     * Fake endpoint to test group parameters (optional)
+     *
+     * Fake endpoint to test group parameters (optional)
+     *
+     * This tests the overload of the method that uses a Map for query parameters instead of
+     * listing them out individually.
+     */
+    @Test
+    public void testGroupParametersTestQueryMap() {
+        Boolean requiredBooleanGroup = null;
+        Boolean booleanGroup = null;
+        FakeApi.TestGroupParametersQueryParams queryParams = new FakeApi.TestGroupParametersQueryParams()
+            .requiredStringGroup(null)
+            .requiredInt64Group(null)
+            .stringGroup(null)
+            .int64Group(null);
+        // api.testGroupParameters(requiredBooleanGroup, booleanGroup, queryParams);
+
+    // TODO: test validations
+    }
+    
+    /**
+     * test inline additionalProperties
+     *
+     * 
+     */
+    @Test
+    public void testInlineAdditionalPropertiesTest() {
+        Map<String, String> param = null;
+        // api.testInlineAdditionalProperties(param);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * test json serialization of form data
+     *
+     * 
+     */
+    @Test
+    public void testJsonFormDataTest() {
+        String param = null;
+        String param2 = null;
+        // api.testJsonFormData(param, param2);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * 
+     *
+     * To test the collection format in query parameters
+     */
+    @Test
+    public void testQueryParameterCollectionFormatTest() {
+        List<String> pipe = null;
+        List<String> ioutil = null;
+        List<String> http = null;
+        List<String> url = null;
+        List<String> context = null;
+        // api.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
+
+        // TODO: test validations
+    }
+
+    /**
+     * 
+     *
+     * To test the collection format in query parameters
+     *
+     * This tests the overload of the method that uses a Map for query parameters instead of
+     * listing them out individually.
+     */
+    @Test
+    public void testQueryParameterCollectionFormatTestQueryMap() {
+        FakeApi.TestQueryParameterCollectionFormatQueryParams queryParams = new FakeApi.TestQueryParameterCollectionFormatQueryParams()
+            .pipe(null)
+            .ioutil(null)
+            .http(null)
+            .url(null)
+            .context(null);
+        // api.testQueryParameterCollectionFormat(queryParams);
+
+    // TODO: test validations
+    }
+    
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
new file mode 100644
index 000000000000..badb867ce81f
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
@@ -0,0 +1,40 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.model.Client;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for FakeClassnameTags123Api
+ */
+public class FakeClassnameTags123ApiTest {
+
+    private FakeClassnameTags123Api api;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().buildClient(FakeClassnameTags123Api.class);
+    }
+
+    
+    /**
+     * To test class name in snake case
+     *
+     * To test class name in snake case
+     */
+    @Test
+    public void testClassnameTest() {
+        Client body = null;
+        // Client response = api.testClassname(body);
+
+        // TODO: test validations
+    }
+
+    
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/PetApiTest.java
new file mode 100644
index 000000000000..d49eb6ea0262
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -0,0 +1,194 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import java.io.File;
+import org.openapitools.client.model.ModelApiResponse;
+import org.openapitools.client.model.Pet;
+import java.util.Set;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for PetApi
+ */
+public class PetApiTest {
+
+    private PetApi api;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().buildClient(PetApi.class);
+    }
+
+    
+    /**
+     * Add a new pet to the store
+     *
+     * 
+     */
+    @Test
+    public void addPetTest() {
+        Pet body = null;
+        // api.addPet(body);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Deletes a pet
+     *
+     * 
+     */
+    @Test
+    public void deletePetTest() {
+        Long petId = null;
+        String apiKey = null;
+        // api.deletePet(petId, apiKey);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Finds Pets by status
+     *
+     * Multiple status values can be provided with comma separated strings
+     */
+    @Test
+    public void findPetsByStatusTest() {
+        List<String> status = null;
+        // List<Pet> response = api.findPetsByStatus(status);
+
+        // TODO: test validations
+    }
+
+    /**
+     * Finds Pets by status
+     *
+     * Multiple status values can be provided with comma separated strings
+     *
+     * This tests the overload of the method that uses a Map for query parameters instead of
+     * listing them out individually.
+     */
+    @Test
+    public void findPetsByStatusTestQueryMap() {
+        PetApi.FindPetsByStatusQueryParams queryParams = new PetApi.FindPetsByStatusQueryParams()
+            .status(null);
+        // List<Pet> response = api.findPetsByStatus(queryParams);
+
+    // TODO: test validations
+    }
+    
+    /**
+     * Finds Pets by tags
+     *
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     */
+    @Test
+    public void findPetsByTagsTest() {
+        Set<String> tags = null;
+        // Set<Pet> response = api.findPetsByTags(tags);
+
+        // TODO: test validations
+    }
+
+    /**
+     * Finds Pets by tags
+     *
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     *
+     * This tests the overload of the method that uses a Map for query parameters instead of
+     * listing them out individually.
+     */
+    @Test
+    public void findPetsByTagsTestQueryMap() {
+        PetApi.FindPetsByTagsQueryParams queryParams = new PetApi.FindPetsByTagsQueryParams()
+            .tags(null);
+        // Set<Pet> response = api.findPetsByTags(queryParams);
+
+    // TODO: test validations
+    }
+    
+    /**
+     * Find pet by ID
+     *
+     * Returns a single pet
+     */
+    @Test
+    public void getPetByIdTest() {
+        Long petId = null;
+        // Pet response = api.getPetById(petId);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Update an existing pet
+     *
+     * 
+     */
+    @Test
+    public void updatePetTest() {
+        Pet body = null;
+        // api.updatePet(body);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Updates a pet in the store with form data
+     *
+     * 
+     */
+    @Test
+    public void updatePetWithFormTest() {
+        Long petId = null;
+        String name = null;
+        String status = null;
+        // api.updatePetWithForm(petId, name, status);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * uploads an image
+     *
+     * 
+     */
+    @Test
+    public void uploadFileTest() {
+        Long petId = null;
+        String additionalMetadata = null;
+        File file = null;
+        // ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * uploads an image (required)
+     *
+     * 
+     */
+    @Test
+    public void uploadFileWithRequiredFileTest() {
+        Long petId = null;
+        File requiredFile = null;
+        String additionalMetadata = null;
+        // ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+
+        // TODO: test validations
+    }
+
+    
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/StoreApiTest.java
new file mode 100644
index 000000000000..07a48ec6e63c
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -0,0 +1,81 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.model.Order;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for StoreApi
+ */
+public class StoreApiTest {
+
+    private StoreApi api;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().buildClient(StoreApi.class);
+    }
+
+    
+    /**
+     * Delete purchase order by ID
+     *
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     */
+    @Test
+    public void deleteOrderTest() {
+        String orderId = null;
+        // api.deleteOrder(orderId);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Returns pet inventories by status
+     *
+     * Returns a map of status codes to quantities
+     */
+    @Test
+    public void getInventoryTest() {
+        // Map<String, Integer> response = api.getInventory();
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Find purchase order by ID
+     *
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     */
+    @Test
+    public void getOrderByIdTest() {
+        Long orderId = null;
+        // Order response = api.getOrderById(orderId);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Place an order for a pet
+     *
+     * 
+     */
+    @Test
+    public void placeOrderTest() {
+        Order body = null;
+        // Order response = api.placeOrder(body);
+
+        // TODO: test validations
+    }
+
+    
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/UserApiTest.java
new file mode 100644
index 000000000000..2656fb4cc920
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/UserApiTest.java
@@ -0,0 +1,156 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.model.User;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for UserApi
+ */
+public class UserApiTest {
+
+    private UserApi api;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().buildClient(UserApi.class);
+    }
+
+    
+    /**
+     * Create user
+     *
+     * This can only be done by the logged in user.
+     */
+    @Test
+    public void createUserTest() {
+        User body = null;
+        // api.createUser(body);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Creates list of users with given input array
+     *
+     * 
+     */
+    @Test
+    public void createUsersWithArrayInputTest() {
+        List<User> body = null;
+        // api.createUsersWithArrayInput(body);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Creates list of users with given input array
+     *
+     * 
+     */
+    @Test
+    public void createUsersWithListInputTest() {
+        List<User> body = null;
+        // api.createUsersWithListInput(body);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Delete user
+     *
+     * This can only be done by the logged in user.
+     */
+    @Test
+    public void deleteUserTest() {
+        String username = null;
+        // api.deleteUser(username);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Get user by user name
+     *
+     * 
+     */
+    @Test
+    public void getUserByNameTest() {
+        String username = null;
+        // User response = api.getUserByName(username);
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Logs user into the system
+     *
+     * 
+     */
+    @Test
+    public void loginUserTest() {
+        String username = null;
+        String password = null;
+        // String response = api.loginUser(username, password);
+
+        // TODO: test validations
+    }
+
+    /**
+     * Logs user into the system
+     *
+     * 
+     *
+     * This tests the overload of the method that uses a Map for query parameters instead of
+     * listing them out individually.
+     */
+    @Test
+    public void loginUserTestQueryMap() {
+        UserApi.LoginUserQueryParams queryParams = new UserApi.LoginUserQueryParams()
+            .username(null)
+            .password(null);
+        // String response = api.loginUser(queryParams);
+
+    // TODO: test validations
+    }
+    
+    /**
+     * Logs out current logged in user session
+     *
+     * 
+     */
+    @Test
+    public void logoutUserTest() {
+        // api.logoutUser();
+
+        // TODO: test validations
+    }
+
+    
+    /**
+     * Updated user
+     *
+     * This can only be done by the logged in user.
+     */
+    @Test
+    public void updateUserTest() {
+        String username = null;
+        User body = null;
+        // api.updateUser(username, body);
+
+        // TODO: test validations
+    }
+
+    
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
new file mode 100644
index 000000000000..ec44af783873
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesAnyType
+ */
+public class AdditionalPropertiesAnyTypeTest {
+    private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType();
+
+    /**
+     * Model tests for AdditionalPropertiesAnyType
+     */
+    @Test
+    public void testAdditionalPropertiesAnyType() {
+        // TODO: test AdditionalPropertiesAnyType
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
new file mode 100644
index 000000000000..ceb024c5620b
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
@@ -0,0 +1,52 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesArray
+ */
+public class AdditionalPropertiesArrayTest {
+    private final AdditionalPropertiesArray model = new AdditionalPropertiesArray();
+
+    /**
+     * Model tests for AdditionalPropertiesArray
+     */
+    @Test
+    public void testAdditionalPropertiesArray() {
+        // TODO: test AdditionalPropertiesArray
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
new file mode 100644
index 000000000000..517e5a10ae43
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesBoolean
+ */
+public class AdditionalPropertiesBooleanTest {
+    private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean();
+
+    /**
+     * Model tests for AdditionalPropertiesBoolean
+     */
+    @Test
+    public void testAdditionalPropertiesBoolean() {
+        // TODO: test AdditionalPropertiesBoolean
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
new file mode 100644
index 000000000000..2e3844ba9756
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
@@ -0,0 +1,133 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesClass
+ */
+public class AdditionalPropertiesClassTest {
+    private final AdditionalPropertiesClass model = new AdditionalPropertiesClass();
+
+    /**
+     * Model tests for AdditionalPropertiesClass
+     */
+    @Test
+    public void testAdditionalPropertiesClass() {
+        // TODO: test AdditionalPropertiesClass
+    }
+
+    /**
+     * Test the property 'mapString'
+     */
+    @Test
+    public void mapStringTest() {
+        // TODO: test mapString
+    }
+
+    /**
+     * Test the property 'mapNumber'
+     */
+    @Test
+    public void mapNumberTest() {
+        // TODO: test mapNumber
+    }
+
+    /**
+     * Test the property 'mapInteger'
+     */
+    @Test
+    public void mapIntegerTest() {
+        // TODO: test mapInteger
+    }
+
+    /**
+     * Test the property 'mapBoolean'
+     */
+    @Test
+    public void mapBooleanTest() {
+        // TODO: test mapBoolean
+    }
+
+    /**
+     * Test the property 'mapArrayInteger'
+     */
+    @Test
+    public void mapArrayIntegerTest() {
+        // TODO: test mapArrayInteger
+    }
+
+    /**
+     * Test the property 'mapArrayAnytype'
+     */
+    @Test
+    public void mapArrayAnytypeTest() {
+        // TODO: test mapArrayAnytype
+    }
+
+    /**
+     * Test the property 'mapMapString'
+     */
+    @Test
+    public void mapMapStringTest() {
+        // TODO: test mapMapString
+    }
+
+    /**
+     * Test the property 'mapMapAnytype'
+     */
+    @Test
+    public void mapMapAnytypeTest() {
+        // TODO: test mapMapAnytype
+    }
+
+    /**
+     * Test the property 'anytype1'
+     */
+    @Test
+    public void anytype1Test() {
+        // TODO: test anytype1
+    }
+
+    /**
+     * Test the property 'anytype2'
+     */
+    @Test
+    public void anytype2Test() {
+        // TODO: test anytype2
+    }
+
+    /**
+     * Test the property 'anytype3'
+     */
+    @Test
+    public void anytype3Test() {
+        // TODO: test anytype3
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
new file mode 100644
index 000000000000..66a7b85623e3
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesInteger
+ */
+public class AdditionalPropertiesIntegerTest {
+    private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger();
+
+    /**
+     * Model tests for AdditionalPropertiesInteger
+     */
+    @Test
+    public void testAdditionalPropertiesInteger() {
+        // TODO: test AdditionalPropertiesInteger
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
new file mode 100644
index 000000000000..4e03485a4484
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
@@ -0,0 +1,52 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesNumber
+ */
+public class AdditionalPropertiesNumberTest {
+    private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber();
+
+    /**
+     * Model tests for AdditionalPropertiesNumber
+     */
+    @Test
+    public void testAdditionalPropertiesNumber() {
+        // TODO: test AdditionalPropertiesNumber
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
new file mode 100644
index 000000000000..e0c72c586347
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesObject
+ */
+public class AdditionalPropertiesObjectTest {
+    private final AdditionalPropertiesObject model = new AdditionalPropertiesObject();
+
+    /**
+     * Model tests for AdditionalPropertiesObject
+     */
+    @Test
+    public void testAdditionalPropertiesObject() {
+        // TODO: test AdditionalPropertiesObject
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
new file mode 100644
index 000000000000..c84d987e7640
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesString
+ */
+public class AdditionalPropertiesStringTest {
+    private final AdditionalPropertiesString model = new AdditionalPropertiesString();
+
+    /**
+     * Model tests for AdditionalPropertiesString
+     */
+    @Test
+    public void testAdditionalPropertiesString() {
+        // TODO: test AdditionalPropertiesString
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AnimalTest.java
new file mode 100644
index 000000000000..7e79e5ca7b3f
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/AnimalTest.java
@@ -0,0 +1,62 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.BigCat;
+import org.openapitools.client.model.Cat;
+import org.openapitools.client.model.Dog;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Animal
+ */
+public class AnimalTest {
+    private final Animal model = new Animal();
+
+    /**
+     * Model tests for Animal
+     */
+    @Test
+    public void testAnimal() {
+        // TODO: test Animal
+    }
+
+    /**
+     * Test the property 'className'
+     */
+    @Test
+    public void classNameTest() {
+        // TODO: test className
+    }
+
+    /**
+     * Test the property 'color'
+     */
+    @Test
+    public void colorTest() {
+        // TODO: test color
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
new file mode 100644
index 000000000000..e25187a3b608
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
@@ -0,0 +1,52 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ArrayOfArrayOfNumberOnly
+ */
+public class ArrayOfArrayOfNumberOnlyTest {
+    private final ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly();
+
+    /**
+     * Model tests for ArrayOfArrayOfNumberOnly
+     */
+    @Test
+    public void testArrayOfArrayOfNumberOnly() {
+        // TODO: test ArrayOfArrayOfNumberOnly
+    }
+
+    /**
+     * Test the property 'arrayArrayNumber'
+     */
+    @Test
+    public void arrayArrayNumberTest() {
+        // TODO: test arrayArrayNumber
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
new file mode 100644
index 000000000000..ae1061823991
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
@@ -0,0 +1,52 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ArrayOfNumberOnly
+ */
+public class ArrayOfNumberOnlyTest {
+    private final ArrayOfNumberOnly model = new ArrayOfNumberOnly();
+
+    /**
+     * Model tests for ArrayOfNumberOnly
+     */
+    @Test
+    public void testArrayOfNumberOnly() {
+        // TODO: test ArrayOfNumberOnly
+    }
+
+    /**
+     * Test the property 'arrayNumber'
+     */
+    @Test
+    public void arrayNumberTest() {
+        // TODO: test arrayNumber
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ArrayTestTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ArrayTestTest.java
new file mode 100644
index 000000000000..36bd9951cf60
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ArrayTestTest.java
@@ -0,0 +1,68 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.openapitools.client.model.ReadOnlyFirst;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ArrayTest
+ */
+public class ArrayTestTest {
+    private final ArrayTest model = new ArrayTest();
+
+    /**
+     * Model tests for ArrayTest
+     */
+    @Test
+    public void testArrayTest() {
+        // TODO: test ArrayTest
+    }
+
+    /**
+     * Test the property 'arrayOfString'
+     */
+    @Test
+    public void arrayOfStringTest() {
+        // TODO: test arrayOfString
+    }
+
+    /**
+     * Test the property 'arrayArrayOfInteger'
+     */
+    @Test
+    public void arrayArrayOfIntegerTest() {
+        // TODO: test arrayArrayOfInteger
+    }
+
+    /**
+     * Test the property 'arrayArrayOfModel'
+     */
+    @Test
+    public void arrayArrayOfModelTest() {
+        // TODO: test arrayArrayOfModel
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java
rename to samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/BigCatTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/BigCatTest.java
new file mode 100644
index 000000000000..b3afa31d2894
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/BigCatTest.java
@@ -0,0 +1,77 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.BigCatAllOf;
+import org.openapitools.client.model.Cat;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for BigCat
+ */
+public class BigCatTest {
+    private final BigCat model = new BigCat();
+
+    /**
+     * Model tests for BigCat
+     */
+    @Test
+    public void testBigCat() {
+        // TODO: test BigCat
+    }
+
+    /**
+     * Test the property 'className'
+     */
+    @Test
+    public void classNameTest() {
+        // TODO: test className
+    }
+
+    /**
+     * Test the property 'color'
+     */
+    @Test
+    public void colorTest() {
+        // TODO: test color
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+    /**
+     * Test the property 'kind'
+     */
+    @Test
+    public void kindTest() {
+        // TODO: test kind
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/CapitalizationTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/CapitalizationTest.java
new file mode 100644
index 000000000000..a701b341fc59
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/CapitalizationTest.java
@@ -0,0 +1,89 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Capitalization
+ */
+public class CapitalizationTest {
+    private final Capitalization model = new Capitalization();
+
+    /**
+     * Model tests for Capitalization
+     */
+    @Test
+    public void testCapitalization() {
+        // TODO: test Capitalization
+    }
+
+    /**
+     * Test the property 'smallCamel'
+     */
+    @Test
+    public void smallCamelTest() {
+        // TODO: test smallCamel
+    }
+
+    /**
+     * Test the property 'capitalCamel'
+     */
+    @Test
+    public void capitalCamelTest() {
+        // TODO: test capitalCamel
+    }
+
+    /**
+     * Test the property 'smallSnake'
+     */
+    @Test
+    public void smallSnakeTest() {
+        // TODO: test smallSnake
+    }
+
+    /**
+     * Test the property 'capitalSnake'
+     */
+    @Test
+    public void capitalSnakeTest() {
+        // TODO: test capitalSnake
+    }
+
+    /**
+     * Test the property 'scAETHFlowPoints'
+     */
+    @Test
+    public void scAETHFlowPointsTest() {
+        // TODO: test scAETHFlowPoints
+    }
+
+    /**
+     * Test the property 'ATT_NAME'
+     */
+    @Test
+    public void ATT_NAMETest() {
+        // TODO: test ATT_NAME
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/CatAllOfTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/CatAllOfTest.java
new file mode 100644
index 000000000000..1d85a0447253
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/CatAllOfTest.java
@@ -0,0 +1,49 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for CatAllOf
+ */
+public class CatAllOfTest {
+    private final CatAllOf model = new CatAllOf();
+
+    /**
+     * Model tests for CatAllOf
+     */
+    @Test
+    public void testCatAllOf() {
+        // TODO: test CatAllOf
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/CatTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/CatTest.java
new file mode 100644
index 000000000000..d0952b501004
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/CatTest.java
@@ -0,0 +1,70 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.BigCat;
+import org.openapitools.client.model.CatAllOf;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Cat
+ */
+public class CatTest {
+    private final Cat model = new Cat();
+
+    /**
+     * Model tests for Cat
+     */
+    @Test
+    public void testCat() {
+        // TODO: test Cat
+    }
+
+    /**
+     * Test the property 'className'
+     */
+    @Test
+    public void classNameTest() {
+        // TODO: test className
+    }
+
+    /**
+     * Test the property 'color'
+     */
+    @Test
+    public void colorTest() {
+        // TODO: test color
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/CategoryTest.java
new file mode 100644
index 000000000000..6027994a2ac3
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/CategoryTest.java
@@ -0,0 +1,57 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Category
+ */
+public class CategoryTest {
+    private final Category model = new Category();
+
+    /**
+     * Model tests for Category
+     */
+    @Test
+    public void testCategory() {
+        // TODO: test Category
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ClassModelTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ClassModelTest.java
new file mode 100644
index 000000000000..8914c9cad43d
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ClassModelTest.java
@@ -0,0 +1,49 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ClassModel
+ */
+public class ClassModelTest {
+    private final ClassModel model = new ClassModel();
+
+    /**
+     * Model tests for ClassModel
+     */
+    @Test
+    public void testClassModel() {
+        // TODO: test ClassModel
+    }
+
+    /**
+     * Test the property 'propertyClass'
+     */
+    @Test
+    public void propertyClassTest() {
+        // TODO: test propertyClass
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ClientTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ClientTest.java
new file mode 100644
index 000000000000..c21b346272d7
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ClientTest.java
@@ -0,0 +1,49 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Client
+ */
+public class ClientTest {
+    private final Client model = new Client();
+
+    /**
+     * Model tests for Client
+     */
+    @Test
+    public void testClient() {
+        // TODO: test Client
+    }
+
+    /**
+     * Test the property 'client'
+     */
+    @Test
+    public void clientTest() {
+        // TODO: test client
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/DogAllOfTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/DogAllOfTest.java
new file mode 100644
index 000000000000..6e4b49108098
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/DogAllOfTest.java
@@ -0,0 +1,49 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for DogAllOf
+ */
+public class DogAllOfTest {
+    private final DogAllOf model = new DogAllOf();
+
+    /**
+     * Model tests for DogAllOf
+     */
+    @Test
+    public void testDogAllOf() {
+        // TODO: test DogAllOf
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/DogTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/DogTest.java
new file mode 100644
index 000000000000..3446815a300a
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/DogTest.java
@@ -0,0 +1,69 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Dog
+ */
+public class DogTest {
+    private final Dog model = new Dog();
+
+    /**
+     * Model tests for Dog
+     */
+    @Test
+    public void testDog() {
+        // TODO: test Dog
+    }
+
+    /**
+     * Test the property 'className'
+     */
+    @Test
+    public void classNameTest() {
+        // TODO: test className
+    }
+
+    /**
+     * Test the property 'color'
+     */
+    @Test
+    public void colorTest() {
+        // TODO: test color
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/EnumArraysTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/EnumArraysTest.java
new file mode 100644
index 000000000000..45b8fbbd8220
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/EnumArraysTest.java
@@ -0,0 +1,59 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for EnumArrays
+ */
+public class EnumArraysTest {
+    private final EnumArrays model = new EnumArrays();
+
+    /**
+     * Model tests for EnumArrays
+     */
+    @Test
+    public void testEnumArrays() {
+        // TODO: test EnumArrays
+    }
+
+    /**
+     * Test the property 'justSymbol'
+     */
+    @Test
+    public void justSymbolTest() {
+        // TODO: test justSymbol
+    }
+
+    /**
+     * Test the property 'arrayEnum'
+     */
+    @Test
+    public void arrayEnumTest() {
+        // TODO: test arrayEnum
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/EnumClassTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/EnumClassTest.java
new file mode 100644
index 000000000000..9e45543facd2
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/EnumClassTest.java
@@ -0,0 +1,33 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for EnumClass
+ */
+public class EnumClassTest {
+    /**
+     * Model tests for EnumClass
+     */
+    @Test
+    public void testEnumClass() {
+        // TODO: test EnumClass
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/EnumTestTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/EnumTestTest.java
new file mode 100644
index 000000000000..04e7afb19784
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/EnumTestTest.java
@@ -0,0 +1,82 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.OuterEnum;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for EnumTest
+ */
+public class EnumTestTest {
+    private final EnumTest model = new EnumTest();
+
+    /**
+     * Model tests for EnumTest
+     */
+    @Test
+    public void testEnumTest() {
+        // TODO: test EnumTest
+    }
+
+    /**
+     * Test the property 'enumString'
+     */
+    @Test
+    public void enumStringTest() {
+        // TODO: test enumString
+    }
+
+    /**
+     * Test the property 'enumStringRequired'
+     */
+    @Test
+    public void enumStringRequiredTest() {
+        // TODO: test enumStringRequired
+    }
+
+    /**
+     * Test the property 'enumInteger'
+     */
+    @Test
+    public void enumIntegerTest() {
+        // TODO: test enumInteger
+    }
+
+    /**
+     * Test the property 'enumNumber'
+     */
+    @Test
+    public void enumNumberTest() {
+        // TODO: test enumNumber
+    }
+
+    /**
+     * Test the property 'outerEnum'
+     */
+    @Test
+    public void outerEnumTest() {
+        // TODO: test outerEnum
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
new file mode 100644
index 000000000000..ef37e666be39
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
@@ -0,0 +1,59 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for FileSchemaTestClass
+ */
+public class FileSchemaTestClassTest {
+    private final FileSchemaTestClass model = new FileSchemaTestClass();
+
+    /**
+     * Model tests for FileSchemaTestClass
+     */
+    @Test
+    public void testFileSchemaTestClass() {
+        // TODO: test FileSchemaTestClass
+    }
+
+    /**
+     * Test the property 'file'
+     */
+    @Test
+    public void fileTest() {
+        // TODO: test file
+    }
+
+    /**
+     * Test the property 'files'
+     */
+    @Test
+    public void filesTest() {
+        // TODO: test files
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/FormatTestTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/FormatTestTest.java
new file mode 100644
index 000000000000..710501b51bd4
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/FormatTestTest.java
@@ -0,0 +1,158 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.File;
+import java.math.BigDecimal;
+import java.util.UUID;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for FormatTest
+ */
+public class FormatTestTest {
+    private final FormatTest model = new FormatTest();
+
+    /**
+     * Model tests for FormatTest
+     */
+    @Test
+    public void testFormatTest() {
+        // TODO: test FormatTest
+    }
+
+    /**
+     * Test the property 'integer'
+     */
+    @Test
+    public void integerTest() {
+        // TODO: test integer
+    }
+
+    /**
+     * Test the property 'int32'
+     */
+    @Test
+    public void int32Test() {
+        // TODO: test int32
+    }
+
+    /**
+     * Test the property 'int64'
+     */
+    @Test
+    public void int64Test() {
+        // TODO: test int64
+    }
+
+    /**
+     * Test the property 'number'
+     */
+    @Test
+    public void numberTest() {
+        // TODO: test number
+    }
+
+    /**
+     * Test the property '_float'
+     */
+    @Test
+    public void _floatTest() {
+        // TODO: test _float
+    }
+
+    /**
+     * Test the property '_double'
+     */
+    @Test
+    public void _doubleTest() {
+        // TODO: test _double
+    }
+
+    /**
+     * Test the property 'string'
+     */
+    @Test
+    public void stringTest() {
+        // TODO: test string
+    }
+
+    /**
+     * Test the property '_byte'
+     */
+    @Test
+    public void _byteTest() {
+        // TODO: test _byte
+    }
+
+    /**
+     * Test the property 'binary'
+     */
+    @Test
+    public void binaryTest() {
+        // TODO: test binary
+    }
+
+    /**
+     * Test the property 'date'
+     */
+    @Test
+    public void dateTest() {
+        // TODO: test date
+    }
+
+    /**
+     * Test the property 'dateTime'
+     */
+    @Test
+    public void dateTimeTest() {
+        // TODO: test dateTime
+    }
+
+    /**
+     * Test the property 'uuid'
+     */
+    @Test
+    public void uuidTest() {
+        // TODO: test uuid
+    }
+
+    /**
+     * Test the property 'password'
+     */
+    @Test
+    public void passwordTest() {
+        // TODO: test password
+    }
+
+    /**
+     * Test the property 'bigDecimal'
+     */
+    @Test
+    public void bigDecimalTest() {
+        // TODO: test bigDecimal
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
new file mode 100644
index 000000000000..e902c100383b
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
@@ -0,0 +1,57 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for HasOnlyReadOnly
+ */
+public class HasOnlyReadOnlyTest {
+    private final HasOnlyReadOnly model = new HasOnlyReadOnly();
+
+    /**
+     * Model tests for HasOnlyReadOnly
+     */
+    @Test
+    public void testHasOnlyReadOnly() {
+        // TODO: test HasOnlyReadOnly
+    }
+
+    /**
+     * Test the property 'bar'
+     */
+    @Test
+    public void barTest() {
+        // TODO: test bar
+    }
+
+    /**
+     * Test the property 'foo'
+     */
+    @Test
+    public void fooTest() {
+        // TODO: test foo
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/MapTestTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/MapTestTest.java
new file mode 100644
index 000000000000..a0c991bb7588
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/MapTestTest.java
@@ -0,0 +1,76 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for MapTest
+ */
+public class MapTestTest {
+    private final MapTest model = new MapTest();
+
+    /**
+     * Model tests for MapTest
+     */
+    @Test
+    public void testMapTest() {
+        // TODO: test MapTest
+    }
+
+    /**
+     * Test the property 'mapMapOfString'
+     */
+    @Test
+    public void mapMapOfStringTest() {
+        // TODO: test mapMapOfString
+    }
+
+    /**
+     * Test the property 'mapOfEnumString'
+     */
+    @Test
+    public void mapOfEnumStringTest() {
+        // TODO: test mapOfEnumString
+    }
+
+    /**
+     * Test the property 'directMap'
+     */
+    @Test
+    public void directMapTest() {
+        // TODO: test directMap
+    }
+
+    /**
+     * Test the property 'indirectMap'
+     */
+    @Test
+    public void indirectMapTest() {
+        // TODO: test indirectMap
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
new file mode 100644
index 000000000000..f8a8c734baaf
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
@@ -0,0 +1,71 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.openapitools.client.model.Animal;
+import org.threeten.bp.OffsetDateTime;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for MixedPropertiesAndAdditionalPropertiesClass
+ */
+public class MixedPropertiesAndAdditionalPropertiesClassTest {
+    private final MixedPropertiesAndAdditionalPropertiesClass model = new MixedPropertiesAndAdditionalPropertiesClass();
+
+    /**
+     * Model tests for MixedPropertiesAndAdditionalPropertiesClass
+     */
+    @Test
+    public void testMixedPropertiesAndAdditionalPropertiesClass() {
+        // TODO: test MixedPropertiesAndAdditionalPropertiesClass
+    }
+
+    /**
+     * Test the property 'uuid'
+     */
+    @Test
+    public void uuidTest() {
+        // TODO: test uuid
+    }
+
+    /**
+     * Test the property 'dateTime'
+     */
+    @Test
+    public void dateTimeTest() {
+        // TODO: test dateTime
+    }
+
+    /**
+     * Test the property 'map'
+     */
+    @Test
+    public void mapTest() {
+        // TODO: test map
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/Model200ResponseTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
new file mode 100644
index 000000000000..82c7208079db
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
@@ -0,0 +1,57 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Model200Response
+ */
+public class Model200ResponseTest {
+    private final Model200Response model = new Model200Response();
+
+    /**
+     * Model tests for Model200Response
+     */
+    @Test
+    public void testModel200Response() {
+        // TODO: test Model200Response
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+    /**
+     * Test the property 'propertyClass'
+     */
+    @Test
+    public void propertyClassTest() {
+        // TODO: test propertyClass
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
new file mode 100644
index 000000000000..97a1287aa413
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
@@ -0,0 +1,65 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ModelApiResponse
+ */
+public class ModelApiResponseTest {
+    private final ModelApiResponse model = new ModelApiResponse();
+
+    /**
+     * Model tests for ModelApiResponse
+     */
+    @Test
+    public void testModelApiResponse() {
+        // TODO: test ModelApiResponse
+    }
+
+    /**
+     * Test the property 'code'
+     */
+    @Test
+    public void codeTest() {
+        // TODO: test code
+    }
+
+    /**
+     * Test the property 'type'
+     */
+    @Test
+    public void typeTest() {
+        // TODO: test type
+    }
+
+    /**
+     * Test the property 'message'
+     */
+    @Test
+    public void messageTest() {
+        // TODO: test message
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ModelReturnTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ModelReturnTest.java
new file mode 100644
index 000000000000..f884519ebc86
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ModelReturnTest.java
@@ -0,0 +1,49 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ModelReturn
+ */
+public class ModelReturnTest {
+    private final ModelReturn model = new ModelReturn();
+
+    /**
+     * Model tests for ModelReturn
+     */
+    @Test
+    public void testModelReturn() {
+        // TODO: test ModelReturn
+    }
+
+    /**
+     * Test the property '_return'
+     */
+    @Test
+    public void _returnTest() {
+        // TODO: test _return
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/NameTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/NameTest.java
new file mode 100644
index 000000000000..cb3a94cf74ab
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/NameTest.java
@@ -0,0 +1,73 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Name
+ */
+public class NameTest {
+    private final Name model = new Name();
+
+    /**
+     * Model tests for Name
+     */
+    @Test
+    public void testName() {
+        // TODO: test Name
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+    /**
+     * Test the property 'snakeCase'
+     */
+    @Test
+    public void snakeCaseTest() {
+        // TODO: test snakeCase
+    }
+
+    /**
+     * Test the property 'property'
+     */
+    @Test
+    public void propertyTest() {
+        // TODO: test property
+    }
+
+    /**
+     * Test the property '_123number'
+     */
+    @Test
+    public void _123numberTest() {
+        // TODO: test _123number
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/NumberOnlyTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
new file mode 100644
index 000000000000..f4fbd5ee8b42
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
@@ -0,0 +1,50 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for NumberOnly
+ */
+public class NumberOnlyTest {
+    private final NumberOnly model = new NumberOnly();
+
+    /**
+     * Model tests for NumberOnly
+     */
+    @Test
+    public void testNumberOnly() {
+        // TODO: test NumberOnly
+    }
+
+    /**
+     * Test the property 'justNumber'
+     */
+    @Test
+    public void justNumberTest() {
+        // TODO: test justNumber
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/OrderTest.java
new file mode 100644
index 000000000000..d24c8479f5d6
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.threeten.bp.OffsetDateTime;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Order
+ */
+public class OrderTest {
+    private final Order model = new Order();
+
+    /**
+     * Model tests for Order
+     */
+    @Test
+    public void testOrder() {
+        // TODO: test Order
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'petId'
+     */
+    @Test
+    public void petIdTest() {
+        // TODO: test petId
+    }
+
+    /**
+     * Test the property 'quantity'
+     */
+    @Test
+    public void quantityTest() {
+        // TODO: test quantity
+    }
+
+    /**
+     * Test the property 'shipDate'
+     */
+    @Test
+    public void shipDateTest() {
+        // TODO: test shipDate
+    }
+
+    /**
+     * Test the property 'status'
+     */
+    @Test
+    public void statusTest() {
+        // TODO: test status
+    }
+
+    /**
+     * Test the property 'complete'
+     */
+    @Test
+    public void completeTest() {
+        // TODO: test complete
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/OuterCompositeTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
new file mode 100644
index 000000000000..ebea3ca304c0
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
@@ -0,0 +1,66 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for OuterComposite
+ */
+public class OuterCompositeTest {
+    private final OuterComposite model = new OuterComposite();
+
+    /**
+     * Model tests for OuterComposite
+     */
+    @Test
+    public void testOuterComposite() {
+        // TODO: test OuterComposite
+    }
+
+    /**
+     * Test the property 'myNumber'
+     */
+    @Test
+    public void myNumberTest() {
+        // TODO: test myNumber
+    }
+
+    /**
+     * Test the property 'myString'
+     */
+    @Test
+    public void myStringTest() {
+        // TODO: test myString
+    }
+
+    /**
+     * Test the property 'myBoolean'
+     */
+    @Test
+    public void myBooleanTest() {
+        // TODO: test myBoolean
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/OuterEnumTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/OuterEnumTest.java
new file mode 100644
index 000000000000..cf0ebae0faf0
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/OuterEnumTest.java
@@ -0,0 +1,33 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for OuterEnum
+ */
+public class OuterEnumTest {
+    /**
+     * Model tests for OuterEnum
+     */
+    @Test
+    public void testOuterEnum() {
+        // TODO: test OuterEnum
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/PetTest.java
new file mode 100644
index 000000000000..4065f7ca1a46
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/PetTest.java
@@ -0,0 +1,95 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.openapitools.client.model.Category;
+import org.openapitools.client.model.Tag;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Pet
+ */
+public class PetTest {
+    private final Pet model = new Pet();
+
+    /**
+     * Model tests for Pet
+     */
+    @Test
+    public void testPet() {
+        // TODO: test Pet
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'category'
+     */
+    @Test
+    public void categoryTest() {
+        // TODO: test category
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+    /**
+     * Test the property 'photoUrls'
+     */
+    @Test
+    public void photoUrlsTest() {
+        // TODO: test photoUrls
+    }
+
+    /**
+     * Test the property 'tags'
+     */
+    @Test
+    public void tagsTest() {
+        // TODO: test tags
+    }
+
+    /**
+     * Test the property 'status'
+     */
+    @Test
+    public void statusTest() {
+        // TODO: test status
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
new file mode 100644
index 000000000000..b82a7d0ef561
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
@@ -0,0 +1,57 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ReadOnlyFirst
+ */
+public class ReadOnlyFirstTest {
+    private final ReadOnlyFirst model = new ReadOnlyFirst();
+
+    /**
+     * Model tests for ReadOnlyFirst
+     */
+    @Test
+    public void testReadOnlyFirst() {
+        // TODO: test ReadOnlyFirst
+    }
+
+    /**
+     * Test the property 'bar'
+     */
+    @Test
+    public void barTest() {
+        // TODO: test bar
+    }
+
+    /**
+     * Test the property 'baz'
+     */
+    @Test
+    public void bazTest() {
+        // TODO: test baz
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
new file mode 100644
index 000000000000..d5a19c371e68
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
@@ -0,0 +1,49 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for SpecialModelName
+ */
+public class SpecialModelNameTest {
+    private final SpecialModelName model = new SpecialModelName();
+
+    /**
+     * Model tests for SpecialModelName
+     */
+    @Test
+    public void testSpecialModelName() {
+        // TODO: test SpecialModelName
+    }
+
+    /**
+     * Test the property '$specialPropertyName'
+     */
+    @Test
+    public void $specialPropertyNameTest() {
+        // TODO: test $specialPropertyName
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/TagTest.java
new file mode 100644
index 000000000000..5c2cc6f49e05
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/TagTest.java
@@ -0,0 +1,57 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Tag
+ */
+public class TagTest {
+    private final Tag model = new Tag();
+
+    /**
+     * Model tests for Tag
+     */
+    @Test
+    public void testTag() {
+        // TODO: test Tag
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
new file mode 100644
index 000000000000..e96ac744439d
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
@@ -0,0 +1,84 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for TypeHolderDefault
+ */
+public class TypeHolderDefaultTest {
+    private final TypeHolderDefault model = new TypeHolderDefault();
+
+    /**
+     * Model tests for TypeHolderDefault
+     */
+    @Test
+    public void testTypeHolderDefault() {
+        // TODO: test TypeHolderDefault
+    }
+
+    /**
+     * Test the property 'stringItem'
+     */
+    @Test
+    public void stringItemTest() {
+        // TODO: test stringItem
+    }
+
+    /**
+     * Test the property 'numberItem'
+     */
+    @Test
+    public void numberItemTest() {
+        // TODO: test numberItem
+    }
+
+    /**
+     * Test the property 'integerItem'
+     */
+    @Test
+    public void integerItemTest() {
+        // TODO: test integerItem
+    }
+
+    /**
+     * Test the property 'boolItem'
+     */
+    @Test
+    public void boolItemTest() {
+        // TODO: test boolItem
+    }
+
+    /**
+     * Test the property 'arrayItem'
+     */
+    @Test
+    public void arrayItemTest() {
+        // TODO: test arrayItem
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
new file mode 100644
index 000000000000..56641d163a50
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
@@ -0,0 +1,92 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for TypeHolderExample
+ */
+public class TypeHolderExampleTest {
+    private final TypeHolderExample model = new TypeHolderExample();
+
+    /**
+     * Model tests for TypeHolderExample
+     */
+    @Test
+    public void testTypeHolderExample() {
+        // TODO: test TypeHolderExample
+    }
+
+    /**
+     * Test the property 'stringItem'
+     */
+    @Test
+    public void stringItemTest() {
+        // TODO: test stringItem
+    }
+
+    /**
+     * Test the property 'numberItem'
+     */
+    @Test
+    public void numberItemTest() {
+        // TODO: test numberItem
+    }
+
+    /**
+     * Test the property 'floatItem'
+     */
+    @Test
+    public void floatItemTest() {
+        // TODO: test floatItem
+    }
+
+    /**
+     * Test the property 'integerItem'
+     */
+    @Test
+    public void integerItemTest() {
+        // TODO: test integerItem
+    }
+
+    /**
+     * Test the property 'boolItem'
+     */
+    @Test
+    public void boolItemTest() {
+        // TODO: test boolItem
+    }
+
+    /**
+     * Test the property 'arrayItem'
+     */
+    @Test
+    public void arrayItemTest() {
+        // TODO: test arrayItem
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/UserTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/UserTest.java
new file mode 100644
index 000000000000..ce40d3a2a637
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/UserTest.java
@@ -0,0 +1,105 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for User
+ */
+public class UserTest {
+    private final User model = new User();
+
+    /**
+     * Model tests for User
+     */
+    @Test
+    public void testUser() {
+        // TODO: test User
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'username'
+     */
+    @Test
+    public void usernameTest() {
+        // TODO: test username
+    }
+
+    /**
+     * Test the property 'firstName'
+     */
+    @Test
+    public void firstNameTest() {
+        // TODO: test firstName
+    }
+
+    /**
+     * Test the property 'lastName'
+     */
+    @Test
+    public void lastNameTest() {
+        // TODO: test lastName
+    }
+
+    /**
+     * Test the property 'email'
+     */
+    @Test
+    public void emailTest() {
+        // TODO: test email
+    }
+
+    /**
+     * Test the property 'password'
+     */
+    @Test
+    public void passwordTest() {
+        // TODO: test password
+    }
+
+    /**
+     * Test the property 'phone'
+     */
+    @Test
+    public void phoneTest() {
+        // TODO: test phone
+    }
+
+    /**
+     * Test the property 'userStatus'
+     */
+    @Test
+    public void userStatusTest() {
+        // TODO: test userStatus
+    }
+
+}
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/XmlItemTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/XmlItemTest.java
new file mode 100644
index 000000000000..501c414555f4
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/XmlItemTest.java
@@ -0,0 +1,276 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for XmlItem
+ */
+public class XmlItemTest {
+    private final XmlItem model = new XmlItem();
+
+    /**
+     * Model tests for XmlItem
+     */
+    @Test
+    public void testXmlItem() {
+        // TODO: test XmlItem
+    }
+
+    /**
+     * Test the property 'attributeString'
+     */
+    @Test
+    public void attributeStringTest() {
+        // TODO: test attributeString
+    }
+
+    /**
+     * Test the property 'attributeNumber'
+     */
+    @Test
+    public void attributeNumberTest() {
+        // TODO: test attributeNumber
+    }
+
+    /**
+     * Test the property 'attributeInteger'
+     */
+    @Test
+    public void attributeIntegerTest() {
+        // TODO: test attributeInteger
+    }
+
+    /**
+     * Test the property 'attributeBoolean'
+     */
+    @Test
+    public void attributeBooleanTest() {
+        // TODO: test attributeBoolean
+    }
+
+    /**
+     * Test the property 'wrappedArray'
+     */
+    @Test
+    public void wrappedArrayTest() {
+        // TODO: test wrappedArray
+    }
+
+    /**
+     * Test the property 'nameString'
+     */
+    @Test
+    public void nameStringTest() {
+        // TODO: test nameString
+    }
+
+    /**
+     * Test the property 'nameNumber'
+     */
+    @Test
+    public void nameNumberTest() {
+        // TODO: test nameNumber
+    }
+
+    /**
+     * Test the property 'nameInteger'
+     */
+    @Test
+    public void nameIntegerTest() {
+        // TODO: test nameInteger
+    }
+
+    /**
+     * Test the property 'nameBoolean'
+     */
+    @Test
+    public void nameBooleanTest() {
+        // TODO: test nameBoolean
+    }
+
+    /**
+     * Test the property 'nameArray'
+     */
+    @Test
+    public void nameArrayTest() {
+        // TODO: test nameArray
+    }
+
+    /**
+     * Test the property 'nameWrappedArray'
+     */
+    @Test
+    public void nameWrappedArrayTest() {
+        // TODO: test nameWrappedArray
+    }
+
+    /**
+     * Test the property 'prefixString'
+     */
+    @Test
+    public void prefixStringTest() {
+        // TODO: test prefixString
+    }
+
+    /**
+     * Test the property 'prefixNumber'
+     */
+    @Test
+    public void prefixNumberTest() {
+        // TODO: test prefixNumber
+    }
+
+    /**
+     * Test the property 'prefixInteger'
+     */
+    @Test
+    public void prefixIntegerTest() {
+        // TODO: test prefixInteger
+    }
+
+    /**
+     * Test the property 'prefixBoolean'
+     */
+    @Test
+    public void prefixBooleanTest() {
+        // TODO: test prefixBoolean
+    }
+
+    /**
+     * Test the property 'prefixArray'
+     */
+    @Test
+    public void prefixArrayTest() {
+        // TODO: test prefixArray
+    }
+
+    /**
+     * Test the property 'prefixWrappedArray'
+     */
+    @Test
+    public void prefixWrappedArrayTest() {
+        // TODO: test prefixWrappedArray
+    }
+
+    /**
+     * Test the property 'namespaceString'
+     */
+    @Test
+    public void namespaceStringTest() {
+        // TODO: test namespaceString
+    }
+
+    /**
+     * Test the property 'namespaceNumber'
+     */
+    @Test
+    public void namespaceNumberTest() {
+        // TODO: test namespaceNumber
+    }
+
+    /**
+     * Test the property 'namespaceInteger'
+     */
+    @Test
+    public void namespaceIntegerTest() {
+        // TODO: test namespaceInteger
+    }
+
+    /**
+     * Test the property 'namespaceBoolean'
+     */
+    @Test
+    public void namespaceBooleanTest() {
+        // TODO: test namespaceBoolean
+    }
+
+    /**
+     * Test the property 'namespaceArray'
+     */
+    @Test
+    public void namespaceArrayTest() {
+        // TODO: test namespaceArray
+    }
+
+    /**
+     * Test the property 'namespaceWrappedArray'
+     */
+    @Test
+    public void namespaceWrappedArrayTest() {
+        // TODO: test namespaceWrappedArray
+    }
+
+    /**
+     * Test the property 'prefixNsString'
+     */
+    @Test
+    public void prefixNsStringTest() {
+        // TODO: test prefixNsString
+    }
+
+    /**
+     * Test the property 'prefixNsNumber'
+     */
+    @Test
+    public void prefixNsNumberTest() {
+        // TODO: test prefixNsNumber
+    }
+
+    /**
+     * Test the property 'prefixNsInteger'
+     */
+    @Test
+    public void prefixNsIntegerTest() {
+        // TODO: test prefixNsInteger
+    }
+
+    /**
+     * Test the property 'prefixNsBoolean'
+     */
+    @Test
+    public void prefixNsBooleanTest() {
+        // TODO: test prefixNsBoolean
+    }
+
+    /**
+     * Test the property 'prefixNsArray'
+     */
+    @Test
+    public void prefixNsArrayTest() {
+        // TODO: test prefixNsArray
+    }
+
+    /**
+     * Test the property 'prefixNsWrappedArray'
+     */
+    @Test
+    public void prefixNsWrappedArrayTest() {
+        // TODO: test prefixNsWrappedArray
+    }
+
+}
diff --git a/samples/client/petstore/java/feign10x/build.gradle b/samples/client/petstore/java/feign10x/build.gradle
deleted file mode 100644
index a45a4a21784f..000000000000
--- a/samples/client/petstore/java/feign10x/build.gradle
+++ /dev/null
@@ -1,124 +0,0 @@
-apply plugin: 'idea'
-apply plugin: 'eclipse'
-
-group = 'org.openapitools'
-version = '1.0.0'
-
-buildscript {
-    repositories {
-        maven { url "https://repo1.maven.org/maven2" }
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.+'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-    }
-}
-
-repositories {
-    jcenter()
-}
-
-
-if(hasProperty('target') && target == 'android') {
-
-    apply plugin: 'com.android.library'
-    apply plugin: 'com.github.dcendents.android-maven'
-
-    android {
-        compileSdkVersion 25
-        buildToolsVersion '25.0.2'
-        defaultConfig {
-            minSdkVersion 14
-            targetSdkVersion 25
-        }
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_7
-            targetCompatibility JavaVersion.VERSION_1_7
-        }
-
-        // Rename the aar correctly
-        libraryVariants.all { variant ->
-            variant.outputs.each { output ->
-                def outputFile = output.outputFile
-                if (outputFile != null && outputFile.name.endsWith('.aar')) {
-                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
-                    output.outputFile = new File(outputFile.parent, fileName)
-                }
-            }
-        }
-
-        dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
-        }
-    }
-
-    afterEvaluate {
-        android.libraryVariants.all { variant ->
-            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
-            task.description = "Create jar artifact for ${variant.name}"
-            task.dependsOn variant.javaCompile
-            task.from variant.javaCompile.destinationDir
-            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
-            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
-            artifacts.add('archives', task);
-        }
-    }
-
-    task sourcesJar(type: Jar) {
-        from android.sourceSets.main.java.srcDirs
-        classifier = 'sources'
-    }
-
-    artifacts {
-        archives sourcesJar
-    }
-
-} else {
-
-    apply plugin: 'java'
-    apply plugin: 'maven'
-
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
-
-    install {
-        repositories.mavenInstaller {
-            pom.artifactId = 'petstore-feign-10x'
-        }
-    }
-
-    task execute(type:JavaExec) {
-       main = System.getProperty('mainClass')
-       classpath = sourceSets.main.runtimeClasspath
-    }
-}
-
-ext {
-    swagger_annotations_version = "1.5.24"
-    jackson_version = "2.10.3"
-    jackson_databind_version = "2.10.3"
-    jackson_databind_nullable_version = "0.2.1"
-    jackson_threetenbp_version = "2.9.10"
-    feign_version = "9.7.0"
-    feign_form_version = "2.1.0"
-    junit_version = "4.13"
-    oltu_version = "1.0.1"
-}
-
-dependencies {
-    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "com.google.code.findbugs:jsr305:3.0.2"
-    compile "io.github.openfeign:feign-core:$feign_version"
-    compile "io.github.openfeign:feign-jackson:$feign_version"
-    compile "io.github.openfeign:feign-slf4j:$feign_version"
-    compile "io.github.openfeign.form:feign-form:$feign_form_version"
-    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
-    compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version"
-    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
-    compile "com.brsanthu:migbase64:2.2"
-    testCompile "junit:junit:$junit_version"
-}
diff --git a/samples/client/petstore/java/feign10x/build.sbt b/samples/client/petstore/java/feign10x/build.sbt
deleted file mode 100644
index ba4786bb334c..000000000000
--- a/samples/client/petstore/java/feign10x/build.sbt
+++ /dev/null
@@ -1,27 +0,0 @@
-lazy val root = (project in file(".")).
-  settings(
-    organization := "org.openapitools",
-    name := "petstore-feign-10x",
-    version := "1.0.0",
-    scalaVersion := "2.11.4",
-    scalacOptions ++= Seq("-feature"),
-    javacOptions in compile ++= Seq("-Xlint:deprecation"),
-    publishArtifact in (Compile, packageDoc) := false,
-    resolvers += Resolver.mavenLocal,
-    libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.24" % "compile",
-      "io.github.openfeign" % "feign-core" % "9.7.0" % "compile",
-      "io.github.openfeign" % "feign-jackson" % "9.7.0" % "compile",
-      "io.github.openfeign" % "feign-slf4j" % "9.7.0" % "compile",
-      "io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile",
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
-      "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
-      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
-      "com.brsanthu" % "migbase64" % "2.2" % "compile",
-      "junit" % "junit" % "4.13" % "test",
-      "com.novocode" % "junit-interface" % "0.10" % "test"
-    )
-  )
diff --git a/samples/client/petstore/java/feign10x/pom.xml b/samples/client/petstore/java/feign10x/pom.xml
deleted file mode 100644
index 00b154e922e3..000000000000
--- a/samples/client/petstore/java/feign10x/pom.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>petstore-feign-10x</artifactId>
-    <packaging>jar</packaging>
-    <name>petstore-feign-10x</name>
-    <version>1.0.0</version>
-    <url>https://github.com/openapitools/openapi-generator</url>
-    <description>OpenAPI Java</description>
-    <scm>
-        <connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
-        <developerConnection>scm:git:git@github.com:openapitools/openapi-generator.git</developerConnection>
-        <url>https://github.com/openapitools/openapi-generator</url>
-    </scm>
-
-    <licenses>
-        <license>
-            <name>Unlicense</name>
-            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>OpenAPI-Generator Contributors</name>
-            <email>team@openapitools.org</email>
-            <organization>OpenAPITools.org</organization>
-            <organizationUrl>http://openapitools.org</organizationUrl>
-        </developer>
-    </developers>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>2.2.0</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M4</version>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>loggerPath</name>
-                            <value>conf/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                    <argLine>-Xms512m -Xmx1500m</argLine>
-                    <parallel>methods</parallel>
-                    <threadCount>10</threadCount>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- attach test jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.10</version>
-                <executions>
-                    <execution>
-                        <id>add_sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/main/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>add_test_sources</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/test/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
-                    <fork>true</fork>
-                    <meminitial>128m</meminitial>
-                    <maxmem>512m</maxmem>
-                    <compilerArgs>
-                        <arg>-Xlint:all</arg>
-                        <arg>-J-Xss4m</arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.1</version>
-                <configuration>
-                    <doclint>none</doclint>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>sign-artifacts</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations-version}</version>
-        </dependency>
-
-        <!-- @Nullable annotation -->
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-        </dependency>
-        
-        <!-- HTTP client: Netflix Feign -->
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-core</artifactId>
-            <version>${feign-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-jackson</artifactId>
-            <version>${feign-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-slf4j</artifactId>
-            <version>${feign-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign.form</groupId>
-            <artifactId>feign-form</artifactId>
-            <version>${feign-form-version}</version>
-        </dependency>
-
-        <!-- JSON processing: jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openapitools</groupId>
-            <artifactId>jackson-databind-nullable</artifactId>
-            <version>${jackson-databind-nullable-version}</version>
-        </dependency>
-            <dependency>
-                <groupId>com.github.joschi.jackson</groupId>
-                <artifactId>jackson-datatype-threetenbp</artifactId>
-                <version>${jackson-threetenbp-version}</version>
-            </dependency>
-        <dependency>
-            <groupId>org.apache.oltu.oauth2</groupId>
-            <artifactId>org.apache.oltu.oauth2.client</artifactId>
-            <version>${oltu-version}</version>
-        </dependency>
-
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>mockwebserver</artifactId>
-            <version>3.6.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>1.7.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.7</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <swagger-annotations-version>1.5.24</swagger-annotations-version>
-        <feign-version>9.7.0</feign-version>
-        <feign-form-version>2.1.0</feign-form-version>
-        <jackson-version>2.10.3</jackson-version>
-        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
-        <jackson-databind-version>2.10.3</jackson-databind-version>
-        <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
-        <junit-version>4.13</junit-version>
-        <maven-plugin-version>1.0.0</maven-plugin-version>
-        <oltu-version>1.0.1</oltu-version>
-    </properties>
-</project>
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ApiClient.java
deleted file mode 100644
index 738307efaf78..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ApiClient.java
+++ /dev/null
@@ -1,355 +0,0 @@
-package org.openapitools.client;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
-import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
-
-import org.threeten.bp.*;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import org.openapitools.jackson.nullable.JsonNullableModule;
-import com.fasterxml.jackson.datatype.threetenbp.ThreeTenModule;
-
-import feign.Feign;
-import feign.RequestInterceptor;
-import feign.form.FormEncoder;
-import feign.jackson.JacksonDecoder;
-import feign.jackson.JacksonEncoder;
-import feign.slf4j.Slf4jLogger;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.auth.OAuth.AccessTokenListener;
-
-
-public class ApiClient {
-  public interface Api {}
-
-  protected ObjectMapper objectMapper;
-  private String basePath = "http://petstore.swagger.io:80/v2";
-  private Map<String, RequestInterceptor> apiAuthorizations;
-  private Feign.Builder feignBuilder;
-
-  public ApiClient() {
-    objectMapper = createObjectMapper();
-    apiAuthorizations = new LinkedHashMap<String, RequestInterceptor>();
-    feignBuilder = Feign.builder()
-                .encoder(new FormEncoder(new JacksonEncoder(objectMapper)))
-                .decoder(new JacksonDecoder(objectMapper))
-                .logger(new Slf4jLogger());
-  }
-
-  public ApiClient(String[] authNames) {
-    this();
-    for(String authName : authNames) {
-      RequestInterceptor auth;
-      if ("api_key".equals(authName)) {
-        auth = new ApiKeyAuth("header", "api_key");
-      } else if ("api_key_query".equals(authName)) {
-        auth = new ApiKeyAuth("query", "api_key_query");
-      } else if ("http_basic_test".equals(authName)) {
-        auth = new HttpBasicAuth();
-      } else if ("petstore_auth".equals(authName)) {
-        auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
-      } else {
-        throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
-      }
-      addAuthorization(authName, auth);
-    }
-  }
-
-  /**
-   * Basic constructor for single auth name
-   * @param authName
-   */
-  public ApiClient(String authName) {
-    this(new String[]{authName});
-  }
-
-  /**
-   * Helper constructor for single api key
-   * @param authName
-   * @param apiKey
-   */
-  public ApiClient(String authName, String apiKey) {
-    this(authName);
-    this.setApiKey(apiKey);
-  }
-
-  /**
-   * Helper constructor for single basic auth or password oauth2
-   * @param authName
-   * @param username
-   * @param password
-   */
-  public ApiClient(String authName, String username, String password) {
-    this(authName);
-    this.setCredentials(username,  password);
-  }
-
-  /**
-   * Helper constructor for single password oauth2
-   * @param authName
-   * @param clientId
-   * @param secret
-   * @param username
-   * @param password
-   */
-  public ApiClient(String authName, String clientId, String secret, String username, String password) {
-    this(authName);
-    this.getTokenEndPoint()
-           .setClientId(clientId)
-           .setClientSecret(secret)
-           .setUsername(username)
-           .setPassword(password);
-  }
-
-  public String getBasePath() {
-    return basePath;
-  }
-
-  public ApiClient setBasePath(String basePath) {
-    this.basePath = basePath;
-    return this;
-  }
-
-  public Map<String, RequestInterceptor> getApiAuthorizations() {
-    return apiAuthorizations;
-  }
-
-  public void setApiAuthorizations(Map<String, RequestInterceptor> apiAuthorizations) {
-    this.apiAuthorizations = apiAuthorizations;
-  }
-
-  public Feign.Builder getFeignBuilder() {
-    return feignBuilder;
-  }
-
-  public ApiClient setFeignBuilder(Feign.Builder feignBuilder) {
-    this.feignBuilder = feignBuilder;
-    return this;
-  }
-
-  private ObjectMapper createObjectMapper() {
-    ObjectMapper objectMapper = new ObjectMapper();
-    objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-    objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
-    objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-    objectMapper.disable(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE);
-    objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-    objectMapper.setDateFormat(new RFC3339DateFormat());
-    ThreeTenModule module = new ThreeTenModule();
-    module.addDeserializer(Instant.class, CustomInstantDeserializer.INSTANT);
-    module.addDeserializer(OffsetDateTime.class, CustomInstantDeserializer.OFFSET_DATE_TIME);
-    module.addDeserializer(ZonedDateTime.class, CustomInstantDeserializer.ZONED_DATE_TIME);
-    objectMapper.registerModule(module);
-    JsonNullableModule jnm = new JsonNullableModule();
-    objectMapper.registerModule(jnm);
-    return objectMapper;
-  }
-
-  public ObjectMapper getObjectMapper(){
-    return objectMapper;
-  }
-
-  /**
-   * Creates a feign client for given API interface.
-   *
-   * Usage:
-   *    ApiClient apiClient = new ApiClient();
-   *    apiClient.setBasePath("http://localhost:8080");
-   *    XYZApi api = apiClient.buildClient(XYZApi.class);
-   *    XYZResponse response = api.someMethod(...);
-   * @param <T> Type
-   * @param clientClass Client class
-   * @return The Client
-   */
-  public <T extends Api> T buildClient(Class<T> clientClass) {
-    return feignBuilder.target(clientClass, basePath);
-  }
-
-  /**
-   * Select the Accept header's value from the given accepts array:
-   *   if JSON exists in the given array, use it;
-   *   otherwise use all of them (joining into a string)
-   *
-   * @param accepts The accepts array to select from
-   * @return The Accept header to use. If the given array is empty,
-   *   null will be returned (not to set the Accept header explicitly).
-   */
-  public String selectHeaderAccept(String[] accepts) {
-    if (accepts.length == 0) return null;
-    if (StringUtil.containsIgnoreCase(accepts, "application/json")) return "application/json";
-    return StringUtil.join(accepts, ",");
-  }
-
-  /**
-   * Select the Content-Type header's value from the given array:
-   *   if JSON exists in the given array, use it;
-   *   otherwise use the first one of the array.
-   *
-   * @param contentTypes The Content-Type array to select from
-   * @return The Content-Type header to use. If the given array is empty,
-   *   JSON will be used.
-   */
-  public String selectHeaderContentType(String[] contentTypes) {
-    if (contentTypes.length == 0) return "application/json";
-    if (StringUtil.containsIgnoreCase(contentTypes, "application/json")) return "application/json";
-    return contentTypes[0];
-  }
-
-
-  /**
-   * Helper method to configure the bearer token.
-   * @param bearerToken the bearer token.
-   */
-  public void setBearerToken(String bearerToken) {
-    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof HttpBearerAuth) {
-        ((HttpBearerAuth) apiAuthorization).setBearerToken(bearerToken);
-        return;
-      }
-    }
-    throw new RuntimeException("No Bearer authentication configured!");
-  }
-
-  /**
-   * Helper method to configure the first api key found
-   * @param apiKey API key
-   */
-  public void setApiKey(String apiKey) {
-    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof ApiKeyAuth) {
-        ApiKeyAuth keyAuth = (ApiKeyAuth) apiAuthorization;
-        keyAuth.setApiKey(apiKey);
-        return ;
-      }
-    }
-    throw new RuntimeException("No API key authentication configured!");
-  }
-
-  /**
-   * Helper method to configure the username/password for basic auth or password OAuth
-   * @param username Username
-   * @param password Password
-   */
-  public void setCredentials(String username, String password) {
-    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof HttpBasicAuth) {
-        HttpBasicAuth basicAuth = (HttpBasicAuth) apiAuthorization;
-        basicAuth.setCredentials(username, password);
-        return;
-      }
-      if (apiAuthorization instanceof OAuth) {
-        OAuth oauth = (OAuth) apiAuthorization;
-        oauth.getTokenRequestBuilder().setUsername(username).setPassword(password);
-        return;
-      }
-    }
-    throw new RuntimeException("No Basic authentication or OAuth configured!");
-  }
-
-  /**
-   * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
-   * @return Token request builder
-   */
-  public TokenRequestBuilder getTokenEndPoint() {
-    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof OAuth) {
-        OAuth oauth = (OAuth) apiAuthorization;
-        return oauth.getTokenRequestBuilder();
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
-   * @return Authentication request builder
-   */
-  public AuthenticationRequestBuilder getAuthorizationEndPoint() {
-    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof OAuth) {
-        OAuth oauth = (OAuth) apiAuthorization;
-        return oauth.getAuthenticationRequestBuilder();
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
-   * @param accessToken Access Token
-   * @param expiresIn Validity period in seconds
-   */
-  public void setAccessToken(String accessToken, Long expiresIn) {
-    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof OAuth) {
-        OAuth oauth = (OAuth) apiAuthorization;
-        oauth.setAccessToken(accessToken, expiresIn);
-        return;
-      }
-    }
-  }
-
-  /**
-   * Helper method to configure the oauth accessCode/implicit flow parameters
-   * @param clientId Client ID
-   * @param clientSecret Client secret
-   * @param redirectURI Redirect URI
-   */
-  public void configureAuthorizationFlow(String clientId, String clientSecret, String redirectURI) {
-    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof OAuth) {
-        OAuth oauth = (OAuth) apiAuthorization;
-        oauth.getTokenRequestBuilder()
-                .setClientId(clientId)
-                .setClientSecret(clientSecret)
-                .setRedirectURI(redirectURI);
-        oauth.getAuthenticationRequestBuilder()
-                .setClientId(clientId)
-                .setRedirectURI(redirectURI);
-        return;
-      }
-    }
-  }
-
-  /**
-   * Configures a listener which is notified when a new access token is received.
-   * @param accessTokenListener Acesss token listener
-   */
-  public void registerAccessTokenListener(AccessTokenListener accessTokenListener) {
-    for(RequestInterceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof OAuth) {
-        OAuth oauth = (OAuth) apiAuthorization;
-        oauth.registerAccessTokenListener(accessTokenListener);
-        return;
-      }
-    }
-  }
-
-  /**
-   * Gets request interceptor based on authentication name
-   * @param authName Authentiation name
-   * @return Request Interceptor
-   */
-  public RequestInterceptor getAuthorization(String authName) {
-    return apiAuthorizations.get(authName);
-  }
-
-  /**
-   * Adds an authorization to be used by the client
-   * @param authName Authentication name
-   * @param authorization Request interceptor
-   */
-  public void addAuthorization(String authName, RequestInterceptor authorization) {
-    if (apiAuthorizations.containsKey(authName)) {
-      throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations");
-    }
-    apiAuthorizations.put(authName, authorization);
-    feignBuilder.requestInterceptor(authorization);
-  }
-
-}
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/StringUtil.java
deleted file mode 100644
index 747a23f5bf23..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/StringUtil.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-
-public class StringUtil {
-  /**
-   * Check if the given array contains the given value (with case-insensitive comparison).
-   *
-   * @param array The array
-   * @param value The value to search
-   * @return true if the array contains the value
-   */
-  public static boolean containsIgnoreCase(String[] array, String value) {
-    for (String str : array) {
-      if (value == null && str == null) {
-        return true;
-      }
-      if (value != null && value.equalsIgnoreCase(str)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Join an array of strings with the given separator.
-   * <p>
-   * Note: This might be replaced by utility method from commons-lang or guava someday
-   * if one of those libraries is added as dependency.
-   * </p>
-   *
-   * @param array     The array of strings
-   * @param separator The separator
-   * @return the resulting string
-   */
-  public static String join(String[] array, String separator) {
-    int len = array.length;
-    if (len == 0) {
-      return "";
-    }
-
-    StringBuilder out = new StringBuilder();
-    out.append(array[0]);
-    for (int i = 1; i < len; i++) {
-      out.append(separator).append(array[i]);
-    }
-    return out.toString();
-  }
-
-  /**
-   * Join a list of strings with the given separator.
-   *
-   * @param list      The list of strings
-   * @param separator The separator
-   * @return the resulting string
-   */
-  public static String join(Collection<String> list, String separator) {
-    Iterator<String> iterator = list.iterator();
-    StringBuilder out = new StringBuilder();
-    if (iterator.hasNext()) {
-      out.append(iterator.next());
-    }
-    while (iterator.hasNext()) {
-      out.append(separator).append(iterator.next());
-    }
-    return out.toString();
-  }
-}
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
deleted file mode 100644
index bd4cd7e1fe7a..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.EncodingUtils;
-
-import org.openapitools.client.model.Client;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import feign.*;
-
-
-public interface AnotherFakeApi extends ApiClient.Api {
-
-
-  /**
-   * To test special tags
-   * To test special tags and operation ID starting with number
-   * @param body client model (required)
-   * @return Client
-   */
-  @RequestLine("PATCH /another-fake/dummy")
-  @Headers({
-    "Content-Type: application/json",
-    "Accept: application/json",
-  })
-  Client call123testSpecialTags(Client body);
-}
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/FakeApi.java
deleted file mode 100644
index 7648f4c650fa..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/FakeApi.java
+++ /dev/null
@@ -1,422 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.EncodingUtils;
-
-import java.math.BigDecimal;
-import org.openapitools.client.model.Client;
-import java.io.File;
-import org.openapitools.client.model.FileSchemaTestClass;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
-import org.openapitools.client.model.OuterComposite;
-import org.openapitools.client.model.User;
-import org.openapitools.client.model.XmlItem;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import feign.*;
-
-
-public interface FakeApi extends ApiClient.Api {
-
-
-  /**
-   * creates an XmlItem
-   * this route creates an XmlItem
-   * @param xmlItem XmlItem Body (required)
-   */
-  @RequestLine("POST /fake/create_xml_item")
-  @Headers({
-    "Content-Type: application/xml",
-    "Accept: application/json",
-  })
-  void createXmlItem(XmlItem xmlItem);
-
-  /**
-   * 
-   * Test serialization of outer boolean types
-   * @param body Input boolean as post body (optional)
-   * @return Boolean
-   */
-  @RequestLine("POST /fake/outer/boolean")
-  @Headers({
-    "Content-Type: */*",
-    "Accept: */*",
-  })
-  Boolean fakeOuterBooleanSerialize(Boolean body);
-
-  /**
-   * 
-   * Test serialization of object with outer number type
-   * @param body Input composite as post body (optional)
-   * @return OuterComposite
-   */
-  @RequestLine("POST /fake/outer/composite")
-  @Headers({
-    "Content-Type: */*",
-    "Accept: */*",
-  })
-  OuterComposite fakeOuterCompositeSerialize(OuterComposite body);
-
-  /**
-   * 
-   * Test serialization of outer number types
-   * @param body Input number as post body (optional)
-   * @return BigDecimal
-   */
-  @RequestLine("POST /fake/outer/number")
-  @Headers({
-    "Content-Type: */*",
-    "Accept: */*",
-  })
-  BigDecimal fakeOuterNumberSerialize(BigDecimal body);
-
-  /**
-   * 
-   * Test serialization of outer string types
-   * @param body Input string as post body (optional)
-   * @return String
-   */
-  @RequestLine("POST /fake/outer/string")
-  @Headers({
-    "Content-Type: */*",
-    "Accept: */*",
-  })
-  String fakeOuterStringSerialize(String body);
-
-  /**
-   * 
-   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-   * @param body  (required)
-   */
-  @RequestLine("PUT /fake/body-with-file-schema")
-  @Headers({
-    "Content-Type: application/json",
-    "Accept: application/json",
-  })
-  void testBodyWithFileSchema(FileSchemaTestClass body);
-
-  /**
-   * 
-   * 
-   * @param query  (required)
-   * @param body  (required)
-   */
-  @RequestLine("PUT /fake/body-with-query-params?query={query}")
-  @Headers({
-    "Content-Type: application/json",
-    "Accept: application/json",
-  })
-  void testBodyWithQueryParams(@Param("query") String query, User body);
-
-  /**
-   * 
-   * 
-   * Note, this is equivalent to the other <code>testBodyWithQueryParams</code> method,
-   * but with the query parameters collected into a single Map parameter. This
-   * is convenient for services with optional query parameters, especially when
-   * used with the {@link TestBodyWithQueryParamsQueryParams} class that allows for
-   * building up this map in a fluent style.
-   * @param body  (required)
-   * @param queryParams Map of query parameters as name-value pairs
-   *   <p>The following elements may be specified in the query map:</p>
-   *   <ul>
-   *   <li>query -  (required)</li>
-   *   </ul>
-   */
-  @RequestLine("PUT /fake/body-with-query-params?query={query}")
-  @Headers({
-  "Content-Type: application/json",
-  "Accept: application/json",
-  })
-  void testBodyWithQueryParams(User body, @QueryMap(encoded=true) Map<String, Object> queryParams);
-
-  /**
-   * A convenience class for generating query parameters for the
-   * <code>testBodyWithQueryParams</code> method in a fluent style.
-   */
-  public static class TestBodyWithQueryParamsQueryParams extends HashMap<String, Object> {
-    public TestBodyWithQueryParamsQueryParams query(final String value) {
-      put("query", EncodingUtils.encode(value));
-      return this;
-    }
-  }
-
-  /**
-   * To test \&quot;client\&quot; model
-   * To test \&quot;client\&quot; model
-   * @param body client model (required)
-   * @return Client
-   */
-  @RequestLine("PATCH /fake")
-  @Headers({
-    "Content-Type: application/json",
-    "Accept: application/json",
-  })
-  Client testClientModel(Client body);
-
-  /**
-   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-   * @param number None (required)
-   * @param _double None (required)
-   * @param patternWithoutDelimiter None (required)
-   * @param _byte None (required)
-   * @param integer None (optional)
-   * @param int32 None (optional)
-   * @param int64 None (optional)
-   * @param _float None (optional)
-   * @param string None (optional)
-   * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
-   * @param password None (optional)
-   * @param paramCallback None (optional)
-   */
-  @RequestLine("POST /fake")
-  @Headers({
-    "Content-Type: application/x-www-form-urlencoded",
-    "Accept: application/json",
-  })
-  void testEndpointParameters(@Param("number") BigDecimal number, @Param("_double") Double _double, @Param("patternWithoutDelimiter") String patternWithoutDelimiter, @Param("_byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("_float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("paramCallback") String paramCallback);
-
-  /**
-   * To test enum parameters
-   * To test enum parameters
-   * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
-   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
-   * @param enumQueryStringArray Query parameter enum test (string array) (optional)
-   * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
-   * @param enumQueryInteger Query parameter enum test (double) (optional)
-   * @param enumQueryDouble Query parameter enum test (double) (optional)
-   * @param enumFormStringArray Form parameter enum test (string array) (optional)
-   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
-   */
-  @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}")
-  @Headers({
-    "Content-Type: application/x-www-form-urlencoded",
-    "Accept: application/json",
-    "enum_header_string_array: {enumHeaderStringArray}",
-    
-    "enum_header_string: {enumHeaderString}"
-  })
-  void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumQueryStringArray") List<String> enumQueryStringArray, @Param("enumQueryString") String enumQueryString, @Param("enumQueryInteger") Integer enumQueryInteger, @Param("enumQueryDouble") Double enumQueryDouble, @Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString);
-
-  /**
-   * To test enum parameters
-   * To test enum parameters
-   * Note, this is equivalent to the other <code>testEnumParameters</code> method,
-   * but with the query parameters collected into a single Map parameter. This
-   * is convenient for services with optional query parameters, especially when
-   * used with the {@link TestEnumParametersQueryParams} class that allows for
-   * building up this map in a fluent style.
-   * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
-   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
-   * @param enumFormStringArray Form parameter enum test (string array) (optional)
-   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
-   * @param queryParams Map of query parameters as name-value pairs
-   *   <p>The following elements may be specified in the query map:</p>
-   *   <ul>
-   *   <li>enumQueryStringArray - Query parameter enum test (string array) (optional)</li>
-   *   <li>enumQueryString - Query parameter enum test (string) (optional, default to -efg)</li>
-   *   <li>enumQueryInteger - Query parameter enum test (double) (optional)</li>
-   *   <li>enumQueryDouble - Query parameter enum test (double) (optional)</li>
-   *   </ul>
-   */
-  @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}")
-  @Headers({
-  "Content-Type: application/x-www-form-urlencoded",
-  "Accept: application/json",
-      "enum_header_string_array: {enumHeaderStringArray}",
-      
-      "enum_header_string: {enumHeaderString}"
-  })
-  void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString, @QueryMap(encoded=true) Map<String, Object> queryParams);
-
-  /**
-   * A convenience class for generating query parameters for the
-   * <code>testEnumParameters</code> method in a fluent style.
-   */
-  public static class TestEnumParametersQueryParams extends HashMap<String, Object> {
-    public TestEnumParametersQueryParams enumQueryStringArray(final List<String> value) {
-      put("enum_query_string_array", EncodingUtils.encodeCollection(value, "csv"));
-      return this;
-    }
-    public TestEnumParametersQueryParams enumQueryString(final String value) {
-      put("enum_query_string", EncodingUtils.encode(value));
-      return this;
-    }
-    public TestEnumParametersQueryParams enumQueryInteger(final Integer value) {
-      put("enum_query_integer", EncodingUtils.encode(value));
-      return this;
-    }
-    public TestEnumParametersQueryParams enumQueryDouble(final Double value) {
-      put("enum_query_double", EncodingUtils.encode(value));
-      return this;
-    }
-  }
-
-  /**
-   * Fake endpoint to test group parameters (optional)
-   * Fake endpoint to test group parameters (optional)
-   * @param requiredStringGroup Required String in group parameters (required)
-   * @param requiredBooleanGroup Required Boolean in group parameters (required)
-   * @param requiredInt64Group Required Integer in group parameters (required)
-   * @param stringGroup String in group parameters (optional)
-   * @param booleanGroup Boolean in group parameters (optional)
-   * @param int64Group Integer in group parameters (optional)
-   */
-  @RequestLine("DELETE /fake?required_string_group={requiredStringGroup}&required_int64_group={requiredInt64Group}&string_group={stringGroup}&int64_group={int64Group}")
-  @Headers({
-    "Accept: application/json",
-    "required_boolean_group: {requiredBooleanGroup}",
-    
-    "boolean_group: {booleanGroup}"
-  })
-  void testGroupParameters(@Param("requiredStringGroup") Integer requiredStringGroup, @Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("requiredInt64Group") Long requiredInt64Group, @Param("stringGroup") Integer stringGroup, @Param("booleanGroup") Boolean booleanGroup, @Param("int64Group") Long int64Group);
-
-  /**
-   * Fake endpoint to test group parameters (optional)
-   * Fake endpoint to test group parameters (optional)
-   * Note, this is equivalent to the other <code>testGroupParameters</code> method,
-   * but with the query parameters collected into a single Map parameter. This
-   * is convenient for services with optional query parameters, especially when
-   * used with the {@link TestGroupParametersQueryParams} class that allows for
-   * building up this map in a fluent style.
-   * @param requiredBooleanGroup Required Boolean in group parameters (required)
-   * @param booleanGroup Boolean in group parameters (optional)
-   * @param queryParams Map of query parameters as name-value pairs
-   *   <p>The following elements may be specified in the query map:</p>
-   *   <ul>
-   *   <li>requiredStringGroup - Required String in group parameters (required)</li>
-   *   <li>requiredInt64Group - Required Integer in group parameters (required)</li>
-   *   <li>stringGroup - String in group parameters (optional)</li>
-   *   <li>int64Group - Integer in group parameters (optional)</li>
-   *   </ul>
-   */
-  @RequestLine("DELETE /fake?required_string_group={requiredStringGroup}&required_int64_group={requiredInt64Group}&string_group={stringGroup}&int64_group={int64Group}")
-  @Headers({
-  "Accept: application/json",
-      "required_boolean_group: {requiredBooleanGroup}",
-      
-      "boolean_group: {booleanGroup}"
-  })
-  void testGroupParameters(@Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("booleanGroup") Boolean booleanGroup, @QueryMap(encoded=true) Map<String, Object> queryParams);
-
-  /**
-   * A convenience class for generating query parameters for the
-   * <code>testGroupParameters</code> method in a fluent style.
-   */
-  public static class TestGroupParametersQueryParams extends HashMap<String, Object> {
-    public TestGroupParametersQueryParams requiredStringGroup(final Integer value) {
-      put("required_string_group", EncodingUtils.encode(value));
-      return this;
-    }
-    public TestGroupParametersQueryParams requiredInt64Group(final Long value) {
-      put("required_int64_group", EncodingUtils.encode(value));
-      return this;
-    }
-    public TestGroupParametersQueryParams stringGroup(final Integer value) {
-      put("string_group", EncodingUtils.encode(value));
-      return this;
-    }
-    public TestGroupParametersQueryParams int64Group(final Long value) {
-      put("int64_group", EncodingUtils.encode(value));
-      return this;
-    }
-  }
-
-  /**
-   * test inline additionalProperties
-   * 
-   * @param param request body (required)
-   */
-  @RequestLine("POST /fake/inline-additionalProperties")
-  @Headers({
-    "Content-Type: application/json",
-    "Accept: application/json",
-  })
-  void testInlineAdditionalProperties(Map<String, String> param);
-
-  /**
-   * test json serialization of form data
-   * 
-   * @param param field1 (required)
-   * @param param2 field2 (required)
-   */
-  @RequestLine("GET /fake/jsonFormData")
-  @Headers({
-    "Content-Type: application/x-www-form-urlencoded",
-    "Accept: application/json",
-  })
-  void testJsonFormData(@Param("param") String param, @Param("param2") String param2);
-
-  /**
-   * 
-   * To test the collection format in query parameters
-   * @param pipe  (required)
-   * @param ioutil  (required)
-   * @param http  (required)
-   * @param url  (required)
-   * @param context  (required)
-   */
-  @RequestLine("PUT /fake/test-query-paramters?pipe={pipe}&ioutil={ioutil}&http={http}&url={url}&context={context}")
-  @Headers({
-    "Accept: application/json",
-  })
-  void testQueryParameterCollectionFormat(@Param("pipe") List<String> pipe, @Param("ioutil") List<String> ioutil, @Param("http") List<String> http, @Param("url") List<String> url, @Param("context") List<String> context);
-
-  /**
-   * 
-   * To test the collection format in query parameters
-   * Note, this is equivalent to the other <code>testQueryParameterCollectionFormat</code> method,
-   * but with the query parameters collected into a single Map parameter. This
-   * is convenient for services with optional query parameters, especially when
-   * used with the {@link TestQueryParameterCollectionFormatQueryParams} class that allows for
-   * building up this map in a fluent style.
-   * @param queryParams Map of query parameters as name-value pairs
-   *   <p>The following elements may be specified in the query map:</p>
-   *   <ul>
-   *   <li>pipe -  (required)</li>
-   *   <li>ioutil -  (required)</li>
-   *   <li>http -  (required)</li>
-   *   <li>url -  (required)</li>
-   *   <li>context -  (required)</li>
-   *   </ul>
-   */
-  @RequestLine("PUT /fake/test-query-paramters?pipe={pipe}&ioutil={ioutil}&http={http}&url={url}&context={context}")
-  @Headers({
-  "Accept: application/json",
-  })
-  void testQueryParameterCollectionFormat(@QueryMap(encoded=true) Map<String, Object> queryParams);
-
-  /**
-   * A convenience class for generating query parameters for the
-   * <code>testQueryParameterCollectionFormat</code> method in a fluent style.
-   */
-  public static class TestQueryParameterCollectionFormatQueryParams extends HashMap<String, Object> {
-    public TestQueryParameterCollectionFormatQueryParams pipe(final List<String> value) {
-      put("pipe", EncodingUtils.encodeCollection(value, "csv"));
-      return this;
-    }
-    public TestQueryParameterCollectionFormatQueryParams ioutil(final List<String> value) {
-      put("ioutil", EncodingUtils.encodeCollection(value, "csv"));
-      return this;
-    }
-    public TestQueryParameterCollectionFormatQueryParams http(final List<String> value) {
-      put("http", EncodingUtils.encodeCollection(value, "ssv"));
-      return this;
-    }
-    public TestQueryParameterCollectionFormatQueryParams url(final List<String> value) {
-      put("url", EncodingUtils.encodeCollection(value, "csv"));
-      return this;
-    }
-    public TestQueryParameterCollectionFormatQueryParams context(final List<String> value) {
-      put("context", EncodingUtils.encodeCollection(value, "multi"));
-      return this;
-    }
-  }
-}
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
deleted file mode 100644
index 2df21ad9b964..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.EncodingUtils;
-
-import org.openapitools.client.model.Client;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import feign.*;
-
-
-public interface FakeClassnameTags123Api extends ApiClient.Api {
-
-
-  /**
-   * To test class name in snake case
-   * To test class name in snake case
-   * @param body client model (required)
-   * @return Client
-   */
-  @RequestLine("PATCH /fake_classname_test")
-  @Headers({
-    "Content-Type: application/json",
-    "Accept: application/json",
-  })
-  Client testClassname(Client body);
-}
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/PetApi.java
deleted file mode 100644
index 48ecf31fd3f8..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/PetApi.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.EncodingUtils;
-
-import java.io.File;
-import org.openapitools.client.model.ModelApiResponse;
-import org.openapitools.client.model.Pet;
-import java.util.Set;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import feign.*;
-
-
-public interface PetApi extends ApiClient.Api {
-
-
-  /**
-   * Add a new pet to the store
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   */
-  @RequestLine("POST /pet")
-  @Headers({
-    "Content-Type: application/json",
-    "Accept: application/json",
-  })
-  void addPet(Pet body);
-
-  /**
-   * Deletes a pet
-   * 
-   * @param petId Pet id to delete (required)
-   * @param apiKey  (optional)
-   */
-  @RequestLine("DELETE /pet/{petId}")
-  @Headers({
-    "Accept: application/json",
-    "api_key: {apiKey}"
-  })
-  void deletePet(@Param("petId") Long petId, @Param("apiKey") String apiKey);
-
-  /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma separated strings
-   * @param status Status values that need to be considered for filter (required)
-   * @return List&lt;Pet&gt;
-   */
-  @RequestLine("GET /pet/findByStatus?status={status}")
-  @Headers({
-    "Accept: application/json",
-  })
-  List<Pet> findPetsByStatus(@Param("status") List<String> status);
-
-  /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma separated strings
-   * Note, this is equivalent to the other <code>findPetsByStatus</code> method,
-   * but with the query parameters collected into a single Map parameter. This
-   * is convenient for services with optional query parameters, especially when
-   * used with the {@link FindPetsByStatusQueryParams} class that allows for
-   * building up this map in a fluent style.
-   * @param queryParams Map of query parameters as name-value pairs
-   *   <p>The following elements may be specified in the query map:</p>
-   *   <ul>
-   *   <li>status - Status values that need to be considered for filter (required)</li>
-   *   </ul>
-   * @return List&lt;Pet&gt;
-   */
-  @RequestLine("GET /pet/findByStatus?status={status}")
-  @Headers({
-  "Accept: application/json",
-  })
-  List<Pet> findPetsByStatus(@QueryMap(encoded=true) Map<String, Object> queryParams);
-
-  /**
-   * A convenience class for generating query parameters for the
-   * <code>findPetsByStatus</code> method in a fluent style.
-   */
-  public static class FindPetsByStatusQueryParams extends HashMap<String, Object> {
-    public FindPetsByStatusQueryParams status(final List<String> value) {
-      put("status", EncodingUtils.encodeCollection(value, "csv"));
-      return this;
-    }
-  }
-
-  /**
-   * Finds Pets by tags
-   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by (required)
-   * @return Set&lt;Pet&gt;
-   */
-  @RequestLine("GET /pet/findByTags?tags={tags}")
-  @Headers({
-    "Accept: application/json",
-  })
-  Set<Pet> findPetsByTags(@Param("tags") Set<String> tags);
-
-  /**
-   * Finds Pets by tags
-   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-   * Note, this is equivalent to the other <code>findPetsByTags</code> method,
-   * but with the query parameters collected into a single Map parameter. This
-   * is convenient for services with optional query parameters, especially when
-   * used with the {@link FindPetsByTagsQueryParams} class that allows for
-   * building up this map in a fluent style.
-   * @param queryParams Map of query parameters as name-value pairs
-   *   <p>The following elements may be specified in the query map:</p>
-   *   <ul>
-   *   <li>tags - Tags to filter by (required)</li>
-   *   </ul>
-   * @return Set&lt;Pet&gt;
-   */
-  @RequestLine("GET /pet/findByTags?tags={tags}")
-  @Headers({
-  "Accept: application/json",
-  })
-  Set<Pet> findPetsByTags(@QueryMap(encoded=true) Map<String, Object> queryParams);
-
-  /**
-   * A convenience class for generating query parameters for the
-   * <code>findPetsByTags</code> method in a fluent style.
-   */
-  public static class FindPetsByTagsQueryParams extends HashMap<String, Object> {
-    public FindPetsByTagsQueryParams tags(final Set<String> value) {
-      put("tags", EncodingUtils.encodeCollection(value, "csv"));
-      return this;
-    }
-  }
-
-  /**
-   * Find pet by ID
-   * Returns a single pet
-   * @param petId ID of pet to return (required)
-   * @return Pet
-   */
-  @RequestLine("GET /pet/{petId}")
-  @Headers({
-    "Accept: application/json",
-  })
-  Pet getPetById(@Param("petId") Long petId);
-
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   */
-  @RequestLine("PUT /pet")
-  @Headers({
-    "Content-Type: application/json",
-    "Accept: application/json",
-  })
-  void updatePet(Pet body);
-
-  /**
-   * Updates a pet in the store with form data
-   * 
-   * @param petId ID of pet that needs to be updated (required)
-   * @param name Updated name of the pet (optional)
-   * @param status Updated status of the pet (optional)
-   */
-  @RequestLine("POST /pet/{petId}")
-  @Headers({
-    "Content-Type: application/x-www-form-urlencoded",
-    "Accept: application/json",
-  })
-  void updatePetWithForm(@Param("petId") Long petId, @Param("name") String name, @Param("status") String status);
-
-  /**
-   * uploads an image
-   * 
-   * @param petId ID of pet to update (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @param file file to upload (optional)
-   * @return ModelApiResponse
-   */
-  @RequestLine("POST /pet/{petId}/uploadImage")
-  @Headers({
-    "Content-Type: multipart/form-data",
-    "Accept: application/json",
-  })
-  ModelApiResponse uploadFile(@Param("petId") Long petId, @Param("additionalMetadata") String additionalMetadata, @Param("file") File file);
-
-  /**
-   * uploads an image (required)
-   * 
-   * @param petId ID of pet to update (required)
-   * @param requiredFile file to upload (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @return ModelApiResponse
-   */
-  @RequestLine("POST /fake/{petId}/uploadImageWithRequiredFile")
-  @Headers({
-    "Content-Type: multipart/form-data",
-    "Accept: application/json",
-  })
-  ModelApiResponse uploadFileWithRequiredFile(@Param("petId") Long petId, @Param("requiredFile") File requiredFile, @Param("additionalMetadata") String additionalMetadata);
-}
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/StoreApi.java
deleted file mode 100644
index 30757ed5731e..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/StoreApi.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.EncodingUtils;
-
-import org.openapitools.client.model.Order;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import feign.*;
-
-
-public interface StoreApi extends ApiClient.Api {
-
-
-  /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted (required)
-   */
-  @RequestLine("DELETE /store/order/{orderId}")
-  @Headers({
-    "Accept: application/json",
-  })
-  void deleteOrder(@Param("orderId") String orderId);
-
-  /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return Map&lt;String, Integer&gt;
-   */
-  @RequestLine("GET /store/inventory")
-  @Headers({
-    "Accept: application/json",
-  })
-  Map<String, Integer> getInventory();
-
-  /**
-   * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched (required)
-   * @return Order
-   */
-  @RequestLine("GET /store/order/{orderId}")
-  @Headers({
-    "Accept: application/json",
-  })
-  Order getOrderById(@Param("orderId") Long orderId);
-
-  /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet (required)
-   * @return Order
-   */
-  @RequestLine("POST /store/order")
-  @Headers({
-    "Content-Type: */*",
-    "Accept: application/json",
-  })
-  Order placeOrder(Order body);
-}
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/UserApi.java
deleted file mode 100644
index d74a9a2f8090..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/UserApi.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.EncodingUtils;
-
-import org.openapitools.client.model.User;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import feign.*;
-
-
-public interface UserApi extends ApiClient.Api {
-
-
-  /**
-   * Create user
-   * This can only be done by the logged in user.
-   * @param body Created user object (required)
-   */
-  @RequestLine("POST /user")
-  @Headers({
-    "Content-Type: */*",
-    "Accept: application/json",
-  })
-  void createUser(User body);
-
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   */
-  @RequestLine("POST /user/createWithArray")
-  @Headers({
-    "Content-Type: */*",
-    "Accept: application/json",
-  })
-  void createUsersWithArrayInput(List<User> body);
-
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   */
-  @RequestLine("POST /user/createWithList")
-  @Headers({
-    "Content-Type: */*",
-    "Accept: application/json",
-  })
-  void createUsersWithListInput(List<User> body);
-
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted (required)
-   */
-  @RequestLine("DELETE /user/{username}")
-  @Headers({
-    "Accept: application/json",
-  })
-  void deleteUser(@Param("username") String username);
-
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
-   * @return User
-   */
-  @RequestLine("GET /user/{username}")
-  @Headers({
-    "Accept: application/json",
-  })
-  User getUserByName(@Param("username") String username);
-
-  /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login (required)
-   * @param password The password for login in clear text (required)
-   * @return String
-   */
-  @RequestLine("GET /user/login?username={username}&password={password}")
-  @Headers({
-    "Accept: application/json",
-  })
-  String loginUser(@Param("username") String username, @Param("password") String password);
-
-  /**
-   * Logs user into the system
-   * 
-   * Note, this is equivalent to the other <code>loginUser</code> method,
-   * but with the query parameters collected into a single Map parameter. This
-   * is convenient for services with optional query parameters, especially when
-   * used with the {@link LoginUserQueryParams} class that allows for
-   * building up this map in a fluent style.
-   * @param queryParams Map of query parameters as name-value pairs
-   *   <p>The following elements may be specified in the query map:</p>
-   *   <ul>
-   *   <li>username - The user name for login (required)</li>
-   *   <li>password - The password for login in clear text (required)</li>
-   *   </ul>
-   * @return String
-   */
-  @RequestLine("GET /user/login?username={username}&password={password}")
-  @Headers({
-  "Accept: application/json",
-  })
-  String loginUser(@QueryMap(encoded=true) Map<String, Object> queryParams);
-
-  /**
-   * A convenience class for generating query parameters for the
-   * <code>loginUser</code> method in a fluent style.
-   */
-  public static class LoginUserQueryParams extends HashMap<String, Object> {
-    public LoginUserQueryParams username(final String value) {
-      put("username", EncodingUtils.encode(value));
-      return this;
-    }
-    public LoginUserQueryParams password(final String value) {
-      put("password", EncodingUtils.encode(value));
-      return this;
-    }
-  }
-
-  /**
-   * Logs out current logged in user session
-   * 
-   */
-  @RequestLine("GET /user/logout")
-  @Headers({
-    "Accept: application/json",
-  })
-  void logoutUser();
-
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted (required)
-   * @param body Updated user object (required)
-   */
-  @RequestLine("PUT /user/{username}")
-  @Headers({
-    "Content-Type: */*",
-    "Accept: application/json",
-  })
-  void updateUser(@Param("username") String username, User body);
-}
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
deleted file mode 100644
index 0f1223c2bc61..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * AdditionalPropertiesAnyType
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesAnyType name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
-    return Objects.equals(this.name, additionalPropertiesAnyType.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesAnyType {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
deleted file mode 100644
index c03535ab9471..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * AdditionalPropertiesArray
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesArray.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesArray extends HashMap<String, List> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesArray name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
-    return Objects.equals(this.name, additionalPropertiesArray.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesArray {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
deleted file mode 100644
index 4356a4f8c1eb..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * AdditionalPropertiesBoolean
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesBoolean name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
-    return Objects.equals(this.name, additionalPropertiesBoolean.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesBoolean {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
deleted file mode 100644
index 781d4686e981..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * AdditionalPropertiesClass
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_STRING,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_NUMBER,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_INTEGER,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_BOOLEAN,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_INTEGER,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_ANYTYPE,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_STRING,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_ANYTYPE,
-  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE1,
-  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
-  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
-})
-
-public class AdditionalPropertiesClass {
-  public static final String JSON_PROPERTY_MAP_STRING = "map_string";
-  private Map<String, String> mapString = null;
-
-  public static final String JSON_PROPERTY_MAP_NUMBER = "map_number";
-  private Map<String, BigDecimal> mapNumber = null;
-
-  public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer";
-  private Map<String, Integer> mapInteger = null;
-
-  public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean";
-  private Map<String, Boolean> mapBoolean = null;
-
-  public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer";
-  private Map<String, List<Integer>> mapArrayInteger = null;
-
-  public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype";
-  private Map<String, List<Object>> mapArrayAnytype = null;
-
-  public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string";
-  private Map<String, Map<String, String>> mapMapString = null;
-
-  public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype";
-  private Map<String, Map<String, Object>> mapMapAnytype = null;
-
-  public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1";
-  private Object anytype1;
-
-  public static final String JSON_PROPERTY_ANYTYPE2 = "anytype_2";
-  private Object anytype2;
-
-  public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3";
-  private Object anytype3;
-
-
-  public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
-    
-    this.mapString = mapString;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) {
-    if (this.mapString == null) {
-      this.mapString = new HashMap<String, String>();
-    }
-    this.mapString.put(key, mapStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapString
-   * @return mapString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, String> getMapString() {
-    return mapString;
-  }
-
-
-  public void setMapString(Map<String, String> mapString) {
-    this.mapString = mapString;
-  }
-
-
-  public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
-    
-    this.mapNumber = mapNumber;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) {
-    if (this.mapNumber == null) {
-      this.mapNumber = new HashMap<String, BigDecimal>();
-    }
-    this.mapNumber.put(key, mapNumberItem);
-    return this;
-  }
-
-   /**
-   * Get mapNumber
-   * @return mapNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, BigDecimal> getMapNumber() {
-    return mapNumber;
-  }
-
-
-  public void setMapNumber(Map<String, BigDecimal> mapNumber) {
-    this.mapNumber = mapNumber;
-  }
-
-
-  public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
-    
-    this.mapInteger = mapInteger;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) {
-    if (this.mapInteger == null) {
-      this.mapInteger = new HashMap<String, Integer>();
-    }
-    this.mapInteger.put(key, mapIntegerItem);
-    return this;
-  }
-
-   /**
-   * Get mapInteger
-   * @return mapInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Integer> getMapInteger() {
-    return mapInteger;
-  }
-
-
-  public void setMapInteger(Map<String, Integer> mapInteger) {
-    this.mapInteger = mapInteger;
-  }
-
-
-  public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
-    
-    this.mapBoolean = mapBoolean;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) {
-    if (this.mapBoolean == null) {
-      this.mapBoolean = new HashMap<String, Boolean>();
-    }
-    this.mapBoolean.put(key, mapBooleanItem);
-    return this;
-  }
-
-   /**
-   * Get mapBoolean
-   * @return mapBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Boolean> getMapBoolean() {
-    return mapBoolean;
-  }
-
-
-  public void setMapBoolean(Map<String, Boolean> mapBoolean) {
-    this.mapBoolean = mapBoolean;
-  }
-
-
-  public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
-    
-    this.mapArrayInteger = mapArrayInteger;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer> mapArrayIntegerItem) {
-    if (this.mapArrayInteger == null) {
-      this.mapArrayInteger = new HashMap<String, List<Integer>>();
-    }
-    this.mapArrayInteger.put(key, mapArrayIntegerItem);
-    return this;
-  }
-
-   /**
-   * Get mapArrayInteger
-   * @return mapArrayInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, List<Integer>> getMapArrayInteger() {
-    return mapArrayInteger;
-  }
-
-
-  public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
-    this.mapArrayInteger = mapArrayInteger;
-  }
-
-
-  public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
-    
-    this.mapArrayAnytype = mapArrayAnytype;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object> mapArrayAnytypeItem) {
-    if (this.mapArrayAnytype == null) {
-      this.mapArrayAnytype = new HashMap<String, List<Object>>();
-    }
-    this.mapArrayAnytype.put(key, mapArrayAnytypeItem);
-    return this;
-  }
-
-   /**
-   * Get mapArrayAnytype
-   * @return mapArrayAnytype
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, List<Object>> getMapArrayAnytype() {
-    return mapArrayAnytype;
-  }
-
-
-  public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
-    this.mapArrayAnytype = mapArrayAnytype;
-  }
-
-
-  public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> mapMapString) {
-    
-    this.mapMapString = mapMapString;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, String> mapMapStringItem) {
-    if (this.mapMapString == null) {
-      this.mapMapString = new HashMap<String, Map<String, String>>();
-    }
-    this.mapMapString.put(key, mapMapStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapMapString
-   * @return mapMapString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Map<String, String>> getMapMapString() {
-    return mapMapString;
-  }
-
-
-  public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
-    this.mapMapString = mapMapString;
-  }
-
-
-  public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
-    
-    this.mapMapAnytype = mapMapAnytype;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Object> mapMapAnytypeItem) {
-    if (this.mapMapAnytype == null) {
-      this.mapMapAnytype = new HashMap<String, Map<String, Object>>();
-    }
-    this.mapMapAnytype.put(key, mapMapAnytypeItem);
-    return this;
-  }
-
-   /**
-   * Get mapMapAnytype
-   * @return mapMapAnytype
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Map<String, Object>> getMapMapAnytype() {
-    return mapMapAnytype;
-  }
-
-
-  public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
-    this.mapMapAnytype = mapMapAnytype;
-  }
-
-
-  public AdditionalPropertiesClass anytype1(Object anytype1) {
-    
-    this.anytype1 = anytype1;
-    return this;
-  }
-
-   /**
-   * Get anytype1
-   * @return anytype1
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Object getAnytype1() {
-    return anytype1;
-  }
-
-
-  public void setAnytype1(Object anytype1) {
-    this.anytype1 = anytype1;
-  }
-
-
-  public AdditionalPropertiesClass anytype2(Object anytype2) {
-    
-    this.anytype2 = anytype2;
-    return this;
-  }
-
-   /**
-   * Get anytype2
-   * @return anytype2
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ANYTYPE2)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Object getAnytype2() {
-    return anytype2;
-  }
-
-
-  public void setAnytype2(Object anytype2) {
-    this.anytype2 = anytype2;
-  }
-
-
-  public AdditionalPropertiesClass anytype3(Object anytype3) {
-    
-    this.anytype3 = anytype3;
-    return this;
-  }
-
-   /**
-   * Get anytype3
-   * @return anytype3
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ANYTYPE3)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Object getAnytype3() {
-    return anytype3;
-  }
-
-
-  public void setAnytype3(Object anytype3) {
-    this.anytype3 = anytype3;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
-    return Objects.equals(this.mapString, additionalPropertiesClass.mapString) &&
-        Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) &&
-        Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) &&
-        Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) &&
-        Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) &&
-        Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) &&
-        Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) &&
-        Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) &&
-        Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) &&
-        Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) &&
-        Objects.equals(this.anytype3, additionalPropertiesClass.anytype3);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesClass {\n");
-    sb.append("    mapString: ").append(toIndentedString(mapString)).append("\n");
-    sb.append("    mapNumber: ").append(toIndentedString(mapNumber)).append("\n");
-    sb.append("    mapInteger: ").append(toIndentedString(mapInteger)).append("\n");
-    sb.append("    mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n");
-    sb.append("    mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n");
-    sb.append("    mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n");
-    sb.append("    mapMapString: ").append(toIndentedString(mapMapString)).append("\n");
-    sb.append("    mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n");
-    sb.append("    anytype1: ").append(toIndentedString(anytype1)).append("\n");
-    sb.append("    anytype2: ").append(toIndentedString(anytype2)).append("\n");
-    sb.append("    anytype3: ").append(toIndentedString(anytype3)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
deleted file mode 100644
index 2426e7c974c4..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * AdditionalPropertiesInteger
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesInteger.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesInteger name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
-    return Objects.equals(this.name, additionalPropertiesInteger.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesInteger {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
deleted file mode 100644
index da407ccdc473..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * AdditionalPropertiesNumber
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesNumber.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesNumber name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
-    return Objects.equals(this.name, additionalPropertiesNumber.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesNumber {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
deleted file mode 100644
index 5e468870311e..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * AdditionalPropertiesObject
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesObject.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesObject extends HashMap<String, Map> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesObject name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o;
-    return Objects.equals(this.name, additionalPropertiesObject.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesObject {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
deleted file mode 100644
index ed080254966e..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * AdditionalPropertiesString
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesString.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesString extends HashMap<String, String> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesString name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o;
-    return Objects.equals(this.name, additionalPropertiesString.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesString {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
deleted file mode 100644
index 3bcb8a739172..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.BigCat;
-import org.openapitools.client.model.Cat;
-import org.openapitools.client.model.Dog;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Animal
- */
-@JsonPropertyOrder({
-  Animal.JSON_PROPERTY_CLASS_NAME,
-  Animal.JSON_PROPERTY_COLOR
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
-  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
-})
-
-public class Animal {
-  public static final String JSON_PROPERTY_CLASS_NAME = "className";
-  protected String className;
-
-  public static final String JSON_PROPERTY_COLOR = "color";
-  private String color = "red";
-
-
-  public Animal className(String className) {
-    
-    this.className = className;
-    return this;
-  }
-
-   /**
-   * Get className
-   * @return className
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getClassName() {
-    return className;
-  }
-
-
-  public void setClassName(String className) {
-    this.className = className;
-  }
-
-
-  public Animal color(String color) {
-    
-    this.color = color;
-    return this;
-  }
-
-   /**
-   * Get color
-   * @return color
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_COLOR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getColor() {
-    return color;
-  }
-
-
-  public void setColor(String color) {
-    this.color = color;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Animal animal = (Animal) o;
-    return Objects.equals(this.className, animal.className) &&
-        Objects.equals(this.color, animal.color);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(className, color);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Animal {\n");
-    sb.append("    className: ").append(toIndentedString(className)).append("\n");
-    sb.append("    color: ").append(toIndentedString(color)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
deleted file mode 100644
index 96f829bc648b..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ArrayOfArrayOfNumberOnly
- */
-@JsonPropertyOrder({
-  ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
-})
-
-public class ArrayOfArrayOfNumberOnly {
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
-  private List<List<BigDecimal>> arrayArrayNumber = null;
-
-
-  public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
-    
-    this.arrayArrayNumber = arrayArrayNumber;
-    return this;
-  }
-
-  public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
-    if (this.arrayArrayNumber == null) {
-      this.arrayArrayNumber = new ArrayList<List<BigDecimal>>();
-    }
-    this.arrayArrayNumber.add(arrayArrayNumberItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayNumber
-   * @return arrayArrayNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<List<BigDecimal>> getArrayArrayNumber() {
-    return arrayArrayNumber;
-  }
-
-
-  public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
-    this.arrayArrayNumber = arrayArrayNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o;
-    return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayArrayNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayOfArrayOfNumberOnly {\n");
-    sb.append("    arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
deleted file mode 100644
index 37e40dbd3ec8..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ArrayOfNumberOnly
- */
-@JsonPropertyOrder({
-  ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
-})
-
-public class ArrayOfNumberOnly {
-  public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
-  private List<BigDecimal> arrayNumber = null;
-
-
-  public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
-    
-    this.arrayNumber = arrayNumber;
-    return this;
-  }
-
-  public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
-    if (this.arrayNumber == null) {
-      this.arrayNumber = new ArrayList<BigDecimal>();
-    }
-    this.arrayNumber.add(arrayNumberItem);
-    return this;
-  }
-
-   /**
-   * Get arrayNumber
-   * @return arrayNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<BigDecimal> getArrayNumber() {
-    return arrayNumber;
-  }
-
-
-  public void setArrayNumber(List<BigDecimal> arrayNumber) {
-    this.arrayNumber = arrayNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o;
-    return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayOfNumberOnly {\n");
-    sb.append("    arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
deleted file mode 100644
index de7c895ac93a..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.client.model.ReadOnlyFirst;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ArrayTest
- */
-@JsonPropertyOrder({
-  ArrayTest.JSON_PROPERTY_ARRAY_OF_STRING,
-  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
-  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
-})
-
-public class ArrayTest {
-  public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
-  private List<String> arrayOfString = null;
-
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
-  private List<List<Long>> arrayArrayOfInteger = null;
-
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
-  private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
-
-
-  public ArrayTest arrayOfString(List<String> arrayOfString) {
-    
-    this.arrayOfString = arrayOfString;
-    return this;
-  }
-
-  public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
-    if (this.arrayOfString == null) {
-      this.arrayOfString = new ArrayList<String>();
-    }
-    this.arrayOfString.add(arrayOfStringItem);
-    return this;
-  }
-
-   /**
-   * Get arrayOfString
-   * @return arrayOfString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<String> getArrayOfString() {
-    return arrayOfString;
-  }
-
-
-  public void setArrayOfString(List<String> arrayOfString) {
-    this.arrayOfString = arrayOfString;
-  }
-
-
-  public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
-    
-    this.arrayArrayOfInteger = arrayArrayOfInteger;
-    return this;
-  }
-
-  public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
-    if (this.arrayArrayOfInteger == null) {
-      this.arrayArrayOfInteger = new ArrayList<List<Long>>();
-    }
-    this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayOfInteger
-   * @return arrayArrayOfInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<List<Long>> getArrayArrayOfInteger() {
-    return arrayArrayOfInteger;
-  }
-
-
-  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
-    this.arrayArrayOfInteger = arrayArrayOfInteger;
-  }
-
-
-  public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
-    
-    this.arrayArrayOfModel = arrayArrayOfModel;
-    return this;
-  }
-
-  public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
-    if (this.arrayArrayOfModel == null) {
-      this.arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
-    }
-    this.arrayArrayOfModel.add(arrayArrayOfModelItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayOfModel
-   * @return arrayArrayOfModel
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
-    return arrayArrayOfModel;
-  }
-
-
-  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
-    this.arrayArrayOfModel = arrayArrayOfModel;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayTest arrayTest = (ArrayTest) o;
-    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
-        Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
-        Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayTest {\n");
-    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
-    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
-    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/BigCat.java
deleted file mode 100644
index c4386f4e6011..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/BigCat.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.BigCatAllOf;
-import org.openapitools.client.model.Cat;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * BigCat
- */
-@JsonPropertyOrder({
-  BigCat.JSON_PROPERTY_KIND
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-})
-
-public class BigCat extends Cat {
-  /**
-   * Gets or Sets kind
-   */
-  public enum KindEnum {
-    LIONS("lions"),
-    
-    TIGERS("tigers"),
-    
-    LEOPARDS("leopards"),
-    
-    JAGUARS("jaguars");
-
-    private String value;
-
-    KindEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static KindEnum fromValue(String value) {
-      for (KindEnum b : KindEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_KIND = "kind";
-  private KindEnum kind;
-
-
-  public BigCat kind(KindEnum kind) {
-    
-    this.kind = kind;
-    return this;
-  }
-
-   /**
-   * Get kind
-   * @return kind
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_KIND)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public KindEnum getKind() {
-    return kind;
-  }
-
-
-  public void setKind(KindEnum kind) {
-    this.kind = kind;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BigCat bigCat = (BigCat) o;
-    return Objects.equals(this.kind, bigCat.kind) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(kind, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BigCat {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/BigCatAllOf.java
deleted file mode 100644
index 7ce0ddb21f5a..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * BigCatAllOf
- */
-@JsonPropertyOrder({
-  BigCatAllOf.JSON_PROPERTY_KIND
-})
-
-public class BigCatAllOf {
-  /**
-   * Gets or Sets kind
-   */
-  public enum KindEnum {
-    LIONS("lions"),
-    
-    TIGERS("tigers"),
-    
-    LEOPARDS("leopards"),
-    
-    JAGUARS("jaguars");
-
-    private String value;
-
-    KindEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static KindEnum fromValue(String value) {
-      for (KindEnum b : KindEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_KIND = "kind";
-  private KindEnum kind;
-
-
-  public BigCatAllOf kind(KindEnum kind) {
-    
-    this.kind = kind;
-    return this;
-  }
-
-   /**
-   * Get kind
-   * @return kind
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_KIND)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public KindEnum getKind() {
-    return kind;
-  }
-
-
-  public void setKind(KindEnum kind) {
-    this.kind = kind;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BigCatAllOf bigCatAllOf = (BigCatAllOf) o;
-    return Objects.equals(this.kind, bigCatAllOf.kind);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(kind);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BigCatAllOf {\n");
-    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
deleted file mode 100644
index 033e97881105..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Capitalization
- */
-@JsonPropertyOrder({
-  Capitalization.JSON_PROPERTY_SMALL_CAMEL,
-  Capitalization.JSON_PROPERTY_CAPITAL_CAMEL,
-  Capitalization.JSON_PROPERTY_SMALL_SNAKE,
-  Capitalization.JSON_PROPERTY_CAPITAL_SNAKE,
-  Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
-  Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
-})
-
-public class Capitalization {
-  public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
-  private String smallCamel;
-
-  public static final String JSON_PROPERTY_CAPITAL_CAMEL = "CapitalCamel";
-  private String capitalCamel;
-
-  public static final String JSON_PROPERTY_SMALL_SNAKE = "small_Snake";
-  private String smallSnake;
-
-  public static final String JSON_PROPERTY_CAPITAL_SNAKE = "Capital_Snake";
-  private String capitalSnake;
-
-  public static final String JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points";
-  private String scAETHFlowPoints;
-
-  public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME";
-  private String ATT_NAME;
-
-
-  public Capitalization smallCamel(String smallCamel) {
-    
-    this.smallCamel = smallCamel;
-    return this;
-  }
-
-   /**
-   * Get smallCamel
-   * @return smallCamel
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getSmallCamel() {
-    return smallCamel;
-  }
-
-
-  public void setSmallCamel(String smallCamel) {
-    this.smallCamel = smallCamel;
-  }
-
-
-  public Capitalization capitalCamel(String capitalCamel) {
-    
-    this.capitalCamel = capitalCamel;
-    return this;
-  }
-
-   /**
-   * Get capitalCamel
-   * @return capitalCamel
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getCapitalCamel() {
-    return capitalCamel;
-  }
-
-
-  public void setCapitalCamel(String capitalCamel) {
-    this.capitalCamel = capitalCamel;
-  }
-
-
-  public Capitalization smallSnake(String smallSnake) {
-    
-    this.smallSnake = smallSnake;
-    return this;
-  }
-
-   /**
-   * Get smallSnake
-   * @return smallSnake
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getSmallSnake() {
-    return smallSnake;
-  }
-
-
-  public void setSmallSnake(String smallSnake) {
-    this.smallSnake = smallSnake;
-  }
-
-
-  public Capitalization capitalSnake(String capitalSnake) {
-    
-    this.capitalSnake = capitalSnake;
-    return this;
-  }
-
-   /**
-   * Get capitalSnake
-   * @return capitalSnake
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getCapitalSnake() {
-    return capitalSnake;
-  }
-
-
-  public void setCapitalSnake(String capitalSnake) {
-    this.capitalSnake = capitalSnake;
-  }
-
-
-  public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
-    
-    this.scAETHFlowPoints = scAETHFlowPoints;
-    return this;
-  }
-
-   /**
-   * Get scAETHFlowPoints
-   * @return scAETHFlowPoints
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getScAETHFlowPoints() {
-    return scAETHFlowPoints;
-  }
-
-
-  public void setScAETHFlowPoints(String scAETHFlowPoints) {
-    this.scAETHFlowPoints = scAETHFlowPoints;
-  }
-
-
-  public Capitalization ATT_NAME(String ATT_NAME) {
-    
-    this.ATT_NAME = ATT_NAME;
-    return this;
-  }
-
-   /**
-   * Name of the pet 
-   * @return ATT_NAME
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Name of the pet ")
-  @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getATTNAME() {
-    return ATT_NAME;
-  }
-
-
-  public void setATTNAME(String ATT_NAME) {
-    this.ATT_NAME = ATT_NAME;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Capitalization capitalization = (Capitalization) o;
-    return Objects.equals(this.smallCamel, capitalization.smallCamel) &&
-        Objects.equals(this.capitalCamel, capitalization.capitalCamel) &&
-        Objects.equals(this.smallSnake, capitalization.smallSnake) &&
-        Objects.equals(this.capitalSnake, capitalization.capitalSnake) &&
-        Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) &&
-        Objects.equals(this.ATT_NAME, capitalization.ATT_NAME);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Capitalization {\n");
-    sb.append("    smallCamel: ").append(toIndentedString(smallCamel)).append("\n");
-    sb.append("    capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n");
-    sb.append("    smallSnake: ").append(toIndentedString(smallSnake)).append("\n");
-    sb.append("    capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n");
-    sb.append("    scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n");
-    sb.append("    ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
deleted file mode 100644
index 0476bbfbb6d4..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Animal;
-import org.openapitools.client.model.BigCat;
-import org.openapitools.client.model.CatAllOf;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Cat
- */
-@JsonPropertyOrder({
-  Cat.JSON_PROPERTY_DECLAWED
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
-})
-
-public class Cat extends Animal {
-  public static final String JSON_PROPERTY_DECLAWED = "declawed";
-  private Boolean declawed;
-
-
-  public Cat declawed(Boolean declawed) {
-    
-    this.declawed = declawed;
-    return this;
-  }
-
-   /**
-   * Get declawed
-   * @return declawed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DECLAWED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean isDeclawed() {
-    return declawed;
-  }
-
-
-  public void setDeclawed(Boolean declawed) {
-    this.declawed = declawed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Cat cat = (Cat) o;
-    return Objects.equals(this.declawed, cat.declawed) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(declawed, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Cat {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
deleted file mode 100644
index cc04e0e022d3..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * CatAllOf
- */
-@JsonPropertyOrder({
-  CatAllOf.JSON_PROPERTY_DECLAWED
-})
-
-public class CatAllOf {
-  public static final String JSON_PROPERTY_DECLAWED = "declawed";
-  private Boolean declawed;
-
-
-  public CatAllOf declawed(Boolean declawed) {
-    
-    this.declawed = declawed;
-    return this;
-  }
-
-   /**
-   * Get declawed
-   * @return declawed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DECLAWED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean isDeclawed() {
-    return declawed;
-  }
-
-
-  public void setDeclawed(Boolean declawed) {
-    this.declawed = declawed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CatAllOf catAllOf = (CatAllOf) o;
-    return Objects.equals(this.declawed, catAllOf.declawed);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(declawed);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CatAllOf {\n");
-    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
deleted file mode 100644
index 868ba8750742..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Category
- */
-@JsonPropertyOrder({
-  Category.JSON_PROPERTY_ID,
-  Category.JSON_PROPERTY_NAME
-})
-
-public class Category {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name = "default-name";
-
-
-  public Category id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Category name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Category category = (Category) o;
-    return Objects.equals(this.id, category.id) &&
-        Objects.equals(this.name, category.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Category {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
deleted file mode 100644
index 4de7664b26a7..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Model for testing model with \&quot;_class\&quot; property
- */
-@ApiModel(description = "Model for testing model with \"_class\" property")
-@JsonPropertyOrder({
-  ClassModel.JSON_PROPERTY_PROPERTY_CLASS
-})
-
-public class ClassModel {
-  public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
-  private String propertyClass;
-
-
-  public ClassModel propertyClass(String propertyClass) {
-    
-    this.propertyClass = propertyClass;
-    return this;
-  }
-
-   /**
-   * Get propertyClass
-   * @return propertyClass
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPropertyClass() {
-    return propertyClass;
-  }
-
-
-  public void setPropertyClass(String propertyClass) {
-    this.propertyClass = propertyClass;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ClassModel classModel = (ClassModel) o;
-    return Objects.equals(this.propertyClass, classModel.propertyClass);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(propertyClass);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ClassModel {\n");
-    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
deleted file mode 100644
index 02b0aac2247a..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Client
- */
-@JsonPropertyOrder({
-  Client.JSON_PROPERTY_CLIENT
-})
-
-public class Client {
-  public static final String JSON_PROPERTY_CLIENT = "client";
-  private String client;
-
-
-  public Client client(String client) {
-    
-    this.client = client;
-    return this;
-  }
-
-   /**
-   * Get client
-   * @return client
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CLIENT)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getClient() {
-    return client;
-  }
-
-
-  public void setClient(String client) {
-    this.client = client;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Client client = (Client) o;
-    return Objects.equals(this.client, client.client);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(client);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Client {\n");
-    sb.append("    client: ").append(toIndentedString(client)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
deleted file mode 100644
index f56658043689..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Animal;
-import org.openapitools.client.model.DogAllOf;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Dog
- */
-@JsonPropertyOrder({
-  Dog.JSON_PROPERTY_BREED
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-})
-
-public class Dog extends Animal {
-  public static final String JSON_PROPERTY_BREED = "breed";
-  private String breed;
-
-
-  public Dog breed(String breed) {
-    
-    this.breed = breed;
-    return this;
-  }
-
-   /**
-   * Get breed
-   * @return breed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BREED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBreed() {
-    return breed;
-  }
-
-
-  public void setBreed(String breed) {
-    this.breed = breed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Dog dog = (Dog) o;
-    return Objects.equals(this.breed, dog.breed) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(breed, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Dog {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
deleted file mode 100644
index dd42595cf202..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * DogAllOf
- */
-@JsonPropertyOrder({
-  DogAllOf.JSON_PROPERTY_BREED
-})
-
-public class DogAllOf {
-  public static final String JSON_PROPERTY_BREED = "breed";
-  private String breed;
-
-
-  public DogAllOf breed(String breed) {
-    
-    this.breed = breed;
-    return this;
-  }
-
-   /**
-   * Get breed
-   * @return breed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BREED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBreed() {
-    return breed;
-  }
-
-
-  public void setBreed(String breed) {
-    this.breed = breed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    DogAllOf dogAllOf = (DogAllOf) o;
-    return Objects.equals(this.breed, dogAllOf.breed);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(breed);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class DogAllOf {\n");
-    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
deleted file mode 100644
index aff182cd4983..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * EnumArrays
- */
-@JsonPropertyOrder({
-  EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
-  EnumArrays.JSON_PROPERTY_ARRAY_ENUM
-})
-
-public class EnumArrays {
-  /**
-   * Gets or Sets justSymbol
-   */
-  public enum JustSymbolEnum {
-    GREATER_THAN_OR_EQUAL_TO(">="),
-    
-    DOLLAR("$");
-
-    private String value;
-
-    JustSymbolEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static JustSymbolEnum fromValue(String value) {
-      for (JustSymbolEnum b : JustSymbolEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_JUST_SYMBOL = "just_symbol";
-  private JustSymbolEnum justSymbol;
-
-  /**
-   * Gets or Sets arrayEnum
-   */
-  public enum ArrayEnumEnum {
-    FISH("fish"),
-    
-    CRAB("crab");
-
-    private String value;
-
-    ArrayEnumEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static ArrayEnumEnum fromValue(String value) {
-      for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
-  private List<ArrayEnumEnum> arrayEnum = null;
-
-
-  public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
-    
-    this.justSymbol = justSymbol;
-    return this;
-  }
-
-   /**
-   * Get justSymbol
-   * @return justSymbol
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JustSymbolEnum getJustSymbol() {
-    return justSymbol;
-  }
-
-
-  public void setJustSymbol(JustSymbolEnum justSymbol) {
-    this.justSymbol = justSymbol;
-  }
-
-
-  public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
-    
-    this.arrayEnum = arrayEnum;
-    return this;
-  }
-
-  public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
-    if (this.arrayEnum == null) {
-      this.arrayEnum = new ArrayList<ArrayEnumEnum>();
-    }
-    this.arrayEnum.add(arrayEnumItem);
-    return this;
-  }
-
-   /**
-   * Get arrayEnum
-   * @return arrayEnum
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<ArrayEnumEnum> getArrayEnum() {
-    return arrayEnum;
-  }
-
-
-  public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
-    this.arrayEnum = arrayEnum;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EnumArrays enumArrays = (EnumArrays) o;
-    return Objects.equals(this.justSymbol, enumArrays.justSymbol) &&
-        Objects.equals(this.arrayEnum, enumArrays.arrayEnum);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(justSymbol, arrayEnum);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EnumArrays {\n");
-    sb.append("    justSymbol: ").append(toIndentedString(justSymbol)).append("\n");
-    sb.append("    arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
deleted file mode 100644
index 51a1a645a109..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.OuterEnum;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * EnumTest
- */
-@JsonPropertyOrder({
-  EnumTest.JSON_PROPERTY_ENUM_STRING,
-  EnumTest.JSON_PROPERTY_ENUM_STRING_REQUIRED,
-  EnumTest.JSON_PROPERTY_ENUM_INTEGER,
-  EnumTest.JSON_PROPERTY_ENUM_NUMBER,
-  EnumTest.JSON_PROPERTY_OUTER_ENUM
-})
-
-public class EnumTest {
-  /**
-   * Gets or Sets enumString
-   */
-  public enum EnumStringEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower"),
-    
-    EMPTY("");
-
-    private String value;
-
-    EnumStringEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumStringEnum fromValue(String value) {
-      for (EnumStringEnum b : EnumStringEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_STRING = "enum_string";
-  private EnumStringEnum enumString;
-
-  /**
-   * Gets or Sets enumStringRequired
-   */
-  public enum EnumStringRequiredEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower"),
-    
-    EMPTY("");
-
-    private String value;
-
-    EnumStringRequiredEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumStringRequiredEnum fromValue(String value) {
-      for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_STRING_REQUIRED = "enum_string_required";
-  private EnumStringRequiredEnum enumStringRequired;
-
-  /**
-   * Gets or Sets enumInteger
-   */
-  public enum EnumIntegerEnum {
-    NUMBER_1(1),
-    
-    NUMBER_MINUS_1(-1);
-
-    private Integer value;
-
-    EnumIntegerEnum(Integer value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public Integer getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumIntegerEnum fromValue(Integer value) {
-      for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer";
-  private EnumIntegerEnum enumInteger;
-
-  /**
-   * Gets or Sets enumNumber
-   */
-  public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(1.1),
-    
-    NUMBER_MINUS_1_DOT_2(-1.2);
-
-    private Double value;
-
-    EnumNumberEnum(Double value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public Double getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumNumberEnum fromValue(Double value) {
-      for (EnumNumberEnum b : EnumNumberEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_NUMBER = "enum_number";
-  private EnumNumberEnum enumNumber;
-
-  public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum";
-  private OuterEnum outerEnum;
-
-
-  public EnumTest enumString(EnumStringEnum enumString) {
-    
-    this.enumString = enumString;
-    return this;
-  }
-
-   /**
-   * Get enumString
-   * @return enumString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public EnumStringEnum getEnumString() {
-    return enumString;
-  }
-
-
-  public void setEnumString(EnumStringEnum enumString) {
-    this.enumString = enumString;
-  }
-
-
-  public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
-    
-    this.enumStringRequired = enumStringRequired;
-    return this;
-  }
-
-   /**
-   * Get enumStringRequired
-   * @return enumStringRequired
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public EnumStringRequiredEnum getEnumStringRequired() {
-    return enumStringRequired;
-  }
-
-
-  public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
-    this.enumStringRequired = enumStringRequired;
-  }
-
-
-  public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
-    
-    this.enumInteger = enumInteger;
-    return this;
-  }
-
-   /**
-   * Get enumInteger
-   * @return enumInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public EnumIntegerEnum getEnumInteger() {
-    return enumInteger;
-  }
-
-
-  public void setEnumInteger(EnumIntegerEnum enumInteger) {
-    this.enumInteger = enumInteger;
-  }
-
-
-  public EnumTest enumNumber(EnumNumberEnum enumNumber) {
-    
-    this.enumNumber = enumNumber;
-    return this;
-  }
-
-   /**
-   * Get enumNumber
-   * @return enumNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public EnumNumberEnum getEnumNumber() {
-    return enumNumber;
-  }
-
-
-  public void setEnumNumber(EnumNumberEnum enumNumber) {
-    this.enumNumber = enumNumber;
-  }
-
-
-  public EnumTest outerEnum(OuterEnum outerEnum) {
-    
-    this.outerEnum = outerEnum;
-    return this;
-  }
-
-   /**
-   * Get outerEnum
-   * @return outerEnum
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OuterEnum getOuterEnum() {
-    return outerEnum;
-  }
-
-
-  public void setOuterEnum(OuterEnum outerEnum) {
-    this.outerEnum = outerEnum;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EnumTest enumTest = (EnumTest) o;
-    return Objects.equals(this.enumString, enumTest.enumString) &&
-        Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
-        Objects.equals(this.enumInteger, enumTest.enumInteger) &&
-        Objects.equals(this.enumNumber, enumTest.enumNumber) &&
-        Objects.equals(this.outerEnum, enumTest.outerEnum);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EnumTest {\n");
-    sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
-    sb.append("    enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
-    sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
-    sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
-    sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
deleted file mode 100644
index 8166597792d0..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * FileSchemaTestClass
- */
-@JsonPropertyOrder({
-  FileSchemaTestClass.JSON_PROPERTY_FILE,
-  FileSchemaTestClass.JSON_PROPERTY_FILES
-})
-
-public class FileSchemaTestClass {
-  public static final String JSON_PROPERTY_FILE = "file";
-  private java.io.File file;
-
-  public static final String JSON_PROPERTY_FILES = "files";
-  private List<java.io.File> files = null;
-
-
-  public FileSchemaTestClass file(java.io.File file) {
-    
-    this.file = file;
-    return this;
-  }
-
-   /**
-   * Get file
-   * @return file
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FILE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public java.io.File getFile() {
-    return file;
-  }
-
-
-  public void setFile(java.io.File file) {
-    this.file = file;
-  }
-
-
-  public FileSchemaTestClass files(List<java.io.File> files) {
-    
-    this.files = files;
-    return this;
-  }
-
-  public FileSchemaTestClass addFilesItem(java.io.File filesItem) {
-    if (this.files == null) {
-      this.files = new ArrayList<java.io.File>();
-    }
-    this.files.add(filesItem);
-    return this;
-  }
-
-   /**
-   * Get files
-   * @return files
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FILES)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<java.io.File> getFiles() {
-    return files;
-  }
-
-
-  public void setFiles(List<java.io.File> files) {
-    this.files = files;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o;
-    return Objects.equals(this.file, fileSchemaTestClass.file) &&
-        Objects.equals(this.files, fileSchemaTestClass.files);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(file, files);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FileSchemaTestClass {\n");
-    sb.append("    file: ").append(toIndentedString(file)).append("\n");
-    sb.append("    files: ").append(toIndentedString(files)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
deleted file mode 100644
index 4dee7f6c9dcc..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.File;
-import java.math.BigDecimal;
-import java.util.UUID;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * FormatTest
- */
-@JsonPropertyOrder({
-  FormatTest.JSON_PROPERTY_INTEGER,
-  FormatTest.JSON_PROPERTY_INT32,
-  FormatTest.JSON_PROPERTY_INT64,
-  FormatTest.JSON_PROPERTY_NUMBER,
-  FormatTest.JSON_PROPERTY_FLOAT,
-  FormatTest.JSON_PROPERTY_DOUBLE,
-  FormatTest.JSON_PROPERTY_STRING,
-  FormatTest.JSON_PROPERTY_BYTE,
-  FormatTest.JSON_PROPERTY_BINARY,
-  FormatTest.JSON_PROPERTY_DATE,
-  FormatTest.JSON_PROPERTY_DATE_TIME,
-  FormatTest.JSON_PROPERTY_UUID,
-  FormatTest.JSON_PROPERTY_PASSWORD,
-  FormatTest.JSON_PROPERTY_BIG_DECIMAL
-})
-
-public class FormatTest {
-  public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
-
-  public static final String JSON_PROPERTY_INT32 = "int32";
-  private Integer int32;
-
-  public static final String JSON_PROPERTY_INT64 = "int64";
-  private Long int64;
-
-  public static final String JSON_PROPERTY_NUMBER = "number";
-  private BigDecimal number;
-
-  public static final String JSON_PROPERTY_FLOAT = "float";
-  private Float _float;
-
-  public static final String JSON_PROPERTY_DOUBLE = "double";
-  private Double _double;
-
-  public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
-
-  public static final String JSON_PROPERTY_BYTE = "byte";
-  private byte[] _byte;
-
-  public static final String JSON_PROPERTY_BINARY = "binary";
-  private File binary;
-
-  public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
-
-  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
-
-  public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
-
-  public static final String JSON_PROPERTY_PASSWORD = "password";
-  private String password;
-
-  public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
-  private BigDecimal bigDecimal;
-
-
-  public FormatTest integer(Integer integer) {
-    
-    this.integer = integer;
-    return this;
-  }
-
-   /**
-   * Get integer
-   * minimum: 10
-   * maximum: 100
-   * @return integer
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getInteger() {
-    return integer;
-  }
-
-
-  public void setInteger(Integer integer) {
-    this.integer = integer;
-  }
-
-
-  public FormatTest int32(Integer int32) {
-    
-    this.int32 = int32;
-    return this;
-  }
-
-   /**
-   * Get int32
-   * minimum: 20
-   * maximum: 200
-   * @return int32
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INT32)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getInt32() {
-    return int32;
-  }
-
-
-  public void setInt32(Integer int32) {
-    this.int32 = int32;
-  }
-
-
-  public FormatTest int64(Long int64) {
-    
-    this.int64 = int64;
-    return this;
-  }
-
-   /**
-   * Get int64
-   * @return int64
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INT64)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getInt64() {
-    return int64;
-  }
-
-
-  public void setInt64(Long int64) {
-    this.int64 = int64;
-  }
-
-
-  public FormatTest number(BigDecimal number) {
-    
-    this.number = number;
-    return this;
-  }
-
-   /**
-   * Get number
-   * minimum: 32.1
-   * maximum: 543.2
-   * @return number
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public BigDecimal getNumber() {
-    return number;
-  }
-
-
-  public void setNumber(BigDecimal number) {
-    this.number = number;
-  }
-
-
-  public FormatTest _float(Float _float) {
-    
-    this._float = _float;
-    return this;
-  }
-
-   /**
-   * Get _float
-   * minimum: 54.3
-   * maximum: 987.6
-   * @return _float
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FLOAT)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Float getFloat() {
-    return _float;
-  }
-
-
-  public void setFloat(Float _float) {
-    this._float = _float;
-  }
-
-
-  public FormatTest _double(Double _double) {
-    
-    this._double = _double;
-    return this;
-  }
-
-   /**
-   * Get _double
-   * minimum: 67.8
-   * maximum: 123.4
-   * @return _double
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DOUBLE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Double getDouble() {
-    return _double;
-  }
-
-
-  public void setDouble(Double _double) {
-    this._double = _double;
-  }
-
-
-  public FormatTest string(String string) {
-    
-    this.string = string;
-    return this;
-  }
-
-   /**
-   * Get string
-   * @return string
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getString() {
-    return string;
-  }
-
-
-  public void setString(String string) {
-    this.string = string;
-  }
-
-
-  public FormatTest _byte(byte[] _byte) {
-    
-    this._byte = _byte;
-    return this;
-  }
-
-   /**
-   * Get _byte
-   * @return _byte
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_BYTE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public byte[] getByte() {
-    return _byte;
-  }
-
-
-  public void setByte(byte[] _byte) {
-    this._byte = _byte;
-  }
-
-
-  public FormatTest binary(File binary) {
-    
-    this.binary = binary;
-    return this;
-  }
-
-   /**
-   * Get binary
-   * @return binary
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BINARY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public File getBinary() {
-    return binary;
-  }
-
-
-  public void setBinary(File binary) {
-    this.binary = binary;
-  }
-
-
-  public FormatTest date(LocalDate date) {
-    
-    this.date = date;
-    return this;
-  }
-
-   /**
-   * Get date
-   * @return date
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_DATE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public LocalDate getDate() {
-    return date;
-  }
-
-
-  public void setDate(LocalDate date) {
-    this.date = date;
-  }
-
-
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    
-    this.dateTime = dateTime;
-    return this;
-  }
-
-   /**
-   * Get dateTime
-   * @return dateTime
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OffsetDateTime getDateTime() {
-    return dateTime;
-  }
-
-
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
-  }
-
-
-  public FormatTest uuid(UUID uuid) {
-    
-    this.uuid = uuid;
-    return this;
-  }
-
-   /**
-   * Get uuid
-   * @return uuid
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
-  @JsonProperty(JSON_PROPERTY_UUID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public UUID getUuid() {
-    return uuid;
-  }
-
-
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
-  }
-
-
-  public FormatTest password(String password) {
-    
-    this.password = password;
-    return this;
-  }
-
-   /**
-   * Get password
-   * @return password
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_PASSWORD)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getPassword() {
-    return password;
-  }
-
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    
-    this.bigDecimal = bigDecimal;
-    return this;
-  }
-
-   /**
-   * Get bigDecimal
-   * @return bigDecimal
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getBigDecimal() {
-    return bigDecimal;
-  }
-
-
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
-        Objects.equals(this.int32, formatTest.int32) &&
-        Objects.equals(this.int64, formatTest.int64) &&
-        Objects.equals(this.number, formatTest.number) &&
-        Objects.equals(this._float, formatTest._float) &&
-        Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
-        Arrays.equals(this._byte, formatTest._byte) &&
-        Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
-        Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
-    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
-    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
-    sb.append("    number: ").append(toIndentedString(number)).append("\n");
-    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
-    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
-    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
-    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    password: ").append(toIndentedString(password)).append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
deleted file mode 100644
index 0a3f0d464360..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * HasOnlyReadOnly
- */
-@JsonPropertyOrder({
-  HasOnlyReadOnly.JSON_PROPERTY_BAR,
-  HasOnlyReadOnly.JSON_PROPERTY_FOO
-})
-
-public class HasOnlyReadOnly {
-  public static final String JSON_PROPERTY_BAR = "bar";
-  private String bar;
-
-  public static final String JSON_PROPERTY_FOO = "foo";
-  private String foo;
-
-
-   /**
-   * Get bar
-   * @return bar
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBar() {
-    return bar;
-  }
-
-
-
-
-   /**
-   * Get foo
-   * @return foo
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FOO)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getFoo() {
-    return foo;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o;
-    return Objects.equals(this.bar, hasOnlyReadOnly.bar) &&
-        Objects.equals(this.foo, hasOnlyReadOnly.foo);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(bar, foo);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class HasOnlyReadOnly {\n");
-    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
-    sb.append("    foo: ").append(toIndentedString(foo)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
deleted file mode 100644
index 113f92dd9cbe..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * MapTest
- */
-@JsonPropertyOrder({
-  MapTest.JSON_PROPERTY_MAP_MAP_OF_STRING,
-  MapTest.JSON_PROPERTY_MAP_OF_ENUM_STRING,
-  MapTest.JSON_PROPERTY_DIRECT_MAP,
-  MapTest.JSON_PROPERTY_INDIRECT_MAP
-})
-
-public class MapTest {
-  public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
-  private Map<String, Map<String, String>> mapMapOfString = null;
-
-  /**
-   * Gets or Sets inner
-   */
-  public enum InnerEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower");
-
-    private String value;
-
-    InnerEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static InnerEnum fromValue(String value) {
-      for (InnerEnum b : InnerEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string";
-  private Map<String, InnerEnum> mapOfEnumString = null;
-
-  public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map";
-  private Map<String, Boolean> directMap = null;
-
-  public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
-  private Map<String, Boolean> indirectMap = null;
-
-
-  public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
-    
-    this.mapMapOfString = mapMapOfString;
-    return this;
-  }
-
-  public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
-    if (this.mapMapOfString == null) {
-      this.mapMapOfString = new HashMap<String, Map<String, String>>();
-    }
-    this.mapMapOfString.put(key, mapMapOfStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapMapOfString
-   * @return mapMapOfString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Map<String, String>> getMapMapOfString() {
-    return mapMapOfString;
-  }
-
-
-  public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
-    this.mapMapOfString = mapMapOfString;
-  }
-
-
-  public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
-    
-    this.mapOfEnumString = mapOfEnumString;
-    return this;
-  }
-
-  public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
-    if (this.mapOfEnumString == null) {
-      this.mapOfEnumString = new HashMap<String, InnerEnum>();
-    }
-    this.mapOfEnumString.put(key, mapOfEnumStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapOfEnumString
-   * @return mapOfEnumString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, InnerEnum> getMapOfEnumString() {
-    return mapOfEnumString;
-  }
-
-
-  public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
-    this.mapOfEnumString = mapOfEnumString;
-  }
-
-
-  public MapTest directMap(Map<String, Boolean> directMap) {
-    
-    this.directMap = directMap;
-    return this;
-  }
-
-  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
-    if (this.directMap == null) {
-      this.directMap = new HashMap<String, Boolean>();
-    }
-    this.directMap.put(key, directMapItem);
-    return this;
-  }
-
-   /**
-   * Get directMap
-   * @return directMap
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Boolean> getDirectMap() {
-    return directMap;
-  }
-
-
-  public void setDirectMap(Map<String, Boolean> directMap) {
-    this.directMap = directMap;
-  }
-
-
-  public MapTest indirectMap(Map<String, Boolean> indirectMap) {
-    
-    this.indirectMap = indirectMap;
-    return this;
-  }
-
-  public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
-    if (this.indirectMap == null) {
-      this.indirectMap = new HashMap<String, Boolean>();
-    }
-    this.indirectMap.put(key, indirectMapItem);
-    return this;
-  }
-
-   /**
-   * Get indirectMap
-   * @return indirectMap
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Boolean> getIndirectMap() {
-    return indirectMap;
-  }
-
-
-  public void setIndirectMap(Map<String, Boolean> indirectMap) {
-    this.indirectMap = indirectMap;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MapTest mapTest = (MapTest) o;
-    return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
-        Objects.equals(this.directMap, mapTest.directMap) &&
-        Objects.equals(this.indirectMap, mapTest.indirectMap);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MapTest {\n");
-    sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
-    sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
-    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
-    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
deleted file mode 100644
index d483d69700f8..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import org.openapitools.client.model.Animal;
-import org.threeten.bp.OffsetDateTime;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * MixedPropertiesAndAdditionalPropertiesClass
- */
-@JsonPropertyOrder({
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_UUID,
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
-})
-
-public class MixedPropertiesAndAdditionalPropertiesClass {
-  public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
-
-  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
-
-  public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = null;
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    
-    this.uuid = uuid;
-    return this;
-  }
-
-   /**
-   * Get uuid
-   * @return uuid
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_UUID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public UUID getUuid() {
-    return uuid;
-  }
-
-
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
-  }
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    
-    this.dateTime = dateTime;
-    return this;
-  }
-
-   /**
-   * Get dateTime
-   * @return dateTime
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OffsetDateTime getDateTime() {
-    return dateTime;
-  }
-
-
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
-  }
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    
-    this.map = map;
-    return this;
-  }
-
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<String, Animal>();
-    }
-    this.map.put(key, mapItem);
-    return this;
-  }
-
-   /**
-   * Get map
-   * @return map
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Animal> getMap() {
-    return map;
-  }
-
-
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
deleted file mode 100644
index dd99468a0059..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Model for testing model name starting with number
- */
-@ApiModel(description = "Model for testing model name starting with number")
-@JsonPropertyOrder({
-  Model200Response.JSON_PROPERTY_NAME,
-  Model200Response.JSON_PROPERTY_PROPERTY_CLASS
-})
-
-public class Model200Response {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private Integer name;
-
-  public static final String JSON_PROPERTY_PROPERTY_CLASS = "class";
-  private String propertyClass;
-
-
-  public Model200Response name(Integer name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getName() {
-    return name;
-  }
-
-
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-
-  public Model200Response propertyClass(String propertyClass) {
-    
-    this.propertyClass = propertyClass;
-    return this;
-  }
-
-   /**
-   * Get propertyClass
-   * @return propertyClass
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPropertyClass() {
-    return propertyClass;
-  }
-
-
-  public void setPropertyClass(String propertyClass) {
-    this.propertyClass = propertyClass;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Model200Response _200response = (Model200Response) o;
-    return Objects.equals(this.name, _200response.name) &&
-        Objects.equals(this.propertyClass, _200response.propertyClass);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, propertyClass);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Model200Response {\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
deleted file mode 100644
index 383cafdd3a5a..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ModelApiResponse
- */
-@JsonPropertyOrder({
-  ModelApiResponse.JSON_PROPERTY_CODE,
-  ModelApiResponse.JSON_PROPERTY_TYPE,
-  ModelApiResponse.JSON_PROPERTY_MESSAGE
-})
-
-public class ModelApiResponse {
-  public static final String JSON_PROPERTY_CODE = "code";
-  private Integer code;
-
-  public static final String JSON_PROPERTY_TYPE = "type";
-  private String type;
-
-  public static final String JSON_PROPERTY_MESSAGE = "message";
-  private String message;
-
-
-  public ModelApiResponse code(Integer code) {
-    
-    this.code = code;
-    return this;
-  }
-
-   /**
-   * Get code
-   * @return code
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CODE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getCode() {
-    return code;
-  }
-
-
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-
-  public ModelApiResponse type(String type) {
-    
-    this.type = type;
-    return this;
-  }
-
-   /**
-   * Get type
-   * @return type
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_TYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getType() {
-    return type;
-  }
-
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  public ModelApiResponse message(String message) {
-    
-    this.message = message;
-    return this;
-  }
-
-   /**
-   * Get message
-   * @return message
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MESSAGE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getMessage() {
-    return message;
-  }
-
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ModelApiResponse _apiResponse = (ModelApiResponse) o;
-    return Objects.equals(this.code, _apiResponse.code) &&
-        Objects.equals(this.type, _apiResponse.type) &&
-        Objects.equals(this.message, _apiResponse.message);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, type, message);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ModelApiResponse {\n");
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
deleted file mode 100644
index b62e13a90a0c..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Model for testing reserved words
- */
-@ApiModel(description = "Model for testing reserved words")
-@JsonPropertyOrder({
-  ModelReturn.JSON_PROPERTY_RETURN
-})
-
-public class ModelReturn {
-  public static final String JSON_PROPERTY_RETURN = "return";
-  private Integer _return;
-
-
-  public ModelReturn _return(Integer _return) {
-    
-    this._return = _return;
-    return this;
-  }
-
-   /**
-   * Get _return
-   * @return _return
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_RETURN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getReturn() {
-    return _return;
-  }
-
-
-  public void setReturn(Integer _return) {
-    this._return = _return;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ModelReturn _return = (ModelReturn) o;
-    return Objects.equals(this._return, _return._return);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(_return);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ModelReturn {\n");
-    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
deleted file mode 100644
index bd625c5f66f3..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Model for testing model name same as property name
- */
-@ApiModel(description = "Model for testing model name same as property name")
-@JsonPropertyOrder({
-  Name.JSON_PROPERTY_NAME,
-  Name.JSON_PROPERTY_SNAKE_CASE,
-  Name.JSON_PROPERTY_PROPERTY,
-  Name.JSON_PROPERTY_123NUMBER
-})
-
-public class Name {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private Integer name;
-
-  public static final String JSON_PROPERTY_SNAKE_CASE = "snake_case";
-  private Integer snakeCase;
-
-  public static final String JSON_PROPERTY_PROPERTY = "property";
-  private String property;
-
-  public static final String JSON_PROPERTY_123NUMBER = "123Number";
-  private Integer _123number;
-
-
-  public Name name(Integer name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Integer getName() {
-    return name;
-  }
-
-
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-
-   /**
-   * Get snakeCase
-   * @return snakeCase
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getSnakeCase() {
-    return snakeCase;
-  }
-
-
-
-
-  public Name property(String property) {
-    
-    this.property = property;
-    return this;
-  }
-
-   /**
-   * Get property
-   * @return property
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getProperty() {
-    return property;
-  }
-
-
-  public void setProperty(String property) {
-    this.property = property;
-  }
-
-
-   /**
-   * Get _123number
-   * @return _123number
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_123NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer get123number() {
-    return _123number;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Name name = (Name) o;
-    return Objects.equals(this.name, name.name) &&
-        Objects.equals(this.snakeCase, name.snakeCase) &&
-        Objects.equals(this.property, name.property) &&
-        Objects.equals(this._123number, name._123number);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, snakeCase, property, _123number);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Name {\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
-    sb.append("    property: ").append(toIndentedString(property)).append("\n");
-    sb.append("    _123number: ").append(toIndentedString(_123number)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
deleted file mode 100644
index 5ca72a169fe8..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * NumberOnly
- */
-@JsonPropertyOrder({
-  NumberOnly.JSON_PROPERTY_JUST_NUMBER
-})
-
-public class NumberOnly {
-  public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
-  private BigDecimal justNumber;
-
-
-  public NumberOnly justNumber(BigDecimal justNumber) {
-    
-    this.justNumber = justNumber;
-    return this;
-  }
-
-   /**
-   * Get justNumber
-   * @return justNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getJustNumber() {
-    return justNumber;
-  }
-
-
-  public void setJustNumber(BigDecimal justNumber) {
-    this.justNumber = justNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    NumberOnly numberOnly = (NumberOnly) o;
-    return Objects.equals(this.justNumber, numberOnly.justNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(justNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class NumberOnly {\n");
-    sb.append("    justNumber: ").append(toIndentedString(justNumber)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
deleted file mode 100644
index d4f5f1c55bd0..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.threeten.bp.OffsetDateTime;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Order
- */
-@JsonPropertyOrder({
-  Order.JSON_PROPERTY_ID,
-  Order.JSON_PROPERTY_PET_ID,
-  Order.JSON_PROPERTY_QUANTITY,
-  Order.JSON_PROPERTY_SHIP_DATE,
-  Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
-})
-
-public class Order {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_PET_ID = "petId";
-  private Long petId;
-
-  public static final String JSON_PROPERTY_QUANTITY = "quantity";
-  private Integer quantity;
-
-  public static final String JSON_PROPERTY_SHIP_DATE = "shipDate";
-  private OffsetDateTime shipDate;
-
-  /**
-   * Order Status
-   */
-  public enum StatusEnum {
-    PLACED("placed"),
-    
-    APPROVED("approved"),
-    
-    DELIVERED("delivered");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static StatusEnum fromValue(String value) {
-      for (StatusEnum b : StatusEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_STATUS = "status";
-  private StatusEnum status;
-
-  public static final String JSON_PROPERTY_COMPLETE = "complete";
-  private Boolean complete = false;
-
-
-  public Order id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Order petId(Long petId) {
-    
-    this.petId = petId;
-    return this;
-  }
-
-   /**
-   * Get petId
-   * @return petId
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PET_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getPetId() {
-    return petId;
-  }
-
-
-  public void setPetId(Long petId) {
-    this.petId = petId;
-  }
-
-
-  public Order quantity(Integer quantity) {
-    
-    this.quantity = quantity;
-    return this;
-  }
-
-   /**
-   * Get quantity
-   * @return quantity
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_QUANTITY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getQuantity() {
-    return quantity;
-  }
-
-
-  public void setQuantity(Integer quantity) {
-    this.quantity = quantity;
-  }
-
-
-  public Order shipDate(OffsetDateTime shipDate) {
-    
-    this.shipDate = shipDate;
-    return this;
-  }
-
-   /**
-   * Get shipDate
-   * @return shipDate
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SHIP_DATE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OffsetDateTime getShipDate() {
-    return shipDate;
-  }
-
-
-  public void setShipDate(OffsetDateTime shipDate) {
-    this.shipDate = shipDate;
-  }
-
-
-  public Order status(StatusEnum status) {
-    
-    this.status = status;
-    return this;
-  }
-
-   /**
-   * Order Status
-   * @return status
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Order Status")
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public StatusEnum getStatus() {
-    return status;
-  }
-
-
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-
-  public Order complete(Boolean complete) {
-    
-    this.complete = complete;
-    return this;
-  }
-
-   /**
-   * Get complete
-   * @return complete
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_COMPLETE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean isComplete() {
-    return complete;
-  }
-
-
-  public void setComplete(Boolean complete) {
-    this.complete = complete;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Order order = (Order) o;
-    return Objects.equals(this.id, order.id) &&
-        Objects.equals(this.petId, order.petId) &&
-        Objects.equals(this.quantity, order.quantity) &&
-        Objects.equals(this.shipDate, order.shipDate) &&
-        Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Order {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
-    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
-    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
deleted file mode 100644
index 4d73ff2bbd6f..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * OuterComposite
- */
-@JsonPropertyOrder({
-  OuterComposite.JSON_PROPERTY_MY_NUMBER,
-  OuterComposite.JSON_PROPERTY_MY_STRING,
-  OuterComposite.JSON_PROPERTY_MY_BOOLEAN
-})
-
-public class OuterComposite {
-  public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
-  private BigDecimal myNumber;
-
-  public static final String JSON_PROPERTY_MY_STRING = "my_string";
-  private String myString;
-
-  public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean";
-  private Boolean myBoolean;
-
-
-  public OuterComposite myNumber(BigDecimal myNumber) {
-    
-    this.myNumber = myNumber;
-    return this;
-  }
-
-   /**
-   * Get myNumber
-   * @return myNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getMyNumber() {
-    return myNumber;
-  }
-
-
-  public void setMyNumber(BigDecimal myNumber) {
-    this.myNumber = myNumber;
-  }
-
-
-  public OuterComposite myString(String myString) {
-    
-    this.myString = myString;
-    return this;
-  }
-
-   /**
-   * Get myString
-   * @return myString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getMyString() {
-    return myString;
-  }
-
-
-  public void setMyString(String myString) {
-    this.myString = myString;
-  }
-
-
-  public OuterComposite myBoolean(Boolean myBoolean) {
-    
-    this.myBoolean = myBoolean;
-    return this;
-  }
-
-   /**
-   * Get myBoolean
-   * @return myBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean isMyBoolean() {
-    return myBoolean;
-  }
-
-
-  public void setMyBoolean(Boolean myBoolean) {
-    this.myBoolean = myBoolean;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OuterComposite outerComposite = (OuterComposite) o;
-    return Objects.equals(this.myNumber, outerComposite.myNumber) &&
-        Objects.equals(this.myString, outerComposite.myString) &&
-        Objects.equals(this.myBoolean, outerComposite.myBoolean);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(myNumber, myString, myBoolean);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OuterComposite {\n");
-    sb.append("    myNumber: ").append(toIndentedString(myNumber)).append("\n");
-    sb.append("    myString: ").append(toIndentedString(myString)).append("\n");
-    sb.append("    myBoolean: ").append(toIndentedString(myBoolean)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
deleted file mode 100644
index cd98c32b8380..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.openapitools.client.model.Category;
-import org.openapitools.client.model.Tag;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Pet
- */
-@JsonPropertyOrder({
-  Pet.JSON_PROPERTY_ID,
-  Pet.JSON_PROPERTY_CATEGORY,
-  Pet.JSON_PROPERTY_NAME,
-  Pet.JSON_PROPERTY_PHOTO_URLS,
-  Pet.JSON_PROPERTY_TAGS,
-  Pet.JSON_PROPERTY_STATUS
-})
-
-public class Pet {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_CATEGORY = "category";
-  private Category category;
-
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-  public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
-  private Set<String> photoUrls = new LinkedHashSet<String>();
-
-  public static final String JSON_PROPERTY_TAGS = "tags";
-  private List<Tag> tags = null;
-
-  /**
-   * pet status in the store
-   */
-  public enum StatusEnum {
-    AVAILABLE("available"),
-    
-    PENDING("pending"),
-    
-    SOLD("sold");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static StatusEnum fromValue(String value) {
-      for (StatusEnum b : StatusEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_STATUS = "status";
-  private StatusEnum status;
-
-
-  public Pet id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Pet category(Category category) {
-    
-    this.category = category;
-    return this;
-  }
-
-   /**
-   * Get category
-   * @return category
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CATEGORY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Category getCategory() {
-    return category;
-  }
-
-
-  public void setCategory(Category category) {
-    this.category = category;
-  }
-
-
-  public Pet name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @ApiModelProperty(example = "doggie", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  public Pet photoUrls(Set<String> photoUrls) {
-    
-    this.photoUrls = photoUrls;
-    return this;
-  }
-
-  public Pet addPhotoUrlsItem(String photoUrlsItem) {
-    this.photoUrls.add(photoUrlsItem);
-    return this;
-  }
-
-   /**
-   * Get photoUrls
-   * @return photoUrls
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Set<String> getPhotoUrls() {
-    return photoUrls;
-  }
-
-
-  public void setPhotoUrls(Set<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
-
-
-  public Pet tags(List<Tag> tags) {
-    
-    this.tags = tags;
-    return this;
-  }
-
-  public Pet addTagsItem(Tag tagsItem) {
-    if (this.tags == null) {
-      this.tags = new ArrayList<Tag>();
-    }
-    this.tags.add(tagsItem);
-    return this;
-  }
-
-   /**
-   * Get tags
-   * @return tags
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_TAGS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Tag> getTags() {
-    return tags;
-  }
-
-
-  public void setTags(List<Tag> tags) {
-    this.tags = tags;
-  }
-
-
-  public Pet status(StatusEnum status) {
-    
-    this.status = status;
-    return this;
-  }
-
-   /**
-   * pet status in the store
-   * @return status
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "pet status in the store")
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public StatusEnum getStatus() {
-    return status;
-  }
-
-
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Pet pet = (Pet) o;
-    return Objects.equals(this.id, pet.id) &&
-        Objects.equals(this.category, pet.category) &&
-        Objects.equals(this.name, pet.name) &&
-        Objects.equals(this.photoUrls, pet.photoUrls) &&
-        Objects.equals(this.tags, pet.tags) &&
-        Objects.equals(this.status, pet.status);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, category, name, photoUrls, tags, status);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Pet {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
deleted file mode 100644
index b3e58ef3d2c5..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ReadOnlyFirst
- */
-@JsonPropertyOrder({
-  ReadOnlyFirst.JSON_PROPERTY_BAR,
-  ReadOnlyFirst.JSON_PROPERTY_BAZ
-})
-
-public class ReadOnlyFirst {
-  public static final String JSON_PROPERTY_BAR = "bar";
-  private String bar;
-
-  public static final String JSON_PROPERTY_BAZ = "baz";
-  private String baz;
-
-
-   /**
-   * Get bar
-   * @return bar
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBar() {
-    return bar;
-  }
-
-
-
-
-  public ReadOnlyFirst baz(String baz) {
-    
-    this.baz = baz;
-    return this;
-  }
-
-   /**
-   * Get baz
-   * @return baz
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAZ)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBaz() {
-    return baz;
-  }
-
-
-  public void setBaz(String baz) {
-    this.baz = baz;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
-    return Objects.equals(this.bar, readOnlyFirst.bar) &&
-        Objects.equals(this.baz, readOnlyFirst.baz);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(bar, baz);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ReadOnlyFirst {\n");
-    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
-    sb.append("    baz: ").append(toIndentedString(baz)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
deleted file mode 100644
index 35ad3bf46994..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * SpecialModelName
- */
-@JsonPropertyOrder({
-  SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
-})
-
-public class SpecialModelName {
-  public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
-  private Long $specialPropertyName;
-
-
-  public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
-    
-    this.$specialPropertyName = $specialPropertyName;
-    return this;
-  }
-
-   /**
-   * Get $specialPropertyName
-   * @return $specialPropertyName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long get$SpecialPropertyName() {
-    return $specialPropertyName;
-  }
-
-
-  public void set$SpecialPropertyName(Long $specialPropertyName) {
-    this.$specialPropertyName = $specialPropertyName;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SpecialModelName $specialModelName = (SpecialModelName) o;
-    return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash($specialPropertyName);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SpecialModelName {\n");
-    sb.append("    $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
deleted file mode 100644
index a3ecb398faa3..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Tag
- */
-@JsonPropertyOrder({
-  Tag.JSON_PROPERTY_ID,
-  Tag.JSON_PROPERTY_NAME
-})
-
-public class Tag {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public Tag id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Tag name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Tag tag = (Tag) o;
-    return Objects.equals(this.id, tag.id) &&
-        Objects.equals(this.name, tag.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Tag {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
deleted file mode 100644
index e5996f694682..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * TypeHolderDefault
- */
-@JsonPropertyOrder({
-  TypeHolderDefault.JSON_PROPERTY_STRING_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_NUMBER_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_INTEGER_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
-})
-
-public class TypeHolderDefault {
-  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
-  private String stringItem = "what";
-
-  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
-  private BigDecimal numberItem;
-
-  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
-  private Integer integerItem;
-
-  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
-  private Boolean boolItem = true;
-
-  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
-  private List<Integer> arrayItem = new ArrayList<Integer>();
-
-
-  public TypeHolderDefault stringItem(String stringItem) {
-    
-    this.stringItem = stringItem;
-    return this;
-  }
-
-   /**
-   * Get stringItem
-   * @return stringItem
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getStringItem() {
-    return stringItem;
-  }
-
-
-  public void setStringItem(String stringItem) {
-    this.stringItem = stringItem;
-  }
-
-
-  public TypeHolderDefault numberItem(BigDecimal numberItem) {
-    
-    this.numberItem = numberItem;
-    return this;
-  }
-
-   /**
-   * Get numberItem
-   * @return numberItem
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public BigDecimal getNumberItem() {
-    return numberItem;
-  }
-
-
-  public void setNumberItem(BigDecimal numberItem) {
-    this.numberItem = numberItem;
-  }
-
-
-  public TypeHolderDefault integerItem(Integer integerItem) {
-    
-    this.integerItem = integerItem;
-    return this;
-  }
-
-   /**
-   * Get integerItem
-   * @return integerItem
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Integer getIntegerItem() {
-    return integerItem;
-  }
-
-
-  public void setIntegerItem(Integer integerItem) {
-    this.integerItem = integerItem;
-  }
-
-
-  public TypeHolderDefault boolItem(Boolean boolItem) {
-    
-    this.boolItem = boolItem;
-    return this;
-  }
-
-   /**
-   * Get boolItem
-   * @return boolItem
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Boolean isBoolItem() {
-    return boolItem;
-  }
-
-
-  public void setBoolItem(Boolean boolItem) {
-    this.boolItem = boolItem;
-  }
-
-
-  public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
-    
-    this.arrayItem = arrayItem;
-    return this;
-  }
-
-  public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
-    this.arrayItem.add(arrayItemItem);
-    return this;
-  }
-
-   /**
-   * Get arrayItem
-   * @return arrayItem
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public List<Integer> getArrayItem() {
-    return arrayItem;
-  }
-
-
-  public void setArrayItem(List<Integer> arrayItem) {
-    this.arrayItem = arrayItem;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o;
-    return Objects.equals(this.stringItem, typeHolderDefault.stringItem) &&
-        Objects.equals(this.numberItem, typeHolderDefault.numberItem) &&
-        Objects.equals(this.integerItem, typeHolderDefault.integerItem) &&
-        Objects.equals(this.boolItem, typeHolderDefault.boolItem) &&
-        Objects.equals(this.arrayItem, typeHolderDefault.arrayItem);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TypeHolderDefault {\n");
-    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
-    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
-    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
-    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
-    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
deleted file mode 100644
index b7f141913e71..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * TypeHolderExample
- */
-@JsonPropertyOrder({
-  TypeHolderExample.JSON_PROPERTY_STRING_ITEM,
-  TypeHolderExample.JSON_PROPERTY_NUMBER_ITEM,
-  TypeHolderExample.JSON_PROPERTY_FLOAT_ITEM,
-  TypeHolderExample.JSON_PROPERTY_INTEGER_ITEM,
-  TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
-  TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
-})
-
-public class TypeHolderExample {
-  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
-  private String stringItem;
-
-  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
-  private BigDecimal numberItem;
-
-  public static final String JSON_PROPERTY_FLOAT_ITEM = "float_item";
-  private Float floatItem;
-
-  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
-  private Integer integerItem;
-
-  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
-  private Boolean boolItem;
-
-  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
-  private List<Integer> arrayItem = new ArrayList<Integer>();
-
-
-  public TypeHolderExample stringItem(String stringItem) {
-    
-    this.stringItem = stringItem;
-    return this;
-  }
-
-   /**
-   * Get stringItem
-   * @return stringItem
-  **/
-  @ApiModelProperty(example = "what", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getStringItem() {
-    return stringItem;
-  }
-
-
-  public void setStringItem(String stringItem) {
-    this.stringItem = stringItem;
-  }
-
-
-  public TypeHolderExample numberItem(BigDecimal numberItem) {
-    
-    this.numberItem = numberItem;
-    return this;
-  }
-
-   /**
-   * Get numberItem
-   * @return numberItem
-  **/
-  @ApiModelProperty(example = "1.234", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public BigDecimal getNumberItem() {
-    return numberItem;
-  }
-
-
-  public void setNumberItem(BigDecimal numberItem) {
-    this.numberItem = numberItem;
-  }
-
-
-  public TypeHolderExample floatItem(Float floatItem) {
-    
-    this.floatItem = floatItem;
-    return this;
-  }
-
-   /**
-   * Get floatItem
-   * @return floatItem
-  **/
-  @ApiModelProperty(example = "1.234", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Float getFloatItem() {
-    return floatItem;
-  }
-
-
-  public void setFloatItem(Float floatItem) {
-    this.floatItem = floatItem;
-  }
-
-
-  public TypeHolderExample integerItem(Integer integerItem) {
-    
-    this.integerItem = integerItem;
-    return this;
-  }
-
-   /**
-   * Get integerItem
-   * @return integerItem
-  **/
-  @ApiModelProperty(example = "-2", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Integer getIntegerItem() {
-    return integerItem;
-  }
-
-
-  public void setIntegerItem(Integer integerItem) {
-    this.integerItem = integerItem;
-  }
-
-
-  public TypeHolderExample boolItem(Boolean boolItem) {
-    
-    this.boolItem = boolItem;
-    return this;
-  }
-
-   /**
-   * Get boolItem
-   * @return boolItem
-  **/
-  @ApiModelProperty(example = "true", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Boolean isBoolItem() {
-    return boolItem;
-  }
-
-
-  public void setBoolItem(Boolean boolItem) {
-    this.boolItem = boolItem;
-  }
-
-
-  public TypeHolderExample arrayItem(List<Integer> arrayItem) {
-    
-    this.arrayItem = arrayItem;
-    return this;
-  }
-
-  public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
-    this.arrayItem.add(arrayItemItem);
-    return this;
-  }
-
-   /**
-   * Get arrayItem
-   * @return arrayItem
-  **/
-  @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public List<Integer> getArrayItem() {
-    return arrayItem;
-  }
-
-
-  public void setArrayItem(List<Integer> arrayItem) {
-    this.arrayItem = arrayItem;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TypeHolderExample typeHolderExample = (TypeHolderExample) o;
-    return Objects.equals(this.stringItem, typeHolderExample.stringItem) &&
-        Objects.equals(this.numberItem, typeHolderExample.numberItem) &&
-        Objects.equals(this.floatItem, typeHolderExample.floatItem) &&
-        Objects.equals(this.integerItem, typeHolderExample.integerItem) &&
-        Objects.equals(this.boolItem, typeHolderExample.boolItem) &&
-        Objects.equals(this.arrayItem, typeHolderExample.arrayItem);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TypeHolderExample {\n");
-    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
-    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
-    sb.append("    floatItem: ").append(toIndentedString(floatItem)).append("\n");
-    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
-    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
-    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
deleted file mode 100644
index b7e74643dab2..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * User
- */
-@JsonPropertyOrder({
-  User.JSON_PROPERTY_ID,
-  User.JSON_PROPERTY_USERNAME,
-  User.JSON_PROPERTY_FIRST_NAME,
-  User.JSON_PROPERTY_LAST_NAME,
-  User.JSON_PROPERTY_EMAIL,
-  User.JSON_PROPERTY_PASSWORD,
-  User.JSON_PROPERTY_PHONE,
-  User.JSON_PROPERTY_USER_STATUS
-})
-
-public class User {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_USERNAME = "username";
-  private String username;
-
-  public static final String JSON_PROPERTY_FIRST_NAME = "firstName";
-  private String firstName;
-
-  public static final String JSON_PROPERTY_LAST_NAME = "lastName";
-  private String lastName;
-
-  public static final String JSON_PROPERTY_EMAIL = "email";
-  private String email;
-
-  public static final String JSON_PROPERTY_PASSWORD = "password";
-  private String password;
-
-  public static final String JSON_PROPERTY_PHONE = "phone";
-  private String phone;
-
-  public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
-  private Integer userStatus;
-
-
-  public User id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public User username(String username) {
-    
-    this.username = username;
-    return this;
-  }
-
-   /**
-   * Get username
-   * @return username
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_USERNAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getUsername() {
-    return username;
-  }
-
-
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-
-  public User firstName(String firstName) {
-    
-    this.firstName = firstName;
-    return this;
-  }
-
-   /**
-   * Get firstName
-   * @return firstName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FIRST_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getFirstName() {
-    return firstName;
-  }
-
-
-  public void setFirstName(String firstName) {
-    this.firstName = firstName;
-  }
-
-
-  public User lastName(String lastName) {
-    
-    this.lastName = lastName;
-    return this;
-  }
-
-   /**
-   * Get lastName
-   * @return lastName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_LAST_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getLastName() {
-    return lastName;
-  }
-
-
-  public void setLastName(String lastName) {
-    this.lastName = lastName;
-  }
-
-
-  public User email(String email) {
-    
-    this.email = email;
-    return this;
-  }
-
-   /**
-   * Get email
-   * @return email
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_EMAIL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getEmail() {
-    return email;
-  }
-
-
-  public void setEmail(String email) {
-    this.email = email;
-  }
-
-
-  public User password(String password) {
-    
-    this.password = password;
-    return this;
-  }
-
-   /**
-   * Get password
-   * @return password
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PASSWORD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPassword() {
-    return password;
-  }
-
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-
-  public User phone(String phone) {
-    
-    this.phone = phone;
-    return this;
-  }
-
-   /**
-   * Get phone
-   * @return phone
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PHONE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPhone() {
-    return phone;
-  }
-
-
-  public void setPhone(String phone) {
-    this.phone = phone;
-  }
-
-
-  public User userStatus(Integer userStatus) {
-    
-    this.userStatus = userStatus;
-    return this;
-  }
-
-   /**
-   * User Status
-   * @return userStatus
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "User Status")
-  @JsonProperty(JSON_PROPERTY_USER_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getUserStatus() {
-    return userStatus;
-  }
-
-
-  public void setUserStatus(Integer userStatus) {
-    this.userStatus = userStatus;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    User user = (User) o;
-    return Objects.equals(this.id, user.id) &&
-        Objects.equals(this.username, user.username) &&
-        Objects.equals(this.firstName, user.firstName) &&
-        Objects.equals(this.lastName, user.lastName) &&
-        Objects.equals(this.email, user.email) &&
-        Objects.equals(this.password, user.password) &&
-        Objects.equals(this.phone, user.phone) &&
-        Objects.equals(this.userStatus, user.userStatus);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class User {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    username: ").append(toIndentedString(username)).append("\n");
-    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
-    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
-    sb.append("    email: ").append(toIndentedString(email)).append("\n");
-    sb.append("    password: ").append(toIndentedString(password)).append("\n");
-    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
-    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
deleted file mode 100644
index 65e7c295192b..000000000000
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
+++ /dev/null
@@ -1,1045 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * XmlItem
- */
-@JsonPropertyOrder({
-  XmlItem.JSON_PROPERTY_ATTRIBUTE_STRING,
-  XmlItem.JSON_PROPERTY_ATTRIBUTE_NUMBER,
-  XmlItem.JSON_PROPERTY_ATTRIBUTE_INTEGER,
-  XmlItem.JSON_PROPERTY_ATTRIBUTE_BOOLEAN,
-  XmlItem.JSON_PROPERTY_WRAPPED_ARRAY,
-  XmlItem.JSON_PROPERTY_NAME_STRING,
-  XmlItem.JSON_PROPERTY_NAME_NUMBER,
-  XmlItem.JSON_PROPERTY_NAME_INTEGER,
-  XmlItem.JSON_PROPERTY_NAME_BOOLEAN,
-  XmlItem.JSON_PROPERTY_NAME_ARRAY,
-  XmlItem.JSON_PROPERTY_NAME_WRAPPED_ARRAY,
-  XmlItem.JSON_PROPERTY_PREFIX_STRING,
-  XmlItem.JSON_PROPERTY_PREFIX_NUMBER,
-  XmlItem.JSON_PROPERTY_PREFIX_INTEGER,
-  XmlItem.JSON_PROPERTY_PREFIX_BOOLEAN,
-  XmlItem.JSON_PROPERTY_PREFIX_ARRAY,
-  XmlItem.JSON_PROPERTY_PREFIX_WRAPPED_ARRAY,
-  XmlItem.JSON_PROPERTY_NAMESPACE_STRING,
-  XmlItem.JSON_PROPERTY_NAMESPACE_NUMBER,
-  XmlItem.JSON_PROPERTY_NAMESPACE_INTEGER,
-  XmlItem.JSON_PROPERTY_NAMESPACE_BOOLEAN,
-  XmlItem.JSON_PROPERTY_NAMESPACE_ARRAY,
-  XmlItem.JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_STRING,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_NUMBER,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_INTEGER,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_BOOLEAN,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
-})
-
-public class XmlItem {
-  public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
-  private String attributeString;
-
-  public static final String JSON_PROPERTY_ATTRIBUTE_NUMBER = "attribute_number";
-  private BigDecimal attributeNumber;
-
-  public static final String JSON_PROPERTY_ATTRIBUTE_INTEGER = "attribute_integer";
-  private Integer attributeInteger;
-
-  public static final String JSON_PROPERTY_ATTRIBUTE_BOOLEAN = "attribute_boolean";
-  private Boolean attributeBoolean;
-
-  public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array";
-  private List<Integer> wrappedArray = null;
-
-  public static final String JSON_PROPERTY_NAME_STRING = "name_string";
-  private String nameString;
-
-  public static final String JSON_PROPERTY_NAME_NUMBER = "name_number";
-  private BigDecimal nameNumber;
-
-  public static final String JSON_PROPERTY_NAME_INTEGER = "name_integer";
-  private Integer nameInteger;
-
-  public static final String JSON_PROPERTY_NAME_BOOLEAN = "name_boolean";
-  private Boolean nameBoolean;
-
-  public static final String JSON_PROPERTY_NAME_ARRAY = "name_array";
-  private List<Integer> nameArray = null;
-
-  public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array";
-  private List<Integer> nameWrappedArray = null;
-
-  public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string";
-  private String prefixString;
-
-  public static final String JSON_PROPERTY_PREFIX_NUMBER = "prefix_number";
-  private BigDecimal prefixNumber;
-
-  public static final String JSON_PROPERTY_PREFIX_INTEGER = "prefix_integer";
-  private Integer prefixInteger;
-
-  public static final String JSON_PROPERTY_PREFIX_BOOLEAN = "prefix_boolean";
-  private Boolean prefixBoolean;
-
-  public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array";
-  private List<Integer> prefixArray = null;
-
-  public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array";
-  private List<Integer> prefixWrappedArray = null;
-
-  public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string";
-  private String namespaceString;
-
-  public static final String JSON_PROPERTY_NAMESPACE_NUMBER = "namespace_number";
-  private BigDecimal namespaceNumber;
-
-  public static final String JSON_PROPERTY_NAMESPACE_INTEGER = "namespace_integer";
-  private Integer namespaceInteger;
-
-  public static final String JSON_PROPERTY_NAMESPACE_BOOLEAN = "namespace_boolean";
-  private Boolean namespaceBoolean;
-
-  public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array";
-  private List<Integer> namespaceArray = null;
-
-  public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array";
-  private List<Integer> namespaceWrappedArray = null;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string";
-  private String prefixNsString;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_NUMBER = "prefix_ns_number";
-  private BigDecimal prefixNsNumber;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_INTEGER = "prefix_ns_integer";
-  private Integer prefixNsInteger;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_BOOLEAN = "prefix_ns_boolean";
-  private Boolean prefixNsBoolean;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array";
-  private List<Integer> prefixNsArray = null;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
-  private List<Integer> prefixNsWrappedArray = null;
-
-
-  public XmlItem attributeString(String attributeString) {
-    
-    this.attributeString = attributeString;
-    return this;
-  }
-
-   /**
-   * Get attributeString
-   * @return attributeString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getAttributeString() {
-    return attributeString;
-  }
-
-
-  public void setAttributeString(String attributeString) {
-    this.attributeString = attributeString;
-  }
-
-
-  public XmlItem attributeNumber(BigDecimal attributeNumber) {
-    
-    this.attributeNumber = attributeNumber;
-    return this;
-  }
-
-   /**
-   * Get attributeNumber
-   * @return attributeNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getAttributeNumber() {
-    return attributeNumber;
-  }
-
-
-  public void setAttributeNumber(BigDecimal attributeNumber) {
-    this.attributeNumber = attributeNumber;
-  }
-
-
-  public XmlItem attributeInteger(Integer attributeInteger) {
-    
-    this.attributeInteger = attributeInteger;
-    return this;
-  }
-
-   /**
-   * Get attributeInteger
-   * @return attributeInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getAttributeInteger() {
-    return attributeInteger;
-  }
-
-
-  public void setAttributeInteger(Integer attributeInteger) {
-    this.attributeInteger = attributeInteger;
-  }
-
-
-  public XmlItem attributeBoolean(Boolean attributeBoolean) {
-    
-    this.attributeBoolean = attributeBoolean;
-    return this;
-  }
-
-   /**
-   * Get attributeBoolean
-   * @return attributeBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean isAttributeBoolean() {
-    return attributeBoolean;
-  }
-
-
-  public void setAttributeBoolean(Boolean attributeBoolean) {
-    this.attributeBoolean = attributeBoolean;
-  }
-
-
-  public XmlItem wrappedArray(List<Integer> wrappedArray) {
-    
-    this.wrappedArray = wrappedArray;
-    return this;
-  }
-
-  public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
-    if (this.wrappedArray == null) {
-      this.wrappedArray = new ArrayList<Integer>();
-    }
-    this.wrappedArray.add(wrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get wrappedArray
-   * @return wrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getWrappedArray() {
-    return wrappedArray;
-  }
-
-
-  public void setWrappedArray(List<Integer> wrappedArray) {
-    this.wrappedArray = wrappedArray;
-  }
-
-
-  public XmlItem nameString(String nameString) {
-    
-    this.nameString = nameString;
-    return this;
-  }
-
-   /**
-   * Get nameString
-   * @return nameString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getNameString() {
-    return nameString;
-  }
-
-
-  public void setNameString(String nameString) {
-    this.nameString = nameString;
-  }
-
-
-  public XmlItem nameNumber(BigDecimal nameNumber) {
-    
-    this.nameNumber = nameNumber;
-    return this;
-  }
-
-   /**
-   * Get nameNumber
-   * @return nameNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getNameNumber() {
-    return nameNumber;
-  }
-
-
-  public void setNameNumber(BigDecimal nameNumber) {
-    this.nameNumber = nameNumber;
-  }
-
-
-  public XmlItem nameInteger(Integer nameInteger) {
-    
-    this.nameInteger = nameInteger;
-    return this;
-  }
-
-   /**
-   * Get nameInteger
-   * @return nameInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getNameInteger() {
-    return nameInteger;
-  }
-
-
-  public void setNameInteger(Integer nameInteger) {
-    this.nameInteger = nameInteger;
-  }
-
-
-  public XmlItem nameBoolean(Boolean nameBoolean) {
-    
-    this.nameBoolean = nameBoolean;
-    return this;
-  }
-
-   /**
-   * Get nameBoolean
-   * @return nameBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean isNameBoolean() {
-    return nameBoolean;
-  }
-
-
-  public void setNameBoolean(Boolean nameBoolean) {
-    this.nameBoolean = nameBoolean;
-  }
-
-
-  public XmlItem nameArray(List<Integer> nameArray) {
-    
-    this.nameArray = nameArray;
-    return this;
-  }
-
-  public XmlItem addNameArrayItem(Integer nameArrayItem) {
-    if (this.nameArray == null) {
-      this.nameArray = new ArrayList<Integer>();
-    }
-    this.nameArray.add(nameArrayItem);
-    return this;
-  }
-
-   /**
-   * Get nameArray
-   * @return nameArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getNameArray() {
-    return nameArray;
-  }
-
-
-  public void setNameArray(List<Integer> nameArray) {
-    this.nameArray = nameArray;
-  }
-
-
-  public XmlItem nameWrappedArray(List<Integer> nameWrappedArray) {
-    
-    this.nameWrappedArray = nameWrappedArray;
-    return this;
-  }
-
-  public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
-    if (this.nameWrappedArray == null) {
-      this.nameWrappedArray = new ArrayList<Integer>();
-    }
-    this.nameWrappedArray.add(nameWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get nameWrappedArray
-   * @return nameWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getNameWrappedArray() {
-    return nameWrappedArray;
-  }
-
-
-  public void setNameWrappedArray(List<Integer> nameWrappedArray) {
-    this.nameWrappedArray = nameWrappedArray;
-  }
-
-
-  public XmlItem prefixString(String prefixString) {
-    
-    this.prefixString = prefixString;
-    return this;
-  }
-
-   /**
-   * Get prefixString
-   * @return prefixString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPrefixString() {
-    return prefixString;
-  }
-
-
-  public void setPrefixString(String prefixString) {
-    this.prefixString = prefixString;
-  }
-
-
-  public XmlItem prefixNumber(BigDecimal prefixNumber) {
-    
-    this.prefixNumber = prefixNumber;
-    return this;
-  }
-
-   /**
-   * Get prefixNumber
-   * @return prefixNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getPrefixNumber() {
-    return prefixNumber;
-  }
-
-
-  public void setPrefixNumber(BigDecimal prefixNumber) {
-    this.prefixNumber = prefixNumber;
-  }
-
-
-  public XmlItem prefixInteger(Integer prefixInteger) {
-    
-    this.prefixInteger = prefixInteger;
-    return this;
-  }
-
-   /**
-   * Get prefixInteger
-   * @return prefixInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getPrefixInteger() {
-    return prefixInteger;
-  }
-
-
-  public void setPrefixInteger(Integer prefixInteger) {
-    this.prefixInteger = prefixInteger;
-  }
-
-
-  public XmlItem prefixBoolean(Boolean prefixBoolean) {
-    
-    this.prefixBoolean = prefixBoolean;
-    return this;
-  }
-
-   /**
-   * Get prefixBoolean
-   * @return prefixBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean isPrefixBoolean() {
-    return prefixBoolean;
-  }
-
-
-  public void setPrefixBoolean(Boolean prefixBoolean) {
-    this.prefixBoolean = prefixBoolean;
-  }
-
-
-  public XmlItem prefixArray(List<Integer> prefixArray) {
-    
-    this.prefixArray = prefixArray;
-    return this;
-  }
-
-  public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
-    if (this.prefixArray == null) {
-      this.prefixArray = new ArrayList<Integer>();
-    }
-    this.prefixArray.add(prefixArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixArray
-   * @return prefixArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getPrefixArray() {
-    return prefixArray;
-  }
-
-
-  public void setPrefixArray(List<Integer> prefixArray) {
-    this.prefixArray = prefixArray;
-  }
-
-
-  public XmlItem prefixWrappedArray(List<Integer> prefixWrappedArray) {
-    
-    this.prefixWrappedArray = prefixWrappedArray;
-    return this;
-  }
-
-  public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
-    if (this.prefixWrappedArray == null) {
-      this.prefixWrappedArray = new ArrayList<Integer>();
-    }
-    this.prefixWrappedArray.add(prefixWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixWrappedArray
-   * @return prefixWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getPrefixWrappedArray() {
-    return prefixWrappedArray;
-  }
-
-
-  public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
-    this.prefixWrappedArray = prefixWrappedArray;
-  }
-
-
-  public XmlItem namespaceString(String namespaceString) {
-    
-    this.namespaceString = namespaceString;
-    return this;
-  }
-
-   /**
-   * Get namespaceString
-   * @return namespaceString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getNamespaceString() {
-    return namespaceString;
-  }
-
-
-  public void setNamespaceString(String namespaceString) {
-    this.namespaceString = namespaceString;
-  }
-
-
-  public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
-    
-    this.namespaceNumber = namespaceNumber;
-    return this;
-  }
-
-   /**
-   * Get namespaceNumber
-   * @return namespaceNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getNamespaceNumber() {
-    return namespaceNumber;
-  }
-
-
-  public void setNamespaceNumber(BigDecimal namespaceNumber) {
-    this.namespaceNumber = namespaceNumber;
-  }
-
-
-  public XmlItem namespaceInteger(Integer namespaceInteger) {
-    
-    this.namespaceInteger = namespaceInteger;
-    return this;
-  }
-
-   /**
-   * Get namespaceInteger
-   * @return namespaceInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getNamespaceInteger() {
-    return namespaceInteger;
-  }
-
-
-  public void setNamespaceInteger(Integer namespaceInteger) {
-    this.namespaceInteger = namespaceInteger;
-  }
-
-
-  public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
-    
-    this.namespaceBoolean = namespaceBoolean;
-    return this;
-  }
-
-   /**
-   * Get namespaceBoolean
-   * @return namespaceBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean isNamespaceBoolean() {
-    return namespaceBoolean;
-  }
-
-
-  public void setNamespaceBoolean(Boolean namespaceBoolean) {
-    this.namespaceBoolean = namespaceBoolean;
-  }
-
-
-  public XmlItem namespaceArray(List<Integer> namespaceArray) {
-    
-    this.namespaceArray = namespaceArray;
-    return this;
-  }
-
-  public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
-    if (this.namespaceArray == null) {
-      this.namespaceArray = new ArrayList<Integer>();
-    }
-    this.namespaceArray.add(namespaceArrayItem);
-    return this;
-  }
-
-   /**
-   * Get namespaceArray
-   * @return namespaceArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getNamespaceArray() {
-    return namespaceArray;
-  }
-
-
-  public void setNamespaceArray(List<Integer> namespaceArray) {
-    this.namespaceArray = namespaceArray;
-  }
-
-
-  public XmlItem namespaceWrappedArray(List<Integer> namespaceWrappedArray) {
-    
-    this.namespaceWrappedArray = namespaceWrappedArray;
-    return this;
-  }
-
-  public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
-    if (this.namespaceWrappedArray == null) {
-      this.namespaceWrappedArray = new ArrayList<Integer>();
-    }
-    this.namespaceWrappedArray.add(namespaceWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get namespaceWrappedArray
-   * @return namespaceWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getNamespaceWrappedArray() {
-    return namespaceWrappedArray;
-  }
-
-
-  public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
-    this.namespaceWrappedArray = namespaceWrappedArray;
-  }
-
-
-  public XmlItem prefixNsString(String prefixNsString) {
-    
-    this.prefixNsString = prefixNsString;
-    return this;
-  }
-
-   /**
-   * Get prefixNsString
-   * @return prefixNsString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPrefixNsString() {
-    return prefixNsString;
-  }
-
-
-  public void setPrefixNsString(String prefixNsString) {
-    this.prefixNsString = prefixNsString;
-  }
-
-
-  public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
-    
-    this.prefixNsNumber = prefixNsNumber;
-    return this;
-  }
-
-   /**
-   * Get prefixNsNumber
-   * @return prefixNsNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getPrefixNsNumber() {
-    return prefixNsNumber;
-  }
-
-
-  public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
-    this.prefixNsNumber = prefixNsNumber;
-  }
-
-
-  public XmlItem prefixNsInteger(Integer prefixNsInteger) {
-    
-    this.prefixNsInteger = prefixNsInteger;
-    return this;
-  }
-
-   /**
-   * Get prefixNsInteger
-   * @return prefixNsInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getPrefixNsInteger() {
-    return prefixNsInteger;
-  }
-
-
-  public void setPrefixNsInteger(Integer prefixNsInteger) {
-    this.prefixNsInteger = prefixNsInteger;
-  }
-
-
-  public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
-    
-    this.prefixNsBoolean = prefixNsBoolean;
-    return this;
-  }
-
-   /**
-   * Get prefixNsBoolean
-   * @return prefixNsBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean isPrefixNsBoolean() {
-    return prefixNsBoolean;
-  }
-
-
-  public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
-    this.prefixNsBoolean = prefixNsBoolean;
-  }
-
-
-  public XmlItem prefixNsArray(List<Integer> prefixNsArray) {
-    
-    this.prefixNsArray = prefixNsArray;
-    return this;
-  }
-
-  public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
-    if (this.prefixNsArray == null) {
-      this.prefixNsArray = new ArrayList<Integer>();
-    }
-    this.prefixNsArray.add(prefixNsArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixNsArray
-   * @return prefixNsArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getPrefixNsArray() {
-    return prefixNsArray;
-  }
-
-
-  public void setPrefixNsArray(List<Integer> prefixNsArray) {
-    this.prefixNsArray = prefixNsArray;
-  }
-
-
-  public XmlItem prefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
-    
-    this.prefixNsWrappedArray = prefixNsWrappedArray;
-    return this;
-  }
-
-  public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
-    if (this.prefixNsWrappedArray == null) {
-      this.prefixNsWrappedArray = new ArrayList<Integer>();
-    }
-    this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixNsWrappedArray
-   * @return prefixNsWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getPrefixNsWrappedArray() {
-    return prefixNsWrappedArray;
-  }
-
-
-  public void setPrefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
-    this.prefixNsWrappedArray = prefixNsWrappedArray;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    XmlItem xmlItem = (XmlItem) o;
-    return Objects.equals(this.attributeString, xmlItem.attributeString) &&
-        Objects.equals(this.attributeNumber, xmlItem.attributeNumber) &&
-        Objects.equals(this.attributeInteger, xmlItem.attributeInteger) &&
-        Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) &&
-        Objects.equals(this.wrappedArray, xmlItem.wrappedArray) &&
-        Objects.equals(this.nameString, xmlItem.nameString) &&
-        Objects.equals(this.nameNumber, xmlItem.nameNumber) &&
-        Objects.equals(this.nameInteger, xmlItem.nameInteger) &&
-        Objects.equals(this.nameBoolean, xmlItem.nameBoolean) &&
-        Objects.equals(this.nameArray, xmlItem.nameArray) &&
-        Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) &&
-        Objects.equals(this.prefixString, xmlItem.prefixString) &&
-        Objects.equals(this.prefixNumber, xmlItem.prefixNumber) &&
-        Objects.equals(this.prefixInteger, xmlItem.prefixInteger) &&
-        Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) &&
-        Objects.equals(this.prefixArray, xmlItem.prefixArray) &&
-        Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) &&
-        Objects.equals(this.namespaceString, xmlItem.namespaceString) &&
-        Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) &&
-        Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) &&
-        Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) &&
-        Objects.equals(this.namespaceArray, xmlItem.namespaceArray) &&
-        Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) &&
-        Objects.equals(this.prefixNsString, xmlItem.prefixNsString) &&
-        Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) &&
-        Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) &&
-        Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) &&
-        Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) &&
-        Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class XmlItem {\n");
-    sb.append("    attributeString: ").append(toIndentedString(attributeString)).append("\n");
-    sb.append("    attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n");
-    sb.append("    attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n");
-    sb.append("    attributeBoolean: ").append(toIndentedString(attributeBoolean)).append("\n");
-    sb.append("    wrappedArray: ").append(toIndentedString(wrappedArray)).append("\n");
-    sb.append("    nameString: ").append(toIndentedString(nameString)).append("\n");
-    sb.append("    nameNumber: ").append(toIndentedString(nameNumber)).append("\n");
-    sb.append("    nameInteger: ").append(toIndentedString(nameInteger)).append("\n");
-    sb.append("    nameBoolean: ").append(toIndentedString(nameBoolean)).append("\n");
-    sb.append("    nameArray: ").append(toIndentedString(nameArray)).append("\n");
-    sb.append("    nameWrappedArray: ").append(toIndentedString(nameWrappedArray)).append("\n");
-    sb.append("    prefixString: ").append(toIndentedString(prefixString)).append("\n");
-    sb.append("    prefixNumber: ").append(toIndentedString(prefixNumber)).append("\n");
-    sb.append("    prefixInteger: ").append(toIndentedString(prefixInteger)).append("\n");
-    sb.append("    prefixBoolean: ").append(toIndentedString(prefixBoolean)).append("\n");
-    sb.append("    prefixArray: ").append(toIndentedString(prefixArray)).append("\n");
-    sb.append("    prefixWrappedArray: ").append(toIndentedString(prefixWrappedArray)).append("\n");
-    sb.append("    namespaceString: ").append(toIndentedString(namespaceString)).append("\n");
-    sb.append("    namespaceNumber: ").append(toIndentedString(namespaceNumber)).append("\n");
-    sb.append("    namespaceInteger: ").append(toIndentedString(namespaceInteger)).append("\n");
-    sb.append("    namespaceBoolean: ").append(toIndentedString(namespaceBoolean)).append("\n");
-    sb.append("    namespaceArray: ").append(toIndentedString(namespaceArray)).append("\n");
-    sb.append("    namespaceWrappedArray: ").append(toIndentedString(namespaceWrappedArray)).append("\n");
-    sb.append("    prefixNsString: ").append(toIndentedString(prefixNsString)).append("\n");
-    sb.append("    prefixNsNumber: ").append(toIndentedString(prefixNsNumber)).append("\n");
-    sb.append("    prefixNsInteger: ").append(toIndentedString(prefixNsInteger)).append("\n");
-    sb.append("    prefixNsBoolean: ").append(toIndentedString(prefixNsBoolean)).append("\n");
-    sb.append("    prefixNsArray: ").append(toIndentedString(prefixNsArray)).append("\n");
-    sb.append("    prefixNsWrappedArray: ").append(toIndentedString(prefixNsWrappedArray)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/google-api-client/build.gradle b/samples/client/petstore/java/google-api-client/build.gradle
index 5ac7da5a35d7..7cf83afba67c 100644
--- a/samples/client/petstore/java/google-api-client/build.gradle
+++ b/samples/client/petstore/java/google-api-client/build.gradle
@@ -117,5 +117,6 @@ dependencies {
     compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
     compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/google-api-client/build.sbt b/samples/client/petstore/java/google-api-client/build.sbt
index 48b38d8b35d1..d35d5eeab6b5 100644
--- a/samples/client/petstore/java/google-api-client/build.sbt
+++ b/samples/client/petstore/java/google-api-client/build.sbt
@@ -16,6 +16,7 @@ lazy val root = (project in file(".")).
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile",
       "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile",
       "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/samples/client/petstore/java/google-api-client/pom.xml b/samples/client/petstore/java/google-api-client/pom.xml
index e10770e25990..bc570c3ed1fc 100644
--- a/samples/client/petstore/java/google-api-client/pom.xml
+++ b/samples/client/petstore/java/google-api-client/pom.xml
@@ -147,6 +147,7 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -247,6 +248,12 @@
                 <artifactId>jackson-datatype-threetenbp</artifactId>
                 <version>${jackson-threetenbp-version}</version>
             </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -265,6 +272,7 @@
         <jackson-databind-version>2.10.4</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
         <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13</junit-version>
     </properties>
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/ApiClient.java
index 9dd0fcc8c6cb..80cb32e59f5c 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/ApiClient.java
@@ -17,7 +17,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiClient {
     private final String basePath;
     private final HttpRequestFactory httpRequestFactory;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/StringUtil.java
index 747a23f5bf23..4dc60597910a 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/StringUtil.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 461ec4a03ab2..d9d0b8602d24 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.ArrayList;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AnotherFakeApi {
     private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java
index f3e6f6406e2f..e3e4d58cd192 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.ArrayList;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeApi {
     private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index fc39bf01f896..5895c4d7b7eb 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.ArrayList;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeClassnameTags123Api {
     private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java
index 561e4336d725..2708fb956ada 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.ArrayList;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class PetApi {
     private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/StoreApi.java
index d103e480fcf8..2ba19aa3b658 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.ArrayList;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StoreApi {
     private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/UserApi.java
index fb8b763e252f..eaf587737db9 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/UserApi.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.ArrayList;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class UserApi {
     private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 0f1223c2bc61..f84a72518f68 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c03535ab9471..3104ead59eed 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 4356a4f8c1eb..b485c4825c27 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 781d4686e981..8dffb4999596 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -43,7 +43,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   private Map<String, String> mapString = null;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 2426e7c974c4..d09eacadf3e9 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index da407ccdc473..93480b7f4966 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 5e468870311e..4afc16a07bb9 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index ed080254966e..8533c0b77ae3 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
index 3bcb8a739172..83270058d077 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
@@ -35,7 +35,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 96f829bc648b..5dc5abf29846 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 37e40dbd3ec8..c237ea37a6e2 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java
index de7c895ac93a..8ca28d3862b8 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -34,7 +34,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   private List<String> arrayOfString = null;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCat.java
index c4386f4e6011..f038a3a46ad7 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCat.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index 7ce0ddb21f5a..e3b6b0fdd04e 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java
index 033e97881105..d253e541dede 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -34,7 +34,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   private String smallCamel;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
index 11ce48991b06..e397ea7aa176 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java
index 3e7b991436aa..e31a9ae81150 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
index 868ba8750742..de74329bc521 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
@@ -30,7 +30,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java
index 4de7664b26a7..bac4aec70b57 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java
index 02b0aac2247a..6bb0d3fab73e 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
index f56658043689..edf33abb2b57 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java
index dd42595cf202..147bb4d9b761 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java
index aff182cd4983..42c75cb2727d 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,7 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
index 51a1a645a109..75f53d11450c 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -34,7 +34,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8166597792d0..aae40c4a5a6e 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,7 +32,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
   private java.io.File file;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
index 4dee7f6c9dcc..d24c2298054f 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -47,7 +47,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 0a3f0d464360..741ab2441d34 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,7 +30,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java
index 113f92dd9cbe..9621c8220b71 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java
@@ -35,7 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d483d69700f8..3ccd9310b55c 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,7 +37,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java
index dd99468a0059..3b952b2730bf 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,7 +31,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 383cafdd3a5a..dd401709d75d 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -31,7 +31,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
   private Integer code;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java
index b62e13a90a0c..733ec3718a15 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
index bd625c5f66f3..8c03d816bff7 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
@@ -33,7 +33,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5ca72a169fe8..45f21901673f 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java
index 6e2816302162..e894257f323c 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java
@@ -35,7 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java
index d4d9ac6ba110..863237336880 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -32,7 +32,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   private BigDecimal myNumber;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
index cd98c32b8380..26446f5b488e 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
@@ -40,7 +40,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b3e58ef3d2c5..e5f23ef5dcfe 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,7 +30,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 35ad3bf46994..e60f8a8104d6 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java
index a3ecb398faa3..b15dc0d14fc6 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,7 +30,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 73f393587944..6ede0d94c081 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -36,7 +36,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem = "what";
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index e3daa1a3e1cb..2c30b9bbed2d 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -37,7 +37,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java
index b7e74643dab2..eafdd902c04d 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java
@@ -36,7 +36,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java
index f585a625223a..84bfde5ed4ff 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -60,7 +60,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   private String attributeString;
diff --git a/samples/client/petstore/java/jersey1/build.gradle b/samples/client/petstore/java/jersey1/build.gradle
index ddcf91a0640c..1ba30ce08519 100644
--- a/samples/client/petstore/java/jersey1/build.gradle
+++ b/samples/client/petstore/java/jersey1/build.gradle
@@ -133,6 +133,7 @@ dependencies {
     compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version"
     compile "com.brsanthu:migbase64:2.2"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
 
diff --git a/samples/client/petstore/java/jersey1/pom.xml b/samples/client/petstore/java/jersey1/pom.xml
index 09f4db8539e7..c28acc505a4e 100644
--- a/samples/client/petstore/java/jersey1/pom.xml
+++ b/samples/client/petstore/java/jersey1/pom.xml
@@ -162,6 +162,7 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -271,6 +272,12 @@
                 <artifactId>migbase64</artifactId>
                 <version>2.2</version>
             </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -285,6 +292,7 @@
         <jersey-version>1.19.4</jersey-version>
         <jackson-version>2.10.3</jackson-version>
         <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13</junit-version>
     </properties>
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/ApiClient.java
index 74a543e6bbae..f5748ef44075 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/ApiClient.java
@@ -58,7 +58,7 @@
 import org.openapitools.client.auth.ApiKeyAuth;
 import org.openapitools.client.auth.OAuth;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiClient {
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   private Map<String, String> defaultCookieMap = new HashMap<String, String>();
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/ApiException.java
index 6c91e35f27a9..c814fc5bbc9c 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/ApiException.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/ApiException.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/Configuration.java
index acbecda489dd..476456fd4ed6 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/Configuration.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/Configuration.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/Pair.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/Pair.java
index ae89aa614543..8352d84046a7 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/Pair.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/Pair.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/StringUtil.java
index 747a23f5bf23..4dc60597910a 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/StringUtil.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index abb57bf3dd3d..2cc17cbcbed5 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AnotherFakeApi {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java
index 3c3ca7c4c9c9..159f6abace35 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -36,7 +36,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeApi {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 62ad8734de3e..4bb24b6c29d2 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeClassnameTags123Api {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java
index 6d7aa3f33baa..a95b34eeb0ea 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java
@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class PetApi {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/StoreApi.java
index 52de03d9e756..bc68e36d8b4c 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StoreApi {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/UserApi.java
index 7edacb17d72c..1c6ce952c316 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/UserApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class UserApi {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
index a9427105d811..8e03da2a6791 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
index 98993417bee7..bd1f1225416a 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
@@ -22,7 +22,7 @@
 
 import java.io.UnsupportedEncodingException;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
index e20259cb94ca..e9d4c678963a 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/OAuth.java
index 779680c9b2f9..0f145f8b23c5 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/OAuth.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 0f1223c2bc61..f84a72518f68 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c03535ab9471..3104ead59eed 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 4356a4f8c1eb..b485c4825c27 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 781d4686e981..8dffb4999596 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -43,7 +43,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   private Map<String, String> mapString = null;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 2426e7c974c4..d09eacadf3e9 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index da407ccdc473..93480b7f4966 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 5e468870311e..4afc16a07bb9 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index ed080254966e..8533c0b77ae3 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java
index 3bcb8a739172..83270058d077 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java
@@ -35,7 +35,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 96f829bc648b..5dc5abf29846 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 37e40dbd3ec8..c237ea37a6e2 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java
index de7c895ac93a..8ca28d3862b8 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -34,7 +34,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   private List<String> arrayOfString = null;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCat.java
index c4386f4e6011..f038a3a46ad7 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCat.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index 7ce0ddb21f5a..e3b6b0fdd04e 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java
index 033e97881105..d253e541dede 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -34,7 +34,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   private String smallCamel;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java
index 11ce48991b06..e397ea7aa176 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java
index 3e7b991436aa..e31a9ae81150 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java
index 868ba8750742..de74329bc521 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java
@@ -30,7 +30,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java
index 4de7664b26a7..bac4aec70b57 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java
index 02b0aac2247a..6bb0d3fab73e 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java
index f56658043689..edf33abb2b57 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java
index dd42595cf202..147bb4d9b761 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java
index aff182cd4983..42c75cb2727d 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,7 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java
index 51a1a645a109..75f53d11450c 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -34,7 +34,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8166597792d0..aae40c4a5a6e 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,7 +32,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
   private java.io.File file;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java
index 4dee7f6c9dcc..d24c2298054f 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -47,7 +47,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 0a3f0d464360..741ab2441d34 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,7 +30,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java
index 113f92dd9cbe..9621c8220b71 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java
@@ -35,7 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d483d69700f8..3ccd9310b55c 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,7 +37,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java
index dd99468a0059..3b952b2730bf 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,7 +31,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 383cafdd3a5a..dd401709d75d 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -31,7 +31,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
   private Integer code;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java
index b62e13a90a0c..733ec3718a15 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java
index bd625c5f66f3..8c03d816bff7 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java
@@ -33,7 +33,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5ca72a169fe8..45f21901673f 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java
index 6e2816302162..e894257f323c 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java
@@ -35,7 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java
index d4d9ac6ba110..863237336880 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -32,7 +32,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   private BigDecimal myNumber;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java
index cd98c32b8380..26446f5b488e 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java
@@ -40,7 +40,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b3e58ef3d2c5..e5f23ef5dcfe 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,7 +30,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 35ad3bf46994..e60f8a8104d6 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java
index a3ecb398faa3..b15dc0d14fc6 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,7 +30,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 73f393587944..6ede0d94c081 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -36,7 +36,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem = "what";
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index e3daa1a3e1cb..2c30b9bbed2d 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -37,7 +37,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java
index b7e74643dab2..eafdd902c04d 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java
@@ -36,7 +36,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java
index f585a625223a..84bfde5ed4ff 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -60,7 +60,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   private String attributeString;
diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle
index ae42ace869bc..9fd264d4f8b6 100644
--- a/samples/client/petstore/java/jersey2-java8/build.gradle
+++ b/samples/client/petstore/java/jersey2-java8/build.gradle
@@ -117,6 +117,7 @@ dependencies {
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     compile "com.github.scribejava:scribejava-apis:$scribejava_apis_version"
     compile "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/build.sbt b/samples/client/petstore/java/jersey2-java8/build.sbt
index 6d3d373e83b9..5654b9ea09f2 100644
--- a/samples/client/petstore/java/jersey2-java8/build.sbt
+++ b/samples/client/petstore/java/jersey2-java8/build.sbt
@@ -19,6 +19,7 @@ lazy val root = (project in file(".")).
       "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
       "com.github.scribejava" % "scribejava-apis" % "6.9.0" % "compile",
       "org.tomitribe" % "tomitribe-http-signatures" % "1.3" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/samples/client/petstore/java/jersey2-java8/pom.xml b/samples/client/petstore/java/jersey2-java8/pom.xml
index 59d6a7c0da48..384c64a4ed3b 100644
--- a/samples/client/petstore/java/jersey2-java8/pom.xml
+++ b/samples/client/petstore/java/jersey2-java8/pom.xml
@@ -67,6 +67,7 @@
                     <argLine>-Xms512m -Xmx1500m</argLine>
                     <parallel>methods</parallel>
                     <threadCount>10</threadCount>
+                    <trimStackTrace>false</trimStackTrace>
                 </configuration>
             </plugin>
             <plugin>
@@ -162,6 +163,7 @@
                 </executions>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.8</source>
                     <tags>
                         <tag>
                             <name>http.response.details</name>
@@ -278,6 +280,12 @@
             <artifactId>scribejava-apis</artifactId>
             <version>${scribejava-apis-version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -293,6 +301,7 @@
         <jackson-version>2.10.4</jackson-version>
         <jackson-databind-version>2.10.4</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
         <scribejava-apis-version>6.9.0</scribejava-apis-version>
     </properties>
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
index 0755459fc431..226aea1527c9 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
@@ -25,6 +25,13 @@
 import java.io.InputStream;
 
 import java.net.URI;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.security.cert.X509Certificate;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import org.glassfish.jersey.logging.LoggingFeature;
@@ -55,13 +62,13 @@
 import org.openapitools.client.auth.HttpBearerAuth;
 import org.openapitools.client.auth.ApiKeyAuth;
 import org.openapitools.client.auth.OAuth;
-import org.openapitools.client.model.AbstractOpenApiSchema;
-
 
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiClient {
   protected Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   protected Map<String, String> defaultCookieMap = new HashMap<String, String>();
   protected String basePath = "http://petstore.swagger.io:80/v2";
+  protected String userAgent;
   private static final Logger log = Logger.getLogger(ApiClient.class.getName());
 
   protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
@@ -373,7 +380,7 @@ public ApiClient setAccessToken(String accessToken) {
   public ApiClient setOauthCredentials(String clientId, String clientSecret) {
     for (Authentication auth : authentications.values()) {
       if (auth instanceof OAuth) {
-        ((OAuth) auth).setCredentials(clientId, clientSecret);
+        ((OAuth) auth).setCredentials(clientId, clientSecret, isDebugging());
         return this;
       }
     }
@@ -432,10 +439,19 @@ public ApiClient setOauthScope(String scope) {
    * @return API client
    */
   public ApiClient setUserAgent(String userAgent) {
+    userAgent = userAgent;
     addDefaultHeader("User-Agent", userAgent);
     return this;
   }
 
+  /**
+   * Get the User-Agent header's value.
+   * @return User-Agent string
+   */
+  public String getUserAgent(){
+    return userAgent;
+  }
+
   /**
    * Add a default header.
    *
@@ -750,7 +766,7 @@ public String escapeString(String str) {
    * @return Entity
    * @throws ApiException API exception
    */
-  public Entity<?> serialize(Object obj, Map<String, Object> formParams, String contentType) throws ApiException {
+  public Entity<?> serialize(Object obj, Map<String, Object> formParams, String contentType, boolean isBodyNullable) throws ApiException {
     Entity<?> entity;
     if (contentType.startsWith("multipart/form-data")) {
       MultiPart multiPart = new MultiPart();
@@ -774,7 +790,11 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
       entity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE);
     } else {
       // We let jersey handle the serialization
-      entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
+      if (isBodyNullable) { // payload is nullable
+        entity = Entity.entity(obj == null ? Entity.text("null") : obj, contentType);
+      } else {
+        entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
+      }
     }
     return entity;
   }
@@ -785,10 +805,11 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
    * @param obj Object
    * @param formParams Form parameters
    * @param contentType Context type
+   * @param isBodyNulalble True if the body is nullable
    * @return String
    * @throws ApiException API exception
    */
-  public String serializeToString(Object obj, Map<String, Object> formParams, String contentType) throws ApiException {
+  public String serializeToString(Object obj, Map<String, Object> formParams, String contentType, boolean isBodyNullable) throws ApiException {
     try {
       if (contentType.startsWith("multipart/form-data")) {
         throw new ApiException("multipart/form-data not yet supported for serializeToString (http signature authentication)");
@@ -804,74 +825,17 @@ public String serializeToString(Object obj, Map<String, Object> formParams, Stri
           return formString.substring(0, formString.length() - 1);
         }
       } else {
-        return json.getMapper().writeValueAsString(obj);
+        if (isBodyNullable) {
+          return obj == null ? "null" : json.getMapper().writeValueAsString(obj);
+        } else {
+          return json.getMapper().writeValueAsString(obj);
+        }
       }
     } catch (Exception ex) {
       throw new ApiException("Failed to perform serializeToString: " + ex.toString());
     }
   }
 
-  public AbstractOpenApiSchema deserializeSchemas(Response response, AbstractOpenApiSchema schema) throws ApiException{
-
-    Object result = null;
-    int matchCounter = 0;
-    ArrayList<String> matchSchemas = new ArrayList<>();
-
-    if (schema.isNullable()) {
-      response.bufferEntity();
-      if ("{}".equals(String.valueOf(response.readEntity(String.class))) ||
-          "".equals(String.valueOf(response.readEntity(String.class)))) {
-        // schema is nullable and the response body is {} or empty string
-        return schema;
-      }
-    }
-
-    for (Map.Entry<String, GenericType> entry : schema.getSchemas().entrySet()) {
-      String schemaName = entry.getKey();
-      GenericType schemaType = entry.getValue();
-
-      if (schemaType instanceof GenericType) { // model
-        try {
-          Object deserializedObject = deserialize(response, schemaType);
-          if (deserializedObject != null) {
-            result = deserializedObject;
-            matchCounter++;
-
-            if ("anyOf".equals(schema.getSchemaType())) {
-              break;
-            } else if ("oneOf".equals(schema.getSchemaType())) {
-              matchSchemas.add(schemaName);
-            } else {
-              throw new ApiException("Unknowe type found while expecting anyOf/oneOf:" + schema.getSchemaType());
-            }
-          } else {
-            // failed to deserialize the response in the schema provided, proceed to the next one if any
-          }
-        } catch (Exception ex) {
-          // failed to deserialize, do nothing and try next one (schema)
-          // Logging the error may be useful to troubleshoot why a payload fails to match
-          // the schema.
-          log.log(Level.FINE, "Input data does not match schema '" + schemaName + "'", ex);
-        }
-      } else {// unknown type
-        throw new ApiException(schemaType.getClass() + " is not a GenericType and cannot be handled properly in deserialization.");
-      }
-
-    }
-
-    if (matchCounter > 1 && "oneOf".equals(schema.getSchemaType())) {// more than 1 match for oneOf
-      throw new ApiException("Response body is invalid as it matches more than one schema (" + StringUtil.join(matchSchemas, ", ") + ") defined in the oneOf model: " + schema.getClass().getName());
-    } else if (matchCounter == 0) { // fail to match any in oneOf/anyOf schemas
-      throw new ApiException("Response body is invalid as it does not match any schemas (" + StringUtil.join(schema.getSchemas().keySet(), ", ") + ") defined in the oneOf/anyOf model: " + schema.getClass().getName());
-    } else { // only one matched
-      schema.setActualInstance(result);
-      return schema;
-    }
-
-  }
-
-
-
   /**
    * Deserialize response body to Java object according to the Content-Type.
    * @param <T> Type
@@ -973,7 +937,7 @@ public File prepareDownloadFile(Response response) throws IOException {
    * @param contentType The request's Content-Type header
    * @param authNames The authentications to apply
    * @param returnType The return type into which to deserialize the response
-   * @param schema An instance of the response that uses oneOf/anyOf
+   * @param isBodyNullable True if the body is nullable
    * @return The response body in type of string
    * @throws ApiException API exception
    */
@@ -990,7 +954,7 @@ public <T> ApiResponse<T> invokeAPI(
       String contentType,
       String[] authNames,
       GenericType<T> returnType,
-      AbstractOpenApiSchema schema)
+      boolean isBodyNullable)
       throws ApiException {
 
     // Not using `.target(targetURL).path(path)` below,
@@ -1037,7 +1001,7 @@ public <T> ApiResponse<T> invokeAPI(
       }
     }
 
-    Entity<?> entity = serialize(body, formParams, contentType);
+    Entity<?> entity = serialize(body, formParams, contentType, isBodyNullable);
 
     // put all headers in one place
     Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
@@ -1049,7 +1013,7 @@ public <T> ApiResponse<T> invokeAPI(
         queryParams,
         allHeaderParams,
         cookieParams,
-        serializeToString(body, formParams, contentType),
+        serializeToString(body, formParams, contentType, isBodyNullable),
         method,
         target.getUri());
 
@@ -1087,12 +1051,10 @@ public <T> ApiResponse<T> invokeAPI(
       if (response.getStatusInfo() == Status.NO_CONTENT) {
         return new ApiResponse<T>(statusCode, responseHeaders);
       } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) {
-        if (returnType == null) return new ApiResponse<T>(statusCode, responseHeaders);
-        else if (schema == null) {
+        if (returnType == null) {
+          return new ApiResponse<T>(statusCode, responseHeaders);
+        } else {
           return new ApiResponse<T>(statusCode, responseHeaders, deserialize(response, returnType));
-        } else { // oneOf/anyOf
-          return new ApiResponse<T>(
-              statusCode, responseHeaders, (T) deserializeSchemas(response, schema));
         }
       } else {
         String message = "error";
@@ -1138,8 +1100,8 @@ private Response sendRequest(String method, Invocation.Builder invocationBuilder
    * @deprecated Add qualified name of the operation as a first parameter.
    */
   @Deprecated
-  public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType, AbstractOpenApiSchema schema) throws ApiException {
-    return invokeAPI(null, path, method, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames, returnType, schema);
+  public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType, boolean isBodyNullable) throws ApiException {
+    return invokeAPI(null, path, method, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames, returnType, isBodyNullable);
   }
 
   /**
@@ -1165,13 +1127,64 @@ protected Client buildHttpClient(boolean debugging) {
       java.util.logging.Logger.getLogger("org.glassfish.jersey.client").setLevel(java.util.logging.Level.SEVERE);
     }
     performAdditionalClientConfiguration(clientConfig);
-    return ClientBuilder.newClient(clientConfig);
+    ClientBuilder clientBuilder = ClientBuilder.newBuilder();
+    customizeClientBuilder(clientBuilder);
+    clientBuilder = clientBuilder.withConfig(clientConfig);
+    return clientBuilder.build();
   }
 
+  /**
+   * Perform additional configuration of the API client.
+   * This method can be overriden to customize the API client.
+   */
   protected void performAdditionalClientConfiguration(ClientConfig clientConfig) {
     // No-op extension point
   }
 
+  /**
+   * Customize the client builder.
+   *
+   * This method can be overriden to customize the API client. For example, this can be used to:
+   * 1. Set the hostname verifier to be used by the client to verify the endpoint's hostname
+   *    against its identification information.
+   * 2. Set the client-side key store.
+   * 3. Set the SSL context that will be used when creating secured transport connections to
+   *    server endpoints from web targets created by the client instance that is using this SSL context.
+   * 4. Set the client-side trust store.
+   *
+   * To completely disable certificate validation (at your own risk), you can
+   * override this method and invoke disableCertificateValidation(clientBuilder).
+   */
+  protected void customizeClientBuilder(ClientBuilder clientBuilder) {
+    // No-op extension point
+  }
+
+  /**
+   * Disable X.509 certificate validation in TLS connections.
+   *
+   * Please note that trusting all certificates is extremely risky.
+   * This may be useful in a development environment with self-signed certificates.
+   */
+  protected void disableCertificateValidation(ClientBuilder clientBuilder) throws KeyManagementException, NoSuchAlgorithmException {
+    TrustManager[] trustAllCerts = new X509TrustManager[] {
+      new X509TrustManager() {
+        @Override
+        public X509Certificate[] getAcceptedIssuers() {
+          return null;
+        }
+        @Override
+        public void checkClientTrusted(X509Certificate[] certs, String authType) {
+        }
+        @Override
+        public void checkServerTrusted(X509Certificate[] certs, String authType) {
+        }
+      }
+    };
+    SSLContext sslContext = SSLContext.getInstance("TLS");
+    sslContext.init(null, trustAllCerts, new SecureRandom());
+    clientBuilder.sslContext(sslContext);
+  }
+
   protected Map<String, List<String>> buildResponseHeaders(Response response) {
     Map<String, List<String>> responseHeaders = new HashMap<String, List<String>>();
     for (Entry<String, List<Object>> entry: response.getHeaders().entrySet()) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiException.java
index 3612265bc619..1c98dfd2a4b1 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiException.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiException.java
@@ -19,7 +19,7 @@
 /**
  * API Exception
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java
index acbecda489dd..476456fd4ed6 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java
index fd834ef6b4a0..9d748f6e7c22 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java
@@ -4,12 +4,17 @@
 import com.fasterxml.jackson.databind.*;
 import org.openapitools.jackson.nullable.JsonNullableModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.openapitools.client.model.*;
 
 import java.text.DateFormat;
-
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.core.GenericType;
 import javax.ws.rs.ext.ContextResolver;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class JSON implements ContextResolver<ObjectMapper> {
   private ObjectMapper mapper;
 
@@ -46,4 +51,197 @@ public ObjectMapper getContext(Class<?> type) {
    * @return object mapper
    */
   public ObjectMapper getMapper() { return mapper; }
+
+  /**
+   * Returns the target model class that should be used to deserialize the input data.
+   * The discriminator mappings are used to determine the target model class.
+   *
+   * @param node The input data.
+   * @param modelClass The class that contains the discriminator mappings.
+   */
+  public static Class<?> getClassForElement(JsonNode node, Class<?> modelClass) {
+    ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass);
+    if (cdm != null) {
+      return cdm.getClassForElement(node, new HashSet<Class<?>>());
+    }
+    return null;
+  }
+
+  /**
+   * Helper class to register the discriminator mappings.
+   */
+  private static class ClassDiscriminatorMapping {
+    // The model class name.
+    Class<?> modelClass;
+    // The name of the discriminator property.
+    String discriminatorName;
+    // The discriminator mappings for a model class.
+    Map<String, Class<?>> discriminatorMappings;
+
+    // Constructs a new class discriminator.
+    ClassDiscriminatorMapping(Class<?> cls, String propertyName, Map<String, Class<?>> mappings) {
+      modelClass = cls;
+      discriminatorName = propertyName;
+      discriminatorMappings = new HashMap<String, Class<?>>();
+      if (mappings != null) {
+        discriminatorMappings.putAll(mappings);
+      }
+    }
+
+    // Return the name of the discriminator property for this model class.
+    String getDiscriminatorPropertyName() {
+      return discriminatorName;
+    }
+
+    // Return the discriminator value or null if the discriminator is not
+    // present in the payload.
+    String getDiscriminatorValue(JsonNode node) {
+      // Determine the value of the discriminator property in the input data.
+      if (discriminatorName != null) {
+        // Get the value of the discriminator property, if present in the input payload.
+        node = node.get(discriminatorName);
+        if (node != null && node.isValueNode()) {
+          String discrValue = node.asText();
+          if (discrValue != null) {
+            return discrValue;
+          }
+        }
+      }
+      return null;
+    }
+
+    /**
+     * Returns the target model class that should be used to deserialize the input data.
+     * This function can be invoked for anyOf/oneOf composed models with discriminator mappings.
+     * The discriminator mappings are used to determine the target model class.
+     *
+     * @param node The input data.
+     * @param visitedClasses The set of classes that have already been visited.
+     */
+    Class<?> getClassForElement(JsonNode node, Set<Class<?>> visitedClasses) {
+      if (visitedClasses.contains(modelClass)) {
+        // Class has already been visited.
+        return null;
+      }
+      // Determine the value of the discriminator property in the input data.
+      String discrValue = getDiscriminatorValue(node);
+      if (discrValue == null) {
+        return null;
+      }
+      Class<?> cls = discriminatorMappings.get(discrValue);
+      // It may not be sufficient to return this cls directly because that target class
+      // may itself be a composed schema, possibly with its own discriminator.
+      visitedClasses.add(modelClass);
+      for (Class<?> childClass : discriminatorMappings.values()) {
+        ClassDiscriminatorMapping childCdm = modelDiscriminators.get(childClass);
+        if (childCdm == null) {
+          continue;
+        }
+        if (!discriminatorName.equals(childCdm.discriminatorName)) {
+          discrValue = getDiscriminatorValue(node);
+          if (discrValue == null) {
+            continue;
+          }
+        }
+        if (childCdm != null) {
+          // Recursively traverse the discriminator mappings.
+          Class<?> childDiscr = childCdm.getClassForElement(node, visitedClasses);
+          if (childDiscr != null) {
+            return childDiscr;
+          }
+        }
+      }
+      return cls;
+    }
+  }
+
+  /**
+   * Returns true if inst is an instance of modelClass in the OpenAPI model hierarchy.
+   *
+   * The Java class hierarchy is not implemented the same way as the OpenAPI model hierarchy,
+   * so it's not possible to use the instanceof keyword.
+   *
+   * @param modelClass A OpenAPI model class.
+   * @param inst The instance object.
+   */
+  public static boolean isInstanceOf(Class<?> modelClass, Object inst, Set<Class<?>> visitedClasses) {
+    if (modelClass.isInstance(inst)) {
+      // This handles the 'allOf' use case with single parent inheritance.
+      return true;
+    }
+    if (visitedClasses.contains(modelClass)) {
+      // This is to prevent infinite recursion when the composed schemas have
+      // a circular dependency.
+      return false;
+    }
+    visitedClasses.add(modelClass);
+    
+    // Traverse the oneOf/anyOf composed schemas.
+    Map<String, GenericType> descendants = modelDescendants.get(modelClass);
+    if (descendants != null) {
+      for (GenericType childType : descendants.values()) {
+        if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  /**
+   * A map of discriminators for all model classes.
+   */
+  private static Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<Class<?>, ClassDiscriminatorMapping>();
+
+  /**
+   * A map of oneOf/anyOf descendants for each model class.
+   */
+  private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<Class<?>, Map<String, GenericType>>();
+
+  /**
+    * Register a model class discriminator.
+    *
+    * @param modelClass the model class
+    * @param discriminatorPropertyName the name of the discriminator property
+    * @param mappings a map with the discriminator mappings.
+    */
+  public static void registerDiscriminator(Class<?> modelClass, String discriminatorPropertyName, Map<String, Class<?>> mappings) {
+    ClassDiscriminatorMapping m = new ClassDiscriminatorMapping(modelClass, discriminatorPropertyName, mappings);
+    modelDiscriminators.put(modelClass, m);
+  }
+
+  /**
+    * Register the oneOf/anyOf descendants of the modelClass.
+    *
+    * @param modelClass the model class
+    * @param descendants a map of oneOf/anyOf descendants.
+    */
+  public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
+    modelDescendants.put(modelClass, descendants);
+  }
+
+  private static JSON json;
+
+  static
+  {
+    json = new JSON();
+  }
+
+  /**
+    * Get the default JSON instance.
+    *
+    * @return the default JSON instance
+    */
+  public static JSON getDefault() {
+    return json;
+  }
+
+  /**
+    * Set the default JSON instance.
+    *
+    * @param json JSON instance to be used
+    */
+  public static void setDefault(JSON json) {
+    JSON.json = json;
+  }
 }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Pair.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Pair.java
index ae89aa614543..8352d84046a7 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Pair.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Pair.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/StringUtil.java
index 747a23f5bf23..4dc60597910a 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/StringUtil.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 0fac43ffba33..00a2e3fcd4b4 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AnotherFakeApi {
   private ApiClient apiClient;
 
@@ -110,6 +110,6 @@ public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client body) throw
 
     return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", localVarPath, "PATCH", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
 }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
index d82160dce469..170ca91a961f 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeApi {
   private ApiClient apiClient;
 
@@ -115,7 +115,7 @@ public ApiResponse<Void> createXmlItemWithHttpInfo(XmlItem xmlItem) throws ApiEx
 
     return apiClient.invokeAPI("FakeApi.createXmlItem", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * 
@@ -177,7 +177,7 @@ public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(Boolean body)
 
     return apiClient.invokeAPI("FakeApi.fakeOuterBooleanSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * 
@@ -239,7 +239,7 @@ public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(Outer
 
     return apiClient.invokeAPI("FakeApi.fakeOuterCompositeSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * 
@@ -301,7 +301,7 @@ public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(BigDecimal b
 
     return apiClient.invokeAPI("FakeApi.fakeOuterNumberSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * 
@@ -363,7 +363,7 @@ public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(String body) thr
 
     return apiClient.invokeAPI("FakeApi.fakeOuterStringSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * 
@@ -427,7 +427,7 @@ public ApiResponse<Void> testBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass
 
     return apiClient.invokeAPI("FakeApi.testBodyWithFileSchema", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * 
@@ -499,7 +499,7 @@ public ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(String query, User
 
     return apiClient.invokeAPI("FakeApi.testBodyWithQueryParams", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * To test \&quot;client\&quot; model
@@ -566,7 +566,7 @@ public ApiResponse<Client> testClientModelWithHttpInfo(Client body) throws ApiEx
 
     return apiClient.invokeAPI("FakeApi.testClientModel", localVarPath, "PATCH", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -701,7 +701,7 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
 
     return apiClient.invokeAPI("FakeApi.testEndpointParameters", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * To test enum parameters
@@ -788,7 +788,7 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderS
 
     return apiClient.invokeAPI("FakeApi.testEnumParameters", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
 
 private ApiResponse<Void> testGroupParametersWithHttpInfo(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {
@@ -844,7 +844,7 @@ private ApiResponse<Void> testGroupParametersWithHttpInfo(Integer requiredString
 
     return apiClient.invokeAPI("FakeApi.testGroupParameters", localVarPath, "DELETE", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
 
   public class APItestGroupParametersRequest {
@@ -1023,7 +1023,7 @@ public ApiResponse<Void> testInlineAdditionalPropertiesWithHttpInfo(Map<String,
 
     return apiClient.invokeAPI("FakeApi.testInlineAdditionalProperties", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * test json serialization of form data
@@ -1098,7 +1098,7 @@ public ApiResponse<Void> testJsonFormDataWithHttpInfo(String param, String param
 
     return apiClient.invokeAPI("FakeApi.testJsonFormData", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * 
@@ -1195,6 +1195,6 @@ public ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(List<Str
 
     return apiClient.invokeAPI("FakeApi.testQueryParameterCollectionFormat", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
 }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index c3fc1748396a..1694d007f192 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeClassnameTags123Api {
   private ApiClient apiClient;
 
@@ -110,6 +110,6 @@ public ApiResponse<Client> testClassnameWithHttpInfo(Client body) throws ApiExce
 
     return apiClient.invokeAPI("FakeClassnameTags123Api.testClassname", localVarPath, "PATCH", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
 }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java
index 8f2c6c9f99a5..71fe54b109ea 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java
@@ -18,7 +18,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class PetApi {
   private ApiClient apiClient;
 
@@ -112,7 +112,7 @@ public ApiResponse<Void> addPetWithHttpInfo(Pet body) throws ApiException {
 
     return apiClient.invokeAPI("PetApi.addPet", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Deletes a pet
@@ -183,7 +183,7 @@ public ApiResponse<Void> deletePetWithHttpInfo(Long petId, String apiKey) throws
 
     return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Finds Pets by status
@@ -253,7 +253,7 @@ public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status)
 
     return apiClient.invokeAPI("PetApi.findPetsByStatus", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Finds Pets by tags
@@ -327,7 +327,7 @@ public ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(Set<String> tags) throws
 
     return apiClient.invokeAPI("PetApi.findPetsByTags", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Find pet by ID
@@ -399,7 +399,7 @@ public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
 
     return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Update an existing pet
@@ -469,7 +469,7 @@ public ApiResponse<Void> updatePetWithHttpInfo(Pet body) throws ApiException {
 
     return apiClient.invokeAPI("PetApi.updatePet", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Updates a pet in the store with form data
@@ -542,7 +542,7 @@ public ApiResponse<Void> updatePetWithFormWithHttpInfo(Long petId, String name,
 
     return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * uploads an image
@@ -618,7 +618,7 @@ public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String a
 
     return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * uploads an image (required)
@@ -699,6 +699,6 @@ public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(Long
 
     return apiClient.invokeAPI("PetApi.uploadFileWithRequiredFile", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
 }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
index b5ca41442db5..0d259914167b 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StoreApi {
   private ApiClient apiClient;
 
@@ -110,7 +110,7 @@ public ApiResponse<Void> deleteOrderWithHttpInfo(String orderId) throws ApiExcep
 
     return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Returns pet inventories by status
@@ -170,7 +170,7 @@ public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiEx
 
     return apiClient.invokeAPI("StoreApi.getInventory", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Find purchase order by ID
@@ -242,7 +242,7 @@ public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiExcep
 
     return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Place an order for a pet
@@ -311,6 +311,6 @@ public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException
 
     return apiClient.invokeAPI("StoreApi.placeOrder", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
 }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java
index 4aa5531f4eb6..cf1f8c794073 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class UserApi {
   private ApiClient apiClient;
 
@@ -107,7 +107,7 @@ public ApiResponse<Void> createUserWithHttpInfo(User body) throws ApiException {
 
     return apiClient.invokeAPI("UserApi.createUser", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Creates list of users with given input array
@@ -171,7 +171,7 @@ public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(List<User> body)
 
     return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Creates list of users with given input array
@@ -235,7 +235,7 @@ public ApiResponse<Void> createUsersWithListInputWithHttpInfo(List<User> body) t
 
     return apiClient.invokeAPI("UserApi.createUsersWithListInput", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Delete user
@@ -302,7 +302,7 @@ public ApiResponse<Void> deleteUserWithHttpInfo(String username) throws ApiExcep
 
     return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Get user by user name
@@ -374,7 +374,7 @@ public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiEx
 
     return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Logs user into the system
@@ -452,7 +452,7 @@ public ApiResponse<String> loginUserWithHttpInfo(String username, String passwor
 
     return apiClient.invokeAPI("UserApi.loginUser", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Logs out current logged in user session
@@ -509,7 +509,7 @@ public ApiResponse<Void> logoutUserWithHttpInfo() throws ApiException {
 
     return apiClient.invokeAPI("UserApi.logoutUser", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Updated user
@@ -583,6 +583,6 @@ public ApiResponse<Void> updateUserWithHttpInfo(String username, User body) thro
 
     return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
 }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
index c1b2e4840702..d6c8c0f6aee0 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
index e6f95e585639..13e6ca480d97 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
index 1b46b4c6839f..eacc5d02d024 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java
index 5751094fa1db..8a468063c987 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -31,153 +31,163 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OAuth implements Authentication {
-  private static final Logger log = Logger.getLogger(OAuth.class.getName());
-
-  private String tokenUrl;
-  private String absoluteTokenUrl;
-  private OAuthFlow flow = OAuthFlow.application;
-  private OAuth20Service service;
-  private DefaultApi20 authApi;
-  private String scope;
-  private String username;
-  private String password;
-  private String code;
-  private volatile OAuth2AccessToken accessToken;
-
-  public OAuth(String basePath, String tokenUrl) {
-    this.tokenUrl = tokenUrl;
-    this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
-    authApi = new DefaultApi20() {
-      @Override
-      public String getAccessTokenEndpoint() {
-        return absoluteTokenUrl;
-      }
-
-      @Override
-      protected String getAuthorizationBaseUrl() {
-        throw new UnsupportedOperationException("Shouldn't get there !");
-      }
-    };
-  }
-
-  private static String createAbsoluteTokenUrl(String basePath, String tokenUrl) {
-    if (!URI.create(tokenUrl).isAbsolute()) {
-      try {
-        return UriBuilder.fromPath(basePath).path(tokenUrl).build().toURL().toString();
-      } catch (MalformedURLException e) {
-        log.log(Level.SEVERE, "Couldn't create absolute token URL", e);
-      }
+    private static final Logger log = Logger.getLogger(OAuth.class.getName());
+
+    private String tokenUrl;
+    private String absoluteTokenUrl;
+    private OAuthFlow flow = OAuthFlow.application;
+    private OAuth20Service service;
+    private DefaultApi20 authApi;
+    private String scope;
+    private String username;
+    private String password;
+    private String code;
+    private volatile OAuth2AccessToken accessToken;
+
+    public OAuth(String basePath, String tokenUrl) {
+        this.tokenUrl = tokenUrl;
+        this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
+        authApi = new DefaultApi20() {
+            @Override
+            public String getAccessTokenEndpoint() {
+              return absoluteTokenUrl;
+            }
+
+            @Override
+            protected String getAuthorizationBaseUrl() {
+              throw new UnsupportedOperationException("Shouldn't get there !");
+            }
+        };
+    }
+
+    private static String createAbsoluteTokenUrl(String basePath, String tokenUrl) {
+        if (!URI.create(tokenUrl).isAbsolute()) {
+            try {
+                return UriBuilder.fromPath(basePath).path(tokenUrl).build().toURL().toString();
+            } catch (MalformedURLException e) {
+                log.log(Level.SEVERE, "Couldn't create absolute token URL", e);
+            }
+        }
+        return tokenUrl;
+    }
+
+    @Override
+    public void applyToParams(
+        List<Pair> queryParams,
+        Map<String, String> headerParams,
+        Map<String, String> cookieParams,
+        String payload,
+        String method,
+        URI uri)
+        throws ApiException {
+
+        if (accessToken == null) {
+            obtainAccessToken(null);
+        }
+        if (accessToken != null) {
+            headerParams.put("Authorization", "Bearer " + accessToken.getAccessToken());
+        }
     }
-    return tokenUrl;
-  }
-
-  @Override
-  public void applyToParams(
-      List<Pair> queryParams,
-      Map<String, String> headerParams,
-      Map<String, String> cookieParams,
-      String payload,
-      String method,
-      URI uri)
-      throws ApiException {
-
-    if (accessToken == null) {
-      obtainAccessToken(null);
+
+    public OAuth2AccessToken renewAccessToken() throws ApiException {
+        String refreshToken = null;
+        if (accessToken != null) {
+            refreshToken = accessToken.getRefreshToken();
+            accessToken = null;
+        }
+        return obtainAccessToken(refreshToken);
     }
-    if (accessToken != null) {
-      headerParams.put("Authorization", "Bearer " + accessToken.getAccessToken());
+
+    public synchronized OAuth2AccessToken obtainAccessToken(String refreshToken) throws ApiException {
+        if (service == null) {
+            log.log(Level.FINE, "service is null in obtainAccessToken.");
+            return null;
+        }
+        try {
+            if (refreshToken != null) {
+                return service.refreshAccessToken(refreshToken);
+            }
+        } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
+            log.log(Level.FINE, "Refreshing the access token using the refresh token failed", e);
+        }
+        try {
+            switch (flow) {
+                case password:
+                    if (username != null && password != null) {
+                        accessToken = service.getAccessTokenPasswordGrant(username, password, scope);
+                    }
+                    break;
+                case accessCode:
+                    if (code != null) {
+                        accessToken = service.getAccessToken(code);
+                        code = null;
+                    }
+                    break;
+                case application:
+                    accessToken = service.getAccessTokenClientCredentialsGrant(scope);
+                    break;
+                default:
+                    log.log(Level.SEVERE, "Invalid flow in obtainAccessToken: " + flow);
+            }
+        } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
+            throw new ApiException(e);
+        }
+        return accessToken;
     }
-  }
 
-  public OAuth2AccessToken renewAccessToken() throws ApiException {
-    String refreshToken = null;
-    if (accessToken != null) {
-      refreshToken = accessToken.getRefreshToken();
-      accessToken = null;
+    public OAuth2AccessToken getAccessToken() {
+        return accessToken;
     }
-    return obtainAccessToken(refreshToken);
-  }
 
-  public synchronized OAuth2AccessToken obtainAccessToken(String refreshToken) throws ApiException {
-    if (service == null) {
-      return null;
+    public OAuth setAccessToken(OAuth2AccessToken accessToken) {
+        this.accessToken = accessToken;
+        return this;
     }
-    try {
-      if (refreshToken != null) {
-        return service.refreshAccessToken(refreshToken);
-      }
-    } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
-      log.log(Level.FINE, "Refreshing the access token using the refresh token failed", e);
+
+    public OAuth setAccessToken(String accessToken) {
+        this.accessToken = new OAuth2AccessToken(accessToken);
+        return this;
+    }
+
+    public OAuth setScope(String scope) {
+       this.scope = scope;
+       return this;
     }
-    try {
-      switch (flow) {
-        case password:
-          if (username != null && password != null) {
-            accessToken = service.getAccessTokenPasswordGrant(username, password, scope);
-          }
-          break;
-        case accessCode:
-          if (code != null) {
-            accessToken = service.getAccessToken(code);
-            code = null;
-          }
-          break;
-        case application:
-          accessToken = service.getAccessTokenClientCredentialsGrant(scope);
-      }
-    } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
-      throw new ApiException(e);
+
+    public OAuth setCredentials(String clientId, String clientSecret, Boolean debug) {
+        if (Boolean.TRUE.equals(debug)) {
+            service = new ServiceBuilder(clientId)
+                .apiSecret(clientSecret).debug()
+                .build(authApi);
+        } else {
+            service = new ServiceBuilder(clientId)
+                .apiSecret(clientSecret)
+                .build(authApi);
+        }
+        return this;
+    }
+
+    public OAuth usePasswordFlow(String username, String password) {
+        this.flow = OAuthFlow.password;
+        this.username = username;
+        this.password = password;
+        return this;
+    }
+
+    public OAuth useAuthorizationCodeFlow(String code) {
+        this.flow = OAuthFlow.accessCode;
+        this.code = code;
+        return this;
+    }
+
+    public OAuth setFlow(OAuthFlow flow) {
+        this.flow = flow;
+        return this;
+    }
+
+    public void setBasePath(String basePath) {
+        this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
     }
-    return accessToken;
-  }
-
-  public OAuth2AccessToken getAccessToken() {
-    return accessToken;
-  }
-
-  public OAuth setAccessToken(OAuth2AccessToken accessToken) {
-    this.accessToken = accessToken;
-    return this;
-  }
-
-  public OAuth setAccessToken(String accessToken) {
-    this.accessToken = new OAuth2AccessToken(accessToken);
-    return this;
-  }
-
-  public OAuth setScope(String scope) {
-    this.scope = scope;
-    return this;
-  }
-
-  public OAuth setCredentials(String clientId, String clientSecret) {
-    service = new ServiceBuilder(clientId)
-        .apiSecret(clientSecret)
-        .build(authApi);
-    return this;
-  }
-
-  public OAuth usePasswordFlow(String username, String password) {
-    this.flow = OAuthFlow.password;
-    this.username = username;
-    this.password = password;
-    return this;
-  }
-
-  public OAuth useAuthorizationCodeFlow(String code) {
-    this.flow = OAuthFlow.accessCode;
-    this.code = code;
-    return this;
-  }
-
-  public OAuth setFlow(OAuthFlow flow) {
-    this.flow = flow;
-    return this;
-  }
-
-  public void setBasePath(String basePath) {
-    this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
-  }
 }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
index 892694344461..40d56df0ce25 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
@@ -24,7 +24,7 @@
 /**
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -41,14 +41,14 @@ public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
         this.isNullable = isNullable;
     }
 
-    /***
-     * Get the list of schemas allowed to be stored in this object
+    /**
+     * Get the list of oneOf/anyOf composed schemas allowed to be stored in this object
      *
      * @return an instance of the actual schema/object
      */
     public abstract Map<String, GenericType> getSchemas();
 
-    /***
+    /**
      * Get the actual instance
      *
      * @return an instance of the actual schema/object
@@ -56,14 +56,33 @@ public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
     @JsonValue
     public Object getActualInstance() {return instance;}
 
-    /***
+    /**
      * Set the actual instance
      *
      * @param instance the actual instance of the schema/object
      */
     public void setActualInstance(Object instance) {this.instance = instance;}
 
-    /***
+    /**
+     * Get the instant recursively when the schemas defined in oneOf/anyof happen to be oneOf/anyOf schema as well
+     *
+     * @return an instance of the actual schema/object
+     */
+    public Object getActualInstanceRecursively() {
+        return getActualInstanceRecursively(this);
+    }
+
+    private Object getActualInstanceRecursively(AbstractOpenApiSchema object) {
+        if (object.getActualInstance() == null) {
+            return null;
+        } else if (object.getActualInstance() instanceof AbstractOpenApiSchema) {
+            return getActualInstanceRecursively((AbstractOpenApiSchema)object.getActualInstance());
+        } else {
+            return object.getActualInstance();
+        }
+    }
+
+    /**
      * Get the schema type (e.g. anyOf, oneOf)
      *
      * @return the schema type
@@ -112,7 +131,7 @@ public int hashCode() {
         return Objects.hash(instance, isNullable, schemaType);
     }
 
-    /***
+    /**
      * Is nullalble
      *
      * @return true if it's nullable
@@ -124,4 +143,7 @@ public Boolean isNullable() {
             return Boolean.FALSE;
         }
     }
+
+
+
 }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 0f1223c2bc61..da926c598b00 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -13,17 +13,23 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * AdditionalPropertiesAnyType
@@ -31,14 +37,13 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
-public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesAnyType {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
 
   public AdditionalPropertiesAnyType name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -61,7 +66,47 @@ public void setName(String name) {
     this.name = name;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this AdditionalPropertiesAnyType object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -71,13 +116,13 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
-    return Objects.equals(this.name, additionalPropertiesAnyType.name) &&
-        super.equals(o);
+    return Objects.equals(this.name, additionalPropertiesAnyType.name)&&
+        Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, super.hashCode());
+    return Objects.hash(name, additionalProperties);
   }
 
 
@@ -85,8 +130,8 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class AdditionalPropertiesAnyType {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c03535ab9471..a154f367ec50 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -13,18 +13,24 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * AdditionalPropertiesArray
@@ -32,14 +38,13 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
-public class AdditionalPropertiesArray extends HashMap<String, List> {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesArray {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
 
   public AdditionalPropertiesArray name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -62,7 +67,47 @@ public void setName(String name) {
     this.name = name;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, List> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public AdditionalPropertiesArray putAdditionalProperty(String key, List value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, List>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, List> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public List getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this AdditionalPropertiesArray object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -72,13 +117,13 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
-    return Objects.equals(this.name, additionalPropertiesArray.name) &&
-        super.equals(o);
+    return Objects.equals(this.name, additionalPropertiesArray.name)&&
+        Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, super.hashCode());
+    return Objects.hash(name, additionalProperties);
   }
 
 
@@ -86,8 +131,8 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class AdditionalPropertiesArray {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 4356a4f8c1eb..c2669176254a 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -13,17 +13,23 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * AdditionalPropertiesBoolean
@@ -31,14 +37,13 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesBoolean {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
 
   public AdditionalPropertiesBoolean name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -61,7 +66,47 @@ public void setName(String name) {
     this.name = name;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Boolean> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Boolean>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Boolean> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Boolean getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this AdditionalPropertiesBoolean object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -71,13 +116,13 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
-    return Objects.equals(this.name, additionalPropertiesBoolean.name) &&
-        super.equals(o);
+    return Objects.equals(this.name, additionalPropertiesBoolean.name)&&
+        Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, super.hashCode());
+    return Objects.hash(name, additionalProperties);
   }
 
 
@@ -85,8 +130,8 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class AdditionalPropertiesBoolean {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index fa85ab77596a..a057a169cfd8 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +28,8 @@
 import java.util.List;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * AdditionalPropertiesClass
@@ -43,7 +47,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   private Map<String, String> mapString = null;
@@ -80,7 +84,6 @@ public class AdditionalPropertiesClass {
 
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
-    
     this.mapString = mapString;
     return this;
   }
@@ -113,7 +116,6 @@ public void setMapString(Map<String, String> mapString) {
 
 
   public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
-    
     this.mapNumber = mapNumber;
     return this;
   }
@@ -146,7 +148,6 @@ public void setMapNumber(Map<String, BigDecimal> mapNumber) {
 
 
   public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
-    
     this.mapInteger = mapInteger;
     return this;
   }
@@ -179,7 +180,6 @@ public void setMapInteger(Map<String, Integer> mapInteger) {
 
 
   public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
-    
     this.mapBoolean = mapBoolean;
     return this;
   }
@@ -212,7 +212,6 @@ public void setMapBoolean(Map<String, Boolean> mapBoolean) {
 
 
   public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
-    
     this.mapArrayInteger = mapArrayInteger;
     return this;
   }
@@ -245,7 +244,6 @@ public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
 
 
   public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
-    
     this.mapArrayAnytype = mapArrayAnytype;
     return this;
   }
@@ -278,7 +276,6 @@ public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
 
 
   public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> mapMapString) {
-    
     this.mapMapString = mapMapString;
     return this;
   }
@@ -311,7 +308,6 @@ public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
 
 
   public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
-    
     this.mapMapAnytype = mapMapAnytype;
     return this;
   }
@@ -344,7 +340,6 @@ public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
 
 
   public AdditionalPropertiesClass anytype1(Object anytype1) {
-    
     this.anytype1 = anytype1;
     return this;
   }
@@ -369,7 +364,6 @@ public void setAnytype1(Object anytype1) {
 
 
   public AdditionalPropertiesClass anytype2(Object anytype2) {
-    
     this.anytype2 = anytype2;
     return this;
   }
@@ -394,7 +388,6 @@ public void setAnytype2(Object anytype2) {
 
 
   public AdditionalPropertiesClass anytype3(Object anytype3) {
-    
     this.anytype3 = anytype3;
     return this;
   }
@@ -418,6 +411,9 @@ public void setAnytype3(Object anytype3) {
   }
 
 
+  /**
+   * Return true if this AdditionalPropertiesClass object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 2426e7c974c4..caf7134fcf84 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -13,17 +13,23 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * AdditionalPropertiesInteger
@@ -31,14 +37,13 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
-public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesInteger {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
 
   public AdditionalPropertiesInteger name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -61,7 +66,47 @@ public void setName(String name) {
     this.name = name;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Integer> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Integer>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Integer> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Integer getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this AdditionalPropertiesInteger object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -71,13 +116,13 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
-    return Objects.equals(this.name, additionalPropertiesInteger.name) &&
-        super.equals(o);
+    return Objects.equals(this.name, additionalPropertiesInteger.name)&&
+        Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, super.hashCode());
+    return Objects.hash(name, additionalProperties);
   }
 
 
@@ -85,8 +130,8 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class AdditionalPropertiesInteger {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index da407ccdc473..a213d51e4139 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,9 +28,9 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * AdditionalPropertiesNumber
@@ -32,14 +38,13 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesNumber {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
 
   public AdditionalPropertiesNumber name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -62,7 +67,47 @@ public void setName(String name) {
     this.name = name;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, BigDecimal> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, BigDecimal>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, BigDecimal> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public BigDecimal getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this AdditionalPropertiesNumber object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -72,13 +117,13 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
-    return Objects.equals(this.name, additionalPropertiesNumber.name) &&
-        super.equals(o);
+    return Objects.equals(this.name, additionalPropertiesNumber.name)&&
+        Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, super.hashCode());
+    return Objects.hash(name, additionalProperties);
   }
 
 
@@ -86,8 +131,8 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class AdditionalPropertiesNumber {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 5e468870311e..83a6c2cd55f8 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -13,17 +13,24 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * AdditionalPropertiesObject
@@ -31,14 +38,13 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
-public class AdditionalPropertiesObject extends HashMap<String, Map> {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesObject {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
 
   public AdditionalPropertiesObject name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -61,7 +67,47 @@ public void setName(String name) {
     this.name = name;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Map> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Map>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Map> getAdditionalProperties() {
+    return additionalProperties;
+  }
 
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Map getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this AdditionalPropertiesObject object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -71,13 +117,13 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o;
-    return Objects.equals(this.name, additionalPropertiesObject.name) &&
-        super.equals(o);
+    return Objects.equals(this.name, additionalPropertiesObject.name)&&
+        Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, super.hashCode());
+    return Objects.hash(name, additionalProperties);
   }
 
 
@@ -85,8 +131,8 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class AdditionalPropertiesObject {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index ed080254966e..5a52da796a5d 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -13,17 +13,23 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * AdditionalPropertiesString
@@ -31,14 +37,13 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
-public class AdditionalPropertiesString extends HashMap<String, String> {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesString {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
 
   public AdditionalPropertiesString name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -61,7 +66,47 @@ public void setName(String name) {
     this.name = name;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, String> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public AdditionalPropertiesString putAdditionalProperty(String key, String value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, String>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, String> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public String getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this AdditionalPropertiesString object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -71,13 +116,13 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o;
-    return Objects.equals(this.name, additionalPropertiesString.name) &&
-        super.equals(o);
+    return Objects.equals(this.name, additionalPropertiesString.name)&&
+        Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, super.hashCode());
+    return Objects.hash(name, additionalProperties);
   }
 
 
@@ -85,8 +130,8 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class AdditionalPropertiesString {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
index 67751ea072f8..a53105de3265 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -27,6 +29,8 @@
 import org.openapitools.client.model.Cat;
 import org.openapitools.client.model.Dog;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Animal
@@ -35,7 +39,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
@@ -52,7 +56,6 @@ public class Animal {
 
 
   public Animal className(String className) {
-    
     this.className = className;
     return this;
   }
@@ -76,7 +79,6 @@ public void setClassName(String className) {
 
 
   public Animal color(String color) {
-    
     this.color = color;
     return this;
   }
@@ -100,6 +102,9 @@ public void setColor(String color) {
   }
 
 
+  /**
+   * Return true if this Animal object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -140,5 +145,14 @@ private String toIndentedString(java.lang.Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 
+static {
+  // Initialize and register the discriminator mappings.
+  Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+  mappings.put("BigCat", BigCat.class);
+  mappings.put("Cat", Cat.class);
+  mappings.put("Dog", Dog.class);
+  mappings.put("Animal", Animal.class);
+  JSON.registerDiscriminator(Animal.class, "className", mappings);
+}
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 28d19953c345..ae6c3866e081 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ArrayOfArrayOfNumberOnly
@@ -32,14 +36,13 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
 
 
   public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
-    
     this.arrayArrayNumber = arrayArrayNumber;
     return this;
   }
@@ -71,6 +74,9 @@ public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
   }
 
 
+  /**
+   * Return true if this ArrayOfArrayOfNumberOnly object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 5eeac9d8ac5d..5197dda9bc4f 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ArrayOfNumberOnly
@@ -32,14 +36,13 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
 
 
   public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
-    
     this.arrayNumber = arrayNumber;
     return this;
   }
@@ -71,6 +74,9 @@ public void setArrayNumber(List<BigDecimal> arrayNumber) {
   }
 
 
+  /**
+   * Return true if this ArrayOfNumberOnly object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
index df57098053eb..0d125019fe68 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import java.util.List;
 import org.openapitools.client.model.ReadOnlyFirst;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ArrayTest
@@ -34,7 +38,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   private List<String> arrayOfString = null;
@@ -47,7 +51,6 @@ public class ArrayTest {
 
 
   public ArrayTest arrayOfString(List<String> arrayOfString) {
-    
     this.arrayOfString = arrayOfString;
     return this;
   }
@@ -80,7 +83,6 @@ public void setArrayOfString(List<String> arrayOfString) {
 
 
   public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
-    
     this.arrayArrayOfInteger = arrayArrayOfInteger;
     return this;
   }
@@ -113,7 +115,6 @@ public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
 
 
   public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
-    
     this.arrayArrayOfModel = arrayArrayOfModel;
     return this;
   }
@@ -145,6 +146,9 @@ public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
   }
 
 
+  /**
+   * Return true if this ArrayTest object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCat.java
index c4386f4e6011..ebe7aa71ecb1 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCat.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +28,8 @@
 import org.openapitools.client.model.BigCatAllOf;
 import org.openapitools.client.model.Cat;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * BigCat
@@ -33,7 +37,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
@@ -83,7 +87,6 @@ public static KindEnum fromValue(String value) {
 
 
   public BigCat kind(KindEnum kind) {
-    
     this.kind = kind;
     return this;
   }
@@ -107,6 +110,9 @@ public void setKind(KindEnum kind) {
   }
 
 
+  /**
+   * Return true if this BigCat object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -147,5 +153,11 @@ private String toIndentedString(java.lang.Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 
+static {
+  // Initialize and register the discriminator mappings.
+  Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+  mappings.put("BigCat", BigCat.class);
+  JSON.registerDiscriminator(BigCat.class, "className", mappings);
+}
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index 7ce0ddb21f5a..704cc5dd5884 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * BigCatAllOf
@@ -29,7 +33,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
@@ -75,7 +79,6 @@ public static KindEnum fromValue(String value) {
 
 
   public BigCatAllOf kind(KindEnum kind) {
-    
     this.kind = kind;
     return this;
   }
@@ -99,6 +102,9 @@ public void setKind(KindEnum kind) {
   }
 
 
+  /**
+   * Return true if this BigCat_allOf object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
index 033e97881105..c87ca1ea948b 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Capitalization
@@ -34,7 +38,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   private String smallCamel;
@@ -56,7 +60,6 @@ public class Capitalization {
 
 
   public Capitalization smallCamel(String smallCamel) {
-    
     this.smallCamel = smallCamel;
     return this;
   }
@@ -81,7 +84,6 @@ public void setSmallCamel(String smallCamel) {
 
 
   public Capitalization capitalCamel(String capitalCamel) {
-    
     this.capitalCamel = capitalCamel;
     return this;
   }
@@ -106,7 +108,6 @@ public void setCapitalCamel(String capitalCamel) {
 
 
   public Capitalization smallSnake(String smallSnake) {
-    
     this.smallSnake = smallSnake;
     return this;
   }
@@ -131,7 +132,6 @@ public void setSmallSnake(String smallSnake) {
 
 
   public Capitalization capitalSnake(String capitalSnake) {
-    
     this.capitalSnake = capitalSnake;
     return this;
   }
@@ -156,7 +156,6 @@ public void setCapitalSnake(String capitalSnake) {
 
 
   public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
-    
     this.scAETHFlowPoints = scAETHFlowPoints;
     return this;
   }
@@ -181,7 +180,6 @@ public void setScAETHFlowPoints(String scAETHFlowPoints) {
 
 
   public Capitalization ATT_NAME(String ATT_NAME) {
-    
     this.ATT_NAME = ATT_NAME;
     return this;
   }
@@ -205,6 +203,9 @@ public void setATTNAME(String ATT_NAME) {
   }
 
 
+  /**
+   * Return true if this Capitalization object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
index 11ce48991b06..23331093f203 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -27,6 +29,8 @@
 import org.openapitools.client.model.BigCat;
 import org.openapitools.client.model.CatAllOf;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Cat
@@ -34,7 +38,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
@@ -46,7 +50,6 @@ public class Cat extends Animal {
 
 
   public Cat declawed(Boolean declawed) {
-    
     this.declawed = declawed;
     return this;
   }
@@ -70,6 +73,9 @@ public void setDeclawed(Boolean declawed) {
   }
 
 
+  /**
+   * Return true if this Cat object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -110,5 +116,12 @@ private String toIndentedString(java.lang.Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 
+static {
+  // Initialize and register the discriminator mappings.
+  Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+  mappings.put("BigCat", BigCat.class);
+  mappings.put("Cat", Cat.class);
+  JSON.registerDiscriminator(Cat.class, "className", mappings);
+}
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
index 3e7b991436aa..f3060f5d0e36 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * CatAllOf
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
 
 
   public CatAllOf declawed(Boolean declawed) {
-    
     this.declawed = declawed;
     return this;
   }
@@ -60,6 +63,9 @@ public void setDeclawed(Boolean declawed) {
   }
 
 
+  /**
+   * Return true if this Cat_allOf object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
index 868ba8750742..de082b6e900f 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Category
@@ -30,7 +34,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
@@ -40,7 +44,6 @@ public class Category {
 
 
   public Category id(Long id) {
-    
     this.id = id;
     return this;
   }
@@ -65,7 +68,6 @@ public void setId(Long id) {
 
 
   public Category name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -88,6 +90,9 @@ public void setName(String name) {
   }
 
 
+  /**
+   * Return true if this Category object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
index 4de7664b26a7..ebaa83367832 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Model for testing model with \&quot;_class\&quot; property
@@ -30,14 +34,13 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
 
 
   public ClassModel propertyClass(String propertyClass) {
-    
     this.propertyClass = propertyClass;
     return this;
   }
@@ -61,6 +64,9 @@ public void setPropertyClass(String propertyClass) {
   }
 
 
+  /**
+   * Return true if this ClassModel object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
index 02b0aac2247a..1bc59615daea 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Client
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
 
 
   public Client client(String client) {
-    
     this.client = client;
     return this;
   }
@@ -60,6 +63,9 @@ public void setClient(String client) {
   }
 
 
+  /**
+   * Return true if this Client object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
index f56658043689..8815d87acaac 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +28,8 @@
 import org.openapitools.client.model.Animal;
 import org.openapitools.client.model.DogAllOf;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Dog
@@ -33,7 +37,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
@@ -44,7 +48,6 @@ public class Dog extends Animal {
 
 
   public Dog breed(String breed) {
-    
     this.breed = breed;
     return this;
   }
@@ -68,6 +71,9 @@ public void setBreed(String breed) {
   }
 
 
+  /**
+   * Return true if this Dog object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -108,5 +114,11 @@ private String toIndentedString(java.lang.Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 
+static {
+  // Initialize and register the discriminator mappings.
+  Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+  mappings.put("Dog", Dog.class);
+  JSON.registerDiscriminator(Dog.class, "className", mappings);
+}
 }
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
index dd42595cf202..c8e362e0e9d7 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * DogAllOf
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
 
 
   public DogAllOf breed(String breed) {
-    
     this.breed = breed;
     return this;
   }
@@ -60,6 +63,9 @@ public void setBreed(String breed) {
   }
 
 
+  /**
+   * Return true if this Dog_allOf object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
index 86526adb3fa7..7916b8a9cd7e 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -24,6 +26,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * EnumArrays
@@ -32,7 +36,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
@@ -112,7 +116,6 @@ public static ArrayEnumEnum fromValue(String value) {
 
 
   public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
-    
     this.justSymbol = justSymbol;
     return this;
   }
@@ -137,7 +140,6 @@ public void setJustSymbol(JustSymbolEnum justSymbol) {
 
 
   public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
-    
     this.arrayEnum = arrayEnum;
     return this;
   }
@@ -169,6 +171,9 @@ public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
   }
 
 
+  /**
+   * Return true if this EnumArrays object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java
index e9102d974276..973b51cc93e4 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java
@@ -15,7 +15,11 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
index 51a1a645a109..9449a2c904fc 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -23,6 +25,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.OuterEnum;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * EnumTest
@@ -34,7 +38,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
@@ -197,7 +201,6 @@ public static EnumNumberEnum fromValue(Double value) {
 
 
   public EnumTest enumString(EnumStringEnum enumString) {
-    
     this.enumString = enumString;
     return this;
   }
@@ -222,7 +225,6 @@ public void setEnumString(EnumStringEnum enumString) {
 
 
   public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
-    
     this.enumStringRequired = enumStringRequired;
     return this;
   }
@@ -246,7 +248,6 @@ public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
 
 
   public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
-    
     this.enumInteger = enumInteger;
     return this;
   }
@@ -271,7 +272,6 @@ public void setEnumInteger(EnumIntegerEnum enumInteger) {
 
 
   public EnumTest enumNumber(EnumNumberEnum enumNumber) {
-    
     this.enumNumber = enumNumber;
     return this;
   }
@@ -296,7 +296,6 @@ public void setEnumNumber(EnumNumberEnum enumNumber) {
 
 
   public EnumTest outerEnum(OuterEnum outerEnum) {
-    
     this.outerEnum = outerEnum;
     return this;
   }
@@ -320,6 +319,9 @@ public void setOuterEnum(OuterEnum outerEnum) {
   }
 
 
+  /**
+   * Return true if this Enum_Test object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index cfd62fbce628..4680680d6d78 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -24,6 +26,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * FileSchemaTestClass
@@ -32,7 +36,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
   private java.io.File file;
@@ -42,7 +46,6 @@ public class FileSchemaTestClass {
 
 
   public FileSchemaTestClass file(java.io.File file) {
-    
     this.file = file;
     return this;
   }
@@ -67,7 +70,6 @@ public void setFile(java.io.File file) {
 
 
   public FileSchemaTestClass files(List<java.io.File> files) {
-    
     this.files = files;
     return this;
   }
@@ -99,6 +101,9 @@ public void setFiles(List<java.io.File> files) {
   }
 
 
+  /**
+   * Return true if this FileSchemaTestClass object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
index 72ed8740e4d7..30eb6a65fdef 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -27,6 +29,8 @@
 import java.time.OffsetDateTime;
 import java.util.UUID;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * FormatTest
@@ -47,7 +51,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
@@ -93,7 +97,6 @@ public class FormatTest {
 
 
   public FormatTest integer(Integer integer) {
-    
     this.integer = integer;
     return this;
   }
@@ -120,7 +123,6 @@ public void setInteger(Integer integer) {
 
 
   public FormatTest int32(Integer int32) {
-    
     this.int32 = int32;
     return this;
   }
@@ -147,7 +149,6 @@ public void setInt32(Integer int32) {
 
 
   public FormatTest int64(Long int64) {
-    
     this.int64 = int64;
     return this;
   }
@@ -172,7 +173,6 @@ public void setInt64(Long int64) {
 
 
   public FormatTest number(BigDecimal number) {
-    
     this.number = number;
     return this;
   }
@@ -198,7 +198,6 @@ public void setNumber(BigDecimal number) {
 
 
   public FormatTest _float(Float _float) {
-    
     this._float = _float;
     return this;
   }
@@ -225,7 +224,6 @@ public void setFloat(Float _float) {
 
 
   public FormatTest _double(Double _double) {
-    
     this._double = _double;
     return this;
   }
@@ -252,7 +250,6 @@ public void setDouble(Double _double) {
 
 
   public FormatTest string(String string) {
-    
     this.string = string;
     return this;
   }
@@ -277,7 +274,6 @@ public void setString(String string) {
 
 
   public FormatTest _byte(byte[] _byte) {
-    
     this._byte = _byte;
     return this;
   }
@@ -301,7 +297,6 @@ public void setByte(byte[] _byte) {
 
 
   public FormatTest binary(File binary) {
-    
     this.binary = binary;
     return this;
   }
@@ -326,7 +321,6 @@ public void setBinary(File binary) {
 
 
   public FormatTest date(LocalDate date) {
-    
     this.date = date;
     return this;
   }
@@ -350,7 +344,6 @@ public void setDate(LocalDate date) {
 
 
   public FormatTest dateTime(OffsetDateTime dateTime) {
-    
     this.dateTime = dateTime;
     return this;
   }
@@ -375,7 +368,6 @@ public void setDateTime(OffsetDateTime dateTime) {
 
 
   public FormatTest uuid(UUID uuid) {
-    
     this.uuid = uuid;
     return this;
   }
@@ -400,7 +392,6 @@ public void setUuid(UUID uuid) {
 
 
   public FormatTest password(String password) {
-    
     this.password = password;
     return this;
   }
@@ -424,7 +415,6 @@ public void setPassword(String password) {
 
 
   public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    
     this.bigDecimal = bigDecimal;
     return this;
   }
@@ -448,6 +438,9 @@ public void setBigDecimal(BigDecimal bigDecimal) {
   }
 
 
+  /**
+   * Return true if this format_test object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 0a3f0d464360..b802d5acf615 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * HasOnlyReadOnly
@@ -30,7 +34,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
@@ -71,6 +75,9 @@ public String getFoo() {
 
 
 
+  /**
+   * Return true if this hasOnlyReadOnly object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
index 3e72350aa8b1..d2f49b5bb632 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import java.util.List;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * MapTest
@@ -35,7 +39,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   private Map<String, Map<String, String>> mapMapOfString = null;
@@ -86,7 +90,6 @@ public static InnerEnum fromValue(String value) {
 
 
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
-    
     this.mapMapOfString = mapMapOfString;
     return this;
   }
@@ -119,7 +122,6 @@ public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
 
 
   public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
-    
     this.mapOfEnumString = mapOfEnumString;
     return this;
   }
@@ -152,7 +154,6 @@ public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
 
 
   public MapTest directMap(Map<String, Boolean> directMap) {
-    
     this.directMap = directMap;
     return this;
   }
@@ -185,7 +186,6 @@ public void setDirectMap(Map<String, Boolean> directMap) {
 
 
   public MapTest indirectMap(Map<String, Boolean> indirectMap) {
-    
     this.indirectMap = indirectMap;
     return this;
   }
@@ -217,6 +217,9 @@ public void setIndirectMap(Map<String, Boolean> indirectMap) {
   }
 
 
+  /**
+   * Return true if this MapTest object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 07d314691a97..3d3037cfb68d 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -28,6 +30,8 @@
 import java.util.UUID;
 import org.openapitools.client.model.Animal;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
@@ -37,7 +41,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
@@ -50,7 +54,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
 
 
   public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    
     this.uuid = uuid;
     return this;
   }
@@ -75,7 +78,6 @@ public void setUuid(UUID uuid) {
 
 
   public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    
     this.dateTime = dateTime;
     return this;
   }
@@ -100,7 +102,6 @@ public void setDateTime(OffsetDateTime dateTime) {
 
 
   public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    
     this.map = map;
     return this;
   }
@@ -132,6 +133,9 @@ public void setMap(Map<String, Animal> map) {
   }
 
 
+  /**
+   * Return true if this MixedPropertiesAndAdditionalPropertiesClass object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
index dd99468a0059..7775d5835ca3 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Model for testing model name starting with number
@@ -31,7 +35,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
@@ -41,7 +45,6 @@ public class Model200Response {
 
 
   public Model200Response name(Integer name) {
-    
     this.name = name;
     return this;
   }
@@ -66,7 +69,6 @@ public void setName(Integer name) {
 
 
   public Model200Response propertyClass(String propertyClass) {
-    
     this.propertyClass = propertyClass;
     return this;
   }
@@ -90,6 +92,9 @@ public void setPropertyClass(String propertyClass) {
   }
 
 
+  /**
+   * Return true if this 200_response object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 383cafdd3a5a..da4182452b58 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ModelApiResponse
@@ -31,7 +35,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
   private Integer code;
@@ -44,7 +48,6 @@ public class ModelApiResponse {
 
 
   public ModelApiResponse code(Integer code) {
-    
     this.code = code;
     return this;
   }
@@ -69,7 +72,6 @@ public void setCode(Integer code) {
 
 
   public ModelApiResponse type(String type) {
-    
     this.type = type;
     return this;
   }
@@ -94,7 +96,6 @@ public void setType(String type) {
 
 
   public ModelApiResponse message(String message) {
-    
     this.message = message;
     return this;
   }
@@ -118,6 +119,9 @@ public void setMessage(String message) {
   }
 
 
+  /**
+   * Return true if this ApiResponse object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
index b62e13a90a0c..ba4143056b7e 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Model for testing reserved words
@@ -30,14 +34,13 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
 
 
   public ModelReturn _return(Integer _return) {
-    
     this._return = _return;
     return this;
   }
@@ -61,6 +64,9 @@ public void setReturn(Integer _return) {
   }
 
 
+  /**
+   * Return true if this Return object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
index bd625c5f66f3..0dd87332e679 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Model for testing model name same as property name
@@ -33,7 +37,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
@@ -49,7 +53,6 @@ public class Name {
 
 
   public Name name(Integer name) {
-    
     this.name = name;
     return this;
   }
@@ -89,7 +92,6 @@ public Integer getSnakeCase() {
 
 
   public Name property(String property) {
-    
     this.property = property;
     return this;
   }
@@ -129,6 +131,9 @@ public Integer get123number() {
 
 
 
+  /**
+   * Return true if this Name object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5ca72a169fe8..751777ec56f4 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -23,6 +25,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * NumberOnly
@@ -30,14 +34,13 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
 
 
   public NumberOnly justNumber(BigDecimal justNumber) {
-    
     this.justNumber = justNumber;
     return this;
   }
@@ -61,6 +64,9 @@ public void setJustNumber(BigDecimal justNumber) {
   }
 
 
+  /**
+   * Return true if this NumberOnly object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
index ba4e395e94e9..5c780beef5d0 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -23,6 +25,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Order
@@ -35,7 +39,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
@@ -94,7 +98,6 @@ public static StatusEnum fromValue(String value) {
 
 
   public Order id(Long id) {
-    
     this.id = id;
     return this;
   }
@@ -119,7 +122,6 @@ public void setId(Long id) {
 
 
   public Order petId(Long petId) {
-    
     this.petId = petId;
     return this;
   }
@@ -144,7 +146,6 @@ public void setPetId(Long petId) {
 
 
   public Order quantity(Integer quantity) {
-    
     this.quantity = quantity;
     return this;
   }
@@ -169,7 +170,6 @@ public void setQuantity(Integer quantity) {
 
 
   public Order shipDate(OffsetDateTime shipDate) {
-    
     this.shipDate = shipDate;
     return this;
   }
@@ -194,7 +194,6 @@ public void setShipDate(OffsetDateTime shipDate) {
 
 
   public Order status(StatusEnum status) {
-    
     this.status = status;
     return this;
   }
@@ -219,7 +218,6 @@ public void setStatus(StatusEnum status) {
 
 
   public Order complete(Boolean complete) {
-    
     this.complete = complete;
     return this;
   }
@@ -243,6 +241,9 @@ public void setComplete(Boolean complete) {
   }
 
 
+  /**
+   * Return true if this Order object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
index d4d9ac6ba110..93630fda594e 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -23,6 +25,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * OuterComposite
@@ -32,7 +36,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   private BigDecimal myNumber;
@@ -45,7 +49,6 @@ public class OuterComposite {
 
 
   public OuterComposite myNumber(BigDecimal myNumber) {
-    
     this.myNumber = myNumber;
     return this;
   }
@@ -70,7 +73,6 @@ public void setMyNumber(BigDecimal myNumber) {
 
 
   public OuterComposite myString(String myString) {
-    
     this.myString = myString;
     return this;
   }
@@ -95,7 +97,6 @@ public void setMyString(String myString) {
 
 
   public OuterComposite myBoolean(Boolean myBoolean) {
-    
     this.myBoolean = myBoolean;
     return this;
   }
@@ -119,6 +120,9 @@ public void setMyBoolean(Boolean myBoolean) {
   }
 
 
+  /**
+   * Return true if this OuterComposite object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java
index 308646a320c7..866df2ba31bb 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java
@@ -15,7 +15,11 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
index 3baccce6f9c4..8df16028a8ee 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -28,6 +30,8 @@
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Pet
@@ -40,7 +44,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
@@ -99,7 +103,6 @@ public static StatusEnum fromValue(String value) {
 
 
   public Pet id(Long id) {
-    
     this.id = id;
     return this;
   }
@@ -124,7 +127,6 @@ public void setId(Long id) {
 
 
   public Pet category(Category category) {
-    
     this.category = category;
     return this;
   }
@@ -149,7 +151,6 @@ public void setCategory(Category category) {
 
 
   public Pet name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -173,7 +174,6 @@ public void setName(String name) {
 
 
   public Pet photoUrls(Set<String> photoUrls) {
-    
     this.photoUrls = photoUrls;
     return this;
   }
@@ -202,7 +202,6 @@ public void setPhotoUrls(Set<String> photoUrls) {
 
 
   public Pet tags(List<Tag> tags) {
-    
     this.tags = tags;
     return this;
   }
@@ -235,7 +234,6 @@ public void setTags(List<Tag> tags) {
 
 
   public Pet status(StatusEnum status) {
-    
     this.status = status;
     return this;
   }
@@ -259,6 +257,9 @@ public void setStatus(StatusEnum status) {
   }
 
 
+  /**
+   * Return true if this Pet object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b3e58ef3d2c5..ba58c8cb29fe 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ReadOnlyFirst
@@ -30,7 +34,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
@@ -56,7 +60,6 @@ public String getBar() {
 
 
   public ReadOnlyFirst baz(String baz) {
-    
     this.baz = baz;
     return this;
   }
@@ -80,6 +83,9 @@ public void setBaz(String baz) {
   }
 
 
+  /**
+   * Return true if this ReadOnlyFirst object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 35ad3bf46994..a69740babcd3 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * SpecialModelName
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
 
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
-    
     this.$specialPropertyName = $specialPropertyName;
     return this;
   }
@@ -60,6 +63,9 @@ public class SpecialModelName {
   }
 
 
+  /**
+   * Return true if this $special[model.name] object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
index a3ecb398faa3..78b29486f2e7 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Tag
@@ -30,7 +34,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
@@ -40,7 +44,6 @@ public class Tag {
 
 
   public Tag id(Long id) {
-    
     this.id = id;
     return this;
   }
@@ -65,7 +68,6 @@ public void setId(Long id) {
 
 
   public Tag name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -89,6 +91,9 @@ public void setName(String name) {
   }
 
 
+  /**
+   * Return true if this Tag object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index f79d7b6383a7..7376f1752493 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * TypeHolderDefault
@@ -36,7 +40,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem = "what";
@@ -55,7 +59,6 @@ public class TypeHolderDefault {
 
 
   public TypeHolderDefault stringItem(String stringItem) {
-    
     this.stringItem = stringItem;
     return this;
   }
@@ -79,7 +82,6 @@ public void setStringItem(String stringItem) {
 
 
   public TypeHolderDefault numberItem(BigDecimal numberItem) {
-    
     this.numberItem = numberItem;
     return this;
   }
@@ -103,7 +105,6 @@ public void setNumberItem(BigDecimal numberItem) {
 
 
   public TypeHolderDefault integerItem(Integer integerItem) {
-    
     this.integerItem = integerItem;
     return this;
   }
@@ -127,7 +128,6 @@ public void setIntegerItem(Integer integerItem) {
 
 
   public TypeHolderDefault boolItem(Boolean boolItem) {
-    
     this.boolItem = boolItem;
     return this;
   }
@@ -151,7 +151,6 @@ public void setBoolItem(Boolean boolItem) {
 
 
   public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
-    
     this.arrayItem = arrayItem;
     return this;
   }
@@ -179,6 +178,9 @@ public void setArrayItem(List<Integer> arrayItem) {
   }
 
 
+  /**
+   * Return true if this TypeHolderDefault object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index f15b107fd18b..2c90730bca23 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * TypeHolderExample
@@ -37,7 +41,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem;
@@ -59,7 +63,6 @@ public class TypeHolderExample {
 
 
   public TypeHolderExample stringItem(String stringItem) {
-    
     this.stringItem = stringItem;
     return this;
   }
@@ -83,7 +86,6 @@ public void setStringItem(String stringItem) {
 
 
   public TypeHolderExample numberItem(BigDecimal numberItem) {
-    
     this.numberItem = numberItem;
     return this;
   }
@@ -107,7 +109,6 @@ public void setNumberItem(BigDecimal numberItem) {
 
 
   public TypeHolderExample floatItem(Float floatItem) {
-    
     this.floatItem = floatItem;
     return this;
   }
@@ -131,7 +132,6 @@ public void setFloatItem(Float floatItem) {
 
 
   public TypeHolderExample integerItem(Integer integerItem) {
-    
     this.integerItem = integerItem;
     return this;
   }
@@ -155,7 +155,6 @@ public void setIntegerItem(Integer integerItem) {
 
 
   public TypeHolderExample boolItem(Boolean boolItem) {
-    
     this.boolItem = boolItem;
     return this;
   }
@@ -179,7 +178,6 @@ public void setBoolItem(Boolean boolItem) {
 
 
   public TypeHolderExample arrayItem(List<Integer> arrayItem) {
-    
     this.arrayItem = arrayItem;
     return this;
   }
@@ -207,6 +205,9 @@ public void setArrayItem(List<Integer> arrayItem) {
   }
 
 
+  /**
+   * Return true if this TypeHolderExample object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
index b7e74643dab2..0e4ed3e56624 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * User
@@ -36,7 +40,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
@@ -64,7 +68,6 @@ public class User {
 
 
   public User id(Long id) {
-    
     this.id = id;
     return this;
   }
@@ -89,7 +92,6 @@ public void setId(Long id) {
 
 
   public User username(String username) {
-    
     this.username = username;
     return this;
   }
@@ -114,7 +116,6 @@ public void setUsername(String username) {
 
 
   public User firstName(String firstName) {
-    
     this.firstName = firstName;
     return this;
   }
@@ -139,7 +140,6 @@ public void setFirstName(String firstName) {
 
 
   public User lastName(String lastName) {
-    
     this.lastName = lastName;
     return this;
   }
@@ -164,7 +164,6 @@ public void setLastName(String lastName) {
 
 
   public User email(String email) {
-    
     this.email = email;
     return this;
   }
@@ -189,7 +188,6 @@ public void setEmail(String email) {
 
 
   public User password(String password) {
-    
     this.password = password;
     return this;
   }
@@ -214,7 +212,6 @@ public void setPassword(String password) {
 
 
   public User phone(String phone) {
-    
     this.phone = phone;
     return this;
   }
@@ -239,7 +236,6 @@ public void setPhone(String phone) {
 
 
   public User userStatus(Integer userStatus) {
-    
     this.userStatus = userStatus;
     return this;
   }
@@ -263,6 +259,9 @@ public void setUserStatus(Integer userStatus) {
   }
 
 
+  /**
+   * Return true if this User object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java
index b3fbdce31b9b..ce110f1144ce 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * XmlItem
@@ -60,7 +64,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   private String attributeString;
@@ -151,7 +155,6 @@ public class XmlItem {
 
 
   public XmlItem attributeString(String attributeString) {
-    
     this.attributeString = attributeString;
     return this;
   }
@@ -176,7 +179,6 @@ public void setAttributeString(String attributeString) {
 
 
   public XmlItem attributeNumber(BigDecimal attributeNumber) {
-    
     this.attributeNumber = attributeNumber;
     return this;
   }
@@ -201,7 +203,6 @@ public void setAttributeNumber(BigDecimal attributeNumber) {
 
 
   public XmlItem attributeInteger(Integer attributeInteger) {
-    
     this.attributeInteger = attributeInteger;
     return this;
   }
@@ -226,7 +227,6 @@ public void setAttributeInteger(Integer attributeInteger) {
 
 
   public XmlItem attributeBoolean(Boolean attributeBoolean) {
-    
     this.attributeBoolean = attributeBoolean;
     return this;
   }
@@ -251,7 +251,6 @@ public void setAttributeBoolean(Boolean attributeBoolean) {
 
 
   public XmlItem wrappedArray(List<Integer> wrappedArray) {
-    
     this.wrappedArray = wrappedArray;
     return this;
   }
@@ -284,7 +283,6 @@ public void setWrappedArray(List<Integer> wrappedArray) {
 
 
   public XmlItem nameString(String nameString) {
-    
     this.nameString = nameString;
     return this;
   }
@@ -309,7 +307,6 @@ public void setNameString(String nameString) {
 
 
   public XmlItem nameNumber(BigDecimal nameNumber) {
-    
     this.nameNumber = nameNumber;
     return this;
   }
@@ -334,7 +331,6 @@ public void setNameNumber(BigDecimal nameNumber) {
 
 
   public XmlItem nameInteger(Integer nameInteger) {
-    
     this.nameInteger = nameInteger;
     return this;
   }
@@ -359,7 +355,6 @@ public void setNameInteger(Integer nameInteger) {
 
 
   public XmlItem nameBoolean(Boolean nameBoolean) {
-    
     this.nameBoolean = nameBoolean;
     return this;
   }
@@ -384,7 +379,6 @@ public void setNameBoolean(Boolean nameBoolean) {
 
 
   public XmlItem nameArray(List<Integer> nameArray) {
-    
     this.nameArray = nameArray;
     return this;
   }
@@ -417,7 +411,6 @@ public void setNameArray(List<Integer> nameArray) {
 
 
   public XmlItem nameWrappedArray(List<Integer> nameWrappedArray) {
-    
     this.nameWrappedArray = nameWrappedArray;
     return this;
   }
@@ -450,7 +443,6 @@ public void setNameWrappedArray(List<Integer> nameWrappedArray) {
 
 
   public XmlItem prefixString(String prefixString) {
-    
     this.prefixString = prefixString;
     return this;
   }
@@ -475,7 +467,6 @@ public void setPrefixString(String prefixString) {
 
 
   public XmlItem prefixNumber(BigDecimal prefixNumber) {
-    
     this.prefixNumber = prefixNumber;
     return this;
   }
@@ -500,7 +491,6 @@ public void setPrefixNumber(BigDecimal prefixNumber) {
 
 
   public XmlItem prefixInteger(Integer prefixInteger) {
-    
     this.prefixInteger = prefixInteger;
     return this;
   }
@@ -525,7 +515,6 @@ public void setPrefixInteger(Integer prefixInteger) {
 
 
   public XmlItem prefixBoolean(Boolean prefixBoolean) {
-    
     this.prefixBoolean = prefixBoolean;
     return this;
   }
@@ -550,7 +539,6 @@ public void setPrefixBoolean(Boolean prefixBoolean) {
 
 
   public XmlItem prefixArray(List<Integer> prefixArray) {
-    
     this.prefixArray = prefixArray;
     return this;
   }
@@ -583,7 +571,6 @@ public void setPrefixArray(List<Integer> prefixArray) {
 
 
   public XmlItem prefixWrappedArray(List<Integer> prefixWrappedArray) {
-    
     this.prefixWrappedArray = prefixWrappedArray;
     return this;
   }
@@ -616,7 +603,6 @@ public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
 
 
   public XmlItem namespaceString(String namespaceString) {
-    
     this.namespaceString = namespaceString;
     return this;
   }
@@ -641,7 +627,6 @@ public void setNamespaceString(String namespaceString) {
 
 
   public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
-    
     this.namespaceNumber = namespaceNumber;
     return this;
   }
@@ -666,7 +651,6 @@ public void setNamespaceNumber(BigDecimal namespaceNumber) {
 
 
   public XmlItem namespaceInteger(Integer namespaceInteger) {
-    
     this.namespaceInteger = namespaceInteger;
     return this;
   }
@@ -691,7 +675,6 @@ public void setNamespaceInteger(Integer namespaceInteger) {
 
 
   public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
-    
     this.namespaceBoolean = namespaceBoolean;
     return this;
   }
@@ -716,7 +699,6 @@ public void setNamespaceBoolean(Boolean namespaceBoolean) {
 
 
   public XmlItem namespaceArray(List<Integer> namespaceArray) {
-    
     this.namespaceArray = namespaceArray;
     return this;
   }
@@ -749,7 +731,6 @@ public void setNamespaceArray(List<Integer> namespaceArray) {
 
 
   public XmlItem namespaceWrappedArray(List<Integer> namespaceWrappedArray) {
-    
     this.namespaceWrappedArray = namespaceWrappedArray;
     return this;
   }
@@ -782,7 +763,6 @@ public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
 
 
   public XmlItem prefixNsString(String prefixNsString) {
-    
     this.prefixNsString = prefixNsString;
     return this;
   }
@@ -807,7 +787,6 @@ public void setPrefixNsString(String prefixNsString) {
 
 
   public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
-    
     this.prefixNsNumber = prefixNsNumber;
     return this;
   }
@@ -832,7 +811,6 @@ public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
 
 
   public XmlItem prefixNsInteger(Integer prefixNsInteger) {
-    
     this.prefixNsInteger = prefixNsInteger;
     return this;
   }
@@ -857,7 +835,6 @@ public void setPrefixNsInteger(Integer prefixNsInteger) {
 
 
   public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
-    
     this.prefixNsBoolean = prefixNsBoolean;
     return this;
   }
@@ -882,7 +859,6 @@ public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
 
 
   public XmlItem prefixNsArray(List<Integer> prefixNsArray) {
-    
     this.prefixNsArray = prefixNsArray;
     return this;
   }
@@ -915,7 +891,6 @@ public void setPrefixNsArray(List<Integer> prefixNsArray) {
 
 
   public XmlItem prefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
-    
     this.prefixNsWrappedArray = prefixNsWrappedArray;
     return this;
   }
@@ -947,6 +922,9 @@ public void setPrefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
   }
 
 
+  /**
+   * Return true if this XmlItem object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONTest.java b/samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONTest.java
index 7fb307a3df8d..dda1ef9c1efd 100644
--- a/samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONTest.java
@@ -3,7 +3,9 @@
 import org.openapitools.client.model.Order;
 
 import java.lang.Exception;
-
+import java.util.Date;
+import java.util.TimeZone;
+import java.text.SimpleDateFormat;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -32,6 +34,33 @@ public void testDefaultDate() throws Exception {
         assertEquals(dateStr, dateFormat.format(o.getShipDate()));
     }
 
+    @Test
+    public void testRFC3339DateFormatDate() throws Exception {
+        {
+            String dateStr = "2011-01-18 00:00:00.0Z";
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S'Z'");
+            sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
+            Date date = sdf.parse(dateStr);
+            
+            RFC3339DateFormat df = new RFC3339DateFormat();
+            StringBuffer sb = new StringBuffer();
+            String s = df.format(date);
+            System.out.println("DATE: " + s);
+            assertEquals("2011-01-18T00:00:00.000Z", s);
+        }
+        {
+            String dateStr = "2011-01-18 00:00:00.0";
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");
+            sdf.setTimeZone(TimeZone.getTimeZone("America/Los_Angeles"));
+            Date date = sdf.parse(dateStr);
+            
+            RFC3339DateFormat df = new RFC3339DateFormat();
+            StringBuffer sb = new StringBuffer();
+            String s = df.format(date);
+            assertEquals("2011-01-18T08:00:00.000Z", s);
+        }
+    }
+
     @Test
     public void testCustomDate() throws Exception {
         final DateTimeFormatter dateFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("Etc/GMT+2"));
diff --git a/samples/client/petstore/java/microprofile-rest-client/pom.xml b/samples/client/petstore/java/microprofile-rest-client/pom.xml
index 7cbd4fec38f4..bd3e252b97c1 100644
--- a/samples/client/petstore/java/microprofile-rest-client/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client/pom.xml
@@ -77,18 +77,21 @@
       <version>1.3.5</version>
       <scope>test</scope>
     </dependency>
-    
     <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-extension-providers</artifactId>
         <version>3.2.6</version>
     </dependency>
-
     <dependency>
       <groupId>javax.json.bind</groupId>
       <artifactId>javax.json.bind-api</artifactId>
       <version>1.0</version>
     </dependency>
+    <dependency>
+        <groupId>javax.json</groupId>
+        <artifactId>javax.json-api</artifactId>
+        <version>1.1.4</version>
+    </dependency>
     <dependency>
         <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>
@@ -115,6 +118,12 @@
         <artifactId>jackson-datatype-joda</artifactId>
         <version>${jackson-jaxrs-version}</version>
     </dependency>
+    <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>${javax-annotation-version}</version>
+        <scope>provided</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
@@ -136,6 +145,7 @@
     <servlet-api-version>2.5</servlet-api-version>
     <cxf-version>3.2.7</cxf-version>
     <jackson-jaxrs-version>2.9.7</jackson-jaxrs-version>
+    <javax-annotation-version>1.3.2</javax-annotation-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Category.java
index 9ea25a0d4a38..c06b02b09a6f 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Category.java
@@ -25,13 +25,15 @@
 package org.openapitools.client.model;
 
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
+import java.lang.reflect.Type;
+import javax.json.bind.annotation.JsonbTypeDeserializer;
+import javax.json.bind.annotation.JsonbTypeSerializer;
+import javax.json.bind.serializer.DeserializationContext;
+import javax.json.bind.serializer.JsonbDeserializer;
+import javax.json.bind.serializer.JsonbSerializer;
+import javax.json.bind.serializer.SerializationContext;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonParser;
 import javax.json.bind.annotation.JsonbProperty;
 
 /**
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 271061b8bc30..077d0887c926 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -25,13 +25,15 @@
 package org.openapitools.client.model;
 
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
+import java.lang.reflect.Type;
+import javax.json.bind.annotation.JsonbTypeDeserializer;
+import javax.json.bind.annotation.JsonbTypeSerializer;
+import javax.json.bind.serializer.DeserializationContext;
+import javax.json.bind.serializer.JsonbDeserializer;
+import javax.json.bind.serializer.JsonbSerializer;
+import javax.json.bind.serializer.SerializationContext;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonParser;
 import javax.json.bind.annotation.JsonbProperty;
 
 /**
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
index 8ef80102c9d2..8d6322fb43e7 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
@@ -26,13 +26,15 @@
 
 import java.util.Date;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
+import java.lang.reflect.Type;
+import javax.json.bind.annotation.JsonbTypeDeserializer;
+import javax.json.bind.annotation.JsonbTypeSerializer;
+import javax.json.bind.serializer.DeserializationContext;
+import javax.json.bind.serializer.JsonbDeserializer;
+import javax.json.bind.serializer.JsonbSerializer;
+import javax.json.bind.serializer.SerializationContext;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonParser;
 import javax.json.bind.annotation.JsonbProperty;
 
 /**
@@ -48,14 +50,14 @@ public class Order  {
 
   private Date shipDate;
 
-@XmlType(name="StatusEnum")
-@XmlEnum(String.class)
-public enum StatusEnum {
+  @JsonbTypeSerializer(StatusEnum.Serializer.class)
+  @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
+  public enum StatusEnum {
 
-@XmlEnumValue("placed") PLACED(String.valueOf("placed")), @XmlEnumValue("approved") APPROVED(String.valueOf("approved")), @XmlEnumValue("delivered") DELIVERED(String.valueOf("delivered"));
+    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));	
 
 
-    private String value;
+    String value;
 
     StatusEnum (String v) {
         value = v;
@@ -70,15 +72,25 @@ public String toString() {
         return String.valueOf(value);
     }
 
-    public static StatusEnum fromValue(String v) {
-        for (StatusEnum b : StatusEnum.values()) {
-            if (String.valueOf(b.value).equals(v)) {
-                return b;
+    public static final class Deserializer implements JsonbDeserializer<StatusEnum> {
+        @Override
+        public StatusEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) {
+            for (StatusEnum b : StatusEnum.values()) {
+                if (String.valueOf(b.value).equals(parser.getString())) {
+                    return b;
+                }
             }
+            throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'");
         }
-        throw new IllegalArgumentException("Unexpected value '" + v + "'");
     }
-}
+
+    public static final class Serializer implements JsonbSerializer<StatusEnum> {
+        @Override
+        public void serialize(StatusEnum obj, JsonGenerator generator, SerializationContext ctx) {
+            generator.write(obj.value);
+        }
+    }
+  }
 
  /**
    * Order Status
@@ -176,11 +188,8 @@ public Order shipDate(Date shipDate) {
    * @return status
   **/
   @JsonbProperty("status")
-  public String getStatus() {
-    if (status == null) {
-      return null;
-    }
-    return status.value();
+  public StatusEnum getStatus() {
+    return status;
   }
 
   /**
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java
index c4d170842f08..c2a78c8f00e0 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java
@@ -29,13 +29,15 @@
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
+import java.lang.reflect.Type;
+import javax.json.bind.annotation.JsonbTypeDeserializer;
+import javax.json.bind.annotation.JsonbTypeSerializer;
+import javax.json.bind.serializer.DeserializationContext;
+import javax.json.bind.serializer.JsonbDeserializer;
+import javax.json.bind.serializer.JsonbSerializer;
+import javax.json.bind.serializer.SerializationContext;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonParser;
 import javax.json.bind.annotation.JsonbProperty;
 
 /**
@@ -53,14 +55,14 @@ public class Pet  {
 
   private List<Tag> tags = null;
 
-@XmlType(name="StatusEnum")
-@XmlEnum(String.class)
-public enum StatusEnum {
+  @JsonbTypeSerializer(StatusEnum.Serializer.class)
+  @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
+  public enum StatusEnum {
 
-@XmlEnumValue("available") AVAILABLE(String.valueOf("available")), @XmlEnumValue("pending") PENDING(String.valueOf("pending")), @XmlEnumValue("sold") SOLD(String.valueOf("sold"));
+    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));	
 
 
-    private String value;
+    String value;
 
     StatusEnum (String v) {
         value = v;
@@ -75,15 +77,25 @@ public String toString() {
         return String.valueOf(value);
     }
 
-    public static StatusEnum fromValue(String v) {
-        for (StatusEnum b : StatusEnum.values()) {
-            if (String.valueOf(b.value).equals(v)) {
-                return b;
+    public static final class Deserializer implements JsonbDeserializer<StatusEnum> {
+        @Override
+        public StatusEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) {
+            for (StatusEnum b : StatusEnum.values()) {
+                if (String.valueOf(b.value).equals(parser.getString())) {
+                    return b;
+                }
             }
+            throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'");
         }
-        throw new IllegalArgumentException("Unexpected value '" + v + "'");
     }
-}
+
+    public static final class Serializer implements JsonbSerializer<StatusEnum> {
+        @Override
+        public void serialize(StatusEnum obj, JsonGenerator generator, SerializationContext ctx) {
+            generator.write(obj.value);
+        }
+    }
+  }
 
  /**
    * pet status in the store
@@ -210,11 +222,8 @@ public Pet addTagsItem(Tag tagsItem) {
    * @return status
   **/
   @JsonbProperty("status")
-  public String getStatus() {
-    if (status == null) {
-      return null;
-    }
-    return status.value();
+  public StatusEnum getStatus() {
+    return status;
   }
 
   /**
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Tag.java
index aee530754dbc..c04d84f4b853 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Tag.java
@@ -25,13 +25,15 @@
 package org.openapitools.client.model;
 
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
+import java.lang.reflect.Type;
+import javax.json.bind.annotation.JsonbTypeDeserializer;
+import javax.json.bind.annotation.JsonbTypeSerializer;
+import javax.json.bind.serializer.DeserializationContext;
+import javax.json.bind.serializer.JsonbDeserializer;
+import javax.json.bind.serializer.JsonbSerializer;
+import javax.json.bind.serializer.SerializationContext;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonParser;
 import javax.json.bind.annotation.JsonbProperty;
 
 /**
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/User.java
index 6bdb21b15be8..d3db19903efe 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/User.java
@@ -25,13 +25,15 @@
 package org.openapitools.client.model;
 
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
+import java.lang.reflect.Type;
+import javax.json.bind.annotation.JsonbTypeDeserializer;
+import javax.json.bind.annotation.JsonbTypeSerializer;
+import javax.json.bind.serializer.DeserializationContext;
+import javax.json.bind.serializer.JsonbDeserializer;
+import javax.json.bind.serializer.JsonbSerializer;
+import javax.json.bind.serializer.SerializationContext;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonParser;
 import javax.json.bind.annotation.JsonbProperty;
 
 /**
diff --git a/samples/client/petstore/java/native-async/.openapi-generator/FILES b/samples/client/petstore/java/native-async/.openapi-generator/FILES
new file mode 100644
index 000000000000..48923dfacbed
--- /dev/null
+++ b/samples/client/petstore/java/native-async/.openapi-generator/FILES
@@ -0,0 +1,125 @@
+.gitignore
+.travis.yml
+README.md
+api/openapi.yaml
+build.gradle
+build.sbt
+docs/AdditionalPropertiesAnyType.md
+docs/AdditionalPropertiesArray.md
+docs/AdditionalPropertiesBoolean.md
+docs/AdditionalPropertiesClass.md
+docs/AdditionalPropertiesInteger.md
+docs/AdditionalPropertiesNumber.md
+docs/AdditionalPropertiesObject.md
+docs/AdditionalPropertiesString.md
+docs/Animal.md
+docs/AnotherFakeApi.md
+docs/ArrayOfArrayOfNumberOnly.md
+docs/ArrayOfNumberOnly.md
+docs/ArrayTest.md
+docs/BigCat.md
+docs/BigCatAllOf.md
+docs/Capitalization.md
+docs/Cat.md
+docs/CatAllOf.md
+docs/Category.md
+docs/ClassModel.md
+docs/Client.md
+docs/Dog.md
+docs/DogAllOf.md
+docs/EnumArrays.md
+docs/EnumClass.md
+docs/EnumTest.md
+docs/FakeApi.md
+docs/FakeClassnameTags123Api.md
+docs/FileSchemaTestClass.md
+docs/FormatTest.md
+docs/HasOnlyReadOnly.md
+docs/MapTest.md
+docs/MixedPropertiesAndAdditionalPropertiesClass.md
+docs/Model200Response.md
+docs/ModelApiResponse.md
+docs/ModelReturn.md
+docs/Name.md
+docs/NumberOnly.md
+docs/Order.md
+docs/OuterComposite.md
+docs/OuterEnum.md
+docs/Pet.md
+docs/PetApi.md
+docs/ReadOnlyFirst.md
+docs/SpecialModelName.md
+docs/StoreApi.md
+docs/Tag.md
+docs/TypeHolderDefault.md
+docs/TypeHolderExample.md
+docs/User.md
+docs/UserApi.md
+docs/XmlItem.md
+git_push.sh
+gradle.properties
+gradle/wrapper/gradle-wrapper.jar
+gradle/wrapper/gradle-wrapper.properties
+gradlew
+gradlew.bat
+pom.xml
+settings.gradle
+src/main/AndroidManifest.xml
+src/main/java/org/openapitools/client/ApiClient.java
+src/main/java/org/openapitools/client/ApiException.java
+src/main/java/org/openapitools/client/Configuration.java
+src/main/java/org/openapitools/client/Pair.java
+src/main/java/org/openapitools/client/ServerConfiguration.java
+src/main/java/org/openapitools/client/ServerVariable.java
+src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+src/main/java/org/openapitools/client/api/FakeApi.java
+src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+src/main/java/org/openapitools/client/api/PetApi.java
+src/main/java/org/openapitools/client/api/StoreApi.java
+src/main/java/org/openapitools/client/api/UserApi.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+src/main/java/org/openapitools/client/model/Animal.java
+src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+src/main/java/org/openapitools/client/model/ArrayTest.java
+src/main/java/org/openapitools/client/model/BigCat.java
+src/main/java/org/openapitools/client/model/BigCatAllOf.java
+src/main/java/org/openapitools/client/model/Capitalization.java
+src/main/java/org/openapitools/client/model/Cat.java
+src/main/java/org/openapitools/client/model/CatAllOf.java
+src/main/java/org/openapitools/client/model/Category.java
+src/main/java/org/openapitools/client/model/ClassModel.java
+src/main/java/org/openapitools/client/model/Client.java
+src/main/java/org/openapitools/client/model/Dog.java
+src/main/java/org/openapitools/client/model/DogAllOf.java
+src/main/java/org/openapitools/client/model/EnumArrays.java
+src/main/java/org/openapitools/client/model/EnumClass.java
+src/main/java/org/openapitools/client/model/EnumTest.java
+src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+src/main/java/org/openapitools/client/model/FormatTest.java
+src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+src/main/java/org/openapitools/client/model/MapTest.java
+src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+src/main/java/org/openapitools/client/model/Model200Response.java
+src/main/java/org/openapitools/client/model/ModelApiResponse.java
+src/main/java/org/openapitools/client/model/ModelReturn.java
+src/main/java/org/openapitools/client/model/Name.java
+src/main/java/org/openapitools/client/model/NumberOnly.java
+src/main/java/org/openapitools/client/model/Order.java
+src/main/java/org/openapitools/client/model/OuterComposite.java
+src/main/java/org/openapitools/client/model/OuterEnum.java
+src/main/java/org/openapitools/client/model/Pet.java
+src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/client/model/SpecialModelName.java
+src/main/java/org/openapitools/client/model/Tag.java
+src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+src/main/java/org/openapitools/client/model/TypeHolderExample.java
+src/main/java/org/openapitools/client/model/User.java
+src/main/java/org/openapitools/client/model/XmlItem.java
diff --git a/samples/client/petstore/java/native-async/.openapi-generator/VERSION b/samples/client/petstore/java/native-async/.openapi-generator/VERSION
index b5d898602c2c..d99e7162d01f 100644
--- a/samples/client/petstore/java/native-async/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/native-async/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/native-async/README.md b/samples/client/petstore/java/native-async/README.md
index 95bf0640c902..d23c4a03f6b2 100644
--- a/samples/client/petstore/java/native-async/README.md
+++ b/samples/client/petstore/java/native-async/README.md
@@ -75,6 +75,7 @@ Please follow the [installation](#installation) instruction and execute the foll
 import org.openapitools.client.*;
 import org.openapitools.client.model.*;
 import org.openapitools.client.api.AnotherFakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class AnotherFakeApiExample {
 
@@ -85,7 +86,7 @@ public class AnotherFakeApiExample {
         AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
         Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.call123testSpecialTags(body);
+            CompletableFuture<Client> result = apiInstance.call123testSpecialTags(body);
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
diff --git a/samples/client/petstore/java/native-async/api/openapi.yaml b/samples/client/petstore/java/native-async/api/openapi.yaml
index 30aad25824c8..a49359fd348c 100644
--- a/samples/client/petstore/java/native-async/api/openapi.yaml
+++ b/samples/client/petstore/java/native-async/api/openapi.yaml
@@ -144,6 +144,7 @@ paths:
           items:
             type: string
           type: array
+          uniqueItems: true
         style: form
       responses:
         "200":
@@ -153,11 +154,13 @@ paths:
                 items:
                   $ref: '#/components/schemas/Pet'
                 type: array
+                uniqueItems: true
             application/json:
               schema:
                 items:
                   $ref: '#/components/schemas/Pet'
                 type: array
+                uniqueItems: true
           description: successful operation
         "400":
           content: {}
@@ -1384,6 +1387,7 @@ components:
           items:
             type: string
           type: array
+          uniqueItems: true
           xml:
             name: photoUrl
             wrapped: true
diff --git a/samples/client/petstore/java/native-async/build.gradle b/samples/client/petstore/java/native-async/build.gradle
index a790b04b52b9..d4db22d6ee3c 100644
--- a/samples/client/petstore/java/native-async/build.gradle
+++ b/samples/client/petstore/java/native-async/build.gradle
@@ -62,5 +62,7 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
+    compile "org.openapitools:jackson-databind-nullable:0.2.1"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesClass.md
index 36e181620016..ffab911c1be8 100644
--- a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]
 
 
 
diff --git a/samples/client/petstore/java/native-async/docs/AnotherFakeApi.md b/samples/client/petstore/java/native-async/docs/AnotherFakeApi.md
index 059616ec6baa..a4573e40e4cd 100644
--- a/samples/client/petstore/java/native-async/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/native-async/docs/AnotherFakeApi.md
@@ -10,7 +10,7 @@ Method | HTTP request | Description
 
 ## call123testSpecialTags
 
-> Client call123testSpecialTags(body)
+> CompletableFuture<Client> call123testSpecialTags(body)
 
 To test special tags
 
@@ -25,6 +25,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.AnotherFakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -34,7 +35,8 @@ public class Example {
         AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
         Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.call123testSpecialTags(body);
+            CompletableFuture<Client> result = apiInstance.call123testSpecialTags(body);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
@@ -56,7 +58,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**Client**](Client.md)
+CompletableFuture<[**Client**](Client.md)>
+
 
 ### Authorization
 
diff --git a/samples/client/petstore/java/native-async/docs/FakeApi.md b/samples/client/petstore/java/native-async/docs/FakeApi.md
index 1ce9c124e914..c3132712768b 100644
--- a/samples/client/petstore/java/native-async/docs/FakeApi.md
+++ b/samples/client/petstore/java/native-async/docs/FakeApi.md
@@ -23,7 +23,7 @@ Method | HTTP request | Description
 
 ## createXmlItem
 
-> createXmlItem(xmlItem)
+> CompletableFuture<Void> createXmlItem(xmlItem)
 
 creates an XmlItem
 
@@ -38,6 +38,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -47,7 +48,8 @@ public class Example {
         FakeApi apiInstance = new FakeApi(defaultClient);
         XmlItem xmlItem = new XmlItem(); // XmlItem | XmlItem Body
         try {
-            apiInstance.createXmlItem(xmlItem);
+            CompletableFuture<Void> result = apiInstance.createXmlItem(xmlItem);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#createXmlItem");
             System.err.println("Status code: " + e.getCode());
@@ -68,7 +70,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -87,7 +90,7 @@ No authorization required
 
 ## fakeOuterBooleanSerialize
 
-> Boolean fakeOuterBooleanSerialize(body)
+> CompletableFuture<Boolean> fakeOuterBooleanSerialize(body)
 
 
 
@@ -102,6 +105,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -111,7 +115,8 @@ public class Example {
         FakeApi apiInstance = new FakeApi(defaultClient);
         Boolean body = true; // Boolean | Input boolean as post body
         try {
-            Boolean result = apiInstance.fakeOuterBooleanSerialize(body);
+            CompletableFuture<Boolean> result = apiInstance.fakeOuterBooleanSerialize(body);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#fakeOuterBooleanSerialize");
@@ -133,7 +138,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-**Boolean**
+CompletableFuture<**Boolean**>
+
 
 ### Authorization
 
@@ -152,7 +158,7 @@ No authorization required
 
 ## fakeOuterCompositeSerialize
 
-> OuterComposite fakeOuterCompositeSerialize(body)
+> CompletableFuture<OuterComposite> fakeOuterCompositeSerialize(body)
 
 
 
@@ -167,6 +173,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -176,7 +183,8 @@ public class Example {
         FakeApi apiInstance = new FakeApi(defaultClient);
         OuterComposite body = new OuterComposite(); // OuterComposite | Input composite as post body
         try {
-            OuterComposite result = apiInstance.fakeOuterCompositeSerialize(body);
+            CompletableFuture<OuterComposite> result = apiInstance.fakeOuterCompositeSerialize(body);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#fakeOuterCompositeSerialize");
@@ -198,7 +206,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**OuterComposite**](OuterComposite.md)
+CompletableFuture<[**OuterComposite**](OuterComposite.md)>
+
 
 ### Authorization
 
@@ -217,7 +226,7 @@ No authorization required
 
 ## fakeOuterNumberSerialize
 
-> BigDecimal fakeOuterNumberSerialize(body)
+> CompletableFuture<BigDecimal> fakeOuterNumberSerialize(body)
 
 
 
@@ -232,6 +241,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -241,7 +251,8 @@ public class Example {
         FakeApi apiInstance = new FakeApi(defaultClient);
         BigDecimal body = new BigDecimal(); // BigDecimal | Input number as post body
         try {
-            BigDecimal result = apiInstance.fakeOuterNumberSerialize(body);
+            CompletableFuture<BigDecimal> result = apiInstance.fakeOuterNumberSerialize(body);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#fakeOuterNumberSerialize");
@@ -263,7 +274,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**BigDecimal**](BigDecimal.md)
+CompletableFuture<[**BigDecimal**](BigDecimal.md)>
+
 
 ### Authorization
 
@@ -282,7 +294,7 @@ No authorization required
 
 ## fakeOuterStringSerialize
 
-> String fakeOuterStringSerialize(body)
+> CompletableFuture<String> fakeOuterStringSerialize(body)
 
 
 
@@ -297,6 +309,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -306,7 +319,8 @@ public class Example {
         FakeApi apiInstance = new FakeApi(defaultClient);
         String body = "body_example"; // String | Input string as post body
         try {
-            String result = apiInstance.fakeOuterStringSerialize(body);
+            CompletableFuture<String> result = apiInstance.fakeOuterStringSerialize(body);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#fakeOuterStringSerialize");
@@ -328,7 +342,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-**String**
+CompletableFuture<**String**>
+
 
 ### Authorization
 
@@ -347,7 +362,7 @@ No authorization required
 
 ## testBodyWithFileSchema
 
-> testBodyWithFileSchema(body)
+> CompletableFuture<Void> testBodyWithFileSchema(body)
 
 
 
@@ -362,6 +377,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -371,7 +387,8 @@ public class Example {
         FakeApi apiInstance = new FakeApi(defaultClient);
         FileSchemaTestClass body = new FileSchemaTestClass(); // FileSchemaTestClass | 
         try {
-            apiInstance.testBodyWithFileSchema(body);
+            CompletableFuture<Void> result = apiInstance.testBodyWithFileSchema(body);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testBodyWithFileSchema");
             System.err.println("Status code: " + e.getCode());
@@ -392,7 +409,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -411,7 +429,7 @@ No authorization required
 
 ## testBodyWithQueryParams
 
-> testBodyWithQueryParams(query, body)
+> CompletableFuture<Void> testBodyWithQueryParams(query, body)
 
 
 
@@ -424,6 +442,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -434,7 +453,8 @@ public class Example {
         String query = "query_example"; // String | 
         User body = new User(); // User | 
         try {
-            apiInstance.testBodyWithQueryParams(query, body);
+            CompletableFuture<Void> result = apiInstance.testBodyWithQueryParams(query, body);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testBodyWithQueryParams");
             System.err.println("Status code: " + e.getCode());
@@ -456,7 +476,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -475,7 +496,7 @@ No authorization required
 
 ## testClientModel
 
-> Client testClientModel(body)
+> CompletableFuture<Client> testClientModel(body)
 
 To test \&quot;client\&quot; model
 
@@ -490,6 +511,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -499,7 +521,8 @@ public class Example {
         FakeApi apiInstance = new FakeApi(defaultClient);
         Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testClientModel(body);
+            CompletableFuture<Client> result = apiInstance.testClientModel(body);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testClientModel");
@@ -521,7 +544,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**Client**](Client.md)
+CompletableFuture<[**Client**](Client.md)>
+
 
 ### Authorization
 
@@ -540,7 +564,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> CompletableFuture<Void> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
@@ -556,6 +580,7 @@ import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -583,7 +608,8 @@ public class Example {
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            CompletableFuture<Void> result = apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -617,7 +643,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -637,7 +664,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
+> CompletableFuture<Void> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
 
 To test enum parameters
 
@@ -652,6 +679,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -668,7 +696,8 @@ public class Example {
         List<String> enumFormStringArray = "$"; // List<String> | Form parameter enum test (string array)
         String enumFormString = "-efg"; // String | Form parameter enum test (string)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+            CompletableFuture<Void> result = apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -696,7 +725,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -716,7 +746,7 @@ No authorization required
 
 ## testGroupParameters
 
-> testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
+> CompletableFuture<Void> testGroupParameters(testGroupParametersRequest)
 
 Fake endpoint to test group parameters (optional)
 
@@ -731,6 +761,8 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import org.openapitools.client.api.FakeApi.*;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -745,7 +777,15 @@ public class Example {
         Boolean booleanGroup = true; // Boolean | Boolean in group parameters
         Long int64Group = 56L; // Long | Integer in group parameters
         try {
-            apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+            APItestGroupParametersRequest request = APItestGroupParametersRequest.newBuilder()
+                .requiredStringGroup(requiredStringGroup)
+                .requiredBooleanGroup(requiredBooleanGroup)
+                .requiredInt64Group(requiredInt64Group)
+                .stringGroup(stringGroup)
+                .booleanGroup(booleanGroup)
+                .int64Group(int64Group)
+                .build();
+            CompletableFuture<Void> result = apiInstance.testGroupParameters(request);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testGroupParameters");
             System.err.println("Status code: " + e.getCode());
@@ -759,19 +799,14 @@ public class Example {
 
 ### Parameters
 
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **requiredStringGroup** | **Integer**| Required String in group parameters |
- **requiredBooleanGroup** | **Boolean**| Required Boolean in group parameters |
- **requiredInt64Group** | **Long**| Required Integer in group parameters |
- **stringGroup** | **Integer**| String in group parameters | [optional]
- **booleanGroup** | **Boolean**| Boolean in group parameters | [optional]
- **int64Group** | **Long**| Integer in group parameters | [optional]
+|    Name      |    Type       | Description   |     Notes    |
+|------------- | ------------- | ------------- | -------------|
+| testGroupParametersRequest | [**APItestGroupParametersRequest**](FakeApi.md#APItestGroupParametersRequest)|-|-|
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -788,9 +823,24 @@ No authorization required
 | **400** | Someting wrong |  -  |
 
 
+<a name="APItestGroupParametersRequest"></a>
+## APItestGroupParametersRequest
+### Properties
+
+|     Name      |    Type       | Description   |     Notes    |
+| ------------- | ------------- | ------------- | -------------|
+ **requiredStringGroup** | **Integer** | Required String in group parameters |
+ **requiredBooleanGroup** | **Boolean** | Required Boolean in group parameters |
+ **requiredInt64Group** | **Long** | Required Integer in group parameters |
+ **stringGroup** | **Integer** | String in group parameters | [optional]
+ **booleanGroup** | **Boolean** | Boolean in group parameters | [optional]
+ **int64Group** | **Long** | Integer in group parameters | [optional]
+
+
+
 ## testInlineAdditionalProperties
 
-> testInlineAdditionalProperties(param)
+> CompletableFuture<Void> testInlineAdditionalProperties(param)
 
 test inline additionalProperties
 
@@ -803,6 +853,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -812,7 +863,8 @@ public class Example {
         FakeApi apiInstance = new FakeApi(defaultClient);
         Map<String, String> param = new HashMap(); // Map<String, String> | request body
         try {
-            apiInstance.testInlineAdditionalProperties(param);
+            CompletableFuture<Void> result = apiInstance.testInlineAdditionalProperties(param);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testInlineAdditionalProperties");
             System.err.println("Status code: " + e.getCode());
@@ -833,7 +885,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -852,7 +905,7 @@ No authorization required
 
 ## testJsonFormData
 
-> testJsonFormData(param, param2)
+> CompletableFuture<Void> testJsonFormData(param, param2)
 
 test json serialization of form data
 
@@ -865,6 +918,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -875,7 +929,8 @@ public class Example {
         String param = "param_example"; // String | field1
         String param2 = "param2_example"; // String | field2
         try {
-            apiInstance.testJsonFormData(param, param2);
+            CompletableFuture<Void> result = apiInstance.testJsonFormData(param, param2);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testJsonFormData");
             System.err.println("Status code: " + e.getCode());
@@ -897,7 +952,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -916,7 +972,7 @@ No authorization required
 
 ## testQueryParameterCollectionFormat
 
-> testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
+> CompletableFuture<Void> testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
 
 
 
@@ -931,6 +987,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -944,7 +1001,8 @@ public class Example {
         List<String> url = Arrays.asList(); // List<String> | 
         List<String> context = Arrays.asList(); // List<String> | 
         try {
-            apiInstance.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
+            CompletableFuture<Void> result = apiInstance.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testQueryParameterCollectionFormat");
             System.err.println("Status code: " + e.getCode());
@@ -969,7 +1027,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
diff --git a/samples/client/petstore/java/native-async/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/native-async/docs/FakeClassnameTags123Api.md
index 14a74a37a4e2..783fd1eb4c7f 100644
--- a/samples/client/petstore/java/native-async/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/native-async/docs/FakeClassnameTags123Api.md
@@ -10,7 +10,7 @@ Method | HTTP request | Description
 
 ## testClassname
 
-> Client testClassname(body)
+> CompletableFuture<Client> testClassname(body)
 
 To test class name in snake case
 
@@ -26,6 +26,7 @@ import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeClassnameTags123Api;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -41,7 +42,8 @@ public class Example {
         FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api(defaultClient);
         Client body = new Client(); // Client | client model
         try {
-            Client result = apiInstance.testClassname(body);
+            CompletableFuture<Client> result = apiInstance.testClassname(body);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeClassnameTags123Api#testClassname");
@@ -63,7 +65,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**Client**](Client.md)
+CompletableFuture<[**Client**](Client.md)>
+
 
 ### Authorization
 
diff --git a/samples/client/petstore/java/native-async/docs/Pet.md b/samples/client/petstore/java/native-async/docs/Pet.md
index 37ac007b7931..bdcdad6b3e60 100644
--- a/samples/client/petstore/java/native-async/docs/Pet.md
+++ b/samples/client/petstore/java/native-async/docs/Pet.md
@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **id** | **Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
 **name** | **String** |  | 
-**photoUrls** | **List&lt;String&gt;** |  | 
+**photoUrls** | **Set&lt;String&gt;** |  | 
 **tags** | [**List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**StatusEnum**](#StatusEnum) | pet status in the store |  [optional]
 
diff --git a/samples/client/petstore/java/native-async/docs/PetApi.md b/samples/client/petstore/java/native-async/docs/PetApi.md
index 875a8e6783e9..dcb57ab1f9b3 100644
--- a/samples/client/petstore/java/native-async/docs/PetApi.md
+++ b/samples/client/petstore/java/native-async/docs/PetApi.md
@@ -18,7 +18,7 @@ Method | HTTP request | Description
 
 ## addPet
 
-> addPet(body)
+> CompletableFuture<Void> addPet(body)
 
 Add a new pet to the store
 
@@ -32,6 +32,7 @@ import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.PetApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -45,7 +46,8 @@ public class Example {
         PetApi apiInstance = new PetApi(defaultClient);
         Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
         try {
-            apiInstance.addPet(body);
+            CompletableFuture<Void> result = apiInstance.addPet(body);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#addPet");
             System.err.println("Status code: " + e.getCode());
@@ -66,7 +68,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -86,7 +89,7 @@ null (empty response body)
 
 ## deletePet
 
-> deletePet(petId, apiKey)
+> CompletableFuture<Void> deletePet(petId, apiKey)
 
 Deletes a pet
 
@@ -100,6 +103,7 @@ import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.PetApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -114,7 +118,8 @@ public class Example {
         Long petId = 56L; // Long | Pet id to delete
         String apiKey = "apiKey_example"; // String | 
         try {
-            apiInstance.deletePet(petId, apiKey);
+            CompletableFuture<Void> result = apiInstance.deletePet(petId, apiKey);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#deletePet");
             System.err.println("Status code: " + e.getCode());
@@ -136,7 +141,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -156,7 +162,7 @@ null (empty response body)
 
 ## findPetsByStatus
 
-> List&lt;Pet&gt; findPetsByStatus(status)
+> CompletableFuture<List<Pet>> findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -172,6 +178,7 @@ import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.PetApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -185,7 +192,8 @@ public class Example {
         PetApi apiInstance = new PetApi(defaultClient);
         List<String> status = Arrays.asList("available"); // List<String> | Status values that need to be considered for filter
         try {
-            List<Pet> result = apiInstance.findPetsByStatus(status);
+            CompletableFuture<List<Pet>> result = apiInstance.findPetsByStatus(status);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#findPetsByStatus");
@@ -207,7 +215,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**List&lt;Pet&gt;**](Pet.md)
+CompletableFuture<[**List&lt;Pet&gt;**](Pet.md)>
+
 
 ### Authorization
 
@@ -227,7 +236,7 @@ Name | Type | Description  | Notes
 
 ## findPetsByTags
 
-> List&lt;Pet&gt; findPetsByTags(tags)
+> CompletableFuture<Set<Pet>> findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -243,6 +252,7 @@ import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.PetApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -254,9 +264,10 @@ public class Example {
         petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
 
         PetApi apiInstance = new PetApi(defaultClient);
-        List<String> tags = Arrays.asList(); // List<String> | Tags to filter by
+        Set<String> tags = Arrays.asList(); // Set<String> | Tags to filter by
         try {
-            List<Pet> result = apiInstance.findPetsByTags(tags);
+            CompletableFuture<Set<Pet>> result = apiInstance.findPetsByTags(tags);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#findPetsByTags");
@@ -274,11 +285,12 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**List&lt;String&gt;**](String.md)| Tags to filter by |
+ **tags** | [**Set&lt;String&gt;**](String.md)| Tags to filter by |
 
 ### Return type
 
-[**List&lt;Pet&gt;**](Pet.md)
+CompletableFuture<[**Set&lt;Pet&gt;**](Pet.md)>
+
 
 ### Authorization
 
@@ -298,7 +310,7 @@ Name | Type | Description  | Notes
 
 ## getPetById
 
-> Pet getPetById(petId)
+> CompletableFuture<Pet> getPetById(petId)
 
 Find pet by ID
 
@@ -314,6 +326,7 @@ import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.PetApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -329,7 +342,8 @@ public class Example {
         PetApi apiInstance = new PetApi(defaultClient);
         Long petId = 56L; // Long | ID of pet to return
         try {
-            Pet result = apiInstance.getPetById(petId);
+            CompletableFuture<Pet> result = apiInstance.getPetById(petId);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#getPetById");
@@ -351,7 +365,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**Pet**](Pet.md)
+CompletableFuture<[**Pet**](Pet.md)>
+
 
 ### Authorization
 
@@ -372,7 +387,7 @@ Name | Type | Description  | Notes
 
 ## updatePet
 
-> updatePet(body)
+> CompletableFuture<Void> updatePet(body)
 
 Update an existing pet
 
@@ -386,6 +401,7 @@ import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.PetApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -399,7 +415,8 @@ public class Example {
         PetApi apiInstance = new PetApi(defaultClient);
         Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
         try {
-            apiInstance.updatePet(body);
+            CompletableFuture<Void> result = apiInstance.updatePet(body);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#updatePet");
             System.err.println("Status code: " + e.getCode());
@@ -420,7 +437,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -442,7 +460,7 @@ null (empty response body)
 
 ## updatePetWithForm
 
-> updatePetWithForm(petId, name, status)
+> CompletableFuture<Void> updatePetWithForm(petId, name, status)
 
 Updates a pet in the store with form data
 
@@ -456,6 +474,7 @@ import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.PetApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -471,7 +490,8 @@ public class Example {
         String name = "name_example"; // String | Updated name of the pet
         String status = "status_example"; // String | Updated status of the pet
         try {
-            apiInstance.updatePetWithForm(petId, name, status);
+            CompletableFuture<Void> result = apiInstance.updatePetWithForm(petId, name, status);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#updatePetWithForm");
             System.err.println("Status code: " + e.getCode());
@@ -494,7 +514,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -513,7 +534,7 @@ null (empty response body)
 
 ## uploadFile
 
-> ModelApiResponse uploadFile(petId, additionalMetadata, file)
+> CompletableFuture<ModelApiResponse> uploadFile(petId, additionalMetadata, file)
 
 uploads an image
 
@@ -527,6 +548,7 @@ import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.PetApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -542,7 +564,8 @@ public class Example {
         String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
         File file = new File("/path/to/file"); // File | file to upload
         try {
-            ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
+            CompletableFuture<ModelApiResponse> result = apiInstance.uploadFile(petId, additionalMetadata, file);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#uploadFile");
@@ -566,7 +589,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ModelApiResponse**](ModelApiResponse.md)
+CompletableFuture<[**ModelApiResponse**](ModelApiResponse.md)>
+
 
 ### Authorization
 
@@ -585,7 +609,7 @@ Name | Type | Description  | Notes
 
 ## uploadFileWithRequiredFile
 
-> ModelApiResponse uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
+> CompletableFuture<ModelApiResponse> uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
 
 uploads an image (required)
 
@@ -599,6 +623,7 @@ import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.PetApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -614,7 +639,8 @@ public class Example {
         File requiredFile = new File("/path/to/file"); // File | file to upload
         String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
         try {
-            ModelApiResponse result = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+            CompletableFuture<ModelApiResponse> result = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#uploadFileWithRequiredFile");
@@ -638,7 +664,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ModelApiResponse**](ModelApiResponse.md)
+CompletableFuture<[**ModelApiResponse**](ModelApiResponse.md)>
+
 
 ### Authorization
 
diff --git a/samples/client/petstore/java/native-async/docs/StoreApi.md b/samples/client/petstore/java/native-async/docs/StoreApi.md
index 352399ea515c..40705f50dcff 100644
--- a/samples/client/petstore/java/native-async/docs/StoreApi.md
+++ b/samples/client/petstore/java/native-async/docs/StoreApi.md
@@ -13,7 +13,7 @@ Method | HTTP request | Description
 
 ## deleteOrder
 
-> deleteOrder(orderId)
+> CompletableFuture<Void> deleteOrder(orderId)
 
 Delete purchase order by ID
 
@@ -28,6 +28,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.StoreApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -37,7 +38,8 @@ public class Example {
         StoreApi apiInstance = new StoreApi(defaultClient);
         String orderId = "orderId_example"; // String | ID of the order that needs to be deleted
         try {
-            apiInstance.deleteOrder(orderId);
+            CompletableFuture<Void> result = apiInstance.deleteOrder(orderId);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling StoreApi#deleteOrder");
             System.err.println("Status code: " + e.getCode());
@@ -58,7 +60,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -78,7 +81,7 @@ No authorization required
 
 ## getInventory
 
-> Map&lt;String, Integer&gt; getInventory()
+> CompletableFuture<Map<String, Integer>> getInventory()
 
 Returns pet inventories by status
 
@@ -94,6 +97,7 @@ import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.StoreApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -108,7 +112,8 @@ public class Example {
 
         StoreApi apiInstance = new StoreApi(defaultClient);
         try {
-            Map<String, Integer> result = apiInstance.getInventory();
+            CompletableFuture<Map<String, Integer>> result = apiInstance.getInventory();
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling StoreApi#getInventory");
@@ -127,7 +132,8 @@ This endpoint does not need any parameter.
 
 ### Return type
 
-**Map&lt;String, Integer&gt;**
+CompletableFuture<**Map&lt;String, Integer&gt;**>
+
 
 ### Authorization
 
@@ -146,7 +152,7 @@ This endpoint does not need any parameter.
 
 ## getOrderById
 
-> Order getOrderById(orderId)
+> CompletableFuture<Order> getOrderById(orderId)
 
 Find purchase order by ID
 
@@ -161,6 +167,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.StoreApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -170,7 +177,8 @@ public class Example {
         StoreApi apiInstance = new StoreApi(defaultClient);
         Long orderId = 56L; // Long | ID of pet that needs to be fetched
         try {
-            Order result = apiInstance.getOrderById(orderId);
+            CompletableFuture<Order> result = apiInstance.getOrderById(orderId);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling StoreApi#getOrderById");
@@ -192,7 +200,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**Order**](Order.md)
+CompletableFuture<[**Order**](Order.md)>
+
 
 ### Authorization
 
@@ -213,7 +222,7 @@ No authorization required
 
 ## placeOrder
 
-> Order placeOrder(body)
+> CompletableFuture<Order> placeOrder(body)
 
 Place an order for a pet
 
@@ -226,6 +235,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.StoreApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -235,7 +245,8 @@ public class Example {
         StoreApi apiInstance = new StoreApi(defaultClient);
         Order body = new Order(); // Order | order placed for purchasing the pet
         try {
-            Order result = apiInstance.placeOrder(body);
+            CompletableFuture<Order> result = apiInstance.placeOrder(body);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling StoreApi#placeOrder");
@@ -257,7 +268,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**Order**](Order.md)
+CompletableFuture<[**Order**](Order.md)>
+
 
 ### Authorization
 
diff --git a/samples/client/petstore/java/native-async/docs/UserApi.md b/samples/client/petstore/java/native-async/docs/UserApi.md
index ca9f550c3167..c5b24efa9f82 100644
--- a/samples/client/petstore/java/native-async/docs/UserApi.md
+++ b/samples/client/petstore/java/native-async/docs/UserApi.md
@@ -17,7 +17,7 @@ Method | HTTP request | Description
 
 ## createUser
 
-> createUser(body)
+> CompletableFuture<Void> createUser(body)
 
 Create user
 
@@ -32,6 +32,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.UserApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -41,7 +42,8 @@ public class Example {
         UserApi apiInstance = new UserApi(defaultClient);
         User body = new User(); // User | Created user object
         try {
-            apiInstance.createUser(body);
+            CompletableFuture<Void> result = apiInstance.createUser(body);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#createUser");
             System.err.println("Status code: " + e.getCode());
@@ -62,7 +64,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -81,7 +84,7 @@ No authorization required
 
 ## createUsersWithArrayInput
 
-> createUsersWithArrayInput(body)
+> CompletableFuture<Void> createUsersWithArrayInput(body)
 
 Creates list of users with given input array
 
@@ -94,6 +97,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.UserApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -103,7 +107,8 @@ public class Example {
         UserApi apiInstance = new UserApi(defaultClient);
         List<User> body = Arrays.asList(); // List<User> | List of user object
         try {
-            apiInstance.createUsersWithArrayInput(body);
+            CompletableFuture<Void> result = apiInstance.createUsersWithArrayInput(body);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
             System.err.println("Status code: " + e.getCode());
@@ -124,7 +129,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -143,7 +149,7 @@ No authorization required
 
 ## createUsersWithListInput
 
-> createUsersWithListInput(body)
+> CompletableFuture<Void> createUsersWithListInput(body)
 
 Creates list of users with given input array
 
@@ -156,6 +162,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.UserApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -165,7 +172,8 @@ public class Example {
         UserApi apiInstance = new UserApi(defaultClient);
         List<User> body = Arrays.asList(); // List<User> | List of user object
         try {
-            apiInstance.createUsersWithListInput(body);
+            CompletableFuture<Void> result = apiInstance.createUsersWithListInput(body);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#createUsersWithListInput");
             System.err.println("Status code: " + e.getCode());
@@ -186,7 +194,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -205,7 +214,7 @@ No authorization required
 
 ## deleteUser
 
-> deleteUser(username)
+> CompletableFuture<Void> deleteUser(username)
 
 Delete user
 
@@ -220,6 +229,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.UserApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -229,7 +239,8 @@ public class Example {
         UserApi apiInstance = new UserApi(defaultClient);
         String username = "username_example"; // String | The name that needs to be deleted
         try {
-            apiInstance.deleteUser(username);
+            CompletableFuture<Void> result = apiInstance.deleteUser(username);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#deleteUser");
             System.err.println("Status code: " + e.getCode());
@@ -250,7 +261,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -270,7 +282,7 @@ No authorization required
 
 ## getUserByName
 
-> User getUserByName(username)
+> CompletableFuture<User> getUserByName(username)
 
 Get user by user name
 
@@ -283,6 +295,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.UserApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -292,7 +305,8 @@ public class Example {
         UserApi apiInstance = new UserApi(defaultClient);
         String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing.
         try {
-            User result = apiInstance.getUserByName(username);
+            CompletableFuture<User> result = apiInstance.getUserByName(username);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#getUserByName");
@@ -314,7 +328,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**User**](User.md)
+CompletableFuture<[**User**](User.md)>
+
 
 ### Authorization
 
@@ -335,7 +350,7 @@ No authorization required
 
 ## loginUser
 
-> String loginUser(username, password)
+> CompletableFuture<String> loginUser(username, password)
 
 Logs user into the system
 
@@ -348,6 +363,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.UserApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -358,7 +374,8 @@ public class Example {
         String username = "username_example"; // String | The user name for login
         String password = "password_example"; // String | The password for login in clear text
         try {
-            String result = apiInstance.loginUser(username, password);
+            CompletableFuture<String> result = apiInstance.loginUser(username, password);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#loginUser");
@@ -381,7 +398,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-**String**
+CompletableFuture<**String**>
+
 
 ### Authorization
 
@@ -401,7 +419,7 @@ No authorization required
 
 ## logoutUser
 
-> logoutUser()
+> CompletableFuture<Void> logoutUser()
 
 Logs out current logged in user session
 
@@ -414,6 +432,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.UserApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -422,7 +441,8 @@ public class Example {
 
         UserApi apiInstance = new UserApi(defaultClient);
         try {
-            apiInstance.logoutUser();
+            CompletableFuture<Void> result = apiInstance.logoutUser();
+
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#logoutUser");
             System.err.println("Status code: " + e.getCode());
@@ -440,7 +460,8 @@ This endpoint does not need any parameter.
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
@@ -459,7 +480,7 @@ No authorization required
 
 ## updateUser
 
-> updateUser(username, body)
+> CompletableFuture<Void> updateUser(username, body)
 
 Updated user
 
@@ -474,6 +495,7 @@ import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.UserApi;
+import java.util.concurrent.CompletableFuture;
 
 public class Example {
     public static void main(String[] args) {
@@ -484,7 +506,8 @@ public class Example {
         String username = "username_example"; // String | name that need to be deleted
         User body = new User(); // User | Updated user object
         try {
-            apiInstance.updateUser(username, body);
+            CompletableFuture<Void> result = apiInstance.updateUser(username, body);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#updateUser");
             System.err.println("Status code: " + e.getCode());
@@ -506,7 +529,8 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-null (empty response body)
+
+CompletableFuture<void> (empty response body)
 
 ### Authorization
 
diff --git a/samples/client/petstore/java/native-async/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java/native-async/gradle/wrapper/gradle-wrapper.jar
index cc4fdc293d0e..e35d600ab118 100644
Binary files a/samples/client/petstore/java/native-async/gradle/wrapper/gradle-wrapper.jar and b/samples/client/petstore/java/native-async/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/samples/client/petstore/java/native-async/pom.xml b/samples/client/petstore/java/native-async/pom.xml
index 135ed128d122..4487eae80d9a 100644
--- a/samples/client/petstore/java/native-async/pom.xml
+++ b/samples/client/petstore/java/native-async/pom.xml
@@ -193,6 +193,12 @@
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -209,6 +215,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <jackson-version>2.9.9</jackson-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java
index b805d0f4b425..aac276303614 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java
@@ -47,7 +47,7 @@
  * <p>The setter methods of this class return the current object to facilitate
  * a fluent style of configuration.</p>
  */
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiClient {
 
   private static final Charset UTF_8 = Charset.forName("UTF-8");
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiException.java
index f5427482e3a7..9b6bbf0dc38e 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiException.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiException.java
@@ -15,7 +15,7 @@
 
 import java.net.http.HttpHeaders;
 
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private HttpHeaders responseHeaders = null;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/Configuration.java
index acbecda489dd..29538391ae05 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/Configuration.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/Configuration.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/Pair.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/Pair.java
index ae89aa614543..e1afb8c039f6 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/Pair.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/Pair.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 3fc1152250c2..47f31d0c3b79 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -37,7 +37,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AnotherFakeApi {
   private final HttpClient memberVarHttpClient;
   private final ObjectMapper memberVarObjectMapper;
@@ -45,7 +45,7 @@ public class AnotherFakeApi {
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  
+
   public AnotherFakeApi() {
     this(new ApiClient());
   }
@@ -66,10 +66,38 @@ public AnotherFakeApi(ApiClient apiClient) {
    * @return Client
    * @throws ApiException if fails to make API call
    */
-  public CompletableFuture<Client> call123testSpecialTags (Client body) throws ApiException {
+  public CompletableFuture<Client> call123testSpecialTags(Client body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = call123testSpecialTagsRequestBuilder(body);
+      return memberVarHttpClient.sendAsync(
+              localVarRequestBuilder.build(),
+              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
+          if (localVarResponse.statusCode()/ 100 != 2) {
+              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
+                  "call123testSpecialTags call received non-success response",
+                  localVarResponse.headers(),
+                  localVarResponse.body())
+              );
+          } else {
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Client>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
+          }
+      });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
+  }
+
+  private HttpRequest.Builder call123testSpecialTagsRequestBuilder(Client body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'body' when calling call123testSpecialTags"));
+      throw new ApiException(400, "Missing the required parameter 'body' when calling call123testSpecialTags");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -84,29 +112,15 @@ public CompletableFuture<Client> call123testSpecialTags (Client body) throws Api
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PATCH", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      return memberVarHttpClient.sendAsync(
-              localVarRequestBuilder.build(),
-              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
-          if (localVarResponse.statusCode()/ 100 != 2) {
-              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "call123testSpecialTags call received non-success response",
-                  localVarResponse.headers(),
-                  localVarResponse.body())
-              );
-          } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
-          }
-      });
     } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
   }
 }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
index 6c2fc4767796..8f739343f3c9 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -45,7 +45,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeApi {
   private final HttpClient memberVarHttpClient;
   private final ObjectMapper memberVarObjectMapper;
@@ -53,7 +53,7 @@ public class FakeApi {
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  
+
   public FakeApi() {
     this(new ApiClient());
   }
@@ -73,10 +73,32 @@ public FakeApi(ApiClient apiClient) {
    * @param xmlItem XmlItem Body (required)
    * @throws ApiException if fails to make API call
    */
-  public CompletableFuture<Void> createXmlItem (XmlItem xmlItem) throws ApiException {
+  public CompletableFuture<Void> createXmlItem(XmlItem xmlItem) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = createXmlItemRequestBuilder(xmlItem);
+      return memberVarHttpClient.sendAsync(
+              localVarRequestBuilder.build(),
+              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
+          if (localVarResponse.statusCode()/ 100 != 2) {
+              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
+                  "createXmlItem call received non-success response",
+                  localVarResponse.headers(),
+                  localVarResponse.body())
+              );
+          } else {
+              return CompletableFuture.completedFuture(null);
+          }
+      });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
+  }
+
+  private HttpRequest.Builder createXmlItemRequestBuilder(XmlItem xmlItem) throws ApiException {
     // verify the required parameter 'xmlItem' is set
     if (xmlItem == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'xmlItem' when calling createXmlItem"));
+      throw new ApiException(400, "Missing the required parameter 'xmlItem' when calling createXmlItem");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -91,39 +113,53 @@ public CompletableFuture<Void> createXmlItem (XmlItem xmlItem) throws ApiExcepti
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(xmlItem);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * Test serialization of outer boolean types
+   * @param body Input boolean as post body (optional)
+   * @return Boolean
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Boolean> fakeOuterBooleanSerialize(Boolean body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = fakeOuterBooleanSerializeRequestBuilder(body);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "createXmlItem call received non-success response",
+                  "fakeOuterBooleanSerialize call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Boolean>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
-    } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
     }
   }
-  /**
-   * 
-   * Test serialization of outer boolean types
-   * @param body Input boolean as post body (optional)
-   * @return Boolean
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Boolean> fakeOuterBooleanSerialize (Boolean body) throws ApiException {
+
+  private HttpRequest.Builder fakeOuterBooleanSerializeRequestBuilder(Boolean body) throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -137,39 +173,53 @@ public CompletableFuture<Boolean> fakeOuterBooleanSerialize (Boolean body) throw
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * Test serialization of object with outer number type
+   * @param body Input composite as post body (optional)
+   * @return OuterComposite
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<OuterComposite> fakeOuterCompositeSerialize(OuterComposite body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = fakeOuterCompositeSerializeRequestBuilder(body);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "fakeOuterBooleanSerialize call received non-success response",
+                  "fakeOuterCompositeSerialize call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<OuterComposite>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
-    } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
     }
   }
-  /**
-   * 
-   * Test serialization of object with outer number type
-   * @param body Input composite as post body (optional)
-   * @return OuterComposite
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<OuterComposite> fakeOuterCompositeSerialize (OuterComposite body) throws ApiException {
+
+  private HttpRequest.Builder fakeOuterCompositeSerializeRequestBuilder(OuterComposite body) throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -183,39 +233,53 @@ public CompletableFuture<OuterComposite> fakeOuterCompositeSerialize (OuterCompo
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * Test serialization of outer number types
+   * @param body Input number as post body (optional)
+   * @return BigDecimal
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<BigDecimal> fakeOuterNumberSerialize(BigDecimal body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = fakeOuterNumberSerializeRequestBuilder(body);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "fakeOuterCompositeSerialize call received non-success response",
+                  "fakeOuterNumberSerialize call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<BigDecimal>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
-    } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
     }
   }
-  /**
-   * 
-   * Test serialization of outer number types
-   * @param body Input number as post body (optional)
-   * @return BigDecimal
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<BigDecimal> fakeOuterNumberSerialize (BigDecimal body) throws ApiException {
+
+  private HttpRequest.Builder fakeOuterNumberSerializeRequestBuilder(BigDecimal body) throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -229,39 +293,53 @@ public CompletableFuture<BigDecimal> fakeOuterNumberSerialize (BigDecimal body)
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * Test serialization of outer string types
+   * @param body Input string as post body (optional)
+   * @return String
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<String> fakeOuterStringSerialize(String body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = fakeOuterStringSerializeRequestBuilder(body);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "fakeOuterNumberSerialize call received non-success response",
+                  "fakeOuterStringSerialize call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<String>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
-    } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
     }
   }
-  /**
-   * 
-   * Test serialization of outer string types
-   * @param body Input string as post body (optional)
-   * @return String
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<String> fakeOuterStringSerialize (String body) throws ApiException {
+
+  private HttpRequest.Builder fakeOuterStringSerializeRequestBuilder(String body) throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -275,41 +353,49 @@ public CompletableFuture<String> fakeOuterStringSerialize (String body) throws A
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+   * @param body  (required)
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> testBodyWithFileSchema(FileSchemaTestClass body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = testBodyWithFileSchemaRequestBuilder(body);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "fakeOuterStringSerialize call received non-success response",
+                  "testBodyWithFileSchema call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              return CompletableFuture.completedFuture(null);
           }
       });
-    } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
     }
   }
-  /**
-   * 
-   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-   * @param body  (required)
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Void> testBodyWithFileSchema (FileSchemaTestClass body) throws ApiException {
+
+  private HttpRequest.Builder testBodyWithFileSchemaRequestBuilder(FileSchemaTestClass body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithFileSchema"));
+      throw new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithFileSchema");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -324,46 +410,54 @@ public CompletableFuture<Void> testBodyWithFileSchema (FileSchemaTestClass body)
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * 
+   * @param query  (required)
+   * @param body  (required)
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> testBodyWithQueryParams(String query, User body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = testBodyWithQueryParamsRequestBuilder(query, body);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "testBodyWithFileSchema call received non-success response",
+                  "testBodyWithQueryParams call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              return CompletableFuture.completedFuture(null);
           }
       });
-    } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
     }
   }
-  /**
-   * 
-   * 
-   * @param query  (required)
-   * @param body  (required)
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Void> testBodyWithQueryParams (String query, User body) throws ApiException {
+
+  private HttpRequest.Builder testBodyWithQueryParamsRequestBuilder(String query, User body) throws ApiException {
     // verify the required parameter 'query' is set
     if (query == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'query' when calling testBodyWithQueryParams"));
+      throw new ApiException(400, "Missing the required parameter 'query' when calling testBodyWithQueryParams");
     }
     // verify the required parameter 'body' is set
     if (body == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithQueryParams"));
+      throw new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithQueryParams");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -387,42 +481,56 @@ public CompletableFuture<Void> testBodyWithQueryParams (String query, User body)
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * To test \&quot;client\&quot; model
+   * To test \&quot;client\&quot; model
+   * @param body client model (required)
+   * @return Client
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Client> testClientModel(Client body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = testClientModelRequestBuilder(body);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "testBodyWithQueryParams call received non-success response",
+                  "testClientModel call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Client>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
-    } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
     }
   }
-  /**
-   * To test \&quot;client\&quot; model
-   * To test \&quot;client\&quot; model
-   * @param body client model (required)
-   * @return Client
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Client> testClientModel (Client body) throws ApiException {
+
+  private HttpRequest.Builder testClientModelRequestBuilder(Client body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'body' when calling testClientModel"));
+      throw new ApiException(400, "Missing the required parameter 'body' when calling testClientModel");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -437,30 +545,16 @@ public CompletableFuture<Client> testClientModel (Client body) throws ApiExcepti
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PATCH", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      return memberVarHttpClient.sendAsync(
-              localVarRequestBuilder.build(),
-              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
-          if (localVarResponse.statusCode()/ 100 != 2) {
-              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "testClientModel call received non-success response",
-                  localVarResponse.headers(),
-                  localVarResponse.body())
-              );
-          } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
-          }
-      });
     } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
     }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
   }
   /**
    * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -481,22 +575,44 @@ public CompletableFuture<Client> testClientModel (Client body) throws ApiExcepti
    * @param paramCallback None (optional)
    * @throws ApiException if fails to make API call
    */
-  public CompletableFuture<Void> testEndpointParameters (BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+  public CompletableFuture<Void> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+      return memberVarHttpClient.sendAsync(
+              localVarRequestBuilder.build(),
+              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
+          if (localVarResponse.statusCode()/ 100 != 2) {
+              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
+                  "testEndpointParameters call received non-success response",
+                  localVarResponse.headers(),
+                  localVarResponse.body())
+              );
+          } else {
+              return CompletableFuture.completedFuture(null);
+          }
+      });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
+  }
+
+  private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
     // verify the required parameter 'number' is set
     if (number == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters"));
+      throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters");
     }
     // verify the required parameter '_double' is set
     if (_double == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter '_double' when calling testEndpointParameters"));
+      throw new ApiException(400, "Missing the required parameter '_double' when calling testEndpointParameters");
     }
     // verify the required parameter 'patternWithoutDelimiter' is set
     if (patternWithoutDelimiter == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'patternWithoutDelimiter' when calling testEndpointParameters"));
+      throw new ApiException(400, "Missing the required parameter 'patternWithoutDelimiter' when calling testEndpointParameters");
     }
     // verify the required parameter '_byte' is set
     if (_byte == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter '_byte' when calling testEndpointParameters"));
+      throw new ApiException(400, "Missing the required parameter '_byte' when calling testEndpointParameters");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -507,28 +623,14 @@ public CompletableFuture<Void> testEndpointParameters (BigDecimal number, Double
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      return memberVarHttpClient.sendAsync(
-              localVarRequestBuilder.build(),
-              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
-          if (localVarResponse.statusCode()/ 100 != 2) {
-              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "testEndpointParameters call received non-success response",
-                  localVarResponse.headers(),
-                  localVarResponse.body())
-              );
-          } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
-          }
-      });
+    localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
   }
   /**
    * To test enum parameters
@@ -543,7 +645,29 @@ public CompletableFuture<Void> testEndpointParameters (BigDecimal number, Double
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
    * @throws ApiException if fails to make API call
    */
-  public CompletableFuture<Void> testEnumParameters (List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws ApiException {
+  public CompletableFuture<Void> testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = testEnumParametersRequestBuilder(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+      return memberVarHttpClient.sendAsync(
+              localVarRequestBuilder.build(),
+              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
+          if (localVarResponse.statusCode()/ 100 != 2) {
+              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
+                  "testEnumParameters call received non-success response",
+                  localVarResponse.headers(),
+                  localVarResponse.body())
+              );
+          } else {
+              return CompletableFuture.completedFuture(null);
+          }
+      });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
+  }
+
+  private HttpRequest.Builder testEnumParametersRequestBuilder(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -571,29 +695,31 @@ public CompletableFuture<Void> testEnumParameters (List<String> enumHeaderString
     }
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      return memberVarHttpClient.sendAsync(
-              localVarRequestBuilder.build(),
-              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
-          if (localVarResponse.statusCode()/ 100 != 2) {
-              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "testEnumParameters call received non-success response",
-                  localVarResponse.headers(),
-                  localVarResponse.body())
-              );
-          } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
-          }
-      });
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
   }
+  /**
+   * Fake endpoint to test group parameters (optional)
+   * Fake endpoint to test group parameters (optional)
+   * @param testGroupParametersRequest {@link APItestGroupParametersRequest}
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> testGroupParameters(APItestGroupParametersRequest testGroupParametersRequest) throws ApiException {
+    Integer requiredStringGroup = testGroupParametersRequest.requiredStringGroup();
+    Boolean requiredBooleanGroup = testGroupParametersRequest.requiredBooleanGroup();
+    Long requiredInt64Group = testGroupParametersRequest.requiredInt64Group();
+    Integer stringGroup = testGroupParametersRequest.stringGroup();
+    Boolean booleanGroup = testGroupParametersRequest.booleanGroup();
+    Long int64Group = testGroupParametersRequest.int64Group();
+    return testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+  }
+
   /**
    * Fake endpoint to test group parameters (optional)
    * Fake endpoint to test group parameters (optional)
@@ -605,18 +731,40 @@ public CompletableFuture<Void> testEnumParameters (List<String> enumHeaderString
    * @param int64Group Integer in group parameters (optional)
    * @throws ApiException if fails to make API call
    */
-  public CompletableFuture<Void> testGroupParameters (Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {
+  public CompletableFuture<Void> testGroupParameters(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = testGroupParametersRequestBuilder(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+      return memberVarHttpClient.sendAsync(
+              localVarRequestBuilder.build(),
+              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
+          if (localVarResponse.statusCode()/ 100 != 2) {
+              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
+                  "testGroupParameters call received non-success response",
+                  localVarResponse.headers(),
+                  localVarResponse.body())
+              );
+          } else {
+              return CompletableFuture.completedFuture(null);
+          }
+      });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
+  }
+
+  private HttpRequest.Builder testGroupParametersRequestBuilder(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {
     // verify the required parameter 'requiredStringGroup' is set
     if (requiredStringGroup == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'requiredStringGroup' when calling testGroupParameters"));
+      throw new ApiException(400, "Missing the required parameter 'requiredStringGroup' when calling testGroupParameters");
     }
     // verify the required parameter 'requiredBooleanGroup' is set
     if (requiredBooleanGroup == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'requiredBooleanGroup' when calling testGroupParameters"));
+      throw new ApiException(400, "Missing the required parameter 'requiredBooleanGroup' when calling testGroupParameters");
     }
     // verify the required parameter 'requiredInt64Group' is set
     if (requiredInt64Group == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters"));
+      throw new ApiException(400, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -645,39 +793,124 @@ public CompletableFuture<Void> testGroupParameters (Integer requiredStringGroup,
     }
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
+    localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+
+  public static final class APItestGroupParametersRequest {
+    private Integer requiredStringGroup; // Required String in group parameters (required)
+    private Boolean requiredBooleanGroup; // Required Boolean in group parameters (required)
+    private Long requiredInt64Group; // Required Integer in group parameters (required)
+    private Integer stringGroup; // String in group parameters (optional)
+    private Boolean booleanGroup; // Boolean in group parameters (optional)
+    private Long int64Group; // Integer in group parameters (optional)
+
+    private APItestGroupParametersRequest(Builder builder) {
+      this.requiredStringGroup = builder.requiredStringGroup;
+      this.requiredBooleanGroup = builder.requiredBooleanGroup;
+      this.requiredInt64Group = builder.requiredInt64Group;
+      this.stringGroup = builder.stringGroup;
+      this.booleanGroup = builder.booleanGroup;
+      this.int64Group = builder.int64Group;
+    }
+    public Integer requiredStringGroup() {
+      return requiredStringGroup;
+    }
+    public Boolean requiredBooleanGroup() {
+      return requiredBooleanGroup;
+    }
+    public Long requiredInt64Group() {
+      return requiredInt64Group;
+    }
+    public Integer stringGroup() {
+      return stringGroup;
+    }
+    public Boolean booleanGroup() {
+      return booleanGroup;
+    }
+    public Long int64Group() {
+      return int64Group;
+    }
+    public static Builder newBuilder() {
+      return new Builder();
+    }
+
+    public static class Builder {
+      private Integer requiredStringGroup;
+      private Boolean requiredBooleanGroup;
+      private Long requiredInt64Group;
+      private Integer stringGroup;
+      private Boolean booleanGroup;
+      private Long int64Group;
+
+      public Builder requiredStringGroup(Integer requiredStringGroup) {
+        this.requiredStringGroup = requiredStringGroup;
+        return this;
+      }
+      public Builder requiredBooleanGroup(Boolean requiredBooleanGroup) {
+        this.requiredBooleanGroup = requiredBooleanGroup;
+        return this;
+      }
+      public Builder requiredInt64Group(Long requiredInt64Group) {
+        this.requiredInt64Group = requiredInt64Group;
+        return this;
       }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
+      public Builder stringGroup(Integer stringGroup) {
+        this.stringGroup = stringGroup;
+        return this;
       }
+      public Builder booleanGroup(Boolean booleanGroup) {
+        this.booleanGroup = booleanGroup;
+        return this;
+      }
+      public Builder int64Group(Long int64Group) {
+        this.int64Group = int64Group;
+        return this;
+      }
+      public APItestGroupParametersRequest build() {
+        return new APItestGroupParametersRequest(this);
+      }
+    }
+  }
+
+  /**
+   * test inline additionalProperties
+   * 
+   * @param param request body (required)
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> testInlineAdditionalProperties(Map<String, String> param) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = testInlineAdditionalPropertiesRequestBuilder(param);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "testGroupParameters call received non-success response",
+                  "testInlineAdditionalProperties call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              return CompletableFuture.completedFuture(null);
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * test inline additionalProperties
-   * 
-   * @param param request body (required)
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Void> testInlineAdditionalProperties (Map<String, String> param) throws ApiException {
+
+  private HttpRequest.Builder testInlineAdditionalPropertiesRequestBuilder(Map<String, String> param) throws ApiException {
     // verify the required parameter 'param' is set
     if (param == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'param' when calling testInlineAdditionalProperties"));
+      throw new ApiException(400, "Missing the required parameter 'param' when calling testInlineAdditionalProperties");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -692,46 +925,54 @@ public CompletableFuture<Void> testInlineAdditionalProperties (Map<String, Strin
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(param);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * test json serialization of form data
+   * 
+   * @param param field1 (required)
+   * @param param2 field2 (required)
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> testJsonFormData(String param, String param2) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = testJsonFormDataRequestBuilder(param, param2);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "testInlineAdditionalProperties call received non-success response",
+                  "testJsonFormData call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              return CompletableFuture.completedFuture(null);
           }
       });
-    } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
     }
   }
-  /**
-   * test json serialization of form data
-   * 
-   * @param param field1 (required)
-   * @param param2 field2 (required)
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Void> testJsonFormData (String param, String param2) throws ApiException {
+
+  private HttpRequest.Builder testJsonFormDataRequestBuilder(String param, String param2) throws ApiException {
     // verify the required parameter 'param' is set
     if (param == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'param' when calling testJsonFormData"));
+      throw new ApiException(400, "Missing the required parameter 'param' when calling testJsonFormData");
     }
     // verify the required parameter 'param2' is set
     if (param2 == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'param2' when calling testJsonFormData"));
+      throw new ApiException(400, "Missing the required parameter 'param2' when calling testJsonFormData");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -742,59 +983,67 @@ public CompletableFuture<Void> testJsonFormData (String param, String param2) th
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * To test the collection format in query parameters
+   * @param pipe  (required)
+   * @param ioutil  (required)
+   * @param http  (required)
+   * @param url  (required)
+   * @param context  (required)
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> testQueryParameterCollectionFormat(List<String> pipe, List<String> ioutil, List<String> http, List<String> url, List<String> context) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = testQueryParameterCollectionFormatRequestBuilder(pipe, ioutil, http, url, context);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "testJsonFormData call received non-success response",
+                  "testQueryParameterCollectionFormat call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              return CompletableFuture.completedFuture(null);
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * 
-   * To test the collection format in query parameters
-   * @param pipe  (required)
-   * @param ioutil  (required)
-   * @param http  (required)
-   * @param url  (required)
-   * @param context  (required)
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Void> testQueryParameterCollectionFormat (List<String> pipe, List<String> ioutil, List<String> http, List<String> url, List<String> context) throws ApiException {
+
+  private HttpRequest.Builder testQueryParameterCollectionFormatRequestBuilder(List<String> pipe, List<String> ioutil, List<String> http, List<String> url, List<String> context) throws ApiException {
     // verify the required parameter 'pipe' is set
     if (pipe == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat"));
+      throw new ApiException(400, "Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat");
     }
     // verify the required parameter 'ioutil' is set
     if (ioutil == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'ioutil' when calling testQueryParameterCollectionFormat"));
+      throw new ApiException(400, "Missing the required parameter 'ioutil' when calling testQueryParameterCollectionFormat");
     }
     // verify the required parameter 'http' is set
     if (http == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'http' when calling testQueryParameterCollectionFormat"));
+      throw new ApiException(400, "Missing the required parameter 'http' when calling testQueryParameterCollectionFormat");
     }
     // verify the required parameter 'url' is set
     if (url == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'url' when calling testQueryParameterCollectionFormat"));
+      throw new ApiException(400, "Missing the required parameter 'url' when calling testQueryParameterCollectionFormat");
     }
     // verify the required parameter 'context' is set
     if (context == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'context' when calling testQueryParameterCollectionFormat"));
+      throw new ApiException(400, "Missing the required parameter 'context' when calling testQueryParameterCollectionFormat");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -804,7 +1053,7 @@ public CompletableFuture<Void> testQueryParameterCollectionFormat (List<String>
     List<Pair> localVarQueryParams = new ArrayList<>();
     localVarQueryParams.addAll(ApiClient.parameterToPairs("csv", "pipe", pipe));
     localVarQueryParams.addAll(ApiClient.parameterToPairs("csv", "ioutil", ioutil));
-    localVarQueryParams.addAll(ApiClient.parameterToPairs("space", "http", http));
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("ssv", "http", http));
     localVarQueryParams.addAll(ApiClient.parameterToPairs("csv", "url", url));
     localVarQueryParams.addAll(ApiClient.parameterToPairs("multi", "context", context));
 
@@ -818,27 +1067,13 @@ public CompletableFuture<Void> testQueryParameterCollectionFormat (List<String>
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      return memberVarHttpClient.sendAsync(
-              localVarRequestBuilder.build(),
-              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
-          if (localVarResponse.statusCode()/ 100 != 2) {
-              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "testQueryParameterCollectionFormat call received non-success response",
-                  localVarResponse.headers(),
-                  localVarResponse.body())
-              );
-          } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
-          }
-      });
+    localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
   }
 }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 8e69ccdbff5b..575762fbb2b8 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -37,7 +37,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeClassnameTags123Api {
   private final HttpClient memberVarHttpClient;
   private final ObjectMapper memberVarObjectMapper;
@@ -45,7 +45,7 @@ public class FakeClassnameTags123Api {
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  
+
   public FakeClassnameTags123Api() {
     this(new ApiClient());
   }
@@ -66,10 +66,38 @@ public FakeClassnameTags123Api(ApiClient apiClient) {
    * @return Client
    * @throws ApiException if fails to make API call
    */
-  public CompletableFuture<Client> testClassname (Client body) throws ApiException {
+  public CompletableFuture<Client> testClassname(Client body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = testClassnameRequestBuilder(body);
+      return memberVarHttpClient.sendAsync(
+              localVarRequestBuilder.build(),
+              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
+          if (localVarResponse.statusCode()/ 100 != 2) {
+              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
+                  "testClassname call received non-success response",
+                  localVarResponse.headers(),
+                  localVarResponse.body())
+              );
+          } else {
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Client>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
+          }
+      });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
+  }
+
+  private HttpRequest.Builder testClassnameRequestBuilder(Client body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'body' when calling testClassname"));
+      throw new ApiException(400, "Missing the required parameter 'body' when calling testClassname");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -84,29 +112,15 @@ public CompletableFuture<Client> testClassname (Client body) throws ApiException
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PATCH", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      return memberVarHttpClient.sendAsync(
-              localVarRequestBuilder.build(),
-              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
-          if (localVarResponse.statusCode()/ 100 != 2) {
-              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "testClassname call received non-success response",
-                  localVarResponse.headers(),
-                  localVarResponse.body())
-              );
-          } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
-          }
-      });
     } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
   }
 }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
index 6315984a9f2e..6061337d5672 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
@@ -19,6 +19,7 @@
 import java.io.File;
 import org.openapitools.client.model.ModelApiResponse;
 import org.openapitools.client.model.Pet;
+import java.util.Set;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -39,7 +40,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class PetApi {
   private final HttpClient memberVarHttpClient;
   private final ObjectMapper memberVarObjectMapper;
@@ -47,7 +48,7 @@ public class PetApi {
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  
+
   public PetApi() {
     this(new ApiClient());
   }
@@ -67,10 +68,32 @@ public PetApi(ApiClient apiClient) {
    * @param body Pet object that needs to be added to the store (required)
    * @throws ApiException if fails to make API call
    */
-  public CompletableFuture<Void> addPet (Pet body) throws ApiException {
+  public CompletableFuture<Void> addPet(Pet body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = addPetRequestBuilder(body);
+      return memberVarHttpClient.sendAsync(
+              localVarRequestBuilder.build(),
+              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
+          if (localVarResponse.statusCode()/ 100 != 2) {
+              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
+                  "addPet call received non-success response",
+                  localVarResponse.headers(),
+                  localVarResponse.body())
+              );
+          } else {
+              return CompletableFuture.completedFuture(null);
+          }
+      });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
+  }
+
+  private HttpRequest.Builder addPetRequestBuilder(Pet body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'body' when calling addPet"));
+      throw new ApiException(400, "Missing the required parameter 'body' when calling addPet");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -85,42 +108,50 @@ public CompletableFuture<Void> addPet (Pet body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> deletePet(Long petId, String apiKey) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = deletePetRequestBuilder(petId, apiKey);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "addPet call received non-success response",
+                  "deletePet call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              return CompletableFuture.completedFuture(null);
           }
       });
-    } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
     }
   }
-  /**
-   * Deletes a pet
-   * 
-   * @param petId Pet id to delete (required)
-   * @param apiKey  (optional)
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Void> deletePet (Long petId, String apiKey) throws ApiException {
+
+  private HttpRequest.Builder deletePetRequestBuilder(Long petId, String apiKey) throws ApiException {
     // verify the required parameter 'petId' is set
     if (petId == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'petId' when calling deletePet"));
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -135,40 +166,54 @@ public CompletableFuture<Void> deletePet (Long petId, String apiKey) throws ApiE
     }
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for filter (required)
+   * @return List&lt;Pet&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<List<Pet>> findPetsByStatus(List<String> status) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = findPetsByStatusRequestBuilder(status);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "deletePet call received non-success response",
+                  "findPetsByStatus call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<List<Pet>>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma separated strings
-   * @param status Status values that need to be considered for filter (required)
-   * @return List&lt;Pet&gt;
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<List<Pet>> findPetsByStatus (List<String> status) throws ApiException {
+
+  private HttpRequest.Builder findPetsByStatusRequestBuilder(List<String> status) throws ApiException {
     // verify the required parameter 'status' is set
     if (status == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'status' when calling findPetsByStatus"));
+      throw new ApiException(400, "Missing the required parameter 'status' when calling findPetsByStatus");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -188,42 +233,56 @@ public CompletableFuture<List<Pet>> findPetsByStatus (List<String> status) throw
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Finds Pets by tags
+   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by (required)
+   * @return Set&lt;Pet&gt;
+   * @throws ApiException if fails to make API call
+   * @deprecated
+   */
+  @Deprecated
+  public CompletableFuture<Set<Pet>> findPetsByTags(Set<String> tags) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = findPetsByTagsRequestBuilder(tags);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "findPetsByStatus call received non-success response",
+                  "findPetsByTags call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Set<Pet>>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * Finds Pets by tags
-   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by (required)
-   * @return List&lt;Pet&gt;
-   * @throws ApiException if fails to make API call
-   * @deprecated
-   */
-  @Deprecated
-  public CompletableFuture<List<Pet>> findPetsByTags (List<String> tags) throws ApiException {
+
+  private HttpRequest.Builder findPetsByTagsRequestBuilder(Set<String> tags) throws ApiException {
     // verify the required parameter 'tags' is set
     if (tags == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'tags' when calling findPetsByTags"));
+      throw new ApiException(400, "Missing the required parameter 'tags' when calling findPetsByTags");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -243,40 +302,54 @@ public CompletableFuture<List<Pet>> findPetsByTags (List<String> tags) throws Ap
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Find pet by ID
+   * Returns a single pet
+   * @param petId ID of pet to return (required)
+   * @return Pet
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Pet> getPetById(Long petId) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = getPetByIdRequestBuilder(petId);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "findPetsByTags call received non-success response",
+                  "getPetById call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Pet>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * Find pet by ID
-   * Returns a single pet
-   * @param petId ID of pet to return (required)
-   * @return Pet
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Pet> getPetById (Long petId) throws ApiException {
+
+  private HttpRequest.Builder getPetByIdRequestBuilder(Long petId) throws ApiException {
     // verify the required parameter 'petId' is set
     if (petId == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'petId' when calling getPetById"));
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -288,39 +361,47 @@ public CompletableFuture<Pet> getPetById (Long petId) throws ApiException {
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (required)
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> updatePet(Pet body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = updatePetRequestBuilder(body);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "getPetById call received non-success response",
+                  "updatePet call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              return CompletableFuture.completedFuture(null);
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Void> updatePet (Pet body) throws ApiException {
+
+  private HttpRequest.Builder updatePetRequestBuilder(Pet body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'body' when calling updatePet"));
+      throw new ApiException(400, "Missing the required parameter 'body' when calling updatePet");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -335,43 +416,51 @@ public CompletableFuture<Void> updatePet (Pet body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> updatePetWithForm(Long petId, String name, String status) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = updatePetWithFormRequestBuilder(petId, name, status);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "updatePet call received non-success response",
+                  "updatePetWithForm call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              return CompletableFuture.completedFuture(null);
           }
       });
-    } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
     }
   }
-  /**
-   * Updates a pet in the store with form data
-   * 
-   * @param petId ID of pet that needs to be updated (required)
-   * @param name Updated name of the pet (optional)
-   * @param status Updated status of the pet (optional)
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Void> updatePetWithForm (Long petId, String name, String status) throws ApiException {
+
+  private HttpRequest.Builder updatePetWithFormRequestBuilder(Long petId, String name, String status) throws ApiException {
     // verify the required parameter 'petId' is set
     if (petId == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm"));
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -383,42 +472,56 @@ public CompletableFuture<Void> updatePetWithForm (Long petId, String name, Strin
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * uploads an image
+   * 
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
+   * @return ModelApiResponse
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<ModelApiResponse> uploadFile(Long petId, String additionalMetadata, File file) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = uploadFileRequestBuilder(petId, additionalMetadata, file);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "updatePetWithForm call received non-success response",
+                  "uploadFile call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<ModelApiResponse>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * uploads an image
-   * 
-   * @param petId ID of pet to update (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @param file file to upload (optional)
-   * @return ModelApiResponse
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<ModelApiResponse> uploadFile (Long petId, String additionalMetadata, File file) throws ApiException {
+
+  private HttpRequest.Builder uploadFileRequestBuilder(Long petId, String additionalMetadata, File file) throws ApiException {
     // verify the required parameter 'petId' is set
     if (petId == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile"));
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -430,46 +533,60 @@ public CompletableFuture<ModelApiResponse> uploadFile (Long petId, String additi
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * uploads an image (required)
+   * 
+   * @param petId ID of pet to update (required)
+   * @param requiredFile file to upload (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @return ModelApiResponse
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<ModelApiResponse> uploadFileWithRequiredFile(Long petId, File requiredFile, String additionalMetadata) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = uploadFileWithRequiredFileRequestBuilder(petId, requiredFile, additionalMetadata);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "uploadFile call received non-success response",
+                  "uploadFileWithRequiredFile call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<ModelApiResponse>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * uploads an image (required)
-   * 
-   * @param petId ID of pet to update (required)
-   * @param requiredFile file to upload (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @return ModelApiResponse
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<ModelApiResponse> uploadFileWithRequiredFile (Long petId, File requiredFile, String additionalMetadata) throws ApiException {
+
+  private HttpRequest.Builder uploadFileWithRequiredFileRequestBuilder(Long petId, File requiredFile, String additionalMetadata) throws ApiException {
     // verify the required parameter 'petId' is set
     if (petId == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'petId' when calling uploadFileWithRequiredFile"));
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFileWithRequiredFile");
     }
     // verify the required parameter 'requiredFile' is set
     if (requiredFile == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile"));
+      throw new ApiException(400, "Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -481,27 +598,13 @@ public CompletableFuture<ModelApiResponse> uploadFileWithRequiredFile (Long petI
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      return memberVarHttpClient.sendAsync(
-              localVarRequestBuilder.build(),
-              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
-          if (localVarResponse.statusCode()/ 100 != 2) {
-              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "uploadFileWithRequiredFile call received non-success response",
-                  localVarResponse.headers(),
-                  localVarResponse.body())
-              );
-          } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
-          }
-      });
+    localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
   }
 }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
index 16712948a944..69097494bae3 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -37,7 +37,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StoreApi {
   private final HttpClient memberVarHttpClient;
   private final ObjectMapper memberVarObjectMapper;
@@ -45,7 +45,7 @@ public class StoreApi {
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  
+
   public StoreApi() {
     this(new ApiClient());
   }
@@ -65,10 +65,32 @@ public StoreApi(ApiClient apiClient) {
    * @param orderId ID of the order that needs to be deleted (required)
    * @throws ApiException if fails to make API call
    */
-  public CompletableFuture<Void> deleteOrder (String orderId) throws ApiException {
+  public CompletableFuture<Void> deleteOrder(String orderId) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = deleteOrderRequestBuilder(orderId);
+      return memberVarHttpClient.sendAsync(
+              localVarRequestBuilder.build(),
+              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
+          if (localVarResponse.statusCode()/ 100 != 2) {
+              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
+                  "deleteOrder call received non-success response",
+                  localVarResponse.headers(),
+                  localVarResponse.body())
+              );
+          } else {
+              return CompletableFuture.completedFuture(null);
+          }
+      });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
+  }
+
+  private HttpRequest.Builder deleteOrderRequestBuilder(String orderId) throws ApiException {
     // verify the required parameter 'orderId' is set
     if (orderId == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder"));
+      throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -80,36 +102,50 @@ public CompletableFuture<Void> deleteOrder (String orderId) throws ApiException
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Map&lt;String, Integer&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Map<String, Integer>> getInventory() throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = getInventoryRequestBuilder();
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "deleteOrder call received non-success response",
+                  "getInventory call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Map<String, Integer>>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return Map&lt;String, Integer&gt;
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Map<String, Integer>> getInventory () throws ApiException {
+
+  private HttpRequest.Builder getInventoryRequestBuilder() throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -119,40 +155,54 @@ public CompletableFuture<Map<String, Integer>> getInventory () throws ApiExcepti
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Find purchase order by ID
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched (required)
+   * @return Order
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Order> getOrderById(Long orderId) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = getOrderByIdRequestBuilder(orderId);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "getInventory call received non-success response",
+                  "getOrderById call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Order>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched (required)
-   * @return Order
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Order> getOrderById (Long orderId) throws ApiException {
+
+  private HttpRequest.Builder getOrderByIdRequestBuilder(Long orderId) throws ApiException {
     // verify the required parameter 'orderId' is set
     if (orderId == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById"));
+      throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -164,40 +214,54 @@ public CompletableFuture<Order> getOrderById (Long orderId) throws ApiException
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (required)
+   * @return Order
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Order> placeOrder(Order body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = placeOrderRequestBuilder(body);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "getOrderById call received non-success response",
+                  "placeOrder call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Order>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet (required)
-   * @return Order
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Order> placeOrder (Order body) throws ApiException {
+
+  private HttpRequest.Builder placeOrderRequestBuilder(Order body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'body' when calling placeOrder"));
+      throw new ApiException(400, "Missing the required parameter 'body' when calling placeOrder");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -212,29 +276,15 @@ public CompletableFuture<Order> placeOrder (Order body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      return memberVarHttpClient.sendAsync(
-              localVarRequestBuilder.build(),
-              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
-          if (localVarResponse.statusCode()/ 100 != 2) {
-              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "placeOrder call received non-success response",
-                  localVarResponse.headers(),
-                  localVarResponse.body())
-              );
-          } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
-          }
-      });
     } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
   }
 }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
index 733f104d15bd..9c933cfd406a 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
@@ -37,7 +37,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class UserApi {
   private final HttpClient memberVarHttpClient;
   private final ObjectMapper memberVarObjectMapper;
@@ -45,7 +45,7 @@ public class UserApi {
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  
+
   public UserApi() {
     this(new ApiClient());
   }
@@ -65,10 +65,32 @@ public UserApi(ApiClient apiClient) {
    * @param body Created user object (required)
    * @throws ApiException if fails to make API call
    */
-  public CompletableFuture<Void> createUser (User body) throws ApiException {
+  public CompletableFuture<Void> createUser(User body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = createUserRequestBuilder(body);
+      return memberVarHttpClient.sendAsync(
+              localVarRequestBuilder.build(),
+              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
+          if (localVarResponse.statusCode()/ 100 != 2) {
+              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
+                  "createUser call received non-success response",
+                  localVarResponse.headers(),
+                  localVarResponse.body())
+              );
+          } else {
+              return CompletableFuture.completedFuture(null);
+          }
+      });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
+  }
+
+  private HttpRequest.Builder createUserRequestBuilder(User body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'body' when calling createUser"));
+      throw new ApiException(400, "Missing the required parameter 'body' when calling createUser");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -83,41 +105,49 @@ public CompletableFuture<Void> createUser (User body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> createUsersWithArrayInput(List<User> body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = createUsersWithArrayInputRequestBuilder(body);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "createUser call received non-success response",
+                  "createUsersWithArrayInput call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              return CompletableFuture.completedFuture(null);
           }
       });
-    } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
     }
   }
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Void> createUsersWithArrayInput (List<User> body) throws ApiException {
+
+  private HttpRequest.Builder createUsersWithArrayInputRequestBuilder(List<User> body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithArrayInput"));
+      throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithArrayInput");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -132,41 +162,49 @@ public CompletableFuture<Void> createUsersWithArrayInput (List<User> body) throw
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> createUsersWithListInput(List<User> body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = createUsersWithListInputRequestBuilder(body);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "createUsersWithArrayInput call received non-success response",
+                  "createUsersWithListInput call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              return CompletableFuture.completedFuture(null);
           }
       });
-    } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
     }
   }
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Void> createUsersWithListInput (List<User> body) throws ApiException {
+
+  private HttpRequest.Builder createUsersWithListInputRequestBuilder(List<User> body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithListInput"));
+      throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithListInput");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -181,41 +219,49 @@ public CompletableFuture<Void> createUsersWithListInput (List<User> body) throws
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> deleteUser(String username) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = deleteUserRequestBuilder(username);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "createUsersWithListInput call received non-success response",
+                  "deleteUser call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              return CompletableFuture.completedFuture(null);
           }
       });
-    } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
     }
   }
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted (required)
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Void> deleteUser (String username) throws ApiException {
+
+  private HttpRequest.Builder deleteUserRequestBuilder(String username) throws ApiException {
     // verify the required parameter 'username' is set
     if (username == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'username' when calling deleteUser"));
+      throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -227,40 +273,54 @@ public CompletableFuture<Void> deleteUser (String username) throws ApiException
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return User
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<User> getUserByName(String username) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = getUserByNameRequestBuilder(username);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "deleteUser call received non-success response",
+                  "getUserByName call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<User>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
-   * @return User
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<User> getUserByName (String username) throws ApiException {
+
+  private HttpRequest.Builder getUserByNameRequestBuilder(String username) throws ApiException {
     // verify the required parameter 'username' is set
     if (username == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'username' when calling getUserByName"));
+      throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -272,45 +332,59 @@ public CompletableFuture<User> getUserByName (String username) throws ApiExcepti
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login (required)
+   * @param password The password for login in clear text (required)
+   * @return String
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<String> loginUser(String username, String password) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = loginUserRequestBuilder(username, password);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "getUserByName call received non-success response",
+                  "loginUser call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              try {
+                return CompletableFuture.completedFuture(
+                    memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<String>() {})
+                );
+              } catch (IOException e) {
+                return CompletableFuture.failedFuture(new ApiException(e));
+              }
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login (required)
-   * @param password The password for login in clear text (required)
-   * @return String
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<String> loginUser (String username, String password) throws ApiException {
+
+  private HttpRequest.Builder loginUserRequestBuilder(String username, String password) throws ApiException {
     // verify the required parameter 'username' is set
     if (username == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'username' when calling loginUser"));
+      throw new ApiException(400, "Missing the required parameter 'username' when calling loginUser");
     }
     // verify the required parameter 'password' is set
     if (password == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'password' when calling loginUser"));
+      throw new ApiException(400, "Missing the required parameter 'password' when calling loginUser");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -331,35 +405,43 @@ public CompletableFuture<String> loginUser (String username, String password) th
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Logs out current logged in user session
+   * 
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> logoutUser() throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = logoutUserRequestBuilder();
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "loginUser call received non-success response",
+                  "logoutUser call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              return CompletableFuture.completedFuture(null);
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * Logs out current logged in user session
-   * 
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Void> logoutUser () throws ApiException {
+
+  private HttpRequest.Builder logoutUserRequestBuilder() throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -369,44 +451,52 @@ public CompletableFuture<Void> logoutUser () throws ApiException {
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (required)
+   * @throws ApiException if fails to make API call
+   */
+  public CompletableFuture<Void> updateUser(String username, User body) throws ApiException {
+    try {
+      HttpRequest.Builder localVarRequestBuilder = updateUserRequestBuilder(username, body);
       return memberVarHttpClient.sendAsync(
               localVarRequestBuilder.build(),
               HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
           if (localVarResponse.statusCode()/ 100 != 2) {
               return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "logoutUser call received non-success response",
+                  "updateUser call received non-success response",
                   localVarResponse.headers(),
                   localVarResponse.body())
               );
           } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
+              return CompletableFuture.completedFuture(null);
           }
       });
+    }
+    catch (ApiException e) {
+      return CompletableFuture.failedFuture(e);
+    }
   }
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted (required)
-   * @param body Updated user object (required)
-   * @throws ApiException if fails to make API call
-   */
-  public CompletableFuture<Void> updateUser (String username, User body) throws ApiException {
+
+  private HttpRequest.Builder updateUserRequestBuilder(String username, User body) throws ApiException {
     // verify the required parameter 'username' is set
     if (username == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'username' when calling updateUser"));
+      throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser");
     }
     // verify the required parameter 'body' is set
     if (body == null) {
-        return CompletableFuture.failedFuture(new ApiException(400, "Missing the required parameter 'body' when calling updateUser"));
+      throw new ApiException(400, "Missing the required parameter 'body' when calling updateUser");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -422,29 +512,15 @@ public CompletableFuture<Void> updateUser (String username, User body) throws Ap
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      return memberVarHttpClient.sendAsync(
-              localVarRequestBuilder.build(),
-              HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
-          if (localVarResponse.statusCode()/ 100 != 2) {
-              return CompletableFuture.failedFuture(new ApiException(localVarResponse.statusCode(),
-                  "updateUser call received non-success response",
-                  localVarResponse.headers(),
-                  localVarResponse.body())
-              );
-          } else {
-              return CompletableFuture.completedFuture(
-                      null
-              );
-          }
-      });
     } catch (IOException e) {
-      return CompletableFuture.failedFuture(new ApiException(e));
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
   }
 }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 0f1223c2bc61..f743e501e3b3 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c03535ab9471..4a63a4759873 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 4356a4f8c1eb..ad55a0a8e220 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index fa85ab77596a..0ea407ac8b43 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -43,7 +43,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   private Map<String, String> mapString = null;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 2426e7c974c4..e23d5c0d564e 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index da407ccdc473..184d3c9f6b9e 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 5e468870311e..6777cc390e49 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index ed080254966e..ac062c802998 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java
index bbadf265ba6b..05a333ff89ed 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java
@@ -23,6 +23,9 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.BigCat;
+import org.openapitools.client.model.Cat;
+import org.openapitools.client.model.Dog;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
@@ -32,12 +35,12 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
-  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
+  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
 })
 
 public class Animal {
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 28d19953c345..33aed0c39863 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 5eeac9d8ac5d..6e9c30a19c8a 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java
index df57098053eb..7d27ffc4964f 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -34,7 +34,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   private List<String> arrayOfString = null;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BigCat.java
index 84b3f05703b2..bcb573925b55 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BigCat.java
@@ -18,6 +18,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -31,6 +33,10 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+})
 
 public class BigCat extends Cat {
   /**
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index 7ce0ddb21f5a..c07d3650409f 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java
index 033e97881105..bff34dccde4b 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -34,7 +34,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   private String smallCamel;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java
index 484725c76fe0..56ed830a2174 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java
@@ -18,10 +18,13 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.BigCat;
 import org.openapitools.client.model.CatAllOf;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
@@ -31,6 +34,11 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
+})
 
 public class Cat extends Animal {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/CatAllOf.java
index 3e7b991436aa..97abe188ea60 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java
index 868ba8750742..aeee848682aa 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java
@@ -30,7 +30,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java
index 4de7664b26a7..c4950f02893a 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java
index 02b0aac2247a..1276ee5e36fc 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java
index 78044654d500..b1042faa3b82 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java
@@ -18,6 +18,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -31,6 +33,10 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+})
 
 public class Dog extends Animal {
   public static final String JSON_PROPERTY_BREED = "breed";
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DogAllOf.java
index dd42595cf202..3518ba28ec22 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java
index 86526adb3fa7..653c53874e62 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,7 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java
index 51a1a645a109..c0d90a44a474 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -34,7 +34,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index cfd62fbce628..2668a5216d28 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,7 +32,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
   private java.io.File file;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java
index 72ed8740e4d7..9c33da1c2d08 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -47,7 +47,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 0a3f0d464360..80ef1122ee87 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,7 +30,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java
index 3e72350aa8b1..0f9e586f10fb 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java
@@ -35,7 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 07d314691a97..8380b7d9511c 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,7 +37,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java
index dd99468a0059..d648bf27c437 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,7 +31,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 383cafdd3a5a..02df7eca78ef 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -31,7 +31,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
   private Integer code;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java
index b62e13a90a0c..fe4401430d6d 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java
index bd625c5f66f3..e1b4db38dfc1 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java
@@ -33,7 +33,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5ca72a169fe8..c1f1f3b0ffc5 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java
index ba4e395e94e9..ac6b97e17e61 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java
@@ -35,7 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java
index d4d9ac6ba110..b1b6239245be 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -32,7 +32,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   private BigDecimal myNumber;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java
index 2df466732f74..5fd7d1d2b8a6 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java
@@ -22,7 +22,9 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -38,7 +40,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
@@ -50,7 +52,7 @@ public class Pet {
   private String name;
 
   public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
-  private List<String> photoUrls = new ArrayList<>();
+  private Set<String> photoUrls = new LinkedHashSet<>();
 
   public static final String JSON_PROPERTY_TAGS = "tags";
   private List<Tag> tags = null;
@@ -170,7 +172,7 @@ public void setName(String name) {
   }
 
 
-  public Pet photoUrls(List<String> photoUrls) {
+  public Pet photoUrls(Set<String> photoUrls) {
     
     this.photoUrls = photoUrls;
     return this;
@@ -189,12 +191,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
-  public List<String> getPhotoUrls() {
+  public Set<String> getPhotoUrls() {
     return photoUrls;
   }
 
 
-  public void setPhotoUrls(List<String> photoUrls) {
+  public void setPhotoUrls(Set<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
 
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b3e58ef3d2c5..fe71d78a87e3 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,7 +30,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 35ad3bf46994..1edaa88d2eb9 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Tag.java
index a3ecb398faa3..36dc2ef6ca37 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,7 +30,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index f79d7b6383a7..0fb13c190a44 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -36,7 +36,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem = "what";
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index f15b107fd18b..a9b4ef6a1e20 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -37,7 +37,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/User.java
index b7e74643dab2..15599afa8bca 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/User.java
@@ -36,7 +36,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/XmlItem.java
index b3fbdce31b9b..1dd697308a4e 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -60,7 +60,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   private String attributeString;
diff --git a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
index 44d82e91f71f..8022ebac99ed 100644
--- a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
+++ b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
@@ -17,20 +17,23 @@
 import org.openapitools.client.model.Client;
 import org.junit.Test;
 import org.junit.Ignore;
-import org.junit.Assert;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import java.util.concurrent.CompletableFuture;
+
 /**
  * API tests for AnotherFakeApi
  */
+@Ignore
 public class AnotherFakeApiTest {
 
     private final AnotherFakeApi api = new AnotherFakeApi();
 
+    
     /**
      * To test special tags
      *
@@ -41,11 +44,11 @@ public class AnotherFakeApiTest {
      */
     @Test
     public void call123testSpecialTagsTest() throws ApiException {
-        //
-        //Client body = null;
-        //
-        //Client response = api.call123testSpecialTags(body);
-
+        Client body = null;
+        CompletableFuture<Client> response = 
+        api.call123testSpecialTags(body);
+        
         // TODO: test validations
     }
+    
 }
diff --git a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/FakeApiTest.java
index 73e2be5f5e5f..e73d4f28e277 100644
--- a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -25,20 +25,23 @@
 import org.openapitools.client.model.XmlItem;
 import org.junit.Test;
 import org.junit.Ignore;
-import org.junit.Assert;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import java.util.concurrent.CompletableFuture;
+
 /**
  * API tests for FakeApi
  */
+@Ignore
 public class FakeApiTest {
 
     private final FakeApi api = new FakeApi();
 
+    
     /**
      * creates an XmlItem
      *
@@ -49,14 +52,16 @@ public class FakeApiTest {
      */
     @Test
     public void createXmlItemTest() throws ApiException {
-        //
-        //XmlItem xmlItem = null;
-        //
-        //api.createXmlItem(xmlItem);
-
+        XmlItem xmlItem = null;
+        
+        CompletableFuture<Void> response = api.createXmlItem(xmlItem);
+        
         // TODO: test validations
     }
+    
     /**
+     * 
+     *
      * Test serialization of outer boolean types
      *
      * @throws ApiException
@@ -64,14 +69,16 @@ public void createXmlItemTest() throws ApiException {
      */
     @Test
     public void fakeOuterBooleanSerializeTest() throws ApiException {
-        //
-        //Boolean body = null;
-        //
-        //Boolean response = api.fakeOuterBooleanSerialize(body);
-
+        Boolean body = null;
+        CompletableFuture<Boolean> response = 
+        api.fakeOuterBooleanSerialize(body);
+        
         // TODO: test validations
     }
+    
     /**
+     * 
+     *
      * Test serialization of object with outer number type
      *
      * @throws ApiException
@@ -79,14 +86,16 @@ public void fakeOuterBooleanSerializeTest() throws ApiException {
      */
     @Test
     public void fakeOuterCompositeSerializeTest() throws ApiException {
-        //
-        //OuterComposite body = null;
-        //
-        //OuterComposite response = api.fakeOuterCompositeSerialize(body);
-
+        OuterComposite body = null;
+        CompletableFuture<OuterComposite> response = 
+        api.fakeOuterCompositeSerialize(body);
+        
         // TODO: test validations
     }
+    
     /**
+     * 
+     *
      * Test serialization of outer number types
      *
      * @throws ApiException
@@ -94,14 +103,16 @@ public void fakeOuterCompositeSerializeTest() throws ApiException {
      */
     @Test
     public void fakeOuterNumberSerializeTest() throws ApiException {
-        //
-        //BigDecimal body = null;
-        //
-        //BigDecimal response = api.fakeOuterNumberSerialize(body);
-
+        BigDecimal body = null;
+        CompletableFuture<BigDecimal> response = 
+        api.fakeOuterNumberSerialize(body);
+        
         // TODO: test validations
     }
+    
     /**
+     * 
+     *
      * Test serialization of outer string types
      *
      * @throws ApiException
@@ -109,14 +120,16 @@ public void fakeOuterNumberSerializeTest() throws ApiException {
      */
     @Test
     public void fakeOuterStringSerializeTest() throws ApiException {
-        //
-        //String body = null;
-        //
-        //String response = api.fakeOuterStringSerialize(body);
-
+        String body = null;
+        CompletableFuture<String> response = 
+        api.fakeOuterStringSerialize(body);
+        
         // TODO: test validations
     }
+    
     /**
+     * 
+     *
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
      *
      * @throws ApiException
@@ -124,28 +137,31 @@ public void fakeOuterStringSerializeTest() throws ApiException {
      */
     @Test
     public void testBodyWithFileSchemaTest() throws ApiException {
-        //
-        //FileSchemaTestClass body = null;
-        //
-        //api.testBodyWithFileSchema(body);
-
+        FileSchemaTestClass body = null;
+        
+        CompletableFuture<Void> response = api.testBodyWithFileSchema(body);
+        
         // TODO: test validations
     }
+    
     /**
+     * 
+     *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void testBodyWithQueryParamsTest() throws ApiException {
-        //
-        //String query = null;
-        //
-        //User body = null;
-        //
-        //api.testBodyWithQueryParams(query, body);
-
+        String query = null;
+        User body = null;
+        
+        CompletableFuture<Void> response = api.testBodyWithQueryParams(query, body);
+        
         // TODO: test validations
     }
+    
     /**
      * To test \&quot;client\&quot; model
      *
@@ -156,13 +172,13 @@ public void testBodyWithQueryParamsTest() throws ApiException {
      */
     @Test
     public void testClientModelTest() throws ApiException {
-        //
-        //Client body = null;
-        //
-        //Client response = api.testClientModel(body);
-
+        Client body = null;
+        CompletableFuture<Client> response = 
+        api.testClientModel(body);
+        
         // TODO: test validations
     }
+    
     /**
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      *
@@ -173,39 +189,26 @@ public void testClientModelTest() throws ApiException {
      */
     @Test
     public void testEndpointParametersTest() throws ApiException {
-        //
-        //BigDecimal number = null;
-        //
-        //Double _double = null;
-        //
-        //String patternWithoutDelimiter = null;
-        //
-        //byte[] _byte = null;
-        //
-        //Integer integer = null;
-        //
-        //Integer int32 = null;
-        //
-        //Long int64 = null;
-        //
-        //Float _float = null;
-        //
-        //String string = null;
-        //
-        //File binary = null;
-        //
-        //LocalDate date = null;
-        //
-        //OffsetDateTime dateTime = null;
-        //
-        //String password = null;
-        //
-        //String paramCallback = null;
-        //
-        //api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
-
+        BigDecimal number = null;
+        Double _double = null;
+        String patternWithoutDelimiter = null;
+        byte[] _byte = null;
+        Integer integer = null;
+        Integer int32 = null;
+        Long int64 = null;
+        Float _float = null;
+        String string = null;
+        File binary = null;
+        LocalDate date = null;
+        OffsetDateTime dateTime = null;
+        String password = null;
+        String paramCallback = null;
+        
+        CompletableFuture<Void> response = api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+        
         // TODO: test validations
     }
+    
     /**
      * To test enum parameters
      *
@@ -216,27 +219,20 @@ public void testEndpointParametersTest() throws ApiException {
      */
     @Test
     public void testEnumParametersTest() throws ApiException {
-        //
-        //List<String> enumHeaderStringArray = null;
-        //
-        //String enumHeaderString = null;
-        //
-        //List<String> enumQueryStringArray = null;
-        //
-        //String enumQueryString = null;
-        //
-        //Integer enumQueryInteger = null;
-        //
-        //Double enumQueryDouble = null;
-        //
-        //List<String> enumFormStringArray = null;
-        //
-        //String enumFormString = null;
-        //
-        //api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
-
+        List<String> enumHeaderStringArray = null;
+        String enumHeaderString = null;
+        List<String> enumQueryStringArray = null;
+        String enumQueryString = null;
+        Integer enumQueryInteger = null;
+        Double enumQueryDouble = null;
+        List<String> enumFormStringArray = null;
+        String enumFormString = null;
+        
+        CompletableFuture<Void> response = api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+        
         // TODO: test validations
     }
+    
     /**
      * Fake endpoint to test group parameters (optional)
      *
@@ -247,56 +243,65 @@ public void testEnumParametersTest() throws ApiException {
      */
     @Test
     public void testGroupParametersTest() throws ApiException {
-        //
-        //Integer requiredStringGroup = null;
-        //
-        //Boolean requiredBooleanGroup = null;
-        //
-        //Long requiredInt64Group = null;
-        //
-        //Integer stringGroup = null;
-        //
-        //Boolean booleanGroup = null;
-        //
-        //Long int64Group = null;
-        //
-        //api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+        Integer requiredStringGroup = null;
+        Boolean requiredBooleanGroup = null;
+        Long requiredInt64Group = null;
+        Integer stringGroup = null;
+        Boolean booleanGroup = null;
+        Long int64Group = null;
+        
+        FakeApi.APItestGroupParametersRequest request = FakeApi.APItestGroupParametersRequest.newBuilder()
+          .requiredStringGroup(requiredStringGroup)
+          .requiredBooleanGroup(requiredBooleanGroup)
+          .requiredInt64Group(requiredInt64Group)
+          .stringGroup(stringGroup)
+          .booleanGroup(booleanGroup)
+          .int64Group(int64Group)
+          .build();
+        
+        CompletableFuture<Void> response = api.testGroupParameters(request);
 
         // TODO: test validations
     }
+    
     /**
      * test inline additionalProperties
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void testInlineAdditionalPropertiesTest() throws ApiException {
-        //
-        //Map<String, String> param = null;
-        //
-        //api.testInlineAdditionalProperties(param);
-
+        Map<String, String> param = null;
+        
+        CompletableFuture<Void> response = api.testInlineAdditionalProperties(param);
+        
         // TODO: test validations
     }
+    
     /**
      * test json serialization of form data
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void testJsonFormDataTest() throws ApiException {
-        //
-        //String param = null;
-        //
-        //String param2 = null;
-        //
-        //api.testJsonFormData(param, param2);
-
+        String param = null;
+        String param2 = null;
+        
+        CompletableFuture<Void> response = api.testJsonFormData(param, param2);
+        
         // TODO: test validations
     }
+    
     /**
+     * 
+     *
      * To test the collection format in query parameters
      *
      * @throws ApiException
@@ -304,19 +309,15 @@ public void testJsonFormDataTest() throws ApiException {
      */
     @Test
     public void testQueryParameterCollectionFormatTest() throws ApiException {
-        //
-        //List<String> pipe = null;
-        //
-        //List<String> ioutil = null;
-        //
-        //List<String> http = null;
-        //
-        //List<String> url = null;
-        //
-        //List<String> context = null;
-        //
-        //api.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
-
+        List<String> pipe = null;
+        List<String> ioutil = null;
+        List<String> http = null;
+        List<String> url = null;
+        List<String> context = null;
+        
+        CompletableFuture<Void> response = api.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
+        
         // TODO: test validations
     }
+    
 }
diff --git a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
index ac540ae2c810..a63cac218667 100644
--- a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
+++ b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
@@ -17,20 +17,23 @@
 import org.openapitools.client.model.Client;
 import org.junit.Test;
 import org.junit.Ignore;
-import org.junit.Assert;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import java.util.concurrent.CompletableFuture;
+
 /**
  * API tests for FakeClassnameTags123Api
  */
+@Ignore
 public class FakeClassnameTags123ApiTest {
 
     private final FakeClassnameTags123Api api = new FakeClassnameTags123Api();
 
+    
     /**
      * To test class name in snake case
      *
@@ -41,11 +44,11 @@ public class FakeClassnameTags123ApiTest {
      */
     @Test
     public void testClassnameTest() throws ApiException {
-        //
-        //Client body = null;
-        //
-        //Client response = api.testClassname(body);
-
+        Client body = null;
+        CompletableFuture<Client> response = 
+        api.testClassname(body);
+        
         // TODO: test validations
     }
+    
 }
diff --git a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/PetApiTest.java
index 5bda552acf62..933cb8c34141 100644
--- a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -17,54 +17,61 @@
 import java.io.File;
 import org.openapitools.client.model.ModelApiResponse;
 import org.openapitools.client.model.Pet;
+import java.util.Set;
 import org.junit.Test;
 import org.junit.Ignore;
-import org.junit.Assert;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import java.util.concurrent.CompletableFuture;
+
 /**
  * API tests for PetApi
  */
+@Ignore
 public class PetApiTest {
 
     private final PetApi api = new PetApi();
 
+    
     /**
      * Add a new pet to the store
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void addPetTest() throws ApiException {
-        //
-        //Pet body = null;
-        //
-        //api.addPet(body);
-
+        Pet body = null;
+        
+        CompletableFuture<Void> response = api.addPet(body);
+        
         // TODO: test validations
     }
+    
     /**
      * Deletes a pet
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void deletePetTest() throws ApiException {
-        //
-        //Long petId = null;
-        //
-        //String apiKey = null;
-        //
-        //api.deletePet(petId, apiKey);
-
+        Long petId = null;
+        String apiKey = null;
+        
+        CompletableFuture<Void> response = api.deletePet(petId, apiKey);
+        
         // TODO: test validations
     }
+    
     /**
      * Finds Pets by status
      *
@@ -75,13 +82,13 @@ public void deletePetTest() throws ApiException {
      */
     @Test
     public void findPetsByStatusTest() throws ApiException {
-        //
-        //List<String> status = null;
-        //
-        //List<Pet> response = api.findPetsByStatus(status);
-
+        List<String> status = null;
+        CompletableFuture<List<Pet>> response = 
+        api.findPetsByStatus(status);
+        
         // TODO: test validations
     }
+    
     /**
      * Finds Pets by tags
      *
@@ -92,13 +99,13 @@ public void findPetsByStatusTest() throws ApiException {
      */
     @Test
     public void findPetsByTagsTest() throws ApiException {
-        //
-        //List<String> tags = null;
-        //
-        //List<Pet> response = api.findPetsByTags(tags);
-
+        Set<String> tags = null;
+        CompletableFuture<Set<Pet>> response = 
+        api.findPetsByTags(tags);
+        
         // TODO: test validations
     }
+    
     /**
      * Find pet by ID
      *
@@ -109,83 +116,85 @@ public void findPetsByTagsTest() throws ApiException {
      */
     @Test
     public void getPetByIdTest() throws ApiException {
-        //
-        //Long petId = null;
-        //
-        //Pet response = api.getPetById(petId);
-
+        Long petId = null;
+        CompletableFuture<Pet> response = 
+        api.getPetById(petId);
+        
         // TODO: test validations
     }
+    
     /**
      * Update an existing pet
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void updatePetTest() throws ApiException {
-        //
-        //Pet body = null;
-        //
-        //api.updatePet(body);
-
+        Pet body = null;
+        
+        CompletableFuture<Void> response = api.updatePet(body);
+        
         // TODO: test validations
     }
+    
     /**
      * Updates a pet in the store with form data
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void updatePetWithFormTest() throws ApiException {
-        //
-        //Long petId = null;
-        //
-        //String name = null;
-        //
-        //String status = null;
-        //
-        //api.updatePetWithForm(petId, name, status);
-
+        Long petId = null;
+        String name = null;
+        String status = null;
+        
+        CompletableFuture<Void> response = api.updatePetWithForm(petId, name, status);
+        
         // TODO: test validations
     }
+    
     /**
      * uploads an image
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void uploadFileTest() throws ApiException {
-        //
-        //Long petId = null;
-        //
-        //String additionalMetadata = null;
-        //
-        //File file = null;
-        //
-        //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
-
+        Long petId = null;
+        String additionalMetadata = null;
+        File file = null;
+        CompletableFuture<ModelApiResponse> response = 
+        api.uploadFile(petId, additionalMetadata, file);
+        
         // TODO: test validations
     }
+    
     /**
      * uploads an image (required)
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void uploadFileWithRequiredFileTest() throws ApiException {
-        //
-        //Long petId = null;
-        //
-        //File requiredFile = null;
-        //
-        //String additionalMetadata = null;
-        //
-        //ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
-
+        Long petId = null;
+        File requiredFile = null;
+        String additionalMetadata = null;
+        CompletableFuture<ModelApiResponse> response = 
+        api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+        
         // TODO: test validations
     }
+    
 }
diff --git a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 6f9a624092d7..67bdd914ac3b 100644
--- a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -17,20 +17,23 @@
 import org.openapitools.client.model.Order;
 import org.junit.Test;
 import org.junit.Ignore;
-import org.junit.Assert;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import java.util.concurrent.CompletableFuture;
+
 /**
  * API tests for StoreApi
  */
+@Ignore
 public class StoreApiTest {
 
     private final StoreApi api = new StoreApi();
 
+    
     /**
      * Delete purchase order by ID
      *
@@ -41,13 +44,13 @@ public class StoreApiTest {
      */
     @Test
     public void deleteOrderTest() throws ApiException {
-        //
-        //String orderId = null;
-        //
-        //api.deleteOrder(orderId);
-
+        String orderId = null;
+        
+        CompletableFuture<Void> response = api.deleteOrder(orderId);
+        
         // TODO: test validations
     }
+    
     /**
      * Returns pet inventories by status
      *
@@ -58,11 +61,12 @@ public void deleteOrderTest() throws ApiException {
      */
     @Test
     public void getInventoryTest() throws ApiException {
-        //
-        //Map<String, Integer> response = api.getInventory();
-
+        CompletableFuture<Map<String, Integer>> response = 
+        api.getInventory();
+        
         // TODO: test validations
     }
+    
     /**
      * Find purchase order by ID
      *
@@ -73,26 +77,28 @@ public void getInventoryTest() throws ApiException {
      */
     @Test
     public void getOrderByIdTest() throws ApiException {
-        //
-        //Long orderId = null;
-        //
-        //Order response = api.getOrderById(orderId);
-
+        Long orderId = null;
+        CompletableFuture<Order> response = 
+        api.getOrderById(orderId);
+        
         // TODO: test validations
     }
+    
     /**
      * Place an order for a pet
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void placeOrderTest() throws ApiException {
-        //
-        //Order body = null;
-        //
-        //Order response = api.placeOrder(body);
-
+        Order body = null;
+        CompletableFuture<Order> response = 
+        api.placeOrder(body);
+        
         // TODO: test validations
     }
+    
 }
diff --git a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/UserApiTest.java
index ffe1ec483816..265b71ad0cf9 100644
--- a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/UserApiTest.java
@@ -17,20 +17,23 @@
 import org.openapitools.client.model.User;
 import org.junit.Test;
 import org.junit.Ignore;
-import org.junit.Assert;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import java.util.concurrent.CompletableFuture;
+
 /**
  * API tests for UserApi
  */
+@Ignore
 public class UserApiTest {
 
     private final UserApi api = new UserApi();
 
+    
     /**
      * Create user
      *
@@ -41,43 +44,47 @@ public class UserApiTest {
      */
     @Test
     public void createUserTest() throws ApiException {
-        //
-        //User body = null;
-        //
-        //api.createUser(body);
-
+        User body = null;
+        
+        CompletableFuture<Void> response = api.createUser(body);
+        
         // TODO: test validations
     }
+    
     /**
      * Creates list of users with given input array
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void createUsersWithArrayInputTest() throws ApiException {
-        //
-        //List<User> body = null;
-        //
-        //api.createUsersWithArrayInput(body);
-
+        List<User> body = null;
+        
+        CompletableFuture<Void> response = api.createUsersWithArrayInput(body);
+        
         // TODO: test validations
     }
+    
     /**
      * Creates list of users with given input array
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void createUsersWithListInputTest() throws ApiException {
-        //
-        //List<User> body = null;
-        //
-        //api.createUsersWithListInput(body);
-
+        List<User> body = null;
+        
+        CompletableFuture<Void> response = api.createUsersWithListInput(body);
+        
         // TODO: test validations
     }
+    
     /**
      * Delete user
      *
@@ -88,58 +95,64 @@ public void createUsersWithListInputTest() throws ApiException {
      */
     @Test
     public void deleteUserTest() throws ApiException {
-        //
-        //String username = null;
-        //
-        //api.deleteUser(username);
-
+        String username = null;
+        
+        CompletableFuture<Void> response = api.deleteUser(username);
+        
         // TODO: test validations
     }
+    
     /**
      * Get user by user name
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void getUserByNameTest() throws ApiException {
-        //
-        //String username = null;
-        //
-        //User response = api.getUserByName(username);
-
+        String username = null;
+        CompletableFuture<User> response = 
+        api.getUserByName(username);
+        
         // TODO: test validations
     }
+    
     /**
      * Logs user into the system
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void loginUserTest() throws ApiException {
-        //
-        //String username = null;
-        //
-        //String password = null;
-        //
-        //String response = api.loginUser(username, password);
-
+        String username = null;
+        String password = null;
+        CompletableFuture<String> response = 
+        api.loginUser(username, password);
+        
         // TODO: test validations
     }
+    
     /**
      * Logs out current logged in user session
      *
+     * 
+     *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
     public void logoutUserTest() throws ApiException {
-        //
-        //api.logoutUser();
-
+        
+        CompletableFuture<Void> response = api.logoutUser();
+        
         // TODO: test validations
     }
+    
     /**
      * Updated user
      *
@@ -150,13 +163,12 @@ public void logoutUserTest() throws ApiException {
      */
     @Test
     public void updateUserTest() throws ApiException {
-        //
-        //String username = null;
-        //
-        //User body = null;
-        //
-        //api.updateUser(username, body);
-
+        String username = null;
+        User body = null;
+        
+        CompletableFuture<Void> response = api.updateUser(username, body);
+        
         // TODO: test validations
     }
+    
 }
diff --git a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/AnimalTest.java
index c0d10ec5a3d8..7e79e5ca7b3f 100644
--- a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/AnimalTest.java
+++ b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/AnimalTest.java
@@ -21,6 +21,9 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.BigCat;
+import org.openapitools.client.model.Cat;
+import org.openapitools.client.model.Dog;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/BigCatTest.java b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/BigCatTest.java
index 006c80707427..b3afa31d2894 100644
--- a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/BigCatTest.java
+++ b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/BigCatTest.java
@@ -16,6 +16,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/CatTest.java b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/CatTest.java
index dbf40678a2d0..d0952b501004 100644
--- a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/CatTest.java
+++ b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/CatTest.java
@@ -16,10 +16,13 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.BigCat;
 import org.openapitools.client.model.CatAllOf;
 import org.junit.Assert;
 import org.junit.Ignore;
diff --git a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/DogTest.java b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/DogTest.java
index a46bc508d48c..3446815a300a 100644
--- a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/DogTest.java
+++ b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/DogTest.java
@@ -16,6 +16,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/PetTest.java
index c3c0d4cc35dd..4065f7ca1a46 100644
--- a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/PetTest.java
+++ b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/model/PetTest.java
@@ -20,7 +20,9 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
 import org.junit.Assert;
diff --git a/samples/client/petstore/java/native/.openapi-generator/FILES b/samples/client/petstore/java/native/.openapi-generator/FILES
index 48923dfacbed..cb10aec6dd80 100644
--- a/samples/client/petstore/java/native/.openapi-generator/FILES
+++ b/samples/client/petstore/java/native/.openapi-generator/FILES
@@ -67,6 +67,7 @@ settings.gradle
 src/main/AndroidManifest.xml
 src/main/java/org/openapitools/client/ApiClient.java
 src/main/java/org/openapitools/client/ApiException.java
+src/main/java/org/openapitools/client/ApiResponse.java
 src/main/java/org/openapitools/client/Configuration.java
 src/main/java/org/openapitools/client/Pair.java
 src/main/java/org/openapitools/client/ServerConfiguration.java
diff --git a/samples/client/petstore/java/native/build.gradle b/samples/client/petstore/java/native/build.gradle
index a790b04b52b9..d4db22d6ee3c 100644
--- a/samples/client/petstore/java/native/build.gradle
+++ b/samples/client/petstore/java/native/build.gradle
@@ -62,5 +62,7 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
+    compile "org.openapitools:jackson-databind-nullable:0.2.1"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/native/docs/AnotherFakeApi.md b/samples/client/petstore/java/native/docs/AnotherFakeApi.md
index 059616ec6baa..be710a2b7d39 100644
--- a/samples/client/petstore/java/native/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/native/docs/AnotherFakeApi.md
@@ -5,6 +5,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+[**call123testSpecialTagsWithHttpInfo**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 
 
 
@@ -35,6 +36,7 @@ public class Example {
         Client body = new Client(); // Client | client model
         try {
             Client result = apiInstance.call123testSpecialTags(body);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
@@ -58,6 +60,75 @@ Name | Type | Description  | Notes
 
 [**Client**](Client.md)
 
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
+## call123testSpecialTagsWithHttpInfo
+
+> ApiResponse<Client> call123testSpecialTags call123testSpecialTagsWithHttpInfo(body)
+
+To test special tags
+
+To test special tags and operation ID starting with number
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.AnotherFakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
+        try {
+            ApiResponse<Client> response = apiInstance.call123testSpecialTagsWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Client**](Client.md)| client model |
+
+### Return type
+
+ApiResponse<[**Client**](Client.md)>
+
+
 ### Authorization
 
 No authorization required
diff --git a/samples/client/petstore/java/native/docs/FakeApi.md b/samples/client/petstore/java/native/docs/FakeApi.md
index 1ce9c124e914..4f3e6b4608b0 100644
--- a/samples/client/petstore/java/native/docs/FakeApi.md
+++ b/samples/client/petstore/java/native/docs/FakeApi.md
@@ -5,25 +5,39 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**createXmlItem**](FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
+[**createXmlItemWithHttpInfo**](FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 [**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
+[**fakeOuterBooleanSerializeWithHttpInfo**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
+[**fakeOuterCompositeSerializeWithHttpInfo**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
+[**fakeOuterNumberSerializeWithHttpInfo**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+[**fakeOuterStringSerializeWithHttpInfo**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
 [**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
+[**testBodyWithFileSchemaWithHttpInfo**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 [**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
+[**testBodyWithQueryParamsWithHttpInfo**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 [**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
+[**testClientModelWithHttpInfo**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
 [**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+[**testEndpointParametersWithHttpInfo**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 [**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+[**testEnumParametersWithHttpInfo**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
 [**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
+[**testGroupParametersWithHttpInfo**](FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 [**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
+[**testInlineAdditionalPropertiesWithHttpInfo**](FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
 [**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+[**testJsonFormDataWithHttpInfo**](FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
 [**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
+[**testQueryParameterCollectionFormatWithHttpInfo**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
 
 
 
 ## createXmlItem
 
-> createXmlItem(xmlItem)
+> void createXmlItem(xmlItem)
 
 creates an XmlItem
 
@@ -48,6 +62,7 @@ public class Example {
         XmlItem xmlItem = new XmlItem(); // XmlItem | XmlItem Body
         try {
             apiInstance.createXmlItem(xmlItem);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#createXmlItem");
             System.err.println("Status code: " + e.getCode());
@@ -68,6 +83,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
+
 null (empty response body)
 
 ### Authorization
@@ -84,14 +100,13 @@ No authorization required
 |-------------|-------------|------------------|
 | **200** | successful operation |  -  |
 
+## createXmlItemWithHttpInfo
 
-## fakeOuterBooleanSerialize
-
-> Boolean fakeOuterBooleanSerialize(body)
-
+> ApiResponse<Void> createXmlItem createXmlItemWithHttpInfo(xmlItem)
 
+creates an XmlItem
 
-Test serialization of outer boolean types
+this route creates an XmlItem
 
 ### Example
 
@@ -99,6 +114,7 @@ Test serialization of outer boolean types
 // Import classes:
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
@@ -109,12 +125,13 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         FakeApi apiInstance = new FakeApi(defaultClient);
-        Boolean body = true; // Boolean | Input boolean as post body
+        XmlItem xmlItem = new XmlItem(); // XmlItem | XmlItem Body
         try {
-            Boolean result = apiInstance.fakeOuterBooleanSerialize(body);
-            System.out.println(result);
+            ApiResponse<Void> response = apiInstance.createXmlItemWithHttpInfo(xmlItem);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
         } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#fakeOuterBooleanSerialize");
+            System.err.println("Exception when calling FakeApi#createXmlItem");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -129,11 +146,12 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | **Boolean**| Input boolean as post body | [optional]
+ **xmlItem** | [**XmlItem**](XmlItem.md)| XmlItem Body |
 
 ### Return type
 
-**Boolean**
+
+ApiResponse<Void>
 
 ### Authorization
 
@@ -141,22 +159,22 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
-- **Accept**: */*
+- **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
+- **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | Output boolean |  -  |
+| **200** | successful operation |  -  |
 
 
-## fakeOuterCompositeSerialize
+## fakeOuterBooleanSerialize
 
-> OuterComposite fakeOuterCompositeSerialize(body)
+> Boolean fakeOuterBooleanSerialize(body)
 
 
 
-Test serialization of object with outer number type
+Test serialization of outer boolean types
 
 ### Example
 
@@ -174,12 +192,13 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         FakeApi apiInstance = new FakeApi(defaultClient);
-        OuterComposite body = new OuterComposite(); // OuterComposite | Input composite as post body
+        Boolean body = true; // Boolean | Input boolean as post body
         try {
-            OuterComposite result = apiInstance.fakeOuterCompositeSerialize(body);
+            Boolean result = apiInstance.fakeOuterBooleanSerialize(body);
+
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#fakeOuterCompositeSerialize");
+            System.err.println("Exception when calling FakeApi#fakeOuterBooleanSerialize");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -194,11 +213,12 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**OuterComposite**](OuterComposite.md)| Input composite as post body | [optional]
+ **body** | **Boolean**| Input boolean as post body | [optional]
 
 ### Return type
 
-[**OuterComposite**](OuterComposite.md)
+**Boolean**
+
 
 ### Authorization
 
@@ -212,16 +232,15 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | Output composite |  -  |
-
+| **200** | Output boolean |  -  |
 
-## fakeOuterNumberSerialize
+## fakeOuterBooleanSerializeWithHttpInfo
 
-> BigDecimal fakeOuterNumberSerialize(body)
+> ApiResponse<Boolean> fakeOuterBooleanSerialize fakeOuterBooleanSerializeWithHttpInfo(body)
 
 
 
-Test serialization of outer number types
+Test serialization of outer boolean types
 
 ### Example
 
@@ -229,6 +248,7 @@ Test serialization of outer number types
 // Import classes:
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
@@ -239,12 +259,14 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         FakeApi apiInstance = new FakeApi(defaultClient);
-        BigDecimal body = new BigDecimal(); // BigDecimal | Input number as post body
+        Boolean body = true; // Boolean | Input boolean as post body
         try {
-            BigDecimal result = apiInstance.fakeOuterNumberSerialize(body);
-            System.out.println(result);
+            ApiResponse<Boolean> response = apiInstance.fakeOuterBooleanSerializeWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
         } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#fakeOuterNumberSerialize");
+            System.err.println("Exception when calling FakeApi#fakeOuterBooleanSerialize");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -259,11 +281,12 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | **BigDecimal**| Input number as post body | [optional]
+ **body** | **Boolean**| Input boolean as post body | [optional]
 
 ### Return type
 
-[**BigDecimal**](BigDecimal.md)
+ApiResponse<**Boolean**>
+
 
 ### Authorization
 
@@ -277,16 +300,16 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | Output number |  -  |
+| **200** | Output boolean |  -  |
 
 
-## fakeOuterStringSerialize
+## fakeOuterCompositeSerialize
 
-> String fakeOuterStringSerialize(body)
+> OuterComposite fakeOuterCompositeSerialize(body)
 
 
 
-Test serialization of outer string types
+Test serialization of object with outer number type
 
 ### Example
 
@@ -304,12 +327,13 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         FakeApi apiInstance = new FakeApi(defaultClient);
-        String body = "body_example"; // String | Input string as post body
+        OuterComposite body = new OuterComposite(); // OuterComposite | Input composite as post body
         try {
-            String result = apiInstance.fakeOuterStringSerialize(body);
+            OuterComposite result = apiInstance.fakeOuterCompositeSerialize(body);
+
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#fakeOuterStringSerialize");
+            System.err.println("Exception when calling FakeApi#fakeOuterCompositeSerialize");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -324,11 +348,12 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | **String**| Input string as post body | [optional]
+ **body** | [**OuterComposite**](OuterComposite.md)| Input composite as post body | [optional]
 
 ### Return type
 
-**String**
+[**OuterComposite**](OuterComposite.md)
+
 
 ### Authorization
 
@@ -342,16 +367,15 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | Output string |  -  |
-
+| **200** | Output composite |  -  |
 
-## testBodyWithFileSchema
+## fakeOuterCompositeSerializeWithHttpInfo
 
-> testBodyWithFileSchema(body)
+> ApiResponse<OuterComposite> fakeOuterCompositeSerialize fakeOuterCompositeSerializeWithHttpInfo(body)
 
 
 
-For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+Test serialization of object with outer number type
 
 ### Example
 
@@ -359,6 +383,7 @@ For this test, the body for this request much reference a schema named &#x60;Fil
 // Import classes:
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
@@ -369,11 +394,14 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         FakeApi apiInstance = new FakeApi(defaultClient);
-        FileSchemaTestClass body = new FileSchemaTestClass(); // FileSchemaTestClass | 
+        OuterComposite body = new OuterComposite(); // OuterComposite | Input composite as post body
         try {
-            apiInstance.testBodyWithFileSchema(body);
+            ApiResponse<OuterComposite> response = apiInstance.fakeOuterCompositeSerializeWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
         } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testBodyWithFileSchema");
+            System.err.println("Exception when calling FakeApi#fakeOuterCompositeSerialize");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -388,11 +416,12 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  |
+ **body** | [**OuterComposite**](OuterComposite.md)| Input composite as post body | [optional]
 
 ### Return type
 
-null (empty response body)
+ApiResponse<[**OuterComposite**](OuterComposite.md)>
+
 
 ### Authorization
 
@@ -400,20 +429,22 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: application/json
-- **Accept**: Not defined
+- **Content-Type**: Not defined
+- **Accept**: */*
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | Success |  -  |
+| **200** | Output composite |  -  |
 
 
-## testBodyWithQueryParams
+## fakeOuterNumberSerialize
+
+> BigDecimal fakeOuterNumberSerialize(body)
 
-> testBodyWithQueryParams(query, body)
 
 
+Test serialization of outer number types
 
 ### Example
 
@@ -431,12 +462,13 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         FakeApi apiInstance = new FakeApi(defaultClient);
-        String query = "query_example"; // String | 
-        User body = new User(); // User | 
+        BigDecimal body = new BigDecimal(); // BigDecimal | Input number as post body
         try {
-            apiInstance.testBodyWithQueryParams(query, body);
+            BigDecimal result = apiInstance.fakeOuterNumberSerialize(body);
+
+            System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testBodyWithQueryParams");
+            System.err.println("Exception when calling FakeApi#fakeOuterNumberSerialize");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -451,12 +483,12 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **query** | **String**|  |
- **body** | [**User**](User.md)|  |
+ **body** | **BigDecimal**| Input number as post body | [optional]
 
 ### Return type
 
-null (empty response body)
+[**BigDecimal**](BigDecimal.md)
+
 
 ### Authorization
 
@@ -464,22 +496,21 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: application/json
-- **Accept**: Not defined
+- **Content-Type**: Not defined
+- **Accept**: */*
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | Success |  -  |
+| **200** | Output number |  -  |
 
+## fakeOuterNumberSerializeWithHttpInfo
 
-## testClientModel
+> ApiResponse<BigDecimal> fakeOuterNumberSerialize fakeOuterNumberSerializeWithHttpInfo(body)
 
-> Client testClientModel(body)
 
-To test \&quot;client\&quot; model
 
-To test \&quot;client\&quot; model
+Test serialization of outer number types
 
 ### Example
 
@@ -487,6 +518,7 @@ To test \&quot;client\&quot; model
 // Import classes:
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
@@ -497,12 +529,14 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         FakeApi apiInstance = new FakeApi(defaultClient);
-        Client body = new Client(); // Client | client model
+        BigDecimal body = new BigDecimal(); // BigDecimal | Input number as post body
         try {
-            Client result = apiInstance.testClientModel(body);
-            System.out.println(result);
+            ApiResponse<BigDecimal> response = apiInstance.fakeOuterNumberSerializeWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
         } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testClientModel");
+            System.err.println("Exception when calling FakeApi#fakeOuterNumberSerialize");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -517,11 +551,12 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Client**](Client.md)| client model |
+ **body** | **BigDecimal**| Input number as post body | [optional]
 
 ### Return type
 
-[**Client**](Client.md)
+ApiResponse<[**BigDecimal**](BigDecimal.md)>
+
 
 ### Authorization
 
@@ -529,22 +564,22 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: application/json
-- **Accept**: application/json
+- **Content-Type**: Not defined
+- **Accept**: */*
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **200** | successful operation |  -  |
+| **200** | Output number |  -  |
 
 
-## testEndpointParameters
+## fakeOuterStringSerialize
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> String fakeOuterStringSerialize(body)
 
-Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
-Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+
+Test serialization of outer string types
 
 ### Example
 
@@ -553,7 +588,6 @@ Fake endpoint for testing various parameters  假端點  偽のエンドポイ
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
 import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
 
@@ -561,31 +595,15 @@ public class Example {
     public static void main(String[] args) {
         ApiClient defaultClient = Configuration.getDefaultApiClient();
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure HTTP basic authorization: http_basic_test
-        HttpBasicAuth http_basic_test = (HttpBasicAuth) defaultClient.getAuthentication("http_basic_test");
-        http_basic_test.setUsername("YOUR USERNAME");
-        http_basic_test.setPassword("YOUR PASSWORD");
 
         FakeApi apiInstance = new FakeApi(defaultClient);
-        BigDecimal number = new BigDecimal(); // BigDecimal | None
-        Double _double = 3.4D; // Double | None
-        String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
-        byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
-        Integer int32 = 56; // Integer | None
-        Long int64 = 56L; // Long | None
-        Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
-        File binary = new File("/path/to/file"); // File | None
-        LocalDate date = new LocalDate(); // LocalDate | None
-        OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None
-        String password = "password_example"; // String | None
-        String paramCallback = "paramCallback_example"; // String | None
+        String body = "body_example"; // String | Input string as post body
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            String result = apiInstance.fakeOuterStringSerialize(body);
+
+            System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testEndpointParameters");
+            System.err.println("Exception when calling FakeApi#fakeOuterStringSerialize");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -600,48 +618,34 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **number** | **BigDecimal**| None |
- **_double** | **Double**| None |
- **patternWithoutDelimiter** | **String**| None |
- **_byte** | **byte[]**| None |
- **integer** | **Integer**| None | [optional]
- **int32** | **Integer**| None | [optional]
- **int64** | **Long**| None | [optional]
- **_float** | **Float**| None | [optional]
- **string** | **String**| None | [optional]
- **binary** | **File**| None | [optional]
- **date** | **LocalDate**| None | [optional]
- **dateTime** | **OffsetDateTime**| None | [optional]
- **password** | **String**| None | [optional]
- **paramCallback** | **String**| None | [optional]
+ **body** | **String**| Input string as post body | [optional]
 
 ### Return type
 
-null (empty response body)
+**String**
+
 
 ### Authorization
 
-[http_basic_test](../README.md#http_basic_test)
+No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
+- **Content-Type**: Not defined
+- **Accept**: */*
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Invalid username supplied |  -  |
-| **404** | User not found |  -  |
+| **200** | Output string |  -  |
 
+## fakeOuterStringSerializeWithHttpInfo
 
-## testEnumParameters
+> ApiResponse<String> fakeOuterStringSerialize fakeOuterStringSerializeWithHttpInfo(body)
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
 
-To test enum parameters
 
-To test enum parameters
+Test serialization of outer string types
 
 ### Example
 
@@ -649,6 +653,7 @@ To test enum parameters
 // Import classes:
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.models.*;
 import org.openapitools.client.api.FakeApi;
@@ -659,18 +664,14 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         FakeApi apiInstance = new FakeApi(defaultClient);
-        List<String> enumHeaderStringArray = Arrays.asList("$"); // List<String> | Header parameter enum test (string array)
-        String enumHeaderString = "-efg"; // String | Header parameter enum test (string)
-        List<String> enumQueryStringArray = Arrays.asList("$"); // List<String> | Query parameter enum test (string array)
-        String enumQueryString = "-efg"; // String | Query parameter enum test (string)
-        Integer enumQueryInteger = 56; // Integer | Query parameter enum test (double)
-        Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double)
-        List<String> enumFormStringArray = "$"; // List<String> | Form parameter enum test (string array)
-        String enumFormString = "-efg"; // String | Form parameter enum test (string)
+        String body = "body_example"; // String | Input string as post body
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+            ApiResponse<String> response = apiInstance.fakeOuterStringSerializeWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
         } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testEnumParameters");
+            System.err.println("Exception when calling FakeApi#fakeOuterStringSerialize");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -685,18 +686,12 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **enumHeaderStringArray** | [**List&lt;String&gt;**](String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
- **enumHeaderString** | **String**| Header parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
- **enumQueryStringArray** | [**List&lt;String&gt;**](String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
- **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
- **enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
- **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
- **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $]
- **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
+ **body** | **String**| Input string as post body | [optional]
 
 ### Return type
 
-null (empty response body)
+ApiResponse<**String**>
+
 
 ### Authorization
 
@@ -704,23 +699,22 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
+- **Content-Type**: Not defined
+- **Accept**: */*
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Invalid request |  -  |
-| **404** | Not found |  -  |
+| **200** | Output string |  -  |
 
 
-## testGroupParameters
+## testBodyWithFileSchema
 
-> testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
+> void testBodyWithFileSchema(body)
 
-Fake endpoint to test group parameters (optional)
 
-Fake endpoint to test group parameters (optional)
+
+For this test, the body for this request much reference a schema named &#x60;File&#x60;.
 
 ### Example
 
@@ -738,14 +732,866 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         FakeApi apiInstance = new FakeApi(defaultClient);
-        Integer requiredStringGroup = 56; // Integer | Required String in group parameters
-        Boolean requiredBooleanGroup = true; // Boolean | Required Boolean in group parameters
-        Long requiredInt64Group = 56L; // Long | Required Integer in group parameters
-        Integer stringGroup = 56; // Integer | String in group parameters
-        Boolean booleanGroup = true; // Boolean | Boolean in group parameters
-        Long int64Group = 56L; // Long | Integer in group parameters
+        FileSchemaTestClass body = new FileSchemaTestClass(); // FileSchemaTestClass | 
         try {
-            apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+            apiInstance.testBodyWithFileSchema(body);
+
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testBodyWithFileSchema");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  |
+
+### Return type
+
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Success |  -  |
+
+## testBodyWithFileSchemaWithHttpInfo
+
+> ApiResponse<Void> testBodyWithFileSchema testBodyWithFileSchemaWithHttpInfo(body)
+
+
+
+For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        FileSchemaTestClass body = new FileSchemaTestClass(); // FileSchemaTestClass | 
+        try {
+            ApiResponse<Void> response = apiInstance.testBodyWithFileSchemaWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testBodyWithFileSchema");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  |
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Success |  -  |
+
+
+## testBodyWithQueryParams
+
+> void testBodyWithQueryParams(query, body)
+
+
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        String query = "query_example"; // String | 
+        User body = new User(); // User | 
+        try {
+            apiInstance.testBodyWithQueryParams(query, body);
+
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testBodyWithQueryParams");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **query** | **String**|  |
+ **body** | [**User**](User.md)|  |
+
+### Return type
+
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Success |  -  |
+
+## testBodyWithQueryParamsWithHttpInfo
+
+> ApiResponse<Void> testBodyWithQueryParams testBodyWithQueryParamsWithHttpInfo(query, body)
+
+
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        String query = "query_example"; // String | 
+        User body = new User(); // User | 
+        try {
+            ApiResponse<Void> response = apiInstance.testBodyWithQueryParamsWithHttpInfo(query, body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testBodyWithQueryParams");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **query** | **String**|  |
+ **body** | [**User**](User.md)|  |
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Success |  -  |
+
+
+## testClientModel
+
+> Client testClientModel(body)
+
+To test \&quot;client\&quot; model
+
+To test \&quot;client\&quot; model
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
+        try {
+            Client result = apiInstance.testClientModel(body);
+
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testClientModel");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Client**](Client.md)| client model |
+
+### Return type
+
+[**Client**](Client.md)
+
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
+## testClientModelWithHttpInfo
+
+> ApiResponse<Client> testClientModel testClientModelWithHttpInfo(body)
+
+To test \&quot;client\&quot; model
+
+To test \&quot;client\&quot; model
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
+        try {
+            ApiResponse<Client> response = apiInstance.testClientModelWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testClientModel");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Client**](Client.md)| client model |
+
+### Return type
+
+ApiResponse<[**Client**](Client.md)>
+
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
+
+## testEndpointParameters
+
+> void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+
+Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+
+Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure HTTP basic authorization: http_basic_test
+        HttpBasicAuth http_basic_test = (HttpBasicAuth) defaultClient.getAuthentication("http_basic_test");
+        http_basic_test.setUsername("YOUR USERNAME");
+        http_basic_test.setPassword("YOUR PASSWORD");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        BigDecimal number = new BigDecimal(); // BigDecimal | None
+        Double _double = 3.4D; // Double | None
+        String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
+        byte[] _byte = null; // byte[] | None
+        Integer integer = 56; // Integer | None
+        Integer int32 = 56; // Integer | None
+        Long int64 = 56L; // Long | None
+        Float _float = 3.4F; // Float | None
+        String string = "string_example"; // String | None
+        File binary = new File("/path/to/file"); // File | None
+        LocalDate date = new LocalDate(); // LocalDate | None
+        OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None
+        String password = "password_example"; // String | None
+        String paramCallback = "paramCallback_example"; // String | None
+        try {
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testEndpointParameters");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **number** | **BigDecimal**| None |
+ **_double** | **Double**| None |
+ **patternWithoutDelimiter** | **String**| None |
+ **_byte** | **byte[]**| None |
+ **integer** | **Integer**| None | [optional]
+ **int32** | **Integer**| None | [optional]
+ **int64** | **Long**| None | [optional]
+ **_float** | **Float**| None | [optional]
+ **string** | **String**| None | [optional]
+ **binary** | **File**| None | [optional]
+ **date** | **LocalDate**| None | [optional]
+ **dateTime** | **OffsetDateTime**| None | [optional]
+ **password** | **String**| None | [optional]
+ **paramCallback** | **String**| None | [optional]
+
+### Return type
+
+
+null (empty response body)
+
+### Authorization
+
+[http_basic_test](../README.md#http_basic_test)
+
+### HTTP request headers
+
+- **Content-Type**: application/x-www-form-urlencoded
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Invalid username supplied |  -  |
+| **404** | User not found |  -  |
+
+## testEndpointParametersWithHttpInfo
+
+> ApiResponse<Void> testEndpointParameters testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+
+Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+
+Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure HTTP basic authorization: http_basic_test
+        HttpBasicAuth http_basic_test = (HttpBasicAuth) defaultClient.getAuthentication("http_basic_test");
+        http_basic_test.setUsername("YOUR USERNAME");
+        http_basic_test.setPassword("YOUR PASSWORD");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        BigDecimal number = new BigDecimal(); // BigDecimal | None
+        Double _double = 3.4D; // Double | None
+        String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
+        byte[] _byte = null; // byte[] | None
+        Integer integer = 56; // Integer | None
+        Integer int32 = 56; // Integer | None
+        Long int64 = 56L; // Long | None
+        Float _float = 3.4F; // Float | None
+        String string = "string_example"; // String | None
+        File binary = new File("/path/to/file"); // File | None
+        LocalDate date = new LocalDate(); // LocalDate | None
+        OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None
+        String password = "password_example"; // String | None
+        String paramCallback = "paramCallback_example"; // String | None
+        try {
+            ApiResponse<Void> response = apiInstance.testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testEndpointParameters");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **number** | **BigDecimal**| None |
+ **_double** | **Double**| None |
+ **patternWithoutDelimiter** | **String**| None |
+ **_byte** | **byte[]**| None |
+ **integer** | **Integer**| None | [optional]
+ **int32** | **Integer**| None | [optional]
+ **int64** | **Long**| None | [optional]
+ **_float** | **Float**| None | [optional]
+ **string** | **String**| None | [optional]
+ **binary** | **File**| None | [optional]
+ **date** | **LocalDate**| None | [optional]
+ **dateTime** | **OffsetDateTime**| None | [optional]
+ **password** | **String**| None | [optional]
+ **paramCallback** | **String**| None | [optional]
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+[http_basic_test](../README.md#http_basic_test)
+
+### HTTP request headers
+
+- **Content-Type**: application/x-www-form-urlencoded
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Invalid username supplied |  -  |
+| **404** | User not found |  -  |
+
+
+## testEnumParameters
+
+> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
+
+To test enum parameters
+
+To test enum parameters
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        List<String> enumHeaderStringArray = Arrays.asList("$"); // List<String> | Header parameter enum test (string array)
+        String enumHeaderString = "-efg"; // String | Header parameter enum test (string)
+        List<String> enumQueryStringArray = Arrays.asList("$"); // List<String> | Query parameter enum test (string array)
+        String enumQueryString = "-efg"; // String | Query parameter enum test (string)
+        Integer enumQueryInteger = 56; // Integer | Query parameter enum test (double)
+        Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double)
+        List<String> enumFormStringArray = "$"; // List<String> | Form parameter enum test (string array)
+        String enumFormString = "-efg"; // String | Form parameter enum test (string)
+        try {
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testEnumParameters");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **enumHeaderStringArray** | [**List&lt;String&gt;**](String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
+ **enumHeaderString** | **String**| Header parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
+ **enumQueryStringArray** | [**List&lt;String&gt;**](String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
+ **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
+ **enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
+ **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
+ **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $]
+ **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
+
+### Return type
+
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/x-www-form-urlencoded
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Invalid request |  -  |
+| **404** | Not found |  -  |
+
+## testEnumParametersWithHttpInfo
+
+> ApiResponse<Void> testEnumParameters testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
+
+To test enum parameters
+
+To test enum parameters
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        List<String> enumHeaderStringArray = Arrays.asList("$"); // List<String> | Header parameter enum test (string array)
+        String enumHeaderString = "-efg"; // String | Header parameter enum test (string)
+        List<String> enumQueryStringArray = Arrays.asList("$"); // List<String> | Query parameter enum test (string array)
+        String enumQueryString = "-efg"; // String | Query parameter enum test (string)
+        Integer enumQueryInteger = 56; // Integer | Query parameter enum test (double)
+        Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double)
+        List<String> enumFormStringArray = "$"; // List<String> | Form parameter enum test (string array)
+        String enumFormString = "-efg"; // String | Form parameter enum test (string)
+        try {
+            ApiResponse<Void> response = apiInstance.testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testEnumParameters");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **enumHeaderStringArray** | [**List&lt;String&gt;**](String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
+ **enumHeaderString** | **String**| Header parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
+ **enumQueryStringArray** | [**List&lt;String&gt;**](String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
+ **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
+ **enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
+ **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
+ **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $]
+ **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/x-www-form-urlencoded
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Invalid request |  -  |
+| **404** | Not found |  -  |
+
+
+## testGroupParameters
+
+> void testGroupParameters(testGroupParametersRequest)
+
+Fake endpoint to test group parameters (optional)
+
+Fake endpoint to test group parameters (optional)
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+import org.openapitools.client.api.FakeApi.*;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        Integer requiredStringGroup = 56; // Integer | Required String in group parameters
+        Boolean requiredBooleanGroup = true; // Boolean | Required Boolean in group parameters
+        Long requiredInt64Group = 56L; // Long | Required Integer in group parameters
+        Integer stringGroup = 56; // Integer | String in group parameters
+        Boolean booleanGroup = true; // Boolean | Boolean in group parameters
+        Long int64Group = 56L; // Long | Integer in group parameters
+        try {
+            APItestGroupParametersRequest request = APItestGroupParametersRequest.newBuilder()
+                .requiredStringGroup(requiredStringGroup)
+                .requiredBooleanGroup(requiredBooleanGroup)
+                .requiredInt64Group(requiredInt64Group)
+                .stringGroup(stringGroup)
+                .booleanGroup(booleanGroup)
+                .int64Group(int64Group)
+                .build();
+            apiInstance.testGroupParameters(request);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testGroupParameters");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+|    Name      |    Type       | Description   |     Notes    |
+|------------- | ------------- | ------------- | -------------|
+| testGroupParametersRequest | [**APItestGroupParametersRequest**](FakeApi.md#APItestGroupParametersRequest)|-|-|
+
+### Return type
+
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Someting wrong |  -  |
+
+## testGroupParametersWithHttpInfo
+
+> ApiResponse<Void> testGroupParameters testGroupParametersWithHttpInfo(testGroupParametersRequest)
+
+Fake endpoint to test group parameters (optional)
+
+Fake endpoint to test group parameters (optional)
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+import org.openapitools.client.api.FakeApi.*;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        Integer requiredStringGroup = 56; // Integer | Required String in group parameters
+        Boolean requiredBooleanGroup = true; // Boolean | Required Boolean in group parameters
+        Long requiredInt64Group = 56L; // Long | Required Integer in group parameters
+        Integer stringGroup = 56; // Integer | String in group parameters
+        Boolean booleanGroup = true; // Boolean | Boolean in group parameters
+        Long int64Group = 56L; // Long | Integer in group parameters
+        try {
+            APItestGroupParametersRequest request = APItestGroupParametersRequest.newBuilder()
+                .requiredStringGroup(requiredStringGroup)
+                .requiredBooleanGroup(requiredBooleanGroup)
+                .requiredInt64Group(requiredInt64Group)
+                .stringGroup(stringGroup)
+                .booleanGroup(booleanGroup)
+                .int64Group(int64Group)
+                .build();
+            ApiResponse<Void> response = apiInstance.testGroupParametersWithHttpInfo(request);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testGroupParameters");
             System.err.println("Status code: " + e.getCode());
@@ -759,19 +1605,14 @@ public class Example {
 
 ### Parameters
 
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **requiredStringGroup** | **Integer**| Required String in group parameters |
- **requiredBooleanGroup** | **Boolean**| Required Boolean in group parameters |
- **requiredInt64Group** | **Long**| Required Integer in group parameters |
- **stringGroup** | **Integer**| String in group parameters | [optional]
- **booleanGroup** | **Boolean**| Boolean in group parameters | [optional]
- **int64Group** | **Long**| Integer in group parameters | [optional]
+|    Name      |    Type       | Description   |     Notes    |
+|------------- | ------------- | ------------- | -------------|
+| testGroupParametersRequest | [**APItestGroupParametersRequest**](FakeApi.md#APItestGroupParametersRequest)|-|-|
 
 ### Return type
 
-null (empty response body)
+
+ApiResponse<Void>
 
 ### Authorization
 
@@ -788,9 +1629,24 @@ No authorization required
 | **400** | Someting wrong |  -  |
 
 
+<a name="APItestGroupParametersRequest"></a>
+## APItestGroupParametersRequest
+### Properties
+
+|     Name      |    Type       | Description   |     Notes    |
+| ------------- | ------------- | ------------- | -------------|
+ **requiredStringGroup** | **Integer** | Required String in group parameters |
+ **requiredBooleanGroup** | **Boolean** | Required Boolean in group parameters |
+ **requiredInt64Group** | **Long** | Required Integer in group parameters |
+ **stringGroup** | **Integer** | String in group parameters | [optional]
+ **booleanGroup** | **Boolean** | Boolean in group parameters | [optional]
+ **int64Group** | **Long** | Integer in group parameters | [optional]
+
+
+
 ## testInlineAdditionalProperties
 
-> testInlineAdditionalProperties(param)
+> void testInlineAdditionalProperties(param)
 
 test inline additionalProperties
 
@@ -813,6 +1669,7 @@ public class Example {
         Map<String, String> param = new HashMap(); // Map<String, String> | request body
         try {
             apiInstance.testInlineAdditionalProperties(param);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testInlineAdditionalProperties");
             System.err.println("Status code: " + e.getCode());
@@ -833,6 +1690,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
+
 null (empty response body)
 
 ### Authorization
@@ -849,10 +1707,75 @@ No authorization required
 |-------------|-------------|------------------|
 | **200** | successful operation |  -  |
 
+## testInlineAdditionalPropertiesWithHttpInfo
+
+> ApiResponse<Void> testInlineAdditionalProperties testInlineAdditionalPropertiesWithHttpInfo(param)
+
+test inline additionalProperties
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        Map<String, String> param = new HashMap(); // Map<String, String> | request body
+        try {
+            ApiResponse<Void> response = apiInstance.testInlineAdditionalPropertiesWithHttpInfo(param);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testInlineAdditionalProperties");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **param** | [**Map&lt;String, String&gt;**](String.md)| request body |
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
 
 ## testJsonFormData
 
-> testJsonFormData(param, param2)
+> void testJsonFormData(param, param2)
 
 test json serialization of form data
 
@@ -876,6 +1799,7 @@ public class Example {
         String param2 = "param2_example"; // String | field2
         try {
             apiInstance.testJsonFormData(param, param2);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testJsonFormData");
             System.err.println("Status code: " + e.getCode());
@@ -897,6 +1821,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
+
 null (empty response body)
 
 ### Authorization
@@ -913,10 +1838,77 @@ No authorization required
 |-------------|-------------|------------------|
 | **200** | successful operation |  -  |
 
+## testJsonFormDataWithHttpInfo
+
+> ApiResponse<Void> testJsonFormData testJsonFormDataWithHttpInfo(param, param2)
+
+test json serialization of form data
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        String param = "param_example"; // String | field1
+        String param2 = "param2_example"; // String | field2
+        try {
+            ApiResponse<Void> response = apiInstance.testJsonFormDataWithHttpInfo(param, param2);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testJsonFormData");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **param** | **String**| field1 |
+ **param2** | **String**| field2 |
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/x-www-form-urlencoded
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
 
 ## testQueryParameterCollectionFormat
 
-> testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
+> void testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
 
 
 
@@ -945,6 +1937,7 @@ public class Example {
         List<String> context = Arrays.asList(); // List<String> | 
         try {
             apiInstance.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testQueryParameterCollectionFormat");
             System.err.println("Status code: " + e.getCode());
@@ -969,6 +1962,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
+
 null (empty response body)
 
 ### Authorization
@@ -985,3 +1979,78 @@ No authorization required
 |-------------|-------------|------------------|
 | **200** | Success |  -  |
 
+## testQueryParameterCollectionFormatWithHttpInfo
+
+> ApiResponse<Void> testQueryParameterCollectionFormat testQueryParameterCollectionFormatWithHttpInfo(pipe, ioutil, http, url, context)
+
+
+
+To test the collection format in query parameters
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        List<String> pipe = Arrays.asList(); // List<String> | 
+        List<String> ioutil = Arrays.asList(); // List<String> | 
+        List<String> http = Arrays.asList(); // List<String> | 
+        List<String> url = Arrays.asList(); // List<String> | 
+        List<String> context = Arrays.asList(); // List<String> | 
+        try {
+            ApiResponse<Void> response = apiInstance.testQueryParameterCollectionFormatWithHttpInfo(pipe, ioutil, http, url, context);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testQueryParameterCollectionFormat");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pipe** | [**List&lt;String&gt;**](String.md)|  |
+ **ioutil** | [**List&lt;String&gt;**](String.md)|  |
+ **http** | [**List&lt;String&gt;**](String.md)|  |
+ **url** | [**List&lt;String&gt;**](String.md)|  |
+ **context** | [**List&lt;String&gt;**](String.md)|  |
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Success |  -  |
+
diff --git a/samples/client/petstore/java/native/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/native/docs/FakeClassnameTags123Api.md
index 14a74a37a4e2..c7c841060f4d 100644
--- a/samples/client/petstore/java/native/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/native/docs/FakeClassnameTags123Api.md
@@ -5,6 +5,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
+[**testClassnameWithHttpInfo**](FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 
 
 
@@ -42,6 +43,7 @@ public class Example {
         Client body = new Client(); // Client | client model
         try {
             Client result = apiInstance.testClassname(body);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeClassnameTags123Api#testClassname");
@@ -65,6 +67,82 @@ Name | Type | Description  | Notes
 
 [**Client**](Client.md)
 
+
+### Authorization
+
+[api_key_query](../README.md#api_key_query)
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
+## testClassnameWithHttpInfo
+
+> ApiResponse<Client> testClassname testClassnameWithHttpInfo(body)
+
+To test class name in snake case
+
+To test class name in snake case
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeClassnameTags123Api;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure API key authorization: api_key_query
+        ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
+        api_key_query.setApiKey("YOUR API KEY");
+        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+        //api_key_query.setApiKeyPrefix("Token");
+
+        FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api(defaultClient);
+        Client body = new Client(); // Client | client model
+        try {
+            ApiResponse<Client> response = apiInstance.testClassnameWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeClassnameTags123Api#testClassname");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Client**](Client.md)| client model |
+
+### Return type
+
+ApiResponse<[**Client**](Client.md)>
+
+
 ### Authorization
 
 [api_key_query](../README.md#api_key_query)
diff --git a/samples/client/petstore/java/native/docs/PetApi.md b/samples/client/petstore/java/native/docs/PetApi.md
index d56efcd59677..d4f8bca1caa5 100644
--- a/samples/client/petstore/java/native/docs/PetApi.md
+++ b/samples/client/petstore/java/native/docs/PetApi.md
@@ -5,20 +5,29 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
+[**addPetWithHttpInfo**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 [**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
+[**deletePetWithHttpInfo**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
 [**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
+[**findPetsByStatusWithHttpInfo**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
 [**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
+[**findPetsByTagsWithHttpInfo**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
 [**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
+[**getPetByIdWithHttpInfo**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
 [**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
+[**updatePetWithHttpInfo**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 [**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
+[**updatePetWithFormWithHttpInfo**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 [**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+[**uploadFileWithHttpInfo**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
 [**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+[**uploadFileWithRequiredFileWithHttpInfo**](PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 
 
 
 ## addPet
 
-> addPet(body)
+> void addPet(body)
 
 Add a new pet to the store
 
@@ -46,6 +55,7 @@ public class Example {
         Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
         try {
             apiInstance.addPet(body);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#addPet");
             System.err.println("Status code: " + e.getCode());
@@ -66,6 +76,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
+
 null (empty response body)
 
 ### Authorization
@@ -83,10 +94,81 @@ null (empty response body)
 | **200** | successful operation |  -  |
 | **405** | Invalid input |  -  |
 
+## addPetWithHttpInfo
+
+> ApiResponse<Void> addPet addPetWithHttpInfo(body)
+
+Add a new pet to the store
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
+        try {
+            ApiResponse<Void> response = apiInstance.addPetWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#addPet");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: application/json, application/xml
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **405** | Invalid input |  -  |
+
 
 ## deletePet
 
-> deletePet(petId, apiKey)
+> void deletePet(petId, apiKey)
 
 Deletes a pet
 
@@ -115,6 +197,7 @@ public class Example {
         String apiKey = "apiKey_example"; // String | 
         try {
             apiInstance.deletePet(petId, apiKey);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#deletePet");
             System.err.println("Status code: " + e.getCode());
@@ -136,6 +219,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
+
 null (empty response body)
 
 ### Authorization
@@ -153,14 +237,11 @@ null (empty response body)
 | **200** | successful operation |  -  |
 | **400** | Invalid pet value |  -  |
 
+## deletePetWithHttpInfo
 
-## findPetsByStatus
-
-> List&lt;Pet&gt; findPetsByStatus(status)
-
-Finds Pets by status
+> ApiResponse<Void> deletePet deletePetWithHttpInfo(petId, apiKey)
 
-Multiple status values can be provided with comma separated strings
+Deletes a pet
 
 ### Example
 
@@ -168,6 +249,7 @@ Multiple status values can be provided with comma separated strings
 // Import classes:
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
@@ -183,12 +265,14 @@ public class Example {
         petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
 
         PetApi apiInstance = new PetApi(defaultClient);
-        List<String> status = Arrays.asList("available"); // List<String> | Status values that need to be considered for filter
+        Long petId = 56L; // Long | Pet id to delete
+        String apiKey = "apiKey_example"; // String | 
         try {
-            List<Pet> result = apiInstance.findPetsByStatus(status);
-            System.out.println(result);
+            ApiResponse<Void> response = apiInstance.deletePetWithHttpInfo(petId, apiKey);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
         } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#findPetsByStatus");
+            System.err.println("Exception when calling PetApi#deletePet");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -203,11 +287,13 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**List&lt;String&gt;**](String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **petId** | **Long**| Pet id to delete |
+ **apiKey** | **String**|  | [optional]
 
 ### Return type
 
-[**List&lt;Pet&gt;**](Pet.md)
+
+ApiResponse<Void>
 
 ### Authorization
 
@@ -216,22 +302,22 @@ Name | Type | Description  | Notes
 ### HTTP request headers
 
 - **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
+- **Accept**: Not defined
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
 | **200** | successful operation |  -  |
-| **400** | Invalid status value |  -  |
+| **400** | Invalid pet value |  -  |
 
 
-## findPetsByTags
+## findPetsByStatus
 
-> Set&lt;Pet&gt; findPetsByTags(tags)
+> List<Pet> findPetsByStatus(status)
 
-Finds Pets by tags
+Finds Pets by status
 
-Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+Multiple status values can be provided with comma separated strings
 
 ### Example
 
@@ -254,12 +340,13 @@ public class Example {
         petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
 
         PetApi apiInstance = new PetApi(defaultClient);
-        Set<String> tags = Arrays.asList(); // Set<String> | Tags to filter by
+        List<String> status = Arrays.asList("available"); // List<String> | Status values that need to be considered for filter
         try {
-            Set<Pet> result = apiInstance.findPetsByTags(tags);
+            List<Pet> result = apiInstance.findPetsByStatus(status);
+
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#findPetsByTags");
+            System.err.println("Exception when calling PetApi#findPetsByStatus");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -274,11 +361,12 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**Set&lt;String&gt;**](String.md)| Tags to filter by |
+ **status** | [**List&lt;String&gt;**](String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**Set&lt;Pet&gt;**](Pet.md)
+[**List&lt;Pet&gt;**](Pet.md)
+
 
 ### Authorization
 
@@ -293,16 +381,15 @@ Name | Type | Description  | Notes
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
 | **200** | successful operation |  -  |
-| **400** | Invalid tag value |  -  |
-
+| **400** | Invalid status value |  -  |
 
-## getPetById
+## findPetsByStatusWithHttpInfo
 
-> Pet getPetById(petId)
+> ApiResponse<List<Pet>> findPetsByStatus findPetsByStatusWithHttpInfo(status)
 
-Find pet by ID
+Finds Pets by status
 
-Returns a single pet
+Multiple status values can be provided with comma separated strings
 
 ### Example
 
@@ -310,6 +397,7 @@ Returns a single pet
 // Import classes:
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
@@ -320,19 +408,19 @@ public class Example {
         ApiClient defaultClient = Configuration.getDefaultApiClient();
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        // Configure API key authorization: api_key
-        ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
-        api_key.setApiKey("YOUR API KEY");
-        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-        //api_key.setApiKeyPrefix("Token");
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
 
         PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | ID of pet to return
+        List<String> status = Arrays.asList("available"); // List<String> | Status values that need to be considered for filter
         try {
-            Pet result = apiInstance.getPetById(petId);
-            System.out.println(result);
+            ApiResponse<List<Pet>> response = apiInstance.findPetsByStatusWithHttpInfo(status);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
         } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#getPetById");
+            System.err.println("Exception when calling PetApi#findPetsByStatus");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -347,15 +435,16 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet to return |
+ **status** | [**List&lt;String&gt;**](String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**Pet**](Pet.md)
+ApiResponse<[**List&lt;Pet&gt;**](Pet.md)>
+
 
 ### Authorization
 
-[api_key](../README.md#api_key)
+[petstore_auth](../README.md#petstore_auth)
 
 ### HTTP request headers
 
@@ -366,15 +455,16 @@ Name | Type | Description  | Notes
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
 | **200** | successful operation |  -  |
-| **400** | Invalid ID supplied |  -  |
-| **404** | Pet not found |  -  |
+| **400** | Invalid status value |  -  |
 
 
-## updatePet
+## findPetsByTags
 
-> updatePet(body)
+> Set<Pet> findPetsByTags(tags)
 
-Update an existing pet
+Finds Pets by tags
+
+Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
 
 ### Example
 
@@ -397,11 +487,13 @@ public class Example {
         petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
 
         PetApi apiInstance = new PetApi(defaultClient);
-        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
+        Set<String> tags = Arrays.asList(); // Set<String> | Tags to filter by
         try {
-            apiInstance.updatePet(body);
+            Set<Pet> result = apiInstance.findPetsByTags(tags);
+
+            System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#updatePet");
+            System.err.println("Exception when calling PetApi#findPetsByTags");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -416,11 +508,12 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+ **tags** | [**Set&lt;String&gt;**](String.md)| Tags to filter by |
 
 ### Return type
 
-null (empty response body)
+[**Set&lt;Pet&gt;**](Pet.md)
+
 
 ### Authorization
 
@@ -428,23 +521,22 @@ null (empty response body)
 
 ### HTTP request headers
 
-- **Content-Type**: application/json, application/xml
-- **Accept**: Not defined
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
 | **200** | successful operation |  -  |
-| **400** | Invalid ID supplied |  -  |
-| **404** | Pet not found |  -  |
-| **405** | Validation exception |  -  |
+| **400** | Invalid tag value |  -  |
 
+## findPetsByTagsWithHttpInfo
 
-## updatePetWithForm
+> ApiResponse<Set<Pet>> findPetsByTags findPetsByTagsWithHttpInfo(tags)
 
-> updatePetWithForm(petId, name, status)
+Finds Pets by tags
 
-Updates a pet in the store with form data
+Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
 
 ### Example
 
@@ -452,6 +544,7 @@ Updates a pet in the store with form data
 // Import classes:
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
@@ -467,13 +560,14 @@ public class Example {
         petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
 
         PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | ID of pet that needs to be updated
-        String name = "name_example"; // String | Updated name of the pet
-        String status = "status_example"; // String | Updated status of the pet
+        Set<String> tags = Arrays.asList(); // Set<String> | Tags to filter by
         try {
-            apiInstance.updatePetWithForm(petId, name, status);
+            ApiResponse<Set<Pet>> response = apiInstance.findPetsByTagsWithHttpInfo(tags);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
         } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#updatePetWithForm");
+            System.err.println("Exception when calling PetApi#findPetsByTags");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -488,13 +582,12 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet that needs to be updated |
- **name** | **String**| Updated name of the pet | [optional]
- **status** | **String**| Updated status of the pet | [optional]
+ **tags** | [**Set&lt;String&gt;**](String.md)| Tags to filter by |
 
 ### Return type
 
-null (empty response body)
+ApiResponse<[**Set&lt;Pet&gt;**](Pet.md)>
+
 
 ### Authorization
 
@@ -502,20 +595,23 @@ null (empty response body)
 
 ### HTTP request headers
 
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **405** | Invalid input |  -  |
+| **200** | successful operation |  -  |
+| **400** | Invalid tag value |  -  |
 
 
-## uploadFile
+## getPetById
 
-> ModelApiResponse uploadFile(petId, additionalMetadata, file)
+> Pet getPetById(petId)
 
-uploads an image
+Find pet by ID
+
+Returns a single pet
 
 ### Example
 
@@ -533,19 +629,20 @@ public class Example {
         ApiClient defaultClient = Configuration.getDefaultApiClient();
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+        // Configure API key authorization: api_key
+        ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
+        api_key.setApiKey("YOUR API KEY");
+        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+        //api_key.setApiKeyPrefix("Token");
 
         PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | ID of pet to update
-        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
-        File file = new File("/path/to/file"); // File | file to upload
+        Long petId = 56L; // Long | ID of pet to return
         try {
-            ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
+            Pet result = apiInstance.getPetById(petId);
+
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#uploadFile");
+            System.err.println("Exception when calling PetApi#getPetById");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -560,34 +657,36 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet to update |
- **additionalMetadata** | **String**| Additional data to pass to server | [optional]
- **file** | **File**| file to upload | [optional]
+ **petId** | **Long**| ID of pet to return |
 
 ### Return type
 
-[**ModelApiResponse**](ModelApiResponse.md)
+[**Pet**](Pet.md)
+
 
 ### Authorization
 
-[petstore_auth](../README.md#petstore_auth)
+[api_key](../README.md#api_key)
 
 ### HTTP request headers
 
-- **Content-Type**: multipart/form-data
-- **Accept**: application/json
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
 
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
 | **200** | successful operation |  -  |
+| **400** | Invalid ID supplied |  -  |
+| **404** | Pet not found |  -  |
 
+## getPetByIdWithHttpInfo
 
-## uploadFileWithRequiredFile
+> ApiResponse<Pet> getPetById getPetByIdWithHttpInfo(petId)
 
-> ModelApiResponse uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
+Find pet by ID
 
-uploads an image (required)
+Returns a single pet
 
 ### Example
 
@@ -595,6 +694,7 @@ uploads an image (required)
 // Import classes:
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Configuration;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.models.*;
@@ -605,19 +705,21 @@ public class Example {
         ApiClient defaultClient = Configuration.getDefaultApiClient();
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
         
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+        // Configure API key authorization: api_key
+        ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
+        api_key.setApiKey("YOUR API KEY");
+        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+        //api_key.setApiKeyPrefix("Token");
 
         PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | ID of pet to update
-        File requiredFile = new File("/path/to/file"); // File | file to upload
-        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
+        Long petId = 56L; // Long | ID of pet to return
         try {
-            ModelApiResponse result = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
-            System.out.println(result);
+            ApiResponse<Pet> response = apiInstance.getPetByIdWithHttpInfo(petId);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
         } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#uploadFileWithRequiredFile");
+            System.err.println("Exception when calling PetApi#getPetById");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -632,14 +734,605 @@ public class Example {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet to update |
- **requiredFile** | **File**| file to upload |
- **additionalMetadata** | **String**| Additional data to pass to server | [optional]
+ **petId** | **Long**| ID of pet to return |
+
+### Return type
+
+ApiResponse<[**Pet**](Pet.md)>
+
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid ID supplied |  -  |
+| **404** | Pet not found |  -  |
+
+
+## updatePet
+
+> void updatePet(body)
+
+Update an existing pet
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
+        try {
+            apiInstance.updatePet(body);
+
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#updatePet");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+
+### Return type
+
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: application/json, application/xml
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid ID supplied |  -  |
+| **404** | Pet not found |  -  |
+| **405** | Validation exception |  -  |
+
+## updatePetWithHttpInfo
+
+> ApiResponse<Void> updatePet updatePetWithHttpInfo(body)
+
+Update an existing pet
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
+        try {
+            ApiResponse<Void> response = apiInstance.updatePetWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#updatePet");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: application/json, application/xml
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid ID supplied |  -  |
+| **404** | Pet not found |  -  |
+| **405** | Validation exception |  -  |
+
+
+## updatePetWithForm
+
+> void updatePetWithForm(petId, name, status)
+
+Updates a pet in the store with form data
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Long petId = 56L; // Long | ID of pet that needs to be updated
+        String name = "name_example"; // String | Updated name of the pet
+        String status = "status_example"; // String | Updated status of the pet
+        try {
+            apiInstance.updatePetWithForm(petId, name, status);
+
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#updatePetWithForm");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| ID of pet that needs to be updated |
+ **name** | **String**| Updated name of the pet | [optional]
+ **status** | **String**| Updated status of the pet | [optional]
+
+### Return type
+
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: application/x-www-form-urlencoded
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **405** | Invalid input |  -  |
+
+## updatePetWithFormWithHttpInfo
+
+> ApiResponse<Void> updatePetWithForm updatePetWithFormWithHttpInfo(petId, name, status)
+
+Updates a pet in the store with form data
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Long petId = 56L; // Long | ID of pet that needs to be updated
+        String name = "name_example"; // String | Updated name of the pet
+        String status = "status_example"; // String | Updated status of the pet
+        try {
+            ApiResponse<Void> response = apiInstance.updatePetWithFormWithHttpInfo(petId, name, status);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#updatePetWithForm");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| ID of pet that needs to be updated |
+ **name** | **String**| Updated name of the pet | [optional]
+ **status** | **String**| Updated status of the pet | [optional]
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: application/x-www-form-urlencoded
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **405** | Invalid input |  -  |
+
+
+## uploadFile
+
+> ModelApiResponse uploadFile(petId, additionalMetadata, file)
+
+uploads an image
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Long petId = 56L; // Long | ID of pet to update
+        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
+        File file = new File("/path/to/file"); // File | file to upload
+        try {
+            ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
+
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#uploadFile");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| ID of pet to update |
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional]
+ **file** | **File**| file to upload | [optional]
+
+### Return type
+
+[**ModelApiResponse**](ModelApiResponse.md)
+
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: multipart/form-data
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
+## uploadFileWithHttpInfo
+
+> ApiResponse<ModelApiResponse> uploadFile uploadFileWithHttpInfo(petId, additionalMetadata, file)
+
+uploads an image
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Long petId = 56L; // Long | ID of pet to update
+        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
+        File file = new File("/path/to/file"); // File | file to upload
+        try {
+            ApiResponse<ModelApiResponse> response = apiInstance.uploadFileWithHttpInfo(petId, additionalMetadata, file);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#uploadFile");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| ID of pet to update |
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional]
+ **file** | **File**| file to upload | [optional]
+
+### Return type
+
+ApiResponse<[**ModelApiResponse**](ModelApiResponse.md)>
+
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: multipart/form-data
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
+
+## uploadFileWithRequiredFile
+
+> ModelApiResponse uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
+
+uploads an image (required)
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Long petId = 56L; // Long | ID of pet to update
+        File requiredFile = new File("/path/to/file"); // File | file to upload
+        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
+        try {
+            ModelApiResponse result = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#uploadFileWithRequiredFile");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| ID of pet to update |
+ **requiredFile** | **File**| file to upload |
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional]
 
 ### Return type
 
 [**ModelApiResponse**](ModelApiResponse.md)
 
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: multipart/form-data
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
+## uploadFileWithRequiredFileWithHttpInfo
+
+> ApiResponse<ModelApiResponse> uploadFileWithRequiredFile uploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata)
+
+uploads an image (required)
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Long petId = 56L; // Long | ID of pet to update
+        File requiredFile = new File("/path/to/file"); // File | file to upload
+        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
+        try {
+            ApiResponse<ModelApiResponse> response = apiInstance.uploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#uploadFileWithRequiredFile");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| ID of pet to update |
+ **requiredFile** | **File**| file to upload |
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional]
+
+### Return type
+
+ApiResponse<[**ModelApiResponse**](ModelApiResponse.md)>
+
+
 ### Authorization
 
 [petstore_auth](../README.md#petstore_auth)
diff --git a/samples/client/petstore/java/native/docs/StoreApi.md b/samples/client/petstore/java/native/docs/StoreApi.md
index 352399ea515c..b009b9132082 100644
--- a/samples/client/petstore/java/native/docs/StoreApi.md
+++ b/samples/client/petstore/java/native/docs/StoreApi.md
@@ -5,15 +5,19 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
+[**deleteOrderWithHttpInfo**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
 [**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
+[**getInventoryWithHttpInfo**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
 [**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
+[**getOrderByIdWithHttpInfo**](StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
 [**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
+[**placeOrderWithHttpInfo**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
 
 
 
 ## deleteOrder
 
-> deleteOrder(orderId)
+> void deleteOrder(orderId)
 
 Delete purchase order by ID
 
@@ -38,6 +42,7 @@ public class Example {
         String orderId = "orderId_example"; // String | ID of the order that needs to be deleted
         try {
             apiInstance.deleteOrder(orderId);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling StoreApi#deleteOrder");
             System.err.println("Status code: " + e.getCode());
@@ -58,6 +63,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
+
 null (empty response body)
 
 ### Authorization
@@ -75,10 +81,78 @@ No authorization required
 | **400** | Invalid ID supplied |  -  |
 | **404** | Order not found |  -  |
 
+## deleteOrderWithHttpInfo
+
+> ApiResponse<Void> deleteOrder deleteOrderWithHttpInfo(orderId)
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.StoreApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        StoreApi apiInstance = new StoreApi(defaultClient);
+        String orderId = "orderId_example"; // String | ID of the order that needs to be deleted
+        try {
+            ApiResponse<Void> response = apiInstance.deleteOrderWithHttpInfo(orderId);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling StoreApi#deleteOrder");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **String**| ID of the order that needs to be deleted |
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Invalid ID supplied |  -  |
+| **404** | Order not found |  -  |
+
 
 ## getInventory
 
-> Map&lt;String, Integer&gt; getInventory()
+> Map<String, Integer> getInventory()
 
 Returns pet inventories by status
 
@@ -109,6 +183,7 @@ public class Example {
         StoreApi apiInstance = new StoreApi(defaultClient);
         try {
             Map<String, Integer> result = apiInstance.getInventory();
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling StoreApi#getInventory");
@@ -129,6 +204,78 @@ This endpoint does not need any parameter.
 
 **Map&lt;String, Integer&gt;**
 
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
+## getInventoryWithHttpInfo
+
+> ApiResponse<Map<String, Integer>> getInventory getInventoryWithHttpInfo()
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.StoreApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure API key authorization: api_key
+        ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
+        api_key.setApiKey("YOUR API KEY");
+        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+        //api_key.setApiKeyPrefix("Token");
+
+        StoreApi apiInstance = new StoreApi(defaultClient);
+        try {
+            ApiResponse<Map<String, Integer>> response = apiInstance.getInventoryWithHttpInfo();
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling StoreApi#getInventory");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+ApiResponse<**Map&lt;String, Integer&gt;**>
+
+
 ### Authorization
 
 [api_key](../README.md#api_key)
@@ -171,6 +318,7 @@ public class Example {
         Long orderId = 56L; // Long | ID of pet that needs to be fetched
         try {
             Order result = apiInstance.getOrderById(orderId);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling StoreApi#getOrderById");
@@ -194,6 +342,77 @@ Name | Type | Description  | Notes
 
 [**Order**](Order.md)
 
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid ID supplied |  -  |
+| **404** | Order not found |  -  |
+
+## getOrderByIdWithHttpInfo
+
+> ApiResponse<Order> getOrderById getOrderByIdWithHttpInfo(orderId)
+
+Find purchase order by ID
+
+For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.StoreApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        StoreApi apiInstance = new StoreApi(defaultClient);
+        Long orderId = 56L; // Long | ID of pet that needs to be fetched
+        try {
+            ApiResponse<Order> response = apiInstance.getOrderByIdWithHttpInfo(orderId);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling StoreApi#getOrderById");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **Long**| ID of pet that needs to be fetched |
+
+### Return type
+
+ApiResponse<[**Order**](Order.md)>
+
+
 ### Authorization
 
 No authorization required
@@ -236,6 +455,7 @@ public class Example {
         Order body = new Order(); // Order | order placed for purchasing the pet
         try {
             Order result = apiInstance.placeOrder(body);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling StoreApi#placeOrder");
@@ -259,6 +479,74 @@ Name | Type | Description  | Notes
 
 [**Order**](Order.md)
 
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid Order |  -  |
+
+## placeOrderWithHttpInfo
+
+> ApiResponse<Order> placeOrder placeOrderWithHttpInfo(body)
+
+Place an order for a pet
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.StoreApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        StoreApi apiInstance = new StoreApi(defaultClient);
+        Order body = new Order(); // Order | order placed for purchasing the pet
+        try {
+            ApiResponse<Order> response = apiInstance.placeOrderWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling StoreApi#placeOrder");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet |
+
+### Return type
+
+ApiResponse<[**Order**](Order.md)>
+
+
 ### Authorization
 
 No authorization required
diff --git a/samples/client/petstore/java/native/docs/UserApi.md b/samples/client/petstore/java/native/docs/UserApi.md
index ca9f550c3167..a43b140ab6cb 100644
--- a/samples/client/petstore/java/native/docs/UserApi.md
+++ b/samples/client/petstore/java/native/docs/UserApi.md
@@ -5,19 +5,27 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**createUser**](UserApi.md#createUser) | **POST** /user | Create user
+[**createUserWithHttpInfo**](UserApi.md#createUser) | **POST** /user | Create user
 [**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
+[**createUsersWithArrayInputWithHttpInfo**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
 [**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
+[**createUsersWithListInputWithHttpInfo**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
 [**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
+[**deleteUserWithHttpInfo**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
 [**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
+[**getUserByNameWithHttpInfo**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
 [**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
+[**loginUserWithHttpInfo**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
 [**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
+[**logoutUserWithHttpInfo**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
 [**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
+[**updateUserWithHttpInfo**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
 
 
 
 ## createUser
 
-> createUser(body)
+> void createUser(body)
 
 Create user
 
@@ -42,6 +50,7 @@ public class Example {
         User body = new User(); // User | Created user object
         try {
             apiInstance.createUser(body);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#createUser");
             System.err.println("Status code: " + e.getCode());
@@ -62,6 +71,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
+
 null (empty response body)
 
 ### Authorization
@@ -78,10 +88,77 @@ No authorization required
 |-------------|-------------|------------------|
 | **0** | successful operation |  -  |
 
+## createUserWithHttpInfo
+
+> ApiResponse<Void> createUser createUserWithHttpInfo(body)
+
+Create user
+
+This can only be done by the logged in user.
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        User body = new User(); // User | Created user object
+        try {
+            ApiResponse<Void> response = apiInstance.createUserWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#createUser");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**User**](User.md)| Created user object |
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **0** | successful operation |  -  |
+
 
 ## createUsersWithArrayInput
 
-> createUsersWithArrayInput(body)
+> void createUsersWithArrayInput(body)
 
 Creates list of users with given input array
 
@@ -104,6 +181,7 @@ public class Example {
         List<User> body = Arrays.asList(); // List<User> | List of user object
         try {
             apiInstance.createUsersWithArrayInput(body);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
             System.err.println("Status code: " + e.getCode());
@@ -124,6 +202,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
+
 null (empty response body)
 
 ### Authorization
@@ -140,10 +219,75 @@ No authorization required
 |-------------|-------------|------------------|
 | **0** | successful operation |  -  |
 
+## createUsersWithArrayInputWithHttpInfo
+
+> ApiResponse<Void> createUsersWithArrayInput createUsersWithArrayInputWithHttpInfo(body)
+
+Creates list of users with given input array
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        List<User> body = Arrays.asList(); // List<User> | List of user object
+        try {
+            ApiResponse<Void> response = apiInstance.createUsersWithArrayInputWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**List&lt;User&gt;**](User.md)| List of user object |
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **0** | successful operation |  -  |
+
 
 ## createUsersWithListInput
 
-> createUsersWithListInput(body)
+> void createUsersWithListInput(body)
 
 Creates list of users with given input array
 
@@ -166,6 +310,7 @@ public class Example {
         List<User> body = Arrays.asList(); // List<User> | List of user object
         try {
             apiInstance.createUsersWithListInput(body);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#createUsersWithListInput");
             System.err.println("Status code: " + e.getCode());
@@ -186,6 +331,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
+
 null (empty response body)
 
 ### Authorization
@@ -202,10 +348,75 @@ No authorization required
 |-------------|-------------|------------------|
 | **0** | successful operation |  -  |
 
+## createUsersWithListInputWithHttpInfo
+
+> ApiResponse<Void> createUsersWithListInput createUsersWithListInputWithHttpInfo(body)
+
+Creates list of users with given input array
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        List<User> body = Arrays.asList(); // List<User> | List of user object
+        try {
+            ApiResponse<Void> response = apiInstance.createUsersWithListInputWithHttpInfo(body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#createUsersWithListInput");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**List&lt;User&gt;**](User.md)| List of user object |
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **0** | successful operation |  -  |
+
 
 ## deleteUser
 
-> deleteUser(username)
+> void deleteUser(username)
 
 Delete user
 
@@ -230,6 +441,7 @@ public class Example {
         String username = "username_example"; // String | The name that needs to be deleted
         try {
             apiInstance.deleteUser(username);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#deleteUser");
             System.err.println("Status code: " + e.getCode());
@@ -250,6 +462,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
+
 null (empty response body)
 
 ### Authorization
@@ -267,6 +480,74 @@ No authorization required
 | **400** | Invalid username supplied |  -  |
 | **404** | User not found |  -  |
 
+## deleteUserWithHttpInfo
+
+> ApiResponse<Void> deleteUser deleteUserWithHttpInfo(username)
+
+Delete user
+
+This can only be done by the logged in user.
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        String username = "username_example"; // String | The name that needs to be deleted
+        try {
+            ApiResponse<Void> response = apiInstance.deleteUserWithHttpInfo(username);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#deleteUser");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be deleted |
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Invalid username supplied |  -  |
+| **404** | User not found |  -  |
+
 
 ## getUserByName
 
@@ -293,6 +574,7 @@ public class Example {
         String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing.
         try {
             User result = apiInstance.getUserByName(username);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#getUserByName");
@@ -316,6 +598,75 @@ Name | Type | Description  | Notes
 
 [**User**](User.md)
 
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid username supplied |  -  |
+| **404** | User not found |  -  |
+
+## getUserByNameWithHttpInfo
+
+> ApiResponse<User> getUserByName getUserByNameWithHttpInfo(username)
+
+Get user by user name
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing.
+        try {
+            ApiResponse<User> response = apiInstance.getUserByNameWithHttpInfo(username);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#getUserByName");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be fetched. Use user1 for testing. |
+
+### Return type
+
+ApiResponse<[**User**](User.md)>
+
+
 ### Authorization
 
 No authorization required
@@ -359,6 +710,7 @@ public class Example {
         String password = "password_example"; // String | The password for login in clear text
         try {
             String result = apiInstance.loginUser(username, password);
+
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#loginUser");
@@ -383,6 +735,76 @@ Name | Type | Description  | Notes
 
 **String**
 
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  * X-Rate-Limit - calls per hour allowed by the user <br>  * X-Expires-After - date in UTC when token expires <br>  |
+| **400** | Invalid username/password supplied |  -  |
+
+## loginUserWithHttpInfo
+
+> ApiResponse<String> loginUser loginUserWithHttpInfo(username, password)
+
+Logs user into the system
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        String username = "username_example"; // String | The user name for login
+        String password = "password_example"; // String | The password for login in clear text
+        try {
+            ApiResponse<String> response = apiInstance.loginUserWithHttpInfo(username, password);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+            System.out.println("Response body: " + response.getData().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#loginUser");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The user name for login |
+ **password** | **String**| The password for login in clear text |
+
+### Return type
+
+ApiResponse<**String**>
+
+
 ### Authorization
 
 No authorization required
@@ -401,7 +823,7 @@ No authorization required
 
 ## logoutUser
 
-> logoutUser()
+> void logoutUser()
 
 Logs out current logged in user session
 
@@ -423,6 +845,7 @@ public class Example {
         UserApi apiInstance = new UserApi(defaultClient);
         try {
             apiInstance.logoutUser();
+
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#logoutUser");
             System.err.println("Status code: " + e.getCode());
@@ -440,6 +863,7 @@ This endpoint does not need any parameter.
 
 ### Return type
 
+
 null (empty response body)
 
 ### Authorization
@@ -456,10 +880,71 @@ No authorization required
 |-------------|-------------|------------------|
 | **0** | successful operation |  -  |
 
+## logoutUserWithHttpInfo
+
+> ApiResponse<Void> logoutUser logoutUserWithHttpInfo()
+
+Logs out current logged in user session
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        try {
+            ApiResponse<Void> response = apiInstance.logoutUserWithHttpInfo();
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#logoutUser");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **0** | successful operation |  -  |
+
 
 ## updateUser
 
-> updateUser(username, body)
+> void updateUser(username, body)
 
 Updated user
 
@@ -485,6 +970,7 @@ public class Example {
         User body = new User(); // User | Updated user object
         try {
             apiInstance.updateUser(username, body);
+
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#updateUser");
             System.err.println("Status code: " + e.getCode());
@@ -506,6 +992,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
+
 null (empty response body)
 
 ### Authorization
@@ -523,3 +1010,73 @@ No authorization required
 | **400** | Invalid user supplied |  -  |
 | **404** | User not found |  -  |
 
+## updateUserWithHttpInfo
+
+> ApiResponse<Void> updateUser updateUserWithHttpInfo(username, body)
+
+Updated user
+
+This can only be done by the logged in user.
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        String username = "username_example"; // String | name that need to be deleted
+        User body = new User(); // User | Updated user object
+        try {
+            ApiResponse<Void> response = apiInstance.updateUserWithHttpInfo(username, body);
+            System.out.println("Status code: " + response.getStatusCode());
+            System.out.println("Response headers: " + response.getHeaders().toString());
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#updateUser");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| name that need to be deleted |
+ **body** | [**User**](User.md)| Updated user object |
+
+### Return type
+
+
+ApiResponse<Void>
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Invalid user supplied |  -  |
+| **404** | User not found |  -  |
+
diff --git a/samples/client/petstore/java/native/pom.xml b/samples/client/petstore/java/native/pom.xml
index 135ed128d122..4487eae80d9a 100644
--- a/samples/client/petstore/java/native/pom.xml
+++ b/samples/client/petstore/java/native/pom.xml
@@ -193,6 +193,12 @@
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -209,6 +215,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <jackson-version>2.9.9</jackson-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
index b805d0f4b425..aac276303614 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
@@ -47,7 +47,7 @@
  * <p>The setter methods of this class return the current object to facilitate
  * a fluent style of configuration.</p>
  */
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiClient {
 
   private static final Charset UTF_8 = Charset.forName("UTF-8");
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiException.java
index f5427482e3a7..9b6bbf0dc38e 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiException.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiException.java
@@ -15,7 +15,7 @@
 
 import java.net.http.HttpHeaders;
 
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private HttpHeaders responseHeaders = null;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiResponse.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiResponse.java
new file mode 100644
index 000000000000..9bb5cac17b41
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiResponse.java
@@ -0,0 +1,59 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API response returned by API call.
+ *
+ * @param <T> The type of data that is deserialized from response body
+ */
+public class ApiResponse<T> {
+    final private int statusCode;
+    final private Map<String, List<String>> headers;
+    final private T data;
+
+    /**
+     * @param statusCode The status code of HTTP response
+     * @param headers The headers of HTTP response
+     */
+    public ApiResponse(int statusCode, Map<String, List<String>> headers) {
+        this(statusCode, headers, null);
+    }
+
+    /**
+     * @param statusCode The status code of HTTP response
+     * @param headers The headers of HTTP response
+     * @param data The object deserialized from response bod
+     */
+    public ApiResponse(int statusCode, Map<String, List<String>> headers, T data) {
+        this.statusCode = statusCode;
+        this.headers = headers;
+        this.data = data;
+    }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    public Map<String, List<String>> getHeaders() {
+        return headers;
+    }
+
+    public T getData() {
+        return data;
+    }
+}
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Configuration.java
index acbecda489dd..29538391ae05 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Configuration.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Configuration.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Pair.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Pair.java
index ae89aa614543..e1afb8c039f6 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Pair.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Pair.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index a0bfdf62070d..9124c1880fc1 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -14,6 +14,7 @@
 
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Pair;
 
 import org.openapitools.client.model.Client;
@@ -35,8 +36,7 @@
 import java.util.List;
 import java.util.Map;
 
-
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AnotherFakeApi {
   private final HttpClient memberVarHttpClient;
   private final ObjectMapper memberVarObjectMapper;
@@ -44,7 +44,7 @@ public class AnotherFakeApi {
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  
+
   public AnotherFakeApi() {
     this(new ApiClient());
   }
@@ -65,10 +65,51 @@ public AnotherFakeApi(ApiClient apiClient) {
    * @return Client
    * @throws ApiException if fails to make API call
    */
-  public Client call123testSpecialTags (Client body) throws ApiException {
+  public Client call123testSpecialTags(Client body) throws ApiException {
+    ApiResponse<Client> localVarResponse = call123testSpecialTagsWithHttpInfo(body);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * To test special tags
+   * To test special tags and operation ID starting with number
+   * @param body client model (required)
+   * @return ApiResponse&lt;Client&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = call123testSpecialTagsRequestBuilder(body);
+    try {
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (memberVarResponseInterceptor != null) {
+        memberVarResponseInterceptor.accept(localVarResponse);
+      }
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "call123testSpecialTags call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+      return new ApiResponse<Client>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Client>() {})
+        );
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new ApiException(e);
+    }
+  }
+
+  private HttpRequest.Builder call123testSpecialTagsRequestBuilder(Client body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        throw new ApiException(400, "Missing the required parameter 'body' when calling call123testSpecialTags");
+      throw new ApiException(400, "Missing the required parameter 'body' when calling call123testSpecialTags");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -83,31 +124,15 @@ public Client call123testSpecialTags (Client body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PATCH", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
-      if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
-      }          
-      if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "call123testSpecialTags call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
-      }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Client>() {});
     } catch (IOException e) {
       throw new ApiException(e);
     }
-    catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new ApiException(e);
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
   }
 }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
index db15514520e5..31b6ea1b3b29 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -14,6 +14,7 @@
 
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Pair;
 
 import java.math.BigDecimal;
@@ -43,8 +44,7 @@
 import java.util.List;
 import java.util.Map;
 
-
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeApi {
   private final HttpClient memberVarHttpClient;
   private final ObjectMapper memberVarObjectMapper;
@@ -52,7 +52,7 @@ public class FakeApi {
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  
+
   public FakeApi() {
     this(new ApiClient());
   }
@@ -72,10 +72,50 @@ public FakeApi(ApiClient apiClient) {
    * @param xmlItem XmlItem Body (required)
    * @throws ApiException if fails to make API call
    */
-  public void createXmlItem (XmlItem xmlItem) throws ApiException {
+  public void createXmlItem(XmlItem xmlItem) throws ApiException {
+    createXmlItemWithHttpInfo(xmlItem);
+  }
+
+  /**
+   * creates an XmlItem
+   * this route creates an XmlItem
+   * @param xmlItem XmlItem Body (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> createXmlItemWithHttpInfo(XmlItem xmlItem) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = createXmlItemRequestBuilder(xmlItem);
+    try {
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (memberVarResponseInterceptor != null) {
+        memberVarResponseInterceptor.accept(localVarResponse);
+      }
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "createXmlItem call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new ApiException(e);
+    }
+  }
+
+  private HttpRequest.Builder createXmlItemRequestBuilder(XmlItem xmlItem) throws ApiException {
     // verify the required parameter 'xmlItem' is set
     if (xmlItem == null) {
-        throw new ApiException(400, "Missing the required parameter 'xmlItem' when calling createXmlItem");
+      throw new ApiException(400, "Missing the required parameter 'xmlItem' when calling createXmlItem");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -90,24 +130,56 @@ public void createXmlItem (XmlItem xmlItem) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(xmlItem);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * Test serialization of outer boolean types
+   * @param body Input boolean as post body (optional)
+   * @return Boolean
+   * @throws ApiException if fails to make API call
+   */
+  public Boolean fakeOuterBooleanSerialize(Boolean body) throws ApiException {
+    ApiResponse<Boolean> localVarResponse = fakeOuterBooleanSerializeWithHttpInfo(body);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * 
+   * Test serialization of outer boolean types
+   * @param body Input boolean as post body (optional)
+   * @return ApiResponse&lt;Boolean&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = fakeOuterBooleanSerializeRequestBuilder(body);
+    try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "createXmlItem call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "fakeOuterBooleanSerialize call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<Boolean>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Boolean>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -116,14 +188,8 @@ public void createXmlItem (XmlItem xmlItem) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * 
-   * Test serialization of outer boolean types
-   * @param body Input boolean as post body (optional)
-   * @return Boolean
-   * @throws ApiException if fails to make API call
-   */
-  public Boolean fakeOuterBooleanSerialize (Boolean body) throws ApiException {
+
+  private HttpRequest.Builder fakeOuterBooleanSerializeRequestBuilder(Boolean body) throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -137,25 +203,56 @@ public Boolean fakeOuterBooleanSerialize (Boolean body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * Test serialization of object with outer number type
+   * @param body Input composite as post body (optional)
+   * @return OuterComposite
+   * @throws ApiException if fails to make API call
+   */
+  public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws ApiException {
+    ApiResponse<OuterComposite> localVarResponse = fakeOuterCompositeSerializeWithHttpInfo(body);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * 
+   * Test serialization of object with outer number type
+   * @param body Input composite as post body (optional)
+   * @return ApiResponse&lt;OuterComposite&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(OuterComposite body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = fakeOuterCompositeSerializeRequestBuilder(body);
+    try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "fakeOuterBooleanSerialize call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "fakeOuterCompositeSerialize call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Boolean>() {});
+      return new ApiResponse<OuterComposite>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<OuterComposite>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -164,14 +261,8 @@ public Boolean fakeOuterBooleanSerialize (Boolean body) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * 
-   * Test serialization of object with outer number type
-   * @param body Input composite as post body (optional)
-   * @return OuterComposite
-   * @throws ApiException if fails to make API call
-   */
-  public OuterComposite fakeOuterCompositeSerialize (OuterComposite body) throws ApiException {
+
+  private HttpRequest.Builder fakeOuterCompositeSerializeRequestBuilder(OuterComposite body) throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -185,25 +276,56 @@ public OuterComposite fakeOuterCompositeSerialize (OuterComposite body) throws A
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * Test serialization of outer number types
+   * @param body Input number as post body (optional)
+   * @return BigDecimal
+   * @throws ApiException if fails to make API call
+   */
+  public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws ApiException {
+    ApiResponse<BigDecimal> localVarResponse = fakeOuterNumberSerializeWithHttpInfo(body);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * 
+   * Test serialization of outer number types
+   * @param body Input number as post body (optional)
+   * @return ApiResponse&lt;BigDecimal&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = fakeOuterNumberSerializeRequestBuilder(body);
+    try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "fakeOuterCompositeSerialize call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "fakeOuterNumberSerialize call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<OuterComposite>() {});
+      return new ApiResponse<BigDecimal>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<BigDecimal>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -212,14 +334,8 @@ public OuterComposite fakeOuterCompositeSerialize (OuterComposite body) throws A
       throw new ApiException(e);
     }
   }
-  /**
-   * 
-   * Test serialization of outer number types
-   * @param body Input number as post body (optional)
-   * @return BigDecimal
-   * @throws ApiException if fails to make API call
-   */
-  public BigDecimal fakeOuterNumberSerialize (BigDecimal body) throws ApiException {
+
+  private HttpRequest.Builder fakeOuterNumberSerializeRequestBuilder(BigDecimal body) throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -233,25 +349,56 @@ public BigDecimal fakeOuterNumberSerialize (BigDecimal body) throws ApiException
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * Test serialization of outer string types
+   * @param body Input string as post body (optional)
+   * @return String
+   * @throws ApiException if fails to make API call
+   */
+  public String fakeOuterStringSerialize(String body) throws ApiException {
+    ApiResponse<String> localVarResponse = fakeOuterStringSerializeWithHttpInfo(body);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * 
+   * Test serialization of outer string types
+   * @param body Input string as post body (optional)
+   * @return ApiResponse&lt;String&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = fakeOuterStringSerializeRequestBuilder(body);
+    try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "fakeOuterNumberSerialize call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "fakeOuterStringSerialize call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<BigDecimal>() {});
+      return new ApiResponse<String>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<String>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -260,14 +407,8 @@ public BigDecimal fakeOuterNumberSerialize (BigDecimal body) throws ApiException
       throw new ApiException(e);
     }
   }
-  /**
-   * 
-   * Test serialization of outer string types
-   * @param body Input string as post body (optional)
-   * @return String
-   * @throws ApiException if fails to make API call
-   */
-  public String fakeOuterStringSerialize (String body) throws ApiException {
+
+  private HttpRequest.Builder fakeOuterStringSerializeRequestBuilder(String body) throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -281,25 +422,54 @@ public String fakeOuterStringSerialize (String body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+   * @param body  (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void testBodyWithFileSchema(FileSchemaTestClass body) throws ApiException {
+    testBodyWithFileSchemaWithHttpInfo(body);
+  }
+
+  /**
+   * 
+   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+   * @param body  (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> testBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = testBodyWithFileSchemaRequestBuilder(body);
+    try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "fakeOuterStringSerialize call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "testBodyWithFileSchema call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<String>() {});
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -308,16 +478,11 @@ public String fakeOuterStringSerialize (String body) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * 
-   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-   * @param body  (required)
-   * @throws ApiException if fails to make API call
-   */
-  public void testBodyWithFileSchema (FileSchemaTestClass body) throws ApiException {
+
+  private HttpRequest.Builder testBodyWithFileSchemaRequestBuilder(FileSchemaTestClass body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        throw new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithFileSchema");
+      throw new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithFileSchema");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -332,24 +497,56 @@ public void testBodyWithFileSchema (FileSchemaTestClass body) throws ApiExceptio
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * 
+   * @param query  (required)
+   * @param body  (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void testBodyWithQueryParams(String query, User body) throws ApiException {
+    testBodyWithQueryParamsWithHttpInfo(query, body);
+  }
+
+  /**
+   * 
+   * 
+   * @param query  (required)
+   * @param body  (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(String query, User body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = testBodyWithQueryParamsRequestBuilder(query, body);
+    try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "testBodyWithFileSchema call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "testBodyWithQueryParams call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -358,21 +555,15 @@ public void testBodyWithFileSchema (FileSchemaTestClass body) throws ApiExceptio
       throw new ApiException(e);
     }
   }
-  /**
-   * 
-   * 
-   * @param query  (required)
-   * @param body  (required)
-   * @throws ApiException if fails to make API call
-   */
-  public void testBodyWithQueryParams (String query, User body) throws ApiException {
+
+  private HttpRequest.Builder testBodyWithQueryParamsRequestBuilder(String query, User body) throws ApiException {
     // verify the required parameter 'query' is set
     if (query == null) {
-        throw new ApiException(400, "Missing the required parameter 'query' when calling testBodyWithQueryParams");
+      throw new ApiException(400, "Missing the required parameter 'query' when calling testBodyWithQueryParams");
     }
     // verify the required parameter 'body' is set
     if (body == null) {
-        throw new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithQueryParams");
+      throw new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithQueryParams");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -396,24 +587,56 @@ public void testBodyWithQueryParams (String query, User body) throws ApiExceptio
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * To test \&quot;client\&quot; model
+   * To test \&quot;client\&quot; model
+   * @param body client model (required)
+   * @return Client
+   * @throws ApiException if fails to make API call
+   */
+  public Client testClientModel(Client body) throws ApiException {
+    ApiResponse<Client> localVarResponse = testClientModelWithHttpInfo(body);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * To test \&quot;client\&quot; model
+   * To test \&quot;client\&quot; model
+   * @param body client model (required)
+   * @return ApiResponse&lt;Client&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Client> testClientModelWithHttpInfo(Client body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = testClientModelRequestBuilder(body);
+    try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "testBodyWithQueryParams call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "testClientModel call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<Client>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Client>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -422,17 +645,11 @@ public void testBodyWithQueryParams (String query, User body) throws ApiExceptio
       throw new ApiException(e);
     }
   }
-  /**
-   * To test \&quot;client\&quot; model
-   * To test \&quot;client\&quot; model
-   * @param body client model (required)
-   * @return Client
-   * @throws ApiException if fails to make API call
-   */
-  public Client testClientModel (Client body) throws ApiException {
+
+  private HttpRequest.Builder testClientModelRequestBuilder(Client body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        throw new ApiException(400, "Missing the required parameter 'body' when calling testClientModel");
+      throw new ApiException(400, "Missing the required parameter 'body' when calling testClientModel");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -447,33 +664,40 @@ public Client testClientModel (Client body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PATCH", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
-      if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
-      }          
-      if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "testClientModel call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
-      }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Client>() {});
     } catch (IOException e) {
       throw new ApiException(e);
     }
-    catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new ApiException(e);
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+   * @param number None (required)
+   * @param _double None (required)
+   * @param patternWithoutDelimiter None (required)
+   * @param _byte None (required)
+   * @param integer None (optional)
+   * @param int32 None (optional)
+   * @param int64 None (optional)
+   * @param _float None (optional)
+   * @param string None (optional)
+   * @param binary None (optional)
+   * @param date None (optional)
+   * @param dateTime None (optional)
+   * @param password None (optional)
+   * @param paramCallback None (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
   }
+
   /**
    * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
    * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -491,24 +715,54 @@ public Client testClientModel (Client body) throws ApiException {
    * @param dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
+   * @return ApiResponse&lt;Void&gt;
    * @throws ApiException if fails to make API call
    */
-  public void testEndpointParameters (BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    try {
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (memberVarResponseInterceptor != null) {
+        memberVarResponseInterceptor.accept(localVarResponse);
+      }
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "testEndpointParameters call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new ApiException(e);
+    }
+  }
+
+  private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
     // verify the required parameter 'number' is set
     if (number == null) {
-        throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters");
+      throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters");
     }
     // verify the required parameter '_double' is set
     if (_double == null) {
-        throw new ApiException(400, "Missing the required parameter '_double' when calling testEndpointParameters");
+      throw new ApiException(400, "Missing the required parameter '_double' when calling testEndpointParameters");
     }
     // verify the required parameter 'patternWithoutDelimiter' is set
     if (patternWithoutDelimiter == null) {
-        throw new ApiException(400, "Missing the required parameter 'patternWithoutDelimiter' when calling testEndpointParameters");
+      throw new ApiException(400, "Missing the required parameter 'patternWithoutDelimiter' when calling testEndpointParameters");
     }
     // verify the required parameter '_byte' is set
     if (_byte == null) {
-        throw new ApiException(400, "Missing the required parameter '_byte' when calling testEndpointParameters");
+      throw new ApiException(400, "Missing the required parameter '_byte' when calling testEndpointParameters");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -519,34 +773,32 @@ public void testEndpointParameters (BigDecimal number, Double _double, String pa
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-    try {
-      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
-      if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
-      }          
-      if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "testEndpointParameters call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
-      }
-    } catch (IOException e) {
-      throw new ApiException(e);
+    localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
     }
-    catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new ApiException(e);
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
+  }
+  /**
+   * To test enum parameters
+   * To test enum parameters
+   * @param enumHeaderStringArray Header parameter enum test (string array) (optional
+   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
+   * @param enumQueryStringArray Query parameter enum test (string array) (optional
+   * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
+   * @param enumQueryInteger Query parameter enum test (double) (optional)
+   * @param enumQueryDouble Query parameter enum test (double) (optional)
+   * @param enumFormStringArray Form parameter enum test (string array) (optional
+   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @throws ApiException if fails to make API call
+   */
+  public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws ApiException {
+    testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
   }
+
   /**
    * To test enum parameters
    * To test enum parameters
@@ -558,9 +810,39 @@ public void testEndpointParameters (BigDecimal number, Double _double, String pa
    * @param enumQueryDouble Query parameter enum test (double) (optional)
    * @param enumFormStringArray Form parameter enum test (string array) (optional
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @return ApiResponse&lt;Void&gt;
    * @throws ApiException if fails to make API call
    */
-  public void testEnumParameters (List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws ApiException {
+  public ApiResponse<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = testEnumParametersRequestBuilder(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+    try {
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (memberVarResponseInterceptor != null) {
+        memberVarResponseInterceptor.accept(localVarResponse);
+      }
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "testEnumParameters call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new ApiException(e);
+    }
+  }
+
+  private HttpRequest.Builder testEnumParametersRequestBuilder(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -588,34 +870,63 @@ public void testEnumParameters (List<String> enumHeaderStringArray, String enumH
     }
     localVarRequestBuilder.header("Accept", "application/json");
 
-    try {
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
-      if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
-      }          
-      if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "testEnumParameters call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
-      }
-    } catch (IOException e) {
-      throw new ApiException(e);
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
     }
-    catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new ApiException(e);
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Fake endpoint to test group parameters (optional)
+   * Fake endpoint to test group parameters (optional)
+   * @param testGroupParametersRequest {@link APItestGroupParametersRequest}
+   * @throws ApiException if fails to make API call
+   */
+  public void testGroupParameters(APItestGroupParametersRequest testGroupParametersRequest) throws ApiException {
+    Integer requiredStringGroup = testGroupParametersRequest.requiredStringGroup();
+    Boolean requiredBooleanGroup = testGroupParametersRequest.requiredBooleanGroup();
+    Long requiredInt64Group = testGroupParametersRequest.requiredInt64Group();
+    Integer stringGroup = testGroupParametersRequest.stringGroup();
+    Boolean booleanGroup = testGroupParametersRequest.booleanGroup();
+    Long int64Group = testGroupParametersRequest.int64Group();
+    testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+  }
+
+  /**
+   * Fake endpoint to test group parameters (optional)
+   * Fake endpoint to test group parameters (optional)
+   * @param testGroupParametersRequest {@link APItestGroupParametersRequest}
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> testGroupParametersWithHttpInfo(APItestGroupParametersRequest testGroupParametersRequest) throws ApiException {
+    Integer requiredStringGroup = testGroupParametersRequest.requiredStringGroup();
+    Boolean requiredBooleanGroup = testGroupParametersRequest.requiredBooleanGroup();
+    Long requiredInt64Group = testGroupParametersRequest.requiredInt64Group();
+    Integer stringGroup = testGroupParametersRequest.stringGroup();
+    Boolean booleanGroup = testGroupParametersRequest.booleanGroup();
+    Long int64Group = testGroupParametersRequest.int64Group();
+    return testGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+  }
+
+  /**
+   * Fake endpoint to test group parameters (optional)
+   * Fake endpoint to test group parameters (optional)
+   * @param requiredStringGroup Required String in group parameters (required)
+   * @param requiredBooleanGroup Required Boolean in group parameters (required)
+   * @param requiredInt64Group Required Integer in group parameters (required)
+   * @param stringGroup String in group parameters (optional)
+   * @param booleanGroup Boolean in group parameters (optional)
+   * @param int64Group Integer in group parameters (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {
+    testGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
   }
+
   /**
    * Fake endpoint to test group parameters (optional)
    * Fake endpoint to test group parameters (optional)
@@ -625,20 +936,50 @@ public void testEnumParameters (List<String> enumHeaderStringArray, String enumH
    * @param stringGroup String in group parameters (optional)
    * @param booleanGroup Boolean in group parameters (optional)
    * @param int64Group Integer in group parameters (optional)
+   * @return ApiResponse&lt;Void&gt;
    * @throws ApiException if fails to make API call
    */
-  public void testGroupParameters (Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {
+  public ApiResponse<Void> testGroupParametersWithHttpInfo(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = testGroupParametersRequestBuilder(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+    try {
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (memberVarResponseInterceptor != null) {
+        memberVarResponseInterceptor.accept(localVarResponse);
+      }
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "testGroupParameters call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new ApiException(e);
+    }
+  }
+
+  private HttpRequest.Builder testGroupParametersRequestBuilder(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {
     // verify the required parameter 'requiredStringGroup' is set
     if (requiredStringGroup == null) {
-        throw new ApiException(400, "Missing the required parameter 'requiredStringGroup' when calling testGroupParameters");
+      throw new ApiException(400, "Missing the required parameter 'requiredStringGroup' when calling testGroupParameters");
     }
     // verify the required parameter 'requiredBooleanGroup' is set
     if (requiredBooleanGroup == null) {
-        throw new ApiException(400, "Missing the required parameter 'requiredBooleanGroup' when calling testGroupParameters");
+      throw new ApiException(400, "Missing the required parameter 'requiredBooleanGroup' when calling testGroupParameters");
     }
     // verify the required parameter 'requiredInt64Group' is set
     if (requiredInt64Group == null) {
-        throw new ApiException(400, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters");
+      throw new ApiException(400, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -667,26 +1008,129 @@ public void testGroupParameters (Integer requiredStringGroup, Boolean requiredBo
     }
     localVarRequestBuilder.header("Accept", "application/json");
 
-    try {
-      localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
+    localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+
+  public static final class APItestGroupParametersRequest {
+    private Integer requiredStringGroup; // Required String in group parameters (required)
+    private Boolean requiredBooleanGroup; // Required Boolean in group parameters (required)
+    private Long requiredInt64Group; // Required Integer in group parameters (required)
+    private Integer stringGroup; // String in group parameters (optional)
+    private Boolean booleanGroup; // Boolean in group parameters (optional)
+    private Long int64Group; // Integer in group parameters (optional)
+
+    private APItestGroupParametersRequest(Builder builder) {
+      this.requiredStringGroup = builder.requiredStringGroup;
+      this.requiredBooleanGroup = builder.requiredBooleanGroup;
+      this.requiredInt64Group = builder.requiredInt64Group;
+      this.stringGroup = builder.stringGroup;
+      this.booleanGroup = builder.booleanGroup;
+      this.int64Group = builder.int64Group;
+    }
+    public Integer requiredStringGroup() {
+      return requiredStringGroup;
+    }
+    public Boolean requiredBooleanGroup() {
+      return requiredBooleanGroup;
+    }
+    public Long requiredInt64Group() {
+      return requiredInt64Group;
+    }
+    public Integer stringGroup() {
+      return stringGroup;
+    }
+    public Boolean booleanGroup() {
+      return booleanGroup;
+    }
+    public Long int64Group() {
+      return int64Group;
+    }
+    public static Builder newBuilder() {
+      return new Builder();
+    }
+
+    public static class Builder {
+      private Integer requiredStringGroup;
+      private Boolean requiredBooleanGroup;
+      private Long requiredInt64Group;
+      private Integer stringGroup;
+      private Boolean booleanGroup;
+      private Long int64Group;
+
+      public Builder requiredStringGroup(Integer requiredStringGroup) {
+        this.requiredStringGroup = requiredStringGroup;
+        return this;
+      }
+      public Builder requiredBooleanGroup(Boolean requiredBooleanGroup) {
+        this.requiredBooleanGroup = requiredBooleanGroup;
+        return this;
+      }
+      public Builder requiredInt64Group(Long requiredInt64Group) {
+        this.requiredInt64Group = requiredInt64Group;
+        return this;
+      }
+      public Builder stringGroup(Integer stringGroup) {
+        this.stringGroup = stringGroup;
+        return this;
+      }
+      public Builder booleanGroup(Boolean booleanGroup) {
+        this.booleanGroup = booleanGroup;
+        return this;
+      }
+      public Builder int64Group(Long int64Group) {
+        this.int64Group = int64Group;
+        return this;
       }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
+      public APItestGroupParametersRequest build() {
+        return new APItestGroupParametersRequest(this);
       }
+    }
+  }
+
+  /**
+   * test inline additionalProperties
+   * 
+   * @param param request body (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void testInlineAdditionalProperties(Map<String, String> param) throws ApiException {
+    testInlineAdditionalPropertiesWithHttpInfo(param);
+  }
+
+  /**
+   * test inline additionalProperties
+   * 
+   * @param param request body (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> testInlineAdditionalPropertiesWithHttpInfo(Map<String, String> param) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = testInlineAdditionalPropertiesRequestBuilder(param);
+    try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "testGroupParameters call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "testInlineAdditionalProperties call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -695,16 +1139,11 @@ public void testGroupParameters (Integer requiredStringGroup, Boolean requiredBo
       throw new ApiException(e);
     }
   }
-  /**
-   * test inline additionalProperties
-   * 
-   * @param param request body (required)
-   * @throws ApiException if fails to make API call
-   */
-  public void testInlineAdditionalProperties (Map<String, String> param) throws ApiException {
+
+  private HttpRequest.Builder testInlineAdditionalPropertiesRequestBuilder(Map<String, String> param) throws ApiException {
     // verify the required parameter 'param' is set
     if (param == null) {
-        throw new ApiException(400, "Missing the required parameter 'param' when calling testInlineAdditionalProperties");
+      throw new ApiException(400, "Missing the required parameter 'param' when calling testInlineAdditionalProperties");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -719,24 +1158,56 @@ public void testInlineAdditionalProperties (Map<String, String> param) throws Ap
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(param);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * test json serialization of form data
+   * 
+   * @param param field1 (required)
+   * @param param2 field2 (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void testJsonFormData(String param, String param2) throws ApiException {
+    testJsonFormDataWithHttpInfo(param, param2);
+  }
+
+  /**
+   * test json serialization of form data
+   * 
+   * @param param field1 (required)
+   * @param param2 field2 (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> testJsonFormDataWithHttpInfo(String param, String param2) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = testJsonFormDataRequestBuilder(param, param2);
+    try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "testInlineAdditionalProperties call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "testJsonFormData call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -745,21 +1216,15 @@ public void testInlineAdditionalProperties (Map<String, String> param) throws Ap
       throw new ApiException(e);
     }
   }
-  /**
-   * test json serialization of form data
-   * 
-   * @param param field1 (required)
-   * @param param2 field2 (required)
-   * @throws ApiException if fails to make API call
-   */
-  public void testJsonFormData (String param, String param2) throws ApiException {
+
+  private HttpRequest.Builder testJsonFormDataRequestBuilder(String param, String param2) throws ApiException {
     // verify the required parameter 'param' is set
     if (param == null) {
-        throw new ApiException(400, "Missing the required parameter 'param' when calling testJsonFormData");
+      throw new ApiException(400, "Missing the required parameter 'param' when calling testJsonFormData");
     }
     // verify the required parameter 'param2' is set
     if (param2 == null) {
-        throw new ApiException(400, "Missing the required parameter 'param2' when calling testJsonFormData");
+      throw new ApiException(400, "Missing the required parameter 'param2' when calling testJsonFormData");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -770,26 +1235,60 @@ public void testJsonFormData (String param, String param2) throws ApiException {
 
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * 
+   * To test the collection format in query parameters
+   * @param pipe  (required)
+   * @param ioutil  (required)
+   * @param http  (required)
+   * @param url  (required)
+   * @param context  (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void testQueryParameterCollectionFormat(List<String> pipe, List<String> ioutil, List<String> http, List<String> url, List<String> context) throws ApiException {
+    testQueryParameterCollectionFormatWithHttpInfo(pipe, ioutil, http, url, context);
+  }
+
+  /**
+   * 
+   * To test the collection format in query parameters
+   * @param pipe  (required)
+   * @param ioutil  (required)
+   * @param http  (required)
+   * @param url  (required)
+   * @param context  (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(List<String> pipe, List<String> ioutil, List<String> http, List<String> url, List<String> context) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = testQueryParameterCollectionFormatRequestBuilder(pipe, ioutil, http, url, context);
     try {
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "testJsonFormData call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "testQueryParameterCollectionFormat call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -798,36 +1297,27 @@ public void testJsonFormData (String param, String param2) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * 
-   * To test the collection format in query parameters
-   * @param pipe  (required)
-   * @param ioutil  (required)
-   * @param http  (required)
-   * @param url  (required)
-   * @param context  (required)
-   * @throws ApiException if fails to make API call
-   */
-  public void testQueryParameterCollectionFormat (List<String> pipe, List<String> ioutil, List<String> http, List<String> url, List<String> context) throws ApiException {
+
+  private HttpRequest.Builder testQueryParameterCollectionFormatRequestBuilder(List<String> pipe, List<String> ioutil, List<String> http, List<String> url, List<String> context) throws ApiException {
     // verify the required parameter 'pipe' is set
     if (pipe == null) {
-        throw new ApiException(400, "Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat");
+      throw new ApiException(400, "Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat");
     }
     // verify the required parameter 'ioutil' is set
     if (ioutil == null) {
-        throw new ApiException(400, "Missing the required parameter 'ioutil' when calling testQueryParameterCollectionFormat");
+      throw new ApiException(400, "Missing the required parameter 'ioutil' when calling testQueryParameterCollectionFormat");
     }
     // verify the required parameter 'http' is set
     if (http == null) {
-        throw new ApiException(400, "Missing the required parameter 'http' when calling testQueryParameterCollectionFormat");
+      throw new ApiException(400, "Missing the required parameter 'http' when calling testQueryParameterCollectionFormat");
     }
     // verify the required parameter 'url' is set
     if (url == null) {
-        throw new ApiException(400, "Missing the required parameter 'url' when calling testQueryParameterCollectionFormat");
+      throw new ApiException(400, "Missing the required parameter 'url' when calling testQueryParameterCollectionFormat");
     }
     // verify the required parameter 'context' is set
     if (context == null) {
-        throw new ApiException(400, "Missing the required parameter 'context' when calling testQueryParameterCollectionFormat");
+      throw new ApiException(400, "Missing the required parameter 'context' when calling testQueryParameterCollectionFormat");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -851,32 +1341,13 @@ public void testQueryParameterCollectionFormat (List<String> pipe, List<String>
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-    try {
-      localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
-      if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
-      }          
-      if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "testQueryParameterCollectionFormat call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
-      }
-    } catch (IOException e) {
-      throw new ApiException(e);
+    localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
     }
-    catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new ApiException(e);
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
   }
 }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 5b6753d212ea..bc13e4b5cb72 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -14,6 +14,7 @@
 
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Pair;
 
 import org.openapitools.client.model.Client;
@@ -35,8 +36,7 @@
 import java.util.List;
 import java.util.Map;
 
-
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeClassnameTags123Api {
   private final HttpClient memberVarHttpClient;
   private final ObjectMapper memberVarObjectMapper;
@@ -44,7 +44,7 @@ public class FakeClassnameTags123Api {
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  
+
   public FakeClassnameTags123Api() {
     this(new ApiClient());
   }
@@ -65,10 +65,51 @@ public FakeClassnameTags123Api(ApiClient apiClient) {
    * @return Client
    * @throws ApiException if fails to make API call
    */
-  public Client testClassname (Client body) throws ApiException {
+  public Client testClassname(Client body) throws ApiException {
+    ApiResponse<Client> localVarResponse = testClassnameWithHttpInfo(body);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * To test class name in snake case
+   * To test class name in snake case
+   * @param body client model (required)
+   * @return ApiResponse&lt;Client&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Client> testClassnameWithHttpInfo(Client body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = testClassnameRequestBuilder(body);
+    try {
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (memberVarResponseInterceptor != null) {
+        memberVarResponseInterceptor.accept(localVarResponse);
+      }
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "testClassname call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+      return new ApiResponse<Client>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Client>() {})
+        );
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new ApiException(e);
+    }
+  }
+
+  private HttpRequest.Builder testClassnameRequestBuilder(Client body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        throw new ApiException(400, "Missing the required parameter 'body' when calling testClassname");
+      throw new ApiException(400, "Missing the required parameter 'body' when calling testClassname");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -83,31 +124,15 @@ public Client testClassname (Client body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PATCH", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
-      if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
-      }          
-      if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "testClassname call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
-      }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Client>() {});
     } catch (IOException e) {
       throw new ApiException(e);
     }
-    catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new ApiException(e);
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
   }
 }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
index 342595698bc4..78058c16ada1 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
@@ -14,6 +14,7 @@
 
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Pair;
 
 import java.io.File;
@@ -38,8 +39,7 @@
 import java.util.List;
 import java.util.Map;
 
-
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class PetApi {
   private final HttpClient memberVarHttpClient;
   private final ObjectMapper memberVarObjectMapper;
@@ -47,7 +47,7 @@ public class PetApi {
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  
+
   public PetApi() {
     this(new ApiClient());
   }
@@ -67,10 +67,50 @@ public PetApi(ApiClient apiClient) {
    * @param body Pet object that needs to be added to the store (required)
    * @throws ApiException if fails to make API call
    */
-  public void addPet (Pet body) throws ApiException {
+  public void addPet(Pet body) throws ApiException {
+    addPetWithHttpInfo(body);
+  }
+
+  /**
+   * Add a new pet to the store
+   * 
+   * @param body Pet object that needs to be added to the store (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> addPetWithHttpInfo(Pet body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = addPetRequestBuilder(body);
+    try {
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (memberVarResponseInterceptor != null) {
+        memberVarResponseInterceptor.accept(localVarResponse);
+      }
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "addPet call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new ApiException(e);
+    }
+  }
+
+  private HttpRequest.Builder addPetRequestBuilder(Pet body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        throw new ApiException(400, "Missing the required parameter 'body' when calling addPet");
+      throw new ApiException(400, "Missing the required parameter 'body' when calling addPet");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -85,24 +125,56 @@ public void addPet (Pet body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public void deletePet(Long petId, String apiKey) throws ApiException {
+    deletePetWithHttpInfo(petId, apiKey);
+  }
+
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> deletePetWithHttpInfo(Long petId, String apiKey) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = deletePetRequestBuilder(petId, apiKey);
+    try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "addPet call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "deletePet call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -111,17 +183,11 @@ public void addPet (Pet body) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Deletes a pet
-   * 
-   * @param petId Pet id to delete (required)
-   * @param apiKey  (optional)
-   * @throws ApiException if fails to make API call
-   */
-  public void deletePet (Long petId, String apiKey) throws ApiException {
+
+  private HttpRequest.Builder deletePetRequestBuilder(Long petId, String apiKey) throws ApiException {
     // verify the required parameter 'petId' is set
     if (petId == null) {
-        throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet");
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -136,26 +202,54 @@ public void deletePet (Long petId, String apiKey) throws ApiException {
     }
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for filter (required)
+   * @return List&lt;Pet&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
+    ApiResponse<List<Pet>> localVarResponse = findPetsByStatusWithHttpInfo(status);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for filter (required)
+   * @return ApiResponse&lt;List&lt;Pet&gt;&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = findPetsByStatusRequestBuilder(status);
     try {
-      localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "deletePet call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "findPetsByStatus call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<List<Pet>>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<List<Pet>>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -164,17 +258,11 @@ public void deletePet (Long petId, String apiKey) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma separated strings
-   * @param status Status values that need to be considered for filter (required)
-   * @return List&lt;Pet&gt;
-   * @throws ApiException if fails to make API call
-   */
-  public List<Pet> findPetsByStatus (List<String> status) throws ApiException {
+
+  private HttpRequest.Builder findPetsByStatusRequestBuilder(List<String> status) throws ApiException {
     // verify the required parameter 'status' is set
     if (status == null) {
-        throw new ApiException(400, "Missing the required parameter 'status' when calling findPetsByStatus");
+      throw new ApiException(400, "Missing the required parameter 'status' when calling findPetsByStatus");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -194,27 +282,58 @@ public List<Pet> findPetsByStatus (List<String> status) throws ApiException {
 
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Finds Pets by tags
+   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by (required)
+   * @return Set&lt;Pet&gt;
+   * @throws ApiException if fails to make API call
+   * @deprecated
+   */
+  @Deprecated
+  public Set<Pet> findPetsByTags(Set<String> tags) throws ApiException {
+    ApiResponse<Set<Pet>> localVarResponse = findPetsByTagsWithHttpInfo(tags);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * Finds Pets by tags
+   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by (required)
+   * @return ApiResponse&lt;Set&lt;Pet&gt;&gt;
+   * @throws ApiException if fails to make API call
+   * @deprecated
+   */
+  @Deprecated
+  public ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(Set<String> tags) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = findPetsByTagsRequestBuilder(tags);
     try {
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "findPetsByStatus call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "findPetsByTags call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<List<Pet>>() {});
+      return new ApiResponse<Set<Pet>>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Set<Pet>>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -223,19 +342,11 @@ public List<Pet> findPetsByStatus (List<String> status) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Finds Pets by tags
-   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by (required)
-   * @return Set&lt;Pet&gt;
-   * @throws ApiException if fails to make API call
-   * @deprecated
-   */
-  @Deprecated
-  public Set<Pet> findPetsByTags (Set<String> tags) throws ApiException {
+
+  private HttpRequest.Builder findPetsByTagsRequestBuilder(Set<String> tags) throws ApiException {
     // verify the required parameter 'tags' is set
     if (tags == null) {
-        throw new ApiException(400, "Missing the required parameter 'tags' when calling findPetsByTags");
+      throw new ApiException(400, "Missing the required parameter 'tags' when calling findPetsByTags");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -255,27 +366,54 @@ public Set<Pet> findPetsByTags (Set<String> tags) throws ApiException {
 
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Find pet by ID
+   * Returns a single pet
+   * @param petId ID of pet to return (required)
+   * @return Pet
+   * @throws ApiException if fails to make API call
+   */
+  public Pet getPetById(Long petId) throws ApiException {
+    ApiResponse<Pet> localVarResponse = getPetByIdWithHttpInfo(petId);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * Find pet by ID
+   * Returns a single pet
+   * @param petId ID of pet to return (required)
+   * @return ApiResponse&lt;Pet&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = getPetByIdRequestBuilder(petId);
     try {
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "findPetsByTags call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "getPetById call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Set<Pet>>() {});
+      return new ApiResponse<Pet>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Pet>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -284,17 +422,11 @@ public Set<Pet> findPetsByTags (Set<String> tags) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Find pet by ID
-   * Returns a single pet
-   * @param petId ID of pet to return (required)
-   * @return Pet
-   * @throws ApiException if fails to make API call
-   */
-  public Pet getPetById (Long petId) throws ApiException {
+
+  private HttpRequest.Builder getPetByIdRequestBuilder(Long petId) throws ApiException {
     // verify the required parameter 'petId' is set
     if (petId == null) {
-        throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById");
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -306,27 +438,52 @@ public Pet getPetById (Long petId) throws ApiException {
 
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void updatePet(Pet body) throws ApiException {
+    updatePetWithHttpInfo(body);
+  }
+
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> updatePetWithHttpInfo(Pet body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = updatePetRequestBuilder(body);
     try {
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "getPetById call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "updatePet call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Pet>() {});
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -335,16 +492,11 @@ public Pet getPetById (Long petId) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @throws ApiException if fails to make API call
-   */
-  public void updatePet (Pet body) throws ApiException {
+
+  private HttpRequest.Builder updatePetRequestBuilder(Pet body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        throw new ApiException(400, "Missing the required parameter 'body' when calling updatePet");
+      throw new ApiException(400, "Missing the required parameter 'body' when calling updatePet");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -359,31 +511,16 @@ public void updatePet (Pet body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
-      if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
-      }          
-      if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "updatePet call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
-      }
     } catch (IOException e) {
       throw new ApiException(e);
     }
-    catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new ApiException(e);
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
   }
   /**
    * Updates a pet in the store with form data
@@ -393,10 +530,52 @@ public void updatePet (Pet body) throws ApiException {
    * @param status Updated status of the pet (optional)
    * @throws ApiException if fails to make API call
    */
-  public void updatePetWithForm (Long petId, String name, String status) throws ApiException {
+  public void updatePetWithForm(Long petId, String name, String status) throws ApiException {
+    updatePetWithFormWithHttpInfo(petId, name, status);
+  }
+
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> updatePetWithFormWithHttpInfo(Long petId, String name, String status) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = updatePetWithFormRequestBuilder(petId, name, status);
+    try {
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (memberVarResponseInterceptor != null) {
+        memberVarResponseInterceptor.accept(localVarResponse);
+      }
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "updatePetWithForm call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new ApiException(e);
+    }
+  }
+
+  private HttpRequest.Builder updatePetWithFormRequestBuilder(Long petId, String name, String status) throws ApiException {
     // verify the required parameter 'petId' is set
     if (petId == null) {
-        throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm");
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -408,26 +587,58 @@ public void updatePetWithForm (Long petId, String name, String status) throws Ap
 
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * uploads an image
+   * 
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
+   * @return ModelApiResponse
+   * @throws ApiException if fails to make API call
+   */
+  public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File file) throws ApiException {
+    ApiResponse<ModelApiResponse> localVarResponse = uploadFileWithHttpInfo(petId, additionalMetadata, file);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * uploads an image
+   * 
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
+   * @return ApiResponse&lt;ModelApiResponse&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File file) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = uploadFileRequestBuilder(petId, additionalMetadata, file);
     try {
-      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "updatePetWithForm call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "uploadFile call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<ModelApiResponse>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<ModelApiResponse>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -436,19 +647,11 @@ public void updatePetWithForm (Long petId, String name, String status) throws Ap
       throw new ApiException(e);
     }
   }
-  /**
-   * uploads an image
-   * 
-   * @param petId ID of pet to update (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @param file file to upload (optional)
-   * @return ModelApiResponse
-   * @throws ApiException if fails to make API call
-   */
-  public ModelApiResponse uploadFile (Long petId, String additionalMetadata, File file) throws ApiException {
+
+  private HttpRequest.Builder uploadFileRequestBuilder(Long petId, String additionalMetadata, File file) throws ApiException {
     // verify the required parameter 'petId' is set
     if (petId == null) {
-        throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile");
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -460,27 +663,58 @@ public ModelApiResponse uploadFile (Long petId, String additionalMetadata, File
 
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * uploads an image (required)
+   * 
+   * @param petId ID of pet to update (required)
+   * @param requiredFile file to upload (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @return ModelApiResponse
+   * @throws ApiException if fails to make API call
+   */
+  public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile, String additionalMetadata) throws ApiException {
+    ApiResponse<ModelApiResponse> localVarResponse = uploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * uploads an image (required)
+   * 
+   * @param petId ID of pet to update (required)
+   * @param requiredFile file to upload (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @return ApiResponse&lt;ModelApiResponse&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = uploadFileWithRequiredFileRequestBuilder(petId, requiredFile, additionalMetadata);
     try {
-      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "uploadFile call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "uploadFileWithRequiredFile call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<ModelApiResponse>() {});
+      return new ApiResponse<ModelApiResponse>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<ModelApiResponse>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -489,23 +723,15 @@ public ModelApiResponse uploadFile (Long petId, String additionalMetadata, File
       throw new ApiException(e);
     }
   }
-  /**
-   * uploads an image (required)
-   * 
-   * @param petId ID of pet to update (required)
-   * @param requiredFile file to upload (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @return ModelApiResponse
-   * @throws ApiException if fails to make API call
-   */
-  public ModelApiResponse uploadFileWithRequiredFile (Long petId, File requiredFile, String additionalMetadata) throws ApiException {
+
+  private HttpRequest.Builder uploadFileWithRequiredFileRequestBuilder(Long petId, File requiredFile, String additionalMetadata) throws ApiException {
     // verify the required parameter 'petId' is set
     if (petId == null) {
-        throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFileWithRequiredFile");
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFileWithRequiredFile");
     }
     // verify the required parameter 'requiredFile' is set
     if (requiredFile == null) {
-        throw new ApiException(400, "Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile");
+      throw new ApiException(400, "Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -517,33 +743,13 @@ public ModelApiResponse uploadFileWithRequiredFile (Long petId, File requiredFil
 
     localVarRequestBuilder.header("Accept", "application/json");
 
-    try {
-      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
-      if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
-      }          
-      if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "uploadFileWithRequiredFile call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
-      }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<ModelApiResponse>() {});
-    } catch (IOException e) {
-      throw new ApiException(e);
+    localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
     }
-    catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new ApiException(e);
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
   }
 }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
index b8b5ad93573d..845c1567b0c1 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -14,6 +14,7 @@
 
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Pair;
 
 import org.openapitools.client.model.Order;
@@ -35,8 +36,7 @@
 import java.util.List;
 import java.util.Map;
 
-
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StoreApi {
   private final HttpClient memberVarHttpClient;
   private final ObjectMapper memberVarObjectMapper;
@@ -44,7 +44,7 @@ public class StoreApi {
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  
+
   public StoreApi() {
     this(new ApiClient());
   }
@@ -64,10 +64,50 @@ public StoreApi(ApiClient apiClient) {
    * @param orderId ID of the order that needs to be deleted (required)
    * @throws ApiException if fails to make API call
    */
-  public void deleteOrder (String orderId) throws ApiException {
+  public void deleteOrder(String orderId) throws ApiException {
+    deleteOrderWithHttpInfo(orderId);
+  }
+
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> deleteOrderWithHttpInfo(String orderId) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = deleteOrderRequestBuilder(orderId);
+    try {
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (memberVarResponseInterceptor != null) {
+        memberVarResponseInterceptor.accept(localVarResponse);
+      }
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "deleteOrder call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new ApiException(e);
+    }
+  }
+
+  private HttpRequest.Builder deleteOrderRequestBuilder(String orderId) throws ApiException {
     // verify the required parameter 'orderId' is set
     if (orderId == null) {
-        throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder");
+      throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -79,26 +119,52 @@ public void deleteOrder (String orderId) throws ApiException {
 
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Map&lt;String, Integer&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public Map<String, Integer> getInventory() throws ApiException {
+    ApiResponse<Map<String, Integer>> localVarResponse = getInventoryWithHttpInfo();
+    return localVarResponse.getData();
+  }
+
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return ApiResponse&lt;Map&lt;String, Integer&gt;&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = getInventoryRequestBuilder();
     try {
-      localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "deleteOrder call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "getInventory call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<Map<String, Integer>>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Map<String, Integer>>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -107,13 +173,8 @@ public void deleteOrder (String orderId) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return Map&lt;String, Integer&gt;
-   * @throws ApiException if fails to make API call
-   */
-  public Map<String, Integer> getInventory () throws ApiException {
+
+  private HttpRequest.Builder getInventoryRequestBuilder() throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -123,27 +184,54 @@ public Map<String, Integer> getInventory () throws ApiException {
 
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Find purchase order by ID
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched (required)
+   * @return Order
+   * @throws ApiException if fails to make API call
+   */
+  public Order getOrderById(Long orderId) throws ApiException {
+    ApiResponse<Order> localVarResponse = getOrderByIdWithHttpInfo(orderId);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * Find purchase order by ID
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched (required)
+   * @return ApiResponse&lt;Order&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = getOrderByIdRequestBuilder(orderId);
     try {
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "getInventory call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "getOrderById call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Map<String, Integer>>() {});
+      return new ApiResponse<Order>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Order>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -152,17 +240,11 @@ public Map<String, Integer> getInventory () throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched (required)
-   * @return Order
-   * @throws ApiException if fails to make API call
-   */
-  public Order getOrderById (Long orderId) throws ApiException {
+
+  private HttpRequest.Builder getOrderByIdRequestBuilder(Long orderId) throws ApiException {
     // verify the required parameter 'orderId' is set
     if (orderId == null) {
-        throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById");
+      throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -174,27 +256,54 @@ public Order getOrderById (Long orderId) throws ApiException {
 
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (required)
+   * @return Order
+   * @throws ApiException if fails to make API call
+   */
+  public Order placeOrder(Order body) throws ApiException {
+    ApiResponse<Order> localVarResponse = placeOrderWithHttpInfo(body);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (required)
+   * @return ApiResponse&lt;Order&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = placeOrderRequestBuilder(body);
     try {
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "getOrderById call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "placeOrder call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Order>() {});
+      return new ApiResponse<Order>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Order>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -203,17 +312,11 @@ public Order getOrderById (Long orderId) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet (required)
-   * @return Order
-   * @throws ApiException if fails to make API call
-   */
-  public Order placeOrder (Order body) throws ApiException {
+
+  private HttpRequest.Builder placeOrderRequestBuilder(Order body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        throw new ApiException(400, "Missing the required parameter 'body' when calling placeOrder");
+      throw new ApiException(400, "Missing the required parameter 'body' when calling placeOrder");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -228,31 +331,15 @@ public Order placeOrder (Order body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
-      if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
-      }          
-      if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "placeOrder call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
-      }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Order>() {});
     } catch (IOException e) {
       throw new ApiException(e);
     }
-    catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new ApiException(e);
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
   }
 }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
index d0f358fee28d..6e5b6a147090 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
@@ -14,6 +14,7 @@
 
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.ApiException;
+import org.openapitools.client.ApiResponse;
 import org.openapitools.client.Pair;
 
 import org.openapitools.client.model.User;
@@ -35,8 +36,7 @@
 import java.util.List;
 import java.util.Map;
 
-
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class UserApi {
   private final HttpClient memberVarHttpClient;
   private final ObjectMapper memberVarObjectMapper;
@@ -44,7 +44,7 @@ public class UserApi {
   private final Consumer<HttpRequest.Builder> memberVarInterceptor;
   private final Duration memberVarReadTimeout;
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
-  
+
   public UserApi() {
     this(new ApiClient());
   }
@@ -64,10 +64,50 @@ public UserApi(ApiClient apiClient) {
    * @param body Created user object (required)
    * @throws ApiException if fails to make API call
    */
-  public void createUser (User body) throws ApiException {
+  public void createUser(User body) throws ApiException {
+    createUserWithHttpInfo(body);
+  }
+
+  /**
+   * Create user
+   * This can only be done by the logged in user.
+   * @param body Created user object (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> createUserWithHttpInfo(User body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = createUserRequestBuilder(body);
+    try {
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (memberVarResponseInterceptor != null) {
+        memberVarResponseInterceptor.accept(localVarResponse);
+      }
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "createUser call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new ApiException(e);
+    }
+  }
+
+  private HttpRequest.Builder createUserRequestBuilder(User body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        throw new ApiException(400, "Missing the required parameter 'body' when calling createUser");
+      throw new ApiException(400, "Missing the required parameter 'body' when calling createUser");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -82,24 +122,54 @@ public void createUser (User body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void createUsersWithArrayInput(List<User> body) throws ApiException {
+    createUsersWithArrayInputWithHttpInfo(body);
+  }
+
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(List<User> body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = createUsersWithArrayInputRequestBuilder(body);
+    try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "createUser call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "createUsersWithArrayInput call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -108,16 +178,11 @@ public void createUser (User body) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @throws ApiException if fails to make API call
-   */
-  public void createUsersWithArrayInput (List<User> body) throws ApiException {
+
+  private HttpRequest.Builder createUsersWithArrayInputRequestBuilder(List<User> body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithArrayInput");
+      throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithArrayInput");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -132,24 +197,54 @@ public void createUsersWithArrayInput (List<User> body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void createUsersWithListInput(List<User> body) throws ApiException {
+    createUsersWithListInputWithHttpInfo(body);
+  }
+
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> createUsersWithListInputWithHttpInfo(List<User> body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = createUsersWithListInputRequestBuilder(body);
+    try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "createUsersWithArrayInput call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "createUsersWithListInput call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -158,16 +253,11 @@ public void createUsersWithArrayInput (List<User> body) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @throws ApiException if fails to make API call
-   */
-  public void createUsersWithListInput (List<User> body) throws ApiException {
+
+  private HttpRequest.Builder createUsersWithListInputRequestBuilder(List<User> body) throws ApiException {
     // verify the required parameter 'body' is set
     if (body == null) {
-        throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithListInput");
+      throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithListInput");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -182,24 +272,54 @@ public void createUsersWithListInput (List<User> body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void deleteUser(String username) throws ApiException {
+    deleteUserWithHttpInfo(username);
+  }
+
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> deleteUserWithHttpInfo(String username) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = deleteUserRequestBuilder(username);
+    try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "createUsersWithListInput call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "deleteUser call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -208,16 +328,11 @@ public void createUsersWithListInput (List<User> body) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted (required)
-   * @throws ApiException if fails to make API call
-   */
-  public void deleteUser (String username) throws ApiException {
+
+  private HttpRequest.Builder deleteUserRequestBuilder(String username) throws ApiException {
     // verify the required parameter 'username' is set
     if (username == null) {
-        throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser");
+      throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -229,26 +344,54 @@ public void deleteUser (String username) throws ApiException {
 
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return User
+   * @throws ApiException if fails to make API call
+   */
+  public User getUserByName(String username) throws ApiException {
+    ApiResponse<User> localVarResponse = getUserByNameWithHttpInfo(username);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return ApiResponse&lt;User&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = getUserByNameRequestBuilder(username);
     try {
-      localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "deleteUser call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "getUserByName call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<User>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<User>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -257,17 +400,11 @@ public void deleteUser (String username) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
-   * @return User
-   * @throws ApiException if fails to make API call
-   */
-  public User getUserByName (String username) throws ApiException {
+
+  private HttpRequest.Builder getUserByNameRequestBuilder(String username) throws ApiException {
     // verify the required parameter 'username' is set
     if (username == null) {
-        throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName");
+      throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -279,27 +416,56 @@ public User getUserByName (String username) throws ApiException {
 
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login (required)
+   * @param password The password for login in clear text (required)
+   * @return String
+   * @throws ApiException if fails to make API call
+   */
+  public String loginUser(String username, String password) throws ApiException {
+    ApiResponse<String> localVarResponse = loginUserWithHttpInfo(username, password);
+    return localVarResponse.getData();
+  }
+
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login (required)
+   * @param password The password for login in clear text (required)
+   * @return ApiResponse&lt;String&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<String> loginUserWithHttpInfo(String username, String password) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = loginUserRequestBuilder(username, password);
     try {
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "getUserByName call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "loginUser call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<User>() {});
+      return new ApiResponse<String>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<String>() {})
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -308,22 +474,15 @@ public User getUserByName (String username) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login (required)
-   * @param password The password for login in clear text (required)
-   * @return String
-   * @throws ApiException if fails to make API call
-   */
-  public String loginUser (String username, String password) throws ApiException {
+
+  private HttpRequest.Builder loginUserRequestBuilder(String username, String password) throws ApiException {
     // verify the required parameter 'username' is set
     if (username == null) {
-        throw new ApiException(400, "Missing the required parameter 'username' when calling loginUser");
+      throw new ApiException(400, "Missing the required parameter 'username' when calling loginUser");
     }
     // verify the required parameter 'password' is set
     if (password == null) {
-        throw new ApiException(400, "Missing the required parameter 'password' when calling loginUser");
+      throw new ApiException(400, "Missing the required parameter 'password' when calling loginUser");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -344,27 +503,50 @@ public String loginUser (String username, String password) throws ApiException {
 
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Logs out current logged in user session
+   * 
+   * @throws ApiException if fails to make API call
+   */
+  public void logoutUser() throws ApiException {
+    logoutUserWithHttpInfo();
+  }
+
+  /**
+   * Logs out current logged in user session
+   * 
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> logoutUserWithHttpInfo() throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = logoutUserRequestBuilder();
     try {
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "loginUser call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "logoutUser call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
-      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<String>() {});
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -373,12 +555,8 @@ public String loginUser (String username, String password) throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Logs out current logged in user session
-   * 
-   * @throws ApiException if fails to make API call
-   */
-  public void logoutUser () throws ApiException {
+
+  private HttpRequest.Builder logoutUserRequestBuilder() throws ApiException {
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
 
@@ -388,26 +566,54 @@ public void logoutUser () throws ApiException {
 
     localVarRequestBuilder.header("Accept", "application/json");
 
+    localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
+    }
+    return localVarRequestBuilder;
+  }
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void updateUser(String username, User body) throws ApiException {
+    updateUserWithHttpInfo(username, body);
+  }
+
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public ApiResponse<Void> updateUserWithHttpInfo(String username, User body) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = updateUserRequestBuilder(username, body);
     try {
-      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
       if (memberVarResponseInterceptor != null) {
         memberVarResponseInterceptor.accept(localVarResponse);
-      }          
+      }
       if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "logoutUser call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+        throw new ApiException(localVarResponse.statusCode(),
+            "updateUser call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
       }
+      return new ApiResponse<Void>(
+          localVarResponse.statusCode(),
+          localVarResponse.headers().map(),
+          null
+        );
     } catch (IOException e) {
       throw new ApiException(e);
     }
@@ -416,21 +622,15 @@ public void logoutUser () throws ApiException {
       throw new ApiException(e);
     }
   }
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted (required)
-   * @param body Updated user object (required)
-   * @throws ApiException if fails to make API call
-   */
-  public void updateUser (String username, User body) throws ApiException {
+
+  private HttpRequest.Builder updateUserRequestBuilder(String username, User body) throws ApiException {
     // verify the required parameter 'username' is set
     if (username == null) {
-        throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser");
+      throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser");
     }
     // verify the required parameter 'body' is set
     if (body == null) {
-        throw new ApiException(400, "Missing the required parameter 'body' when calling updateUser");
+      throw new ApiException(400, "Missing the required parameter 'body' when calling updateUser");
     }
 
     HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
@@ -446,30 +646,15 @@ public void updateUser (String username, User body) throws ApiException {
     try {
       byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
       localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
-      if (memberVarReadTimeout != null) {
-        localVarRequestBuilder.timeout(memberVarReadTimeout);
-      }
-      if (memberVarInterceptor != null) {
-        memberVarInterceptor.accept(localVarRequestBuilder);
-      }
-      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
-      localVarRequestBuilder.build(),
-      HttpResponse.BodyHandlers.ofInputStream());
-      if (memberVarResponseInterceptor != null) {
-        memberVarResponseInterceptor.accept(localVarResponse);
-      }          
-      if (localVarResponse.statusCode()/ 100 != 2) {
-          throw new ApiException(localVarResponse.statusCode(),
-              "updateUser call received non-success response",
-              localVarResponse.headers(),
-              localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
-      }
     } catch (IOException e) {
       throw new ApiException(e);
     }
-    catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-      throw new ApiException(e);
+    if (memberVarReadTimeout != null) {
+      localVarRequestBuilder.timeout(memberVarReadTimeout);
+    }
+    if (memberVarInterceptor != null) {
+      memberVarInterceptor.accept(localVarRequestBuilder);
     }
+    return localVarRequestBuilder;
   }
 }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 0f1223c2bc61..f743e501e3b3 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c03535ab9471..4a63a4759873 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 4356a4f8c1eb..ad55a0a8e220 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index fa85ab77596a..0ea407ac8b43 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -43,7 +43,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   private Map<String, String> mapString = null;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 2426e7c974c4..e23d5c0d564e 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index da407ccdc473..184d3c9f6b9e 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 5e468870311e..6777cc390e49 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index ed080254966e..ac062c802998 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java
index 3bcb8a739172..05a333ff89ed 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java
@@ -35,7 +35,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 28d19953c345..33aed0c39863 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 5eeac9d8ac5d..6e9c30a19c8a 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java
index df57098053eb..7d27ffc4964f 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -34,7 +34,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   private List<String> arrayOfString = null;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BigCat.java
index c4386f4e6011..bcb573925b55 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BigCat.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index 7ce0ddb21f5a..c07d3650409f 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java
index 033e97881105..bff34dccde4b 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -34,7 +34,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   private String smallCamel;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java
index 11ce48991b06..56ed830a2174 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/CatAllOf.java
index 3e7b991436aa..97abe188ea60 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java
index 868ba8750742..aeee848682aa 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java
@@ -30,7 +30,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java
index 4de7664b26a7..c4950f02893a 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java
index 02b0aac2247a..1276ee5e36fc 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java
index f56658043689..b1042faa3b82 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DogAllOf.java
index dd42595cf202..3518ba28ec22 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java
index 86526adb3fa7..653c53874e62 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,7 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
index 51a1a645a109..c0d90a44a474 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -34,7 +34,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index cfd62fbce628..2668a5216d28 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,7 +32,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
   private java.io.File file;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
index 72ed8740e4d7..9c33da1c2d08 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -47,7 +47,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 0a3f0d464360..80ef1122ee87 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,7 +30,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java
index 3e72350aa8b1..0f9e586f10fb 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java
@@ -35,7 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 07d314691a97..8380b7d9511c 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,7 +37,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java
index dd99468a0059..d648bf27c437 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,7 +31,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 383cafdd3a5a..02df7eca78ef 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -31,7 +31,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
   private Integer code;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java
index b62e13a90a0c..fe4401430d6d 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java
index bd625c5f66f3..e1b4db38dfc1 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java
@@ -33,7 +33,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5ca72a169fe8..c1f1f3b0ffc5 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java
index ba4e395e94e9..ac6b97e17e61 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java
@@ -35,7 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java
index d4d9ac6ba110..b1b6239245be 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -32,7 +32,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   private BigDecimal myNumber;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java
index 3baccce6f9c4..5fd7d1d2b8a6 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java
@@ -40,7 +40,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b3e58ef3d2c5..fe71d78a87e3 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,7 +30,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 35ad3bf46994..1edaa88d2eb9 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java
index a3ecb398faa3..36dc2ef6ca37 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,7 +30,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index f79d7b6383a7..0fb13c190a44 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -36,7 +36,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem = "what";
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index f15b107fd18b..a9b4ef6a1e20 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -37,7 +37,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java
index b7e74643dab2..15599afa8bca 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java
@@ -36,7 +36,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/XmlItem.java
index b3fbdce31b9b..1dd697308a4e 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -60,7 +60,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   private String attributeString;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/ApiClientTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/ApiClientTest.java
deleted file mode 100644
index 976ef6916a3e..000000000000
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/ApiClientTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.openapitools.client;
-
-import org.junit.Test;
-
-import java.net.http.HttpClient;
-import java.time.Duration;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class ApiClientTest {
-
-    @Test
-    public void urlEncodeTest() {
-        String encoded = ApiClient.urlEncode("/&= $");
-        assertEquals("%2F%26%3D+%24", encoded);
-    }
-
-    @Test
-    public void parameterToPairsTest() {
-        List<Pair> l = ApiClient.parameterToPairs("$name", "some value");
-        assertEquals(1, l.size());
-        Pair p = l.get(0);
-        assertEquals("%24name", p.getName());
-        assertEquals("some+value", p.getValue());
-
-        l = ApiClient.parameterToPairs("$name", null);
-        assertTrue(l.isEmpty());
-    }
-
-    @Test
-    public void parameterToPairsCollectionTest() {
-        List<Pair> l = ApiClient.parameterToPairs(
-                "csv",
-                "$name",
-                List.of("value 1", "value 2"));
-        assertEquals(1, l.size());
-        Pair p = l.get(0);
-        assertEquals("%24name", p.getName());
-        assertEquals("value+1%2Cvalue+2", p.getValue());
-
-        l = ApiClient.parameterToPairs(
-                "multi",
-                "$name",
-                List.of("value 1", "value 2"));
-        assertEquals(2, l.size());
-        p = l.get(0);
-        assertEquals("%24name", p.getName());
-        assertEquals("value+1", p.getValue());
-        p = l.get(1);
-        assertEquals("%24name", p.getName());
-        assertEquals("value+2", p.getValue());
-
-        l = ApiClient.parameterToPairs(
-                "multi",
-                "$name",
-                List.of());
-        assertTrue(l.isEmpty());
-    }
-
-    @Test
-    public void uriOverrideTest() {
-        ApiClient apiClient = new ApiClient();
-        apiClient.setHost("test.swagger.io");
-        apiClient.setPort(9999);
-        apiClient.setBasePath("/testing");
-        String baseUri = apiClient.getBaseUri();
-        assertTrue(baseUri.endsWith("://test.swagger.io:9999/testing"));
-    }
-
-    @Test
-    public void clientConnectTimeoutTest() {
-        ApiClient apiClient = new ApiClient();
-        HttpClient client = apiClient.getHttpClient();
-        assertTrue(client.connectTimeout().isEmpty());
-
-        HttpClient.Builder builder = HttpClient.newBuilder()
-                .connectTimeout(Duration.ofSeconds(10));
-        apiClient.setHttpClientBuilder(builder);
-        client = apiClient.getHttpClient();
-        assertTrue(client.connectTimeout().isPresent());
-        assertEquals(Duration.ofSeconds(10), client.connectTimeout().get());
-    }
-}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
index 6fa396b48542..b0df7dc64cf5 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
+
 /**
  * API tests for AnotherFakeApi
  */
@@ -43,8 +44,9 @@ public class AnotherFakeApiTest {
     @Test
     public void call123testSpecialTagsTest() throws ApiException {
         Client body = null;
-        Client response = api.call123testSpecialTags(body);
-
+        Client response = 
+        api.call123testSpecialTags(body);
+        
         // TODO: test validations
     }
     
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeApiTest.java
index 67847a40b617..c98e14e9da9b 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -31,6 +31,7 @@
 import java.util.List;
 import java.util.Map;
 
+
 /**
  * API tests for FakeApi
  */
@@ -51,8 +52,9 @@ public class FakeApiTest {
     @Test
     public void createXmlItemTest() throws ApiException {
         XmlItem xmlItem = null;
+        
         api.createXmlItem(xmlItem);
-
+        
         // TODO: test validations
     }
     
@@ -67,8 +69,9 @@ public void createXmlItemTest() throws ApiException {
     @Test
     public void fakeOuterBooleanSerializeTest() throws ApiException {
         Boolean body = null;
-        Boolean response = api.fakeOuterBooleanSerialize(body);
-
+        Boolean response = 
+        api.fakeOuterBooleanSerialize(body);
+        
         // TODO: test validations
     }
     
@@ -83,8 +86,9 @@ public void fakeOuterBooleanSerializeTest() throws ApiException {
     @Test
     public void fakeOuterCompositeSerializeTest() throws ApiException {
         OuterComposite body = null;
-        OuterComposite response = api.fakeOuterCompositeSerialize(body);
-
+        OuterComposite response = 
+        api.fakeOuterCompositeSerialize(body);
+        
         // TODO: test validations
     }
     
@@ -99,8 +103,9 @@ public void fakeOuterCompositeSerializeTest() throws ApiException {
     @Test
     public void fakeOuterNumberSerializeTest() throws ApiException {
         BigDecimal body = null;
-        BigDecimal response = api.fakeOuterNumberSerialize(body);
-
+        BigDecimal response = 
+        api.fakeOuterNumberSerialize(body);
+        
         // TODO: test validations
     }
     
@@ -115,8 +120,9 @@ public void fakeOuterNumberSerializeTest() throws ApiException {
     @Test
     public void fakeOuterStringSerializeTest() throws ApiException {
         String body = null;
-        String response = api.fakeOuterStringSerialize(body);
-
+        String response = 
+        api.fakeOuterStringSerialize(body);
+        
         // TODO: test validations
     }
     
@@ -131,8 +137,9 @@ public void fakeOuterStringSerializeTest() throws ApiException {
     @Test
     public void testBodyWithFileSchemaTest() throws ApiException {
         FileSchemaTestClass body = null;
+        
         api.testBodyWithFileSchema(body);
-
+        
         // TODO: test validations
     }
     
@@ -148,8 +155,9 @@ public void testBodyWithFileSchemaTest() throws ApiException {
     public void testBodyWithQueryParamsTest() throws ApiException {
         String query = null;
         User body = null;
+        
         api.testBodyWithQueryParams(query, body);
-
+        
         // TODO: test validations
     }
     
@@ -164,15 +172,16 @@ public void testBodyWithQueryParamsTest() throws ApiException {
     @Test
     public void testClientModelTest() throws ApiException {
         Client body = null;
-        Client response = api.testClientModel(body);
-
+        Client response = 
+        api.testClientModel(body);
+        
         // TODO: test validations
     }
     
     /**
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      *
      * @throws ApiException
      *          if the Api call fails
@@ -193,8 +202,9 @@ public void testEndpointParametersTest() throws ApiException {
         OffsetDateTime dateTime = null;
         String password = null;
         String paramCallback = null;
+        
         api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
-
+        
         // TODO: test validations
     }
     
@@ -216,8 +226,9 @@ public void testEnumParametersTest() throws ApiException {
         Double enumQueryDouble = null;
         List<String> enumFormStringArray = null;
         String enumFormString = null;
+        
         api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
-
+        
         // TODO: test validations
     }
     
@@ -237,7 +248,17 @@ public void testGroupParametersTest() throws ApiException {
         Integer stringGroup = null;
         Boolean booleanGroup = null;
         Long int64Group = null;
-        api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+        
+        FakeApi.APItestGroupParametersRequest request = FakeApi.APItestGroupParametersRequest.newBuilder()
+          .requiredStringGroup(requiredStringGroup)
+          .requiredBooleanGroup(requiredBooleanGroup)
+          .requiredInt64Group(requiredInt64Group)
+          .stringGroup(stringGroup)
+          .booleanGroup(booleanGroup)
+          .int64Group(int64Group)
+          .build();
+        
+        api.testGroupParameters(request);
 
         // TODO: test validations
     }
@@ -253,8 +274,9 @@ public void testGroupParametersTest() throws ApiException {
     @Test
     public void testInlineAdditionalPropertiesTest() throws ApiException {
         Map<String, String> param = null;
+        
         api.testInlineAdditionalProperties(param);
-
+        
         // TODO: test validations
     }
     
@@ -270,8 +292,30 @@ public void testInlineAdditionalPropertiesTest() throws ApiException {
     public void testJsonFormDataTest() throws ApiException {
         String param = null;
         String param2 = null;
+        
         api.testJsonFormData(param, param2);
-
+        
+        // TODO: test validations
+    }
+    
+    /**
+     * 
+     *
+     * To test the collection format in query parameters
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void testQueryParameterCollectionFormatTest() throws ApiException {
+        List<String> pipe = null;
+        List<String> ioutil = null;
+        List<String> http = null;
+        List<String> url = null;
+        List<String> context = null;
+        
+        api.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
+        
         // TODO: test validations
     }
     
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
index 96f3b24e18bb..fec12340b521 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
+
 /**
  * API tests for FakeClassnameTags123Api
  */
@@ -43,8 +44,9 @@ public class FakeClassnameTags123ApiTest {
     @Test
     public void testClassnameTest() throws ApiException {
         Client body = null;
-        Client response = api.testClassname(body);
-
+        Client response = 
+        api.testClassname(body);
+        
         // TODO: test validations
     }
     
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/PetApiTest.java
index 0be54dcc1b68..593db3557482 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -17,6 +17,7 @@
 import java.io.File;
 import org.openapitools.client.model.ModelApiResponse;
 import org.openapitools.client.model.Pet;
+import java.util.Set;
 import org.junit.Test;
 import org.junit.Ignore;
 
@@ -24,7 +25,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+
 
 /**
  * API tests for PetApi
@@ -46,8 +47,9 @@ public class PetApiTest {
     @Test
     public void addPetTest() throws ApiException {
         Pet body = null;
+        
         api.addPet(body);
-
+        
         // TODO: test validations
     }
     
@@ -63,8 +65,9 @@ public void addPetTest() throws ApiException {
     public void deletePetTest() throws ApiException {
         Long petId = null;
         String apiKey = null;
+        
         api.deletePet(petId, apiKey);
-
+        
         // TODO: test validations
     }
     
@@ -79,8 +82,9 @@ public void deletePetTest() throws ApiException {
     @Test
     public void findPetsByStatusTest() throws ApiException {
         List<String> status = null;
-        List<Pet> response = api.findPetsByStatus(status);
-
+        List<Pet> response = 
+        api.findPetsByStatus(status);
+        
         // TODO: test validations
     }
     
@@ -95,8 +99,9 @@ public void findPetsByStatusTest() throws ApiException {
     @Test
     public void findPetsByTagsTest() throws ApiException {
         Set<String> tags = null;
-        Set<Pet> response = api.findPetsByTags(tags);
-
+        Set<Pet> response = 
+        api.findPetsByTags(tags);
+        
         // TODO: test validations
     }
     
@@ -111,8 +116,9 @@ public void findPetsByTagsTest() throws ApiException {
     @Test
     public void getPetByIdTest() throws ApiException {
         Long petId = null;
-        Pet response = api.getPetById(petId);
-
+        Pet response = 
+        api.getPetById(petId);
+        
         // TODO: test validations
     }
     
@@ -127,8 +133,9 @@ public void getPetByIdTest() throws ApiException {
     @Test
     public void updatePetTest() throws ApiException {
         Pet body = null;
+        
         api.updatePet(body);
-
+        
         // TODO: test validations
     }
     
@@ -145,8 +152,9 @@ public void updatePetWithFormTest() throws ApiException {
         Long petId = null;
         String name = null;
         String status = null;
+        
         api.updatePetWithForm(petId, name, status);
-
+        
         // TODO: test validations
     }
     
@@ -163,8 +171,9 @@ public void uploadFileTest() throws ApiException {
         Long petId = null;
         String additionalMetadata = null;
         File file = null;
-        ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
-
+        ModelApiResponse response = 
+        api.uploadFile(petId, additionalMetadata, file);
+        
         // TODO: test validations
     }
     
@@ -181,8 +190,9 @@ public void uploadFileWithRequiredFileTest() throws ApiException {
         Long petId = null;
         File requiredFile = null;
         String additionalMetadata = null;
-        ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
-
+        ModelApiResponse response = 
+        api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+        
         // TODO: test validations
     }
     
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 4aa80d6f0a39..06b18c88b211 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
+
 /**
  * API tests for StoreApi
  */
@@ -43,8 +44,9 @@ public class StoreApiTest {
     @Test
     public void deleteOrderTest() throws ApiException {
         String orderId = null;
+        
         api.deleteOrder(orderId);
-
+        
         // TODO: test validations
     }
     
@@ -58,8 +60,9 @@ public void deleteOrderTest() throws ApiException {
      */
     @Test
     public void getInventoryTest() throws ApiException {
-        Map<String, Integer> response = api.getInventory();
-
+        Map<String, Integer> response = 
+        api.getInventory();
+        
         // TODO: test validations
     }
     
@@ -74,8 +77,9 @@ public void getInventoryTest() throws ApiException {
     @Test
     public void getOrderByIdTest() throws ApiException {
         Long orderId = null;
-        Order response = api.getOrderById(orderId);
-
+        Order response = 
+        api.getOrderById(orderId);
+        
         // TODO: test validations
     }
     
@@ -90,8 +94,9 @@ public void getOrderByIdTest() throws ApiException {
     @Test
     public void placeOrderTest() throws ApiException {
         Order body = null;
-        Order response = api.placeOrder(body);
-
+        Order response = 
+        api.placeOrder(body);
+        
         // TODO: test validations
     }
     
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/UserApiTest.java
index c2feab9aea41..16daf27c9d6a 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/UserApiTest.java
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
+
 /**
  * API tests for UserApi
  */
@@ -43,8 +44,9 @@ public class UserApiTest {
     @Test
     public void createUserTest() throws ApiException {
         User body = null;
+        
         api.createUser(body);
-
+        
         // TODO: test validations
     }
     
@@ -59,8 +61,9 @@ public void createUserTest() throws ApiException {
     @Test
     public void createUsersWithArrayInputTest() throws ApiException {
         List<User> body = null;
+        
         api.createUsersWithArrayInput(body);
-
+        
         // TODO: test validations
     }
     
@@ -75,8 +78,9 @@ public void createUsersWithArrayInputTest() throws ApiException {
     @Test
     public void createUsersWithListInputTest() throws ApiException {
         List<User> body = null;
+        
         api.createUsersWithListInput(body);
-
+        
         // TODO: test validations
     }
     
@@ -91,8 +95,9 @@ public void createUsersWithListInputTest() throws ApiException {
     @Test
     public void deleteUserTest() throws ApiException {
         String username = null;
+        
         api.deleteUser(username);
-
+        
         // TODO: test validations
     }
     
@@ -107,8 +112,9 @@ public void deleteUserTest() throws ApiException {
     @Test
     public void getUserByNameTest() throws ApiException {
         String username = null;
-        User response = api.getUserByName(username);
-
+        User response = 
+        api.getUserByName(username);
+        
         // TODO: test validations
     }
     
@@ -124,8 +130,9 @@ public void getUserByNameTest() throws ApiException {
     public void loginUserTest() throws ApiException {
         String username = null;
         String password = null;
-        String response = api.loginUser(username, password);
-
+        String response = 
+        api.loginUser(username, password);
+        
         // TODO: test validations
     }
     
@@ -139,8 +146,9 @@ public void loginUserTest() throws ApiException {
      */
     @Test
     public void logoutUserTest() throws ApiException {
+        
         api.logoutUser();
-
+        
         // TODO: test validations
     }
     
@@ -156,8 +164,9 @@ public void logoutUserTest() throws ApiException {
     public void updateUserTest() throws ApiException {
         String username = null;
         User body = null;
+        
         api.updateUser(username, body);
-
+        
         // TODO: test validations
     }
     
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
index 7f17caef95d1..ec44af783873 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
index 4f90e42398e3..ceb024c5620b 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
index 2136768d35c5..517e5a10ae43 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
index c16a83b37c98..2e3844ba9756 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
index ff1f5bf73dcd..66a7b85623e3 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
index 64e1b7998556..4e03485a4484 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
index 3a7be8304c05..e0c72c586347 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
index b434bc16ee37..c84d987e7640 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AnimalTest.java
index 288f496c1956..7e79e5ca7b3f 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AnimalTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AnimalTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
@@ -20,6 +21,9 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.BigCat;
+import org.openapitools.client.model.Cat;
+import org.openapitools.client.model.Dog;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
index 70f2cb25d43b..e25187a3b608 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
index 8621c69bf3d5..ae1061823991 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayTestTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayTestTest.java
index 38f8f6a72b67..36bd9951cf60 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayTestTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayTestTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/BigCatTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/BigCatTest.java
index 006c80707427..b3afa31d2894 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/BigCatTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/BigCatTest.java
@@ -16,6 +16,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CapitalizationTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CapitalizationTest.java
index 077001565e7a..a701b341fc59 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CapitalizationTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CapitalizationTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatAllOfTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatAllOfTest.java
index 989e4c8d14b3..1d85a0447253 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatAllOfTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatAllOfTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatTest.java
index 91bf0ba87a9f..d0952b501004 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatTest.java
@@ -13,12 +13,16 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.BigCat;
 import org.openapitools.client.model.CatAllOf;
 import org.junit.Assert;
 import org.junit.Ignore;
@@ -55,4 +59,12 @@ public void colorTest() {
         // TODO: test color
     }
 
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
 }
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CategoryTest.java
index e3b82ec76f36..6027994a2ac3 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CategoryTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CategoryTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClassModelTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClassModelTest.java
index a6ab71b54661..8914c9cad43d 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClassModelTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClassModelTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClientTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClientTest.java
index 09b37202e165..c21b346272d7 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClientTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClientTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogAllOfTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogAllOfTest.java
index 4ddd0d5c8c15..6e4b49108098 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogAllOfTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogAllOfTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogTest.java
index 9c1bc2e3b316..3446815a300a 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogTest.java
@@ -13,8 +13,11 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -55,4 +58,12 @@ public void colorTest() {
         // TODO: test color
     }
 
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
 }
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumArraysTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumArraysTest.java
index d6be9e0d845c..45b8fbbd8220 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumArraysTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumArraysTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumTestTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumTestTest.java
index 278f13d1511e..04e7afb19784 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumTestTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumTestTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
index b62c3d1c0d41..ef37e666be39 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FormatTestTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FormatTestTest.java
index a82c13f333b7..73a1f737503f 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FormatTestTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FormatTestTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -146,4 +147,12 @@ public void passwordTest() {
         // TODO: test password
     }
 
+    /**
+     * Test the property 'bigDecimal'
+     */
+    @Test
+    public void bigDecimalTest() {
+        // TODO: test bigDecimal
+    }
+
 }
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
index 8adce96ff9c9..e902c100383b 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MapTestTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MapTestTest.java
index 25bcac7b9854..a0c991bb7588 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MapTestTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MapTestTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
index 0f0d56b2a956..630b566f54db 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/Model200ResponseTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
index 40cdb83d4f3c..82c7208079db 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
index e24e3fe8b8c3..97a1287aa413 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelReturnTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelReturnTest.java
index 64df63c9b4ad..f884519ebc86 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelReturnTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelReturnTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NameTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NameTest.java
index 906587a014da..cb3a94cf74ab 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NameTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NameTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NumberOnlyTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
index 25a6f85213bb..f4fbd5ee8b42 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OrderTest.java
index 229a851a4ade..da63441c6597 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OrderTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OuterCompositeTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
index 6e37732d5f89..ebea3ca304c0 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/PetTest.java
index 82c72033b550..4065f7ca1a46 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/PetTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/PetTest.java
@@ -13,13 +13,16 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
 import org.junit.Assert;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
index 8ba8d2415130..b82a7d0ef561 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
index 4cd639541b87..d5a19c371e68 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TagTest.java
index 8732cce6b049..5c2cc6f49e05 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TagTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TagTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
index 38672c891f68..e96ac744439d 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
index d2527ff622f8..56641d163a50 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -56,6 +57,14 @@ public void numberItemTest() {
         // TODO: test numberItem
     }
 
+    /**
+     * Test the property 'floatItem'
+     */
+    @Test
+    public void floatItemTest() {
+        // TODO: test floatItem
+    }
+
     /**
      * Test the property 'integerItem'
      */
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/UserTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/UserTest.java
index 6aa343941c5b..ce40d3a2a637 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/UserTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/UserTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/XmlItemTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/XmlItemTest.java
index dfe5d66d9996..501c414555f4 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/XmlItemTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/XmlItemTest.java
@@ -13,6 +13,7 @@
 
 package org.openapitools.client.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
index 9eea35b5b5b3..9e214253cff9 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
@@ -107,6 +107,7 @@ dependencies {
     compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
     compile 'org.threeten:threetenbp:1.4.3'
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile 'junit:junit:4.13'
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt
index 62105ba95b41..b516c93647a8 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt
@@ -19,6 +19,7 @@ lazy val root = (project in file(".")).
       "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
       "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
index 381f74cf7ae1..36ca4e1143bc 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
@@ -267,6 +267,7 @@
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
             <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
         </dependency>
         <!-- test dependencies -->
         <dependency>
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java
index b4072319ad5e..bc4e2bdbe0a0 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java
@@ -97,6 +97,23 @@ public ApiClient() {
         authentications = Collections.unmodifiableMap(authentications);
     }
 
+    /*
+     * Basic constructor with custom OkHttpClient
+     */
+    public ApiClient(OkHttpClient client) {
+        init();
+
+        httpClient = client;
+
+        // Setup authentications (key: authentication name, value: authentication).
+        authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+        authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
+        authentications.put("http_basic_test", new HttpBasicAuth());
+        authentications.put("petstore_auth", new OAuth());
+        // Prevent the authentications from being modified.
+        authentications = Collections.unmodifiableMap(authentications);
+    }
+
     /*
      * Constructor for ApiClient to support access token retry on 401/403 configured with client ID
      */
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiException.java
index 6c91e35f27a9..c814fc5bbc9c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiException.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiException.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/Configuration.java
index acbecda489dd..476456fd4ed6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/Configuration.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/Configuration.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/Pair.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/Pair.java
index ae89aa614543..8352d84046a7 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/Pair.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/Pair.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/StringUtil.java
index 747a23f5bf23..4dc60597910a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/StringUtil.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
index a9427105d811..8e03da2a6791 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
index e20259cb94ca..e9d4c678963a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/OAuth.java
index 779680c9b2f9..0f145f8b23c5 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/OAuth.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 799f4f299194..c22e6c5bed8b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,7 +31,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 3a4f7f534076..4ad54a802b6a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,7 +32,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 8c12d0836db0..707f8ebf811e 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,7 +31,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 4d1400b1d913..8e747c6291fc 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -33,7 +33,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass implements Parcelable {
   public static final String SERIALIZED_NAME_MAP_STRING = "map_string";
   @SerializedName(SERIALIZED_NAME_MAP_STRING)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 815a9c698278..c20398682750 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,7 +31,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index d73cfe4f44b6..bed5bcc2d91d 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,7 +32,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 14736d319ab0..bf0b4b18014f 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,7 +31,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index c10de0fa03d4..e9fb5b564b8b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,7 +31,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
index 450ca836944f..3b22feec80ab 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
@@ -32,7 +32,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Animal implements Parcelable {
   public static final String SERIALIZED_NAME_CLASS_NAME = "className";
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 3237410a4e6d..0b93238de8cd 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly implements Parcelable {
   public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 3c66930c8746..498c729ce402 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly implements Parcelable {
   public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber";
   @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java
index e5b6e8595ec3..471b25c8f457 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -32,7 +32,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest implements Parcelable {
   public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string";
   @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java
index 6c47dc583d07..0c66b503caf4 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java
@@ -31,7 +31,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class BigCat extends Cat implements Parcelable {
   /**
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index 1cc92cea52c8..1c6286cdbeae 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -29,7 +29,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf implements Parcelable {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
index 2caf50a6a0b3..fa12ca287708 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -29,7 +29,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization implements Parcelable {
   public static final String SERIALIZED_NAME_SMALL_CAMEL = "smallCamel";
   @SerializedName(SERIALIZED_NAME_SMALL_CAMEL)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
index f060aebc4db6..aa2fe6568c4f 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
@@ -32,7 +32,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Cat extends Animal implements Parcelable {
   public static final String SERIALIZED_NAME_DECLAWED = "declawed";
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java
index 90ebd33eb90b..2af217eca4c8 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -29,7 +29,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf implements Parcelable {
   public static final String SERIALIZED_NAME_DECLAWED = "declawed";
   @SerializedName(SERIALIZED_NAME_DECLAWED)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
index 7341142e952d..668b890ab94b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
@@ -29,7 +29,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category implements Parcelable {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
index 1d174752b7a7..7283b73b70e6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -30,7 +30,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel implements Parcelable {
   public static final String SERIALIZED_NAME_PROPERTY_CLASS = "_class";
   @SerializedName(SERIALIZED_NAME_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
index 431d26464740..43a4fa663072 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
@@ -29,7 +29,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client implements Parcelable {
   public static final String SERIALIZED_NAME_CLIENT = "client";
   @SerializedName(SERIALIZED_NAME_CLIENT)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
index a3309d426a75..c8322b246b8b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
@@ -31,7 +31,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Dog extends Animal implements Parcelable {
   public static final String SERIALIZED_NAME_BREED = "breed";
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java
index 52fe86324020..ccf2b9d7cf6f 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -29,7 +29,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf implements Parcelable {
   public static final String SERIALIZED_NAME_BREED = "breed";
   @SerializedName(SERIALIZED_NAME_BREED)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
index f3b128fd1394..c54cc775f2ec 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -31,7 +31,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays implements Parcelable {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
index 8fb43919154f..ec8f394f2388 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -30,7 +30,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest implements Parcelable {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 7f37b4693f9b..0a0db633dd93 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -31,7 +31,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass implements Parcelable {
   public static final String SERIALIZED_NAME_FILE = "file";
   @SerializedName(SERIALIZED_NAME_FILE)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
index c83b12623e95..861317683b50 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -34,7 +34,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest implements Parcelable {
   public static final String SERIALIZED_NAME_INTEGER = "integer";
   @SerializedName(SERIALIZED_NAME_INTEGER)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index fc314c0a03fc..455547401162 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -29,7 +29,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly implements Parcelable {
   public static final String SERIALIZED_NAME_BAR = "bar";
   @SerializedName(SERIALIZED_NAME_BAR)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
index a7f7e92e23ba..3f5d24725df7 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
@@ -32,7 +32,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest implements Parcelable {
   public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string";
   @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index a4e55b7778d5..09d8f06208d0 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -35,7 +35,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
index ce610fd1e668..8b9ca3e70937 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -30,7 +30,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index c3f8d98fcdd5..1aff89f0adea 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -29,7 +29,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse implements Parcelable {
   public static final String SERIALIZED_NAME_CODE = "code";
   @SerializedName(SERIALIZED_NAME_CODE)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
index 6ee19d9bef8f..c7a93aa332f0 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -30,7 +30,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn implements Parcelable {
   public static final String SERIALIZED_NAME_RETURN = "return";
   @SerializedName(SERIALIZED_NAME_RETURN)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
index 442cbb10ee1c..d1628712f1f0 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
@@ -30,7 +30,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
index 4544fcf3a15e..573a52a2969b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -30,7 +30,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly implements Parcelable {
   public static final String SERIALIZED_NAME_JUST_NUMBER = "JustNumber";
   @SerializedName(SERIALIZED_NAME_JUST_NUMBER)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
index 1c970568b064..961f73435634 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
@@ -30,7 +30,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order implements Parcelable {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
index 524143206b94..321f6d82b1ce 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -30,7 +30,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite implements Parcelable {
   public static final String SERIALIZED_NAME_MY_NUMBER = "my_number";
   @SerializedName(SERIALIZED_NAME_MY_NUMBER)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
index 01ddfa84b9f8..75b65d97aa1f 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
@@ -35,7 +35,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet implements Parcelable {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 806d54baf975..ccd60cea1e6a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -29,7 +29,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst implements Parcelable {
   public static final String SERIALIZED_NAME_BAR = "bar";
   @SerializedName(SERIALIZED_NAME_BAR)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 8ac528e97f24..43338b3897ca 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -29,7 +29,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName implements Parcelable {
   public static final String SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   @SerializedName(SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
index 0ad73ddbe564..faecf9304dd4 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
@@ -29,7 +29,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag implements Parcelable {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 02cc27459544..b5af762726cf 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -32,7 +32,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault implements Parcelable {
   public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
   @SerializedName(SERIALIZED_NAME_STRING_ITEM)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 8f03c4f5bc9c..5e63c18816f3 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -32,7 +32,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample implements Parcelable {
   public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
   @SerializedName(SERIALIZED_NAME_STRING_ITEM)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
index db7bb59bd13f..8b1309aff3d6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
@@ -29,7 +29,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User implements Parcelable {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java
index c07f900734c4..7dcfd549dfab 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -32,7 +32,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem implements Parcelable {
   public static final String SERIALIZED_NAME_ATTRIBUTE_STRING = "attribute_string";
   @SerializedName(SERIALIZED_NAME_ATTRIBUTE_STRING)
diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle
index d28df6958d1a..575c787183fb 100644
--- a/samples/client/petstore/java/okhttp-gson/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson/build.gradle
@@ -107,6 +107,7 @@ dependencies {
     compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
     compile 'org.threeten:threetenbp:1.4.3'
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile 'junit:junit:4.13'
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/build.sbt b/samples/client/petstore/java/okhttp-gson/build.sbt
index 76cc798c0634..8320c6d4c4db 100644
--- a/samples/client/petstore/java/okhttp-gson/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson/build.sbt
@@ -19,6 +19,7 @@ lazy val root = (project in file(".")).
       "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
       "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
index 31e833313527..54e8d3a2d5c1 100644
--- a/samples/client/petstore/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -260,6 +260,7 @@
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
             <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
         </dependency>
         <!-- test dependencies -->
         <dependency>
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java
index b4072319ad5e..bc4e2bdbe0a0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java
@@ -97,6 +97,23 @@ public ApiClient() {
         authentications = Collections.unmodifiableMap(authentications);
     }
 
+    /*
+     * Basic constructor with custom OkHttpClient
+     */
+    public ApiClient(OkHttpClient client) {
+        init();
+
+        httpClient = client;
+
+        // Setup authentications (key: authentication name, value: authentication).
+        authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+        authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
+        authentications.put("http_basic_test", new HttpBasicAuth());
+        authentications.put("petstore_auth", new OAuth());
+        // Prevent the authentications from being modified.
+        authentications = Collections.unmodifiableMap(authentications);
+    }
+
     /*
      * Constructor for ApiClient to support access token retry on 401/403 configured with client ID
      */
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java
index 6c91e35f27a9..c814fc5bbc9c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java
index acbecda489dd..476456fd4ed6 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/Pair.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/Pair.java
index ae89aa614543..8352d84046a7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/Pair.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/Pair.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/StringUtil.java
index 747a23f5bf23..4dc60597910a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/StringUtil.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
index a9427105d811..8e03da2a6791 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
index e20259cb94ca..e9d4c678963a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/OAuth.java
index 779680c9b2f9..0f145f8b23c5 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/OAuth.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 79c169543fde..43c6885f374f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index e16ee861f893..f71f19e32f5f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -30,7 +30,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 29161b52aa16..d748b6c1c7e9 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index a067b01ec979..5dcdb50233e2 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -31,7 +31,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_MAP_STRING = "map_string";
   @SerializedName(SERIALIZED_NAME_MAP_STRING)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 3a15ed7cd977..d2c4b0ef322c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 9bc46e099916..fe1b89b67e42 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -30,7 +30,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index bd65f7791c5e..8690d66d3462 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index cdb8afedaaf4..5bd295794e93 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java
index 4d3bf2369fb6..00548e65fa3b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java
@@ -30,7 +30,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Animal {
   public static final String SERIALIZED_NAME_CLASS_NAME = "className";
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index a6dd760660d5..0a4f98a0b627 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -30,7 +30,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 487c539d3bac..5f87c4ddef1a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -30,7 +30,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber";
   @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7d66ce233feb..ff780811ba1f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -30,7 +30,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string";
   @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BigCat.java
index d30cc70c0cf4..186ea74bbac1 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BigCat.java
@@ -29,7 +29,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class BigCat extends Cat {
   /**
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index cd2207704bd1..7a5439270613 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -27,7 +27,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
index d4fbec81c543..c68dbeb2a423 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -27,7 +27,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String SERIALIZED_NAME_SMALL_CAMEL = "smallCamel";
   @SerializedName(SERIALIZED_NAME_SMALL_CAMEL)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
index 058f627b4141..560bebcb7bb6 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
@@ -30,7 +30,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Cat extends Animal {
   public static final String SERIALIZED_NAME_DECLAWED = "declawed";
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java
index dcd1a8e3b90e..a88c5a44b663 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -27,7 +27,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String SERIALIZED_NAME_DECLAWED = "declawed";
   @SerializedName(SERIALIZED_NAME_DECLAWED)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
index 4d07c3a1bef1..558a67073120 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
@@ -27,7 +27,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
index 8867bdd06bf0..41190d85a1eb 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -28,7 +28,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String SERIALIZED_NAME_PROPERTY_CLASS = "_class";
   @SerializedName(SERIALIZED_NAME_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
index 25831260e09b..c4baca1e73d7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
@@ -27,7 +27,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String SERIALIZED_NAME_CLIENT = "client";
   @SerializedName(SERIALIZED_NAME_CLIENT)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
index f80bc1ab8dcd..49df272d86ed 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
@@ -29,7 +29,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Dog extends Animal {
   public static final String SERIALIZED_NAME_BREED = "breed";
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java
index b945c2c33db4..134c87b2e9b4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -27,7 +27,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String SERIALIZED_NAME_BREED = "breed";
   @SerializedName(SERIALIZED_NAME_BREED)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
index 2512b4cf9d52..b1aba3f4e68d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -29,7 +29,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
index ccbbabaa9ba5..a25f521079b8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -28,7 +28,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index f4a15cd5b7fd..908312827464 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -29,7 +29,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String SERIALIZED_NAME_FILE = "file";
   @SerializedName(SERIALIZED_NAME_FILE)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
index 5983420c81b1..ff862108132a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -32,7 +32,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String SERIALIZED_NAME_INTEGER = "integer";
   @SerializedName(SERIALIZED_NAME_INTEGER)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 8fcb26846436..0a4bdb4671ab 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -27,7 +27,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String SERIALIZED_NAME_BAR = "bar";
   @SerializedName(SERIALIZED_NAME_BAR)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
index 7dc68b0ff00f..280d523ea933 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
@@ -30,7 +30,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string";
   @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 527853d7522c..ea4ebddd037d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -33,7 +33,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
index df3683dac78d..8a7a5ee5aad0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -28,7 +28,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index b9cf72823b2f..92181899c1ae 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -27,7 +27,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String SERIALIZED_NAME_CODE = "code";
   @SerializedName(SERIALIZED_NAME_CODE)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
index 6e9714df977d..d740c15becd1 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -28,7 +28,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String SERIALIZED_NAME_RETURN = "return";
   @SerializedName(SERIALIZED_NAME_RETURN)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
index 94117a9b0f4b..879a6337cebc 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
@@ -28,7 +28,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
index 9a55d8aa615f..50981eb598e1 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -28,7 +28,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String SERIALIZED_NAME_JUST_NUMBER = "JustNumber";
   @SerializedName(SERIALIZED_NAME_JUST_NUMBER)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
index 33d57e18bee5..847d9d8a5636 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
@@ -28,7 +28,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
index 1efe43b234b5..bd38e7946d50 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -28,7 +28,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String SERIALIZED_NAME_MY_NUMBER = "my_number";
   @SerializedName(SERIALIZED_NAME_MY_NUMBER)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
index 4ea18b217b6e..6d5855842591 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
@@ -33,7 +33,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index ed0244a3ca27..991726d89632 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -27,7 +27,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String SERIALIZED_NAME_BAR = "bar";
   @SerializedName(SERIALIZED_NAME_BAR)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 3405d30ff614..9e64e21d5856 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -27,7 +27,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   @SerializedName(SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
index 710e0fe54a4e..259f762b292d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
@@ -27,7 +27,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 978cdb6f78db..f3fdb3b0196d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -30,7 +30,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
   @SerializedName(SERIALIZED_NAME_STRING_ITEM)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 878b1540ee7f..f72745a6b0ba 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -30,7 +30,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
   @SerializedName(SERIALIZED_NAME_STRING_ITEM)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
index d91115317819..349a04836d16 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
@@ -27,7 +27,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/XmlItem.java
index ecfd0be1b31a..ae1d289ac2c3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -30,7 +30,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String SERIALIZED_NAME_ATTRIBUTE_STRING = "attribute_string";
   @SerializedName(SERIALIZED_NAME_ATTRIBUTE_STRING)
diff --git a/samples/client/petstore/java/rest-assured-jackson/build.gradle b/samples/client/petstore/java/rest-assured-jackson/build.gradle
index ca4ac63c3ec8..db16163d6f45 100644
--- a/samples/client/petstore/java/rest-assured-jackson/build.gradle
+++ b/samples/client/petstore/java/rest-assured-jackson/build.gradle
@@ -117,5 +117,6 @@ dependencies {
     compile "com.squareup.okio:okio:$okio_version"
     compile "javax.validation:validation-api:2.0.1.Final"
     compile "org.hibernate:hibernate-validator:6.0.19.Final"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/rest-assured-jackson/build.sbt b/samples/client/petstore/java/rest-assured-jackson/build.sbt
index 8f167f16a2f3..18d29bef0574 100644
--- a/samples/client/petstore/java/rest-assured-jackson/build.sbt
+++ b/samples/client/petstore/java/rest-assured-jackson/build.sbt
@@ -21,6 +21,7 @@ lazy val root = (project in file(".")).
       "com.squareup.okio" % "okio" % "1.17.5" % "compile",
       "javax.validation" % "validation-api" % "2.0.1.Final" % "compile",
       "org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile",
+	"javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/samples/client/petstore/java/rest-assured-jackson/pom.xml b/samples/client/petstore/java/rest-assured-jackson/pom.xml
index 3666b630e03a..7cd72558289c 100644
--- a/samples/client/petstore/java/rest-assured-jackson/pom.xml
+++ b/samples/client/petstore/java/rest-assured-jackson/pom.xml
@@ -146,6 +146,7 @@
                 <version>3.2.0</version>
                 <configuration>
                     <doclint>none</doclint>
+                    <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -220,6 +221,12 @@
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
@@ -281,6 +288,7 @@
         <gson-fire-version>1.8.4</gson-fire-version>
         <jackson-version>2.10.3</jackson-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <okio-version>1.17.5</okio-version>
         <junit-version>4.13</junit-version>
     </properties>
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index b91c7f4883bf..8cf0a4e0413e 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index ad5c7d888d6b..0c6f5077a312 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -35,7 +35,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 9c451e212ef7..d02d6f8c23c4 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 803715a970f3..5bac1897d347 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -46,7 +46,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   private Map<String, String> mapString = null;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 5eb0c6ca44e1..5e5580a12e6b 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 7718b35dd3c9..2cfed6ac8bbb 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -35,7 +35,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 1e084af46792..7238c48b8fbf 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 0b6ba05845b5..f65278c1a311 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java
index 72ba4a50d663..41e012a41129 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java
@@ -38,7 +38,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 96271e5a2fc4..203c75204621 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -35,7 +35,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 3a2e55170eea..336304cead20 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -35,7 +35,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java
index efe1b01d6b1f..99eada4081e3 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -37,7 +37,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   private List<String> arrayOfString = null;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java
index be1b1956406e..973d491c3bea 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java
@@ -36,7 +36,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index d9cac42b3c78..e68e97722a7d 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java
index 0ecd3a8f024d..14d9ce97c200 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -37,7 +37,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   private String smallCamel;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java
index ebf23e6633fe..b116b5e974f8 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java
@@ -37,7 +37,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/CatAllOf.java
index da2d6fdf3596..5650a931312e 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java
index 9b6db321395e..8ae56f05c48e 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java
@@ -33,7 +33,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java
index e7765bbe8de0..0eb3e1f23bdf 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java
index d730df42e2c2..e462014e13e7 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java
index cfb399eb77e0..80bdd178d51a 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java
@@ -36,7 +36,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/DogAllOf.java
index e916e73f4a72..de709714cbdf 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java
index a3e3abfd2cb3..517660f43993 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -35,7 +35,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
index 6294398ba8c2..63d5d87e8680 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -37,7 +37,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 7a00e4c6f72e..f5c01e0219f3 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -35,7 +35,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
   private java.io.File file;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java
index ea151142c168..09509ff968dc 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -50,7 +50,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 2dfd47631254..edac175cf958 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -33,7 +33,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java
index 91db4d7aec98..47dc047540c3 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java
@@ -38,7 +38,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index a13f416e3526..46139bf7b765 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -40,7 +40,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java
index e45ce82249c8..068a2bd58331 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -34,7 +34,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 0ef2a65b14f4..2a37a359031e 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -34,7 +34,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
   private Integer code;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java
index f8114f259c8a..2cc1987d61cb 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java
index bd6824582a09..becd9effdaed 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java
@@ -36,7 +36,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java
index 762257cc27f0..6fc7af18563c 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java
index ba36ae033451..380b84fb362d 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java
@@ -38,7 +38,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java
index cc608363ef1b..8982b96fe054 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -35,7 +35,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   private BigDecimal myNumber;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java
index 377dc444cf62..0e73f80db074 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java
@@ -43,7 +43,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index e09c5fb1779f..8ba3f38db051 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -33,7 +33,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java
index b52f4293aa9a..651ec0840fb7 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java
index 5ee4236adb10..0a3bbc2c4c43 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java
@@ -33,7 +33,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 4a024c4ae814..7bd1b0395ce1 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -39,7 +39,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem = "what";
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index bd0ba57eac0d..dcb7af07b8cd 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -40,7 +40,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java
index 33ed7c7c3ab7..b31896ad197a 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java
@@ -39,7 +39,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java
index 64aeb37138a4..6eb813fea4b2 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -63,7 +63,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   private String attributeString;
diff --git a/samples/client/petstore/java/rest-assured/build.gradle b/samples/client/petstore/java/rest-assured/build.gradle
index 44bbfcbb5722..9c64c31fc922 100644
--- a/samples/client/petstore/java/rest-assured/build.gradle
+++ b/samples/client/petstore/java/rest-assured/build.gradle
@@ -114,5 +114,6 @@ dependencies {
     compile "com.squareup.okio:okio:$okio_version"
     compile "javax.validation:validation-api:2.0.1.Final"
     compile "org.hibernate:hibernate-validator:6.0.19.Final"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/rest-assured/build.sbt b/samples/client/petstore/java/rest-assured/build.sbt
index e56cbf759bf8..85cb4c005fa1 100644
--- a/samples/client/petstore/java/rest-assured/build.sbt
+++ b/samples/client/petstore/java/rest-assured/build.sbt
@@ -19,6 +19,7 @@ lazy val root = (project in file(".")).
       "com.squareup.okio" % "okio" % "1.17.5" % "compile",
       "javax.validation" % "validation-api" % "2.0.1.Final" % "compile",
       "org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile",
+	"javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/samples/client/petstore/java/rest-assured/pom.xml b/samples/client/petstore/java/rest-assured/pom.xml
index 21e224499c41..463c266580e5 100644
--- a/samples/client/petstore/java/rest-assured/pom.xml
+++ b/samples/client/petstore/java/rest-assured/pom.xml
@@ -146,6 +146,7 @@
                 <version>3.2.0</version>
                 <configuration>
                     <doclint>none</doclint>
+                    <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -209,6 +210,12 @@
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
@@ -262,6 +269,7 @@
         <gson-version>2.8.6</gson-version>
         <gson-fire-version>1.8.4</gson-fire-version>
         <threetenbp-version>1.4.3</threetenbp-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <okio-version>1.17.5</okio-version>
         <junit-version>4.13</junit-version>
     </properties>
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index aba19948f055..6a6e20dec3e2 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -32,7 +32,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index bb35b0970ef4..334bcf046560 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -33,7 +33,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index b3528f7a8722..a657f62ac051 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -32,7 +32,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index a72f9a9889e8..78fef3fb872c 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -34,7 +34,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_MAP_STRING = "map_string";
   @SerializedName(SERIALIZED_NAME_MAP_STRING)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 574b6ad8f1bb..6ddf034a21e3 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -32,7 +32,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index c138d835e55a..caa1e96c2450 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -33,7 +33,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 48bd74a65a60..05e8be35e901 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -32,7 +32,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 8be8dcd782d6..1867da695152 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -32,7 +32,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java
index 78849b6c612a..877a6e299087 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java
@@ -33,7 +33,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Animal {
   public static final String SERIALIZED_NAME_CLASS_NAME = "className";
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 9db163e71534..84adce00b31b 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -33,7 +33,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 02106b473bc8..554cdbb2b99b 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -33,7 +33,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber";
   @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java
index 4ec8e611d8c6..766d3eac7071 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -33,7 +33,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string";
   @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java
index 14fe30c93914..242bf10e9b0e 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java
@@ -32,7 +32,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class BigCat extends Cat {
   /**
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index eaa296451029..3336ea744af7 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -30,7 +30,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java
index 90db42f19630..8429b3f07221 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -30,7 +30,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String SERIALIZED_NAME_SMALL_CAMEL = "smallCamel";
   @SerializedName(SERIALIZED_NAME_SMALL_CAMEL)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
index df466c467577..b4f9a9774174 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
@@ -33,7 +33,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Cat extends Animal {
   public static final String SERIALIZED_NAME_DECLAWED = "declawed";
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java
index 6061abfee808..f7b7751fd125 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -30,7 +30,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String SERIALIZED_NAME_DECLAWED = "declawed";
   @SerializedName(SERIALIZED_NAME_DECLAWED)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java
index 1837174952ac..a17b2a28760f 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java
@@ -30,7 +30,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java
index 8bda0bd8381d..1e052e375520 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -31,7 +31,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String SERIALIZED_NAME_PROPERTY_CLASS = "_class";
   @SerializedName(SERIALIZED_NAME_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java
index e72113def905..3c75c6423660 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java
@@ -30,7 +30,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String SERIALIZED_NAME_CLIENT = "client";
   @SerializedName(SERIALIZED_NAME_CLIENT)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
index f6046b43924d..8d26c6210f37 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
@@ -32,7 +32,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Dog extends Animal {
   public static final String SERIALIZED_NAME_BREED = "breed";
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java
index dc2f0f751e63..155df409ef1f 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -30,7 +30,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String SERIALIZED_NAME_BREED = "breed";
   @SerializedName(SERIALIZED_NAME_BREED)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java
index 0fd2de659e99..eed3d651271b 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,7 +32,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
index 5fa3c853a032..d266824bf428 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -31,7 +31,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index eb73f8f1e4a6..117ed39996ea 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,7 +32,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String SERIALIZED_NAME_FILE = "file";
   @SerializedName(SERIALIZED_NAME_FILE)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
index c05d5a9485e9..1e1247a20a6f 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -35,7 +35,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String SERIALIZED_NAME_INTEGER = "integer";
   @SerializedName(SERIALIZED_NAME_INTEGER)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index b5f9d033d1fc..b2b5983888c5 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,7 +30,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String SERIALIZED_NAME_BAR = "bar";
   @SerializedName(SERIALIZED_NAME_BAR)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java
index d2d1452e028a..6f4990f39d13 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java
@@ -33,7 +33,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string";
   @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index ee8f4a7f9bb5..0f9eba91632a 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -36,7 +36,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java
index 55328ed3accd..e5ac335e8c7a 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,7 +31,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 9fb06422b55f..79563bc4c1a5 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -30,7 +30,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String SERIALIZED_NAME_CODE = "code";
   @SerializedName(SERIALIZED_NAME_CODE)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java
index 84afadc74399..93274a02a5a0 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -31,7 +31,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String SERIALIZED_NAME_RETURN = "return";
   @SerializedName(SERIALIZED_NAME_RETURN)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java
index ddea46f4bf1e..0c502b998d33 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java
@@ -31,7 +31,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5ea3f679be6f..cad617d6d321 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -31,7 +31,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String SERIALIZED_NAME_JUST_NUMBER = "JustNumber";
   @SerializedName(SERIALIZED_NAME_JUST_NUMBER)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java
index 40eed7b5db9d..fffd8eb801f0 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java
@@ -31,7 +31,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java
index fef7f5812aa0..64dd81e79aad 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -31,7 +31,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String SERIALIZED_NAME_MY_NUMBER = "my_number";
   @SerializedName(SERIALIZED_NAME_MY_NUMBER)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java
index 79d7d08b863b..33faf8ced9f1 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java
@@ -36,7 +36,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index d034413519b5..6672ba46b133 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,7 +30,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String SERIALIZED_NAME_BAR = "bar";
   @SerializedName(SERIALIZED_NAME_BAR)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 45f9e21f8b63..7a99f46b27b5 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -30,7 +30,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   @SerializedName(SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java
index 315b9180f676..cf0934a7c82b 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,7 +30,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index bbe170f19845..9de2129b02c1 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -33,7 +33,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
   @SerializedName(SERIALIZED_NAME_STRING_ITEM)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index daa84d59ba9e..a12cfcaaa4f3 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -33,7 +33,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
   @SerializedName(SERIALIZED_NAME_STRING_ITEM)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java
index 760ff3053791..5c4e542d9293 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java
@@ -30,7 +30,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java
index d1bae238ba51..cd70617ca0fa 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -33,7 +33,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String SERIALIZED_NAME_ATTRIBUTE_STRING = "attribute_string";
   @SerializedName(SERIALIZED_NAME_ATTRIBUTE_STRING)
diff --git a/samples/client/petstore/java/resteasy/build.gradle b/samples/client/petstore/java/resteasy/build.gradle
index 447352376169..e23483b58276 100644
--- a/samples/client/petstore/java/resteasy/build.gradle
+++ b/samples/client/petstore/java/resteasy/build.gradle
@@ -118,5 +118,6 @@ dependencies {
     compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
     compile "joda-time:joda-time:$jodatime_version"
     compile "com.brsanthu:migbase64:2.2"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/resteasy/build.sbt b/samples/client/petstore/java/resteasy/build.sbt
index 41951cf7462d..70b90e5477e0 100644
--- a/samples/client/petstore/java/resteasy/build.sbt
+++ b/samples/client/petstore/java/resteasy/build.sbt
@@ -20,6 +20,7 @@ lazy val root = (project in file(".")).
       "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
       "joda-time" % "joda-time" % "2.9.9" % "compile",
       "com.brsanthu" % "migbase64" % "2.2" % "compile",
+	  "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/samples/client/petstore/java/resteasy/pom.xml b/samples/client/petstore/java/resteasy/pom.xml
index 414dfab5bec5..2f6bfd4a8adc 100644
--- a/samples/client/petstore/java/resteasy/pom.xml
+++ b/samples/client/petstore/java/resteasy/pom.xml
@@ -145,6 +145,7 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -234,6 +235,12 @@
             <artifactId>jackson-datatype-threetenbp</artifactId>
             <version>${threetenbp-version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -249,6 +256,7 @@
         <jackson-version>2.10.4</jackson-version>
         <jackson-databind-version>2.10.4</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <threetenbp-version>2.9.10</threetenbp-version>
         <jodatime-version>2.9.9</jodatime-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java
index 4738f8c3d0ca..433318b74b08 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java
@@ -45,7 +45,7 @@
 import org.openapitools.client.auth.ApiKeyAuth;
 import org.openapitools.client.auth.OAuth;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiClient {
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   private Map<String, String> defaultCookieMap = new HashMap<String, String>();
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiException.java
index 6c91e35f27a9..c814fc5bbc9c 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiException.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiException.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/Configuration.java
index acbecda489dd..476456fd4ed6 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/Configuration.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/Configuration.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/JSON.java
index b586ff362190..9368681606c6 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/JSON.java
@@ -9,7 +9,7 @@
 
 import javax.ws.rs.ext.ContextResolver;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class JSON implements ContextResolver<ObjectMapper> {
   private ObjectMapper mapper;
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/Pair.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/Pair.java
index ae89aa614543..8352d84046a7 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/Pair.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/Pair.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/StringUtil.java
index 747a23f5bf23..4dc60597910a 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/StringUtil.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 12ee9b4852cd..64082a17167d 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AnotherFakeApi {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java
index bd2b2386f2bc..697b70fc85c2 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeApi {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 620e2e6a6076..541c0de0f6aa 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeClassnameTags123Api {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java
index 106b3032f20a..841806758c00 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java
@@ -17,7 +17,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class PetApi {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/StoreApi.java
index c6d4d3cdaf92..c5cd88a18711 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StoreApi {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/UserApi.java
index 4a823799de80..96c7210bf240 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/UserApi.java
@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class UserApi {
   private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
index a9427105d811..8e03da2a6791 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
index 98993417bee7..bd1f1225416a 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
@@ -22,7 +22,7 @@
 
 import java.io.UnsupportedEncodingException;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
index e20259cb94ca..e9d4c678963a 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/OAuth.java
index 779680c9b2f9..0f145f8b23c5 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/OAuth.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 0f1223c2bc61..f84a72518f68 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c03535ab9471..3104ead59eed 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 4356a4f8c1eb..b485c4825c27 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 781d4686e981..8dffb4999596 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -43,7 +43,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   private Map<String, String> mapString = null;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 2426e7c974c4..d09eacadf3e9 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index da407ccdc473..93480b7f4966 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 5e468870311e..4afc16a07bb9 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index ed080254966e..8533c0b77ae3 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java
index 3bcb8a739172..83270058d077 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java
@@ -35,7 +35,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 96f829bc648b..5dc5abf29846 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 37e40dbd3ec8..c237ea37a6e2 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java
index de7c895ac93a..8ca28d3862b8 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -34,7 +34,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   private List<String> arrayOfString = null;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCat.java
index c4386f4e6011..f038a3a46ad7 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCat.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index 7ce0ddb21f5a..e3b6b0fdd04e 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java
index 033e97881105..d253e541dede 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -34,7 +34,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   private String smallCamel;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
index 11ce48991b06..e397ea7aa176 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java
index 3e7b991436aa..e31a9ae81150 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
index 868ba8750742..de74329bc521 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
@@ -30,7 +30,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java
index 4de7664b26a7..bac4aec70b57 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java
index 02b0aac2247a..6bb0d3fab73e 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
index f56658043689..edf33abb2b57 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java
index dd42595cf202..147bb4d9b761 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java
index aff182cd4983..42c75cb2727d 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,7 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
index 51a1a645a109..75f53d11450c 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -34,7 +34,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8166597792d0..aae40c4a5a6e 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,7 +32,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
   private java.io.File file;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
index 4dee7f6c9dcc..d24c2298054f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -47,7 +47,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 0a3f0d464360..741ab2441d34 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,7 +30,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java
index 113f92dd9cbe..9621c8220b71 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java
@@ -35,7 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d483d69700f8..3ccd9310b55c 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,7 +37,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java
index dd99468a0059..3b952b2730bf 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,7 +31,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 383cafdd3a5a..dd401709d75d 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -31,7 +31,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
   private Integer code;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java
index b62e13a90a0c..733ec3718a15 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java
index bd625c5f66f3..8c03d816bff7 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java
@@ -33,7 +33,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5ca72a169fe8..45f21901673f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
index 6e2816302162..e894257f323c 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
@@ -35,7 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java
index d4d9ac6ba110..863237336880 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -32,7 +32,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   private BigDecimal myNumber;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
index cd98c32b8380..26446f5b488e 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
@@ -40,7 +40,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b3e58ef3d2c5..e5f23ef5dcfe 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,7 +30,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 35ad3bf46994..e60f8a8104d6 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
index a3ecb398faa3..b15dc0d14fc6 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,7 +30,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 73f393587944..6ede0d94c081 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -36,7 +36,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem = "what";
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index e3daa1a3e1cb..2c30b9bbed2d 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -37,7 +37,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java
index b7e74643dab2..eafdd902c04d 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java
@@ -36,7 +36,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java
index f585a625223a..84bfde5ed4ff 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -60,7 +60,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   private String attributeString;
diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle
index aeebd8f06f73..028191b31cab 100644
--- a/samples/client/petstore/java/resttemplate-withXml/build.gradle
+++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle
@@ -116,5 +116,6 @@ dependencies {
     compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version"
     compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/resttemplate-withXml/pom.xml b/samples/client/petstore/java/resttemplate-withXml/pom.xml
index 5dd21ddd7911..e1aca7d98a30 100644
--- a/samples/client/petstore/java/resttemplate-withXml/pom.xml
+++ b/samples/client/petstore/java/resttemplate-withXml/pom.xml
@@ -257,6 +257,12 @@
                 <artifactId>jackson-datatype-threetenbp</artifactId>
                 <version>${jackson-threetenbp-version}</version>
             </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -273,6 +279,7 @@
         <jackson-version>2.10.4</jackson-version>
         <jackson-databind-version>2.10.4</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13</junit-version>
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
index fa898ad686f2..605826fff1d4 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
@@ -64,7 +64,7 @@
 import org.openapitools.client.auth.ApiKeyAuth;
 import org.openapitools.client.auth.OAuth;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.ApiClient")
 public class ApiClient {
     public enum CollectionFormat {
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index fe954fb02826..0e9eaf39cd4b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -26,7 +27,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.api.AnotherFakeApi")
 public class AnotherFakeApi {
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
index 2c5be6cd0ecb..e3fda6c1ee12 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -18,6 +18,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -34,7 +35,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.api.FakeApi")
 public class FakeApi {
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index e71b013c96b4..d9c821519609 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -26,7 +27,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.api.FakeClassnameTags123Api")
 public class FakeClassnameTags123Api {
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java
index 8ed48b27b6d1..eac8abdc3ccd 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java
@@ -13,6 +13,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -29,7 +30,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.api.PetApi")
 public class PetApi {
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java
index a082609afab4..d2897deda183 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -26,7 +27,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.api.StoreApi")
 public class StoreApi {
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java
index a5a7cec5de7a..7dea94d09185 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -26,7 +27,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.api.UserApi")
 public class UserApi {
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
index bbd04ba629dd..9e9f3733160e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
@@ -3,7 +3,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
     private final String location;
     private final String paramName;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
index 903582344d12..bbbbba67a472 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
@@ -7,7 +7,7 @@
 import org.springframework.util.Base64Utils;
 import org.springframework.util.MultiValueMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBasicAuth implements Authentication {
     private String username;
     private String password;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
index 078488989025..299c05b12e04 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
@@ -7,7 +7,7 @@
 import org.springframework.util.Base64Utils;
 import org.springframework.util.MultiValueMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
     private final String scheme;
     private String bearerToken;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/OAuth.java
index a1782cdb9e15..3067453951e9 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/OAuth.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -3,7 +3,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OAuth implements Authentication {
     private String accessToken;
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 6dd4c1d5fd35..619d69ca703e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "AdditionalPropertiesAnyType")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesAnyType")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c06c0c1470e9..fea82ea0670c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "AdditionalPropertiesArray")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesArray")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index eddbbd859d14..5af36e0b74f2 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "AdditionalPropertiesBoolean")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesBoolean")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index c8b96f0db2dd..529a2ac4ea47 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -45,7 +45,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "AdditionalPropertiesClass")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesClass")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index cd5c55b0d185..8ecb7eaf2bc5 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "AdditionalPropertiesInteger")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesInteger")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 49b741ff9579..9db93d341bc4 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "AdditionalPropertiesNumber")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesNumber")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index ac216a38970f..f99c59f9d89b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "AdditionalPropertiesObject")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesObject")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index a24db92f4c13..f2e41d3d966a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "AdditionalPropertiesString")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesString")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
index 2a8029a89962..7bbe43a1508e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
@@ -37,7 +37,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index e35b35971cee..e92537956af3 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "ArrayOfArrayOfNumberOnly")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ArrayOfArrayOfNumberOnly")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 1a579457da71..48ed30dd5623 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "ArrayOfNumberOnly")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ArrayOfNumberOnly")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java
index df355f7e8818..c442858ea0cb 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -36,7 +36,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "ArrayTest")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ArrayTest")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCat.java
index 7c04dda99bb5..6923e03a94af 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCat.java
@@ -35,7 +35,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index 65817c4f4c8d..105c2f9fcb46 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "BigCatAllOf")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "BigCatAllOf")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java
index b3192d836a9d..9481c40492df 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -36,7 +36,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "Capitalization")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Capitalization")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
index f6979ab94bb3..abba4224859e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
@@ -36,7 +36,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java
index ef047259bec1..fb5498de2d48 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "CatAllOf")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "CatAllOf")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
index b42fb4508ad3..486d3a640c58 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
@@ -32,7 +32,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "Category")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Category")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java
index 2a3625d71bfe..6b4a4156a584 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "ClassModel")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ClassModel")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java
index 8e5280c4cbdf..c7d3068beb9f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "Client")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Client")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
index fd408171712b..85f6ac20f89e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
@@ -35,7 +35,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java
index 2a07c1db3dad..93bdd6f1fe16 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "DogAllOf")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "DogAllOf")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java
index e67e1a227eb6..c8351de6b301 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -34,7 +34,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "EnumArrays")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "EnumArrays")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
index a2f2836ed323..87d2cf3265d5 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -36,7 +36,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "EnumTest")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "EnumTest")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 15d519f5e68e..fcccd9e80212 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -34,7 +34,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "FileSchemaTestClass")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "FileSchemaTestClass")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
index 302fc9e501af..e465e6751914 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -49,7 +49,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "FormatTest")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "FormatTest")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index b3b1db0f33f7..a6d596729448 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -32,7 +32,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "HasOnlyReadOnly")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "HasOnlyReadOnly")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java
index 0f7c97815928..7cbb7bab0f48 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java
@@ -37,7 +37,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "MapTest")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "MapTest")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 30c2adcf1c60..dae63b5f2864 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,7 +39,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "MixedPropertiesAndAdditionalPropertiesClass")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "MixedPropertiesAndAdditionalPropertiesClass")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java
index 3d5fb315b771..6c5307c12cd8 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -33,7 +33,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "Name")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Name")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index d1aa54e3ec62..8b28904dddd5 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -33,7 +33,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "ModelApiResponse")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ModelApiResponse")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java
index 1faca465c9c5..bbe14c63ab56 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "Return")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Return")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java
index 5ba7843e8aa1..5251c3371e52 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java
@@ -35,7 +35,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "Name")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Name")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5f3b1eb5b1f4..918300bea552 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "NumberOnly")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "NumberOnly")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
index 90cc286825b7..fdd915ad2242 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
@@ -37,7 +37,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "Order")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Order")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java
index 112a4d8c0897..6f2c1605ed08 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -34,7 +34,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "OuterComposite")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "OuterComposite")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java
index ba6fca86e2f1..78e2f89fae81 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java
@@ -42,7 +42,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "Pet")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Pet")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 7db0e8024f88..6c92adb0b2d8 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -32,7 +32,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "ReadOnlyFirst")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ReadOnlyFirst")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 7a23d4c3801a..5ccb098de6fa 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "$special[model.name]")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "$special[model.name]")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java
index 775a898861b8..cbbd97bd682b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java
@@ -32,7 +32,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "Tag")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Tag")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index bc95502e821d..c34074712b40 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -38,7 +38,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "TypeHolderDefault")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "TypeHolderDefault")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index e6b20d8a0937..2c4c7e79db54 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -39,7 +39,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "TypeHolderExample")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "TypeHolderExample")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java
index 1fc14613b9af..a8e6be32dd26 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java
@@ -38,7 +38,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(name = "User")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "User")
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java
index 42091b2e28da..fc328e1f5891 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -62,7 +62,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @XmlRootElement(namespace="http://a.com/schema", name = "XmlItem")
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(namespace="http://a.com/schema", localName = "XmlItem")
diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle
index 9ed5bfa05109..8ed094a0d65a 100644
--- a/samples/client/petstore/java/resttemplate/build.gradle
+++ b/samples/client/petstore/java/resttemplate/build.gradle
@@ -115,5 +115,6 @@ dependencies {
     compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
     compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/resttemplate/pom.xml b/samples/client/petstore/java/resttemplate/pom.xml
index aefd702fc24b..964370d0b70a 100644
--- a/samples/client/petstore/java/resttemplate/pom.xml
+++ b/samples/client/petstore/java/resttemplate/pom.xml
@@ -249,6 +249,12 @@
                 <artifactId>jackson-datatype-threetenbp</artifactId>
                 <version>${jackson-threetenbp-version}</version>
             </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -265,6 +271,7 @@
         <jackson-version>2.10.4</jackson-version>
         <jackson-databind-version>2.10.4</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13</junit-version>
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
index 1b100928730a..a1669fc64a1a 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
@@ -59,7 +59,7 @@
 import org.openapitools.client.auth.ApiKeyAuth;
 import org.openapitools.client.auth.OAuth;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.ApiClient")
 public class ApiClient {
     public enum CollectionFormat {
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index fe954fb02826..0e9eaf39cd4b 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -26,7 +27,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.api.AnotherFakeApi")
 public class AnotherFakeApi {
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
index 2c5be6cd0ecb..e3fda6c1ee12 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -18,6 +18,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -34,7 +35,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.api.FakeApi")
 public class FakeApi {
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index e71b013c96b4..d9c821519609 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -26,7 +27,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.api.FakeClassnameTags123Api")
 public class FakeClassnameTags123Api {
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java
index 8ed48b27b6d1..eac8abdc3ccd 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java
@@ -13,6 +13,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -29,7 +30,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.api.PetApi")
 public class PetApi {
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java
index a082609afab4..d2897deda183 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -26,7 +27,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.api.StoreApi")
 public class StoreApi {
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java
index a5a7cec5de7a..7dea94d09185 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -26,7 +27,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @Component("org.openapitools.client.api.UserApi")
 public class UserApi {
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
index bbd04ba629dd..9e9f3733160e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
@@ -3,7 +3,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
     private final String location;
     private final String paramName;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
index 903582344d12..bbbbba67a472 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
@@ -7,7 +7,7 @@
 import org.springframework.util.Base64Utils;
 import org.springframework.util.MultiValueMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBasicAuth implements Authentication {
     private String username;
     private String password;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
index 078488989025..299c05b12e04 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
@@ -7,7 +7,7 @@
 import org.springframework.util.Base64Utils;
 import org.springframework.util.MultiValueMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
     private final String scheme;
     private String bearerToken;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/OAuth.java
index a1782cdb9e15..3067453951e9 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/OAuth.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -3,7 +3,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OAuth implements Authentication {
     private String accessToken;
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 0f1223c2bc61..f84a72518f68 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c03535ab9471..3104ead59eed 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 4356a4f8c1eb..b485c4825c27 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 781d4686e981..8dffb4999596 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -43,7 +43,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   private Map<String, String> mapString = null;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 2426e7c974c4..d09eacadf3e9 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index da407ccdc473..93480b7f4966 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 5e468870311e..4afc16a07bb9 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index ed080254966e..8533c0b77ae3 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
index 3bcb8a739172..83270058d077 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
@@ -35,7 +35,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 96f829bc648b..5dc5abf29846 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 37e40dbd3ec8..c237ea37a6e2 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java
index de7c895ac93a..8ca28d3862b8 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -34,7 +34,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   private List<String> arrayOfString = null;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCat.java
index c4386f4e6011..f038a3a46ad7 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCat.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index 7ce0ddb21f5a..e3b6b0fdd04e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
index 033e97881105..d253e541dede 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -34,7 +34,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   private String smallCamel;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
index 11ce48991b06..e397ea7aa176 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java
index 3e7b991436aa..e31a9ae81150 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
index 868ba8750742..de74329bc521 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
@@ -30,7 +30,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
index 4de7664b26a7..bac4aec70b57 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
index 02b0aac2247a..6bb0d3fab73e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
index f56658043689..edf33abb2b57 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java
index dd42595cf202..147bb4d9b761 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java
index aff182cd4983..42c75cb2727d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,7 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
index 51a1a645a109..75f53d11450c 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -34,7 +34,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8166597792d0..aae40c4a5a6e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,7 +32,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
   private java.io.File file;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
index 4dee7f6c9dcc..d24c2298054f 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -47,7 +47,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 0a3f0d464360..741ab2441d34 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,7 +30,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java
index 113f92dd9cbe..9621c8220b71 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java
@@ -35,7 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d483d69700f8..3ccd9310b55c 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,7 +37,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
index dd99468a0059..3b952b2730bf 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,7 +31,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 383cafdd3a5a..dd401709d75d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -31,7 +31,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
   private Integer code;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
index b62e13a90a0c..733ec3718a15 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
index bd625c5f66f3..8c03d816bff7 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
@@ -33,7 +33,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5ca72a169fe8..45f21901673f 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
index 6e2816302162..e894257f323c 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
@@ -35,7 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
index d4d9ac6ba110..863237336880 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -32,7 +32,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   private BigDecimal myNumber;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
index cd98c32b8380..26446f5b488e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
@@ -40,7 +40,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b3e58ef3d2c5..e5f23ef5dcfe 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,7 +30,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 35ad3bf46994..e60f8a8104d6 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
index a3ecb398faa3..b15dc0d14fc6 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,7 +30,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 73f393587944..6ede0d94c081 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -36,7 +36,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem = "what";
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index e3daa1a3e1cb..2c30b9bbed2d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -37,7 +37,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
index b7e74643dab2..eafdd902c04d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
@@ -36,7 +36,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java
index f585a625223a..84bfde5ed4ff 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -60,7 +60,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   private String attributeString;
diff --git a/samples/client/petstore/java/retrofit/pom.xml b/samples/client/petstore/java/retrofit/pom.xml
new file mode 100644
index 000000000000..9de4ae305fdb
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/pom.xml
@@ -0,0 +1,251 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>petstore-retrofit</artifactId>
+    <packaging>jar</packaging>
+    <name>petstore-retrofit</name>
+    <version>1.0.0</version>
+    <url>https://github.com/openapitools/openapi-generator</url>
+    <description>OpenAPI Java</description>
+    <scm>
+        <connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
+        <developerConnection>scm:git:git@github.com:openapitools/openapi-generator.git</developerConnection>
+        <url>https://github.com/openapitools/openapi-generator</url>
+    </scm>
+
+    <licenses>
+        <license>
+            <name>Unlicense</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>OpenAPI-Generator Contributors</name>
+            <email>team@openapitools.org</email>
+            <organization>OpenAPITools.org</organization>
+            <organizationUrl>http://openapitools.org</organizationUrl>
+        </developer>
+    </developers>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.12</version>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>loggerPath</name>
+                            <value>conf/log4j.properties</value>
+                        </property>
+                    </systemProperties>
+                    <argLine>-Xms512m -Xmx1500m</argLine>
+                    <parallel>methods</parallel>
+                    <forkMode>pertest</forkMode>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- attach test jar -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.10</version>
+                <executions>
+                    <execution>
+                        <id>add_sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add_test_sources</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.1.1</version>
+                <configuration>
+                    <doclint>none</doclint>
+                        <source>1.7</source>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>sign-artifacts</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.5</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations-version}</version>
+        </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit</groupId>
+            <artifactId>retrofit</artifactId>
+            <version>${retrofit-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.oltu.oauth2</groupId>
+            <artifactId>org.apache.oltu.oauth2.client</artifactId>
+            <version>${oltu-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>${jodatime-version}</version>
+        </dependency>
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <swagger-annotations-version>1.5.21</swagger-annotations-version>
+        <retrofit-version>1.9.0</retrofit-version>
+        <okhttp-version>2.7.5</okhttp-version>
+        <jodatime-version>2.9.9</jodatime-version>
+        <oltu-version>1.0.1</oltu-version>
+        <maven-plugin-version>1.0.0</maven-plugin-version>
+        <junit-version>4.13</junit-version>
+    </properties>
+</project>
diff --git a/samples/client/petstore/java/retrofit2-play24/.openapi-generator/FILES b/samples/client/petstore/java/retrofit2-play24/.openapi-generator/FILES
deleted file mode 100644
index a562460201e4..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/.openapi-generator/FILES
+++ /dev/null
@@ -1,131 +0,0 @@
-.gitignore
-.travis.yml
-README.md
-api/openapi.yaml
-build.gradle
-build.sbt
-docs/AdditionalPropertiesAnyType.md
-docs/AdditionalPropertiesArray.md
-docs/AdditionalPropertiesBoolean.md
-docs/AdditionalPropertiesClass.md
-docs/AdditionalPropertiesInteger.md
-docs/AdditionalPropertiesNumber.md
-docs/AdditionalPropertiesObject.md
-docs/AdditionalPropertiesString.md
-docs/Animal.md
-docs/AnotherFakeApi.md
-docs/ArrayOfArrayOfNumberOnly.md
-docs/ArrayOfNumberOnly.md
-docs/ArrayTest.md
-docs/BigCat.md
-docs/BigCatAllOf.md
-docs/Capitalization.md
-docs/Cat.md
-docs/CatAllOf.md
-docs/Category.md
-docs/ClassModel.md
-docs/Client.md
-docs/Dog.md
-docs/DogAllOf.md
-docs/EnumArrays.md
-docs/EnumClass.md
-docs/EnumTest.md
-docs/FakeApi.md
-docs/FakeClassnameTags123Api.md
-docs/FileSchemaTestClass.md
-docs/FormatTest.md
-docs/HasOnlyReadOnly.md
-docs/MapTest.md
-docs/MixedPropertiesAndAdditionalPropertiesClass.md
-docs/Model200Response.md
-docs/ModelApiResponse.md
-docs/ModelReturn.md
-docs/Name.md
-docs/NumberOnly.md
-docs/Order.md
-docs/OuterComposite.md
-docs/OuterEnum.md
-docs/Pet.md
-docs/PetApi.md
-docs/ReadOnlyFirst.md
-docs/SpecialModelName.md
-docs/StoreApi.md
-docs/Tag.md
-docs/TypeHolderDefault.md
-docs/TypeHolderExample.md
-docs/User.md
-docs/UserApi.md
-docs/XmlItem.md
-git_push.sh
-gradle.properties
-gradle/wrapper/gradle-wrapper.jar
-gradle/wrapper/gradle-wrapper.properties
-gradlew
-gradlew.bat
-pom.xml
-settings.gradle
-src/main/AndroidManifest.xml
-src/main/java/org/openapitools/client/ApiClient.java
-src/main/java/org/openapitools/client/ApiClient.java
-src/main/java/org/openapitools/client/CollectionFormats.java
-src/main/java/org/openapitools/client/Pair.java
-src/main/java/org/openapitools/client/Play24CallAdapterFactory.java
-src/main/java/org/openapitools/client/Play24CallFactory.java
-src/main/java/org/openapitools/client/RFC3339DateFormat.java
-src/main/java/org/openapitools/client/ServerConfiguration.java
-src/main/java/org/openapitools/client/ServerVariable.java
-src/main/java/org/openapitools/client/StringUtil.java
-src/main/java/org/openapitools/client/api/AnotherFakeApi.java
-src/main/java/org/openapitools/client/api/FakeApi.java
-src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
-src/main/java/org/openapitools/client/api/PetApi.java
-src/main/java/org/openapitools/client/api/StoreApi.java
-src/main/java/org/openapitools/client/api/UserApi.java
-src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
-src/main/java/org/openapitools/client/auth/Authentication.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
-src/main/java/org/openapitools/client/model/Animal.java
-src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
-src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
-src/main/java/org/openapitools/client/model/ArrayTest.java
-src/main/java/org/openapitools/client/model/BigCat.java
-src/main/java/org/openapitools/client/model/BigCatAllOf.java
-src/main/java/org/openapitools/client/model/Capitalization.java
-src/main/java/org/openapitools/client/model/Cat.java
-src/main/java/org/openapitools/client/model/CatAllOf.java
-src/main/java/org/openapitools/client/model/Category.java
-src/main/java/org/openapitools/client/model/ClassModel.java
-src/main/java/org/openapitools/client/model/Client.java
-src/main/java/org/openapitools/client/model/Dog.java
-src/main/java/org/openapitools/client/model/DogAllOf.java
-src/main/java/org/openapitools/client/model/EnumArrays.java
-src/main/java/org/openapitools/client/model/EnumClass.java
-src/main/java/org/openapitools/client/model/EnumTest.java
-src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
-src/main/java/org/openapitools/client/model/FormatTest.java
-src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
-src/main/java/org/openapitools/client/model/MapTest.java
-src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
-src/main/java/org/openapitools/client/model/Model200Response.java
-src/main/java/org/openapitools/client/model/ModelApiResponse.java
-src/main/java/org/openapitools/client/model/ModelReturn.java
-src/main/java/org/openapitools/client/model/Name.java
-src/main/java/org/openapitools/client/model/NumberOnly.java
-src/main/java/org/openapitools/client/model/Order.java
-src/main/java/org/openapitools/client/model/OuterComposite.java
-src/main/java/org/openapitools/client/model/OuterEnum.java
-src/main/java/org/openapitools/client/model/Pet.java
-src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
-src/main/java/org/openapitools/client/model/SpecialModelName.java
-src/main/java/org/openapitools/client/model/Tag.java
-src/main/java/org/openapitools/client/model/TypeHolderDefault.java
-src/main/java/org/openapitools/client/model/TypeHolderExample.java
-src/main/java/org/openapitools/client/model/User.java
-src/main/java/org/openapitools/client/model/XmlItem.java
diff --git a/samples/client/petstore/java/retrofit2-play24/README.md b/samples/client/petstore/java/retrofit2-play24/README.md
deleted file mode 100644
index 57dcd43e1555..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# petstore-java-client-retrofit2-play24
-
-## Requirements
-
-Building the API client library requires [Maven](https://maven.apache.org/) to be installed.
-
-## Installation & Usage
-
-To install the API client library to your local Maven repository, simply execute:
-
-```shell
-mvn install
-```
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-```shell
-mvn deploy
-```
-
-Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
-
-After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
-
-```xml
-<dependency>
-    <groupId>org.openapitools</groupId>
-    <artifactId>petstore-java-client-retrofit2-play24</artifactId>
-    <version>1.0.0</version>
-    <scope>compile</scope>
-</dependency>
-
-```
-
-## Author
-
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play24/build.gradle b/samples/client/petstore/java/retrofit2-play24/build.gradle
deleted file mode 100644
index c40aba2faad6..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/build.gradle
+++ /dev/null
@@ -1,126 +0,0 @@
-apply plugin: 'idea'
-apply plugin: 'eclipse'
-
-group = 'org.openapitools'
-version = '1.0.0'
-
-buildscript {
-    repositories {
-        maven { url "https://repo1.maven.org/maven2" }
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.+'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-    }
-}
-
-repositories {
-    jcenter()
-}
-
-
-if(hasProperty('target') && target == 'android') {
-
-    apply plugin: 'com.android.library'
-    apply plugin: 'com.github.dcendents.android-maven'
-
-    android {
-        compileSdkVersion 25
-        buildToolsVersion '25.0.2'
-        defaultConfig {
-            minSdkVersion 14
-            targetSdkVersion 25
-        }
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_8
-            targetCompatibility JavaVersion.VERSION_1_8
-        }
-
-        // Rename the aar correctly
-        libraryVariants.all { variant ->
-            variant.outputs.each { output ->
-                def outputFile = output.outputFile
-                if (outputFile != null && outputFile.name.endsWith('.aar')) {
-                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
-                    output.outputFile = new File(outputFile.parent, fileName)
-                }
-            }
-        }
-
-        dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
-        }
-    }
-
-    afterEvaluate {
-        android.libraryVariants.all { variant ->
-            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
-            task.description = "Create jar artifact for ${variant.name}"
-            task.dependsOn variant.javaCompile
-            task.from variant.javaCompile.destinationDir
-            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
-            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
-            artifacts.add('archives', task);
-        }
-    }
-
-    task sourcesJar(type: Jar) {
-        from android.sourceSets.main.java.srcDirs
-        classifier = 'sources'
-    }
-
-    artifacts {
-        archives sourcesJar
-    }
-
-} else {
-
-    apply plugin: 'java'
-    apply plugin: 'maven'
-
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-
-    install {
-        repositories.mavenInstaller {
-            pom.artifactId = 'petstore-java-client-retrofit2-play24'
-        }
-    }
-
-    task execute(type:JavaExec) {
-       main = System.getProperty('mainClass')
-       classpath = sourceSets.main.runtimeClasspath
-    }
-}
-
-ext {
-    oltu_version = "1.0.1"
-    retrofit_version = "2.3.0"
-    jackson_version = "2.6.6"
-    play_version = "2.4.11"
-    swagger_annotations_version = "1.5.22"
-    junit_version = "4.13"
-    json_fire_version = "1.8.0"
-}
-
-dependencies {
-    compile "com.squareup.retrofit2:retrofit:$retrofit_version"
-    compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
-    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
-    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "com.google.code.findbugs:jsr305:3.0.2"
-    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
-        exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
-    }
-    compile "io.gsonfire:gson-fire:$json_fire_version"
-    compile "com.typesafe.play:play-java-ws_2.11:$play_version"
-    compile "com.squareup.retrofit2:converter-jackson:$retrofit_version"
-    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
-    compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
-
-    testCompile "junit:junit:$junit_version"
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/build.sbt b/samples/client/petstore/java/retrofit2-play24/build.sbt
deleted file mode 100644
index d2bc6d821278..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/build.sbt
+++ /dev/null
@@ -1,25 +0,0 @@
-lazy val root = (project in file(".")).
-  settings(
-    organization := "org.openapitools",
-    name := "petstore-java-client-retrofit2-play24",
-    version := "1.0.0",
-    scalaVersion := "2.11.4",
-    scalacOptions ++= Seq("-feature"),
-    javacOptions in compile ++= Seq("-Xlint:deprecation"),
-    publishArtifact in (Compile, packageDoc) := false,
-    resolvers += Resolver.mavenLocal,
-    libraryDependencies ++= Seq(
-      "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
-      "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
-      "com.typesafe.play" % "play-java-ws_2.11" % "2.4.11" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.6" % "compile",
-      "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
-      "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
-      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
-      "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
-      "junit" % "junit" % "4.13" % "test",
-      "com.novocode" % "junit-interface" % "0.11" % "test"
-    )
-  )
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/AnimalFarm.md b/samples/client/petstore/java/retrofit2-play24/docs/AnimalFarm.md
deleted file mode 100644
index c7c7f1ddcce6..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/docs/AnimalFarm.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# AnimalFarm
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/StringBooleanMap.md b/samples/client/petstore/java/retrofit2-play24/docs/StringBooleanMap.md
deleted file mode 100644
index cac7afc80e07..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/docs/StringBooleanMap.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# StringBooleanMap
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml
deleted file mode 100644
index e17c6639dffc..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/pom.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>petstore-java-client-retrofit2-play24</artifactId>
-    <packaging>jar</packaging>
-    <name>petstore-java-client-retrofit2-play24</name>
-    <version>1.0.0</version>
-    <url>https://github.com/openapitools/openapi-generator</url>
-    <description>OpenAPI Java</description>
-    <scm>
-        <connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
-        <developerConnection>scm:git:git@github.com:openapitools/openapi-generator.git</developerConnection>
-        <url>https://github.com/openapitools/openapi-generator</url>
-    </scm>
-
-    <licenses>
-        <license>
-            <name>Unlicense</name>
-            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>OpenAPI-Generator Contributors</name>
-            <email>team@openapitools.org</email>
-            <organization>OpenAPITools.org</organization>
-            <organizationUrl>http://openapitools.org</organizationUrl>
-        </developer>
-    </developers>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>2.2.0</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12</version>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>loggerPath</name>
-                            <value>conf/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                    <argLine>-Xms512m -Xmx1500m</argLine>
-                    <parallel>methods</parallel>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- attach test jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.10</version>
-                <executions>
-                    <execution>
-                        <id>add_sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/main/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>add_test_sources</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/test/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.1</version>
-                <configuration>
-                    <doclint>none</doclint>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>sign-artifacts</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations-version}</version>
-        </dependency>
-        <!-- @Nullable annotation -->
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.retrofit2</groupId>
-            <artifactId>converter-gson</artifactId>
-            <version>${retrofit-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.retrofit2</groupId>
-            <artifactId>retrofit</artifactId>
-            <version>${retrofit-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.retrofit2</groupId>
-            <artifactId>converter-scalars</artifactId>
-            <version>${retrofit-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.oltu.oauth2</groupId>
-            <artifactId>org.apache.oltu.oauth2.client</artifactId>
-            <version>${oltu-version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.oltu.oauth2</groupId>
-                    <artifactId>common</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.gsonfire</groupId>
-            <artifactId>gson-fire</artifactId>
-            <version>${gson-fire-version}</version>
-        </dependency>
-            <!-- JSON processing: jackson -->
-            <dependency>
-                <groupId>com.squareup.retrofit2</groupId>
-                <artifactId>converter-jackson</artifactId>
-                <version>${retrofit-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.datatype</groupId>
-                <artifactId>jackson-datatype-jsr310</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe.play</groupId>
-                <artifactId>play-java-ws_2.11</artifactId>
-                <version>${play-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <gson-fire-version>1.8.3</gson-fire-version>
-        <swagger-annotations-version>1.5.22</swagger-annotations-version>
-        <jackson-databind-version>2.10.3</jackson-databind-version>
-        <jackson-version>2.6.6</jackson-version>
-        <play-version>2.4.11</play-version>
-        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
-        <retrofit-version>2.5.0</retrofit-version>
-        <oltu-version>1.0.1</oltu-version>
-        <junit-version>4.13</junit-version>
-    </properties>
-</project>
diff --git a/samples/client/petstore/java/retrofit2-play24/settings.gradle b/samples/client/petstore/java/retrofit2-play24/settings.gradle
deleted file mode 100644
index 38086de55880..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = "petstore-java-client-retrofit2-play24"
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/ApiClient.java
deleted file mode 100644
index 49b7ef862967..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/ApiClient.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.openapitools.client;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.*;
-
-import retrofit2.Retrofit;
-import retrofit2.converter.scalars.ScalarsConverterFactory;
-import retrofit2.converter.jackson.JacksonConverterFactory;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openapitools.jackson.nullable.JsonNullableModule;
-
-import play.libs.Json;
-import play.libs.ws.WSClient;
-
-import org.openapitools.client.Play24CallAdapterFactory;
-import org.openapitools.client.Play24CallFactory;
-
-import okhttp3.Interceptor;
-import org.openapitools.client.auth.ApiKeyAuth;
-import org.openapitools.client.auth.Authentication;
-
-/**
- * API client
- */
-public class ApiClient {
-
-    /** Underlying HTTP-client */
-    private WSClient wsClient;
-
-    /** Supported auths */
-    private Map<String, Authentication> authentications;
-
-    /** API base path */
-    private String basePath = "http://petstore.swagger.io:80/v2";
-
-    public ApiClient(WSClient wsClient) {
-        this();
-        this.wsClient = wsClient;
-    }
-
-    public ApiClient() {
-        // Setup authentications (key: authentication name, value: authentication).
-        authentications = new HashMap<>();
-        authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
-        authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
-        // authentications.put("http_basic_test", new HttpBasicAuth());
-        // authentications.put("petstore_auth", new OAuth());
-        // Prevent the authentications from being modified.
-        authentications = Collections.unmodifiableMap(authentications);
-
-    }
-
-    /**
-     * Creates a retrofit2 client for given API interface
-     */
-    public <S> S createService(Class<S> serviceClass) {
-        if(!basePath.endsWith("/")) {
-            basePath = basePath + "/";
-        }
-
-        Map<String, String> extraHeaders = new HashMap<>();
-        Map<String, String> extraCookies = new HashMap<>();
-        List<Pair> extraQueryParams = new ArrayList<>();
-
-        for (String authName : authentications.keySet()) {
-            Authentication auth = authentications.get(authName);
-            if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
-
-            auth.applyToParams(extraQueryParams, extraHeaders, extraCookies);
-        }
-
-        ObjectMapper mapper = Json.mapper();
-        JsonNullableModule jnm = new JsonNullableModule();
-        mapper.registerModule(jnm);
-
-        return new Retrofit.Builder()
-                       .baseUrl(basePath)
-                       .addConverterFactory(ScalarsConverterFactory.create())
-                       .addConverterFactory(JacksonConverterFactory.create(mapper))
-                       .callFactory(new Play24CallFactory(wsClient, extraHeaders, extraCookies, extraQueryParams))
-                       .addCallAdapterFactory(new Play24CallAdapterFactory())
-                       .build()
-                       .create(serviceClass);
-    }
-
-    /**
-     * Helper method to set API base path
-     */
-    public ApiClient setBasePath(String basePath) {
-        this.basePath = basePath;
-        return this;
-    }
-
-    /**
-     * Get authentications (key: authentication name, value: authentication).
-     */
-    public Map<String, Authentication> getAuthentications() {
-        return authentications;
-    }
-
-    /**
-     * Get authentication for the given name.
-     *
-     * @param authName The authentication name
-     * @return The authentication, null if not found
-     */
-    public Authentication getAuthentication(String authName) {
-        return authentications.get(authName);
-    }
-
-    /**
-     * Helper method to set API key value for the first API key authentication.
-     */
-    public ApiClient setApiKey(String apiKey) {
-        for (Authentication auth : authentications.values()) {
-            if (auth instanceof ApiKeyAuth) {
-                ((ApiKeyAuth) auth).setApiKey(apiKey);
-                return this;
-            }
-        }
-
-        throw new RuntimeException("No API key authentication configured!");
-    }
-
-    /**
-     * Helper method to set API key prefix for the first API key authentication.
-     */
-    public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
-        for (Authentication auth : authentications.values()) {
-            if (auth instanceof ApiKeyAuth) {
-                ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
-                return this;
-            }
-        }
-
-        throw new RuntimeException("No API key authentication configured!");
-    }
-
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Pair.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Pair.java
deleted file mode 100644
index ae89aa614543..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Pair.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client;
-
-
-public class Pair {
-    private String name = "";
-    private String value = "";
-
-    public Pair (String name, String value) {
-        setName(name);
-        setValue(value);
-    }
-
-    private void setName(String name) {
-        if (!isValidString(name)) {
-            return;
-        }
-
-        this.name = name;
-    }
-
-    private void setValue(String value) {
-        if (!isValidString(value)) {
-            return;
-        }
-
-        this.value = value;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public String getValue() {
-        return this.value;
-    }
-
-    private boolean isValidString(String arg) {
-        if (arg == null) {
-            return false;
-        }
-
-        if (arg.trim().isEmpty()) {
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Play24CallAdapterFactory.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Play24CallAdapterFactory.java
deleted file mode 100644
index 0bc70ad03ce5..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Play24CallAdapterFactory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.openapitools.client;
-
-import play.libs.F;
-import retrofit2.*;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.WildcardType;
-
-/**
- * Creates {@link CallAdapter} instances that convert {@link Call} into {@link play.libs.F.Promise}
- */
-public class Play24CallAdapterFactory extends CallAdapter.Factory {
-
-    @Override
-    public CallAdapter<?, ?> get(Type returnType, Annotation[] annotations, Retrofit retrofit) {
-        if (!(returnType instanceof ParameterizedType)) {
-            return null;
-        }
-
-        ParameterizedType type = (ParameterizedType) returnType;
-        if (type.getRawType() != F.Promise.class) {
-            return null;
-        }
-
-        return createAdapter((ParameterizedType) returnType);
-    }
-
-    private CallAdapter<?, F.Promise<?>> createAdapter(ParameterizedType returnType) {
-        Type[] types = returnType.getActualTypeArguments();
-        if (types.length != 1) {
-            throw new IllegalStateException("Must be exactly one type parameter");
-        }
-
-        Type resultType = types[0];
-        Class<?> rawTypeParam = getRawType(resultType);
-
-        boolean includeResponse = false;
-        if (rawTypeParam == Response.class) {
-            if (!(resultType instanceof ParameterizedType)) {
-                throw new IllegalStateException("Response must be parameterized"
-                        + " as Response<T>");
-            }
-            resultType = ((ParameterizedType) resultType).getActualTypeArguments()[0];
-            includeResponse = true;
-        }
-
-        return new ValueAdapter(resultType, includeResponse);
-    }
-    
-    /**
-     * Adapter that coverts values returned by API interface into CompletionStage
-     */
-    private static final class ValueAdapter<R> implements CallAdapter<R, F.Promise<R>> {
-
-        private final Type responseType;
-        private final boolean includeResponse;
-
-        ValueAdapter(Type responseType, boolean includeResponse) {
-            this.responseType = responseType;
-            this.includeResponse = includeResponse;
-        }
-
-        @Override
-        public Type responseType() {
-            return responseType;
-        }
-
-        @Override
-        public F.Promise<R> adapt(final Call<R> call) {
-            final F.RedeemablePromise<R> promise = F.RedeemablePromise.empty();
-
-            call.enqueue(new Callback<R>() {
-
-                @Override
-                public void onResponse(Call<R> call, Response<R> response) {
-                    if (response.isSuccessful()) {
-                        if (includeResponse) {
-                            promise.success((R) response);
-                        } else {
-                            promise.success(response.body());
-                        }
-                    } else {
-                        promise.failure(new HttpException(response));
-                    }
-                }
-
-                @Override
-                public void onFailure(Call<R> call, Throwable t) {
-                    promise.failure(t);
-                }
-
-            });
-
-            return promise;
-        }
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Play24CallFactory.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Play24CallFactory.java
deleted file mode 100644
index 0bcc385af46e..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Play24CallFactory.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package org.openapitools.client;
-
-import okhttp3.*;
-import okio.Buffer;
-import okio.BufferedSource;
-import play.libs.F;
-import play.libs.ws.WSClient;
-import play.libs.ws.WSRequest;
-import play.libs.ws.WSResponse;
-import play.libs.ws.WSCookie;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * Creates {@link Call} instances that invoke underlying {@link WSClient}
- */
-public class Play24CallFactory implements okhttp3.Call.Factory {
-
-    /** PlayWS http client */
-    private final WSClient wsClient;
-
-    /** Extra headers to add to request */
-    private Map<String, String> extraHeaders = new HashMap<>();
-
-    /** Extra cookies to add to request */
-    private Map<String, String> extraCookies = new HashMap<>();
-
-    /** Extra query parameters to add to request */
-    private List<Pair> extraQueryParams = new ArrayList<>();
-
-    public Play24CallFactory(WSClient wsClient) {
-        this.wsClient = wsClient;
-    }
-
-    public Play24CallFactory(WSClient wsClient, Map<String, String> extraHeaders,
-        Map<String, String> extraCookies,
-        List<Pair> extraQueryParams) {
-        this.wsClient = wsClient;
-
-        this.extraHeaders.putAll(extraHeaders);
-        this.extraCookies.putAll(extraCookies);
-        this.extraQueryParams.addAll(extraQueryParams);
-    }
-
-    @Override
-    public Call newCall(Request request) {
-        // add extra headers
-        Request.Builder rb = request.newBuilder();
-        for (Map.Entry<String, String> header : this.extraHeaders.entrySet()) {
-            rb.addHeader(header.getKey(), header.getValue());
-        }
-        for (Map.Entry<String, String> cookie : this.extraCookies.entrySet()) {
-            rb.addHeader("Cookie", String.format("%s=%s", cookie.getKey(), cookie.getValue()));
-        }
-
-        // add extra query params
-        if (!this.extraQueryParams.isEmpty()) {
-            String newQuery = request.url().uri().getQuery();
-            for (Pair queryParam : this.extraQueryParams) {
-                String param = String.format("%s=%s", queryParam.getName(), queryParam.getValue());
-                if (newQuery == null) {
-                    newQuery = param;
-                } else {
-                    newQuery += "&" + param;
-                }
-            }
-
-            URI newUri;
-            try {
-                newUri = new URI(request.url().uri().getScheme(), request.url().uri().getAuthority(),
-                        request.url().uri().getPath(), newQuery, request.url().uri().getFragment());
-                rb.url(newUri.toURL());
-            } catch (MalformedURLException | URISyntaxException e) {
-                throw new RuntimeException("Error while updating an url", e);
-            }
-        }
-
-        return new PlayWSCall(wsClient, rb.build());
-    }
-
-    /**
-     * Call implementation that delegates to Play WS Client
-     */
-    static class PlayWSCall implements Call {
-
-        private final WSClient wsClient;
-        private WSRequest wsRequest;
-
-        private final Request request;
-
-        public PlayWSCall(WSClient wsClient, Request request) {
-            this.wsClient = wsClient;
-            this.request = request;
-        }
-
-        @Override
-        public Request request() {
-            return request;
-        }
-
-        @Override
-        public void enqueue(final okhttp3.Callback responseCallback) {
-            final Call call = this;
-            final F.Promise<WSResponse> promise = executeAsync();
-
-            promise.onRedeem(new F.Callback<WSResponse>() {
-
-                @Override
-                public void invoke(WSResponse wsResponse) throws Throwable {
-                    responseCallback.onResponse(call, PlayWSCall.this.toWSResponse(wsResponse));
-                }
-
-            });
-
-            promise.onFailure(new F.Callback<Throwable>() {
-
-                @Override
-                public void invoke(Throwable throwable) throws Throwable {
-                    if (throwable instanceof IOException) {
-                        responseCallback.onFailure(call, (IOException) throwable);
-                    } else {
-                        responseCallback.onFailure(call, new IOException(throwable));
-                    }
-                }
-
-            });
-
-        }
-
-        F.Promise<WSResponse> executeAsync() {
-            try {
-                wsRequest = wsClient.url(request.url().uri().toString());
-                addHeaders(wsRequest);
-                addCookies(wsRequest);
-                if (request.body() != null) {
-                    addBody(wsRequest);
-                }
-
-                return wsRequest.execute(request.method());
-            } catch (Exception e) {
-                throw new RuntimeException(e.getMessage(), e);
-            }
-        }
-
-        private void addHeaders(WSRequest wsRequest) {
-            for(Map.Entry<String, List<String>> entry : request.headers().toMultimap().entrySet()) {
-                List<String> values = entry.getValue();
-                for (String value : values) {
-                    wsRequest.setHeader(entry.getKey(), value);
-                }
-            }
-        }
-
-        private void addCookies(WSRequest wsRequest) {
-            final List<String> cookies = request.headers("Cookie");
-            if (!cookies.isEmpty()) {
-                String delimiter = "";
-                final StringBuilder cookieHeader = new StringBuilder();
-                for (final String cookie : cookies) {
-                    cookieHeader.append(String.format("%s%s", delimiter, cookie));
-                    delimiter = "; ";
-                }
-                wsRequest.setHeader("Cookie", cookieHeader.toString());
-            }
-        }
-
-        private void addBody(WSRequest wsRequest) throws IOException {
-            Buffer buffer = new Buffer();
-            request.body().writeTo(buffer);
-            wsRequest.setBody(buffer.inputStream());
-            wsRequest.setContentType(request.body().contentType().toString());
-        }
-
-        private Response toWSResponse(final WSResponse r) {
-            final Response.Builder builder = new Response.Builder();
-            builder.request(request)
-                   .code(r.getStatus())
-                   .body(new ResponseBody() {
-
-                       @Override
-                       public MediaType contentType() {
-                           return Optional.ofNullable(r.getHeader("Content-Type"))
-                                          .map(MediaType::parse)
-                                          .orElse(null);
-                       }
-
-                       @Override
-                       public long contentLength() {
-                           return r.asByteArray().length;
-                       }
-
-                       @Override
-                       public BufferedSource source() {
-                           return new Buffer().write(r.asByteArray());
-                       }
-
-                   });
-
-            for (Map.Entry<String, List<String>> entry : r.getAllHeaders().entrySet()) {
-                for (String value : entry.getValue()) {
-                    builder.addHeader(entry.getKey(), value);
-                }
-            }
-            for (final WSCookie cookie : r.getCookies()) {
-                builder.addHeader("Cookie", String.format("%s=%s", cookie.getName(), cookie.getValue()));
-            }
-
-            builder.protocol(Protocol.HTTP_1_1);
-            return builder.build();
-        }
-
-        @Override
-        public Response execute() throws IOException {
-            throw new UnsupportedOperationException("Not supported");
-        }
-
-        @Override
-        public void cancel() {
-            throw new UnsupportedOperationException("Not supported");
-        }
-
-        @Override
-        public PlayWSCall clone() {
-            throw new UnsupportedOperationException("Not supported");
-        }
-
-        @Override
-        public boolean isExecuted() {
-            return false;
-        }
-
-        @Override
-        public boolean isCanceled() {
-            return false;
-        }
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/StringUtil.java
deleted file mode 100644
index 747a23f5bf23..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/StringUtil.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-
-public class StringUtil {
-  /**
-   * Check if the given array contains the given value (with case-insensitive comparison).
-   *
-   * @param array The array
-   * @param value The value to search
-   * @return true if the array contains the value
-   */
-  public static boolean containsIgnoreCase(String[] array, String value) {
-    for (String str : array) {
-      if (value == null && str == null) {
-        return true;
-      }
-      if (value != null && value.equalsIgnoreCase(str)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Join an array of strings with the given separator.
-   * <p>
-   * Note: This might be replaced by utility method from commons-lang or guava someday
-   * if one of those libraries is added as dependency.
-   * </p>
-   *
-   * @param array     The array of strings
-   * @param separator The separator
-   * @return the resulting string
-   */
-  public static String join(String[] array, String separator) {
-    int len = array.length;
-    if (len == 0) {
-      return "";
-    }
-
-    StringBuilder out = new StringBuilder();
-    out.append(array[0]);
-    for (int i = 1; i < len; i++) {
-      out.append(separator).append(array[i]);
-    }
-    return out.toString();
-  }
-
-  /**
-   * Join a list of strings with the given separator.
-   *
-   * @param list      The list of strings
-   * @param separator The separator
-   * @return the resulting string
-   */
-  public static String join(Collection<String> list, String separator) {
-    Iterator<String> iterator = list.iterator();
-    StringBuilder out = new StringBuilder();
-    if (iterator.hasNext()) {
-      out.append(iterator.next());
-    }
-    while (iterator.hasNext()) {
-      out.append(separator).append(iterator.next());
-    }
-    return out.toString();
-  }
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
deleted file mode 100644
index 5af56d72d0d0..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-
-
-import retrofit2.Call;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import org.openapitools.client.model.Client;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import play.libs.F;
-import retrofit2.Response;
-
-public interface AnotherFakeApi {
-  /**
-   * To test special tags
-   * To test special tags and operation ID starting with number
-   * @param body client model (required)
-   * @return Call&lt;Client&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PATCH("another-fake/dummy")
-  F.Promise<Response<Client>> call123testSpecialTags(
-    @retrofit2.http.Body Client body
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/FakeApi.java
deleted file mode 100644
index b1a773c63d71..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/FakeApi.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-
-
-import retrofit2.Call;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import java.math.BigDecimal;
-import org.openapitools.client.model.Client;
-import java.io.File;
-import org.openapitools.client.model.FileSchemaTestClass;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import org.openapitools.client.model.OuterComposite;
-import org.openapitools.client.model.User;
-import org.openapitools.client.model.XmlItem;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import play.libs.F;
-import retrofit2.Response;
-
-public interface FakeApi {
-  /**
-   * creates an XmlItem
-   * this route creates an XmlItem
-   * @param xmlItem XmlItem Body (required)
-   * @return Call&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/xml"
-  })
-  @POST("fake/create_xml_item")
-  F.Promise<Response<Void>> createXmlItem(
-    @retrofit2.http.Body XmlItem xmlItem
-  );
-
-  /**
-   * 
-   * Test serialization of outer boolean types
-   * @param body Input boolean as post body (optional)
-   * @return Call&lt;Boolean&gt;
-   */
-  @POST("fake/outer/boolean")
-  F.Promise<Response<Boolean>> fakeOuterBooleanSerialize(
-    @retrofit2.http.Body Boolean body
-  );
-
-  /**
-   * 
-   * Test serialization of object with outer number type
-   * @param body Input composite as post body (optional)
-   * @return Call&lt;OuterComposite&gt;
-   */
-  @POST("fake/outer/composite")
-  F.Promise<Response<OuterComposite>> fakeOuterCompositeSerialize(
-    @retrofit2.http.Body OuterComposite body
-  );
-
-  /**
-   * 
-   * Test serialization of outer number types
-   * @param body Input number as post body (optional)
-   * @return Call&lt;BigDecimal&gt;
-   */
-  @POST("fake/outer/number")
-  F.Promise<Response<BigDecimal>> fakeOuterNumberSerialize(
-    @retrofit2.http.Body BigDecimal body
-  );
-
-  /**
-   * 
-   * Test serialization of outer string types
-   * @param body Input string as post body (optional)
-   * @return Call&lt;String&gt;
-   */
-  @POST("fake/outer/string")
-  F.Promise<Response<String>> fakeOuterStringSerialize(
-    @retrofit2.http.Body String body
-  );
-
-  /**
-   * 
-   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-   * @param body  (required)
-   * @return Call&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PUT("fake/body-with-file-schema")
-  F.Promise<Response<Void>> testBodyWithFileSchema(
-    @retrofit2.http.Body FileSchemaTestClass body
-  );
-
-  /**
-   * 
-   * 
-   * @param query  (required)
-   * @param body  (required)
-   * @return Call&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PUT("fake/body-with-query-params")
-  F.Promise<Response<Void>> testBodyWithQueryParams(
-    @retrofit2.http.Query("query") String query, @retrofit2.http.Body User body
-  );
-
-  /**
-   * To test \&quot;client\&quot; model
-   * To test \&quot;client\&quot; model
-   * @param body client model (required)
-   * @return Call&lt;Client&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PATCH("fake")
-  F.Promise<Response<Client>> testClientModel(
-    @retrofit2.http.Body Client body
-  );
-
-  /**
-   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-   * @param number None (required)
-   * @param _double None (required)
-   * @param patternWithoutDelimiter None (required)
-   * @param _byte None (required)
-   * @param integer None (optional)
-   * @param int32 None (optional)
-   * @param int64 None (optional)
-   * @param _float None (optional)
-   * @param string None (optional)
-   * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
-   * @param password None (optional)
-   * @param paramCallback None (optional)
-   * @return Call&lt;Void&gt;
-   */
-  @retrofit2.http.FormUrlEncoded
-  @POST("fake")
-  F.Promise<Response<Void>> testEndpointParameters(
-    @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") OffsetDateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback
-  );
-
-  /**
-   * To test enum parameters
-   * To test enum parameters
-   * @param enumHeaderStringArray Header parameter enum test (string array) (optional, default to new ArrayList&lt;&gt;())
-   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
-   * @param enumQueryStringArray Query parameter enum test (string array) (optional, default to new ArrayList&lt;&gt;())
-   * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
-   * @param enumQueryInteger Query parameter enum test (double) (optional)
-   * @param enumQueryDouble Query parameter enum test (double) (optional)
-   * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
-   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
-   * @return Call&lt;Void&gt;
-   */
-  @retrofit2.http.FormUrlEncoded
-  @GET("fake")
-  F.Promise<Response<Void>> testEnumParameters(
-    @retrofit2.http.Header("enum_header_string_array") List<String> enumHeaderStringArray, @retrofit2.http.Header("enum_header_string") String enumHeaderString, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit2.http.Query("enum_query_string") String enumQueryString, @retrofit2.http.Query("enum_query_integer") Integer enumQueryInteger, @retrofit2.http.Query("enum_query_double") Double enumQueryDouble, @retrofit2.http.Field("enum_form_string_array") List<String> enumFormStringArray, @retrofit2.http.Field("enum_form_string") String enumFormString
-  );
-
-  /**
-   * Fake endpoint to test group parameters (optional)
-   * Fake endpoint to test group parameters (optional)
-   * @param requiredStringGroup Required String in group parameters (required)
-   * @param requiredBooleanGroup Required Boolean in group parameters (required)
-   * @param requiredInt64Group Required Integer in group parameters (required)
-   * @param stringGroup String in group parameters (optional)
-   * @param booleanGroup Boolean in group parameters (optional)
-   * @param int64Group Integer in group parameters (optional)
-   * @return Call&lt;Void&gt;
-   */
-  @DELETE("fake")
-  F.Promise<Response<Void>> testGroupParameters(
-    @retrofit2.http.Query("required_string_group") Integer requiredStringGroup, @retrofit2.http.Header("required_boolean_group") Boolean requiredBooleanGroup, @retrofit2.http.Query("required_int64_group") Long requiredInt64Group, @retrofit2.http.Query("string_group") Integer stringGroup, @retrofit2.http.Header("boolean_group") Boolean booleanGroup, @retrofit2.http.Query("int64_group") Long int64Group
-  );
-
-  /**
-   * test inline additionalProperties
-   * 
-   * @param param request body (required)
-   * @return Call&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @POST("fake/inline-additionalProperties")
-  F.Promise<Response<Void>> testInlineAdditionalProperties(
-    @retrofit2.http.Body Map<String, String> param
-  );
-
-  /**
-   * test json serialization of form data
-   * 
-   * @param param field1 (required)
-   * @param param2 field2 (required)
-   * @return Call&lt;Void&gt;
-   */
-  @retrofit2.http.FormUrlEncoded
-  @GET("fake/jsonFormData")
-  F.Promise<Response<Void>> testJsonFormData(
-    @retrofit2.http.Field("param") String param, @retrofit2.http.Field("param2") String param2
-  );
-
-  /**
-   * 
-   * To test the collection format in query parameters
-   * @param pipe  (required)
-   * @param ioutil  (required)
-   * @param http  (required)
-   * @param url  (required)
-   * @param context  (required)
-   * @return Call&lt;Void&gt;
-   */
-  @PUT("fake/test-query-paramters")
-  F.Promise<Response<Void>> testQueryParameterCollectionFormat(
-    @retrofit2.http.Query("pipe") CSVParams pipe, @retrofit2.http.Query("ioutil") CSVParams ioutil, @retrofit2.http.Query("http") SSVParams http, @retrofit2.http.Query("url") CSVParams url, @retrofit2.http.Query("context") List<String> context
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
deleted file mode 100644
index 111f24e7b96e..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-
-
-import retrofit2.Call;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import org.openapitools.client.model.Client;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import play.libs.F;
-import retrofit2.Response;
-
-public interface FakeClassnameTags123Api {
-  /**
-   * To test class name in snake case
-   * To test class name in snake case
-   * @param body client model (required)
-   * @return Call&lt;Client&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PATCH("fake_classname_test")
-  F.Promise<Response<Client>> testClassname(
-    @retrofit2.http.Body Client body
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/PetApi.java
deleted file mode 100644
index 09fcc52ba254..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/PetApi.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-
-
-import retrofit2.Call;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import java.io.File;
-import org.openapitools.client.model.ModelApiResponse;
-import org.openapitools.client.model.Pet;
-import java.util.Set;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import play.libs.F;
-import retrofit2.Response;
-
-public interface PetApi {
-  /**
-   * Add a new pet to the store
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @return Call&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @POST("pet")
-  F.Promise<Response<Void>> addPet(
-    @retrofit2.http.Body Pet body
-  );
-
-  /**
-   * Deletes a pet
-   * 
-   * @param petId Pet id to delete (required)
-   * @param apiKey  (optional)
-   * @return Call&lt;Void&gt;
-   */
-  @DELETE("pet/{petId}")
-  F.Promise<Response<Void>> deletePet(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Header("api_key") String apiKey
-  );
-
-  /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma separated strings
-   * @param status Status values that need to be considered for filter (required)
-   * @return Call&lt;List&lt;Pet&gt;&gt;
-   */
-  @GET("pet/findByStatus")
-  F.Promise<Response<List<Pet>>> findPetsByStatus(
-    @retrofit2.http.Query("status") CSVParams status
-  );
-
-  /**
-   * Finds Pets by tags
-   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by (required)
-   * @return Call&lt;Set&lt;Pet&gt;&gt;
-   */
-  @GET("pet/findByTags")
-  F.Promise<Response<Set<Pet>>> findPetsByTags(
-    @retrofit2.http.Query("tags") CSVParams tags
-  );
-
-  /**
-   * Find pet by ID
-   * Returns a single pet
-   * @param petId ID of pet to return (required)
-   * @return Call&lt;Pet&gt;
-   */
-  @GET("pet/{petId}")
-  F.Promise<Response<Pet>> getPetById(
-    @retrofit2.http.Path("petId") Long petId
-  );
-
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @return Call&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PUT("pet")
-  F.Promise<Response<Void>> updatePet(
-    @retrofit2.http.Body Pet body
-  );
-
-  /**
-   * Updates a pet in the store with form data
-   * 
-   * @param petId ID of pet that needs to be updated (required)
-   * @param name Updated name of the pet (optional)
-   * @param status Updated status of the pet (optional)
-   * @return Call&lt;Void&gt;
-   */
-  @retrofit2.http.FormUrlEncoded
-  @POST("pet/{petId}")
-  F.Promise<Response<Void>> updatePetWithForm(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Field("name") String name, @retrofit2.http.Field("status") String status
-  );
-
-  /**
-   * uploads an image
-   * 
-   * @param petId ID of pet to update (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @param file file to upload (optional)
-   * @return Call&lt;ModelApiResponse&gt;
-   */
-  @retrofit2.http.Multipart
-  @POST("pet/{petId}/uploadImage")
-  F.Promise<Response<ModelApiResponse>> uploadFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
-  );
-
-  /**
-   * uploads an image (required)
-   * 
-   * @param petId ID of pet to update (required)
-   * @param requiredFile file to upload (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @return Call&lt;ModelApiResponse&gt;
-   */
-  @retrofit2.http.Multipart
-  @POST("fake/{petId}/uploadImageWithRequiredFile")
-  F.Promise<Response<ModelApiResponse>> uploadFileWithRequiredFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/StoreApi.java
deleted file mode 100644
index 92eab00b6eb6..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/StoreApi.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-
-
-import retrofit2.Call;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import org.openapitools.client.model.Order;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import play.libs.F;
-import retrofit2.Response;
-
-public interface StoreApi {
-  /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted (required)
-   * @return Call&lt;Void&gt;
-   */
-  @DELETE("store/order/{order_id}")
-  F.Promise<Response<Void>> deleteOrder(
-    @retrofit2.http.Path("order_id") String orderId
-  );
-
-  /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return Call&lt;Map&lt;String, Integer&gt;&gt;
-   */
-  @GET("store/inventory")
-  F.Promise<Response<Map<String, Integer>>> getInventory();
-    
-
-  /**
-   * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched (required)
-   * @return Call&lt;Order&gt;
-   */
-  @GET("store/order/{order_id}")
-  F.Promise<Response<Order>> getOrderById(
-    @retrofit2.http.Path("order_id") Long orderId
-  );
-
-  /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet (required)
-   * @return Call&lt;Order&gt;
-   */
-  @POST("store/order")
-  F.Promise<Response<Order>> placeOrder(
-    @retrofit2.http.Body Order body
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/UserApi.java
deleted file mode 100644
index 3a3d0b974a7d..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/UserApi.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-
-
-import retrofit2.Call;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import org.openapitools.client.model.User;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import play.libs.F;
-import retrofit2.Response;
-
-public interface UserApi {
-  /**
-   * Create user
-   * This can only be done by the logged in user.
-   * @param body Created user object (required)
-   * @return Call&lt;Void&gt;
-   */
-  @POST("user")
-  F.Promise<Response<Void>> createUser(
-    @retrofit2.http.Body User body
-  );
-
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @return Call&lt;Void&gt;
-   */
-  @POST("user/createWithArray")
-  F.Promise<Response<Void>> createUsersWithArrayInput(
-    @retrofit2.http.Body List<User> body
-  );
-
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @return Call&lt;Void&gt;
-   */
-  @POST("user/createWithList")
-  F.Promise<Response<Void>> createUsersWithListInput(
-    @retrofit2.http.Body List<User> body
-  );
-
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted (required)
-   * @return Call&lt;Void&gt;
-   */
-  @DELETE("user/{username}")
-  F.Promise<Response<Void>> deleteUser(
-    @retrofit2.http.Path("username") String username
-  );
-
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
-   * @return Call&lt;User&gt;
-   */
-  @GET("user/{username}")
-  F.Promise<Response<User>> getUserByName(
-    @retrofit2.http.Path("username") String username
-  );
-
-  /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login (required)
-   * @param password The password for login in clear text (required)
-   * @return Call&lt;String&gt;
-   */
-  @GET("user/login")
-  F.Promise<Response<String>> loginUser(
-    @retrofit2.http.Query("username") String username, @retrofit2.http.Query("password") String password
-  );
-
-  /**
-   * Logs out current logged in user session
-   * 
-   * @return Call&lt;Void&gt;
-   */
-  @GET("user/logout")
-  F.Promise<Response<Void>> logoutUser();
-    
-
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted (required)
-   * @param body Updated user object (required)
-   * @return Call&lt;Void&gt;
-   */
-  @PUT("user/{username}")
-  F.Promise<Response<Void>> updateUser(
-    @retrofit2.http.Path("username") String username, @retrofit2.http.Body User body
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
deleted file mode 100644
index 809a01a97878..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.auth;
-
-import org.openapitools.client.Pair;
-
-import java.util.Map;
-import java.util.List;
-
-/**
- * Holds ApiKey auth info
- */
-
-public class ApiKeyAuth implements Authentication {
-  private final String location;
-  private final String paramName;
-
-  private String apiKey;
-  private String apiKeyPrefix;
-
-  public ApiKeyAuth(String location, String paramName) {
-    this.location = location;
-    this.paramName = paramName;
-  }
-
-  public String getLocation() {
-    return location;
-  }
-
-  public String getParamName() {
-    return paramName;
-  }
-
-  public String getApiKey() {
-    return apiKey;
-  }
-
-  public void setApiKey(String apiKey) {
-    this.apiKey = apiKey;
-  }
-
-  public String getApiKeyPrefix() {
-    return apiKeyPrefix;
-  }
-
-  public void setApiKeyPrefix(String apiKeyPrefix) {
-    this.apiKeyPrefix = apiKeyPrefix;
-  }
-
-  @Override
-  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams) {
-    if (apiKey == null) {
-      return;
-    }
-    String value;
-    if (apiKeyPrefix != null) {
-      value = apiKeyPrefix + " " + apiKey;
-    } else {
-      value = apiKey;
-    }
-    if ("query".equals(location)) {
-      queryParams.add(new Pair(paramName, value));
-    } else if ("header".equals(location)) {
-      headerParams.put(paramName, value);
-    } else if ("cookie".equals(location)) {
-      cookieParams.put(paramName, value);
-    }
-  }
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/auth/Authentication.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/auth/Authentication.java
deleted file mode 100644
index 5c558b1d5abd..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/auth/Authentication.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.auth;
-
-import org.openapitools.client.Pair;
-
-import java.util.Map;
-import java.util.List;
-
-public interface Authentication {
-    /**
-     * Apply authentication settings to header and query params.
-     *
-     * @param queryParams List of query parameters
-     * @param headerParams Map of header parameters
-     * @param cookieParams Map of cookie parameters
-     */
-    void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams);
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
deleted file mode 100644
index 0967f96bd1dc..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesAnyType
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesAnyType name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
-    return Objects.equals(this.name, additionalPropertiesAnyType.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesAnyType {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
deleted file mode 100644
index 9071c582806e..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesArray
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesArray.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesArray extends HashMap<String, List> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesArray name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
-    return Objects.equals(this.name, additionalPropertiesArray.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesArray {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
deleted file mode 100644
index 8f134e614a87..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesBoolean
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesBoolean name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
-    return Objects.equals(this.name, additionalPropertiesBoolean.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesBoolean {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
deleted file mode 100644
index 294c05c7334c..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesClass
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_STRING,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_NUMBER,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_INTEGER,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_BOOLEAN,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_INTEGER,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_ANYTYPE,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_STRING,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_ANYTYPE,
-  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE1,
-  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
-  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
-})
-
-public class AdditionalPropertiesClass {
-  public static final String JSON_PROPERTY_MAP_STRING = "map_string";
-  private Map<String, String> mapString = null;
-
-  public static final String JSON_PROPERTY_MAP_NUMBER = "map_number";
-  private Map<String, BigDecimal> mapNumber = null;
-
-  public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer";
-  private Map<String, Integer> mapInteger = null;
-
-  public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean";
-  private Map<String, Boolean> mapBoolean = null;
-
-  public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer";
-  private Map<String, List<Integer>> mapArrayInteger = null;
-
-  public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype";
-  private Map<String, List<Object>> mapArrayAnytype = null;
-
-  public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string";
-  private Map<String, Map<String, String>> mapMapString = null;
-
-  public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype";
-  private Map<String, Map<String, Object>> mapMapAnytype = null;
-
-  public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1";
-  private Object anytype1;
-
-  public static final String JSON_PROPERTY_ANYTYPE2 = "anytype_2";
-  private Object anytype2;
-
-  public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3";
-  private Object anytype3;
-
-
-  public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
-    
-    this.mapString = mapString;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) {
-    if (this.mapString == null) {
-      this.mapString = new HashMap<>();
-    }
-    this.mapString.put(key, mapStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapString
-   * @return mapString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, String> getMapString() {
-    return mapString;
-  }
-
-
-  public void setMapString(Map<String, String> mapString) {
-    this.mapString = mapString;
-  }
-
-
-  public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
-    
-    this.mapNumber = mapNumber;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) {
-    if (this.mapNumber == null) {
-      this.mapNumber = new HashMap<>();
-    }
-    this.mapNumber.put(key, mapNumberItem);
-    return this;
-  }
-
-   /**
-   * Get mapNumber
-   * @return mapNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, BigDecimal> getMapNumber() {
-    return mapNumber;
-  }
-
-
-  public void setMapNumber(Map<String, BigDecimal> mapNumber) {
-    this.mapNumber = mapNumber;
-  }
-
-
-  public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
-    
-    this.mapInteger = mapInteger;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) {
-    if (this.mapInteger == null) {
-      this.mapInteger = new HashMap<>();
-    }
-    this.mapInteger.put(key, mapIntegerItem);
-    return this;
-  }
-
-   /**
-   * Get mapInteger
-   * @return mapInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Integer> getMapInteger() {
-    return mapInteger;
-  }
-
-
-  public void setMapInteger(Map<String, Integer> mapInteger) {
-    this.mapInteger = mapInteger;
-  }
-
-
-  public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
-    
-    this.mapBoolean = mapBoolean;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) {
-    if (this.mapBoolean == null) {
-      this.mapBoolean = new HashMap<>();
-    }
-    this.mapBoolean.put(key, mapBooleanItem);
-    return this;
-  }
-
-   /**
-   * Get mapBoolean
-   * @return mapBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Boolean> getMapBoolean() {
-    return mapBoolean;
-  }
-
-
-  public void setMapBoolean(Map<String, Boolean> mapBoolean) {
-    this.mapBoolean = mapBoolean;
-  }
-
-
-  public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
-    
-    this.mapArrayInteger = mapArrayInteger;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer> mapArrayIntegerItem) {
-    if (this.mapArrayInteger == null) {
-      this.mapArrayInteger = new HashMap<>();
-    }
-    this.mapArrayInteger.put(key, mapArrayIntegerItem);
-    return this;
-  }
-
-   /**
-   * Get mapArrayInteger
-   * @return mapArrayInteger
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, List<Integer>> getMapArrayInteger() {
-    return mapArrayInteger;
-  }
-
-
-  public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
-    this.mapArrayInteger = mapArrayInteger;
-  }
-
-
-  public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
-    
-    this.mapArrayAnytype = mapArrayAnytype;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object> mapArrayAnytypeItem) {
-    if (this.mapArrayAnytype == null) {
-      this.mapArrayAnytype = new HashMap<>();
-    }
-    this.mapArrayAnytype.put(key, mapArrayAnytypeItem);
-    return this;
-  }
-
-   /**
-   * Get mapArrayAnytype
-   * @return mapArrayAnytype
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, List<Object>> getMapArrayAnytype() {
-    return mapArrayAnytype;
-  }
-
-
-  public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
-    this.mapArrayAnytype = mapArrayAnytype;
-  }
-
-
-  public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> mapMapString) {
-    
-    this.mapMapString = mapMapString;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, String> mapMapStringItem) {
-    if (this.mapMapString == null) {
-      this.mapMapString = new HashMap<>();
-    }
-    this.mapMapString.put(key, mapMapStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapMapString
-   * @return mapMapString
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Map<String, String>> getMapMapString() {
-    return mapMapString;
-  }
-
-
-  public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
-    this.mapMapString = mapMapString;
-  }
-
-
-  public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
-    
-    this.mapMapAnytype = mapMapAnytype;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Object> mapMapAnytypeItem) {
-    if (this.mapMapAnytype == null) {
-      this.mapMapAnytype = new HashMap<>();
-    }
-    this.mapMapAnytype.put(key, mapMapAnytypeItem);
-    return this;
-  }
-
-   /**
-   * Get mapMapAnytype
-   * @return mapMapAnytype
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Map<String, Object>> getMapMapAnytype() {
-    return mapMapAnytype;
-  }
-
-
-  public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
-    this.mapMapAnytype = mapMapAnytype;
-  }
-
-
-  public AdditionalPropertiesClass anytype1(Object anytype1) {
-    
-    this.anytype1 = anytype1;
-    return this;
-  }
-
-   /**
-   * Get anytype1
-   * @return anytype1
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Object getAnytype1() {
-    return anytype1;
-  }
-
-
-  public void setAnytype1(Object anytype1) {
-    this.anytype1 = anytype1;
-  }
-
-
-  public AdditionalPropertiesClass anytype2(Object anytype2) {
-    
-    this.anytype2 = anytype2;
-    return this;
-  }
-
-   /**
-   * Get anytype2
-   * @return anytype2
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ANYTYPE2)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Object getAnytype2() {
-    return anytype2;
-  }
-
-
-  public void setAnytype2(Object anytype2) {
-    this.anytype2 = anytype2;
-  }
-
-
-  public AdditionalPropertiesClass anytype3(Object anytype3) {
-    
-    this.anytype3 = anytype3;
-    return this;
-  }
-
-   /**
-   * Get anytype3
-   * @return anytype3
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ANYTYPE3)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Object getAnytype3() {
-    return anytype3;
-  }
-
-
-  public void setAnytype3(Object anytype3) {
-    this.anytype3 = anytype3;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
-    return Objects.equals(this.mapString, additionalPropertiesClass.mapString) &&
-        Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) &&
-        Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) &&
-        Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) &&
-        Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) &&
-        Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) &&
-        Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) &&
-        Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) &&
-        Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) &&
-        Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) &&
-        Objects.equals(this.anytype3, additionalPropertiesClass.anytype3);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesClass {\n");
-    sb.append("    mapString: ").append(toIndentedString(mapString)).append("\n");
-    sb.append("    mapNumber: ").append(toIndentedString(mapNumber)).append("\n");
-    sb.append("    mapInteger: ").append(toIndentedString(mapInteger)).append("\n");
-    sb.append("    mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n");
-    sb.append("    mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n");
-    sb.append("    mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n");
-    sb.append("    mapMapString: ").append(toIndentedString(mapMapString)).append("\n");
-    sb.append("    mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n");
-    sb.append("    anytype1: ").append(toIndentedString(anytype1)).append("\n");
-    sb.append("    anytype2: ").append(toIndentedString(anytype2)).append("\n");
-    sb.append("    anytype3: ").append(toIndentedString(anytype3)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
deleted file mode 100644
index 94d4ece0c37f..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesInteger
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesInteger.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesInteger name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
-    return Objects.equals(this.name, additionalPropertiesInteger.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesInteger {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
deleted file mode 100644
index 21088ae74341..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesNumber
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesNumber.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesNumber name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
-    return Objects.equals(this.name, additionalPropertiesNumber.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesNumber {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
deleted file mode 100644
index 58780e577cb5..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesObject
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesObject.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesObject extends HashMap<String, Map> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesObject name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o;
-    return Objects.equals(this.name, additionalPropertiesObject.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesObject {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
deleted file mode 100644
index f3ece0e27ed3..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesString
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesString.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesString extends HashMap<String, String> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesString name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o;
-    return Objects.equals(this.name, additionalPropertiesString.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesString {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Animal.java
deleted file mode 100644
index 854f1a7e969e..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Animal.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.BigCat;
-import org.openapitools.client.model.Cat;
-import org.openapitools.client.model.Dog;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Animal
- */
-@JsonPropertyOrder({
-  Animal.JSON_PROPERTY_CLASS_NAME,
-  Animal.JSON_PROPERTY_COLOR
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
-  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
-})
-
-public class Animal {
-  public static final String JSON_PROPERTY_CLASS_NAME = "className";
-  protected String className;
-
-  public static final String JSON_PROPERTY_COLOR = "color";
-  private String color = "red";
-
-
-  public Animal className(String className) {
-    
-    this.className = className;
-    return this;
-  }
-
-   /**
-   * Get className
-   * @return className
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getClassName() {
-    return className;
-  }
-
-
-  public void setClassName(String className) {
-    this.className = className;
-  }
-
-
-  public Animal color(String color) {
-    
-    this.color = color;
-    return this;
-  }
-
-   /**
-   * Get color
-   * @return color
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_COLOR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getColor() {
-    return color;
-  }
-
-
-  public void setColor(String color) {
-    this.color = color;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Animal animal = (Animal) o;
-    return Objects.equals(this.className, animal.className) &&
-        Objects.equals(this.color, animal.color);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(className, color);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Animal {\n");
-    sb.append("    className: ").append(toIndentedString(className)).append("\n");
-    sb.append("    color: ").append(toIndentedString(color)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
deleted file mode 100644
index 937459512853..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * ArrayOfArrayOfNumberOnly
- */
-@JsonPropertyOrder({
-  ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
-})
-
-public class ArrayOfArrayOfNumberOnly {
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
-  private List<List<BigDecimal>> arrayArrayNumber = null;
-
-
-  public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
-    
-    this.arrayArrayNumber = arrayArrayNumber;
-    return this;
-  }
-
-  public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
-    if (this.arrayArrayNumber == null) {
-      this.arrayArrayNumber = new ArrayList<>();
-    }
-    this.arrayArrayNumber.add(arrayArrayNumberItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayNumber
-   * @return arrayArrayNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<List<BigDecimal>> getArrayArrayNumber() {
-    return arrayArrayNumber;
-  }
-
-
-  public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
-    this.arrayArrayNumber = arrayArrayNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o;
-    return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayArrayNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayOfArrayOfNumberOnly {\n");
-    sb.append("    arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
deleted file mode 100644
index 1658e7153006..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * ArrayOfNumberOnly
- */
-@JsonPropertyOrder({
-  ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
-})
-
-public class ArrayOfNumberOnly {
-  public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
-  private List<BigDecimal> arrayNumber = null;
-
-
-  public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
-    
-    this.arrayNumber = arrayNumber;
-    return this;
-  }
-
-  public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
-    if (this.arrayNumber == null) {
-      this.arrayNumber = new ArrayList<>();
-    }
-    this.arrayNumber.add(arrayNumberItem);
-    return this;
-  }
-
-   /**
-   * Get arrayNumber
-   * @return arrayNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<BigDecimal> getArrayNumber() {
-    return arrayNumber;
-  }
-
-
-  public void setArrayNumber(List<BigDecimal> arrayNumber) {
-    this.arrayNumber = arrayNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o;
-    return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayOfNumberOnly {\n");
-    sb.append("    arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayTest.java
deleted file mode 100644
index de001c2ec5e7..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.client.model.ReadOnlyFirst;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * ArrayTest
- */
-@JsonPropertyOrder({
-  ArrayTest.JSON_PROPERTY_ARRAY_OF_STRING,
-  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
-  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
-})
-
-public class ArrayTest {
-  public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
-  private List<String> arrayOfString = null;
-
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
-  private List<List<Long>> arrayArrayOfInteger = null;
-
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
-  private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
-
-
-  public ArrayTest arrayOfString(List<String> arrayOfString) {
-    
-    this.arrayOfString = arrayOfString;
-    return this;
-  }
-
-  public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
-    if (this.arrayOfString == null) {
-      this.arrayOfString = new ArrayList<>();
-    }
-    this.arrayOfString.add(arrayOfStringItem);
-    return this;
-  }
-
-   /**
-   * Get arrayOfString
-   * @return arrayOfString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<String> getArrayOfString() {
-    return arrayOfString;
-  }
-
-
-  public void setArrayOfString(List<String> arrayOfString) {
-    this.arrayOfString = arrayOfString;
-  }
-
-
-  public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
-    
-    this.arrayArrayOfInteger = arrayArrayOfInteger;
-    return this;
-  }
-
-  public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
-    if (this.arrayArrayOfInteger == null) {
-      this.arrayArrayOfInteger = new ArrayList<>();
-    }
-    this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayOfInteger
-   * @return arrayArrayOfInteger
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<List<Long>> getArrayArrayOfInteger() {
-    return arrayArrayOfInteger;
-  }
-
-
-  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
-    this.arrayArrayOfInteger = arrayArrayOfInteger;
-  }
-
-
-  public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
-    
-    this.arrayArrayOfModel = arrayArrayOfModel;
-    return this;
-  }
-
-  public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
-    if (this.arrayArrayOfModel == null) {
-      this.arrayArrayOfModel = new ArrayList<>();
-    }
-    this.arrayArrayOfModel.add(arrayArrayOfModelItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayOfModel
-   * @return arrayArrayOfModel
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
-    return arrayArrayOfModel;
-  }
-
-
-  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
-    this.arrayArrayOfModel = arrayArrayOfModel;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayTest arrayTest = (ArrayTest) o;
-    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
-        Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
-        Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayTest {\n");
-    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
-    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
-    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/BigCat.java
deleted file mode 100644
index bc2a449ff8d4..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/BigCat.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.BigCatAllOf;
-import org.openapitools.client.model.Cat;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * BigCat
- */
-@JsonPropertyOrder({
-  BigCat.JSON_PROPERTY_KIND
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-})
-
-public class BigCat extends Cat {
-  /**
-   * Gets or Sets kind
-   */
-  public enum KindEnum {
-    LIONS("lions"),
-    
-    TIGERS("tigers"),
-    
-    LEOPARDS("leopards"),
-    
-    JAGUARS("jaguars");
-
-    private String value;
-
-    KindEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static KindEnum fromValue(String value) {
-      for (KindEnum b : KindEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_KIND = "kind";
-  private KindEnum kind;
-
-
-  public BigCat kind(KindEnum kind) {
-    
-    this.kind = kind;
-    return this;
-  }
-
-   /**
-   * Get kind
-   * @return kind
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_KIND)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public KindEnum getKind() {
-    return kind;
-  }
-
-
-  public void setKind(KindEnum kind) {
-    this.kind = kind;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BigCat bigCat = (BigCat) o;
-    return Objects.equals(this.kind, bigCat.kind) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(kind, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BigCat {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/BigCatAllOf.java
deleted file mode 100644
index 754e37125b36..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * BigCatAllOf
- */
-@JsonPropertyOrder({
-  BigCatAllOf.JSON_PROPERTY_KIND
-})
-
-public class BigCatAllOf {
-  /**
-   * Gets or Sets kind
-   */
-  public enum KindEnum {
-    LIONS("lions"),
-    
-    TIGERS("tigers"),
-    
-    LEOPARDS("leopards"),
-    
-    JAGUARS("jaguars");
-
-    private String value;
-
-    KindEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static KindEnum fromValue(String value) {
-      for (KindEnum b : KindEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_KIND = "kind";
-  private KindEnum kind;
-
-
-  public BigCatAllOf kind(KindEnum kind) {
-    
-    this.kind = kind;
-    return this;
-  }
-
-   /**
-   * Get kind
-   * @return kind
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_KIND)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public KindEnum getKind() {
-    return kind;
-  }
-
-
-  public void setKind(KindEnum kind) {
-    this.kind = kind;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BigCatAllOf bigCatAllOf = (BigCatAllOf) o;
-    return Objects.equals(this.kind, bigCatAllOf.kind);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(kind);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BigCatAllOf {\n");
-    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Capitalization.java
deleted file mode 100644
index 28c74d28c020..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Capitalization.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Capitalization
- */
-@JsonPropertyOrder({
-  Capitalization.JSON_PROPERTY_SMALL_CAMEL,
-  Capitalization.JSON_PROPERTY_CAPITAL_CAMEL,
-  Capitalization.JSON_PROPERTY_SMALL_SNAKE,
-  Capitalization.JSON_PROPERTY_CAPITAL_SNAKE,
-  Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
-  Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
-})
-
-public class Capitalization {
-  public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
-  private String smallCamel;
-
-  public static final String JSON_PROPERTY_CAPITAL_CAMEL = "CapitalCamel";
-  private String capitalCamel;
-
-  public static final String JSON_PROPERTY_SMALL_SNAKE = "small_Snake";
-  private String smallSnake;
-
-  public static final String JSON_PROPERTY_CAPITAL_SNAKE = "Capital_Snake";
-  private String capitalSnake;
-
-  public static final String JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points";
-  private String scAETHFlowPoints;
-
-  public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME";
-  private String ATT_NAME;
-
-
-  public Capitalization smallCamel(String smallCamel) {
-    
-    this.smallCamel = smallCamel;
-    return this;
-  }
-
-   /**
-   * Get smallCamel
-   * @return smallCamel
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getSmallCamel() {
-    return smallCamel;
-  }
-
-
-  public void setSmallCamel(String smallCamel) {
-    this.smallCamel = smallCamel;
-  }
-
-
-  public Capitalization capitalCamel(String capitalCamel) {
-    
-    this.capitalCamel = capitalCamel;
-    return this;
-  }
-
-   /**
-   * Get capitalCamel
-   * @return capitalCamel
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getCapitalCamel() {
-    return capitalCamel;
-  }
-
-
-  public void setCapitalCamel(String capitalCamel) {
-    this.capitalCamel = capitalCamel;
-  }
-
-
-  public Capitalization smallSnake(String smallSnake) {
-    
-    this.smallSnake = smallSnake;
-    return this;
-  }
-
-   /**
-   * Get smallSnake
-   * @return smallSnake
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getSmallSnake() {
-    return smallSnake;
-  }
-
-
-  public void setSmallSnake(String smallSnake) {
-    this.smallSnake = smallSnake;
-  }
-
-
-  public Capitalization capitalSnake(String capitalSnake) {
-    
-    this.capitalSnake = capitalSnake;
-    return this;
-  }
-
-   /**
-   * Get capitalSnake
-   * @return capitalSnake
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getCapitalSnake() {
-    return capitalSnake;
-  }
-
-
-  public void setCapitalSnake(String capitalSnake) {
-    this.capitalSnake = capitalSnake;
-  }
-
-
-  public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
-    
-    this.scAETHFlowPoints = scAETHFlowPoints;
-    return this;
-  }
-
-   /**
-   * Get scAETHFlowPoints
-   * @return scAETHFlowPoints
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getScAETHFlowPoints() {
-    return scAETHFlowPoints;
-  }
-
-
-  public void setScAETHFlowPoints(String scAETHFlowPoints) {
-    this.scAETHFlowPoints = scAETHFlowPoints;
-  }
-
-
-  public Capitalization ATT_NAME(String ATT_NAME) {
-    
-    this.ATT_NAME = ATT_NAME;
-    return this;
-  }
-
-   /**
-   * Name of the pet 
-   * @return ATT_NAME
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Name of the pet ")
-  @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getATTNAME() {
-    return ATT_NAME;
-  }
-
-
-  public void setATTNAME(String ATT_NAME) {
-    this.ATT_NAME = ATT_NAME;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Capitalization capitalization = (Capitalization) o;
-    return Objects.equals(this.smallCamel, capitalization.smallCamel) &&
-        Objects.equals(this.capitalCamel, capitalization.capitalCamel) &&
-        Objects.equals(this.smallSnake, capitalization.smallSnake) &&
-        Objects.equals(this.capitalSnake, capitalization.capitalSnake) &&
-        Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) &&
-        Objects.equals(this.ATT_NAME, capitalization.ATT_NAME);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Capitalization {\n");
-    sb.append("    smallCamel: ").append(toIndentedString(smallCamel)).append("\n");
-    sb.append("    capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n");
-    sb.append("    smallSnake: ").append(toIndentedString(smallSnake)).append("\n");
-    sb.append("    capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n");
-    sb.append("    scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n");
-    sb.append("    ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java
deleted file mode 100644
index fcb521ba34e8..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Animal;
-import org.openapitools.client.model.BigCat;
-import org.openapitools.client.model.CatAllOf;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Cat
- */
-@JsonPropertyOrder({
-  Cat.JSON_PROPERTY_DECLAWED
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
-})
-
-public class Cat extends Animal {
-  public static final String JSON_PROPERTY_DECLAWED = "declawed";
-  private Boolean declawed;
-
-
-  public Cat declawed(Boolean declawed) {
-    
-    this.declawed = declawed;
-    return this;
-  }
-
-   /**
-   * Get declawed
-   * @return declawed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DECLAWED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getDeclawed() {
-    return declawed;
-  }
-
-
-  public void setDeclawed(Boolean declawed) {
-    this.declawed = declawed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Cat cat = (Cat) o;
-    return Objects.equals(this.declawed, cat.declawed) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(declawed, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Cat {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/CatAllOf.java
deleted file mode 100644
index f62c8936adc4..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * CatAllOf
- */
-@JsonPropertyOrder({
-  CatAllOf.JSON_PROPERTY_DECLAWED
-})
-
-public class CatAllOf {
-  public static final String JSON_PROPERTY_DECLAWED = "declawed";
-  private Boolean declawed;
-
-
-  public CatAllOf declawed(Boolean declawed) {
-    
-    this.declawed = declawed;
-    return this;
-  }
-
-   /**
-   * Get declawed
-   * @return declawed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DECLAWED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getDeclawed() {
-    return declawed;
-  }
-
-
-  public void setDeclawed(Boolean declawed) {
-    this.declawed = declawed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CatAllOf catAllOf = (CatAllOf) o;
-    return Objects.equals(this.declawed, catAllOf.declawed);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(declawed);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CatAllOf {\n");
-    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Category.java
deleted file mode 100644
index 35816bb041f2..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Category.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Category
- */
-@JsonPropertyOrder({
-  Category.JSON_PROPERTY_ID,
-  Category.JSON_PROPERTY_NAME
-})
-
-public class Category {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name = "default-name";
-
-
-  public Category id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Category name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Category category = (Category) o;
-    return Objects.equals(this.id, category.id) &&
-        Objects.equals(this.name, category.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Category {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ClassModel.java
deleted file mode 100644
index b4f2d9795ecd..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ClassModel.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Model for testing model with \&quot;_class\&quot; property
- */
-@ApiModel(description = "Model for testing model with \"_class\" property")
-@JsonPropertyOrder({
-  ClassModel.JSON_PROPERTY_PROPERTY_CLASS
-})
-
-public class ClassModel {
-  public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
-  private String propertyClass;
-
-
-  public ClassModel propertyClass(String propertyClass) {
-    
-    this.propertyClass = propertyClass;
-    return this;
-  }
-
-   /**
-   * Get propertyClass
-   * @return propertyClass
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPropertyClass() {
-    return propertyClass;
-  }
-
-
-  public void setPropertyClass(String propertyClass) {
-    this.propertyClass = propertyClass;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ClassModel classModel = (ClassModel) o;
-    return Objects.equals(this.propertyClass, classModel.propertyClass);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(propertyClass);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ClassModel {\n");
-    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Client.java
deleted file mode 100644
index be3c219200f8..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Client.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Client
- */
-@JsonPropertyOrder({
-  Client.JSON_PROPERTY_CLIENT
-})
-
-public class Client {
-  public static final String JSON_PROPERTY_CLIENT = "client";
-  private String client;
-
-
-  public Client client(String client) {
-    
-    this.client = client;
-    return this;
-  }
-
-   /**
-   * Get client
-   * @return client
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CLIENT)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getClient() {
-    return client;
-  }
-
-
-  public void setClient(String client) {
-    this.client = client;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Client client = (Client) o;
-    return Objects.equals(this.client, client.client);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(client);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Client {\n");
-    sb.append("    client: ").append(toIndentedString(client)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java
deleted file mode 100644
index 754fa0230879..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Animal;
-import org.openapitools.client.model.DogAllOf;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Dog
- */
-@JsonPropertyOrder({
-  Dog.JSON_PROPERTY_BREED
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-})
-
-public class Dog extends Animal {
-  public static final String JSON_PROPERTY_BREED = "breed";
-  private String breed;
-
-
-  public Dog breed(String breed) {
-    
-    this.breed = breed;
-    return this;
-  }
-
-   /**
-   * Get breed
-   * @return breed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BREED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBreed() {
-    return breed;
-  }
-
-
-  public void setBreed(String breed) {
-    this.breed = breed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Dog dog = (Dog) o;
-    return Objects.equals(this.breed, dog.breed) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(breed, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Dog {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/DogAllOf.java
deleted file mode 100644
index 62c3b1969449..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * DogAllOf
- */
-@JsonPropertyOrder({
-  DogAllOf.JSON_PROPERTY_BREED
-})
-
-public class DogAllOf {
-  public static final String JSON_PROPERTY_BREED = "breed";
-  private String breed;
-
-
-  public DogAllOf breed(String breed) {
-    
-    this.breed = breed;
-    return this;
-  }
-
-   /**
-   * Get breed
-   * @return breed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BREED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBreed() {
-    return breed;
-  }
-
-
-  public void setBreed(String breed) {
-    this.breed = breed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    DogAllOf dogAllOf = (DogAllOf) o;
-    return Objects.equals(this.breed, dogAllOf.breed);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(breed);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class DogAllOf {\n");
-    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumArrays.java
deleted file mode 100644
index 8a54b50f5226..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * EnumArrays
- */
-@JsonPropertyOrder({
-  EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
-  EnumArrays.JSON_PROPERTY_ARRAY_ENUM
-})
-
-public class EnumArrays {
-  /**
-   * Gets or Sets justSymbol
-   */
-  public enum JustSymbolEnum {
-    GREATER_THAN_OR_EQUAL_TO(">="),
-    
-    DOLLAR("$");
-
-    private String value;
-
-    JustSymbolEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static JustSymbolEnum fromValue(String value) {
-      for (JustSymbolEnum b : JustSymbolEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_JUST_SYMBOL = "just_symbol";
-  private JustSymbolEnum justSymbol;
-
-  /**
-   * Gets or Sets arrayEnum
-   */
-  public enum ArrayEnumEnum {
-    FISH("fish"),
-    
-    CRAB("crab");
-
-    private String value;
-
-    ArrayEnumEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static ArrayEnumEnum fromValue(String value) {
-      for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
-  private List<ArrayEnumEnum> arrayEnum = null;
-
-
-  public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
-    
-    this.justSymbol = justSymbol;
-    return this;
-  }
-
-   /**
-   * Get justSymbol
-   * @return justSymbol
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JustSymbolEnum getJustSymbol() {
-    return justSymbol;
-  }
-
-
-  public void setJustSymbol(JustSymbolEnum justSymbol) {
-    this.justSymbol = justSymbol;
-  }
-
-
-  public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
-    
-    this.arrayEnum = arrayEnum;
-    return this;
-  }
-
-  public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
-    if (this.arrayEnum == null) {
-      this.arrayEnum = new ArrayList<>();
-    }
-    this.arrayEnum.add(arrayEnumItem);
-    return this;
-  }
-
-   /**
-   * Get arrayEnum
-   * @return arrayEnum
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<ArrayEnumEnum> getArrayEnum() {
-    return arrayEnum;
-  }
-
-
-  public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
-    this.arrayEnum = arrayEnum;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EnumArrays enumArrays = (EnumArrays) o;
-    return Objects.equals(this.justSymbol, enumArrays.justSymbol) &&
-        Objects.equals(this.arrayEnum, enumArrays.arrayEnum);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(justSymbol, arrayEnum);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EnumArrays {\n");
-    sb.append("    justSymbol: ").append(toIndentedString(justSymbol)).append("\n");
-    sb.append("    arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumClass.java
deleted file mode 100644
index d78b71854be4..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumClass.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Gets or Sets EnumClass
- */
-public enum EnumClass {
-  
-  _ABC("_abc"),
-  
-  _EFG("-efg"),
-  
-  _XYZ_("(xyz)");
-
-  private String value;
-
-  EnumClass(String value) {
-    this.value = value;
-  }
-
-  @JsonValue
-  public String getValue() {
-    return value;
-  }
-
-  @Override
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static EnumClass fromValue(String value) {
-    for (EnumClass b : EnumClass.values()) {
-      if (b.value.equals(value)) {
-        return b;
-      }
-    }
-    throw new IllegalArgumentException("Unexpected value '" + value + "'");
-  }
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java
deleted file mode 100644
index 575a32ebce7d..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.OuterEnum;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * EnumTest
- */
-@JsonPropertyOrder({
-  EnumTest.JSON_PROPERTY_ENUM_STRING,
-  EnumTest.JSON_PROPERTY_ENUM_STRING_REQUIRED,
-  EnumTest.JSON_PROPERTY_ENUM_INTEGER,
-  EnumTest.JSON_PROPERTY_ENUM_NUMBER,
-  EnumTest.JSON_PROPERTY_OUTER_ENUM
-})
-
-public class EnumTest {
-  /**
-   * Gets or Sets enumString
-   */
-  public enum EnumStringEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower"),
-    
-    EMPTY("");
-
-    private String value;
-
-    EnumStringEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumStringEnum fromValue(String value) {
-      for (EnumStringEnum b : EnumStringEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_STRING = "enum_string";
-  private EnumStringEnum enumString;
-
-  /**
-   * Gets or Sets enumStringRequired
-   */
-  public enum EnumStringRequiredEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower"),
-    
-    EMPTY("");
-
-    private String value;
-
-    EnumStringRequiredEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumStringRequiredEnum fromValue(String value) {
-      for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_STRING_REQUIRED = "enum_string_required";
-  private EnumStringRequiredEnum enumStringRequired;
-
-  /**
-   * Gets or Sets enumInteger
-   */
-  public enum EnumIntegerEnum {
-    NUMBER_1(1),
-    
-    NUMBER_MINUS_1(-1);
-
-    private Integer value;
-
-    EnumIntegerEnum(Integer value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public Integer getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumIntegerEnum fromValue(Integer value) {
-      for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer";
-  private EnumIntegerEnum enumInteger;
-
-  /**
-   * Gets or Sets enumNumber
-   */
-  public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(1.1),
-    
-    NUMBER_MINUS_1_DOT_2(-1.2);
-
-    private Double value;
-
-    EnumNumberEnum(Double value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public Double getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumNumberEnum fromValue(Double value) {
-      for (EnumNumberEnum b : EnumNumberEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_NUMBER = "enum_number";
-  private EnumNumberEnum enumNumber;
-
-  public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum";
-  private OuterEnum outerEnum;
-
-
-  public EnumTest enumString(EnumStringEnum enumString) {
-    
-    this.enumString = enumString;
-    return this;
-  }
-
-   /**
-   * Get enumString
-   * @return enumString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public EnumStringEnum getEnumString() {
-    return enumString;
-  }
-
-
-  public void setEnumString(EnumStringEnum enumString) {
-    this.enumString = enumString;
-  }
-
-
-  public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
-    
-    this.enumStringRequired = enumStringRequired;
-    return this;
-  }
-
-   /**
-   * Get enumStringRequired
-   * @return enumStringRequired
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public EnumStringRequiredEnum getEnumStringRequired() {
-    return enumStringRequired;
-  }
-
-
-  public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
-    this.enumStringRequired = enumStringRequired;
-  }
-
-
-  public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
-    
-    this.enumInteger = enumInteger;
-    return this;
-  }
-
-   /**
-   * Get enumInteger
-   * @return enumInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public EnumIntegerEnum getEnumInteger() {
-    return enumInteger;
-  }
-
-
-  public void setEnumInteger(EnumIntegerEnum enumInteger) {
-    this.enumInteger = enumInteger;
-  }
-
-
-  public EnumTest enumNumber(EnumNumberEnum enumNumber) {
-    
-    this.enumNumber = enumNumber;
-    return this;
-  }
-
-   /**
-   * Get enumNumber
-   * @return enumNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public EnumNumberEnum getEnumNumber() {
-    return enumNumber;
-  }
-
-
-  public void setEnumNumber(EnumNumberEnum enumNumber) {
-    this.enumNumber = enumNumber;
-  }
-
-
-  public EnumTest outerEnum(OuterEnum outerEnum) {
-    
-    this.outerEnum = outerEnum;
-    return this;
-  }
-
-   /**
-   * Get outerEnum
-   * @return outerEnum
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OuterEnum getOuterEnum() {
-    return outerEnum;
-  }
-
-
-  public void setOuterEnum(OuterEnum outerEnum) {
-    this.outerEnum = outerEnum;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EnumTest enumTest = (EnumTest) o;
-    return Objects.equals(this.enumString, enumTest.enumString) &&
-        Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
-        Objects.equals(this.enumInteger, enumTest.enumInteger) &&
-        Objects.equals(this.enumNumber, enumTest.enumNumber) &&
-        Objects.equals(this.outerEnum, enumTest.outerEnum);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EnumTest {\n");
-    sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
-    sb.append("    enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
-    sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
-    sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
-    sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
deleted file mode 100644
index 46c92718db49..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * FileSchemaTestClass
- */
-@JsonPropertyOrder({
-  FileSchemaTestClass.JSON_PROPERTY_FILE,
-  FileSchemaTestClass.JSON_PROPERTY_FILES
-})
-
-public class FileSchemaTestClass {
-  public static final String JSON_PROPERTY_FILE = "file";
-  private java.io.File file;
-
-  public static final String JSON_PROPERTY_FILES = "files";
-  private List<java.io.File> files = null;
-
-
-  public FileSchemaTestClass file(java.io.File file) {
-    
-    this.file = file;
-    return this;
-  }
-
-   /**
-   * Get file
-   * @return file
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FILE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public java.io.File getFile() {
-    return file;
-  }
-
-
-  public void setFile(java.io.File file) {
-    this.file = file;
-  }
-
-
-  public FileSchemaTestClass files(List<java.io.File> files) {
-    
-    this.files = files;
-    return this;
-  }
-
-  public FileSchemaTestClass addFilesItem(java.io.File filesItem) {
-    if (this.files == null) {
-      this.files = new ArrayList<>();
-    }
-    this.files.add(filesItem);
-    return this;
-  }
-
-   /**
-   * Get files
-   * @return files
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FILES)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<java.io.File> getFiles() {
-    return files;
-  }
-
-
-  public void setFiles(List<java.io.File> files) {
-    this.files = files;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o;
-    return Objects.equals(this.file, fileSchemaTestClass.file) &&
-        Objects.equals(this.files, fileSchemaTestClass.files);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(file, files);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FileSchemaTestClass {\n");
-    sb.append("    file: ").append(toIndentedString(file)).append("\n");
-    sb.append("    files: ").append(toIndentedString(files)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FormatTest.java
deleted file mode 100644
index 81dbea7fbada..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FormatTest.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.File;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.UUID;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * FormatTest
- */
-@JsonPropertyOrder({
-  FormatTest.JSON_PROPERTY_INTEGER,
-  FormatTest.JSON_PROPERTY_INT32,
-  FormatTest.JSON_PROPERTY_INT64,
-  FormatTest.JSON_PROPERTY_NUMBER,
-  FormatTest.JSON_PROPERTY_FLOAT,
-  FormatTest.JSON_PROPERTY_DOUBLE,
-  FormatTest.JSON_PROPERTY_STRING,
-  FormatTest.JSON_PROPERTY_BYTE,
-  FormatTest.JSON_PROPERTY_BINARY,
-  FormatTest.JSON_PROPERTY_DATE,
-  FormatTest.JSON_PROPERTY_DATE_TIME,
-  FormatTest.JSON_PROPERTY_UUID,
-  FormatTest.JSON_PROPERTY_PASSWORD,
-  FormatTest.JSON_PROPERTY_BIG_DECIMAL
-})
-
-public class FormatTest {
-  public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
-
-  public static final String JSON_PROPERTY_INT32 = "int32";
-  private Integer int32;
-
-  public static final String JSON_PROPERTY_INT64 = "int64";
-  private Long int64;
-
-  public static final String JSON_PROPERTY_NUMBER = "number";
-  private BigDecimal number;
-
-  public static final String JSON_PROPERTY_FLOAT = "float";
-  private Float _float;
-
-  public static final String JSON_PROPERTY_DOUBLE = "double";
-  private Double _double;
-
-  public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
-
-  public static final String JSON_PROPERTY_BYTE = "byte";
-  private byte[] _byte;
-
-  public static final String JSON_PROPERTY_BINARY = "binary";
-  private File binary;
-
-  public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
-
-  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
-
-  public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
-
-  public static final String JSON_PROPERTY_PASSWORD = "password";
-  private String password;
-
-  public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
-  private BigDecimal bigDecimal;
-
-
-  public FormatTest integer(Integer integer) {
-    
-    this.integer = integer;
-    return this;
-  }
-
-   /**
-   * Get integer
-   * minimum: 10
-   * maximum: 100
-   * @return integer
-  **/
-  @javax.annotation.Nullable
- @Min(10) @Max(100)  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getInteger() {
-    return integer;
-  }
-
-
-  public void setInteger(Integer integer) {
-    this.integer = integer;
-  }
-
-
-  public FormatTest int32(Integer int32) {
-    
-    this.int32 = int32;
-    return this;
-  }
-
-   /**
-   * Get int32
-   * minimum: 20
-   * maximum: 200
-   * @return int32
-  **/
-  @javax.annotation.Nullable
- @Min(20) @Max(200)  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INT32)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getInt32() {
-    return int32;
-  }
-
-
-  public void setInt32(Integer int32) {
-    this.int32 = int32;
-  }
-
-
-  public FormatTest int64(Long int64) {
-    
-    this.int64 = int64;
-    return this;
-  }
-
-   /**
-   * Get int64
-   * @return int64
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INT64)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getInt64() {
-    return int64;
-  }
-
-
-  public void setInt64(Long int64) {
-    this.int64 = int64;
-  }
-
-
-  public FormatTest number(BigDecimal number) {
-    
-    this.number = number;
-    return this;
-  }
-
-   /**
-   * Get number
-   * minimum: 32.1
-   * maximum: 543.2
-   * @return number
-  **/
-  @NotNull
-  @Valid
- @DecimalMin("32.1") @DecimalMax("543.2")  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public BigDecimal getNumber() {
-    return number;
-  }
-
-
-  public void setNumber(BigDecimal number) {
-    this.number = number;
-  }
-
-
-  public FormatTest _float(Float _float) {
-    
-    this._float = _float;
-    return this;
-  }
-
-   /**
-   * Get _float
-   * minimum: 54.3
-   * maximum: 987.6
-   * @return _float
-  **/
-  @javax.annotation.Nullable
- @DecimalMin("54.3") @DecimalMax("987.6")  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FLOAT)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Float getFloat() {
-    return _float;
-  }
-
-
-  public void setFloat(Float _float) {
-    this._float = _float;
-  }
-
-
-  public FormatTest _double(Double _double) {
-    
-    this._double = _double;
-    return this;
-  }
-
-   /**
-   * Get _double
-   * minimum: 67.8
-   * maximum: 123.4
-   * @return _double
-  **/
-  @javax.annotation.Nullable
- @DecimalMin("67.8") @DecimalMax("123.4")  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DOUBLE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Double getDouble() {
-    return _double;
-  }
-
-
-  public void setDouble(Double _double) {
-    this._double = _double;
-  }
-
-
-  public FormatTest string(String string) {
-    
-    this.string = string;
-    return this;
-  }
-
-   /**
-   * Get string
-   * @return string
-  **/
-  @javax.annotation.Nullable
- @Pattern(regexp="/[a-z]/i")  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getString() {
-    return string;
-  }
-
-
-  public void setString(String string) {
-    this.string = string;
-  }
-
-
-  public FormatTest _byte(byte[] _byte) {
-    
-    this._byte = _byte;
-    return this;
-  }
-
-   /**
-   * Get _byte
-   * @return _byte
-  **/
-  @NotNull
- @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_BYTE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public byte[] getByte() {
-    return _byte;
-  }
-
-
-  public void setByte(byte[] _byte) {
-    this._byte = _byte;
-  }
-
-
-  public FormatTest binary(File binary) {
-    
-    this.binary = binary;
-    return this;
-  }
-
-   /**
-   * Get binary
-   * @return binary
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BINARY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public File getBinary() {
-    return binary;
-  }
-
-
-  public void setBinary(File binary) {
-    this.binary = binary;
-  }
-
-
-  public FormatTest date(LocalDate date) {
-    
-    this.date = date;
-    return this;
-  }
-
-   /**
-   * Get date
-   * @return date
-  **/
-  @NotNull
-  @Valid
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_DATE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public LocalDate getDate() {
-    return date;
-  }
-
-
-  public void setDate(LocalDate date) {
-    this.date = date;
-  }
-
-
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    
-    this.dateTime = dateTime;
-    return this;
-  }
-
-   /**
-   * Get dateTime
-   * @return dateTime
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OffsetDateTime getDateTime() {
-    return dateTime;
-  }
-
-
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
-  }
-
-
-  public FormatTest uuid(UUID uuid) {
-    
-    this.uuid = uuid;
-    return this;
-  }
-
-   /**
-   * Get uuid
-   * @return uuid
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
-  @JsonProperty(JSON_PROPERTY_UUID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public UUID getUuid() {
-    return uuid;
-  }
-
-
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
-  }
-
-
-  public FormatTest password(String password) {
-    
-    this.password = password;
-    return this;
-  }
-
-   /**
-   * Get password
-   * @return password
-  **/
-  @NotNull
- @Size(min=10,max=64)  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_PASSWORD)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getPassword() {
-    return password;
-  }
-
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    
-    this.bigDecimal = bigDecimal;
-    return this;
-  }
-
-   /**
-   * Get bigDecimal
-   * @return bigDecimal
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getBigDecimal() {
-    return bigDecimal;
-  }
-
-
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
-        Objects.equals(this.int32, formatTest.int32) &&
-        Objects.equals(this.int64, formatTest.int64) &&
-        Objects.equals(this.number, formatTest.number) &&
-        Objects.equals(this._float, formatTest._float) &&
-        Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
-        Arrays.equals(this._byte, formatTest._byte) &&
-        Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
-        Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
-    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
-    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
-    sb.append("    number: ").append(toIndentedString(number)).append("\n");
-    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
-    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
-    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
-    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    password: ").append(toIndentedString(password)).append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
deleted file mode 100644
index 81e823b2fe8a..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * HasOnlyReadOnly
- */
-@JsonPropertyOrder({
-  HasOnlyReadOnly.JSON_PROPERTY_BAR,
-  HasOnlyReadOnly.JSON_PROPERTY_FOO
-})
-
-public class HasOnlyReadOnly {
-  public static final String JSON_PROPERTY_BAR = "bar";
-  private String bar;
-
-  public static final String JSON_PROPERTY_FOO = "foo";
-  private String foo;
-
-
-   /**
-   * Get bar
-   * @return bar
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBar() {
-    return bar;
-  }
-
-
-
-
-   /**
-   * Get foo
-   * @return foo
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FOO)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getFoo() {
-    return foo;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o;
-    return Objects.equals(this.bar, hasOnlyReadOnly.bar) &&
-        Objects.equals(this.foo, hasOnlyReadOnly.foo);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(bar, foo);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class HasOnlyReadOnly {\n");
-    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
-    sb.append("    foo: ").append(toIndentedString(foo)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MapTest.java
deleted file mode 100644
index 11d6be2d43d0..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MapTest.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * MapTest
- */
-@JsonPropertyOrder({
-  MapTest.JSON_PROPERTY_MAP_MAP_OF_STRING,
-  MapTest.JSON_PROPERTY_MAP_OF_ENUM_STRING,
-  MapTest.JSON_PROPERTY_DIRECT_MAP,
-  MapTest.JSON_PROPERTY_INDIRECT_MAP
-})
-
-public class MapTest {
-  public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
-  private Map<String, Map<String, String>> mapMapOfString = null;
-
-  /**
-   * Gets or Sets inner
-   */
-  public enum InnerEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower");
-
-    private String value;
-
-    InnerEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static InnerEnum fromValue(String value) {
-      for (InnerEnum b : InnerEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string";
-  private Map<String, InnerEnum> mapOfEnumString = null;
-
-  public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map";
-  private Map<String, Boolean> directMap = null;
-
-  public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
-  private Map<String, Boolean> indirectMap = null;
-
-
-  public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
-    
-    this.mapMapOfString = mapMapOfString;
-    return this;
-  }
-
-  public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
-    if (this.mapMapOfString == null) {
-      this.mapMapOfString = new HashMap<>();
-    }
-    this.mapMapOfString.put(key, mapMapOfStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapMapOfString
-   * @return mapMapOfString
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Map<String, String>> getMapMapOfString() {
-    return mapMapOfString;
-  }
-
-
-  public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
-    this.mapMapOfString = mapMapOfString;
-  }
-
-
-  public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
-    
-    this.mapOfEnumString = mapOfEnumString;
-    return this;
-  }
-
-  public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
-    if (this.mapOfEnumString == null) {
-      this.mapOfEnumString = new HashMap<>();
-    }
-    this.mapOfEnumString.put(key, mapOfEnumStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapOfEnumString
-   * @return mapOfEnumString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, InnerEnum> getMapOfEnumString() {
-    return mapOfEnumString;
-  }
-
-
-  public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
-    this.mapOfEnumString = mapOfEnumString;
-  }
-
-
-  public MapTest directMap(Map<String, Boolean> directMap) {
-    
-    this.directMap = directMap;
-    return this;
-  }
-
-  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
-    if (this.directMap == null) {
-      this.directMap = new HashMap<>();
-    }
-    this.directMap.put(key, directMapItem);
-    return this;
-  }
-
-   /**
-   * Get directMap
-   * @return directMap
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Boolean> getDirectMap() {
-    return directMap;
-  }
-
-
-  public void setDirectMap(Map<String, Boolean> directMap) {
-    this.directMap = directMap;
-  }
-
-
-  public MapTest indirectMap(Map<String, Boolean> indirectMap) {
-    
-    this.indirectMap = indirectMap;
-    return this;
-  }
-
-  public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
-    if (this.indirectMap == null) {
-      this.indirectMap = new HashMap<>();
-    }
-    this.indirectMap.put(key, indirectMapItem);
-    return this;
-  }
-
-   /**
-   * Get indirectMap
-   * @return indirectMap
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Boolean> getIndirectMap() {
-    return indirectMap;
-  }
-
-
-  public void setIndirectMap(Map<String, Boolean> indirectMap) {
-    this.indirectMap = indirectMap;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MapTest mapTest = (MapTest) o;
-    return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
-        Objects.equals(this.directMap, mapTest.directMap) &&
-        Objects.equals(this.indirectMap, mapTest.indirectMap);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MapTest {\n");
-    sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
-    sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
-    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
-    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
deleted file mode 100644
index 18c2179c7081..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.time.OffsetDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import org.openapitools.client.model.Animal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * MixedPropertiesAndAdditionalPropertiesClass
- */
-@JsonPropertyOrder({
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_UUID,
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
-})
-
-public class MixedPropertiesAndAdditionalPropertiesClass {
-  public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
-
-  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
-
-  public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = null;
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    
-    this.uuid = uuid;
-    return this;
-  }
-
-   /**
-   * Get uuid
-   * @return uuid
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_UUID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public UUID getUuid() {
-    return uuid;
-  }
-
-
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
-  }
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    
-    this.dateTime = dateTime;
-    return this;
-  }
-
-   /**
-   * Get dateTime
-   * @return dateTime
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OffsetDateTime getDateTime() {
-    return dateTime;
-  }
-
-
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
-  }
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    
-    this.map = map;
-    return this;
-  }
-
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
-    }
-    this.map.put(key, mapItem);
-    return this;
-  }
-
-   /**
-   * Get map
-   * @return map
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Animal> getMap() {
-    return map;
-  }
-
-
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Model200Response.java
deleted file mode 100644
index 5eb7788e9172..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Model200Response.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Model for testing model name starting with number
- */
-@ApiModel(description = "Model for testing model name starting with number")
-@JsonPropertyOrder({
-  Model200Response.JSON_PROPERTY_NAME,
-  Model200Response.JSON_PROPERTY_PROPERTY_CLASS
-})
-
-public class Model200Response {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private Integer name;
-
-  public static final String JSON_PROPERTY_PROPERTY_CLASS = "class";
-  private String propertyClass;
-
-
-  public Model200Response name(Integer name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getName() {
-    return name;
-  }
-
-
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-
-  public Model200Response propertyClass(String propertyClass) {
-    
-    this.propertyClass = propertyClass;
-    return this;
-  }
-
-   /**
-   * Get propertyClass
-   * @return propertyClass
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPropertyClass() {
-    return propertyClass;
-  }
-
-
-  public void setPropertyClass(String propertyClass) {
-    this.propertyClass = propertyClass;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Model200Response _200response = (Model200Response) o;
-    return Objects.equals(this.name, _200response.name) &&
-        Objects.equals(this.propertyClass, _200response.propertyClass);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, propertyClass);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Model200Response {\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelApiResponse.java
deleted file mode 100644
index 16b0ac3a5ea8..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * ModelApiResponse
- */
-@JsonPropertyOrder({
-  ModelApiResponse.JSON_PROPERTY_CODE,
-  ModelApiResponse.JSON_PROPERTY_TYPE,
-  ModelApiResponse.JSON_PROPERTY_MESSAGE
-})
-
-public class ModelApiResponse {
-  public static final String JSON_PROPERTY_CODE = "code";
-  private Integer code;
-
-  public static final String JSON_PROPERTY_TYPE = "type";
-  private String type;
-
-  public static final String JSON_PROPERTY_MESSAGE = "message";
-  private String message;
-
-
-  public ModelApiResponse code(Integer code) {
-    
-    this.code = code;
-    return this;
-  }
-
-   /**
-   * Get code
-   * @return code
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CODE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getCode() {
-    return code;
-  }
-
-
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-
-  public ModelApiResponse type(String type) {
-    
-    this.type = type;
-    return this;
-  }
-
-   /**
-   * Get type
-   * @return type
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_TYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getType() {
-    return type;
-  }
-
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  public ModelApiResponse message(String message) {
-    
-    this.message = message;
-    return this;
-  }
-
-   /**
-   * Get message
-   * @return message
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MESSAGE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getMessage() {
-    return message;
-  }
-
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ModelApiResponse _apiResponse = (ModelApiResponse) o;
-    return Objects.equals(this.code, _apiResponse.code) &&
-        Objects.equals(this.type, _apiResponse.type) &&
-        Objects.equals(this.message, _apiResponse.message);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, type, message);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ModelApiResponse {\n");
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelReturn.java
deleted file mode 100644
index e35698cbfa3f..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Model for testing reserved words
- */
-@ApiModel(description = "Model for testing reserved words")
-@JsonPropertyOrder({
-  ModelReturn.JSON_PROPERTY_RETURN
-})
-
-public class ModelReturn {
-  public static final String JSON_PROPERTY_RETURN = "return";
-  private Integer _return;
-
-
-  public ModelReturn _return(Integer _return) {
-    
-    this._return = _return;
-    return this;
-  }
-
-   /**
-   * Get _return
-   * @return _return
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_RETURN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getReturn() {
-    return _return;
-  }
-
-
-  public void setReturn(Integer _return) {
-    this._return = _return;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ModelReturn _return = (ModelReturn) o;
-    return Objects.equals(this._return, _return._return);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(_return);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ModelReturn {\n");
-    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Name.java
deleted file mode 100644
index 885d7220817a..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Name.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Model for testing model name same as property name
- */
-@ApiModel(description = "Model for testing model name same as property name")
-@JsonPropertyOrder({
-  Name.JSON_PROPERTY_NAME,
-  Name.JSON_PROPERTY_SNAKE_CASE,
-  Name.JSON_PROPERTY_PROPERTY,
-  Name.JSON_PROPERTY_123NUMBER
-})
-
-public class Name {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private Integer name;
-
-  public static final String JSON_PROPERTY_SNAKE_CASE = "snake_case";
-  private Integer snakeCase;
-
-  public static final String JSON_PROPERTY_PROPERTY = "property";
-  private String property;
-
-  public static final String JSON_PROPERTY_123NUMBER = "123Number";
-  private Integer _123number;
-
-
-  public Name name(Integer name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Integer getName() {
-    return name;
-  }
-
-
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-
-   /**
-   * Get snakeCase
-   * @return snakeCase
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getSnakeCase() {
-    return snakeCase;
-  }
-
-
-
-
-  public Name property(String property) {
-    
-    this.property = property;
-    return this;
-  }
-
-   /**
-   * Get property
-   * @return property
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getProperty() {
-    return property;
-  }
-
-
-  public void setProperty(String property) {
-    this.property = property;
-  }
-
-
-   /**
-   * Get _123number
-   * @return _123number
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_123NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer get123number() {
-    return _123number;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Name name = (Name) o;
-    return Objects.equals(this.name, name.name) &&
-        Objects.equals(this.snakeCase, name.snakeCase) &&
-        Objects.equals(this.property, name.property) &&
-        Objects.equals(this._123number, name._123number);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, snakeCase, property, _123number);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Name {\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
-    sb.append("    property: ").append(toIndentedString(property)).append("\n");
-    sb.append("    _123number: ").append(toIndentedString(_123number)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/NumberOnly.java
deleted file mode 100644
index 73a245256928..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * NumberOnly
- */
-@JsonPropertyOrder({
-  NumberOnly.JSON_PROPERTY_JUST_NUMBER
-})
-
-public class NumberOnly {
-  public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
-  private BigDecimal justNumber;
-
-
-  public NumberOnly justNumber(BigDecimal justNumber) {
-    
-    this.justNumber = justNumber;
-    return this;
-  }
-
-   /**
-   * Get justNumber
-   * @return justNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getJustNumber() {
-    return justNumber;
-  }
-
-
-  public void setJustNumber(BigDecimal justNumber) {
-    this.justNumber = justNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    NumberOnly numberOnly = (NumberOnly) o;
-    return Objects.equals(this.justNumber, numberOnly.justNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(justNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class NumberOnly {\n");
-    sb.append("    justNumber: ").append(toIndentedString(justNumber)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Order.java
deleted file mode 100644
index c1f857ba7f19..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Order.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.time.OffsetDateTime;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Order
- */
-@JsonPropertyOrder({
-  Order.JSON_PROPERTY_ID,
-  Order.JSON_PROPERTY_PET_ID,
-  Order.JSON_PROPERTY_QUANTITY,
-  Order.JSON_PROPERTY_SHIP_DATE,
-  Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
-})
-
-public class Order {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_PET_ID = "petId";
-  private Long petId;
-
-  public static final String JSON_PROPERTY_QUANTITY = "quantity";
-  private Integer quantity;
-
-  public static final String JSON_PROPERTY_SHIP_DATE = "shipDate";
-  private OffsetDateTime shipDate;
-
-  /**
-   * Order Status
-   */
-  public enum StatusEnum {
-    PLACED("placed"),
-    
-    APPROVED("approved"),
-    
-    DELIVERED("delivered");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static StatusEnum fromValue(String value) {
-      for (StatusEnum b : StatusEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_STATUS = "status";
-  private StatusEnum status;
-
-  public static final String JSON_PROPERTY_COMPLETE = "complete";
-  private Boolean complete = false;
-
-
-  public Order id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Order petId(Long petId) {
-    
-    this.petId = petId;
-    return this;
-  }
-
-   /**
-   * Get petId
-   * @return petId
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PET_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getPetId() {
-    return petId;
-  }
-
-
-  public void setPetId(Long petId) {
-    this.petId = petId;
-  }
-
-
-  public Order quantity(Integer quantity) {
-    
-    this.quantity = quantity;
-    return this;
-  }
-
-   /**
-   * Get quantity
-   * @return quantity
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_QUANTITY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getQuantity() {
-    return quantity;
-  }
-
-
-  public void setQuantity(Integer quantity) {
-    this.quantity = quantity;
-  }
-
-
-  public Order shipDate(OffsetDateTime shipDate) {
-    
-    this.shipDate = shipDate;
-    return this;
-  }
-
-   /**
-   * Get shipDate
-   * @return shipDate
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SHIP_DATE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OffsetDateTime getShipDate() {
-    return shipDate;
-  }
-
-
-  public void setShipDate(OffsetDateTime shipDate) {
-    this.shipDate = shipDate;
-  }
-
-
-  public Order status(StatusEnum status) {
-    
-    this.status = status;
-    return this;
-  }
-
-   /**
-   * Order Status
-   * @return status
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Order Status")
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public StatusEnum getStatus() {
-    return status;
-  }
-
-
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-
-  public Order complete(Boolean complete) {
-    
-    this.complete = complete;
-    return this;
-  }
-
-   /**
-   * Get complete
-   * @return complete
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_COMPLETE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getComplete() {
-    return complete;
-  }
-
-
-  public void setComplete(Boolean complete) {
-    this.complete = complete;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Order order = (Order) o;
-    return Objects.equals(this.id, order.id) &&
-        Objects.equals(this.petId, order.petId) &&
-        Objects.equals(this.quantity, order.quantity) &&
-        Objects.equals(this.shipDate, order.shipDate) &&
-        Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Order {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
-    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
-    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterComposite.java
deleted file mode 100644
index 333de203a4fb..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * OuterComposite
- */
-@JsonPropertyOrder({
-  OuterComposite.JSON_PROPERTY_MY_NUMBER,
-  OuterComposite.JSON_PROPERTY_MY_STRING,
-  OuterComposite.JSON_PROPERTY_MY_BOOLEAN
-})
-
-public class OuterComposite {
-  public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
-  private BigDecimal myNumber;
-
-  public static final String JSON_PROPERTY_MY_STRING = "my_string";
-  private String myString;
-
-  public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean";
-  private Boolean myBoolean;
-
-
-  public OuterComposite myNumber(BigDecimal myNumber) {
-    
-    this.myNumber = myNumber;
-    return this;
-  }
-
-   /**
-   * Get myNumber
-   * @return myNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getMyNumber() {
-    return myNumber;
-  }
-
-
-  public void setMyNumber(BigDecimal myNumber) {
-    this.myNumber = myNumber;
-  }
-
-
-  public OuterComposite myString(String myString) {
-    
-    this.myString = myString;
-    return this;
-  }
-
-   /**
-   * Get myString
-   * @return myString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getMyString() {
-    return myString;
-  }
-
-
-  public void setMyString(String myString) {
-    this.myString = myString;
-  }
-
-
-  public OuterComposite myBoolean(Boolean myBoolean) {
-    
-    this.myBoolean = myBoolean;
-    return this;
-  }
-
-   /**
-   * Get myBoolean
-   * @return myBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getMyBoolean() {
-    return myBoolean;
-  }
-
-
-  public void setMyBoolean(Boolean myBoolean) {
-    this.myBoolean = myBoolean;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OuterComposite outerComposite = (OuterComposite) o;
-    return Objects.equals(this.myNumber, outerComposite.myNumber) &&
-        Objects.equals(this.myString, outerComposite.myString) &&
-        Objects.equals(this.myBoolean, outerComposite.myBoolean);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(myNumber, myString, myBoolean);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OuterComposite {\n");
-    sb.append("    myNumber: ").append(toIndentedString(myNumber)).append("\n");
-    sb.append("    myString: ").append(toIndentedString(myString)).append("\n");
-    sb.append("    myBoolean: ").append(toIndentedString(myBoolean)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterEnum.java
deleted file mode 100644
index 5591f09ff23f..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterEnum.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Gets or Sets OuterEnum
- */
-public enum OuterEnum {
-  
-  PLACED("placed"),
-  
-  APPROVED("approved"),
-  
-  DELIVERED("delivered");
-
-  private String value;
-
-  OuterEnum(String value) {
-    this.value = value;
-  }
-
-  @JsonValue
-  public String getValue() {
-    return value;
-  }
-
-  @Override
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static OuterEnum fromValue(String value) {
-    for (OuterEnum b : OuterEnum.values()) {
-      if (b.value.equals(value)) {
-        return b;
-      }
-    }
-    throw new IllegalArgumentException("Unexpected value '" + value + "'");
-  }
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java
deleted file mode 100644
index de960e6e5868..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.openapitools.client.model.Category;
-import org.openapitools.client.model.Tag;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Pet
- */
-@JsonPropertyOrder({
-  Pet.JSON_PROPERTY_ID,
-  Pet.JSON_PROPERTY_CATEGORY,
-  Pet.JSON_PROPERTY_NAME,
-  Pet.JSON_PROPERTY_PHOTO_URLS,
-  Pet.JSON_PROPERTY_TAGS,
-  Pet.JSON_PROPERTY_STATUS
-})
-
-public class Pet {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_CATEGORY = "category";
-  private Category category;
-
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-  public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
-  private Set<String> photoUrls = new LinkedHashSet<>();
-
-  public static final String JSON_PROPERTY_TAGS = "tags";
-  private List<Tag> tags = null;
-
-  /**
-   * pet status in the store
-   */
-  public enum StatusEnum {
-    AVAILABLE("available"),
-    
-    PENDING("pending"),
-    
-    SOLD("sold");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static StatusEnum fromValue(String value) {
-      for (StatusEnum b : StatusEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_STATUS = "status";
-  private StatusEnum status;
-
-
-  public Pet id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Pet category(Category category) {
-    
-    this.category = category;
-    return this;
-  }
-
-   /**
-   * Get category
-   * @return category
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CATEGORY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Category getCategory() {
-    return category;
-  }
-
-
-  public void setCategory(Category category) {
-    this.category = category;
-  }
-
-
-  public Pet name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @NotNull
-  @ApiModelProperty(example = "doggie", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  public Pet photoUrls(Set<String> photoUrls) {
-    
-    this.photoUrls = photoUrls;
-    return this;
-  }
-
-  public Pet addPhotoUrlsItem(String photoUrlsItem) {
-    this.photoUrls.add(photoUrlsItem);
-    return this;
-  }
-
-   /**
-   * Get photoUrls
-   * @return photoUrls
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Set<String> getPhotoUrls() {
-    return photoUrls;
-  }
-
-
-  public void setPhotoUrls(Set<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
-
-
-  public Pet tags(List<Tag> tags) {
-    
-    this.tags = tags;
-    return this;
-  }
-
-  public Pet addTagsItem(Tag tagsItem) {
-    if (this.tags == null) {
-      this.tags = new ArrayList<>();
-    }
-    this.tags.add(tagsItem);
-    return this;
-  }
-
-   /**
-   * Get tags
-   * @return tags
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_TAGS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Tag> getTags() {
-    return tags;
-  }
-
-
-  public void setTags(List<Tag> tags) {
-    this.tags = tags;
-  }
-
-
-  public Pet status(StatusEnum status) {
-    
-    this.status = status;
-    return this;
-  }
-
-   /**
-   * pet status in the store
-   * @return status
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "pet status in the store")
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public StatusEnum getStatus() {
-    return status;
-  }
-
-
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Pet pet = (Pet) o;
-    return Objects.equals(this.id, pet.id) &&
-        Objects.equals(this.category, pet.category) &&
-        Objects.equals(this.name, pet.name) &&
-        Objects.equals(this.photoUrls, pet.photoUrls) &&
-        Objects.equals(this.tags, pet.tags) &&
-        Objects.equals(this.status, pet.status);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, category, name, photoUrls, tags, status);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Pet {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
deleted file mode 100644
index a36a25c05104..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * ReadOnlyFirst
- */
-@JsonPropertyOrder({
-  ReadOnlyFirst.JSON_PROPERTY_BAR,
-  ReadOnlyFirst.JSON_PROPERTY_BAZ
-})
-
-public class ReadOnlyFirst {
-  public static final String JSON_PROPERTY_BAR = "bar";
-  private String bar;
-
-  public static final String JSON_PROPERTY_BAZ = "baz";
-  private String baz;
-
-
-   /**
-   * Get bar
-   * @return bar
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBar() {
-    return bar;
-  }
-
-
-
-
-  public ReadOnlyFirst baz(String baz) {
-    
-    this.baz = baz;
-    return this;
-  }
-
-   /**
-   * Get baz
-   * @return baz
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAZ)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBaz() {
-    return baz;
-  }
-
-
-  public void setBaz(String baz) {
-    this.baz = baz;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
-    return Objects.equals(this.bar, readOnlyFirst.bar) &&
-        Objects.equals(this.baz, readOnlyFirst.baz);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(bar, baz);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ReadOnlyFirst {\n");
-    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
-    sb.append("    baz: ").append(toIndentedString(baz)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/SpecialModelName.java
deleted file mode 100644
index eb40d707adaf..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * SpecialModelName
- */
-@JsonPropertyOrder({
-  SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
-})
-
-public class SpecialModelName {
-  public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
-  private Long $specialPropertyName;
-
-
-  public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
-    
-    this.$specialPropertyName = $specialPropertyName;
-    return this;
-  }
-
-   /**
-   * Get $specialPropertyName
-   * @return $specialPropertyName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long get$SpecialPropertyName() {
-    return $specialPropertyName;
-  }
-
-
-  public void set$SpecialPropertyName(Long $specialPropertyName) {
-    this.$specialPropertyName = $specialPropertyName;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SpecialModelName $specialModelName = (SpecialModelName) o;
-    return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash($specialPropertyName);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SpecialModelName {\n");
-    sb.append("    $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Tag.java
deleted file mode 100644
index 17edbc2edd9c..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Tag.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Tag
- */
-@JsonPropertyOrder({
-  Tag.JSON_PROPERTY_ID,
-  Tag.JSON_PROPERTY_NAME
-})
-
-public class Tag {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public Tag id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Tag name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Tag tag = (Tag) o;
-    return Objects.equals(this.id, tag.id) &&
-        Objects.equals(this.name, tag.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Tag {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
deleted file mode 100644
index e6ddf531002a..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * TypeHolderDefault
- */
-@JsonPropertyOrder({
-  TypeHolderDefault.JSON_PROPERTY_STRING_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_NUMBER_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_INTEGER_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
-})
-
-public class TypeHolderDefault {
-  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
-  private String stringItem = "what";
-
-  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
-  private BigDecimal numberItem;
-
-  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
-  private Integer integerItem;
-
-  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
-  private Boolean boolItem = true;
-
-  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
-  private List<Integer> arrayItem = new ArrayList<>();
-
-
-  public TypeHolderDefault stringItem(String stringItem) {
-    
-    this.stringItem = stringItem;
-    return this;
-  }
-
-   /**
-   * Get stringItem
-   * @return stringItem
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getStringItem() {
-    return stringItem;
-  }
-
-
-  public void setStringItem(String stringItem) {
-    this.stringItem = stringItem;
-  }
-
-
-  public TypeHolderDefault numberItem(BigDecimal numberItem) {
-    
-    this.numberItem = numberItem;
-    return this;
-  }
-
-   /**
-   * Get numberItem
-   * @return numberItem
-  **/
-  @NotNull
-  @Valid
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public BigDecimal getNumberItem() {
-    return numberItem;
-  }
-
-
-  public void setNumberItem(BigDecimal numberItem) {
-    this.numberItem = numberItem;
-  }
-
-
-  public TypeHolderDefault integerItem(Integer integerItem) {
-    
-    this.integerItem = integerItem;
-    return this;
-  }
-
-   /**
-   * Get integerItem
-   * @return integerItem
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Integer getIntegerItem() {
-    return integerItem;
-  }
-
-
-  public void setIntegerItem(Integer integerItem) {
-    this.integerItem = integerItem;
-  }
-
-
-  public TypeHolderDefault boolItem(Boolean boolItem) {
-    
-    this.boolItem = boolItem;
-    return this;
-  }
-
-   /**
-   * Get boolItem
-   * @return boolItem
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Boolean getBoolItem() {
-    return boolItem;
-  }
-
-
-  public void setBoolItem(Boolean boolItem) {
-    this.boolItem = boolItem;
-  }
-
-
-  public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
-    
-    this.arrayItem = arrayItem;
-    return this;
-  }
-
-  public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
-    this.arrayItem.add(arrayItemItem);
-    return this;
-  }
-
-   /**
-   * Get arrayItem
-   * @return arrayItem
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public List<Integer> getArrayItem() {
-    return arrayItem;
-  }
-
-
-  public void setArrayItem(List<Integer> arrayItem) {
-    this.arrayItem = arrayItem;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o;
-    return Objects.equals(this.stringItem, typeHolderDefault.stringItem) &&
-        Objects.equals(this.numberItem, typeHolderDefault.numberItem) &&
-        Objects.equals(this.integerItem, typeHolderDefault.integerItem) &&
-        Objects.equals(this.boolItem, typeHolderDefault.boolItem) &&
-        Objects.equals(this.arrayItem, typeHolderDefault.arrayItem);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TypeHolderDefault {\n");
-    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
-    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
-    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
-    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
-    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderExample.java
deleted file mode 100644
index 6c606c85a90f..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * TypeHolderExample
- */
-@JsonPropertyOrder({
-  TypeHolderExample.JSON_PROPERTY_STRING_ITEM,
-  TypeHolderExample.JSON_PROPERTY_NUMBER_ITEM,
-  TypeHolderExample.JSON_PROPERTY_FLOAT_ITEM,
-  TypeHolderExample.JSON_PROPERTY_INTEGER_ITEM,
-  TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
-  TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
-})
-
-public class TypeHolderExample {
-  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
-  private String stringItem;
-
-  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
-  private BigDecimal numberItem;
-
-  public static final String JSON_PROPERTY_FLOAT_ITEM = "float_item";
-  private Float floatItem;
-
-  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
-  private Integer integerItem;
-
-  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
-  private Boolean boolItem;
-
-  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
-  private List<Integer> arrayItem = new ArrayList<>();
-
-
-  public TypeHolderExample stringItem(String stringItem) {
-    
-    this.stringItem = stringItem;
-    return this;
-  }
-
-   /**
-   * Get stringItem
-   * @return stringItem
-  **/
-  @NotNull
-  @ApiModelProperty(example = "what", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getStringItem() {
-    return stringItem;
-  }
-
-
-  public void setStringItem(String stringItem) {
-    this.stringItem = stringItem;
-  }
-
-
-  public TypeHolderExample numberItem(BigDecimal numberItem) {
-    
-    this.numberItem = numberItem;
-    return this;
-  }
-
-   /**
-   * Get numberItem
-   * @return numberItem
-  **/
-  @NotNull
-  @Valid
-  @ApiModelProperty(example = "1.234", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public BigDecimal getNumberItem() {
-    return numberItem;
-  }
-
-
-  public void setNumberItem(BigDecimal numberItem) {
-    this.numberItem = numberItem;
-  }
-
-
-  public TypeHolderExample floatItem(Float floatItem) {
-    
-    this.floatItem = floatItem;
-    return this;
-  }
-
-   /**
-   * Get floatItem
-   * @return floatItem
-  **/
-  @NotNull
-  @ApiModelProperty(example = "1.234", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Float getFloatItem() {
-    return floatItem;
-  }
-
-
-  public void setFloatItem(Float floatItem) {
-    this.floatItem = floatItem;
-  }
-
-
-  public TypeHolderExample integerItem(Integer integerItem) {
-    
-    this.integerItem = integerItem;
-    return this;
-  }
-
-   /**
-   * Get integerItem
-   * @return integerItem
-  **/
-  @NotNull
-  @ApiModelProperty(example = "-2", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Integer getIntegerItem() {
-    return integerItem;
-  }
-
-
-  public void setIntegerItem(Integer integerItem) {
-    this.integerItem = integerItem;
-  }
-
-
-  public TypeHolderExample boolItem(Boolean boolItem) {
-    
-    this.boolItem = boolItem;
-    return this;
-  }
-
-   /**
-   * Get boolItem
-   * @return boolItem
-  **/
-  @NotNull
-  @ApiModelProperty(example = "true", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Boolean getBoolItem() {
-    return boolItem;
-  }
-
-
-  public void setBoolItem(Boolean boolItem) {
-    this.boolItem = boolItem;
-  }
-
-
-  public TypeHolderExample arrayItem(List<Integer> arrayItem) {
-    
-    this.arrayItem = arrayItem;
-    return this;
-  }
-
-  public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
-    this.arrayItem.add(arrayItemItem);
-    return this;
-  }
-
-   /**
-   * Get arrayItem
-   * @return arrayItem
-  **/
-  @NotNull
-  @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public List<Integer> getArrayItem() {
-    return arrayItem;
-  }
-
-
-  public void setArrayItem(List<Integer> arrayItem) {
-    this.arrayItem = arrayItem;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TypeHolderExample typeHolderExample = (TypeHolderExample) o;
-    return Objects.equals(this.stringItem, typeHolderExample.stringItem) &&
-        Objects.equals(this.numberItem, typeHolderExample.numberItem) &&
-        Objects.equals(this.floatItem, typeHolderExample.floatItem) &&
-        Objects.equals(this.integerItem, typeHolderExample.integerItem) &&
-        Objects.equals(this.boolItem, typeHolderExample.boolItem) &&
-        Objects.equals(this.arrayItem, typeHolderExample.arrayItem);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TypeHolderExample {\n");
-    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
-    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
-    sb.append("    floatItem: ").append(toIndentedString(floatItem)).append("\n");
-    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
-    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
-    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/User.java
deleted file mode 100644
index 7268eab0d6f4..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/User.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * User
- */
-@JsonPropertyOrder({
-  User.JSON_PROPERTY_ID,
-  User.JSON_PROPERTY_USERNAME,
-  User.JSON_PROPERTY_FIRST_NAME,
-  User.JSON_PROPERTY_LAST_NAME,
-  User.JSON_PROPERTY_EMAIL,
-  User.JSON_PROPERTY_PASSWORD,
-  User.JSON_PROPERTY_PHONE,
-  User.JSON_PROPERTY_USER_STATUS
-})
-
-public class User {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_USERNAME = "username";
-  private String username;
-
-  public static final String JSON_PROPERTY_FIRST_NAME = "firstName";
-  private String firstName;
-
-  public static final String JSON_PROPERTY_LAST_NAME = "lastName";
-  private String lastName;
-
-  public static final String JSON_PROPERTY_EMAIL = "email";
-  private String email;
-
-  public static final String JSON_PROPERTY_PASSWORD = "password";
-  private String password;
-
-  public static final String JSON_PROPERTY_PHONE = "phone";
-  private String phone;
-
-  public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
-  private Integer userStatus;
-
-
-  public User id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public User username(String username) {
-    
-    this.username = username;
-    return this;
-  }
-
-   /**
-   * Get username
-   * @return username
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_USERNAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getUsername() {
-    return username;
-  }
-
-
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-
-  public User firstName(String firstName) {
-    
-    this.firstName = firstName;
-    return this;
-  }
-
-   /**
-   * Get firstName
-   * @return firstName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FIRST_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getFirstName() {
-    return firstName;
-  }
-
-
-  public void setFirstName(String firstName) {
-    this.firstName = firstName;
-  }
-
-
-  public User lastName(String lastName) {
-    
-    this.lastName = lastName;
-    return this;
-  }
-
-   /**
-   * Get lastName
-   * @return lastName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_LAST_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getLastName() {
-    return lastName;
-  }
-
-
-  public void setLastName(String lastName) {
-    this.lastName = lastName;
-  }
-
-
-  public User email(String email) {
-    
-    this.email = email;
-    return this;
-  }
-
-   /**
-   * Get email
-   * @return email
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_EMAIL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getEmail() {
-    return email;
-  }
-
-
-  public void setEmail(String email) {
-    this.email = email;
-  }
-
-
-  public User password(String password) {
-    
-    this.password = password;
-    return this;
-  }
-
-   /**
-   * Get password
-   * @return password
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PASSWORD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPassword() {
-    return password;
-  }
-
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-
-  public User phone(String phone) {
-    
-    this.phone = phone;
-    return this;
-  }
-
-   /**
-   * Get phone
-   * @return phone
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PHONE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPhone() {
-    return phone;
-  }
-
-
-  public void setPhone(String phone) {
-    this.phone = phone;
-  }
-
-
-  public User userStatus(Integer userStatus) {
-    
-    this.userStatus = userStatus;
-    return this;
-  }
-
-   /**
-   * User Status
-   * @return userStatus
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "User Status")
-  @JsonProperty(JSON_PROPERTY_USER_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getUserStatus() {
-    return userStatus;
-  }
-
-
-  public void setUserStatus(Integer userStatus) {
-    this.userStatus = userStatus;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    User user = (User) o;
-    return Objects.equals(this.id, user.id) &&
-        Objects.equals(this.username, user.username) &&
-        Objects.equals(this.firstName, user.firstName) &&
-        Objects.equals(this.lastName, user.lastName) &&
-        Objects.equals(this.email, user.email) &&
-        Objects.equals(this.password, user.password) &&
-        Objects.equals(this.phone, user.phone) &&
-        Objects.equals(this.userStatus, user.userStatus);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class User {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    username: ").append(toIndentedString(username)).append("\n");
-    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
-    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
-    sb.append("    email: ").append(toIndentedString(email)).append("\n");
-    sb.append("    password: ").append(toIndentedString(password)).append("\n");
-    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
-    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/XmlItem.java
deleted file mode 100644
index 458f927a8967..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/XmlItem.java
+++ /dev/null
@@ -1,1052 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * XmlItem
- */
-@JsonPropertyOrder({
-  XmlItem.JSON_PROPERTY_ATTRIBUTE_STRING,
-  XmlItem.JSON_PROPERTY_ATTRIBUTE_NUMBER,
-  XmlItem.JSON_PROPERTY_ATTRIBUTE_INTEGER,
-  XmlItem.JSON_PROPERTY_ATTRIBUTE_BOOLEAN,
-  XmlItem.JSON_PROPERTY_WRAPPED_ARRAY,
-  XmlItem.JSON_PROPERTY_NAME_STRING,
-  XmlItem.JSON_PROPERTY_NAME_NUMBER,
-  XmlItem.JSON_PROPERTY_NAME_INTEGER,
-  XmlItem.JSON_PROPERTY_NAME_BOOLEAN,
-  XmlItem.JSON_PROPERTY_NAME_ARRAY,
-  XmlItem.JSON_PROPERTY_NAME_WRAPPED_ARRAY,
-  XmlItem.JSON_PROPERTY_PREFIX_STRING,
-  XmlItem.JSON_PROPERTY_PREFIX_NUMBER,
-  XmlItem.JSON_PROPERTY_PREFIX_INTEGER,
-  XmlItem.JSON_PROPERTY_PREFIX_BOOLEAN,
-  XmlItem.JSON_PROPERTY_PREFIX_ARRAY,
-  XmlItem.JSON_PROPERTY_PREFIX_WRAPPED_ARRAY,
-  XmlItem.JSON_PROPERTY_NAMESPACE_STRING,
-  XmlItem.JSON_PROPERTY_NAMESPACE_NUMBER,
-  XmlItem.JSON_PROPERTY_NAMESPACE_INTEGER,
-  XmlItem.JSON_PROPERTY_NAMESPACE_BOOLEAN,
-  XmlItem.JSON_PROPERTY_NAMESPACE_ARRAY,
-  XmlItem.JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_STRING,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_NUMBER,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_INTEGER,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_BOOLEAN,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
-})
-
-public class XmlItem {
-  public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
-  private String attributeString;
-
-  public static final String JSON_PROPERTY_ATTRIBUTE_NUMBER = "attribute_number";
-  private BigDecimal attributeNumber;
-
-  public static final String JSON_PROPERTY_ATTRIBUTE_INTEGER = "attribute_integer";
-  private Integer attributeInteger;
-
-  public static final String JSON_PROPERTY_ATTRIBUTE_BOOLEAN = "attribute_boolean";
-  private Boolean attributeBoolean;
-
-  public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array";
-  private List<Integer> wrappedArray = null;
-
-  public static final String JSON_PROPERTY_NAME_STRING = "name_string";
-  private String nameString;
-
-  public static final String JSON_PROPERTY_NAME_NUMBER = "name_number";
-  private BigDecimal nameNumber;
-
-  public static final String JSON_PROPERTY_NAME_INTEGER = "name_integer";
-  private Integer nameInteger;
-
-  public static final String JSON_PROPERTY_NAME_BOOLEAN = "name_boolean";
-  private Boolean nameBoolean;
-
-  public static final String JSON_PROPERTY_NAME_ARRAY = "name_array";
-  private List<Integer> nameArray = null;
-
-  public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array";
-  private List<Integer> nameWrappedArray = null;
-
-  public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string";
-  private String prefixString;
-
-  public static final String JSON_PROPERTY_PREFIX_NUMBER = "prefix_number";
-  private BigDecimal prefixNumber;
-
-  public static final String JSON_PROPERTY_PREFIX_INTEGER = "prefix_integer";
-  private Integer prefixInteger;
-
-  public static final String JSON_PROPERTY_PREFIX_BOOLEAN = "prefix_boolean";
-  private Boolean prefixBoolean;
-
-  public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array";
-  private List<Integer> prefixArray = null;
-
-  public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array";
-  private List<Integer> prefixWrappedArray = null;
-
-  public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string";
-  private String namespaceString;
-
-  public static final String JSON_PROPERTY_NAMESPACE_NUMBER = "namespace_number";
-  private BigDecimal namespaceNumber;
-
-  public static final String JSON_PROPERTY_NAMESPACE_INTEGER = "namespace_integer";
-  private Integer namespaceInteger;
-
-  public static final String JSON_PROPERTY_NAMESPACE_BOOLEAN = "namespace_boolean";
-  private Boolean namespaceBoolean;
-
-  public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array";
-  private List<Integer> namespaceArray = null;
-
-  public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array";
-  private List<Integer> namespaceWrappedArray = null;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string";
-  private String prefixNsString;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_NUMBER = "prefix_ns_number";
-  private BigDecimal prefixNsNumber;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_INTEGER = "prefix_ns_integer";
-  private Integer prefixNsInteger;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_BOOLEAN = "prefix_ns_boolean";
-  private Boolean prefixNsBoolean;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array";
-  private List<Integer> prefixNsArray = null;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
-  private List<Integer> prefixNsWrappedArray = null;
-
-
-  public XmlItem attributeString(String attributeString) {
-    
-    this.attributeString = attributeString;
-    return this;
-  }
-
-   /**
-   * Get attributeString
-   * @return attributeString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getAttributeString() {
-    return attributeString;
-  }
-
-
-  public void setAttributeString(String attributeString) {
-    this.attributeString = attributeString;
-  }
-
-
-  public XmlItem attributeNumber(BigDecimal attributeNumber) {
-    
-    this.attributeNumber = attributeNumber;
-    return this;
-  }
-
-   /**
-   * Get attributeNumber
-   * @return attributeNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getAttributeNumber() {
-    return attributeNumber;
-  }
-
-
-  public void setAttributeNumber(BigDecimal attributeNumber) {
-    this.attributeNumber = attributeNumber;
-  }
-
-
-  public XmlItem attributeInteger(Integer attributeInteger) {
-    
-    this.attributeInteger = attributeInteger;
-    return this;
-  }
-
-   /**
-   * Get attributeInteger
-   * @return attributeInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getAttributeInteger() {
-    return attributeInteger;
-  }
-
-
-  public void setAttributeInteger(Integer attributeInteger) {
-    this.attributeInteger = attributeInteger;
-  }
-
-
-  public XmlItem attributeBoolean(Boolean attributeBoolean) {
-    
-    this.attributeBoolean = attributeBoolean;
-    return this;
-  }
-
-   /**
-   * Get attributeBoolean
-   * @return attributeBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getAttributeBoolean() {
-    return attributeBoolean;
-  }
-
-
-  public void setAttributeBoolean(Boolean attributeBoolean) {
-    this.attributeBoolean = attributeBoolean;
-  }
-
-
-  public XmlItem wrappedArray(List<Integer> wrappedArray) {
-    
-    this.wrappedArray = wrappedArray;
-    return this;
-  }
-
-  public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
-    if (this.wrappedArray == null) {
-      this.wrappedArray = new ArrayList<>();
-    }
-    this.wrappedArray.add(wrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get wrappedArray
-   * @return wrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getWrappedArray() {
-    return wrappedArray;
-  }
-
-
-  public void setWrappedArray(List<Integer> wrappedArray) {
-    this.wrappedArray = wrappedArray;
-  }
-
-
-  public XmlItem nameString(String nameString) {
-    
-    this.nameString = nameString;
-    return this;
-  }
-
-   /**
-   * Get nameString
-   * @return nameString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getNameString() {
-    return nameString;
-  }
-
-
-  public void setNameString(String nameString) {
-    this.nameString = nameString;
-  }
-
-
-  public XmlItem nameNumber(BigDecimal nameNumber) {
-    
-    this.nameNumber = nameNumber;
-    return this;
-  }
-
-   /**
-   * Get nameNumber
-   * @return nameNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getNameNumber() {
-    return nameNumber;
-  }
-
-
-  public void setNameNumber(BigDecimal nameNumber) {
-    this.nameNumber = nameNumber;
-  }
-
-
-  public XmlItem nameInteger(Integer nameInteger) {
-    
-    this.nameInteger = nameInteger;
-    return this;
-  }
-
-   /**
-   * Get nameInteger
-   * @return nameInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getNameInteger() {
-    return nameInteger;
-  }
-
-
-  public void setNameInteger(Integer nameInteger) {
-    this.nameInteger = nameInteger;
-  }
-
-
-  public XmlItem nameBoolean(Boolean nameBoolean) {
-    
-    this.nameBoolean = nameBoolean;
-    return this;
-  }
-
-   /**
-   * Get nameBoolean
-   * @return nameBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getNameBoolean() {
-    return nameBoolean;
-  }
-
-
-  public void setNameBoolean(Boolean nameBoolean) {
-    this.nameBoolean = nameBoolean;
-  }
-
-
-  public XmlItem nameArray(List<Integer> nameArray) {
-    
-    this.nameArray = nameArray;
-    return this;
-  }
-
-  public XmlItem addNameArrayItem(Integer nameArrayItem) {
-    if (this.nameArray == null) {
-      this.nameArray = new ArrayList<>();
-    }
-    this.nameArray.add(nameArrayItem);
-    return this;
-  }
-
-   /**
-   * Get nameArray
-   * @return nameArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getNameArray() {
-    return nameArray;
-  }
-
-
-  public void setNameArray(List<Integer> nameArray) {
-    this.nameArray = nameArray;
-  }
-
-
-  public XmlItem nameWrappedArray(List<Integer> nameWrappedArray) {
-    
-    this.nameWrappedArray = nameWrappedArray;
-    return this;
-  }
-
-  public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
-    if (this.nameWrappedArray == null) {
-      this.nameWrappedArray = new ArrayList<>();
-    }
-    this.nameWrappedArray.add(nameWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get nameWrappedArray
-   * @return nameWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getNameWrappedArray() {
-    return nameWrappedArray;
-  }
-
-
-  public void setNameWrappedArray(List<Integer> nameWrappedArray) {
-    this.nameWrappedArray = nameWrappedArray;
-  }
-
-
-  public XmlItem prefixString(String prefixString) {
-    
-    this.prefixString = prefixString;
-    return this;
-  }
-
-   /**
-   * Get prefixString
-   * @return prefixString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPrefixString() {
-    return prefixString;
-  }
-
-
-  public void setPrefixString(String prefixString) {
-    this.prefixString = prefixString;
-  }
-
-
-  public XmlItem prefixNumber(BigDecimal prefixNumber) {
-    
-    this.prefixNumber = prefixNumber;
-    return this;
-  }
-
-   /**
-   * Get prefixNumber
-   * @return prefixNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getPrefixNumber() {
-    return prefixNumber;
-  }
-
-
-  public void setPrefixNumber(BigDecimal prefixNumber) {
-    this.prefixNumber = prefixNumber;
-  }
-
-
-  public XmlItem prefixInteger(Integer prefixInteger) {
-    
-    this.prefixInteger = prefixInteger;
-    return this;
-  }
-
-   /**
-   * Get prefixInteger
-   * @return prefixInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getPrefixInteger() {
-    return prefixInteger;
-  }
-
-
-  public void setPrefixInteger(Integer prefixInteger) {
-    this.prefixInteger = prefixInteger;
-  }
-
-
-  public XmlItem prefixBoolean(Boolean prefixBoolean) {
-    
-    this.prefixBoolean = prefixBoolean;
-    return this;
-  }
-
-   /**
-   * Get prefixBoolean
-   * @return prefixBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getPrefixBoolean() {
-    return prefixBoolean;
-  }
-
-
-  public void setPrefixBoolean(Boolean prefixBoolean) {
-    this.prefixBoolean = prefixBoolean;
-  }
-
-
-  public XmlItem prefixArray(List<Integer> prefixArray) {
-    
-    this.prefixArray = prefixArray;
-    return this;
-  }
-
-  public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
-    if (this.prefixArray == null) {
-      this.prefixArray = new ArrayList<>();
-    }
-    this.prefixArray.add(prefixArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixArray
-   * @return prefixArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getPrefixArray() {
-    return prefixArray;
-  }
-
-
-  public void setPrefixArray(List<Integer> prefixArray) {
-    this.prefixArray = prefixArray;
-  }
-
-
-  public XmlItem prefixWrappedArray(List<Integer> prefixWrappedArray) {
-    
-    this.prefixWrappedArray = prefixWrappedArray;
-    return this;
-  }
-
-  public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
-    if (this.prefixWrappedArray == null) {
-      this.prefixWrappedArray = new ArrayList<>();
-    }
-    this.prefixWrappedArray.add(prefixWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixWrappedArray
-   * @return prefixWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getPrefixWrappedArray() {
-    return prefixWrappedArray;
-  }
-
-
-  public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
-    this.prefixWrappedArray = prefixWrappedArray;
-  }
-
-
-  public XmlItem namespaceString(String namespaceString) {
-    
-    this.namespaceString = namespaceString;
-    return this;
-  }
-
-   /**
-   * Get namespaceString
-   * @return namespaceString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getNamespaceString() {
-    return namespaceString;
-  }
-
-
-  public void setNamespaceString(String namespaceString) {
-    this.namespaceString = namespaceString;
-  }
-
-
-  public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
-    
-    this.namespaceNumber = namespaceNumber;
-    return this;
-  }
-
-   /**
-   * Get namespaceNumber
-   * @return namespaceNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getNamespaceNumber() {
-    return namespaceNumber;
-  }
-
-
-  public void setNamespaceNumber(BigDecimal namespaceNumber) {
-    this.namespaceNumber = namespaceNumber;
-  }
-
-
-  public XmlItem namespaceInteger(Integer namespaceInteger) {
-    
-    this.namespaceInteger = namespaceInteger;
-    return this;
-  }
-
-   /**
-   * Get namespaceInteger
-   * @return namespaceInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getNamespaceInteger() {
-    return namespaceInteger;
-  }
-
-
-  public void setNamespaceInteger(Integer namespaceInteger) {
-    this.namespaceInteger = namespaceInteger;
-  }
-
-
-  public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
-    
-    this.namespaceBoolean = namespaceBoolean;
-    return this;
-  }
-
-   /**
-   * Get namespaceBoolean
-   * @return namespaceBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getNamespaceBoolean() {
-    return namespaceBoolean;
-  }
-
-
-  public void setNamespaceBoolean(Boolean namespaceBoolean) {
-    this.namespaceBoolean = namespaceBoolean;
-  }
-
-
-  public XmlItem namespaceArray(List<Integer> namespaceArray) {
-    
-    this.namespaceArray = namespaceArray;
-    return this;
-  }
-
-  public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
-    if (this.namespaceArray == null) {
-      this.namespaceArray = new ArrayList<>();
-    }
-    this.namespaceArray.add(namespaceArrayItem);
-    return this;
-  }
-
-   /**
-   * Get namespaceArray
-   * @return namespaceArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getNamespaceArray() {
-    return namespaceArray;
-  }
-
-
-  public void setNamespaceArray(List<Integer> namespaceArray) {
-    this.namespaceArray = namespaceArray;
-  }
-
-
-  public XmlItem namespaceWrappedArray(List<Integer> namespaceWrappedArray) {
-    
-    this.namespaceWrappedArray = namespaceWrappedArray;
-    return this;
-  }
-
-  public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
-    if (this.namespaceWrappedArray == null) {
-      this.namespaceWrappedArray = new ArrayList<>();
-    }
-    this.namespaceWrappedArray.add(namespaceWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get namespaceWrappedArray
-   * @return namespaceWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getNamespaceWrappedArray() {
-    return namespaceWrappedArray;
-  }
-
-
-  public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
-    this.namespaceWrappedArray = namespaceWrappedArray;
-  }
-
-
-  public XmlItem prefixNsString(String prefixNsString) {
-    
-    this.prefixNsString = prefixNsString;
-    return this;
-  }
-
-   /**
-   * Get prefixNsString
-   * @return prefixNsString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPrefixNsString() {
-    return prefixNsString;
-  }
-
-
-  public void setPrefixNsString(String prefixNsString) {
-    this.prefixNsString = prefixNsString;
-  }
-
-
-  public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
-    
-    this.prefixNsNumber = prefixNsNumber;
-    return this;
-  }
-
-   /**
-   * Get prefixNsNumber
-   * @return prefixNsNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getPrefixNsNumber() {
-    return prefixNsNumber;
-  }
-
-
-  public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
-    this.prefixNsNumber = prefixNsNumber;
-  }
-
-
-  public XmlItem prefixNsInteger(Integer prefixNsInteger) {
-    
-    this.prefixNsInteger = prefixNsInteger;
-    return this;
-  }
-
-   /**
-   * Get prefixNsInteger
-   * @return prefixNsInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getPrefixNsInteger() {
-    return prefixNsInteger;
-  }
-
-
-  public void setPrefixNsInteger(Integer prefixNsInteger) {
-    this.prefixNsInteger = prefixNsInteger;
-  }
-
-
-  public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
-    
-    this.prefixNsBoolean = prefixNsBoolean;
-    return this;
-  }
-
-   /**
-   * Get prefixNsBoolean
-   * @return prefixNsBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getPrefixNsBoolean() {
-    return prefixNsBoolean;
-  }
-
-
-  public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
-    this.prefixNsBoolean = prefixNsBoolean;
-  }
-
-
-  public XmlItem prefixNsArray(List<Integer> prefixNsArray) {
-    
-    this.prefixNsArray = prefixNsArray;
-    return this;
-  }
-
-  public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
-    if (this.prefixNsArray == null) {
-      this.prefixNsArray = new ArrayList<>();
-    }
-    this.prefixNsArray.add(prefixNsArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixNsArray
-   * @return prefixNsArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getPrefixNsArray() {
-    return prefixNsArray;
-  }
-
-
-  public void setPrefixNsArray(List<Integer> prefixNsArray) {
-    this.prefixNsArray = prefixNsArray;
-  }
-
-
-  public XmlItem prefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
-    
-    this.prefixNsWrappedArray = prefixNsWrappedArray;
-    return this;
-  }
-
-  public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
-    if (this.prefixNsWrappedArray == null) {
-      this.prefixNsWrappedArray = new ArrayList<>();
-    }
-    this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixNsWrappedArray
-   * @return prefixNsWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getPrefixNsWrappedArray() {
-    return prefixNsWrappedArray;
-  }
-
-
-  public void setPrefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
-    this.prefixNsWrappedArray = prefixNsWrappedArray;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    XmlItem xmlItem = (XmlItem) o;
-    return Objects.equals(this.attributeString, xmlItem.attributeString) &&
-        Objects.equals(this.attributeNumber, xmlItem.attributeNumber) &&
-        Objects.equals(this.attributeInteger, xmlItem.attributeInteger) &&
-        Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) &&
-        Objects.equals(this.wrappedArray, xmlItem.wrappedArray) &&
-        Objects.equals(this.nameString, xmlItem.nameString) &&
-        Objects.equals(this.nameNumber, xmlItem.nameNumber) &&
-        Objects.equals(this.nameInteger, xmlItem.nameInteger) &&
-        Objects.equals(this.nameBoolean, xmlItem.nameBoolean) &&
-        Objects.equals(this.nameArray, xmlItem.nameArray) &&
-        Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) &&
-        Objects.equals(this.prefixString, xmlItem.prefixString) &&
-        Objects.equals(this.prefixNumber, xmlItem.prefixNumber) &&
-        Objects.equals(this.prefixInteger, xmlItem.prefixInteger) &&
-        Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) &&
-        Objects.equals(this.prefixArray, xmlItem.prefixArray) &&
-        Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) &&
-        Objects.equals(this.namespaceString, xmlItem.namespaceString) &&
-        Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) &&
-        Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) &&
-        Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) &&
-        Objects.equals(this.namespaceArray, xmlItem.namespaceArray) &&
-        Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) &&
-        Objects.equals(this.prefixNsString, xmlItem.prefixNsString) &&
-        Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) &&
-        Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) &&
-        Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) &&
-        Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) &&
-        Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class XmlItem {\n");
-    sb.append("    attributeString: ").append(toIndentedString(attributeString)).append("\n");
-    sb.append("    attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n");
-    sb.append("    attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n");
-    sb.append("    attributeBoolean: ").append(toIndentedString(attributeBoolean)).append("\n");
-    sb.append("    wrappedArray: ").append(toIndentedString(wrappedArray)).append("\n");
-    sb.append("    nameString: ").append(toIndentedString(nameString)).append("\n");
-    sb.append("    nameNumber: ").append(toIndentedString(nameNumber)).append("\n");
-    sb.append("    nameInteger: ").append(toIndentedString(nameInteger)).append("\n");
-    sb.append("    nameBoolean: ").append(toIndentedString(nameBoolean)).append("\n");
-    sb.append("    nameArray: ").append(toIndentedString(nameArray)).append("\n");
-    sb.append("    nameWrappedArray: ").append(toIndentedString(nameWrappedArray)).append("\n");
-    sb.append("    prefixString: ").append(toIndentedString(prefixString)).append("\n");
-    sb.append("    prefixNumber: ").append(toIndentedString(prefixNumber)).append("\n");
-    sb.append("    prefixInteger: ").append(toIndentedString(prefixInteger)).append("\n");
-    sb.append("    prefixBoolean: ").append(toIndentedString(prefixBoolean)).append("\n");
-    sb.append("    prefixArray: ").append(toIndentedString(prefixArray)).append("\n");
-    sb.append("    prefixWrappedArray: ").append(toIndentedString(prefixWrappedArray)).append("\n");
-    sb.append("    namespaceString: ").append(toIndentedString(namespaceString)).append("\n");
-    sb.append("    namespaceNumber: ").append(toIndentedString(namespaceNumber)).append("\n");
-    sb.append("    namespaceInteger: ").append(toIndentedString(namespaceInteger)).append("\n");
-    sb.append("    namespaceBoolean: ").append(toIndentedString(namespaceBoolean)).append("\n");
-    sb.append("    namespaceArray: ").append(toIndentedString(namespaceArray)).append("\n");
-    sb.append("    namespaceWrappedArray: ").append(toIndentedString(namespaceWrappedArray)).append("\n");
-    sb.append("    prefixNsString: ").append(toIndentedString(prefixNsString)).append("\n");
-    sb.append("    prefixNsNumber: ").append(toIndentedString(prefixNsNumber)).append("\n");
-    sb.append("    prefixNsInteger: ").append(toIndentedString(prefixNsInteger)).append("\n");
-    sb.append("    prefixNsBoolean: ").append(toIndentedString(prefixNsBoolean)).append("\n");
-    sb.append("    prefixNsArray: ").append(toIndentedString(prefixNsArray)).append("\n");
-    sb.append("    prefixNsWrappedArray: ").append(toIndentedString(prefixNsWrappedArray)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
deleted file mode 100644
index 1d45ba717a26..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.Client;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for AnotherFakeApi
- */
-public class AnotherFakeApiTest {
-
-    private AnotherFakeApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(AnotherFakeApi.class);
-    }
-
-    /**
-     * To test special tags
-     *
-     * To test special tags
-     */
-    @Test
-    public void testSpecialTagsTest() {
-        Client client = null;
-        // Client response = api.testSpecialTags(client);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/FakeApiTest.java
deleted file mode 100644
index 82a96b9818b3..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import java.math.BigDecimal;
-import org.openapitools.client.model.Client;
-import java.io.File;
-import org.openapitools.client.model.FileSchemaTestClass;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import org.openapitools.client.model.OuterComposite;
-import org.openapitools.client.model.User;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for FakeApi
- */
-public class FakeApiTest {
-
-    private FakeApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(FakeApi.class);
-    }
-
-    /**
-     * 
-     *
-     * Test serialization of outer boolean types
-     */
-    @Test
-    public void fakeOuterBooleanSerializeTest() {
-        Boolean body = null;
-        // Boolean response = api.fakeOuterBooleanSerialize(body);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * Test serialization of object with outer number type
-     */
-    @Test
-    public void fakeOuterCompositeSerializeTest() {
-        OuterComposite outerComposite = null;
-        // OuterComposite response = api.fakeOuterCompositeSerialize(outerComposite);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * Test serialization of outer number types
-     */
-    @Test
-    public void fakeOuterNumberSerializeTest() {
-        BigDecimal body = null;
-        // BigDecimal response = api.fakeOuterNumberSerialize(body);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * Test serialization of outer string types
-     */
-    @Test
-    public void fakeOuterStringSerializeTest() {
-        String body = null;
-        // String response = api.fakeOuterStringSerialize(body);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-     */
-    @Test
-    public void testBodyWithFileSchemaTest() {
-        FileSchemaTestClass fileSchemaTestClass = null;
-        // api.testBodyWithFileSchema(fileSchemaTestClass);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * 
-     */
-    @Test
-    public void testBodyWithQueryParamsTest() {
-        String query = null;
-        User user = null;
-        // api.testBodyWithQueryParams(query, user);
-
-        // TODO: test validations
-    }
-    /**
-     * To test \&quot;client\&quot; model
-     *
-     * To test \&quot;client\&quot; model
-     */
-    @Test
-    public void testClientModelTest() {
-        Client client = null;
-        // Client response = api.testClientModel(client);
-
-        // TODO: test validations
-    }
-    /**
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     */
-    @Test
-    public void testEndpointParametersTest() {
-        BigDecimal number = null;
-        Double _double = null;
-        String patternWithoutDelimiter = null;
-        byte[] _byte = null;
-        Integer integer = null;
-        Integer int32 = null;
-        Long int64 = null;
-        Float _float = null;
-        String string = null;
-        File binary = null;
-        LocalDate date = null;
-        OffsetDateTime dateTime = null;
-        String password = null;
-        String paramCallback = null;
-        // api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
-
-        // TODO: test validations
-    }
-    /**
-     * To test enum parameters
-     *
-     * To test enum parameters
-     */
-    @Test
-    public void testEnumParametersTest() {
-        List<String> enumHeaderStringArray = null;
-        String enumHeaderString = null;
-        List<String> enumQueryStringArray = null;
-        String enumQueryString = null;
-        Integer enumQueryInteger = null;
-        Double enumQueryDouble = null;
-        List<String> enumFormStringArray = null;
-        String enumFormString = null;
-        // api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
-
-        // TODO: test validations
-    }
-    /**
-     * Fake endpoint to test group parameters (optional)
-     *
-     * Fake endpoint to test group parameters (optional)
-     */
-    @Test
-    public void testGroupParametersTest() {
-        Integer requiredStringGroup = null;
-        Boolean requiredBooleanGroup = null;
-        Long requiredInt64Group = null;
-        Integer stringGroup = null;
-        Boolean booleanGroup = null;
-        Long int64Group = null;
-        // api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
-
-        // TODO: test validations
-    }
-    /**
-     * test inline additionalProperties
-     *
-     * 
-     */
-    @Test
-    public void testInlineAdditionalPropertiesTest() {
-        Map<String, String> requestBody = null;
-        // api.testInlineAdditionalProperties(requestBody);
-
-        // TODO: test validations
-    }
-    /**
-     * test json serialization of form data
-     *
-     * 
-     */
-    @Test
-    public void testJsonFormDataTest() {
-        String param = null;
-        String param2 = null;
-        // api.testJsonFormData(param, param2);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
deleted file mode 100644
index 6e32cc284814..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.Client;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for FakeClassnameTags123Api
- */
-public class FakeClassnameTags123ApiTest {
-
-    private FakeClassnameTags123Api api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(FakeClassnameTags123Api.class);
-    }
-
-    /**
-     * To test class name in snake case
-     *
-     * To test class name in snake case
-     */
-    @Test
-    public void testClassnameTest() {
-        Client client = null;
-        // Client response = api.testClassname(client);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/PetApiTest.java
deleted file mode 100644
index 65eed9391e98..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import java.io.File;
-import org.openapitools.client.model.ModelApiResponse;
-import org.openapitools.client.model.Pet;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for PetApi
- */
-public class PetApiTest {
-
-    private PetApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(PetApi.class);
-    }
-
-    /**
-     * Add a new pet to the store
-     *
-     * 
-     */
-    @Test
-    public void addPetTest() {
-        Pet pet = null;
-        // api.addPet(pet);
-
-        // TODO: test validations
-    }
-    /**
-     * Deletes a pet
-     *
-     * 
-     */
-    @Test
-    public void deletePetTest() {
-        Long petId = null;
-        String apiKey = null;
-        // api.deletePet(petId, apiKey);
-
-        // TODO: test validations
-    }
-    /**
-     * Finds Pets by status
-     *
-     * Multiple status values can be provided with comma separated strings
-     */
-    @Test
-    public void findPetsByStatusTest() {
-        List<String> status = null;
-        // List<Pet> response = api.findPetsByStatus(status);
-
-        // TODO: test validations
-    }
-    /**
-     * Finds Pets by tags
-     *
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     */
-    @Test
-    public void findPetsByTagsTest() {
-        List<String> tags = null;
-        // List<Pet> response = api.findPetsByTags(tags);
-
-        // TODO: test validations
-    }
-    /**
-     * Find pet by ID
-     *
-     * Returns a single pet
-     */
-    @Test
-    public void getPetByIdTest() {
-        Long petId = null;
-        // Pet response = api.getPetById(petId);
-
-        // TODO: test validations
-    }
-    /**
-     * Update an existing pet
-     *
-     * 
-     */
-    @Test
-    public void updatePetTest() {
-        Pet pet = null;
-        // api.updatePet(pet);
-
-        // TODO: test validations
-    }
-    /**
-     * Updates a pet in the store with form data
-     *
-     * 
-     */
-    @Test
-    public void updatePetWithFormTest() {
-        Long petId = null;
-        String name = null;
-        String status = null;
-        // api.updatePetWithForm(petId, name, status);
-
-        // TODO: test validations
-    }
-    /**
-     * uploads an image
-     *
-     * 
-     */
-    @Test
-    public void uploadFileTest() {
-        Long petId = null;
-        String additionalMetadata = null;
-        File file = null;
-        // ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/StoreApiTest.java
deleted file mode 100644
index 15455ccabb20..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.Order;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for StoreApi
- */
-public class StoreApiTest {
-
-    private StoreApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(StoreApi.class);
-    }
-
-    /**
-     * Delete purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-     */
-    @Test
-    public void deleteOrderTest() {
-        String orderId = null;
-        // api.deleteOrder(orderId);
-
-        // TODO: test validations
-    }
-    /**
-     * Returns pet inventories by status
-     *
-     * Returns a map of status codes to quantities
-     */
-    @Test
-    public void getInventoryTest() {
-        // Map<String, Integer> response = api.getInventory();
-
-        // TODO: test validations
-    }
-    /**
-     * Find purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     */
-    @Test
-    public void getOrderByIdTest() {
-        Long orderId = null;
-        // Order response = api.getOrderById(orderId);
-
-        // TODO: test validations
-    }
-    /**
-     * Place an order for a pet
-     *
-     * 
-     */
-    @Test
-    public void placeOrderTest() {
-        Order order = null;
-        // Order response = api.placeOrder(order);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/UserApiTest.java
deleted file mode 100644
index 9174f6d02508..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/api/UserApiTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.User;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for UserApi
- */
-public class UserApiTest {
-
-    private UserApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(UserApi.class);
-    }
-
-    /**
-     * Create user
-     *
-     * This can only be done by the logged in user.
-     */
-    @Test
-    public void createUserTest() {
-        User user = null;
-        // api.createUser(user);
-
-        // TODO: test validations
-    }
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
-    @Test
-    public void createUsersWithArrayInputTest() {
-        List<User> user = null;
-        // api.createUsersWithArrayInput(user);
-
-        // TODO: test validations
-    }
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
-    @Test
-    public void createUsersWithListInputTest() {
-        List<User> user = null;
-        // api.createUsersWithListInput(user);
-
-        // TODO: test validations
-    }
-    /**
-     * Delete user
-     *
-     * This can only be done by the logged in user.
-     */
-    @Test
-    public void deleteUserTest() {
-        String username = null;
-        // api.deleteUser(username);
-
-        // TODO: test validations
-    }
-    /**
-     * Get user by user name
-     *
-     * 
-     */
-    @Test
-    public void getUserByNameTest() {
-        String username = null;
-        // User response = api.getUserByName(username);
-
-        // TODO: test validations
-    }
-    /**
-     * Logs user into the system
-     *
-     * 
-     */
-    @Test
-    public void loginUserTest() {
-        String username = null;
-        String password = null;
-        // String response = api.loginUser(username, password);
-
-        // TODO: test validations
-    }
-    /**
-     * Logs out current logged in user session
-     *
-     * 
-     */
-    @Test
-    public void logoutUserTest() {
-        // api.logoutUser();
-
-        // TODO: test validations
-    }
-    /**
-     * Updated user
-     *
-     * This can only be done by the logged in user.
-     */
-    @Test
-    public void updateUserTest() {
-        String username = null;
-        User user = null;
-        // api.updateUser(username, user);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
deleted file mode 100644
index 2b0bd0bbaefe..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesAnyType
- */
-public class AdditionalPropertiesAnyTypeTest {
-    private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType();
-
-    /**
-     * Model tests for AdditionalPropertiesAnyType
-     */
-    @Test
-    public void testAdditionalPropertiesAnyType() {
-        // TODO: test AdditionalPropertiesAnyType
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
deleted file mode 100644
index c6dd88eea82c..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesArray
- */
-public class AdditionalPropertiesArrayTest {
-    private final AdditionalPropertiesArray model = new AdditionalPropertiesArray();
-
-    /**
-     * Model tests for AdditionalPropertiesArray
-     */
-    @Test
-    public void testAdditionalPropertiesArray() {
-        // TODO: test AdditionalPropertiesArray
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
deleted file mode 100644
index 9d474c0dd801..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesBoolean
- */
-public class AdditionalPropertiesBooleanTest {
-    private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean();
-
-    /**
-     * Model tests for AdditionalPropertiesBoolean
-     */
-    @Test
-    public void testAdditionalPropertiesBoolean() {
-        // TODO: test AdditionalPropertiesBoolean
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
deleted file mode 100644
index c6bcc988bf94..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesClass
- */
-public class AdditionalPropertiesClassTest {
-    private final AdditionalPropertiesClass model = new AdditionalPropertiesClass();
-
-    /**
-     * Model tests for AdditionalPropertiesClass
-     */
-    @Test
-    public void testAdditionalPropertiesClass() {
-        // TODO: test AdditionalPropertiesClass
-    }
-
-    /**
-     * Test the property 'mapProperty'
-     */
-    @Test
-    public void mapPropertyTest() {
-        // TODO: test mapProperty
-    }
-
-    /**
-     * Test the property 'mapOfMapProperty'
-     */
-    @Test
-    public void mapOfMapPropertyTest() {
-        // TODO: test mapOfMapProperty
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
deleted file mode 100644
index bf1b1c427b64..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesInteger
- */
-public class AdditionalPropertiesIntegerTest {
-    private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger();
-
-    /**
-     * Model tests for AdditionalPropertiesInteger
-     */
-    @Test
-    public void testAdditionalPropertiesInteger() {
-        // TODO: test AdditionalPropertiesInteger
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
deleted file mode 100644
index b9cb6470e38d..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesNumber
- */
-public class AdditionalPropertiesNumberTest {
-    private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber();
-
-    /**
-     * Model tests for AdditionalPropertiesNumber
-     */
-    @Test
-    public void testAdditionalPropertiesNumber() {
-        // TODO: test AdditionalPropertiesNumber
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
deleted file mode 100644
index 3cbcb8ec3b0f..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesObject
- */
-public class AdditionalPropertiesObjectTest {
-    private final AdditionalPropertiesObject model = new AdditionalPropertiesObject();
-
-    /**
-     * Model tests for AdditionalPropertiesObject
-     */
-    @Test
-    public void testAdditionalPropertiesObject() {
-        // TODO: test AdditionalPropertiesObject
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
deleted file mode 100644
index 1d3c05075eaa..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesString
- */
-public class AdditionalPropertiesStringTest {
-    private final AdditionalPropertiesString model = new AdditionalPropertiesString();
-
-    /**
-     * Model tests for AdditionalPropertiesString
-     */
-    @Test
-    public void testAdditionalPropertiesString() {
-        // TODO: test AdditionalPropertiesString
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AnimalTest.java
deleted file mode 100644
index beb02882b30e..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/AnimalTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Animal
- */
-public class AnimalTest {
-    private final Animal model = new Animal();
-
-    /**
-     * Model tests for Animal
-     */
-    @Test
-    public void testAnimal() {
-        // TODO: test Animal
-    }
-
-    /**
-     * Test the property 'className'
-     */
-    @Test
-    public void classNameTest() {
-        // TODO: test className
-    }
-
-    /**
-     * Test the property 'color'
-     */
-    @Test
-    public void colorTest() {
-        // TODO: test color
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
deleted file mode 100644
index ae7970522b15..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ArrayOfArrayOfNumberOnly
- */
-public class ArrayOfArrayOfNumberOnlyTest {
-    private final ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly();
-
-    /**
-     * Model tests for ArrayOfArrayOfNumberOnly
-     */
-    @Test
-    public void testArrayOfArrayOfNumberOnly() {
-        // TODO: test ArrayOfArrayOfNumberOnly
-    }
-
-    /**
-     * Test the property 'arrayArrayNumber'
-     */
-    @Test
-    public void arrayArrayNumberTest() {
-        // TODO: test arrayArrayNumber
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
deleted file mode 100644
index 6151b7068b75..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ArrayOfNumberOnly
- */
-public class ArrayOfNumberOnlyTest {
-    private final ArrayOfNumberOnly model = new ArrayOfNumberOnly();
-
-    /**
-     * Model tests for ArrayOfNumberOnly
-     */
-    @Test
-    public void testArrayOfNumberOnly() {
-        // TODO: test ArrayOfNumberOnly
-    }
-
-    /**
-     * Test the property 'arrayNumber'
-     */
-    @Test
-    public void arrayNumberTest() {
-        // TODO: test arrayNumber
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ArrayTestTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ArrayTestTest.java
deleted file mode 100644
index 4bb62b6569ae..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ArrayTestTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.client.model.ReadOnlyFirst;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ArrayTest
- */
-public class ArrayTestTest {
-    private final ArrayTest model = new ArrayTest();
-
-    /**
-     * Model tests for ArrayTest
-     */
-    @Test
-    public void testArrayTest() {
-        // TODO: test ArrayTest
-    }
-
-    /**
-     * Test the property 'arrayOfString'
-     */
-    @Test
-    public void arrayOfStringTest() {
-        // TODO: test arrayOfString
-    }
-
-    /**
-     * Test the property 'arrayArrayOfInteger'
-     */
-    @Test
-    public void arrayArrayOfIntegerTest() {
-        // TODO: test arrayArrayOfInteger
-    }
-
-    /**
-     * Test the property 'arrayArrayOfModel'
-     */
-    @Test
-    public void arrayArrayOfModelTest() {
-        // TODO: test arrayArrayOfModel
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/BigCatTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/BigCatTest.java
deleted file mode 100644
index 006c80707427..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/BigCatTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.BigCatAllOf;
-import org.openapitools.client.model.Cat;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for BigCat
- */
-public class BigCatTest {
-    private final BigCat model = new BigCat();
-
-    /**
-     * Model tests for BigCat
-     */
-    @Test
-    public void testBigCat() {
-        // TODO: test BigCat
-    }
-
-    /**
-     * Test the property 'className'
-     */
-    @Test
-    public void classNameTest() {
-        // TODO: test className
-    }
-
-    /**
-     * Test the property 'color'
-     */
-    @Test
-    public void colorTest() {
-        // TODO: test color
-    }
-
-    /**
-     * Test the property 'declawed'
-     */
-    @Test
-    public void declawedTest() {
-        // TODO: test declawed
-    }
-
-    /**
-     * Test the property 'kind'
-     */
-    @Test
-    public void kindTest() {
-        // TODO: test kind
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/CapitalizationTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/CapitalizationTest.java
deleted file mode 100644
index eae9be7938c9..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/CapitalizationTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Capitalization
- */
-public class CapitalizationTest {
-    private final Capitalization model = new Capitalization();
-
-    /**
-     * Model tests for Capitalization
-     */
-    @Test
-    public void testCapitalization() {
-        // TODO: test Capitalization
-    }
-
-    /**
-     * Test the property 'smallCamel'
-     */
-    @Test
-    public void smallCamelTest() {
-        // TODO: test smallCamel
-    }
-
-    /**
-     * Test the property 'capitalCamel'
-     */
-    @Test
-    public void capitalCamelTest() {
-        // TODO: test capitalCamel
-    }
-
-    /**
-     * Test the property 'smallSnake'
-     */
-    @Test
-    public void smallSnakeTest() {
-        // TODO: test smallSnake
-    }
-
-    /**
-     * Test the property 'capitalSnake'
-     */
-    @Test
-    public void capitalSnakeTest() {
-        // TODO: test capitalSnake
-    }
-
-    /**
-     * Test the property 'scAETHFlowPoints'
-     */
-    @Test
-    public void scAETHFlowPointsTest() {
-        // TODO: test scAETHFlowPoints
-    }
-
-    /**
-     * Test the property 'ATT_NAME'
-     */
-    @Test
-    public void ATT_NAMETest() {
-        // TODO: test ATT_NAME
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/CatAllOfTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/CatAllOfTest.java
deleted file mode 100644
index 69b226745d79..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/CatAllOfTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for CatAllOf
- */
-public class CatAllOfTest {
-    private final CatAllOf model = new CatAllOf();
-
-    /**
-     * Model tests for CatAllOf
-     */
-    @Test
-    public void testCatAllOf() {
-        // TODO: test CatAllOf
-    }
-
-    /**
-     * Test the property 'declawed'
-     */
-    @Test
-    public void declawedTest() {
-        // TODO: test declawed
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/CatTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/CatTest.java
deleted file mode 100644
index dcb9f2d4cae6..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/CatTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Animal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Cat
- */
-public class CatTest {
-    private final Cat model = new Cat();
-
-    /**
-     * Model tests for Cat
-     */
-    @Test
-    public void testCat() {
-        // TODO: test Cat
-    }
-
-    /**
-     * Test the property 'className'
-     */
-    @Test
-    public void classNameTest() {
-        // TODO: test className
-    }
-
-    /**
-     * Test the property 'color'
-     */
-    @Test
-    public void colorTest() {
-        // TODO: test color
-    }
-
-    /**
-     * Test the property 'declawed'
-     */
-    @Test
-    public void declawedTest() {
-        // TODO: test declawed
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/CategoryTest.java
deleted file mode 100644
index 1df27cf03202..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/CategoryTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Category
- */
-public class CategoryTest {
-    private final Category model = new Category();
-
-    /**
-     * Model tests for Category
-     */
-    @Test
-    public void testCategory() {
-        // TODO: test Category
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ClassModelTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ClassModelTest.java
deleted file mode 100644
index 04eb02f835e2..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ClassModelTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ClassModel
- */
-public class ClassModelTest {
-    private final ClassModel model = new ClassModel();
-
-    /**
-     * Model tests for ClassModel
-     */
-    @Test
-    public void testClassModel() {
-        // TODO: test ClassModel
-    }
-
-    /**
-     * Test the property 'propertyClass'
-     */
-    @Test
-    public void propertyClassTest() {
-        // TODO: test propertyClass
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ClientTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ClientTest.java
deleted file mode 100644
index 03b6bb41a529..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ClientTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Client
- */
-public class ClientTest {
-    private final Client model = new Client();
-
-    /**
-     * Model tests for Client
-     */
-    @Test
-    public void testClient() {
-        // TODO: test Client
-    }
-
-    /**
-     * Test the property 'client'
-     */
-    @Test
-    public void clientTest() {
-        // TODO: test client
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/DogAllOfTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/DogAllOfTest.java
deleted file mode 100644
index 1b83dcefc4f5..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/DogAllOfTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for DogAllOf
- */
-public class DogAllOfTest {
-    private final DogAllOf model = new DogAllOf();
-
-    /**
-     * Model tests for DogAllOf
-     */
-    @Test
-    public void testDogAllOf() {
-        // TODO: test DogAllOf
-    }
-
-    /**
-     * Test the property 'breed'
-     */
-    @Test
-    public void breedTest() {
-        // TODO: test breed
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/DogTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/DogTest.java
deleted file mode 100644
index 06ac28f804ad..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/DogTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Animal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Dog
- */
-public class DogTest {
-    private final Dog model = new Dog();
-
-    /**
-     * Model tests for Dog
-     */
-    @Test
-    public void testDog() {
-        // TODO: test Dog
-    }
-
-    /**
-     * Test the property 'className'
-     */
-    @Test
-    public void classNameTest() {
-        // TODO: test className
-    }
-
-    /**
-     * Test the property 'color'
-     */
-    @Test
-    public void colorTest() {
-        // TODO: test color
-    }
-
-    /**
-     * Test the property 'breed'
-     */
-    @Test
-    public void breedTest() {
-        // TODO: test breed
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/EnumArraysTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/EnumArraysTest.java
deleted file mode 100644
index 11b5f01985fe..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/EnumArraysTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for EnumArrays
- */
-public class EnumArraysTest {
-    private final EnumArrays model = new EnumArrays();
-
-    /**
-     * Model tests for EnumArrays
-     */
-    @Test
-    public void testEnumArrays() {
-        // TODO: test EnumArrays
-    }
-
-    /**
-     * Test the property 'justSymbol'
-     */
-    @Test
-    public void justSymbolTest() {
-        // TODO: test justSymbol
-    }
-
-    /**
-     * Test the property 'arrayEnum'
-     */
-    @Test
-    public void arrayEnumTest() {
-        // TODO: test arrayEnum
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/EnumClassTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/EnumClassTest.java
deleted file mode 100644
index cb51ca50c958..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/EnumClassTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for EnumClass
- */
-public class EnumClassTest {
-    /**
-     * Model tests for EnumClass
-     */
-    @Test
-    public void testEnumClass() {
-        // TODO: test EnumClass
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/EnumTestTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/EnumTestTest.java
deleted file mode 100644
index 13122a0cb978..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/EnumTestTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.OuterEnum;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for EnumTest
- */
-public class EnumTestTest {
-    private final EnumTest model = new EnumTest();
-
-    /**
-     * Model tests for EnumTest
-     */
-    @Test
-    public void testEnumTest() {
-        // TODO: test EnumTest
-    }
-
-    /**
-     * Test the property 'enumString'
-     */
-    @Test
-    public void enumStringTest() {
-        // TODO: test enumString
-    }
-
-    /**
-     * Test the property 'enumStringRequired'
-     */
-    @Test
-    public void enumStringRequiredTest() {
-        // TODO: test enumStringRequired
-    }
-
-    /**
-     * Test the property 'enumInteger'
-     */
-    @Test
-    public void enumIntegerTest() {
-        // TODO: test enumInteger
-    }
-
-    /**
-     * Test the property 'enumNumber'
-     */
-    @Test
-    public void enumNumberTest() {
-        // TODO: test enumNumber
-    }
-
-    /**
-     * Test the property 'outerEnum'
-     */
-    @Test
-    public void outerEnumTest() {
-        // TODO: test outerEnum
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
deleted file mode 100644
index a6b0d8ff7b05..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for FileSchemaTestClass
- */
-public class FileSchemaTestClassTest {
-    private final FileSchemaTestClass model = new FileSchemaTestClass();
-
-    /**
-     * Model tests for FileSchemaTestClass
-     */
-    @Test
-    public void testFileSchemaTestClass() {
-        // TODO: test FileSchemaTestClass
-    }
-
-    /**
-     * Test the property 'file'
-     */
-    @Test
-    public void fileTest() {
-        // TODO: test file
-    }
-
-    /**
-     * Test the property 'files'
-     */
-    @Test
-    public void filesTest() {
-        // TODO: test files
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/FormatTestTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/FormatTestTest.java
deleted file mode 100644
index 9cbc69fd1dca..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/FormatTestTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.File;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.UUID;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for FormatTest
- */
-public class FormatTestTest {
-    private final FormatTest model = new FormatTest();
-
-    /**
-     * Model tests for FormatTest
-     */
-    @Test
-    public void testFormatTest() {
-        // TODO: test FormatTest
-    }
-
-    /**
-     * Test the property 'integer'
-     */
-    @Test
-    public void integerTest() {
-        // TODO: test integer
-    }
-
-    /**
-     * Test the property 'int32'
-     */
-    @Test
-    public void int32Test() {
-        // TODO: test int32
-    }
-
-    /**
-     * Test the property 'int64'
-     */
-    @Test
-    public void int64Test() {
-        // TODO: test int64
-    }
-
-    /**
-     * Test the property 'number'
-     */
-    @Test
-    public void numberTest() {
-        // TODO: test number
-    }
-
-    /**
-     * Test the property '_float'
-     */
-    @Test
-    public void _floatTest() {
-        // TODO: test _float
-    }
-
-    /**
-     * Test the property '_double'
-     */
-    @Test
-    public void _doubleTest() {
-        // TODO: test _double
-    }
-
-    /**
-     * Test the property 'string'
-     */
-    @Test
-    public void stringTest() {
-        // TODO: test string
-    }
-
-    /**
-     * Test the property '_byte'
-     */
-    @Test
-    public void _byteTest() {
-        // TODO: test _byte
-    }
-
-    /**
-     * Test the property 'binary'
-     */
-    @Test
-    public void binaryTest() {
-        // TODO: test binary
-    }
-
-    /**
-     * Test the property 'date'
-     */
-    @Test
-    public void dateTest() {
-        // TODO: test date
-    }
-
-    /**
-     * Test the property 'dateTime'
-     */
-    @Test
-    public void dateTimeTest() {
-        // TODO: test dateTime
-    }
-
-    /**
-     * Test the property 'uuid'
-     */
-    @Test
-    public void uuidTest() {
-        // TODO: test uuid
-    }
-
-    /**
-     * Test the property 'password'
-     */
-    @Test
-    public void passwordTest() {
-        // TODO: test password
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
deleted file mode 100644
index 2c4b2470b983..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for HasOnlyReadOnly
- */
-public class HasOnlyReadOnlyTest {
-    private final HasOnlyReadOnly model = new HasOnlyReadOnly();
-
-    /**
-     * Model tests for HasOnlyReadOnly
-     */
-    @Test
-    public void testHasOnlyReadOnly() {
-        // TODO: test HasOnlyReadOnly
-    }
-
-    /**
-     * Test the property 'bar'
-     */
-    @Test
-    public void barTest() {
-        // TODO: test bar
-    }
-
-    /**
-     * Test the property 'foo'
-     */
-    @Test
-    public void fooTest() {
-        // TODO: test foo
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/MapTestTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/MapTestTest.java
deleted file mode 100644
index 0f08d8c88f07..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/MapTestTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for MapTest
- */
-public class MapTestTest {
-    private final MapTest model = new MapTest();
-
-    /**
-     * Model tests for MapTest
-     */
-    @Test
-    public void testMapTest() {
-        // TODO: test MapTest
-    }
-
-    /**
-     * Test the property 'mapMapOfString'
-     */
-    @Test
-    public void mapMapOfStringTest() {
-        // TODO: test mapMapOfString
-    }
-
-    /**
-     * Test the property 'mapOfEnumString'
-     */
-    @Test
-    public void mapOfEnumStringTest() {
-        // TODO: test mapOfEnumString
-    }
-
-    /**
-     * Test the property 'directMap'
-     */
-    @Test
-    public void directMapTest() {
-        // TODO: test directMap
-    }
-
-    /**
-     * Test the property 'indirectMap'
-     */
-    @Test
-    public void indirectMapTest() {
-        // TODO: test indirectMap
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
deleted file mode 100644
index 504be4cd00ba..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.time.OffsetDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import org.openapitools.client.model.Animal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for MixedPropertiesAndAdditionalPropertiesClass
- */
-public class MixedPropertiesAndAdditionalPropertiesClassTest {
-    private final MixedPropertiesAndAdditionalPropertiesClass model = new MixedPropertiesAndAdditionalPropertiesClass();
-
-    /**
-     * Model tests for MixedPropertiesAndAdditionalPropertiesClass
-     */
-    @Test
-    public void testMixedPropertiesAndAdditionalPropertiesClass() {
-        // TODO: test MixedPropertiesAndAdditionalPropertiesClass
-    }
-
-    /**
-     * Test the property 'uuid'
-     */
-    @Test
-    public void uuidTest() {
-        // TODO: test uuid
-    }
-
-    /**
-     * Test the property 'dateTime'
-     */
-    @Test
-    public void dateTimeTest() {
-        // TODO: test dateTime
-    }
-
-    /**
-     * Test the property 'map'
-     */
-    @Test
-    public void mapTest() {
-        // TODO: test map
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/Model200ResponseTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
deleted file mode 100644
index 1ad55ca32ea6..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Model200Response
- */
-public class Model200ResponseTest {
-    private final Model200Response model = new Model200Response();
-
-    /**
-     * Model tests for Model200Response
-     */
-    @Test
-    public void testModel200Response() {
-        // TODO: test Model200Response
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-    /**
-     * Test the property 'propertyClass'
-     */
-    @Test
-    public void propertyClassTest() {
-        // TODO: test propertyClass
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
deleted file mode 100644
index 73d28676aeae..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ModelApiResponse
- */
-public class ModelApiResponseTest {
-    private final ModelApiResponse model = new ModelApiResponse();
-
-    /**
-     * Model tests for ModelApiResponse
-     */
-    @Test
-    public void testModelApiResponse() {
-        // TODO: test ModelApiResponse
-    }
-
-    /**
-     * Test the property 'code'
-     */
-    @Test
-    public void codeTest() {
-        // TODO: test code
-    }
-
-    /**
-     * Test the property 'type'
-     */
-    @Test
-    public void typeTest() {
-        // TODO: test type
-    }
-
-    /**
-     * Test the property 'message'
-     */
-    @Test
-    public void messageTest() {
-        // TODO: test message
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ModelReturnTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ModelReturnTest.java
deleted file mode 100644
index b073fda00140..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ModelReturnTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ModelReturn
- */
-public class ModelReturnTest {
-    private final ModelReturn model = new ModelReturn();
-
-    /**
-     * Model tests for ModelReturn
-     */
-    @Test
-    public void testModelReturn() {
-        // TODO: test ModelReturn
-    }
-
-    /**
-     * Test the property '_return'
-     */
-    @Test
-    public void _returnTest() {
-        // TODO: test _return
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/NameTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/NameTest.java
deleted file mode 100644
index e81ebc38e652..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/NameTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Name
- */
-public class NameTest {
-    private final Name model = new Name();
-
-    /**
-     * Model tests for Name
-     */
-    @Test
-    public void testName() {
-        // TODO: test Name
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-    /**
-     * Test the property 'snakeCase'
-     */
-    @Test
-    public void snakeCaseTest() {
-        // TODO: test snakeCase
-    }
-
-    /**
-     * Test the property 'property'
-     */
-    @Test
-    public void propertyTest() {
-        // TODO: test property
-    }
-
-    /**
-     * Test the property '_123number'
-     */
-    @Test
-    public void _123numberTest() {
-        // TODO: test _123number
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/NumberOnlyTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
deleted file mode 100644
index 565c8bd0627e..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for NumberOnly
- */
-public class NumberOnlyTest {
-    private final NumberOnly model = new NumberOnly();
-
-    /**
-     * Model tests for NumberOnly
-     */
-    @Test
-    public void testNumberOnly() {
-        // TODO: test NumberOnly
-    }
-
-    /**
-     * Test the property 'justNumber'
-     */
-    @Test
-    public void justNumberTest() {
-        // TODO: test justNumber
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/OrderTest.java
deleted file mode 100644
index d65ce716e13e..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/OrderTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.time.OffsetDateTime;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Order
- */
-public class OrderTest {
-    private final Order model = new Order();
-
-    /**
-     * Model tests for Order
-     */
-    @Test
-    public void testOrder() {
-        // TODO: test Order
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'petId'
-     */
-    @Test
-    public void petIdTest() {
-        // TODO: test petId
-    }
-
-    /**
-     * Test the property 'quantity'
-     */
-    @Test
-    public void quantityTest() {
-        // TODO: test quantity
-    }
-
-    /**
-     * Test the property 'shipDate'
-     */
-    @Test
-    public void shipDateTest() {
-        // TODO: test shipDate
-    }
-
-    /**
-     * Test the property 'status'
-     */
-    @Test
-    public void statusTest() {
-        // TODO: test status
-    }
-
-    /**
-     * Test the property 'complete'
-     */
-    @Test
-    public void completeTest() {
-        // TODO: test complete
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/OuterCompositeTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
deleted file mode 100644
index 49b656a93faf..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for OuterComposite
- */
-public class OuterCompositeTest {
-    private final OuterComposite model = new OuterComposite();
-
-    /**
-     * Model tests for OuterComposite
-     */
-    @Test
-    public void testOuterComposite() {
-        // TODO: test OuterComposite
-    }
-
-    /**
-     * Test the property 'myNumber'
-     */
-    @Test
-    public void myNumberTest() {
-        // TODO: test myNumber
-    }
-
-    /**
-     * Test the property 'myString'
-     */
-    @Test
-    public void myStringTest() {
-        // TODO: test myString
-    }
-
-    /**
-     * Test the property 'myBoolean'
-     */
-    @Test
-    public void myBooleanTest() {
-        // TODO: test myBoolean
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/OuterEnumTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/OuterEnumTest.java
deleted file mode 100644
index 61154c6d8818..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/OuterEnumTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for OuterEnum
- */
-public class OuterEnumTest {
-    /**
-     * Model tests for OuterEnum
-     */
-    @Test
-    public void testOuterEnum() {
-        // TODO: test OuterEnum
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/PetTest.java
deleted file mode 100644
index bf6908e4a455..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/PetTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.client.model.Category;
-import org.openapitools.client.model.Tag;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Pet
- */
-public class PetTest {
-    private final Pet model = new Pet();
-
-    /**
-     * Model tests for Pet
-     */
-    @Test
-    public void testPet() {
-        // TODO: test Pet
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'category'
-     */
-    @Test
-    public void categoryTest() {
-        // TODO: test category
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-    /**
-     * Test the property 'photoUrls'
-     */
-    @Test
-    public void photoUrlsTest() {
-        // TODO: test photoUrls
-    }
-
-    /**
-     * Test the property 'tags'
-     */
-    @Test
-    public void tagsTest() {
-        // TODO: test tags
-    }
-
-    /**
-     * Test the property 'status'
-     */
-    @Test
-    public void statusTest() {
-        // TODO: test status
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
deleted file mode 100644
index e48b31a39fda..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ReadOnlyFirst
- */
-public class ReadOnlyFirstTest {
-    private final ReadOnlyFirst model = new ReadOnlyFirst();
-
-    /**
-     * Model tests for ReadOnlyFirst
-     */
-    @Test
-    public void testReadOnlyFirst() {
-        // TODO: test ReadOnlyFirst
-    }
-
-    /**
-     * Test the property 'bar'
-     */
-    @Test
-    public void barTest() {
-        // TODO: test bar
-    }
-
-    /**
-     * Test the property 'baz'
-     */
-    @Test
-    public void bazTest() {
-        // TODO: test baz
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
deleted file mode 100644
index 1696eee82dad..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for SpecialModelName
- */
-public class SpecialModelNameTest {
-    private final SpecialModelName model = new SpecialModelName();
-
-    /**
-     * Model tests for SpecialModelName
-     */
-    @Test
-    public void testSpecialModelName() {
-        // TODO: test SpecialModelName
-    }
-
-    /**
-     * Test the property '$specialPropertyName'
-     */
-    @Test
-    public void $specialPropertyNameTest() {
-        // TODO: test $specialPropertyName
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/TagTest.java
deleted file mode 100644
index b37aca5fdfc8..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/TagTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Tag
- */
-public class TagTest {
-    private final Tag model = new Tag();
-
-    /**
-     * Model tests for Tag
-     */
-    @Test
-    public void testTag() {
-        // TODO: test Tag
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
deleted file mode 100644
index 409076e80a3a..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for TypeHolderDefault
- */
-public class TypeHolderDefaultTest {
-    private final TypeHolderDefault model = new TypeHolderDefault();
-
-    /**
-     * Model tests for TypeHolderDefault
-     */
-    @Test
-    public void testTypeHolderDefault() {
-        // TODO: test TypeHolderDefault
-    }
-
-    /**
-     * Test the property 'stringItem'
-     */
-    @Test
-    public void stringItemTest() {
-        // TODO: test stringItem
-    }
-
-    /**
-     * Test the property 'numberItem'
-     */
-    @Test
-    public void numberItemTest() {
-        // TODO: test numberItem
-    }
-
-    /**
-     * Test the property 'integerItem'
-     */
-    @Test
-    public void integerItemTest() {
-        // TODO: test integerItem
-    }
-
-    /**
-     * Test the property 'boolItem'
-     */
-    @Test
-    public void boolItemTest() {
-        // TODO: test boolItem
-    }
-
-    /**
-     * Test the property 'arrayItem'
-     */
-    @Test
-    public void arrayItemTest() {
-        // TODO: test arrayItem
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
deleted file mode 100644
index ffd8f3ddc33e..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for TypeHolderExample
- */
-public class TypeHolderExampleTest {
-    private final TypeHolderExample model = new TypeHolderExample();
-
-    /**
-     * Model tests for TypeHolderExample
-     */
-    @Test
-    public void testTypeHolderExample() {
-        // TODO: test TypeHolderExample
-    }
-
-    /**
-     * Test the property 'stringItem'
-     */
-    @Test
-    public void stringItemTest() {
-        // TODO: test stringItem
-    }
-
-    /**
-     * Test the property 'numberItem'
-     */
-    @Test
-    public void numberItemTest() {
-        // TODO: test numberItem
-    }
-
-    /**
-     * Test the property 'integerItem'
-     */
-    @Test
-    public void integerItemTest() {
-        // TODO: test integerItem
-    }
-
-    /**
-     * Test the property 'boolItem'
-     */
-    @Test
-    public void boolItemTest() {
-        // TODO: test boolItem
-    }
-
-    /**
-     * Test the property 'arrayItem'
-     */
-    @Test
-    public void arrayItemTest() {
-        // TODO: test arrayItem
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/UserTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/UserTest.java
deleted file mode 100644
index 76733c9e72f2..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/UserTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for User
- */
-public class UserTest {
-    private final User model = new User();
-
-    /**
-     * Model tests for User
-     */
-    @Test
-    public void testUser() {
-        // TODO: test User
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'username'
-     */
-    @Test
-    public void usernameTest() {
-        // TODO: test username
-    }
-
-    /**
-     * Test the property 'firstName'
-     */
-    @Test
-    public void firstNameTest() {
-        // TODO: test firstName
-    }
-
-    /**
-     * Test the property 'lastName'
-     */
-    @Test
-    public void lastNameTest() {
-        // TODO: test lastName
-    }
-
-    /**
-     * Test the property 'email'
-     */
-    @Test
-    public void emailTest() {
-        // TODO: test email
-    }
-
-    /**
-     * Test the property 'password'
-     */
-    @Test
-    public void passwordTest() {
-        // TODO: test password
-    }
-
-    /**
-     * Test the property 'phone'
-     */
-    @Test
-    public void phoneTest() {
-        // TODO: test phone
-    }
-
-    /**
-     * Test the property 'userStatus'
-     */
-    @Test
-    public void userStatusTest() {
-        // TODO: test userStatus
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/XmlItemTest.java b/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/XmlItemTest.java
deleted file mode 100644
index 55e75391e00e..000000000000
--- a/samples/client/petstore/java/retrofit2-play24/src/test/java/org/openapitools/client/model/XmlItemTest.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for XmlItem
- */
-public class XmlItemTest {
-    private final XmlItem model = new XmlItem();
-
-    /**
-     * Model tests for XmlItem
-     */
-    @Test
-    public void testXmlItem() {
-        // TODO: test XmlItem
-    }
-
-    /**
-     * Test the property 'attributeString'
-     */
-    @Test
-    public void attributeStringTest() {
-        // TODO: test attributeString
-    }
-
-    /**
-     * Test the property 'attributeNumber'
-     */
-    @Test
-    public void attributeNumberTest() {
-        // TODO: test attributeNumber
-    }
-
-    /**
-     * Test the property 'attributeInteger'
-     */
-    @Test
-    public void attributeIntegerTest() {
-        // TODO: test attributeInteger
-    }
-
-    /**
-     * Test the property 'attributeBoolean'
-     */
-    @Test
-    public void attributeBooleanTest() {
-        // TODO: test attributeBoolean
-    }
-
-    /**
-     * Test the property 'wrappedArray'
-     */
-    @Test
-    public void wrappedArrayTest() {
-        // TODO: test wrappedArray
-    }
-
-    /**
-     * Test the property 'nameString'
-     */
-    @Test
-    public void nameStringTest() {
-        // TODO: test nameString
-    }
-
-    /**
-     * Test the property 'nameNumber'
-     */
-    @Test
-    public void nameNumberTest() {
-        // TODO: test nameNumber
-    }
-
-    /**
-     * Test the property 'nameInteger'
-     */
-    @Test
-    public void nameIntegerTest() {
-        // TODO: test nameInteger
-    }
-
-    /**
-     * Test the property 'nameBoolean'
-     */
-    @Test
-    public void nameBooleanTest() {
-        // TODO: test nameBoolean
-    }
-
-    /**
-     * Test the property 'nameArray'
-     */
-    @Test
-    public void nameArrayTest() {
-        // TODO: test nameArray
-    }
-
-    /**
-     * Test the property 'nameWrappedArray'
-     */
-    @Test
-    public void nameWrappedArrayTest() {
-        // TODO: test nameWrappedArray
-    }
-
-    /**
-     * Test the property 'prefixString'
-     */
-    @Test
-    public void prefixStringTest() {
-        // TODO: test prefixString
-    }
-
-    /**
-     * Test the property 'prefixNumber'
-     */
-    @Test
-    public void prefixNumberTest() {
-        // TODO: test prefixNumber
-    }
-
-    /**
-     * Test the property 'prefixInteger'
-     */
-    @Test
-    public void prefixIntegerTest() {
-        // TODO: test prefixInteger
-    }
-
-    /**
-     * Test the property 'prefixBoolean'
-     */
-    @Test
-    public void prefixBooleanTest() {
-        // TODO: test prefixBoolean
-    }
-
-    /**
-     * Test the property 'prefixArray'
-     */
-    @Test
-    public void prefixArrayTest() {
-        // TODO: test prefixArray
-    }
-
-    /**
-     * Test the property 'prefixWrappedArray'
-     */
-    @Test
-    public void prefixWrappedArrayTest() {
-        // TODO: test prefixWrappedArray
-    }
-
-    /**
-     * Test the property 'namespaceString'
-     */
-    @Test
-    public void namespaceStringTest() {
-        // TODO: test namespaceString
-    }
-
-    /**
-     * Test the property 'namespaceNumber'
-     */
-    @Test
-    public void namespaceNumberTest() {
-        // TODO: test namespaceNumber
-    }
-
-    /**
-     * Test the property 'namespaceInteger'
-     */
-    @Test
-    public void namespaceIntegerTest() {
-        // TODO: test namespaceInteger
-    }
-
-    /**
-     * Test the property 'namespaceBoolean'
-     */
-    @Test
-    public void namespaceBooleanTest() {
-        // TODO: test namespaceBoolean
-    }
-
-    /**
-     * Test the property 'namespaceArray'
-     */
-    @Test
-    public void namespaceArrayTest() {
-        // TODO: test namespaceArray
-    }
-
-    /**
-     * Test the property 'namespaceWrappedArray'
-     */
-    @Test
-    public void namespaceWrappedArrayTest() {
-        // TODO: test namespaceWrappedArray
-    }
-
-    /**
-     * Test the property 'prefixNamespaceString'
-     */
-    @Test
-    public void prefixNamespaceStringTest() {
-        // TODO: test prefixNamespaceString
-    }
-
-    /**
-     * Test the property 'prefixNamespaceNumber'
-     */
-    @Test
-    public void prefixNamespaceNumberTest() {
-        // TODO: test prefixNamespaceNumber
-    }
-
-    /**
-     * Test the property 'prefixNamespaceInteger'
-     */
-    @Test
-    public void prefixNamespaceIntegerTest() {
-        // TODO: test prefixNamespaceInteger
-    }
-
-    /**
-     * Test the property 'prefixNamespaceBoolean'
-     */
-    @Test
-    public void prefixNamespaceBooleanTest() {
-        // TODO: test prefixNamespaceBoolean
-    }
-
-    /**
-     * Test the property 'prefixNamespaceArray'
-     */
-    @Test
-    public void prefixNamespaceArrayTest() {
-        // TODO: test prefixNamespaceArray
-    }
-
-    /**
-     * Test the property 'prefixNamespaceWrappedArray'
-     */
-    @Test
-    public void prefixNamespaceWrappedArrayTest() {
-        // TODO: test prefixNamespaceWrappedArray
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/.openapi-generator/FILES b/samples/client/petstore/java/retrofit2-play25/.openapi-generator/FILES
deleted file mode 100644
index af054bf73c15..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/.openapi-generator/FILES
+++ /dev/null
@@ -1,131 +0,0 @@
-.gitignore
-.travis.yml
-README.md
-api/openapi.yaml
-build.gradle
-build.sbt
-docs/AdditionalPropertiesAnyType.md
-docs/AdditionalPropertiesArray.md
-docs/AdditionalPropertiesBoolean.md
-docs/AdditionalPropertiesClass.md
-docs/AdditionalPropertiesInteger.md
-docs/AdditionalPropertiesNumber.md
-docs/AdditionalPropertiesObject.md
-docs/AdditionalPropertiesString.md
-docs/Animal.md
-docs/AnotherFakeApi.md
-docs/ArrayOfArrayOfNumberOnly.md
-docs/ArrayOfNumberOnly.md
-docs/ArrayTest.md
-docs/BigCat.md
-docs/BigCatAllOf.md
-docs/Capitalization.md
-docs/Cat.md
-docs/CatAllOf.md
-docs/Category.md
-docs/ClassModel.md
-docs/Client.md
-docs/Dog.md
-docs/DogAllOf.md
-docs/EnumArrays.md
-docs/EnumClass.md
-docs/EnumTest.md
-docs/FakeApi.md
-docs/FakeClassnameTags123Api.md
-docs/FileSchemaTestClass.md
-docs/FormatTest.md
-docs/HasOnlyReadOnly.md
-docs/MapTest.md
-docs/MixedPropertiesAndAdditionalPropertiesClass.md
-docs/Model200Response.md
-docs/ModelApiResponse.md
-docs/ModelReturn.md
-docs/Name.md
-docs/NumberOnly.md
-docs/Order.md
-docs/OuterComposite.md
-docs/OuterEnum.md
-docs/Pet.md
-docs/PetApi.md
-docs/ReadOnlyFirst.md
-docs/SpecialModelName.md
-docs/StoreApi.md
-docs/Tag.md
-docs/TypeHolderDefault.md
-docs/TypeHolderExample.md
-docs/User.md
-docs/UserApi.md
-docs/XmlItem.md
-git_push.sh
-gradle.properties
-gradle/wrapper/gradle-wrapper.jar
-gradle/wrapper/gradle-wrapper.properties
-gradlew
-gradlew.bat
-pom.xml
-settings.gradle
-src/main/AndroidManifest.xml
-src/main/java/org/openapitools/client/ApiClient.java
-src/main/java/org/openapitools/client/ApiClient.java
-src/main/java/org/openapitools/client/CollectionFormats.java
-src/main/java/org/openapitools/client/Pair.java
-src/main/java/org/openapitools/client/Play25CallAdapterFactory.java
-src/main/java/org/openapitools/client/Play25CallFactory.java
-src/main/java/org/openapitools/client/RFC3339DateFormat.java
-src/main/java/org/openapitools/client/ServerConfiguration.java
-src/main/java/org/openapitools/client/ServerVariable.java
-src/main/java/org/openapitools/client/StringUtil.java
-src/main/java/org/openapitools/client/api/AnotherFakeApi.java
-src/main/java/org/openapitools/client/api/FakeApi.java
-src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
-src/main/java/org/openapitools/client/api/PetApi.java
-src/main/java/org/openapitools/client/api/StoreApi.java
-src/main/java/org/openapitools/client/api/UserApi.java
-src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
-src/main/java/org/openapitools/client/auth/Authentication.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
-src/main/java/org/openapitools/client/model/Animal.java
-src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
-src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
-src/main/java/org/openapitools/client/model/ArrayTest.java
-src/main/java/org/openapitools/client/model/BigCat.java
-src/main/java/org/openapitools/client/model/BigCatAllOf.java
-src/main/java/org/openapitools/client/model/Capitalization.java
-src/main/java/org/openapitools/client/model/Cat.java
-src/main/java/org/openapitools/client/model/CatAllOf.java
-src/main/java/org/openapitools/client/model/Category.java
-src/main/java/org/openapitools/client/model/ClassModel.java
-src/main/java/org/openapitools/client/model/Client.java
-src/main/java/org/openapitools/client/model/Dog.java
-src/main/java/org/openapitools/client/model/DogAllOf.java
-src/main/java/org/openapitools/client/model/EnumArrays.java
-src/main/java/org/openapitools/client/model/EnumClass.java
-src/main/java/org/openapitools/client/model/EnumTest.java
-src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
-src/main/java/org/openapitools/client/model/FormatTest.java
-src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
-src/main/java/org/openapitools/client/model/MapTest.java
-src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
-src/main/java/org/openapitools/client/model/Model200Response.java
-src/main/java/org/openapitools/client/model/ModelApiResponse.java
-src/main/java/org/openapitools/client/model/ModelReturn.java
-src/main/java/org/openapitools/client/model/Name.java
-src/main/java/org/openapitools/client/model/NumberOnly.java
-src/main/java/org/openapitools/client/model/Order.java
-src/main/java/org/openapitools/client/model/OuterComposite.java
-src/main/java/org/openapitools/client/model/OuterEnum.java
-src/main/java/org/openapitools/client/model/Pet.java
-src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
-src/main/java/org/openapitools/client/model/SpecialModelName.java
-src/main/java/org/openapitools/client/model/Tag.java
-src/main/java/org/openapitools/client/model/TypeHolderDefault.java
-src/main/java/org/openapitools/client/model/TypeHolderExample.java
-src/main/java/org/openapitools/client/model/User.java
-src/main/java/org/openapitools/client/model/XmlItem.java
diff --git a/samples/client/petstore/java/retrofit2-play25/README.md b/samples/client/petstore/java/retrofit2-play25/README.md
deleted file mode 100644
index 4635ce773aaf..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# petstore-java-client-retrofit2-play25
-
-## Requirements
-
-Building the API client library requires [Maven](https://maven.apache.org/) to be installed.
-
-## Installation & Usage
-
-To install the API client library to your local Maven repository, simply execute:
-
-```shell
-mvn install
-```
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-```shell
-mvn deploy
-```
-
-Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
-
-After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
-
-```xml
-<dependency>
-    <groupId>org.openapitools</groupId>
-    <artifactId>petstore-java-client-retrofit2-play25</artifactId>
-    <version>1.0.0</version>
-    <scope>compile</scope>
-</dependency>
-
-```
-
-## Author
-
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/build.gradle b/samples/client/petstore/java/retrofit2-play25/build.gradle
deleted file mode 100644
index 521a5e5c5c8e..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/build.gradle
+++ /dev/null
@@ -1,128 +0,0 @@
-apply plugin: 'idea'
-apply plugin: 'eclipse'
-
-group = 'org.openapitools'
-version = '1.0.0'
-
-buildscript {
-    repositories {
-        maven { url "https://repo1.maven.org/maven2" }
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.+'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-    }
-}
-
-repositories {
-    jcenter()
-}
-
-
-if(hasProperty('target') && target == 'android') {
-
-    apply plugin: 'com.android.library'
-    apply plugin: 'com.github.dcendents.android-maven'
-
-    android {
-        compileSdkVersion 25
-        buildToolsVersion '25.0.2'
-        defaultConfig {
-            minSdkVersion 14
-            targetSdkVersion 25
-        }
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_8
-            targetCompatibility JavaVersion.VERSION_1_8
-        }
-
-        // Rename the aar correctly
-        libraryVariants.all { variant ->
-            variant.outputs.each { output ->
-                def outputFile = output.outputFile
-                if (outputFile != null && outputFile.name.endsWith('.aar')) {
-                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
-                    output.outputFile = new File(outputFile.parent, fileName)
-                }
-            }
-        }
-
-        dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
-        }
-    }
-
-    afterEvaluate {
-        android.libraryVariants.all { variant ->
-            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
-            task.description = "Create jar artifact for ${variant.name}"
-            task.dependsOn variant.javaCompile
-            task.from variant.javaCompile.destinationDir
-            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
-            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
-            artifacts.add('archives', task);
-        }
-    }
-
-    task sourcesJar(type: Jar) {
-        from android.sourceSets.main.java.srcDirs
-        classifier = 'sources'
-    }
-
-    artifacts {
-        archives sourcesJar
-    }
-
-} else {
-
-    apply plugin: 'java'
-    apply plugin: 'maven'
-
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-
-    install {
-        repositories.mavenInstaller {
-            pom.artifactId = 'petstore-java-client-retrofit2-play25'
-        }
-    }
-
-    task execute(type:JavaExec) {
-       main = System.getProperty('mainClass')
-       classpath = sourceSets.main.runtimeClasspath
-    }
-}
-
-ext {
-    oltu_version = "1.0.1"
-    retrofit_version = "2.3.0"
-    jackson_version = "2.10.4"
-    play_version = "2.5.14"
-    swagger_annotations_version = "1.5.22"
-    junit_version = "4.13"
-    threetenbp_version = "1.4.0"
-    json_fire_version = "1.8.0"
-}
-
-dependencies {
-    compile "com.squareup.retrofit2:retrofit:$retrofit_version"
-    compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
-    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
-    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "com.google.code.findbugs:jsr305:3.0.2"
-    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
-        exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
-    }
-    compile "io.gsonfire:gson-fire:$json_fire_version"
-    compile "org.threeten:threetenbp:$threetenbp_version"
-    compile "com.typesafe.play:play-java-ws_2.11:$play_version"
-    compile "com.squareup.retrofit2:converter-jackson:$retrofit_version"
-    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
-    compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
-
-    testCompile "junit:junit:$junit_version"
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/build.sbt b/samples/client/petstore/java/retrofit2-play25/build.sbt
deleted file mode 100644
index 520494bfdd53..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/build.sbt
+++ /dev/null
@@ -1,26 +0,0 @@
-lazy val root = (project in file(".")).
-  settings(
-    organization := "org.openapitools",
-    name := "petstore-java-client-retrofit2-play25",
-    version := "1.0.0",
-    scalaVersion := "2.11.4",
-    scalacOptions ++= Seq("-feature"),
-    javacOptions in compile ++= Seq("-Xlint:deprecation"),
-    publishArtifact in (Compile, packageDoc) := false,
-    resolvers += Resolver.mavenLocal,
-    libraryDependencies ++= Seq(
-      "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
-      "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
-      "com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.4" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.4" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile",
-      "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
-      "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
-      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
-      "org.threeten" % "threetenbp" % "1.4.0" % "compile",
-      "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
-      "junit" % "junit" % "4.13" % "test",
-      "com.novocode" % "junit-interface" % "0.11" % "test"
-    )
-  )
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesAnyType.md
deleted file mode 100644
index 87b468bb7ca3..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesAnyType.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesAnyType
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesArray.md
deleted file mode 100644
index cb7fe9b3903d..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesArray.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesArray
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesBoolean.md
deleted file mode 100644
index 6b53e7ba73a1..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesBoolean.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesBoolean
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesClass.md
deleted file mode 100644
index ffab911c1be8..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesClass.md
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# AdditionalPropertiesClass
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**mapString** | **Map&lt;String, String&gt;** |  |  [optional]
-**mapNumber** | [**Map&lt;String, BigDecimal&gt;**](BigDecimal.md) |  |  [optional]
-**mapInteger** | **Map&lt;String, Integer&gt;** |  |  [optional]
-**mapBoolean** | **Map&lt;String, Boolean&gt;** |  |  [optional]
-**mapArrayInteger** | [**Map&lt;String, List&lt;Integer&gt;&gt;**](List.md) |  |  [optional]
-**mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
-**mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
-**mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | **Object** |  |  [optional]
-**anytype2** | **Object** |  |  [optional]
-**anytype3** | **Object** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesInteger.md
deleted file mode 100644
index d2ed7fb1a460..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesInteger.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesInteger
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesNumber.md
deleted file mode 100644
index 53f6e81e7176..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesNumber.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesNumber
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesObject.md
deleted file mode 100644
index 98ac8d2e5fe0..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesObject.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesObject
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesString.md
deleted file mode 100644
index d7970cdfe190..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesString.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesString
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/Animal.md b/samples/client/petstore/java/retrofit2-play25/docs/Animal.md
deleted file mode 100644
index c8e18ae55e4f..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/Animal.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# Animal
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**className** | **String** |  | 
-**color** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/AnimalFarm.md b/samples/client/petstore/java/retrofit2-play25/docs/AnimalFarm.md
deleted file mode 100644
index c7c7f1ddcce6..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/AnimalFarm.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# AnimalFarm
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/AnotherFakeApi.md b/samples/client/petstore/java/retrofit2-play25/docs/AnotherFakeApi.md
deleted file mode 100644
index f58ecd4216a4..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/AnotherFakeApi.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# AnotherFakeApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** another-fake/dummy | To test special tags
-
-
-
-## call123testSpecialTags
-
-> Client call123testSpecialTags(body)
-
-To test special tags
-
-To test special tags and operation ID starting with number
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.AnotherFakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client body = new Client(); // Client | client model
-        try {
-            Client result = apiInstance.call123testSpecialTags(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**Client**](Client.md)| client model |
-
-### Return type
-
-[**Client**](Client.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2-play25/docs/ArrayOfArrayOfNumberOnly.md
deleted file mode 100644
index a48aa23e78ee..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/ArrayOfArrayOfNumberOnly.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# ArrayOfArrayOfNumberOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**arrayArrayNumber** | [**List&lt;List&lt;BigDecimal&gt;&gt;**](List.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2-play25/docs/ArrayOfNumberOnly.md
deleted file mode 100644
index fa2909211a07..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/ArrayOfNumberOnly.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# ArrayOfNumberOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**arrayNumber** | [**List&lt;BigDecimal&gt;**](BigDecimal.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/ArrayTest.md b/samples/client/petstore/java/retrofit2-play25/docs/ArrayTest.md
deleted file mode 100644
index 9ad1c9814a51..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/ArrayTest.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-# ArrayTest
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**arrayOfString** | **List&lt;String&gt;** |  |  [optional]
-**arrayArrayOfInteger** | [**List&lt;List&lt;Long&gt;&gt;**](List.md) |  |  [optional]
-**arrayArrayOfModel** | [**List&lt;List&lt;ReadOnlyFirst&gt;&gt;**](List.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/BigCat.md b/samples/client/petstore/java/retrofit2-play25/docs/BigCat.md
deleted file mode 100644
index 8a075304abf8..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/BigCat.md
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-# BigCat
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**kind** | [**KindEnum**](#KindEnum) |  |  [optional]
-
-
-
-## Enum: KindEnum
-
-Name | Value
----- | -----
-LIONS | &quot;lions&quot;
-TIGERS | &quot;tigers&quot;
-LEOPARDS | &quot;leopards&quot;
-JAGUARS | &quot;jaguars&quot;
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/BigCatAllOf.md b/samples/client/petstore/java/retrofit2-play25/docs/BigCatAllOf.md
deleted file mode 100644
index 21177dbf089d..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/BigCatAllOf.md
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-# BigCatAllOf
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**kind** | [**KindEnum**](#KindEnum) |  |  [optional]
-
-
-
-## Enum: KindEnum
-
-Name | Value
----- | -----
-LIONS | &quot;lions&quot;
-TIGERS | &quot;tigers&quot;
-LEOPARDS | &quot;leopards&quot;
-JAGUARS | &quot;jaguars&quot;
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/Capitalization.md b/samples/client/petstore/java/retrofit2-play25/docs/Capitalization.md
deleted file mode 100644
index 7b73c40b5545..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/Capitalization.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-# Capitalization
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**smallCamel** | **String** |  |  [optional]
-**capitalCamel** | **String** |  |  [optional]
-**smallSnake** | **String** |  |  [optional]
-**capitalSnake** | **String** |  |  [optional]
-**scAETHFlowPoints** | **String** |  |  [optional]
-**ATT_NAME** | **String** | Name of the pet  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/Cat.md b/samples/client/petstore/java/retrofit2-play25/docs/Cat.md
deleted file mode 100644
index 39c2f864df88..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/Cat.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# Cat
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**declawed** | **Boolean** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/CatAllOf.md b/samples/client/petstore/java/retrofit2-play25/docs/CatAllOf.md
deleted file mode 100644
index 1098fd900c5d..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/CatAllOf.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# CatAllOf
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**declawed** | **Boolean** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/Category.md b/samples/client/petstore/java/retrofit2-play25/docs/Category.md
deleted file mode 100644
index 613ea9f7ee24..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/Category.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# Category
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**name** | **String** |  | 
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/ClassModel.md b/samples/client/petstore/java/retrofit2-play25/docs/ClassModel.md
deleted file mode 100644
index d5453c20133a..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/ClassModel.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# ClassModel
-
-Model for testing model with \"_class\" property
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**propertyClass** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/Client.md b/samples/client/petstore/java/retrofit2-play25/docs/Client.md
deleted file mode 100644
index 228df492383f..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/Client.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# Client
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**client** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/Dog.md b/samples/client/petstore/java/retrofit2-play25/docs/Dog.md
deleted file mode 100644
index 73cedf2bc919..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/Dog.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# Dog
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**breed** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/DogAllOf.md b/samples/client/petstore/java/retrofit2-play25/docs/DogAllOf.md
deleted file mode 100644
index cbeb9e9a22df..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/DogAllOf.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# DogAllOf
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**breed** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/EnumArrays.md b/samples/client/petstore/java/retrofit2-play25/docs/EnumArrays.md
deleted file mode 100644
index 869b7a6c066d..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/EnumArrays.md
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-# EnumArrays
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**justSymbol** | [**JustSymbolEnum**](#JustSymbolEnum) |  |  [optional]
-**arrayEnum** | [**List&lt;ArrayEnumEnum&gt;**](#List&lt;ArrayEnumEnum&gt;) |  |  [optional]
-
-
-
-## Enum: JustSymbolEnum
-
-Name | Value
----- | -----
-GREATER_THAN_OR_EQUAL_TO | &quot;&gt;&#x3D;&quot;
-DOLLAR | &quot;$&quot;
-
-
-
-## Enum: List&lt;ArrayEnumEnum&gt;
-
-Name | Value
----- | -----
-FISH | &quot;fish&quot;
-CRAB | &quot;crab&quot;
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/EnumClass.md b/samples/client/petstore/java/retrofit2-play25/docs/EnumClass.md
deleted file mode 100644
index b314590a7591..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/EnumClass.md
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-# EnumClass
-
-## Enum
-
-
-* `_ABC` (value: `"_abc"`)
-
-* `_EFG` (value: `"-efg"`)
-
-* `_XYZ_` (value: `"(xyz)"`)
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/EnumTest.md b/samples/client/petstore/java/retrofit2-play25/docs/EnumTest.md
deleted file mode 100644
index 61eb95f22fe9..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/EnumTest.md
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-# EnumTest
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**enumString** | [**EnumStringEnum**](#EnumStringEnum) |  |  [optional]
-**enumStringRequired** | [**EnumStringRequiredEnum**](#EnumStringRequiredEnum) |  | 
-**enumInteger** | [**EnumIntegerEnum**](#EnumIntegerEnum) |  |  [optional]
-**enumNumber** | [**EnumNumberEnum**](#EnumNumberEnum) |  |  [optional]
-**outerEnum** | [**OuterEnum**](OuterEnum.md) |  |  [optional]
-
-
-
-## Enum: EnumStringEnum
-
-Name | Value
----- | -----
-UPPER | &quot;UPPER&quot;
-LOWER | &quot;lower&quot;
-EMPTY | &quot;&quot;
-
-
-
-## Enum: EnumStringRequiredEnum
-
-Name | Value
----- | -----
-UPPER | &quot;UPPER&quot;
-LOWER | &quot;lower&quot;
-EMPTY | &quot;&quot;
-
-
-
-## Enum: EnumIntegerEnum
-
-Name | Value
----- | -----
-NUMBER_1 | 1
-NUMBER_MINUS_1 | -1
-
-
-
-## Enum: EnumNumberEnum
-
-Name | Value
----- | -----
-NUMBER_1_DOT_1 | 1.1
-NUMBER_MINUS_1_DOT_2 | -1.2
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/FakeApi.md b/samples/client/petstore/java/retrofit2-play25/docs/FakeApi.md
deleted file mode 100644
index 8de4500212eb..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/FakeApi.md
+++ /dev/null
@@ -1,987 +0,0 @@
-# FakeApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**createXmlItem**](FakeApi.md#createXmlItem) | **POST** fake/create_xml_item | creates an XmlItem
-[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** fake/outer/boolean | 
-[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** fake/outer/composite | 
-[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** fake/outer/number | 
-[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** fake/outer/string | 
-[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** fake/body-with-file-schema | 
-[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** fake/body-with-query-params | 
-[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** fake | To test \&quot;client\&quot; model
-[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** fake | To test enum parameters
-[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** fake | Fake endpoint to test group parameters (optional)
-[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** fake/inline-additionalProperties | test inline additionalProperties
-[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** fake/jsonFormData | test json serialization of form data
-[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** fake/test-query-paramters | 
-
-
-
-## createXmlItem
-
-> createXmlItem(xmlItem)
-
-creates an XmlItem
-
-this route creates an XmlItem
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        XmlItem xmlItem = new XmlItem(); // XmlItem | XmlItem Body
-        try {
-            apiInstance.createXmlItem(xmlItem);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#createXmlItem");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **xmlItem** | [**XmlItem**](XmlItem.md)| XmlItem Body |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
-
-## fakeOuterBooleanSerialize
-
-> Boolean fakeOuterBooleanSerialize(body)
-
-
-
-Test serialization of outer boolean types
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        Boolean body = true; // Boolean | Input boolean as post body
-        try {
-            Boolean result = apiInstance.fakeOuterBooleanSerialize(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#fakeOuterBooleanSerialize");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | **Boolean**| Input boolean as post body | [optional]
-
-### Return type
-
-**Boolean**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: */*
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Output boolean |  -  |
-
-
-## fakeOuterCompositeSerialize
-
-> OuterComposite fakeOuterCompositeSerialize(body)
-
-
-
-Test serialization of object with outer number type
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        OuterComposite body = new OuterComposite(); // OuterComposite | Input composite as post body
-        try {
-            OuterComposite result = apiInstance.fakeOuterCompositeSerialize(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#fakeOuterCompositeSerialize");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**OuterComposite**](OuterComposite.md)| Input composite as post body | [optional]
-
-### Return type
-
-[**OuterComposite**](OuterComposite.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: */*
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Output composite |  -  |
-
-
-## fakeOuterNumberSerialize
-
-> BigDecimal fakeOuterNumberSerialize(body)
-
-
-
-Test serialization of outer number types
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        BigDecimal body = new BigDecimal(); // BigDecimal | Input number as post body
-        try {
-            BigDecimal result = apiInstance.fakeOuterNumberSerialize(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#fakeOuterNumberSerialize");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | **BigDecimal**| Input number as post body | [optional]
-
-### Return type
-
-[**BigDecimal**](BigDecimal.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: */*
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Output number |  -  |
-
-
-## fakeOuterStringSerialize
-
-> String fakeOuterStringSerialize(body)
-
-
-
-Test serialization of outer string types
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        String body = "body_example"; // String | Input string as post body
-        try {
-            String result = apiInstance.fakeOuterStringSerialize(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#fakeOuterStringSerialize");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | **String**| Input string as post body | [optional]
-
-### Return type
-
-**String**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: */*
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Output string |  -  |
-
-
-## testBodyWithFileSchema
-
-> testBodyWithFileSchema(body)
-
-
-
-For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        FileSchemaTestClass body = new FileSchemaTestClass(); // FileSchemaTestClass | 
-        try {
-            apiInstance.testBodyWithFileSchema(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testBodyWithFileSchema");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Success |  -  |
-
-
-## testBodyWithQueryParams
-
-> testBodyWithQueryParams(query, body)
-
-
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        String query = "query_example"; // String | 
-        User body = new User(); // User | 
-        try {
-            apiInstance.testBodyWithQueryParams(query, body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testBodyWithQueryParams");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **query** | **String**|  |
- **body** | [**User**](User.md)|  |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Success |  -  |
-
-
-## testClientModel
-
-> Client testClientModel(body)
-
-To test \&quot;client\&quot; model
-
-To test \&quot;client\&quot; model
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        Client body = new Client(); // Client | client model
-        try {
-            Client result = apiInstance.testClientModel(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testClientModel");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**Client**](Client.md)| client model |
-
-### Return type
-
-[**Client**](Client.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
-
-## testEndpointParameters
-
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
-
-Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-
-Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure HTTP basic authorization: http_basic_test
-        HttpBasicAuth http_basic_test = (HttpBasicAuth) defaultClient.getAuthentication("http_basic_test");
-        http_basic_test.setUsername("YOUR USERNAME");
-        http_basic_test.setPassword("YOUR PASSWORD");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        BigDecimal number = new BigDecimal(); // BigDecimal | None
-        Double _double = 3.4D; // Double | None
-        String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
-        byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
-        Integer int32 = 56; // Integer | None
-        Long int64 = 56L; // Long | None
-        Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
-        File binary = new File("/path/to/file"); // File | None
-        LocalDate date = new LocalDate(); // LocalDate | None
-        OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None
-        String password = "password_example"; // String | None
-        String paramCallback = "paramCallback_example"; // String | None
-        try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testEndpointParameters");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **number** | **BigDecimal**| None |
- **_double** | **Double**| None |
- **patternWithoutDelimiter** | **String**| None |
- **_byte** | **byte[]**| None |
- **integer** | **Integer**| None | [optional]
- **int32** | **Integer**| None | [optional]
- **int64** | **Long**| None | [optional]
- **_float** | **Float**| None | [optional]
- **string** | **String**| None | [optional]
- **binary** | **File**| None | [optional]
- **date** | **LocalDate**| None | [optional]
- **dateTime** | **OffsetDateTime**| None | [optional]
- **password** | **String**| None | [optional]
- **paramCallback** | **String**| None | [optional]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[http_basic_test](../README.md#http_basic_test)
-
-### HTTP request headers
-
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **400** | Invalid username supplied |  -  |
-| **404** | User not found |  -  |
-
-
-## testEnumParameters
-
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
-
-To test enum parameters
-
-To test enum parameters
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        List<String> enumHeaderStringArray = Arrays.asList("$"); // List<String> | Header parameter enum test (string array)
-        String enumHeaderString = "-efg"; // String | Header parameter enum test (string)
-        List<String> enumQueryStringArray = Arrays.asList("$"); // List<String> | Query parameter enum test (string array)
-        String enumQueryString = "-efg"; // String | Query parameter enum test (string)
-        Integer enumQueryInteger = 56; // Integer | Query parameter enum test (double)
-        Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double)
-        List<String> enumFormStringArray = "$"; // List<String> | Form parameter enum test (string array)
-        String enumFormString = "-efg"; // String | Form parameter enum test (string)
-        try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testEnumParameters");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **enumHeaderStringArray** | [**List&lt;String&gt;**](String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
- **enumHeaderString** | **String**| Header parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
- **enumQueryStringArray** | [**List&lt;String&gt;**](String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
- **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
- **enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
- **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
- **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $]
- **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **400** | Invalid request |  -  |
-| **404** | Not found |  -  |
-
-
-## testGroupParameters
-
-> testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
-
-Fake endpoint to test group parameters (optional)
-
-Fake endpoint to test group parameters (optional)
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        Integer requiredStringGroup = 56; // Integer | Required String in group parameters
-        Boolean requiredBooleanGroup = true; // Boolean | Required Boolean in group parameters
-        Long requiredInt64Group = 56L; // Long | Required Integer in group parameters
-        Integer stringGroup = 56; // Integer | String in group parameters
-        Boolean booleanGroup = true; // Boolean | Boolean in group parameters
-        Long int64Group = 56L; // Long | Integer in group parameters
-        try {
-            apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testGroupParameters");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **requiredStringGroup** | **Integer**| Required String in group parameters |
- **requiredBooleanGroup** | **Boolean**| Required Boolean in group parameters |
- **requiredInt64Group** | **Long**| Required Integer in group parameters |
- **stringGroup** | **Integer**| String in group parameters | [optional]
- **booleanGroup** | **Boolean**| Boolean in group parameters | [optional]
- **int64Group** | **Long**| Integer in group parameters | [optional]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
-
-
-## testInlineAdditionalProperties
-
-> testInlineAdditionalProperties(param)
-
-test inline additionalProperties
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        Map<String, String> param = new HashMap(); // Map<String, String> | request body
-        try {
-            apiInstance.testInlineAdditionalProperties(param);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testInlineAdditionalProperties");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **param** | [**Map&lt;String, String&gt;**](String.md)| request body |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
-
-## testJsonFormData
-
-> testJsonFormData(param, param2)
-
-test json serialization of form data
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        String param = "param_example"; // String | field1
-        String param2 = "param2_example"; // String | field2
-        try {
-            apiInstance.testJsonFormData(param, param2);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testJsonFormData");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **param** | **String**| field1 |
- **param2** | **String**| field2 |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
-
-## testQueryParameterCollectionFormat
-
-> testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
-
-
-
-To test the collection format in query parameters
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        List<String> pipe = Arrays.asList(); // List<String> | 
-        List<String> ioutil = Arrays.asList(); // List<String> | 
-        List<String> http = Arrays.asList(); // List<String> | 
-        List<String> url = Arrays.asList(); // List<String> | 
-        List<String> context = Arrays.asList(); // List<String> | 
-        try {
-            apiInstance.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testQueryParameterCollectionFormat");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pipe** | [**List&lt;String&gt;**](String.md)|  |
- **ioutil** | [**List&lt;String&gt;**](String.md)|  |
- **http** | [**List&lt;String&gt;**](String.md)|  |
- **url** | [**List&lt;String&gt;**](String.md)|  |
- **context** | [**List&lt;String&gt;**](String.md)|  |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Success |  -  |
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/retrofit2-play25/docs/FakeClassnameTags123Api.md
deleted file mode 100644
index 4f4dac58589d..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/FakeClassnameTags123Api.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# FakeClassnameTags123Api
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** fake_classname_test | To test class name in snake case
-
-
-
-## testClassname
-
-> Client testClassname(body)
-
-To test class name in snake case
-
-To test class name in snake case
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeClassnameTags123Api;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure API key authorization: api_key_query
-        ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
-        api_key_query.setApiKey("YOUR API KEY");
-        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-        //api_key_query.setApiKeyPrefix("Token");
-
-        FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api(defaultClient);
-        Client body = new Client(); // Client | client model
-        try {
-            Client result = apiInstance.testClassname(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeClassnameTags123Api#testClassname");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**Client**](Client.md)| client model |
-
-### Return type
-
-[**Client**](Client.md)
-
-### Authorization
-
-[api_key_query](../README.md#api_key_query)
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/FileSchemaTestClass.md b/samples/client/petstore/java/retrofit2-play25/docs/FileSchemaTestClass.md
deleted file mode 100644
index 3a95e27d7c09..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/FileSchemaTestClass.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# FileSchemaTestClass
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**file** | [**java.io.File**](java.io.File.md) |  |  [optional]
-**files** | [**List&lt;java.io.File&gt;**](java.io.File.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/FormatTest.md b/samples/client/petstore/java/retrofit2-play25/docs/FormatTest.md
deleted file mode 100644
index d138e921902a..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/FormatTest.md
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-# FormatTest
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**integer** | **Integer** |  |  [optional]
-**int32** | **Integer** |  |  [optional]
-**int64** | **Long** |  |  [optional]
-**number** | [**BigDecimal**](BigDecimal.md) |  | 
-**_float** | **Float** |  |  [optional]
-**_double** | **Double** |  |  [optional]
-**string** | **String** |  |  [optional]
-**_byte** | **byte[]** |  | 
-**binary** | [**File**](File.md) |  |  [optional]
-**date** | [**LocalDate**](LocalDate.md) |  | 
-**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
-**uuid** | [**UUID**](UUID.md) |  |  [optional]
-**password** | **String** |  | 
-**bigDecimal** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/retrofit2-play25/docs/HasOnlyReadOnly.md
deleted file mode 100644
index 4795b40ef65e..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/HasOnlyReadOnly.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# HasOnlyReadOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**bar** | **String** |  |  [optional] [readonly]
-**foo** | **String** |  |  [optional] [readonly]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/MapTest.md b/samples/client/petstore/java/retrofit2-play25/docs/MapTest.md
deleted file mode 100644
index c35c3cf2c0be..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/MapTest.md
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-# MapTest
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**mapMapOfString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
-**mapOfEnumString** | [**Map&lt;String, InnerEnum&gt;**](#Map&lt;String, InnerEnum&gt;) |  |  [optional]
-**directMap** | **Map&lt;String, Boolean&gt;** |  |  [optional]
-**indirectMap** | **Map&lt;String, Boolean&gt;** |  |  [optional]
-
-
-
-## Enum: Map&lt;String, InnerEnum&gt;
-
-Name | Value
----- | -----
-UPPER | &quot;UPPER&quot;
-LOWER | &quot;lower&quot;
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2-play25/docs/MixedPropertiesAndAdditionalPropertiesClass.md
deleted file mode 100644
index 3dc283ae4936..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-# MixedPropertiesAndAdditionalPropertiesClass
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**uuid** | [**UUID**](UUID.md) |  |  [optional]
-**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
-**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/Model200Response.md b/samples/client/petstore/java/retrofit2-play25/docs/Model200Response.md
deleted file mode 100644
index f9928d70622c..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/Model200Response.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-# Model200Response
-
-Model for testing model name starting with number
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **Integer** |  |  [optional]
-**propertyClass** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/ModelApiResponse.md b/samples/client/petstore/java/retrofit2-play25/docs/ModelApiResponse.md
deleted file mode 100644
index 14fb7f1ed27b..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/ModelApiResponse.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-# ModelApiResponse
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**code** | **Integer** |  |  [optional]
-**type** | **String** |  |  [optional]
-**message** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/ModelReturn.md b/samples/client/petstore/java/retrofit2-play25/docs/ModelReturn.md
deleted file mode 100644
index 5005d4b72392..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/ModelReturn.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# ModelReturn
-
-Model for testing reserved words
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**_return** | **Integer** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/Name.md b/samples/client/petstore/java/retrofit2-play25/docs/Name.md
deleted file mode 100644
index b815a0b4c994..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/Name.md
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-# Name
-
-Model for testing model name same as property name
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **Integer** |  | 
-**snakeCase** | **Integer** |  |  [optional] [readonly]
-**property** | **String** |  |  [optional]
-**_123number** | **Integer** |  |  [optional] [readonly]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/NumberOnly.md b/samples/client/petstore/java/retrofit2-play25/docs/NumberOnly.md
deleted file mode 100644
index 1c12b6adf3bd..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/NumberOnly.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# NumberOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**justNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/Order.md b/samples/client/petstore/java/retrofit2-play25/docs/Order.md
deleted file mode 100644
index 409fc4cc9616..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/Order.md
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-# Order
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**petId** | **Long** |  |  [optional]
-**quantity** | **Integer** |  |  [optional]
-**shipDate** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
-**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional]
-**complete** | **Boolean** |  |  [optional]
-
-
-
-## Enum: StatusEnum
-
-Name | Value
----- | -----
-PLACED | &quot;placed&quot;
-APPROVED | &quot;approved&quot;
-DELIVERED | &quot;delivered&quot;
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/OuterComposite.md b/samples/client/petstore/java/retrofit2-play25/docs/OuterComposite.md
deleted file mode 100644
index e06292218847..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/OuterComposite.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-# OuterComposite
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**myNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-**myString** | **String** |  |  [optional]
-**myBoolean** | **Boolean** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/OuterEnum.md b/samples/client/petstore/java/retrofit2-play25/docs/OuterEnum.md
deleted file mode 100644
index 1f9b723eb8e7..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/OuterEnum.md
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-# OuterEnum
-
-## Enum
-
-
-* `PLACED` (value: `"placed"`)
-
-* `APPROVED` (value: `"approved"`)
-
-* `DELIVERED` (value: `"delivered"`)
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/Pet.md b/samples/client/petstore/java/retrofit2-play25/docs/Pet.md
deleted file mode 100644
index bdcdad6b3e60..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/Pet.md
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-# Pet
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**category** | [**Category**](Category.md) |  |  [optional]
-**name** | **String** |  | 
-**photoUrls** | **Set&lt;String&gt;** |  | 
-**tags** | [**List&lt;Tag&gt;**](Tag.md) |  |  [optional]
-**status** | [**StatusEnum**](#StatusEnum) | pet status in the store |  [optional]
-
-
-
-## Enum: StatusEnum
-
-Name | Value
----- | -----
-AVAILABLE | &quot;available&quot;
-PENDING | &quot;pending&quot;
-SOLD | &quot;sold&quot;
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/PetApi.md b/samples/client/petstore/java/retrofit2-play25/docs/PetApi.md
deleted file mode 100644
index ca4e8b4197a3..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/PetApi.md
+++ /dev/null
@@ -1,656 +0,0 @@
-# PetApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**addPet**](PetApi.md#addPet) | **POST** pet | Add a new pet to the store
-[**deletePet**](PetApi.md#deletePet) | **DELETE** pet/{petId} | Deletes a pet
-[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** pet/findByStatus | Finds Pets by status
-[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** pet/findByTags | Finds Pets by tags
-[**getPetById**](PetApi.md#getPetById) | **GET** pet/{petId} | Find pet by ID
-[**updatePet**](PetApi.md#updatePet) | **PUT** pet | Update an existing pet
-[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** pet/{petId} | Updates a pet in the store with form data
-[**uploadFile**](PetApi.md#uploadFile) | **POST** pet/{petId}/uploadImage | uploads an image
-[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-
-
-
-## addPet
-
-> addPet(body)
-
-Add a new pet to the store
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
-        try {
-            apiInstance.addPet(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#addPet");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: application/json, application/xml
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **405** | Invalid input |  -  |
-
-
-## deletePet
-
-> deletePet(petId, apiKey)
-
-Deletes a pet
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | Pet id to delete
-        String apiKey = "apiKey_example"; // String | 
-        try {
-            apiInstance.deletePet(petId, apiKey);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#deletePet");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **petId** | **Long**| Pet id to delete |
- **apiKey** | **String**|  | [optional]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid pet value |  -  |
-
-
-## findPetsByStatus
-
-> List&lt;Pet&gt; findPetsByStatus(status)
-
-Finds Pets by status
-
-Multiple status values can be provided with comma separated strings
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        List<String> status = Arrays.asList("available"); // List<String> | Status values that need to be considered for filter
-        try {
-            List<Pet> result = apiInstance.findPetsByStatus(status);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#findPetsByStatus");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **status** | [**List&lt;String&gt;**](String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
-
-### Return type
-
-[**List&lt;Pet&gt;**](Pet.md)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid status value |  -  |
-
-
-## findPetsByTags
-
-> Set&lt;Pet&gt; findPetsByTags(tags)
-
-Finds Pets by tags
-
-Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Set<String> tags = Arrays.asList(); // Set<String> | Tags to filter by
-        try {
-            Set<Pet> result = apiInstance.findPetsByTags(tags);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#findPetsByTags");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **tags** | [**Set&lt;String&gt;**](String.md)| Tags to filter by |
-
-### Return type
-
-[**Set&lt;Pet&gt;**](Pet.md)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid tag value |  -  |
-
-
-## getPetById
-
-> Pet getPetById(petId)
-
-Find pet by ID
-
-Returns a single pet
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure API key authorization: api_key
-        ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
-        api_key.setApiKey("YOUR API KEY");
-        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-        //api_key.setApiKeyPrefix("Token");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | ID of pet to return
-        try {
-            Pet result = apiInstance.getPetById(petId);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#getPetById");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet to return |
-
-### Return type
-
-[**Pet**](Pet.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid ID supplied |  -  |
-| **404** | Pet not found |  -  |
-
-
-## updatePet
-
-> updatePet(body)
-
-Update an existing pet
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
-        try {
-            apiInstance.updatePet(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#updatePet");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: application/json, application/xml
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid ID supplied |  -  |
-| **404** | Pet not found |  -  |
-| **405** | Validation exception |  -  |
-
-
-## updatePetWithForm
-
-> updatePetWithForm(petId, name, status)
-
-Updates a pet in the store with form data
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | ID of pet that needs to be updated
-        String name = "name_example"; // String | Updated name of the pet
-        String status = "status_example"; // String | Updated status of the pet
-        try {
-            apiInstance.updatePetWithForm(petId, name, status);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#updatePetWithForm");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet that needs to be updated |
- **name** | **String**| Updated name of the pet | [optional]
- **status** | **String**| Updated status of the pet | [optional]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **405** | Invalid input |  -  |
-
-
-## uploadFile
-
-> ModelApiResponse uploadFile(petId, additionalMetadata, file)
-
-uploads an image
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | ID of pet to update
-        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
-        File file = new File("/path/to/file"); // File | file to upload
-        try {
-            ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#uploadFile");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet to update |
- **additionalMetadata** | **String**| Additional data to pass to server | [optional]
- **file** | **File**| file to upload | [optional]
-
-### Return type
-
-[**ModelApiResponse**](ModelApiResponse.md)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: multipart/form-data
-- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
-
-## uploadFileWithRequiredFile
-
-> ModelApiResponse uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
-
-uploads an image (required)
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | ID of pet to update
-        File requiredFile = new File("/path/to/file"); // File | file to upload
-        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
-        try {
-            ModelApiResponse result = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#uploadFileWithRequiredFile");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet to update |
- **requiredFile** | **File**| file to upload |
- **additionalMetadata** | **String**| Additional data to pass to server | [optional]
-
-### Return type
-
-[**ModelApiResponse**](ModelApiResponse.md)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: multipart/form-data
-- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/ReadOnlyFirst.md b/samples/client/petstore/java/retrofit2-play25/docs/ReadOnlyFirst.md
deleted file mode 100644
index a692499dc661..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/ReadOnlyFirst.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# ReadOnlyFirst
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**bar** | **String** |  |  [optional] [readonly]
-**baz** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/SpecialModelName.md b/samples/client/petstore/java/retrofit2-play25/docs/SpecialModelName.md
deleted file mode 100644
index 934b8f0f25d7..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/SpecialModelName.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# SpecialModelName
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**$specialPropertyName** | **Long** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/StoreApi.md b/samples/client/petstore/java/retrofit2-play25/docs/StoreApi.md
deleted file mode 100644
index ebefe2ffdd4b..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/StoreApi.md
+++ /dev/null
@@ -1,276 +0,0 @@
-# StoreApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** store/order/{order_id} | Delete purchase order by ID
-[**getInventory**](StoreApi.md#getInventory) | **GET** store/inventory | Returns pet inventories by status
-[**getOrderById**](StoreApi.md#getOrderById) | **GET** store/order/{order_id} | Find purchase order by ID
-[**placeOrder**](StoreApi.md#placeOrder) | **POST** store/order | Place an order for a pet
-
-
-
-## deleteOrder
-
-> deleteOrder(orderId)
-
-Delete purchase order by ID
-
-For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.StoreApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        StoreApi apiInstance = new StoreApi(defaultClient);
-        String orderId = "orderId_example"; // String | ID of the order that needs to be deleted
-        try {
-            apiInstance.deleteOrder(orderId);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#deleteOrder");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **orderId** | **String**| ID of the order that needs to be deleted |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **400** | Invalid ID supplied |  -  |
-| **404** | Order not found |  -  |
-
-
-## getInventory
-
-> Map&lt;String, Integer&gt; getInventory()
-
-Returns pet inventories by status
-
-Returns a map of status codes to quantities
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.StoreApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure API key authorization: api_key
-        ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
-        api_key.setApiKey("YOUR API KEY");
-        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-        //api_key.setApiKeyPrefix("Token");
-
-        StoreApi apiInstance = new StoreApi(defaultClient);
-        try {
-            Map<String, Integer> result = apiInstance.getInventory();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#getInventory");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-This endpoint does not need any parameter.
-
-### Return type
-
-**Map&lt;String, Integer&gt;**
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
-
-## getOrderById
-
-> Order getOrderById(orderId)
-
-Find purchase order by ID
-
-For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.StoreApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        StoreApi apiInstance = new StoreApi(defaultClient);
-        Long orderId = 56L; // Long | ID of pet that needs to be fetched
-        try {
-            Order result = apiInstance.getOrderById(orderId);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#getOrderById");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **orderId** | **Long**| ID of pet that needs to be fetched |
-
-### Return type
-
-[**Order**](Order.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid ID supplied |  -  |
-| **404** | Order not found |  -  |
-
-
-## placeOrder
-
-> Order placeOrder(body)
-
-Place an order for a pet
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.StoreApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        StoreApi apiInstance = new StoreApi(defaultClient);
-        Order body = new Order(); // Order | order placed for purchasing the pet
-        try {
-            Order result = apiInstance.placeOrder(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#placeOrder");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**Order**](Order.md)| order placed for purchasing the pet |
-
-### Return type
-
-[**Order**](Order.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid Order |  -  |
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/StringBooleanMap.md b/samples/client/petstore/java/retrofit2-play25/docs/StringBooleanMap.md
deleted file mode 100644
index cac7afc80e07..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/StringBooleanMap.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# StringBooleanMap
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/Tag.md b/samples/client/petstore/java/retrofit2-play25/docs/Tag.md
deleted file mode 100644
index f24eba7d222e..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/Tag.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# Tag
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/TypeHolderDefault.md b/samples/client/petstore/java/retrofit2-play25/docs/TypeHolderDefault.md
deleted file mode 100644
index a338fc900cb1..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/TypeHolderDefault.md
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-# TypeHolderDefault
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**stringItem** | **String** |  | 
-**numberItem** | [**BigDecimal**](BigDecimal.md) |  | 
-**integerItem** | **Integer** |  | 
-**boolItem** | **Boolean** |  | 
-**arrayItem** | **List&lt;Integer&gt;** |  | 
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/TypeHolderExample.md b/samples/client/petstore/java/retrofit2-play25/docs/TypeHolderExample.md
deleted file mode 100644
index f8858da60664..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/TypeHolderExample.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-# TypeHolderExample
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**stringItem** | **String** |  | 
-**numberItem** | [**BigDecimal**](BigDecimal.md) |  | 
-**floatItem** | **Float** |  | 
-**integerItem** | **Integer** |  | 
-**boolItem** | **Boolean** |  | 
-**arrayItem** | **List&lt;Integer&gt;** |  | 
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/User.md b/samples/client/petstore/java/retrofit2-play25/docs/User.md
deleted file mode 100644
index c4ea94b7fc17..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/User.md
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-# User
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**username** | **String** |  |  [optional]
-**firstName** | **String** |  |  [optional]
-**lastName** | **String** |  |  [optional]
-**email** | **String** |  |  [optional]
-**password** | **String** |  |  [optional]
-**phone** | **String** |  |  [optional]
-**userStatus** | **Integer** | User Status |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/UserApi.md b/samples/client/petstore/java/retrofit2-play25/docs/UserApi.md
deleted file mode 100644
index d03e871ce01b..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/UserApi.md
+++ /dev/null
@@ -1,525 +0,0 @@
-# UserApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**createUser**](UserApi.md#createUser) | **POST** user | Create user
-[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** user/createWithArray | Creates list of users with given input array
-[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** user/createWithList | Creates list of users with given input array
-[**deleteUser**](UserApi.md#deleteUser) | **DELETE** user/{username} | Delete user
-[**getUserByName**](UserApi.md#getUserByName) | **GET** user/{username} | Get user by user name
-[**loginUser**](UserApi.md#loginUser) | **GET** user/login | Logs user into the system
-[**logoutUser**](UserApi.md#logoutUser) | **GET** user/logout | Logs out current logged in user session
-[**updateUser**](UserApi.md#updateUser) | **PUT** user/{username} | Updated user
-
-
-
-## createUser
-
-> createUser(body)
-
-Create user
-
-This can only be done by the logged in user.
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        User body = new User(); // User | Created user object
-        try {
-            apiInstance.createUser(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#createUser");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**User**](User.md)| Created user object |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **0** | successful operation |  -  |
-
-
-## createUsersWithArrayInput
-
-> createUsersWithArrayInput(body)
-
-Creates list of users with given input array
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        List<User> body = Arrays.asList(); // List<User> | List of user object
-        try {
-            apiInstance.createUsersWithArrayInput(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**List&lt;User&gt;**](User.md)| List of user object |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **0** | successful operation |  -  |
-
-
-## createUsersWithListInput
-
-> createUsersWithListInput(body)
-
-Creates list of users with given input array
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        List<User> body = Arrays.asList(); // List<User> | List of user object
-        try {
-            apiInstance.createUsersWithListInput(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#createUsersWithListInput");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**List&lt;User&gt;**](User.md)| List of user object |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **0** | successful operation |  -  |
-
-
-## deleteUser
-
-> deleteUser(username)
-
-Delete user
-
-This can only be done by the logged in user.
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        String username = "username_example"; // String | The name that needs to be deleted
-        try {
-            apiInstance.deleteUser(username);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#deleteUser");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **username** | **String**| The name that needs to be deleted |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **400** | Invalid username supplied |  -  |
-| **404** | User not found |  -  |
-
-
-## getUserByName
-
-> User getUserByName(username)
-
-Get user by user name
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing.
-        try {
-            User result = apiInstance.getUserByName(username);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#getUserByName");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **username** | **String**| The name that needs to be fetched. Use user1 for testing. |
-
-### Return type
-
-[**User**](User.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid username supplied |  -  |
-| **404** | User not found |  -  |
-
-
-## loginUser
-
-> String loginUser(username, password)
-
-Logs user into the system
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        String username = "username_example"; // String | The user name for login
-        String password = "password_example"; // String | The password for login in clear text
-        try {
-            String result = apiInstance.loginUser(username, password);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#loginUser");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **username** | **String**| The user name for login |
- **password** | **String**| The password for login in clear text |
-
-### Return type
-
-**String**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  * X-Rate-Limit - calls per hour allowed by the user <br>  * X-Expires-After - date in UTC when token expires <br>  |
-| **400** | Invalid username/password supplied |  -  |
-
-
-## logoutUser
-
-> logoutUser()
-
-Logs out current logged in user session
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        try {
-            apiInstance.logoutUser();
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#logoutUser");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-This endpoint does not need any parameter.
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **0** | successful operation |  -  |
-
-
-## updateUser
-
-> updateUser(username, body)
-
-Updated user
-
-This can only be done by the logged in user.
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        String username = "username_example"; // String | name that need to be deleted
-        User body = new User(); // User | Updated user object
-        try {
-            apiInstance.updateUser(username, body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#updateUser");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **username** | **String**| name that need to be deleted |
- **body** | [**User**](User.md)| Updated user object |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **400** | Invalid user supplied |  -  |
-| **404** | User not found |  -  |
-
diff --git a/samples/client/petstore/java/retrofit2-play25/docs/XmlItem.md b/samples/client/petstore/java/retrofit2-play25/docs/XmlItem.md
deleted file mode 100644
index 6065fd1f4e59..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/docs/XmlItem.md
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-# XmlItem
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**attributeString** | **String** |  |  [optional]
-**attributeNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-**attributeInteger** | **Integer** |  |  [optional]
-**attributeBoolean** | **Boolean** |  |  [optional]
-**wrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
-**nameString** | **String** |  |  [optional]
-**nameNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-**nameInteger** | **Integer** |  |  [optional]
-**nameBoolean** | **Boolean** |  |  [optional]
-**nameArray** | **List&lt;Integer&gt;** |  |  [optional]
-**nameWrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
-**prefixString** | **String** |  |  [optional]
-**prefixNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-**prefixInteger** | **Integer** |  |  [optional]
-**prefixBoolean** | **Boolean** |  |  [optional]
-**prefixArray** | **List&lt;Integer&gt;** |  |  [optional]
-**prefixWrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
-**namespaceString** | **String** |  |  [optional]
-**namespaceNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-**namespaceInteger** | **Integer** |  |  [optional]
-**namespaceBoolean** | **Boolean** |  |  [optional]
-**namespaceArray** | **List&lt;Integer&gt;** |  |  [optional]
-**namespaceWrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
-**prefixNsString** | **String** |  |  [optional]
-**prefixNsNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-**prefixNsInteger** | **Integer** |  |  [optional]
-**prefixNsBoolean** | **Boolean** |  |  [optional]
-**prefixNsArray** | **List&lt;Integer&gt;** |  |  [optional]
-**prefixNsWrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2-play25/pom.xml b/samples/client/petstore/java/retrofit2-play25/pom.xml
deleted file mode 100644
index 76aa913fc2cc..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/pom.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>petstore-java-client-retrofit2-play25</artifactId>
-    <packaging>jar</packaging>
-    <name>petstore-java-client-retrofit2-play25</name>
-    <version>1.0.0</version>
-    <url>https://github.com/openapitools/openapi-generator</url>
-    <description>OpenAPI Java</description>
-    <scm>
-        <connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
-        <developerConnection>scm:git:git@github.com:openapitools/openapi-generator.git</developerConnection>
-        <url>https://github.com/openapitools/openapi-generator</url>
-    </scm>
-
-    <licenses>
-        <license>
-            <name>Unlicense</name>
-            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>OpenAPI-Generator Contributors</name>
-            <email>team@openapitools.org</email>
-            <organization>OpenAPITools.org</organization>
-            <organizationUrl>http://openapitools.org</organizationUrl>
-        </developer>
-    </developers>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>2.2.0</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12</version>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>loggerPath</name>
-                            <value>conf/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                    <argLine>-Xms512m -Xmx1500m</argLine>
-                    <parallel>methods</parallel>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- attach test jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.10</version>
-                <executions>
-                    <execution>
-                        <id>add_sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/main/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>add_test_sources</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/test/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.1</version>
-                <configuration>
-                    <doclint>none</doclint>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>sign-artifacts</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations-version}</version>
-        </dependency>
-        <!-- @Nullable annotation -->
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.retrofit2</groupId>
-            <artifactId>converter-gson</artifactId>
-            <version>${retrofit-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.retrofit2</groupId>
-            <artifactId>retrofit</artifactId>
-            <version>${retrofit-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.retrofit2</groupId>
-            <artifactId>converter-scalars</artifactId>
-            <version>${retrofit-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.oltu.oauth2</groupId>
-            <artifactId>org.apache.oltu.oauth2.client</artifactId>
-            <version>${oltu-version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.oltu.oauth2</groupId>
-                    <artifactId>common</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.gsonfire</groupId>
-            <artifactId>gson-fire</artifactId>
-            <version>${gson-fire-version}</version>
-        </dependency>
-            <dependency>
-                <groupId>org.threeten</groupId>
-                <artifactId>threetenbp</artifactId>
-                <version>${threetenbp-version}</version>
-            </dependency>
-            <!-- JSON processing: jackson -->
-            <dependency>
-                <groupId>com.squareup.retrofit2</groupId>
-                <artifactId>converter-jackson</artifactId>
-                <version>${retrofit-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.datatype</groupId>
-                <artifactId>jackson-datatype-jsr310</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe.play</groupId>
-                <artifactId>play-java-ws_2.11</artifactId>
-                <version>${play-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <gson-fire-version>1.8.3</gson-fire-version>
-        <swagger-annotations-version>1.5.22</swagger-annotations-version>
-        <jackson-databind-version>2.10.3</jackson-databind-version>
-        <jackson-version>2.10.4</jackson-version>
-        <play-version>2.5.15</play-version>
-        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
-        <retrofit-version>2.5.0</retrofit-version>
-        <threetenbp-version>1.4.0</threetenbp-version>
-        <oltu-version>1.0.1</oltu-version>
-        <junit-version>4.13</junit-version>
-    </properties>
-</project>
diff --git a/samples/client/petstore/java/retrofit2-play25/settings.gradle b/samples/client/petstore/java/retrofit2-play25/settings.gradle
deleted file mode 100644
index 1a1d1329c849..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = "petstore-java-client-retrofit2-play25"
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/ApiClient.java
deleted file mode 100644
index a81407cfe5b1..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/ApiClient.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.openapitools.client;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.*;
-
-import retrofit2.Retrofit;
-import retrofit2.converter.scalars.ScalarsConverterFactory;
-import retrofit2.converter.jackson.JacksonConverterFactory;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openapitools.jackson.nullable.JsonNullableModule;
-
-import play.libs.Json;
-import play.libs.ws.WSClient;
-
-import org.openapitools.client.Play25CallAdapterFactory;
-import org.openapitools.client.Play25CallFactory;
-
-import okhttp3.Interceptor;
-import org.openapitools.client.auth.ApiKeyAuth;
-import org.openapitools.client.auth.Authentication;
-
-/**
- * API client
- */
-public class ApiClient {
-
-    /** Underlying HTTP-client */
-    private WSClient wsClient;
-
-    /** Supported auths */
-    private Map<String, Authentication> authentications;
-
-    /** API base path */
-    private String basePath = "http://petstore.swagger.io:80/v2";
-
-    public ApiClient(WSClient wsClient) {
-        this();
-        this.wsClient = wsClient;
-    }
-
-    public ApiClient() {
-        // Setup authentications (key: authentication name, value: authentication).
-        authentications = new HashMap<>();
-        authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
-        authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
-        // authentications.put("http_basic_test", new HttpBasicAuth());
-        // authentications.put("petstore_auth", new OAuth());
-        // Prevent the authentications from being modified.
-        authentications = Collections.unmodifiableMap(authentications);
-
-    }
-
-    /**
-     * Creates a retrofit2 client for given API interface
-     */
-    public <S> S createService(Class<S> serviceClass) {
-        if(!basePath.endsWith("/")) {
-            basePath = basePath + "/";
-        }
-
-        Map<String, String> extraHeaders = new HashMap<>();
-        Map<String, String> extraCookies = new HashMap<>();
-        List<Pair> extraQueryParams = new ArrayList<>();
-
-        for (String authName : authentications.keySet()) {
-            Authentication auth = authentications.get(authName);
-            if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
-
-            auth.applyToParams(extraQueryParams, extraHeaders, extraCookies);
-        }
-
-        ObjectMapper mapper = Json.mapper();
-        JsonNullableModule jnm = new JsonNullableModule();
-        mapper.registerModule(jnm);
-
-        return new Retrofit.Builder()
-                       .baseUrl(basePath)
-                       .addConverterFactory(ScalarsConverterFactory.create())
-                       .addConverterFactory(JacksonConverterFactory.create(mapper))
-                       .callFactory(new Play25CallFactory(wsClient, extraHeaders, extraCookies, extraQueryParams))
-                       .addCallAdapterFactory(new Play25CallAdapterFactory())
-                       .build()
-                       .create(serviceClass);
-    }
-
-    /**
-     * Helper method to set API base path
-     */
-    public ApiClient setBasePath(String basePath) {
-        this.basePath = basePath;
-        return this;
-    }
-
-    /**
-     * Get authentications (key: authentication name, value: authentication).
-     */
-    public Map<String, Authentication> getAuthentications() {
-        return authentications;
-    }
-
-    /**
-     * Get authentication for the given name.
-     *
-     * @param authName The authentication name
-     * @return The authentication, null if not found
-     */
-    public Authentication getAuthentication(String authName) {
-        return authentications.get(authName);
-    }
-
-    /**
-     * Helper method to set API key value for the first API key authentication.
-     */
-    public ApiClient setApiKey(String apiKey) {
-        for (Authentication auth : authentications.values()) {
-            if (auth instanceof ApiKeyAuth) {
-                ((ApiKeyAuth) auth).setApiKey(apiKey);
-                return this;
-            }
-        }
-
-        throw new RuntimeException("No API key authentication configured!");
-    }
-
-    /**
-     * Helper method to set API key prefix for the first API key authentication.
-     */
-    public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
-        for (Authentication auth : authentications.values()) {
-            if (auth instanceof ApiKeyAuth) {
-                ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
-                return this;
-            }
-        }
-
-        throw new RuntimeException("No API key authentication configured!");
-    }
-
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/CollectionFormats.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/CollectionFormats.java
deleted file mode 100644
index 20cbb0e7d6af..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/CollectionFormats.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.openapitools.client;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class CollectionFormats {
-
-    public static class CSVParams {
-
-        protected List<String> params;
-
-        public CSVParams() {
-        }
-
-        public CSVParams(List<String> params) {
-            this.params = params;
-        }
-
-        public CSVParams(String... params) {
-            this.params = Arrays.asList(params);
-        }
-
-        public List<String> getParams() {
-            return params;
-        }
-
-        public void setParams(List<String> params) {
-            this.params = params;
-        }
-
-        @Override
-        public String toString() {
-            return StringUtil.join(params.toArray(new String[0]), ",");
-        }
-
-    }
-
-    public static class SPACEParams extends SSVParams {
-
-    }
-
-    public static class SSVParams extends CSVParams {
-
-        public SSVParams() {
-        }
-
-        public SSVParams(List<String> params) {
-            super(params);
-        }
-
-        public SSVParams(String... params) {
-            super(params);
-        }
-
-        @Override
-        public String toString() {
-            return StringUtil.join(params.toArray(new String[0]), " ");
-        }
-    }
-
-    public static class TSVParams extends CSVParams {
-
-        public TSVParams() {
-        }
-
-        public TSVParams(List<String> params) {
-            super(params);
-        }
-
-        public TSVParams(String... params) {
-            super(params);
-        }
-
-        @Override
-        public String toString() {
-            return StringUtil.join( params.toArray(new String[0]), "\t");
-        }
-    }
-
-    public static class PIPESParams extends CSVParams {
-
-        public PIPESParams() {
-        }
-
-        public PIPESParams(List<String> params) {
-            super(params);
-        }
-
-        public PIPESParams(String... params) {
-            super(params);
-        }
-
-        @Override
-        public String toString() {
-            return StringUtil.join(params.toArray(new String[0]), "|");
-        }
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Pair.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Pair.java
deleted file mode 100644
index ae89aa614543..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Pair.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client;
-
-
-public class Pair {
-    private String name = "";
-    private String value = "";
-
-    public Pair (String name, String value) {
-        setName(name);
-        setValue(value);
-    }
-
-    private void setName(String name) {
-        if (!isValidString(name)) {
-            return;
-        }
-
-        this.name = name;
-    }
-
-    private void setValue(String value) {
-        if (!isValidString(value)) {
-            return;
-        }
-
-        this.value = value;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public String getValue() {
-        return this.value;
-    }
-
-    private boolean isValidString(String arg) {
-        if (arg == null) {
-            return false;
-        }
-
-        if (arg.trim().isEmpty()) {
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallAdapterFactory.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallAdapterFactory.java
deleted file mode 100644
index 5977e3e3553c..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallAdapterFactory.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.openapitools.client;
-
-import java.util.concurrent.CompletionStage;
-import retrofit2.*;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.WildcardType;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.function.Function;
-
-/**
- * Creates {@link CallAdapter} instances that convert {@link Call} into {@link java.util.concurrent.CompletionStage}
- */
-public class Play25CallAdapterFactory extends CallAdapter.Factory {
-
-    private Function<RuntimeException, RuntimeException> exceptionConverter = Function.identity();
-
-    public Play25CallAdapterFactory() {
-    }
-
-    public Play25CallAdapterFactory(
-            Function<RuntimeException, RuntimeException> exceptionConverter) {
-        this.exceptionConverter = exceptionConverter;
-    }
-
-    @Override
-    public CallAdapter<?, ?> get(Type returnType, Annotation[] annotations, Retrofit retrofit) {
-        if (!(returnType instanceof ParameterizedType)) {
-            return null;
-        }
-
-        ParameterizedType type = (ParameterizedType) returnType;
-        if (type.getRawType() != CompletionStage.class) {
-            return null;
-        }
-
-        return createAdapter((ParameterizedType) returnType);
-    }
-
-    private CallAdapter<?, CompletionStage<?>> createAdapter(ParameterizedType returnType) {
-        // Get CompletionStage type argument
-        Type[] types = returnType.getActualTypeArguments();
-        if (types.length != 1) {
-            throw new IllegalStateException("Must be exactly one type parameter");
-        }
-
-        Type resultType = types[0];
-        Class<?> rawTypeParam = getRawType(resultType);
-
-        boolean includeResponse = false;
-        if (rawTypeParam == Response.class) {
-            if (!(resultType instanceof ParameterizedType)) {
-                throw new IllegalStateException("Response must be parameterized"
-                        + " as Response<T>");
-            }
-            resultType = ((ParameterizedType) resultType).getActualTypeArguments()[0];
-            includeResponse = true;
-        }
-
-        return new ValueAdapter(resultType, includeResponse, exceptionConverter);
-    }
-
-    /**
-     * Adapter that coverts values returned by API interface into CompletionStage
-     */
-    private static final class ValueAdapter<R> implements CallAdapter<R, CompletionStage<R>> {
-
-        private final Type responseType;
-        private final boolean includeResponse;
-        private Function<RuntimeException, RuntimeException> exceptionConverter;
-
-        ValueAdapter(Type responseType, boolean includeResponse,
-                     Function<RuntimeException, RuntimeException> exceptionConverter) {
-            this.responseType = responseType;
-            this.includeResponse = includeResponse;
-            this.exceptionConverter = exceptionConverter;
-        }
-
-        @Override
-        public Type responseType() {
-            return responseType;
-        }
-
-        @Override
-        public CompletionStage<R> adapt(final Call<R> call) {
-            final CompletableFuture<R> promise = new CompletableFuture();
-
-            call.enqueue(new Callback<R>() {
-
-                @Override
-                public void onResponse(Call<R> call, Response<R> response) {
-                    if (response.isSuccessful()) {
-                        if (includeResponse) {
-                            promise.complete((R) response);
-                        } else {
-                            promise.complete(response.body());
-                        }
-                    } else {
-                        promise.completeExceptionally(exceptionConverter.apply(new HttpException(response)));
-                    }
-                }
-
-                @Override
-                public void onFailure(Call<R> call, Throwable t) {
-                    promise.completeExceptionally(t);
-                }
-
-            });
-
-            return promise;
-        }
-    }
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallFactory.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallFactory.java
deleted file mode 100644
index 412ba4b5aa09..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallFactory.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package org.openapitools.client;
-
-import okhttp3.*;
-import okio.AsyncTimeout;
-import okio.Buffer;
-import okio.BufferedSource;
-import okio.Timeout;
-import play.libs.ws.WSClient;
-import play.libs.ws.WSRequest;
-import play.libs.ws.WSResponse;
-import play.libs.ws.WSRequestFilter;
-import play.libs.ws.WSCookie;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.CompletionStage;
-
-/**
- * Creates {@link Call} instances that invoke underlying {@link WSClient}
- */
-public class Play25CallFactory implements okhttp3.Call.Factory {
-
-    /** PlayWS http client */
-    private final WSClient wsClient;
-
-    /** Extra headers to add to request */
-    private Map<String, String> extraHeaders = new HashMap<>();
-
-    /** Extra cookies to add to request */
-    private Map<String, String> extraCookies = new HashMap<>();
-
-    /** Extra query parameters to add to request */
-    private List<Pair> extraQueryParams = new ArrayList<>();
-
-    /** Filters (interceptors) */
-    private List<WSRequestFilter> filters = new ArrayList<>();
-
-    public Play25CallFactory(WSClient wsClient) {
-        this.wsClient = wsClient;
-    }
-
-    public Play25CallFactory(WSClient wsClient, List<WSRequestFilter> filters) {
-        this.wsClient = wsClient;
-        this.filters.addAll(filters);
-    }
-
-    public Play25CallFactory(WSClient wsClient, Map<String, String> extraHeaders,
-        Map<String, String> extraCookies,
-        List<Pair> extraQueryParams) {
-        this.wsClient = wsClient;
-
-        this.extraHeaders.putAll(extraHeaders);
-        this.extraCookies.putAll(extraCookies);
-        this.extraQueryParams.addAll(extraQueryParams);
-    }
-
-    @Override
-    public Call newCall(Request request) {
-        // add extra headers
-        Request.Builder rb = request.newBuilder();
-        for (Map.Entry<String, String> header : this.extraHeaders.entrySet()) {
-            rb.addHeader(header.getKey(), header.getValue());
-        }
-        for (Map.Entry<String, String> cookie : this.extraCookies.entrySet()) {
-            rb.addHeader("Cookie", String.format("%s=%s", cookie.getKey(), cookie.getValue()));
-        }
-
-        // add extra query params
-        if (!this.extraQueryParams.isEmpty()) {
-            String newQuery = request.url().uri().getQuery();
-            for (Pair queryParam : this.extraQueryParams) {
-                String param = String.format("%s=%s", queryParam.getName(), queryParam.getValue());
-                if (newQuery == null) {
-                    newQuery = param;
-                } else {
-                    newQuery += "&" + param;
-                }
-            }
-
-            URI newUri;
-            try {
-                newUri = new URI(request.url().uri().getScheme(), request.url().uri().getAuthority(),
-                        request.url().uri().getPath(), newQuery, request.url().uri().getFragment());
-                rb.url(newUri.toURL());
-            } catch (MalformedURLException | URISyntaxException e) {
-                throw new RuntimeException("Error while updating an url", e);
-            }
-        }
-
-        return new PlayWSCall(wsClient, this.filters, rb.build());
-    }
-
-    /**
-     * Call implementation that delegates to Play WS Client
-     */
-    static class PlayWSCall implements Call {
-
-        private final WSClient wsClient;
-        private WSRequest wsRequest;
-        private List<WSRequestFilter> filters;
-
-        private final Request request;
-        private final AsyncTimeout timeout;
-
-        public PlayWSCall(WSClient wsClient, List<WSRequestFilter> filters, Request request) {
-            this.wsClient = wsClient;
-            this.request = request;
-            this.filters = filters;
-            this.timeout = new AsyncTimeout();
-        }
-
-        @Override
-        public Request request() {
-            return request;
-        }
-
-        @Override
-        public Timeout timeout() {
-            return timeout;
-        }
-
-        @Override
-        public void enqueue(final okhttp3.Callback responseCallback) {
-            final Call call = this;
-            final CompletionStage<WSResponse> promise = executeAsync();
-
-            promise.whenCompleteAsync((v, t) -> {
-                if (t != null) {
-                    if (t instanceof IOException) {
-                        responseCallback.onFailure(call, (IOException) t);
-                    } else {
-                        responseCallback.onFailure(call, new IOException(t));
-                    }
-                } else {
-                    try {
-                        responseCallback.onResponse(call, PlayWSCall.this.toWSResponse(v));
-                    } catch (IOException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            }, play.libs.concurrent.HttpExecution.defaultContext());
-        }
-
-        CompletionStage<WSResponse> executeAsync() {
-            try {
-                wsRequest = wsClient.url(request.url().uri().toString());
-                addHeaders(wsRequest);
-                addCookies(wsRequest);
-                if (request.body() != null) {
-                    addBody(wsRequest);
-                }
-                filters.stream().forEach(f -> wsRequest.withRequestFilter(f));
-
-                return wsRequest.execute(request.method());
-            } catch (Exception e) {
-                throw new RuntimeException(e.getMessage(), e);
-            }
-        }
-
-        private void addHeaders(WSRequest wsRequest) {
-            for(Map.Entry<String, List<String>> entry : request.headers().toMultimap().entrySet()) {
-                List<String> values = entry.getValue();
-                for (String value : values) {
-                    wsRequest.setHeader(entry.getKey(), value);
-                }
-            }
-        }
-
-        private void addCookies(WSRequest wsRequest) {
-            final List<String> cookies = request.headers("Cookie");
-            if (!cookies.isEmpty()) {
-                String delimiter = "";
-                final StringBuilder cookieHeader = new StringBuilder();
-                for (final String cookie : cookies) {
-                    cookieHeader.append(String.format("%s%s", delimiter, cookie));
-                    delimiter = "; ";
-                }
-                wsRequest.setHeader("Cookie", cookieHeader.toString());
-            }
-        }
-
-        private void addBody(WSRequest wsRequest) throws IOException {
-            Buffer buffer = new Buffer();
-            request.body().writeTo(buffer);
-            wsRequest.setBody(buffer.inputStream());
-
-            MediaType mediaType = request.body().contentType();
-            if (mediaType != null) {
-                wsRequest.setContentType(mediaType.toString());
-            }
-        }
-
-        private Response toWSResponse(final WSResponse r) {
-            final Response.Builder builder = new Response.Builder();
-            builder.request(request)
-                   .code(r.getStatus())
-                   .body(new ResponseBody() {
-
-                       @Override
-                       public MediaType contentType() {
-                           return Optional.ofNullable(r.getHeader("Content-Type"))
-                                          .map(MediaType::parse)
-                                          .orElse(null);
-                       }
-
-                       @Override
-                       public long contentLength() {
-                           return r.asByteArray().length;
-                       }
-
-                       @Override
-                       public BufferedSource source() {
-                           return new Buffer().write(r.asByteArray());
-                       }
-
-                   });
-
-            for (Map.Entry<String, List<String>> entry : r.getAllHeaders().entrySet()) {
-                for (String value : entry.getValue()) {
-                    builder.addHeader(entry.getKey(), value);
-                }
-            }
-            for (final WSCookie cookie : r.getCookies()) {
-                builder.addHeader("Cookie", String.format("%s=%s", cookie.getName(), cookie.getValue()));
-            }
-
-
-            builder.protocol(Protocol.HTTP_1_1);
-            return builder.build();
-        }
-
-        @Override
-        public Response execute() throws IOException {
-            throw new UnsupportedOperationException("Not supported");
-        }
-
-        @Override
-        public void cancel() {
-            throw new UnsupportedOperationException("Not supported");
-        }
-
-        @Override
-        public PlayWSCall clone() {
-            throw new UnsupportedOperationException("Not supported");
-        }
-
-        @Override
-        public boolean isExecuted() {
-            return false;
-        }
-
-        @Override
-        public boolean isCanceled() {
-            return false;
-        }
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/RFC3339DateFormat.java
deleted file mode 100644
index 9509fd089812..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/RFC3339DateFormat.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-package org.openapitools.client;
-
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
-
-import java.text.FieldPosition;
-import java.util.Date;
-
-
-public class RFC3339DateFormat extends ISO8601DateFormat {
-
-  // Same as ISO8601DateFormat but serializing milliseconds.
-  @Override
-  public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
-    String value = ISO8601Utils.format(date, true);
-    toAppendTo.append(value);
-    return toAppendTo;
-  }
-
-}
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/StringUtil.java
deleted file mode 100644
index 747a23f5bf23..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/StringUtil.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-
-public class StringUtil {
-  /**
-   * Check if the given array contains the given value (with case-insensitive comparison).
-   *
-   * @param array The array
-   * @param value The value to search
-   * @return true if the array contains the value
-   */
-  public static boolean containsIgnoreCase(String[] array, String value) {
-    for (String str : array) {
-      if (value == null && str == null) {
-        return true;
-      }
-      if (value != null && value.equalsIgnoreCase(str)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Join an array of strings with the given separator.
-   * <p>
-   * Note: This might be replaced by utility method from commons-lang or guava someday
-   * if one of those libraries is added as dependency.
-   * </p>
-   *
-   * @param array     The array of strings
-   * @param separator The separator
-   * @return the resulting string
-   */
-  public static String join(String[] array, String separator) {
-    int len = array.length;
-    if (len == 0) {
-      return "";
-    }
-
-    StringBuilder out = new StringBuilder();
-    out.append(array[0]);
-    for (int i = 1; i < len; i++) {
-      out.append(separator).append(array[i]);
-    }
-    return out.toString();
-  }
-
-  /**
-   * Join a list of strings with the given separator.
-   *
-   * @param list      The list of strings
-   * @param separator The separator
-   * @return the resulting string
-   */
-  public static String join(Collection<String> list, String separator) {
-    Iterator<String> iterator = list.iterator();
-    StringBuilder out = new StringBuilder();
-    if (iterator.hasNext()) {
-      out.append(iterator.next());
-    }
-    while (iterator.hasNext()) {
-      out.append(separator).append(iterator.next());
-    }
-    return out.toString();
-  }
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
deleted file mode 100644
index b638ac676908..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-
-
-import retrofit2.Call;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import org.openapitools.client.model.Client;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import java.util.concurrent.*;
-import retrofit2.Response;
-
-public interface AnotherFakeApi {
-  /**
-   * To test special tags
-   * To test special tags and operation ID starting with number
-   * @param body client model (required)
-   * @return Call&lt;Client&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PATCH("another-fake/dummy")
-  CompletionStage<Response<Client>> call123testSpecialTags(
-    @retrofit2.http.Body Client body
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/FakeApi.java
deleted file mode 100644
index a9c8e3f16da0..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/FakeApi.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-
-
-import retrofit2.Call;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import java.math.BigDecimal;
-import org.openapitools.client.model.Client;
-import java.io.File;
-import org.openapitools.client.model.FileSchemaTestClass;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
-import org.openapitools.client.model.OuterComposite;
-import org.openapitools.client.model.User;
-import org.openapitools.client.model.XmlItem;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import java.util.concurrent.*;
-import retrofit2.Response;
-
-public interface FakeApi {
-  /**
-   * creates an XmlItem
-   * this route creates an XmlItem
-   * @param xmlItem XmlItem Body (required)
-   * @return Call&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/xml"
-  })
-  @POST("fake/create_xml_item")
-  CompletionStage<Response<Void>> createXmlItem(
-    @retrofit2.http.Body XmlItem xmlItem
-  );
-
-  /**
-   * 
-   * Test serialization of outer boolean types
-   * @param body Input boolean as post body (optional)
-   * @return Call&lt;Boolean&gt;
-   */
-  @POST("fake/outer/boolean")
-  CompletionStage<Response<Boolean>> fakeOuterBooleanSerialize(
-    @retrofit2.http.Body Boolean body
-  );
-
-  /**
-   * 
-   * Test serialization of object with outer number type
-   * @param body Input composite as post body (optional)
-   * @return Call&lt;OuterComposite&gt;
-   */
-  @POST("fake/outer/composite")
-  CompletionStage<Response<OuterComposite>> fakeOuterCompositeSerialize(
-    @retrofit2.http.Body OuterComposite body
-  );
-
-  /**
-   * 
-   * Test serialization of outer number types
-   * @param body Input number as post body (optional)
-   * @return Call&lt;BigDecimal&gt;
-   */
-  @POST("fake/outer/number")
-  CompletionStage<Response<BigDecimal>> fakeOuterNumberSerialize(
-    @retrofit2.http.Body BigDecimal body
-  );
-
-  /**
-   * 
-   * Test serialization of outer string types
-   * @param body Input string as post body (optional)
-   * @return Call&lt;String&gt;
-   */
-  @POST("fake/outer/string")
-  CompletionStage<Response<String>> fakeOuterStringSerialize(
-    @retrofit2.http.Body String body
-  );
-
-  /**
-   * 
-   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-   * @param body  (required)
-   * @return Call&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PUT("fake/body-with-file-schema")
-  CompletionStage<Response<Void>> testBodyWithFileSchema(
-    @retrofit2.http.Body FileSchemaTestClass body
-  );
-
-  /**
-   * 
-   * 
-   * @param query  (required)
-   * @param body  (required)
-   * @return Call&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PUT("fake/body-with-query-params")
-  CompletionStage<Response<Void>> testBodyWithQueryParams(
-    @retrofit2.http.Query("query") String query, @retrofit2.http.Body User body
-  );
-
-  /**
-   * To test \&quot;client\&quot; model
-   * To test \&quot;client\&quot; model
-   * @param body client model (required)
-   * @return Call&lt;Client&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PATCH("fake")
-  CompletionStage<Response<Client>> testClientModel(
-    @retrofit2.http.Body Client body
-  );
-
-  /**
-   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-   * @param number None (required)
-   * @param _double None (required)
-   * @param patternWithoutDelimiter None (required)
-   * @param _byte None (required)
-   * @param integer None (optional)
-   * @param int32 None (optional)
-   * @param int64 None (optional)
-   * @param _float None (optional)
-   * @param string None (optional)
-   * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
-   * @param password None (optional)
-   * @param paramCallback None (optional)
-   * @return Call&lt;Void&gt;
-   */
-  @retrofit2.http.FormUrlEncoded
-  @POST("fake")
-  CompletionStage<Response<Void>> testEndpointParameters(
-    @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") OffsetDateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback
-  );
-
-  /**
-   * To test enum parameters
-   * To test enum parameters
-   * @param enumHeaderStringArray Header parameter enum test (string array) (optional, default to new ArrayList&lt;&gt;())
-   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
-   * @param enumQueryStringArray Query parameter enum test (string array) (optional, default to new ArrayList&lt;&gt;())
-   * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
-   * @param enumQueryInteger Query parameter enum test (double) (optional)
-   * @param enumQueryDouble Query parameter enum test (double) (optional)
-   * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
-   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
-   * @return Call&lt;Void&gt;
-   */
-  @retrofit2.http.FormUrlEncoded
-  @GET("fake")
-  CompletionStage<Response<Void>> testEnumParameters(
-    @retrofit2.http.Header("enum_header_string_array") List<String> enumHeaderStringArray, @retrofit2.http.Header("enum_header_string") String enumHeaderString, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit2.http.Query("enum_query_string") String enumQueryString, @retrofit2.http.Query("enum_query_integer") Integer enumQueryInteger, @retrofit2.http.Query("enum_query_double") Double enumQueryDouble, @retrofit2.http.Field("enum_form_string_array") List<String> enumFormStringArray, @retrofit2.http.Field("enum_form_string") String enumFormString
-  );
-
-  /**
-   * Fake endpoint to test group parameters (optional)
-   * Fake endpoint to test group parameters (optional)
-   * @param requiredStringGroup Required String in group parameters (required)
-   * @param requiredBooleanGroup Required Boolean in group parameters (required)
-   * @param requiredInt64Group Required Integer in group parameters (required)
-   * @param stringGroup String in group parameters (optional)
-   * @param booleanGroup Boolean in group parameters (optional)
-   * @param int64Group Integer in group parameters (optional)
-   * @return Call&lt;Void&gt;
-   */
-  @DELETE("fake")
-  CompletionStage<Response<Void>> testGroupParameters(
-    @retrofit2.http.Query("required_string_group") Integer requiredStringGroup, @retrofit2.http.Header("required_boolean_group") Boolean requiredBooleanGroup, @retrofit2.http.Query("required_int64_group") Long requiredInt64Group, @retrofit2.http.Query("string_group") Integer stringGroup, @retrofit2.http.Header("boolean_group") Boolean booleanGroup, @retrofit2.http.Query("int64_group") Long int64Group
-  );
-
-  /**
-   * test inline additionalProperties
-   * 
-   * @param param request body (required)
-   * @return Call&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @POST("fake/inline-additionalProperties")
-  CompletionStage<Response<Void>> testInlineAdditionalProperties(
-    @retrofit2.http.Body Map<String, String> param
-  );
-
-  /**
-   * test json serialization of form data
-   * 
-   * @param param field1 (required)
-   * @param param2 field2 (required)
-   * @return Call&lt;Void&gt;
-   */
-  @retrofit2.http.FormUrlEncoded
-  @GET("fake/jsonFormData")
-  CompletionStage<Response<Void>> testJsonFormData(
-    @retrofit2.http.Field("param") String param, @retrofit2.http.Field("param2") String param2
-  );
-
-  /**
-   * 
-   * To test the collection format in query parameters
-   * @param pipe  (required)
-   * @param ioutil  (required)
-   * @param http  (required)
-   * @param url  (required)
-   * @param context  (required)
-   * @return Call&lt;Void&gt;
-   */
-  @PUT("fake/test-query-paramters")
-  CompletionStage<Response<Void>> testQueryParameterCollectionFormat(
-    @retrofit2.http.Query("pipe") CSVParams pipe, @retrofit2.http.Query("ioutil") CSVParams ioutil, @retrofit2.http.Query("http") SSVParams http, @retrofit2.http.Query("url") CSVParams url, @retrofit2.http.Query("context") List<String> context
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
deleted file mode 100644
index e4f16e34fd72..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-
-
-import retrofit2.Call;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import org.openapitools.client.model.Client;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import java.util.concurrent.*;
-import retrofit2.Response;
-
-public interface FakeClassnameTags123Api {
-  /**
-   * To test class name in snake case
-   * To test class name in snake case
-   * @param body client model (required)
-   * @return Call&lt;Client&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PATCH("fake_classname_test")
-  CompletionStage<Response<Client>> testClassname(
-    @retrofit2.http.Body Client body
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/PetApi.java
deleted file mode 100644
index 40e2cded8f97..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/PetApi.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-
-
-import retrofit2.Call;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import java.io.File;
-import org.openapitools.client.model.ModelApiResponse;
-import org.openapitools.client.model.Pet;
-import java.util.Set;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import java.util.concurrent.*;
-import retrofit2.Response;
-
-public interface PetApi {
-  /**
-   * Add a new pet to the store
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @return Call&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @POST("pet")
-  CompletionStage<Response<Void>> addPet(
-    @retrofit2.http.Body Pet body
-  );
-
-  /**
-   * Deletes a pet
-   * 
-   * @param petId Pet id to delete (required)
-   * @param apiKey  (optional)
-   * @return Call&lt;Void&gt;
-   */
-  @DELETE("pet/{petId}")
-  CompletionStage<Response<Void>> deletePet(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Header("api_key") String apiKey
-  );
-
-  /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma separated strings
-   * @param status Status values that need to be considered for filter (required)
-   * @return Call&lt;List&lt;Pet&gt;&gt;
-   */
-  @GET("pet/findByStatus")
-  CompletionStage<Response<List<Pet>>> findPetsByStatus(
-    @retrofit2.http.Query("status") CSVParams status
-  );
-
-  /**
-   * Finds Pets by tags
-   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by (required)
-   * @return Call&lt;Set&lt;Pet&gt;&gt;
-   */
-  @GET("pet/findByTags")
-  CompletionStage<Response<Set<Pet>>> findPetsByTags(
-    @retrofit2.http.Query("tags") CSVParams tags
-  );
-
-  /**
-   * Find pet by ID
-   * Returns a single pet
-   * @param petId ID of pet to return (required)
-   * @return Call&lt;Pet&gt;
-   */
-  @GET("pet/{petId}")
-  CompletionStage<Response<Pet>> getPetById(
-    @retrofit2.http.Path("petId") Long petId
-  );
-
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @return Call&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PUT("pet")
-  CompletionStage<Response<Void>> updatePet(
-    @retrofit2.http.Body Pet body
-  );
-
-  /**
-   * Updates a pet in the store with form data
-   * 
-   * @param petId ID of pet that needs to be updated (required)
-   * @param name Updated name of the pet (optional)
-   * @param status Updated status of the pet (optional)
-   * @return Call&lt;Void&gt;
-   */
-  @retrofit2.http.FormUrlEncoded
-  @POST("pet/{petId}")
-  CompletionStage<Response<Void>> updatePetWithForm(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Field("name") String name, @retrofit2.http.Field("status") String status
-  );
-
-  /**
-   * uploads an image
-   * 
-   * @param petId ID of pet to update (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @param file file to upload (optional)
-   * @return Call&lt;ModelApiResponse&gt;
-   */
-  @retrofit2.http.Multipart
-  @POST("pet/{petId}/uploadImage")
-  CompletionStage<Response<ModelApiResponse>> uploadFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
-  );
-
-  /**
-   * uploads an image (required)
-   * 
-   * @param petId ID of pet to update (required)
-   * @param requiredFile file to upload (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @return Call&lt;ModelApiResponse&gt;
-   */
-  @retrofit2.http.Multipart
-  @POST("fake/{petId}/uploadImageWithRequiredFile")
-  CompletionStage<Response<ModelApiResponse>> uploadFileWithRequiredFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/StoreApi.java
deleted file mode 100644
index 798245fd983f..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/StoreApi.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-
-
-import retrofit2.Call;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import org.openapitools.client.model.Order;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import java.util.concurrent.*;
-import retrofit2.Response;
-
-public interface StoreApi {
-  /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted (required)
-   * @return Call&lt;Void&gt;
-   */
-  @DELETE("store/order/{order_id}")
-  CompletionStage<Response<Void>> deleteOrder(
-    @retrofit2.http.Path("order_id") String orderId
-  );
-
-  /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return Call&lt;Map&lt;String, Integer&gt;&gt;
-   */
-  @GET("store/inventory")
-  CompletionStage<Response<Map<String, Integer>>> getInventory();
-    
-
-  /**
-   * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched (required)
-   * @return Call&lt;Order&gt;
-   */
-  @GET("store/order/{order_id}")
-  CompletionStage<Response<Order>> getOrderById(
-    @retrofit2.http.Path("order_id") Long orderId
-  );
-
-  /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet (required)
-   * @return Call&lt;Order&gt;
-   */
-  @POST("store/order")
-  CompletionStage<Response<Order>> placeOrder(
-    @retrofit2.http.Body Order body
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/UserApi.java
deleted file mode 100644
index 3208b159ade7..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/UserApi.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-
-
-import retrofit2.Call;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import org.openapitools.client.model.User;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import java.util.concurrent.*;
-import retrofit2.Response;
-
-public interface UserApi {
-  /**
-   * Create user
-   * This can only be done by the logged in user.
-   * @param body Created user object (required)
-   * @return Call&lt;Void&gt;
-   */
-  @POST("user")
-  CompletionStage<Response<Void>> createUser(
-    @retrofit2.http.Body User body
-  );
-
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @return Call&lt;Void&gt;
-   */
-  @POST("user/createWithArray")
-  CompletionStage<Response<Void>> createUsersWithArrayInput(
-    @retrofit2.http.Body List<User> body
-  );
-
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @return Call&lt;Void&gt;
-   */
-  @POST("user/createWithList")
-  CompletionStage<Response<Void>> createUsersWithListInput(
-    @retrofit2.http.Body List<User> body
-  );
-
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted (required)
-   * @return Call&lt;Void&gt;
-   */
-  @DELETE("user/{username}")
-  CompletionStage<Response<Void>> deleteUser(
-    @retrofit2.http.Path("username") String username
-  );
-
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
-   * @return Call&lt;User&gt;
-   */
-  @GET("user/{username}")
-  CompletionStage<Response<User>> getUserByName(
-    @retrofit2.http.Path("username") String username
-  );
-
-  /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login (required)
-   * @param password The password for login in clear text (required)
-   * @return Call&lt;String&gt;
-   */
-  @GET("user/login")
-  CompletionStage<Response<String>> loginUser(
-    @retrofit2.http.Query("username") String username, @retrofit2.http.Query("password") String password
-  );
-
-  /**
-   * Logs out current logged in user session
-   * 
-   * @return Call&lt;Void&gt;
-   */
-  @GET("user/logout")
-  CompletionStage<Response<Void>> logoutUser();
-    
-
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted (required)
-   * @param body Updated user object (required)
-   * @return Call&lt;Void&gt;
-   */
-  @PUT("user/{username}")
-  CompletionStage<Response<Void>> updateUser(
-    @retrofit2.http.Path("username") String username, @retrofit2.http.Body User body
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
deleted file mode 100644
index 809a01a97878..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.auth;
-
-import org.openapitools.client.Pair;
-
-import java.util.Map;
-import java.util.List;
-
-/**
- * Holds ApiKey auth info
- */
-
-public class ApiKeyAuth implements Authentication {
-  private final String location;
-  private final String paramName;
-
-  private String apiKey;
-  private String apiKeyPrefix;
-
-  public ApiKeyAuth(String location, String paramName) {
-    this.location = location;
-    this.paramName = paramName;
-  }
-
-  public String getLocation() {
-    return location;
-  }
-
-  public String getParamName() {
-    return paramName;
-  }
-
-  public String getApiKey() {
-    return apiKey;
-  }
-
-  public void setApiKey(String apiKey) {
-    this.apiKey = apiKey;
-  }
-
-  public String getApiKeyPrefix() {
-    return apiKeyPrefix;
-  }
-
-  public void setApiKeyPrefix(String apiKeyPrefix) {
-    this.apiKeyPrefix = apiKeyPrefix;
-  }
-
-  @Override
-  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams) {
-    if (apiKey == null) {
-      return;
-    }
-    String value;
-    if (apiKeyPrefix != null) {
-      value = apiKeyPrefix + " " + apiKey;
-    } else {
-      value = apiKey;
-    }
-    if ("query".equals(location)) {
-      queryParams.add(new Pair(paramName, value));
-    } else if ("header".equals(location)) {
-      headerParams.put(paramName, value);
-    } else if ("cookie".equals(location)) {
-      cookieParams.put(paramName, value);
-    }
-  }
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/auth/Authentication.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/auth/Authentication.java
deleted file mode 100644
index 5c558b1d5abd..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/auth/Authentication.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.auth;
-
-import org.openapitools.client.Pair;
-
-import java.util.Map;
-import java.util.List;
-
-public interface Authentication {
-    /**
-     * Apply authentication settings to header and query params.
-     *
-     * @param queryParams List of query parameters
-     * @param headerParams Map of header parameters
-     * @param cookieParams Map of cookie parameters
-     */
-    void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams);
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
deleted file mode 100644
index 0967f96bd1dc..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesAnyType
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesAnyType name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
-    return Objects.equals(this.name, additionalPropertiesAnyType.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesAnyType {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
deleted file mode 100644
index 9071c582806e..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesArray
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesArray.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesArray extends HashMap<String, List> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesArray name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
-    return Objects.equals(this.name, additionalPropertiesArray.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesArray {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
deleted file mode 100644
index 8f134e614a87..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesBoolean
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesBoolean name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
-    return Objects.equals(this.name, additionalPropertiesBoolean.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesBoolean {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
deleted file mode 100644
index 294c05c7334c..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesClass
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_STRING,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_NUMBER,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_INTEGER,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_BOOLEAN,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_INTEGER,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_ANYTYPE,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_STRING,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_ANYTYPE,
-  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE1,
-  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
-  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
-})
-
-public class AdditionalPropertiesClass {
-  public static final String JSON_PROPERTY_MAP_STRING = "map_string";
-  private Map<String, String> mapString = null;
-
-  public static final String JSON_PROPERTY_MAP_NUMBER = "map_number";
-  private Map<String, BigDecimal> mapNumber = null;
-
-  public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer";
-  private Map<String, Integer> mapInteger = null;
-
-  public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean";
-  private Map<String, Boolean> mapBoolean = null;
-
-  public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer";
-  private Map<String, List<Integer>> mapArrayInteger = null;
-
-  public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype";
-  private Map<String, List<Object>> mapArrayAnytype = null;
-
-  public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string";
-  private Map<String, Map<String, String>> mapMapString = null;
-
-  public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype";
-  private Map<String, Map<String, Object>> mapMapAnytype = null;
-
-  public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1";
-  private Object anytype1;
-
-  public static final String JSON_PROPERTY_ANYTYPE2 = "anytype_2";
-  private Object anytype2;
-
-  public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3";
-  private Object anytype3;
-
-
-  public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
-    
-    this.mapString = mapString;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) {
-    if (this.mapString == null) {
-      this.mapString = new HashMap<>();
-    }
-    this.mapString.put(key, mapStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapString
-   * @return mapString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, String> getMapString() {
-    return mapString;
-  }
-
-
-  public void setMapString(Map<String, String> mapString) {
-    this.mapString = mapString;
-  }
-
-
-  public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
-    
-    this.mapNumber = mapNumber;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) {
-    if (this.mapNumber == null) {
-      this.mapNumber = new HashMap<>();
-    }
-    this.mapNumber.put(key, mapNumberItem);
-    return this;
-  }
-
-   /**
-   * Get mapNumber
-   * @return mapNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, BigDecimal> getMapNumber() {
-    return mapNumber;
-  }
-
-
-  public void setMapNumber(Map<String, BigDecimal> mapNumber) {
-    this.mapNumber = mapNumber;
-  }
-
-
-  public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
-    
-    this.mapInteger = mapInteger;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) {
-    if (this.mapInteger == null) {
-      this.mapInteger = new HashMap<>();
-    }
-    this.mapInteger.put(key, mapIntegerItem);
-    return this;
-  }
-
-   /**
-   * Get mapInteger
-   * @return mapInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Integer> getMapInteger() {
-    return mapInteger;
-  }
-
-
-  public void setMapInteger(Map<String, Integer> mapInteger) {
-    this.mapInteger = mapInteger;
-  }
-
-
-  public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
-    
-    this.mapBoolean = mapBoolean;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) {
-    if (this.mapBoolean == null) {
-      this.mapBoolean = new HashMap<>();
-    }
-    this.mapBoolean.put(key, mapBooleanItem);
-    return this;
-  }
-
-   /**
-   * Get mapBoolean
-   * @return mapBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Boolean> getMapBoolean() {
-    return mapBoolean;
-  }
-
-
-  public void setMapBoolean(Map<String, Boolean> mapBoolean) {
-    this.mapBoolean = mapBoolean;
-  }
-
-
-  public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
-    
-    this.mapArrayInteger = mapArrayInteger;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer> mapArrayIntegerItem) {
-    if (this.mapArrayInteger == null) {
-      this.mapArrayInteger = new HashMap<>();
-    }
-    this.mapArrayInteger.put(key, mapArrayIntegerItem);
-    return this;
-  }
-
-   /**
-   * Get mapArrayInteger
-   * @return mapArrayInteger
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, List<Integer>> getMapArrayInteger() {
-    return mapArrayInteger;
-  }
-
-
-  public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
-    this.mapArrayInteger = mapArrayInteger;
-  }
-
-
-  public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
-    
-    this.mapArrayAnytype = mapArrayAnytype;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object> mapArrayAnytypeItem) {
-    if (this.mapArrayAnytype == null) {
-      this.mapArrayAnytype = new HashMap<>();
-    }
-    this.mapArrayAnytype.put(key, mapArrayAnytypeItem);
-    return this;
-  }
-
-   /**
-   * Get mapArrayAnytype
-   * @return mapArrayAnytype
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, List<Object>> getMapArrayAnytype() {
-    return mapArrayAnytype;
-  }
-
-
-  public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
-    this.mapArrayAnytype = mapArrayAnytype;
-  }
-
-
-  public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> mapMapString) {
-    
-    this.mapMapString = mapMapString;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, String> mapMapStringItem) {
-    if (this.mapMapString == null) {
-      this.mapMapString = new HashMap<>();
-    }
-    this.mapMapString.put(key, mapMapStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapMapString
-   * @return mapMapString
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Map<String, String>> getMapMapString() {
-    return mapMapString;
-  }
-
-
-  public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
-    this.mapMapString = mapMapString;
-  }
-
-
-  public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
-    
-    this.mapMapAnytype = mapMapAnytype;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Object> mapMapAnytypeItem) {
-    if (this.mapMapAnytype == null) {
-      this.mapMapAnytype = new HashMap<>();
-    }
-    this.mapMapAnytype.put(key, mapMapAnytypeItem);
-    return this;
-  }
-
-   /**
-   * Get mapMapAnytype
-   * @return mapMapAnytype
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Map<String, Object>> getMapMapAnytype() {
-    return mapMapAnytype;
-  }
-
-
-  public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
-    this.mapMapAnytype = mapMapAnytype;
-  }
-
-
-  public AdditionalPropertiesClass anytype1(Object anytype1) {
-    
-    this.anytype1 = anytype1;
-    return this;
-  }
-
-   /**
-   * Get anytype1
-   * @return anytype1
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Object getAnytype1() {
-    return anytype1;
-  }
-
-
-  public void setAnytype1(Object anytype1) {
-    this.anytype1 = anytype1;
-  }
-
-
-  public AdditionalPropertiesClass anytype2(Object anytype2) {
-    
-    this.anytype2 = anytype2;
-    return this;
-  }
-
-   /**
-   * Get anytype2
-   * @return anytype2
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ANYTYPE2)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Object getAnytype2() {
-    return anytype2;
-  }
-
-
-  public void setAnytype2(Object anytype2) {
-    this.anytype2 = anytype2;
-  }
-
-
-  public AdditionalPropertiesClass anytype3(Object anytype3) {
-    
-    this.anytype3 = anytype3;
-    return this;
-  }
-
-   /**
-   * Get anytype3
-   * @return anytype3
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ANYTYPE3)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Object getAnytype3() {
-    return anytype3;
-  }
-
-
-  public void setAnytype3(Object anytype3) {
-    this.anytype3 = anytype3;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
-    return Objects.equals(this.mapString, additionalPropertiesClass.mapString) &&
-        Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) &&
-        Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) &&
-        Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) &&
-        Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) &&
-        Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) &&
-        Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) &&
-        Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) &&
-        Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) &&
-        Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) &&
-        Objects.equals(this.anytype3, additionalPropertiesClass.anytype3);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesClass {\n");
-    sb.append("    mapString: ").append(toIndentedString(mapString)).append("\n");
-    sb.append("    mapNumber: ").append(toIndentedString(mapNumber)).append("\n");
-    sb.append("    mapInteger: ").append(toIndentedString(mapInteger)).append("\n");
-    sb.append("    mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n");
-    sb.append("    mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n");
-    sb.append("    mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n");
-    sb.append("    mapMapString: ").append(toIndentedString(mapMapString)).append("\n");
-    sb.append("    mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n");
-    sb.append("    anytype1: ").append(toIndentedString(anytype1)).append("\n");
-    sb.append("    anytype2: ").append(toIndentedString(anytype2)).append("\n");
-    sb.append("    anytype3: ").append(toIndentedString(anytype3)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
deleted file mode 100644
index 94d4ece0c37f..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesInteger
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesInteger.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesInteger name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
-    return Objects.equals(this.name, additionalPropertiesInteger.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesInteger {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
deleted file mode 100644
index 21088ae74341..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesNumber
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesNumber.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesNumber name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
-    return Objects.equals(this.name, additionalPropertiesNumber.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesNumber {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
deleted file mode 100644
index 58780e577cb5..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesObject
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesObject.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesObject extends HashMap<String, Map> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesObject name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o;
-    return Objects.equals(this.name, additionalPropertiesObject.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesObject {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
deleted file mode 100644
index f3ece0e27ed3..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * AdditionalPropertiesString
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesString.JSON_PROPERTY_NAME
-})
-
-public class AdditionalPropertiesString extends HashMap<String, String> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public AdditionalPropertiesString name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o;
-    return Objects.equals(this.name, additionalPropertiesString.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesString {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Animal.java
deleted file mode 100644
index 854f1a7e969e..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Animal.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.BigCat;
-import org.openapitools.client.model.Cat;
-import org.openapitools.client.model.Dog;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Animal
- */
-@JsonPropertyOrder({
-  Animal.JSON_PROPERTY_CLASS_NAME,
-  Animal.JSON_PROPERTY_COLOR
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
-  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
-})
-
-public class Animal {
-  public static final String JSON_PROPERTY_CLASS_NAME = "className";
-  protected String className;
-
-  public static final String JSON_PROPERTY_COLOR = "color";
-  private String color = "red";
-
-
-  public Animal className(String className) {
-    
-    this.className = className;
-    return this;
-  }
-
-   /**
-   * Get className
-   * @return className
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getClassName() {
-    return className;
-  }
-
-
-  public void setClassName(String className) {
-    this.className = className;
-  }
-
-
-  public Animal color(String color) {
-    
-    this.color = color;
-    return this;
-  }
-
-   /**
-   * Get color
-   * @return color
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_COLOR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getColor() {
-    return color;
-  }
-
-
-  public void setColor(String color) {
-    this.color = color;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Animal animal = (Animal) o;
-    return Objects.equals(this.className, animal.className) &&
-        Objects.equals(this.color, animal.color);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(className, color);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Animal {\n");
-    sb.append("    className: ").append(toIndentedString(className)).append("\n");
-    sb.append("    color: ").append(toIndentedString(color)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
deleted file mode 100644
index 937459512853..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * ArrayOfArrayOfNumberOnly
- */
-@JsonPropertyOrder({
-  ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
-})
-
-public class ArrayOfArrayOfNumberOnly {
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
-  private List<List<BigDecimal>> arrayArrayNumber = null;
-
-
-  public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
-    
-    this.arrayArrayNumber = arrayArrayNumber;
-    return this;
-  }
-
-  public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
-    if (this.arrayArrayNumber == null) {
-      this.arrayArrayNumber = new ArrayList<>();
-    }
-    this.arrayArrayNumber.add(arrayArrayNumberItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayNumber
-   * @return arrayArrayNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<List<BigDecimal>> getArrayArrayNumber() {
-    return arrayArrayNumber;
-  }
-
-
-  public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
-    this.arrayArrayNumber = arrayArrayNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o;
-    return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayArrayNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayOfArrayOfNumberOnly {\n");
-    sb.append("    arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
deleted file mode 100644
index 1658e7153006..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * ArrayOfNumberOnly
- */
-@JsonPropertyOrder({
-  ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
-})
-
-public class ArrayOfNumberOnly {
-  public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
-  private List<BigDecimal> arrayNumber = null;
-
-
-  public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
-    
-    this.arrayNumber = arrayNumber;
-    return this;
-  }
-
-  public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
-    if (this.arrayNumber == null) {
-      this.arrayNumber = new ArrayList<>();
-    }
-    this.arrayNumber.add(arrayNumberItem);
-    return this;
-  }
-
-   /**
-   * Get arrayNumber
-   * @return arrayNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<BigDecimal> getArrayNumber() {
-    return arrayNumber;
-  }
-
-
-  public void setArrayNumber(List<BigDecimal> arrayNumber) {
-    this.arrayNumber = arrayNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o;
-    return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayOfNumberOnly {\n");
-    sb.append("    arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayTest.java
deleted file mode 100644
index de001c2ec5e7..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.client.model.ReadOnlyFirst;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * ArrayTest
- */
-@JsonPropertyOrder({
-  ArrayTest.JSON_PROPERTY_ARRAY_OF_STRING,
-  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
-  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
-})
-
-public class ArrayTest {
-  public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
-  private List<String> arrayOfString = null;
-
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
-  private List<List<Long>> arrayArrayOfInteger = null;
-
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
-  private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
-
-
-  public ArrayTest arrayOfString(List<String> arrayOfString) {
-    
-    this.arrayOfString = arrayOfString;
-    return this;
-  }
-
-  public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
-    if (this.arrayOfString == null) {
-      this.arrayOfString = new ArrayList<>();
-    }
-    this.arrayOfString.add(arrayOfStringItem);
-    return this;
-  }
-
-   /**
-   * Get arrayOfString
-   * @return arrayOfString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<String> getArrayOfString() {
-    return arrayOfString;
-  }
-
-
-  public void setArrayOfString(List<String> arrayOfString) {
-    this.arrayOfString = arrayOfString;
-  }
-
-
-  public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
-    
-    this.arrayArrayOfInteger = arrayArrayOfInteger;
-    return this;
-  }
-
-  public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
-    if (this.arrayArrayOfInteger == null) {
-      this.arrayArrayOfInteger = new ArrayList<>();
-    }
-    this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayOfInteger
-   * @return arrayArrayOfInteger
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<List<Long>> getArrayArrayOfInteger() {
-    return arrayArrayOfInteger;
-  }
-
-
-  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
-    this.arrayArrayOfInteger = arrayArrayOfInteger;
-  }
-
-
-  public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
-    
-    this.arrayArrayOfModel = arrayArrayOfModel;
-    return this;
-  }
-
-  public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
-    if (this.arrayArrayOfModel == null) {
-      this.arrayArrayOfModel = new ArrayList<>();
-    }
-    this.arrayArrayOfModel.add(arrayArrayOfModelItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayOfModel
-   * @return arrayArrayOfModel
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
-    return arrayArrayOfModel;
-  }
-
-
-  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
-    this.arrayArrayOfModel = arrayArrayOfModel;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayTest arrayTest = (ArrayTest) o;
-    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
-        Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
-        Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayTest {\n");
-    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
-    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
-    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/BigCat.java
deleted file mode 100644
index bc2a449ff8d4..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/BigCat.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.BigCatAllOf;
-import org.openapitools.client.model.Cat;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * BigCat
- */
-@JsonPropertyOrder({
-  BigCat.JSON_PROPERTY_KIND
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-})
-
-public class BigCat extends Cat {
-  /**
-   * Gets or Sets kind
-   */
-  public enum KindEnum {
-    LIONS("lions"),
-    
-    TIGERS("tigers"),
-    
-    LEOPARDS("leopards"),
-    
-    JAGUARS("jaguars");
-
-    private String value;
-
-    KindEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static KindEnum fromValue(String value) {
-      for (KindEnum b : KindEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_KIND = "kind";
-  private KindEnum kind;
-
-
-  public BigCat kind(KindEnum kind) {
-    
-    this.kind = kind;
-    return this;
-  }
-
-   /**
-   * Get kind
-   * @return kind
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_KIND)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public KindEnum getKind() {
-    return kind;
-  }
-
-
-  public void setKind(KindEnum kind) {
-    this.kind = kind;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BigCat bigCat = (BigCat) o;
-    return Objects.equals(this.kind, bigCat.kind) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(kind, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BigCat {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/BigCatAllOf.java
deleted file mode 100644
index 754e37125b36..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * BigCatAllOf
- */
-@JsonPropertyOrder({
-  BigCatAllOf.JSON_PROPERTY_KIND
-})
-
-public class BigCatAllOf {
-  /**
-   * Gets or Sets kind
-   */
-  public enum KindEnum {
-    LIONS("lions"),
-    
-    TIGERS("tigers"),
-    
-    LEOPARDS("leopards"),
-    
-    JAGUARS("jaguars");
-
-    private String value;
-
-    KindEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static KindEnum fromValue(String value) {
-      for (KindEnum b : KindEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_KIND = "kind";
-  private KindEnum kind;
-
-
-  public BigCatAllOf kind(KindEnum kind) {
-    
-    this.kind = kind;
-    return this;
-  }
-
-   /**
-   * Get kind
-   * @return kind
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_KIND)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public KindEnum getKind() {
-    return kind;
-  }
-
-
-  public void setKind(KindEnum kind) {
-    this.kind = kind;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BigCatAllOf bigCatAllOf = (BigCatAllOf) o;
-    return Objects.equals(this.kind, bigCatAllOf.kind);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(kind);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BigCatAllOf {\n");
-    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Capitalization.java
deleted file mode 100644
index 28c74d28c020..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Capitalization.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Capitalization
- */
-@JsonPropertyOrder({
-  Capitalization.JSON_PROPERTY_SMALL_CAMEL,
-  Capitalization.JSON_PROPERTY_CAPITAL_CAMEL,
-  Capitalization.JSON_PROPERTY_SMALL_SNAKE,
-  Capitalization.JSON_PROPERTY_CAPITAL_SNAKE,
-  Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
-  Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
-})
-
-public class Capitalization {
-  public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
-  private String smallCamel;
-
-  public static final String JSON_PROPERTY_CAPITAL_CAMEL = "CapitalCamel";
-  private String capitalCamel;
-
-  public static final String JSON_PROPERTY_SMALL_SNAKE = "small_Snake";
-  private String smallSnake;
-
-  public static final String JSON_PROPERTY_CAPITAL_SNAKE = "Capital_Snake";
-  private String capitalSnake;
-
-  public static final String JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points";
-  private String scAETHFlowPoints;
-
-  public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME";
-  private String ATT_NAME;
-
-
-  public Capitalization smallCamel(String smallCamel) {
-    
-    this.smallCamel = smallCamel;
-    return this;
-  }
-
-   /**
-   * Get smallCamel
-   * @return smallCamel
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getSmallCamel() {
-    return smallCamel;
-  }
-
-
-  public void setSmallCamel(String smallCamel) {
-    this.smallCamel = smallCamel;
-  }
-
-
-  public Capitalization capitalCamel(String capitalCamel) {
-    
-    this.capitalCamel = capitalCamel;
-    return this;
-  }
-
-   /**
-   * Get capitalCamel
-   * @return capitalCamel
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getCapitalCamel() {
-    return capitalCamel;
-  }
-
-
-  public void setCapitalCamel(String capitalCamel) {
-    this.capitalCamel = capitalCamel;
-  }
-
-
-  public Capitalization smallSnake(String smallSnake) {
-    
-    this.smallSnake = smallSnake;
-    return this;
-  }
-
-   /**
-   * Get smallSnake
-   * @return smallSnake
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getSmallSnake() {
-    return smallSnake;
-  }
-
-
-  public void setSmallSnake(String smallSnake) {
-    this.smallSnake = smallSnake;
-  }
-
-
-  public Capitalization capitalSnake(String capitalSnake) {
-    
-    this.capitalSnake = capitalSnake;
-    return this;
-  }
-
-   /**
-   * Get capitalSnake
-   * @return capitalSnake
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getCapitalSnake() {
-    return capitalSnake;
-  }
-
-
-  public void setCapitalSnake(String capitalSnake) {
-    this.capitalSnake = capitalSnake;
-  }
-
-
-  public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
-    
-    this.scAETHFlowPoints = scAETHFlowPoints;
-    return this;
-  }
-
-   /**
-   * Get scAETHFlowPoints
-   * @return scAETHFlowPoints
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getScAETHFlowPoints() {
-    return scAETHFlowPoints;
-  }
-
-
-  public void setScAETHFlowPoints(String scAETHFlowPoints) {
-    this.scAETHFlowPoints = scAETHFlowPoints;
-  }
-
-
-  public Capitalization ATT_NAME(String ATT_NAME) {
-    
-    this.ATT_NAME = ATT_NAME;
-    return this;
-  }
-
-   /**
-   * Name of the pet 
-   * @return ATT_NAME
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Name of the pet ")
-  @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getATTNAME() {
-    return ATT_NAME;
-  }
-
-
-  public void setATTNAME(String ATT_NAME) {
-    this.ATT_NAME = ATT_NAME;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Capitalization capitalization = (Capitalization) o;
-    return Objects.equals(this.smallCamel, capitalization.smallCamel) &&
-        Objects.equals(this.capitalCamel, capitalization.capitalCamel) &&
-        Objects.equals(this.smallSnake, capitalization.smallSnake) &&
-        Objects.equals(this.capitalSnake, capitalization.capitalSnake) &&
-        Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) &&
-        Objects.equals(this.ATT_NAME, capitalization.ATT_NAME);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Capitalization {\n");
-    sb.append("    smallCamel: ").append(toIndentedString(smallCamel)).append("\n");
-    sb.append("    capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n");
-    sb.append("    smallSnake: ").append(toIndentedString(smallSnake)).append("\n");
-    sb.append("    capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n");
-    sb.append("    scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n");
-    sb.append("    ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java
deleted file mode 100644
index fcb521ba34e8..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Animal;
-import org.openapitools.client.model.BigCat;
-import org.openapitools.client.model.CatAllOf;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Cat
- */
-@JsonPropertyOrder({
-  Cat.JSON_PROPERTY_DECLAWED
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-  @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
-})
-
-public class Cat extends Animal {
-  public static final String JSON_PROPERTY_DECLAWED = "declawed";
-  private Boolean declawed;
-
-
-  public Cat declawed(Boolean declawed) {
-    
-    this.declawed = declawed;
-    return this;
-  }
-
-   /**
-   * Get declawed
-   * @return declawed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DECLAWED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getDeclawed() {
-    return declawed;
-  }
-
-
-  public void setDeclawed(Boolean declawed) {
-    this.declawed = declawed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Cat cat = (Cat) o;
-    return Objects.equals(this.declawed, cat.declawed) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(declawed, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Cat {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/CatAllOf.java
deleted file mode 100644
index f62c8936adc4..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * CatAllOf
- */
-@JsonPropertyOrder({
-  CatAllOf.JSON_PROPERTY_DECLAWED
-})
-
-public class CatAllOf {
-  public static final String JSON_PROPERTY_DECLAWED = "declawed";
-  private Boolean declawed;
-
-
-  public CatAllOf declawed(Boolean declawed) {
-    
-    this.declawed = declawed;
-    return this;
-  }
-
-   /**
-   * Get declawed
-   * @return declawed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DECLAWED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getDeclawed() {
-    return declawed;
-  }
-
-
-  public void setDeclawed(Boolean declawed) {
-    this.declawed = declawed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CatAllOf catAllOf = (CatAllOf) o;
-    return Objects.equals(this.declawed, catAllOf.declawed);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(declawed);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CatAllOf {\n");
-    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Category.java
deleted file mode 100644
index 35816bb041f2..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Category.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Category
- */
-@JsonPropertyOrder({
-  Category.JSON_PROPERTY_ID,
-  Category.JSON_PROPERTY_NAME
-})
-
-public class Category {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name = "default-name";
-
-
-  public Category id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Category name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Category category = (Category) o;
-    return Objects.equals(this.id, category.id) &&
-        Objects.equals(this.name, category.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Category {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ClassModel.java
deleted file mode 100644
index b4f2d9795ecd..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ClassModel.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Model for testing model with \&quot;_class\&quot; property
- */
-@ApiModel(description = "Model for testing model with \"_class\" property")
-@JsonPropertyOrder({
-  ClassModel.JSON_PROPERTY_PROPERTY_CLASS
-})
-
-public class ClassModel {
-  public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
-  private String propertyClass;
-
-
-  public ClassModel propertyClass(String propertyClass) {
-    
-    this.propertyClass = propertyClass;
-    return this;
-  }
-
-   /**
-   * Get propertyClass
-   * @return propertyClass
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPropertyClass() {
-    return propertyClass;
-  }
-
-
-  public void setPropertyClass(String propertyClass) {
-    this.propertyClass = propertyClass;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ClassModel classModel = (ClassModel) o;
-    return Objects.equals(this.propertyClass, classModel.propertyClass);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(propertyClass);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ClassModel {\n");
-    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Client.java
deleted file mode 100644
index be3c219200f8..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Client.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Client
- */
-@JsonPropertyOrder({
-  Client.JSON_PROPERTY_CLIENT
-})
-
-public class Client {
-  public static final String JSON_PROPERTY_CLIENT = "client";
-  private String client;
-
-
-  public Client client(String client) {
-    
-    this.client = client;
-    return this;
-  }
-
-   /**
-   * Get client
-   * @return client
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CLIENT)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getClient() {
-    return client;
-  }
-
-
-  public void setClient(String client) {
-    this.client = client;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Client client = (Client) o;
-    return Objects.equals(this.client, client.client);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(client);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Client {\n");
-    sb.append("    client: ").append(toIndentedString(client)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java
deleted file mode 100644
index 754fa0230879..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Animal;
-import org.openapitools.client.model.DogAllOf;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Dog
- */
-@JsonPropertyOrder({
-  Dog.JSON_PROPERTY_BREED
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-})
-
-public class Dog extends Animal {
-  public static final String JSON_PROPERTY_BREED = "breed";
-  private String breed;
-
-
-  public Dog breed(String breed) {
-    
-    this.breed = breed;
-    return this;
-  }
-
-   /**
-   * Get breed
-   * @return breed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BREED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBreed() {
-    return breed;
-  }
-
-
-  public void setBreed(String breed) {
-    this.breed = breed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Dog dog = (Dog) o;
-    return Objects.equals(this.breed, dog.breed) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(breed, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Dog {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/DogAllOf.java
deleted file mode 100644
index 62c3b1969449..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * DogAllOf
- */
-@JsonPropertyOrder({
-  DogAllOf.JSON_PROPERTY_BREED
-})
-
-public class DogAllOf {
-  public static final String JSON_PROPERTY_BREED = "breed";
-  private String breed;
-
-
-  public DogAllOf breed(String breed) {
-    
-    this.breed = breed;
-    return this;
-  }
-
-   /**
-   * Get breed
-   * @return breed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BREED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBreed() {
-    return breed;
-  }
-
-
-  public void setBreed(String breed) {
-    this.breed = breed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    DogAllOf dogAllOf = (DogAllOf) o;
-    return Objects.equals(this.breed, dogAllOf.breed);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(breed);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class DogAllOf {\n");
-    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumArrays.java
deleted file mode 100644
index 8a54b50f5226..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * EnumArrays
- */
-@JsonPropertyOrder({
-  EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
-  EnumArrays.JSON_PROPERTY_ARRAY_ENUM
-})
-
-public class EnumArrays {
-  /**
-   * Gets or Sets justSymbol
-   */
-  public enum JustSymbolEnum {
-    GREATER_THAN_OR_EQUAL_TO(">="),
-    
-    DOLLAR("$");
-
-    private String value;
-
-    JustSymbolEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static JustSymbolEnum fromValue(String value) {
-      for (JustSymbolEnum b : JustSymbolEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_JUST_SYMBOL = "just_symbol";
-  private JustSymbolEnum justSymbol;
-
-  /**
-   * Gets or Sets arrayEnum
-   */
-  public enum ArrayEnumEnum {
-    FISH("fish"),
-    
-    CRAB("crab");
-
-    private String value;
-
-    ArrayEnumEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static ArrayEnumEnum fromValue(String value) {
-      for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
-  private List<ArrayEnumEnum> arrayEnum = null;
-
-
-  public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
-    
-    this.justSymbol = justSymbol;
-    return this;
-  }
-
-   /**
-   * Get justSymbol
-   * @return justSymbol
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JustSymbolEnum getJustSymbol() {
-    return justSymbol;
-  }
-
-
-  public void setJustSymbol(JustSymbolEnum justSymbol) {
-    this.justSymbol = justSymbol;
-  }
-
-
-  public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
-    
-    this.arrayEnum = arrayEnum;
-    return this;
-  }
-
-  public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
-    if (this.arrayEnum == null) {
-      this.arrayEnum = new ArrayList<>();
-    }
-    this.arrayEnum.add(arrayEnumItem);
-    return this;
-  }
-
-   /**
-   * Get arrayEnum
-   * @return arrayEnum
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<ArrayEnumEnum> getArrayEnum() {
-    return arrayEnum;
-  }
-
-
-  public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
-    this.arrayEnum = arrayEnum;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EnumArrays enumArrays = (EnumArrays) o;
-    return Objects.equals(this.justSymbol, enumArrays.justSymbol) &&
-        Objects.equals(this.arrayEnum, enumArrays.arrayEnum);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(justSymbol, arrayEnum);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EnumArrays {\n");
-    sb.append("    justSymbol: ").append(toIndentedString(justSymbol)).append("\n");
-    sb.append("    arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumClass.java
deleted file mode 100644
index d78b71854be4..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumClass.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Gets or Sets EnumClass
- */
-public enum EnumClass {
-  
-  _ABC("_abc"),
-  
-  _EFG("-efg"),
-  
-  _XYZ_("(xyz)");
-
-  private String value;
-
-  EnumClass(String value) {
-    this.value = value;
-  }
-
-  @JsonValue
-  public String getValue() {
-    return value;
-  }
-
-  @Override
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static EnumClass fromValue(String value) {
-    for (EnumClass b : EnumClass.values()) {
-      if (b.value.equals(value)) {
-        return b;
-      }
-    }
-    throw new IllegalArgumentException("Unexpected value '" + value + "'");
-  }
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java
deleted file mode 100644
index 575a32ebce7d..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.OuterEnum;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * EnumTest
- */
-@JsonPropertyOrder({
-  EnumTest.JSON_PROPERTY_ENUM_STRING,
-  EnumTest.JSON_PROPERTY_ENUM_STRING_REQUIRED,
-  EnumTest.JSON_PROPERTY_ENUM_INTEGER,
-  EnumTest.JSON_PROPERTY_ENUM_NUMBER,
-  EnumTest.JSON_PROPERTY_OUTER_ENUM
-})
-
-public class EnumTest {
-  /**
-   * Gets or Sets enumString
-   */
-  public enum EnumStringEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower"),
-    
-    EMPTY("");
-
-    private String value;
-
-    EnumStringEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumStringEnum fromValue(String value) {
-      for (EnumStringEnum b : EnumStringEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_STRING = "enum_string";
-  private EnumStringEnum enumString;
-
-  /**
-   * Gets or Sets enumStringRequired
-   */
-  public enum EnumStringRequiredEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower"),
-    
-    EMPTY("");
-
-    private String value;
-
-    EnumStringRequiredEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumStringRequiredEnum fromValue(String value) {
-      for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_STRING_REQUIRED = "enum_string_required";
-  private EnumStringRequiredEnum enumStringRequired;
-
-  /**
-   * Gets or Sets enumInteger
-   */
-  public enum EnumIntegerEnum {
-    NUMBER_1(1),
-    
-    NUMBER_MINUS_1(-1);
-
-    private Integer value;
-
-    EnumIntegerEnum(Integer value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public Integer getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumIntegerEnum fromValue(Integer value) {
-      for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer";
-  private EnumIntegerEnum enumInteger;
-
-  /**
-   * Gets or Sets enumNumber
-   */
-  public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(1.1),
-    
-    NUMBER_MINUS_1_DOT_2(-1.2);
-
-    private Double value;
-
-    EnumNumberEnum(Double value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public Double getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumNumberEnum fromValue(Double value) {
-      for (EnumNumberEnum b : EnumNumberEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_NUMBER = "enum_number";
-  private EnumNumberEnum enumNumber;
-
-  public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum";
-  private OuterEnum outerEnum;
-
-
-  public EnumTest enumString(EnumStringEnum enumString) {
-    
-    this.enumString = enumString;
-    return this;
-  }
-
-   /**
-   * Get enumString
-   * @return enumString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public EnumStringEnum getEnumString() {
-    return enumString;
-  }
-
-
-  public void setEnumString(EnumStringEnum enumString) {
-    this.enumString = enumString;
-  }
-
-
-  public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
-    
-    this.enumStringRequired = enumStringRequired;
-    return this;
-  }
-
-   /**
-   * Get enumStringRequired
-   * @return enumStringRequired
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public EnumStringRequiredEnum getEnumStringRequired() {
-    return enumStringRequired;
-  }
-
-
-  public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
-    this.enumStringRequired = enumStringRequired;
-  }
-
-
-  public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
-    
-    this.enumInteger = enumInteger;
-    return this;
-  }
-
-   /**
-   * Get enumInteger
-   * @return enumInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public EnumIntegerEnum getEnumInteger() {
-    return enumInteger;
-  }
-
-
-  public void setEnumInteger(EnumIntegerEnum enumInteger) {
-    this.enumInteger = enumInteger;
-  }
-
-
-  public EnumTest enumNumber(EnumNumberEnum enumNumber) {
-    
-    this.enumNumber = enumNumber;
-    return this;
-  }
-
-   /**
-   * Get enumNumber
-   * @return enumNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public EnumNumberEnum getEnumNumber() {
-    return enumNumber;
-  }
-
-
-  public void setEnumNumber(EnumNumberEnum enumNumber) {
-    this.enumNumber = enumNumber;
-  }
-
-
-  public EnumTest outerEnum(OuterEnum outerEnum) {
-    
-    this.outerEnum = outerEnum;
-    return this;
-  }
-
-   /**
-   * Get outerEnum
-   * @return outerEnum
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OuterEnum getOuterEnum() {
-    return outerEnum;
-  }
-
-
-  public void setOuterEnum(OuterEnum outerEnum) {
-    this.outerEnum = outerEnum;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EnumTest enumTest = (EnumTest) o;
-    return Objects.equals(this.enumString, enumTest.enumString) &&
-        Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
-        Objects.equals(this.enumInteger, enumTest.enumInteger) &&
-        Objects.equals(this.enumNumber, enumTest.enumNumber) &&
-        Objects.equals(this.outerEnum, enumTest.outerEnum);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EnumTest {\n");
-    sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
-    sb.append("    enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
-    sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
-    sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
-    sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
deleted file mode 100644
index 46c92718db49..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * FileSchemaTestClass
- */
-@JsonPropertyOrder({
-  FileSchemaTestClass.JSON_PROPERTY_FILE,
-  FileSchemaTestClass.JSON_PROPERTY_FILES
-})
-
-public class FileSchemaTestClass {
-  public static final String JSON_PROPERTY_FILE = "file";
-  private java.io.File file;
-
-  public static final String JSON_PROPERTY_FILES = "files";
-  private List<java.io.File> files = null;
-
-
-  public FileSchemaTestClass file(java.io.File file) {
-    
-    this.file = file;
-    return this;
-  }
-
-   /**
-   * Get file
-   * @return file
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FILE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public java.io.File getFile() {
-    return file;
-  }
-
-
-  public void setFile(java.io.File file) {
-    this.file = file;
-  }
-
-
-  public FileSchemaTestClass files(List<java.io.File> files) {
-    
-    this.files = files;
-    return this;
-  }
-
-  public FileSchemaTestClass addFilesItem(java.io.File filesItem) {
-    if (this.files == null) {
-      this.files = new ArrayList<>();
-    }
-    this.files.add(filesItem);
-    return this;
-  }
-
-   /**
-   * Get files
-   * @return files
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FILES)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<java.io.File> getFiles() {
-    return files;
-  }
-
-
-  public void setFiles(List<java.io.File> files) {
-    this.files = files;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o;
-    return Objects.equals(this.file, fileSchemaTestClass.file) &&
-        Objects.equals(this.files, fileSchemaTestClass.files);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(file, files);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FileSchemaTestClass {\n");
-    sb.append("    file: ").append(toIndentedString(file)).append("\n");
-    sb.append("    files: ").append(toIndentedString(files)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FormatTest.java
deleted file mode 100644
index cbf0d392bb7e..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FormatTest.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.File;
-import java.math.BigDecimal;
-import java.util.UUID;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * FormatTest
- */
-@JsonPropertyOrder({
-  FormatTest.JSON_PROPERTY_INTEGER,
-  FormatTest.JSON_PROPERTY_INT32,
-  FormatTest.JSON_PROPERTY_INT64,
-  FormatTest.JSON_PROPERTY_NUMBER,
-  FormatTest.JSON_PROPERTY_FLOAT,
-  FormatTest.JSON_PROPERTY_DOUBLE,
-  FormatTest.JSON_PROPERTY_STRING,
-  FormatTest.JSON_PROPERTY_BYTE,
-  FormatTest.JSON_PROPERTY_BINARY,
-  FormatTest.JSON_PROPERTY_DATE,
-  FormatTest.JSON_PROPERTY_DATE_TIME,
-  FormatTest.JSON_PROPERTY_UUID,
-  FormatTest.JSON_PROPERTY_PASSWORD,
-  FormatTest.JSON_PROPERTY_BIG_DECIMAL
-})
-
-public class FormatTest {
-  public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
-
-  public static final String JSON_PROPERTY_INT32 = "int32";
-  private Integer int32;
-
-  public static final String JSON_PROPERTY_INT64 = "int64";
-  private Long int64;
-
-  public static final String JSON_PROPERTY_NUMBER = "number";
-  private BigDecimal number;
-
-  public static final String JSON_PROPERTY_FLOAT = "float";
-  private Float _float;
-
-  public static final String JSON_PROPERTY_DOUBLE = "double";
-  private Double _double;
-
-  public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
-
-  public static final String JSON_PROPERTY_BYTE = "byte";
-  private byte[] _byte;
-
-  public static final String JSON_PROPERTY_BINARY = "binary";
-  private File binary;
-
-  public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
-
-  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
-
-  public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
-
-  public static final String JSON_PROPERTY_PASSWORD = "password";
-  private String password;
-
-  public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
-  private BigDecimal bigDecimal;
-
-
-  public FormatTest integer(Integer integer) {
-    
-    this.integer = integer;
-    return this;
-  }
-
-   /**
-   * Get integer
-   * minimum: 10
-   * maximum: 100
-   * @return integer
-  **/
-  @javax.annotation.Nullable
- @Min(10) @Max(100)  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getInteger() {
-    return integer;
-  }
-
-
-  public void setInteger(Integer integer) {
-    this.integer = integer;
-  }
-
-
-  public FormatTest int32(Integer int32) {
-    
-    this.int32 = int32;
-    return this;
-  }
-
-   /**
-   * Get int32
-   * minimum: 20
-   * maximum: 200
-   * @return int32
-  **/
-  @javax.annotation.Nullable
- @Min(20) @Max(200)  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INT32)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getInt32() {
-    return int32;
-  }
-
-
-  public void setInt32(Integer int32) {
-    this.int32 = int32;
-  }
-
-
-  public FormatTest int64(Long int64) {
-    
-    this.int64 = int64;
-    return this;
-  }
-
-   /**
-   * Get int64
-   * @return int64
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INT64)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getInt64() {
-    return int64;
-  }
-
-
-  public void setInt64(Long int64) {
-    this.int64 = int64;
-  }
-
-
-  public FormatTest number(BigDecimal number) {
-    
-    this.number = number;
-    return this;
-  }
-
-   /**
-   * Get number
-   * minimum: 32.1
-   * maximum: 543.2
-   * @return number
-  **/
-  @NotNull
-  @Valid
- @DecimalMin("32.1") @DecimalMax("543.2")  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public BigDecimal getNumber() {
-    return number;
-  }
-
-
-  public void setNumber(BigDecimal number) {
-    this.number = number;
-  }
-
-
-  public FormatTest _float(Float _float) {
-    
-    this._float = _float;
-    return this;
-  }
-
-   /**
-   * Get _float
-   * minimum: 54.3
-   * maximum: 987.6
-   * @return _float
-  **/
-  @javax.annotation.Nullable
- @DecimalMin("54.3") @DecimalMax("987.6")  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FLOAT)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Float getFloat() {
-    return _float;
-  }
-
-
-  public void setFloat(Float _float) {
-    this._float = _float;
-  }
-
-
-  public FormatTest _double(Double _double) {
-    
-    this._double = _double;
-    return this;
-  }
-
-   /**
-   * Get _double
-   * minimum: 67.8
-   * maximum: 123.4
-   * @return _double
-  **/
-  @javax.annotation.Nullable
- @DecimalMin("67.8") @DecimalMax("123.4")  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DOUBLE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Double getDouble() {
-    return _double;
-  }
-
-
-  public void setDouble(Double _double) {
-    this._double = _double;
-  }
-
-
-  public FormatTest string(String string) {
-    
-    this.string = string;
-    return this;
-  }
-
-   /**
-   * Get string
-   * @return string
-  **/
-  @javax.annotation.Nullable
- @Pattern(regexp="/[a-z]/i")  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getString() {
-    return string;
-  }
-
-
-  public void setString(String string) {
-    this.string = string;
-  }
-
-
-  public FormatTest _byte(byte[] _byte) {
-    
-    this._byte = _byte;
-    return this;
-  }
-
-   /**
-   * Get _byte
-   * @return _byte
-  **/
-  @NotNull
- @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_BYTE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public byte[] getByte() {
-    return _byte;
-  }
-
-
-  public void setByte(byte[] _byte) {
-    this._byte = _byte;
-  }
-
-
-  public FormatTest binary(File binary) {
-    
-    this.binary = binary;
-    return this;
-  }
-
-   /**
-   * Get binary
-   * @return binary
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BINARY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public File getBinary() {
-    return binary;
-  }
-
-
-  public void setBinary(File binary) {
-    this.binary = binary;
-  }
-
-
-  public FormatTest date(LocalDate date) {
-    
-    this.date = date;
-    return this;
-  }
-
-   /**
-   * Get date
-   * @return date
-  **/
-  @NotNull
-  @Valid
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_DATE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public LocalDate getDate() {
-    return date;
-  }
-
-
-  public void setDate(LocalDate date) {
-    this.date = date;
-  }
-
-
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    
-    this.dateTime = dateTime;
-    return this;
-  }
-
-   /**
-   * Get dateTime
-   * @return dateTime
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OffsetDateTime getDateTime() {
-    return dateTime;
-  }
-
-
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
-  }
-
-
-  public FormatTest uuid(UUID uuid) {
-    
-    this.uuid = uuid;
-    return this;
-  }
-
-   /**
-   * Get uuid
-   * @return uuid
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
-  @JsonProperty(JSON_PROPERTY_UUID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public UUID getUuid() {
-    return uuid;
-  }
-
-
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
-  }
-
-
-  public FormatTest password(String password) {
-    
-    this.password = password;
-    return this;
-  }
-
-   /**
-   * Get password
-   * @return password
-  **/
-  @NotNull
- @Size(min=10,max=64)  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_PASSWORD)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getPassword() {
-    return password;
-  }
-
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    
-    this.bigDecimal = bigDecimal;
-    return this;
-  }
-
-   /**
-   * Get bigDecimal
-   * @return bigDecimal
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getBigDecimal() {
-    return bigDecimal;
-  }
-
-
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
-        Objects.equals(this.int32, formatTest.int32) &&
-        Objects.equals(this.int64, formatTest.int64) &&
-        Objects.equals(this.number, formatTest.number) &&
-        Objects.equals(this._float, formatTest._float) &&
-        Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
-        Arrays.equals(this._byte, formatTest._byte) &&
-        Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
-        Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
-    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
-    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
-    sb.append("    number: ").append(toIndentedString(number)).append("\n");
-    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
-    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
-    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
-    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    password: ").append(toIndentedString(password)).append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
deleted file mode 100644
index 81e823b2fe8a..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * HasOnlyReadOnly
- */
-@JsonPropertyOrder({
-  HasOnlyReadOnly.JSON_PROPERTY_BAR,
-  HasOnlyReadOnly.JSON_PROPERTY_FOO
-})
-
-public class HasOnlyReadOnly {
-  public static final String JSON_PROPERTY_BAR = "bar";
-  private String bar;
-
-  public static final String JSON_PROPERTY_FOO = "foo";
-  private String foo;
-
-
-   /**
-   * Get bar
-   * @return bar
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBar() {
-    return bar;
-  }
-
-
-
-
-   /**
-   * Get foo
-   * @return foo
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FOO)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getFoo() {
-    return foo;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o;
-    return Objects.equals(this.bar, hasOnlyReadOnly.bar) &&
-        Objects.equals(this.foo, hasOnlyReadOnly.foo);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(bar, foo);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class HasOnlyReadOnly {\n");
-    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
-    sb.append("    foo: ").append(toIndentedString(foo)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MapTest.java
deleted file mode 100644
index 11d6be2d43d0..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MapTest.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * MapTest
- */
-@JsonPropertyOrder({
-  MapTest.JSON_PROPERTY_MAP_MAP_OF_STRING,
-  MapTest.JSON_PROPERTY_MAP_OF_ENUM_STRING,
-  MapTest.JSON_PROPERTY_DIRECT_MAP,
-  MapTest.JSON_PROPERTY_INDIRECT_MAP
-})
-
-public class MapTest {
-  public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
-  private Map<String, Map<String, String>> mapMapOfString = null;
-
-  /**
-   * Gets or Sets inner
-   */
-  public enum InnerEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower");
-
-    private String value;
-
-    InnerEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static InnerEnum fromValue(String value) {
-      for (InnerEnum b : InnerEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string";
-  private Map<String, InnerEnum> mapOfEnumString = null;
-
-  public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map";
-  private Map<String, Boolean> directMap = null;
-
-  public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
-  private Map<String, Boolean> indirectMap = null;
-
-
-  public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
-    
-    this.mapMapOfString = mapMapOfString;
-    return this;
-  }
-
-  public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
-    if (this.mapMapOfString == null) {
-      this.mapMapOfString = new HashMap<>();
-    }
-    this.mapMapOfString.put(key, mapMapOfStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapMapOfString
-   * @return mapMapOfString
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Map<String, String>> getMapMapOfString() {
-    return mapMapOfString;
-  }
-
-
-  public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
-    this.mapMapOfString = mapMapOfString;
-  }
-
-
-  public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
-    
-    this.mapOfEnumString = mapOfEnumString;
-    return this;
-  }
-
-  public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
-    if (this.mapOfEnumString == null) {
-      this.mapOfEnumString = new HashMap<>();
-    }
-    this.mapOfEnumString.put(key, mapOfEnumStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapOfEnumString
-   * @return mapOfEnumString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, InnerEnum> getMapOfEnumString() {
-    return mapOfEnumString;
-  }
-
-
-  public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
-    this.mapOfEnumString = mapOfEnumString;
-  }
-
-
-  public MapTest directMap(Map<String, Boolean> directMap) {
-    
-    this.directMap = directMap;
-    return this;
-  }
-
-  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
-    if (this.directMap == null) {
-      this.directMap = new HashMap<>();
-    }
-    this.directMap.put(key, directMapItem);
-    return this;
-  }
-
-   /**
-   * Get directMap
-   * @return directMap
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Boolean> getDirectMap() {
-    return directMap;
-  }
-
-
-  public void setDirectMap(Map<String, Boolean> directMap) {
-    this.directMap = directMap;
-  }
-
-
-  public MapTest indirectMap(Map<String, Boolean> indirectMap) {
-    
-    this.indirectMap = indirectMap;
-    return this;
-  }
-
-  public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
-    if (this.indirectMap == null) {
-      this.indirectMap = new HashMap<>();
-    }
-    this.indirectMap.put(key, indirectMapItem);
-    return this;
-  }
-
-   /**
-   * Get indirectMap
-   * @return indirectMap
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Boolean> getIndirectMap() {
-    return indirectMap;
-  }
-
-
-  public void setIndirectMap(Map<String, Boolean> indirectMap) {
-    this.indirectMap = indirectMap;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MapTest mapTest = (MapTest) o;
-    return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
-        Objects.equals(this.directMap, mapTest.directMap) &&
-        Objects.equals(this.indirectMap, mapTest.indirectMap);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MapTest {\n");
-    sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
-    sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
-    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
-    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
deleted file mode 100644
index 28c4f00fe779..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import org.openapitools.client.model.Animal;
-import org.threeten.bp.OffsetDateTime;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * MixedPropertiesAndAdditionalPropertiesClass
- */
-@JsonPropertyOrder({
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_UUID,
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
-})
-
-public class MixedPropertiesAndAdditionalPropertiesClass {
-  public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
-
-  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
-
-  public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = null;
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    
-    this.uuid = uuid;
-    return this;
-  }
-
-   /**
-   * Get uuid
-   * @return uuid
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_UUID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public UUID getUuid() {
-    return uuid;
-  }
-
-
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
-  }
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    
-    this.dateTime = dateTime;
-    return this;
-  }
-
-   /**
-   * Get dateTime
-   * @return dateTime
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OffsetDateTime getDateTime() {
-    return dateTime;
-  }
-
-
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
-  }
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    
-    this.map = map;
-    return this;
-  }
-
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
-    }
-    this.map.put(key, mapItem);
-    return this;
-  }
-
-   /**
-   * Get map
-   * @return map
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Animal> getMap() {
-    return map;
-  }
-
-
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Model200Response.java
deleted file mode 100644
index 5eb7788e9172..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Model200Response.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Model for testing model name starting with number
- */
-@ApiModel(description = "Model for testing model name starting with number")
-@JsonPropertyOrder({
-  Model200Response.JSON_PROPERTY_NAME,
-  Model200Response.JSON_PROPERTY_PROPERTY_CLASS
-})
-
-public class Model200Response {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private Integer name;
-
-  public static final String JSON_PROPERTY_PROPERTY_CLASS = "class";
-  private String propertyClass;
-
-
-  public Model200Response name(Integer name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getName() {
-    return name;
-  }
-
-
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-
-  public Model200Response propertyClass(String propertyClass) {
-    
-    this.propertyClass = propertyClass;
-    return this;
-  }
-
-   /**
-   * Get propertyClass
-   * @return propertyClass
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPropertyClass() {
-    return propertyClass;
-  }
-
-
-  public void setPropertyClass(String propertyClass) {
-    this.propertyClass = propertyClass;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Model200Response _200response = (Model200Response) o;
-    return Objects.equals(this.name, _200response.name) &&
-        Objects.equals(this.propertyClass, _200response.propertyClass);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, propertyClass);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Model200Response {\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelApiResponse.java
deleted file mode 100644
index 16b0ac3a5ea8..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * ModelApiResponse
- */
-@JsonPropertyOrder({
-  ModelApiResponse.JSON_PROPERTY_CODE,
-  ModelApiResponse.JSON_PROPERTY_TYPE,
-  ModelApiResponse.JSON_PROPERTY_MESSAGE
-})
-
-public class ModelApiResponse {
-  public static final String JSON_PROPERTY_CODE = "code";
-  private Integer code;
-
-  public static final String JSON_PROPERTY_TYPE = "type";
-  private String type;
-
-  public static final String JSON_PROPERTY_MESSAGE = "message";
-  private String message;
-
-
-  public ModelApiResponse code(Integer code) {
-    
-    this.code = code;
-    return this;
-  }
-
-   /**
-   * Get code
-   * @return code
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CODE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getCode() {
-    return code;
-  }
-
-
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-
-  public ModelApiResponse type(String type) {
-    
-    this.type = type;
-    return this;
-  }
-
-   /**
-   * Get type
-   * @return type
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_TYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getType() {
-    return type;
-  }
-
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  public ModelApiResponse message(String message) {
-    
-    this.message = message;
-    return this;
-  }
-
-   /**
-   * Get message
-   * @return message
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MESSAGE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getMessage() {
-    return message;
-  }
-
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ModelApiResponse _apiResponse = (ModelApiResponse) o;
-    return Objects.equals(this.code, _apiResponse.code) &&
-        Objects.equals(this.type, _apiResponse.type) &&
-        Objects.equals(this.message, _apiResponse.message);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, type, message);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ModelApiResponse {\n");
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelReturn.java
deleted file mode 100644
index e35698cbfa3f..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Model for testing reserved words
- */
-@ApiModel(description = "Model for testing reserved words")
-@JsonPropertyOrder({
-  ModelReturn.JSON_PROPERTY_RETURN
-})
-
-public class ModelReturn {
-  public static final String JSON_PROPERTY_RETURN = "return";
-  private Integer _return;
-
-
-  public ModelReturn _return(Integer _return) {
-    
-    this._return = _return;
-    return this;
-  }
-
-   /**
-   * Get _return
-   * @return _return
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_RETURN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getReturn() {
-    return _return;
-  }
-
-
-  public void setReturn(Integer _return) {
-    this._return = _return;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ModelReturn _return = (ModelReturn) o;
-    return Objects.equals(this._return, _return._return);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(_return);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ModelReturn {\n");
-    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Name.java
deleted file mode 100644
index 885d7220817a..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Name.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Model for testing model name same as property name
- */
-@ApiModel(description = "Model for testing model name same as property name")
-@JsonPropertyOrder({
-  Name.JSON_PROPERTY_NAME,
-  Name.JSON_PROPERTY_SNAKE_CASE,
-  Name.JSON_PROPERTY_PROPERTY,
-  Name.JSON_PROPERTY_123NUMBER
-})
-
-public class Name {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private Integer name;
-
-  public static final String JSON_PROPERTY_SNAKE_CASE = "snake_case";
-  private Integer snakeCase;
-
-  public static final String JSON_PROPERTY_PROPERTY = "property";
-  private String property;
-
-  public static final String JSON_PROPERTY_123NUMBER = "123Number";
-  private Integer _123number;
-
-
-  public Name name(Integer name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Integer getName() {
-    return name;
-  }
-
-
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-
-   /**
-   * Get snakeCase
-   * @return snakeCase
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getSnakeCase() {
-    return snakeCase;
-  }
-
-
-
-
-  public Name property(String property) {
-    
-    this.property = property;
-    return this;
-  }
-
-   /**
-   * Get property
-   * @return property
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getProperty() {
-    return property;
-  }
-
-
-  public void setProperty(String property) {
-    this.property = property;
-  }
-
-
-   /**
-   * Get _123number
-   * @return _123number
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_123NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer get123number() {
-    return _123number;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Name name = (Name) o;
-    return Objects.equals(this.name, name.name) &&
-        Objects.equals(this.snakeCase, name.snakeCase) &&
-        Objects.equals(this.property, name.property) &&
-        Objects.equals(this._123number, name._123number);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, snakeCase, property, _123number);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Name {\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
-    sb.append("    property: ").append(toIndentedString(property)).append("\n");
-    sb.append("    _123number: ").append(toIndentedString(_123number)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/NumberOnly.java
deleted file mode 100644
index 73a245256928..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * NumberOnly
- */
-@JsonPropertyOrder({
-  NumberOnly.JSON_PROPERTY_JUST_NUMBER
-})
-
-public class NumberOnly {
-  public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
-  private BigDecimal justNumber;
-
-
-  public NumberOnly justNumber(BigDecimal justNumber) {
-    
-    this.justNumber = justNumber;
-    return this;
-  }
-
-   /**
-   * Get justNumber
-   * @return justNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getJustNumber() {
-    return justNumber;
-  }
-
-
-  public void setJustNumber(BigDecimal justNumber) {
-    this.justNumber = justNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    NumberOnly numberOnly = (NumberOnly) o;
-    return Objects.equals(this.justNumber, numberOnly.justNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(justNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class NumberOnly {\n");
-    sb.append("    justNumber: ").append(toIndentedString(justNumber)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Order.java
deleted file mode 100644
index 59510f49a728..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Order.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.threeten.bp.OffsetDateTime;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Order
- */
-@JsonPropertyOrder({
-  Order.JSON_PROPERTY_ID,
-  Order.JSON_PROPERTY_PET_ID,
-  Order.JSON_PROPERTY_QUANTITY,
-  Order.JSON_PROPERTY_SHIP_DATE,
-  Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
-})
-
-public class Order {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_PET_ID = "petId";
-  private Long petId;
-
-  public static final String JSON_PROPERTY_QUANTITY = "quantity";
-  private Integer quantity;
-
-  public static final String JSON_PROPERTY_SHIP_DATE = "shipDate";
-  private OffsetDateTime shipDate;
-
-  /**
-   * Order Status
-   */
-  public enum StatusEnum {
-    PLACED("placed"),
-    
-    APPROVED("approved"),
-    
-    DELIVERED("delivered");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static StatusEnum fromValue(String value) {
-      for (StatusEnum b : StatusEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_STATUS = "status";
-  private StatusEnum status;
-
-  public static final String JSON_PROPERTY_COMPLETE = "complete";
-  private Boolean complete = false;
-
-
-  public Order id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Order petId(Long petId) {
-    
-    this.petId = petId;
-    return this;
-  }
-
-   /**
-   * Get petId
-   * @return petId
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PET_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getPetId() {
-    return petId;
-  }
-
-
-  public void setPetId(Long petId) {
-    this.petId = petId;
-  }
-
-
-  public Order quantity(Integer quantity) {
-    
-    this.quantity = quantity;
-    return this;
-  }
-
-   /**
-   * Get quantity
-   * @return quantity
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_QUANTITY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getQuantity() {
-    return quantity;
-  }
-
-
-  public void setQuantity(Integer quantity) {
-    this.quantity = quantity;
-  }
-
-
-  public Order shipDate(OffsetDateTime shipDate) {
-    
-    this.shipDate = shipDate;
-    return this;
-  }
-
-   /**
-   * Get shipDate
-   * @return shipDate
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SHIP_DATE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OffsetDateTime getShipDate() {
-    return shipDate;
-  }
-
-
-  public void setShipDate(OffsetDateTime shipDate) {
-    this.shipDate = shipDate;
-  }
-
-
-  public Order status(StatusEnum status) {
-    
-    this.status = status;
-    return this;
-  }
-
-   /**
-   * Order Status
-   * @return status
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Order Status")
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public StatusEnum getStatus() {
-    return status;
-  }
-
-
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-
-  public Order complete(Boolean complete) {
-    
-    this.complete = complete;
-    return this;
-  }
-
-   /**
-   * Get complete
-   * @return complete
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_COMPLETE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getComplete() {
-    return complete;
-  }
-
-
-  public void setComplete(Boolean complete) {
-    this.complete = complete;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Order order = (Order) o;
-    return Objects.equals(this.id, order.id) &&
-        Objects.equals(this.petId, order.petId) &&
-        Objects.equals(this.quantity, order.quantity) &&
-        Objects.equals(this.shipDate, order.shipDate) &&
-        Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Order {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
-    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
-    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterComposite.java
deleted file mode 100644
index 333de203a4fb..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * OuterComposite
- */
-@JsonPropertyOrder({
-  OuterComposite.JSON_PROPERTY_MY_NUMBER,
-  OuterComposite.JSON_PROPERTY_MY_STRING,
-  OuterComposite.JSON_PROPERTY_MY_BOOLEAN
-})
-
-public class OuterComposite {
-  public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
-  private BigDecimal myNumber;
-
-  public static final String JSON_PROPERTY_MY_STRING = "my_string";
-  private String myString;
-
-  public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean";
-  private Boolean myBoolean;
-
-
-  public OuterComposite myNumber(BigDecimal myNumber) {
-    
-    this.myNumber = myNumber;
-    return this;
-  }
-
-   /**
-   * Get myNumber
-   * @return myNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getMyNumber() {
-    return myNumber;
-  }
-
-
-  public void setMyNumber(BigDecimal myNumber) {
-    this.myNumber = myNumber;
-  }
-
-
-  public OuterComposite myString(String myString) {
-    
-    this.myString = myString;
-    return this;
-  }
-
-   /**
-   * Get myString
-   * @return myString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getMyString() {
-    return myString;
-  }
-
-
-  public void setMyString(String myString) {
-    this.myString = myString;
-  }
-
-
-  public OuterComposite myBoolean(Boolean myBoolean) {
-    
-    this.myBoolean = myBoolean;
-    return this;
-  }
-
-   /**
-   * Get myBoolean
-   * @return myBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getMyBoolean() {
-    return myBoolean;
-  }
-
-
-  public void setMyBoolean(Boolean myBoolean) {
-    this.myBoolean = myBoolean;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OuterComposite outerComposite = (OuterComposite) o;
-    return Objects.equals(this.myNumber, outerComposite.myNumber) &&
-        Objects.equals(this.myString, outerComposite.myString) &&
-        Objects.equals(this.myBoolean, outerComposite.myBoolean);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(myNumber, myString, myBoolean);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OuterComposite {\n");
-    sb.append("    myNumber: ").append(toIndentedString(myNumber)).append("\n");
-    sb.append("    myString: ").append(toIndentedString(myString)).append("\n");
-    sb.append("    myBoolean: ").append(toIndentedString(myBoolean)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterEnum.java
deleted file mode 100644
index 5591f09ff23f..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterEnum.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Gets or Sets OuterEnum
- */
-public enum OuterEnum {
-  
-  PLACED("placed"),
-  
-  APPROVED("approved"),
-  
-  DELIVERED("delivered");
-
-  private String value;
-
-  OuterEnum(String value) {
-    this.value = value;
-  }
-
-  @JsonValue
-  public String getValue() {
-    return value;
-  }
-
-  @Override
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static OuterEnum fromValue(String value) {
-    for (OuterEnum b : OuterEnum.values()) {
-      if (b.value.equals(value)) {
-        return b;
-      }
-    }
-    throw new IllegalArgumentException("Unexpected value '" + value + "'");
-  }
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java
deleted file mode 100644
index de960e6e5868..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.openapitools.client.model.Category;
-import org.openapitools.client.model.Tag;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Pet
- */
-@JsonPropertyOrder({
-  Pet.JSON_PROPERTY_ID,
-  Pet.JSON_PROPERTY_CATEGORY,
-  Pet.JSON_PROPERTY_NAME,
-  Pet.JSON_PROPERTY_PHOTO_URLS,
-  Pet.JSON_PROPERTY_TAGS,
-  Pet.JSON_PROPERTY_STATUS
-})
-
-public class Pet {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_CATEGORY = "category";
-  private Category category;
-
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-  public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
-  private Set<String> photoUrls = new LinkedHashSet<>();
-
-  public static final String JSON_PROPERTY_TAGS = "tags";
-  private List<Tag> tags = null;
-
-  /**
-   * pet status in the store
-   */
-  public enum StatusEnum {
-    AVAILABLE("available"),
-    
-    PENDING("pending"),
-    
-    SOLD("sold");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static StatusEnum fromValue(String value) {
-      for (StatusEnum b : StatusEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_STATUS = "status";
-  private StatusEnum status;
-
-
-  public Pet id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Pet category(Category category) {
-    
-    this.category = category;
-    return this;
-  }
-
-   /**
-   * Get category
-   * @return category
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CATEGORY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Category getCategory() {
-    return category;
-  }
-
-
-  public void setCategory(Category category) {
-    this.category = category;
-  }
-
-
-  public Pet name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @NotNull
-  @ApiModelProperty(example = "doggie", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  public Pet photoUrls(Set<String> photoUrls) {
-    
-    this.photoUrls = photoUrls;
-    return this;
-  }
-
-  public Pet addPhotoUrlsItem(String photoUrlsItem) {
-    this.photoUrls.add(photoUrlsItem);
-    return this;
-  }
-
-   /**
-   * Get photoUrls
-   * @return photoUrls
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Set<String> getPhotoUrls() {
-    return photoUrls;
-  }
-
-
-  public void setPhotoUrls(Set<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
-
-
-  public Pet tags(List<Tag> tags) {
-    
-    this.tags = tags;
-    return this;
-  }
-
-  public Pet addTagsItem(Tag tagsItem) {
-    if (this.tags == null) {
-      this.tags = new ArrayList<>();
-    }
-    this.tags.add(tagsItem);
-    return this;
-  }
-
-   /**
-   * Get tags
-   * @return tags
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_TAGS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Tag> getTags() {
-    return tags;
-  }
-
-
-  public void setTags(List<Tag> tags) {
-    this.tags = tags;
-  }
-
-
-  public Pet status(StatusEnum status) {
-    
-    this.status = status;
-    return this;
-  }
-
-   /**
-   * pet status in the store
-   * @return status
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "pet status in the store")
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public StatusEnum getStatus() {
-    return status;
-  }
-
-
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Pet pet = (Pet) o;
-    return Objects.equals(this.id, pet.id) &&
-        Objects.equals(this.category, pet.category) &&
-        Objects.equals(this.name, pet.name) &&
-        Objects.equals(this.photoUrls, pet.photoUrls) &&
-        Objects.equals(this.tags, pet.tags) &&
-        Objects.equals(this.status, pet.status);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, category, name, photoUrls, tags, status);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Pet {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
deleted file mode 100644
index a36a25c05104..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * ReadOnlyFirst
- */
-@JsonPropertyOrder({
-  ReadOnlyFirst.JSON_PROPERTY_BAR,
-  ReadOnlyFirst.JSON_PROPERTY_BAZ
-})
-
-public class ReadOnlyFirst {
-  public static final String JSON_PROPERTY_BAR = "bar";
-  private String bar;
-
-  public static final String JSON_PROPERTY_BAZ = "baz";
-  private String baz;
-
-
-   /**
-   * Get bar
-   * @return bar
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBar() {
-    return bar;
-  }
-
-
-
-
-  public ReadOnlyFirst baz(String baz) {
-    
-    this.baz = baz;
-    return this;
-  }
-
-   /**
-   * Get baz
-   * @return baz
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAZ)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBaz() {
-    return baz;
-  }
-
-
-  public void setBaz(String baz) {
-    this.baz = baz;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
-    return Objects.equals(this.bar, readOnlyFirst.bar) &&
-        Objects.equals(this.baz, readOnlyFirst.baz);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(bar, baz);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ReadOnlyFirst {\n");
-    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
-    sb.append("    baz: ").append(toIndentedString(baz)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/SpecialModelName.java
deleted file mode 100644
index eb40d707adaf..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * SpecialModelName
- */
-@JsonPropertyOrder({
-  SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
-})
-
-public class SpecialModelName {
-  public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
-  private Long $specialPropertyName;
-
-
-  public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
-    
-    this.$specialPropertyName = $specialPropertyName;
-    return this;
-  }
-
-   /**
-   * Get $specialPropertyName
-   * @return $specialPropertyName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long get$SpecialPropertyName() {
-    return $specialPropertyName;
-  }
-
-
-  public void set$SpecialPropertyName(Long $specialPropertyName) {
-    this.$specialPropertyName = $specialPropertyName;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SpecialModelName $specialModelName = (SpecialModelName) o;
-    return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash($specialPropertyName);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SpecialModelName {\n");
-    sb.append("    $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Tag.java
deleted file mode 100644
index 17edbc2edd9c..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Tag.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * Tag
- */
-@JsonPropertyOrder({
-  Tag.JSON_PROPERTY_ID,
-  Tag.JSON_PROPERTY_NAME
-})
-
-public class Tag {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public Tag id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Tag name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Tag tag = (Tag) o;
-    return Objects.equals(this.id, tag.id) &&
-        Objects.equals(this.name, tag.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Tag {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
deleted file mode 100644
index e6ddf531002a..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * TypeHolderDefault
- */
-@JsonPropertyOrder({
-  TypeHolderDefault.JSON_PROPERTY_STRING_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_NUMBER_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_INTEGER_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
-})
-
-public class TypeHolderDefault {
-  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
-  private String stringItem = "what";
-
-  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
-  private BigDecimal numberItem;
-
-  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
-  private Integer integerItem;
-
-  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
-  private Boolean boolItem = true;
-
-  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
-  private List<Integer> arrayItem = new ArrayList<>();
-
-
-  public TypeHolderDefault stringItem(String stringItem) {
-    
-    this.stringItem = stringItem;
-    return this;
-  }
-
-   /**
-   * Get stringItem
-   * @return stringItem
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getStringItem() {
-    return stringItem;
-  }
-
-
-  public void setStringItem(String stringItem) {
-    this.stringItem = stringItem;
-  }
-
-
-  public TypeHolderDefault numberItem(BigDecimal numberItem) {
-    
-    this.numberItem = numberItem;
-    return this;
-  }
-
-   /**
-   * Get numberItem
-   * @return numberItem
-  **/
-  @NotNull
-  @Valid
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public BigDecimal getNumberItem() {
-    return numberItem;
-  }
-
-
-  public void setNumberItem(BigDecimal numberItem) {
-    this.numberItem = numberItem;
-  }
-
-
-  public TypeHolderDefault integerItem(Integer integerItem) {
-    
-    this.integerItem = integerItem;
-    return this;
-  }
-
-   /**
-   * Get integerItem
-   * @return integerItem
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Integer getIntegerItem() {
-    return integerItem;
-  }
-
-
-  public void setIntegerItem(Integer integerItem) {
-    this.integerItem = integerItem;
-  }
-
-
-  public TypeHolderDefault boolItem(Boolean boolItem) {
-    
-    this.boolItem = boolItem;
-    return this;
-  }
-
-   /**
-   * Get boolItem
-   * @return boolItem
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Boolean getBoolItem() {
-    return boolItem;
-  }
-
-
-  public void setBoolItem(Boolean boolItem) {
-    this.boolItem = boolItem;
-  }
-
-
-  public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
-    
-    this.arrayItem = arrayItem;
-    return this;
-  }
-
-  public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
-    this.arrayItem.add(arrayItemItem);
-    return this;
-  }
-
-   /**
-   * Get arrayItem
-   * @return arrayItem
-  **/
-  @NotNull
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public List<Integer> getArrayItem() {
-    return arrayItem;
-  }
-
-
-  public void setArrayItem(List<Integer> arrayItem) {
-    this.arrayItem = arrayItem;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o;
-    return Objects.equals(this.stringItem, typeHolderDefault.stringItem) &&
-        Objects.equals(this.numberItem, typeHolderDefault.numberItem) &&
-        Objects.equals(this.integerItem, typeHolderDefault.integerItem) &&
-        Objects.equals(this.boolItem, typeHolderDefault.boolItem) &&
-        Objects.equals(this.arrayItem, typeHolderDefault.arrayItem);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TypeHolderDefault {\n");
-    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
-    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
-    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
-    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
-    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderExample.java
deleted file mode 100644
index 6c606c85a90f..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * TypeHolderExample
- */
-@JsonPropertyOrder({
-  TypeHolderExample.JSON_PROPERTY_STRING_ITEM,
-  TypeHolderExample.JSON_PROPERTY_NUMBER_ITEM,
-  TypeHolderExample.JSON_PROPERTY_FLOAT_ITEM,
-  TypeHolderExample.JSON_PROPERTY_INTEGER_ITEM,
-  TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
-  TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
-})
-
-public class TypeHolderExample {
-  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
-  private String stringItem;
-
-  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
-  private BigDecimal numberItem;
-
-  public static final String JSON_PROPERTY_FLOAT_ITEM = "float_item";
-  private Float floatItem;
-
-  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
-  private Integer integerItem;
-
-  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
-  private Boolean boolItem;
-
-  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
-  private List<Integer> arrayItem = new ArrayList<>();
-
-
-  public TypeHolderExample stringItem(String stringItem) {
-    
-    this.stringItem = stringItem;
-    return this;
-  }
-
-   /**
-   * Get stringItem
-   * @return stringItem
-  **/
-  @NotNull
-  @ApiModelProperty(example = "what", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getStringItem() {
-    return stringItem;
-  }
-
-
-  public void setStringItem(String stringItem) {
-    this.stringItem = stringItem;
-  }
-
-
-  public TypeHolderExample numberItem(BigDecimal numberItem) {
-    
-    this.numberItem = numberItem;
-    return this;
-  }
-
-   /**
-   * Get numberItem
-   * @return numberItem
-  **/
-  @NotNull
-  @Valid
-  @ApiModelProperty(example = "1.234", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public BigDecimal getNumberItem() {
-    return numberItem;
-  }
-
-
-  public void setNumberItem(BigDecimal numberItem) {
-    this.numberItem = numberItem;
-  }
-
-
-  public TypeHolderExample floatItem(Float floatItem) {
-    
-    this.floatItem = floatItem;
-    return this;
-  }
-
-   /**
-   * Get floatItem
-   * @return floatItem
-  **/
-  @NotNull
-  @ApiModelProperty(example = "1.234", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Float getFloatItem() {
-    return floatItem;
-  }
-
-
-  public void setFloatItem(Float floatItem) {
-    this.floatItem = floatItem;
-  }
-
-
-  public TypeHolderExample integerItem(Integer integerItem) {
-    
-    this.integerItem = integerItem;
-    return this;
-  }
-
-   /**
-   * Get integerItem
-   * @return integerItem
-  **/
-  @NotNull
-  @ApiModelProperty(example = "-2", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Integer getIntegerItem() {
-    return integerItem;
-  }
-
-
-  public void setIntegerItem(Integer integerItem) {
-    this.integerItem = integerItem;
-  }
-
-
-  public TypeHolderExample boolItem(Boolean boolItem) {
-    
-    this.boolItem = boolItem;
-    return this;
-  }
-
-   /**
-   * Get boolItem
-   * @return boolItem
-  **/
-  @NotNull
-  @ApiModelProperty(example = "true", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Boolean getBoolItem() {
-    return boolItem;
-  }
-
-
-  public void setBoolItem(Boolean boolItem) {
-    this.boolItem = boolItem;
-  }
-
-
-  public TypeHolderExample arrayItem(List<Integer> arrayItem) {
-    
-    this.arrayItem = arrayItem;
-    return this;
-  }
-
-  public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
-    this.arrayItem.add(arrayItemItem);
-    return this;
-  }
-
-   /**
-   * Get arrayItem
-   * @return arrayItem
-  **/
-  @NotNull
-  @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public List<Integer> getArrayItem() {
-    return arrayItem;
-  }
-
-
-  public void setArrayItem(List<Integer> arrayItem) {
-    this.arrayItem = arrayItem;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TypeHolderExample typeHolderExample = (TypeHolderExample) o;
-    return Objects.equals(this.stringItem, typeHolderExample.stringItem) &&
-        Objects.equals(this.numberItem, typeHolderExample.numberItem) &&
-        Objects.equals(this.floatItem, typeHolderExample.floatItem) &&
-        Objects.equals(this.integerItem, typeHolderExample.integerItem) &&
-        Objects.equals(this.boolItem, typeHolderExample.boolItem) &&
-        Objects.equals(this.arrayItem, typeHolderExample.arrayItem);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TypeHolderExample {\n");
-    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
-    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
-    sb.append("    floatItem: ").append(toIndentedString(floatItem)).append("\n");
-    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
-    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
-    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/User.java
deleted file mode 100644
index 7268eab0d6f4..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/User.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * User
- */
-@JsonPropertyOrder({
-  User.JSON_PROPERTY_ID,
-  User.JSON_PROPERTY_USERNAME,
-  User.JSON_PROPERTY_FIRST_NAME,
-  User.JSON_PROPERTY_LAST_NAME,
-  User.JSON_PROPERTY_EMAIL,
-  User.JSON_PROPERTY_PASSWORD,
-  User.JSON_PROPERTY_PHONE,
-  User.JSON_PROPERTY_USER_STATUS
-})
-
-public class User {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_USERNAME = "username";
-  private String username;
-
-  public static final String JSON_PROPERTY_FIRST_NAME = "firstName";
-  private String firstName;
-
-  public static final String JSON_PROPERTY_LAST_NAME = "lastName";
-  private String lastName;
-
-  public static final String JSON_PROPERTY_EMAIL = "email";
-  private String email;
-
-  public static final String JSON_PROPERTY_PASSWORD = "password";
-  private String password;
-
-  public static final String JSON_PROPERTY_PHONE = "phone";
-  private String phone;
-
-  public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
-  private Integer userStatus;
-
-
-  public User id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public User username(String username) {
-    
-    this.username = username;
-    return this;
-  }
-
-   /**
-   * Get username
-   * @return username
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_USERNAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getUsername() {
-    return username;
-  }
-
-
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-
-  public User firstName(String firstName) {
-    
-    this.firstName = firstName;
-    return this;
-  }
-
-   /**
-   * Get firstName
-   * @return firstName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FIRST_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getFirstName() {
-    return firstName;
-  }
-
-
-  public void setFirstName(String firstName) {
-    this.firstName = firstName;
-  }
-
-
-  public User lastName(String lastName) {
-    
-    this.lastName = lastName;
-    return this;
-  }
-
-   /**
-   * Get lastName
-   * @return lastName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_LAST_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getLastName() {
-    return lastName;
-  }
-
-
-  public void setLastName(String lastName) {
-    this.lastName = lastName;
-  }
-
-
-  public User email(String email) {
-    
-    this.email = email;
-    return this;
-  }
-
-   /**
-   * Get email
-   * @return email
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_EMAIL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getEmail() {
-    return email;
-  }
-
-
-  public void setEmail(String email) {
-    this.email = email;
-  }
-
-
-  public User password(String password) {
-    
-    this.password = password;
-    return this;
-  }
-
-   /**
-   * Get password
-   * @return password
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PASSWORD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPassword() {
-    return password;
-  }
-
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-
-  public User phone(String phone) {
-    
-    this.phone = phone;
-    return this;
-  }
-
-   /**
-   * Get phone
-   * @return phone
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PHONE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPhone() {
-    return phone;
-  }
-
-
-  public void setPhone(String phone) {
-    this.phone = phone;
-  }
-
-
-  public User userStatus(Integer userStatus) {
-    
-    this.userStatus = userStatus;
-    return this;
-  }
-
-   /**
-   * User Status
-   * @return userStatus
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "User Status")
-  @JsonProperty(JSON_PROPERTY_USER_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getUserStatus() {
-    return userStatus;
-  }
-
-
-  public void setUserStatus(Integer userStatus) {
-    this.userStatus = userStatus;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    User user = (User) o;
-    return Objects.equals(this.id, user.id) &&
-        Objects.equals(this.username, user.username) &&
-        Objects.equals(this.firstName, user.firstName) &&
-        Objects.equals(this.lastName, user.lastName) &&
-        Objects.equals(this.email, user.email) &&
-        Objects.equals(this.password, user.password) &&
-        Objects.equals(this.phone, user.phone) &&
-        Objects.equals(this.userStatus, user.userStatus);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class User {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    username: ").append(toIndentedString(username)).append("\n");
-    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
-    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
-    sb.append("    email: ").append(toIndentedString(email)).append("\n");
-    sb.append("    password: ").append(toIndentedString(password)).append("\n");
-    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
-    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/XmlItem.java
deleted file mode 100644
index 458f927a8967..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/XmlItem.java
+++ /dev/null
@@ -1,1052 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.validation.constraints.*;
-import javax.validation.Valid;
-
-/**
- * XmlItem
- */
-@JsonPropertyOrder({
-  XmlItem.JSON_PROPERTY_ATTRIBUTE_STRING,
-  XmlItem.JSON_PROPERTY_ATTRIBUTE_NUMBER,
-  XmlItem.JSON_PROPERTY_ATTRIBUTE_INTEGER,
-  XmlItem.JSON_PROPERTY_ATTRIBUTE_BOOLEAN,
-  XmlItem.JSON_PROPERTY_WRAPPED_ARRAY,
-  XmlItem.JSON_PROPERTY_NAME_STRING,
-  XmlItem.JSON_PROPERTY_NAME_NUMBER,
-  XmlItem.JSON_PROPERTY_NAME_INTEGER,
-  XmlItem.JSON_PROPERTY_NAME_BOOLEAN,
-  XmlItem.JSON_PROPERTY_NAME_ARRAY,
-  XmlItem.JSON_PROPERTY_NAME_WRAPPED_ARRAY,
-  XmlItem.JSON_PROPERTY_PREFIX_STRING,
-  XmlItem.JSON_PROPERTY_PREFIX_NUMBER,
-  XmlItem.JSON_PROPERTY_PREFIX_INTEGER,
-  XmlItem.JSON_PROPERTY_PREFIX_BOOLEAN,
-  XmlItem.JSON_PROPERTY_PREFIX_ARRAY,
-  XmlItem.JSON_PROPERTY_PREFIX_WRAPPED_ARRAY,
-  XmlItem.JSON_PROPERTY_NAMESPACE_STRING,
-  XmlItem.JSON_PROPERTY_NAMESPACE_NUMBER,
-  XmlItem.JSON_PROPERTY_NAMESPACE_INTEGER,
-  XmlItem.JSON_PROPERTY_NAMESPACE_BOOLEAN,
-  XmlItem.JSON_PROPERTY_NAMESPACE_ARRAY,
-  XmlItem.JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_STRING,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_NUMBER,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_INTEGER,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_BOOLEAN,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
-  XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
-})
-
-public class XmlItem {
-  public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
-  private String attributeString;
-
-  public static final String JSON_PROPERTY_ATTRIBUTE_NUMBER = "attribute_number";
-  private BigDecimal attributeNumber;
-
-  public static final String JSON_PROPERTY_ATTRIBUTE_INTEGER = "attribute_integer";
-  private Integer attributeInteger;
-
-  public static final String JSON_PROPERTY_ATTRIBUTE_BOOLEAN = "attribute_boolean";
-  private Boolean attributeBoolean;
-
-  public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array";
-  private List<Integer> wrappedArray = null;
-
-  public static final String JSON_PROPERTY_NAME_STRING = "name_string";
-  private String nameString;
-
-  public static final String JSON_PROPERTY_NAME_NUMBER = "name_number";
-  private BigDecimal nameNumber;
-
-  public static final String JSON_PROPERTY_NAME_INTEGER = "name_integer";
-  private Integer nameInteger;
-
-  public static final String JSON_PROPERTY_NAME_BOOLEAN = "name_boolean";
-  private Boolean nameBoolean;
-
-  public static final String JSON_PROPERTY_NAME_ARRAY = "name_array";
-  private List<Integer> nameArray = null;
-
-  public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array";
-  private List<Integer> nameWrappedArray = null;
-
-  public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string";
-  private String prefixString;
-
-  public static final String JSON_PROPERTY_PREFIX_NUMBER = "prefix_number";
-  private BigDecimal prefixNumber;
-
-  public static final String JSON_PROPERTY_PREFIX_INTEGER = "prefix_integer";
-  private Integer prefixInteger;
-
-  public static final String JSON_PROPERTY_PREFIX_BOOLEAN = "prefix_boolean";
-  private Boolean prefixBoolean;
-
-  public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array";
-  private List<Integer> prefixArray = null;
-
-  public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array";
-  private List<Integer> prefixWrappedArray = null;
-
-  public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string";
-  private String namespaceString;
-
-  public static final String JSON_PROPERTY_NAMESPACE_NUMBER = "namespace_number";
-  private BigDecimal namespaceNumber;
-
-  public static final String JSON_PROPERTY_NAMESPACE_INTEGER = "namespace_integer";
-  private Integer namespaceInteger;
-
-  public static final String JSON_PROPERTY_NAMESPACE_BOOLEAN = "namespace_boolean";
-  private Boolean namespaceBoolean;
-
-  public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array";
-  private List<Integer> namespaceArray = null;
-
-  public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array";
-  private List<Integer> namespaceWrappedArray = null;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string";
-  private String prefixNsString;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_NUMBER = "prefix_ns_number";
-  private BigDecimal prefixNsNumber;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_INTEGER = "prefix_ns_integer";
-  private Integer prefixNsInteger;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_BOOLEAN = "prefix_ns_boolean";
-  private Boolean prefixNsBoolean;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array";
-  private List<Integer> prefixNsArray = null;
-
-  public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
-  private List<Integer> prefixNsWrappedArray = null;
-
-
-  public XmlItem attributeString(String attributeString) {
-    
-    this.attributeString = attributeString;
-    return this;
-  }
-
-   /**
-   * Get attributeString
-   * @return attributeString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getAttributeString() {
-    return attributeString;
-  }
-
-
-  public void setAttributeString(String attributeString) {
-    this.attributeString = attributeString;
-  }
-
-
-  public XmlItem attributeNumber(BigDecimal attributeNumber) {
-    
-    this.attributeNumber = attributeNumber;
-    return this;
-  }
-
-   /**
-   * Get attributeNumber
-   * @return attributeNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getAttributeNumber() {
-    return attributeNumber;
-  }
-
-
-  public void setAttributeNumber(BigDecimal attributeNumber) {
-    this.attributeNumber = attributeNumber;
-  }
-
-
-  public XmlItem attributeInteger(Integer attributeInteger) {
-    
-    this.attributeInteger = attributeInteger;
-    return this;
-  }
-
-   /**
-   * Get attributeInteger
-   * @return attributeInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getAttributeInteger() {
-    return attributeInteger;
-  }
-
-
-  public void setAttributeInteger(Integer attributeInteger) {
-    this.attributeInteger = attributeInteger;
-  }
-
-
-  public XmlItem attributeBoolean(Boolean attributeBoolean) {
-    
-    this.attributeBoolean = attributeBoolean;
-    return this;
-  }
-
-   /**
-   * Get attributeBoolean
-   * @return attributeBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getAttributeBoolean() {
-    return attributeBoolean;
-  }
-
-
-  public void setAttributeBoolean(Boolean attributeBoolean) {
-    this.attributeBoolean = attributeBoolean;
-  }
-
-
-  public XmlItem wrappedArray(List<Integer> wrappedArray) {
-    
-    this.wrappedArray = wrappedArray;
-    return this;
-  }
-
-  public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
-    if (this.wrappedArray == null) {
-      this.wrappedArray = new ArrayList<>();
-    }
-    this.wrappedArray.add(wrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get wrappedArray
-   * @return wrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getWrappedArray() {
-    return wrappedArray;
-  }
-
-
-  public void setWrappedArray(List<Integer> wrappedArray) {
-    this.wrappedArray = wrappedArray;
-  }
-
-
-  public XmlItem nameString(String nameString) {
-    
-    this.nameString = nameString;
-    return this;
-  }
-
-   /**
-   * Get nameString
-   * @return nameString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getNameString() {
-    return nameString;
-  }
-
-
-  public void setNameString(String nameString) {
-    this.nameString = nameString;
-  }
-
-
-  public XmlItem nameNumber(BigDecimal nameNumber) {
-    
-    this.nameNumber = nameNumber;
-    return this;
-  }
-
-   /**
-   * Get nameNumber
-   * @return nameNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getNameNumber() {
-    return nameNumber;
-  }
-
-
-  public void setNameNumber(BigDecimal nameNumber) {
-    this.nameNumber = nameNumber;
-  }
-
-
-  public XmlItem nameInteger(Integer nameInteger) {
-    
-    this.nameInteger = nameInteger;
-    return this;
-  }
-
-   /**
-   * Get nameInteger
-   * @return nameInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getNameInteger() {
-    return nameInteger;
-  }
-
-
-  public void setNameInteger(Integer nameInteger) {
-    this.nameInteger = nameInteger;
-  }
-
-
-  public XmlItem nameBoolean(Boolean nameBoolean) {
-    
-    this.nameBoolean = nameBoolean;
-    return this;
-  }
-
-   /**
-   * Get nameBoolean
-   * @return nameBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getNameBoolean() {
-    return nameBoolean;
-  }
-
-
-  public void setNameBoolean(Boolean nameBoolean) {
-    this.nameBoolean = nameBoolean;
-  }
-
-
-  public XmlItem nameArray(List<Integer> nameArray) {
-    
-    this.nameArray = nameArray;
-    return this;
-  }
-
-  public XmlItem addNameArrayItem(Integer nameArrayItem) {
-    if (this.nameArray == null) {
-      this.nameArray = new ArrayList<>();
-    }
-    this.nameArray.add(nameArrayItem);
-    return this;
-  }
-
-   /**
-   * Get nameArray
-   * @return nameArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getNameArray() {
-    return nameArray;
-  }
-
-
-  public void setNameArray(List<Integer> nameArray) {
-    this.nameArray = nameArray;
-  }
-
-
-  public XmlItem nameWrappedArray(List<Integer> nameWrappedArray) {
-    
-    this.nameWrappedArray = nameWrappedArray;
-    return this;
-  }
-
-  public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
-    if (this.nameWrappedArray == null) {
-      this.nameWrappedArray = new ArrayList<>();
-    }
-    this.nameWrappedArray.add(nameWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get nameWrappedArray
-   * @return nameWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getNameWrappedArray() {
-    return nameWrappedArray;
-  }
-
-
-  public void setNameWrappedArray(List<Integer> nameWrappedArray) {
-    this.nameWrappedArray = nameWrappedArray;
-  }
-
-
-  public XmlItem prefixString(String prefixString) {
-    
-    this.prefixString = prefixString;
-    return this;
-  }
-
-   /**
-   * Get prefixString
-   * @return prefixString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPrefixString() {
-    return prefixString;
-  }
-
-
-  public void setPrefixString(String prefixString) {
-    this.prefixString = prefixString;
-  }
-
-
-  public XmlItem prefixNumber(BigDecimal prefixNumber) {
-    
-    this.prefixNumber = prefixNumber;
-    return this;
-  }
-
-   /**
-   * Get prefixNumber
-   * @return prefixNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getPrefixNumber() {
-    return prefixNumber;
-  }
-
-
-  public void setPrefixNumber(BigDecimal prefixNumber) {
-    this.prefixNumber = prefixNumber;
-  }
-
-
-  public XmlItem prefixInteger(Integer prefixInteger) {
-    
-    this.prefixInteger = prefixInteger;
-    return this;
-  }
-
-   /**
-   * Get prefixInteger
-   * @return prefixInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getPrefixInteger() {
-    return prefixInteger;
-  }
-
-
-  public void setPrefixInteger(Integer prefixInteger) {
-    this.prefixInteger = prefixInteger;
-  }
-
-
-  public XmlItem prefixBoolean(Boolean prefixBoolean) {
-    
-    this.prefixBoolean = prefixBoolean;
-    return this;
-  }
-
-   /**
-   * Get prefixBoolean
-   * @return prefixBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getPrefixBoolean() {
-    return prefixBoolean;
-  }
-
-
-  public void setPrefixBoolean(Boolean prefixBoolean) {
-    this.prefixBoolean = prefixBoolean;
-  }
-
-
-  public XmlItem prefixArray(List<Integer> prefixArray) {
-    
-    this.prefixArray = prefixArray;
-    return this;
-  }
-
-  public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
-    if (this.prefixArray == null) {
-      this.prefixArray = new ArrayList<>();
-    }
-    this.prefixArray.add(prefixArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixArray
-   * @return prefixArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getPrefixArray() {
-    return prefixArray;
-  }
-
-
-  public void setPrefixArray(List<Integer> prefixArray) {
-    this.prefixArray = prefixArray;
-  }
-
-
-  public XmlItem prefixWrappedArray(List<Integer> prefixWrappedArray) {
-    
-    this.prefixWrappedArray = prefixWrappedArray;
-    return this;
-  }
-
-  public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
-    if (this.prefixWrappedArray == null) {
-      this.prefixWrappedArray = new ArrayList<>();
-    }
-    this.prefixWrappedArray.add(prefixWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixWrappedArray
-   * @return prefixWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getPrefixWrappedArray() {
-    return prefixWrappedArray;
-  }
-
-
-  public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
-    this.prefixWrappedArray = prefixWrappedArray;
-  }
-
-
-  public XmlItem namespaceString(String namespaceString) {
-    
-    this.namespaceString = namespaceString;
-    return this;
-  }
-
-   /**
-   * Get namespaceString
-   * @return namespaceString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getNamespaceString() {
-    return namespaceString;
-  }
-
-
-  public void setNamespaceString(String namespaceString) {
-    this.namespaceString = namespaceString;
-  }
-
-
-  public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
-    
-    this.namespaceNumber = namespaceNumber;
-    return this;
-  }
-
-   /**
-   * Get namespaceNumber
-   * @return namespaceNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getNamespaceNumber() {
-    return namespaceNumber;
-  }
-
-
-  public void setNamespaceNumber(BigDecimal namespaceNumber) {
-    this.namespaceNumber = namespaceNumber;
-  }
-
-
-  public XmlItem namespaceInteger(Integer namespaceInteger) {
-    
-    this.namespaceInteger = namespaceInteger;
-    return this;
-  }
-
-   /**
-   * Get namespaceInteger
-   * @return namespaceInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getNamespaceInteger() {
-    return namespaceInteger;
-  }
-
-
-  public void setNamespaceInteger(Integer namespaceInteger) {
-    this.namespaceInteger = namespaceInteger;
-  }
-
-
-  public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
-    
-    this.namespaceBoolean = namespaceBoolean;
-    return this;
-  }
-
-   /**
-   * Get namespaceBoolean
-   * @return namespaceBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getNamespaceBoolean() {
-    return namespaceBoolean;
-  }
-
-
-  public void setNamespaceBoolean(Boolean namespaceBoolean) {
-    this.namespaceBoolean = namespaceBoolean;
-  }
-
-
-  public XmlItem namespaceArray(List<Integer> namespaceArray) {
-    
-    this.namespaceArray = namespaceArray;
-    return this;
-  }
-
-  public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
-    if (this.namespaceArray == null) {
-      this.namespaceArray = new ArrayList<>();
-    }
-    this.namespaceArray.add(namespaceArrayItem);
-    return this;
-  }
-
-   /**
-   * Get namespaceArray
-   * @return namespaceArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getNamespaceArray() {
-    return namespaceArray;
-  }
-
-
-  public void setNamespaceArray(List<Integer> namespaceArray) {
-    this.namespaceArray = namespaceArray;
-  }
-
-
-  public XmlItem namespaceWrappedArray(List<Integer> namespaceWrappedArray) {
-    
-    this.namespaceWrappedArray = namespaceWrappedArray;
-    return this;
-  }
-
-  public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
-    if (this.namespaceWrappedArray == null) {
-      this.namespaceWrappedArray = new ArrayList<>();
-    }
-    this.namespaceWrappedArray.add(namespaceWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get namespaceWrappedArray
-   * @return namespaceWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getNamespaceWrappedArray() {
-    return namespaceWrappedArray;
-  }
-
-
-  public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
-    this.namespaceWrappedArray = namespaceWrappedArray;
-  }
-
-
-  public XmlItem prefixNsString(String prefixNsString) {
-    
-    this.prefixNsString = prefixNsString;
-    return this;
-  }
-
-   /**
-   * Get prefixNsString
-   * @return prefixNsString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPrefixNsString() {
-    return prefixNsString;
-  }
-
-
-  public void setPrefixNsString(String prefixNsString) {
-    this.prefixNsString = prefixNsString;
-  }
-
-
-  public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
-    
-    this.prefixNsNumber = prefixNsNumber;
-    return this;
-  }
-
-   /**
-   * Get prefixNsNumber
-   * @return prefixNsNumber
-  **/
-  @javax.annotation.Nullable
-  @Valid
-  @ApiModelProperty(example = "1.234", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getPrefixNsNumber() {
-    return prefixNsNumber;
-  }
-
-
-  public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
-    this.prefixNsNumber = prefixNsNumber;
-  }
-
-
-  public XmlItem prefixNsInteger(Integer prefixNsInteger) {
-    
-    this.prefixNsInteger = prefixNsInteger;
-    return this;
-  }
-
-   /**
-   * Get prefixNsInteger
-   * @return prefixNsInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getPrefixNsInteger() {
-    return prefixNsInteger;
-  }
-
-
-  public void setPrefixNsInteger(Integer prefixNsInteger) {
-    this.prefixNsInteger = prefixNsInteger;
-  }
-
-
-  public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
-    
-    this.prefixNsBoolean = prefixNsBoolean;
-    return this;
-  }
-
-   /**
-   * Get prefixNsBoolean
-   * @return prefixNsBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getPrefixNsBoolean() {
-    return prefixNsBoolean;
-  }
-
-
-  public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
-    this.prefixNsBoolean = prefixNsBoolean;
-  }
-
-
-  public XmlItem prefixNsArray(List<Integer> prefixNsArray) {
-    
-    this.prefixNsArray = prefixNsArray;
-    return this;
-  }
-
-  public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
-    if (this.prefixNsArray == null) {
-      this.prefixNsArray = new ArrayList<>();
-    }
-    this.prefixNsArray.add(prefixNsArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixNsArray
-   * @return prefixNsArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getPrefixNsArray() {
-    return prefixNsArray;
-  }
-
-
-  public void setPrefixNsArray(List<Integer> prefixNsArray) {
-    this.prefixNsArray = prefixNsArray;
-  }
-
-
-  public XmlItem prefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
-    
-    this.prefixNsWrappedArray = prefixNsWrappedArray;
-    return this;
-  }
-
-  public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
-    if (this.prefixNsWrappedArray == null) {
-      this.prefixNsWrappedArray = new ArrayList<>();
-    }
-    this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixNsWrappedArray
-   * @return prefixNsWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Integer> getPrefixNsWrappedArray() {
-    return prefixNsWrappedArray;
-  }
-
-
-  public void setPrefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
-    this.prefixNsWrappedArray = prefixNsWrappedArray;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    XmlItem xmlItem = (XmlItem) o;
-    return Objects.equals(this.attributeString, xmlItem.attributeString) &&
-        Objects.equals(this.attributeNumber, xmlItem.attributeNumber) &&
-        Objects.equals(this.attributeInteger, xmlItem.attributeInteger) &&
-        Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) &&
-        Objects.equals(this.wrappedArray, xmlItem.wrappedArray) &&
-        Objects.equals(this.nameString, xmlItem.nameString) &&
-        Objects.equals(this.nameNumber, xmlItem.nameNumber) &&
-        Objects.equals(this.nameInteger, xmlItem.nameInteger) &&
-        Objects.equals(this.nameBoolean, xmlItem.nameBoolean) &&
-        Objects.equals(this.nameArray, xmlItem.nameArray) &&
-        Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) &&
-        Objects.equals(this.prefixString, xmlItem.prefixString) &&
-        Objects.equals(this.prefixNumber, xmlItem.prefixNumber) &&
-        Objects.equals(this.prefixInteger, xmlItem.prefixInteger) &&
-        Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) &&
-        Objects.equals(this.prefixArray, xmlItem.prefixArray) &&
-        Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) &&
-        Objects.equals(this.namespaceString, xmlItem.namespaceString) &&
-        Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) &&
-        Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) &&
-        Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) &&
-        Objects.equals(this.namespaceArray, xmlItem.namespaceArray) &&
-        Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) &&
-        Objects.equals(this.prefixNsString, xmlItem.prefixNsString) &&
-        Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) &&
-        Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) &&
-        Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) &&
-        Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) &&
-        Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class XmlItem {\n");
-    sb.append("    attributeString: ").append(toIndentedString(attributeString)).append("\n");
-    sb.append("    attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n");
-    sb.append("    attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n");
-    sb.append("    attributeBoolean: ").append(toIndentedString(attributeBoolean)).append("\n");
-    sb.append("    wrappedArray: ").append(toIndentedString(wrappedArray)).append("\n");
-    sb.append("    nameString: ").append(toIndentedString(nameString)).append("\n");
-    sb.append("    nameNumber: ").append(toIndentedString(nameNumber)).append("\n");
-    sb.append("    nameInteger: ").append(toIndentedString(nameInteger)).append("\n");
-    sb.append("    nameBoolean: ").append(toIndentedString(nameBoolean)).append("\n");
-    sb.append("    nameArray: ").append(toIndentedString(nameArray)).append("\n");
-    sb.append("    nameWrappedArray: ").append(toIndentedString(nameWrappedArray)).append("\n");
-    sb.append("    prefixString: ").append(toIndentedString(prefixString)).append("\n");
-    sb.append("    prefixNumber: ").append(toIndentedString(prefixNumber)).append("\n");
-    sb.append("    prefixInteger: ").append(toIndentedString(prefixInteger)).append("\n");
-    sb.append("    prefixBoolean: ").append(toIndentedString(prefixBoolean)).append("\n");
-    sb.append("    prefixArray: ").append(toIndentedString(prefixArray)).append("\n");
-    sb.append("    prefixWrappedArray: ").append(toIndentedString(prefixWrappedArray)).append("\n");
-    sb.append("    namespaceString: ").append(toIndentedString(namespaceString)).append("\n");
-    sb.append("    namespaceNumber: ").append(toIndentedString(namespaceNumber)).append("\n");
-    sb.append("    namespaceInteger: ").append(toIndentedString(namespaceInteger)).append("\n");
-    sb.append("    namespaceBoolean: ").append(toIndentedString(namespaceBoolean)).append("\n");
-    sb.append("    namespaceArray: ").append(toIndentedString(namespaceArray)).append("\n");
-    sb.append("    namespaceWrappedArray: ").append(toIndentedString(namespaceWrappedArray)).append("\n");
-    sb.append("    prefixNsString: ").append(toIndentedString(prefixNsString)).append("\n");
-    sb.append("    prefixNsNumber: ").append(toIndentedString(prefixNsNumber)).append("\n");
-    sb.append("    prefixNsInteger: ").append(toIndentedString(prefixNsInteger)).append("\n");
-    sb.append("    prefixNsBoolean: ").append(toIndentedString(prefixNsBoolean)).append("\n");
-    sb.append("    prefixNsArray: ").append(toIndentedString(prefixNsArray)).append("\n");
-    sb.append("    prefixNsWrappedArray: ").append(toIndentedString(prefixNsWrappedArray)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
deleted file mode 100644
index 1d45ba717a26..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.Client;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for AnotherFakeApi
- */
-public class AnotherFakeApiTest {
-
-    private AnotherFakeApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(AnotherFakeApi.class);
-    }
-
-    /**
-     * To test special tags
-     *
-     * To test special tags
-     */
-    @Test
-    public void testSpecialTagsTest() {
-        Client client = null;
-        // Client response = api.testSpecialTags(client);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/FakeApiTest.java
deleted file mode 100644
index aec2e41c34e8..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import java.math.BigDecimal;
-import org.openapitools.client.model.Client;
-import java.io.File;
-import org.openapitools.client.model.FileSchemaTestClass;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
-import org.openapitools.client.model.OuterComposite;
-import org.openapitools.client.model.User;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for FakeApi
- */
-public class FakeApiTest {
-
-    private FakeApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(FakeApi.class);
-    }
-
-    /**
-     * 
-     *
-     * Test serialization of outer boolean types
-     */
-    @Test
-    public void fakeOuterBooleanSerializeTest() {
-        Boolean body = null;
-        // Boolean response = api.fakeOuterBooleanSerialize(body);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * Test serialization of object with outer number type
-     */
-    @Test
-    public void fakeOuterCompositeSerializeTest() {
-        OuterComposite outerComposite = null;
-        // OuterComposite response = api.fakeOuterCompositeSerialize(outerComposite);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * Test serialization of outer number types
-     */
-    @Test
-    public void fakeOuterNumberSerializeTest() {
-        BigDecimal body = null;
-        // BigDecimal response = api.fakeOuterNumberSerialize(body);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * Test serialization of outer string types
-     */
-    @Test
-    public void fakeOuterStringSerializeTest() {
-        String body = null;
-        // String response = api.fakeOuterStringSerialize(body);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-     */
-    @Test
-    public void testBodyWithFileSchemaTest() {
-        FileSchemaTestClass fileSchemaTestClass = null;
-        // api.testBodyWithFileSchema(fileSchemaTestClass);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * 
-     */
-    @Test
-    public void testBodyWithQueryParamsTest() {
-        String query = null;
-        User user = null;
-        // api.testBodyWithQueryParams(query, user);
-
-        // TODO: test validations
-    }
-    /**
-     * To test \&quot;client\&quot; model
-     *
-     * To test \&quot;client\&quot; model
-     */
-    @Test
-    public void testClientModelTest() {
-        Client client = null;
-        // Client response = api.testClientModel(client);
-
-        // TODO: test validations
-    }
-    /**
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     */
-    @Test
-    public void testEndpointParametersTest() {
-        BigDecimal number = null;
-        Double _double = null;
-        String patternWithoutDelimiter = null;
-        byte[] _byte = null;
-        Integer integer = null;
-        Integer int32 = null;
-        Long int64 = null;
-        Float _float = null;
-        String string = null;
-        File binary = null;
-        LocalDate date = null;
-        OffsetDateTime dateTime = null;
-        String password = null;
-        String paramCallback = null;
-        // api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
-
-        // TODO: test validations
-    }
-    /**
-     * To test enum parameters
-     *
-     * To test enum parameters
-     */
-    @Test
-    public void testEnumParametersTest() {
-        List<String> enumHeaderStringArray = null;
-        String enumHeaderString = null;
-        List<String> enumQueryStringArray = null;
-        String enumQueryString = null;
-        Integer enumQueryInteger = null;
-        Double enumQueryDouble = null;
-        List<String> enumFormStringArray = null;
-        String enumFormString = null;
-        // api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
-
-        // TODO: test validations
-    }
-    /**
-     * Fake endpoint to test group parameters (optional)
-     *
-     * Fake endpoint to test group parameters (optional)
-     */
-    @Test
-    public void testGroupParametersTest() {
-        Integer requiredStringGroup = null;
-        Boolean requiredBooleanGroup = null;
-        Long requiredInt64Group = null;
-        Integer stringGroup = null;
-        Boolean booleanGroup = null;
-        Long int64Group = null;
-        // api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
-
-        // TODO: test validations
-    }
-    /**
-     * test inline additionalProperties
-     *
-     * 
-     */
-    @Test
-    public void testInlineAdditionalPropertiesTest() {
-        Map<String, String> requestBody = null;
-        // api.testInlineAdditionalProperties(requestBody);
-
-        // TODO: test validations
-    }
-    /**
-     * test json serialization of form data
-     *
-     * 
-     */
-    @Test
-    public void testJsonFormDataTest() {
-        String param = null;
-        String param2 = null;
-        // api.testJsonFormData(param, param2);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
deleted file mode 100644
index 6e32cc284814..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.Client;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for FakeClassnameTags123Api
- */
-public class FakeClassnameTags123ApiTest {
-
-    private FakeClassnameTags123Api api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(FakeClassnameTags123Api.class);
-    }
-
-    /**
-     * To test class name in snake case
-     *
-     * To test class name in snake case
-     */
-    @Test
-    public void testClassnameTest() {
-        Client client = null;
-        // Client response = api.testClassname(client);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/PetApiTest.java
deleted file mode 100644
index 65eed9391e98..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import java.io.File;
-import org.openapitools.client.model.ModelApiResponse;
-import org.openapitools.client.model.Pet;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for PetApi
- */
-public class PetApiTest {
-
-    private PetApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(PetApi.class);
-    }
-
-    /**
-     * Add a new pet to the store
-     *
-     * 
-     */
-    @Test
-    public void addPetTest() {
-        Pet pet = null;
-        // api.addPet(pet);
-
-        // TODO: test validations
-    }
-    /**
-     * Deletes a pet
-     *
-     * 
-     */
-    @Test
-    public void deletePetTest() {
-        Long petId = null;
-        String apiKey = null;
-        // api.deletePet(petId, apiKey);
-
-        // TODO: test validations
-    }
-    /**
-     * Finds Pets by status
-     *
-     * Multiple status values can be provided with comma separated strings
-     */
-    @Test
-    public void findPetsByStatusTest() {
-        List<String> status = null;
-        // List<Pet> response = api.findPetsByStatus(status);
-
-        // TODO: test validations
-    }
-    /**
-     * Finds Pets by tags
-     *
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     */
-    @Test
-    public void findPetsByTagsTest() {
-        List<String> tags = null;
-        // List<Pet> response = api.findPetsByTags(tags);
-
-        // TODO: test validations
-    }
-    /**
-     * Find pet by ID
-     *
-     * Returns a single pet
-     */
-    @Test
-    public void getPetByIdTest() {
-        Long petId = null;
-        // Pet response = api.getPetById(petId);
-
-        // TODO: test validations
-    }
-    /**
-     * Update an existing pet
-     *
-     * 
-     */
-    @Test
-    public void updatePetTest() {
-        Pet pet = null;
-        // api.updatePet(pet);
-
-        // TODO: test validations
-    }
-    /**
-     * Updates a pet in the store with form data
-     *
-     * 
-     */
-    @Test
-    public void updatePetWithFormTest() {
-        Long petId = null;
-        String name = null;
-        String status = null;
-        // api.updatePetWithForm(petId, name, status);
-
-        // TODO: test validations
-    }
-    /**
-     * uploads an image
-     *
-     * 
-     */
-    @Test
-    public void uploadFileTest() {
-        Long petId = null;
-        String additionalMetadata = null;
-        File file = null;
-        // ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/StoreApiTest.java
deleted file mode 100644
index 15455ccabb20..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.Order;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for StoreApi
- */
-public class StoreApiTest {
-
-    private StoreApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(StoreApi.class);
-    }
-
-    /**
-     * Delete purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-     */
-    @Test
-    public void deleteOrderTest() {
-        String orderId = null;
-        // api.deleteOrder(orderId);
-
-        // TODO: test validations
-    }
-    /**
-     * Returns pet inventories by status
-     *
-     * Returns a map of status codes to quantities
-     */
-    @Test
-    public void getInventoryTest() {
-        // Map<String, Integer> response = api.getInventory();
-
-        // TODO: test validations
-    }
-    /**
-     * Find purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     */
-    @Test
-    public void getOrderByIdTest() {
-        Long orderId = null;
-        // Order response = api.getOrderById(orderId);
-
-        // TODO: test validations
-    }
-    /**
-     * Place an order for a pet
-     *
-     * 
-     */
-    @Test
-    public void placeOrderTest() {
-        Order order = null;
-        // Order response = api.placeOrder(order);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/UserApiTest.java
deleted file mode 100644
index 9174f6d02508..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/api/UserApiTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.User;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for UserApi
- */
-public class UserApiTest {
-
-    private UserApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(UserApi.class);
-    }
-
-    /**
-     * Create user
-     *
-     * This can only be done by the logged in user.
-     */
-    @Test
-    public void createUserTest() {
-        User user = null;
-        // api.createUser(user);
-
-        // TODO: test validations
-    }
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
-    @Test
-    public void createUsersWithArrayInputTest() {
-        List<User> user = null;
-        // api.createUsersWithArrayInput(user);
-
-        // TODO: test validations
-    }
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
-    @Test
-    public void createUsersWithListInputTest() {
-        List<User> user = null;
-        // api.createUsersWithListInput(user);
-
-        // TODO: test validations
-    }
-    /**
-     * Delete user
-     *
-     * This can only be done by the logged in user.
-     */
-    @Test
-    public void deleteUserTest() {
-        String username = null;
-        // api.deleteUser(username);
-
-        // TODO: test validations
-    }
-    /**
-     * Get user by user name
-     *
-     * 
-     */
-    @Test
-    public void getUserByNameTest() {
-        String username = null;
-        // User response = api.getUserByName(username);
-
-        // TODO: test validations
-    }
-    /**
-     * Logs user into the system
-     *
-     * 
-     */
-    @Test
-    public void loginUserTest() {
-        String username = null;
-        String password = null;
-        // String response = api.loginUser(username, password);
-
-        // TODO: test validations
-    }
-    /**
-     * Logs out current logged in user session
-     *
-     * 
-     */
-    @Test
-    public void logoutUserTest() {
-        // api.logoutUser();
-
-        // TODO: test validations
-    }
-    /**
-     * Updated user
-     *
-     * This can only be done by the logged in user.
-     */
-    @Test
-    public void updateUserTest() {
-        String username = null;
-        User user = null;
-        // api.updateUser(username, user);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
deleted file mode 100644
index 2b0bd0bbaefe..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesAnyType
- */
-public class AdditionalPropertiesAnyTypeTest {
-    private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType();
-
-    /**
-     * Model tests for AdditionalPropertiesAnyType
-     */
-    @Test
-    public void testAdditionalPropertiesAnyType() {
-        // TODO: test AdditionalPropertiesAnyType
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
deleted file mode 100644
index c6dd88eea82c..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesArray
- */
-public class AdditionalPropertiesArrayTest {
-    private final AdditionalPropertiesArray model = new AdditionalPropertiesArray();
-
-    /**
-     * Model tests for AdditionalPropertiesArray
-     */
-    @Test
-    public void testAdditionalPropertiesArray() {
-        // TODO: test AdditionalPropertiesArray
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
deleted file mode 100644
index 9d474c0dd801..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesBoolean
- */
-public class AdditionalPropertiesBooleanTest {
-    private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean();
-
-    /**
-     * Model tests for AdditionalPropertiesBoolean
-     */
-    @Test
-    public void testAdditionalPropertiesBoolean() {
-        // TODO: test AdditionalPropertiesBoolean
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
deleted file mode 100644
index c6bcc988bf94..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesClass
- */
-public class AdditionalPropertiesClassTest {
-    private final AdditionalPropertiesClass model = new AdditionalPropertiesClass();
-
-    /**
-     * Model tests for AdditionalPropertiesClass
-     */
-    @Test
-    public void testAdditionalPropertiesClass() {
-        // TODO: test AdditionalPropertiesClass
-    }
-
-    /**
-     * Test the property 'mapProperty'
-     */
-    @Test
-    public void mapPropertyTest() {
-        // TODO: test mapProperty
-    }
-
-    /**
-     * Test the property 'mapOfMapProperty'
-     */
-    @Test
-    public void mapOfMapPropertyTest() {
-        // TODO: test mapOfMapProperty
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
deleted file mode 100644
index bf1b1c427b64..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesInteger
- */
-public class AdditionalPropertiesIntegerTest {
-    private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger();
-
-    /**
-     * Model tests for AdditionalPropertiesInteger
-     */
-    @Test
-    public void testAdditionalPropertiesInteger() {
-        // TODO: test AdditionalPropertiesInteger
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
deleted file mode 100644
index b9cb6470e38d..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesNumber
- */
-public class AdditionalPropertiesNumberTest {
-    private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber();
-
-    /**
-     * Model tests for AdditionalPropertiesNumber
-     */
-    @Test
-    public void testAdditionalPropertiesNumber() {
-        // TODO: test AdditionalPropertiesNumber
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
deleted file mode 100644
index 3cbcb8ec3b0f..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesObject
- */
-public class AdditionalPropertiesObjectTest {
-    private final AdditionalPropertiesObject model = new AdditionalPropertiesObject();
-
-    /**
-     * Model tests for AdditionalPropertiesObject
-     */
-    @Test
-    public void testAdditionalPropertiesObject() {
-        // TODO: test AdditionalPropertiesObject
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
deleted file mode 100644
index 1d3c05075eaa..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesString
- */
-public class AdditionalPropertiesStringTest {
-    private final AdditionalPropertiesString model = new AdditionalPropertiesString();
-
-    /**
-     * Model tests for AdditionalPropertiesString
-     */
-    @Test
-    public void testAdditionalPropertiesString() {
-        // TODO: test AdditionalPropertiesString
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AnimalTest.java
deleted file mode 100644
index beb02882b30e..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/AnimalTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Animal
- */
-public class AnimalTest {
-    private final Animal model = new Animal();
-
-    /**
-     * Model tests for Animal
-     */
-    @Test
-    public void testAnimal() {
-        // TODO: test Animal
-    }
-
-    /**
-     * Test the property 'className'
-     */
-    @Test
-    public void classNameTest() {
-        // TODO: test className
-    }
-
-    /**
-     * Test the property 'color'
-     */
-    @Test
-    public void colorTest() {
-        // TODO: test color
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
deleted file mode 100644
index ae7970522b15..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ArrayOfArrayOfNumberOnly
- */
-public class ArrayOfArrayOfNumberOnlyTest {
-    private final ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly();
-
-    /**
-     * Model tests for ArrayOfArrayOfNumberOnly
-     */
-    @Test
-    public void testArrayOfArrayOfNumberOnly() {
-        // TODO: test ArrayOfArrayOfNumberOnly
-    }
-
-    /**
-     * Test the property 'arrayArrayNumber'
-     */
-    @Test
-    public void arrayArrayNumberTest() {
-        // TODO: test arrayArrayNumber
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
deleted file mode 100644
index 6151b7068b75..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ArrayOfNumberOnly
- */
-public class ArrayOfNumberOnlyTest {
-    private final ArrayOfNumberOnly model = new ArrayOfNumberOnly();
-
-    /**
-     * Model tests for ArrayOfNumberOnly
-     */
-    @Test
-    public void testArrayOfNumberOnly() {
-        // TODO: test ArrayOfNumberOnly
-    }
-
-    /**
-     * Test the property 'arrayNumber'
-     */
-    @Test
-    public void arrayNumberTest() {
-        // TODO: test arrayNumber
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ArrayTestTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ArrayTestTest.java
deleted file mode 100644
index 4bb62b6569ae..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ArrayTestTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.client.model.ReadOnlyFirst;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ArrayTest
- */
-public class ArrayTestTest {
-    private final ArrayTest model = new ArrayTest();
-
-    /**
-     * Model tests for ArrayTest
-     */
-    @Test
-    public void testArrayTest() {
-        // TODO: test ArrayTest
-    }
-
-    /**
-     * Test the property 'arrayOfString'
-     */
-    @Test
-    public void arrayOfStringTest() {
-        // TODO: test arrayOfString
-    }
-
-    /**
-     * Test the property 'arrayArrayOfInteger'
-     */
-    @Test
-    public void arrayArrayOfIntegerTest() {
-        // TODO: test arrayArrayOfInteger
-    }
-
-    /**
-     * Test the property 'arrayArrayOfModel'
-     */
-    @Test
-    public void arrayArrayOfModelTest() {
-        // TODO: test arrayArrayOfModel
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java
deleted file mode 100644
index a9b13011f001..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for BigCatAllOf
- */
-public class BigCatAllOfTest {
-    private final BigCatAllOf model = new BigCatAllOf();
-
-    /**
-     * Model tests for BigCatAllOf
-     */
-    @Test
-    public void testBigCatAllOf() {
-        // TODO: test BigCatAllOf
-    }
-
-    /**
-     * Test the property 'kind'
-     */
-    @Test
-    public void kindTest() {
-        // TODO: test kind
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/BigCatTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/BigCatTest.java
deleted file mode 100644
index 006c80707427..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/BigCatTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.BigCatAllOf;
-import org.openapitools.client.model.Cat;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for BigCat
- */
-public class BigCatTest {
-    private final BigCat model = new BigCat();
-
-    /**
-     * Model tests for BigCat
-     */
-    @Test
-    public void testBigCat() {
-        // TODO: test BigCat
-    }
-
-    /**
-     * Test the property 'className'
-     */
-    @Test
-    public void classNameTest() {
-        // TODO: test className
-    }
-
-    /**
-     * Test the property 'color'
-     */
-    @Test
-    public void colorTest() {
-        // TODO: test color
-    }
-
-    /**
-     * Test the property 'declawed'
-     */
-    @Test
-    public void declawedTest() {
-        // TODO: test declawed
-    }
-
-    /**
-     * Test the property 'kind'
-     */
-    @Test
-    public void kindTest() {
-        // TODO: test kind
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/CapitalizationTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/CapitalizationTest.java
deleted file mode 100644
index eae9be7938c9..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/CapitalizationTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Capitalization
- */
-public class CapitalizationTest {
-    private final Capitalization model = new Capitalization();
-
-    /**
-     * Model tests for Capitalization
-     */
-    @Test
-    public void testCapitalization() {
-        // TODO: test Capitalization
-    }
-
-    /**
-     * Test the property 'smallCamel'
-     */
-    @Test
-    public void smallCamelTest() {
-        // TODO: test smallCamel
-    }
-
-    /**
-     * Test the property 'capitalCamel'
-     */
-    @Test
-    public void capitalCamelTest() {
-        // TODO: test capitalCamel
-    }
-
-    /**
-     * Test the property 'smallSnake'
-     */
-    @Test
-    public void smallSnakeTest() {
-        // TODO: test smallSnake
-    }
-
-    /**
-     * Test the property 'capitalSnake'
-     */
-    @Test
-    public void capitalSnakeTest() {
-        // TODO: test capitalSnake
-    }
-
-    /**
-     * Test the property 'scAETHFlowPoints'
-     */
-    @Test
-    public void scAETHFlowPointsTest() {
-        // TODO: test scAETHFlowPoints
-    }
-
-    /**
-     * Test the property 'ATT_NAME'
-     */
-    @Test
-    public void ATT_NAMETest() {
-        // TODO: test ATT_NAME
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/CatAllOfTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/CatAllOfTest.java
deleted file mode 100644
index 69b226745d79..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/CatAllOfTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for CatAllOf
- */
-public class CatAllOfTest {
-    private final CatAllOf model = new CatAllOf();
-
-    /**
-     * Model tests for CatAllOf
-     */
-    @Test
-    public void testCatAllOf() {
-        // TODO: test CatAllOf
-    }
-
-    /**
-     * Test the property 'declawed'
-     */
-    @Test
-    public void declawedTest() {
-        // TODO: test declawed
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/CatTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/CatTest.java
deleted file mode 100644
index dcb9f2d4cae6..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/CatTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Animal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Cat
- */
-public class CatTest {
-    private final Cat model = new Cat();
-
-    /**
-     * Model tests for Cat
-     */
-    @Test
-    public void testCat() {
-        // TODO: test Cat
-    }
-
-    /**
-     * Test the property 'className'
-     */
-    @Test
-    public void classNameTest() {
-        // TODO: test className
-    }
-
-    /**
-     * Test the property 'color'
-     */
-    @Test
-    public void colorTest() {
-        // TODO: test color
-    }
-
-    /**
-     * Test the property 'declawed'
-     */
-    @Test
-    public void declawedTest() {
-        // TODO: test declawed
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/CategoryTest.java
deleted file mode 100644
index 1df27cf03202..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/CategoryTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Category
- */
-public class CategoryTest {
-    private final Category model = new Category();
-
-    /**
-     * Model tests for Category
-     */
-    @Test
-    public void testCategory() {
-        // TODO: test Category
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ClassModelTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ClassModelTest.java
deleted file mode 100644
index 04eb02f835e2..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ClassModelTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ClassModel
- */
-public class ClassModelTest {
-    private final ClassModel model = new ClassModel();
-
-    /**
-     * Model tests for ClassModel
-     */
-    @Test
-    public void testClassModel() {
-        // TODO: test ClassModel
-    }
-
-    /**
-     * Test the property 'propertyClass'
-     */
-    @Test
-    public void propertyClassTest() {
-        // TODO: test propertyClass
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ClientTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ClientTest.java
deleted file mode 100644
index 03b6bb41a529..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ClientTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Client
- */
-public class ClientTest {
-    private final Client model = new Client();
-
-    /**
-     * Model tests for Client
-     */
-    @Test
-    public void testClient() {
-        // TODO: test Client
-    }
-
-    /**
-     * Test the property 'client'
-     */
-    @Test
-    public void clientTest() {
-        // TODO: test client
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/DogAllOfTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/DogAllOfTest.java
deleted file mode 100644
index 1b83dcefc4f5..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/DogAllOfTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for DogAllOf
- */
-public class DogAllOfTest {
-    private final DogAllOf model = new DogAllOf();
-
-    /**
-     * Model tests for DogAllOf
-     */
-    @Test
-    public void testDogAllOf() {
-        // TODO: test DogAllOf
-    }
-
-    /**
-     * Test the property 'breed'
-     */
-    @Test
-    public void breedTest() {
-        // TODO: test breed
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/DogTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/DogTest.java
deleted file mode 100644
index 06ac28f804ad..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/DogTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Animal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Dog
- */
-public class DogTest {
-    private final Dog model = new Dog();
-
-    /**
-     * Model tests for Dog
-     */
-    @Test
-    public void testDog() {
-        // TODO: test Dog
-    }
-
-    /**
-     * Test the property 'className'
-     */
-    @Test
-    public void classNameTest() {
-        // TODO: test className
-    }
-
-    /**
-     * Test the property 'color'
-     */
-    @Test
-    public void colorTest() {
-        // TODO: test color
-    }
-
-    /**
-     * Test the property 'breed'
-     */
-    @Test
-    public void breedTest() {
-        // TODO: test breed
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/EnumArraysTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/EnumArraysTest.java
deleted file mode 100644
index 11b5f01985fe..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/EnumArraysTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for EnumArrays
- */
-public class EnumArraysTest {
-    private final EnumArrays model = new EnumArrays();
-
-    /**
-     * Model tests for EnumArrays
-     */
-    @Test
-    public void testEnumArrays() {
-        // TODO: test EnumArrays
-    }
-
-    /**
-     * Test the property 'justSymbol'
-     */
-    @Test
-    public void justSymbolTest() {
-        // TODO: test justSymbol
-    }
-
-    /**
-     * Test the property 'arrayEnum'
-     */
-    @Test
-    public void arrayEnumTest() {
-        // TODO: test arrayEnum
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/EnumClassTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/EnumClassTest.java
deleted file mode 100644
index cb51ca50c958..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/EnumClassTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for EnumClass
- */
-public class EnumClassTest {
-    /**
-     * Model tests for EnumClass
-     */
-    @Test
-    public void testEnumClass() {
-        // TODO: test EnumClass
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/EnumTestTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/EnumTestTest.java
deleted file mode 100644
index 13122a0cb978..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/EnumTestTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.OuterEnum;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for EnumTest
- */
-public class EnumTestTest {
-    private final EnumTest model = new EnumTest();
-
-    /**
-     * Model tests for EnumTest
-     */
-    @Test
-    public void testEnumTest() {
-        // TODO: test EnumTest
-    }
-
-    /**
-     * Test the property 'enumString'
-     */
-    @Test
-    public void enumStringTest() {
-        // TODO: test enumString
-    }
-
-    /**
-     * Test the property 'enumStringRequired'
-     */
-    @Test
-    public void enumStringRequiredTest() {
-        // TODO: test enumStringRequired
-    }
-
-    /**
-     * Test the property 'enumInteger'
-     */
-    @Test
-    public void enumIntegerTest() {
-        // TODO: test enumInteger
-    }
-
-    /**
-     * Test the property 'enumNumber'
-     */
-    @Test
-    public void enumNumberTest() {
-        // TODO: test enumNumber
-    }
-
-    /**
-     * Test the property 'outerEnum'
-     */
-    @Test
-    public void outerEnumTest() {
-        // TODO: test outerEnum
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
deleted file mode 100644
index a6b0d8ff7b05..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for FileSchemaTestClass
- */
-public class FileSchemaTestClassTest {
-    private final FileSchemaTestClass model = new FileSchemaTestClass();
-
-    /**
-     * Model tests for FileSchemaTestClass
-     */
-    @Test
-    public void testFileSchemaTestClass() {
-        // TODO: test FileSchemaTestClass
-    }
-
-    /**
-     * Test the property 'file'
-     */
-    @Test
-    public void fileTest() {
-        // TODO: test file
-    }
-
-    /**
-     * Test the property 'files'
-     */
-    @Test
-    public void filesTest() {
-        // TODO: test files
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/FormatTestTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/FormatTestTest.java
deleted file mode 100644
index 6081209ef19f..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/FormatTestTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.File;
-import java.math.BigDecimal;
-import java.util.UUID;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for FormatTest
- */
-public class FormatTestTest {
-    private final FormatTest model = new FormatTest();
-
-    /**
-     * Model tests for FormatTest
-     */
-    @Test
-    public void testFormatTest() {
-        // TODO: test FormatTest
-    }
-
-    /**
-     * Test the property 'integer'
-     */
-    @Test
-    public void integerTest() {
-        // TODO: test integer
-    }
-
-    /**
-     * Test the property 'int32'
-     */
-    @Test
-    public void int32Test() {
-        // TODO: test int32
-    }
-
-    /**
-     * Test the property 'int64'
-     */
-    @Test
-    public void int64Test() {
-        // TODO: test int64
-    }
-
-    /**
-     * Test the property 'number'
-     */
-    @Test
-    public void numberTest() {
-        // TODO: test number
-    }
-
-    /**
-     * Test the property '_float'
-     */
-    @Test
-    public void _floatTest() {
-        // TODO: test _float
-    }
-
-    /**
-     * Test the property '_double'
-     */
-    @Test
-    public void _doubleTest() {
-        // TODO: test _double
-    }
-
-    /**
-     * Test the property 'string'
-     */
-    @Test
-    public void stringTest() {
-        // TODO: test string
-    }
-
-    /**
-     * Test the property '_byte'
-     */
-    @Test
-    public void _byteTest() {
-        // TODO: test _byte
-    }
-
-    /**
-     * Test the property 'binary'
-     */
-    @Test
-    public void binaryTest() {
-        // TODO: test binary
-    }
-
-    /**
-     * Test the property 'date'
-     */
-    @Test
-    public void dateTest() {
-        // TODO: test date
-    }
-
-    /**
-     * Test the property 'dateTime'
-     */
-    @Test
-    public void dateTimeTest() {
-        // TODO: test dateTime
-    }
-
-    /**
-     * Test the property 'uuid'
-     */
-    @Test
-    public void uuidTest() {
-        // TODO: test uuid
-    }
-
-    /**
-     * Test the property 'password'
-     */
-    @Test
-    public void passwordTest() {
-        // TODO: test password
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
deleted file mode 100644
index 2c4b2470b983..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for HasOnlyReadOnly
- */
-public class HasOnlyReadOnlyTest {
-    private final HasOnlyReadOnly model = new HasOnlyReadOnly();
-
-    /**
-     * Model tests for HasOnlyReadOnly
-     */
-    @Test
-    public void testHasOnlyReadOnly() {
-        // TODO: test HasOnlyReadOnly
-    }
-
-    /**
-     * Test the property 'bar'
-     */
-    @Test
-    public void barTest() {
-        // TODO: test bar
-    }
-
-    /**
-     * Test the property 'foo'
-     */
-    @Test
-    public void fooTest() {
-        // TODO: test foo
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/MapTestTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/MapTestTest.java
deleted file mode 100644
index 0f08d8c88f07..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/MapTestTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for MapTest
- */
-public class MapTestTest {
-    private final MapTest model = new MapTest();
-
-    /**
-     * Model tests for MapTest
-     */
-    @Test
-    public void testMapTest() {
-        // TODO: test MapTest
-    }
-
-    /**
-     * Test the property 'mapMapOfString'
-     */
-    @Test
-    public void mapMapOfStringTest() {
-        // TODO: test mapMapOfString
-    }
-
-    /**
-     * Test the property 'mapOfEnumString'
-     */
-    @Test
-    public void mapOfEnumStringTest() {
-        // TODO: test mapOfEnumString
-    }
-
-    /**
-     * Test the property 'directMap'
-     */
-    @Test
-    public void directMapTest() {
-        // TODO: test directMap
-    }
-
-    /**
-     * Test the property 'indirectMap'
-     */
-    @Test
-    public void indirectMapTest() {
-        // TODO: test indirectMap
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
deleted file mode 100644
index c308aec0a94d..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import org.openapitools.client.model.Animal;
-import org.threeten.bp.OffsetDateTime;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for MixedPropertiesAndAdditionalPropertiesClass
- */
-public class MixedPropertiesAndAdditionalPropertiesClassTest {
-    private final MixedPropertiesAndAdditionalPropertiesClass model = new MixedPropertiesAndAdditionalPropertiesClass();
-
-    /**
-     * Model tests for MixedPropertiesAndAdditionalPropertiesClass
-     */
-    @Test
-    public void testMixedPropertiesAndAdditionalPropertiesClass() {
-        // TODO: test MixedPropertiesAndAdditionalPropertiesClass
-    }
-
-    /**
-     * Test the property 'uuid'
-     */
-    @Test
-    public void uuidTest() {
-        // TODO: test uuid
-    }
-
-    /**
-     * Test the property 'dateTime'
-     */
-    @Test
-    public void dateTimeTest() {
-        // TODO: test dateTime
-    }
-
-    /**
-     * Test the property 'map'
-     */
-    @Test
-    public void mapTest() {
-        // TODO: test map
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/Model200ResponseTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
deleted file mode 100644
index 1ad55ca32ea6..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Model200Response
- */
-public class Model200ResponseTest {
-    private final Model200Response model = new Model200Response();
-
-    /**
-     * Model tests for Model200Response
-     */
-    @Test
-    public void testModel200Response() {
-        // TODO: test Model200Response
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-    /**
-     * Test the property 'propertyClass'
-     */
-    @Test
-    public void propertyClassTest() {
-        // TODO: test propertyClass
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
deleted file mode 100644
index 73d28676aeae..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ModelApiResponse
- */
-public class ModelApiResponseTest {
-    private final ModelApiResponse model = new ModelApiResponse();
-
-    /**
-     * Model tests for ModelApiResponse
-     */
-    @Test
-    public void testModelApiResponse() {
-        // TODO: test ModelApiResponse
-    }
-
-    /**
-     * Test the property 'code'
-     */
-    @Test
-    public void codeTest() {
-        // TODO: test code
-    }
-
-    /**
-     * Test the property 'type'
-     */
-    @Test
-    public void typeTest() {
-        // TODO: test type
-    }
-
-    /**
-     * Test the property 'message'
-     */
-    @Test
-    public void messageTest() {
-        // TODO: test message
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ModelReturnTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ModelReturnTest.java
deleted file mode 100644
index b073fda00140..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ModelReturnTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ModelReturn
- */
-public class ModelReturnTest {
-    private final ModelReturn model = new ModelReturn();
-
-    /**
-     * Model tests for ModelReturn
-     */
-    @Test
-    public void testModelReturn() {
-        // TODO: test ModelReturn
-    }
-
-    /**
-     * Test the property '_return'
-     */
-    @Test
-    public void _returnTest() {
-        // TODO: test _return
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/NameTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/NameTest.java
deleted file mode 100644
index e81ebc38e652..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/NameTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Name
- */
-public class NameTest {
-    private final Name model = new Name();
-
-    /**
-     * Model tests for Name
-     */
-    @Test
-    public void testName() {
-        // TODO: test Name
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-    /**
-     * Test the property 'snakeCase'
-     */
-    @Test
-    public void snakeCaseTest() {
-        // TODO: test snakeCase
-    }
-
-    /**
-     * Test the property 'property'
-     */
-    @Test
-    public void propertyTest() {
-        // TODO: test property
-    }
-
-    /**
-     * Test the property '_123number'
-     */
-    @Test
-    public void _123numberTest() {
-        // TODO: test _123number
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/NumberOnlyTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
deleted file mode 100644
index 565c8bd0627e..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for NumberOnly
- */
-public class NumberOnlyTest {
-    private final NumberOnly model = new NumberOnly();
-
-    /**
-     * Model tests for NumberOnly
-     */
-    @Test
-    public void testNumberOnly() {
-        // TODO: test NumberOnly
-    }
-
-    /**
-     * Test the property 'justNumber'
-     */
-    @Test
-    public void justNumberTest() {
-        // TODO: test justNumber
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/OrderTest.java
deleted file mode 100644
index c2d3025a2643..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/OrderTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.threeten.bp.OffsetDateTime;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Order
- */
-public class OrderTest {
-    private final Order model = new Order();
-
-    /**
-     * Model tests for Order
-     */
-    @Test
-    public void testOrder() {
-        // TODO: test Order
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'petId'
-     */
-    @Test
-    public void petIdTest() {
-        // TODO: test petId
-    }
-
-    /**
-     * Test the property 'quantity'
-     */
-    @Test
-    public void quantityTest() {
-        // TODO: test quantity
-    }
-
-    /**
-     * Test the property 'shipDate'
-     */
-    @Test
-    public void shipDateTest() {
-        // TODO: test shipDate
-    }
-
-    /**
-     * Test the property 'status'
-     */
-    @Test
-    public void statusTest() {
-        // TODO: test status
-    }
-
-    /**
-     * Test the property 'complete'
-     */
-    @Test
-    public void completeTest() {
-        // TODO: test complete
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/OuterCompositeTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
deleted file mode 100644
index 49b656a93faf..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for OuterComposite
- */
-public class OuterCompositeTest {
-    private final OuterComposite model = new OuterComposite();
-
-    /**
-     * Model tests for OuterComposite
-     */
-    @Test
-    public void testOuterComposite() {
-        // TODO: test OuterComposite
-    }
-
-    /**
-     * Test the property 'myNumber'
-     */
-    @Test
-    public void myNumberTest() {
-        // TODO: test myNumber
-    }
-
-    /**
-     * Test the property 'myString'
-     */
-    @Test
-    public void myStringTest() {
-        // TODO: test myString
-    }
-
-    /**
-     * Test the property 'myBoolean'
-     */
-    @Test
-    public void myBooleanTest() {
-        // TODO: test myBoolean
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/OuterEnumTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/OuterEnumTest.java
deleted file mode 100644
index 61154c6d8818..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/OuterEnumTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for OuterEnum
- */
-public class OuterEnumTest {
-    /**
-     * Model tests for OuterEnum
-     */
-    @Test
-    public void testOuterEnum() {
-        // TODO: test OuterEnum
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/PetTest.java
deleted file mode 100644
index bf6908e4a455..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/PetTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.client.model.Category;
-import org.openapitools.client.model.Tag;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Pet
- */
-public class PetTest {
-    private final Pet model = new Pet();
-
-    /**
-     * Model tests for Pet
-     */
-    @Test
-    public void testPet() {
-        // TODO: test Pet
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'category'
-     */
-    @Test
-    public void categoryTest() {
-        // TODO: test category
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-    /**
-     * Test the property 'photoUrls'
-     */
-    @Test
-    public void photoUrlsTest() {
-        // TODO: test photoUrls
-    }
-
-    /**
-     * Test the property 'tags'
-     */
-    @Test
-    public void tagsTest() {
-        // TODO: test tags
-    }
-
-    /**
-     * Test the property 'status'
-     */
-    @Test
-    public void statusTest() {
-        // TODO: test status
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
deleted file mode 100644
index e48b31a39fda..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ReadOnlyFirst
- */
-public class ReadOnlyFirstTest {
-    private final ReadOnlyFirst model = new ReadOnlyFirst();
-
-    /**
-     * Model tests for ReadOnlyFirst
-     */
-    @Test
-    public void testReadOnlyFirst() {
-        // TODO: test ReadOnlyFirst
-    }
-
-    /**
-     * Test the property 'bar'
-     */
-    @Test
-    public void barTest() {
-        // TODO: test bar
-    }
-
-    /**
-     * Test the property 'baz'
-     */
-    @Test
-    public void bazTest() {
-        // TODO: test baz
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
deleted file mode 100644
index 1696eee82dad..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for SpecialModelName
- */
-public class SpecialModelNameTest {
-    private final SpecialModelName model = new SpecialModelName();
-
-    /**
-     * Model tests for SpecialModelName
-     */
-    @Test
-    public void testSpecialModelName() {
-        // TODO: test SpecialModelName
-    }
-
-    /**
-     * Test the property '$specialPropertyName'
-     */
-    @Test
-    public void $specialPropertyNameTest() {
-        // TODO: test $specialPropertyName
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/TagTest.java
deleted file mode 100644
index b37aca5fdfc8..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/TagTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Tag
- */
-public class TagTest {
-    private final Tag model = new Tag();
-
-    /**
-     * Model tests for Tag
-     */
-    @Test
-    public void testTag() {
-        // TODO: test Tag
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
deleted file mode 100644
index 409076e80a3a..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for TypeHolderDefault
- */
-public class TypeHolderDefaultTest {
-    private final TypeHolderDefault model = new TypeHolderDefault();
-
-    /**
-     * Model tests for TypeHolderDefault
-     */
-    @Test
-    public void testTypeHolderDefault() {
-        // TODO: test TypeHolderDefault
-    }
-
-    /**
-     * Test the property 'stringItem'
-     */
-    @Test
-    public void stringItemTest() {
-        // TODO: test stringItem
-    }
-
-    /**
-     * Test the property 'numberItem'
-     */
-    @Test
-    public void numberItemTest() {
-        // TODO: test numberItem
-    }
-
-    /**
-     * Test the property 'integerItem'
-     */
-    @Test
-    public void integerItemTest() {
-        // TODO: test integerItem
-    }
-
-    /**
-     * Test the property 'boolItem'
-     */
-    @Test
-    public void boolItemTest() {
-        // TODO: test boolItem
-    }
-
-    /**
-     * Test the property 'arrayItem'
-     */
-    @Test
-    public void arrayItemTest() {
-        // TODO: test arrayItem
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
deleted file mode 100644
index ffd8f3ddc33e..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for TypeHolderExample
- */
-public class TypeHolderExampleTest {
-    private final TypeHolderExample model = new TypeHolderExample();
-
-    /**
-     * Model tests for TypeHolderExample
-     */
-    @Test
-    public void testTypeHolderExample() {
-        // TODO: test TypeHolderExample
-    }
-
-    /**
-     * Test the property 'stringItem'
-     */
-    @Test
-    public void stringItemTest() {
-        // TODO: test stringItem
-    }
-
-    /**
-     * Test the property 'numberItem'
-     */
-    @Test
-    public void numberItemTest() {
-        // TODO: test numberItem
-    }
-
-    /**
-     * Test the property 'integerItem'
-     */
-    @Test
-    public void integerItemTest() {
-        // TODO: test integerItem
-    }
-
-    /**
-     * Test the property 'boolItem'
-     */
-    @Test
-    public void boolItemTest() {
-        // TODO: test boolItem
-    }
-
-    /**
-     * Test the property 'arrayItem'
-     */
-    @Test
-    public void arrayItemTest() {
-        // TODO: test arrayItem
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/UserTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/UserTest.java
deleted file mode 100644
index 76733c9e72f2..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/UserTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for User
- */
-public class UserTest {
-    private final User model = new User();
-
-    /**
-     * Model tests for User
-     */
-    @Test
-    public void testUser() {
-        // TODO: test User
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'username'
-     */
-    @Test
-    public void usernameTest() {
-        // TODO: test username
-    }
-
-    /**
-     * Test the property 'firstName'
-     */
-    @Test
-    public void firstNameTest() {
-        // TODO: test firstName
-    }
-
-    /**
-     * Test the property 'lastName'
-     */
-    @Test
-    public void lastNameTest() {
-        // TODO: test lastName
-    }
-
-    /**
-     * Test the property 'email'
-     */
-    @Test
-    public void emailTest() {
-        // TODO: test email
-    }
-
-    /**
-     * Test the property 'password'
-     */
-    @Test
-    public void passwordTest() {
-        // TODO: test password
-    }
-
-    /**
-     * Test the property 'phone'
-     */
-    @Test
-    public void phoneTest() {
-        // TODO: test phone
-    }
-
-    /**
-     * Test the property 'userStatus'
-     */
-    @Test
-    public void userStatusTest() {
-        // TODO: test userStatus
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/XmlItemTest.java b/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/XmlItemTest.java
deleted file mode 100644
index 55e75391e00e..000000000000
--- a/samples/client/petstore/java/retrofit2-play25/src/test/java/org/openapitools/client/model/XmlItemTest.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for XmlItem
- */
-public class XmlItemTest {
-    private final XmlItem model = new XmlItem();
-
-    /**
-     * Model tests for XmlItem
-     */
-    @Test
-    public void testXmlItem() {
-        // TODO: test XmlItem
-    }
-
-    /**
-     * Test the property 'attributeString'
-     */
-    @Test
-    public void attributeStringTest() {
-        // TODO: test attributeString
-    }
-
-    /**
-     * Test the property 'attributeNumber'
-     */
-    @Test
-    public void attributeNumberTest() {
-        // TODO: test attributeNumber
-    }
-
-    /**
-     * Test the property 'attributeInteger'
-     */
-    @Test
-    public void attributeIntegerTest() {
-        // TODO: test attributeInteger
-    }
-
-    /**
-     * Test the property 'attributeBoolean'
-     */
-    @Test
-    public void attributeBooleanTest() {
-        // TODO: test attributeBoolean
-    }
-
-    /**
-     * Test the property 'wrappedArray'
-     */
-    @Test
-    public void wrappedArrayTest() {
-        // TODO: test wrappedArray
-    }
-
-    /**
-     * Test the property 'nameString'
-     */
-    @Test
-    public void nameStringTest() {
-        // TODO: test nameString
-    }
-
-    /**
-     * Test the property 'nameNumber'
-     */
-    @Test
-    public void nameNumberTest() {
-        // TODO: test nameNumber
-    }
-
-    /**
-     * Test the property 'nameInteger'
-     */
-    @Test
-    public void nameIntegerTest() {
-        // TODO: test nameInteger
-    }
-
-    /**
-     * Test the property 'nameBoolean'
-     */
-    @Test
-    public void nameBooleanTest() {
-        // TODO: test nameBoolean
-    }
-
-    /**
-     * Test the property 'nameArray'
-     */
-    @Test
-    public void nameArrayTest() {
-        // TODO: test nameArray
-    }
-
-    /**
-     * Test the property 'nameWrappedArray'
-     */
-    @Test
-    public void nameWrappedArrayTest() {
-        // TODO: test nameWrappedArray
-    }
-
-    /**
-     * Test the property 'prefixString'
-     */
-    @Test
-    public void prefixStringTest() {
-        // TODO: test prefixString
-    }
-
-    /**
-     * Test the property 'prefixNumber'
-     */
-    @Test
-    public void prefixNumberTest() {
-        // TODO: test prefixNumber
-    }
-
-    /**
-     * Test the property 'prefixInteger'
-     */
-    @Test
-    public void prefixIntegerTest() {
-        // TODO: test prefixInteger
-    }
-
-    /**
-     * Test the property 'prefixBoolean'
-     */
-    @Test
-    public void prefixBooleanTest() {
-        // TODO: test prefixBoolean
-    }
-
-    /**
-     * Test the property 'prefixArray'
-     */
-    @Test
-    public void prefixArrayTest() {
-        // TODO: test prefixArray
-    }
-
-    /**
-     * Test the property 'prefixWrappedArray'
-     */
-    @Test
-    public void prefixWrappedArrayTest() {
-        // TODO: test prefixWrappedArray
-    }
-
-    /**
-     * Test the property 'namespaceString'
-     */
-    @Test
-    public void namespaceStringTest() {
-        // TODO: test namespaceString
-    }
-
-    /**
-     * Test the property 'namespaceNumber'
-     */
-    @Test
-    public void namespaceNumberTest() {
-        // TODO: test namespaceNumber
-    }
-
-    /**
-     * Test the property 'namespaceInteger'
-     */
-    @Test
-    public void namespaceIntegerTest() {
-        // TODO: test namespaceInteger
-    }
-
-    /**
-     * Test the property 'namespaceBoolean'
-     */
-    @Test
-    public void namespaceBooleanTest() {
-        // TODO: test namespaceBoolean
-    }
-
-    /**
-     * Test the property 'namespaceArray'
-     */
-    @Test
-    public void namespaceArrayTest() {
-        // TODO: test namespaceArray
-    }
-
-    /**
-     * Test the property 'namespaceWrappedArray'
-     */
-    @Test
-    public void namespaceWrappedArrayTest() {
-        // TODO: test namespaceWrappedArray
-    }
-
-    /**
-     * Test the property 'prefixNamespaceString'
-     */
-    @Test
-    public void prefixNamespaceStringTest() {
-        // TODO: test prefixNamespaceString
-    }
-
-    /**
-     * Test the property 'prefixNamespaceNumber'
-     */
-    @Test
-    public void prefixNamespaceNumberTest() {
-        // TODO: test prefixNamespaceNumber
-    }
-
-    /**
-     * Test the property 'prefixNamespaceInteger'
-     */
-    @Test
-    public void prefixNamespaceIntegerTest() {
-        // TODO: test prefixNamespaceInteger
-    }
-
-    /**
-     * Test the property 'prefixNamespaceBoolean'
-     */
-    @Test
-    public void prefixNamespaceBooleanTest() {
-        // TODO: test prefixNamespaceBoolean
-    }
-
-    /**
-     * Test the property 'prefixNamespaceArray'
-     */
-    @Test
-    public void prefixNamespaceArrayTest() {
-        // TODO: test prefixNamespaceArray
-    }
-
-    /**
-     * Test the property 'prefixNamespaceWrappedArray'
-     */
-    @Test
-    public void prefixNamespaceWrappedArrayTest() {
-        // TODO: test prefixNamespaceWrappedArray
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2-play26/build.gradle b/samples/client/petstore/java/retrofit2-play26/build.gradle
index 2b365f233ad0..40da433677cf 100644
--- a/samples/client/petstore/java/retrofit2-play26/build.gradle
+++ b/samples/client/petstore/java/retrofit2-play26/build.gradle
@@ -126,6 +126,6 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
     compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
-
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/retrofit2-play26/build.sbt b/samples/client/petstore/java/retrofit2-play26/build.sbt
index 6c72635b4d05..39f5936febfc 100644
--- a/samples/client/petstore/java/retrofit2-play26/build.sbt
+++ b/samples/client/petstore/java/retrofit2-play26/build.sbt
@@ -13,14 +13,15 @@ lazy val root = (project in file(".")).
       "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
       "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile",
       "javax.validation" % "validation-api" % "1.1.0.Final" % "compile",
+      "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       "com.fasterxml.jackson.core" % "jackson-core" % "2.10.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.4" % "compile",
       "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile",
-      "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "org.threeten" % "threetenbp" % "1.4.0" % "compile",
       "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.11" % "test"
     )
diff --git a/samples/client/petstore/java/retrofit2-play26/pom.xml b/samples/client/petstore/java/retrofit2-play26/pom.xml
index c0e191c5546a..faa435788516 100644
--- a/samples/client/petstore/java/retrofit2-play26/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play26/pom.xml
@@ -132,12 +132,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -255,7 +265,12 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind-version}</version>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openapitools</groupId>
+                <artifactId>jackson-databind-nullable</artifactId>
+                <version>${jackson-databind-nullable-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -272,11 +287,12 @@
                 <artifactId>validation-api</artifactId>
                 <version>1.1.0.Final</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -292,12 +308,12 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.3</gson-fire-version>
         <swagger-annotations-version>1.5.22</swagger-annotations-version>
-        <jackson-databind-version>2.10.3</jackson-databind-version>
         <jackson-version>2.10.4</jackson-version>
         <play-version>2.6.7</play-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
         <retrofit-version>2.5.0</retrofit-version>
         <threetenbp-version>1.4.0</threetenbp-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <oltu-version>1.0.1</oltu-version>
         <junit-version>4.13</junit-version>
     </properties>
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Pair.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Pair.java
index ae89aa614543..8352d84046a7 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Pair.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Pair.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/StringUtil.java
index 747a23f5bf23..4dc60597910a 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/StringUtil.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
index 809a01a97878..79a732ce8bb3 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
@@ -21,7 +21,7 @@
 /**
  * Holds ApiKey auth info
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 0967f96bd1dc..87958d5c7408 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 9071c582806e..6e61778611f2 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 8f134e614a87..9841ffc5b2bf 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 294c05c7334c..cc669ca9bcd9 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -45,7 +45,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   private Map<String, String> mapString = null;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 94d4ece0c37f..5d125ad27ecf 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 21088ae74341..8352d3806a99 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 58780e577cb5..3054e6755a10 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index f3ece0e27ed3..1d8f0433034c 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java
index 854f1a7e969e..4f7094331d42 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java
@@ -37,7 +37,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 937459512853..b764e0257bf9 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 1658e7153006..62bf7ba06a7d 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java
index de001c2ec5e7..d9c4e3ae3c92 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -36,7 +36,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   private List<String> arrayOfString = null;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java
index bc2a449ff8d4..4389c167cabc 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java
@@ -35,7 +35,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index 754e37125b36..19ee4311e786 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java
index 28c74d28c020..6e1b0dd242e5 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -36,7 +36,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   private String smallCamel;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java
index fcb521ba34e8..ca170cfaf239 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java
@@ -36,7 +36,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java
index f62c8936adc4..2acdba3ff844 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java
index 35816bb041f2..b70ad8fe5c2c 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java
@@ -32,7 +32,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java
index b4f2d9795ecd..b653cc28f081 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java
index be3c219200f8..c61e5359d859 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java
index 754fa0230879..67219179a765 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java
@@ -35,7 +35,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java
index 62c3b1969449..9b55cbc4f186 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java
index 8a54b50f5226..85be0585c891 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -34,7 +34,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
index 575a32ebce7d..ac65d1c25e43 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -36,7 +36,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 46c92718db49..138738068cde 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -34,7 +34,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
   private java.io.File file;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
index cbf0d392bb7e..e9a19d8618e2 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -49,7 +49,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 81e823b2fe8a..643812937c33 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -32,7 +32,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java
index 11d6be2d43d0..3eb2a9c0a5a8 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java
@@ -37,7 +37,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 28c4f00fe779..064c23b726b1 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,7 +39,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java
index 5eb7788e9172..91ea72cb5738 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -33,7 +33,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 16b0ac3a5ea8..275db9f083ac 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -33,7 +33,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
   private Integer code;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java
index e35698cbfa3f..3f049658cc0f 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java
index 885d7220817a..6e58bb4cb2ff 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java
@@ -35,7 +35,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java
index 73a245256928..f3d643e39d3b 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java
index 59510f49a728..dc9866d702a8 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java
@@ -37,7 +37,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java
index 333de203a4fb..eb8210070a01 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -34,7 +34,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   private BigDecimal myNumber;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java
index de960e6e5868..b522cd724213 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java
@@ -42,7 +42,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index a36a25c05104..25f676fa51f1 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -32,7 +32,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java
index eb40d707adaf..03eb5335fcb3 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java
index 17edbc2edd9c..95e4f19548a4 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java
@@ -32,7 +32,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index e6ddf531002a..ceb3cacacf63 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -38,7 +38,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem = "what";
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 6c606c85a90f..c9beeee10f30 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -39,7 +39,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java
index 7268eab0d6f4..6f4cd0153513 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java
@@ -38,7 +38,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java
index 458f927a8967..b03a19af5217 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -62,7 +62,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   private String attributeString;
diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle
index 3b1a970bd1e5..1e5a0afe5093 100644
--- a/samples/client/petstore/java/retrofit2/build.gradle
+++ b/samples/client/petstore/java/retrofit2/build.gradle
@@ -114,6 +114,6 @@ dependencies {
     }
     compile "io.gsonfire:gson-fire:$json_fire_version"
     compile "org.threeten:threetenbp:$threetenbp_version"
-
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/retrofit2/build.sbt b/samples/client/petstore/java/retrofit2/build.sbt
index c3c628643336..5f3b6691e17b 100644
--- a/samples/client/petstore/java/retrofit2/build.sbt
+++ b/samples/client/petstore/java/retrofit2/build.sbt
@@ -16,6 +16,7 @@ lazy val root = (project in file(".")).
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "org.threeten" % "threetenbp" % "1.4.0" % "compile",
       "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.11" % "test"
     )
diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml
index f9891166b951..be92aa2fc719 100644
--- a/samples/client/petstore/java/retrofit2/pom.xml
+++ b/samples/client/petstore/java/retrofit2/pom.xml
@@ -132,12 +132,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -236,6 +246,12 @@
                 <artifactId>threetenbp</artifactId>
                 <version>${threetenbp-version}</version>
             </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -253,6 +269,7 @@
         <swagger-annotations-version>1.5.22</swagger-annotations-version>
         <retrofit-version>2.5.0</retrofit-version>
         <threetenbp-version>1.4.0</threetenbp-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <oltu-version>1.0.1</oltu-version>
         <junit-version>4.13</junit-version>
     </properties>
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/ApiClient.java
index ad3a711e1675..3ad04dd6d90a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/ApiClient.java
@@ -35,10 +35,18 @@ public class ApiClient {
   private OkHttpClient.Builder okBuilder;
   private Retrofit.Builder adapterBuilder;
   private JSON json;
+  private OkHttpClient okHttpClient;
 
   public ApiClient() {
     apiAuthorizations = new LinkedHashMap<String, Interceptor>();
     createDefaultAdapter();
+    okBuilder = new OkHttpClient.Builder();
+  }
+
+  public ApiClient(OkHttpClient client){
+    apiAuthorizations = new LinkedHashMap<String, Interceptor>();
+    createDefaultAdapter();
+    okHttpClient = client;
   }
 
   public ApiClient(String[] authNames) {
@@ -114,7 +122,6 @@ public ApiClient(String authName, String clientId, String secret, String usernam
 
   public void createDefaultAdapter() {
     json = new JSON();
-    okBuilder = new OkHttpClient.Builder();
 
     String baseUrl = "http://petstore.swagger.io:80/v2";
     if (!baseUrl.endsWith("/"))
@@ -128,10 +135,11 @@ public void createDefaultAdapter() {
   }
 
   public <S> S createService(Class<S> serviceClass) {
-    return adapterBuilder
-      .client(okBuilder.build())
-      .build()
-      .create(serviceClass);
+    if (okHttpClient != null) {
+        return adapterBuilder.client(okHttpClient).build().create(serviceClass);
+    } else {
+        return adapterBuilder.client(okBuilder.build()).build().create(serviceClass);
+    }
   }
 
   public ApiClient setDateFormat(DateFormat dateFormat) {
@@ -303,7 +311,11 @@ public ApiClient addAuthorization(String authName, Interceptor authorization) {
       throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations");
     }
     apiAuthorizations.put(authName, authorization);
+    if(okBuilder == null){
+    	throw new RuntimeException("The ApiClient was created with a built OkHttpClient so it's not possible to add an authorization interceptor to it");
+    }
     okBuilder.addInterceptor(authorization);
+    
     return this;
   }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/StringUtil.java
index 747a23f5bf23..4dc60597910a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/StringUtil.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 79c169543fde..43c6885f374f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index e16ee861f893..f71f19e32f5f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -30,7 +30,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 29161b52aa16..d748b6c1c7e9 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index a067b01ec979..5dcdb50233e2 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -31,7 +31,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_MAP_STRING = "map_string";
   @SerializedName(SERIALIZED_NAME_MAP_STRING)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 3a15ed7cd977..d2c4b0ef322c 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 9bc46e099916..fe1b89b67e42 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -30,7 +30,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index bd65f7791c5e..8690d66d3462 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index cdb8afedaaf4..5bd295794e93 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java
index 4d3bf2369fb6..00548e65fa3b 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java
@@ -30,7 +30,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Animal {
   public static final String SERIALIZED_NAME_CLASS_NAME = "className";
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index a6dd760660d5..0a4f98a0b627 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -30,7 +30,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 487c539d3bac..5f87c4ddef1a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -30,7 +30,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber";
   @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7d66ce233feb..ff780811ba1f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -30,7 +30,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string";
   @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCat.java
index d30cc70c0cf4..186ea74bbac1 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCat.java
@@ -29,7 +29,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class BigCat extends Cat {
   /**
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index cd2207704bd1..7a5439270613 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -27,7 +27,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java
index d4fbec81c543..c68dbeb2a423 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -27,7 +27,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String SERIALIZED_NAME_SMALL_CAMEL = "smallCamel";
   @SerializedName(SERIALIZED_NAME_SMALL_CAMEL)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
index 058f627b4141..560bebcb7bb6 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
@@ -30,7 +30,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Cat extends Animal {
   public static final String SERIALIZED_NAME_DECLAWED = "declawed";
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java
index dcd1a8e3b90e..a88c5a44b663 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -27,7 +27,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String SERIALIZED_NAME_DECLAWED = "declawed";
   @SerializedName(SERIALIZED_NAME_DECLAWED)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java
index 4d07c3a1bef1..558a67073120 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java
@@ -27,7 +27,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java
index 8867bdd06bf0..41190d85a1eb 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -28,7 +28,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String SERIALIZED_NAME_PROPERTY_CLASS = "_class";
   @SerializedName(SERIALIZED_NAME_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java
index 25831260e09b..c4baca1e73d7 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java
@@ -27,7 +27,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String SERIALIZED_NAME_CLIENT = "client";
   @SerializedName(SERIALIZED_NAME_CLIENT)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
index f80bc1ab8dcd..49df272d86ed 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
@@ -29,7 +29,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Dog extends Animal {
   public static final String SERIALIZED_NAME_BREED = "breed";
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java
index b945c2c33db4..134c87b2e9b4 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -27,7 +27,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String SERIALIZED_NAME_BREED = "breed";
   @SerializedName(SERIALIZED_NAME_BREED)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java
index 2512b4cf9d52..b1aba3f4e68d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -29,7 +29,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
index ccbbabaa9ba5..a25f521079b8 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -28,7 +28,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index f4a15cd5b7fd..908312827464 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -29,7 +29,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String SERIALIZED_NAME_FILE = "file";
   @SerializedName(SERIALIZED_NAME_FILE)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
index 5983420c81b1..ff862108132a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -32,7 +32,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String SERIALIZED_NAME_INTEGER = "integer";
   @SerializedName(SERIALIZED_NAME_INTEGER)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 8fcb26846436..0a4bdb4671ab 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -27,7 +27,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String SERIALIZED_NAME_BAR = "bar";
   @SerializedName(SERIALIZED_NAME_BAR)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java
index 7dc68b0ff00f..280d523ea933 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java
@@ -30,7 +30,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string";
   @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 527853d7522c..ea4ebddd037d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -33,7 +33,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java
index df3683dac78d..8a7a5ee5aad0 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -28,7 +28,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index b9cf72823b2f..92181899c1ae 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -27,7 +27,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String SERIALIZED_NAME_CODE = "code";
   @SerializedName(SERIALIZED_NAME_CODE)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java
index 6e9714df977d..d740c15becd1 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -28,7 +28,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String SERIALIZED_NAME_RETURN = "return";
   @SerializedName(SERIALIZED_NAME_RETURN)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java
index 94117a9b0f4b..879a6337cebc 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java
@@ -28,7 +28,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java
index 9a55d8aa615f..50981eb598e1 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -28,7 +28,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String SERIALIZED_NAME_JUST_NUMBER = "JustNumber";
   @SerializedName(SERIALIZED_NAME_JUST_NUMBER)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java
index 33d57e18bee5..847d9d8a5636 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java
@@ -28,7 +28,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java
index 1efe43b234b5..bd38e7946d50 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -28,7 +28,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String SERIALIZED_NAME_MY_NUMBER = "my_number";
   @SerializedName(SERIALIZED_NAME_MY_NUMBER)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java
index 4ea18b217b6e..6d5855842591 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java
@@ -33,7 +33,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index ed0244a3ca27..991726d89632 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -27,7 +27,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String SERIALIZED_NAME_BAR = "bar";
   @SerializedName(SERIALIZED_NAME_BAR)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 3405d30ff614..9e64e21d5856 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -27,7 +27,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   @SerializedName(SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java
index 710e0fe54a4e..259f762b292d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java
@@ -27,7 +27,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 978cdb6f78db..f3fdb3b0196d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -30,7 +30,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
   @SerializedName(SERIALIZED_NAME_STRING_ITEM)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 878b1540ee7f..f72745a6b0ba 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -30,7 +30,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
   @SerializedName(SERIALIZED_NAME_STRING_ITEM)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java
index d91115317819..349a04836d16 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java
@@ -27,7 +27,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java
index ecfd0be1b31a..ae1d289ac2c3 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -30,7 +30,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String SERIALIZED_NAME_ATTRIBUTE_STRING = "attribute_string";
   @SerializedName(SERIALIZED_NAME_ATTRIBUTE_STRING)
diff --git a/samples/client/petstore/java/retrofit2rx/.gitignore b/samples/client/petstore/java/retrofit2rx/.gitignore
deleted file mode 100644
index a530464afa1b..000000000000
--- a/samples/client/petstore/java/retrofit2rx/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# exclude jar for gradle wrapper
-!gradle/wrapper/*.jar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# build files
-**/target
-target
-.gradle
-build
diff --git a/samples/client/petstore/java/retrofit2rx/.travis.yml b/samples/client/petstore/java/retrofit2rx/.travis.yml
deleted file mode 100644
index e3bdf2af1bea..000000000000
--- a/samples/client/petstore/java/retrofit2rx/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Generated by OpenAPI Generator: https://openapi-generator.tech
-#
-# Ref: https://docs.travis-ci.com/user/languages/java/
-#
-language: java
-jdk:
-  - openjdk12
-  - openjdk11
-  - openjdk10
-  - openjdk9
-  - openjdk8
-before_install:
-  # ensure gradlew has proper permission
-  - chmod a+x ./gradlew
-script:
-  # test using maven
-  #- mvn test
-  # test using gradle
-  - gradle test
-  # test using sbt 
-  # - sbt test
diff --git a/samples/client/petstore/java/retrofit2rx/README.md b/samples/client/petstore/java/retrofit2rx/README.md
deleted file mode 100644
index 9153e965d87c..000000000000
--- a/samples/client/petstore/java/retrofit2rx/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# petstore-retrofit2-rx
-
-## Requirements
-
-Building the API client library requires [Maven](https://maven.apache.org/) to be installed.
-
-## Installation & Usage
-
-To install the API client library to your local Maven repository, simply execute:
-
-```shell
-mvn install
-```
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-```shell
-mvn deploy
-```
-
-Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
-
-After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
-
-```xml
-<dependency>
-    <groupId>org.openapitools</groupId>
-    <artifactId>petstore-retrofit2-rx</artifactId>
-    <version>1.0.0</version>
-    <scope>compile</scope>
-</dependency>
-
-```
-
-## Author
-
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/api/openapi.yaml b/samples/client/petstore/java/retrofit2rx/api/openapi.yaml
deleted file mode 100644
index a49359fd348c..000000000000
--- a/samples/client/petstore/java/retrofit2rx/api/openapi.yaml
+++ /dev/null
@@ -1,2187 +0,0 @@
-openapi: 3.0.1
-info:
-  description: 'This spec is mainly for testing Petstore server and contains fake
-    endpoints, models. Please do not use this for any other purpose. Special characters:
-    " \'
-  license:
-    name: Apache-2.0
-    url: https://www.apache.org/licenses/LICENSE-2.0.html
-  title: OpenAPI Petstore
-  version: 1.0.0
-servers:
-- url: http://petstore.swagger.io:80/v2
-tags:
-- description: Everything about your Pets
-  name: pet
-- description: Access to Petstore orders
-  name: store
-- description: Operations about user
-  name: user
-paths:
-  /pet:
-    post:
-      operationId: addPet
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Pet'
-          application/xml:
-            schema:
-              $ref: '#/components/schemas/Pet'
-        description: Pet object that needs to be added to the store
-        required: true
-      responses:
-        "200":
-          content: {}
-          description: successful operation
-        "405":
-          content: {}
-          description: Invalid input
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: Add a new pet to the store
-      tags:
-      - pet
-      x-codegen-request-body-name: body
-      x-contentType: application/json
-      x-accepts: application/json
-    put:
-      operationId: updatePet
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Pet'
-          application/xml:
-            schema:
-              $ref: '#/components/schemas/Pet'
-        description: Pet object that needs to be added to the store
-        required: true
-      responses:
-        "200":
-          content: {}
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid ID supplied
-        "404":
-          content: {}
-          description: Pet not found
-        "405":
-          content: {}
-          description: Validation exception
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: Update an existing pet
-      tags:
-      - pet
-      x-codegen-request-body-name: body
-      x-contentType: application/json
-      x-accepts: application/json
-  /pet/findByStatus:
-    get:
-      description: Multiple status values can be provided with comma separated strings
-      operationId: findPetsByStatus
-      parameters:
-      - description: Status values that need to be considered for filter
-        explode: false
-        in: query
-        name: status
-        required: true
-        schema:
-          items:
-            default: available
-            enum:
-            - available
-            - pending
-            - sold
-            type: string
-          type: array
-        style: form
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                items:
-                  $ref: '#/components/schemas/Pet'
-                type: array
-            application/json:
-              schema:
-                items:
-                  $ref: '#/components/schemas/Pet'
-                type: array
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid status value
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: Finds Pets by status
-      tags:
-      - pet
-      x-accepts: application/json
-  /pet/findByTags:
-    get:
-      deprecated: true
-      description: Multiple tags can be provided with comma separated strings. Use
-        tag1, tag2, tag3 for testing.
-      operationId: findPetsByTags
-      parameters:
-      - description: Tags to filter by
-        explode: false
-        in: query
-        name: tags
-        required: true
-        schema:
-          items:
-            type: string
-          type: array
-          uniqueItems: true
-        style: form
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                items:
-                  $ref: '#/components/schemas/Pet'
-                type: array
-                uniqueItems: true
-            application/json:
-              schema:
-                items:
-                  $ref: '#/components/schemas/Pet'
-                type: array
-                uniqueItems: true
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid tag value
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: Finds Pets by tags
-      tags:
-      - pet
-      x-accepts: application/json
-  /pet/{petId}:
-    delete:
-      operationId: deletePet
-      parameters:
-      - in: header
-        name: api_key
-        schema:
-          type: string
-      - description: Pet id to delete
-        in: path
-        name: petId
-        required: true
-        schema:
-          format: int64
-          type: integer
-      responses:
-        "200":
-          content: {}
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid pet value
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: Deletes a pet
-      tags:
-      - pet
-      x-accepts: application/json
-    get:
-      description: Returns a single pet
-      operationId: getPetById
-      parameters:
-      - description: ID of pet to return
-        in: path
-        name: petId
-        required: true
-        schema:
-          format: int64
-          type: integer
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                $ref: '#/components/schemas/Pet'
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Pet'
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid ID supplied
-        "404":
-          content: {}
-          description: Pet not found
-      security:
-      - api_key: []
-      summary: Find pet by ID
-      tags:
-      - pet
-      x-accepts: application/json
-    post:
-      operationId: updatePetWithForm
-      parameters:
-      - description: ID of pet that needs to be updated
-        in: path
-        name: petId
-        required: true
-        schema:
-          format: int64
-          type: integer
-      requestBody:
-        content:
-          application/x-www-form-urlencoded:
-            schema:
-              properties:
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
-      responses:
-        "405":
-          content: {}
-          description: Invalid input
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: Updates a pet in the store with form data
-      tags:
-      - pet
-      x-contentType: application/x-www-form-urlencoded
-      x-accepts: application/json
-  /pet/{petId}/uploadImage:
-    post:
-      operationId: uploadFile
-      parameters:
-      - description: ID of pet to update
-        in: path
-        name: petId
-        required: true
-        schema:
-          format: int64
-          type: integer
-      requestBody:
-        content:
-          multipart/form-data:
-            schema:
-              properties:
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ApiResponse'
-          description: successful operation
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: uploads an image
-      tags:
-      - pet
-      x-contentType: multipart/form-data
-      x-accepts: application/json
-  /store/inventory:
-    get:
-      description: Returns a map of status codes to quantities
-      operationId: getInventory
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                additionalProperties:
-                  format: int32
-                  type: integer
-                type: object
-          description: successful operation
-      security:
-      - api_key: []
-      summary: Returns pet inventories by status
-      tags:
-      - store
-      x-accepts: application/json
-  /store/order:
-    post:
-      operationId: placeOrder
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              $ref: '#/components/schemas/Order'
-        description: order placed for purchasing the pet
-        required: true
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                $ref: '#/components/schemas/Order'
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid Order
-      summary: Place an order for a pet
-      tags:
-      - store
-      x-codegen-request-body-name: body
-      x-contentType: '*/*'
-      x-accepts: application/json
-  /store/order/{order_id}:
-    delete:
-      description: For valid response try integer IDs with value < 1000. Anything
-        above 1000 or nonintegers will generate API errors
-      operationId: deleteOrder
-      parameters:
-      - description: ID of the order that needs to be deleted
-        in: path
-        name: order_id
-        required: true
-        schema:
-          type: string
-      responses:
-        "400":
-          content: {}
-          description: Invalid ID supplied
-        "404":
-          content: {}
-          description: Order not found
-      summary: Delete purchase order by ID
-      tags:
-      - store
-      x-accepts: application/json
-    get:
-      description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
-      operationId: getOrderById
-      parameters:
-      - description: ID of pet that needs to be fetched
-        in: path
-        name: order_id
-        required: true
-        schema:
-          format: int64
-          maximum: 5
-          minimum: 1
-          type: integer
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                $ref: '#/components/schemas/Order'
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid ID supplied
-        "404":
-          content: {}
-          description: Order not found
-      summary: Find purchase order by ID
-      tags:
-      - store
-      x-accepts: application/json
-  /user:
-    post:
-      description: This can only be done by the logged in user.
-      operationId: createUser
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              $ref: '#/components/schemas/User'
-        description: Created user object
-        required: true
-      responses:
-        default:
-          content: {}
-          description: successful operation
-      summary: Create user
-      tags:
-      - user
-      x-codegen-request-body-name: body
-      x-contentType: '*/*'
-      x-accepts: application/json
-  /user/createWithArray:
-    post:
-      operationId: createUsersWithArrayInput
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              items:
-                $ref: '#/components/schemas/User'
-              type: array
-        description: List of user object
-        required: true
-      responses:
-        default:
-          content: {}
-          description: successful operation
-      summary: Creates list of users with given input array
-      tags:
-      - user
-      x-codegen-request-body-name: body
-      x-contentType: '*/*'
-      x-accepts: application/json
-  /user/createWithList:
-    post:
-      operationId: createUsersWithListInput
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              items:
-                $ref: '#/components/schemas/User'
-              type: array
-        description: List of user object
-        required: true
-      responses:
-        default:
-          content: {}
-          description: successful operation
-      summary: Creates list of users with given input array
-      tags:
-      - user
-      x-codegen-request-body-name: body
-      x-contentType: '*/*'
-      x-accepts: application/json
-  /user/login:
-    get:
-      operationId: loginUser
-      parameters:
-      - description: The user name for login
-        in: query
-        name: username
-        required: true
-        schema:
-          type: string
-      - description: The password for login in clear text
-        in: query
-        name: password
-        required: true
-        schema:
-          type: string
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                type: string
-            application/json:
-              schema:
-                type: string
-          description: successful operation
-          headers:
-            X-Rate-Limit:
-              description: calls per hour allowed by the user
-              schema:
-                format: int32
-                type: integer
-            X-Expires-After:
-              description: date in UTC when token expires
-              schema:
-                format: date-time
-                type: string
-        "400":
-          content: {}
-          description: Invalid username/password supplied
-      summary: Logs user into the system
-      tags:
-      - user
-      x-accepts: application/json
-  /user/logout:
-    get:
-      operationId: logoutUser
-      responses:
-        default:
-          content: {}
-          description: successful operation
-      summary: Logs out current logged in user session
-      tags:
-      - user
-      x-accepts: application/json
-  /user/{username}:
-    delete:
-      description: This can only be done by the logged in user.
-      operationId: deleteUser
-      parameters:
-      - description: The name that needs to be deleted
-        in: path
-        name: username
-        required: true
-        schema:
-          type: string
-      responses:
-        "400":
-          content: {}
-          description: Invalid username supplied
-        "404":
-          content: {}
-          description: User not found
-      summary: Delete user
-      tags:
-      - user
-      x-accepts: application/json
-    get:
-      operationId: getUserByName
-      parameters:
-      - description: The name that needs to be fetched. Use user1 for testing.
-        in: path
-        name: username
-        required: true
-        schema:
-          type: string
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                $ref: '#/components/schemas/User'
-            application/json:
-              schema:
-                $ref: '#/components/schemas/User'
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid username supplied
-        "404":
-          content: {}
-          description: User not found
-      summary: Get user by user name
-      tags:
-      - user
-      x-accepts: application/json
-    put:
-      description: This can only be done by the logged in user.
-      operationId: updateUser
-      parameters:
-      - description: name that need to be deleted
-        in: path
-        name: username
-        required: true
-        schema:
-          type: string
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              $ref: '#/components/schemas/User'
-        description: Updated user object
-        required: true
-      responses:
-        "400":
-          content: {}
-          description: Invalid user supplied
-        "404":
-          content: {}
-          description: User not found
-      summary: Updated user
-      tags:
-      - user
-      x-codegen-request-body-name: body
-      x-contentType: '*/*'
-      x-accepts: application/json
-  /fake_classname_test:
-    patch:
-      description: To test class name in snake case
-      operationId: testClassname
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Client'
-        description: client model
-        required: true
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Client'
-          description: successful operation
-      security:
-      - api_key_query: []
-      summary: To test class name in snake case
-      tags:
-      - fake_classname_tags 123#$%^
-      x-codegen-request-body-name: body
-      x-contentType: application/json
-      x-accepts: application/json
-  /fake:
-    delete:
-      description: Fake endpoint to test group parameters (optional)
-      operationId: testGroupParameters
-      parameters:
-      - description: Required String in group parameters
-        in: query
-        name: required_string_group
-        required: true
-        schema:
-          type: integer
-      - description: Required Boolean in group parameters
-        in: header
-        name: required_boolean_group
-        required: true
-        schema:
-          type: boolean
-      - description: Required Integer in group parameters
-        in: query
-        name: required_int64_group
-        required: true
-        schema:
-          format: int64
-          type: integer
-      - description: String in group parameters
-        in: query
-        name: string_group
-        schema:
-          type: integer
-      - description: Boolean in group parameters
-        in: header
-        name: boolean_group
-        schema:
-          type: boolean
-      - description: Integer in group parameters
-        in: query
-        name: int64_group
-        schema:
-          format: int64
-          type: integer
-      responses:
-        "400":
-          content: {}
-          description: Someting wrong
-      summary: Fake endpoint to test group parameters (optional)
-      tags:
-      - fake
-      x-group-parameters: true
-      x-accepts: application/json
-    get:
-      description: To test enum parameters
-      operationId: testEnumParameters
-      parameters:
-      - description: Header parameter enum test (string array)
-        explode: false
-        in: header
-        name: enum_header_string_array
-        schema:
-          items:
-            default: $
-            enum:
-            - '>'
-            - $
-            type: string
-          type: array
-        style: simple
-      - description: Header parameter enum test (string)
-        in: header
-        name: enum_header_string
-        schema:
-          default: -efg
-          enum:
-          - _abc
-          - -efg
-          - (xyz)
-          type: string
-      - description: Query parameter enum test (string array)
-        explode: false
-        in: query
-        name: enum_query_string_array
-        schema:
-          items:
-            default: $
-            enum:
-            - '>'
-            - $
-            type: string
-          type: array
-        style: form
-      - description: Query parameter enum test (string)
-        in: query
-        name: enum_query_string
-        schema:
-          default: -efg
-          enum:
-          - _abc
-          - -efg
-          - (xyz)
-          type: string
-      - description: Query parameter enum test (double)
-        in: query
-        name: enum_query_integer
-        schema:
-          enum:
-          - 1
-          - -2
-          format: int32
-          type: integer
-      - description: Query parameter enum test (double)
-        in: query
-        name: enum_query_double
-        schema:
-          enum:
-          - 1.1
-          - -1.2
-          format: double
-          type: number
-      requestBody:
-        content:
-          application/x-www-form-urlencoded:
-            schema:
-              properties:
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
-      responses:
-        "400":
-          content: {}
-          description: Invalid request
-        "404":
-          content: {}
-          description: Not found
-      summary: To test enum parameters
-      tags:
-      - fake
-      x-contentType: application/x-www-form-urlencoded
-      x-accepts: application/json
-    patch:
-      description: To test "client" model
-      operationId: testClientModel
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Client'
-        description: client model
-        required: true
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Client'
-          description: successful operation
-      summary: To test "client" model
-      tags:
-      - fake
-      x-codegen-request-body-name: body
-      x-contentType: application/json
-      x-accepts: application/json
-    post:
-      description: |-
-        Fake endpoint for testing various parameters
-         假端點
-         偽のエンドポイント
-         가짜 엔드 포인트
-      operationId: testEndpointParameters
-      requestBody:
-        content:
-          application/x-www-form-urlencoded:
-            schema:
-              properties:
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: /[a-z]/i
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: ^[A-Z].*
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
-        required: true
-      responses:
-        "400":
-          content: {}
-          description: Invalid username supplied
-        "404":
-          content: {}
-          description: User not found
-      security:
-      - http_basic_test: []
-      summary: |-
-        Fake endpoint for testing various parameters
-         假端點
-         偽のエンドポイント
-         가짜 엔드 포인트
-      tags:
-      - fake
-      x-contentType: application/x-www-form-urlencoded
-      x-accepts: application/json
-  /fake/outer/number:
-    post:
-      description: Test serialization of outer number types
-      operationId: fakeOuterNumberSerialize
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              $ref: '#/components/schemas/OuterNumber'
-        description: Input number as post body
-        required: false
-      responses:
-        "200":
-          content:
-            '*/*':
-              schema:
-                $ref: '#/components/schemas/OuterNumber'
-          description: Output number
-      tags:
-      - fake
-      x-codegen-request-body-name: body
-      x-contentType: '*/*'
-      x-accepts: '*/*'
-  /fake/outer/string:
-    post:
-      description: Test serialization of outer string types
-      operationId: fakeOuterStringSerialize
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              $ref: '#/components/schemas/OuterString'
-        description: Input string as post body
-        required: false
-      responses:
-        "200":
-          content:
-            '*/*':
-              schema:
-                $ref: '#/components/schemas/OuterString'
-          description: Output string
-      tags:
-      - fake
-      x-codegen-request-body-name: body
-      x-contentType: '*/*'
-      x-accepts: '*/*'
-  /fake/outer/boolean:
-    post:
-      description: Test serialization of outer boolean types
-      operationId: fakeOuterBooleanSerialize
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              $ref: '#/components/schemas/OuterBoolean'
-        description: Input boolean as post body
-        required: false
-      responses:
-        "200":
-          content:
-            '*/*':
-              schema:
-                $ref: '#/components/schemas/OuterBoolean'
-          description: Output boolean
-      tags:
-      - fake
-      x-codegen-request-body-name: body
-      x-contentType: '*/*'
-      x-accepts: '*/*'
-  /fake/outer/composite:
-    post:
-      description: Test serialization of object with outer number type
-      operationId: fakeOuterCompositeSerialize
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              $ref: '#/components/schemas/OuterComposite'
-        description: Input composite as post body
-        required: false
-      responses:
-        "200":
-          content:
-            '*/*':
-              schema:
-                $ref: '#/components/schemas/OuterComposite'
-          description: Output composite
-      tags:
-      - fake
-      x-codegen-request-body-name: body
-      x-contentType: '*/*'
-      x-accepts: '*/*'
-  /fake/jsonFormData:
-    get:
-      operationId: testJsonFormData
-      requestBody:
-        content:
-          application/x-www-form-urlencoded:
-            schema:
-              properties:
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
-        required: true
-      responses:
-        "200":
-          content: {}
-          description: successful operation
-      summary: test json serialization of form data
-      tags:
-      - fake
-      x-contentType: application/x-www-form-urlencoded
-      x-accepts: application/json
-  /fake/inline-additionalProperties:
-    post:
-      operationId: testInlineAdditionalProperties
-      requestBody:
-        content:
-          application/json:
-            schema:
-              additionalProperties:
-                type: string
-              type: object
-        description: request body
-        required: true
-      responses:
-        "200":
-          content: {}
-          description: successful operation
-      summary: test inline additionalProperties
-      tags:
-      - fake
-      x-codegen-request-body-name: param
-      x-contentType: application/json
-      x-accepts: application/json
-  /fake/body-with-query-params:
-    put:
-      operationId: testBodyWithQueryParams
-      parameters:
-      - in: query
-        name: query
-        required: true
-        schema:
-          type: string
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/User'
-        required: true
-      responses:
-        "200":
-          content: {}
-          description: Success
-      tags:
-      - fake
-      x-codegen-request-body-name: body
-      x-contentType: application/json
-      x-accepts: application/json
-  /fake/create_xml_item:
-    post:
-      description: this route creates an XmlItem
-      operationId: createXmlItem
-      requestBody:
-        content:
-          application/xml:
-            schema:
-              $ref: '#/components/schemas/XmlItem'
-          application/xml; charset=utf-8:
-            schema:
-              $ref: '#/components/schemas/XmlItem'
-          application/xml; charset=utf-16:
-            schema:
-              $ref: '#/components/schemas/XmlItem'
-          text/xml:
-            schema:
-              $ref: '#/components/schemas/XmlItem'
-          text/xml; charset=utf-8:
-            schema:
-              $ref: '#/components/schemas/XmlItem'
-          text/xml; charset=utf-16:
-            schema:
-              $ref: '#/components/schemas/XmlItem'
-        description: XmlItem Body
-        required: true
-      responses:
-        "200":
-          content: {}
-          description: successful operation
-      summary: creates an XmlItem
-      tags:
-      - fake
-      x-codegen-request-body-name: XmlItem
-      x-contentType: application/xml
-      x-accepts: application/json
-  /another-fake/dummy:
-    patch:
-      description: To test special tags and operation ID starting with number
-      operationId: 123_test_@#$%_special_tags
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Client'
-        description: client model
-        required: true
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Client'
-          description: successful operation
-      summary: To test special tags
-      tags:
-      - $another-fake?
-      x-codegen-request-body-name: body
-      x-contentType: application/json
-      x-accepts: application/json
-  /fake/body-with-file-schema:
-    put:
-      description: For this test, the body for this request much reference a schema
-        named `File`.
-      operationId: testBodyWithFileSchema
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/FileSchemaTestClass'
-        required: true
-      responses:
-        "200":
-          content: {}
-          description: Success
-      tags:
-      - fake
-      x-codegen-request-body-name: body
-      x-contentType: application/json
-      x-accepts: application/json
-  /fake/test-query-paramters:
-    put:
-      description: To test the collection format in query parameters
-      operationId: testQueryParameterCollectionFormat
-      parameters:
-      - explode: false
-        in: query
-        name: pipe
-        required: true
-        schema:
-          items:
-            type: string
-          type: array
-        style: form
-      - in: query
-        name: ioutil
-        required: true
-        schema:
-          items:
-            type: string
-          type: array
-      - in: query
-        name: http
-        required: true
-        schema:
-          items:
-            type: string
-          type: array
-        style: spaceDelimited
-      - explode: false
-        in: query
-        name: url
-        required: true
-        schema:
-          items:
-            type: string
-          type: array
-        style: form
-      - explode: true
-        in: query
-        name: context
-        required: true
-        schema:
-          items:
-            type: string
-          type: array
-        style: form
-      responses:
-        "200":
-          content: {}
-          description: Success
-      tags:
-      - fake
-      x-accepts: application/json
-  /fake/{petId}/uploadImageWithRequiredFile:
-    post:
-      operationId: uploadFileWithRequiredFile
-      parameters:
-      - description: ID of pet to update
-        in: path
-        name: petId
-        required: true
-        schema:
-          format: int64
-          type: integer
-      requestBody:
-        content:
-          multipart/form-data:
-            schema:
-              properties:
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
-        required: true
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ApiResponse'
-          description: successful operation
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: uploads an image (required)
-      tags:
-      - pet
-      x-contentType: multipart/form-data
-      x-accepts: application/json
-components:
-  schemas:
-    Order:
-      example:
-        petId: 6
-        quantity: 1
-        id: 0
-        shipDate: 2000-01-23T04:56:07.000+00:00
-        complete: false
-        status: placed
-      properties:
-        id:
-          format: int64
-          type: integer
-        petId:
-          format: int64
-          type: integer
-        quantity:
-          format: int32
-          type: integer
-        shipDate:
-          format: date-time
-          type: string
-        status:
-          description: Order Status
-          enum:
-          - placed
-          - approved
-          - delivered
-          type: string
-        complete:
-          default: false
-          type: boolean
-      type: object
-      xml:
-        name: Order
-    Category:
-      example:
-        name: default-name
-        id: 6
-      properties:
-        id:
-          format: int64
-          type: integer
-        name:
-          default: default-name
-          type: string
-      required:
-      - name
-      type: object
-      xml:
-        name: Category
-    User:
-      example:
-        firstName: firstName
-        lastName: lastName
-        password: password
-        userStatus: 6
-        phone: phone
-        id: 0
-        email: email
-        username: username
-      properties:
-        id:
-          format: int64
-          type: integer
-          x-is-unique: true
-        username:
-          type: string
-        firstName:
-          type: string
-        lastName:
-          type: string
-        email:
-          type: string
-        password:
-          type: string
-        phone:
-          type: string
-        userStatus:
-          description: User Status
-          format: int32
-          type: integer
-      type: object
-      xml:
-        name: User
-    Tag:
-      example:
-        name: name
-        id: 1
-      properties:
-        id:
-          format: int64
-          type: integer
-        name:
-          type: string
-      type: object
-      xml:
-        name: Tag
-    Pet:
-      example:
-        photoUrls:
-        - photoUrls
-        - photoUrls
-        name: doggie
-        id: 0
-        category:
-          name: default-name
-          id: 6
-        tags:
-        - name: name
-          id: 1
-        - name: name
-          id: 1
-        status: available
-      properties:
-        id:
-          format: int64
-          type: integer
-          x-is-unique: true
-        category:
-          $ref: '#/components/schemas/Category'
-        name:
-          example: doggie
-          type: string
-        photoUrls:
-          items:
-            type: string
-          type: array
-          uniqueItems: true
-          xml:
-            name: photoUrl
-            wrapped: true
-        tags:
-          items:
-            $ref: '#/components/schemas/Tag'
-          type: array
-          xml:
-            name: tag
-            wrapped: true
-        status:
-          description: pet status in the store
-          enum:
-          - available
-          - pending
-          - sold
-          type: string
-      required:
-      - name
-      - photoUrls
-      type: object
-      xml:
-        name: Pet
-    ApiResponse:
-      example:
-        code: 0
-        type: type
-        message: message
-      properties:
-        code:
-          format: int32
-          type: integer
-        type:
-          type: string
-        message:
-          type: string
-      type: object
-    $special[model.name]:
-      properties:
-        $special[property.name]:
-          format: int64
-          type: integer
-      type: object
-      xml:
-        name: $special[model.name]
-    Return:
-      description: Model for testing reserved words
-      properties:
-        return:
-          format: int32
-          type: integer
-      type: object
-      xml:
-        name: Return
-    Name:
-      description: Model for testing model name same as property name
-      properties:
-        name:
-          format: int32
-          type: integer
-        snake_case:
-          format: int32
-          readOnly: true
-          type: integer
-        property:
-          type: string
-        "123Number":
-          readOnly: true
-          type: integer
-      required:
-      - name
-      type: object
-      xml:
-        name: Name
-    "200_response":
-      description: Model for testing model name starting with number
-      properties:
-        name:
-          format: int32
-          type: integer
-        class:
-          type: string
-      type: object
-      xml:
-        name: Name
-    ClassModel:
-      description: Model for testing model with "_class" property
-      properties:
-        _class:
-          type: string
-      type: object
-    Dog:
-      allOf:
-      - $ref: '#/components/schemas/Animal'
-      - $ref: '#/components/schemas/Dog_allOf'
-    Cat:
-      allOf:
-      - $ref: '#/components/schemas/Animal'
-      - $ref: '#/components/schemas/Cat_allOf'
-    BigCat:
-      allOf:
-      - $ref: '#/components/schemas/Cat'
-      - $ref: '#/components/schemas/BigCat_allOf'
-    Animal:
-      discriminator:
-        propertyName: className
-      properties:
-        className:
-          type: string
-        color:
-          default: red
-          type: string
-      required:
-      - className
-      type: object
-    AnimalFarm:
-      items:
-        $ref: '#/components/schemas/Animal'
-      type: array
-    format_test:
-      properties:
-        integer:
-          maximum: 1E+2
-          minimum: 1E+1
-          type: integer
-        int32:
-          format: int32
-          maximum: 2E+2
-          minimum: 2E+1
-          type: integer
-        int64:
-          format: int64
-          type: integer
-        number:
-          maximum: 543.2
-          minimum: 32.1
-          type: number
-        float:
-          format: float
-          maximum: 987.6
-          minimum: 54.3
-          type: number
-        double:
-          format: double
-          maximum: 123.4
-          minimum: 67.8
-          type: number
-        string:
-          pattern: /[a-z]/i
-          type: string
-        byte:
-          format: byte
-          pattern: ^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$
-          type: string
-        binary:
-          format: binary
-          type: string
-        date:
-          format: date
-          type: string
-        dateTime:
-          format: date-time
-          type: string
-        uuid:
-          example: 72f98069-206d-4f12-9f12-3d1e525a8e84
-          format: uuid
-          type: string
-        password:
-          format: password
-          maxLength: 64
-          minLength: 10
-          type: string
-        BigDecimal:
-          format: number
-          type: string
-      required:
-      - byte
-      - date
-      - number
-      - password
-      type: object
-    EnumClass:
-      default: -efg
-      enum:
-      - _abc
-      - -efg
-      - (xyz)
-      type: string
-    Enum_Test:
-      properties:
-        enum_string:
-          enum:
-          - UPPER
-          - lower
-          - ""
-          type: string
-        enum_string_required:
-          enum:
-          - UPPER
-          - lower
-          - ""
-          type: string
-        enum_integer:
-          enum:
-          - 1
-          - -1
-          format: int32
-          type: integer
-        enum_number:
-          enum:
-          - 1.1
-          - -1.2
-          format: double
-          type: number
-        outerEnum:
-          $ref: '#/components/schemas/OuterEnum'
-      required:
-      - enum_string_required
-      type: object
-    AdditionalPropertiesClass:
-      properties:
-        map_string:
-          additionalProperties:
-            type: string
-          type: object
-        map_number:
-          additionalProperties:
-            type: number
-          type: object
-        map_integer:
-          additionalProperties:
-            type: integer
-          type: object
-        map_boolean:
-          additionalProperties:
-            type: boolean
-          type: object
-        map_array_integer:
-          additionalProperties:
-            items:
-              type: integer
-            type: array
-          type: object
-        map_array_anytype:
-          additionalProperties:
-            items:
-              properties: {}
-              type: object
-            type: array
-          type: object
-        map_map_string:
-          additionalProperties:
-            additionalProperties:
-              type: string
-            type: object
-          type: object
-        map_map_anytype:
-          additionalProperties:
-            additionalProperties:
-              properties: {}
-              type: object
-            type: object
-          type: object
-        anytype_1:
-          properties: {}
-          type: object
-        anytype_2:
-          type: object
-        anytype_3:
-          properties: {}
-          type: object
-      type: object
-    AdditionalPropertiesString:
-      additionalProperties:
-        type: string
-      properties:
-        name:
-          type: string
-      type: object
-    AdditionalPropertiesInteger:
-      additionalProperties:
-        type: integer
-      properties:
-        name:
-          type: string
-      type: object
-    AdditionalPropertiesNumber:
-      additionalProperties:
-        type: number
-      properties:
-        name:
-          type: string
-      type: object
-    AdditionalPropertiesBoolean:
-      additionalProperties:
-        type: boolean
-      properties:
-        name:
-          type: string
-      type: object
-    AdditionalPropertiesArray:
-      additionalProperties:
-        items:
-          properties: {}
-          type: object
-        type: array
-      properties:
-        name:
-          type: string
-      type: object
-    AdditionalPropertiesObject:
-      additionalProperties:
-        additionalProperties:
-          properties: {}
-          type: object
-        type: object
-      properties:
-        name:
-          type: string
-      type: object
-    AdditionalPropertiesAnyType:
-      additionalProperties:
-        properties: {}
-        type: object
-      properties:
-        name:
-          type: string
-      type: object
-    MixedPropertiesAndAdditionalPropertiesClass:
-      properties:
-        uuid:
-          format: uuid
-          type: string
-        dateTime:
-          format: date-time
-          type: string
-        map:
-          additionalProperties:
-            $ref: '#/components/schemas/Animal'
-          type: object
-      type: object
-    List:
-      properties:
-        "123-list":
-          type: string
-      type: object
-    Client:
-      example:
-        client: client
-      properties:
-        client:
-          type: string
-      type: object
-    ReadOnlyFirst:
-      properties:
-        bar:
-          readOnly: true
-          type: string
-        baz:
-          type: string
-      type: object
-    hasOnlyReadOnly:
-      properties:
-        bar:
-          readOnly: true
-          type: string
-        foo:
-          readOnly: true
-          type: string
-      type: object
-    Capitalization:
-      properties:
-        smallCamel:
-          type: string
-        CapitalCamel:
-          type: string
-        small_Snake:
-          type: string
-        Capital_Snake:
-          type: string
-        SCA_ETH_Flow_Points:
-          type: string
-        ATT_NAME:
-          description: |
-            Name of the pet
-          type: string
-      type: object
-    MapTest:
-      properties:
-        map_map_of_string:
-          additionalProperties:
-            additionalProperties:
-              type: string
-            type: object
-          type: object
-        map_of_enum_string:
-          additionalProperties:
-            enum:
-            - UPPER
-            - lower
-            type: string
-          type: object
-        direct_map:
-          additionalProperties:
-            type: boolean
-          type: object
-        indirect_map:
-          additionalProperties:
-            type: boolean
-          type: object
-      type: object
-    ArrayTest:
-      properties:
-        array_of_string:
-          items:
-            type: string
-          type: array
-        array_array_of_integer:
-          items:
-            items:
-              format: int64
-              type: integer
-            type: array
-          type: array
-        array_array_of_model:
-          items:
-            items:
-              $ref: '#/components/schemas/ReadOnlyFirst'
-            type: array
-          type: array
-      type: object
-    NumberOnly:
-      properties:
-        JustNumber:
-          type: number
-      type: object
-    ArrayOfNumberOnly:
-      properties:
-        ArrayNumber:
-          items:
-            type: number
-          type: array
-      type: object
-    ArrayOfArrayOfNumberOnly:
-      properties:
-        ArrayArrayNumber:
-          items:
-            items:
-              type: number
-            type: array
-          type: array
-      type: object
-    EnumArrays:
-      properties:
-        just_symbol:
-          enum:
-          - '>='
-          - $
-          type: string
-        array_enum:
-          items:
-            enum:
-            - fish
-            - crab
-            type: string
-          type: array
-      type: object
-    OuterEnum:
-      enum:
-      - placed
-      - approved
-      - delivered
-      type: string
-    OuterComposite:
-      example:
-        my_string: my_string
-        my_number: 0.8008281904610115
-        my_boolean: true
-      properties:
-        my_number:
-          type: number
-        my_string:
-          type: string
-        my_boolean:
-          type: boolean
-          x-codegen-body-parameter-name: boolean_post_body
-      type: object
-    OuterNumber:
-      type: number
-    OuterString:
-      type: string
-    OuterBoolean:
-      type: boolean
-      x-codegen-body-parameter-name: boolean_post_body
-    StringBooleanMap:
-      additionalProperties:
-        type: boolean
-      type: object
-    FileSchemaTestClass:
-      example:
-        file:
-          sourceURI: sourceURI
-        files:
-        - sourceURI: sourceURI
-        - sourceURI: sourceURI
-      properties:
-        file:
-          $ref: '#/components/schemas/File'
-        files:
-          items:
-            $ref: '#/components/schemas/File'
-          type: array
-      type: object
-    File:
-      description: Must be named `File` for test.
-      example:
-        sourceURI: sourceURI
-      properties:
-        sourceURI:
-          description: Test capitalization
-          type: string
-      type: object
-    TypeHolderDefault:
-      properties:
-        string_item:
-          default: what
-          type: string
-        number_item:
-          type: number
-        integer_item:
-          type: integer
-        bool_item:
-          default: true
-          type: boolean
-        array_item:
-          items:
-            type: integer
-          type: array
-      required:
-      - array_item
-      - bool_item
-      - integer_item
-      - number_item
-      - string_item
-      type: object
-    TypeHolderExample:
-      properties:
-        string_item:
-          example: what
-          type: string
-        number_item:
-          example: 1.234
-          type: number
-        float_item:
-          example: 1.234
-          format: float
-          type: number
-        integer_item:
-          example: -2
-          type: integer
-        bool_item:
-          example: true
-          type: boolean
-        array_item:
-          example:
-          - 0
-          - 1
-          - 2
-          - 3
-          items:
-            type: integer
-          type: array
-      required:
-      - array_item
-      - bool_item
-      - float_item
-      - integer_item
-      - number_item
-      - string_item
-      type: object
-    XmlItem:
-      properties:
-        attribute_string:
-          example: string
-          type: string
-          xml:
-            attribute: true
-        attribute_number:
-          example: 1.234
-          type: number
-          xml:
-            attribute: true
-        attribute_integer:
-          example: -2
-          type: integer
-          xml:
-            attribute: true
-        attribute_boolean:
-          example: true
-          type: boolean
-          xml:
-            attribute: true
-        wrapped_array:
-          items:
-            type: integer
-          type: array
-          xml:
-            wrapped: true
-        name_string:
-          example: string
-          type: string
-          xml:
-            name: xml_name_string
-        name_number:
-          example: 1.234
-          type: number
-          xml:
-            name: xml_name_number
-        name_integer:
-          example: -2
-          type: integer
-          xml:
-            name: xml_name_integer
-        name_boolean:
-          example: true
-          type: boolean
-          xml:
-            name: xml_name_boolean
-        name_array:
-          items:
-            type: integer
-            xml:
-              name: xml_name_array_item
-          type: array
-        name_wrapped_array:
-          items:
-            type: integer
-            xml:
-              name: xml_name_wrapped_array_item
-          type: array
-          xml:
-            name: xml_name_wrapped_array
-            wrapped: true
-        prefix_string:
-          example: string
-          type: string
-          xml:
-            prefix: ab
-        prefix_number:
-          example: 1.234
-          type: number
-          xml:
-            prefix: cd
-        prefix_integer:
-          example: -2
-          type: integer
-          xml:
-            prefix: ef
-        prefix_boolean:
-          example: true
-          type: boolean
-          xml:
-            prefix: gh
-        prefix_array:
-          items:
-            type: integer
-            xml:
-              prefix: ij
-          type: array
-        prefix_wrapped_array:
-          items:
-            type: integer
-            xml:
-              prefix: mn
-          type: array
-          xml:
-            prefix: kl
-            wrapped: true
-        namespace_string:
-          example: string
-          type: string
-          xml:
-            namespace: http://a.com/schema
-        namespace_number:
-          example: 1.234
-          type: number
-          xml:
-            namespace: http://b.com/schema
-        namespace_integer:
-          example: -2
-          type: integer
-          xml:
-            namespace: http://c.com/schema
-        namespace_boolean:
-          example: true
-          type: boolean
-          xml:
-            namespace: http://d.com/schema
-        namespace_array:
-          items:
-            type: integer
-            xml:
-              namespace: http://e.com/schema
-          type: array
-        namespace_wrapped_array:
-          items:
-            type: integer
-            xml:
-              namespace: http://g.com/schema
-          type: array
-          xml:
-            namespace: http://f.com/schema
-            wrapped: true
-        prefix_ns_string:
-          example: string
-          type: string
-          xml:
-            namespace: http://a.com/schema
-            prefix: a
-        prefix_ns_number:
-          example: 1.234
-          type: number
-          xml:
-            namespace: http://b.com/schema
-            prefix: b
-        prefix_ns_integer:
-          example: -2
-          type: integer
-          xml:
-            namespace: http://c.com/schema
-            prefix: c
-        prefix_ns_boolean:
-          example: true
-          type: boolean
-          xml:
-            namespace: http://d.com/schema
-            prefix: d
-        prefix_ns_array:
-          items:
-            type: integer
-            xml:
-              namespace: http://e.com/schema
-              prefix: e
-          type: array
-        prefix_ns_wrapped_array:
-          items:
-            type: integer
-            xml:
-              namespace: http://g.com/schema
-              prefix: g
-          type: array
-          xml:
-            namespace: http://f.com/schema
-            prefix: f
-            wrapped: true
-      type: object
-      xml:
-        namespace: http://a.com/schema
-        prefix: pre
-    Dog_allOf:
-      properties:
-        breed:
-          type: string
-    Cat_allOf:
-      properties:
-        declawed:
-          type: boolean
-    BigCat_allOf:
-      properties:
-        kind:
-          enum:
-          - lions
-          - tigers
-          - leopards
-          - jaguars
-          type: string
-  securitySchemes:
-    petstore_auth:
-      flows:
-        implicit:
-          authorizationUrl: http://petstore.swagger.io/api/oauth/dialog
-          scopes:
-            write:pets: modify pets in your account
-            read:pets: read your pets
-      type: oauth2
-    api_key:
-      in: header
-      name: api_key
-      type: apiKey
-    api_key_query:
-      in: query
-      name: api_key_query
-      type: apiKey
-    http_basic_test:
-      scheme: basic
-      type: http
-
diff --git a/samples/client/petstore/java/retrofit2rx/build.gradle b/samples/client/petstore/java/retrofit2rx/build.gradle
deleted file mode 100644
index 5b8f85066e0c..000000000000
--- a/samples/client/petstore/java/retrofit2rx/build.gradle
+++ /dev/null
@@ -1,122 +0,0 @@
-apply plugin: 'idea'
-apply plugin: 'eclipse'
-
-group = 'org.openapitools'
-version = '1.0.0'
-
-buildscript {
-    repositories {
-        maven { url "https://repo1.maven.org/maven2" }
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.+'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-    }
-}
-
-repositories {
-    jcenter()
-}
-
-
-if(hasProperty('target') && target == 'android') {
-
-    apply plugin: 'com.android.library'
-    apply plugin: 'com.github.dcendents.android-maven'
-
-    android {
-        compileSdkVersion 25
-        buildToolsVersion '25.0.2'
-        defaultConfig {
-            minSdkVersion 14
-            targetSdkVersion 25
-        }
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_7
-            targetCompatibility JavaVersion.VERSION_1_7
-        }
-
-        // Rename the aar correctly
-        libraryVariants.all { variant ->
-            variant.outputs.each { output ->
-                def outputFile = output.outputFile
-                if (outputFile != null && outputFile.name.endsWith('.aar')) {
-                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
-                    output.outputFile = new File(outputFile.parent, fileName)
-                }
-            }
-        }
-
-        dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
-        }
-    }
-
-    afterEvaluate {
-        android.libraryVariants.all { variant ->
-            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
-            task.description = "Create jar artifact for ${variant.name}"
-            task.dependsOn variant.javaCompile
-            task.from variant.javaCompile.destinationDir
-            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
-            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
-            artifacts.add('archives', task);
-        }
-    }
-
-    task sourcesJar(type: Jar) {
-        from android.sourceSets.main.java.srcDirs
-        classifier = 'sources'
-    }
-
-    artifacts {
-        archives sourcesJar
-    }
-
-} else {
-
-    apply plugin: 'java'
-    apply plugin: 'maven'
-
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
-
-    install {
-        repositories.mavenInstaller {
-            pom.artifactId = 'petstore-retrofit2-rx'
-        }
-    }
-
-    task execute(type:JavaExec) {
-       main = System.getProperty('mainClass')
-       classpath = sourceSets.main.runtimeClasspath
-    }
-}
-
-ext {
-    oltu_version = "1.0.1"
-    retrofit_version = "2.3.0"
-    swagger_annotations_version = "1.5.22"
-    junit_version = "4.13"
-    rx_java_version = "1.3.0"
-    threetenbp_version = "1.4.0"
-    json_fire_version = "1.8.0"
-}
-
-dependencies {
-    compile "com.squareup.retrofit2:retrofit:$retrofit_version"
-    compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
-    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
-    compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
-    compile "io.reactivex:rxjava:$rx_java_version"
-    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "com.google.code.findbugs:jsr305:3.0.2"
-    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
-        exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
-    }
-    compile "io.gsonfire:gson-fire:$json_fire_version"
-    compile "org.threeten:threetenbp:$threetenbp_version"
-
-    testCompile "junit:junit:$junit_version"
-}
diff --git a/samples/client/petstore/java/retrofit2rx/build.sbt b/samples/client/petstore/java/retrofit2rx/build.sbt
deleted file mode 100644
index 4407bf5a6e94..000000000000
--- a/samples/client/petstore/java/retrofit2rx/build.sbt
+++ /dev/null
@@ -1,24 +0,0 @@
-lazy val root = (project in file(".")).
-  settings(
-    organization := "org.openapitools",
-    name := "petstore-retrofit2-rx",
-    version := "1.0.0",
-    scalaVersion := "2.11.4",
-    scalacOptions ++= Seq("-feature"),
-    javacOptions in compile ++= Seq("-Xlint:deprecation"),
-    publishArtifact in (Compile, packageDoc) := false,
-    resolvers += Resolver.mavenLocal,
-    libraryDependencies ++= Seq(
-      "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
-      "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
-      "com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile",
-      "com.squareup.retrofit2" % "adapter-rxjava" % "2.3.0" % "compile",
-      "io.reactivex" % "rxjava" % "1.3.0" % "compile",
-      "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
-      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
-      "org.threeten" % "threetenbp" % "1.4.0" % "compile",
-      "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
-      "junit" % "junit" % "4.13" % "test",
-      "com.novocode" % "junit-interface" % "0.11" % "test"
-    )
-  )
diff --git a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesAnyType.md
deleted file mode 100644
index 87b468bb7ca3..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesAnyType.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesAnyType
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesArray.md
deleted file mode 100644
index cb7fe9b3903d..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesArray.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesArray
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesBoolean.md
deleted file mode 100644
index 6b53e7ba73a1..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesBoolean.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesBoolean
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesClass.md
deleted file mode 100644
index ffab911c1be8..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesClass.md
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# AdditionalPropertiesClass
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**mapString** | **Map&lt;String, String&gt;** |  |  [optional]
-**mapNumber** | [**Map&lt;String, BigDecimal&gt;**](BigDecimal.md) |  |  [optional]
-**mapInteger** | **Map&lt;String, Integer&gt;** |  |  [optional]
-**mapBoolean** | **Map&lt;String, Boolean&gt;** |  |  [optional]
-**mapArrayInteger** | [**Map&lt;String, List&lt;Integer&gt;&gt;**](List.md) |  |  [optional]
-**mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
-**mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
-**mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | **Object** |  |  [optional]
-**anytype2** | **Object** |  |  [optional]
-**anytype3** | **Object** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesInteger.md
deleted file mode 100644
index d2ed7fb1a460..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesInteger.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesInteger
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesNumber.md
deleted file mode 100644
index 53f6e81e7176..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesNumber.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesNumber
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesObject.md
deleted file mode 100644
index 98ac8d2e5fe0..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesObject.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesObject
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesString.md
deleted file mode 100644
index d7970cdfe190..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesString.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# AdditionalPropertiesString
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Animal.md b/samples/client/petstore/java/retrofit2rx/docs/Animal.md
deleted file mode 100644
index c8e18ae55e4f..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/Animal.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# Animal
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**className** | **String** |  | 
-**color** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/AnimalFarm.md b/samples/client/petstore/java/retrofit2rx/docs/AnimalFarm.md
deleted file mode 100644
index c7c7f1ddcce6..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/AnimalFarm.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# AnimalFarm
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/AnotherFakeApi.md b/samples/client/petstore/java/retrofit2rx/docs/AnotherFakeApi.md
deleted file mode 100644
index f58ecd4216a4..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/AnotherFakeApi.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# AnotherFakeApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** another-fake/dummy | To test special tags
-
-
-
-## call123testSpecialTags
-
-> Client call123testSpecialTags(body)
-
-To test special tags
-
-To test special tags and operation ID starting with number
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.AnotherFakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client body = new Client(); // Client | client model
-        try {
-            Client result = apiInstance.call123testSpecialTags(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**Client**](Client.md)| client model |
-
-### Return type
-
-[**Client**](Client.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2rx/docs/ArrayOfArrayOfNumberOnly.md
deleted file mode 100644
index a48aa23e78ee..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/ArrayOfArrayOfNumberOnly.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# ArrayOfArrayOfNumberOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**arrayArrayNumber** | [**List&lt;List&lt;BigDecimal&gt;&gt;**](List.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2rx/docs/ArrayOfNumberOnly.md
deleted file mode 100644
index fa2909211a07..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/ArrayOfNumberOnly.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# ArrayOfNumberOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**arrayNumber** | [**List&lt;BigDecimal&gt;**](BigDecimal.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/ArrayTest.md b/samples/client/petstore/java/retrofit2rx/docs/ArrayTest.md
deleted file mode 100644
index 9ad1c9814a51..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/ArrayTest.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-# ArrayTest
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**arrayOfString** | **List&lt;String&gt;** |  |  [optional]
-**arrayArrayOfInteger** | [**List&lt;List&lt;Long&gt;&gt;**](List.md) |  |  [optional]
-**arrayArrayOfModel** | [**List&lt;List&lt;ReadOnlyFirst&gt;&gt;**](List.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/BigCat.md b/samples/client/petstore/java/retrofit2rx/docs/BigCat.md
deleted file mode 100644
index 8a075304abf8..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/BigCat.md
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-# BigCat
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**kind** | [**KindEnum**](#KindEnum) |  |  [optional]
-
-
-
-## Enum: KindEnum
-
-Name | Value
----- | -----
-LIONS | &quot;lions&quot;
-TIGERS | &quot;tigers&quot;
-LEOPARDS | &quot;leopards&quot;
-JAGUARS | &quot;jaguars&quot;
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/BigCatAllOf.md b/samples/client/petstore/java/retrofit2rx/docs/BigCatAllOf.md
deleted file mode 100644
index 21177dbf089d..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/BigCatAllOf.md
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-# BigCatAllOf
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**kind** | [**KindEnum**](#KindEnum) |  |  [optional]
-
-
-
-## Enum: KindEnum
-
-Name | Value
----- | -----
-LIONS | &quot;lions&quot;
-TIGERS | &quot;tigers&quot;
-LEOPARDS | &quot;leopards&quot;
-JAGUARS | &quot;jaguars&quot;
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Capitalization.md b/samples/client/petstore/java/retrofit2rx/docs/Capitalization.md
deleted file mode 100644
index 7b73c40b5545..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/Capitalization.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-# Capitalization
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**smallCamel** | **String** |  |  [optional]
-**capitalCamel** | **String** |  |  [optional]
-**smallSnake** | **String** |  |  [optional]
-**capitalSnake** | **String** |  |  [optional]
-**scAETHFlowPoints** | **String** |  |  [optional]
-**ATT_NAME** | **String** | Name of the pet  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Cat.md b/samples/client/petstore/java/retrofit2rx/docs/Cat.md
deleted file mode 100644
index 39c2f864df88..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/Cat.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# Cat
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**declawed** | **Boolean** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/CatAllOf.md b/samples/client/petstore/java/retrofit2rx/docs/CatAllOf.md
deleted file mode 100644
index 1098fd900c5d..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/CatAllOf.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# CatAllOf
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**declawed** | **Boolean** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Category.md b/samples/client/petstore/java/retrofit2rx/docs/Category.md
deleted file mode 100644
index 613ea9f7ee24..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/Category.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# Category
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**name** | **String** |  | 
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/ClassModel.md b/samples/client/petstore/java/retrofit2rx/docs/ClassModel.md
deleted file mode 100644
index d5453c20133a..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/ClassModel.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# ClassModel
-
-Model for testing model with \"_class\" property
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**propertyClass** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Client.md b/samples/client/petstore/java/retrofit2rx/docs/Client.md
deleted file mode 100644
index 228df492383f..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/Client.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# Client
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**client** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Dog.md b/samples/client/petstore/java/retrofit2rx/docs/Dog.md
deleted file mode 100644
index 73cedf2bc919..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/Dog.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# Dog
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**breed** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/DogAllOf.md b/samples/client/petstore/java/retrofit2rx/docs/DogAllOf.md
deleted file mode 100644
index cbeb9e9a22df..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/DogAllOf.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# DogAllOf
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**breed** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/EnumArrays.md b/samples/client/petstore/java/retrofit2rx/docs/EnumArrays.md
deleted file mode 100644
index 869b7a6c066d..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/EnumArrays.md
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-# EnumArrays
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**justSymbol** | [**JustSymbolEnum**](#JustSymbolEnum) |  |  [optional]
-**arrayEnum** | [**List&lt;ArrayEnumEnum&gt;**](#List&lt;ArrayEnumEnum&gt;) |  |  [optional]
-
-
-
-## Enum: JustSymbolEnum
-
-Name | Value
----- | -----
-GREATER_THAN_OR_EQUAL_TO | &quot;&gt;&#x3D;&quot;
-DOLLAR | &quot;$&quot;
-
-
-
-## Enum: List&lt;ArrayEnumEnum&gt;
-
-Name | Value
----- | -----
-FISH | &quot;fish&quot;
-CRAB | &quot;crab&quot;
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/EnumClass.md b/samples/client/petstore/java/retrofit2rx/docs/EnumClass.md
deleted file mode 100644
index b314590a7591..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/EnumClass.md
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-# EnumClass
-
-## Enum
-
-
-* `_ABC` (value: `"_abc"`)
-
-* `_EFG` (value: `"-efg"`)
-
-* `_XYZ_` (value: `"(xyz)"`)
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/EnumTest.md b/samples/client/petstore/java/retrofit2rx/docs/EnumTest.md
deleted file mode 100644
index 61eb95f22fe9..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/EnumTest.md
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-# EnumTest
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**enumString** | [**EnumStringEnum**](#EnumStringEnum) |  |  [optional]
-**enumStringRequired** | [**EnumStringRequiredEnum**](#EnumStringRequiredEnum) |  | 
-**enumInteger** | [**EnumIntegerEnum**](#EnumIntegerEnum) |  |  [optional]
-**enumNumber** | [**EnumNumberEnum**](#EnumNumberEnum) |  |  [optional]
-**outerEnum** | [**OuterEnum**](OuterEnum.md) |  |  [optional]
-
-
-
-## Enum: EnumStringEnum
-
-Name | Value
----- | -----
-UPPER | &quot;UPPER&quot;
-LOWER | &quot;lower&quot;
-EMPTY | &quot;&quot;
-
-
-
-## Enum: EnumStringRequiredEnum
-
-Name | Value
----- | -----
-UPPER | &quot;UPPER&quot;
-LOWER | &quot;lower&quot;
-EMPTY | &quot;&quot;
-
-
-
-## Enum: EnumIntegerEnum
-
-Name | Value
----- | -----
-NUMBER_1 | 1
-NUMBER_MINUS_1 | -1
-
-
-
-## Enum: EnumNumberEnum
-
-Name | Value
----- | -----
-NUMBER_1_DOT_1 | 1.1
-NUMBER_MINUS_1_DOT_2 | -1.2
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md
deleted file mode 100644
index 8de4500212eb..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md
+++ /dev/null
@@ -1,987 +0,0 @@
-# FakeApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**createXmlItem**](FakeApi.md#createXmlItem) | **POST** fake/create_xml_item | creates an XmlItem
-[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** fake/outer/boolean | 
-[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** fake/outer/composite | 
-[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** fake/outer/number | 
-[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** fake/outer/string | 
-[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** fake/body-with-file-schema | 
-[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** fake/body-with-query-params | 
-[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** fake | To test \&quot;client\&quot; model
-[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** fake | To test enum parameters
-[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** fake | Fake endpoint to test group parameters (optional)
-[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** fake/inline-additionalProperties | test inline additionalProperties
-[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** fake/jsonFormData | test json serialization of form data
-[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** fake/test-query-paramters | 
-
-
-
-## createXmlItem
-
-> createXmlItem(xmlItem)
-
-creates an XmlItem
-
-this route creates an XmlItem
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        XmlItem xmlItem = new XmlItem(); // XmlItem | XmlItem Body
-        try {
-            apiInstance.createXmlItem(xmlItem);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#createXmlItem");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **xmlItem** | [**XmlItem**](XmlItem.md)| XmlItem Body |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
-
-## fakeOuterBooleanSerialize
-
-> Boolean fakeOuterBooleanSerialize(body)
-
-
-
-Test serialization of outer boolean types
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        Boolean body = true; // Boolean | Input boolean as post body
-        try {
-            Boolean result = apiInstance.fakeOuterBooleanSerialize(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#fakeOuterBooleanSerialize");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | **Boolean**| Input boolean as post body | [optional]
-
-### Return type
-
-**Boolean**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: */*
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Output boolean |  -  |
-
-
-## fakeOuterCompositeSerialize
-
-> OuterComposite fakeOuterCompositeSerialize(body)
-
-
-
-Test serialization of object with outer number type
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        OuterComposite body = new OuterComposite(); // OuterComposite | Input composite as post body
-        try {
-            OuterComposite result = apiInstance.fakeOuterCompositeSerialize(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#fakeOuterCompositeSerialize");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**OuterComposite**](OuterComposite.md)| Input composite as post body | [optional]
-
-### Return type
-
-[**OuterComposite**](OuterComposite.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: */*
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Output composite |  -  |
-
-
-## fakeOuterNumberSerialize
-
-> BigDecimal fakeOuterNumberSerialize(body)
-
-
-
-Test serialization of outer number types
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        BigDecimal body = new BigDecimal(); // BigDecimal | Input number as post body
-        try {
-            BigDecimal result = apiInstance.fakeOuterNumberSerialize(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#fakeOuterNumberSerialize");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | **BigDecimal**| Input number as post body | [optional]
-
-### Return type
-
-[**BigDecimal**](BigDecimal.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: */*
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Output number |  -  |
-
-
-## fakeOuterStringSerialize
-
-> String fakeOuterStringSerialize(body)
-
-
-
-Test serialization of outer string types
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        String body = "body_example"; // String | Input string as post body
-        try {
-            String result = apiInstance.fakeOuterStringSerialize(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#fakeOuterStringSerialize");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | **String**| Input string as post body | [optional]
-
-### Return type
-
-**String**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: */*
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Output string |  -  |
-
-
-## testBodyWithFileSchema
-
-> testBodyWithFileSchema(body)
-
-
-
-For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        FileSchemaTestClass body = new FileSchemaTestClass(); // FileSchemaTestClass | 
-        try {
-            apiInstance.testBodyWithFileSchema(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testBodyWithFileSchema");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Success |  -  |
-
-
-## testBodyWithQueryParams
-
-> testBodyWithQueryParams(query, body)
-
-
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        String query = "query_example"; // String | 
-        User body = new User(); // User | 
-        try {
-            apiInstance.testBodyWithQueryParams(query, body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testBodyWithQueryParams");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **query** | **String**|  |
- **body** | [**User**](User.md)|  |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Success |  -  |
-
-
-## testClientModel
-
-> Client testClientModel(body)
-
-To test \&quot;client\&quot; model
-
-To test \&quot;client\&quot; model
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        Client body = new Client(); // Client | client model
-        try {
-            Client result = apiInstance.testClientModel(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testClientModel");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**Client**](Client.md)| client model |
-
-### Return type
-
-[**Client**](Client.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
-
-## testEndpointParameters
-
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
-
-Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-
-Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure HTTP basic authorization: http_basic_test
-        HttpBasicAuth http_basic_test = (HttpBasicAuth) defaultClient.getAuthentication("http_basic_test");
-        http_basic_test.setUsername("YOUR USERNAME");
-        http_basic_test.setPassword("YOUR PASSWORD");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        BigDecimal number = new BigDecimal(); // BigDecimal | None
-        Double _double = 3.4D; // Double | None
-        String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
-        byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
-        Integer int32 = 56; // Integer | None
-        Long int64 = 56L; // Long | None
-        Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
-        File binary = new File("/path/to/file"); // File | None
-        LocalDate date = new LocalDate(); // LocalDate | None
-        OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None
-        String password = "password_example"; // String | None
-        String paramCallback = "paramCallback_example"; // String | None
-        try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testEndpointParameters");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **number** | **BigDecimal**| None |
- **_double** | **Double**| None |
- **patternWithoutDelimiter** | **String**| None |
- **_byte** | **byte[]**| None |
- **integer** | **Integer**| None | [optional]
- **int32** | **Integer**| None | [optional]
- **int64** | **Long**| None | [optional]
- **_float** | **Float**| None | [optional]
- **string** | **String**| None | [optional]
- **binary** | **File**| None | [optional]
- **date** | **LocalDate**| None | [optional]
- **dateTime** | **OffsetDateTime**| None | [optional]
- **password** | **String**| None | [optional]
- **paramCallback** | **String**| None | [optional]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[http_basic_test](../README.md#http_basic_test)
-
-### HTTP request headers
-
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **400** | Invalid username supplied |  -  |
-| **404** | User not found |  -  |
-
-
-## testEnumParameters
-
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
-
-To test enum parameters
-
-To test enum parameters
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        List<String> enumHeaderStringArray = Arrays.asList("$"); // List<String> | Header parameter enum test (string array)
-        String enumHeaderString = "-efg"; // String | Header parameter enum test (string)
-        List<String> enumQueryStringArray = Arrays.asList("$"); // List<String> | Query parameter enum test (string array)
-        String enumQueryString = "-efg"; // String | Query parameter enum test (string)
-        Integer enumQueryInteger = 56; // Integer | Query parameter enum test (double)
-        Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double)
-        List<String> enumFormStringArray = "$"; // List<String> | Form parameter enum test (string array)
-        String enumFormString = "-efg"; // String | Form parameter enum test (string)
-        try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testEnumParameters");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **enumHeaderStringArray** | [**List&lt;String&gt;**](String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
- **enumHeaderString** | **String**| Header parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
- **enumQueryStringArray** | [**List&lt;String&gt;**](String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
- **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
- **enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
- **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
- **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $]
- **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **400** | Invalid request |  -  |
-| **404** | Not found |  -  |
-
-
-## testGroupParameters
-
-> testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
-
-Fake endpoint to test group parameters (optional)
-
-Fake endpoint to test group parameters (optional)
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        Integer requiredStringGroup = 56; // Integer | Required String in group parameters
-        Boolean requiredBooleanGroup = true; // Boolean | Required Boolean in group parameters
-        Long requiredInt64Group = 56L; // Long | Required Integer in group parameters
-        Integer stringGroup = 56; // Integer | String in group parameters
-        Boolean booleanGroup = true; // Boolean | Boolean in group parameters
-        Long int64Group = 56L; // Long | Integer in group parameters
-        try {
-            apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testGroupParameters");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **requiredStringGroup** | **Integer**| Required String in group parameters |
- **requiredBooleanGroup** | **Boolean**| Required Boolean in group parameters |
- **requiredInt64Group** | **Long**| Required Integer in group parameters |
- **stringGroup** | **Integer**| String in group parameters | [optional]
- **booleanGroup** | **Boolean**| Boolean in group parameters | [optional]
- **int64Group** | **Long**| Integer in group parameters | [optional]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
-
-
-## testInlineAdditionalProperties
-
-> testInlineAdditionalProperties(param)
-
-test inline additionalProperties
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        Map<String, String> param = new HashMap(); // Map<String, String> | request body
-        try {
-            apiInstance.testInlineAdditionalProperties(param);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testInlineAdditionalProperties");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **param** | [**Map&lt;String, String&gt;**](String.md)| request body |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
-
-## testJsonFormData
-
-> testJsonFormData(param, param2)
-
-test json serialization of form data
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        String param = "param_example"; // String | field1
-        String param2 = "param2_example"; // String | field2
-        try {
-            apiInstance.testJsonFormData(param, param2);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testJsonFormData");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **param** | **String**| field1 |
- **param2** | **String**| field2 |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
-
-## testQueryParameterCollectionFormat
-
-> testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
-
-
-
-To test the collection format in query parameters
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        FakeApi apiInstance = new FakeApi(defaultClient);
-        List<String> pipe = Arrays.asList(); // List<String> | 
-        List<String> ioutil = Arrays.asList(); // List<String> | 
-        List<String> http = Arrays.asList(); // List<String> | 
-        List<String> url = Arrays.asList(); // List<String> | 
-        List<String> context = Arrays.asList(); // List<String> | 
-        try {
-            apiInstance.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeApi#testQueryParameterCollectionFormat");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pipe** | [**List&lt;String&gt;**](String.md)|  |
- **ioutil** | [**List&lt;String&gt;**](String.md)|  |
- **http** | [**List&lt;String&gt;**](String.md)|  |
- **url** | [**List&lt;String&gt;**](String.md)|  |
- **context** | [**List&lt;String&gt;**](String.md)|  |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | Success |  -  |
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/retrofit2rx/docs/FakeClassnameTags123Api.md
deleted file mode 100644
index 4f4dac58589d..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/FakeClassnameTags123Api.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# FakeClassnameTags123Api
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** fake_classname_test | To test class name in snake case
-
-
-
-## testClassname
-
-> Client testClassname(body)
-
-To test class name in snake case
-
-To test class name in snake case
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.FakeClassnameTags123Api;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure API key authorization: api_key_query
-        ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
-        api_key_query.setApiKey("YOUR API KEY");
-        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-        //api_key_query.setApiKeyPrefix("Token");
-
-        FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api(defaultClient);
-        Client body = new Client(); // Client | client model
-        try {
-            Client result = apiInstance.testClassname(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FakeClassnameTags123Api#testClassname");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**Client**](Client.md)| client model |
-
-### Return type
-
-[**Client**](Client.md)
-
-### Authorization
-
-[api_key_query](../README.md#api_key_query)
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/FileSchemaTestClass.md b/samples/client/petstore/java/retrofit2rx/docs/FileSchemaTestClass.md
deleted file mode 100644
index 3a95e27d7c09..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/FileSchemaTestClass.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# FileSchemaTestClass
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**file** | [**java.io.File**](java.io.File.md) |  |  [optional]
-**files** | [**List&lt;java.io.File&gt;**](java.io.File.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/FormatTest.md b/samples/client/petstore/java/retrofit2rx/docs/FormatTest.md
deleted file mode 100644
index d138e921902a..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/FormatTest.md
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-# FormatTest
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**integer** | **Integer** |  |  [optional]
-**int32** | **Integer** |  |  [optional]
-**int64** | **Long** |  |  [optional]
-**number** | [**BigDecimal**](BigDecimal.md) |  | 
-**_float** | **Float** |  |  [optional]
-**_double** | **Double** |  |  [optional]
-**string** | **String** |  |  [optional]
-**_byte** | **byte[]** |  | 
-**binary** | [**File**](File.md) |  |  [optional]
-**date** | [**LocalDate**](LocalDate.md) |  | 
-**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
-**uuid** | [**UUID**](UUID.md) |  |  [optional]
-**password** | **String** |  | 
-**bigDecimal** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/retrofit2rx/docs/HasOnlyReadOnly.md
deleted file mode 100644
index 4795b40ef65e..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/HasOnlyReadOnly.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# HasOnlyReadOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**bar** | **String** |  |  [optional] [readonly]
-**foo** | **String** |  |  [optional] [readonly]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/MapTest.md b/samples/client/petstore/java/retrofit2rx/docs/MapTest.md
deleted file mode 100644
index c35c3cf2c0be..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/MapTest.md
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-# MapTest
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**mapMapOfString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
-**mapOfEnumString** | [**Map&lt;String, InnerEnum&gt;**](#Map&lt;String, InnerEnum&gt;) |  |  [optional]
-**directMap** | **Map&lt;String, Boolean&gt;** |  |  [optional]
-**indirectMap** | **Map&lt;String, Boolean&gt;** |  |  [optional]
-
-
-
-## Enum: Map&lt;String, InnerEnum&gt;
-
-Name | Value
----- | -----
-UPPER | &quot;UPPER&quot;
-LOWER | &quot;lower&quot;
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
deleted file mode 100644
index 3dc283ae4936..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-# MixedPropertiesAndAdditionalPropertiesClass
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**uuid** | [**UUID**](UUID.md) |  |  [optional]
-**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
-**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Model200Response.md b/samples/client/petstore/java/retrofit2rx/docs/Model200Response.md
deleted file mode 100644
index f9928d70622c..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/Model200Response.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-# Model200Response
-
-Model for testing model name starting with number
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **Integer** |  |  [optional]
-**propertyClass** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/ModelApiResponse.md b/samples/client/petstore/java/retrofit2rx/docs/ModelApiResponse.md
deleted file mode 100644
index 14fb7f1ed27b..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/ModelApiResponse.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-# ModelApiResponse
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**code** | **Integer** |  |  [optional]
-**type** | **String** |  |  [optional]
-**message** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/ModelReturn.md b/samples/client/petstore/java/retrofit2rx/docs/ModelReturn.md
deleted file mode 100644
index 5005d4b72392..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/ModelReturn.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# ModelReturn
-
-Model for testing reserved words
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**_return** | **Integer** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Name.md b/samples/client/petstore/java/retrofit2rx/docs/Name.md
deleted file mode 100644
index b815a0b4c994..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/Name.md
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-# Name
-
-Model for testing model name same as property name
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **Integer** |  | 
-**snakeCase** | **Integer** |  |  [optional] [readonly]
-**property** | **String** |  |  [optional]
-**_123number** | **Integer** |  |  [optional] [readonly]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/NumberOnly.md b/samples/client/petstore/java/retrofit2rx/docs/NumberOnly.md
deleted file mode 100644
index 1c12b6adf3bd..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/NumberOnly.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# NumberOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**justNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Order.md b/samples/client/petstore/java/retrofit2rx/docs/Order.md
deleted file mode 100644
index 409fc4cc9616..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/Order.md
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-# Order
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**petId** | **Long** |  |  [optional]
-**quantity** | **Integer** |  |  [optional]
-**shipDate** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
-**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional]
-**complete** | **Boolean** |  |  [optional]
-
-
-
-## Enum: StatusEnum
-
-Name | Value
----- | -----
-PLACED | &quot;placed&quot;
-APPROVED | &quot;approved&quot;
-DELIVERED | &quot;delivered&quot;
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/OuterComposite.md b/samples/client/petstore/java/retrofit2rx/docs/OuterComposite.md
deleted file mode 100644
index e06292218847..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/OuterComposite.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-# OuterComposite
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**myNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-**myString** | **String** |  |  [optional]
-**myBoolean** | **Boolean** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/OuterEnum.md b/samples/client/petstore/java/retrofit2rx/docs/OuterEnum.md
deleted file mode 100644
index 1f9b723eb8e7..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/OuterEnum.md
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-# OuterEnum
-
-## Enum
-
-
-* `PLACED` (value: `"placed"`)
-
-* `APPROVED` (value: `"approved"`)
-
-* `DELIVERED` (value: `"delivered"`)
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Pet.md b/samples/client/petstore/java/retrofit2rx/docs/Pet.md
deleted file mode 100644
index bdcdad6b3e60..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/Pet.md
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-# Pet
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**category** | [**Category**](Category.md) |  |  [optional]
-**name** | **String** |  | 
-**photoUrls** | **Set&lt;String&gt;** |  | 
-**tags** | [**List&lt;Tag&gt;**](Tag.md) |  |  [optional]
-**status** | [**StatusEnum**](#StatusEnum) | pet status in the store |  [optional]
-
-
-
-## Enum: StatusEnum
-
-Name | Value
----- | -----
-AVAILABLE | &quot;available&quot;
-PENDING | &quot;pending&quot;
-SOLD | &quot;sold&quot;
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/PetApi.md b/samples/client/petstore/java/retrofit2rx/docs/PetApi.md
deleted file mode 100644
index ca4e8b4197a3..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/PetApi.md
+++ /dev/null
@@ -1,656 +0,0 @@
-# PetApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**addPet**](PetApi.md#addPet) | **POST** pet | Add a new pet to the store
-[**deletePet**](PetApi.md#deletePet) | **DELETE** pet/{petId} | Deletes a pet
-[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** pet/findByStatus | Finds Pets by status
-[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** pet/findByTags | Finds Pets by tags
-[**getPetById**](PetApi.md#getPetById) | **GET** pet/{petId} | Find pet by ID
-[**updatePet**](PetApi.md#updatePet) | **PUT** pet | Update an existing pet
-[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** pet/{petId} | Updates a pet in the store with form data
-[**uploadFile**](PetApi.md#uploadFile) | **POST** pet/{petId}/uploadImage | uploads an image
-[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-
-
-
-## addPet
-
-> addPet(body)
-
-Add a new pet to the store
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
-        try {
-            apiInstance.addPet(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#addPet");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: application/json, application/xml
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **405** | Invalid input |  -  |
-
-
-## deletePet
-
-> deletePet(petId, apiKey)
-
-Deletes a pet
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | Pet id to delete
-        String apiKey = "apiKey_example"; // String | 
-        try {
-            apiInstance.deletePet(petId, apiKey);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#deletePet");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **petId** | **Long**| Pet id to delete |
- **apiKey** | **String**|  | [optional]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid pet value |  -  |
-
-
-## findPetsByStatus
-
-> List&lt;Pet&gt; findPetsByStatus(status)
-
-Finds Pets by status
-
-Multiple status values can be provided with comma separated strings
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        List<String> status = Arrays.asList("available"); // List<String> | Status values that need to be considered for filter
-        try {
-            List<Pet> result = apiInstance.findPetsByStatus(status);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#findPetsByStatus");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **status** | [**List&lt;String&gt;**](String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
-
-### Return type
-
-[**List&lt;Pet&gt;**](Pet.md)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid status value |  -  |
-
-
-## findPetsByTags
-
-> Set&lt;Pet&gt; findPetsByTags(tags)
-
-Finds Pets by tags
-
-Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Set<String> tags = Arrays.asList(); // Set<String> | Tags to filter by
-        try {
-            Set<Pet> result = apiInstance.findPetsByTags(tags);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#findPetsByTags");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **tags** | [**Set&lt;String&gt;**](String.md)| Tags to filter by |
-
-### Return type
-
-[**Set&lt;Pet&gt;**](Pet.md)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid tag value |  -  |
-
-
-## getPetById
-
-> Pet getPetById(petId)
-
-Find pet by ID
-
-Returns a single pet
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure API key authorization: api_key
-        ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
-        api_key.setApiKey("YOUR API KEY");
-        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-        //api_key.setApiKeyPrefix("Token");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | ID of pet to return
-        try {
-            Pet result = apiInstance.getPetById(petId);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#getPetById");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet to return |
-
-### Return type
-
-[**Pet**](Pet.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid ID supplied |  -  |
-| **404** | Pet not found |  -  |
-
-
-## updatePet
-
-> updatePet(body)
-
-Update an existing pet
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
-        try {
-            apiInstance.updatePet(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#updatePet");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: application/json, application/xml
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid ID supplied |  -  |
-| **404** | Pet not found |  -  |
-| **405** | Validation exception |  -  |
-
-
-## updatePetWithForm
-
-> updatePetWithForm(petId, name, status)
-
-Updates a pet in the store with form data
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | ID of pet that needs to be updated
-        String name = "name_example"; // String | Updated name of the pet
-        String status = "status_example"; // String | Updated status of the pet
-        try {
-            apiInstance.updatePetWithForm(petId, name, status);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#updatePetWithForm");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet that needs to be updated |
- **name** | **String**| Updated name of the pet | [optional]
- **status** | **String**| Updated status of the pet | [optional]
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **405** | Invalid input |  -  |
-
-
-## uploadFile
-
-> ModelApiResponse uploadFile(petId, additionalMetadata, file)
-
-uploads an image
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | ID of pet to update
-        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
-        File file = new File("/path/to/file"); // File | file to upload
-        try {
-            ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#uploadFile");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet to update |
- **additionalMetadata** | **String**| Additional data to pass to server | [optional]
- **file** | **File**| file to upload | [optional]
-
-### Return type
-
-[**ModelApiResponse**](ModelApiResponse.md)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: multipart/form-data
-- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
-
-## uploadFileWithRequiredFile
-
-> ModelApiResponse uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
-
-uploads an image (required)
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.PetApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi(defaultClient);
-        Long petId = 56L; // Long | ID of pet to update
-        File requiredFile = new File("/path/to/file"); // File | file to upload
-        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
-        try {
-            ModelApiResponse result = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#uploadFileWithRequiredFile");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **petId** | **Long**| ID of pet to update |
- **requiredFile** | **File**| file to upload |
- **additionalMetadata** | **String**| Additional data to pass to server | [optional]
-
-### Return type
-
-[**ModelApiResponse**](ModelApiResponse.md)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: multipart/form-data
-- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/ReadOnlyFirst.md b/samples/client/petstore/java/retrofit2rx/docs/ReadOnlyFirst.md
deleted file mode 100644
index a692499dc661..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/ReadOnlyFirst.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# ReadOnlyFirst
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**bar** | **String** |  |  [optional] [readonly]
-**baz** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/SpecialModelName.md b/samples/client/petstore/java/retrofit2rx/docs/SpecialModelName.md
deleted file mode 100644
index 934b8f0f25d7..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/SpecialModelName.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-# SpecialModelName
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**$specialPropertyName** | **Long** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md b/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md
deleted file mode 100644
index ebefe2ffdd4b..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md
+++ /dev/null
@@ -1,276 +0,0 @@
-# StoreApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** store/order/{order_id} | Delete purchase order by ID
-[**getInventory**](StoreApi.md#getInventory) | **GET** store/inventory | Returns pet inventories by status
-[**getOrderById**](StoreApi.md#getOrderById) | **GET** store/order/{order_id} | Find purchase order by ID
-[**placeOrder**](StoreApi.md#placeOrder) | **POST** store/order | Place an order for a pet
-
-
-
-## deleteOrder
-
-> deleteOrder(orderId)
-
-Delete purchase order by ID
-
-For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.StoreApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        StoreApi apiInstance = new StoreApi(defaultClient);
-        String orderId = "orderId_example"; // String | ID of the order that needs to be deleted
-        try {
-            apiInstance.deleteOrder(orderId);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#deleteOrder");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **orderId** | **String**| ID of the order that needs to be deleted |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **400** | Invalid ID supplied |  -  |
-| **404** | Order not found |  -  |
-
-
-## getInventory
-
-> Map&lt;String, Integer&gt; getInventory()
-
-Returns pet inventories by status
-
-Returns a map of status codes to quantities
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.StoreApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-        
-        // Configure API key authorization: api_key
-        ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
-        api_key.setApiKey("YOUR API KEY");
-        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-        //api_key.setApiKeyPrefix("Token");
-
-        StoreApi apiInstance = new StoreApi(defaultClient);
-        try {
-            Map<String, Integer> result = apiInstance.getInventory();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#getInventory");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-This endpoint does not need any parameter.
-
-### Return type
-
-**Map&lt;String, Integer&gt;**
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-
-
-## getOrderById
-
-> Order getOrderById(orderId)
-
-Find purchase order by ID
-
-For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.StoreApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        StoreApi apiInstance = new StoreApi(defaultClient);
-        Long orderId = 56L; // Long | ID of pet that needs to be fetched
-        try {
-            Order result = apiInstance.getOrderById(orderId);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#getOrderById");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **orderId** | **Long**| ID of pet that needs to be fetched |
-
-### Return type
-
-[**Order**](Order.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid ID supplied |  -  |
-| **404** | Order not found |  -  |
-
-
-## placeOrder
-
-> Order placeOrder(body)
-
-Place an order for a pet
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.StoreApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        StoreApi apiInstance = new StoreApi(defaultClient);
-        Order body = new Order(); // Order | order placed for purchasing the pet
-        try {
-            Order result = apiInstance.placeOrder(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#placeOrder");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**Order**](Order.md)| order placed for purchasing the pet |
-
-### Return type
-
-[**Order**](Order.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid Order |  -  |
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/StringBooleanMap.md b/samples/client/petstore/java/retrofit2rx/docs/StringBooleanMap.md
deleted file mode 100644
index cac7afc80e07..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/StringBooleanMap.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# StringBooleanMap
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Tag.md b/samples/client/petstore/java/retrofit2rx/docs/Tag.md
deleted file mode 100644
index f24eba7d222e..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/Tag.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# Tag
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**name** | **String** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/TypeHolderDefault.md b/samples/client/petstore/java/retrofit2rx/docs/TypeHolderDefault.md
deleted file mode 100644
index a338fc900cb1..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/TypeHolderDefault.md
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-# TypeHolderDefault
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**stringItem** | **String** |  | 
-**numberItem** | [**BigDecimal**](BigDecimal.md) |  | 
-**integerItem** | **Integer** |  | 
-**boolItem** | **Boolean** |  | 
-**arrayItem** | **List&lt;Integer&gt;** |  | 
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/TypeHolderExample.md b/samples/client/petstore/java/retrofit2rx/docs/TypeHolderExample.md
deleted file mode 100644
index f8858da60664..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/TypeHolderExample.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-# TypeHolderExample
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**stringItem** | **String** |  | 
-**numberItem** | [**BigDecimal**](BigDecimal.md) |  | 
-**floatItem** | **Float** |  | 
-**integerItem** | **Integer** |  | 
-**boolItem** | **Boolean** |  | 
-**arrayItem** | **List&lt;Integer&gt;** |  | 
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/User.md b/samples/client/petstore/java/retrofit2rx/docs/User.md
deleted file mode 100644
index c4ea94b7fc17..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/User.md
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-# User
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **Long** |  |  [optional]
-**username** | **String** |  |  [optional]
-**firstName** | **String** |  |  [optional]
-**lastName** | **String** |  |  [optional]
-**email** | **String** |  |  [optional]
-**password** | **String** |  |  [optional]
-**phone** | **String** |  |  [optional]
-**userStatus** | **Integer** | User Status |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/UserApi.md b/samples/client/petstore/java/retrofit2rx/docs/UserApi.md
deleted file mode 100644
index d03e871ce01b..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/UserApi.md
+++ /dev/null
@@ -1,525 +0,0 @@
-# UserApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**createUser**](UserApi.md#createUser) | **POST** user | Create user
-[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** user/createWithArray | Creates list of users with given input array
-[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** user/createWithList | Creates list of users with given input array
-[**deleteUser**](UserApi.md#deleteUser) | **DELETE** user/{username} | Delete user
-[**getUserByName**](UserApi.md#getUserByName) | **GET** user/{username} | Get user by user name
-[**loginUser**](UserApi.md#loginUser) | **GET** user/login | Logs user into the system
-[**logoutUser**](UserApi.md#logoutUser) | **GET** user/logout | Logs out current logged in user session
-[**updateUser**](UserApi.md#updateUser) | **PUT** user/{username} | Updated user
-
-
-
-## createUser
-
-> createUser(body)
-
-Create user
-
-This can only be done by the logged in user.
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        User body = new User(); // User | Created user object
-        try {
-            apiInstance.createUser(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#createUser");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**User**](User.md)| Created user object |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **0** | successful operation |  -  |
-
-
-## createUsersWithArrayInput
-
-> createUsersWithArrayInput(body)
-
-Creates list of users with given input array
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        List<User> body = Arrays.asList(); // List<User> | List of user object
-        try {
-            apiInstance.createUsersWithArrayInput(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**List&lt;User&gt;**](User.md)| List of user object |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **0** | successful operation |  -  |
-
-
-## createUsersWithListInput
-
-> createUsersWithListInput(body)
-
-Creates list of users with given input array
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        List<User> body = Arrays.asList(); // List<User> | List of user object
-        try {
-            apiInstance.createUsersWithListInput(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#createUsersWithListInput");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**List&lt;User&gt;**](User.md)| List of user object |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **0** | successful operation |  -  |
-
-
-## deleteUser
-
-> deleteUser(username)
-
-Delete user
-
-This can only be done by the logged in user.
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        String username = "username_example"; // String | The name that needs to be deleted
-        try {
-            apiInstance.deleteUser(username);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#deleteUser");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **username** | **String**| The name that needs to be deleted |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **400** | Invalid username supplied |  -  |
-| **404** | User not found |  -  |
-
-
-## getUserByName
-
-> User getUserByName(username)
-
-Get user by user name
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing.
-        try {
-            User result = apiInstance.getUserByName(username);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#getUserByName");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **username** | **String**| The name that needs to be fetched. Use user1 for testing. |
-
-### Return type
-
-[**User**](User.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  -  |
-| **400** | Invalid username supplied |  -  |
-| **404** | User not found |  -  |
-
-
-## loginUser
-
-> String loginUser(username, password)
-
-Logs user into the system
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        String username = "username_example"; // String | The user name for login
-        String password = "password_example"; // String | The password for login in clear text
-        try {
-            String result = apiInstance.loginUser(username, password);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#loginUser");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **username** | **String**| The user name for login |
- **password** | **String**| The password for login in clear text |
-
-### Return type
-
-**String**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **200** | successful operation |  * X-Rate-Limit - calls per hour allowed by the user <br>  * X-Expires-After - date in UTC when token expires <br>  |
-| **400** | Invalid username/password supplied |  -  |
-
-
-## logoutUser
-
-> logoutUser()
-
-Logs out current logged in user session
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        try {
-            apiInstance.logoutUser();
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#logoutUser");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-This endpoint does not need any parameter.
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **0** | successful operation |  -  |
-
-
-## updateUser
-
-> updateUser(username, body)
-
-Updated user
-
-This can only be done by the logged in user.
-
-### Example
-
-```java
-// Import classes:
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.models.*;
-import org.openapitools.client.api.UserApi;
-
-public class Example {
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
-
-        UserApi apiInstance = new UserApi(defaultClient);
-        String username = "username_example"; // String | name that need to be deleted
-        User body = new User(); // User | Updated user object
-        try {
-            apiInstance.updateUser(username, body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#updateUser");
-            System.err.println("Status code: " + e.getCode());
-            System.err.println("Reason: " + e.getResponseBody());
-            System.err.println("Response headers: " + e.getResponseHeaders());
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **username** | **String**| name that need to be deleted |
- **body** | [**User**](User.md)| Updated user object |
-
-### Return type
-
-null (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-### HTTP response details
-| Status code | Description | Response headers |
-|-------------|-------------|------------------|
-| **400** | Invalid user supplied |  -  |
-| **404** | User not found |  -  |
-
diff --git a/samples/client/petstore/java/retrofit2rx/docs/XmlItem.md b/samples/client/petstore/java/retrofit2rx/docs/XmlItem.md
deleted file mode 100644
index 6065fd1f4e59..000000000000
--- a/samples/client/petstore/java/retrofit2rx/docs/XmlItem.md
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-# XmlItem
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**attributeString** | **String** |  |  [optional]
-**attributeNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-**attributeInteger** | **Integer** |  |  [optional]
-**attributeBoolean** | **Boolean** |  |  [optional]
-**wrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
-**nameString** | **String** |  |  [optional]
-**nameNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-**nameInteger** | **Integer** |  |  [optional]
-**nameBoolean** | **Boolean** |  |  [optional]
-**nameArray** | **List&lt;Integer&gt;** |  |  [optional]
-**nameWrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
-**prefixString** | **String** |  |  [optional]
-**prefixNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-**prefixInteger** | **Integer** |  |  [optional]
-**prefixBoolean** | **Boolean** |  |  [optional]
-**prefixArray** | **List&lt;Integer&gt;** |  |  [optional]
-**prefixWrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
-**namespaceString** | **String** |  |  [optional]
-**namespaceNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-**namespaceInteger** | **Integer** |  |  [optional]
-**namespaceBoolean** | **Boolean** |  |  [optional]
-**namespaceArray** | **List&lt;Integer&gt;** |  |  [optional]
-**namespaceWrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
-**prefixNsString** | **String** |  |  [optional]
-**prefixNsNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
-**prefixNsInteger** | **Integer** |  |  [optional]
-**prefixNsBoolean** | **Boolean** |  |  [optional]
-**prefixNsArray** | **List&lt;Integer&gt;** |  |  [optional]
-**prefixNsWrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
-
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/gradle.properties b/samples/client/petstore/java/retrofit2rx/gradle.properties
deleted file mode 100644
index 05644f0754af..000000000000
--- a/samples/client/petstore/java/retrofit2rx/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java/retrofit2rx/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index cc4fdc293d0e..000000000000
Binary files a/samples/client/petstore/java/retrofit2rx/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/samples/client/petstore/java/retrofit2rx/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/retrofit2rx/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 94920145f34e..000000000000
--- a/samples/client/petstore/java/retrofit2rx/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/samples/client/petstore/java/retrofit2rx/gradlew b/samples/client/petstore/java/retrofit2rx/gradlew
deleted file mode 100644
index 2fe81a7d95e4..000000000000
--- a/samples/client/petstore/java/retrofit2rx/gradlew
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://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.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"
diff --git a/samples/client/petstore/java/retrofit2rx/gradlew.bat b/samples/client/petstore/java/retrofit2rx/gradlew.bat
deleted file mode 100644
index 9618d8d9607c..000000000000
--- a/samples/client/petstore/java/retrofit2rx/gradlew.bat
+++ /dev/null
@@ -1,100 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml
index 0606c937d3ea..d195f17ba588 100644
--- a/samples/client/petstore/java/retrofit2rx/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx/pom.xml
@@ -132,12 +132,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/samples/client/petstore/java/retrofit2rx/settings.gradle b/samples/client/petstore/java/retrofit2rx/settings.gradle
deleted file mode 100644
index b87bf3765486..000000000000
--- a/samples/client/petstore/java/retrofit2rx/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = "petstore-retrofit2-rx"
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/AndroidManifest.xml b/samples/client/petstore/java/retrofit2rx/src/main/AndroidManifest.xml
deleted file mode 100644
index 54fbcb3da1e8..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<manifest package="org.openapitools.client" xmlns:android="http://schemas.android.com/apk/res/android">
-    <application />
-</manifest>
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/ApiClient.java
deleted file mode 100644
index 101c7a6dea70..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/ApiClient.java
+++ /dev/null
@@ -1,403 +0,0 @@
-package org.openapitools.client;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonElement;
-import okhttp3.Interceptor;
-import okhttp3.OkHttpClient;
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
-import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
-import org.threeten.bp.format.DateTimeFormatter;
-import retrofit2.Converter;
-import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
-import retrofit2.converter.gson.GsonConverterFactory;
-import retrofit2.converter.scalars.ScalarsConverterFactory;
-import org.openapitools.client.auth.HttpBasicAuth;
-import org.openapitools.client.auth.HttpBearerAuth;
-import org.openapitools.client.auth.ApiKeyAuth;
-import org.openapitools.client.auth.OAuth;
-import org.openapitools.client.auth.OAuth.AccessTokenListener;
-import org.openapitools.client.auth.OAuthFlow;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.text.DateFormat;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.HashMap;
-
-public class ApiClient {
-
-  private Map<String, Interceptor> apiAuthorizations;
-  private OkHttpClient.Builder okBuilder;
-  private Retrofit.Builder adapterBuilder;
-  private JSON json;
-
-  public ApiClient() {
-    apiAuthorizations = new LinkedHashMap<String, Interceptor>();
-    createDefaultAdapter();
-  }
-
-  public ApiClient(String[] authNames) {
-    this();
-    for(String authName : authNames) {
-      Interceptor auth;
-      if ("api_key".equals(authName)) {
-        
-        auth = new ApiKeyAuth("header", "api_key");
-      } else if ("api_key_query".equals(authName)) {
-        
-        auth = new ApiKeyAuth("query", "api_key_query");
-      } else if ("http_basic_test".equals(authName)) {
-        
-        auth = new HttpBasicAuth();
-        
-      } else if ("petstore_auth".equals(authName)) {
-        
-        auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
-      } else {
-        throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
-      }
-
-      addAuthorization(authName, auth);
-    }
-  }
-
-  /**
-   * Basic constructor for single auth name
-   * @param authName Authentication name
-   */
-  public ApiClient(String authName) {
-    this(new String[]{authName});
-  }
-
-  /**
-   * Helper constructor for single api key
-   * @param authName Authentication name
-   * @param apiKey API key
-   */
-  public ApiClient(String authName, String apiKey) {
-    this(authName);
-    this.setApiKey(apiKey);
-  }
-
-  /**
-   * Helper constructor for single basic auth or password oauth2
-   * @param authName Authentication name
-   * @param username Username
-   * @param password Password
-   */
-  public ApiClient(String authName, String username, String password) {
-    this(authName);
-    this.setCredentials(username,  password);
-  }
-
-  /**
-   * Helper constructor for single password oauth2
-   * @param authName Authentication name
-   * @param clientId Client ID
-   * @param secret Client Secret
-   * @param username Username
-   * @param password Password
-   */
-  public ApiClient(String authName, String clientId, String secret, String username, String password) {
-    this(authName);
-    this.getTokenEndPoint()
-      .setClientId(clientId)
-      .setClientSecret(secret)
-      .setUsername(username)
-      .setPassword(password);
-  }
-
-  public void createDefaultAdapter() {
-    json = new JSON();
-    okBuilder = new OkHttpClient.Builder();
-
-    String baseUrl = "http://petstore.swagger.io:80/v2";
-    if (!baseUrl.endsWith("/"))
-      baseUrl = baseUrl + "/";
-
-    adapterBuilder = new Retrofit
-      .Builder()
-      .baseUrl(baseUrl)
-      .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-            .addConverterFactory(ScalarsConverterFactory.create())
-      .addConverterFactory(GsonCustomConverterFactory.create(json.getGson()));
-  }
-
-  public <S> S createService(Class<S> serviceClass) {
-    return adapterBuilder
-      .client(okBuilder.build())
-      .build()
-      .create(serviceClass);
-  }
-
-  public ApiClient setDateFormat(DateFormat dateFormat) {
-    this.json.setDateFormat(dateFormat);
-    return this;
-  }
-
-  public ApiClient setSqlDateFormat(DateFormat dateFormat) {
-    this.json.setSqlDateFormat(dateFormat);
-    return this;
-  }
-
-  public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
-    this.json.setOffsetDateTimeFormat(dateFormat);
-    return this;
-  }
-
-  public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
-    this.json.setLocalDateFormat(dateFormat);
-    return this;
-  }
-
-
-  /**
-   * Helper method to configure the first api key found
-   * @param apiKey API key
-   * @return ApiClient
-   */
-  public ApiClient setApiKey(String apiKey) {
-    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof ApiKeyAuth) {
-        ApiKeyAuth keyAuth = (ApiKeyAuth) apiAuthorization;
-        keyAuth.setApiKey(apiKey);
-        return this;
-      }
-    }
-    return this;
-  }
-
-  /**
-   * Helper method to set token for the first Http Bearer authentication found.
-   * @param bearerToken Bearer token
-   * @return ApiClient
-   */
-  public ApiClient setBearerToken(String bearerToken) {
-    for (Interceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof HttpBearerAuth) {
-        ((HttpBearerAuth) apiAuthorization).setBearerToken(bearerToken);
-        return this;
-      }
-    }
-    return this;
-  }
-
-  /**
-   * Helper method to configure the username/password for basic auth or password oauth
-   * @param username Username
-   * @param password Password
-   * @return ApiClient
-   */
-  public ApiClient setCredentials(String username, String password) {
-    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof HttpBasicAuth) {
-        HttpBasicAuth basicAuth = (HttpBasicAuth) apiAuthorization;
-        basicAuth.setCredentials(username, password);
-        return this;
-      }
-      if (apiAuthorization instanceof OAuth) {
-        OAuth oauth = (OAuth) apiAuthorization;
-        oauth.getTokenRequestBuilder().setUsername(username).setPassword(password);
-        return this;
-      }
-    }
-    return this;
-  }
-
-  /**
-   * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
-   * @return Token request builder
-   */
-  public TokenRequestBuilder getTokenEndPoint() {
-    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof OAuth) {
-        OAuth oauth = (OAuth) apiAuthorization;
-        return oauth.getTokenRequestBuilder();
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
-   * @return Authentication request builder
-   */
-  public AuthenticationRequestBuilder getAuthorizationEndPoint() {
-    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof OAuth) {
-        OAuth oauth = (OAuth) apiAuthorization;
-        return oauth.getAuthenticationRequestBuilder();
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
-   * @param accessToken Access token
-   * @return ApiClient
-   */
-  public ApiClient setAccessToken(String accessToken) {
-    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof OAuth) {
-        OAuth oauth = (OAuth) apiAuthorization;
-        oauth.setAccessToken(accessToken);
-        return this;
-      }
-    }
-    return this;
-  }
-
-  /**
-   * Helper method to configure the oauth accessCode/implicit flow parameters
-   * @param clientId Client ID
-   * @param clientSecret Client secret
-   * @param redirectURI Redirect URI
-   * @return ApiClient
-   */
-  public ApiClient configureAuthorizationFlow(String clientId, String clientSecret, String redirectURI) {
-    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof OAuth) {
-        OAuth oauth = (OAuth) apiAuthorization;
-        oauth.getTokenRequestBuilder()
-          .setClientId(clientId)
-          .setClientSecret(clientSecret)
-          .setRedirectURI(redirectURI);
-        oauth.getAuthenticationRequestBuilder()
-          .setClientId(clientId)
-          .setRedirectURI(redirectURI);
-        return this;
-      }
-    }
-    return this;
-  }
-
-  /**
-   * Configures a listener which is notified when a new access token is received.
-   * @param accessTokenListener Access token listener
-   * @return ApiClient
-   */
-  public ApiClient registerAccessTokenListener(AccessTokenListener accessTokenListener) {
-    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
-      if (apiAuthorization instanceof OAuth) {
-        OAuth oauth = (OAuth) apiAuthorization;
-        oauth.registerAccessTokenListener(accessTokenListener);
-        return this;
-      }
-    }
-    return this;
-  }
-
-  /**
-   * Adds an authorization to be used by the client
-   * @param authName Authentication name
-   * @param authorization Authorization interceptor
-   * @return ApiClient
-   */
-  public ApiClient addAuthorization(String authName, Interceptor authorization) {
-    if (apiAuthorizations.containsKey(authName)) {
-      throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations");
-    }
-    apiAuthorizations.put(authName, authorization);
-    okBuilder.addInterceptor(authorization);
-    return this;
-  }
-
-  public Map<String, Interceptor> getApiAuthorizations() {
-    return apiAuthorizations;
-  }
-
-  public ApiClient setApiAuthorizations(Map<String, Interceptor> apiAuthorizations) {
-    this.apiAuthorizations = apiAuthorizations;
-    return this;
-  }
-
-  public Retrofit.Builder getAdapterBuilder() {
-    return adapterBuilder;
-  }
-
-  public ApiClient setAdapterBuilder(Retrofit.Builder adapterBuilder) {
-    this.adapterBuilder = adapterBuilder;
-    return this;
-  }
-
-  public OkHttpClient.Builder getOkBuilder() {
-    return okBuilder;
-  }
-
-  public void addAuthsToOkBuilder(OkHttpClient.Builder okBuilder) {
-    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
-      okBuilder.addInterceptor(apiAuthorization);
-    }
-  }
-
-  /**
-   * Clones the okBuilder given in parameter, adds the auth interceptors and uses it to configure the Retrofit
-   * @param okClient An instance of OK HTTP client
-   */
-  public void configureFromOkclient(OkHttpClient okClient) {
-    this.okBuilder = okClient.newBuilder();
-    addAuthsToOkBuilder(this.okBuilder);
-  }
-}
-
-/**
- * This wrapper is to take care of this case:
- * when the deserialization fails due to JsonParseException and the
- * expected type is String, then just return the body string.
- */
-class GsonResponseBodyConverterToString<T> implements Converter<ResponseBody, T> {
-  private final Gson gson;
-  private final Type type;
-
-  GsonResponseBodyConverterToString(Gson gson, Type type) {
-    this.gson = gson;
-    this.type = type;
-  }
-
-  @Override public T convert(ResponseBody value) throws IOException {
-    String returned = value.string();
-    try {
-      return gson.fromJson(returned, type);
-    }
-    catch (JsonParseException e) {
-      return (T) returned;
-    }
-  }
-}
-
-class GsonCustomConverterFactory extends Converter.Factory
-{
-  private final Gson gson;
-  private final GsonConverterFactory gsonConverterFactory;
-
-  public static GsonCustomConverterFactory create(Gson gson) {
-    return new GsonCustomConverterFactory(gson);
-  }
-
-  private GsonCustomConverterFactory(Gson gson) {
-    if (gson == null)
-      throw new NullPointerException("gson == null");
-    this.gson = gson;
-    this.gsonConverterFactory = GsonConverterFactory.create(gson);
-  }
-
-  @Override
-  public Converter<ResponseBody, ?> responseBodyConverter(Type type, Annotation[] annotations, Retrofit retrofit) {
-    if (type.equals(String.class))
-      return new GsonResponseBodyConverterToString<Object>(gson, type);
-    else
-      return gsonConverterFactory.responseBodyConverter(type, annotations, retrofit);
-  }
-
-  @Override
-  public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) {
-    return gsonConverterFactory.requestBodyConverter(type, parameterAnnotations, methodAnnotations, retrofit);
-  }
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/CollectionFormats.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/CollectionFormats.java
deleted file mode 100644
index 20cbb0e7d6af..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/CollectionFormats.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.openapitools.client;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class CollectionFormats {
-
-    public static class CSVParams {
-
-        protected List<String> params;
-
-        public CSVParams() {
-        }
-
-        public CSVParams(List<String> params) {
-            this.params = params;
-        }
-
-        public CSVParams(String... params) {
-            this.params = Arrays.asList(params);
-        }
-
-        public List<String> getParams() {
-            return params;
-        }
-
-        public void setParams(List<String> params) {
-            this.params = params;
-        }
-
-        @Override
-        public String toString() {
-            return StringUtil.join(params.toArray(new String[0]), ",");
-        }
-
-    }
-
-    public static class SPACEParams extends SSVParams {
-
-    }
-
-    public static class SSVParams extends CSVParams {
-
-        public SSVParams() {
-        }
-
-        public SSVParams(List<String> params) {
-            super(params);
-        }
-
-        public SSVParams(String... params) {
-            super(params);
-        }
-
-        @Override
-        public String toString() {
-            return StringUtil.join(params.toArray(new String[0]), " ");
-        }
-    }
-
-    public static class TSVParams extends CSVParams {
-
-        public TSVParams() {
-        }
-
-        public TSVParams(List<String> params) {
-            super(params);
-        }
-
-        public TSVParams(String... params) {
-            super(params);
-        }
-
-        @Override
-        public String toString() {
-            return StringUtil.join( params.toArray(new String[0]), "\t");
-        }
-    }
-
-    public static class PIPESParams extends CSVParams {
-
-        public PIPESParams() {
-        }
-
-        public PIPESParams(List<String> params) {
-            super(params);
-        }
-
-        public PIPESParams(String... params) {
-            super(params);
-        }
-
-        @Override
-        public String toString() {
-            return StringUtil.join(params.toArray(new String[0]), "|");
-        }
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/ServerConfiguration.java
deleted file mode 100644
index a1107a8690e4..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/ServerConfiguration.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.openapitools.client;
-
-import java.util.Map;
-
-/**
- * Representing a Server configuration.
- */
-public class ServerConfiguration {
-    public String URL;
-    public String description;
-    public Map<String, ServerVariable> variables;
-
-    /**
-     * @param URL A URL to the target host.
-     * @param description A describtion of the host designated by the URL.
-     * @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template.
-     */
-    public ServerConfiguration(String URL, String description, Map<String, ServerVariable> variables) {
-        this.URL = URL;
-        this.description = description;
-        this.variables = variables;
-    }
-
-    /**
-     * Format URL template using given variables.
-     *
-     * @param variables A map between a variable name and its value.
-     * @return Formatted URL.
-     */
-    public String URL(Map<String, String> variables) {
-        String url = this.URL;
-
-        // go through variables and replace placeholders
-        for (Map.Entry<String, ServerVariable> variable: this.variables.entrySet()) {
-            String name = variable.getKey();
-            ServerVariable serverVariable = variable.getValue();
-            String value = serverVariable.defaultValue;
-
-            if (variables != null && variables.containsKey(name)) {
-                value = variables.get(name);
-                if (serverVariable.enumValues.size() > 0 && !serverVariable.enumValues.contains(value)) {
-                    throw new RuntimeException("The variable " + name + " in the server URL has invalid value " + value + ".");
-                }
-            }
-            url = url.replaceAll("\\{" + name + "\\}", value);
-        }
-        return url;
-    }
-
-    /**
-     * Format URL template using default server variables.
-     *
-     * @return Formatted URL.
-     */
-    public String URL() {
-        return URL(null);
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/ServerVariable.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/ServerVariable.java
deleted file mode 100644
index c2f13e216662..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/ServerVariable.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.openapitools.client;
-
-import java.util.HashSet;
-
-/**
- * Representing a Server Variable for server URL template substitution.
- */
-public class ServerVariable {
-    public String description;
-    public String defaultValue;
-    public HashSet<String> enumValues = null;
-
-    /**
-     * @param description A description for the server variable.
-     * @param defaultValue The default value to use for substitution.
-     * @param enumValues An enumeration of string values to be used if the substitution options are from a limited set.
-     */
-    public ServerVariable(String description, String defaultValue, HashSet<String> enumValues) {
-        this.description = description;
-        this.defaultValue = defaultValue;
-        this.enumValues = enumValues;
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/StringUtil.java
deleted file mode 100644
index 747a23f5bf23..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/StringUtil.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-
-public class StringUtil {
-  /**
-   * Check if the given array contains the given value (with case-insensitive comparison).
-   *
-   * @param array The array
-   * @param value The value to search
-   * @return true if the array contains the value
-   */
-  public static boolean containsIgnoreCase(String[] array, String value) {
-    for (String str : array) {
-      if (value == null && str == null) {
-        return true;
-      }
-      if (value != null && value.equalsIgnoreCase(str)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Join an array of strings with the given separator.
-   * <p>
-   * Note: This might be replaced by utility method from commons-lang or guava someday
-   * if one of those libraries is added as dependency.
-   * </p>
-   *
-   * @param array     The array of strings
-   * @param separator The separator
-   * @return the resulting string
-   */
-  public static String join(String[] array, String separator) {
-    int len = array.length;
-    if (len == 0) {
-      return "";
-    }
-
-    StringBuilder out = new StringBuilder();
-    out.append(array[0]);
-    for (int i = 1; i < len; i++) {
-      out.append(separator).append(array[i]);
-    }
-    return out.toString();
-  }
-
-  /**
-   * Join a list of strings with the given separator.
-   *
-   * @param list      The list of strings
-   * @param separator The separator
-   * @return the resulting string
-   */
-  public static String join(Collection<String> list, String separator) {
-    Iterator<String> iterator = list.iterator();
-    StringBuilder out = new StringBuilder();
-    if (iterator.hasNext()) {
-      out.append(iterator.next());
-    }
-    while (iterator.hasNext()) {
-      out.append(separator).append(iterator.next());
-    }
-    return out.toString();
-  }
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
deleted file mode 100644
index 925faf5589d0..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-import rx.Observable;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import org.openapitools.client.model.Client;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public interface AnotherFakeApi {
-  /**
-   * To test special tags
-   * To test special tags and operation ID starting with number
-   * @param body client model (required)
-   * @return Observable&lt;Client&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PATCH("another-fake/dummy")
-  Observable<Client> call123testSpecialTags(
-    @retrofit2.http.Body Client body
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/FakeApi.java
deleted file mode 100644
index 438c244adc70..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/FakeApi.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-import rx.Observable;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import java.math.BigDecimal;
-import org.openapitools.client.model.Client;
-import java.io.File;
-import org.openapitools.client.model.FileSchemaTestClass;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
-import org.openapitools.client.model.OuterComposite;
-import org.openapitools.client.model.User;
-import org.openapitools.client.model.XmlItem;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public interface FakeApi {
-  /**
-   * creates an XmlItem
-   * this route creates an XmlItem
-   * @param xmlItem XmlItem Body (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/xml"
-  })
-  @POST("fake/create_xml_item")
-  Observable<Void> createXmlItem(
-    @retrofit2.http.Body XmlItem xmlItem
-  );
-
-  /**
-   * 
-   * Test serialization of outer boolean types
-   * @param body Input boolean as post body (optional)
-   * @return Observable&lt;Boolean&gt;
-   */
-  @POST("fake/outer/boolean")
-  Observable<Boolean> fakeOuterBooleanSerialize(
-    @retrofit2.http.Body Boolean body
-  );
-
-  /**
-   * 
-   * Test serialization of object with outer number type
-   * @param body Input composite as post body (optional)
-   * @return Observable&lt;OuterComposite&gt;
-   */
-  @POST("fake/outer/composite")
-  Observable<OuterComposite> fakeOuterCompositeSerialize(
-    @retrofit2.http.Body OuterComposite body
-  );
-
-  /**
-   * 
-   * Test serialization of outer number types
-   * @param body Input number as post body (optional)
-   * @return Observable&lt;BigDecimal&gt;
-   */
-  @POST("fake/outer/number")
-  Observable<BigDecimal> fakeOuterNumberSerialize(
-    @retrofit2.http.Body BigDecimal body
-  );
-
-  /**
-   * 
-   * Test serialization of outer string types
-   * @param body Input string as post body (optional)
-   * @return Observable&lt;String&gt;
-   */
-  @POST("fake/outer/string")
-  Observable<String> fakeOuterStringSerialize(
-    @retrofit2.http.Body String body
-  );
-
-  /**
-   * 
-   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-   * @param body  (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PUT("fake/body-with-file-schema")
-  Observable<Void> testBodyWithFileSchema(
-    @retrofit2.http.Body FileSchemaTestClass body
-  );
-
-  /**
-   * 
-   * 
-   * @param query  (required)
-   * @param body  (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PUT("fake/body-with-query-params")
-  Observable<Void> testBodyWithQueryParams(
-    @retrofit2.http.Query("query") String query, @retrofit2.http.Body User body
-  );
-
-  /**
-   * To test \&quot;client\&quot; model
-   * To test \&quot;client\&quot; model
-   * @param body client model (required)
-   * @return Observable&lt;Client&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PATCH("fake")
-  Observable<Client> testClientModel(
-    @retrofit2.http.Body Client body
-  );
-
-  /**
-   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-   * @param number None (required)
-   * @param _double None (required)
-   * @param patternWithoutDelimiter None (required)
-   * @param _byte None (required)
-   * @param integer None (optional)
-   * @param int32 None (optional)
-   * @param int64 None (optional)
-   * @param _float None (optional)
-   * @param string None (optional)
-   * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
-   * @param password None (optional)
-   * @param paramCallback None (optional)
-   * @return Observable&lt;Void&gt;
-   */
-  @retrofit2.http.FormUrlEncoded
-  @POST("fake")
-  Observable<Void> testEndpointParameters(
-    @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") OffsetDateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback
-  );
-
-  /**
-   * To test enum parameters
-   * To test enum parameters
-   * @param enumHeaderStringArray Header parameter enum test (string array) (optional, default to new ArrayList&lt;String&gt;())
-   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
-   * @param enumQueryStringArray Query parameter enum test (string array) (optional, default to new ArrayList&lt;String&gt;())
-   * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
-   * @param enumQueryInteger Query parameter enum test (double) (optional)
-   * @param enumQueryDouble Query parameter enum test (double) (optional)
-   * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
-   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
-   * @return Observable&lt;Void&gt;
-   */
-  @retrofit2.http.FormUrlEncoded
-  @GET("fake")
-  Observable<Void> testEnumParameters(
-    @retrofit2.http.Header("enum_header_string_array") List<String> enumHeaderStringArray, @retrofit2.http.Header("enum_header_string") String enumHeaderString, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit2.http.Query("enum_query_string") String enumQueryString, @retrofit2.http.Query("enum_query_integer") Integer enumQueryInteger, @retrofit2.http.Query("enum_query_double") Double enumQueryDouble, @retrofit2.http.Field("enum_form_string_array") List<String> enumFormStringArray, @retrofit2.http.Field("enum_form_string") String enumFormString
-  );
-
-  /**
-   * Fake endpoint to test group parameters (optional)
-   * Fake endpoint to test group parameters (optional)
-   * @param requiredStringGroup Required String in group parameters (required)
-   * @param requiredBooleanGroup Required Boolean in group parameters (required)
-   * @param requiredInt64Group Required Integer in group parameters (required)
-   * @param stringGroup String in group parameters (optional)
-   * @param booleanGroup Boolean in group parameters (optional)
-   * @param int64Group Integer in group parameters (optional)
-   * @return Observable&lt;Void&gt;
-   */
-  @DELETE("fake")
-  Observable<Void> testGroupParameters(
-    @retrofit2.http.Query("required_string_group") Integer requiredStringGroup, @retrofit2.http.Header("required_boolean_group") Boolean requiredBooleanGroup, @retrofit2.http.Query("required_int64_group") Long requiredInt64Group, @retrofit2.http.Query("string_group") Integer stringGroup, @retrofit2.http.Header("boolean_group") Boolean booleanGroup, @retrofit2.http.Query("int64_group") Long int64Group
-  );
-
-  /**
-   * test inline additionalProperties
-   * 
-   * @param param request body (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @POST("fake/inline-additionalProperties")
-  Observable<Void> testInlineAdditionalProperties(
-    @retrofit2.http.Body Map<String, String> param
-  );
-
-  /**
-   * test json serialization of form data
-   * 
-   * @param param field1 (required)
-   * @param param2 field2 (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @retrofit2.http.FormUrlEncoded
-  @GET("fake/jsonFormData")
-  Observable<Void> testJsonFormData(
-    @retrofit2.http.Field("param") String param, @retrofit2.http.Field("param2") String param2
-  );
-
-  /**
-   * 
-   * To test the collection format in query parameters
-   * @param pipe  (required)
-   * @param ioutil  (required)
-   * @param http  (required)
-   * @param url  (required)
-   * @param context  (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @PUT("fake/test-query-paramters")
-  Observable<Void> testQueryParameterCollectionFormat(
-    @retrofit2.http.Query("pipe") CSVParams pipe, @retrofit2.http.Query("ioutil") CSVParams ioutil, @retrofit2.http.Query("http") SSVParams http, @retrofit2.http.Query("url") CSVParams url, @retrofit2.http.Query("context") List<String> context
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
deleted file mode 100644
index 6806977340be..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-import rx.Observable;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import org.openapitools.client.model.Client;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public interface FakeClassnameTags123Api {
-  /**
-   * To test class name in snake case
-   * To test class name in snake case
-   * @param body client model (required)
-   * @return Observable&lt;Client&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PATCH("fake_classname_test")
-  Observable<Client> testClassname(
-    @retrofit2.http.Body Client body
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/PetApi.java
deleted file mode 100644
index 885b9586c600..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/PetApi.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-import rx.Observable;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import java.io.File;
-import org.openapitools.client.model.ModelApiResponse;
-import org.openapitools.client.model.Pet;
-import java.util.Set;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public interface PetApi {
-  /**
-   * Add a new pet to the store
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @POST("pet")
-  Observable<Void> addPet(
-    @retrofit2.http.Body Pet body
-  );
-
-  /**
-   * Deletes a pet
-   * 
-   * @param petId Pet id to delete (required)
-   * @param apiKey  (optional)
-   * @return Observable&lt;Void&gt;
-   */
-  @DELETE("pet/{petId}")
-  Observable<Void> deletePet(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Header("api_key") String apiKey
-  );
-
-  /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma separated strings
-   * @param status Status values that need to be considered for filter (required)
-   * @return Observable&lt;List&lt;Pet&gt;&gt;
-   */
-  @GET("pet/findByStatus")
-  Observable<List<Pet>> findPetsByStatus(
-    @retrofit2.http.Query("status") CSVParams status
-  );
-
-  /**
-   * Finds Pets by tags
-   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by (required)
-   * @return Observable&lt;Set&lt;Pet&gt;&gt;
-   * @deprecated
-   */
-  @Deprecated
-  @GET("pet/findByTags")
-  Observable<Set<Pet>> findPetsByTags(
-    @retrofit2.http.Query("tags") CSVParams tags
-  );
-
-  /**
-   * Find pet by ID
-   * Returns a single pet
-   * @param petId ID of pet to return (required)
-   * @return Observable&lt;Pet&gt;
-   */
-  @GET("pet/{petId}")
-  Observable<Pet> getPetById(
-    @retrofit2.http.Path("petId") Long petId
-  );
-
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @Headers({
-    "Content-Type:application/json"
-  })
-  @PUT("pet")
-  Observable<Void> updatePet(
-    @retrofit2.http.Body Pet body
-  );
-
-  /**
-   * Updates a pet in the store with form data
-   * 
-   * @param petId ID of pet that needs to be updated (required)
-   * @param name Updated name of the pet (optional)
-   * @param status Updated status of the pet (optional)
-   * @return Observable&lt;Void&gt;
-   */
-  @retrofit2.http.FormUrlEncoded
-  @POST("pet/{petId}")
-  Observable<Void> updatePetWithForm(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Field("name") String name, @retrofit2.http.Field("status") String status
-  );
-
-  /**
-   * uploads an image
-   * 
-   * @param petId ID of pet to update (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @param file file to upload (optional)
-   * @return Observable&lt;ModelApiResponse&gt;
-   */
-  @retrofit2.http.Multipart
-  @POST("pet/{petId}/uploadImage")
-  Observable<ModelApiResponse> uploadFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
-  );
-
-  /**
-   * uploads an image (required)
-   * 
-   * @param petId ID of pet to update (required)
-   * @param requiredFile file to upload (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @return Observable&lt;ModelApiResponse&gt;
-   */
-  @retrofit2.http.Multipart
-  @POST("fake/{petId}/uploadImageWithRequiredFile")
-  Observable<ModelApiResponse> uploadFileWithRequiredFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/StoreApi.java
deleted file mode 100644
index a82986b7143a..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/StoreApi.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-import rx.Observable;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import org.openapitools.client.model.Order;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public interface StoreApi {
-  /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @DELETE("store/order/{order_id}")
-  Observable<Void> deleteOrder(
-    @retrofit2.http.Path("order_id") String orderId
-  );
-
-  /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return Observable&lt;Map&lt;String, Integer&gt;&gt;
-   */
-  @GET("store/inventory")
-  Observable<Map<String, Integer>> getInventory();
-    
-
-  /**
-   * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-   * @param orderId ID of pet that needs to be fetched (required)
-   * @return Observable&lt;Order&gt;
-   */
-  @GET("store/order/{order_id}")
-  Observable<Order> getOrderById(
-    @retrofit2.http.Path("order_id") Long orderId
-  );
-
-  /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet (required)
-   * @return Observable&lt;Order&gt;
-   */
-  @POST("store/order")
-  Observable<Order> placeOrder(
-    @retrofit2.http.Body Order body
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/UserApi.java
deleted file mode 100644
index 54b188d24ce6..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/UserApi.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.CollectionFormats.*;
-
-import rx.Observable;
-import retrofit2.http.*;
-
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import okhttp3.MultipartBody;
-
-import org.openapitools.client.model.User;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public interface UserApi {
-  /**
-   * Create user
-   * This can only be done by the logged in user.
-   * @param body Created user object (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @POST("user")
-  Observable<Void> createUser(
-    @retrofit2.http.Body User body
-  );
-
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @POST("user/createWithArray")
-  Observable<Void> createUsersWithArrayInput(
-    @retrofit2.http.Body List<User> body
-  );
-
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @POST("user/createWithList")
-  Observable<Void> createUsersWithListInput(
-    @retrofit2.http.Body List<User> body
-  );
-
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @DELETE("user/{username}")
-  Observable<Void> deleteUser(
-    @retrofit2.http.Path("username") String username
-  );
-
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
-   * @return Observable&lt;User&gt;
-   */
-  @GET("user/{username}")
-  Observable<User> getUserByName(
-    @retrofit2.http.Path("username") String username
-  );
-
-  /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login (required)
-   * @param password The password for login in clear text (required)
-   * @return Observable&lt;String&gt;
-   */
-  @GET("user/login")
-  Observable<String> loginUser(
-    @retrofit2.http.Query("username") String username, @retrofit2.http.Query("password") String password
-  );
-
-  /**
-   * Logs out current logged in user session
-   * 
-   * @return Observable&lt;Void&gt;
-   */
-  @GET("user/logout")
-  Observable<Void> logoutUser();
-    
-
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted (required)
-   * @param body Updated user object (required)
-   * @return Observable&lt;Void&gt;
-   */
-  @PUT("user/{username}")
-  Observable<Void> updateUser(
-    @retrofit2.http.Path("username") String username, @retrofit2.http.Body User body
-  );
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
deleted file mode 100644
index 79c169543fde..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * AdditionalPropertiesAnyType
- */
-
-public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
-  private String name;
-
-
-  public AdditionalPropertiesAnyType name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
-    return Objects.equals(this.name, additionalPropertiesAnyType.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesAnyType {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
deleted file mode 100644
index e16ee861f893..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * AdditionalPropertiesArray
- */
-
-public class AdditionalPropertiesArray extends HashMap<String, List> {
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
-  private String name;
-
-
-  public AdditionalPropertiesArray name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
-    return Objects.equals(this.name, additionalPropertiesArray.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesArray {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
deleted file mode 100644
index 29161b52aa16..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * AdditionalPropertiesBoolean
- */
-
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
-  private String name;
-
-
-  public AdditionalPropertiesBoolean name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
-    return Objects.equals(this.name, additionalPropertiesBoolean.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesBoolean {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
deleted file mode 100644
index a067b01ec979..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * AdditionalPropertiesClass
- */
-
-public class AdditionalPropertiesClass {
-  public static final String SERIALIZED_NAME_MAP_STRING = "map_string";
-  @SerializedName(SERIALIZED_NAME_MAP_STRING)
-  private Map<String, String> mapString = null;
-
-  public static final String SERIALIZED_NAME_MAP_NUMBER = "map_number";
-  @SerializedName(SERIALIZED_NAME_MAP_NUMBER)
-  private Map<String, BigDecimal> mapNumber = null;
-
-  public static final String SERIALIZED_NAME_MAP_INTEGER = "map_integer";
-  @SerializedName(SERIALIZED_NAME_MAP_INTEGER)
-  private Map<String, Integer> mapInteger = null;
-
-  public static final String SERIALIZED_NAME_MAP_BOOLEAN = "map_boolean";
-  @SerializedName(SERIALIZED_NAME_MAP_BOOLEAN)
-  private Map<String, Boolean> mapBoolean = null;
-
-  public static final String SERIALIZED_NAME_MAP_ARRAY_INTEGER = "map_array_integer";
-  @SerializedName(SERIALIZED_NAME_MAP_ARRAY_INTEGER)
-  private Map<String, List<Integer>> mapArrayInteger = null;
-
-  public static final String SERIALIZED_NAME_MAP_ARRAY_ANYTYPE = "map_array_anytype";
-  @SerializedName(SERIALIZED_NAME_MAP_ARRAY_ANYTYPE)
-  private Map<String, List<Object>> mapArrayAnytype = null;
-
-  public static final String SERIALIZED_NAME_MAP_MAP_STRING = "map_map_string";
-  @SerializedName(SERIALIZED_NAME_MAP_MAP_STRING)
-  private Map<String, Map<String, String>> mapMapString = null;
-
-  public static final String SERIALIZED_NAME_MAP_MAP_ANYTYPE = "map_map_anytype";
-  @SerializedName(SERIALIZED_NAME_MAP_MAP_ANYTYPE)
-  private Map<String, Map<String, Object>> mapMapAnytype = null;
-
-  public static final String SERIALIZED_NAME_ANYTYPE1 = "anytype_1";
-  @SerializedName(SERIALIZED_NAME_ANYTYPE1)
-  private Object anytype1;
-
-  public static final String SERIALIZED_NAME_ANYTYPE2 = "anytype_2";
-  @SerializedName(SERIALIZED_NAME_ANYTYPE2)
-  private Object anytype2;
-
-  public static final String SERIALIZED_NAME_ANYTYPE3 = "anytype_3";
-  @SerializedName(SERIALIZED_NAME_ANYTYPE3)
-  private Object anytype3;
-
-
-  public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
-    
-    this.mapString = mapString;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) {
-    if (this.mapString == null) {
-      this.mapString = new HashMap<String, String>();
-    }
-    this.mapString.put(key, mapStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapString
-   * @return mapString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Map<String, String> getMapString() {
-    return mapString;
-  }
-
-
-  public void setMapString(Map<String, String> mapString) {
-    this.mapString = mapString;
-  }
-
-
-  public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
-    
-    this.mapNumber = mapNumber;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) {
-    if (this.mapNumber == null) {
-      this.mapNumber = new HashMap<String, BigDecimal>();
-    }
-    this.mapNumber.put(key, mapNumberItem);
-    return this;
-  }
-
-   /**
-   * Get mapNumber
-   * @return mapNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Map<String, BigDecimal> getMapNumber() {
-    return mapNumber;
-  }
-
-
-  public void setMapNumber(Map<String, BigDecimal> mapNumber) {
-    this.mapNumber = mapNumber;
-  }
-
-
-  public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
-    
-    this.mapInteger = mapInteger;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) {
-    if (this.mapInteger == null) {
-      this.mapInteger = new HashMap<String, Integer>();
-    }
-    this.mapInteger.put(key, mapIntegerItem);
-    return this;
-  }
-
-   /**
-   * Get mapInteger
-   * @return mapInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Map<String, Integer> getMapInteger() {
-    return mapInteger;
-  }
-
-
-  public void setMapInteger(Map<String, Integer> mapInteger) {
-    this.mapInteger = mapInteger;
-  }
-
-
-  public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
-    
-    this.mapBoolean = mapBoolean;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) {
-    if (this.mapBoolean == null) {
-      this.mapBoolean = new HashMap<String, Boolean>();
-    }
-    this.mapBoolean.put(key, mapBooleanItem);
-    return this;
-  }
-
-   /**
-   * Get mapBoolean
-   * @return mapBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Map<String, Boolean> getMapBoolean() {
-    return mapBoolean;
-  }
-
-
-  public void setMapBoolean(Map<String, Boolean> mapBoolean) {
-    this.mapBoolean = mapBoolean;
-  }
-
-
-  public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
-    
-    this.mapArrayInteger = mapArrayInteger;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer> mapArrayIntegerItem) {
-    if (this.mapArrayInteger == null) {
-      this.mapArrayInteger = new HashMap<String, List<Integer>>();
-    }
-    this.mapArrayInteger.put(key, mapArrayIntegerItem);
-    return this;
-  }
-
-   /**
-   * Get mapArrayInteger
-   * @return mapArrayInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Map<String, List<Integer>> getMapArrayInteger() {
-    return mapArrayInteger;
-  }
-
-
-  public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
-    this.mapArrayInteger = mapArrayInteger;
-  }
-
-
-  public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
-    
-    this.mapArrayAnytype = mapArrayAnytype;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object> mapArrayAnytypeItem) {
-    if (this.mapArrayAnytype == null) {
-      this.mapArrayAnytype = new HashMap<String, List<Object>>();
-    }
-    this.mapArrayAnytype.put(key, mapArrayAnytypeItem);
-    return this;
-  }
-
-   /**
-   * Get mapArrayAnytype
-   * @return mapArrayAnytype
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Map<String, List<Object>> getMapArrayAnytype() {
-    return mapArrayAnytype;
-  }
-
-
-  public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
-    this.mapArrayAnytype = mapArrayAnytype;
-  }
-
-
-  public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> mapMapString) {
-    
-    this.mapMapString = mapMapString;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, String> mapMapStringItem) {
-    if (this.mapMapString == null) {
-      this.mapMapString = new HashMap<String, Map<String, String>>();
-    }
-    this.mapMapString.put(key, mapMapStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapMapString
-   * @return mapMapString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Map<String, Map<String, String>> getMapMapString() {
-    return mapMapString;
-  }
-
-
-  public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
-    this.mapMapString = mapMapString;
-  }
-
-
-  public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
-    
-    this.mapMapAnytype = mapMapAnytype;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Object> mapMapAnytypeItem) {
-    if (this.mapMapAnytype == null) {
-      this.mapMapAnytype = new HashMap<String, Map<String, Object>>();
-    }
-    this.mapMapAnytype.put(key, mapMapAnytypeItem);
-    return this;
-  }
-
-   /**
-   * Get mapMapAnytype
-   * @return mapMapAnytype
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Map<String, Map<String, Object>> getMapMapAnytype() {
-    return mapMapAnytype;
-  }
-
-
-  public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
-    this.mapMapAnytype = mapMapAnytype;
-  }
-
-
-  public AdditionalPropertiesClass anytype1(Object anytype1) {
-    
-    this.anytype1 = anytype1;
-    return this;
-  }
-
-   /**
-   * Get anytype1
-   * @return anytype1
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Object getAnytype1() {
-    return anytype1;
-  }
-
-
-  public void setAnytype1(Object anytype1) {
-    this.anytype1 = anytype1;
-  }
-
-
-  public AdditionalPropertiesClass anytype2(Object anytype2) {
-    
-    this.anytype2 = anytype2;
-    return this;
-  }
-
-   /**
-   * Get anytype2
-   * @return anytype2
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Object getAnytype2() {
-    return anytype2;
-  }
-
-
-  public void setAnytype2(Object anytype2) {
-    this.anytype2 = anytype2;
-  }
-
-
-  public AdditionalPropertiesClass anytype3(Object anytype3) {
-    
-    this.anytype3 = anytype3;
-    return this;
-  }
-
-   /**
-   * Get anytype3
-   * @return anytype3
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Object getAnytype3() {
-    return anytype3;
-  }
-
-
-  public void setAnytype3(Object anytype3) {
-    this.anytype3 = anytype3;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
-    return Objects.equals(this.mapString, additionalPropertiesClass.mapString) &&
-        Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) &&
-        Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) &&
-        Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) &&
-        Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) &&
-        Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) &&
-        Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) &&
-        Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) &&
-        Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) &&
-        Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) &&
-        Objects.equals(this.anytype3, additionalPropertiesClass.anytype3);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesClass {\n");
-    sb.append("    mapString: ").append(toIndentedString(mapString)).append("\n");
-    sb.append("    mapNumber: ").append(toIndentedString(mapNumber)).append("\n");
-    sb.append("    mapInteger: ").append(toIndentedString(mapInteger)).append("\n");
-    sb.append("    mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n");
-    sb.append("    mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n");
-    sb.append("    mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n");
-    sb.append("    mapMapString: ").append(toIndentedString(mapMapString)).append("\n");
-    sb.append("    mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n");
-    sb.append("    anytype1: ").append(toIndentedString(anytype1)).append("\n");
-    sb.append("    anytype2: ").append(toIndentedString(anytype2)).append("\n");
-    sb.append("    anytype3: ").append(toIndentedString(anytype3)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
deleted file mode 100644
index 3a15ed7cd977..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * AdditionalPropertiesInteger
- */
-
-public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
-  private String name;
-
-
-  public AdditionalPropertiesInteger name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
-    return Objects.equals(this.name, additionalPropertiesInteger.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesInteger {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
deleted file mode 100644
index 9bc46e099916..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * AdditionalPropertiesNumber
- */
-
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
-  private String name;
-
-
-  public AdditionalPropertiesNumber name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
-    return Objects.equals(this.name, additionalPropertiesNumber.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesNumber {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
deleted file mode 100644
index bd65f7791c5e..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * AdditionalPropertiesObject
- */
-
-public class AdditionalPropertiesObject extends HashMap<String, Map> {
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
-  private String name;
-
-
-  public AdditionalPropertiesObject name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o;
-    return Objects.equals(this.name, additionalPropertiesObject.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesObject {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
deleted file mode 100644
index cdb8afedaaf4..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * AdditionalPropertiesString
- */
-
-public class AdditionalPropertiesString extends HashMap<String, String> {
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
-  private String name;
-
-
-  public AdditionalPropertiesString name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o;
-    return Objects.equals(this.name, additionalPropertiesString.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesString {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Animal.java
deleted file mode 100644
index 4d3bf2369fb6..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Animal.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.openapitools.client.model.BigCat;
-import org.openapitools.client.model.Cat;
-import org.openapitools.client.model.Dog;
-
-/**
- * Animal
- */
-
-
-public class Animal {
-  public static final String SERIALIZED_NAME_CLASS_NAME = "className";
-  @SerializedName(SERIALIZED_NAME_CLASS_NAME)
-  protected String className;
-
-  public static final String SERIALIZED_NAME_COLOR = "color";
-  @SerializedName(SERIALIZED_NAME_COLOR)
-  private String color = "red";
-
-  public Animal() {
-    this.className = this.getClass().getSimpleName();
-  }
-
-  public Animal className(String className) {
-    
-    this.className = className;
-    return this;
-  }
-
-   /**
-   * Get className
-   * @return className
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public String getClassName() {
-    return className;
-  }
-
-
-  public void setClassName(String className) {
-    this.className = className;
-  }
-
-
-  public Animal color(String color) {
-    
-    this.color = color;
-    return this;
-  }
-
-   /**
-   * Get color
-   * @return color
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getColor() {
-    return color;
-  }
-
-
-  public void setColor(String color) {
-    this.color = color;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Animal animal = (Animal) o;
-    return Objects.equals(this.className, animal.className) &&
-        Objects.equals(this.color, animal.color);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(className, color);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Animal {\n");
-    sb.append("    className: ").append(toIndentedString(className)).append("\n");
-    sb.append("    color: ").append(toIndentedString(color)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
deleted file mode 100644
index a6dd760660d5..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * ArrayOfArrayOfNumberOnly
- */
-
-public class ArrayOfArrayOfNumberOnly {
-  public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
-  @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER)
-  private List<List<BigDecimal>> arrayArrayNumber = null;
-
-
-  public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
-    
-    this.arrayArrayNumber = arrayArrayNumber;
-    return this;
-  }
-
-  public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
-    if (this.arrayArrayNumber == null) {
-      this.arrayArrayNumber = new ArrayList<List<BigDecimal>>();
-    }
-    this.arrayArrayNumber.add(arrayArrayNumberItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayNumber
-   * @return arrayArrayNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<List<BigDecimal>> getArrayArrayNumber() {
-    return arrayArrayNumber;
-  }
-
-
-  public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
-    this.arrayArrayNumber = arrayArrayNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o;
-    return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayArrayNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayOfArrayOfNumberOnly {\n");
-    sb.append("    arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
deleted file mode 100644
index 487c539d3bac..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * ArrayOfNumberOnly
- */
-
-public class ArrayOfNumberOnly {
-  public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber";
-  @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER)
-  private List<BigDecimal> arrayNumber = null;
-
-
-  public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
-    
-    this.arrayNumber = arrayNumber;
-    return this;
-  }
-
-  public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
-    if (this.arrayNumber == null) {
-      this.arrayNumber = new ArrayList<BigDecimal>();
-    }
-    this.arrayNumber.add(arrayNumberItem);
-    return this;
-  }
-
-   /**
-   * Get arrayNumber
-   * @return arrayNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<BigDecimal> getArrayNumber() {
-    return arrayNumber;
-  }
-
-
-  public void setArrayNumber(List<BigDecimal> arrayNumber) {
-    this.arrayNumber = arrayNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o;
-    return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayOfNumberOnly {\n");
-    sb.append("    arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayTest.java
deleted file mode 100644
index 7d66ce233feb..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.client.model.ReadOnlyFirst;
-
-/**
- * ArrayTest
- */
-
-public class ArrayTest {
-  public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string";
-  @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING)
-  private List<String> arrayOfString = null;
-
-  public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
-  @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER)
-  private List<List<Long>> arrayArrayOfInteger = null;
-
-  public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
-  @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL)
-  private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
-
-
-  public ArrayTest arrayOfString(List<String> arrayOfString) {
-    
-    this.arrayOfString = arrayOfString;
-    return this;
-  }
-
-  public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
-    if (this.arrayOfString == null) {
-      this.arrayOfString = new ArrayList<String>();
-    }
-    this.arrayOfString.add(arrayOfStringItem);
-    return this;
-  }
-
-   /**
-   * Get arrayOfString
-   * @return arrayOfString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<String> getArrayOfString() {
-    return arrayOfString;
-  }
-
-
-  public void setArrayOfString(List<String> arrayOfString) {
-    this.arrayOfString = arrayOfString;
-  }
-
-
-  public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
-    
-    this.arrayArrayOfInteger = arrayArrayOfInteger;
-    return this;
-  }
-
-  public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
-    if (this.arrayArrayOfInteger == null) {
-      this.arrayArrayOfInteger = new ArrayList<List<Long>>();
-    }
-    this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayOfInteger
-   * @return arrayArrayOfInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<List<Long>> getArrayArrayOfInteger() {
-    return arrayArrayOfInteger;
-  }
-
-
-  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
-    this.arrayArrayOfInteger = arrayArrayOfInteger;
-  }
-
-
-  public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
-    
-    this.arrayArrayOfModel = arrayArrayOfModel;
-    return this;
-  }
-
-  public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
-    if (this.arrayArrayOfModel == null) {
-      this.arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
-    }
-    this.arrayArrayOfModel.add(arrayArrayOfModelItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayOfModel
-   * @return arrayArrayOfModel
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
-    return arrayArrayOfModel;
-  }
-
-
-  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
-    this.arrayArrayOfModel = arrayArrayOfModel;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayTest arrayTest = (ArrayTest) o;
-    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
-        Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
-        Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayTest {\n");
-    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
-    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
-    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/BigCat.java
deleted file mode 100644
index d30cc70c0cf4..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/BigCat.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.openapitools.client.model.BigCatAllOf;
-import org.openapitools.client.model.Cat;
-
-/**
- * BigCat
- */
-
-
-public class BigCat extends Cat {
-  /**
-   * Gets or Sets kind
-   */
-  @JsonAdapter(KindEnum.Adapter.class)
-  public enum KindEnum {
-    LIONS("lions"),
-    
-    TIGERS("tigers"),
-    
-    LEOPARDS("leopards"),
-    
-    JAGUARS("jaguars");
-
-    private String value;
-
-    KindEnum(String value) {
-      this.value = value;
-    }
-
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    public static KindEnum fromValue(String value) {
-      for (KindEnum b : KindEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-
-    public static class Adapter extends TypeAdapter<KindEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final KindEnum enumeration) throws IOException {
-        jsonWriter.value(enumeration.getValue());
-      }
-
-      @Override
-      public KindEnum read(final JsonReader jsonReader) throws IOException {
-        String value =  jsonReader.nextString();
-        return KindEnum.fromValue(value);
-      }
-    }
-  }
-
-  public static final String SERIALIZED_NAME_KIND = "kind";
-  @SerializedName(SERIALIZED_NAME_KIND)
-  private KindEnum kind;
-
-  public BigCat() {
-    this.className = this.getClass().getSimpleName();
-  }
-
-  public BigCat kind(KindEnum kind) {
-    
-    this.kind = kind;
-    return this;
-  }
-
-   /**
-   * Get kind
-   * @return kind
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public KindEnum getKind() {
-    return kind;
-  }
-
-
-  public void setKind(KindEnum kind) {
-    this.kind = kind;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BigCat bigCat = (BigCat) o;
-    return Objects.equals(this.kind, bigCat.kind) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(kind, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BigCat {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/BigCatAllOf.java
deleted file mode 100644
index cd2207704bd1..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * BigCatAllOf
- */
-
-public class BigCatAllOf {
-  /**
-   * Gets or Sets kind
-   */
-  @JsonAdapter(KindEnum.Adapter.class)
-  public enum KindEnum {
-    LIONS("lions"),
-    
-    TIGERS("tigers"),
-    
-    LEOPARDS("leopards"),
-    
-    JAGUARS("jaguars");
-
-    private String value;
-
-    KindEnum(String value) {
-      this.value = value;
-    }
-
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    public static KindEnum fromValue(String value) {
-      for (KindEnum b : KindEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-
-    public static class Adapter extends TypeAdapter<KindEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final KindEnum enumeration) throws IOException {
-        jsonWriter.value(enumeration.getValue());
-      }
-
-      @Override
-      public KindEnum read(final JsonReader jsonReader) throws IOException {
-        String value =  jsonReader.nextString();
-        return KindEnum.fromValue(value);
-      }
-    }
-  }
-
-  public static final String SERIALIZED_NAME_KIND = "kind";
-  @SerializedName(SERIALIZED_NAME_KIND)
-  private KindEnum kind;
-
-
-  public BigCatAllOf kind(KindEnum kind) {
-    
-    this.kind = kind;
-    return this;
-  }
-
-   /**
-   * Get kind
-   * @return kind
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public KindEnum getKind() {
-    return kind;
-  }
-
-
-  public void setKind(KindEnum kind) {
-    this.kind = kind;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BigCatAllOf bigCatAllOf = (BigCatAllOf) o;
-    return Objects.equals(this.kind, bigCatAllOf.kind);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(kind);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BigCatAllOf {\n");
-    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Capitalization.java
deleted file mode 100644
index d4fbec81c543..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Capitalization.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * Capitalization
- */
-
-public class Capitalization {
-  public static final String SERIALIZED_NAME_SMALL_CAMEL = "smallCamel";
-  @SerializedName(SERIALIZED_NAME_SMALL_CAMEL)
-  private String smallCamel;
-
-  public static final String SERIALIZED_NAME_CAPITAL_CAMEL = "CapitalCamel";
-  @SerializedName(SERIALIZED_NAME_CAPITAL_CAMEL)
-  private String capitalCamel;
-
-  public static final String SERIALIZED_NAME_SMALL_SNAKE = "small_Snake";
-  @SerializedName(SERIALIZED_NAME_SMALL_SNAKE)
-  private String smallSnake;
-
-  public static final String SERIALIZED_NAME_CAPITAL_SNAKE = "Capital_Snake";
-  @SerializedName(SERIALIZED_NAME_CAPITAL_SNAKE)
-  private String capitalSnake;
-
-  public static final String SERIALIZED_NAME_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points";
-  @SerializedName(SERIALIZED_NAME_SC_A_E_T_H_FLOW_POINTS)
-  private String scAETHFlowPoints;
-
-  public static final String SERIALIZED_NAME_A_T_T_N_A_M_E = "ATT_NAME";
-  @SerializedName(SERIALIZED_NAME_A_T_T_N_A_M_E)
-  private String ATT_NAME;
-
-
-  public Capitalization smallCamel(String smallCamel) {
-    
-    this.smallCamel = smallCamel;
-    return this;
-  }
-
-   /**
-   * Get smallCamel
-   * @return smallCamel
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getSmallCamel() {
-    return smallCamel;
-  }
-
-
-  public void setSmallCamel(String smallCamel) {
-    this.smallCamel = smallCamel;
-  }
-
-
-  public Capitalization capitalCamel(String capitalCamel) {
-    
-    this.capitalCamel = capitalCamel;
-    return this;
-  }
-
-   /**
-   * Get capitalCamel
-   * @return capitalCamel
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getCapitalCamel() {
-    return capitalCamel;
-  }
-
-
-  public void setCapitalCamel(String capitalCamel) {
-    this.capitalCamel = capitalCamel;
-  }
-
-
-  public Capitalization smallSnake(String smallSnake) {
-    
-    this.smallSnake = smallSnake;
-    return this;
-  }
-
-   /**
-   * Get smallSnake
-   * @return smallSnake
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getSmallSnake() {
-    return smallSnake;
-  }
-
-
-  public void setSmallSnake(String smallSnake) {
-    this.smallSnake = smallSnake;
-  }
-
-
-  public Capitalization capitalSnake(String capitalSnake) {
-    
-    this.capitalSnake = capitalSnake;
-    return this;
-  }
-
-   /**
-   * Get capitalSnake
-   * @return capitalSnake
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getCapitalSnake() {
-    return capitalSnake;
-  }
-
-
-  public void setCapitalSnake(String capitalSnake) {
-    this.capitalSnake = capitalSnake;
-  }
-
-
-  public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
-    
-    this.scAETHFlowPoints = scAETHFlowPoints;
-    return this;
-  }
-
-   /**
-   * Get scAETHFlowPoints
-   * @return scAETHFlowPoints
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getScAETHFlowPoints() {
-    return scAETHFlowPoints;
-  }
-
-
-  public void setScAETHFlowPoints(String scAETHFlowPoints) {
-    this.scAETHFlowPoints = scAETHFlowPoints;
-  }
-
-
-  public Capitalization ATT_NAME(String ATT_NAME) {
-    
-    this.ATT_NAME = ATT_NAME;
-    return this;
-  }
-
-   /**
-   * Name of the pet 
-   * @return ATT_NAME
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Name of the pet ")
-
-  public String getATTNAME() {
-    return ATT_NAME;
-  }
-
-
-  public void setATTNAME(String ATT_NAME) {
-    this.ATT_NAME = ATT_NAME;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Capitalization capitalization = (Capitalization) o;
-    return Objects.equals(this.smallCamel, capitalization.smallCamel) &&
-        Objects.equals(this.capitalCamel, capitalization.capitalCamel) &&
-        Objects.equals(this.smallSnake, capitalization.smallSnake) &&
-        Objects.equals(this.capitalSnake, capitalization.capitalSnake) &&
-        Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) &&
-        Objects.equals(this.ATT_NAME, capitalization.ATT_NAME);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Capitalization {\n");
-    sb.append("    smallCamel: ").append(toIndentedString(smallCamel)).append("\n");
-    sb.append("    capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n");
-    sb.append("    smallSnake: ").append(toIndentedString(smallSnake)).append("\n");
-    sb.append("    capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n");
-    sb.append("    scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n");
-    sb.append("    ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java
deleted file mode 100644
index 058f627b4141..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.openapitools.client.model.Animal;
-import org.openapitools.client.model.BigCat;
-import org.openapitools.client.model.CatAllOf;
-
-/**
- * Cat
- */
-
-
-public class Cat extends Animal {
-  public static final String SERIALIZED_NAME_DECLAWED = "declawed";
-  @SerializedName(SERIALIZED_NAME_DECLAWED)
-  private Boolean declawed;
-
-  public Cat() {
-    this.className = this.getClass().getSimpleName();
-  }
-
-  public Cat declawed(Boolean declawed) {
-    
-    this.declawed = declawed;
-    return this;
-  }
-
-   /**
-   * Get declawed
-   * @return declawed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Boolean getDeclawed() {
-    return declawed;
-  }
-
-
-  public void setDeclawed(Boolean declawed) {
-    this.declawed = declawed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Cat cat = (Cat) o;
-    return Objects.equals(this.declawed, cat.declawed) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(declawed, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Cat {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/CatAllOf.java
deleted file mode 100644
index dcd1a8e3b90e..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * CatAllOf
- */
-
-public class CatAllOf {
-  public static final String SERIALIZED_NAME_DECLAWED = "declawed";
-  @SerializedName(SERIALIZED_NAME_DECLAWED)
-  private Boolean declawed;
-
-
-  public CatAllOf declawed(Boolean declawed) {
-    
-    this.declawed = declawed;
-    return this;
-  }
-
-   /**
-   * Get declawed
-   * @return declawed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Boolean getDeclawed() {
-    return declawed;
-  }
-
-
-  public void setDeclawed(Boolean declawed) {
-    this.declawed = declawed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CatAllOf catAllOf = (CatAllOf) o;
-    return Objects.equals(this.declawed, catAllOf.declawed);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(declawed);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CatAllOf {\n");
-    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Category.java
deleted file mode 100644
index 4d07c3a1bef1..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Category.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * Category
- */
-
-public class Category {
-  public static final String SERIALIZED_NAME_ID = "id";
-  @SerializedName(SERIALIZED_NAME_ID)
-  private Long id;
-
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
-  private String name = "default-name";
-
-
-  public Category id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Category name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Category category = (Category) o;
-    return Objects.equals(this.id, category.id) &&
-        Objects.equals(this.name, category.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Category {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ClassModel.java
deleted file mode 100644
index 8867bdd06bf0..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ClassModel.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * Model for testing model with \&quot;_class\&quot; property
- */
-@ApiModel(description = "Model for testing model with \"_class\" property")
-
-public class ClassModel {
-  public static final String SERIALIZED_NAME_PROPERTY_CLASS = "_class";
-  @SerializedName(SERIALIZED_NAME_PROPERTY_CLASS)
-  private String propertyClass;
-
-
-  public ClassModel propertyClass(String propertyClass) {
-    
-    this.propertyClass = propertyClass;
-    return this;
-  }
-
-   /**
-   * Get propertyClass
-   * @return propertyClass
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getPropertyClass() {
-    return propertyClass;
-  }
-
-
-  public void setPropertyClass(String propertyClass) {
-    this.propertyClass = propertyClass;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ClassModel classModel = (ClassModel) o;
-    return Objects.equals(this.propertyClass, classModel.propertyClass);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(propertyClass);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ClassModel {\n");
-    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Client.java
deleted file mode 100644
index 25831260e09b..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Client.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * Client
- */
-
-public class Client {
-  public static final String SERIALIZED_NAME_CLIENT = "client";
-  @SerializedName(SERIALIZED_NAME_CLIENT)
-  private String client;
-
-
-  public Client client(String client) {
-    
-    this.client = client;
-    return this;
-  }
-
-   /**
-   * Get client
-   * @return client
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getClient() {
-    return client;
-  }
-
-
-  public void setClient(String client) {
-    this.client = client;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Client client = (Client) o;
-    return Objects.equals(this.client, client.client);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(client);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Client {\n");
-    sb.append("    client: ").append(toIndentedString(client)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java
deleted file mode 100644
index f80bc1ab8dcd..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.openapitools.client.model.Animal;
-import org.openapitools.client.model.DogAllOf;
-
-/**
- * Dog
- */
-
-
-public class Dog extends Animal {
-  public static final String SERIALIZED_NAME_BREED = "breed";
-  @SerializedName(SERIALIZED_NAME_BREED)
-  private String breed;
-
-  public Dog() {
-    this.className = this.getClass().getSimpleName();
-  }
-
-  public Dog breed(String breed) {
-    
-    this.breed = breed;
-    return this;
-  }
-
-   /**
-   * Get breed
-   * @return breed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getBreed() {
-    return breed;
-  }
-
-
-  public void setBreed(String breed) {
-    this.breed = breed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Dog dog = (Dog) o;
-    return Objects.equals(this.breed, dog.breed) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(breed, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Dog {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/DogAllOf.java
deleted file mode 100644
index b945c2c33db4..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * DogAllOf
- */
-
-public class DogAllOf {
-  public static final String SERIALIZED_NAME_BREED = "breed";
-  @SerializedName(SERIALIZED_NAME_BREED)
-  private String breed;
-
-
-  public DogAllOf breed(String breed) {
-    
-    this.breed = breed;
-    return this;
-  }
-
-   /**
-   * Get breed
-   * @return breed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getBreed() {
-    return breed;
-  }
-
-
-  public void setBreed(String breed) {
-    this.breed = breed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    DogAllOf dogAllOf = (DogAllOf) o;
-    return Objects.equals(this.breed, dogAllOf.breed);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(breed);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class DogAllOf {\n");
-    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumArrays.java
deleted file mode 100644
index 2512b4cf9d52..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * EnumArrays
- */
-
-public class EnumArrays {
-  /**
-   * Gets or Sets justSymbol
-   */
-  @JsonAdapter(JustSymbolEnum.Adapter.class)
-  public enum JustSymbolEnum {
-    GREATER_THAN_OR_EQUAL_TO(">="),
-    
-    DOLLAR("$");
-
-    private String value;
-
-    JustSymbolEnum(String value) {
-      this.value = value;
-    }
-
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    public static JustSymbolEnum fromValue(String value) {
-      for (JustSymbolEnum b : JustSymbolEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-
-    public static class Adapter extends TypeAdapter<JustSymbolEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final JustSymbolEnum enumeration) throws IOException {
-        jsonWriter.value(enumeration.getValue());
-      }
-
-      @Override
-      public JustSymbolEnum read(final JsonReader jsonReader) throws IOException {
-        String value =  jsonReader.nextString();
-        return JustSymbolEnum.fromValue(value);
-      }
-    }
-  }
-
-  public static final String SERIALIZED_NAME_JUST_SYMBOL = "just_symbol";
-  @SerializedName(SERIALIZED_NAME_JUST_SYMBOL)
-  private JustSymbolEnum justSymbol;
-
-  /**
-   * Gets or Sets arrayEnum
-   */
-  @JsonAdapter(ArrayEnumEnum.Adapter.class)
-  public enum ArrayEnumEnum {
-    FISH("fish"),
-    
-    CRAB("crab");
-
-    private String value;
-
-    ArrayEnumEnum(String value) {
-      this.value = value;
-    }
-
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    public static ArrayEnumEnum fromValue(String value) {
-      for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-
-    public static class Adapter extends TypeAdapter<ArrayEnumEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final ArrayEnumEnum enumeration) throws IOException {
-        jsonWriter.value(enumeration.getValue());
-      }
-
-      @Override
-      public ArrayEnumEnum read(final JsonReader jsonReader) throws IOException {
-        String value =  jsonReader.nextString();
-        return ArrayEnumEnum.fromValue(value);
-      }
-    }
-  }
-
-  public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum";
-  @SerializedName(SERIALIZED_NAME_ARRAY_ENUM)
-  private List<ArrayEnumEnum> arrayEnum = null;
-
-
-  public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
-    
-    this.justSymbol = justSymbol;
-    return this;
-  }
-
-   /**
-   * Get justSymbol
-   * @return justSymbol
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public JustSymbolEnum getJustSymbol() {
-    return justSymbol;
-  }
-
-
-  public void setJustSymbol(JustSymbolEnum justSymbol) {
-    this.justSymbol = justSymbol;
-  }
-
-
-  public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
-    
-    this.arrayEnum = arrayEnum;
-    return this;
-  }
-
-  public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
-    if (this.arrayEnum == null) {
-      this.arrayEnum = new ArrayList<ArrayEnumEnum>();
-    }
-    this.arrayEnum.add(arrayEnumItem);
-    return this;
-  }
-
-   /**
-   * Get arrayEnum
-   * @return arrayEnum
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<ArrayEnumEnum> getArrayEnum() {
-    return arrayEnum;
-  }
-
-
-  public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
-    this.arrayEnum = arrayEnum;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EnumArrays enumArrays = (EnumArrays) o;
-    return Objects.equals(this.justSymbol, enumArrays.justSymbol) &&
-        Objects.equals(this.arrayEnum, enumArrays.arrayEnum);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(justSymbol, arrayEnum);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EnumArrays {\n");
-    sb.append("    justSymbol: ").append(toIndentedString(justSymbol)).append("\n");
-    sb.append("    arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java
deleted file mode 100644
index ccbbabaa9ba5..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.openapitools.client.model.OuterEnum;
-
-/**
- * EnumTest
- */
-
-public class EnumTest {
-  /**
-   * Gets or Sets enumString
-   */
-  @JsonAdapter(EnumStringEnum.Adapter.class)
-  public enum EnumStringEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower"),
-    
-    EMPTY("");
-
-    private String value;
-
-    EnumStringEnum(String value) {
-      this.value = value;
-    }
-
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    public static EnumStringEnum fromValue(String value) {
-      for (EnumStringEnum b : EnumStringEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-
-    public static class Adapter extends TypeAdapter<EnumStringEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final EnumStringEnum enumeration) throws IOException {
-        jsonWriter.value(enumeration.getValue());
-      }
-
-      @Override
-      public EnumStringEnum read(final JsonReader jsonReader) throws IOException {
-        String value =  jsonReader.nextString();
-        return EnumStringEnum.fromValue(value);
-      }
-    }
-  }
-
-  public static final String SERIALIZED_NAME_ENUM_STRING = "enum_string";
-  @SerializedName(SERIALIZED_NAME_ENUM_STRING)
-  private EnumStringEnum enumString;
-
-  /**
-   * Gets or Sets enumStringRequired
-   */
-  @JsonAdapter(EnumStringRequiredEnum.Adapter.class)
-  public enum EnumStringRequiredEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower"),
-    
-    EMPTY("");
-
-    private String value;
-
-    EnumStringRequiredEnum(String value) {
-      this.value = value;
-    }
-
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    public static EnumStringRequiredEnum fromValue(String value) {
-      for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-
-    public static class Adapter extends TypeAdapter<EnumStringRequiredEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final EnumStringRequiredEnum enumeration) throws IOException {
-        jsonWriter.value(enumeration.getValue());
-      }
-
-      @Override
-      public EnumStringRequiredEnum read(final JsonReader jsonReader) throws IOException {
-        String value =  jsonReader.nextString();
-        return EnumStringRequiredEnum.fromValue(value);
-      }
-    }
-  }
-
-  public static final String SERIALIZED_NAME_ENUM_STRING_REQUIRED = "enum_string_required";
-  @SerializedName(SERIALIZED_NAME_ENUM_STRING_REQUIRED)
-  private EnumStringRequiredEnum enumStringRequired;
-
-  /**
-   * Gets or Sets enumInteger
-   */
-  @JsonAdapter(EnumIntegerEnum.Adapter.class)
-  public enum EnumIntegerEnum {
-    NUMBER_1(1),
-    
-    NUMBER_MINUS_1(-1);
-
-    private Integer value;
-
-    EnumIntegerEnum(Integer value) {
-      this.value = value;
-    }
-
-    public Integer getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    public static EnumIntegerEnum fromValue(Integer value) {
-      for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-
-    public static class Adapter extends TypeAdapter<EnumIntegerEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final EnumIntegerEnum enumeration) throws IOException {
-        jsonWriter.value(enumeration.getValue());
-      }
-
-      @Override
-      public EnumIntegerEnum read(final JsonReader jsonReader) throws IOException {
-        Integer value =  jsonReader.nextInt();
-        return EnumIntegerEnum.fromValue(value);
-      }
-    }
-  }
-
-  public static final String SERIALIZED_NAME_ENUM_INTEGER = "enum_integer";
-  @SerializedName(SERIALIZED_NAME_ENUM_INTEGER)
-  private EnumIntegerEnum enumInteger;
-
-  /**
-   * Gets or Sets enumNumber
-   */
-  @JsonAdapter(EnumNumberEnum.Adapter.class)
-  public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(1.1),
-    
-    NUMBER_MINUS_1_DOT_2(-1.2);
-
-    private Double value;
-
-    EnumNumberEnum(Double value) {
-      this.value = value;
-    }
-
-    public Double getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    public static EnumNumberEnum fromValue(Double value) {
-      for (EnumNumberEnum b : EnumNumberEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-
-    public static class Adapter extends TypeAdapter<EnumNumberEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final EnumNumberEnum enumeration) throws IOException {
-        jsonWriter.value(enumeration.getValue());
-      }
-
-      @Override
-      public EnumNumberEnum read(final JsonReader jsonReader) throws IOException {
-        Double value =  jsonReader.nextDouble();
-        return EnumNumberEnum.fromValue(value);
-      }
-    }
-  }
-
-  public static final String SERIALIZED_NAME_ENUM_NUMBER = "enum_number";
-  @SerializedName(SERIALIZED_NAME_ENUM_NUMBER)
-  private EnumNumberEnum enumNumber;
-
-  public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum";
-  @SerializedName(SERIALIZED_NAME_OUTER_ENUM)
-  private OuterEnum outerEnum;
-
-
-  public EnumTest enumString(EnumStringEnum enumString) {
-    
-    this.enumString = enumString;
-    return this;
-  }
-
-   /**
-   * Get enumString
-   * @return enumString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public EnumStringEnum getEnumString() {
-    return enumString;
-  }
-
-
-  public void setEnumString(EnumStringEnum enumString) {
-    this.enumString = enumString;
-  }
-
-
-  public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
-    
-    this.enumStringRequired = enumStringRequired;
-    return this;
-  }
-
-   /**
-   * Get enumStringRequired
-   * @return enumStringRequired
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public EnumStringRequiredEnum getEnumStringRequired() {
-    return enumStringRequired;
-  }
-
-
-  public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
-    this.enumStringRequired = enumStringRequired;
-  }
-
-
-  public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
-    
-    this.enumInteger = enumInteger;
-    return this;
-  }
-
-   /**
-   * Get enumInteger
-   * @return enumInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public EnumIntegerEnum getEnumInteger() {
-    return enumInteger;
-  }
-
-
-  public void setEnumInteger(EnumIntegerEnum enumInteger) {
-    this.enumInteger = enumInteger;
-  }
-
-
-  public EnumTest enumNumber(EnumNumberEnum enumNumber) {
-    
-    this.enumNumber = enumNumber;
-    return this;
-  }
-
-   /**
-   * Get enumNumber
-   * @return enumNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public EnumNumberEnum getEnumNumber() {
-    return enumNumber;
-  }
-
-
-  public void setEnumNumber(EnumNumberEnum enumNumber) {
-    this.enumNumber = enumNumber;
-  }
-
-
-  public EnumTest outerEnum(OuterEnum outerEnum) {
-    
-    this.outerEnum = outerEnum;
-    return this;
-  }
-
-   /**
-   * Get outerEnum
-   * @return outerEnum
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public OuterEnum getOuterEnum() {
-    return outerEnum;
-  }
-
-
-  public void setOuterEnum(OuterEnum outerEnum) {
-    this.outerEnum = outerEnum;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EnumTest enumTest = (EnumTest) o;
-    return Objects.equals(this.enumString, enumTest.enumString) &&
-        Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
-        Objects.equals(this.enumInteger, enumTest.enumInteger) &&
-        Objects.equals(this.enumNumber, enumTest.enumNumber) &&
-        Objects.equals(this.outerEnum, enumTest.outerEnum);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EnumTest {\n");
-    sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
-    sb.append("    enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
-    sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
-    sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
-    sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
deleted file mode 100644
index f4a15cd5b7fd..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * FileSchemaTestClass
- */
-
-public class FileSchemaTestClass {
-  public static final String SERIALIZED_NAME_FILE = "file";
-  @SerializedName(SERIALIZED_NAME_FILE)
-  private java.io.File file;
-
-  public static final String SERIALIZED_NAME_FILES = "files";
-  @SerializedName(SERIALIZED_NAME_FILES)
-  private List<java.io.File> files = null;
-
-
-  public FileSchemaTestClass file(java.io.File file) {
-    
-    this.file = file;
-    return this;
-  }
-
-   /**
-   * Get file
-   * @return file
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public java.io.File getFile() {
-    return file;
-  }
-
-
-  public void setFile(java.io.File file) {
-    this.file = file;
-  }
-
-
-  public FileSchemaTestClass files(List<java.io.File> files) {
-    
-    this.files = files;
-    return this;
-  }
-
-  public FileSchemaTestClass addFilesItem(java.io.File filesItem) {
-    if (this.files == null) {
-      this.files = new ArrayList<java.io.File>();
-    }
-    this.files.add(filesItem);
-    return this;
-  }
-
-   /**
-   * Get files
-   * @return files
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<java.io.File> getFiles() {
-    return files;
-  }
-
-
-  public void setFiles(List<java.io.File> files) {
-    this.files = files;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o;
-    return Objects.equals(this.file, fileSchemaTestClass.file) &&
-        Objects.equals(this.files, fileSchemaTestClass.files);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(file, files);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FileSchemaTestClass {\n");
-    sb.append("    file: ").append(toIndentedString(file)).append("\n");
-    sb.append("    files: ").append(toIndentedString(files)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FormatTest.java
deleted file mode 100644
index 5983420c81b1..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FormatTest.java
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.UUID;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
-
-/**
- * FormatTest
- */
-
-public class FormatTest {
-  public static final String SERIALIZED_NAME_INTEGER = "integer";
-  @SerializedName(SERIALIZED_NAME_INTEGER)
-  private Integer integer;
-
-  public static final String SERIALIZED_NAME_INT32 = "int32";
-  @SerializedName(SERIALIZED_NAME_INT32)
-  private Integer int32;
-
-  public static final String SERIALIZED_NAME_INT64 = "int64";
-  @SerializedName(SERIALIZED_NAME_INT64)
-  private Long int64;
-
-  public static final String SERIALIZED_NAME_NUMBER = "number";
-  @SerializedName(SERIALIZED_NAME_NUMBER)
-  private BigDecimal number;
-
-  public static final String SERIALIZED_NAME_FLOAT = "float";
-  @SerializedName(SERIALIZED_NAME_FLOAT)
-  private Float _float;
-
-  public static final String SERIALIZED_NAME_DOUBLE = "double";
-  @SerializedName(SERIALIZED_NAME_DOUBLE)
-  private Double _double;
-
-  public static final String SERIALIZED_NAME_STRING = "string";
-  @SerializedName(SERIALIZED_NAME_STRING)
-  private String string;
-
-  public static final String SERIALIZED_NAME_BYTE = "byte";
-  @SerializedName(SERIALIZED_NAME_BYTE)
-  private byte[] _byte;
-
-  public static final String SERIALIZED_NAME_BINARY = "binary";
-  @SerializedName(SERIALIZED_NAME_BINARY)
-  private File binary;
-
-  public static final String SERIALIZED_NAME_DATE = "date";
-  @SerializedName(SERIALIZED_NAME_DATE)
-  private LocalDate date;
-
-  public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
-  @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
-
-  public static final String SERIALIZED_NAME_UUID = "uuid";
-  @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
-
-  public static final String SERIALIZED_NAME_PASSWORD = "password";
-  @SerializedName(SERIALIZED_NAME_PASSWORD)
-  private String password;
-
-  public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal";
-  @SerializedName(SERIALIZED_NAME_BIG_DECIMAL)
-  private BigDecimal bigDecimal;
-
-
-  public FormatTest integer(Integer integer) {
-    
-    this.integer = integer;
-    return this;
-  }
-
-   /**
-   * Get integer
-   * minimum: 10
-   * maximum: 100
-   * @return integer
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Integer getInteger() {
-    return integer;
-  }
-
-
-  public void setInteger(Integer integer) {
-    this.integer = integer;
-  }
-
-
-  public FormatTest int32(Integer int32) {
-    
-    this.int32 = int32;
-    return this;
-  }
-
-   /**
-   * Get int32
-   * minimum: 20
-   * maximum: 200
-   * @return int32
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Integer getInt32() {
-    return int32;
-  }
-
-
-  public void setInt32(Integer int32) {
-    this.int32 = int32;
-  }
-
-
-  public FormatTest int64(Long int64) {
-    
-    this.int64 = int64;
-    return this;
-  }
-
-   /**
-   * Get int64
-   * @return int64
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Long getInt64() {
-    return int64;
-  }
-
-
-  public void setInt64(Long int64) {
-    this.int64 = int64;
-  }
-
-
-  public FormatTest number(BigDecimal number) {
-    
-    this.number = number;
-    return this;
-  }
-
-   /**
-   * Get number
-   * minimum: 32.1
-   * maximum: 543.2
-   * @return number
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public BigDecimal getNumber() {
-    return number;
-  }
-
-
-  public void setNumber(BigDecimal number) {
-    this.number = number;
-  }
-
-
-  public FormatTest _float(Float _float) {
-    
-    this._float = _float;
-    return this;
-  }
-
-   /**
-   * Get _float
-   * minimum: 54.3
-   * maximum: 987.6
-   * @return _float
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Float getFloat() {
-    return _float;
-  }
-
-
-  public void setFloat(Float _float) {
-    this._float = _float;
-  }
-
-
-  public FormatTest _double(Double _double) {
-    
-    this._double = _double;
-    return this;
-  }
-
-   /**
-   * Get _double
-   * minimum: 67.8
-   * maximum: 123.4
-   * @return _double
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Double getDouble() {
-    return _double;
-  }
-
-
-  public void setDouble(Double _double) {
-    this._double = _double;
-  }
-
-
-  public FormatTest string(String string) {
-    
-    this.string = string;
-    return this;
-  }
-
-   /**
-   * Get string
-   * @return string
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getString() {
-    return string;
-  }
-
-
-  public void setString(String string) {
-    this.string = string;
-  }
-
-
-  public FormatTest _byte(byte[] _byte) {
-    
-    this._byte = _byte;
-    return this;
-  }
-
-   /**
-   * Get _byte
-   * @return _byte
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public byte[] getByte() {
-    return _byte;
-  }
-
-
-  public void setByte(byte[] _byte) {
-    this._byte = _byte;
-  }
-
-
-  public FormatTest binary(File binary) {
-    
-    this.binary = binary;
-    return this;
-  }
-
-   /**
-   * Get binary
-   * @return binary
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public File getBinary() {
-    return binary;
-  }
-
-
-  public void setBinary(File binary) {
-    this.binary = binary;
-  }
-
-
-  public FormatTest date(LocalDate date) {
-    
-    this.date = date;
-    return this;
-  }
-
-   /**
-   * Get date
-   * @return date
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public LocalDate getDate() {
-    return date;
-  }
-
-
-  public void setDate(LocalDate date) {
-    this.date = date;
-  }
-
-
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    
-    this.dateTime = dateTime;
-    return this;
-  }
-
-   /**
-   * Get dateTime
-   * @return dateTime
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public OffsetDateTime getDateTime() {
-    return dateTime;
-  }
-
-
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
-  }
-
-
-  public FormatTest uuid(UUID uuid) {
-    
-    this.uuid = uuid;
-    return this;
-  }
-
-   /**
-   * Get uuid
-   * @return uuid
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
-
-  public UUID getUuid() {
-    return uuid;
-  }
-
-
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
-  }
-
-
-  public FormatTest password(String password) {
-    
-    this.password = password;
-    return this;
-  }
-
-   /**
-   * Get password
-   * @return password
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public String getPassword() {
-    return password;
-  }
-
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    
-    this.bigDecimal = bigDecimal;
-    return this;
-  }
-
-   /**
-   * Get bigDecimal
-   * @return bigDecimal
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public BigDecimal getBigDecimal() {
-    return bigDecimal;
-  }
-
-
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
-        Objects.equals(this.int32, formatTest.int32) &&
-        Objects.equals(this.int64, formatTest.int64) &&
-        Objects.equals(this.number, formatTest.number) &&
-        Objects.equals(this._float, formatTest._float) &&
-        Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
-        Arrays.equals(this._byte, formatTest._byte) &&
-        Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
-        Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
-    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
-    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
-    sb.append("    number: ").append(toIndentedString(number)).append("\n");
-    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
-    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
-    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
-    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    password: ").append(toIndentedString(password)).append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
deleted file mode 100644
index 8fcb26846436..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * HasOnlyReadOnly
- */
-
-public class HasOnlyReadOnly {
-  public static final String SERIALIZED_NAME_BAR = "bar";
-  @SerializedName(SERIALIZED_NAME_BAR)
-  private String bar;
-
-  public static final String SERIALIZED_NAME_FOO = "foo";
-  @SerializedName(SERIALIZED_NAME_FOO)
-  private String foo;
-
-
-   /**
-   * Get bar
-   * @return bar
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getBar() {
-    return bar;
-  }
-
-
-
-
-   /**
-   * Get foo
-   * @return foo
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getFoo() {
-    return foo;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o;
-    return Objects.equals(this.bar, hasOnlyReadOnly.bar) &&
-        Objects.equals(this.foo, hasOnlyReadOnly.foo);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(bar, foo);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class HasOnlyReadOnly {\n");
-    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
-    sb.append("    foo: ").append(toIndentedString(foo)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MapTest.java
deleted file mode 100644
index 7dc68b0ff00f..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MapTest.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * MapTest
- */
-
-public class MapTest {
-  public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string";
-  @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING)
-  private Map<String, Map<String, String>> mapMapOfString = null;
-
-  /**
-   * Gets or Sets inner
-   */
-  @JsonAdapter(InnerEnum.Adapter.class)
-  public enum InnerEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower");
-
-    private String value;
-
-    InnerEnum(String value) {
-      this.value = value;
-    }
-
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    public static InnerEnum fromValue(String value) {
-      for (InnerEnum b : InnerEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-
-    public static class Adapter extends TypeAdapter<InnerEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final InnerEnum enumeration) throws IOException {
-        jsonWriter.value(enumeration.getValue());
-      }
-
-      @Override
-      public InnerEnum read(final JsonReader jsonReader) throws IOException {
-        String value =  jsonReader.nextString();
-        return InnerEnum.fromValue(value);
-      }
-    }
-  }
-
-  public static final String SERIALIZED_NAME_MAP_OF_ENUM_STRING = "map_of_enum_string";
-  @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING)
-  private Map<String, InnerEnum> mapOfEnumString = null;
-
-  public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map";
-  @SerializedName(SERIALIZED_NAME_DIRECT_MAP)
-  private Map<String, Boolean> directMap = null;
-
-  public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map";
-  @SerializedName(SERIALIZED_NAME_INDIRECT_MAP)
-  private Map<String, Boolean> indirectMap = null;
-
-
-  public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
-    
-    this.mapMapOfString = mapMapOfString;
-    return this;
-  }
-
-  public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
-    if (this.mapMapOfString == null) {
-      this.mapMapOfString = new HashMap<String, Map<String, String>>();
-    }
-    this.mapMapOfString.put(key, mapMapOfStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapMapOfString
-   * @return mapMapOfString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Map<String, Map<String, String>> getMapMapOfString() {
-    return mapMapOfString;
-  }
-
-
-  public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
-    this.mapMapOfString = mapMapOfString;
-  }
-
-
-  public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
-    
-    this.mapOfEnumString = mapOfEnumString;
-    return this;
-  }
-
-  public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
-    if (this.mapOfEnumString == null) {
-      this.mapOfEnumString = new HashMap<String, InnerEnum>();
-    }
-    this.mapOfEnumString.put(key, mapOfEnumStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapOfEnumString
-   * @return mapOfEnumString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Map<String, InnerEnum> getMapOfEnumString() {
-    return mapOfEnumString;
-  }
-
-
-  public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
-    this.mapOfEnumString = mapOfEnumString;
-  }
-
-
-  public MapTest directMap(Map<String, Boolean> directMap) {
-    
-    this.directMap = directMap;
-    return this;
-  }
-
-  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
-    if (this.directMap == null) {
-      this.directMap = new HashMap<String, Boolean>();
-    }
-    this.directMap.put(key, directMapItem);
-    return this;
-  }
-
-   /**
-   * Get directMap
-   * @return directMap
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Map<String, Boolean> getDirectMap() {
-    return directMap;
-  }
-
-
-  public void setDirectMap(Map<String, Boolean> directMap) {
-    this.directMap = directMap;
-  }
-
-
-  public MapTest indirectMap(Map<String, Boolean> indirectMap) {
-    
-    this.indirectMap = indirectMap;
-    return this;
-  }
-
-  public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
-    if (this.indirectMap == null) {
-      this.indirectMap = new HashMap<String, Boolean>();
-    }
-    this.indirectMap.put(key, indirectMapItem);
-    return this;
-  }
-
-   /**
-   * Get indirectMap
-   * @return indirectMap
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Map<String, Boolean> getIndirectMap() {
-    return indirectMap;
-  }
-
-
-  public void setIndirectMap(Map<String, Boolean> indirectMap) {
-    this.indirectMap = indirectMap;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MapTest mapTest = (MapTest) o;
-    return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
-        Objects.equals(this.directMap, mapTest.directMap) &&
-        Objects.equals(this.indirectMap, mapTest.indirectMap);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MapTest {\n");
-    sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
-    sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
-    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
-    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
deleted file mode 100644
index 527853d7522c..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import org.openapitools.client.model.Animal;
-import org.threeten.bp.OffsetDateTime;
-
-/**
- * MixedPropertiesAndAdditionalPropertiesClass
- */
-
-public class MixedPropertiesAndAdditionalPropertiesClass {
-  public static final String SERIALIZED_NAME_UUID = "uuid";
-  @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
-
-  public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
-  @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
-
-  public static final String SERIALIZED_NAME_MAP = "map";
-  @SerializedName(SERIALIZED_NAME_MAP)
-  private Map<String, Animal> map = null;
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    
-    this.uuid = uuid;
-    return this;
-  }
-
-   /**
-   * Get uuid
-   * @return uuid
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public UUID getUuid() {
-    return uuid;
-  }
-
-
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
-  }
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    
-    this.dateTime = dateTime;
-    return this;
-  }
-
-   /**
-   * Get dateTime
-   * @return dateTime
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public OffsetDateTime getDateTime() {
-    return dateTime;
-  }
-
-
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
-  }
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    
-    this.map = map;
-    return this;
-  }
-
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<String, Animal>();
-    }
-    this.map.put(key, mapItem);
-    return this;
-  }
-
-   /**
-   * Get map
-   * @return map
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Map<String, Animal> getMap() {
-    return map;
-  }
-
-
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Model200Response.java
deleted file mode 100644
index df3683dac78d..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Model200Response.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * Model for testing model name starting with number
- */
-@ApiModel(description = "Model for testing model name starting with number")
-
-public class Model200Response {
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
-  private Integer name;
-
-  public static final String SERIALIZED_NAME_PROPERTY_CLASS = "class";
-  @SerializedName(SERIALIZED_NAME_PROPERTY_CLASS)
-  private String propertyClass;
-
-
-  public Model200Response name(Integer name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Integer getName() {
-    return name;
-  }
-
-
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-
-  public Model200Response propertyClass(String propertyClass) {
-    
-    this.propertyClass = propertyClass;
-    return this;
-  }
-
-   /**
-   * Get propertyClass
-   * @return propertyClass
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getPropertyClass() {
-    return propertyClass;
-  }
-
-
-  public void setPropertyClass(String propertyClass) {
-    this.propertyClass = propertyClass;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Model200Response _200response = (Model200Response) o;
-    return Objects.equals(this.name, _200response.name) &&
-        Objects.equals(this.propertyClass, _200response.propertyClass);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, propertyClass);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Model200Response {\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
deleted file mode 100644
index b9cf72823b2f..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * ModelApiResponse
- */
-
-public class ModelApiResponse {
-  public static final String SERIALIZED_NAME_CODE = "code";
-  @SerializedName(SERIALIZED_NAME_CODE)
-  private Integer code;
-
-  public static final String SERIALIZED_NAME_TYPE = "type";
-  @SerializedName(SERIALIZED_NAME_TYPE)
-  private String type;
-
-  public static final String SERIALIZED_NAME_MESSAGE = "message";
-  @SerializedName(SERIALIZED_NAME_MESSAGE)
-  private String message;
-
-
-  public ModelApiResponse code(Integer code) {
-    
-    this.code = code;
-    return this;
-  }
-
-   /**
-   * Get code
-   * @return code
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Integer getCode() {
-    return code;
-  }
-
-
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-
-  public ModelApiResponse type(String type) {
-    
-    this.type = type;
-    return this;
-  }
-
-   /**
-   * Get type
-   * @return type
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getType() {
-    return type;
-  }
-
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  public ModelApiResponse message(String message) {
-    
-    this.message = message;
-    return this;
-  }
-
-   /**
-   * Get message
-   * @return message
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getMessage() {
-    return message;
-  }
-
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ModelApiResponse _apiResponse = (ModelApiResponse) o;
-    return Objects.equals(this.code, _apiResponse.code) &&
-        Objects.equals(this.type, _apiResponse.type) &&
-        Objects.equals(this.message, _apiResponse.message);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, type, message);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ModelApiResponse {\n");
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelReturn.java
deleted file mode 100644
index 6e9714df977d..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * Model for testing reserved words
- */
-@ApiModel(description = "Model for testing reserved words")
-
-public class ModelReturn {
-  public static final String SERIALIZED_NAME_RETURN = "return";
-  @SerializedName(SERIALIZED_NAME_RETURN)
-  private Integer _return;
-
-
-  public ModelReturn _return(Integer _return) {
-    
-    this._return = _return;
-    return this;
-  }
-
-   /**
-   * Get _return
-   * @return _return
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Integer getReturn() {
-    return _return;
-  }
-
-
-  public void setReturn(Integer _return) {
-    this._return = _return;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ModelReturn _return = (ModelReturn) o;
-    return Objects.equals(this._return, _return._return);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(_return);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ModelReturn {\n");
-    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Name.java
deleted file mode 100644
index 94117a9b0f4b..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Name.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * Model for testing model name same as property name
- */
-@ApiModel(description = "Model for testing model name same as property name")
-
-public class Name {
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
-  private Integer name;
-
-  public static final String SERIALIZED_NAME_SNAKE_CASE = "snake_case";
-  @SerializedName(SERIALIZED_NAME_SNAKE_CASE)
-  private Integer snakeCase;
-
-  public static final String SERIALIZED_NAME_PROPERTY = "property";
-  @SerializedName(SERIALIZED_NAME_PROPERTY)
-  private String property;
-
-  public static final String SERIALIZED_NAME_123NUMBER = "123Number";
-  @SerializedName(SERIALIZED_NAME_123NUMBER)
-  private Integer _123number;
-
-
-  public Name name(Integer name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public Integer getName() {
-    return name;
-  }
-
-
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-
-   /**
-   * Get snakeCase
-   * @return snakeCase
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Integer getSnakeCase() {
-    return snakeCase;
-  }
-
-
-
-
-  public Name property(String property) {
-    
-    this.property = property;
-    return this;
-  }
-
-   /**
-   * Get property
-   * @return property
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getProperty() {
-    return property;
-  }
-
-
-  public void setProperty(String property) {
-    this.property = property;
-  }
-
-
-   /**
-   * Get _123number
-   * @return _123number
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Integer get123number() {
-    return _123number;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Name name = (Name) o;
-    return Objects.equals(this.name, name.name) &&
-        Objects.equals(this.snakeCase, name.snakeCase) &&
-        Objects.equals(this.property, name.property) &&
-        Objects.equals(this._123number, name._123number);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, snakeCase, property, _123number);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Name {\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
-    sb.append("    property: ").append(toIndentedString(property)).append("\n");
-    sb.append("    _123number: ").append(toIndentedString(_123number)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/NumberOnly.java
deleted file mode 100644
index 9a55d8aa615f..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-
-/**
- * NumberOnly
- */
-
-public class NumberOnly {
-  public static final String SERIALIZED_NAME_JUST_NUMBER = "JustNumber";
-  @SerializedName(SERIALIZED_NAME_JUST_NUMBER)
-  private BigDecimal justNumber;
-
-
-  public NumberOnly justNumber(BigDecimal justNumber) {
-    
-    this.justNumber = justNumber;
-    return this;
-  }
-
-   /**
-   * Get justNumber
-   * @return justNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public BigDecimal getJustNumber() {
-    return justNumber;
-  }
-
-
-  public void setJustNumber(BigDecimal justNumber) {
-    this.justNumber = justNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    NumberOnly numberOnly = (NumberOnly) o;
-    return Objects.equals(this.justNumber, numberOnly.justNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(justNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class NumberOnly {\n");
-    sb.append("    justNumber: ").append(toIndentedString(justNumber)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Order.java
deleted file mode 100644
index 33d57e18bee5..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Order.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.threeten.bp.OffsetDateTime;
-
-/**
- * Order
- */
-
-public class Order {
-  public static final String SERIALIZED_NAME_ID = "id";
-  @SerializedName(SERIALIZED_NAME_ID)
-  private Long id;
-
-  public static final String SERIALIZED_NAME_PET_ID = "petId";
-  @SerializedName(SERIALIZED_NAME_PET_ID)
-  private Long petId;
-
-  public static final String SERIALIZED_NAME_QUANTITY = "quantity";
-  @SerializedName(SERIALIZED_NAME_QUANTITY)
-  private Integer quantity;
-
-  public static final String SERIALIZED_NAME_SHIP_DATE = "shipDate";
-  @SerializedName(SERIALIZED_NAME_SHIP_DATE)
-  private OffsetDateTime shipDate;
-
-  /**
-   * Order Status
-   */
-  @JsonAdapter(StatusEnum.Adapter.class)
-  public enum StatusEnum {
-    PLACED("placed"),
-    
-    APPROVED("approved"),
-    
-    DELIVERED("delivered");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    public static StatusEnum fromValue(String value) {
-      for (StatusEnum b : StatusEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-
-    public static class Adapter extends TypeAdapter<StatusEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final StatusEnum enumeration) throws IOException {
-        jsonWriter.value(enumeration.getValue());
-      }
-
-      @Override
-      public StatusEnum read(final JsonReader jsonReader) throws IOException {
-        String value =  jsonReader.nextString();
-        return StatusEnum.fromValue(value);
-      }
-    }
-  }
-
-  public static final String SERIALIZED_NAME_STATUS = "status";
-  @SerializedName(SERIALIZED_NAME_STATUS)
-  private StatusEnum status;
-
-  public static final String SERIALIZED_NAME_COMPLETE = "complete";
-  @SerializedName(SERIALIZED_NAME_COMPLETE)
-  private Boolean complete = false;
-
-
-  public Order id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Order petId(Long petId) {
-    
-    this.petId = petId;
-    return this;
-  }
-
-   /**
-   * Get petId
-   * @return petId
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Long getPetId() {
-    return petId;
-  }
-
-
-  public void setPetId(Long petId) {
-    this.petId = petId;
-  }
-
-
-  public Order quantity(Integer quantity) {
-    
-    this.quantity = quantity;
-    return this;
-  }
-
-   /**
-   * Get quantity
-   * @return quantity
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Integer getQuantity() {
-    return quantity;
-  }
-
-
-  public void setQuantity(Integer quantity) {
-    this.quantity = quantity;
-  }
-
-
-  public Order shipDate(OffsetDateTime shipDate) {
-    
-    this.shipDate = shipDate;
-    return this;
-  }
-
-   /**
-   * Get shipDate
-   * @return shipDate
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public OffsetDateTime getShipDate() {
-    return shipDate;
-  }
-
-
-  public void setShipDate(OffsetDateTime shipDate) {
-    this.shipDate = shipDate;
-  }
-
-
-  public Order status(StatusEnum status) {
-    
-    this.status = status;
-    return this;
-  }
-
-   /**
-   * Order Status
-   * @return status
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Order Status")
-
-  public StatusEnum getStatus() {
-    return status;
-  }
-
-
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-
-  public Order complete(Boolean complete) {
-    
-    this.complete = complete;
-    return this;
-  }
-
-   /**
-   * Get complete
-   * @return complete
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Boolean getComplete() {
-    return complete;
-  }
-
-
-  public void setComplete(Boolean complete) {
-    this.complete = complete;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Order order = (Order) o;
-    return Objects.equals(this.id, order.id) &&
-        Objects.equals(this.petId, order.petId) &&
-        Objects.equals(this.quantity, order.quantity) &&
-        Objects.equals(this.shipDate, order.shipDate) &&
-        Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Order {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
-    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
-    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/OuterComposite.java
deleted file mode 100644
index 1efe43b234b5..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-
-/**
- * OuterComposite
- */
-
-public class OuterComposite {
-  public static final String SERIALIZED_NAME_MY_NUMBER = "my_number";
-  @SerializedName(SERIALIZED_NAME_MY_NUMBER)
-  private BigDecimal myNumber;
-
-  public static final String SERIALIZED_NAME_MY_STRING = "my_string";
-  @SerializedName(SERIALIZED_NAME_MY_STRING)
-  private String myString;
-
-  public static final String SERIALIZED_NAME_MY_BOOLEAN = "my_boolean";
-  @SerializedName(SERIALIZED_NAME_MY_BOOLEAN)
-  private Boolean myBoolean;
-
-
-  public OuterComposite myNumber(BigDecimal myNumber) {
-    
-    this.myNumber = myNumber;
-    return this;
-  }
-
-   /**
-   * Get myNumber
-   * @return myNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public BigDecimal getMyNumber() {
-    return myNumber;
-  }
-
-
-  public void setMyNumber(BigDecimal myNumber) {
-    this.myNumber = myNumber;
-  }
-
-
-  public OuterComposite myString(String myString) {
-    
-    this.myString = myString;
-    return this;
-  }
-
-   /**
-   * Get myString
-   * @return myString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getMyString() {
-    return myString;
-  }
-
-
-  public void setMyString(String myString) {
-    this.myString = myString;
-  }
-
-
-  public OuterComposite myBoolean(Boolean myBoolean) {
-    
-    this.myBoolean = myBoolean;
-    return this;
-  }
-
-   /**
-   * Get myBoolean
-   * @return myBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Boolean getMyBoolean() {
-    return myBoolean;
-  }
-
-
-  public void setMyBoolean(Boolean myBoolean) {
-    this.myBoolean = myBoolean;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OuterComposite outerComposite = (OuterComposite) o;
-    return Objects.equals(this.myNumber, outerComposite.myNumber) &&
-        Objects.equals(this.myString, outerComposite.myString) &&
-        Objects.equals(this.myBoolean, outerComposite.myBoolean);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(myNumber, myString, myBoolean);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OuterComposite {\n");
-    sb.append("    myNumber: ").append(toIndentedString(myNumber)).append("\n");
-    sb.append("    myString: ").append(toIndentedString(myString)).append("\n");
-    sb.append("    myBoolean: ").append(toIndentedString(myBoolean)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java
deleted file mode 100644
index 4ea18b217b6e..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.openapitools.client.model.Category;
-import org.openapitools.client.model.Tag;
-
-/**
- * Pet
- */
-
-public class Pet {
-  public static final String SERIALIZED_NAME_ID = "id";
-  @SerializedName(SERIALIZED_NAME_ID)
-  private Long id;
-
-  public static final String SERIALIZED_NAME_CATEGORY = "category";
-  @SerializedName(SERIALIZED_NAME_CATEGORY)
-  private Category category;
-
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
-  private String name;
-
-  public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls";
-  @SerializedName(SERIALIZED_NAME_PHOTO_URLS)
-  private Set<String> photoUrls = new LinkedHashSet<String>();
-
-  public static final String SERIALIZED_NAME_TAGS = "tags";
-  @SerializedName(SERIALIZED_NAME_TAGS)
-  private List<Tag> tags = null;
-
-  /**
-   * pet status in the store
-   */
-  @JsonAdapter(StatusEnum.Adapter.class)
-  public enum StatusEnum {
-    AVAILABLE("available"),
-    
-    PENDING("pending"),
-    
-    SOLD("sold");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    public static StatusEnum fromValue(String value) {
-      for (StatusEnum b : StatusEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-
-    public static class Adapter extends TypeAdapter<StatusEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final StatusEnum enumeration) throws IOException {
-        jsonWriter.value(enumeration.getValue());
-      }
-
-      @Override
-      public StatusEnum read(final JsonReader jsonReader) throws IOException {
-        String value =  jsonReader.nextString();
-        return StatusEnum.fromValue(value);
-      }
-    }
-  }
-
-  public static final String SERIALIZED_NAME_STATUS = "status";
-  @SerializedName(SERIALIZED_NAME_STATUS)
-  private StatusEnum status;
-
-
-  public Pet id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Pet category(Category category) {
-    
-    this.category = category;
-    return this;
-  }
-
-   /**
-   * Get category
-   * @return category
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Category getCategory() {
-    return category;
-  }
-
-
-  public void setCategory(Category category) {
-    this.category = category;
-  }
-
-
-  public Pet name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @ApiModelProperty(example = "doggie", required = true, value = "")
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  public Pet photoUrls(Set<String> photoUrls) {
-    
-    this.photoUrls = photoUrls;
-    return this;
-  }
-
-  public Pet addPhotoUrlsItem(String photoUrlsItem) {
-    this.photoUrls.add(photoUrlsItem);
-    return this;
-  }
-
-   /**
-   * Get photoUrls
-   * @return photoUrls
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public Set<String> getPhotoUrls() {
-    return photoUrls;
-  }
-
-
-  public void setPhotoUrls(Set<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
-
-
-  public Pet tags(List<Tag> tags) {
-    
-    this.tags = tags;
-    return this;
-  }
-
-  public Pet addTagsItem(Tag tagsItem) {
-    if (this.tags == null) {
-      this.tags = new ArrayList<Tag>();
-    }
-    this.tags.add(tagsItem);
-    return this;
-  }
-
-   /**
-   * Get tags
-   * @return tags
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<Tag> getTags() {
-    return tags;
-  }
-
-
-  public void setTags(List<Tag> tags) {
-    this.tags = tags;
-  }
-
-
-  public Pet status(StatusEnum status) {
-    
-    this.status = status;
-    return this;
-  }
-
-   /**
-   * pet status in the store
-   * @return status
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "pet status in the store")
-
-  public StatusEnum getStatus() {
-    return status;
-  }
-
-
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Pet pet = (Pet) o;
-    return Objects.equals(this.id, pet.id) &&
-        Objects.equals(this.category, pet.category) &&
-        Objects.equals(this.name, pet.name) &&
-        Objects.equals(this.photoUrls, pet.photoUrls) &&
-        Objects.equals(this.tags, pet.tags) &&
-        Objects.equals(this.status, pet.status);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, category, name, photoUrls, tags, status);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Pet {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
deleted file mode 100644
index ed0244a3ca27..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * ReadOnlyFirst
- */
-
-public class ReadOnlyFirst {
-  public static final String SERIALIZED_NAME_BAR = "bar";
-  @SerializedName(SERIALIZED_NAME_BAR)
-  private String bar;
-
-  public static final String SERIALIZED_NAME_BAZ = "baz";
-  @SerializedName(SERIALIZED_NAME_BAZ)
-  private String baz;
-
-
-   /**
-   * Get bar
-   * @return bar
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getBar() {
-    return bar;
-  }
-
-
-
-
-  public ReadOnlyFirst baz(String baz) {
-    
-    this.baz = baz;
-    return this;
-  }
-
-   /**
-   * Get baz
-   * @return baz
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getBaz() {
-    return baz;
-  }
-
-
-  public void setBaz(String baz) {
-    this.baz = baz;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
-    return Objects.equals(this.bar, readOnlyFirst.bar) &&
-        Objects.equals(this.baz, readOnlyFirst.baz);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(bar, baz);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ReadOnlyFirst {\n");
-    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
-    sb.append("    baz: ").append(toIndentedString(baz)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/SpecialModelName.java
deleted file mode 100644
index 3405d30ff614..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * SpecialModelName
- */
-
-public class SpecialModelName {
-  public static final String SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
-  @SerializedName(SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME)
-  private Long $specialPropertyName;
-
-
-  public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
-    
-    this.$specialPropertyName = $specialPropertyName;
-    return this;
-  }
-
-   /**
-   * Get $specialPropertyName
-   * @return $specialPropertyName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Long get$SpecialPropertyName() {
-    return $specialPropertyName;
-  }
-
-
-  public void set$SpecialPropertyName(Long $specialPropertyName) {
-    this.$specialPropertyName = $specialPropertyName;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SpecialModelName $specialModelName = (SpecialModelName) o;
-    return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash($specialPropertyName);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SpecialModelName {\n");
-    sb.append("    $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Tag.java
deleted file mode 100644
index 710e0fe54a4e..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Tag.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * Tag
- */
-
-public class Tag {
-  public static final String SERIALIZED_NAME_ID = "id";
-  @SerializedName(SERIALIZED_NAME_ID)
-  private Long id;
-
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
-  private String name;
-
-
-  public Tag id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Tag name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Tag tag = (Tag) o;
-    return Objects.equals(this.id, tag.id) &&
-        Objects.equals(this.name, tag.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Tag {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
deleted file mode 100644
index 978cdb6f78db..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * TypeHolderDefault
- */
-
-public class TypeHolderDefault {
-  public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
-  @SerializedName(SERIALIZED_NAME_STRING_ITEM)
-  private String stringItem = "what";
-
-  public static final String SERIALIZED_NAME_NUMBER_ITEM = "number_item";
-  @SerializedName(SERIALIZED_NAME_NUMBER_ITEM)
-  private BigDecimal numberItem;
-
-  public static final String SERIALIZED_NAME_INTEGER_ITEM = "integer_item";
-  @SerializedName(SERIALIZED_NAME_INTEGER_ITEM)
-  private Integer integerItem;
-
-  public static final String SERIALIZED_NAME_BOOL_ITEM = "bool_item";
-  @SerializedName(SERIALIZED_NAME_BOOL_ITEM)
-  private Boolean boolItem = true;
-
-  public static final String SERIALIZED_NAME_ARRAY_ITEM = "array_item";
-  @SerializedName(SERIALIZED_NAME_ARRAY_ITEM)
-  private List<Integer> arrayItem = new ArrayList<Integer>();
-
-
-  public TypeHolderDefault stringItem(String stringItem) {
-    
-    this.stringItem = stringItem;
-    return this;
-  }
-
-   /**
-   * Get stringItem
-   * @return stringItem
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public String getStringItem() {
-    return stringItem;
-  }
-
-
-  public void setStringItem(String stringItem) {
-    this.stringItem = stringItem;
-  }
-
-
-  public TypeHolderDefault numberItem(BigDecimal numberItem) {
-    
-    this.numberItem = numberItem;
-    return this;
-  }
-
-   /**
-   * Get numberItem
-   * @return numberItem
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public BigDecimal getNumberItem() {
-    return numberItem;
-  }
-
-
-  public void setNumberItem(BigDecimal numberItem) {
-    this.numberItem = numberItem;
-  }
-
-
-  public TypeHolderDefault integerItem(Integer integerItem) {
-    
-    this.integerItem = integerItem;
-    return this;
-  }
-
-   /**
-   * Get integerItem
-   * @return integerItem
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public Integer getIntegerItem() {
-    return integerItem;
-  }
-
-
-  public void setIntegerItem(Integer integerItem) {
-    this.integerItem = integerItem;
-  }
-
-
-  public TypeHolderDefault boolItem(Boolean boolItem) {
-    
-    this.boolItem = boolItem;
-    return this;
-  }
-
-   /**
-   * Get boolItem
-   * @return boolItem
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public Boolean getBoolItem() {
-    return boolItem;
-  }
-
-
-  public void setBoolItem(Boolean boolItem) {
-    this.boolItem = boolItem;
-  }
-
-
-  public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
-    
-    this.arrayItem = arrayItem;
-    return this;
-  }
-
-  public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
-    this.arrayItem.add(arrayItemItem);
-    return this;
-  }
-
-   /**
-   * Get arrayItem
-   * @return arrayItem
-  **/
-  @ApiModelProperty(required = true, value = "")
-
-  public List<Integer> getArrayItem() {
-    return arrayItem;
-  }
-
-
-  public void setArrayItem(List<Integer> arrayItem) {
-    this.arrayItem = arrayItem;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o;
-    return Objects.equals(this.stringItem, typeHolderDefault.stringItem) &&
-        Objects.equals(this.numberItem, typeHolderDefault.numberItem) &&
-        Objects.equals(this.integerItem, typeHolderDefault.integerItem) &&
-        Objects.equals(this.boolItem, typeHolderDefault.boolItem) &&
-        Objects.equals(this.arrayItem, typeHolderDefault.arrayItem);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TypeHolderDefault {\n");
-    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
-    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
-    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
-    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
-    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
deleted file mode 100644
index 878b1540ee7f..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * TypeHolderExample
- */
-
-public class TypeHolderExample {
-  public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
-  @SerializedName(SERIALIZED_NAME_STRING_ITEM)
-  private String stringItem;
-
-  public static final String SERIALIZED_NAME_NUMBER_ITEM = "number_item";
-  @SerializedName(SERIALIZED_NAME_NUMBER_ITEM)
-  private BigDecimal numberItem;
-
-  public static final String SERIALIZED_NAME_FLOAT_ITEM = "float_item";
-  @SerializedName(SERIALIZED_NAME_FLOAT_ITEM)
-  private Float floatItem;
-
-  public static final String SERIALIZED_NAME_INTEGER_ITEM = "integer_item";
-  @SerializedName(SERIALIZED_NAME_INTEGER_ITEM)
-  private Integer integerItem;
-
-  public static final String SERIALIZED_NAME_BOOL_ITEM = "bool_item";
-  @SerializedName(SERIALIZED_NAME_BOOL_ITEM)
-  private Boolean boolItem;
-
-  public static final String SERIALIZED_NAME_ARRAY_ITEM = "array_item";
-  @SerializedName(SERIALIZED_NAME_ARRAY_ITEM)
-  private List<Integer> arrayItem = new ArrayList<Integer>();
-
-
-  public TypeHolderExample stringItem(String stringItem) {
-    
-    this.stringItem = stringItem;
-    return this;
-  }
-
-   /**
-   * Get stringItem
-   * @return stringItem
-  **/
-  @ApiModelProperty(example = "what", required = true, value = "")
-
-  public String getStringItem() {
-    return stringItem;
-  }
-
-
-  public void setStringItem(String stringItem) {
-    this.stringItem = stringItem;
-  }
-
-
-  public TypeHolderExample numberItem(BigDecimal numberItem) {
-    
-    this.numberItem = numberItem;
-    return this;
-  }
-
-   /**
-   * Get numberItem
-   * @return numberItem
-  **/
-  @ApiModelProperty(example = "1.234", required = true, value = "")
-
-  public BigDecimal getNumberItem() {
-    return numberItem;
-  }
-
-
-  public void setNumberItem(BigDecimal numberItem) {
-    this.numberItem = numberItem;
-  }
-
-
-  public TypeHolderExample floatItem(Float floatItem) {
-    
-    this.floatItem = floatItem;
-    return this;
-  }
-
-   /**
-   * Get floatItem
-   * @return floatItem
-  **/
-  @ApiModelProperty(example = "1.234", required = true, value = "")
-
-  public Float getFloatItem() {
-    return floatItem;
-  }
-
-
-  public void setFloatItem(Float floatItem) {
-    this.floatItem = floatItem;
-  }
-
-
-  public TypeHolderExample integerItem(Integer integerItem) {
-    
-    this.integerItem = integerItem;
-    return this;
-  }
-
-   /**
-   * Get integerItem
-   * @return integerItem
-  **/
-  @ApiModelProperty(example = "-2", required = true, value = "")
-
-  public Integer getIntegerItem() {
-    return integerItem;
-  }
-
-
-  public void setIntegerItem(Integer integerItem) {
-    this.integerItem = integerItem;
-  }
-
-
-  public TypeHolderExample boolItem(Boolean boolItem) {
-    
-    this.boolItem = boolItem;
-    return this;
-  }
-
-   /**
-   * Get boolItem
-   * @return boolItem
-  **/
-  @ApiModelProperty(example = "true", required = true, value = "")
-
-  public Boolean getBoolItem() {
-    return boolItem;
-  }
-
-
-  public void setBoolItem(Boolean boolItem) {
-    this.boolItem = boolItem;
-  }
-
-
-  public TypeHolderExample arrayItem(List<Integer> arrayItem) {
-    
-    this.arrayItem = arrayItem;
-    return this;
-  }
-
-  public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
-    this.arrayItem.add(arrayItemItem);
-    return this;
-  }
-
-   /**
-   * Get arrayItem
-   * @return arrayItem
-  **/
-  @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
-
-  public List<Integer> getArrayItem() {
-    return arrayItem;
-  }
-
-
-  public void setArrayItem(List<Integer> arrayItem) {
-    this.arrayItem = arrayItem;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TypeHolderExample typeHolderExample = (TypeHolderExample) o;
-    return Objects.equals(this.stringItem, typeHolderExample.stringItem) &&
-        Objects.equals(this.numberItem, typeHolderExample.numberItem) &&
-        Objects.equals(this.floatItem, typeHolderExample.floatItem) &&
-        Objects.equals(this.integerItem, typeHolderExample.integerItem) &&
-        Objects.equals(this.boolItem, typeHolderExample.boolItem) &&
-        Objects.equals(this.arrayItem, typeHolderExample.arrayItem);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TypeHolderExample {\n");
-    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
-    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
-    sb.append("    floatItem: ").append(toIndentedString(floatItem)).append("\n");
-    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
-    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
-    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/User.java
deleted file mode 100644
index d91115317819..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/User.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-
-/**
- * User
- */
-
-public class User {
-  public static final String SERIALIZED_NAME_ID = "id";
-  @SerializedName(SERIALIZED_NAME_ID)
-  private Long id;
-
-  public static final String SERIALIZED_NAME_USERNAME = "username";
-  @SerializedName(SERIALIZED_NAME_USERNAME)
-  private String username;
-
-  public static final String SERIALIZED_NAME_FIRST_NAME = "firstName";
-  @SerializedName(SERIALIZED_NAME_FIRST_NAME)
-  private String firstName;
-
-  public static final String SERIALIZED_NAME_LAST_NAME = "lastName";
-  @SerializedName(SERIALIZED_NAME_LAST_NAME)
-  private String lastName;
-
-  public static final String SERIALIZED_NAME_EMAIL = "email";
-  @SerializedName(SERIALIZED_NAME_EMAIL)
-  private String email;
-
-  public static final String SERIALIZED_NAME_PASSWORD = "password";
-  @SerializedName(SERIALIZED_NAME_PASSWORD)
-  private String password;
-
-  public static final String SERIALIZED_NAME_PHONE = "phone";
-  @SerializedName(SERIALIZED_NAME_PHONE)
-  private String phone;
-
-  public static final String SERIALIZED_NAME_USER_STATUS = "userStatus";
-  @SerializedName(SERIALIZED_NAME_USER_STATUS)
-  private Integer userStatus;
-
-
-  public User id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public User username(String username) {
-    
-    this.username = username;
-    return this;
-  }
-
-   /**
-   * Get username
-   * @return username
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getUsername() {
-    return username;
-  }
-
-
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-
-  public User firstName(String firstName) {
-    
-    this.firstName = firstName;
-    return this;
-  }
-
-   /**
-   * Get firstName
-   * @return firstName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getFirstName() {
-    return firstName;
-  }
-
-
-  public void setFirstName(String firstName) {
-    this.firstName = firstName;
-  }
-
-
-  public User lastName(String lastName) {
-    
-    this.lastName = lastName;
-    return this;
-  }
-
-   /**
-   * Get lastName
-   * @return lastName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getLastName() {
-    return lastName;
-  }
-
-
-  public void setLastName(String lastName) {
-    this.lastName = lastName;
-  }
-
-
-  public User email(String email) {
-    
-    this.email = email;
-    return this;
-  }
-
-   /**
-   * Get email
-   * @return email
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getEmail() {
-    return email;
-  }
-
-
-  public void setEmail(String email) {
-    this.email = email;
-  }
-
-
-  public User password(String password) {
-    
-    this.password = password;
-    return this;
-  }
-
-   /**
-   * Get password
-   * @return password
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getPassword() {
-    return password;
-  }
-
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-
-  public User phone(String phone) {
-    
-    this.phone = phone;
-    return this;
-  }
-
-   /**
-   * Get phone
-   * @return phone
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public String getPhone() {
-    return phone;
-  }
-
-
-  public void setPhone(String phone) {
-    this.phone = phone;
-  }
-
-
-  public User userStatus(Integer userStatus) {
-    
-    this.userStatus = userStatus;
-    return this;
-  }
-
-   /**
-   * User Status
-   * @return userStatus
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "User Status")
-
-  public Integer getUserStatus() {
-    return userStatus;
-  }
-
-
-  public void setUserStatus(Integer userStatus) {
-    this.userStatus = userStatus;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    User user = (User) o;
-    return Objects.equals(this.id, user.id) &&
-        Objects.equals(this.username, user.username) &&
-        Objects.equals(this.firstName, user.firstName) &&
-        Objects.equals(this.lastName, user.lastName) &&
-        Objects.equals(this.email, user.email) &&
-        Objects.equals(this.password, user.password) &&
-        Objects.equals(this.phone, user.phone) &&
-        Objects.equals(this.userStatus, user.userStatus);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class User {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    username: ").append(toIndentedString(username)).append("\n");
-    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
-    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
-    sb.append("    email: ").append(toIndentedString(email)).append("\n");
-    sb.append("    password: ").append(toIndentedString(password)).append("\n");
-    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
-    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/XmlItem.java
deleted file mode 100644
index ecfd0be1b31a..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/XmlItem.java
+++ /dev/null
@@ -1,986 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * XmlItem
- */
-
-public class XmlItem {
-  public static final String SERIALIZED_NAME_ATTRIBUTE_STRING = "attribute_string";
-  @SerializedName(SERIALIZED_NAME_ATTRIBUTE_STRING)
-  private String attributeString;
-
-  public static final String SERIALIZED_NAME_ATTRIBUTE_NUMBER = "attribute_number";
-  @SerializedName(SERIALIZED_NAME_ATTRIBUTE_NUMBER)
-  private BigDecimal attributeNumber;
-
-  public static final String SERIALIZED_NAME_ATTRIBUTE_INTEGER = "attribute_integer";
-  @SerializedName(SERIALIZED_NAME_ATTRIBUTE_INTEGER)
-  private Integer attributeInteger;
-
-  public static final String SERIALIZED_NAME_ATTRIBUTE_BOOLEAN = "attribute_boolean";
-  @SerializedName(SERIALIZED_NAME_ATTRIBUTE_BOOLEAN)
-  private Boolean attributeBoolean;
-
-  public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array";
-  @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY)
-  private List<Integer> wrappedArray = null;
-
-  public static final String SERIALIZED_NAME_NAME_STRING = "name_string";
-  @SerializedName(SERIALIZED_NAME_NAME_STRING)
-  private String nameString;
-
-  public static final String SERIALIZED_NAME_NAME_NUMBER = "name_number";
-  @SerializedName(SERIALIZED_NAME_NAME_NUMBER)
-  private BigDecimal nameNumber;
-
-  public static final String SERIALIZED_NAME_NAME_INTEGER = "name_integer";
-  @SerializedName(SERIALIZED_NAME_NAME_INTEGER)
-  private Integer nameInteger;
-
-  public static final String SERIALIZED_NAME_NAME_BOOLEAN = "name_boolean";
-  @SerializedName(SERIALIZED_NAME_NAME_BOOLEAN)
-  private Boolean nameBoolean;
-
-  public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array";
-  @SerializedName(SERIALIZED_NAME_NAME_ARRAY)
-  private List<Integer> nameArray = null;
-
-  public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array";
-  @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY)
-  private List<Integer> nameWrappedArray = null;
-
-  public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string";
-  @SerializedName(SERIALIZED_NAME_PREFIX_STRING)
-  private String prefixString;
-
-  public static final String SERIALIZED_NAME_PREFIX_NUMBER = "prefix_number";
-  @SerializedName(SERIALIZED_NAME_PREFIX_NUMBER)
-  private BigDecimal prefixNumber;
-
-  public static final String SERIALIZED_NAME_PREFIX_INTEGER = "prefix_integer";
-  @SerializedName(SERIALIZED_NAME_PREFIX_INTEGER)
-  private Integer prefixInteger;
-
-  public static final String SERIALIZED_NAME_PREFIX_BOOLEAN = "prefix_boolean";
-  @SerializedName(SERIALIZED_NAME_PREFIX_BOOLEAN)
-  private Boolean prefixBoolean;
-
-  public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array";
-  @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY)
-  private List<Integer> prefixArray = null;
-
-  public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array";
-  @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY)
-  private List<Integer> prefixWrappedArray = null;
-
-  public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string";
-  @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING)
-  private String namespaceString;
-
-  public static final String SERIALIZED_NAME_NAMESPACE_NUMBER = "namespace_number";
-  @SerializedName(SERIALIZED_NAME_NAMESPACE_NUMBER)
-  private BigDecimal namespaceNumber;
-
-  public static final String SERIALIZED_NAME_NAMESPACE_INTEGER = "namespace_integer";
-  @SerializedName(SERIALIZED_NAME_NAMESPACE_INTEGER)
-  private Integer namespaceInteger;
-
-  public static final String SERIALIZED_NAME_NAMESPACE_BOOLEAN = "namespace_boolean";
-  @SerializedName(SERIALIZED_NAME_NAMESPACE_BOOLEAN)
-  private Boolean namespaceBoolean;
-
-  public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array";
-  @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY)
-  private List<Integer> namespaceArray = null;
-
-  public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array";
-  @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY)
-  private List<Integer> namespaceWrappedArray = null;
-
-  public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string";
-  @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING)
-  private String prefixNsString;
-
-  public static final String SERIALIZED_NAME_PREFIX_NS_NUMBER = "prefix_ns_number";
-  @SerializedName(SERIALIZED_NAME_PREFIX_NS_NUMBER)
-  private BigDecimal prefixNsNumber;
-
-  public static final String SERIALIZED_NAME_PREFIX_NS_INTEGER = "prefix_ns_integer";
-  @SerializedName(SERIALIZED_NAME_PREFIX_NS_INTEGER)
-  private Integer prefixNsInteger;
-
-  public static final String SERIALIZED_NAME_PREFIX_NS_BOOLEAN = "prefix_ns_boolean";
-  @SerializedName(SERIALIZED_NAME_PREFIX_NS_BOOLEAN)
-  private Boolean prefixNsBoolean;
-
-  public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array";
-  @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY)
-  private List<Integer> prefixNsArray = null;
-
-  public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
-  @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY)
-  private List<Integer> prefixNsWrappedArray = null;
-
-
-  public XmlItem attributeString(String attributeString) {
-    
-    this.attributeString = attributeString;
-    return this;
-  }
-
-   /**
-   * Get attributeString
-   * @return attributeString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-
-  public String getAttributeString() {
-    return attributeString;
-  }
-
-
-  public void setAttributeString(String attributeString) {
-    this.attributeString = attributeString;
-  }
-
-
-  public XmlItem attributeNumber(BigDecimal attributeNumber) {
-    
-    this.attributeNumber = attributeNumber;
-    return this;
-  }
-
-   /**
-   * Get attributeNumber
-   * @return attributeNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "1.234", value = "")
-
-  public BigDecimal getAttributeNumber() {
-    return attributeNumber;
-  }
-
-
-  public void setAttributeNumber(BigDecimal attributeNumber) {
-    this.attributeNumber = attributeNumber;
-  }
-
-
-  public XmlItem attributeInteger(Integer attributeInteger) {
-    
-    this.attributeInteger = attributeInteger;
-    return this;
-  }
-
-   /**
-   * Get attributeInteger
-   * @return attributeInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-
-  public Integer getAttributeInteger() {
-    return attributeInteger;
-  }
-
-
-  public void setAttributeInteger(Integer attributeInteger) {
-    this.attributeInteger = attributeInteger;
-  }
-
-
-  public XmlItem attributeBoolean(Boolean attributeBoolean) {
-    
-    this.attributeBoolean = attributeBoolean;
-    return this;
-  }
-
-   /**
-   * Get attributeBoolean
-   * @return attributeBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-
-  public Boolean getAttributeBoolean() {
-    return attributeBoolean;
-  }
-
-
-  public void setAttributeBoolean(Boolean attributeBoolean) {
-    this.attributeBoolean = attributeBoolean;
-  }
-
-
-  public XmlItem wrappedArray(List<Integer> wrappedArray) {
-    
-    this.wrappedArray = wrappedArray;
-    return this;
-  }
-
-  public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
-    if (this.wrappedArray == null) {
-      this.wrappedArray = new ArrayList<Integer>();
-    }
-    this.wrappedArray.add(wrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get wrappedArray
-   * @return wrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<Integer> getWrappedArray() {
-    return wrappedArray;
-  }
-
-
-  public void setWrappedArray(List<Integer> wrappedArray) {
-    this.wrappedArray = wrappedArray;
-  }
-
-
-  public XmlItem nameString(String nameString) {
-    
-    this.nameString = nameString;
-    return this;
-  }
-
-   /**
-   * Get nameString
-   * @return nameString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-
-  public String getNameString() {
-    return nameString;
-  }
-
-
-  public void setNameString(String nameString) {
-    this.nameString = nameString;
-  }
-
-
-  public XmlItem nameNumber(BigDecimal nameNumber) {
-    
-    this.nameNumber = nameNumber;
-    return this;
-  }
-
-   /**
-   * Get nameNumber
-   * @return nameNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "1.234", value = "")
-
-  public BigDecimal getNameNumber() {
-    return nameNumber;
-  }
-
-
-  public void setNameNumber(BigDecimal nameNumber) {
-    this.nameNumber = nameNumber;
-  }
-
-
-  public XmlItem nameInteger(Integer nameInteger) {
-    
-    this.nameInteger = nameInteger;
-    return this;
-  }
-
-   /**
-   * Get nameInteger
-   * @return nameInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-
-  public Integer getNameInteger() {
-    return nameInteger;
-  }
-
-
-  public void setNameInteger(Integer nameInteger) {
-    this.nameInteger = nameInteger;
-  }
-
-
-  public XmlItem nameBoolean(Boolean nameBoolean) {
-    
-    this.nameBoolean = nameBoolean;
-    return this;
-  }
-
-   /**
-   * Get nameBoolean
-   * @return nameBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-
-  public Boolean getNameBoolean() {
-    return nameBoolean;
-  }
-
-
-  public void setNameBoolean(Boolean nameBoolean) {
-    this.nameBoolean = nameBoolean;
-  }
-
-
-  public XmlItem nameArray(List<Integer> nameArray) {
-    
-    this.nameArray = nameArray;
-    return this;
-  }
-
-  public XmlItem addNameArrayItem(Integer nameArrayItem) {
-    if (this.nameArray == null) {
-      this.nameArray = new ArrayList<Integer>();
-    }
-    this.nameArray.add(nameArrayItem);
-    return this;
-  }
-
-   /**
-   * Get nameArray
-   * @return nameArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<Integer> getNameArray() {
-    return nameArray;
-  }
-
-
-  public void setNameArray(List<Integer> nameArray) {
-    this.nameArray = nameArray;
-  }
-
-
-  public XmlItem nameWrappedArray(List<Integer> nameWrappedArray) {
-    
-    this.nameWrappedArray = nameWrappedArray;
-    return this;
-  }
-
-  public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
-    if (this.nameWrappedArray == null) {
-      this.nameWrappedArray = new ArrayList<Integer>();
-    }
-    this.nameWrappedArray.add(nameWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get nameWrappedArray
-   * @return nameWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<Integer> getNameWrappedArray() {
-    return nameWrappedArray;
-  }
-
-
-  public void setNameWrappedArray(List<Integer> nameWrappedArray) {
-    this.nameWrappedArray = nameWrappedArray;
-  }
-
-
-  public XmlItem prefixString(String prefixString) {
-    
-    this.prefixString = prefixString;
-    return this;
-  }
-
-   /**
-   * Get prefixString
-   * @return prefixString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-
-  public String getPrefixString() {
-    return prefixString;
-  }
-
-
-  public void setPrefixString(String prefixString) {
-    this.prefixString = prefixString;
-  }
-
-
-  public XmlItem prefixNumber(BigDecimal prefixNumber) {
-    
-    this.prefixNumber = prefixNumber;
-    return this;
-  }
-
-   /**
-   * Get prefixNumber
-   * @return prefixNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "1.234", value = "")
-
-  public BigDecimal getPrefixNumber() {
-    return prefixNumber;
-  }
-
-
-  public void setPrefixNumber(BigDecimal prefixNumber) {
-    this.prefixNumber = prefixNumber;
-  }
-
-
-  public XmlItem prefixInteger(Integer prefixInteger) {
-    
-    this.prefixInteger = prefixInteger;
-    return this;
-  }
-
-   /**
-   * Get prefixInteger
-   * @return prefixInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-
-  public Integer getPrefixInteger() {
-    return prefixInteger;
-  }
-
-
-  public void setPrefixInteger(Integer prefixInteger) {
-    this.prefixInteger = prefixInteger;
-  }
-
-
-  public XmlItem prefixBoolean(Boolean prefixBoolean) {
-    
-    this.prefixBoolean = prefixBoolean;
-    return this;
-  }
-
-   /**
-   * Get prefixBoolean
-   * @return prefixBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-
-  public Boolean getPrefixBoolean() {
-    return prefixBoolean;
-  }
-
-
-  public void setPrefixBoolean(Boolean prefixBoolean) {
-    this.prefixBoolean = prefixBoolean;
-  }
-
-
-  public XmlItem prefixArray(List<Integer> prefixArray) {
-    
-    this.prefixArray = prefixArray;
-    return this;
-  }
-
-  public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
-    if (this.prefixArray == null) {
-      this.prefixArray = new ArrayList<Integer>();
-    }
-    this.prefixArray.add(prefixArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixArray
-   * @return prefixArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<Integer> getPrefixArray() {
-    return prefixArray;
-  }
-
-
-  public void setPrefixArray(List<Integer> prefixArray) {
-    this.prefixArray = prefixArray;
-  }
-
-
-  public XmlItem prefixWrappedArray(List<Integer> prefixWrappedArray) {
-    
-    this.prefixWrappedArray = prefixWrappedArray;
-    return this;
-  }
-
-  public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
-    if (this.prefixWrappedArray == null) {
-      this.prefixWrappedArray = new ArrayList<Integer>();
-    }
-    this.prefixWrappedArray.add(prefixWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixWrappedArray
-   * @return prefixWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<Integer> getPrefixWrappedArray() {
-    return prefixWrappedArray;
-  }
-
-
-  public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
-    this.prefixWrappedArray = prefixWrappedArray;
-  }
-
-
-  public XmlItem namespaceString(String namespaceString) {
-    
-    this.namespaceString = namespaceString;
-    return this;
-  }
-
-   /**
-   * Get namespaceString
-   * @return namespaceString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-
-  public String getNamespaceString() {
-    return namespaceString;
-  }
-
-
-  public void setNamespaceString(String namespaceString) {
-    this.namespaceString = namespaceString;
-  }
-
-
-  public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
-    
-    this.namespaceNumber = namespaceNumber;
-    return this;
-  }
-
-   /**
-   * Get namespaceNumber
-   * @return namespaceNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "1.234", value = "")
-
-  public BigDecimal getNamespaceNumber() {
-    return namespaceNumber;
-  }
-
-
-  public void setNamespaceNumber(BigDecimal namespaceNumber) {
-    this.namespaceNumber = namespaceNumber;
-  }
-
-
-  public XmlItem namespaceInteger(Integer namespaceInteger) {
-    
-    this.namespaceInteger = namespaceInteger;
-    return this;
-  }
-
-   /**
-   * Get namespaceInteger
-   * @return namespaceInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-
-  public Integer getNamespaceInteger() {
-    return namespaceInteger;
-  }
-
-
-  public void setNamespaceInteger(Integer namespaceInteger) {
-    this.namespaceInteger = namespaceInteger;
-  }
-
-
-  public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
-    
-    this.namespaceBoolean = namespaceBoolean;
-    return this;
-  }
-
-   /**
-   * Get namespaceBoolean
-   * @return namespaceBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-
-  public Boolean getNamespaceBoolean() {
-    return namespaceBoolean;
-  }
-
-
-  public void setNamespaceBoolean(Boolean namespaceBoolean) {
-    this.namespaceBoolean = namespaceBoolean;
-  }
-
-
-  public XmlItem namespaceArray(List<Integer> namespaceArray) {
-    
-    this.namespaceArray = namespaceArray;
-    return this;
-  }
-
-  public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
-    if (this.namespaceArray == null) {
-      this.namespaceArray = new ArrayList<Integer>();
-    }
-    this.namespaceArray.add(namespaceArrayItem);
-    return this;
-  }
-
-   /**
-   * Get namespaceArray
-   * @return namespaceArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<Integer> getNamespaceArray() {
-    return namespaceArray;
-  }
-
-
-  public void setNamespaceArray(List<Integer> namespaceArray) {
-    this.namespaceArray = namespaceArray;
-  }
-
-
-  public XmlItem namespaceWrappedArray(List<Integer> namespaceWrappedArray) {
-    
-    this.namespaceWrappedArray = namespaceWrappedArray;
-    return this;
-  }
-
-  public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
-    if (this.namespaceWrappedArray == null) {
-      this.namespaceWrappedArray = new ArrayList<Integer>();
-    }
-    this.namespaceWrappedArray.add(namespaceWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get namespaceWrappedArray
-   * @return namespaceWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<Integer> getNamespaceWrappedArray() {
-    return namespaceWrappedArray;
-  }
-
-
-  public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
-    this.namespaceWrappedArray = namespaceWrappedArray;
-  }
-
-
-  public XmlItem prefixNsString(String prefixNsString) {
-    
-    this.prefixNsString = prefixNsString;
-    return this;
-  }
-
-   /**
-   * Get prefixNsString
-   * @return prefixNsString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "string", value = "")
-
-  public String getPrefixNsString() {
-    return prefixNsString;
-  }
-
-
-  public void setPrefixNsString(String prefixNsString) {
-    this.prefixNsString = prefixNsString;
-  }
-
-
-  public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
-    
-    this.prefixNsNumber = prefixNsNumber;
-    return this;
-  }
-
-   /**
-   * Get prefixNsNumber
-   * @return prefixNsNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "1.234", value = "")
-
-  public BigDecimal getPrefixNsNumber() {
-    return prefixNsNumber;
-  }
-
-
-  public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
-    this.prefixNsNumber = prefixNsNumber;
-  }
-
-
-  public XmlItem prefixNsInteger(Integer prefixNsInteger) {
-    
-    this.prefixNsInteger = prefixNsInteger;
-    return this;
-  }
-
-   /**
-   * Get prefixNsInteger
-   * @return prefixNsInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "-2", value = "")
-
-  public Integer getPrefixNsInteger() {
-    return prefixNsInteger;
-  }
-
-
-  public void setPrefixNsInteger(Integer prefixNsInteger) {
-    this.prefixNsInteger = prefixNsInteger;
-  }
-
-
-  public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
-    
-    this.prefixNsBoolean = prefixNsBoolean;
-    return this;
-  }
-
-   /**
-   * Get prefixNsBoolean
-   * @return prefixNsBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "true", value = "")
-
-  public Boolean getPrefixNsBoolean() {
-    return prefixNsBoolean;
-  }
-
-
-  public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
-    this.prefixNsBoolean = prefixNsBoolean;
-  }
-
-
-  public XmlItem prefixNsArray(List<Integer> prefixNsArray) {
-    
-    this.prefixNsArray = prefixNsArray;
-    return this;
-  }
-
-  public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
-    if (this.prefixNsArray == null) {
-      this.prefixNsArray = new ArrayList<Integer>();
-    }
-    this.prefixNsArray.add(prefixNsArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixNsArray
-   * @return prefixNsArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<Integer> getPrefixNsArray() {
-    return prefixNsArray;
-  }
-
-
-  public void setPrefixNsArray(List<Integer> prefixNsArray) {
-    this.prefixNsArray = prefixNsArray;
-  }
-
-
-  public XmlItem prefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
-    
-    this.prefixNsWrappedArray = prefixNsWrappedArray;
-    return this;
-  }
-
-  public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
-    if (this.prefixNsWrappedArray == null) {
-      this.prefixNsWrappedArray = new ArrayList<Integer>();
-    }
-    this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem);
-    return this;
-  }
-
-   /**
-   * Get prefixNsWrappedArray
-   * @return prefixNsWrappedArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-
-  public List<Integer> getPrefixNsWrappedArray() {
-    return prefixNsWrappedArray;
-  }
-
-
-  public void setPrefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
-    this.prefixNsWrappedArray = prefixNsWrappedArray;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    XmlItem xmlItem = (XmlItem) o;
-    return Objects.equals(this.attributeString, xmlItem.attributeString) &&
-        Objects.equals(this.attributeNumber, xmlItem.attributeNumber) &&
-        Objects.equals(this.attributeInteger, xmlItem.attributeInteger) &&
-        Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) &&
-        Objects.equals(this.wrappedArray, xmlItem.wrappedArray) &&
-        Objects.equals(this.nameString, xmlItem.nameString) &&
-        Objects.equals(this.nameNumber, xmlItem.nameNumber) &&
-        Objects.equals(this.nameInteger, xmlItem.nameInteger) &&
-        Objects.equals(this.nameBoolean, xmlItem.nameBoolean) &&
-        Objects.equals(this.nameArray, xmlItem.nameArray) &&
-        Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) &&
-        Objects.equals(this.prefixString, xmlItem.prefixString) &&
-        Objects.equals(this.prefixNumber, xmlItem.prefixNumber) &&
-        Objects.equals(this.prefixInteger, xmlItem.prefixInteger) &&
-        Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) &&
-        Objects.equals(this.prefixArray, xmlItem.prefixArray) &&
-        Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) &&
-        Objects.equals(this.namespaceString, xmlItem.namespaceString) &&
-        Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) &&
-        Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) &&
-        Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) &&
-        Objects.equals(this.namespaceArray, xmlItem.namespaceArray) &&
-        Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) &&
-        Objects.equals(this.prefixNsString, xmlItem.prefixNsString) &&
-        Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) &&
-        Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) &&
-        Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) &&
-        Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) &&
-        Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class XmlItem {\n");
-    sb.append("    attributeString: ").append(toIndentedString(attributeString)).append("\n");
-    sb.append("    attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n");
-    sb.append("    attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n");
-    sb.append("    attributeBoolean: ").append(toIndentedString(attributeBoolean)).append("\n");
-    sb.append("    wrappedArray: ").append(toIndentedString(wrappedArray)).append("\n");
-    sb.append("    nameString: ").append(toIndentedString(nameString)).append("\n");
-    sb.append("    nameNumber: ").append(toIndentedString(nameNumber)).append("\n");
-    sb.append("    nameInteger: ").append(toIndentedString(nameInteger)).append("\n");
-    sb.append("    nameBoolean: ").append(toIndentedString(nameBoolean)).append("\n");
-    sb.append("    nameArray: ").append(toIndentedString(nameArray)).append("\n");
-    sb.append("    nameWrappedArray: ").append(toIndentedString(nameWrappedArray)).append("\n");
-    sb.append("    prefixString: ").append(toIndentedString(prefixString)).append("\n");
-    sb.append("    prefixNumber: ").append(toIndentedString(prefixNumber)).append("\n");
-    sb.append("    prefixInteger: ").append(toIndentedString(prefixInteger)).append("\n");
-    sb.append("    prefixBoolean: ").append(toIndentedString(prefixBoolean)).append("\n");
-    sb.append("    prefixArray: ").append(toIndentedString(prefixArray)).append("\n");
-    sb.append("    prefixWrappedArray: ").append(toIndentedString(prefixWrappedArray)).append("\n");
-    sb.append("    namespaceString: ").append(toIndentedString(namespaceString)).append("\n");
-    sb.append("    namespaceNumber: ").append(toIndentedString(namespaceNumber)).append("\n");
-    sb.append("    namespaceInteger: ").append(toIndentedString(namespaceInteger)).append("\n");
-    sb.append("    namespaceBoolean: ").append(toIndentedString(namespaceBoolean)).append("\n");
-    sb.append("    namespaceArray: ").append(toIndentedString(namespaceArray)).append("\n");
-    sb.append("    namespaceWrappedArray: ").append(toIndentedString(namespaceWrappedArray)).append("\n");
-    sb.append("    prefixNsString: ").append(toIndentedString(prefixNsString)).append("\n");
-    sb.append("    prefixNsNumber: ").append(toIndentedString(prefixNsNumber)).append("\n");
-    sb.append("    prefixNsInteger: ").append(toIndentedString(prefixNsInteger)).append("\n");
-    sb.append("    prefixNsBoolean: ").append(toIndentedString(prefixNsBoolean)).append("\n");
-    sb.append("    prefixNsArray: ").append(toIndentedString(prefixNsArray)).append("\n");
-    sb.append("    prefixNsWrappedArray: ").append(toIndentedString(prefixNsWrappedArray)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
deleted file mode 100644
index 1d45ba717a26..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.Client;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for AnotherFakeApi
- */
-public class AnotherFakeApiTest {
-
-    private AnotherFakeApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(AnotherFakeApi.class);
-    }
-
-    /**
-     * To test special tags
-     *
-     * To test special tags
-     */
-    @Test
-    public void testSpecialTagsTest() {
-        Client client = null;
-        // Client response = api.testSpecialTags(client);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/FakeApiTest.java
deleted file mode 100644
index aec2e41c34e8..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import java.math.BigDecimal;
-import org.openapitools.client.model.Client;
-import java.io.File;
-import org.openapitools.client.model.FileSchemaTestClass;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
-import org.openapitools.client.model.OuterComposite;
-import org.openapitools.client.model.User;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for FakeApi
- */
-public class FakeApiTest {
-
-    private FakeApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(FakeApi.class);
-    }
-
-    /**
-     * 
-     *
-     * Test serialization of outer boolean types
-     */
-    @Test
-    public void fakeOuterBooleanSerializeTest() {
-        Boolean body = null;
-        // Boolean response = api.fakeOuterBooleanSerialize(body);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * Test serialization of object with outer number type
-     */
-    @Test
-    public void fakeOuterCompositeSerializeTest() {
-        OuterComposite outerComposite = null;
-        // OuterComposite response = api.fakeOuterCompositeSerialize(outerComposite);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * Test serialization of outer number types
-     */
-    @Test
-    public void fakeOuterNumberSerializeTest() {
-        BigDecimal body = null;
-        // BigDecimal response = api.fakeOuterNumberSerialize(body);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * Test serialization of outer string types
-     */
-    @Test
-    public void fakeOuterStringSerializeTest() {
-        String body = null;
-        // String response = api.fakeOuterStringSerialize(body);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-     */
-    @Test
-    public void testBodyWithFileSchemaTest() {
-        FileSchemaTestClass fileSchemaTestClass = null;
-        // api.testBodyWithFileSchema(fileSchemaTestClass);
-
-        // TODO: test validations
-    }
-    /**
-     * 
-     *
-     * 
-     */
-    @Test
-    public void testBodyWithQueryParamsTest() {
-        String query = null;
-        User user = null;
-        // api.testBodyWithQueryParams(query, user);
-
-        // TODO: test validations
-    }
-    /**
-     * To test \&quot;client\&quot; model
-     *
-     * To test \&quot;client\&quot; model
-     */
-    @Test
-    public void testClientModelTest() {
-        Client client = null;
-        // Client response = api.testClientModel(client);
-
-        // TODO: test validations
-    }
-    /**
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     */
-    @Test
-    public void testEndpointParametersTest() {
-        BigDecimal number = null;
-        Double _double = null;
-        String patternWithoutDelimiter = null;
-        byte[] _byte = null;
-        Integer integer = null;
-        Integer int32 = null;
-        Long int64 = null;
-        Float _float = null;
-        String string = null;
-        File binary = null;
-        LocalDate date = null;
-        OffsetDateTime dateTime = null;
-        String password = null;
-        String paramCallback = null;
-        // api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
-
-        // TODO: test validations
-    }
-    /**
-     * To test enum parameters
-     *
-     * To test enum parameters
-     */
-    @Test
-    public void testEnumParametersTest() {
-        List<String> enumHeaderStringArray = null;
-        String enumHeaderString = null;
-        List<String> enumQueryStringArray = null;
-        String enumQueryString = null;
-        Integer enumQueryInteger = null;
-        Double enumQueryDouble = null;
-        List<String> enumFormStringArray = null;
-        String enumFormString = null;
-        // api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
-
-        // TODO: test validations
-    }
-    /**
-     * Fake endpoint to test group parameters (optional)
-     *
-     * Fake endpoint to test group parameters (optional)
-     */
-    @Test
-    public void testGroupParametersTest() {
-        Integer requiredStringGroup = null;
-        Boolean requiredBooleanGroup = null;
-        Long requiredInt64Group = null;
-        Integer stringGroup = null;
-        Boolean booleanGroup = null;
-        Long int64Group = null;
-        // api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
-
-        // TODO: test validations
-    }
-    /**
-     * test inline additionalProperties
-     *
-     * 
-     */
-    @Test
-    public void testInlineAdditionalPropertiesTest() {
-        Map<String, String> requestBody = null;
-        // api.testInlineAdditionalProperties(requestBody);
-
-        // TODO: test validations
-    }
-    /**
-     * test json serialization of form data
-     *
-     * 
-     */
-    @Test
-    public void testJsonFormDataTest() {
-        String param = null;
-        String param2 = null;
-        // api.testJsonFormData(param, param2);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
deleted file mode 100644
index 6e32cc284814..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.Client;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for FakeClassnameTags123Api
- */
-public class FakeClassnameTags123ApiTest {
-
-    private FakeClassnameTags123Api api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(FakeClassnameTags123Api.class);
-    }
-
-    /**
-     * To test class name in snake case
-     *
-     * To test class name in snake case
-     */
-    @Test
-    public void testClassnameTest() {
-        Client client = null;
-        // Client response = api.testClassname(client);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/PetApiTest.java
deleted file mode 100644
index 65eed9391e98..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import java.io.File;
-import org.openapitools.client.model.ModelApiResponse;
-import org.openapitools.client.model.Pet;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for PetApi
- */
-public class PetApiTest {
-
-    private PetApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(PetApi.class);
-    }
-
-    /**
-     * Add a new pet to the store
-     *
-     * 
-     */
-    @Test
-    public void addPetTest() {
-        Pet pet = null;
-        // api.addPet(pet);
-
-        // TODO: test validations
-    }
-    /**
-     * Deletes a pet
-     *
-     * 
-     */
-    @Test
-    public void deletePetTest() {
-        Long petId = null;
-        String apiKey = null;
-        // api.deletePet(petId, apiKey);
-
-        // TODO: test validations
-    }
-    /**
-     * Finds Pets by status
-     *
-     * Multiple status values can be provided with comma separated strings
-     */
-    @Test
-    public void findPetsByStatusTest() {
-        List<String> status = null;
-        // List<Pet> response = api.findPetsByStatus(status);
-
-        // TODO: test validations
-    }
-    /**
-     * Finds Pets by tags
-     *
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     */
-    @Test
-    public void findPetsByTagsTest() {
-        List<String> tags = null;
-        // List<Pet> response = api.findPetsByTags(tags);
-
-        // TODO: test validations
-    }
-    /**
-     * Find pet by ID
-     *
-     * Returns a single pet
-     */
-    @Test
-    public void getPetByIdTest() {
-        Long petId = null;
-        // Pet response = api.getPetById(petId);
-
-        // TODO: test validations
-    }
-    /**
-     * Update an existing pet
-     *
-     * 
-     */
-    @Test
-    public void updatePetTest() {
-        Pet pet = null;
-        // api.updatePet(pet);
-
-        // TODO: test validations
-    }
-    /**
-     * Updates a pet in the store with form data
-     *
-     * 
-     */
-    @Test
-    public void updatePetWithFormTest() {
-        Long petId = null;
-        String name = null;
-        String status = null;
-        // api.updatePetWithForm(petId, name, status);
-
-        // TODO: test validations
-    }
-    /**
-     * uploads an image
-     *
-     * 
-     */
-    @Test
-    public void uploadFileTest() {
-        Long petId = null;
-        String additionalMetadata = null;
-        File file = null;
-        // ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/StoreApiTest.java
deleted file mode 100644
index 15455ccabb20..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.Order;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for StoreApi
- */
-public class StoreApiTest {
-
-    private StoreApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(StoreApi.class);
-    }
-
-    /**
-     * Delete purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-     */
-    @Test
-    public void deleteOrderTest() {
-        String orderId = null;
-        // api.deleteOrder(orderId);
-
-        // TODO: test validations
-    }
-    /**
-     * Returns pet inventories by status
-     *
-     * Returns a map of status codes to quantities
-     */
-    @Test
-    public void getInventoryTest() {
-        // Map<String, Integer> response = api.getInventory();
-
-        // TODO: test validations
-    }
-    /**
-     * Find purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     */
-    @Test
-    public void getOrderByIdTest() {
-        Long orderId = null;
-        // Order response = api.getOrderById(orderId);
-
-        // TODO: test validations
-    }
-    /**
-     * Place an order for a pet
-     *
-     * 
-     */
-    @Test
-    public void placeOrderTest() {
-        Order order = null;
-        // Order response = api.placeOrder(order);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/UserApiTest.java
deleted file mode 100644
index 9174f6d02508..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/api/UserApiTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.model.User;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for UserApi
- */
-public class UserApiTest {
-
-    private UserApi api;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(UserApi.class);
-    }
-
-    /**
-     * Create user
-     *
-     * This can only be done by the logged in user.
-     */
-    @Test
-    public void createUserTest() {
-        User user = null;
-        // api.createUser(user);
-
-        // TODO: test validations
-    }
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
-    @Test
-    public void createUsersWithArrayInputTest() {
-        List<User> user = null;
-        // api.createUsersWithArrayInput(user);
-
-        // TODO: test validations
-    }
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
-    @Test
-    public void createUsersWithListInputTest() {
-        List<User> user = null;
-        // api.createUsersWithListInput(user);
-
-        // TODO: test validations
-    }
-    /**
-     * Delete user
-     *
-     * This can only be done by the logged in user.
-     */
-    @Test
-    public void deleteUserTest() {
-        String username = null;
-        // api.deleteUser(username);
-
-        // TODO: test validations
-    }
-    /**
-     * Get user by user name
-     *
-     * 
-     */
-    @Test
-    public void getUserByNameTest() {
-        String username = null;
-        // User response = api.getUserByName(username);
-
-        // TODO: test validations
-    }
-    /**
-     * Logs user into the system
-     *
-     * 
-     */
-    @Test
-    public void loginUserTest() {
-        String username = null;
-        String password = null;
-        // String response = api.loginUser(username, password);
-
-        // TODO: test validations
-    }
-    /**
-     * Logs out current logged in user session
-     *
-     * 
-     */
-    @Test
-    public void logoutUserTest() {
-        // api.logoutUser();
-
-        // TODO: test validations
-    }
-    /**
-     * Updated user
-     *
-     * This can only be done by the logged in user.
-     */
-    @Test
-    public void updateUserTest() {
-        String username = null;
-        User user = null;
-        // api.updateUser(username, user);
-
-        // TODO: test validations
-    }
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
deleted file mode 100644
index 656f05771615..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesAnyType
- */
-public class AdditionalPropertiesAnyTypeTest {
-    private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType();
-
-    /**
-     * Model tests for AdditionalPropertiesAnyType
-     */
-    @Test
-    public void testAdditionalPropertiesAnyType() {
-        // TODO: test AdditionalPropertiesAnyType
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
deleted file mode 100644
index 4c5bdc4ffad6..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesArray
- */
-public class AdditionalPropertiesArrayTest {
-    private final AdditionalPropertiesArray model = new AdditionalPropertiesArray();
-
-    /**
-     * Model tests for AdditionalPropertiesArray
-     */
-    @Test
-    public void testAdditionalPropertiesArray() {
-        // TODO: test AdditionalPropertiesArray
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
deleted file mode 100644
index de976999c633..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesBoolean
- */
-public class AdditionalPropertiesBooleanTest {
-    private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean();
-
-    /**
-     * Model tests for AdditionalPropertiesBoolean
-     */
-    @Test
-    public void testAdditionalPropertiesBoolean() {
-        // TODO: test AdditionalPropertiesBoolean
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
deleted file mode 100644
index 3c18ad38c7e3..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesClass
- */
-public class AdditionalPropertiesClassTest {
-    private final AdditionalPropertiesClass model = new AdditionalPropertiesClass();
-
-    /**
-     * Model tests for AdditionalPropertiesClass
-     */
-    @Test
-    public void testAdditionalPropertiesClass() {
-        // TODO: test AdditionalPropertiesClass
-    }
-
-    /**
-     * Test the property 'mapProperty'
-     */
-    @Test
-    public void mapPropertyTest() {
-        // TODO: test mapProperty
-    }
-
-    /**
-     * Test the property 'mapOfMapProperty'
-     */
-    @Test
-    public void mapOfMapPropertyTest() {
-        // TODO: test mapOfMapProperty
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
deleted file mode 100644
index 712e0c131b12..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesInteger
- */
-public class AdditionalPropertiesIntegerTest {
-    private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger();
-
-    /**
-     * Model tests for AdditionalPropertiesInteger
-     */
-    @Test
-    public void testAdditionalPropertiesInteger() {
-        // TODO: test AdditionalPropertiesInteger
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
deleted file mode 100644
index a2039fa83a55..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesNumber
- */
-public class AdditionalPropertiesNumberTest {
-    private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber();
-
-    /**
-     * Model tests for AdditionalPropertiesNumber
-     */
-    @Test
-    public void testAdditionalPropertiesNumber() {
-        // TODO: test AdditionalPropertiesNumber
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
deleted file mode 100644
index 3c9fe9323b85..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesObject
- */
-public class AdditionalPropertiesObjectTest {
-    private final AdditionalPropertiesObject model = new AdditionalPropertiesObject();
-
-    /**
-     * Model tests for AdditionalPropertiesObject
-     */
-    @Test
-    public void testAdditionalPropertiesObject() {
-        // TODO: test AdditionalPropertiesObject
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
deleted file mode 100644
index 3a3942ab84d6..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesString
- */
-public class AdditionalPropertiesStringTest {
-    private final AdditionalPropertiesString model = new AdditionalPropertiesString();
-
-    /**
-     * Model tests for AdditionalPropertiesString
-     */
-    @Test
-    public void testAdditionalPropertiesString() {
-        // TODO: test AdditionalPropertiesString
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AnimalTest.java
deleted file mode 100644
index 30ed464f5e1d..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/AnimalTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Animal
- */
-public class AnimalTest {
-    private final Animal model = new Animal();
-
-    /**
-     * Model tests for Animal
-     */
-    @Test
-    public void testAnimal() {
-        // TODO: test Animal
-    }
-
-    /**
-     * Test the property 'className'
-     */
-    @Test
-    public void classNameTest() {
-        // TODO: test className
-    }
-
-    /**
-     * Test the property 'color'
-     */
-    @Test
-    public void colorTest() {
-        // TODO: test color
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
deleted file mode 100644
index 709475260505..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ArrayOfArrayOfNumberOnly
- */
-public class ArrayOfArrayOfNumberOnlyTest {
-    private final ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly();
-
-    /**
-     * Model tests for ArrayOfArrayOfNumberOnly
-     */
-    @Test
-    public void testArrayOfArrayOfNumberOnly() {
-        // TODO: test ArrayOfArrayOfNumberOnly
-    }
-
-    /**
-     * Test the property 'arrayArrayNumber'
-     */
-    @Test
-    public void arrayArrayNumberTest() {
-        // TODO: test arrayArrayNumber
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
deleted file mode 100644
index 2f88d6ad4b9b..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ArrayOfNumberOnly
- */
-public class ArrayOfNumberOnlyTest {
-    private final ArrayOfNumberOnly model = new ArrayOfNumberOnly();
-
-    /**
-     * Model tests for ArrayOfNumberOnly
-     */
-    @Test
-    public void testArrayOfNumberOnly() {
-        // TODO: test ArrayOfNumberOnly
-    }
-
-    /**
-     * Test the property 'arrayNumber'
-     */
-    @Test
-    public void arrayNumberTest() {
-        // TODO: test arrayNumber
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ArrayTestTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ArrayTestTest.java
deleted file mode 100644
index 3182aa654811..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ArrayTestTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.client.model.ReadOnlyFirst;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ArrayTest
- */
-public class ArrayTestTest {
-    private final ArrayTest model = new ArrayTest();
-
-    /**
-     * Model tests for ArrayTest
-     */
-    @Test
-    public void testArrayTest() {
-        // TODO: test ArrayTest
-    }
-
-    /**
-     * Test the property 'arrayOfString'
-     */
-    @Test
-    public void arrayOfStringTest() {
-        // TODO: test arrayOfString
-    }
-
-    /**
-     * Test the property 'arrayArrayOfInteger'
-     */
-    @Test
-    public void arrayArrayOfIntegerTest() {
-        // TODO: test arrayArrayOfInteger
-    }
-
-    /**
-     * Test the property 'arrayArrayOfModel'
-     */
-    @Test
-    public void arrayArrayOfModelTest() {
-        // TODO: test arrayArrayOfModel
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/CapitalizationTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/CapitalizationTest.java
deleted file mode 100644
index 1d029ba7c504..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/CapitalizationTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Capitalization
- */
-public class CapitalizationTest {
-    private final Capitalization model = new Capitalization();
-
-    /**
-     * Model tests for Capitalization
-     */
-    @Test
-    public void testCapitalization() {
-        // TODO: test Capitalization
-    }
-
-    /**
-     * Test the property 'smallCamel'
-     */
-    @Test
-    public void smallCamelTest() {
-        // TODO: test smallCamel
-    }
-
-    /**
-     * Test the property 'capitalCamel'
-     */
-    @Test
-    public void capitalCamelTest() {
-        // TODO: test capitalCamel
-    }
-
-    /**
-     * Test the property 'smallSnake'
-     */
-    @Test
-    public void smallSnakeTest() {
-        // TODO: test smallSnake
-    }
-
-    /**
-     * Test the property 'capitalSnake'
-     */
-    @Test
-    public void capitalSnakeTest() {
-        // TODO: test capitalSnake
-    }
-
-    /**
-     * Test the property 'scAETHFlowPoints'
-     */
-    @Test
-    public void scAETHFlowPointsTest() {
-        // TODO: test scAETHFlowPoints
-    }
-
-    /**
-     * Test the property 'ATT_NAME'
-     */
-    @Test
-    public void ATT_NAMETest() {
-        // TODO: test ATT_NAME
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/CatAllOfTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/CatAllOfTest.java
deleted file mode 100644
index 0473dc929e5d..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/CatAllOfTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for CatAllOf
- */
-public class CatAllOfTest {
-    private final CatAllOf model = new CatAllOf();
-
-    /**
-     * Model tests for CatAllOf
-     */
-    @Test
-    public void testCatAllOf() {
-        // TODO: test CatAllOf
-    }
-
-    /**
-     * Test the property 'declawed'
-     */
-    @Test
-    public void declawedTest() {
-        // TODO: test declawed
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/CatTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/CatTest.java
deleted file mode 100644
index 718bb5b6baf6..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/CatTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.openapitools.client.model.Animal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Cat
- */
-public class CatTest {
-    private final Cat model = new Cat();
-
-    /**
-     * Model tests for Cat
-     */
-    @Test
-    public void testCat() {
-        // TODO: test Cat
-    }
-
-    /**
-     * Test the property 'className'
-     */
-    @Test
-    public void classNameTest() {
-        // TODO: test className
-    }
-
-    /**
-     * Test the property 'color'
-     */
-    @Test
-    public void colorTest() {
-        // TODO: test color
-    }
-
-    /**
-     * Test the property 'declawed'
-     */
-    @Test
-    public void declawedTest() {
-        // TODO: test declawed
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/CategoryTest.java
deleted file mode 100644
index 79374c54e6f3..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/CategoryTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Category
- */
-public class CategoryTest {
-    private final Category model = new Category();
-
-    /**
-     * Model tests for Category
-     */
-    @Test
-    public void testCategory() {
-        // TODO: test Category
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ClassModelTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ClassModelTest.java
deleted file mode 100644
index 4c66db89c4f6..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ClassModelTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ClassModel
- */
-public class ClassModelTest {
-    private final ClassModel model = new ClassModel();
-
-    /**
-     * Model tests for ClassModel
-     */
-    @Test
-    public void testClassModel() {
-        // TODO: test ClassModel
-    }
-
-    /**
-     * Test the property 'propertyClass'
-     */
-    @Test
-    public void propertyClassTest() {
-        // TODO: test propertyClass
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ClientTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ClientTest.java
deleted file mode 100644
index 1a9f6d6fc9e7..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ClientTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Client
- */
-public class ClientTest {
-    private final Client model = new Client();
-
-    /**
-     * Model tests for Client
-     */
-    @Test
-    public void testClient() {
-        // TODO: test Client
-    }
-
-    /**
-     * Test the property 'client'
-     */
-    @Test
-    public void clientTest() {
-        // TODO: test client
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/DogAllOfTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/DogAllOfTest.java
deleted file mode 100644
index 7780c14a386e..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/DogAllOfTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for DogAllOf
- */
-public class DogAllOfTest {
-    private final DogAllOf model = new DogAllOf();
-
-    /**
-     * Model tests for DogAllOf
-     */
-    @Test
-    public void testDogAllOf() {
-        // TODO: test DogAllOf
-    }
-
-    /**
-     * Test the property 'breed'
-     */
-    @Test
-    public void breedTest() {
-        // TODO: test breed
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/DogTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/DogTest.java
deleted file mode 100644
index 8392c1745647..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/DogTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.openapitools.client.model.Animal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Dog
- */
-public class DogTest {
-    private final Dog model = new Dog();
-
-    /**
-     * Model tests for Dog
-     */
-    @Test
-    public void testDog() {
-        // TODO: test Dog
-    }
-
-    /**
-     * Test the property 'className'
-     */
-    @Test
-    public void classNameTest() {
-        // TODO: test className
-    }
-
-    /**
-     * Test the property 'color'
-     */
-    @Test
-    public void colorTest() {
-        // TODO: test color
-    }
-
-    /**
-     * Test the property 'breed'
-     */
-    @Test
-    public void breedTest() {
-        // TODO: test breed
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/EnumArraysTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/EnumArraysTest.java
deleted file mode 100644
index a116bb028fc8..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/EnumArraysTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for EnumArrays
- */
-public class EnumArraysTest {
-    private final EnumArrays model = new EnumArrays();
-
-    /**
-     * Model tests for EnumArrays
-     */
-    @Test
-    public void testEnumArrays() {
-        // TODO: test EnumArrays
-    }
-
-    /**
-     * Test the property 'justSymbol'
-     */
-    @Test
-    public void justSymbolTest() {
-        // TODO: test justSymbol
-    }
-
-    /**
-     * Test the property 'arrayEnum'
-     */
-    @Test
-    public void arrayEnumTest() {
-        // TODO: test arrayEnum
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/EnumClassTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/EnumClassTest.java
deleted file mode 100644
index 97855ba723a1..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/EnumClassTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.annotations.SerializedName;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for EnumClass
- */
-public class EnumClassTest {
-    /**
-     * Model tests for EnumClass
-     */
-    @Test
-    public void testEnumClass() {
-        // TODO: test EnumClass
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/EnumTestTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/EnumTestTest.java
deleted file mode 100644
index d43e3cace6da..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/EnumTestTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.openapitools.client.model.OuterEnum;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for EnumTest
- */
-public class EnumTestTest {
-    private final EnumTest model = new EnumTest();
-
-    /**
-     * Model tests for EnumTest
-     */
-    @Test
-    public void testEnumTest() {
-        // TODO: test EnumTest
-    }
-
-    /**
-     * Test the property 'enumString'
-     */
-    @Test
-    public void enumStringTest() {
-        // TODO: test enumString
-    }
-
-    /**
-     * Test the property 'enumStringRequired'
-     */
-    @Test
-    public void enumStringRequiredTest() {
-        // TODO: test enumStringRequired
-    }
-
-    /**
-     * Test the property 'enumInteger'
-     */
-    @Test
-    public void enumIntegerTest() {
-        // TODO: test enumInteger
-    }
-
-    /**
-     * Test the property 'enumNumber'
-     */
-    @Test
-    public void enumNumberTest() {
-        // TODO: test enumNumber
-    }
-
-    /**
-     * Test the property 'outerEnum'
-     */
-    @Test
-    public void outerEnumTest() {
-        // TODO: test outerEnum
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
deleted file mode 100644
index a960673c6169..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for FileSchemaTestClass
- */
-public class FileSchemaTestClassTest {
-    private final FileSchemaTestClass model = new FileSchemaTestClass();
-
-    /**
-     * Model tests for FileSchemaTestClass
-     */
-    @Test
-    public void testFileSchemaTestClass() {
-        // TODO: test FileSchemaTestClass
-    }
-
-    /**
-     * Test the property 'file'
-     */
-    @Test
-    public void fileTest() {
-        // TODO: test file
-    }
-
-    /**
-     * Test the property 'files'
-     */
-    @Test
-    public void filesTest() {
-        // TODO: test files
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/FormatTestTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/FormatTestTest.java
deleted file mode 100644
index 4d5b377c0b4f..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/FormatTestTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.UUID;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for FormatTest
- */
-public class FormatTestTest {
-    private final FormatTest model = new FormatTest();
-
-    /**
-     * Model tests for FormatTest
-     */
-    @Test
-    public void testFormatTest() {
-        // TODO: test FormatTest
-    }
-
-    /**
-     * Test the property 'integer'
-     */
-    @Test
-    public void integerTest() {
-        // TODO: test integer
-    }
-
-    /**
-     * Test the property 'int32'
-     */
-    @Test
-    public void int32Test() {
-        // TODO: test int32
-    }
-
-    /**
-     * Test the property 'int64'
-     */
-    @Test
-    public void int64Test() {
-        // TODO: test int64
-    }
-
-    /**
-     * Test the property 'number'
-     */
-    @Test
-    public void numberTest() {
-        // TODO: test number
-    }
-
-    /**
-     * Test the property '_float'
-     */
-    @Test
-    public void _floatTest() {
-        // TODO: test _float
-    }
-
-    /**
-     * Test the property '_double'
-     */
-    @Test
-    public void _doubleTest() {
-        // TODO: test _double
-    }
-
-    /**
-     * Test the property 'string'
-     */
-    @Test
-    public void stringTest() {
-        // TODO: test string
-    }
-
-    /**
-     * Test the property '_byte'
-     */
-    @Test
-    public void _byteTest() {
-        // TODO: test _byte
-    }
-
-    /**
-     * Test the property 'binary'
-     */
-    @Test
-    public void binaryTest() {
-        // TODO: test binary
-    }
-
-    /**
-     * Test the property 'date'
-     */
-    @Test
-    public void dateTest() {
-        // TODO: test date
-    }
-
-    /**
-     * Test the property 'dateTime'
-     */
-    @Test
-    public void dateTimeTest() {
-        // TODO: test dateTime
-    }
-
-    /**
-     * Test the property 'uuid'
-     */
-    @Test
-    public void uuidTest() {
-        // TODO: test uuid
-    }
-
-    /**
-     * Test the property 'password'
-     */
-    @Test
-    public void passwordTest() {
-        // TODO: test password
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
deleted file mode 100644
index d854c0c9daf2..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for HasOnlyReadOnly
- */
-public class HasOnlyReadOnlyTest {
-    private final HasOnlyReadOnly model = new HasOnlyReadOnly();
-
-    /**
-     * Model tests for HasOnlyReadOnly
-     */
-    @Test
-    public void testHasOnlyReadOnly() {
-        // TODO: test HasOnlyReadOnly
-    }
-
-    /**
-     * Test the property 'bar'
-     */
-    @Test
-    public void barTest() {
-        // TODO: test bar
-    }
-
-    /**
-     * Test the property 'foo'
-     */
-    @Test
-    public void fooTest() {
-        // TODO: test foo
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/MapTestTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/MapTestTest.java
deleted file mode 100644
index 9f78d486659f..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/MapTestTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for MapTest
- */
-public class MapTestTest {
-    private final MapTest model = new MapTest();
-
-    /**
-     * Model tests for MapTest
-     */
-    @Test
-    public void testMapTest() {
-        // TODO: test MapTest
-    }
-
-    /**
-     * Test the property 'mapMapOfString'
-     */
-    @Test
-    public void mapMapOfStringTest() {
-        // TODO: test mapMapOfString
-    }
-
-    /**
-     * Test the property 'mapOfEnumString'
-     */
-    @Test
-    public void mapOfEnumStringTest() {
-        // TODO: test mapOfEnumString
-    }
-
-    /**
-     * Test the property 'directMap'
-     */
-    @Test
-    public void directMapTest() {
-        // TODO: test directMap
-    }
-
-    /**
-     * Test the property 'indirectMap'
-     */
-    @Test
-    public void indirectMapTest() {
-        // TODO: test indirectMap
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
deleted file mode 100644
index 93829ac8d536..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import org.openapitools.client.model.Animal;
-import org.threeten.bp.OffsetDateTime;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for MixedPropertiesAndAdditionalPropertiesClass
- */
-public class MixedPropertiesAndAdditionalPropertiesClassTest {
-    private final MixedPropertiesAndAdditionalPropertiesClass model = new MixedPropertiesAndAdditionalPropertiesClass();
-
-    /**
-     * Model tests for MixedPropertiesAndAdditionalPropertiesClass
-     */
-    @Test
-    public void testMixedPropertiesAndAdditionalPropertiesClass() {
-        // TODO: test MixedPropertiesAndAdditionalPropertiesClass
-    }
-
-    /**
-     * Test the property 'uuid'
-     */
-    @Test
-    public void uuidTest() {
-        // TODO: test uuid
-    }
-
-    /**
-     * Test the property 'dateTime'
-     */
-    @Test
-    public void dateTimeTest() {
-        // TODO: test dateTime
-    }
-
-    /**
-     * Test the property 'map'
-     */
-    @Test
-    public void mapTest() {
-        // TODO: test map
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/Model200ResponseTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
deleted file mode 100644
index dcea58773348..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Model200Response
- */
-public class Model200ResponseTest {
-    private final Model200Response model = new Model200Response();
-
-    /**
-     * Model tests for Model200Response
-     */
-    @Test
-    public void testModel200Response() {
-        // TODO: test Model200Response
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-    /**
-     * Test the property 'propertyClass'
-     */
-    @Test
-    public void propertyClassTest() {
-        // TODO: test propertyClass
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
deleted file mode 100644
index 46b8648fdccf..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ModelApiResponse
- */
-public class ModelApiResponseTest {
-    private final ModelApiResponse model = new ModelApiResponse();
-
-    /**
-     * Model tests for ModelApiResponse
-     */
-    @Test
-    public void testModelApiResponse() {
-        // TODO: test ModelApiResponse
-    }
-
-    /**
-     * Test the property 'code'
-     */
-    @Test
-    public void codeTest() {
-        // TODO: test code
-    }
-
-    /**
-     * Test the property 'type'
-     */
-    @Test
-    public void typeTest() {
-        // TODO: test type
-    }
-
-    /**
-     * Test the property 'message'
-     */
-    @Test
-    public void messageTest() {
-        // TODO: test message
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ModelReturnTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ModelReturnTest.java
deleted file mode 100644
index 4135ead56864..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ModelReturnTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ModelReturn
- */
-public class ModelReturnTest {
-    private final ModelReturn model = new ModelReturn();
-
-    /**
-     * Model tests for ModelReturn
-     */
-    @Test
-    public void testModelReturn() {
-        // TODO: test ModelReturn
-    }
-
-    /**
-     * Test the property '_return'
-     */
-    @Test
-    public void _returnTest() {
-        // TODO: test _return
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/NameTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/NameTest.java
deleted file mode 100644
index bdc04b000c18..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/NameTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Name
- */
-public class NameTest {
-    private final Name model = new Name();
-
-    /**
-     * Model tests for Name
-     */
-    @Test
-    public void testName() {
-        // TODO: test Name
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-    /**
-     * Test the property 'snakeCase'
-     */
-    @Test
-    public void snakeCaseTest() {
-        // TODO: test snakeCase
-    }
-
-    /**
-     * Test the property 'property'
-     */
-    @Test
-    public void propertyTest() {
-        // TODO: test property
-    }
-
-    /**
-     * Test the property '_123number'
-     */
-    @Test
-    public void _123numberTest() {
-        // TODO: test _123number
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/NumberOnlyTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
deleted file mode 100644
index 214a6d4538dc..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for NumberOnly
- */
-public class NumberOnlyTest {
-    private final NumberOnly model = new NumberOnly();
-
-    /**
-     * Model tests for NumberOnly
-     */
-    @Test
-    public void testNumberOnly() {
-        // TODO: test NumberOnly
-    }
-
-    /**
-     * Test the property 'justNumber'
-     */
-    @Test
-    public void justNumberTest() {
-        // TODO: test justNumber
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/OrderTest.java
deleted file mode 100644
index 808e365efb56..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/OrderTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.threeten.bp.OffsetDateTime;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Order
- */
-public class OrderTest {
-    private final Order model = new Order();
-
-    /**
-     * Model tests for Order
-     */
-    @Test
-    public void testOrder() {
-        // TODO: test Order
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'petId'
-     */
-    @Test
-    public void petIdTest() {
-        // TODO: test petId
-    }
-
-    /**
-     * Test the property 'quantity'
-     */
-    @Test
-    public void quantityTest() {
-        // TODO: test quantity
-    }
-
-    /**
-     * Test the property 'shipDate'
-     */
-    @Test
-    public void shipDateTest() {
-        // TODO: test shipDate
-    }
-
-    /**
-     * Test the property 'status'
-     */
-    @Test
-    public void statusTest() {
-        // TODO: test status
-    }
-
-    /**
-     * Test the property 'complete'
-     */
-    @Test
-    public void completeTest() {
-        // TODO: test complete
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/OuterCompositeTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
deleted file mode 100644
index 710bfedd5805..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for OuterComposite
- */
-public class OuterCompositeTest {
-    private final OuterComposite model = new OuterComposite();
-
-    /**
-     * Model tests for OuterComposite
-     */
-    @Test
-    public void testOuterComposite() {
-        // TODO: test OuterComposite
-    }
-
-    /**
-     * Test the property 'myNumber'
-     */
-    @Test
-    public void myNumberTest() {
-        // TODO: test myNumber
-    }
-
-    /**
-     * Test the property 'myString'
-     */
-    @Test
-    public void myStringTest() {
-        // TODO: test myString
-    }
-
-    /**
-     * Test the property 'myBoolean'
-     */
-    @Test
-    public void myBooleanTest() {
-        // TODO: test myBoolean
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/OuterEnumTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/OuterEnumTest.java
deleted file mode 100644
index 064f84b3ff60..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/OuterEnumTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.annotations.SerializedName;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for OuterEnum
- */
-public class OuterEnumTest {
-    /**
-     * Model tests for OuterEnum
-     */
-    @Test
-    public void testOuterEnum() {
-        // TODO: test OuterEnum
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/PetTest.java
deleted file mode 100644
index 4e8e4c65827e..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/PetTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.client.model.Category;
-import org.openapitools.client.model.Tag;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Pet
- */
-public class PetTest {
-    private final Pet model = new Pet();
-
-    /**
-     * Model tests for Pet
-     */
-    @Test
-    public void testPet() {
-        // TODO: test Pet
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'category'
-     */
-    @Test
-    public void categoryTest() {
-        // TODO: test category
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-    /**
-     * Test the property 'photoUrls'
-     */
-    @Test
-    public void photoUrlsTest() {
-        // TODO: test photoUrls
-    }
-
-    /**
-     * Test the property 'tags'
-     */
-    @Test
-    public void tagsTest() {
-        // TODO: test tags
-    }
-
-    /**
-     * Test the property 'status'
-     */
-    @Test
-    public void statusTest() {
-        // TODO: test status
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
deleted file mode 100644
index c89b608f6096..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for ReadOnlyFirst
- */
-public class ReadOnlyFirstTest {
-    private final ReadOnlyFirst model = new ReadOnlyFirst();
-
-    /**
-     * Model tests for ReadOnlyFirst
-     */
-    @Test
-    public void testReadOnlyFirst() {
-        // TODO: test ReadOnlyFirst
-    }
-
-    /**
-     * Test the property 'bar'
-     */
-    @Test
-    public void barTest() {
-        // TODO: test bar
-    }
-
-    /**
-     * Test the property 'baz'
-     */
-    @Test
-    public void bazTest() {
-        // TODO: test baz
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
deleted file mode 100644
index d058c884e493..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for SpecialModelName
- */
-public class SpecialModelNameTest {
-    private final SpecialModelName model = new SpecialModelName();
-
-    /**
-     * Model tests for SpecialModelName
-     */
-    @Test
-    public void testSpecialModelName() {
-        // TODO: test SpecialModelName
-    }
-
-    /**
-     * Test the property '$specialPropertyName'
-     */
-    @Test
-    public void $specialPropertyNameTest() {
-        // TODO: test $specialPropertyName
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/TagTest.java
deleted file mode 100644
index 27acc7ce8e77..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/TagTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for Tag
- */
-public class TagTest {
-    private final Tag model = new Tag();
-
-    /**
-     * Model tests for Tag
-     */
-    @Test
-    public void testTag() {
-        // TODO: test Tag
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
deleted file mode 100644
index f120407395a8..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for TypeHolderDefault
- */
-public class TypeHolderDefaultTest {
-    private final TypeHolderDefault model = new TypeHolderDefault();
-
-    /**
-     * Model tests for TypeHolderDefault
-     */
-    @Test
-    public void testTypeHolderDefault() {
-        // TODO: test TypeHolderDefault
-    }
-
-    /**
-     * Test the property 'stringItem'
-     */
-    @Test
-    public void stringItemTest() {
-        // TODO: test stringItem
-    }
-
-    /**
-     * Test the property 'numberItem'
-     */
-    @Test
-    public void numberItemTest() {
-        // TODO: test numberItem
-    }
-
-    /**
-     * Test the property 'integerItem'
-     */
-    @Test
-    public void integerItemTest() {
-        // TODO: test integerItem
-    }
-
-    /**
-     * Test the property 'boolItem'
-     */
-    @Test
-    public void boolItemTest() {
-        // TODO: test boolItem
-    }
-
-    /**
-     * Test the property 'arrayItem'
-     */
-    @Test
-    public void arrayItemTest() {
-        // TODO: test arrayItem
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
deleted file mode 100644
index 5e99dff0caef..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for TypeHolderExample
- */
-public class TypeHolderExampleTest {
-    private final TypeHolderExample model = new TypeHolderExample();
-
-    /**
-     * Model tests for TypeHolderExample
-     */
-    @Test
-    public void testTypeHolderExample() {
-        // TODO: test TypeHolderExample
-    }
-
-    /**
-     * Test the property 'stringItem'
-     */
-    @Test
-    public void stringItemTest() {
-        // TODO: test stringItem
-    }
-
-    /**
-     * Test the property 'numberItem'
-     */
-    @Test
-    public void numberItemTest() {
-        // TODO: test numberItem
-    }
-
-    /**
-     * Test the property 'integerItem'
-     */
-    @Test
-    public void integerItemTest() {
-        // TODO: test integerItem
-    }
-
-    /**
-     * Test the property 'boolItem'
-     */
-    @Test
-    public void boolItemTest() {
-        // TODO: test boolItem
-    }
-
-    /**
-     * Test the property 'arrayItem'
-     */
-    @Test
-    public void arrayItemTest() {
-        // TODO: test arrayItem
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/UserTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/UserTest.java
deleted file mode 100644
index da1c9bda4b5d..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/UserTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for User
- */
-public class UserTest {
-    private final User model = new User();
-
-    /**
-     * Model tests for User
-     */
-    @Test
-    public void testUser() {
-        // TODO: test User
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'username'
-     */
-    @Test
-    public void usernameTest() {
-        // TODO: test username
-    }
-
-    /**
-     * Test the property 'firstName'
-     */
-    @Test
-    public void firstNameTest() {
-        // TODO: test firstName
-    }
-
-    /**
-     * Test the property 'lastName'
-     */
-    @Test
-    public void lastNameTest() {
-        // TODO: test lastName
-    }
-
-    /**
-     * Test the property 'email'
-     */
-    @Test
-    public void emailTest() {
-        // TODO: test email
-    }
-
-    /**
-     * Test the property 'password'
-     */
-    @Test
-    public void passwordTest() {
-        // TODO: test password
-    }
-
-    /**
-     * Test the property 'phone'
-     */
-    @Test
-    public void phoneTest() {
-        // TODO: test phone
-    }
-
-    /**
-     * Test the property 'userStatus'
-     */
-    @Test
-    public void userStatusTest() {
-        // TODO: test userStatus
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/XmlItemTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/XmlItemTest.java
deleted file mode 100644
index 5e861e186210..000000000000
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/XmlItemTest.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * Model tests for XmlItem
- */
-public class XmlItemTest {
-    private final XmlItem model = new XmlItem();
-
-    /**
-     * Model tests for XmlItem
-     */
-    @Test
-    public void testXmlItem() {
-        // TODO: test XmlItem
-    }
-
-    /**
-     * Test the property 'attributeString'
-     */
-    @Test
-    public void attributeStringTest() {
-        // TODO: test attributeString
-    }
-
-    /**
-     * Test the property 'attributeNumber'
-     */
-    @Test
-    public void attributeNumberTest() {
-        // TODO: test attributeNumber
-    }
-
-    /**
-     * Test the property 'attributeInteger'
-     */
-    @Test
-    public void attributeIntegerTest() {
-        // TODO: test attributeInteger
-    }
-
-    /**
-     * Test the property 'attributeBoolean'
-     */
-    @Test
-    public void attributeBooleanTest() {
-        // TODO: test attributeBoolean
-    }
-
-    /**
-     * Test the property 'wrappedArray'
-     */
-    @Test
-    public void wrappedArrayTest() {
-        // TODO: test wrappedArray
-    }
-
-    /**
-     * Test the property 'nameString'
-     */
-    @Test
-    public void nameStringTest() {
-        // TODO: test nameString
-    }
-
-    /**
-     * Test the property 'nameNumber'
-     */
-    @Test
-    public void nameNumberTest() {
-        // TODO: test nameNumber
-    }
-
-    /**
-     * Test the property 'nameInteger'
-     */
-    @Test
-    public void nameIntegerTest() {
-        // TODO: test nameInteger
-    }
-
-    /**
-     * Test the property 'nameBoolean'
-     */
-    @Test
-    public void nameBooleanTest() {
-        // TODO: test nameBoolean
-    }
-
-    /**
-     * Test the property 'nameArray'
-     */
-    @Test
-    public void nameArrayTest() {
-        // TODO: test nameArray
-    }
-
-    /**
-     * Test the property 'nameWrappedArray'
-     */
-    @Test
-    public void nameWrappedArrayTest() {
-        // TODO: test nameWrappedArray
-    }
-
-    /**
-     * Test the property 'prefixString'
-     */
-    @Test
-    public void prefixStringTest() {
-        // TODO: test prefixString
-    }
-
-    /**
-     * Test the property 'prefixNumber'
-     */
-    @Test
-    public void prefixNumberTest() {
-        // TODO: test prefixNumber
-    }
-
-    /**
-     * Test the property 'prefixInteger'
-     */
-    @Test
-    public void prefixIntegerTest() {
-        // TODO: test prefixInteger
-    }
-
-    /**
-     * Test the property 'prefixBoolean'
-     */
-    @Test
-    public void prefixBooleanTest() {
-        // TODO: test prefixBoolean
-    }
-
-    /**
-     * Test the property 'prefixArray'
-     */
-    @Test
-    public void prefixArrayTest() {
-        // TODO: test prefixArray
-    }
-
-    /**
-     * Test the property 'prefixWrappedArray'
-     */
-    @Test
-    public void prefixWrappedArrayTest() {
-        // TODO: test prefixWrappedArray
-    }
-
-    /**
-     * Test the property 'namespaceString'
-     */
-    @Test
-    public void namespaceStringTest() {
-        // TODO: test namespaceString
-    }
-
-    /**
-     * Test the property 'namespaceNumber'
-     */
-    @Test
-    public void namespaceNumberTest() {
-        // TODO: test namespaceNumber
-    }
-
-    /**
-     * Test the property 'namespaceInteger'
-     */
-    @Test
-    public void namespaceIntegerTest() {
-        // TODO: test namespaceInteger
-    }
-
-    /**
-     * Test the property 'namespaceBoolean'
-     */
-    @Test
-    public void namespaceBooleanTest() {
-        // TODO: test namespaceBoolean
-    }
-
-    /**
-     * Test the property 'namespaceArray'
-     */
-    @Test
-    public void namespaceArrayTest() {
-        // TODO: test namespaceArray
-    }
-
-    /**
-     * Test the property 'namespaceWrappedArray'
-     */
-    @Test
-    public void namespaceWrappedArrayTest() {
-        // TODO: test namespaceWrappedArray
-    }
-
-    /**
-     * Test the property 'prefixNamespaceString'
-     */
-    @Test
-    public void prefixNamespaceStringTest() {
-        // TODO: test prefixNamespaceString
-    }
-
-    /**
-     * Test the property 'prefixNamespaceNumber'
-     */
-    @Test
-    public void prefixNamespaceNumberTest() {
-        // TODO: test prefixNamespaceNumber
-    }
-
-    /**
-     * Test the property 'prefixNamespaceInteger'
-     */
-    @Test
-    public void prefixNamespaceIntegerTest() {
-        // TODO: test prefixNamespaceInteger
-    }
-
-    /**
-     * Test the property 'prefixNamespaceBoolean'
-     */
-    @Test
-    public void prefixNamespaceBooleanTest() {
-        // TODO: test prefixNamespaceBoolean
-    }
-
-    /**
-     * Test the property 'prefixNamespaceArray'
-     */
-    @Test
-    public void prefixNamespaceArrayTest() {
-        // TODO: test prefixNamespaceArray
-    }
-
-    /**
-     * Test the property 'prefixNamespaceWrappedArray'
-     */
-    @Test
-    public void prefixNamespaceWrappedArrayTest() {
-        // TODO: test prefixNamespaceWrappedArray
-    }
-
-}
diff --git a/samples/client/petstore/java/retrofit2rx2/build.gradle b/samples/client/petstore/java/retrofit2rx2/build.gradle
index dbb70bc02767..e04748d63639 100644
--- a/samples/client/petstore/java/retrofit2rx2/build.gradle
+++ b/samples/client/petstore/java/retrofit2rx2/build.gradle
@@ -117,6 +117,6 @@ dependencies {
     }
     compile "io.gsonfire:gson-fire:$json_fire_version"
     compile "org.threeten:threetenbp:$threetenbp_version"
-
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/retrofit2rx2/build.sbt b/samples/client/petstore/java/retrofit2rx2/build.sbt
index f08041b22ea6..b7473979ad69 100644
--- a/samples/client/petstore/java/retrofit2rx2/build.sbt
+++ b/samples/client/petstore/java/retrofit2rx2/build.sbt
@@ -18,6 +18,7 @@ lazy val root = (project in file(".")).
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "org.threeten" % "threetenbp" % "1.4.0" % "compile",
       "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.11" % "test"
     )
diff --git a/samples/client/petstore/java/retrofit2rx2/pom.xml b/samples/client/petstore/java/retrofit2rx2/pom.xml
index a99c4583e437..07aa4b7aa48c 100644
--- a/samples/client/petstore/java/retrofit2rx2/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx2/pom.xml
@@ -132,12 +132,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -246,6 +256,12 @@
                 <artifactId>adapter-rxjava2</artifactId>
                 <version>${retrofit-version}</version>
             </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -264,6 +280,7 @@
         <retrofit-version>2.5.0</retrofit-version>
         <rxjava-version>2.1.1</rxjava-version>
         <threetenbp-version>1.4.0</threetenbp-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <oltu-version>1.0.1</oltu-version>
         <junit-version>4.13</junit-version>
     </properties>
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/ApiClient.java
index 76999eb684e5..08239723ff8c 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/ApiClient.java
@@ -36,10 +36,18 @@ public class ApiClient {
   private OkHttpClient.Builder okBuilder;
   private Retrofit.Builder adapterBuilder;
   private JSON json;
+  private OkHttpClient okHttpClient;
 
   public ApiClient() {
     apiAuthorizations = new LinkedHashMap<String, Interceptor>();
     createDefaultAdapter();
+    okBuilder = new OkHttpClient.Builder();
+  }
+
+  public ApiClient(OkHttpClient client){
+    apiAuthorizations = new LinkedHashMap<String, Interceptor>();
+    createDefaultAdapter();
+    okHttpClient = client;
   }
 
   public ApiClient(String[] authNames) {
@@ -115,7 +123,6 @@ public ApiClient(String authName, String clientId, String secret, String usernam
 
   public void createDefaultAdapter() {
     json = new JSON();
-    okBuilder = new OkHttpClient.Builder();
 
     String baseUrl = "http://petstore.swagger.io:80/v2";
     if (!baseUrl.endsWith("/"))
@@ -124,17 +131,17 @@ public void createDefaultAdapter() {
     adapterBuilder = new Retrofit
       .Builder()
       .baseUrl(baseUrl)
-
       .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
       .addConverterFactory(ScalarsConverterFactory.create())
       .addConverterFactory(GsonCustomConverterFactory.create(json.getGson()));
   }
 
   public <S> S createService(Class<S> serviceClass) {
-    return adapterBuilder
-      .client(okBuilder.build())
-      .build()
-      .create(serviceClass);
+    if (okHttpClient != null) {
+        return adapterBuilder.client(okHttpClient).build().create(serviceClass);
+    } else {
+        return adapterBuilder.client(okBuilder.build()).build().create(serviceClass);
+    }
   }
 
   public ApiClient setDateFormat(DateFormat dateFormat) {
@@ -306,7 +313,11 @@ public ApiClient addAuthorization(String authName, Interceptor authorization) {
       throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations");
     }
     apiAuthorizations.put(authName, authorization);
+    if(okBuilder == null){
+    	throw new RuntimeException("The ApiClient was created with a built OkHttpClient so it's not possible to add an authorization interceptor to it");
+    }
     okBuilder.addInterceptor(authorization);
+    
     return this;
   }
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/StringUtil.java
index 747a23f5bf23..4dc60597910a 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/StringUtil.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 79c169543fde..43c6885f374f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index e16ee861f893..f71f19e32f5f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -30,7 +30,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 29161b52aa16..d748b6c1c7e9 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index a067b01ec979..5dcdb50233e2 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -31,7 +31,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_MAP_STRING = "map_string";
   @SerializedName(SERIALIZED_NAME_MAP_STRING)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 3a15ed7cd977..d2c4b0ef322c 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 9bc46e099916..fe1b89b67e42 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -30,7 +30,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index bd65f7791c5e..8690d66d3462 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index cdb8afedaaf4..5bd295794e93 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -29,7 +29,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java
index 4d3bf2369fb6..00548e65fa3b 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java
@@ -30,7 +30,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Animal {
   public static final String SERIALIZED_NAME_CLASS_NAME = "className";
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index a6dd760660d5..0a4f98a0b627 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -30,7 +30,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 487c539d3bac..5f87c4ddef1a 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -30,7 +30,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber";
   @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7d66ce233feb..ff780811ba1f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -30,7 +30,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string";
   @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCat.java
index d30cc70c0cf4..186ea74bbac1 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCat.java
@@ -29,7 +29,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class BigCat extends Cat {
   /**
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index cd2207704bd1..7a5439270613 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -27,7 +27,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java
index d4fbec81c543..c68dbeb2a423 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -27,7 +27,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String SERIALIZED_NAME_SMALL_CAMEL = "smallCamel";
   @SerializedName(SERIALIZED_NAME_SMALL_CAMEL)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
index 058f627b4141..560bebcb7bb6 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
@@ -30,7 +30,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Cat extends Animal {
   public static final String SERIALIZED_NAME_DECLAWED = "declawed";
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java
index dcd1a8e3b90e..a88c5a44b663 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -27,7 +27,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String SERIALIZED_NAME_DECLAWED = "declawed";
   @SerializedName(SERIALIZED_NAME_DECLAWED)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java
index 4d07c3a1bef1..558a67073120 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java
@@ -27,7 +27,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java
index 8867bdd06bf0..41190d85a1eb 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -28,7 +28,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String SERIALIZED_NAME_PROPERTY_CLASS = "_class";
   @SerializedName(SERIALIZED_NAME_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java
index 25831260e09b..c4baca1e73d7 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java
@@ -27,7 +27,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String SERIALIZED_NAME_CLIENT = "client";
   @SerializedName(SERIALIZED_NAME_CLIENT)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
index f80bc1ab8dcd..49df272d86ed 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
@@ -29,7 +29,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 
 public class Dog extends Animal {
   public static final String SERIALIZED_NAME_BREED = "breed";
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java
index b945c2c33db4..134c87b2e9b4 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -27,7 +27,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String SERIALIZED_NAME_BREED = "breed";
   @SerializedName(SERIALIZED_NAME_BREED)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java
index 2512b4cf9d52..b1aba3f4e68d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -29,7 +29,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
index ccbbabaa9ba5..a25f521079b8 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -28,7 +28,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index f4a15cd5b7fd..908312827464 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -29,7 +29,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String SERIALIZED_NAME_FILE = "file";
   @SerializedName(SERIALIZED_NAME_FILE)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
index 5983420c81b1..ff862108132a 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -32,7 +32,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String SERIALIZED_NAME_INTEGER = "integer";
   @SerializedName(SERIALIZED_NAME_INTEGER)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 8fcb26846436..0a4bdb4671ab 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -27,7 +27,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String SERIALIZED_NAME_BAR = "bar";
   @SerializedName(SERIALIZED_NAME_BAR)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java
index 7dc68b0ff00f..280d523ea933 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java
@@ -30,7 +30,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string";
   @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 527853d7522c..ea4ebddd037d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -33,7 +33,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java
index df3683dac78d..8a7a5ee5aad0 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -28,7 +28,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index b9cf72823b2f..92181899c1ae 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -27,7 +27,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String SERIALIZED_NAME_CODE = "code";
   @SerializedName(SERIALIZED_NAME_CODE)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java
index 6e9714df977d..d740c15becd1 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -28,7 +28,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String SERIALIZED_NAME_RETURN = "return";
   @SerializedName(SERIALIZED_NAME_RETURN)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java
index 94117a9b0f4b..879a6337cebc 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java
@@ -28,7 +28,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java
index 9a55d8aa615f..50981eb598e1 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -28,7 +28,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String SERIALIZED_NAME_JUST_NUMBER = "JustNumber";
   @SerializedName(SERIALIZED_NAME_JUST_NUMBER)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java
index 33d57e18bee5..847d9d8a5636 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java
@@ -28,7 +28,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java
index 1efe43b234b5..bd38e7946d50 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -28,7 +28,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String SERIALIZED_NAME_MY_NUMBER = "my_number";
   @SerializedName(SERIALIZED_NAME_MY_NUMBER)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java
index 4ea18b217b6e..6d5855842591 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java
@@ -33,7 +33,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index ed0244a3ca27..991726d89632 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -27,7 +27,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String SERIALIZED_NAME_BAR = "bar";
   @SerializedName(SERIALIZED_NAME_BAR)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 3405d30ff614..9e64e21d5856 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -27,7 +27,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   @SerializedName(SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java
index 710e0fe54a4e..259f762b292d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java
@@ -27,7 +27,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 978cdb6f78db..f3fdb3b0196d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -30,7 +30,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
   @SerializedName(SERIALIZED_NAME_STRING_ITEM)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 878b1540ee7f..f72745a6b0ba 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -30,7 +30,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
   @SerializedName(SERIALIZED_NAME_STRING_ITEM)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java
index d91115317819..349a04836d16 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java
@@ -27,7 +27,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java
index ecfd0be1b31a..ae1d289ac2c3 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -30,7 +30,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String SERIALIZED_NAME_ATTRIBUTE_STRING = "attribute_string";
   @SerializedName(SERIALIZED_NAME_ATTRIBUTE_STRING)
diff --git a/samples/client/petstore/java/retrofit2-play25/.gitignore b/samples/client/petstore/java/retrofit2rx3/.gitignore
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/.gitignore
rename to samples/client/petstore/java/retrofit2rx3/.gitignore
diff --git a/samples/client/petstore/java/retrofit2-play25/.openapi-generator-ignore b/samples/client/petstore/java/retrofit2rx3/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/.openapi-generator-ignore
rename to samples/client/petstore/java/retrofit2rx3/.openapi-generator-ignore
diff --git a/samples/client/petstore/java/retrofit2rx/.openapi-generator/FILES b/samples/client/petstore/java/retrofit2rx3/.openapi-generator/FILES
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/.openapi-generator/FILES
rename to samples/client/petstore/java/retrofit2rx3/.openapi-generator/FILES
diff --git a/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
rename to samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION
diff --git a/samples/client/petstore/java/retrofit2-play25/.travis.yml b/samples/client/petstore/java/retrofit2rx3/.travis.yml
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/.travis.yml
rename to samples/client/petstore/java/retrofit2rx3/.travis.yml
diff --git a/samples/client/petstore/java/retrofit2rx3/README.md b/samples/client/petstore/java/retrofit2rx3/README.md
new file mode 100644
index 000000000000..8ef02d5debdd
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/README.md
@@ -0,0 +1,39 @@
+# petstore-retrofit2-rx3
+
+## Requirements
+
+Building the API client library requires [Maven](https://maven.apache.org/) to be installed.
+
+## Installation & Usage
+
+To install the API client library to your local Maven repository, simply execute:
+
+```shell
+mvn install
+```
+
+To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
+
+```shell
+mvn deploy
+```
+
+Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
+
+After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
+
+```xml
+<dependency>
+    <groupId>org.openapitools</groupId>
+    <artifactId>petstore-retrofit2-rx3</artifactId>
+    <version>1.0.0</version>
+    <scope>compile</scope>
+</dependency>
+
+```
+
+## Author
+
+
+
+
diff --git a/samples/client/petstore/java/retrofit2-play25/api/openapi.yaml b/samples/client/petstore/java/retrofit2rx3/api/openapi.yaml
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/api/openapi.yaml
rename to samples/client/petstore/java/retrofit2rx3/api/openapi.yaml
diff --git a/samples/client/petstore/java/retrofit2rx3/build.gradle b/samples/client/petstore/java/retrofit2rx3/build.gradle
new file mode 100644
index 000000000000..979e01440e91
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/build.gradle
@@ -0,0 +1,122 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
+group = 'org.openapitools'
+version = '1.0.0'
+
+buildscript {
+    repositories {
+        maven { url "https://repo1.maven.org/maven2" }
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+    }
+}
+
+repositories {
+    jcenter()
+}
+
+
+if(hasProperty('target') && target == 'android') {
+
+    apply plugin: 'com.android.library'
+    apply plugin: 'com.github.dcendents.android-maven'
+
+    android {
+        compileSdkVersion 25
+        buildToolsVersion '25.0.2'
+        defaultConfig {
+            minSdkVersion 14
+            targetSdkVersion 25
+        }
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
+        }
+
+        // Rename the aar correctly
+        libraryVariants.all { variant ->
+            variant.outputs.each { output ->
+                def outputFile = output.outputFile
+                if (outputFile != null && outputFile.name.endsWith('.aar')) {
+                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
+                    output.outputFile = new File(outputFile.parent, fileName)
+                }
+            }
+        }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
+    }
+
+    afterEvaluate {
+        android.libraryVariants.all { variant ->
+            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
+            task.description = "Create jar artifact for ${variant.name}"
+            task.dependsOn variant.javaCompile
+            task.from variant.javaCompile.destinationDir
+            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
+            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
+            artifacts.add('archives', task);
+        }
+    }
+
+    task sourcesJar(type: Jar) {
+        from android.sourceSets.main.java.srcDirs
+        classifier = 'sources'
+    }
+
+    artifacts {
+        archives sourcesJar
+    }
+
+} else {
+
+    apply plugin: 'java'
+    apply plugin: 'maven'
+
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+
+    install {
+        repositories.mavenInstaller {
+            pom.artifactId = 'petstore-retrofit2-rx3'
+        }
+    }
+
+    task execute(type:JavaExec) {
+       main = System.getProperty('mainClass')
+       classpath = sourceSets.main.runtimeClasspath
+    }
+}
+
+ext {
+    oltu_version = "1.0.1"
+    retrofit_version = "2.3.0"
+    swagger_annotations_version = "1.5.22"
+    junit_version = "4.13"
+    rx_java_version = "3.0.4"
+    threetenbp_version = "1.4.0"
+    json_fire_version = "1.8.0"
+}
+
+dependencies {
+    compile "com.squareup.retrofit2:retrofit:$retrofit_version"
+    compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
+    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
+    compile 'com.github.akarnokd:rxjava3-retrofit-adapter:3.0.0'
+    compile "io.reactivex.rxjava3:rxjava:$rx_java_version"
+    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
+    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
+        exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
+    }
+    compile "io.gsonfire:gson-fire:$json_fire_version"
+    compile "org.threeten:threetenbp:$threetenbp_version"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
+    testCompile "junit:junit:$junit_version"
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/build.sbt b/samples/client/petstore/java/retrofit2rx3/build.sbt
new file mode 100644
index 000000000000..2b9fe8032687
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/build.sbt
@@ -0,0 +1,25 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "org.openapitools",
+    name := "petstore-retrofit2-rx3",
+    version := "1.0.0",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
+      "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
+      "com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile",
+      "com.github.akarnokd" % "rxjava3-retrofit-adapter" % "3.0.0" % "compile",
+      "io.reactivex.rxjava3" % "rxjava" % "3.0.4" % "compile",
+      "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
+      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "org.threeten" % "threetenbp" % "1.4.0" % "compile",
+      "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
+      "junit" % "junit" % "4.13" % "test",
+      "com.novocode" % "junit-interface" % "0.11" % "test"
+    )
+  )
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesAnyType.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesAnyType.md
rename to samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesAnyType.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesArray.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesArray.md
rename to samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesArray.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesBoolean.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesBoolean.md
rename to samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesBoolean.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesClass.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesClass.md
rename to samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesClass.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesInteger.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesInteger.md
rename to samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesInteger.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesNumber.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesNumber.md
rename to samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesNumber.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesObject.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesObject.md
rename to samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesObject.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesString.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesString.md
rename to samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesString.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/Animal.md b/samples/client/petstore/java/retrofit2rx3/docs/Animal.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/Animal.md
rename to samples/client/petstore/java/retrofit2rx3/docs/Animal.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/AnotherFakeApi.md b/samples/client/petstore/java/retrofit2rx3/docs/AnotherFakeApi.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/AnotherFakeApi.md
rename to samples/client/petstore/java/retrofit2rx3/docs/AnotherFakeApi.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2rx3/docs/ArrayOfArrayOfNumberOnly.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/ArrayOfArrayOfNumberOnly.md
rename to samples/client/petstore/java/retrofit2rx3/docs/ArrayOfArrayOfNumberOnly.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2rx3/docs/ArrayOfNumberOnly.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/ArrayOfNumberOnly.md
rename to samples/client/petstore/java/retrofit2rx3/docs/ArrayOfNumberOnly.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/ArrayTest.md b/samples/client/petstore/java/retrofit2rx3/docs/ArrayTest.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/ArrayTest.md
rename to samples/client/petstore/java/retrofit2rx3/docs/ArrayTest.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/BigCat.md b/samples/client/petstore/java/retrofit2rx3/docs/BigCat.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/BigCat.md
rename to samples/client/petstore/java/retrofit2rx3/docs/BigCat.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/BigCatAllOf.md b/samples/client/petstore/java/retrofit2rx3/docs/BigCatAllOf.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/BigCatAllOf.md
rename to samples/client/petstore/java/retrofit2rx3/docs/BigCatAllOf.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/Capitalization.md b/samples/client/petstore/java/retrofit2rx3/docs/Capitalization.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/Capitalization.md
rename to samples/client/petstore/java/retrofit2rx3/docs/Capitalization.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/Cat.md b/samples/client/petstore/java/retrofit2rx3/docs/Cat.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/Cat.md
rename to samples/client/petstore/java/retrofit2rx3/docs/Cat.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/CatAllOf.md b/samples/client/petstore/java/retrofit2rx3/docs/CatAllOf.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/CatAllOf.md
rename to samples/client/petstore/java/retrofit2rx3/docs/CatAllOf.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/Category.md b/samples/client/petstore/java/retrofit2rx3/docs/Category.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/Category.md
rename to samples/client/petstore/java/retrofit2rx3/docs/Category.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/ClassModel.md b/samples/client/petstore/java/retrofit2rx3/docs/ClassModel.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/ClassModel.md
rename to samples/client/petstore/java/retrofit2rx3/docs/ClassModel.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/Client.md b/samples/client/petstore/java/retrofit2rx3/docs/Client.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/Client.md
rename to samples/client/petstore/java/retrofit2rx3/docs/Client.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/Dog.md b/samples/client/petstore/java/retrofit2rx3/docs/Dog.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/Dog.md
rename to samples/client/petstore/java/retrofit2rx3/docs/Dog.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/DogAllOf.md b/samples/client/petstore/java/retrofit2rx3/docs/DogAllOf.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/DogAllOf.md
rename to samples/client/petstore/java/retrofit2rx3/docs/DogAllOf.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/EnumArrays.md b/samples/client/petstore/java/retrofit2rx3/docs/EnumArrays.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/EnumArrays.md
rename to samples/client/petstore/java/retrofit2rx3/docs/EnumArrays.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/EnumClass.md b/samples/client/petstore/java/retrofit2rx3/docs/EnumClass.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/EnumClass.md
rename to samples/client/petstore/java/retrofit2rx3/docs/EnumClass.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/EnumTest.md b/samples/client/petstore/java/retrofit2rx3/docs/EnumTest.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/EnumTest.md
rename to samples/client/petstore/java/retrofit2rx3/docs/EnumTest.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/FakeApi.md
rename to samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/retrofit2rx3/docs/FakeClassnameTags123Api.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/FakeClassnameTags123Api.md
rename to samples/client/petstore/java/retrofit2rx3/docs/FakeClassnameTags123Api.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/FileSchemaTestClass.md b/samples/client/petstore/java/retrofit2rx3/docs/FileSchemaTestClass.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/FileSchemaTestClass.md
rename to samples/client/petstore/java/retrofit2rx3/docs/FileSchemaTestClass.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/FormatTest.md b/samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/FormatTest.md
rename to samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/retrofit2rx3/docs/HasOnlyReadOnly.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/HasOnlyReadOnly.md
rename to samples/client/petstore/java/retrofit2rx3/docs/HasOnlyReadOnly.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/MapTest.md b/samples/client/petstore/java/retrofit2rx3/docs/MapTest.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/MapTest.md
rename to samples/client/petstore/java/retrofit2rx3/docs/MapTest.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/MixedPropertiesAndAdditionalPropertiesClass.md
rename to samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/Model200Response.md b/samples/client/petstore/java/retrofit2rx3/docs/Model200Response.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/Model200Response.md
rename to samples/client/petstore/java/retrofit2rx3/docs/Model200Response.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/ModelApiResponse.md b/samples/client/petstore/java/retrofit2rx3/docs/ModelApiResponse.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/ModelApiResponse.md
rename to samples/client/petstore/java/retrofit2rx3/docs/ModelApiResponse.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/ModelReturn.md b/samples/client/petstore/java/retrofit2rx3/docs/ModelReturn.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/ModelReturn.md
rename to samples/client/petstore/java/retrofit2rx3/docs/ModelReturn.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/Name.md b/samples/client/petstore/java/retrofit2rx3/docs/Name.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/Name.md
rename to samples/client/petstore/java/retrofit2rx3/docs/Name.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/NumberOnly.md b/samples/client/petstore/java/retrofit2rx3/docs/NumberOnly.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/NumberOnly.md
rename to samples/client/petstore/java/retrofit2rx3/docs/NumberOnly.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/Order.md b/samples/client/petstore/java/retrofit2rx3/docs/Order.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/Order.md
rename to samples/client/petstore/java/retrofit2rx3/docs/Order.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/OuterComposite.md b/samples/client/petstore/java/retrofit2rx3/docs/OuterComposite.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/OuterComposite.md
rename to samples/client/petstore/java/retrofit2rx3/docs/OuterComposite.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/OuterEnum.md b/samples/client/petstore/java/retrofit2rx3/docs/OuterEnum.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/OuterEnum.md
rename to samples/client/petstore/java/retrofit2rx3/docs/OuterEnum.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/Pet.md b/samples/client/petstore/java/retrofit2rx3/docs/Pet.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/Pet.md
rename to samples/client/petstore/java/retrofit2rx3/docs/Pet.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/PetApi.md b/samples/client/petstore/java/retrofit2rx3/docs/PetApi.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/PetApi.md
rename to samples/client/petstore/java/retrofit2rx3/docs/PetApi.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/ReadOnlyFirst.md b/samples/client/petstore/java/retrofit2rx3/docs/ReadOnlyFirst.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/ReadOnlyFirst.md
rename to samples/client/petstore/java/retrofit2rx3/docs/ReadOnlyFirst.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/SpecialModelName.md b/samples/client/petstore/java/retrofit2rx3/docs/SpecialModelName.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/SpecialModelName.md
rename to samples/client/petstore/java/retrofit2rx3/docs/SpecialModelName.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/StoreApi.md b/samples/client/petstore/java/retrofit2rx3/docs/StoreApi.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/StoreApi.md
rename to samples/client/petstore/java/retrofit2rx3/docs/StoreApi.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/Tag.md b/samples/client/petstore/java/retrofit2rx3/docs/Tag.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/Tag.md
rename to samples/client/petstore/java/retrofit2rx3/docs/Tag.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/TypeHolderDefault.md b/samples/client/petstore/java/retrofit2rx3/docs/TypeHolderDefault.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/TypeHolderDefault.md
rename to samples/client/petstore/java/retrofit2rx3/docs/TypeHolderDefault.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/TypeHolderExample.md b/samples/client/petstore/java/retrofit2rx3/docs/TypeHolderExample.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/TypeHolderExample.md
rename to samples/client/petstore/java/retrofit2rx3/docs/TypeHolderExample.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/User.md b/samples/client/petstore/java/retrofit2rx3/docs/User.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/User.md
rename to samples/client/petstore/java/retrofit2rx3/docs/User.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/UserApi.md b/samples/client/petstore/java/retrofit2rx3/docs/UserApi.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/UserApi.md
rename to samples/client/petstore/java/retrofit2rx3/docs/UserApi.md
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/XmlItem.md b/samples/client/petstore/java/retrofit2rx3/docs/XmlItem.md
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/docs/XmlItem.md
rename to samples/client/petstore/java/retrofit2rx3/docs/XmlItem.md
diff --git a/samples/client/petstore/java/retrofit2-play25/git_push.sh b/samples/client/petstore/java/retrofit2rx3/git_push.sh
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/git_push.sh
rename to samples/client/petstore/java/retrofit2rx3/git_push.sh
diff --git a/samples/client/petstore/java/retrofit2-play25/gradle.properties b/samples/client/petstore/java/retrofit2rx3/gradle.properties
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/gradle.properties
rename to samples/client/petstore/java/retrofit2rx3/gradle.properties
diff --git a/samples/client/petstore/java/retrofit2-play25/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java/retrofit2rx3/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/gradle/wrapper/gradle-wrapper.jar
rename to samples/client/petstore/java/retrofit2rx3/gradle/wrapper/gradle-wrapper.jar
diff --git a/samples/client/petstore/java/retrofit2-play25/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/retrofit2rx3/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/gradle/wrapper/gradle-wrapper.properties
rename to samples/client/petstore/java/retrofit2rx3/gradle/wrapper/gradle-wrapper.properties
diff --git a/samples/client/petstore/java/retrofit2-play25/gradlew b/samples/client/petstore/java/retrofit2rx3/gradlew
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/gradlew
rename to samples/client/petstore/java/retrofit2rx3/gradlew
diff --git a/samples/client/petstore/java/retrofit2-play25/gradlew.bat b/samples/client/petstore/java/retrofit2rx3/gradlew.bat
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/gradlew.bat
rename to samples/client/petstore/java/retrofit2rx3/gradlew.bat
diff --git a/samples/client/petstore/java/retrofit2rx3/pom.xml b/samples/client/petstore/java/retrofit2rx3/pom.xml
new file mode 100644
index 000000000000..dba175283646
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/pom.xml
@@ -0,0 +1,287 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>petstore-retrofit2-rx3</artifactId>
+    <packaging>jar</packaging>
+    <name>petstore-retrofit2-rx3</name>
+    <version>1.0.0</version>
+    <url>https://github.com/openapitools/openapi-generator</url>
+    <description>OpenAPI Java</description>
+    <scm>
+        <connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
+        <developerConnection>scm:git:git@github.com:openapitools/openapi-generator.git</developerConnection>
+        <url>https://github.com/openapitools/openapi-generator</url>
+    </scm>
+
+    <licenses>
+        <license>
+            <name>Unlicense</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>OpenAPI-Generator Contributors</name>
+            <email>team@openapitools.org</email>
+            <organization>OpenAPITools.org</organization>
+            <organizationUrl>http://openapitools.org</organizationUrl>
+        </developer>
+    </developers>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.12</version>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>loggerPath</name>
+                            <value>conf/log4j.properties</value>
+                        </property>
+                    </systemProperties>
+                    <argLine>-Xms512m -Xmx1500m</argLine>
+                    <parallel>methods</parallel>
+                    <forkMode>pertest</forkMode>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- attach test jar -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.10</version>
+                <executions>
+                    <execution>
+                        <id>add_sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add_test_sources</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.1.1</version>
+                <configuration>
+                    <doclint>none</doclint>
+                        <source>1.7</source>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>sign-artifacts</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.5</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations-version}</version>
+        </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>converter-gson</artifactId>
+            <version>${retrofit-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>retrofit</artifactId>
+            <version>${retrofit-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>converter-scalars</artifactId>
+            <version>${retrofit-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.oltu.oauth2</groupId>
+            <artifactId>org.apache.oltu.oauth2.client</artifactId>
+            <version>${oltu-version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.oltu.oauth2</groupId>
+                    <artifactId>common</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.gsonfire</groupId>
+            <artifactId>gson-fire</artifactId>
+            <version>${gson-fire-version}</version>
+        </dependency>
+            <dependency>
+                <groupId>org.threeten</groupId>
+                <artifactId>threetenbp</artifactId>
+                <version>${threetenbp-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.reactivex.rxjava3</groupId>
+                <artifactId>rxjava</artifactId>
+                <version>${rxjava-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.akarnokd</groupId>
+                <artifactId>rxjava3-retrofit-adapter</artifactId>
+                <version>3.0.0</version>
+            </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.7</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <gson-fire-version>1.8.3</gson-fire-version>
+        <swagger-annotations-version>1.5.22</swagger-annotations-version>
+        <retrofit-version>2.5.0</retrofit-version>
+            <rxjava-version>3.0.4</rxjava-version>
+        <threetenbp-version>1.4.0</threetenbp-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
+        <oltu-version>1.0.1</oltu-version>
+        <junit-version>4.13</junit-version>
+    </properties>
+</project>
diff --git a/samples/client/petstore/java/retrofit2rx3/settings.gradle b/samples/client/petstore/java/retrofit2rx3/settings.gradle
new file mode 100644
index 000000000000..af31b59b7c44
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "petstore-retrofit2-rx3"
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/AndroidManifest.xml b/samples/client/petstore/java/retrofit2rx3/src/main/AndroidManifest.xml
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/src/main/AndroidManifest.xml
rename to samples/client/petstore/java/retrofit2rx3/src/main/AndroidManifest.xml
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/ApiClient.java
new file mode 100644
index 000000000000..ac2e175ad11f
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/ApiClient.java
@@ -0,0 +1,415 @@
+package org.openapitools.client;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonElement;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+import org.threeten.bp.format.DateTimeFormatter;
+import retrofit2.Converter;
+import retrofit2.Retrofit;
+import hu.akarnokd.rxjava3.retrofit.RxJava3CallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.converter.scalars.ScalarsConverterFactory;
+import org.openapitools.client.auth.HttpBasicAuth;
+import org.openapitools.client.auth.HttpBearerAuth;
+import org.openapitools.client.auth.ApiKeyAuth;
+import org.openapitools.client.auth.OAuth;
+import org.openapitools.client.auth.OAuth.AccessTokenListener;
+import org.openapitools.client.auth.OAuthFlow;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.text.DateFormat;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.HashMap;
+
+public class ApiClient {
+
+  private Map<String, Interceptor> apiAuthorizations;
+  private OkHttpClient.Builder okBuilder;
+  private Retrofit.Builder adapterBuilder;
+  private JSON json;
+  private OkHttpClient okHttpClient;
+
+  public ApiClient() {
+    apiAuthorizations = new LinkedHashMap<String, Interceptor>();
+    createDefaultAdapter();
+    okBuilder = new OkHttpClient.Builder();
+  }
+
+  public ApiClient(OkHttpClient client){
+    apiAuthorizations = new LinkedHashMap<String, Interceptor>();
+    createDefaultAdapter();
+    okHttpClient = client;
+  }
+
+  public ApiClient(String[] authNames) {
+    this();
+    for(String authName : authNames) {
+      Interceptor auth;
+      if ("api_key".equals(authName)) {
+        
+        auth = new ApiKeyAuth("header", "api_key");
+      } else if ("api_key_query".equals(authName)) {
+        
+        auth = new ApiKeyAuth("query", "api_key_query");
+      } else if ("http_basic_test".equals(authName)) {
+        
+        auth = new HttpBasicAuth();
+        
+      } else if ("petstore_auth".equals(authName)) {
+        
+        auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
+      } else {
+        throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
+      }
+
+      addAuthorization(authName, auth);
+    }
+  }
+
+  /**
+   * Basic constructor for single auth name
+   * @param authName Authentication name
+   */
+  public ApiClient(String authName) {
+    this(new String[]{authName});
+  }
+
+  /**
+   * Helper constructor for single api key
+   * @param authName Authentication name
+   * @param apiKey API key
+   */
+  public ApiClient(String authName, String apiKey) {
+    this(authName);
+    this.setApiKey(apiKey);
+  }
+
+  /**
+   * Helper constructor for single basic auth or password oauth2
+   * @param authName Authentication name
+   * @param username Username
+   * @param password Password
+   */
+  public ApiClient(String authName, String username, String password) {
+    this(authName);
+    this.setCredentials(username,  password);
+  }
+
+  /**
+   * Helper constructor for single password oauth2
+   * @param authName Authentication name
+   * @param clientId Client ID
+   * @param secret Client Secret
+   * @param username Username
+   * @param password Password
+   */
+  public ApiClient(String authName, String clientId, String secret, String username, String password) {
+    this(authName);
+    this.getTokenEndPoint()
+      .setClientId(clientId)
+      .setClientSecret(secret)
+      .setUsername(username)
+      .setPassword(password);
+  }
+
+  public void createDefaultAdapter() {
+    json = new JSON();
+
+    String baseUrl = "http://petstore.swagger.io:80/v2";
+    if (!baseUrl.endsWith("/"))
+      baseUrl = baseUrl + "/";
+
+    adapterBuilder = new Retrofit
+      .Builder()
+      .baseUrl(baseUrl)
+      .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
+      .addConverterFactory(ScalarsConverterFactory.create())
+      .addConverterFactory(GsonCustomConverterFactory.create(json.getGson()));
+  }
+
+  public <S> S createService(Class<S> serviceClass) {
+    if (okHttpClient != null) {
+        return adapterBuilder.client(okHttpClient).build().create(serviceClass);
+    } else {
+        return adapterBuilder.client(okBuilder.build()).build().create(serviceClass);
+    }
+  }
+
+  public ApiClient setDateFormat(DateFormat dateFormat) {
+    this.json.setDateFormat(dateFormat);
+    return this;
+  }
+
+  public ApiClient setSqlDateFormat(DateFormat dateFormat) {
+    this.json.setSqlDateFormat(dateFormat);
+    return this;
+  }
+
+  public ApiClient setOffsetDateTimeFormat(DateTimeFormatter dateFormat) {
+    this.json.setOffsetDateTimeFormat(dateFormat);
+    return this;
+  }
+
+  public ApiClient setLocalDateFormat(DateTimeFormatter dateFormat) {
+    this.json.setLocalDateFormat(dateFormat);
+    return this;
+  }
+
+
+  /**
+   * Helper method to configure the first api key found
+   * @param apiKey API key
+   * @return ApiClient
+   */
+  public ApiClient setApiKey(String apiKey) {
+    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof ApiKeyAuth) {
+        ApiKeyAuth keyAuth = (ApiKeyAuth) apiAuthorization;
+        keyAuth.setApiKey(apiKey);
+        return this;
+      }
+    }
+    return this;
+  }
+
+  /**
+   * Helper method to set token for the first Http Bearer authentication found.
+   * @param bearerToken Bearer token
+   * @return ApiClient
+   */
+  public ApiClient setBearerToken(String bearerToken) {
+    for (Interceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof HttpBearerAuth) {
+        ((HttpBearerAuth) apiAuthorization).setBearerToken(bearerToken);
+        return this;
+      }
+    }
+    return this;
+  }
+
+  /**
+   * Helper method to configure the username/password for basic auth or password oauth
+   * @param username Username
+   * @param password Password
+   * @return ApiClient
+   */
+  public ApiClient setCredentials(String username, String password) {
+    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof HttpBasicAuth) {
+        HttpBasicAuth basicAuth = (HttpBasicAuth) apiAuthorization;
+        basicAuth.setCredentials(username, password);
+        return this;
+      }
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.getTokenRequestBuilder().setUsername(username).setPassword(password);
+        return this;
+      }
+    }
+    return this;
+  }
+
+  /**
+   * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+   * @return Token request builder
+   */
+  public TokenRequestBuilder getTokenEndPoint() {
+    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        return oauth.getTokenRequestBuilder();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+   * @return Authentication request builder
+   */
+  public AuthenticationRequestBuilder getAuthorizationEndPoint() {
+    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        return oauth.getAuthenticationRequestBuilder();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
+   * @param accessToken Access token
+   * @return ApiClient
+   */
+  public ApiClient setAccessToken(String accessToken) {
+    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.setAccessToken(accessToken);
+        return this;
+      }
+    }
+    return this;
+  }
+
+  /**
+   * Helper method to configure the oauth accessCode/implicit flow parameters
+   * @param clientId Client ID
+   * @param clientSecret Client secret
+   * @param redirectURI Redirect URI
+   * @return ApiClient
+   */
+  public ApiClient configureAuthorizationFlow(String clientId, String clientSecret, String redirectURI) {
+    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.getTokenRequestBuilder()
+          .setClientId(clientId)
+          .setClientSecret(clientSecret)
+          .setRedirectURI(redirectURI);
+        oauth.getAuthenticationRequestBuilder()
+          .setClientId(clientId)
+          .setRedirectURI(redirectURI);
+        return this;
+      }
+    }
+    return this;
+  }
+
+  /**
+   * Configures a listener which is notified when a new access token is received.
+   * @param accessTokenListener Access token listener
+   * @return ApiClient
+   */
+  public ApiClient registerAccessTokenListener(AccessTokenListener accessTokenListener) {
+    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+      if (apiAuthorization instanceof OAuth) {
+        OAuth oauth = (OAuth) apiAuthorization;
+        oauth.registerAccessTokenListener(accessTokenListener);
+        return this;
+      }
+    }
+    return this;
+  }
+
+  /**
+   * Adds an authorization to be used by the client
+   * @param authName Authentication name
+   * @param authorization Authorization interceptor
+   * @return ApiClient
+   */
+  public ApiClient addAuthorization(String authName, Interceptor authorization) {
+    if (apiAuthorizations.containsKey(authName)) {
+      throw new RuntimeException("auth name \"" + authName + "\" already in api authorizations");
+    }
+    apiAuthorizations.put(authName, authorization);
+    if(okBuilder == null){
+    	throw new RuntimeException("The ApiClient was created with a built OkHttpClient so it's not possible to add an authorization interceptor to it");
+    }
+    okBuilder.addInterceptor(authorization);
+    
+    return this;
+  }
+
+  public Map<String, Interceptor> getApiAuthorizations() {
+    return apiAuthorizations;
+  }
+
+  public ApiClient setApiAuthorizations(Map<String, Interceptor> apiAuthorizations) {
+    this.apiAuthorizations = apiAuthorizations;
+    return this;
+  }
+
+  public Retrofit.Builder getAdapterBuilder() {
+    return adapterBuilder;
+  }
+
+  public ApiClient setAdapterBuilder(Retrofit.Builder adapterBuilder) {
+    this.adapterBuilder = adapterBuilder;
+    return this;
+  }
+
+  public OkHttpClient.Builder getOkBuilder() {
+    return okBuilder;
+  }
+
+  public void addAuthsToOkBuilder(OkHttpClient.Builder okBuilder) {
+    for(Interceptor apiAuthorization : apiAuthorizations.values()) {
+      okBuilder.addInterceptor(apiAuthorization);
+    }
+  }
+
+  /**
+   * Clones the okBuilder given in parameter, adds the auth interceptors and uses it to configure the Retrofit
+   * @param okClient An instance of OK HTTP client
+   */
+  public void configureFromOkclient(OkHttpClient okClient) {
+    this.okBuilder = okClient.newBuilder();
+    addAuthsToOkBuilder(this.okBuilder);
+  }
+}
+
+/**
+ * This wrapper is to take care of this case:
+ * when the deserialization fails due to JsonParseException and the
+ * expected type is String, then just return the body string.
+ */
+class GsonResponseBodyConverterToString<T> implements Converter<ResponseBody, T> {
+  private final Gson gson;
+  private final Type type;
+
+  GsonResponseBodyConverterToString(Gson gson, Type type) {
+    this.gson = gson;
+    this.type = type;
+  }
+
+  @Override public T convert(ResponseBody value) throws IOException {
+    String returned = value.string();
+    try {
+      return gson.fromJson(returned, type);
+    }
+    catch (JsonParseException e) {
+      return (T) returned;
+    }
+  }
+}
+
+class GsonCustomConverterFactory extends Converter.Factory
+{
+  private final Gson gson;
+  private final GsonConverterFactory gsonConverterFactory;
+
+  public static GsonCustomConverterFactory create(Gson gson) {
+    return new GsonCustomConverterFactory(gson);
+  }
+
+  private GsonCustomConverterFactory(Gson gson) {
+    if (gson == null)
+      throw new NullPointerException("gson == null");
+    this.gson = gson;
+    this.gsonConverterFactory = GsonConverterFactory.create(gson);
+  }
+
+  @Override
+  public Converter<ResponseBody, ?> responseBodyConverter(Type type, Annotation[] annotations, Retrofit retrofit) {
+    if (type.equals(String.class))
+      return new GsonResponseBodyConverterToString<Object>(gson, type);
+    else
+      return gsonConverterFactory.responseBodyConverter(type, annotations, retrofit);
+  }
+
+  @Override
+  public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) {
+    return gsonConverterFactory.requestBodyConverter(type, parameterAnnotations, methodAnnotations, retrofit);
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/CollectionFormats.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/CollectionFormats.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/CollectionFormats.java
rename to samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/CollectionFormats.java
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/JSON.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/JSON.java
rename to samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/JSON.java
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/ServerConfiguration.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/ServerConfiguration.java
rename to samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/ServerConfiguration.java
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/ServerVariable.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/ServerVariable.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/ServerVariable.java
rename to samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/ServerVariable.java
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/StringUtil.java
new file mode 100644
index 000000000000..4dc60597910a
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/StringUtil.java
@@ -0,0 +1,83 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class StringUtil {
+  /**
+   * Check if the given array contains the given value (with case-insensitive comparison).
+   *
+   * @param array The array
+   * @param value The value to search
+   * @return true if the array contains the value
+   */
+  public static boolean containsIgnoreCase(String[] array, String value) {
+    for (String str : array) {
+      if (value == null && str == null) {
+        return true;
+      }
+      if (value != null && value.equalsIgnoreCase(str)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Join an array of strings with the given separator.
+   * <p>
+   * Note: This might be replaced by utility method from commons-lang or guava someday
+   * if one of those libraries is added as dependency.
+   * </p>
+   *
+   * @param array     The array of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(String[] array, String separator) {
+    int len = array.length;
+    if (len == 0) {
+      return "";
+    }
+
+    StringBuilder out = new StringBuilder();
+    out.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      out.append(separator).append(array[i]);
+    }
+    return out.toString();
+  }
+
+  /**
+   * Join a list of strings with the given separator.
+   *
+   * @param list      The list of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(Collection<String> list, String separator) {
+    Iterator<String> iterator = list.iterator();
+    StringBuilder out = new StringBuilder();
+    if (iterator.hasNext()) {
+      out.append(iterator.next());
+    }
+    while (iterator.hasNext()) {
+      out.append(separator).append(iterator.next());
+    }
+    return out.toString();
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
new file mode 100644
index 000000000000..3fb4359eb983
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -0,0 +1,35 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.CollectionFormats.*;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Completable;
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
+
+import org.openapitools.client.model.Client;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public interface AnotherFakeApi {
+  /**
+   * To test special tags
+   * To test special tags and operation ID starting with number
+   * @param body client model (required)
+   * @return Observable&lt;Client&gt;
+   */
+  @Headers({
+    "Content-Type:application/json"
+  })
+  @PATCH("another-fake/dummy")
+  Observable<Client> call123testSpecialTags(
+    @retrofit2.http.Body Client body
+  );
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java
new file mode 100644
index 000000000000..983a776a3646
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -0,0 +1,232 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.CollectionFormats.*;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Completable;
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
+
+import java.math.BigDecimal;
+import org.openapitools.client.model.Client;
+import java.io.File;
+import org.openapitools.client.model.FileSchemaTestClass;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+import org.openapitools.client.model.OuterComposite;
+import org.openapitools.client.model.User;
+import org.openapitools.client.model.XmlItem;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public interface FakeApi {
+  /**
+   * creates an XmlItem
+   * this route creates an XmlItem
+   * @param xmlItem XmlItem Body (required)
+   * @return Completable
+   */
+  @Headers({
+    "Content-Type:application/xml"
+  })
+  @POST("fake/create_xml_item")
+  Completable createXmlItem(
+    @retrofit2.http.Body XmlItem xmlItem
+  );
+
+  /**
+   * 
+   * Test serialization of outer boolean types
+   * @param body Input boolean as post body (optional)
+   * @return Observable&lt;Boolean&gt;
+   */
+  @POST("fake/outer/boolean")
+  Observable<Boolean> fakeOuterBooleanSerialize(
+    @retrofit2.http.Body Boolean body
+  );
+
+  /**
+   * 
+   * Test serialization of object with outer number type
+   * @param body Input composite as post body (optional)
+   * @return Observable&lt;OuterComposite&gt;
+   */
+  @POST("fake/outer/composite")
+  Observable<OuterComposite> fakeOuterCompositeSerialize(
+    @retrofit2.http.Body OuterComposite body
+  );
+
+  /**
+   * 
+   * Test serialization of outer number types
+   * @param body Input number as post body (optional)
+   * @return Observable&lt;BigDecimal&gt;
+   */
+  @POST("fake/outer/number")
+  Observable<BigDecimal> fakeOuterNumberSerialize(
+    @retrofit2.http.Body BigDecimal body
+  );
+
+  /**
+   * 
+   * Test serialization of outer string types
+   * @param body Input string as post body (optional)
+   * @return Observable&lt;String&gt;
+   */
+  @POST("fake/outer/string")
+  Observable<String> fakeOuterStringSerialize(
+    @retrofit2.http.Body String body
+  );
+
+  /**
+   * 
+   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+   * @param body  (required)
+   * @return Completable
+   */
+  @Headers({
+    "Content-Type:application/json"
+  })
+  @PUT("fake/body-with-file-schema")
+  Completable testBodyWithFileSchema(
+    @retrofit2.http.Body FileSchemaTestClass body
+  );
+
+  /**
+   * 
+   * 
+   * @param query  (required)
+   * @param body  (required)
+   * @return Completable
+   */
+  @Headers({
+    "Content-Type:application/json"
+  })
+  @PUT("fake/body-with-query-params")
+  Completable testBodyWithQueryParams(
+    @retrofit2.http.Query("query") String query, @retrofit2.http.Body User body
+  );
+
+  /**
+   * To test \&quot;client\&quot; model
+   * To test \&quot;client\&quot; model
+   * @param body client model (required)
+   * @return Observable&lt;Client&gt;
+   */
+  @Headers({
+    "Content-Type:application/json"
+  })
+  @PATCH("fake")
+  Observable<Client> testClientModel(
+    @retrofit2.http.Body Client body
+  );
+
+  /**
+   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+   * @param number None (required)
+   * @param _double None (required)
+   * @param patternWithoutDelimiter None (required)
+   * @param _byte None (required)
+   * @param integer None (optional)
+   * @param int32 None (optional)
+   * @param int64 None (optional)
+   * @param _float None (optional)
+   * @param string None (optional)
+   * @param binary None (optional)
+   * @param date None (optional)
+   * @param dateTime None (optional)
+   * @param password None (optional)
+   * @param paramCallback None (optional)
+   * @return Completable
+   */
+  @retrofit2.http.FormUrlEncoded
+  @POST("fake")
+  Completable testEndpointParameters(
+    @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") OffsetDateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback
+  );
+
+  /**
+   * To test enum parameters
+   * To test enum parameters
+   * @param enumHeaderStringArray Header parameter enum test (string array) (optional, default to new ArrayList&lt;String&gt;())
+   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
+   * @param enumQueryStringArray Query parameter enum test (string array) (optional, default to new ArrayList&lt;String&gt;())
+   * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
+   * @param enumQueryInteger Query parameter enum test (double) (optional)
+   * @param enumQueryDouble Query parameter enum test (double) (optional)
+   * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
+   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @return Completable
+   */
+  @retrofit2.http.FormUrlEncoded
+  @GET("fake")
+  Completable testEnumParameters(
+    @retrofit2.http.Header("enum_header_string_array") List<String> enumHeaderStringArray, @retrofit2.http.Header("enum_header_string") String enumHeaderString, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit2.http.Query("enum_query_string") String enumQueryString, @retrofit2.http.Query("enum_query_integer") Integer enumQueryInteger, @retrofit2.http.Query("enum_query_double") Double enumQueryDouble, @retrofit2.http.Field("enum_form_string_array") List<String> enumFormStringArray, @retrofit2.http.Field("enum_form_string") String enumFormString
+  );
+
+  /**
+   * Fake endpoint to test group parameters (optional)
+   * Fake endpoint to test group parameters (optional)
+   * @param requiredStringGroup Required String in group parameters (required)
+   * @param requiredBooleanGroup Required Boolean in group parameters (required)
+   * @param requiredInt64Group Required Integer in group parameters (required)
+   * @param stringGroup String in group parameters (optional)
+   * @param booleanGroup Boolean in group parameters (optional)
+   * @param int64Group Integer in group parameters (optional)
+   * @return Completable
+   */
+  @DELETE("fake")
+  Completable testGroupParameters(
+    @retrofit2.http.Query("required_string_group") Integer requiredStringGroup, @retrofit2.http.Header("required_boolean_group") Boolean requiredBooleanGroup, @retrofit2.http.Query("required_int64_group") Long requiredInt64Group, @retrofit2.http.Query("string_group") Integer stringGroup, @retrofit2.http.Header("boolean_group") Boolean booleanGroup, @retrofit2.http.Query("int64_group") Long int64Group
+  );
+
+  /**
+   * test inline additionalProperties
+   * 
+   * @param param request body (required)
+   * @return Completable
+   */
+  @Headers({
+    "Content-Type:application/json"
+  })
+  @POST("fake/inline-additionalProperties")
+  Completable testInlineAdditionalProperties(
+    @retrofit2.http.Body Map<String, String> param
+  );
+
+  /**
+   * test json serialization of form data
+   * 
+   * @param param field1 (required)
+   * @param param2 field2 (required)
+   * @return Completable
+   */
+  @retrofit2.http.FormUrlEncoded
+  @GET("fake/jsonFormData")
+  Completable testJsonFormData(
+    @retrofit2.http.Field("param") String param, @retrofit2.http.Field("param2") String param2
+  );
+
+  /**
+   * 
+   * To test the collection format in query parameters
+   * @param pipe  (required)
+   * @param ioutil  (required)
+   * @param http  (required)
+   * @param url  (required)
+   * @param context  (required)
+   * @return Completable
+   */
+  @PUT("fake/test-query-paramters")
+  Completable testQueryParameterCollectionFormat(
+    @retrofit2.http.Query("pipe") CSVParams pipe, @retrofit2.http.Query("ioutil") CSVParams ioutil, @retrofit2.http.Query("http") SSVParams http, @retrofit2.http.Query("url") CSVParams url, @retrofit2.http.Query("context") List<String> context
+  );
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
new file mode 100644
index 000000000000..9a95837b215a
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -0,0 +1,35 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.CollectionFormats.*;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Completable;
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
+
+import org.openapitools.client.model.Client;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public interface FakeClassnameTags123Api {
+  /**
+   * To test class name in snake case
+   * To test class name in snake case
+   * @param body client model (required)
+   * @return Observable&lt;Client&gt;
+   */
+  @Headers({
+    "Content-Type:application/json"
+  })
+  @PATCH("fake_classname_test")
+  Observable<Client> testClassname(
+    @retrofit2.http.Body Client body
+  );
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java
new file mode 100644
index 000000000000..9c3cdc37f7a2
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java
@@ -0,0 +1,141 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.CollectionFormats.*;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Completable;
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
+
+import java.io.File;
+import org.openapitools.client.model.ModelApiResponse;
+import org.openapitools.client.model.Pet;
+import java.util.Set;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public interface PetApi {
+  /**
+   * Add a new pet to the store
+   * 
+   * @param body Pet object that needs to be added to the store (required)
+   * @return Completable
+   */
+  @Headers({
+    "Content-Type:application/json"
+  })
+  @POST("pet")
+  Completable addPet(
+    @retrofit2.http.Body Pet body
+  );
+
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   * @return Completable
+   */
+  @DELETE("pet/{petId}")
+  Completable deletePet(
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Header("api_key") String apiKey
+  );
+
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for filter (required)
+   * @return Observable&lt;List&lt;Pet&gt;&gt;
+   */
+  @GET("pet/findByStatus")
+  Observable<List<Pet>> findPetsByStatus(
+    @retrofit2.http.Query("status") CSVParams status
+  );
+
+  /**
+   * Finds Pets by tags
+   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by (required)
+   * @return Observable&lt;Set&lt;Pet&gt;&gt;
+   * @deprecated
+   */
+  @Deprecated
+  @GET("pet/findByTags")
+  Observable<Set<Pet>> findPetsByTags(
+    @retrofit2.http.Query("tags") CSVParams tags
+  );
+
+  /**
+   * Find pet by ID
+   * Returns a single pet
+   * @param petId ID of pet to return (required)
+   * @return Observable&lt;Pet&gt;
+   */
+  @GET("pet/{petId}")
+  Observable<Pet> getPetById(
+    @retrofit2.http.Path("petId") Long petId
+  );
+
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (required)
+   * @return Completable
+   */
+  @Headers({
+    "Content-Type:application/json"
+  })
+  @PUT("pet")
+  Completable updatePet(
+    @retrofit2.http.Body Pet body
+  );
+
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
+   * @return Completable
+   */
+  @retrofit2.http.FormUrlEncoded
+  @POST("pet/{petId}")
+  Completable updatePetWithForm(
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Field("name") String name, @retrofit2.http.Field("status") String status
+  );
+
+  /**
+   * uploads an image
+   * 
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
+   * @return Observable&lt;ModelApiResponse&gt;
+   */
+  @retrofit2.http.Multipart
+  @POST("pet/{petId}/uploadImage")
+  Observable<ModelApiResponse> uploadFile(
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
+  );
+
+  /**
+   * uploads an image (required)
+   * 
+   * @param petId ID of pet to update (required)
+   * @param requiredFile file to upload (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @return Observable&lt;ModelApiResponse&gt;
+   */
+  @retrofit2.http.Multipart
+  @POST("fake/{petId}/uploadImageWithRequiredFile")
+  Observable<ModelApiResponse> uploadFileWithRequiredFile(
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
+  );
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/StoreApi.java
new file mode 100644
index 000000000000..99ada34679ba
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -0,0 +1,63 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.CollectionFormats.*;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Completable;
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
+
+import org.openapitools.client.model.Order;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public interface StoreApi {
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted (required)
+   * @return Completable
+   */
+  @DELETE("store/order/{order_id}")
+  Completable deleteOrder(
+    @retrofit2.http.Path("order_id") String orderId
+  );
+
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Observable&lt;Map&lt;String, Integer&gt;&gt;
+   */
+  @GET("store/inventory")
+  Observable<Map<String, Integer>> getInventory();
+    
+
+  /**
+   * Find purchase order by ID
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched (required)
+   * @return Observable&lt;Order&gt;
+   */
+  @GET("store/order/{order_id}")
+  Observable<Order> getOrderById(
+    @retrofit2.http.Path("order_id") Long orderId
+  );
+
+  /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (required)
+   * @return Observable&lt;Order&gt;
+   */
+  @POST("store/order")
+  Observable<Order> placeOrder(
+    @retrofit2.http.Body Order body
+  );
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/UserApi.java
new file mode 100644
index 000000000000..7be5be28df39
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/UserApi.java
@@ -0,0 +1,109 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.CollectionFormats.*;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Completable;
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okhttp3.MultipartBody;
+
+import org.openapitools.client.model.User;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public interface UserApi {
+  /**
+   * Create user
+   * This can only be done by the logged in user.
+   * @param body Created user object (required)
+   * @return Completable
+   */
+  @POST("user")
+  Completable createUser(
+    @retrofit2.http.Body User body
+  );
+
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   * @return Completable
+   */
+  @POST("user/createWithArray")
+  Completable createUsersWithArrayInput(
+    @retrofit2.http.Body List<User> body
+  );
+
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   * @return Completable
+   */
+  @POST("user/createWithList")
+  Completable createUsersWithListInput(
+    @retrofit2.http.Body List<User> body
+  );
+
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   * @return Completable
+   */
+  @DELETE("user/{username}")
+  Completable deleteUser(
+    @retrofit2.http.Path("username") String username
+  );
+
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return Observable&lt;User&gt;
+   */
+  @GET("user/{username}")
+  Observable<User> getUserByName(
+    @retrofit2.http.Path("username") String username
+  );
+
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login (required)
+   * @param password The password for login in clear text (required)
+   * @return Observable&lt;String&gt;
+   */
+  @GET("user/login")
+  Observable<String> loginUser(
+    @retrofit2.http.Query("username") String username, @retrofit2.http.Query("password") String password
+  );
+
+  /**
+   * Logs out current logged in user session
+   * 
+   * @return Completable
+   */
+  @GET("user/logout")
+  Completable logoutUser();
+    
+
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (required)
+   * @return Completable
+   */
+  @PUT("user/{username}")
+  Completable updateUser(
+    @retrofit2.http.Path("username") String username, @retrofit2.http.Body User body
+  );
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
rename to samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
rename to samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
rename to samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/auth/OAuth.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/auth/OAuth.java
rename to samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/auth/OAuth.java
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/auth/OAuthFlow.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/auth/OAuthFlow.java
new file mode 100644
index 000000000000..b2d11ff0c4f0
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/auth/OAuthFlow.java
@@ -0,0 +1,18 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.auth;
+
+public enum OAuthFlow {
+    accessCode, implicit, password, application
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java
rename to samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
new file mode 100644
index 000000000000..43c6885f374f
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -0,0 +1,103 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesAnyType
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
+  private String name;
+
+
+  public AdditionalPropertiesAnyType name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
+    return Objects.equals(this.name, additionalPropertiesAnyType.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesAnyType {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
new file mode 100644
index 000000000000..f71f19e32f5f
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -0,0 +1,104 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesArray
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesArray extends HashMap<String, List> {
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
+  private String name;
+
+
+  public AdditionalPropertiesArray name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
+    return Objects.equals(this.name, additionalPropertiesArray.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesArray {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
new file mode 100644
index 000000000000..d748b6c1c7e9
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -0,0 +1,103 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesBoolean
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
+  private String name;
+
+
+  public AdditionalPropertiesBoolean name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
+    return Objects.equals(this.name, additionalPropertiesBoolean.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesBoolean {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
new file mode 100644
index 000000000000..5dcdb50233e2
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -0,0 +1,457 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesClass
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesClass {
+  public static final String SERIALIZED_NAME_MAP_STRING = "map_string";
+  @SerializedName(SERIALIZED_NAME_MAP_STRING)
+  private Map<String, String> mapString = null;
+
+  public static final String SERIALIZED_NAME_MAP_NUMBER = "map_number";
+  @SerializedName(SERIALIZED_NAME_MAP_NUMBER)
+  private Map<String, BigDecimal> mapNumber = null;
+
+  public static final String SERIALIZED_NAME_MAP_INTEGER = "map_integer";
+  @SerializedName(SERIALIZED_NAME_MAP_INTEGER)
+  private Map<String, Integer> mapInteger = null;
+
+  public static final String SERIALIZED_NAME_MAP_BOOLEAN = "map_boolean";
+  @SerializedName(SERIALIZED_NAME_MAP_BOOLEAN)
+  private Map<String, Boolean> mapBoolean = null;
+
+  public static final String SERIALIZED_NAME_MAP_ARRAY_INTEGER = "map_array_integer";
+  @SerializedName(SERIALIZED_NAME_MAP_ARRAY_INTEGER)
+  private Map<String, List<Integer>> mapArrayInteger = null;
+
+  public static final String SERIALIZED_NAME_MAP_ARRAY_ANYTYPE = "map_array_anytype";
+  @SerializedName(SERIALIZED_NAME_MAP_ARRAY_ANYTYPE)
+  private Map<String, List<Object>> mapArrayAnytype = null;
+
+  public static final String SERIALIZED_NAME_MAP_MAP_STRING = "map_map_string";
+  @SerializedName(SERIALIZED_NAME_MAP_MAP_STRING)
+  private Map<String, Map<String, String>> mapMapString = null;
+
+  public static final String SERIALIZED_NAME_MAP_MAP_ANYTYPE = "map_map_anytype";
+  @SerializedName(SERIALIZED_NAME_MAP_MAP_ANYTYPE)
+  private Map<String, Map<String, Object>> mapMapAnytype = null;
+
+  public static final String SERIALIZED_NAME_ANYTYPE1 = "anytype_1";
+  @SerializedName(SERIALIZED_NAME_ANYTYPE1)
+  private Object anytype1;
+
+  public static final String SERIALIZED_NAME_ANYTYPE2 = "anytype_2";
+  @SerializedName(SERIALIZED_NAME_ANYTYPE2)
+  private Object anytype2;
+
+  public static final String SERIALIZED_NAME_ANYTYPE3 = "anytype_3";
+  @SerializedName(SERIALIZED_NAME_ANYTYPE3)
+  private Object anytype3;
+
+
+  public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
+    
+    this.mapString = mapString;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) {
+    if (this.mapString == null) {
+      this.mapString = new HashMap<String, String>();
+    }
+    this.mapString.put(key, mapStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapString
+   * @return mapString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Map<String, String> getMapString() {
+    return mapString;
+  }
+
+
+  public void setMapString(Map<String, String> mapString) {
+    this.mapString = mapString;
+  }
+
+
+  public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
+    
+    this.mapNumber = mapNumber;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) {
+    if (this.mapNumber == null) {
+      this.mapNumber = new HashMap<String, BigDecimal>();
+    }
+    this.mapNumber.put(key, mapNumberItem);
+    return this;
+  }
+
+   /**
+   * Get mapNumber
+   * @return mapNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Map<String, BigDecimal> getMapNumber() {
+    return mapNumber;
+  }
+
+
+  public void setMapNumber(Map<String, BigDecimal> mapNumber) {
+    this.mapNumber = mapNumber;
+  }
+
+
+  public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
+    
+    this.mapInteger = mapInteger;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) {
+    if (this.mapInteger == null) {
+      this.mapInteger = new HashMap<String, Integer>();
+    }
+    this.mapInteger.put(key, mapIntegerItem);
+    return this;
+  }
+
+   /**
+   * Get mapInteger
+   * @return mapInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Map<String, Integer> getMapInteger() {
+    return mapInteger;
+  }
+
+
+  public void setMapInteger(Map<String, Integer> mapInteger) {
+    this.mapInteger = mapInteger;
+  }
+
+
+  public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
+    
+    this.mapBoolean = mapBoolean;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) {
+    if (this.mapBoolean == null) {
+      this.mapBoolean = new HashMap<String, Boolean>();
+    }
+    this.mapBoolean.put(key, mapBooleanItem);
+    return this;
+  }
+
+   /**
+   * Get mapBoolean
+   * @return mapBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Map<String, Boolean> getMapBoolean() {
+    return mapBoolean;
+  }
+
+
+  public void setMapBoolean(Map<String, Boolean> mapBoolean) {
+    this.mapBoolean = mapBoolean;
+  }
+
+
+  public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
+    
+    this.mapArrayInteger = mapArrayInteger;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer> mapArrayIntegerItem) {
+    if (this.mapArrayInteger == null) {
+      this.mapArrayInteger = new HashMap<String, List<Integer>>();
+    }
+    this.mapArrayInteger.put(key, mapArrayIntegerItem);
+    return this;
+  }
+
+   /**
+   * Get mapArrayInteger
+   * @return mapArrayInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Map<String, List<Integer>> getMapArrayInteger() {
+    return mapArrayInteger;
+  }
+
+
+  public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
+    this.mapArrayInteger = mapArrayInteger;
+  }
+
+
+  public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
+    
+    this.mapArrayAnytype = mapArrayAnytype;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object> mapArrayAnytypeItem) {
+    if (this.mapArrayAnytype == null) {
+      this.mapArrayAnytype = new HashMap<String, List<Object>>();
+    }
+    this.mapArrayAnytype.put(key, mapArrayAnytypeItem);
+    return this;
+  }
+
+   /**
+   * Get mapArrayAnytype
+   * @return mapArrayAnytype
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Map<String, List<Object>> getMapArrayAnytype() {
+    return mapArrayAnytype;
+  }
+
+
+  public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
+    this.mapArrayAnytype = mapArrayAnytype;
+  }
+
+
+  public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> mapMapString) {
+    
+    this.mapMapString = mapMapString;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, String> mapMapStringItem) {
+    if (this.mapMapString == null) {
+      this.mapMapString = new HashMap<String, Map<String, String>>();
+    }
+    this.mapMapString.put(key, mapMapStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapMapString
+   * @return mapMapString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Map<String, Map<String, String>> getMapMapString() {
+    return mapMapString;
+  }
+
+
+  public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
+    this.mapMapString = mapMapString;
+  }
+
+
+  public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
+    
+    this.mapMapAnytype = mapMapAnytype;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Object> mapMapAnytypeItem) {
+    if (this.mapMapAnytype == null) {
+      this.mapMapAnytype = new HashMap<String, Map<String, Object>>();
+    }
+    this.mapMapAnytype.put(key, mapMapAnytypeItem);
+    return this;
+  }
+
+   /**
+   * Get mapMapAnytype
+   * @return mapMapAnytype
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Map<String, Map<String, Object>> getMapMapAnytype() {
+    return mapMapAnytype;
+  }
+
+
+  public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
+    this.mapMapAnytype = mapMapAnytype;
+  }
+
+
+  public AdditionalPropertiesClass anytype1(Object anytype1) {
+    
+    this.anytype1 = anytype1;
+    return this;
+  }
+
+   /**
+   * Get anytype1
+   * @return anytype1
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Object getAnytype1() {
+    return anytype1;
+  }
+
+
+  public void setAnytype1(Object anytype1) {
+    this.anytype1 = anytype1;
+  }
+
+
+  public AdditionalPropertiesClass anytype2(Object anytype2) {
+    
+    this.anytype2 = anytype2;
+    return this;
+  }
+
+   /**
+   * Get anytype2
+   * @return anytype2
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Object getAnytype2() {
+    return anytype2;
+  }
+
+
+  public void setAnytype2(Object anytype2) {
+    this.anytype2 = anytype2;
+  }
+
+
+  public AdditionalPropertiesClass anytype3(Object anytype3) {
+    
+    this.anytype3 = anytype3;
+    return this;
+  }
+
+   /**
+   * Get anytype3
+   * @return anytype3
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Object getAnytype3() {
+    return anytype3;
+  }
+
+
+  public void setAnytype3(Object anytype3) {
+    this.anytype3 = anytype3;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
+    return Objects.equals(this.mapString, additionalPropertiesClass.mapString) &&
+        Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) &&
+        Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) &&
+        Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) &&
+        Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) &&
+        Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) &&
+        Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) &&
+        Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) &&
+        Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) &&
+        Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) &&
+        Objects.equals(this.anytype3, additionalPropertiesClass.anytype3);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesClass {\n");
+    sb.append("    mapString: ").append(toIndentedString(mapString)).append("\n");
+    sb.append("    mapNumber: ").append(toIndentedString(mapNumber)).append("\n");
+    sb.append("    mapInteger: ").append(toIndentedString(mapInteger)).append("\n");
+    sb.append("    mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n");
+    sb.append("    mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n");
+    sb.append("    mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n");
+    sb.append("    mapMapString: ").append(toIndentedString(mapMapString)).append("\n");
+    sb.append("    mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n");
+    sb.append("    anytype1: ").append(toIndentedString(anytype1)).append("\n");
+    sb.append("    anytype2: ").append(toIndentedString(anytype2)).append("\n");
+    sb.append("    anytype3: ").append(toIndentedString(anytype3)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
new file mode 100644
index 000000000000..d2c4b0ef322c
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -0,0 +1,103 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesInteger
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
+  private String name;
+
+
+  public AdditionalPropertiesInteger name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
+    return Objects.equals(this.name, additionalPropertiesInteger.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesInteger {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
new file mode 100644
index 000000000000..fe1b89b67e42
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -0,0 +1,104 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesNumber
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
+  private String name;
+
+
+  public AdditionalPropertiesNumber name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
+    return Objects.equals(this.name, additionalPropertiesNumber.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesNumber {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
new file mode 100644
index 000000000000..8690d66d3462
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -0,0 +1,103 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesObject
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
+  private String name;
+
+
+  public AdditionalPropertiesObject name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o;
+    return Objects.equals(this.name, additionalPropertiesObject.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesObject {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
new file mode 100644
index 000000000000..5bd295794e93
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -0,0 +1,103 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesString
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AdditionalPropertiesString extends HashMap<String, String> {
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
+  private String name;
+
+
+  public AdditionalPropertiesString name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o;
+    return Objects.equals(this.name, additionalPropertiesString.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesString {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java
new file mode 100644
index 000000000000..00548e65fa3b
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java
@@ -0,0 +1,134 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.openapitools.client.model.BigCat;
+import org.openapitools.client.model.Cat;
+import org.openapitools.client.model.Dog;
+
+/**
+ * Animal
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+
+public class Animal {
+  public static final String SERIALIZED_NAME_CLASS_NAME = "className";
+  @SerializedName(SERIALIZED_NAME_CLASS_NAME)
+  protected String className;
+
+  public static final String SERIALIZED_NAME_COLOR = "color";
+  @SerializedName(SERIALIZED_NAME_COLOR)
+  private String color = "red";
+
+  public Animal() {
+    this.className = this.getClass().getSimpleName();
+  }
+
+  public Animal className(String className) {
+    
+    this.className = className;
+    return this;
+  }
+
+   /**
+   * Get className
+   * @return className
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public String getClassName() {
+    return className;
+  }
+
+
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  public Animal color(String color) {
+    
+    this.color = color;
+    return this;
+  }
+
+   /**
+   * Get color
+   * @return color
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getColor() {
+    return color;
+  }
+
+
+  public void setColor(String color) {
+    this.color = color;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Animal animal = (Animal) o;
+    return Objects.equals(this.className, animal.className) &&
+        Objects.equals(this.color, animal.color);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, color);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
new file mode 100644
index 000000000000..0a4f98a0b627
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -0,0 +1,110 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * ArrayOfArrayOfNumberOnly
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ArrayOfArrayOfNumberOnly {
+  public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
+  @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER)
+  private List<List<BigDecimal>> arrayArrayNumber = null;
+
+
+  public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
+    
+    this.arrayArrayNumber = arrayArrayNumber;
+    return this;
+  }
+
+  public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
+    if (this.arrayArrayNumber == null) {
+      this.arrayArrayNumber = new ArrayList<List<BigDecimal>>();
+    }
+    this.arrayArrayNumber.add(arrayArrayNumberItem);
+    return this;
+  }
+
+   /**
+   * Get arrayArrayNumber
+   * @return arrayArrayNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<List<BigDecimal>> getArrayArrayNumber() {
+    return arrayArrayNumber;
+  }
+
+
+  public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
+    this.arrayArrayNumber = arrayArrayNumber;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o;
+    return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayArrayNumber);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayOfArrayOfNumberOnly {\n");
+    sb.append("    arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
new file mode 100644
index 000000000000..5f87c4ddef1a
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -0,0 +1,110 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * ArrayOfNumberOnly
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ArrayOfNumberOnly {
+  public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber";
+  @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER)
+  private List<BigDecimal> arrayNumber = null;
+
+
+  public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
+    
+    this.arrayNumber = arrayNumber;
+    return this;
+  }
+
+  public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
+    if (this.arrayNumber == null) {
+      this.arrayNumber = new ArrayList<BigDecimal>();
+    }
+    this.arrayNumber.add(arrayNumberItem);
+    return this;
+  }
+
+   /**
+   * Get arrayNumber
+   * @return arrayNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<BigDecimal> getArrayNumber() {
+    return arrayNumber;
+  }
+
+
+  public void setArrayNumber(List<BigDecimal> arrayNumber) {
+    this.arrayNumber = arrayNumber;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o;
+    return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayNumber);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayOfNumberOnly {\n");
+    sb.append("    arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java
new file mode 100644
index 000000000000..ff780811ba1f
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -0,0 +1,184 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.openapitools.client.model.ReadOnlyFirst;
+
+/**
+ * ArrayTest
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ArrayTest {
+  public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string";
+  @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING)
+  private List<String> arrayOfString = null;
+
+  public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
+  @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER)
+  private List<List<Long>> arrayArrayOfInteger = null;
+
+  public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
+  @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL)
+  private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
+
+
+  public ArrayTest arrayOfString(List<String> arrayOfString) {
+    
+    this.arrayOfString = arrayOfString;
+    return this;
+  }
+
+  public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
+    if (this.arrayOfString == null) {
+      this.arrayOfString = new ArrayList<String>();
+    }
+    this.arrayOfString.add(arrayOfStringItem);
+    return this;
+  }
+
+   /**
+   * Get arrayOfString
+   * @return arrayOfString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<String> getArrayOfString() {
+    return arrayOfString;
+  }
+
+
+  public void setArrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+  }
+
+
+  public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+    return this;
+  }
+
+  public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
+    if (this.arrayArrayOfInteger == null) {
+      this.arrayArrayOfInteger = new ArrayList<List<Long>>();
+    }
+    this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
+    return this;
+  }
+
+   /**
+   * Get arrayArrayOfInteger
+   * @return arrayArrayOfInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<List<Long>> getArrayArrayOfInteger() {
+    return arrayArrayOfInteger;
+  }
+
+
+  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+  }
+
+
+  public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    
+    this.arrayArrayOfModel = arrayArrayOfModel;
+    return this;
+  }
+
+  public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
+    if (this.arrayArrayOfModel == null) {
+      this.arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
+    }
+    this.arrayArrayOfModel.add(arrayArrayOfModelItem);
+    return this;
+  }
+
+   /**
+   * Get arrayArrayOfModel
+   * @return arrayArrayOfModel
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
+    return arrayArrayOfModel;
+  }
+
+
+  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayTest arrayTest = (ArrayTest) o;
+    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
+        Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
+        Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayTest {\n");
+    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
+    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
+    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCat.java
new file mode 100644
index 000000000000..186ea74bbac1
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCat.java
@@ -0,0 +1,158 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.openapitools.client.model.BigCatAllOf;
+import org.openapitools.client.model.Cat;
+
+/**
+ * BigCat
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+
+public class BigCat extends Cat {
+  /**
+   * Gets or Sets kind
+   */
+  @JsonAdapter(KindEnum.Adapter.class)
+  public enum KindEnum {
+    LIONS("lions"),
+    
+    TIGERS("tigers"),
+    
+    LEOPARDS("leopards"),
+    
+    JAGUARS("jaguars");
+
+    private String value;
+
+    KindEnum(String value) {
+      this.value = value;
+    }
+
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static KindEnum fromValue(String value) {
+      for (KindEnum b : KindEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+
+    public static class Adapter extends TypeAdapter<KindEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final KindEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public KindEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return KindEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_KIND = "kind";
+  @SerializedName(SERIALIZED_NAME_KIND)
+  private KindEnum kind;
+
+  public BigCat() {
+    this.className = this.getClass().getSimpleName();
+  }
+
+  public BigCat kind(KindEnum kind) {
+    
+    this.kind = kind;
+    return this;
+  }
+
+   /**
+   * Get kind
+   * @return kind
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public KindEnum getKind() {
+    return kind;
+  }
+
+
+  public void setKind(KindEnum kind) {
+    this.kind = kind;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    BigCat bigCat = (BigCat) o;
+    return Objects.equals(this.kind, bigCat.kind) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(kind, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class BigCat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCatAllOf.java
new file mode 100644
index 000000000000..7a5439270613
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -0,0 +1,150 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * BigCatAllOf
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class BigCatAllOf {
+  /**
+   * Gets or Sets kind
+   */
+  @JsonAdapter(KindEnum.Adapter.class)
+  public enum KindEnum {
+    LIONS("lions"),
+    
+    TIGERS("tigers"),
+    
+    LEOPARDS("leopards"),
+    
+    JAGUARS("jaguars");
+
+    private String value;
+
+    KindEnum(String value) {
+      this.value = value;
+    }
+
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static KindEnum fromValue(String value) {
+      for (KindEnum b : KindEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+
+    public static class Adapter extends TypeAdapter<KindEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final KindEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public KindEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return KindEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_KIND = "kind";
+  @SerializedName(SERIALIZED_NAME_KIND)
+  private KindEnum kind;
+
+
+  public BigCatAllOf kind(KindEnum kind) {
+    
+    this.kind = kind;
+    return this;
+  }
+
+   /**
+   * Get kind
+   * @return kind
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public KindEnum getKind() {
+    return kind;
+  }
+
+
+  public void setKind(KindEnum kind) {
+    this.kind = kind;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    BigCatAllOf bigCatAllOf = (BigCatAllOf) o;
+    return Objects.equals(this.kind, bigCatAllOf.kind);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(kind);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class BigCatAllOf {\n");
+    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Capitalization.java
new file mode 100644
index 000000000000..c68dbeb2a423
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -0,0 +1,244 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * Capitalization
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Capitalization {
+  public static final String SERIALIZED_NAME_SMALL_CAMEL = "smallCamel";
+  @SerializedName(SERIALIZED_NAME_SMALL_CAMEL)
+  private String smallCamel;
+
+  public static final String SERIALIZED_NAME_CAPITAL_CAMEL = "CapitalCamel";
+  @SerializedName(SERIALIZED_NAME_CAPITAL_CAMEL)
+  private String capitalCamel;
+
+  public static final String SERIALIZED_NAME_SMALL_SNAKE = "small_Snake";
+  @SerializedName(SERIALIZED_NAME_SMALL_SNAKE)
+  private String smallSnake;
+
+  public static final String SERIALIZED_NAME_CAPITAL_SNAKE = "Capital_Snake";
+  @SerializedName(SERIALIZED_NAME_CAPITAL_SNAKE)
+  private String capitalSnake;
+
+  public static final String SERIALIZED_NAME_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points";
+  @SerializedName(SERIALIZED_NAME_SC_A_E_T_H_FLOW_POINTS)
+  private String scAETHFlowPoints;
+
+  public static final String SERIALIZED_NAME_A_T_T_N_A_M_E = "ATT_NAME";
+  @SerializedName(SERIALIZED_NAME_A_T_T_N_A_M_E)
+  private String ATT_NAME;
+
+
+  public Capitalization smallCamel(String smallCamel) {
+    
+    this.smallCamel = smallCamel;
+    return this;
+  }
+
+   /**
+   * Get smallCamel
+   * @return smallCamel
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getSmallCamel() {
+    return smallCamel;
+  }
+
+
+  public void setSmallCamel(String smallCamel) {
+    this.smallCamel = smallCamel;
+  }
+
+
+  public Capitalization capitalCamel(String capitalCamel) {
+    
+    this.capitalCamel = capitalCamel;
+    return this;
+  }
+
+   /**
+   * Get capitalCamel
+   * @return capitalCamel
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getCapitalCamel() {
+    return capitalCamel;
+  }
+
+
+  public void setCapitalCamel(String capitalCamel) {
+    this.capitalCamel = capitalCamel;
+  }
+
+
+  public Capitalization smallSnake(String smallSnake) {
+    
+    this.smallSnake = smallSnake;
+    return this;
+  }
+
+   /**
+   * Get smallSnake
+   * @return smallSnake
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getSmallSnake() {
+    return smallSnake;
+  }
+
+
+  public void setSmallSnake(String smallSnake) {
+    this.smallSnake = smallSnake;
+  }
+
+
+  public Capitalization capitalSnake(String capitalSnake) {
+    
+    this.capitalSnake = capitalSnake;
+    return this;
+  }
+
+   /**
+   * Get capitalSnake
+   * @return capitalSnake
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getCapitalSnake() {
+    return capitalSnake;
+  }
+
+
+  public void setCapitalSnake(String capitalSnake) {
+    this.capitalSnake = capitalSnake;
+  }
+
+
+  public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
+    
+    this.scAETHFlowPoints = scAETHFlowPoints;
+    return this;
+  }
+
+   /**
+   * Get scAETHFlowPoints
+   * @return scAETHFlowPoints
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getScAETHFlowPoints() {
+    return scAETHFlowPoints;
+  }
+
+
+  public void setScAETHFlowPoints(String scAETHFlowPoints) {
+    this.scAETHFlowPoints = scAETHFlowPoints;
+  }
+
+
+  public Capitalization ATT_NAME(String ATT_NAME) {
+    
+    this.ATT_NAME = ATT_NAME;
+    return this;
+  }
+
+   /**
+   * Name of the pet 
+   * @return ATT_NAME
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "Name of the pet ")
+
+  public String getATTNAME() {
+    return ATT_NAME;
+  }
+
+
+  public void setATTNAME(String ATT_NAME) {
+    this.ATT_NAME = ATT_NAME;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Capitalization capitalization = (Capitalization) o;
+    return Objects.equals(this.smallCamel, capitalization.smallCamel) &&
+        Objects.equals(this.capitalCamel, capitalization.capitalCamel) &&
+        Objects.equals(this.smallSnake, capitalization.smallSnake) &&
+        Objects.equals(this.capitalSnake, capitalization.capitalSnake) &&
+        Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) &&
+        Objects.equals(this.ATT_NAME, capitalization.ATT_NAME);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Capitalization {\n");
+    sb.append("    smallCamel: ").append(toIndentedString(smallCamel)).append("\n");
+    sb.append("    capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n");
+    sb.append("    smallSnake: ").append(toIndentedString(smallSnake)).append("\n");
+    sb.append("    capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n");
+    sb.append("    scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n");
+    sb.append("    ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java
new file mode 100644
index 000000000000..560bebcb7bb6
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java
@@ -0,0 +1,108 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.BigCat;
+import org.openapitools.client.model.CatAllOf;
+
+/**
+ * Cat
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+
+public class Cat extends Animal {
+  public static final String SERIALIZED_NAME_DECLAWED = "declawed";
+  @SerializedName(SERIALIZED_NAME_DECLAWED)
+  private Boolean declawed;
+
+  public Cat() {
+    this.className = this.getClass().getSimpleName();
+  }
+
+  public Cat declawed(Boolean declawed) {
+    
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Cat cat = (Cat) o;
+    return Objects.equals(this.declawed, cat.declawed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/CatAllOf.java
new file mode 100644
index 000000000000..a88c5a44b663
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -0,0 +1,99 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * CatAllOf
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class CatAllOf {
+  public static final String SERIALIZED_NAME_DECLAWED = "declawed";
+  @SerializedName(SERIALIZED_NAME_DECLAWED)
+  private Boolean declawed;
+
+
+  public CatAllOf declawed(Boolean declawed) {
+    
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return Objects.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Category.java
new file mode 100644
index 000000000000..558a67073120
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Category.java
@@ -0,0 +1,127 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * Category
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Category {
+  public static final String SERIALIZED_NAME_ID = "id";
+  @SerializedName(SERIALIZED_NAME_ID)
+  private Long id;
+
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
+  private String name = "default-name";
+
+
+  public Category id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public Category name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Category category = (Category) o;
+    return Objects.equals(this.id, category.id) &&
+        Objects.equals(this.name, category.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ClassModel.java
new file mode 100644
index 000000000000..41190d85a1eb
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -0,0 +1,100 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * Model for testing model with \&quot;_class\&quot; property
+ */
+@ApiModel(description = "Model for testing model with \"_class\" property")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ClassModel {
+  public static final String SERIALIZED_NAME_PROPERTY_CLASS = "_class";
+  @SerializedName(SERIALIZED_NAME_PROPERTY_CLASS)
+  private String propertyClass;
+
+
+  public ClassModel propertyClass(String propertyClass) {
+    
+    this.propertyClass = propertyClass;
+    return this;
+  }
+
+   /**
+   * Get propertyClass
+   * @return propertyClass
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getPropertyClass() {
+    return propertyClass;
+  }
+
+
+  public void setPropertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ClassModel classModel = (ClassModel) o;
+    return Objects.equals(this.propertyClass, classModel.propertyClass);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(propertyClass);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ClassModel {\n");
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Client.java
new file mode 100644
index 000000000000..c4baca1e73d7
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Client.java
@@ -0,0 +1,99 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * Client
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Client {
+  public static final String SERIALIZED_NAME_CLIENT = "client";
+  @SerializedName(SERIALIZED_NAME_CLIENT)
+  private String client;
+
+
+  public Client client(String client) {
+    
+    this.client = client;
+    return this;
+  }
+
+   /**
+   * Get client
+   * @return client
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getClient() {
+    return client;
+  }
+
+
+  public void setClient(String client) {
+    this.client = client;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Client client = (Client) o;
+    return Objects.equals(this.client, client.client);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(client);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Client {\n");
+    sb.append("    client: ").append(toIndentedString(client)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Dog.java
new file mode 100644
index 000000000000..49df272d86ed
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Dog.java
@@ -0,0 +1,107 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
+
+/**
+ * Dog
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+
+public class Dog extends Animal {
+  public static final String SERIALIZED_NAME_BREED = "breed";
+  @SerializedName(SERIALIZED_NAME_BREED)
+  private String breed;
+
+  public Dog() {
+    this.className = this.getClass().getSimpleName();
+  }
+
+  public Dog breed(String breed) {
+    
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getBreed() {
+    return breed;
+  }
+
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Dog dog = (Dog) o;
+    return Objects.equals(this.breed, dog.breed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/DogAllOf.java
new file mode 100644
index 000000000000..134c87b2e9b4
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -0,0 +1,99 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * DogAllOf
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class DogAllOf {
+  public static final String SERIALIZED_NAME_BREED = "breed";
+  @SerializedName(SERIALIZED_NAME_BREED)
+  private String breed;
+
+
+  public DogAllOf breed(String breed) {
+    
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getBreed() {
+    return breed;
+  }
+
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return Objects.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java
new file mode 100644
index 000000000000..b1aba3f4e68d
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -0,0 +1,232 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * EnumArrays
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class EnumArrays {
+  /**
+   * Gets or Sets justSymbol
+   */
+  @JsonAdapter(JustSymbolEnum.Adapter.class)
+  public enum JustSymbolEnum {
+    GREATER_THAN_OR_EQUAL_TO(">="),
+    
+    DOLLAR("$");
+
+    private String value;
+
+    JustSymbolEnum(String value) {
+      this.value = value;
+    }
+
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static JustSymbolEnum fromValue(String value) {
+      for (JustSymbolEnum b : JustSymbolEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+
+    public static class Adapter extends TypeAdapter<JustSymbolEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final JustSymbolEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public JustSymbolEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return JustSymbolEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_JUST_SYMBOL = "just_symbol";
+  @SerializedName(SERIALIZED_NAME_JUST_SYMBOL)
+  private JustSymbolEnum justSymbol;
+
+  /**
+   * Gets or Sets arrayEnum
+   */
+  @JsonAdapter(ArrayEnumEnum.Adapter.class)
+  public enum ArrayEnumEnum {
+    FISH("fish"),
+    
+    CRAB("crab");
+
+    private String value;
+
+    ArrayEnumEnum(String value) {
+      this.value = value;
+    }
+
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static ArrayEnumEnum fromValue(String value) {
+      for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+
+    public static class Adapter extends TypeAdapter<ArrayEnumEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final ArrayEnumEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public ArrayEnumEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return ArrayEnumEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum";
+  @SerializedName(SERIALIZED_NAME_ARRAY_ENUM)
+  private List<ArrayEnumEnum> arrayEnum = null;
+
+
+  public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
+    
+    this.justSymbol = justSymbol;
+    return this;
+  }
+
+   /**
+   * Get justSymbol
+   * @return justSymbol
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public JustSymbolEnum getJustSymbol() {
+    return justSymbol;
+  }
+
+
+  public void setJustSymbol(JustSymbolEnum justSymbol) {
+    this.justSymbol = justSymbol;
+  }
+
+
+  public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
+    
+    this.arrayEnum = arrayEnum;
+    return this;
+  }
+
+  public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
+    if (this.arrayEnum == null) {
+      this.arrayEnum = new ArrayList<ArrayEnumEnum>();
+    }
+    this.arrayEnum.add(arrayEnumItem);
+    return this;
+  }
+
+   /**
+   * Get arrayEnum
+   * @return arrayEnum
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<ArrayEnumEnum> getArrayEnum() {
+    return arrayEnum;
+  }
+
+
+  public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
+    this.arrayEnum = arrayEnum;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    EnumArrays enumArrays = (EnumArrays) o;
+    return Objects.equals(this.justSymbol, enumArrays.justSymbol) &&
+        Objects.equals(this.arrayEnum, enumArrays.arrayEnum);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(justSymbol, arrayEnum);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EnumArrays {\n");
+    sb.append("    justSymbol: ").append(toIndentedString(justSymbol)).append("\n");
+    sb.append("    arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumClass.java
rename to samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java
new file mode 100644
index 000000000000..a25f521079b8
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -0,0 +1,407 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.openapitools.client.model.OuterEnum;
+
+/**
+ * EnumTest
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class EnumTest {
+  /**
+   * Gets or Sets enumString
+   */
+  @JsonAdapter(EnumStringEnum.Adapter.class)
+  public enum EnumStringEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower"),
+    
+    EMPTY("");
+
+    private String value;
+
+    EnumStringEnum(String value) {
+      this.value = value;
+    }
+
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static EnumStringEnum fromValue(String value) {
+      for (EnumStringEnum b : EnumStringEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+
+    public static class Adapter extends TypeAdapter<EnumStringEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final EnumStringEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public EnumStringEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return EnumStringEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_ENUM_STRING = "enum_string";
+  @SerializedName(SERIALIZED_NAME_ENUM_STRING)
+  private EnumStringEnum enumString;
+
+  /**
+   * Gets or Sets enumStringRequired
+   */
+  @JsonAdapter(EnumStringRequiredEnum.Adapter.class)
+  public enum EnumStringRequiredEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower"),
+    
+    EMPTY("");
+
+    private String value;
+
+    EnumStringRequiredEnum(String value) {
+      this.value = value;
+    }
+
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static EnumStringRequiredEnum fromValue(String value) {
+      for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+
+    public static class Adapter extends TypeAdapter<EnumStringRequiredEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final EnumStringRequiredEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public EnumStringRequiredEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return EnumStringRequiredEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_ENUM_STRING_REQUIRED = "enum_string_required";
+  @SerializedName(SERIALIZED_NAME_ENUM_STRING_REQUIRED)
+  private EnumStringRequiredEnum enumStringRequired;
+
+  /**
+   * Gets or Sets enumInteger
+   */
+  @JsonAdapter(EnumIntegerEnum.Adapter.class)
+  public enum EnumIntegerEnum {
+    NUMBER_1(1),
+    
+    NUMBER_MINUS_1(-1);
+
+    private Integer value;
+
+    EnumIntegerEnum(Integer value) {
+      this.value = value;
+    }
+
+    public Integer getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static EnumIntegerEnum fromValue(Integer value) {
+      for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+
+    public static class Adapter extends TypeAdapter<EnumIntegerEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final EnumIntegerEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public EnumIntegerEnum read(final JsonReader jsonReader) throws IOException {
+        Integer value =  jsonReader.nextInt();
+        return EnumIntegerEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_ENUM_INTEGER = "enum_integer";
+  @SerializedName(SERIALIZED_NAME_ENUM_INTEGER)
+  private EnumIntegerEnum enumInteger;
+
+  /**
+   * Gets or Sets enumNumber
+   */
+  @JsonAdapter(EnumNumberEnum.Adapter.class)
+  public enum EnumNumberEnum {
+    NUMBER_1_DOT_1(1.1),
+    
+    NUMBER_MINUS_1_DOT_2(-1.2);
+
+    private Double value;
+
+    EnumNumberEnum(Double value) {
+      this.value = value;
+    }
+
+    public Double getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static EnumNumberEnum fromValue(Double value) {
+      for (EnumNumberEnum b : EnumNumberEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+
+    public static class Adapter extends TypeAdapter<EnumNumberEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final EnumNumberEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public EnumNumberEnum read(final JsonReader jsonReader) throws IOException {
+        Double value =  jsonReader.nextDouble();
+        return EnumNumberEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_ENUM_NUMBER = "enum_number";
+  @SerializedName(SERIALIZED_NAME_ENUM_NUMBER)
+  private EnumNumberEnum enumNumber;
+
+  public static final String SERIALIZED_NAME_OUTER_ENUM = "outerEnum";
+  @SerializedName(SERIALIZED_NAME_OUTER_ENUM)
+  private OuterEnum outerEnum;
+
+
+  public EnumTest enumString(EnumStringEnum enumString) {
+    
+    this.enumString = enumString;
+    return this;
+  }
+
+   /**
+   * Get enumString
+   * @return enumString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public EnumStringEnum getEnumString() {
+    return enumString;
+  }
+
+
+  public void setEnumString(EnumStringEnum enumString) {
+    this.enumString = enumString;
+  }
+
+
+  public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    
+    this.enumStringRequired = enumStringRequired;
+    return this;
+  }
+
+   /**
+   * Get enumStringRequired
+   * @return enumStringRequired
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public EnumStringRequiredEnum getEnumStringRequired() {
+    return enumStringRequired;
+  }
+
+
+  public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    this.enumStringRequired = enumStringRequired;
+  }
+
+
+  public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
+    
+    this.enumInteger = enumInteger;
+    return this;
+  }
+
+   /**
+   * Get enumInteger
+   * @return enumInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public EnumIntegerEnum getEnumInteger() {
+    return enumInteger;
+  }
+
+
+  public void setEnumInteger(EnumIntegerEnum enumInteger) {
+    this.enumInteger = enumInteger;
+  }
+
+
+  public EnumTest enumNumber(EnumNumberEnum enumNumber) {
+    
+    this.enumNumber = enumNumber;
+    return this;
+  }
+
+   /**
+   * Get enumNumber
+   * @return enumNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public EnumNumberEnum getEnumNumber() {
+    return enumNumber;
+  }
+
+
+  public void setEnumNumber(EnumNumberEnum enumNumber) {
+    this.enumNumber = enumNumber;
+  }
+
+
+  public EnumTest outerEnum(OuterEnum outerEnum) {
+    
+    this.outerEnum = outerEnum;
+    return this;
+  }
+
+   /**
+   * Get outerEnum
+   * @return outerEnum
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public OuterEnum getOuterEnum() {
+    return outerEnum;
+  }
+
+
+  public void setOuterEnum(OuterEnum outerEnum) {
+    this.outerEnum = outerEnum;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    EnumTest enumTest = (EnumTest) o;
+    return Objects.equals(this.enumString, enumTest.enumString) &&
+        Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
+        Objects.equals(this.enumInteger, enumTest.enumInteger) &&
+        Objects.equals(this.enumNumber, enumTest.enumNumber) &&
+        Objects.equals(this.outerEnum, enumTest.outerEnum);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EnumTest {\n");
+    sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
+    sb.append("    enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
+    sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
+    sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
+    sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
new file mode 100644
index 000000000000..908312827464
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -0,0 +1,138 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * FileSchemaTestClass
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class FileSchemaTestClass {
+  public static final String SERIALIZED_NAME_FILE = "file";
+  @SerializedName(SERIALIZED_NAME_FILE)
+  private java.io.File file;
+
+  public static final String SERIALIZED_NAME_FILES = "files";
+  @SerializedName(SERIALIZED_NAME_FILES)
+  private List<java.io.File> files = null;
+
+
+  public FileSchemaTestClass file(java.io.File file) {
+    
+    this.file = file;
+    return this;
+  }
+
+   /**
+   * Get file
+   * @return file
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public java.io.File getFile() {
+    return file;
+  }
+
+
+  public void setFile(java.io.File file) {
+    this.file = file;
+  }
+
+
+  public FileSchemaTestClass files(List<java.io.File> files) {
+    
+    this.files = files;
+    return this;
+  }
+
+  public FileSchemaTestClass addFilesItem(java.io.File filesItem) {
+    if (this.files == null) {
+      this.files = new ArrayList<java.io.File>();
+    }
+    this.files.add(filesItem);
+    return this;
+  }
+
+   /**
+   * Get files
+   * @return files
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<java.io.File> getFiles() {
+    return files;
+  }
+
+
+  public void setFiles(List<java.io.File> files) {
+    this.files = files;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o;
+    return Objects.equals(this.file, fileSchemaTestClass.file) &&
+        Objects.equals(this.files, fileSchemaTestClass.files);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(file, files);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FileSchemaTestClass {\n");
+    sb.append("    file: ").append(toIndentedString(file)).append("\n");
+    sb.append("    files: ").append(toIndentedString(files)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java
new file mode 100644
index 000000000000..ff862108132a
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -0,0 +1,487 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.UUID;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+
+/**
+ * FormatTest
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class FormatTest {
+  public static final String SERIALIZED_NAME_INTEGER = "integer";
+  @SerializedName(SERIALIZED_NAME_INTEGER)
+  private Integer integer;
+
+  public static final String SERIALIZED_NAME_INT32 = "int32";
+  @SerializedName(SERIALIZED_NAME_INT32)
+  private Integer int32;
+
+  public static final String SERIALIZED_NAME_INT64 = "int64";
+  @SerializedName(SERIALIZED_NAME_INT64)
+  private Long int64;
+
+  public static final String SERIALIZED_NAME_NUMBER = "number";
+  @SerializedName(SERIALIZED_NAME_NUMBER)
+  private BigDecimal number;
+
+  public static final String SERIALIZED_NAME_FLOAT = "float";
+  @SerializedName(SERIALIZED_NAME_FLOAT)
+  private Float _float;
+
+  public static final String SERIALIZED_NAME_DOUBLE = "double";
+  @SerializedName(SERIALIZED_NAME_DOUBLE)
+  private Double _double;
+
+  public static final String SERIALIZED_NAME_STRING = "string";
+  @SerializedName(SERIALIZED_NAME_STRING)
+  private String string;
+
+  public static final String SERIALIZED_NAME_BYTE = "byte";
+  @SerializedName(SERIALIZED_NAME_BYTE)
+  private byte[] _byte;
+
+  public static final String SERIALIZED_NAME_BINARY = "binary";
+  @SerializedName(SERIALIZED_NAME_BINARY)
+  private File binary;
+
+  public static final String SERIALIZED_NAME_DATE = "date";
+  @SerializedName(SERIALIZED_NAME_DATE)
+  private LocalDate date;
+
+  public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
+  @SerializedName(SERIALIZED_NAME_DATE_TIME)
+  private OffsetDateTime dateTime;
+
+  public static final String SERIALIZED_NAME_UUID = "uuid";
+  @SerializedName(SERIALIZED_NAME_UUID)
+  private UUID uuid;
+
+  public static final String SERIALIZED_NAME_PASSWORD = "password";
+  @SerializedName(SERIALIZED_NAME_PASSWORD)
+  private String password;
+
+  public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal";
+  @SerializedName(SERIALIZED_NAME_BIG_DECIMAL)
+  private BigDecimal bigDecimal;
+
+
+  public FormatTest integer(Integer integer) {
+    
+    this.integer = integer;
+    return this;
+  }
+
+   /**
+   * Get integer
+   * minimum: 10
+   * maximum: 100
+   * @return integer
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Integer getInteger() {
+    return integer;
+  }
+
+
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+
+  public FormatTest int32(Integer int32) {
+    
+    this.int32 = int32;
+    return this;
+  }
+
+   /**
+   * Get int32
+   * minimum: 20
+   * maximum: 200
+   * @return int32
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Integer getInt32() {
+    return int32;
+  }
+
+
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+
+  public FormatTest int64(Long int64) {
+    
+    this.int64 = int64;
+    return this;
+  }
+
+   /**
+   * Get int64
+   * @return int64
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Long getInt64() {
+    return int64;
+  }
+
+
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+
+  public FormatTest number(BigDecimal number) {
+    
+    this.number = number;
+    return this;
+  }
+
+   /**
+   * Get number
+   * minimum: 32.1
+   * maximum: 543.2
+   * @return number
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public BigDecimal getNumber() {
+    return number;
+  }
+
+
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+
+  public FormatTest _float(Float _float) {
+    
+    this._float = _float;
+    return this;
+  }
+
+   /**
+   * Get _float
+   * minimum: 54.3
+   * maximum: 987.6
+   * @return _float
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Float getFloat() {
+    return _float;
+  }
+
+
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+
+  public FormatTest _double(Double _double) {
+    
+    this._double = _double;
+    return this;
+  }
+
+   /**
+   * Get _double
+   * minimum: 67.8
+   * maximum: 123.4
+   * @return _double
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Double getDouble() {
+    return _double;
+  }
+
+
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+
+  public FormatTest string(String string) {
+    
+    this.string = string;
+    return this;
+  }
+
+   /**
+   * Get string
+   * @return string
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getString() {
+    return string;
+  }
+
+
+  public void setString(String string) {
+    this.string = string;
+  }
+
+
+  public FormatTest _byte(byte[] _byte) {
+    
+    this._byte = _byte;
+    return this;
+  }
+
+   /**
+   * Get _byte
+   * @return _byte
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public byte[] getByte() {
+    return _byte;
+  }
+
+
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+
+  public FormatTest binary(File binary) {
+    
+    this.binary = binary;
+    return this;
+  }
+
+   /**
+   * Get binary
+   * @return binary
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public File getBinary() {
+    return binary;
+  }
+
+
+  public void setBinary(File binary) {
+    this.binary = binary;
+  }
+
+
+  public FormatTest date(LocalDate date) {
+    
+    this.date = date;
+    return this;
+  }
+
+   /**
+   * Get date
+   * @return date
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public LocalDate getDate() {
+    return date;
+  }
+
+
+  public void setDate(LocalDate date) {
+    this.date = date;
+  }
+
+
+  public FormatTest dateTime(OffsetDateTime dateTime) {
+    
+    this.dateTime = dateTime;
+    return this;
+  }
+
+   /**
+   * Get dateTime
+   * @return dateTime
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public OffsetDateTime getDateTime() {
+    return dateTime;
+  }
+
+
+  public void setDateTime(OffsetDateTime dateTime) {
+    this.dateTime = dateTime;
+  }
+
+
+  public FormatTest uuid(UUID uuid) {
+    
+    this.uuid = uuid;
+    return this;
+  }
+
+   /**
+   * Get uuid
+   * @return uuid
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+
+  public UUID getUuid() {
+    return uuid;
+  }
+
+
+  public void setUuid(UUID uuid) {
+    this.uuid = uuid;
+  }
+
+
+  public FormatTest password(String password) {
+    
+    this.password = password;
+    return this;
+  }
+
+   /**
+   * Get password
+   * @return password
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public String getPassword() {
+    return password;
+  }
+
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  public FormatTest bigDecimal(BigDecimal bigDecimal) {
+    
+    this.bigDecimal = bigDecimal;
+    return this;
+  }
+
+   /**
+   * Get bigDecimal
+   * @return bigDecimal
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public BigDecimal getBigDecimal() {
+    return bigDecimal;
+  }
+
+
+  public void setBigDecimal(BigDecimal bigDecimal) {
+    this.bigDecimal = bigDecimal;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FormatTest formatTest = (FormatTest) o;
+    return Objects.equals(this.integer, formatTest.integer) &&
+        Objects.equals(this.int32, formatTest.int32) &&
+        Objects.equals(this.int64, formatTest.int64) &&
+        Objects.equals(this.number, formatTest.number) &&
+        Objects.equals(this._float, formatTest._float) &&
+        Objects.equals(this._double, formatTest._double) &&
+        Objects.equals(this.string, formatTest.string) &&
+        Arrays.equals(this._byte, formatTest._byte) &&
+        Objects.equals(this.binary, formatTest.binary) &&
+        Objects.equals(this.date, formatTest.date) &&
+        Objects.equals(this.dateTime, formatTest.dateTime) &&
+        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this.password, formatTest.password) &&
+        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
+    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
+    sb.append("    number: ").append(toIndentedString(number)).append("\n");
+    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
+    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
+    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
+    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
+    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
new file mode 100644
index 000000000000..0a4bdb4671ab
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -0,0 +1,110 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * HasOnlyReadOnly
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class HasOnlyReadOnly {
+  public static final String SERIALIZED_NAME_BAR = "bar";
+  @SerializedName(SERIALIZED_NAME_BAR)
+  private String bar;
+
+  public static final String SERIALIZED_NAME_FOO = "foo";
+  @SerializedName(SERIALIZED_NAME_FOO)
+  private String foo;
+
+
+   /**
+   * Get bar
+   * @return bar
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getBar() {
+    return bar;
+  }
+
+
+
+
+   /**
+   * Get foo
+   * @return foo
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getFoo() {
+    return foo;
+  }
+
+
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o;
+    return Objects.equals(this.bar, hasOnlyReadOnly.bar) &&
+        Objects.equals(this.foo, hasOnlyReadOnly.foo);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, foo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class HasOnlyReadOnly {\n");
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    foo: ").append(toIndentedString(foo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java
new file mode 100644
index 000000000000..280d523ea933
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java
@@ -0,0 +1,268 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * MapTest
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class MapTest {
+  public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string";
+  @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING)
+  private Map<String, Map<String, String>> mapMapOfString = null;
+
+  /**
+   * Gets or Sets inner
+   */
+  @JsonAdapter(InnerEnum.Adapter.class)
+  public enum InnerEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower");
+
+    private String value;
+
+    InnerEnum(String value) {
+      this.value = value;
+    }
+
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static InnerEnum fromValue(String value) {
+      for (InnerEnum b : InnerEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+
+    public static class Adapter extends TypeAdapter<InnerEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final InnerEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public InnerEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return InnerEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_MAP_OF_ENUM_STRING = "map_of_enum_string";
+  @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING)
+  private Map<String, InnerEnum> mapOfEnumString = null;
+
+  public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map";
+  @SerializedName(SERIALIZED_NAME_DIRECT_MAP)
+  private Map<String, Boolean> directMap = null;
+
+  public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map";
+  @SerializedName(SERIALIZED_NAME_INDIRECT_MAP)
+  private Map<String, Boolean> indirectMap = null;
+
+
+  public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
+    
+    this.mapMapOfString = mapMapOfString;
+    return this;
+  }
+
+  public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
+    if (this.mapMapOfString == null) {
+      this.mapMapOfString = new HashMap<String, Map<String, String>>();
+    }
+    this.mapMapOfString.put(key, mapMapOfStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapMapOfString
+   * @return mapMapOfString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Map<String, Map<String, String>> getMapMapOfString() {
+    return mapMapOfString;
+  }
+
+
+  public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
+    this.mapMapOfString = mapMapOfString;
+  }
+
+
+  public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
+    
+    this.mapOfEnumString = mapOfEnumString;
+    return this;
+  }
+
+  public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
+    if (this.mapOfEnumString == null) {
+      this.mapOfEnumString = new HashMap<String, InnerEnum>();
+    }
+    this.mapOfEnumString.put(key, mapOfEnumStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapOfEnumString
+   * @return mapOfEnumString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Map<String, InnerEnum> getMapOfEnumString() {
+    return mapOfEnumString;
+  }
+
+
+  public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
+    this.mapOfEnumString = mapOfEnumString;
+  }
+
+
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+
+  public MapTest indirectMap(Map<String, Boolean> indirectMap) {
+    
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+  public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
+    if (this.indirectMap == null) {
+      this.indirectMap = new HashMap<String, Boolean>();
+    }
+    this.indirectMap.put(key, indirectMapItem);
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Map<String, Boolean> getIndirectMap() {
+    return indirectMap;
+  }
+
+
+  public void setIndirectMap(Map<String, Boolean> indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MapTest mapTest = (MapTest) o;
+    return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MapTest {\n");
+    sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
+    sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
new file mode 100644
index 000000000000..ea4ebddd037d
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -0,0 +1,171 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.openapitools.client.model.Animal;
+import org.threeten.bp.OffsetDateTime;
+
+/**
+ * MixedPropertiesAndAdditionalPropertiesClass
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class MixedPropertiesAndAdditionalPropertiesClass {
+  public static final String SERIALIZED_NAME_UUID = "uuid";
+  @SerializedName(SERIALIZED_NAME_UUID)
+  private UUID uuid;
+
+  public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
+  @SerializedName(SERIALIZED_NAME_DATE_TIME)
+  private OffsetDateTime dateTime;
+
+  public static final String SERIALIZED_NAME_MAP = "map";
+  @SerializedName(SERIALIZED_NAME_MAP)
+  private Map<String, Animal> map = null;
+
+
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+    
+    this.uuid = uuid;
+    return this;
+  }
+
+   /**
+   * Get uuid
+   * @return uuid
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public UUID getUuid() {
+    return uuid;
+  }
+
+
+  public void setUuid(UUID uuid) {
+    this.uuid = uuid;
+  }
+
+
+  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+    
+    this.dateTime = dateTime;
+    return this;
+  }
+
+   /**
+   * Get dateTime
+   * @return dateTime
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public OffsetDateTime getDateTime() {
+    return dateTime;
+  }
+
+
+  public void setDateTime(OffsetDateTime dateTime) {
+    this.dateTime = dateTime;
+  }
+
+
+  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+    
+    this.map = map;
+    return this;
+  }
+
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
+    if (this.map == null) {
+      this.map = new HashMap<String, Animal>();
+    }
+    this.map.put(key, mapItem);
+    return this;
+  }
+
+   /**
+   * Get map
+   * @return map
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Map<String, Animal> getMap() {
+    return map;
+  }
+
+
+  public void setMap(Map<String, Animal> map) {
+    this.map = map;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
+    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
+        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
+        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(uuid, dateTime, map);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Model200Response.java
new file mode 100644
index 000000000000..8a7a5ee5aad0
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -0,0 +1,129 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * Model for testing model name starting with number
+ */
+@ApiModel(description = "Model for testing model name starting with number")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Model200Response {
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
+  private Integer name;
+
+  public static final String SERIALIZED_NAME_PROPERTY_CLASS = "class";
+  @SerializedName(SERIALIZED_NAME_PROPERTY_CLASS)
+  private String propertyClass;
+
+
+  public Model200Response name(Integer name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Integer getName() {
+    return name;
+  }
+
+
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+
+  public Model200Response propertyClass(String propertyClass) {
+    
+    this.propertyClass = propertyClass;
+    return this;
+  }
+
+   /**
+   * Get propertyClass
+   * @return propertyClass
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getPropertyClass() {
+    return propertyClass;
+  }
+
+
+  public void setPropertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Model200Response _200response = (Model200Response) o;
+    return Objects.equals(this.name, _200response.name) &&
+        Objects.equals(this.propertyClass, _200response.propertyClass);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, propertyClass);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelApiResponse.java
new file mode 100644
index 000000000000..92181899c1ae
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -0,0 +1,157 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * ModelApiResponse
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ModelApiResponse {
+  public static final String SERIALIZED_NAME_CODE = "code";
+  @SerializedName(SERIALIZED_NAME_CODE)
+  private Integer code;
+
+  public static final String SERIALIZED_NAME_TYPE = "type";
+  @SerializedName(SERIALIZED_NAME_TYPE)
+  private String type;
+
+  public static final String SERIALIZED_NAME_MESSAGE = "message";
+  @SerializedName(SERIALIZED_NAME_MESSAGE)
+  private String message;
+
+
+  public ModelApiResponse code(Integer code) {
+    
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * Get code
+   * @return code
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Integer getCode() {
+    return code;
+  }
+
+
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+
+
+  public ModelApiResponse type(String type) {
+    
+    this.type = type;
+    return this;
+  }
+
+   /**
+   * Get type
+   * @return type
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getType() {
+    return type;
+  }
+
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+
+  public ModelApiResponse message(String message) {
+    
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * Get message
+   * @return message
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getMessage() {
+    return message;
+  }
+
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelApiResponse _apiResponse = (ModelApiResponse) o;
+    return Objects.equals(this.code, _apiResponse.code) &&
+        Objects.equals(this.type, _apiResponse.type) &&
+        Objects.equals(this.message, _apiResponse.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(code, type, message);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelApiResponse {\n");
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelReturn.java
new file mode 100644
index 000000000000..d740c15becd1
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -0,0 +1,100 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * Model for testing reserved words
+ */
+@ApiModel(description = "Model for testing reserved words")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ModelReturn {
+  public static final String SERIALIZED_NAME_RETURN = "return";
+  @SerializedName(SERIALIZED_NAME_RETURN)
+  private Integer _return;
+
+
+  public ModelReturn _return(Integer _return) {
+    
+    this._return = _return;
+    return this;
+  }
+
+   /**
+   * Get _return
+   * @return _return
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Integer getReturn() {
+    return _return;
+  }
+
+
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelReturn _return = (ModelReturn) o;
+    return Objects.equals(this._return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Name.java
new file mode 100644
index 000000000000..879a6337cebc
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Name.java
@@ -0,0 +1,168 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * Model for testing model name same as property name
+ */
+@ApiModel(description = "Model for testing model name same as property name")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Name {
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
+  private Integer name;
+
+  public static final String SERIALIZED_NAME_SNAKE_CASE = "snake_case";
+  @SerializedName(SERIALIZED_NAME_SNAKE_CASE)
+  private Integer snakeCase;
+
+  public static final String SERIALIZED_NAME_PROPERTY = "property";
+  @SerializedName(SERIALIZED_NAME_PROPERTY)
+  private String property;
+
+  public static final String SERIALIZED_NAME_123NUMBER = "123Number";
+  @SerializedName(SERIALIZED_NAME_123NUMBER)
+  private Integer _123number;
+
+
+  public Name name(Integer name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public Integer getName() {
+    return name;
+  }
+
+
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+
+   /**
+   * Get snakeCase
+   * @return snakeCase
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+
+
+
+
+  public Name property(String property) {
+    
+    this.property = property;
+    return this;
+  }
+
+   /**
+   * Get property
+   * @return property
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getProperty() {
+    return property;
+  }
+
+
+  public void setProperty(String property) {
+    this.property = property;
+  }
+
+
+   /**
+   * Get _123number
+   * @return _123number
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Integer get123number() {
+    return _123number;
+  }
+
+
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Name name = (Name) o;
+    return Objects.equals(this.name, name.name) &&
+        Objects.equals(this.snakeCase, name.snakeCase) &&
+        Objects.equals(this.property, name.property) &&
+        Objects.equals(this._123number, name._123number);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, snakeCase, property, _123number);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
+    sb.append("    property: ").append(toIndentedString(property)).append("\n");
+    sb.append("    _123number: ").append(toIndentedString(_123number)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/NumberOnly.java
new file mode 100644
index 000000000000..50981eb598e1
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -0,0 +1,100 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+
+/**
+ * NumberOnly
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class NumberOnly {
+  public static final String SERIALIZED_NAME_JUST_NUMBER = "JustNumber";
+  @SerializedName(SERIALIZED_NAME_JUST_NUMBER)
+  private BigDecimal justNumber;
+
+
+  public NumberOnly justNumber(BigDecimal justNumber) {
+    
+    this.justNumber = justNumber;
+    return this;
+  }
+
+   /**
+   * Get justNumber
+   * @return justNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public BigDecimal getJustNumber() {
+    return justNumber;
+  }
+
+
+  public void setJustNumber(BigDecimal justNumber) {
+    this.justNumber = justNumber;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    NumberOnly numberOnly = (NumberOnly) o;
+    return Objects.equals(this.justNumber, numberOnly.justNumber);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(justNumber);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class NumberOnly {\n");
+    sb.append("    justNumber: ").append(toIndentedString(justNumber)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Order.java
new file mode 100644
index 000000000000..847d9d8a5636
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Order.java
@@ -0,0 +1,294 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.threeten.bp.OffsetDateTime;
+
+/**
+ * Order
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Order {
+  public static final String SERIALIZED_NAME_ID = "id";
+  @SerializedName(SERIALIZED_NAME_ID)
+  private Long id;
+
+  public static final String SERIALIZED_NAME_PET_ID = "petId";
+  @SerializedName(SERIALIZED_NAME_PET_ID)
+  private Long petId;
+
+  public static final String SERIALIZED_NAME_QUANTITY = "quantity";
+  @SerializedName(SERIALIZED_NAME_QUANTITY)
+  private Integer quantity;
+
+  public static final String SERIALIZED_NAME_SHIP_DATE = "shipDate";
+  @SerializedName(SERIALIZED_NAME_SHIP_DATE)
+  private OffsetDateTime shipDate;
+
+  /**
+   * Order Status
+   */
+  @JsonAdapter(StatusEnum.Adapter.class)
+  public enum StatusEnum {
+    PLACED("placed"),
+    
+    APPROVED("approved"),
+    
+    DELIVERED("delivered");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static StatusEnum fromValue(String value) {
+      for (StatusEnum b : StatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+
+    public static class Adapter extends TypeAdapter<StatusEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final StatusEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public StatusEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return StatusEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_STATUS = "status";
+  @SerializedName(SERIALIZED_NAME_STATUS)
+  private StatusEnum status;
+
+  public static final String SERIALIZED_NAME_COMPLETE = "complete";
+  @SerializedName(SERIALIZED_NAME_COMPLETE)
+  private Boolean complete = false;
+
+
+  public Order id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public Order petId(Long petId) {
+    
+    this.petId = petId;
+    return this;
+  }
+
+   /**
+   * Get petId
+   * @return petId
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Long getPetId() {
+    return petId;
+  }
+
+
+  public void setPetId(Long petId) {
+    this.petId = petId;
+  }
+
+
+  public Order quantity(Integer quantity) {
+    
+    this.quantity = quantity;
+    return this;
+  }
+
+   /**
+   * Get quantity
+   * @return quantity
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Integer getQuantity() {
+    return quantity;
+  }
+
+
+  public void setQuantity(Integer quantity) {
+    this.quantity = quantity;
+  }
+
+
+  public Order shipDate(OffsetDateTime shipDate) {
+    
+    this.shipDate = shipDate;
+    return this;
+  }
+
+   /**
+   * Get shipDate
+   * @return shipDate
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public OffsetDateTime getShipDate() {
+    return shipDate;
+  }
+
+
+  public void setShipDate(OffsetDateTime shipDate) {
+    this.shipDate = shipDate;
+  }
+
+
+  public Order status(StatusEnum status) {
+    
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * Order Status
+   * @return status
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "Order Status")
+
+  public StatusEnum getStatus() {
+    return status;
+  }
+
+
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+
+  public Order complete(Boolean complete) {
+    
+    this.complete = complete;
+    return this;
+  }
+
+   /**
+   * Get complete
+   * @return complete
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Boolean getComplete() {
+    return complete;
+  }
+
+
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Order order = (Order) o;
+    return Objects.equals(this.id, order.id) &&
+        Objects.equals(this.petId, order.petId) &&
+        Objects.equals(this.quantity, order.quantity) &&
+        Objects.equals(this.shipDate, order.shipDate) &&
+        Objects.equals(this.status, order.status) &&
+        Objects.equals(this.complete, order.complete);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Order {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
+    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
+    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterComposite.java
new file mode 100644
index 000000000000..bd38e7946d50
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -0,0 +1,158 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+
+/**
+ * OuterComposite
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class OuterComposite {
+  public static final String SERIALIZED_NAME_MY_NUMBER = "my_number";
+  @SerializedName(SERIALIZED_NAME_MY_NUMBER)
+  private BigDecimal myNumber;
+
+  public static final String SERIALIZED_NAME_MY_STRING = "my_string";
+  @SerializedName(SERIALIZED_NAME_MY_STRING)
+  private String myString;
+
+  public static final String SERIALIZED_NAME_MY_BOOLEAN = "my_boolean";
+  @SerializedName(SERIALIZED_NAME_MY_BOOLEAN)
+  private Boolean myBoolean;
+
+
+  public OuterComposite myNumber(BigDecimal myNumber) {
+    
+    this.myNumber = myNumber;
+    return this;
+  }
+
+   /**
+   * Get myNumber
+   * @return myNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public BigDecimal getMyNumber() {
+    return myNumber;
+  }
+
+
+  public void setMyNumber(BigDecimal myNumber) {
+    this.myNumber = myNumber;
+  }
+
+
+  public OuterComposite myString(String myString) {
+    
+    this.myString = myString;
+    return this;
+  }
+
+   /**
+   * Get myString
+   * @return myString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getMyString() {
+    return myString;
+  }
+
+
+  public void setMyString(String myString) {
+    this.myString = myString;
+  }
+
+
+  public OuterComposite myBoolean(Boolean myBoolean) {
+    
+    this.myBoolean = myBoolean;
+    return this;
+  }
+
+   /**
+   * Get myBoolean
+   * @return myBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Boolean getMyBoolean() {
+    return myBoolean;
+  }
+
+
+  public void setMyBoolean(Boolean myBoolean) {
+    this.myBoolean = myBoolean;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    OuterComposite outerComposite = (OuterComposite) o;
+    return Objects.equals(this.myNumber, outerComposite.myNumber) &&
+        Objects.equals(this.myString, outerComposite.myString) &&
+        Objects.equals(this.myBoolean, outerComposite.myBoolean);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(myNumber, myString, myBoolean);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OuterComposite {\n");
+    sb.append("    myNumber: ").append(toIndentedString(myNumber)).append("\n");
+    sb.append("    myString: ").append(toIndentedString(myString)).append("\n");
+    sb.append("    myBoolean: ").append(toIndentedString(myBoolean)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/OuterEnum.java
rename to samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java
new file mode 100644
index 000000000000..6d5855842591
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java
@@ -0,0 +1,310 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.openapitools.client.model.Category;
+import org.openapitools.client.model.Tag;
+
+/**
+ * Pet
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Pet {
+  public static final String SERIALIZED_NAME_ID = "id";
+  @SerializedName(SERIALIZED_NAME_ID)
+  private Long id;
+
+  public static final String SERIALIZED_NAME_CATEGORY = "category";
+  @SerializedName(SERIALIZED_NAME_CATEGORY)
+  private Category category;
+
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
+  private String name;
+
+  public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls";
+  @SerializedName(SERIALIZED_NAME_PHOTO_URLS)
+  private Set<String> photoUrls = new LinkedHashSet<String>();
+
+  public static final String SERIALIZED_NAME_TAGS = "tags";
+  @SerializedName(SERIALIZED_NAME_TAGS)
+  private List<Tag> tags = null;
+
+  /**
+   * pet status in the store
+   */
+  @JsonAdapter(StatusEnum.Adapter.class)
+  public enum StatusEnum {
+    AVAILABLE("available"),
+    
+    PENDING("pending"),
+    
+    SOLD("sold");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static StatusEnum fromValue(String value) {
+      for (StatusEnum b : StatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+
+    public static class Adapter extends TypeAdapter<StatusEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final StatusEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public StatusEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return StatusEnum.fromValue(value);
+      }
+    }
+  }
+
+  public static final String SERIALIZED_NAME_STATUS = "status";
+  @SerializedName(SERIALIZED_NAME_STATUS)
+  private StatusEnum status;
+
+
+  public Pet id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public Pet category(Category category) {
+    
+    this.category = category;
+    return this;
+  }
+
+   /**
+   * Get category
+   * @return category
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Category getCategory() {
+    return category;
+  }
+
+
+  public void setCategory(Category category) {
+    this.category = category;
+  }
+
+
+  public Pet name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @ApiModelProperty(example = "doggie", required = true, value = "")
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  public Pet photoUrls(Set<String> photoUrls) {
+    
+    this.photoUrls = photoUrls;
+    return this;
+  }
+
+  public Pet addPhotoUrlsItem(String photoUrlsItem) {
+    this.photoUrls.add(photoUrlsItem);
+    return this;
+  }
+
+   /**
+   * Get photoUrls
+   * @return photoUrls
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public Set<String> getPhotoUrls() {
+    return photoUrls;
+  }
+
+
+  public void setPhotoUrls(Set<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+
+  public Pet tags(List<Tag> tags) {
+    
+    this.tags = tags;
+    return this;
+  }
+
+  public Pet addTagsItem(Tag tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<Tag>();
+    }
+    this.tags.add(tagsItem);
+    return this;
+  }
+
+   /**
+   * Get tags
+   * @return tags
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<Tag> getTags() {
+    return tags;
+  }
+
+
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+
+  public Pet status(StatusEnum status) {
+    
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * pet status in the store
+   * @return status
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "pet status in the store")
+
+  public StatusEnum getStatus() {
+    return status;
+  }
+
+
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Pet pet = (Pet) o;
+    return Objects.equals(this.id, pet.id) &&
+        Objects.equals(this.category, pet.category) &&
+        Objects.equals(this.name, pet.name) &&
+        Objects.equals(this.photoUrls, pet.photoUrls) &&
+        Objects.equals(this.tags, pet.tags) &&
+        Objects.equals(this.status, pet.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, category, name, photoUrls, tags, status);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Pet {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
new file mode 100644
index 000000000000..991726d89632
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -0,0 +1,119 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * ReadOnlyFirst
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ReadOnlyFirst {
+  public static final String SERIALIZED_NAME_BAR = "bar";
+  @SerializedName(SERIALIZED_NAME_BAR)
+  private String bar;
+
+  public static final String SERIALIZED_NAME_BAZ = "baz";
+  @SerializedName(SERIALIZED_NAME_BAZ)
+  private String baz;
+
+
+   /**
+   * Get bar
+   * @return bar
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getBar() {
+    return bar;
+  }
+
+
+
+
+  public ReadOnlyFirst baz(String baz) {
+    
+    this.baz = baz;
+    return this;
+  }
+
+   /**
+   * Get baz
+   * @return baz
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getBaz() {
+    return baz;
+  }
+
+
+  public void setBaz(String baz) {
+    this.baz = baz;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
+    return Objects.equals(this.bar, readOnlyFirst.bar) &&
+        Objects.equals(this.baz, readOnlyFirst.baz);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, baz);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ReadOnlyFirst {\n");
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    baz: ").append(toIndentedString(baz)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/SpecialModelName.java
new file mode 100644
index 000000000000..9e64e21d5856
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -0,0 +1,99 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * SpecialModelName
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class SpecialModelName {
+  public static final String SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
+  @SerializedName(SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME)
+  private Long $specialPropertyName;
+
+
+  public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
+    
+    this.$specialPropertyName = $specialPropertyName;
+    return this;
+  }
+
+   /**
+   * Get $specialPropertyName
+   * @return $specialPropertyName
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Long get$SpecialPropertyName() {
+    return $specialPropertyName;
+  }
+
+
+  public void set$SpecialPropertyName(Long $specialPropertyName) {
+    this.$specialPropertyName = $specialPropertyName;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SpecialModelName $specialModelName = (SpecialModelName) o;
+    return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash($specialPropertyName);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    sb.append("    $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Tag.java
new file mode 100644
index 000000000000..259f762b292d
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Tag.java
@@ -0,0 +1,128 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * Tag
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Tag {
+  public static final String SERIALIZED_NAME_ID = "id";
+  @SerializedName(SERIALIZED_NAME_ID)
+  private Long id;
+
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
+  private String name;
+
+
+  public Tag id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public Tag name(String name) {
+    
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getName() {
+    return name;
+  }
+
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Tag tag = (Tag) o;
+    return Objects.equals(this.id, tag.id) &&
+        Objects.equals(this.name, tag.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Tag {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
new file mode 100644
index 000000000000..f3fdb3b0196d
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -0,0 +1,218 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * TypeHolderDefault
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class TypeHolderDefault {
+  public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
+  @SerializedName(SERIALIZED_NAME_STRING_ITEM)
+  private String stringItem = "what";
+
+  public static final String SERIALIZED_NAME_NUMBER_ITEM = "number_item";
+  @SerializedName(SERIALIZED_NAME_NUMBER_ITEM)
+  private BigDecimal numberItem;
+
+  public static final String SERIALIZED_NAME_INTEGER_ITEM = "integer_item";
+  @SerializedName(SERIALIZED_NAME_INTEGER_ITEM)
+  private Integer integerItem;
+
+  public static final String SERIALIZED_NAME_BOOL_ITEM = "bool_item";
+  @SerializedName(SERIALIZED_NAME_BOOL_ITEM)
+  private Boolean boolItem = true;
+
+  public static final String SERIALIZED_NAME_ARRAY_ITEM = "array_item";
+  @SerializedName(SERIALIZED_NAME_ARRAY_ITEM)
+  private List<Integer> arrayItem = new ArrayList<Integer>();
+
+
+  public TypeHolderDefault stringItem(String stringItem) {
+    
+    this.stringItem = stringItem;
+    return this;
+  }
+
+   /**
+   * Get stringItem
+   * @return stringItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public String getStringItem() {
+    return stringItem;
+  }
+
+
+  public void setStringItem(String stringItem) {
+    this.stringItem = stringItem;
+  }
+
+
+  public TypeHolderDefault numberItem(BigDecimal numberItem) {
+    
+    this.numberItem = numberItem;
+    return this;
+  }
+
+   /**
+   * Get numberItem
+   * @return numberItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public BigDecimal getNumberItem() {
+    return numberItem;
+  }
+
+
+  public void setNumberItem(BigDecimal numberItem) {
+    this.numberItem = numberItem;
+  }
+
+
+  public TypeHolderDefault integerItem(Integer integerItem) {
+    
+    this.integerItem = integerItem;
+    return this;
+  }
+
+   /**
+   * Get integerItem
+   * @return integerItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public Integer getIntegerItem() {
+    return integerItem;
+  }
+
+
+  public void setIntegerItem(Integer integerItem) {
+    this.integerItem = integerItem;
+  }
+
+
+  public TypeHolderDefault boolItem(Boolean boolItem) {
+    
+    this.boolItem = boolItem;
+    return this;
+  }
+
+   /**
+   * Get boolItem
+   * @return boolItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public Boolean getBoolItem() {
+    return boolItem;
+  }
+
+
+  public void setBoolItem(Boolean boolItem) {
+    this.boolItem = boolItem;
+  }
+
+
+  public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
+    
+    this.arrayItem = arrayItem;
+    return this;
+  }
+
+  public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
+    this.arrayItem.add(arrayItemItem);
+    return this;
+  }
+
+   /**
+   * Get arrayItem
+   * @return arrayItem
+  **/
+  @ApiModelProperty(required = true, value = "")
+
+  public List<Integer> getArrayItem() {
+    return arrayItem;
+  }
+
+
+  public void setArrayItem(List<Integer> arrayItem) {
+    this.arrayItem = arrayItem;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o;
+    return Objects.equals(this.stringItem, typeHolderDefault.stringItem) &&
+        Objects.equals(this.numberItem, typeHolderDefault.numberItem) &&
+        Objects.equals(this.integerItem, typeHolderDefault.integerItem) &&
+        Objects.equals(this.boolItem, typeHolderDefault.boolItem) &&
+        Objects.equals(this.arrayItem, typeHolderDefault.arrayItem);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class TypeHolderDefault {\n");
+    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
+    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
+    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
+    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
+    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java
new file mode 100644
index 000000000000..f72745a6b0ba
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -0,0 +1,246 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * TypeHolderExample
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class TypeHolderExample {
+  public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
+  @SerializedName(SERIALIZED_NAME_STRING_ITEM)
+  private String stringItem;
+
+  public static final String SERIALIZED_NAME_NUMBER_ITEM = "number_item";
+  @SerializedName(SERIALIZED_NAME_NUMBER_ITEM)
+  private BigDecimal numberItem;
+
+  public static final String SERIALIZED_NAME_FLOAT_ITEM = "float_item";
+  @SerializedName(SERIALIZED_NAME_FLOAT_ITEM)
+  private Float floatItem;
+
+  public static final String SERIALIZED_NAME_INTEGER_ITEM = "integer_item";
+  @SerializedName(SERIALIZED_NAME_INTEGER_ITEM)
+  private Integer integerItem;
+
+  public static final String SERIALIZED_NAME_BOOL_ITEM = "bool_item";
+  @SerializedName(SERIALIZED_NAME_BOOL_ITEM)
+  private Boolean boolItem;
+
+  public static final String SERIALIZED_NAME_ARRAY_ITEM = "array_item";
+  @SerializedName(SERIALIZED_NAME_ARRAY_ITEM)
+  private List<Integer> arrayItem = new ArrayList<Integer>();
+
+
+  public TypeHolderExample stringItem(String stringItem) {
+    
+    this.stringItem = stringItem;
+    return this;
+  }
+
+   /**
+   * Get stringItem
+   * @return stringItem
+  **/
+  @ApiModelProperty(example = "what", required = true, value = "")
+
+  public String getStringItem() {
+    return stringItem;
+  }
+
+
+  public void setStringItem(String stringItem) {
+    this.stringItem = stringItem;
+  }
+
+
+  public TypeHolderExample numberItem(BigDecimal numberItem) {
+    
+    this.numberItem = numberItem;
+    return this;
+  }
+
+   /**
+   * Get numberItem
+   * @return numberItem
+  **/
+  @ApiModelProperty(example = "1.234", required = true, value = "")
+
+  public BigDecimal getNumberItem() {
+    return numberItem;
+  }
+
+
+  public void setNumberItem(BigDecimal numberItem) {
+    this.numberItem = numberItem;
+  }
+
+
+  public TypeHolderExample floatItem(Float floatItem) {
+    
+    this.floatItem = floatItem;
+    return this;
+  }
+
+   /**
+   * Get floatItem
+   * @return floatItem
+  **/
+  @ApiModelProperty(example = "1.234", required = true, value = "")
+
+  public Float getFloatItem() {
+    return floatItem;
+  }
+
+
+  public void setFloatItem(Float floatItem) {
+    this.floatItem = floatItem;
+  }
+
+
+  public TypeHolderExample integerItem(Integer integerItem) {
+    
+    this.integerItem = integerItem;
+    return this;
+  }
+
+   /**
+   * Get integerItem
+   * @return integerItem
+  **/
+  @ApiModelProperty(example = "-2", required = true, value = "")
+
+  public Integer getIntegerItem() {
+    return integerItem;
+  }
+
+
+  public void setIntegerItem(Integer integerItem) {
+    this.integerItem = integerItem;
+  }
+
+
+  public TypeHolderExample boolItem(Boolean boolItem) {
+    
+    this.boolItem = boolItem;
+    return this;
+  }
+
+   /**
+   * Get boolItem
+   * @return boolItem
+  **/
+  @ApiModelProperty(example = "true", required = true, value = "")
+
+  public Boolean getBoolItem() {
+    return boolItem;
+  }
+
+
+  public void setBoolItem(Boolean boolItem) {
+    this.boolItem = boolItem;
+  }
+
+
+  public TypeHolderExample arrayItem(List<Integer> arrayItem) {
+    
+    this.arrayItem = arrayItem;
+    return this;
+  }
+
+  public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
+    this.arrayItem.add(arrayItemItem);
+    return this;
+  }
+
+   /**
+   * Get arrayItem
+   * @return arrayItem
+  **/
+  @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
+
+  public List<Integer> getArrayItem() {
+    return arrayItem;
+  }
+
+
+  public void setArrayItem(List<Integer> arrayItem) {
+    this.arrayItem = arrayItem;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TypeHolderExample typeHolderExample = (TypeHolderExample) o;
+    return Objects.equals(this.stringItem, typeHolderExample.stringItem) &&
+        Objects.equals(this.numberItem, typeHolderExample.numberItem) &&
+        Objects.equals(this.floatItem, typeHolderExample.floatItem) &&
+        Objects.equals(this.integerItem, typeHolderExample.integerItem) &&
+        Objects.equals(this.boolItem, typeHolderExample.boolItem) &&
+        Objects.equals(this.arrayItem, typeHolderExample.arrayItem);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class TypeHolderExample {\n");
+    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
+    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
+    sb.append("    floatItem: ").append(toIndentedString(floatItem)).append("\n");
+    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
+    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
+    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/User.java
new file mode 100644
index 000000000000..349a04836d16
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/User.java
@@ -0,0 +1,302 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * User
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class User {
+  public static final String SERIALIZED_NAME_ID = "id";
+  @SerializedName(SERIALIZED_NAME_ID)
+  private Long id;
+
+  public static final String SERIALIZED_NAME_USERNAME = "username";
+  @SerializedName(SERIALIZED_NAME_USERNAME)
+  private String username;
+
+  public static final String SERIALIZED_NAME_FIRST_NAME = "firstName";
+  @SerializedName(SERIALIZED_NAME_FIRST_NAME)
+  private String firstName;
+
+  public static final String SERIALIZED_NAME_LAST_NAME = "lastName";
+  @SerializedName(SERIALIZED_NAME_LAST_NAME)
+  private String lastName;
+
+  public static final String SERIALIZED_NAME_EMAIL = "email";
+  @SerializedName(SERIALIZED_NAME_EMAIL)
+  private String email;
+
+  public static final String SERIALIZED_NAME_PASSWORD = "password";
+  @SerializedName(SERIALIZED_NAME_PASSWORD)
+  private String password;
+
+  public static final String SERIALIZED_NAME_PHONE = "phone";
+  @SerializedName(SERIALIZED_NAME_PHONE)
+  private String phone;
+
+  public static final String SERIALIZED_NAME_USER_STATUS = "userStatus";
+  @SerializedName(SERIALIZED_NAME_USER_STATUS)
+  private Integer userStatus;
+
+
+  public User id(Long id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public Long getId() {
+    return id;
+  }
+
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  public User username(String username) {
+    
+    this.username = username;
+    return this;
+  }
+
+   /**
+   * Get username
+   * @return username
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getUsername() {
+    return username;
+  }
+
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+
+  public User firstName(String firstName) {
+    
+    this.firstName = firstName;
+    return this;
+  }
+
+   /**
+   * Get firstName
+   * @return firstName
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getFirstName() {
+    return firstName;
+  }
+
+
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+
+  public User lastName(String lastName) {
+    
+    this.lastName = lastName;
+    return this;
+  }
+
+   /**
+   * Get lastName
+   * @return lastName
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getLastName() {
+    return lastName;
+  }
+
+
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+
+  public User email(String email) {
+    
+    this.email = email;
+    return this;
+  }
+
+   /**
+   * Get email
+   * @return email
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getEmail() {
+    return email;
+  }
+
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+
+  public User password(String password) {
+    
+    this.password = password;
+    return this;
+  }
+
+   /**
+   * Get password
+   * @return password
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getPassword() {
+    return password;
+  }
+
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  public User phone(String phone) {
+    
+    this.phone = phone;
+    return this;
+  }
+
+   /**
+   * Get phone
+   * @return phone
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getPhone() {
+    return phone;
+  }
+
+
+  public void setPhone(String phone) {
+    this.phone = phone;
+  }
+
+
+  public User userStatus(Integer userStatus) {
+    
+    this.userStatus = userStatus;
+    return this;
+  }
+
+   /**
+   * User Status
+   * @return userStatus
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "User Status")
+
+  public Integer getUserStatus() {
+    return userStatus;
+  }
+
+
+  public void setUserStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    User user = (User) o;
+    return Objects.equals(this.id, user.id) &&
+        Objects.equals(this.username, user.username) &&
+        Objects.equals(this.firstName, user.firstName) &&
+        Objects.equals(this.lastName, user.lastName) &&
+        Objects.equals(this.email, user.email) &&
+        Objects.equals(this.password, user.password) &&
+        Objects.equals(this.phone, user.phone) &&
+        Objects.equals(this.userStatus, user.userStatus);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class User {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    username: ").append(toIndentedString(username)).append("\n");
+    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
+    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
+    sb.append("    email: ").append(toIndentedString(email)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
+    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java
new file mode 100644
index 000000000000..ae1d289ac2c3
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -0,0 +1,986 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * XmlItem
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class XmlItem {
+  public static final String SERIALIZED_NAME_ATTRIBUTE_STRING = "attribute_string";
+  @SerializedName(SERIALIZED_NAME_ATTRIBUTE_STRING)
+  private String attributeString;
+
+  public static final String SERIALIZED_NAME_ATTRIBUTE_NUMBER = "attribute_number";
+  @SerializedName(SERIALIZED_NAME_ATTRIBUTE_NUMBER)
+  private BigDecimal attributeNumber;
+
+  public static final String SERIALIZED_NAME_ATTRIBUTE_INTEGER = "attribute_integer";
+  @SerializedName(SERIALIZED_NAME_ATTRIBUTE_INTEGER)
+  private Integer attributeInteger;
+
+  public static final String SERIALIZED_NAME_ATTRIBUTE_BOOLEAN = "attribute_boolean";
+  @SerializedName(SERIALIZED_NAME_ATTRIBUTE_BOOLEAN)
+  private Boolean attributeBoolean;
+
+  public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array";
+  @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY)
+  private List<Integer> wrappedArray = null;
+
+  public static final String SERIALIZED_NAME_NAME_STRING = "name_string";
+  @SerializedName(SERIALIZED_NAME_NAME_STRING)
+  private String nameString;
+
+  public static final String SERIALIZED_NAME_NAME_NUMBER = "name_number";
+  @SerializedName(SERIALIZED_NAME_NAME_NUMBER)
+  private BigDecimal nameNumber;
+
+  public static final String SERIALIZED_NAME_NAME_INTEGER = "name_integer";
+  @SerializedName(SERIALIZED_NAME_NAME_INTEGER)
+  private Integer nameInteger;
+
+  public static final String SERIALIZED_NAME_NAME_BOOLEAN = "name_boolean";
+  @SerializedName(SERIALIZED_NAME_NAME_BOOLEAN)
+  private Boolean nameBoolean;
+
+  public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array";
+  @SerializedName(SERIALIZED_NAME_NAME_ARRAY)
+  private List<Integer> nameArray = null;
+
+  public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array";
+  @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY)
+  private List<Integer> nameWrappedArray = null;
+
+  public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string";
+  @SerializedName(SERIALIZED_NAME_PREFIX_STRING)
+  private String prefixString;
+
+  public static final String SERIALIZED_NAME_PREFIX_NUMBER = "prefix_number";
+  @SerializedName(SERIALIZED_NAME_PREFIX_NUMBER)
+  private BigDecimal prefixNumber;
+
+  public static final String SERIALIZED_NAME_PREFIX_INTEGER = "prefix_integer";
+  @SerializedName(SERIALIZED_NAME_PREFIX_INTEGER)
+  private Integer prefixInteger;
+
+  public static final String SERIALIZED_NAME_PREFIX_BOOLEAN = "prefix_boolean";
+  @SerializedName(SERIALIZED_NAME_PREFIX_BOOLEAN)
+  private Boolean prefixBoolean;
+
+  public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array";
+  @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY)
+  private List<Integer> prefixArray = null;
+
+  public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array";
+  @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY)
+  private List<Integer> prefixWrappedArray = null;
+
+  public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string";
+  @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING)
+  private String namespaceString;
+
+  public static final String SERIALIZED_NAME_NAMESPACE_NUMBER = "namespace_number";
+  @SerializedName(SERIALIZED_NAME_NAMESPACE_NUMBER)
+  private BigDecimal namespaceNumber;
+
+  public static final String SERIALIZED_NAME_NAMESPACE_INTEGER = "namespace_integer";
+  @SerializedName(SERIALIZED_NAME_NAMESPACE_INTEGER)
+  private Integer namespaceInteger;
+
+  public static final String SERIALIZED_NAME_NAMESPACE_BOOLEAN = "namespace_boolean";
+  @SerializedName(SERIALIZED_NAME_NAMESPACE_BOOLEAN)
+  private Boolean namespaceBoolean;
+
+  public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array";
+  @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY)
+  private List<Integer> namespaceArray = null;
+
+  public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array";
+  @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY)
+  private List<Integer> namespaceWrappedArray = null;
+
+  public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string";
+  @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING)
+  private String prefixNsString;
+
+  public static final String SERIALIZED_NAME_PREFIX_NS_NUMBER = "prefix_ns_number";
+  @SerializedName(SERIALIZED_NAME_PREFIX_NS_NUMBER)
+  private BigDecimal prefixNsNumber;
+
+  public static final String SERIALIZED_NAME_PREFIX_NS_INTEGER = "prefix_ns_integer";
+  @SerializedName(SERIALIZED_NAME_PREFIX_NS_INTEGER)
+  private Integer prefixNsInteger;
+
+  public static final String SERIALIZED_NAME_PREFIX_NS_BOOLEAN = "prefix_ns_boolean";
+  @SerializedName(SERIALIZED_NAME_PREFIX_NS_BOOLEAN)
+  private Boolean prefixNsBoolean;
+
+  public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array";
+  @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY)
+  private List<Integer> prefixNsArray = null;
+
+  public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
+  @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY)
+  private List<Integer> prefixNsWrappedArray = null;
+
+
+  public XmlItem attributeString(String attributeString) {
+    
+    this.attributeString = attributeString;
+    return this;
+  }
+
+   /**
+   * Get attributeString
+   * @return attributeString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+
+  public String getAttributeString() {
+    return attributeString;
+  }
+
+
+  public void setAttributeString(String attributeString) {
+    this.attributeString = attributeString;
+  }
+
+
+  public XmlItem attributeNumber(BigDecimal attributeNumber) {
+    
+    this.attributeNumber = attributeNumber;
+    return this;
+  }
+
+   /**
+   * Get attributeNumber
+   * @return attributeNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+
+  public BigDecimal getAttributeNumber() {
+    return attributeNumber;
+  }
+
+
+  public void setAttributeNumber(BigDecimal attributeNumber) {
+    this.attributeNumber = attributeNumber;
+  }
+
+
+  public XmlItem attributeInteger(Integer attributeInteger) {
+    
+    this.attributeInteger = attributeInteger;
+    return this;
+  }
+
+   /**
+   * Get attributeInteger
+   * @return attributeInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+
+  public Integer getAttributeInteger() {
+    return attributeInteger;
+  }
+
+
+  public void setAttributeInteger(Integer attributeInteger) {
+    this.attributeInteger = attributeInteger;
+  }
+
+
+  public XmlItem attributeBoolean(Boolean attributeBoolean) {
+    
+    this.attributeBoolean = attributeBoolean;
+    return this;
+  }
+
+   /**
+   * Get attributeBoolean
+   * @return attributeBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+
+  public Boolean getAttributeBoolean() {
+    return attributeBoolean;
+  }
+
+
+  public void setAttributeBoolean(Boolean attributeBoolean) {
+    this.attributeBoolean = attributeBoolean;
+  }
+
+
+  public XmlItem wrappedArray(List<Integer> wrappedArray) {
+    
+    this.wrappedArray = wrappedArray;
+    return this;
+  }
+
+  public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
+    if (this.wrappedArray == null) {
+      this.wrappedArray = new ArrayList<Integer>();
+    }
+    this.wrappedArray.add(wrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get wrappedArray
+   * @return wrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<Integer> getWrappedArray() {
+    return wrappedArray;
+  }
+
+
+  public void setWrappedArray(List<Integer> wrappedArray) {
+    this.wrappedArray = wrappedArray;
+  }
+
+
+  public XmlItem nameString(String nameString) {
+    
+    this.nameString = nameString;
+    return this;
+  }
+
+   /**
+   * Get nameString
+   * @return nameString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+
+  public String getNameString() {
+    return nameString;
+  }
+
+
+  public void setNameString(String nameString) {
+    this.nameString = nameString;
+  }
+
+
+  public XmlItem nameNumber(BigDecimal nameNumber) {
+    
+    this.nameNumber = nameNumber;
+    return this;
+  }
+
+   /**
+   * Get nameNumber
+   * @return nameNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+
+  public BigDecimal getNameNumber() {
+    return nameNumber;
+  }
+
+
+  public void setNameNumber(BigDecimal nameNumber) {
+    this.nameNumber = nameNumber;
+  }
+
+
+  public XmlItem nameInteger(Integer nameInteger) {
+    
+    this.nameInteger = nameInteger;
+    return this;
+  }
+
+   /**
+   * Get nameInteger
+   * @return nameInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+
+  public Integer getNameInteger() {
+    return nameInteger;
+  }
+
+
+  public void setNameInteger(Integer nameInteger) {
+    this.nameInteger = nameInteger;
+  }
+
+
+  public XmlItem nameBoolean(Boolean nameBoolean) {
+    
+    this.nameBoolean = nameBoolean;
+    return this;
+  }
+
+   /**
+   * Get nameBoolean
+   * @return nameBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+
+  public Boolean getNameBoolean() {
+    return nameBoolean;
+  }
+
+
+  public void setNameBoolean(Boolean nameBoolean) {
+    this.nameBoolean = nameBoolean;
+  }
+
+
+  public XmlItem nameArray(List<Integer> nameArray) {
+    
+    this.nameArray = nameArray;
+    return this;
+  }
+
+  public XmlItem addNameArrayItem(Integer nameArrayItem) {
+    if (this.nameArray == null) {
+      this.nameArray = new ArrayList<Integer>();
+    }
+    this.nameArray.add(nameArrayItem);
+    return this;
+  }
+
+   /**
+   * Get nameArray
+   * @return nameArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<Integer> getNameArray() {
+    return nameArray;
+  }
+
+
+  public void setNameArray(List<Integer> nameArray) {
+    this.nameArray = nameArray;
+  }
+
+
+  public XmlItem nameWrappedArray(List<Integer> nameWrappedArray) {
+    
+    this.nameWrappedArray = nameWrappedArray;
+    return this;
+  }
+
+  public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
+    if (this.nameWrappedArray == null) {
+      this.nameWrappedArray = new ArrayList<Integer>();
+    }
+    this.nameWrappedArray.add(nameWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get nameWrappedArray
+   * @return nameWrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<Integer> getNameWrappedArray() {
+    return nameWrappedArray;
+  }
+
+
+  public void setNameWrappedArray(List<Integer> nameWrappedArray) {
+    this.nameWrappedArray = nameWrappedArray;
+  }
+
+
+  public XmlItem prefixString(String prefixString) {
+    
+    this.prefixString = prefixString;
+    return this;
+  }
+
+   /**
+   * Get prefixString
+   * @return prefixString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+
+  public String getPrefixString() {
+    return prefixString;
+  }
+
+
+  public void setPrefixString(String prefixString) {
+    this.prefixString = prefixString;
+  }
+
+
+  public XmlItem prefixNumber(BigDecimal prefixNumber) {
+    
+    this.prefixNumber = prefixNumber;
+    return this;
+  }
+
+   /**
+   * Get prefixNumber
+   * @return prefixNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+
+  public BigDecimal getPrefixNumber() {
+    return prefixNumber;
+  }
+
+
+  public void setPrefixNumber(BigDecimal prefixNumber) {
+    this.prefixNumber = prefixNumber;
+  }
+
+
+  public XmlItem prefixInteger(Integer prefixInteger) {
+    
+    this.prefixInteger = prefixInteger;
+    return this;
+  }
+
+   /**
+   * Get prefixInteger
+   * @return prefixInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+
+  public Integer getPrefixInteger() {
+    return prefixInteger;
+  }
+
+
+  public void setPrefixInteger(Integer prefixInteger) {
+    this.prefixInteger = prefixInteger;
+  }
+
+
+  public XmlItem prefixBoolean(Boolean prefixBoolean) {
+    
+    this.prefixBoolean = prefixBoolean;
+    return this;
+  }
+
+   /**
+   * Get prefixBoolean
+   * @return prefixBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+
+  public Boolean getPrefixBoolean() {
+    return prefixBoolean;
+  }
+
+
+  public void setPrefixBoolean(Boolean prefixBoolean) {
+    this.prefixBoolean = prefixBoolean;
+  }
+
+
+  public XmlItem prefixArray(List<Integer> prefixArray) {
+    
+    this.prefixArray = prefixArray;
+    return this;
+  }
+
+  public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
+    if (this.prefixArray == null) {
+      this.prefixArray = new ArrayList<Integer>();
+    }
+    this.prefixArray.add(prefixArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixArray
+   * @return prefixArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<Integer> getPrefixArray() {
+    return prefixArray;
+  }
+
+
+  public void setPrefixArray(List<Integer> prefixArray) {
+    this.prefixArray = prefixArray;
+  }
+
+
+  public XmlItem prefixWrappedArray(List<Integer> prefixWrappedArray) {
+    
+    this.prefixWrappedArray = prefixWrappedArray;
+    return this;
+  }
+
+  public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
+    if (this.prefixWrappedArray == null) {
+      this.prefixWrappedArray = new ArrayList<Integer>();
+    }
+    this.prefixWrappedArray.add(prefixWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixWrappedArray
+   * @return prefixWrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<Integer> getPrefixWrappedArray() {
+    return prefixWrappedArray;
+  }
+
+
+  public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
+    this.prefixWrappedArray = prefixWrappedArray;
+  }
+
+
+  public XmlItem namespaceString(String namespaceString) {
+    
+    this.namespaceString = namespaceString;
+    return this;
+  }
+
+   /**
+   * Get namespaceString
+   * @return namespaceString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+
+  public String getNamespaceString() {
+    return namespaceString;
+  }
+
+
+  public void setNamespaceString(String namespaceString) {
+    this.namespaceString = namespaceString;
+  }
+
+
+  public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
+    
+    this.namespaceNumber = namespaceNumber;
+    return this;
+  }
+
+   /**
+   * Get namespaceNumber
+   * @return namespaceNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+
+  public BigDecimal getNamespaceNumber() {
+    return namespaceNumber;
+  }
+
+
+  public void setNamespaceNumber(BigDecimal namespaceNumber) {
+    this.namespaceNumber = namespaceNumber;
+  }
+
+
+  public XmlItem namespaceInteger(Integer namespaceInteger) {
+    
+    this.namespaceInteger = namespaceInteger;
+    return this;
+  }
+
+   /**
+   * Get namespaceInteger
+   * @return namespaceInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+
+  public Integer getNamespaceInteger() {
+    return namespaceInteger;
+  }
+
+
+  public void setNamespaceInteger(Integer namespaceInteger) {
+    this.namespaceInteger = namespaceInteger;
+  }
+
+
+  public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
+    
+    this.namespaceBoolean = namespaceBoolean;
+    return this;
+  }
+
+   /**
+   * Get namespaceBoolean
+   * @return namespaceBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+
+  public Boolean getNamespaceBoolean() {
+    return namespaceBoolean;
+  }
+
+
+  public void setNamespaceBoolean(Boolean namespaceBoolean) {
+    this.namespaceBoolean = namespaceBoolean;
+  }
+
+
+  public XmlItem namespaceArray(List<Integer> namespaceArray) {
+    
+    this.namespaceArray = namespaceArray;
+    return this;
+  }
+
+  public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
+    if (this.namespaceArray == null) {
+      this.namespaceArray = new ArrayList<Integer>();
+    }
+    this.namespaceArray.add(namespaceArrayItem);
+    return this;
+  }
+
+   /**
+   * Get namespaceArray
+   * @return namespaceArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<Integer> getNamespaceArray() {
+    return namespaceArray;
+  }
+
+
+  public void setNamespaceArray(List<Integer> namespaceArray) {
+    this.namespaceArray = namespaceArray;
+  }
+
+
+  public XmlItem namespaceWrappedArray(List<Integer> namespaceWrappedArray) {
+    
+    this.namespaceWrappedArray = namespaceWrappedArray;
+    return this;
+  }
+
+  public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
+    if (this.namespaceWrappedArray == null) {
+      this.namespaceWrappedArray = new ArrayList<Integer>();
+    }
+    this.namespaceWrappedArray.add(namespaceWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get namespaceWrappedArray
+   * @return namespaceWrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<Integer> getNamespaceWrappedArray() {
+    return namespaceWrappedArray;
+  }
+
+
+  public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
+    this.namespaceWrappedArray = namespaceWrappedArray;
+  }
+
+
+  public XmlItem prefixNsString(String prefixNsString) {
+    
+    this.prefixNsString = prefixNsString;
+    return this;
+  }
+
+   /**
+   * Get prefixNsString
+   * @return prefixNsString
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "string", value = "")
+
+  public String getPrefixNsString() {
+    return prefixNsString;
+  }
+
+
+  public void setPrefixNsString(String prefixNsString) {
+    this.prefixNsString = prefixNsString;
+  }
+
+
+  public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
+    
+    this.prefixNsNumber = prefixNsNumber;
+    return this;
+  }
+
+   /**
+   * Get prefixNsNumber
+   * @return prefixNsNumber
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "1.234", value = "")
+
+  public BigDecimal getPrefixNsNumber() {
+    return prefixNsNumber;
+  }
+
+
+  public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
+    this.prefixNsNumber = prefixNsNumber;
+  }
+
+
+  public XmlItem prefixNsInteger(Integer prefixNsInteger) {
+    
+    this.prefixNsInteger = prefixNsInteger;
+    return this;
+  }
+
+   /**
+   * Get prefixNsInteger
+   * @return prefixNsInteger
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "-2", value = "")
+
+  public Integer getPrefixNsInteger() {
+    return prefixNsInteger;
+  }
+
+
+  public void setPrefixNsInteger(Integer prefixNsInteger) {
+    this.prefixNsInteger = prefixNsInteger;
+  }
+
+
+  public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
+    
+    this.prefixNsBoolean = prefixNsBoolean;
+    return this;
+  }
+
+   /**
+   * Get prefixNsBoolean
+   * @return prefixNsBoolean
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(example = "true", value = "")
+
+  public Boolean getPrefixNsBoolean() {
+    return prefixNsBoolean;
+  }
+
+
+  public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
+    this.prefixNsBoolean = prefixNsBoolean;
+  }
+
+
+  public XmlItem prefixNsArray(List<Integer> prefixNsArray) {
+    
+    this.prefixNsArray = prefixNsArray;
+    return this;
+  }
+
+  public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
+    if (this.prefixNsArray == null) {
+      this.prefixNsArray = new ArrayList<Integer>();
+    }
+    this.prefixNsArray.add(prefixNsArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixNsArray
+   * @return prefixNsArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<Integer> getPrefixNsArray() {
+    return prefixNsArray;
+  }
+
+
+  public void setPrefixNsArray(List<Integer> prefixNsArray) {
+    this.prefixNsArray = prefixNsArray;
+  }
+
+
+  public XmlItem prefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
+    
+    this.prefixNsWrappedArray = prefixNsWrappedArray;
+    return this;
+  }
+
+  public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
+    if (this.prefixNsWrappedArray == null) {
+      this.prefixNsWrappedArray = new ArrayList<Integer>();
+    }
+    this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixNsWrappedArray
+   * @return prefixNsWrappedArray
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public List<Integer> getPrefixNsWrappedArray() {
+    return prefixNsWrappedArray;
+  }
+
+
+  public void setPrefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
+    this.prefixNsWrappedArray = prefixNsWrappedArray;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    XmlItem xmlItem = (XmlItem) o;
+    return Objects.equals(this.attributeString, xmlItem.attributeString) &&
+        Objects.equals(this.attributeNumber, xmlItem.attributeNumber) &&
+        Objects.equals(this.attributeInteger, xmlItem.attributeInteger) &&
+        Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) &&
+        Objects.equals(this.wrappedArray, xmlItem.wrappedArray) &&
+        Objects.equals(this.nameString, xmlItem.nameString) &&
+        Objects.equals(this.nameNumber, xmlItem.nameNumber) &&
+        Objects.equals(this.nameInteger, xmlItem.nameInteger) &&
+        Objects.equals(this.nameBoolean, xmlItem.nameBoolean) &&
+        Objects.equals(this.nameArray, xmlItem.nameArray) &&
+        Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) &&
+        Objects.equals(this.prefixString, xmlItem.prefixString) &&
+        Objects.equals(this.prefixNumber, xmlItem.prefixNumber) &&
+        Objects.equals(this.prefixInteger, xmlItem.prefixInteger) &&
+        Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) &&
+        Objects.equals(this.prefixArray, xmlItem.prefixArray) &&
+        Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) &&
+        Objects.equals(this.namespaceString, xmlItem.namespaceString) &&
+        Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) &&
+        Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) &&
+        Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) &&
+        Objects.equals(this.namespaceArray, xmlItem.namespaceArray) &&
+        Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) &&
+        Objects.equals(this.prefixNsString, xmlItem.prefixNsString) &&
+        Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) &&
+        Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) &&
+        Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) &&
+        Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) &&
+        Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class XmlItem {\n");
+    sb.append("    attributeString: ").append(toIndentedString(attributeString)).append("\n");
+    sb.append("    attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n");
+    sb.append("    attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n");
+    sb.append("    attributeBoolean: ").append(toIndentedString(attributeBoolean)).append("\n");
+    sb.append("    wrappedArray: ").append(toIndentedString(wrappedArray)).append("\n");
+    sb.append("    nameString: ").append(toIndentedString(nameString)).append("\n");
+    sb.append("    nameNumber: ").append(toIndentedString(nameNumber)).append("\n");
+    sb.append("    nameInteger: ").append(toIndentedString(nameInteger)).append("\n");
+    sb.append("    nameBoolean: ").append(toIndentedString(nameBoolean)).append("\n");
+    sb.append("    nameArray: ").append(toIndentedString(nameArray)).append("\n");
+    sb.append("    nameWrappedArray: ").append(toIndentedString(nameWrappedArray)).append("\n");
+    sb.append("    prefixString: ").append(toIndentedString(prefixString)).append("\n");
+    sb.append("    prefixNumber: ").append(toIndentedString(prefixNumber)).append("\n");
+    sb.append("    prefixInteger: ").append(toIndentedString(prefixInteger)).append("\n");
+    sb.append("    prefixBoolean: ").append(toIndentedString(prefixBoolean)).append("\n");
+    sb.append("    prefixArray: ").append(toIndentedString(prefixArray)).append("\n");
+    sb.append("    prefixWrappedArray: ").append(toIndentedString(prefixWrappedArray)).append("\n");
+    sb.append("    namespaceString: ").append(toIndentedString(namespaceString)).append("\n");
+    sb.append("    namespaceNumber: ").append(toIndentedString(namespaceNumber)).append("\n");
+    sb.append("    namespaceInteger: ").append(toIndentedString(namespaceInteger)).append("\n");
+    sb.append("    namespaceBoolean: ").append(toIndentedString(namespaceBoolean)).append("\n");
+    sb.append("    namespaceArray: ").append(toIndentedString(namespaceArray)).append("\n");
+    sb.append("    namespaceWrappedArray: ").append(toIndentedString(namespaceWrappedArray)).append("\n");
+    sb.append("    prefixNsString: ").append(toIndentedString(prefixNsString)).append("\n");
+    sb.append("    prefixNsNumber: ").append(toIndentedString(prefixNsNumber)).append("\n");
+    sb.append("    prefixNsInteger: ").append(toIndentedString(prefixNsInteger)).append("\n");
+    sb.append("    prefixNsBoolean: ").append(toIndentedString(prefixNsBoolean)).append("\n");
+    sb.append("    prefixNsArray: ").append(toIndentedString(prefixNsArray)).append("\n");
+    sb.append("    prefixNsWrappedArray: ").append(toIndentedString(prefixNsWrappedArray)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
new file mode 100644
index 000000000000..d53aa9ca7351
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
@@ -0,0 +1,37 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.model.Client;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for AnotherFakeApi
+ */
+public class AnotherFakeApiTest {
+
+    private AnotherFakeApi api;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().createService(AnotherFakeApi.class);
+    }
+
+    /**
+     * To test special tags
+     *
+     * To test special tags and operation ID starting with number
+     */
+    @Test
+    public void call123testSpecialTagsTest() {
+        Client body = null;
+        // Client response = api.call123testSpecialTags(body);
+
+        // TODO: test validations
+    }
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/FakeApiTest.java
new file mode 100644
index 000000000000..69ae2c9fc5f4
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -0,0 +1,232 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import java.math.BigDecimal;
+import org.openapitools.client.model.Client;
+import java.io.File;
+import org.openapitools.client.model.FileSchemaTestClass;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+import org.openapitools.client.model.OuterComposite;
+import org.openapitools.client.model.User;
+import org.openapitools.client.model.XmlItem;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for FakeApi
+ */
+public class FakeApiTest {
+
+    private FakeApi api;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().createService(FakeApi.class);
+    }
+
+    /**
+     * creates an XmlItem
+     *
+     * this route creates an XmlItem
+     */
+    @Test
+    public void createXmlItemTest() {
+        XmlItem xmlItem = null;
+        // api.createXmlItem(xmlItem);
+
+        // TODO: test validations
+    }
+    /**
+     * 
+     *
+     * Test serialization of outer boolean types
+     */
+    @Test
+    public void fakeOuterBooleanSerializeTest() {
+        Boolean body = null;
+        // Boolean response = api.fakeOuterBooleanSerialize(body);
+
+        // TODO: test validations
+    }
+    /**
+     * 
+     *
+     * Test serialization of object with outer number type
+     */
+    @Test
+    public void fakeOuterCompositeSerializeTest() {
+        OuterComposite body = null;
+        // OuterComposite response = api.fakeOuterCompositeSerialize(body);
+
+        // TODO: test validations
+    }
+    /**
+     * 
+     *
+     * Test serialization of outer number types
+     */
+    @Test
+    public void fakeOuterNumberSerializeTest() {
+        BigDecimal body = null;
+        // BigDecimal response = api.fakeOuterNumberSerialize(body);
+
+        // TODO: test validations
+    }
+    /**
+     * 
+     *
+     * Test serialization of outer string types
+     */
+    @Test
+    public void fakeOuterStringSerializeTest() {
+        String body = null;
+        // String response = api.fakeOuterStringSerialize(body);
+
+        // TODO: test validations
+    }
+    /**
+     * 
+     *
+     * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+     */
+    @Test
+    public void testBodyWithFileSchemaTest() {
+        FileSchemaTestClass body = null;
+        // api.testBodyWithFileSchema(body);
+
+        // TODO: test validations
+    }
+    /**
+     * 
+     *
+     * 
+     */
+    @Test
+    public void testBodyWithQueryParamsTest() {
+        String query = null;
+        User body = null;
+        // api.testBodyWithQueryParams(query, body);
+
+        // TODO: test validations
+    }
+    /**
+     * To test \&quot;client\&quot; model
+     *
+     * To test \&quot;client\&quot; model
+     */
+    @Test
+    public void testClientModelTest() {
+        Client body = null;
+        // Client response = api.testClientModel(body);
+
+        // TODO: test validations
+    }
+    /**
+     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+     *
+     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+     */
+    @Test
+    public void testEndpointParametersTest() {
+        BigDecimal number = null;
+        Double _double = null;
+        String patternWithoutDelimiter = null;
+        byte[] _byte = null;
+        Integer integer = null;
+        Integer int32 = null;
+        Long int64 = null;
+        Float _float = null;
+        String string = null;
+        File binary = null;
+        LocalDate date = null;
+        OffsetDateTime dateTime = null;
+        String password = null;
+        String paramCallback = null;
+        // api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+
+        // TODO: test validations
+    }
+    /**
+     * To test enum parameters
+     *
+     * To test enum parameters
+     */
+    @Test
+    public void testEnumParametersTest() {
+        List<String> enumHeaderStringArray = null;
+        String enumHeaderString = null;
+        List<String> enumQueryStringArray = null;
+        String enumQueryString = null;
+        Integer enumQueryInteger = null;
+        Double enumQueryDouble = null;
+        List<String> enumFormStringArray = null;
+        String enumFormString = null;
+        // api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+
+        // TODO: test validations
+    }
+    /**
+     * Fake endpoint to test group parameters (optional)
+     *
+     * Fake endpoint to test group parameters (optional)
+     */
+    @Test
+    public void testGroupParametersTest() {
+        Integer requiredStringGroup = null;
+        Boolean requiredBooleanGroup = null;
+        Long requiredInt64Group = null;
+        Integer stringGroup = null;
+        Boolean booleanGroup = null;
+        Long int64Group = null;
+        // api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+
+        // TODO: test validations
+    }
+    /**
+     * test inline additionalProperties
+     *
+     * 
+     */
+    @Test
+    public void testInlineAdditionalPropertiesTest() {
+        Map<String, String> param = null;
+        // api.testInlineAdditionalProperties(param);
+
+        // TODO: test validations
+    }
+    /**
+     * test json serialization of form data
+     *
+     * 
+     */
+    @Test
+    public void testJsonFormDataTest() {
+        String param = null;
+        String param2 = null;
+        // api.testJsonFormData(param, param2);
+
+        // TODO: test validations
+    }
+    /**
+     * 
+     *
+     * To test the collection format in query parameters
+     */
+    @Test
+    public void testQueryParameterCollectionFormatTest() {
+        List<String> pipe = null;
+        List<String> ioutil = null;
+        List<String> http = null;
+        List<String> url = null;
+        List<String> context = null;
+        // api.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
+
+        // TODO: test validations
+    }
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
new file mode 100644
index 000000000000..6fb41f046eef
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
@@ -0,0 +1,37 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.model.Client;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for FakeClassnameTags123Api
+ */
+public class FakeClassnameTags123ApiTest {
+
+    private FakeClassnameTags123Api api;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().createService(FakeClassnameTags123Api.class);
+    }
+
+    /**
+     * To test class name in snake case
+     *
+     * To test class name in snake case
+     */
+    @Test
+    public void testClassnameTest() {
+        Client body = null;
+        // Client response = api.testClassname(body);
+
+        // TODO: test validations
+    }
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/PetApiTest.java
new file mode 100644
index 000000000000..5061b45f8c6d
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -0,0 +1,143 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import java.io.File;
+import org.openapitools.client.model.ModelApiResponse;
+import org.openapitools.client.model.Pet;
+import java.util.Set;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for PetApi
+ */
+public class PetApiTest {
+
+    private PetApi api;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().createService(PetApi.class);
+    }
+
+    /**
+     * Add a new pet to the store
+     *
+     * 
+     */
+    @Test
+    public void addPetTest() {
+        Pet body = null;
+        // api.addPet(body);
+
+        // TODO: test validations
+    }
+    /**
+     * Deletes a pet
+     *
+     * 
+     */
+    @Test
+    public void deletePetTest() {
+        Long petId = null;
+        String apiKey = null;
+        // api.deletePet(petId, apiKey);
+
+        // TODO: test validations
+    }
+    /**
+     * Finds Pets by status
+     *
+     * Multiple status values can be provided with comma separated strings
+     */
+    @Test
+    public void findPetsByStatusTest() {
+        List<String> status = null;
+        // List<Pet> response = api.findPetsByStatus(status);
+
+        // TODO: test validations
+    }
+    /**
+     * Finds Pets by tags
+     *
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     */
+    @Test
+    public void findPetsByTagsTest() {
+        Set<String> tags = null;
+        // Set<Pet> response = api.findPetsByTags(tags);
+
+        // TODO: test validations
+    }
+    /**
+     * Find pet by ID
+     *
+     * Returns a single pet
+     */
+    @Test
+    public void getPetByIdTest() {
+        Long petId = null;
+        // Pet response = api.getPetById(petId);
+
+        // TODO: test validations
+    }
+    /**
+     * Update an existing pet
+     *
+     * 
+     */
+    @Test
+    public void updatePetTest() {
+        Pet body = null;
+        // api.updatePet(body);
+
+        // TODO: test validations
+    }
+    /**
+     * Updates a pet in the store with form data
+     *
+     * 
+     */
+    @Test
+    public void updatePetWithFormTest() {
+        Long petId = null;
+        String name = null;
+        String status = null;
+        // api.updatePetWithForm(petId, name, status);
+
+        // TODO: test validations
+    }
+    /**
+     * uploads an image
+     *
+     * 
+     */
+    @Test
+    public void uploadFileTest() {
+        Long petId = null;
+        String additionalMetadata = null;
+        File file = null;
+        // ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
+
+        // TODO: test validations
+    }
+    /**
+     * uploads an image (required)
+     *
+     * 
+     */
+    @Test
+    public void uploadFileWithRequiredFileTest() {
+        Long petId = null;
+        File requiredFile = null;
+        String additionalMetadata = null;
+        // ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+
+        // TODO: test validations
+    }
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/StoreApiTest.java
new file mode 100644
index 000000000000..00ebb3349f88
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -0,0 +1,72 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.model.Order;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for StoreApi
+ */
+public class StoreApiTest {
+
+    private StoreApi api;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().createService(StoreApi.class);
+    }
+
+    /**
+     * Delete purchase order by ID
+     *
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     */
+    @Test
+    public void deleteOrderTest() {
+        String orderId = null;
+        // api.deleteOrder(orderId);
+
+        // TODO: test validations
+    }
+    /**
+     * Returns pet inventories by status
+     *
+     * Returns a map of status codes to quantities
+     */
+    @Test
+    public void getInventoryTest() {
+        // Map<String, Integer> response = api.getInventory();
+
+        // TODO: test validations
+    }
+    /**
+     * Find purchase order by ID
+     *
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     */
+    @Test
+    public void getOrderByIdTest() {
+        Long orderId = null;
+        // Order response = api.getOrderById(orderId);
+
+        // TODO: test validations
+    }
+    /**
+     * Place an order for a pet
+     *
+     * 
+     */
+    @Test
+    public void placeOrderTest() {
+        Order body = null;
+        // Order response = api.placeOrder(body);
+
+        // TODO: test validations
+    }
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/UserApiTest.java
new file mode 100644
index 000000000000..8fb13a938996
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/UserApiTest.java
@@ -0,0 +1,122 @@
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.model.User;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for UserApi
+ */
+public class UserApiTest {
+
+    private UserApi api;
+
+    @Before
+    public void setup() {
+        api = new ApiClient().createService(UserApi.class);
+    }
+
+    /**
+     * Create user
+     *
+     * This can only be done by the logged in user.
+     */
+    @Test
+    public void createUserTest() {
+        User body = null;
+        // api.createUser(body);
+
+        // TODO: test validations
+    }
+    /**
+     * Creates list of users with given input array
+     *
+     * 
+     */
+    @Test
+    public void createUsersWithArrayInputTest() {
+        List<User> body = null;
+        // api.createUsersWithArrayInput(body);
+
+        // TODO: test validations
+    }
+    /**
+     * Creates list of users with given input array
+     *
+     * 
+     */
+    @Test
+    public void createUsersWithListInputTest() {
+        List<User> body = null;
+        // api.createUsersWithListInput(body);
+
+        // TODO: test validations
+    }
+    /**
+     * Delete user
+     *
+     * This can only be done by the logged in user.
+     */
+    @Test
+    public void deleteUserTest() {
+        String username = null;
+        // api.deleteUser(username);
+
+        // TODO: test validations
+    }
+    /**
+     * Get user by user name
+     *
+     * 
+     */
+    @Test
+    public void getUserByNameTest() {
+        String username = null;
+        // User response = api.getUserByName(username);
+
+        // TODO: test validations
+    }
+    /**
+     * Logs user into the system
+     *
+     * 
+     */
+    @Test
+    public void loginUserTest() {
+        String username = null;
+        String password = null;
+        // String response = api.loginUser(username, password);
+
+        // TODO: test validations
+    }
+    /**
+     * Logs out current logged in user session
+     *
+     * 
+     */
+    @Test
+    public void logoutUserTest() {
+        // api.logoutUser();
+
+        // TODO: test validations
+    }
+    /**
+     * Updated user
+     *
+     * This can only be done by the logged in user.
+     */
+    @Test
+    public void updateUserTest() {
+        String username = null;
+        User body = null;
+        // api.updateUser(username, body);
+
+        // TODO: test validations
+    }
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
new file mode 100644
index 000000000000..5507437bbe46
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
@@ -0,0 +1,53 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesAnyType
+ */
+public class AdditionalPropertiesAnyTypeTest {
+    private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType();
+
+    /**
+     * Model tests for AdditionalPropertiesAnyType
+     */
+    @Test
+    public void testAdditionalPropertiesAnyType() {
+        // TODO: test AdditionalPropertiesAnyType
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
new file mode 100644
index 000000000000..d770842e2c32
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
@@ -0,0 +1,54 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesArray
+ */
+public class AdditionalPropertiesArrayTest {
+    private final AdditionalPropertiesArray model = new AdditionalPropertiesArray();
+
+    /**
+     * Model tests for AdditionalPropertiesArray
+     */
+    @Test
+    public void testAdditionalPropertiesArray() {
+        // TODO: test AdditionalPropertiesArray
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
new file mode 100644
index 000000000000..17ad4aa94d87
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
@@ -0,0 +1,53 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesBoolean
+ */
+public class AdditionalPropertiesBooleanTest {
+    private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean();
+
+    /**
+     * Model tests for AdditionalPropertiesBoolean
+     */
+    @Test
+    public void testAdditionalPropertiesBoolean() {
+        // TODO: test AdditionalPropertiesBoolean
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
new file mode 100644
index 000000000000..19f1a8fe7aab
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
@@ -0,0 +1,135 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesClass
+ */
+public class AdditionalPropertiesClassTest {
+    private final AdditionalPropertiesClass model = new AdditionalPropertiesClass();
+
+    /**
+     * Model tests for AdditionalPropertiesClass
+     */
+    @Test
+    public void testAdditionalPropertiesClass() {
+        // TODO: test AdditionalPropertiesClass
+    }
+
+    /**
+     * Test the property 'mapString'
+     */
+    @Test
+    public void mapStringTest() {
+        // TODO: test mapString
+    }
+
+    /**
+     * Test the property 'mapNumber'
+     */
+    @Test
+    public void mapNumberTest() {
+        // TODO: test mapNumber
+    }
+
+    /**
+     * Test the property 'mapInteger'
+     */
+    @Test
+    public void mapIntegerTest() {
+        // TODO: test mapInteger
+    }
+
+    /**
+     * Test the property 'mapBoolean'
+     */
+    @Test
+    public void mapBooleanTest() {
+        // TODO: test mapBoolean
+    }
+
+    /**
+     * Test the property 'mapArrayInteger'
+     */
+    @Test
+    public void mapArrayIntegerTest() {
+        // TODO: test mapArrayInteger
+    }
+
+    /**
+     * Test the property 'mapArrayAnytype'
+     */
+    @Test
+    public void mapArrayAnytypeTest() {
+        // TODO: test mapArrayAnytype
+    }
+
+    /**
+     * Test the property 'mapMapString'
+     */
+    @Test
+    public void mapMapStringTest() {
+        // TODO: test mapMapString
+    }
+
+    /**
+     * Test the property 'mapMapAnytype'
+     */
+    @Test
+    public void mapMapAnytypeTest() {
+        // TODO: test mapMapAnytype
+    }
+
+    /**
+     * Test the property 'anytype1'
+     */
+    @Test
+    public void anytype1Test() {
+        // TODO: test anytype1
+    }
+
+    /**
+     * Test the property 'anytype2'
+     */
+    @Test
+    public void anytype2Test() {
+        // TODO: test anytype2
+    }
+
+    /**
+     * Test the property 'anytype3'
+     */
+    @Test
+    public void anytype3Test() {
+        // TODO: test anytype3
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
new file mode 100644
index 000000000000..e6efde8fed97
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
@@ -0,0 +1,53 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesInteger
+ */
+public class AdditionalPropertiesIntegerTest {
+    private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger();
+
+    /**
+     * Model tests for AdditionalPropertiesInteger
+     */
+    @Test
+    public void testAdditionalPropertiesInteger() {
+        // TODO: test AdditionalPropertiesInteger
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
new file mode 100644
index 000000000000..01433159e0f0
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
@@ -0,0 +1,54 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesNumber
+ */
+public class AdditionalPropertiesNumberTest {
+    private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber();
+
+    /**
+     * Model tests for AdditionalPropertiesNumber
+     */
+    @Test
+    public void testAdditionalPropertiesNumber() {
+        // TODO: test AdditionalPropertiesNumber
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
new file mode 100644
index 000000000000..a307b7604d81
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
@@ -0,0 +1,53 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesObject
+ */
+public class AdditionalPropertiesObjectTest {
+    private final AdditionalPropertiesObject model = new AdditionalPropertiesObject();
+
+    /**
+     * Model tests for AdditionalPropertiesObject
+     */
+    @Test
+    public void testAdditionalPropertiesObject() {
+        // TODO: test AdditionalPropertiesObject
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
new file mode 100644
index 000000000000..6a66b95c7b46
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
@@ -0,0 +1,53 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesString
+ */
+public class AdditionalPropertiesStringTest {
+    private final AdditionalPropertiesString model = new AdditionalPropertiesString();
+
+    /**
+     * Model tests for AdditionalPropertiesString
+     */
+    @Test
+    public void testAdditionalPropertiesString() {
+        // TODO: test AdditionalPropertiesString
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AnimalTest.java
new file mode 100644
index 000000000000..340abc2587a1
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/AnimalTest.java
@@ -0,0 +1,62 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.openapitools.client.model.BigCat;
+import org.openapitools.client.model.Cat;
+import org.openapitools.client.model.Dog;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Animal
+ */
+public class AnimalTest {
+    private final Animal model = new Animal();
+
+    /**
+     * Model tests for Animal
+     */
+    @Test
+    public void testAnimal() {
+        // TODO: test Animal
+    }
+
+    /**
+     * Test the property 'className'
+     */
+    @Test
+    public void classNameTest() {
+        // TODO: test className
+    }
+
+    /**
+     * Test the property 'color'
+     */
+    @Test
+    public void colorTest() {
+        // TODO: test color
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
new file mode 100644
index 000000000000..d0e66d293541
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
@@ -0,0 +1,54 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ArrayOfArrayOfNumberOnly
+ */
+public class ArrayOfArrayOfNumberOnlyTest {
+    private final ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly();
+
+    /**
+     * Model tests for ArrayOfArrayOfNumberOnly
+     */
+    @Test
+    public void testArrayOfArrayOfNumberOnly() {
+        // TODO: test ArrayOfArrayOfNumberOnly
+    }
+
+    /**
+     * Test the property 'arrayArrayNumber'
+     */
+    @Test
+    public void arrayArrayNumberTest() {
+        // TODO: test arrayArrayNumber
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
new file mode 100644
index 000000000000..9afc3397f46c
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
@@ -0,0 +1,54 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ArrayOfNumberOnly
+ */
+public class ArrayOfNumberOnlyTest {
+    private final ArrayOfNumberOnly model = new ArrayOfNumberOnly();
+
+    /**
+     * Model tests for ArrayOfNumberOnly
+     */
+    @Test
+    public void testArrayOfNumberOnly() {
+        // TODO: test ArrayOfNumberOnly
+    }
+
+    /**
+     * Test the property 'arrayNumber'
+     */
+    @Test
+    public void arrayNumberTest() {
+        // TODO: test arrayNumber
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ArrayTestTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ArrayTestTest.java
new file mode 100644
index 000000000000..fab9a30565f3
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ArrayTestTest.java
@@ -0,0 +1,70 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.openapitools.client.model.ReadOnlyFirst;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ArrayTest
+ */
+public class ArrayTestTest {
+    private final ArrayTest model = new ArrayTest();
+
+    /**
+     * Model tests for ArrayTest
+     */
+    @Test
+    public void testArrayTest() {
+        // TODO: test ArrayTest
+    }
+
+    /**
+     * Test the property 'arrayOfString'
+     */
+    @Test
+    public void arrayOfStringTest() {
+        // TODO: test arrayOfString
+    }
+
+    /**
+     * Test the property 'arrayArrayOfInteger'
+     */
+    @Test
+    public void arrayArrayOfIntegerTest() {
+        // TODO: test arrayArrayOfInteger
+    }
+
+    /**
+     * Test the property 'arrayArrayOfModel'
+     */
+    @Test
+    public void arrayArrayOfModelTest() {
+        // TODO: test arrayArrayOfModel
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java
rename to samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/BigCatAllOfTest.java
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/BigCatTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/BigCatTest.java
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/src/test/java/org/openapitools/client/model/BigCatTest.java
rename to samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/BigCatTest.java
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/CapitalizationTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/CapitalizationTest.java
new file mode 100644
index 000000000000..ced4f48eb5f9
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/CapitalizationTest.java
@@ -0,0 +1,91 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Capitalization
+ */
+public class CapitalizationTest {
+    private final Capitalization model = new Capitalization();
+
+    /**
+     * Model tests for Capitalization
+     */
+    @Test
+    public void testCapitalization() {
+        // TODO: test Capitalization
+    }
+
+    /**
+     * Test the property 'smallCamel'
+     */
+    @Test
+    public void smallCamelTest() {
+        // TODO: test smallCamel
+    }
+
+    /**
+     * Test the property 'capitalCamel'
+     */
+    @Test
+    public void capitalCamelTest() {
+        // TODO: test capitalCamel
+    }
+
+    /**
+     * Test the property 'smallSnake'
+     */
+    @Test
+    public void smallSnakeTest() {
+        // TODO: test smallSnake
+    }
+
+    /**
+     * Test the property 'capitalSnake'
+     */
+    @Test
+    public void capitalSnakeTest() {
+        // TODO: test capitalSnake
+    }
+
+    /**
+     * Test the property 'scAETHFlowPoints'
+     */
+    @Test
+    public void scAETHFlowPointsTest() {
+        // TODO: test scAETHFlowPoints
+    }
+
+    /**
+     * Test the property 'ATT_NAME'
+     */
+    @Test
+    public void ATT_NAMETest() {
+        // TODO: test ATT_NAME
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/CatAllOfTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/CatAllOfTest.java
new file mode 100644
index 000000000000..384ab21b773b
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/CatAllOfTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for CatAllOf
+ */
+public class CatAllOfTest {
+    private final CatAllOf model = new CatAllOf();
+
+    /**
+     * Model tests for CatAllOf
+     */
+    @Test
+    public void testCatAllOf() {
+        // TODO: test CatAllOf
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/CatTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/CatTest.java
new file mode 100644
index 000000000000..ac7ac3c80f60
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/CatTest.java
@@ -0,0 +1,70 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.BigCat;
+import org.openapitools.client.model.CatAllOf;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Cat
+ */
+public class CatTest {
+    private final Cat model = new Cat();
+
+    /**
+     * Model tests for Cat
+     */
+    @Test
+    public void testCat() {
+        // TODO: test Cat
+    }
+
+    /**
+     * Test the property 'className'
+     */
+    @Test
+    public void classNameTest() {
+        // TODO: test className
+    }
+
+    /**
+     * Test the property 'color'
+     */
+    @Test
+    public void colorTest() {
+        // TODO: test color
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/CategoryTest.java
new file mode 100644
index 000000000000..a6efa6e1fbc6
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/CategoryTest.java
@@ -0,0 +1,59 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Category
+ */
+public class CategoryTest {
+    private final Category model = new Category();
+
+    /**
+     * Model tests for Category
+     */
+    @Test
+    public void testCategory() {
+        // TODO: test Category
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ClassModelTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ClassModelTest.java
new file mode 100644
index 000000000000..1233feec65ec
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ClassModelTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ClassModel
+ */
+public class ClassModelTest {
+    private final ClassModel model = new ClassModel();
+
+    /**
+     * Model tests for ClassModel
+     */
+    @Test
+    public void testClassModel() {
+        // TODO: test ClassModel
+    }
+
+    /**
+     * Test the property 'propertyClass'
+     */
+    @Test
+    public void propertyClassTest() {
+        // TODO: test propertyClass
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ClientTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ClientTest.java
new file mode 100644
index 000000000000..456fab74c4d7
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ClientTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Client
+ */
+public class ClientTest {
+    private final Client model = new Client();
+
+    /**
+     * Model tests for Client
+     */
+    @Test
+    public void testClient() {
+        // TODO: test Client
+    }
+
+    /**
+     * Test the property 'client'
+     */
+    @Test
+    public void clientTest() {
+        // TODO: test client
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/DogAllOfTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/DogAllOfTest.java
new file mode 100644
index 000000000000..0d695b15a639
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/DogAllOfTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for DogAllOf
+ */
+public class DogAllOfTest {
+    private final DogAllOf model = new DogAllOf();
+
+    /**
+     * Model tests for DogAllOf
+     */
+    @Test
+    public void testDogAllOf() {
+        // TODO: test DogAllOf
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/DogTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/DogTest.java
new file mode 100644
index 000000000000..124bc99c1f12
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/DogTest.java
@@ -0,0 +1,69 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Dog
+ */
+public class DogTest {
+    private final Dog model = new Dog();
+
+    /**
+     * Model tests for Dog
+     */
+    @Test
+    public void testDog() {
+        // TODO: test Dog
+    }
+
+    /**
+     * Test the property 'className'
+     */
+    @Test
+    public void classNameTest() {
+        // TODO: test className
+    }
+
+    /**
+     * Test the property 'color'
+     */
+    @Test
+    public void colorTest() {
+        // TODO: test color
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/EnumArraysTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/EnumArraysTest.java
new file mode 100644
index 000000000000..c25b05e9f0d1
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/EnumArraysTest.java
@@ -0,0 +1,61 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for EnumArrays
+ */
+public class EnumArraysTest {
+    private final EnumArrays model = new EnumArrays();
+
+    /**
+     * Model tests for EnumArrays
+     */
+    @Test
+    public void testEnumArrays() {
+        // TODO: test EnumArrays
+    }
+
+    /**
+     * Test the property 'justSymbol'
+     */
+    @Test
+    public void justSymbolTest() {
+        // TODO: test justSymbol
+    }
+
+    /**
+     * Test the property 'arrayEnum'
+     */
+    @Test
+    public void arrayEnumTest() {
+        // TODO: test arrayEnum
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/EnumClassTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/EnumClassTest.java
new file mode 100644
index 000000000000..329454658e33
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/EnumClassTest.java
@@ -0,0 +1,34 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.annotations.SerializedName;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for EnumClass
+ */
+public class EnumClassTest {
+    /**
+     * Model tests for EnumClass
+     */
+    @Test
+    public void testEnumClass() {
+        // TODO: test EnumClass
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/EnumTestTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/EnumTestTest.java
new file mode 100644
index 000000000000..8b76ef556061
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/EnumTestTest.java
@@ -0,0 +1,84 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.openapitools.client.model.OuterEnum;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for EnumTest
+ */
+public class EnumTestTest {
+    private final EnumTest model = new EnumTest();
+
+    /**
+     * Model tests for EnumTest
+     */
+    @Test
+    public void testEnumTest() {
+        // TODO: test EnumTest
+    }
+
+    /**
+     * Test the property 'enumString'
+     */
+    @Test
+    public void enumStringTest() {
+        // TODO: test enumString
+    }
+
+    /**
+     * Test the property 'enumStringRequired'
+     */
+    @Test
+    public void enumStringRequiredTest() {
+        // TODO: test enumStringRequired
+    }
+
+    /**
+     * Test the property 'enumInteger'
+     */
+    @Test
+    public void enumIntegerTest() {
+        // TODO: test enumInteger
+    }
+
+    /**
+     * Test the property 'enumNumber'
+     */
+    @Test
+    public void enumNumberTest() {
+        // TODO: test enumNumber
+    }
+
+    /**
+     * Test the property 'outerEnum'
+     */
+    @Test
+    public void outerEnumTest() {
+        // TODO: test outerEnum
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
new file mode 100644
index 000000000000..0ca366212088
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
@@ -0,0 +1,61 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for FileSchemaTestClass
+ */
+public class FileSchemaTestClassTest {
+    private final FileSchemaTestClass model = new FileSchemaTestClass();
+
+    /**
+     * Model tests for FileSchemaTestClass
+     */
+    @Test
+    public void testFileSchemaTestClass() {
+        // TODO: test FileSchemaTestClass
+    }
+
+    /**
+     * Test the property 'file'
+     */
+    @Test
+    public void fileTest() {
+        // TODO: test file
+    }
+
+    /**
+     * Test the property 'files'
+     */
+    @Test
+    public void filesTest() {
+        // TODO: test files
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/FormatTestTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/FormatTestTest.java
new file mode 100644
index 000000000000..32dbe0df5c15
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/FormatTestTest.java
@@ -0,0 +1,160 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.UUID;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for FormatTest
+ */
+public class FormatTestTest {
+    private final FormatTest model = new FormatTest();
+
+    /**
+     * Model tests for FormatTest
+     */
+    @Test
+    public void testFormatTest() {
+        // TODO: test FormatTest
+    }
+
+    /**
+     * Test the property 'integer'
+     */
+    @Test
+    public void integerTest() {
+        // TODO: test integer
+    }
+
+    /**
+     * Test the property 'int32'
+     */
+    @Test
+    public void int32Test() {
+        // TODO: test int32
+    }
+
+    /**
+     * Test the property 'int64'
+     */
+    @Test
+    public void int64Test() {
+        // TODO: test int64
+    }
+
+    /**
+     * Test the property 'number'
+     */
+    @Test
+    public void numberTest() {
+        // TODO: test number
+    }
+
+    /**
+     * Test the property '_float'
+     */
+    @Test
+    public void _floatTest() {
+        // TODO: test _float
+    }
+
+    /**
+     * Test the property '_double'
+     */
+    @Test
+    public void _doubleTest() {
+        // TODO: test _double
+    }
+
+    /**
+     * Test the property 'string'
+     */
+    @Test
+    public void stringTest() {
+        // TODO: test string
+    }
+
+    /**
+     * Test the property '_byte'
+     */
+    @Test
+    public void _byteTest() {
+        // TODO: test _byte
+    }
+
+    /**
+     * Test the property 'binary'
+     */
+    @Test
+    public void binaryTest() {
+        // TODO: test binary
+    }
+
+    /**
+     * Test the property 'date'
+     */
+    @Test
+    public void dateTest() {
+        // TODO: test date
+    }
+
+    /**
+     * Test the property 'dateTime'
+     */
+    @Test
+    public void dateTimeTest() {
+        // TODO: test dateTime
+    }
+
+    /**
+     * Test the property 'uuid'
+     */
+    @Test
+    public void uuidTest() {
+        // TODO: test uuid
+    }
+
+    /**
+     * Test the property 'password'
+     */
+    @Test
+    public void passwordTest() {
+        // TODO: test password
+    }
+
+    /**
+     * Test the property 'bigDecimal'
+     */
+    @Test
+    public void bigDecimalTest() {
+        // TODO: test bigDecimal
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
new file mode 100644
index 000000000000..0272d7b80004
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
@@ -0,0 +1,59 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for HasOnlyReadOnly
+ */
+public class HasOnlyReadOnlyTest {
+    private final HasOnlyReadOnly model = new HasOnlyReadOnly();
+
+    /**
+     * Model tests for HasOnlyReadOnly
+     */
+    @Test
+    public void testHasOnlyReadOnly() {
+        // TODO: test HasOnlyReadOnly
+    }
+
+    /**
+     * Test the property 'bar'
+     */
+    @Test
+    public void barTest() {
+        // TODO: test bar
+    }
+
+    /**
+     * Test the property 'foo'
+     */
+    @Test
+    public void fooTest() {
+        // TODO: test foo
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/MapTestTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/MapTestTest.java
new file mode 100644
index 000000000000..f86a1303fc88
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/MapTestTest.java
@@ -0,0 +1,78 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for MapTest
+ */
+public class MapTestTest {
+    private final MapTest model = new MapTest();
+
+    /**
+     * Model tests for MapTest
+     */
+    @Test
+    public void testMapTest() {
+        // TODO: test MapTest
+    }
+
+    /**
+     * Test the property 'mapMapOfString'
+     */
+    @Test
+    public void mapMapOfStringTest() {
+        // TODO: test mapMapOfString
+    }
+
+    /**
+     * Test the property 'mapOfEnumString'
+     */
+    @Test
+    public void mapOfEnumStringTest() {
+        // TODO: test mapOfEnumString
+    }
+
+    /**
+     * Test the property 'directMap'
+     */
+    @Test
+    public void directMapTest() {
+        // TODO: test directMap
+    }
+
+    /**
+     * Test the property 'indirectMap'
+     */
+    @Test
+    public void indirectMapTest() {
+        // TODO: test indirectMap
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
new file mode 100644
index 000000000000..808773a5d852
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
@@ -0,0 +1,73 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.openapitools.client.model.Animal;
+import org.threeten.bp.OffsetDateTime;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for MixedPropertiesAndAdditionalPropertiesClass
+ */
+public class MixedPropertiesAndAdditionalPropertiesClassTest {
+    private final MixedPropertiesAndAdditionalPropertiesClass model = new MixedPropertiesAndAdditionalPropertiesClass();
+
+    /**
+     * Model tests for MixedPropertiesAndAdditionalPropertiesClass
+     */
+    @Test
+    public void testMixedPropertiesAndAdditionalPropertiesClass() {
+        // TODO: test MixedPropertiesAndAdditionalPropertiesClass
+    }
+
+    /**
+     * Test the property 'uuid'
+     */
+    @Test
+    public void uuidTest() {
+        // TODO: test uuid
+    }
+
+    /**
+     * Test the property 'dateTime'
+     */
+    @Test
+    public void dateTimeTest() {
+        // TODO: test dateTime
+    }
+
+    /**
+     * Test the property 'map'
+     */
+    @Test
+    public void mapTest() {
+        // TODO: test map
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/Model200ResponseTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
new file mode 100644
index 000000000000..d81fa5a0f669
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
@@ -0,0 +1,59 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Model200Response
+ */
+public class Model200ResponseTest {
+    private final Model200Response model = new Model200Response();
+
+    /**
+     * Model tests for Model200Response
+     */
+    @Test
+    public void testModel200Response() {
+        // TODO: test Model200Response
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+    /**
+     * Test the property 'propertyClass'
+     */
+    @Test
+    public void propertyClassTest() {
+        // TODO: test propertyClass
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
new file mode 100644
index 000000000000..91bd8fada260
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
@@ -0,0 +1,67 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ModelApiResponse
+ */
+public class ModelApiResponseTest {
+    private final ModelApiResponse model = new ModelApiResponse();
+
+    /**
+     * Model tests for ModelApiResponse
+     */
+    @Test
+    public void testModelApiResponse() {
+        // TODO: test ModelApiResponse
+    }
+
+    /**
+     * Test the property 'code'
+     */
+    @Test
+    public void codeTest() {
+        // TODO: test code
+    }
+
+    /**
+     * Test the property 'type'
+     */
+    @Test
+    public void typeTest() {
+        // TODO: test type
+    }
+
+    /**
+     * Test the property 'message'
+     */
+    @Test
+    public void messageTest() {
+        // TODO: test message
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ModelReturnTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ModelReturnTest.java
new file mode 100644
index 000000000000..f317fef485ea
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ModelReturnTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ModelReturn
+ */
+public class ModelReturnTest {
+    private final ModelReturn model = new ModelReturn();
+
+    /**
+     * Model tests for ModelReturn
+     */
+    @Test
+    public void testModelReturn() {
+        // TODO: test ModelReturn
+    }
+
+    /**
+     * Test the property '_return'
+     */
+    @Test
+    public void _returnTest() {
+        // TODO: test _return
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/NameTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/NameTest.java
new file mode 100644
index 000000000000..1ed41a0f80c7
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/NameTest.java
@@ -0,0 +1,75 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Name
+ */
+public class NameTest {
+    private final Name model = new Name();
+
+    /**
+     * Model tests for Name
+     */
+    @Test
+    public void testName() {
+        // TODO: test Name
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+    /**
+     * Test the property 'snakeCase'
+     */
+    @Test
+    public void snakeCaseTest() {
+        // TODO: test snakeCase
+    }
+
+    /**
+     * Test the property 'property'
+     */
+    @Test
+    public void propertyTest() {
+        // TODO: test property
+    }
+
+    /**
+     * Test the property '_123number'
+     */
+    @Test
+    public void _123numberTest() {
+        // TODO: test _123number
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/NumberOnlyTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
new file mode 100644
index 000000000000..15b74f7ef8bf
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
@@ -0,0 +1,52 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for NumberOnly
+ */
+public class NumberOnlyTest {
+    private final NumberOnly model = new NumberOnly();
+
+    /**
+     * Model tests for NumberOnly
+     */
+    @Test
+    public void testNumberOnly() {
+        // TODO: test NumberOnly
+    }
+
+    /**
+     * Test the property 'justNumber'
+     */
+    @Test
+    public void justNumberTest() {
+        // TODO: test justNumber
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/OrderTest.java
new file mode 100644
index 000000000000..b5cc55e4f581
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -0,0 +1,92 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.threeten.bp.OffsetDateTime;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Order
+ */
+public class OrderTest {
+    private final Order model = new Order();
+
+    /**
+     * Model tests for Order
+     */
+    @Test
+    public void testOrder() {
+        // TODO: test Order
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'petId'
+     */
+    @Test
+    public void petIdTest() {
+        // TODO: test petId
+    }
+
+    /**
+     * Test the property 'quantity'
+     */
+    @Test
+    public void quantityTest() {
+        // TODO: test quantity
+    }
+
+    /**
+     * Test the property 'shipDate'
+     */
+    @Test
+    public void shipDateTest() {
+        // TODO: test shipDate
+    }
+
+    /**
+     * Test the property 'status'
+     */
+    @Test
+    public void statusTest() {
+        // TODO: test status
+    }
+
+    /**
+     * Test the property 'complete'
+     */
+    @Test
+    public void completeTest() {
+        // TODO: test complete
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/OuterCompositeTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
new file mode 100644
index 000000000000..67ee59963636
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
@@ -0,0 +1,68 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for OuterComposite
+ */
+public class OuterCompositeTest {
+    private final OuterComposite model = new OuterComposite();
+
+    /**
+     * Model tests for OuterComposite
+     */
+    @Test
+    public void testOuterComposite() {
+        // TODO: test OuterComposite
+    }
+
+    /**
+     * Test the property 'myNumber'
+     */
+    @Test
+    public void myNumberTest() {
+        // TODO: test myNumber
+    }
+
+    /**
+     * Test the property 'myString'
+     */
+    @Test
+    public void myStringTest() {
+        // TODO: test myString
+    }
+
+    /**
+     * Test the property 'myBoolean'
+     */
+    @Test
+    public void myBooleanTest() {
+        // TODO: test myBoolean
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/OuterEnumTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/OuterEnumTest.java
new file mode 100644
index 000000000000..220d40e83cbb
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/OuterEnumTest.java
@@ -0,0 +1,34 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.annotations.SerializedName;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for OuterEnum
+ */
+public class OuterEnumTest {
+    /**
+     * Model tests for OuterEnum
+     */
+    @Test
+    public void testOuterEnum() {
+        // TODO: test OuterEnum
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/PetTest.java
new file mode 100644
index 000000000000..8acfe87f62c1
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/PetTest.java
@@ -0,0 +1,97 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.openapitools.client.model.Category;
+import org.openapitools.client.model.Tag;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Pet
+ */
+public class PetTest {
+    private final Pet model = new Pet();
+
+    /**
+     * Model tests for Pet
+     */
+    @Test
+    public void testPet() {
+        // TODO: test Pet
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'category'
+     */
+    @Test
+    public void categoryTest() {
+        // TODO: test category
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+    /**
+     * Test the property 'photoUrls'
+     */
+    @Test
+    public void photoUrlsTest() {
+        // TODO: test photoUrls
+    }
+
+    /**
+     * Test the property 'tags'
+     */
+    @Test
+    public void tagsTest() {
+        // TODO: test tags
+    }
+
+    /**
+     * Test the property 'status'
+     */
+    @Test
+    public void statusTest() {
+        // TODO: test status
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
new file mode 100644
index 000000000000..2dc9cb2ae2cd
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
@@ -0,0 +1,59 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ReadOnlyFirst
+ */
+public class ReadOnlyFirstTest {
+    private final ReadOnlyFirst model = new ReadOnlyFirst();
+
+    /**
+     * Model tests for ReadOnlyFirst
+     */
+    @Test
+    public void testReadOnlyFirst() {
+        // TODO: test ReadOnlyFirst
+    }
+
+    /**
+     * Test the property 'bar'
+     */
+    @Test
+    public void barTest() {
+        // TODO: test bar
+    }
+
+    /**
+     * Test the property 'baz'
+     */
+    @Test
+    public void bazTest() {
+        // TODO: test baz
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
new file mode 100644
index 000000000000..bcf23eb3cbc8
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for SpecialModelName
+ */
+public class SpecialModelNameTest {
+    private final SpecialModelName model = new SpecialModelName();
+
+    /**
+     * Model tests for SpecialModelName
+     */
+    @Test
+    public void testSpecialModelName() {
+        // TODO: test SpecialModelName
+    }
+
+    /**
+     * Test the property '$specialPropertyName'
+     */
+    @Test
+    public void $specialPropertyNameTest() {
+        // TODO: test $specialPropertyName
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/TagTest.java
new file mode 100644
index 000000000000..83f536d2fa39
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/TagTest.java
@@ -0,0 +1,59 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Tag
+ */
+public class TagTest {
+    private final Tag model = new Tag();
+
+    /**
+     * Model tests for Tag
+     */
+    @Test
+    public void testTag() {
+        // TODO: test Tag
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
new file mode 100644
index 000000000000..ca08c6362ce1
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
@@ -0,0 +1,86 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for TypeHolderDefault
+ */
+public class TypeHolderDefaultTest {
+    private final TypeHolderDefault model = new TypeHolderDefault();
+
+    /**
+     * Model tests for TypeHolderDefault
+     */
+    @Test
+    public void testTypeHolderDefault() {
+        // TODO: test TypeHolderDefault
+    }
+
+    /**
+     * Test the property 'stringItem'
+     */
+    @Test
+    public void stringItemTest() {
+        // TODO: test stringItem
+    }
+
+    /**
+     * Test the property 'numberItem'
+     */
+    @Test
+    public void numberItemTest() {
+        // TODO: test numberItem
+    }
+
+    /**
+     * Test the property 'integerItem'
+     */
+    @Test
+    public void integerItemTest() {
+        // TODO: test integerItem
+    }
+
+    /**
+     * Test the property 'boolItem'
+     */
+    @Test
+    public void boolItemTest() {
+        // TODO: test boolItem
+    }
+
+    /**
+     * Test the property 'arrayItem'
+     */
+    @Test
+    public void arrayItemTest() {
+        // TODO: test arrayItem
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
new file mode 100644
index 000000000000..763bccefe43d
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
@@ -0,0 +1,94 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for TypeHolderExample
+ */
+public class TypeHolderExampleTest {
+    private final TypeHolderExample model = new TypeHolderExample();
+
+    /**
+     * Model tests for TypeHolderExample
+     */
+    @Test
+    public void testTypeHolderExample() {
+        // TODO: test TypeHolderExample
+    }
+
+    /**
+     * Test the property 'stringItem'
+     */
+    @Test
+    public void stringItemTest() {
+        // TODO: test stringItem
+    }
+
+    /**
+     * Test the property 'numberItem'
+     */
+    @Test
+    public void numberItemTest() {
+        // TODO: test numberItem
+    }
+
+    /**
+     * Test the property 'floatItem'
+     */
+    @Test
+    public void floatItemTest() {
+        // TODO: test floatItem
+    }
+
+    /**
+     * Test the property 'integerItem'
+     */
+    @Test
+    public void integerItemTest() {
+        // TODO: test integerItem
+    }
+
+    /**
+     * Test the property 'boolItem'
+     */
+    @Test
+    public void boolItemTest() {
+        // TODO: test boolItem
+    }
+
+    /**
+     * Test the property 'arrayItem'
+     */
+    @Test
+    public void arrayItemTest() {
+        // TODO: test arrayItem
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/UserTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/UserTest.java
new file mode 100644
index 000000000000..b3a76f61da53
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/UserTest.java
@@ -0,0 +1,107 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for User
+ */
+public class UserTest {
+    private final User model = new User();
+
+    /**
+     * Model tests for User
+     */
+    @Test
+    public void testUser() {
+        // TODO: test User
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'username'
+     */
+    @Test
+    public void usernameTest() {
+        // TODO: test username
+    }
+
+    /**
+     * Test the property 'firstName'
+     */
+    @Test
+    public void firstNameTest() {
+        // TODO: test firstName
+    }
+
+    /**
+     * Test the property 'lastName'
+     */
+    @Test
+    public void lastNameTest() {
+        // TODO: test lastName
+    }
+
+    /**
+     * Test the property 'email'
+     */
+    @Test
+    public void emailTest() {
+        // TODO: test email
+    }
+
+    /**
+     * Test the property 'password'
+     */
+    @Test
+    public void passwordTest() {
+        // TODO: test password
+    }
+
+    /**
+     * Test the property 'phone'
+     */
+    @Test
+    public void phoneTest() {
+        // TODO: test phone
+    }
+
+    /**
+     * Test the property 'userStatus'
+     */
+    @Test
+    public void userStatusTest() {
+        // TODO: test userStatus
+    }
+
+}
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/XmlItemTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/XmlItemTest.java
new file mode 100644
index 000000000000..f9790cd7c6bd
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/model/XmlItemTest.java
@@ -0,0 +1,278 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for XmlItem
+ */
+public class XmlItemTest {
+    private final XmlItem model = new XmlItem();
+
+    /**
+     * Model tests for XmlItem
+     */
+    @Test
+    public void testXmlItem() {
+        // TODO: test XmlItem
+    }
+
+    /**
+     * Test the property 'attributeString'
+     */
+    @Test
+    public void attributeStringTest() {
+        // TODO: test attributeString
+    }
+
+    /**
+     * Test the property 'attributeNumber'
+     */
+    @Test
+    public void attributeNumberTest() {
+        // TODO: test attributeNumber
+    }
+
+    /**
+     * Test the property 'attributeInteger'
+     */
+    @Test
+    public void attributeIntegerTest() {
+        // TODO: test attributeInteger
+    }
+
+    /**
+     * Test the property 'attributeBoolean'
+     */
+    @Test
+    public void attributeBooleanTest() {
+        // TODO: test attributeBoolean
+    }
+
+    /**
+     * Test the property 'wrappedArray'
+     */
+    @Test
+    public void wrappedArrayTest() {
+        // TODO: test wrappedArray
+    }
+
+    /**
+     * Test the property 'nameString'
+     */
+    @Test
+    public void nameStringTest() {
+        // TODO: test nameString
+    }
+
+    /**
+     * Test the property 'nameNumber'
+     */
+    @Test
+    public void nameNumberTest() {
+        // TODO: test nameNumber
+    }
+
+    /**
+     * Test the property 'nameInteger'
+     */
+    @Test
+    public void nameIntegerTest() {
+        // TODO: test nameInteger
+    }
+
+    /**
+     * Test the property 'nameBoolean'
+     */
+    @Test
+    public void nameBooleanTest() {
+        // TODO: test nameBoolean
+    }
+
+    /**
+     * Test the property 'nameArray'
+     */
+    @Test
+    public void nameArrayTest() {
+        // TODO: test nameArray
+    }
+
+    /**
+     * Test the property 'nameWrappedArray'
+     */
+    @Test
+    public void nameWrappedArrayTest() {
+        // TODO: test nameWrappedArray
+    }
+
+    /**
+     * Test the property 'prefixString'
+     */
+    @Test
+    public void prefixStringTest() {
+        // TODO: test prefixString
+    }
+
+    /**
+     * Test the property 'prefixNumber'
+     */
+    @Test
+    public void prefixNumberTest() {
+        // TODO: test prefixNumber
+    }
+
+    /**
+     * Test the property 'prefixInteger'
+     */
+    @Test
+    public void prefixIntegerTest() {
+        // TODO: test prefixInteger
+    }
+
+    /**
+     * Test the property 'prefixBoolean'
+     */
+    @Test
+    public void prefixBooleanTest() {
+        // TODO: test prefixBoolean
+    }
+
+    /**
+     * Test the property 'prefixArray'
+     */
+    @Test
+    public void prefixArrayTest() {
+        // TODO: test prefixArray
+    }
+
+    /**
+     * Test the property 'prefixWrappedArray'
+     */
+    @Test
+    public void prefixWrappedArrayTest() {
+        // TODO: test prefixWrappedArray
+    }
+
+    /**
+     * Test the property 'namespaceString'
+     */
+    @Test
+    public void namespaceStringTest() {
+        // TODO: test namespaceString
+    }
+
+    /**
+     * Test the property 'namespaceNumber'
+     */
+    @Test
+    public void namespaceNumberTest() {
+        // TODO: test namespaceNumber
+    }
+
+    /**
+     * Test the property 'namespaceInteger'
+     */
+    @Test
+    public void namespaceIntegerTest() {
+        // TODO: test namespaceInteger
+    }
+
+    /**
+     * Test the property 'namespaceBoolean'
+     */
+    @Test
+    public void namespaceBooleanTest() {
+        // TODO: test namespaceBoolean
+    }
+
+    /**
+     * Test the property 'namespaceArray'
+     */
+    @Test
+    public void namespaceArrayTest() {
+        // TODO: test namespaceArray
+    }
+
+    /**
+     * Test the property 'namespaceWrappedArray'
+     */
+    @Test
+    public void namespaceWrappedArrayTest() {
+        // TODO: test namespaceWrappedArray
+    }
+
+    /**
+     * Test the property 'prefixNsString'
+     */
+    @Test
+    public void prefixNsStringTest() {
+        // TODO: test prefixNsString
+    }
+
+    /**
+     * Test the property 'prefixNsNumber'
+     */
+    @Test
+    public void prefixNsNumberTest() {
+        // TODO: test prefixNsNumber
+    }
+
+    /**
+     * Test the property 'prefixNsInteger'
+     */
+    @Test
+    public void prefixNsIntegerTest() {
+        // TODO: test prefixNsInteger
+    }
+
+    /**
+     * Test the property 'prefixNsBoolean'
+     */
+    @Test
+    public void prefixNsBooleanTest() {
+        // TODO: test prefixNsBoolean
+    }
+
+    /**
+     * Test the property 'prefixNsArray'
+     */
+    @Test
+    public void prefixNsArrayTest() {
+        // TODO: test prefixNsArray
+    }
+
+    /**
+     * Test the property 'prefixNsWrappedArray'
+     */
+    @Test
+    public void prefixNsWrappedArrayTest() {
+        // TODO: test prefixNsWrappedArray
+    }
+
+}
diff --git a/samples/client/petstore/java/vertx/build.gradle b/samples/client/petstore/java/vertx/build.gradle
index bf87fa8200b7..9ab934c57fca 100644
--- a/samples/client/petstore/java/vertx/build.gradle
+++ b/samples/client/petstore/java/vertx/build.gradle
@@ -45,6 +45,7 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
     testCompile "io.vertx:vertx-unit:$vertx_version"
 }
diff --git a/samples/client/petstore/java/vertx/pom.xml b/samples/client/petstore/java/vertx/pom.xml
index 74bde701e646..ca6a87839502 100644
--- a/samples/client/petstore/java/vertx/pom.xml
+++ b/samples/client/petstore/java/vertx/pom.xml
@@ -147,6 +147,7 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -249,6 +250,12 @@
                 <artifactId>jackson-datatype-jsr310</artifactId>
                 <version>${jackson-version}</version>
             </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -272,6 +279,7 @@
         <jackson-version>2.10.4</jackson-version>
         <jackson-databind>2.10.4</jackson-databind>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/ApiClient.java
index 6e916abf3d1a..d02e49265593 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/ApiClient.java
@@ -36,7 +36,7 @@
 
 import static java.util.stream.Collectors.toMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiClient {
 
     private static final Pattern CONTENT_DISPOSITION_PATTERN = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/ApiException.java
index eae50d36337a..f37d7e3764cd 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/ApiException.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/ApiException.java
@@ -17,7 +17,7 @@
 import io.vertx.core.Future;
 import io.vertx.core.MultiMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private MultiMap responseHeaders = null;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/Pair.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/Pair.java
index ae89aa614543..8352d84046a7 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/Pair.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/Pair.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/StringUtil.java
index 747a23f5bf23..4dc60597910a 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/StringUtil.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/AnotherFakeApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/AnotherFakeApiImpl.java
index 91467b9115a4..0256fef27de5 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/AnotherFakeApiImpl.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/AnotherFakeApiImpl.java
@@ -16,7 +16,7 @@
 import org.openapitools.client.Configuration;
 import org.openapitools.client.Pair;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AnotherFakeApiImpl implements AnotherFakeApi {
 
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java
index 70b3577d960b..fc14c5491002 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java
@@ -24,7 +24,7 @@
 import org.openapitools.client.Configuration;
 import org.openapitools.client.Pair;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeApiImpl implements FakeApi {
 
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeClassnameTags123ApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeClassnameTags123ApiImpl.java
index c05b6c91c604..bc1707415818 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeClassnameTags123ApiImpl.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeClassnameTags123ApiImpl.java
@@ -16,7 +16,7 @@
 import org.openapitools.client.Configuration;
 import org.openapitools.client.Pair;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeClassnameTags123ApiImpl implements FakeClassnameTags123Api {
 
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java
index a29e0097394d..fd1575fe9bc8 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java
@@ -19,7 +19,7 @@
 import org.openapitools.client.Configuration;
 import org.openapitools.client.Pair;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class PetApiImpl implements PetApi {
 
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/StoreApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/StoreApiImpl.java
index 733b6549119b..ae8f8302b474 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/StoreApiImpl.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/StoreApiImpl.java
@@ -16,7 +16,7 @@
 import org.openapitools.client.Configuration;
 import org.openapitools.client.Pair;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StoreApiImpl implements StoreApi {
 
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/UserApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/UserApiImpl.java
index e0c9acdf4e0f..1d5ce3d77224 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/UserApiImpl.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/UserApiImpl.java
@@ -16,7 +16,7 @@
 import org.openapitools.client.Configuration;
 import org.openapitools.client.Pair;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class UserApiImpl implements UserApi {
 
     private ApiClient apiClient;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/AnotherFakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/AnotherFakeApi.java
index a9781c68f0bd..4d85babec214 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/AnotherFakeApi.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/AnotherFakeApi.java
@@ -8,7 +8,7 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AnotherFakeApi {
 
 	private final org.openapitools.client.api.AnotherFakeApi delegate;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
index c460d99e18fb..5d022cb70877 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
@@ -16,7 +16,7 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeApi {
 
 	private final org.openapitools.client.api.FakeApi delegate;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeClassnameTags123Api.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeClassnameTags123Api.java
index 757c028b299a..0b75f9f18fe3 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeClassnameTags123Api.java
@@ -8,7 +8,7 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeClassnameTags123Api {
 
 	private final org.openapitools.client.api.FakeClassnameTags123Api delegate;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java
index b7671ba3e10d..5a986b10a785 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java
@@ -11,7 +11,7 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class PetApi {
 
 	private final org.openapitools.client.api.PetApi delegate;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/StoreApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/StoreApi.java
index f5ec71da2e6b..0be88ae9886b 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/StoreApi.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/StoreApi.java
@@ -8,7 +8,7 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StoreApi {
 
 	private final org.openapitools.client.api.StoreApi delegate;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/UserApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/UserApi.java
index 0d5c712f4a39..f7e2e887655d 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/UserApi.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/UserApi.java
@@ -8,7 +8,7 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class UserApi {
 
 	private final org.openapitools.client.api.UserApi delegate;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
index 7960d780f90e..8ea259107687 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
index c35e76467829..cdae61d5bfb1 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
@@ -19,7 +19,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
index 029926d3fa14..efa13254096a 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
@@ -19,7 +19,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/OAuth.java
index 7c7957216701..448c4bc8ef5e 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/OAuth.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 0f1223c2bc61..f84a72518f68 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c03535ab9471..3104ead59eed 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 4356a4f8c1eb..b485c4825c27 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index fa85ab77596a..4b3082c2a9d5 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -43,7 +43,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   private Map<String, String> mapString = null;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 2426e7c974c4..d09eacadf3e9 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index da407ccdc473..93480b7f4966 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 5e468870311e..4afc16a07bb9 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index ed080254966e..8533c0b77ae3 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java
index 3bcb8a739172..83270058d077 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java
@@ -35,7 +35,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 28d19953c345..04028d28af4e 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 5eeac9d8ac5d..a1e543104384 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java
index df57098053eb..10ee0b2ca102 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -34,7 +34,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   private List<String> arrayOfString = null;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCat.java
index c4386f4e6011..f038a3a46ad7 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCat.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index 7ce0ddb21f5a..e3b6b0fdd04e 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java
index 033e97881105..d253e541dede 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -34,7 +34,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   private String smallCamel;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
index 11ce48991b06..e397ea7aa176 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java
index 3e7b991436aa..e31a9ae81150 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java
index 868ba8750742..de74329bc521 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java
@@ -30,7 +30,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java
index 4de7664b26a7..bac4aec70b57 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java
index 02b0aac2247a..6bb0d3fab73e 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
index f56658043689..edf33abb2b57 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java
index dd42595cf202..147bb4d9b761 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java
index 86526adb3fa7..bf547f81f668 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,7 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
index 51a1a645a109..75f53d11450c 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -34,7 +34,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index cfd62fbce628..7f12fa9001f2 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,7 +32,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
   private java.io.File file;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
index 9a7e8a9c976f..cd6ccf98dc6a 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -47,7 +47,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 0a3f0d464360..741ab2441d34 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,7 +30,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java
index 3e72350aa8b1..65e595487b45 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java
@@ -35,7 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 07d314691a97..d6b9118636db 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,7 +37,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java
index dd99468a0059..3b952b2730bf 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,7 +31,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 383cafdd3a5a..dd401709d75d 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -31,7 +31,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
   private Integer code;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java
index b62e13a90a0c..733ec3718a15 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java
index bd625c5f66f3..8c03d816bff7 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java
@@ -33,7 +33,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5ca72a169fe8..45f21901673f 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
index ba4e395e94e9..bfbd68687977 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
@@ -35,7 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java
index d4d9ac6ba110..863237336880 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -32,7 +32,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   private BigDecimal myNumber;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java
index 3baccce6f9c4..37e6e7df60e9 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java
@@ -40,7 +40,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b3e58ef3d2c5..e5f23ef5dcfe 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,7 +30,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 35ad3bf46994..e60f8a8104d6 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java
index a3ecb398faa3..b15dc0d14fc6 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,7 +30,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index f79d7b6383a7..9f17e81859e9 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -36,7 +36,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem = "what";
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index f15b107fd18b..b02cf19f1d82 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -37,7 +37,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java
index b7e74643dab2..eafdd902c04d 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java
@@ -36,7 +36,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java
index b3fbdce31b9b..d6fa59c54a81 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -60,7 +60,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   private String attributeString;
diff --git a/samples/client/petstore/java/webclient/build.gradle b/samples/client/petstore/java/webclient/build.gradle
index 05587f7be399..e7d1f624499b 100644
--- a/samples/client/petstore/java/webclient/build.gradle
+++ b/samples/client/petstore/java/webclient/build.gradle
@@ -131,6 +131,7 @@ dependencies {
     compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
     compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
 
diff --git a/samples/client/petstore/java/webclient/pom.xml b/samples/client/petstore/java/webclient/pom.xml
index fff9da8e312b..c3d419b6d91c 100644
--- a/samples/client/petstore/java/webclient/pom.xml
+++ b/samples/client/petstore/java/webclient/pom.xml
@@ -109,6 +109,12 @@
                 <artifactId>jackson-datatype-jsr310</artifactId>
                 <version>${jackson-version}</version>
             </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -125,6 +131,7 @@
         <jackson-version>2.10.3</jackson-version>
         <jackson-databind-version>2.10.3</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
         <reactor-version>3.1.8.RELEASE</reactor-version>
         <reactor-netty-version>0.7.8.RELEASE</reactor-netty-version>
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java
index 72af8b68035d..a69349fef846 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java
@@ -64,7 +64,7 @@
 import org.openapitools.client.auth.ApiKeyAuth;
 import org.openapitools.client.auth.OAuth;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiClient {
     public enum CollectionFormat {
         CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null);
@@ -643,56 +643,4 @@ public String collectionPathParameterToString(CollectionFormat collectionFormat,
 
          return collectionFormat.collectionToString(values);
     }
-
-    private class ApiClientHttpRequestInterceptor implements ClientHttpRequestInterceptor {
-        private final Log log = LogFactory.getLog(ApiClientHttpRequestInterceptor.class);
-
-        @Override
-        public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException {
-            logRequest(request, body);
-            ClientHttpResponse response = execution.execute(request, body);
-            logResponse(response);
-            return response;
-        }
-
-        private void logRequest(HttpRequest request, byte[] body) throws UnsupportedEncodingException {
-            log.info("URI: " + request.getURI());
-            log.info("HTTP Method: " + request.getMethod());
-            log.info("HTTP Headers: " + headersToString(request.getHeaders()));
-            log.info("Request Body: " + new String(body, StandardCharsets.UTF_8));
-        }
-
-        private void logResponse(ClientHttpResponse response) throws IOException {
-            log.info("HTTP Status Code: " + response.getRawStatusCode());
-            log.info("Status Text: " + response.getStatusText());
-            log.info("HTTP Headers: " + headersToString(response.getHeaders()));
-            log.info("Response Body: " + bodyToString(response.getBody()));
-        }
-
-        private String headersToString(HttpHeaders headers) {
-            StringBuilder builder = new StringBuilder();
-            for(Entry<String, List<String>> entry : headers.entrySet()) {
-                builder.append(entry.getKey()).append("=[");
-                for(String value : entry.getValue()) {
-                    builder.append(value).append(",");
-                }
-                builder.setLength(builder.length() - 1); // Get rid of trailing comma
-                builder.append("],");
-            }
-            builder.setLength(builder.length() - 1); // Get rid of trailing comma
-            return builder.toString();
-        }
-
-        private String bodyToString(InputStream body) throws IOException {
-            StringBuilder builder = new StringBuilder();
-            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(body, StandardCharsets.UTF_8));
-            String line = bufferedReader.readLine();
-            while (line != null) {
-                builder.append(line).append(System.lineSeparator());
-                line = bufferedReader.readLine();
-            }
-            bufferedReader.close();
-            return builder.toString();
-        }
-    }
 }
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/StringUtil.java
index 747a23f5bf23..4dc60597910a 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/StringUtil.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index f4ff12d485fe..edc44d999374 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.LinkedMultiValueMap;
@@ -23,7 +24,7 @@
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Flux;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AnotherFakeApi {
     private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
index 5468d6c2c147..95108f72e5e1 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.LinkedMultiValueMap;
@@ -31,7 +32,7 @@
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Flux;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeApi {
     private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 65e1f466a28c..2a2d3f3e1d8d 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.LinkedMultiValueMap;
@@ -23,7 +24,7 @@
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Flux;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeClassnameTags123Api {
     private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java
index dce19828d439..3749fe40927c 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.LinkedMultiValueMap;
@@ -26,7 +27,7 @@
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Flux;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class PetApi {
     private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java
index e0eeb03e5453..98d603a25455 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.LinkedMultiValueMap;
@@ -23,7 +24,7 @@
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Flux;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StoreApi {
     private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java
index ce37e5a808ff..62188c93a1cc 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java
@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.LinkedMultiValueMap;
@@ -23,7 +24,7 @@
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Flux;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class UserApi {
     private ApiClient apiClient;
 
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
index bbd04ba629dd..9e9f3733160e 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
@@ -3,7 +3,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
     private final String location;
     private final String paramName;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
index 903582344d12..bbbbba67a472 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
@@ -7,7 +7,7 @@
 import org.springframework.util.Base64Utils;
 import org.springframework.util.MultiValueMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBasicAuth implements Authentication {
     private String username;
     private String password;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
index 97ff24fcd69a..775bbf64c3b2 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
@@ -7,7 +7,7 @@
 import org.springframework.util.Base64Utils;
 import org.springframework.util.MultiValueMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
     private final String scheme;
     private String bearerToken;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/OAuth.java
index a1782cdb9e15..3067453951e9 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/OAuth.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -3,7 +3,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.MultiValueMap;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OAuth implements Authentication {
     private String accessToken;
 
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 0f1223c2bc61..f84a72518f68 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c03535ab9471..3104ead59eed 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 4356a4f8c1eb..b485c4825c27 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index fa85ab77596a..4b3082c2a9d5 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -43,7 +43,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   private Map<String, String> mapString = null;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 2426e7c974c4..d09eacadf3e9 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index da407ccdc473..93480b7f4966 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 5e468870311e..4afc16a07bb9 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index ed080254966e..8533c0b77ae3 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java
index 3bcb8a739172..83270058d077 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java
@@ -35,7 +35,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 28d19953c345..04028d28af4e 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 5eeac9d8ac5d..a1e543104384 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java
index df57098053eb..10ee0b2ca102 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -34,7 +34,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   private List<String> arrayOfString = null;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/BigCat.java
index c4386f4e6011..f038a3a46ad7 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/BigCat.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index 7ce0ddb21f5a..e3b6b0fdd04e 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BigCatAllOf {
   /**
    * Gets or Sets kind
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java
index 033e97881105..d253e541dede 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -34,7 +34,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   private String smallCamel;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java
index 11ce48991b06..e397ea7aa176 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java
@@ -34,7 +34,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java
index 3e7b991436aa..e31a9ae81150 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java
index 868ba8750742..de74329bc521 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java
@@ -30,7 +30,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java
index 4de7664b26a7..bac4aec70b57 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java
index 02b0aac2247a..6bb0d3fab73e 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java
index f56658043689..edf33abb2b57 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java
@@ -33,7 +33,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java
index dd42595cf202..147bb4d9b761 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java
index 86526adb3fa7..bf547f81f668 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,7 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
index 51a1a645a109..75f53d11450c 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -34,7 +34,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index cfd62fbce628..7f12fa9001f2 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,7 +32,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
   private java.io.File file;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
index 72ed8740e4d7..ec6dc028b41a 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -47,7 +47,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 0a3f0d464360..741ab2441d34 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,7 +30,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java
index 3e72350aa8b1..65e595487b45 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java
@@ -35,7 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 07d314691a97..d6b9118636db 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,7 +37,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java
index dd99468a0059..3b952b2730bf 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,7 +31,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 383cafdd3a5a..dd401709d75d 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -31,7 +31,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
   private Integer code;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java
index b62e13a90a0c..733ec3718a15 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java
index bd625c5f66f3..8c03d816bff7 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java
@@ -33,7 +33,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5ca72a169fe8..45f21901673f 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
index ba4e395e94e9..bfbd68687977 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
@@ -35,7 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java
index d4d9ac6ba110..863237336880 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -32,7 +32,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   private BigDecimal myNumber;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java
index 3baccce6f9c4..37e6e7df60e9 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java
@@ -40,7 +40,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b3e58ef3d2c5..e5f23ef5dcfe 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,7 +30,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 35ad3bf46994..e60f8a8104d6 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java
index a3ecb398faa3..b15dc0d14fc6 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,7 +30,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index f79d7b6383a7..9f17e81859e9 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -36,7 +36,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem = "what";
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index f15b107fd18b..b02cf19f1d82 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -37,7 +37,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java
index b7e74643dab2..eafdd902c04d 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java
@@ -36,7 +36,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/XmlItem.java
index b3fbdce31b9b..d6fa59c54a81 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -60,7 +60,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   private String attributeString;
diff --git a/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/FILES b/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/FILES
new file mode 100644
index 000000000000..4ea485f86c94
--- /dev/null
+++ b/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/FILES
@@ -0,0 +1,12 @@
+pom.xml
+src/gen/java/org/openapitools/api/PetApi.java
+src/gen/java/org/openapitools/api/StoreApi.java
+src/gen/java/org/openapitools/api/UserApi.java
+src/gen/java/org/openapitools/model/Category.java
+src/gen/java/org/openapitools/model/InlineObject.java
+src/gen/java/org/openapitools/model/InlineObject1.java
+src/gen/java/org/openapitools/model/ModelApiResponse.java
+src/gen/java/org/openapitools/model/Order.java
+src/gen/java/org/openapitools/model/Pet.java
+src/gen/java/org/openapitools/model/Tag.java
+src/gen/java/org/openapitools/model/User.java
diff --git a/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION b/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION
index afa636560641..d99e7162d01f 100644
--- a/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.0-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml
index 9c8c47f76a76..e3f53e0f7ba9 100644
--- a/samples/client/petstore/jaxrs-cxf-client/pom.xml
+++ b/samples/client/petstore/jaxrs-cxf-client/pom.xml
@@ -148,6 +148,12 @@
         <artifactId>jackson-datatype-joda</artifactId>
         <version>${jackson-jaxrs-version}</version>
     </dependency>
+    <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>${javax-annotation-version}</version>
+        <scope>provided</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
@@ -168,7 +174,8 @@
     <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <cxf-version>3.3.0</cxf-version>
-    <jackson-jaxrs-version>2.9.8</jackson-jaxrs-version>
+    <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
+    <javax-annotation-version>1.3.2</javax-annotation-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/PetApi.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/PetApi.java
index 72df7daef99a..1315668d8e5e 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/PetApi.java
@@ -36,10 +36,12 @@ public interface PetApi  {
     @POST
     @Path("/pet")
     @Consumes({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Add a new pet to the store", tags={  })
     @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 405, message = "Invalid input") })
-    public void addPet(Pet body);
+    public Pet addPet(Pet pet);
 
     /**
      * Deletes a pet
@@ -105,12 +107,14 @@ public interface PetApi  {
     @PUT
     @Path("/pet")
     @Consumes({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Update an existing pet", tags={  })
     @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    public void updatePet(Pet body);
+    public Pet updatePet(Pet pet);
 
     /**
      * Updates a pet in the store with form data
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/StoreApi.java
index f335bf43c6be..5c473da6e8f4 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/StoreApi.java
@@ -77,11 +77,12 @@ public interface StoreApi  {
      */
     @POST
     @Path("/store/order")
+    @Consumes({ "application/json" })
     @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Place an order for a pet", tags={  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    public Order placeOrder(Order body);
+    public Order placeOrder(Order order);
 }
 
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/UserApi.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/UserApi.java
index eb14a63a71b5..879c83b1ba94 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/UserApi.java
@@ -35,10 +35,11 @@ public interface UserApi  {
      */
     @POST
     @Path("/user")
+    @Consumes({ "application/json" })
     @ApiOperation(value = "Create user", tags={  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    public void createUser(User body);
+    public void createUser(User user);
 
     /**
      * Creates list of users with given input array
@@ -46,10 +47,11 @@ public interface UserApi  {
      */
     @POST
     @Path("/user/createWithArray")
+    @Consumes({ "application/json" })
     @ApiOperation(value = "Creates list of users with given input array", tags={  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    public void createUsersWithArrayInput(List<User> body);
+    public void createUsersWithArrayInput(List<User> user);
 
     /**
      * Creates list of users with given input array
@@ -57,10 +59,11 @@ public interface UserApi  {
      */
     @POST
     @Path("/user/createWithList")
+    @Consumes({ "application/json" })
     @ApiOperation(value = "Creates list of users with given input array", tags={  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    public void createUsersWithListInput(List<User> body);
+    public void createUsersWithListInput(List<User> user);
 
     /**
      * Delete user
@@ -122,10 +125,11 @@ public interface UserApi  {
      */
     @PUT
     @Path("/user/{username}")
+    @Consumes({ "application/json" })
     @ApiOperation(value = "Updated user", tags={  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    public void updateUser(@PathParam("username") String username, User body);
+    public void updateUser(@PathParam("username") String username, User user);
 }
 
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/InlineObject.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/InlineObject.java
new file mode 100644
index 000000000000..2910fe034ae9
--- /dev/null
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/InlineObject.java
@@ -0,0 +1,86 @@
+package org.openapitools.model;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class InlineObject  {
+  
+  @ApiModelProperty(value = "Updated name of the pet")
+ /**
+   * Updated name of the pet
+  **/
+  private String name;
+
+  @ApiModelProperty(value = "Updated status of the pet")
+ /**
+   * Updated status of the pet
+  **/
+  private String status;
+ /**
+   * Updated name of the pet
+   * @return name
+  **/
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public InlineObject name(String name) {
+    this.name = name;
+    return this;
+  }
+
+ /**
+   * Updated status of the pet
+   * @return status
+  **/
+  @JsonProperty("status")
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  public InlineObject status(String status) {
+    this.status = status;
+    return this;
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineObject {\n");
+    
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private static String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/InlineObject1.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/InlineObject1.java
new file mode 100644
index 000000000000..8fb7e4dee62d
--- /dev/null
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/InlineObject1.java
@@ -0,0 +1,87 @@
+package org.openapitools.model;
+
+import java.io.File;
+
+import io.swagger.annotations.ApiModelProperty;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class InlineObject1  {
+  
+  @ApiModelProperty(value = "Additional data to pass to server")
+ /**
+   * Additional data to pass to server
+  **/
+  private String additionalMetadata;
+
+  @ApiModelProperty(value = "file to upload")
+ /**
+   * file to upload
+  **/
+  private File file;
+ /**
+   * Additional data to pass to server
+   * @return additionalMetadata
+  **/
+  @JsonProperty("additionalMetadata")
+  public String getAdditionalMetadata() {
+    return additionalMetadata;
+  }
+
+  public void setAdditionalMetadata(String additionalMetadata) {
+    this.additionalMetadata = additionalMetadata;
+  }
+
+  public InlineObject1 additionalMetadata(String additionalMetadata) {
+    this.additionalMetadata = additionalMetadata;
+    return this;
+  }
+
+ /**
+   * file to upload
+   * @return file
+  **/
+  @JsonProperty("file")
+  public File getFile() {
+    return file;
+  }
+
+  public void setFile(File file) {
+    this.file = file;
+  }
+
+  public InlineObject1 file(File file) {
+    this.file = file;
+    return this;
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineObject1 {\n");
+    
+    sb.append("    additionalMetadata: ").append(toIndentedString(additionalMetadata)).append("\n");
+    sb.append("    file: ").append(toIndentedString(file)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private static String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java
index 660962be0e43..85036661f993 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java
@@ -53,13 +53,13 @@ public String toString() {
         return String.valueOf(value);
     }
 
-    public static StatusEnum fromValue(String v) {
+    public static StatusEnum fromValue(String value) {
         for (StatusEnum b : StatusEnum.values()) {
-            if (String.valueOf(b.value).equals(v)) {
+            if (b.value.equals(value)) {
                 return b;
             }
         }
-        throw new IllegalArgumentException("Unexpected value '" + v + "'");
+        throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
 }
 
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java
index 0ba245486396..ee8a2e071630 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java
@@ -26,7 +26,7 @@ public class Pet  {
   private Long id;
 
   @ApiModelProperty(value = "")
-  private Category category = null;
+  private Category category;
 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   private String name;
@@ -59,13 +59,13 @@ public String toString() {
         return String.valueOf(value);
     }
 
-    public static StatusEnum fromValue(String v) {
+    public static StatusEnum fromValue(String value) {
         for (StatusEnum b : StatusEnum.values()) {
-            if (String.valueOf(b.value).equals(v)) {
+            if (b.value.equals(value)) {
                 return b;
             }
         }
-        throw new IllegalArgumentException("Unexpected value '" + v + "'");
+        throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
 }
 
diff --git a/samples/client/petstore/k6/.openapi-generator/VERSION b/samples/client/petstore/k6/.openapi-generator/VERSION
index bfbf77eb7fad..d99e7162d01f 100644
--- a/samples/client/petstore/k6/.openapi-generator/VERSION
+++ b/samples/client/petstore/k6/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.0-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/k6/script.js b/samples/client/petstore/k6/script.js
index f70a392d6a47..3106a7a7c0fc 100644
--- a/samples/client/petstore/k6/script.js
+++ b/samples/client/petstore/k6/script.js
@@ -1,13 +1,13 @@
 /*
  * OpenAPI Petstore
- * This is a sample server Petstore server.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
  *
  * OpenAPI spec version: 1.0.0
  *
  * NOTE: This class is auto generated by OpenAPI Generator.
  * https://github.com/OpenAPITools/openapi-generator
  *
- * OpenAPI generator version: 4.3.0-SNAPSHOT
+ * OpenAPI generator version: 5.0.0-SNAPSHOT
  */
 
 
@@ -77,7 +77,7 @@ export default function() {
 
         // Request No. 3
         params = {headers: {"api_key": `${apiKey}`}};
-        request = http.delete(url, params);
+        request = http.del(url, params);
         sleep(SLEEP_DURATION);
     });
     group("/pet/{petId}/uploadImage", () => {
@@ -125,7 +125,7 @@ export default function() {
         sleep(SLEEP_DURATION);
 
         // Request No. 2
-        request = http.delete(url);
+        request = http.del(url);
         sleep(SLEEP_DURATION);
     });
     group("/user", () => {
@@ -198,7 +198,7 @@ export default function() {
         sleep(SLEEP_DURATION);
 
         // Request No. 3
-        request = http.delete(url);
+        request = http.del(url);
         sleep(SLEEP_DURATION);
     });
 }
diff --git a/samples/client/petstore/kotlin-gson/README.md b/samples/client/petstore/kotlin-gson/README.md
index aef4ea15beed..8166d4aadbac 100644
--- a/samples/client/petstore/kotlin-gson/README.md
+++ b/samples/client/petstore/kotlin-gson/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
diff --git a/samples/client/petstore/kotlin-gson/docs/Pet.md b/samples/client/petstore/kotlin-gson/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/client/petstore/kotlin-gson/docs/Pet.md
+++ b/samples/client/petstore/kotlin-gson/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/client/petstore/kotlin-gson/docs/PetApi.md b/samples/client/petstore/kotlin-gson/docs/PetApi.md
index ea93e1745279..27289c31c243 100644
--- a/samples/client/petstore/kotlin-gson/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-gson/docs/PetApi.md
@@ -110,7 +110,7 @@ Configure petstore_auth:
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
+> kotlin.collections.List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -123,9 +123,9 @@ Multiple status values can be provided with comma separated strings
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByStatus(status)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByStatus")
@@ -140,11 +140,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -159,7 +159,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -172,9 +172,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -189,11 +189,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/kotlin-gson/docs/UserApi.md b/samples/client/petstore/kotlin-gson/docs/UserApi.md
index 0f55f06bc629..fd98ce696add 100644
--- a/samples/client/petstore/kotlin-gson/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-gson/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(body)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(body)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 1c78bae10dd4..60f72b51af95 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -119,14 +119,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by status
     * Multiple status values can be provided with comma separated strings
     * @param status Status values that need to be considered for filter 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
     */
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun findPetsByStatus(status: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -139,13 +139,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -163,7 +163,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by tags
     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
     * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
@@ -171,7 +171,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
     @Deprecated(message = "This operation is deprecated.")
-    fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -184,13 +184,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 1e6e81fc1e91..258a2540e9e8 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -83,7 +83,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithArrayInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -123,7 +123,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithListInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 51a090c496e9..54df813fceec 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.google.gson.annotations.SerializedName
+
 /**
  * Describes the result of uploading an image resource
  * @param code 
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Category.kt
index 0e978e11fd6d..fdefa74fda0b 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.google.gson.annotations.SerializedName
+
 /**
  * A category for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt
index 4f9f9fde4537..049c89df3134 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.google.gson.annotations.SerializedName
+
 /**
  * An order for a pets from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 54d9edce52d7..af29ef2b61b7 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Category
 import org.openapitools.client.models.Tag
 
 import com.google.gson.annotations.SerializedName
+
 /**
  * A pet for sale in the pet store
  * @param name 
@@ -29,13 +30,13 @@ data class Pet (
     @SerializedName("name")
     val name: kotlin.String,
     @SerializedName("photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @SerializedName("id")
     val id: kotlin.Long? = null,
     @SerializedName("category")
     val category: Category? = null,
     @SerializedName("tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @SerializedName("status")
     val status: Pet.Status? = null
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 71d9cb767be7..28e82b1df685 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.google.gson.annotations.SerializedName
+
 /**
  * A tag for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/User.kt
index c2158935c59d..62baf33e927e 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.google.gson.annotations.SerializedName
+
 /**
  * A User who is purchasing from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-jackson/README.md b/samples/client/petstore/kotlin-jackson/README.md
index aef4ea15beed..8166d4aadbac 100644
--- a/samples/client/petstore/kotlin-jackson/README.md
+++ b/samples/client/petstore/kotlin-jackson/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
diff --git a/samples/client/petstore/kotlin-jackson/docs/Pet.md b/samples/client/petstore/kotlin-jackson/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/client/petstore/kotlin-jackson/docs/Pet.md
+++ b/samples/client/petstore/kotlin-jackson/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/client/petstore/kotlin-jackson/docs/PetApi.md b/samples/client/petstore/kotlin-jackson/docs/PetApi.md
index ea93e1745279..27289c31c243 100644
--- a/samples/client/petstore/kotlin-jackson/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-jackson/docs/PetApi.md
@@ -110,7 +110,7 @@ Configure petstore_auth:
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
+> kotlin.collections.List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -123,9 +123,9 @@ Multiple status values can be provided with comma separated strings
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByStatus(status)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByStatus")
@@ -140,11 +140,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -159,7 +159,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -172,9 +172,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -189,11 +189,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/kotlin-jackson/docs/UserApi.md b/samples/client/petstore/kotlin-jackson/docs/UserApi.md
index 0f55f06bc629..fd98ce696add 100644
--- a/samples/client/petstore/kotlin-jackson/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-jackson/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(body)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(body)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/Application.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/Application.kt
index 81e53e2d2f6c..a48b80eecd42 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/Application.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/Application.kt
@@ -10,7 +10,7 @@ fun main() {
     println("<top>.main")
     val inventory = StoreApi().getInventory()
     println("Inventory : $inventory")
-    val pet = Pet(name = "Elliot", photoUrls = listOf<String>("https://jameshooverstudios.com/wp-content/uploads/2015/04/Majestic-Dog-Photography-Elliot-Nov-5-2014.jpg", "https://express-images.franklymedia.com/6616/sites/981/2020/01/22105725/Elliott.jpg").toTypedArray(), id = 123456453, category = Category(id = 13259476, name = "dog"), tags = listOf<Tag>(Tag(id = 194093, name = "Elliot")).toTypedArray(), status = Pet.Status.AVAILABLE)
+    val pet = Pet(name = "Elliot", photoUrls = listOf<String>("https://jameshooverstudios.com/wp-content/uploads/2015/04/Majestic-Dog-Photography-Elliot-Nov-5-2014.jpg", "https://express-images.franklymedia.com/6616/sites/981/2020/01/22105725/Elliott.jpg"), id = 123456453, category = Category(id = 13259476, name = "dog"), tags = listOf<Tag>(Tag(id = 194093, name = "Elliot")), status = Pet.Status.AVAILABLE)
     PetApi().addPet(pet)
     val elliot = PetApi().getPetById(123456453)
     println("Elliot : $elliot")
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 1c78bae10dd4..60f72b51af95 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -119,14 +119,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by status
     * Multiple status values can be provided with comma separated strings
     * @param status Status values that need to be considered for filter 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
     */
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun findPetsByStatus(status: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -139,13 +139,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -163,7 +163,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by tags
     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
     * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
@@ -171,7 +171,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
     @Deprecated(message = "This operation is deprecated.")
-    fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -184,13 +184,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 1e6e81fc1e91..258a2540e9e8 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -83,7 +83,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithArrayInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -123,7 +123,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithListInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index ff1d570d234c..c341f8ca321b 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.fasterxml.jackson.annotation.JsonProperty
+
 /**
  * Describes the result of uploading an image resource
  * @param code 
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt
index a8782b11a5e0..2ed5390c1f3a 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.fasterxml.jackson.annotation.JsonProperty
+
 /**
  * A category for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt
index fccc4d2f5e4a..c7df5b55614b 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.fasterxml.jackson.annotation.JsonProperty
+
 /**
  * An order for a pets from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 8ac26d73a48c..be5b168e2d8b 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Category
 import org.openapitools.client.models.Tag
 
 import com.fasterxml.jackson.annotation.JsonProperty
+
 /**
  * A pet for sale in the pet store
  * @param name 
@@ -29,13 +30,13 @@ data class Pet (
     @field:JsonProperty("name")
     val name: kotlin.String,
     @field:JsonProperty("photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @field:JsonProperty("id")
     val id: kotlin.Long? = null,
     @field:JsonProperty("category")
     val category: Category? = null,
     @field:JsonProperty("tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @field:JsonProperty("status")
     val status: Pet.Status? = null
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt
index b6ae7b910fa2..7243f42ed7d8 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.fasterxml.jackson.annotation.JsonProperty
+
 /**
  * A tag for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt
index 199b868323a3..e8f639e50928 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.fasterxml.jackson.annotation.JsonProperty
+
 /**
  * A User who is purchasing from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-json-request-string/README.md b/samples/client/petstore/kotlin-json-request-string/README.md
index 9e9c5a2326bf..971d17b1e244 100644
--- a/samples/client/petstore/kotlin-json-request-string/README.md
+++ b/samples/client/petstore/kotlin-json-request-string/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
diff --git a/samples/client/petstore/kotlin-json-request-string/docs/Pet.md b/samples/client/petstore/kotlin-json-request-string/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/client/petstore/kotlin-json-request-string/docs/Pet.md
+++ b/samples/client/petstore/kotlin-json-request-string/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/client/petstore/kotlin-json-request-string/docs/PetApi.md b/samples/client/petstore/kotlin-json-request-string/docs/PetApi.md
index dd70fe9495dc..c24f3ec45653 100644
--- a/samples/client/petstore/kotlin-json-request-string/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-json-request-string/docs/PetApi.md
@@ -110,7 +110,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -123,9 +123,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -140,11 +140,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -159,7 +159,7 @@ Configure petstore_auth:
 
 <a name="getAllPets"></a>
 # **getAllPets**
-> kotlin.Array&lt;Pet&gt; getAllPets(lastUpdated)
+> kotlin.collections.List&lt;Pet&gt; getAllPets(lastUpdated)
 
 Get all pets
 
@@ -172,7 +172,7 @@ Get all pets
 val apiInstance = PetApi()
 val lastUpdated : java.time.OffsetDateTime = 2013-10-20T19:20:30+01:00 // java.time.OffsetDateTime | When this endpoint was hit last to help indentify if the client already has the latest copy.
 try {
-    val result : kotlin.Array<Pet> = apiInstance.getAllPets(lastUpdated)
+    val result : kotlin.collections.List<Pet> = apiInstance.getAllPets(lastUpdated)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#getAllPets")
@@ -191,7 +191,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/kotlin-json-request-string/docs/UserApi.md b/samples/client/petstore/kotlin-json-request-string/docs/UserApi.md
index 0f55f06bc629..fd98ce696add 100644
--- a/samples/client/petstore/kotlin-json-request-string/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-json-request-string/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(body)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(body)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index d835e047af80..584c6ef06867 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -119,7 +119,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by tags
     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
     * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
@@ -127,7 +127,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
     @Deprecated(message = "This operation is deprecated.")
-    fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -140,13 +140,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -164,14 +164,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Get all pets
     * 
     * @param lastUpdated When this endpoint was hit last to help indentify if the client already has the latest copy. (optional)
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
     */
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getAllPets(lastUpdated: java.time.OffsetDateTime?) : kotlin.Array<Pet> {
+    fun getAllPets(lastUpdated: java.time.OffsetDateTime?) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -186,13 +186,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 1e6e81fc1e91..258a2540e9e8 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -83,7 +83,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithArrayInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -123,7 +123,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithListInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index ada15fee7a1b..fafca8738f66 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * Describes the result of uploading an image resource
  * @param code 
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt
index 426a0e515928..a4c17c3b49dd 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A category for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt
index 3cfa5ca96263..a66c335904e7 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * An order for a pets from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
index a94bb811c3b4..a3df06cb6eb3 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Category
 import org.openapitools.client.models.Tag
 
 import com.squareup.moshi.Json
+
 /**
  * A pet for sale in the pet store
  * @param name 
@@ -29,13 +30,13 @@ data class Pet (
     @Json(name = "name")
     val name: kotlin.String,
     @Json(name = "photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @Json(name = "id")
     val id: kotlin.Long? = null,
     @Json(name = "category")
     val category: Category? = null,
     @Json(name = "tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
index f9ef87e13fbf..6e619023a5c9 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A tag for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/User.kt
index dfd63806da94..af1e270325de 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A User who is purchasing from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/README.md b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/README.md
index aef4ea15beed..8166d4aadbac 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/README.md
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/Pet.md b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/Pet.md
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/PetApi.md b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/PetApi.md
index ea93e1745279..27289c31c243 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/PetApi.md
@@ -110,7 +110,7 @@ Configure petstore_auth:
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
+> kotlin.collections.List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -123,9 +123,9 @@ Multiple status values can be provided with comma separated strings
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByStatus(status)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByStatus")
@@ -140,11 +140,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -159,7 +159,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -172,9 +172,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -189,11 +189,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/UserApi.md b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/UserApi.md
index 0f55f06bc629..fd98ce696add 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(body)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(body)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 565a31075c95..1cff24913d64 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -119,14 +119,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by status
     * Multiple status values can be provided with comma separated strings
     * @param status Status values that need to be considered for filter 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
     */
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    suspend fun findPetsByStatus(status: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -139,13 +139,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -163,7 +163,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by tags
     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
     * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
@@ -171,7 +171,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
     @Deprecated(message = "This operation is deprecated.")
-    suspend fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -184,13 +184,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 0bd96e7456c3..6494674c7f3d 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -83,7 +83,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    suspend fun createUsersWithArrayInput(body: kotlin.Array<User>) : Unit {
+    suspend fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -123,7 +123,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    suspend fun createUsersWithListInput(body: kotlin.Array<User>) : Unit {
+    suspend fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 83b19bd556f0..fc89bf34e7fc 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Describes the result of uploading an image resource
  * @param code 
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
index 60962ece7d4e..b483bee69b3e 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * A category for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
index 474530938cf5..d6bacf867c47 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * An order for a pets from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 2fc4113d2059..afa65785d387 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.Tag
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * A pet for sale in the pet store
  * @param name 
@@ -30,13 +31,13 @@ data class Pet (
     @SerializedName("name")
     val name: kotlin.String,
     @SerializedName("photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @SerializedName("id")
     val id: kotlin.Long? = null,
     @SerializedName("category")
     val category: Category? = null,
     @SerializedName("tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @SerializedName("status")
     val status: Pet.Status? = null
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 0e1786917625..a1a282cb38df 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * A tag for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
index daa329717364..59ba0254f603 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * A User who is purchasing from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-moshi-codegen/README.md b/samples/client/petstore/kotlin-moshi-codegen/README.md
index aef4ea15beed..8166d4aadbac 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/README.md
+++ b/samples/client/petstore/kotlin-moshi-codegen/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
diff --git a/samples/client/petstore/kotlin-moshi-codegen/docs/Pet.md b/samples/client/petstore/kotlin-moshi-codegen/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/docs/Pet.md
+++ b/samples/client/petstore/kotlin-moshi-codegen/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/client/petstore/kotlin-moshi-codegen/docs/PetApi.md b/samples/client/petstore/kotlin-moshi-codegen/docs/PetApi.md
index ea93e1745279..27289c31c243 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-moshi-codegen/docs/PetApi.md
@@ -110,7 +110,7 @@ Configure petstore_auth:
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
+> kotlin.collections.List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -123,9 +123,9 @@ Multiple status values can be provided with comma separated strings
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByStatus(status)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByStatus")
@@ -140,11 +140,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -159,7 +159,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -172,9 +172,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -189,11 +189,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/kotlin-moshi-codegen/docs/UserApi.md b/samples/client/petstore/kotlin-moshi-codegen/docs/UserApi.md
index 0f55f06bc629..fd98ce696add 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-moshi-codegen/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(body)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(body)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 1c78bae10dd4..60f72b51af95 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -119,14 +119,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by status
     * Multiple status values can be provided with comma separated strings
     * @param status Status values that need to be considered for filter 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
     */
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun findPetsByStatus(status: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -139,13 +139,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -163,7 +163,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by tags
     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
     * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
@@ -171,7 +171,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
     @Deprecated(message = "This operation is deprecated.")
-    fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -184,13 +184,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 1e6e81fc1e91..258a2540e9e8 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -83,7 +83,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithArrayInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -123,7 +123,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithListInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 25f8ffdf4731..18d2ce3dbbe7 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+
 /**
  * Describes the result of uploading an image resource
  * @param code 
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Category.kt
index e7229ac4384f..8396fa423574 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+
 /**
  * A category for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt
index c408adac9951..d7091dd4c0c2 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+
 /**
  * An order for a pets from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Pet.kt
index abba68a06462..8b4e6b44d4cc 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.Tag
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+
 /**
  * A pet for sale in the pet store
  * @param name 
@@ -30,13 +31,13 @@ data class Pet (
     @Json(name = "name")
     val name: kotlin.String,
     @Json(name = "photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @Json(name = "id")
     val id: kotlin.Long? = null,
     @Json(name = "category")
     val category: Category? = null,
     @Json(name = "tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Tag.kt
index c1da1f74c35c..e7cdab2bb5df 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+
 /**
  * A tag for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/User.kt
index 3d9ab2208497..1bfad8449046 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+
 /**
  * A User who is purchasing from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-multiplatform/docs/Pet.md b/samples/client/petstore/kotlin-multiplatform/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/client/petstore/kotlin-multiplatform/docs/Pet.md
+++ b/samples/client/petstore/kotlin-multiplatform/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/client/petstore/kotlin-multiplatform/docs/PetApi.md b/samples/client/petstore/kotlin-multiplatform/docs/PetApi.md
index 38df230ae673..7b3efc23d8bf 100644
--- a/samples/client/petstore/kotlin-multiplatform/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-multiplatform/docs/PetApi.md
@@ -110,7 +110,7 @@ Configure petstore_auth:
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
+> kotlin.collections.List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -123,9 +123,9 @@ Multiple status values can be provided with comma separated strings
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByStatus(status)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByStatus")
@@ -140,11 +140,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -159,7 +159,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -172,9 +172,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -189,11 +189,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/kotlin-multiplatform/docs/UserApi.md b/samples/client/petstore/kotlin-multiplatform/docs/UserApi.md
index 0f55f06bc629..fd98ce696add 100644
--- a/samples/client/petstore/kotlin-multiplatform/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-multiplatform/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(body)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(body)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
index aa9c34a0dca6..e164a6cf4d06 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -26,25 +26,25 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 class PetApi @UseExperimental(UnstableDefault::class) constructor(
-        baseUrl: kotlin.String = "http://petstore.swagger.io/v2",
-        httpClientEngine: HttpClientEngine? = null,
-        serializer: KotlinxSerializer)
-    : ApiClient(baseUrl, httpClientEngine, serializer) {
+    baseUrl: kotlin.String = "http://petstore.swagger.io/v2",
+    httpClientEngine: HttpClientEngine? = null,
+    serializer: KotlinxSerializer
+) : ApiClient(baseUrl, httpClientEngine, serializer) {
 
     @UseExperimental(UnstableDefault::class)
     constructor(
         baseUrl: kotlin.String = "http://petstore.swagger.io/v2",
         httpClientEngine: HttpClientEngine? = null,
-        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default)
-    : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
+        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default
+    ) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
 
     /**
-    * Add a new pet to the store
-    * 
-    * @param body Pet object that needs to be added to the store 
-    * @return void
-    */
-    suspend fun addPet(body: Pet) : HttpResponse<Unit> {
+     * Add a new pet to the store
+     * 
+     * @param body Pet object that needs to be added to the store 
+     * @return void
+     */
+    suspend fun addPet(body: Pet): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -68,16 +68,16 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
         ).wrap()
     }
 
-    
+
 
     /**
-    * Deletes a pet
-    * 
-    * @param petId Pet id to delete 
-    * @param apiKey  (optional)
-    * @return void
-    */
-    suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : HttpResponse<Unit> {
+     * Deletes a pet
+     * 
+     * @param petId Pet id to delete 
+     * @param apiKey  (optional)
+     * @return void
+     */
+    suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -91,7 +91,7 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
 
         val localVariableConfig = RequestConfig(
             RequestMethod.DELETE,
-            "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            "/pet/{petId}".replace("{" + "petId" + "}", "$petId"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -105,13 +105,13 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
 
 
     /**
-    * Finds Pets by status
-    * Multiple status values can be provided with comma separated strings
-    * @param status Status values that need to be considered for filter 
-    * @return kotlin.Array<Pet>
-    */
+     * Finds Pets by status
+     * Multiple status values can be provided with comma separated strings
+     * @param status Status values that need to be considered for filter 
+     * @return kotlin.collections.List<Pet>
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun findPetsByStatus(status: kotlin.Array<kotlin.String>) : HttpResponse<kotlin.Array<Pet>> {
+    suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>): HttpResponse<kotlin.collections.List<Pet>> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -134,28 +134,28 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
             localVariableConfig,
             localVariableBody,
             localVariableAuthNames
-        ).wrap<FindPetsByStatusResponse>().map { value.toTypedArray() }
+        ).wrap<FindPetsByStatusResponse>().map { value }
     }
 
     @Serializable
-private class FindPetsByStatusResponse(val value: List<Pet>) {
-    @Serializer(FindPetsByStatusResponse::class)
-    companion object : KSerializer<FindPetsByStatusResponse> {
-        private val serializer: KSerializer<List<Pet>> = Pet.serializer().list
-            override val descriptor = StringDescriptor.withName("FindPetsByStatusResponse")
-            override fun serialize(encoder: Encoder, obj: FindPetsByStatusResponse) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = FindPetsByStatusResponse(serializer.deserialize(decoder))
+    private class FindPetsByStatusResponse(val value: List<Pet>) {
+        @Serializer(FindPetsByStatusResponse::class)
+        companion object : KSerializer<FindPetsByStatusResponse> {
+            private val serializer: KSerializer<List<Pet>> = Pet.serializer().list
+                override val descriptor = StringDescriptor.withName("FindPetsByStatusResponse")
+                override fun serialize(encoder: Encoder, obj: FindPetsByStatusResponse) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = FindPetsByStatusResponse(serializer.deserialize(decoder))
+        }
     }
-}
 
     /**
-    * Finds Pets by tags
-    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-    * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet>
-    */
+     * Finds Pets by tags
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * @param tags Tags to filter by 
+     * @return kotlin.collections.List<Pet>
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : HttpResponse<kotlin.Array<Pet>> {
+    suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>): HttpResponse<kotlin.collections.List<Pet>> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -178,28 +178,28 @@ private class FindPetsByStatusResponse(val value: List<Pet>) {
             localVariableConfig,
             localVariableBody,
             localVariableAuthNames
-        ).wrap<FindPetsByTagsResponse>().map { value.toTypedArray() }
+        ).wrap<FindPetsByTagsResponse>().map { value }
     }
 
     @Serializable
-private class FindPetsByTagsResponse(val value: List<Pet>) {
-    @Serializer(FindPetsByTagsResponse::class)
-    companion object : KSerializer<FindPetsByTagsResponse> {
-        private val serializer: KSerializer<List<Pet>> = Pet.serializer().list
-            override val descriptor = StringDescriptor.withName("FindPetsByTagsResponse")
-            override fun serialize(encoder: Encoder, obj: FindPetsByTagsResponse) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = FindPetsByTagsResponse(serializer.deserialize(decoder))
+    private class FindPetsByTagsResponse(val value: List<Pet>) {
+        @Serializer(FindPetsByTagsResponse::class)
+        companion object : KSerializer<FindPetsByTagsResponse> {
+            private val serializer: KSerializer<List<Pet>> = Pet.serializer().list
+                override val descriptor = StringDescriptor.withName("FindPetsByTagsResponse")
+                override fun serialize(encoder: Encoder, obj: FindPetsByTagsResponse) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = FindPetsByTagsResponse(serializer.deserialize(decoder))
+        }
     }
-}
 
     /**
-    * Find pet by ID
-    * Returns a single pet
-    * @param petId ID of pet to return 
-    * @return Pet
-    */
+     * Find pet by ID
+     * Returns a single pet
+     * @param petId ID of pet to return 
+     * @return Pet
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun getPetById(petId: kotlin.Long) : HttpResponse<Pet> {
+    suspend fun getPetById(petId: kotlin.Long): HttpResponse<Pet> {
 
         val localVariableAuthNames = listOf<String>("api_key")
 
@@ -212,7 +212,7 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.GET,
-            "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            "/pet/{petId}".replace("{" + "petId" + "}", "$petId"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -226,12 +226,12 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
 
 
     /**
-    * Update an existing pet
-    * 
-    * @param body Pet object that needs to be added to the store 
-    * @return void
-    */
-    suspend fun updatePet(body: Pet) : HttpResponse<Unit> {
+     * Update an existing pet
+     * 
+     * @param body Pet object that needs to be added to the store 
+     * @return void
+     */
+    suspend fun updatePet(body: Pet): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -255,17 +255,17 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
         ).wrap()
     }
 
-    
+
 
     /**
-    * Updates a pet in the store with form data
-    * 
-    * @param petId ID of pet that needs to be updated 
-    * @param name Updated name of the pet (optional)
-    * @param status Updated status of the pet (optional)
-    * @return void
-    */
-    suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : HttpResponse<Unit> {
+     * Updates a pet in the store with form data
+     * 
+     * @param petId ID of pet that needs to be updated 
+     * @param name Updated name of the pet (optional)
+     * @param status Updated status of the pet (optional)
+     * @return void
+     */
+    suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -281,7 +281,7 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.POST,
-            "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            "/pet/{petId}".replace("{" + "petId" + "}", "$petId"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -295,15 +295,15 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
 
 
     /**
-    * uploads an image
-    * 
-    * @param petId ID of pet to update 
-    * @param additionalMetadata Additional data to pass to server (optional)
-    * @param file file to upload (optional)
-    * @return ApiResponse
-    */
+     * uploads an image
+     * 
+     * @param petId ID of pet to update 
+     * @param additionalMetadata Additional data to pass to server (optional)
+     * @param file file to upload (optional)
+     * @return ApiResponse
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: io.ktor.client.request.forms.InputProvider?) : HttpResponse<ApiResponse> {
+    suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: io.ktor.client.request.forms.InputProvider?): HttpResponse<ApiResponse> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -319,7 +319,7 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.POST,
-            "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
+            "/pet/{petId}/uploadImage".replace("{" + "petId" + "}", "$petId"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
index 56a581d3725a..8ca30e8ca3a3 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -25,25 +25,25 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 class StoreApi @UseExperimental(UnstableDefault::class) constructor(
-        baseUrl: kotlin.String = "http://petstore.swagger.io/v2",
-        httpClientEngine: HttpClientEngine? = null,
-        serializer: KotlinxSerializer)
-    : ApiClient(baseUrl, httpClientEngine, serializer) {
+    baseUrl: kotlin.String = "http://petstore.swagger.io/v2",
+    httpClientEngine: HttpClientEngine? = null,
+    serializer: KotlinxSerializer
+) : ApiClient(baseUrl, httpClientEngine, serializer) {
 
     @UseExperimental(UnstableDefault::class)
     constructor(
         baseUrl: kotlin.String = "http://petstore.swagger.io/v2",
         httpClientEngine: HttpClientEngine? = null,
-        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default)
-    : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
+        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default
+    ) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
 
     /**
-    * Delete purchase order by ID
-    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-    * @param orderId ID of the order that needs to be deleted 
-    * @return void
-    */
-    suspend fun deleteOrder(orderId: kotlin.String) : HttpResponse<Unit> {
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * @param orderId ID of the order that needs to be deleted 
+     * @return void
+     */
+    suspend fun deleteOrder(orderId: kotlin.String): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -56,7 +56,7 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
 
         val localVariableConfig = RequestConfig(
             RequestMethod.DELETE,
-            "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            "/store/order/{orderId}".replace("{" + "orderId" + "}", "$orderId"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -70,12 +70,12 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
 
 
     /**
-    * Returns pet inventories by status
-    * Returns a map of status codes to quantities
-    * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
-    */
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun getInventory() : HttpResponse<kotlin.collections.Map<kotlin.String, kotlin.Int>> {
+    suspend fun getInventory(): HttpResponse<kotlin.collections.Map<kotlin.String, kotlin.Int>> {
 
         val localVariableAuthNames = listOf<String>("api_key")
 
@@ -101,24 +101,24 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
     }
 
     @Serializable
-private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
-    @Serializer(GetInventoryResponse::class)
-    companion object : KSerializer<GetInventoryResponse> {
-        private val serializer: KSerializer<Map<kotlin.String, kotlin.Int>> = (kotlin.String.serializer() to kotlin.Int.serializer()).map
-            override val descriptor = StringDescriptor.withName("GetInventoryResponse")
-            override fun serialize(encoder: Encoder, obj: GetInventoryResponse) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = GetInventoryResponse(serializer.deserialize(decoder))
+    private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
+        @Serializer(GetInventoryResponse::class)
+        companion object : KSerializer<GetInventoryResponse> {
+            private val serializer: KSerializer<Map<kotlin.String, kotlin.Int>> = (kotlin.String.serializer() to kotlin.Int.serializer()).map
+                override val descriptor = StringDescriptor.withName("GetInventoryResponse")
+                override fun serialize(encoder: Encoder, obj: GetInventoryResponse) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = GetInventoryResponse(serializer.deserialize(decoder))
+        }
     }
-}
 
     /**
-    * Find purchase order by ID
-    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-    * @param orderId ID of pet that needs to be fetched 
-    * @return Order
-    */
+     * Find purchase order by ID
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * @param orderId ID of pet that needs to be fetched 
+     * @return Order
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun getOrderById(orderId: kotlin.Long) : HttpResponse<Order> {
+    suspend fun getOrderById(orderId: kotlin.Long): HttpResponse<Order> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -131,7 +131,7 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.GET,
-            "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            "/store/order/{orderId}".replace("{" + "orderId" + "}", "$orderId"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -145,13 +145,13 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
 
 
     /**
-    * Place an order for a pet
-    * 
-    * @param body order placed for purchasing the pet 
-    * @return Order
-    */
+     * Place an order for a pet
+     * 
+     * @param body order placed for purchasing the pet 
+     * @return Order
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun placeOrder(body: Order) : HttpResponse<Order> {
+    suspend fun placeOrder(body: Order): HttpResponse<Order> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -175,7 +175,7 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
         ).wrap()
     }
 
-    
+
 
 
     companion object {
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
index 6786d3d3f331..88474dc9ef80 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -25,25 +25,25 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 class UserApi @UseExperimental(UnstableDefault::class) constructor(
-        baseUrl: kotlin.String = "http://petstore.swagger.io/v2",
-        httpClientEngine: HttpClientEngine? = null,
-        serializer: KotlinxSerializer)
-    : ApiClient(baseUrl, httpClientEngine, serializer) {
+    baseUrl: kotlin.String = "http://petstore.swagger.io/v2",
+    httpClientEngine: HttpClientEngine? = null,
+    serializer: KotlinxSerializer
+) : ApiClient(baseUrl, httpClientEngine, serializer) {
 
     @UseExperimental(UnstableDefault::class)
     constructor(
         baseUrl: kotlin.String = "http://petstore.swagger.io/v2",
         httpClientEngine: HttpClientEngine? = null,
-        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default)
-    : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
+        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default
+    ) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
 
     /**
-    * Create user
-    * This can only be done by the logged in user.
-    * @param body Created user object 
-    * @return void
-    */
-    suspend fun createUser(body: User) : HttpResponse<Unit> {
+     * Create user
+     * This can only be done by the logged in user.
+     * @param body Created user object 
+     * @return void
+     */
+    suspend fun createUser(body: User): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -67,19 +67,19 @@ class UserApi @UseExperimental(UnstableDefault::class) constructor(
         ).wrap()
     }
 
-    
+
 
     /**
-    * Creates list of users with given input array
-    * 
-    * @param body List of user object 
-    * @return void
-    */
-    suspend fun createUsersWithArrayInput(body: kotlin.Array<User>) : HttpResponse<Unit> {
+     * Creates list of users with given input array
+     * 
+     * @param body List of user object 
+     * @return void
+     */
+    suspend fun createUsersWithArrayInput(body: kotlin.collections.List<User>): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
-        val localVariableBody = CreateUsersWithArrayInputRequest(body.asList())
+        val localVariableBody = CreateUsersWithArrayInputRequest(body)
 
         val localVariableQuery = mutableMapOf<String, List<String>>()
 
@@ -100,27 +100,27 @@ class UserApi @UseExperimental(UnstableDefault::class) constructor(
     }
 
     @Serializable
-private class CreateUsersWithArrayInputRequest(val value: List<User>) {
-    @Serializer(CreateUsersWithArrayInputRequest::class)
-    companion object : KSerializer<CreateUsersWithArrayInputRequest> {
-        private val serializer: KSerializer<List<User>> = User.serializer().list
-            override val descriptor = StringDescriptor.withName("CreateUsersWithArrayInputRequest")
-            override fun serialize(encoder: Encoder, obj: CreateUsersWithArrayInputRequest) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = CreateUsersWithArrayInputRequest(serializer.deserialize(decoder))
+    private class CreateUsersWithArrayInputRequest(val value: List<User>) {
+        @Serializer(CreateUsersWithArrayInputRequest::class)
+        companion object : KSerializer<CreateUsersWithArrayInputRequest> {
+            private val serializer: KSerializer<List<User>> = User.serializer().list
+                override val descriptor = StringDescriptor.withName("CreateUsersWithArrayInputRequest")
+                override fun serialize(encoder: Encoder, obj: CreateUsersWithArrayInputRequest) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = CreateUsersWithArrayInputRequest(serializer.deserialize(decoder))
+        }
     }
-}
 
     /**
-    * Creates list of users with given input array
-    * 
-    * @param body List of user object 
-    * @return void
-    */
-    suspend fun createUsersWithListInput(body: kotlin.Array<User>) : HttpResponse<Unit> {
+     * Creates list of users with given input array
+     * 
+     * @param body List of user object 
+     * @return void
+     */
+    suspend fun createUsersWithListInput(body: kotlin.collections.List<User>): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
-        val localVariableBody = CreateUsersWithListInputRequest(body.asList())
+        val localVariableBody = CreateUsersWithListInputRequest(body)
 
         val localVariableQuery = mutableMapOf<String, List<String>>()
 
@@ -141,23 +141,23 @@ private class CreateUsersWithArrayInputRequest(val value: List<User>) {
     }
 
     @Serializable
-private class CreateUsersWithListInputRequest(val value: List<User>) {
-    @Serializer(CreateUsersWithListInputRequest::class)
-    companion object : KSerializer<CreateUsersWithListInputRequest> {
-        private val serializer: KSerializer<List<User>> = User.serializer().list
-            override val descriptor = StringDescriptor.withName("CreateUsersWithListInputRequest")
-            override fun serialize(encoder: Encoder, obj: CreateUsersWithListInputRequest) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = CreateUsersWithListInputRequest(serializer.deserialize(decoder))
+    private class CreateUsersWithListInputRequest(val value: List<User>) {
+        @Serializer(CreateUsersWithListInputRequest::class)
+        companion object : KSerializer<CreateUsersWithListInputRequest> {
+            private val serializer: KSerializer<List<User>> = User.serializer().list
+                override val descriptor = StringDescriptor.withName("CreateUsersWithListInputRequest")
+                override fun serialize(encoder: Encoder, obj: CreateUsersWithListInputRequest) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = CreateUsersWithListInputRequest(serializer.deserialize(decoder))
+        }
     }
-}
 
     /**
-    * Delete user
-    * This can only be done by the logged in user.
-    * @param username The name that needs to be deleted 
-    * @return void
-    */
-    suspend fun deleteUser(username: kotlin.String) : HttpResponse<Unit> {
+     * Delete user
+     * This can only be done by the logged in user.
+     * @param username The name that needs to be deleted 
+     * @return void
+     */
+    suspend fun deleteUser(username: kotlin.String): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -170,7 +170,7 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.DELETE,
-            "/user/{username}".replace("{"+"username"+"}", "$username"),
+            "/user/{username}".replace("{" + "username" + "}", "$username"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -184,13 +184,13 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
 
     /**
-    * Get user by user name
-    * 
-    * @param username The name that needs to be fetched. Use user1 for testing. 
-    * @return User
-    */
+     * Get user by user name
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing. 
+     * @return User
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun getUserByName(username: kotlin.String) : HttpResponse<User> {
+    suspend fun getUserByName(username: kotlin.String): HttpResponse<User> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -203,7 +203,7 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.GET,
-            "/user/{username}".replace("{"+"username"+"}", "$username"),
+            "/user/{username}".replace("{" + "username" + "}", "$username"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -217,14 +217,14 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
 
     /**
-    * Logs user into the system
-    * 
-    * @param username The user name for login 
-    * @param password The password for login in clear text 
-    * @return kotlin.String
-    */
+     * Logs user into the system
+     * 
+     * @param username The user name for login 
+     * @param password The password for login in clear text 
+     * @return kotlin.String
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun loginUser(username: kotlin.String, password: kotlin.String) : HttpResponse<kotlin.String> {
+    suspend fun loginUser(username: kotlin.String, password: kotlin.String): HttpResponse<kotlin.String> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -253,11 +253,11 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
 
     /**
-    * Logs out current logged in user session
-    * 
-    * @return void
-    */
-    suspend fun logoutUser() : HttpResponse<Unit> {
+     * Logs out current logged in user session
+     * 
+     * @return void
+     */
+    suspend fun logoutUser(): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -284,13 +284,13 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
 
     /**
-    * Updated user
-    * This can only be done by the logged in user.
-    * @param username name that need to be deleted 
-    * @param body Updated user object 
-    * @return void
-    */
-    suspend fun updateUser(username: kotlin.String, body: User) : HttpResponse<Unit> {
+     * Updated user
+     * This can only be done by the logged in user.
+     * @param username name that need to be deleted 
+     * @param body Updated user object 
+     * @return void
+     */
+    suspend fun updateUser(username: kotlin.String, body: User): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -302,7 +302,7 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.PUT,
-            "/user/{username}".replace("{"+"username"+"}", "$username"),
+            "/user/{username}".replace("{" + "username" + "}", "$username"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -314,7 +314,7 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
         ).wrap()
     }
 
-    
+
 
 
     companion object {
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
index 51ab6ed93980..a035628a8f93 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * Describes the result of uploading an image resource
  * @param code 
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
index 96432c658ada..d5f9a45fd4de 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * A category for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
index ec1a0d28e317..f1bd6ce4d0b8 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * An order for a pets from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
index 5e33d0056708..473cbaa959ac 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.Tag
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * A pet for sale in the pet store
  * @param name 
@@ -28,10 +29,10 @@ import kotlinx.serialization.internal.CommonEnumSerializer
 @Serializable
 data class Pet (
     @SerialName(value = "name") @Required val name: kotlin.String,
-    @SerialName(value = "photoUrls") @Required val photoUrls: kotlin.Array<kotlin.String>,
+    @SerialName(value = "photoUrls") @Required val photoUrls: kotlin.collections.List<kotlin.String>,
     @SerialName(value = "id") val id: kotlin.Long? = null,
     @SerialName(value = "category") val category: Category? = null,
-    @SerialName(value = "tags") val tags: kotlin.Array<Tag>? = null,
+    @SerialName(value = "tags") val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @SerialName(value = "status") val status: Pet.Status? = null
 ) {
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
index b21e51bf8d3b..6116e50d3f92 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * A tag for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
index 7d52e737d49e..97b53a049c1d 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * A User who is purchasing from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-nonpublic/README.md b/samples/client/petstore/kotlin-nonpublic/README.md
index aef4ea15beed..8166d4aadbac 100644
--- a/samples/client/petstore/kotlin-nonpublic/README.md
+++ b/samples/client/petstore/kotlin-nonpublic/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
diff --git a/samples/client/petstore/kotlin-nonpublic/docs/Pet.md b/samples/client/petstore/kotlin-nonpublic/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/client/petstore/kotlin-nonpublic/docs/Pet.md
+++ b/samples/client/petstore/kotlin-nonpublic/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/client/petstore/kotlin-nonpublic/docs/PetApi.md b/samples/client/petstore/kotlin-nonpublic/docs/PetApi.md
index ea93e1745279..27289c31c243 100644
--- a/samples/client/petstore/kotlin-nonpublic/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-nonpublic/docs/PetApi.md
@@ -110,7 +110,7 @@ Configure petstore_auth:
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
+> kotlin.collections.List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -123,9 +123,9 @@ Multiple status values can be provided with comma separated strings
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByStatus(status)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByStatus")
@@ -140,11 +140,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -159,7 +159,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -172,9 +172,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -189,11 +189,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/kotlin-nonpublic/docs/UserApi.md b/samples/client/petstore/kotlin-nonpublic/docs/UserApi.md
index 0f55f06bc629..fd98ce696add 100644
--- a/samples/client/petstore/kotlin-nonpublic/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-nonpublic/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(body)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(body)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 86c0c67a4d2f..5e930e963956 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -119,14 +119,14 @@ internal class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(bas
     * Finds Pets by status
     * Multiple status values can be provided with comma separated strings
     * @param status Status values that need to be considered for filter 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
     */
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun findPetsByStatus(status: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -139,13 +139,13 @@ internal class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(bas
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -163,7 +163,7 @@ internal class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(bas
     * Finds Pets by tags
     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
     * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
@@ -171,7 +171,7 @@ internal class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(bas
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
     @Deprecated(message = "This operation is deprecated.")
-    fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -184,13 +184,13 @@ internal class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(bas
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index eba7b8392e8d..725b36b01060 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -83,7 +83,7 @@ internal class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(ba
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithArrayInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -123,7 +123,7 @@ internal class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(ba
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithListInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 4a2f8b137ccc..a695278dfa3c 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * Describes the result of uploading an image resource
  * @param code 
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Category.kt
index 10d567d3c3cd..376994a9b250 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A category for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt
index 8a44803771b2..a943b97c1ea3 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * An order for a pets from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Pet.kt
index fe63282fa215..544fab20f5a7 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Category
 import org.openapitools.client.models.Tag
 
 import com.squareup.moshi.Json
+
 /**
  * A pet for sale in the pet store
  * @param name 
@@ -29,13 +30,13 @@ internal data class Pet (
     @Json(name = "name")
     val name: kotlin.String,
     @Json(name = "photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @Json(name = "id")
     val id: kotlin.Long? = null,
     @Json(name = "category")
     val category: Category? = null,
     @Json(name = "tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 2a130c6cd1d8..d9b84e93eafd 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A tag for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/User.kt
index afac563f29c4..e0e821cd7e38 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A User who is purchasing from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-nullable/README.md b/samples/client/petstore/kotlin-nullable/README.md
index aef4ea15beed..8166d4aadbac 100644
--- a/samples/client/petstore/kotlin-nullable/README.md
+++ b/samples/client/petstore/kotlin-nullable/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
diff --git a/samples/client/petstore/kotlin-nullable/docs/Pet.md b/samples/client/petstore/kotlin-nullable/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/client/petstore/kotlin-nullable/docs/Pet.md
+++ b/samples/client/petstore/kotlin-nullable/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/client/petstore/kotlin-nullable/docs/PetApi.md b/samples/client/petstore/kotlin-nullable/docs/PetApi.md
index b9337d3d62a2..42a28f741c76 100644
--- a/samples/client/petstore/kotlin-nullable/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-nullable/docs/PetApi.md
@@ -110,7 +110,7 @@ Configure petstore_auth:
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
+> kotlin.collections.List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -123,9 +123,9 @@ Multiple status values can be provided with comma separated strings
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
 try {
-    val result : kotlin.Array<Pet>? = apiInstance.findPetsByStatus(status)
+    val result : kotlin.collections.List<Pet>? = apiInstance.findPetsByStatus(status)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByStatus")
@@ -140,11 +140,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -159,7 +159,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -172,9 +172,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet>? = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet>? = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -189,11 +189,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/kotlin-nullable/docs/UserApi.md b/samples/client/petstore/kotlin-nullable/docs/UserApi.md
index 57f651f0b12b..d91ca1e97cf8 100644
--- a/samples/client/petstore/kotlin-nullable/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-nullable/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(body)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(body)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index c36372aebc0f..4b9faa2a2c46 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -119,14 +119,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by status
     * Multiple status values can be provided with comma separated strings
     * @param status Status values that need to be considered for filter 
-    * @return kotlin.Array<Pet> or null
+    * @return kotlin.collections.List<Pet> or null
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
     */
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun findPetsByStatus(status: kotlin.Array<kotlin.String>) : kotlin.Array<Pet>? {
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet>? {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -139,13 +139,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>?
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>?
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -163,7 +163,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by tags
     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
     * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet> or null
+    * @return kotlin.collections.List<Pet> or null
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
@@ -171,7 +171,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
     @Deprecated(message = "This operation is deprecated.")
-    fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : kotlin.Array<Pet>? {
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet>? {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -184,13 +184,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>?
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>?
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 14ce7aa5f54a..2ae5998489dd 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -83,7 +83,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithArrayInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -123,7 +123,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithListInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 3c715519085b..7d40c8efbc2f 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * Describes the result of uploading an image resource
  * @param code 
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt
index 07955e4ff491..ceb0fbc8fe60 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * A category for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt
index d5048059d44e..ed8f8b13a43b 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * An order for a pets from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 0f72fb6bd360..105f485f021d 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.Tag
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * A pet for sale in the pet store
  * @param name 
@@ -30,13 +31,13 @@ data class Pet (
     @Json(name = "name")
     val name: kotlin.String,
     @Json(name = "photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @Json(name = "id")
     val id: kotlin.Long? = null,
     @Json(name = "category")
     val category: Category? = null,
     @Json(name = "tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt
index fa228fbe1f49..944b1cd0a141 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * A tag for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt
index d02cbd91abd9..9697f07d5bf8 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * A User who is purchasing from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-okhttp3/README.md b/samples/client/petstore/kotlin-okhttp3/README.md
index aef4ea15beed..8166d4aadbac 100644
--- a/samples/client/petstore/kotlin-okhttp3/README.md
+++ b/samples/client/petstore/kotlin-okhttp3/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
diff --git a/samples/client/petstore/kotlin-okhttp3/docs/Pet.md b/samples/client/petstore/kotlin-okhttp3/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/client/petstore/kotlin-okhttp3/docs/Pet.md
+++ b/samples/client/petstore/kotlin-okhttp3/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/client/petstore/kotlin-okhttp3/docs/PetApi.md b/samples/client/petstore/kotlin-okhttp3/docs/PetApi.md
index ea93e1745279..27289c31c243 100644
--- a/samples/client/petstore/kotlin-okhttp3/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-okhttp3/docs/PetApi.md
@@ -110,7 +110,7 @@ Configure petstore_auth:
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
+> kotlin.collections.List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -123,9 +123,9 @@ Multiple status values can be provided with comma separated strings
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByStatus(status)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByStatus")
@@ -140,11 +140,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -159,7 +159,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -172,9 +172,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -189,11 +189,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/kotlin-okhttp3/docs/UserApi.md b/samples/client/petstore/kotlin-okhttp3/docs/UserApi.md
index 0f55f06bc629..fd98ce696add 100644
--- a/samples/client/petstore/kotlin-okhttp3/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-okhttp3/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(body)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(body)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 1c78bae10dd4..60f72b51af95 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -119,14 +119,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by status
     * Multiple status values can be provided with comma separated strings
     * @param status Status values that need to be considered for filter 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
     */
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun findPetsByStatus(status: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -139,13 +139,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -163,7 +163,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by tags
     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
     * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
@@ -171,7 +171,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
     @Deprecated(message = "This operation is deprecated.")
-    fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -184,13 +184,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 1e6e81fc1e91..258a2540e9e8 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -83,7 +83,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithArrayInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -123,7 +123,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithListInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index ada15fee7a1b..fafca8738f66 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * Describes the result of uploading an image resource
  * @param code 
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Category.kt
index 426a0e515928..a4c17c3b49dd 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A category for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt
index 3cfa5ca96263..a66c335904e7 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * An order for a pets from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Pet.kt
index a94bb811c3b4..a3df06cb6eb3 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Category
 import org.openapitools.client.models.Tag
 
 import com.squareup.moshi.Json
+
 /**
  * A pet for sale in the pet store
  * @param name 
@@ -29,13 +30,13 @@ data class Pet (
     @Json(name = "name")
     val name: kotlin.String,
     @Json(name = "photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @Json(name = "id")
     val id: kotlin.Long? = null,
     @Json(name = "category")
     val category: Category? = null,
     @Json(name = "tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Tag.kt
index f9ef87e13fbf..6e619023a5c9 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A tag for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/User.kt
index dfd63806da94..af1e270325de 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A User who is purchasing from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-retrofit2/.openapi-generator/FILES b/samples/client/petstore/kotlin-retrofit2/.openapi-generator/FILES
index 76c6633d7c21..ed3870cf0c2a 100644
--- a/samples/client/petstore/kotlin-retrofit2/.openapi-generator/FILES
+++ b/samples/client/petstore/kotlin-retrofit2/.openapi-generator/FILES
@@ -13,12 +13,17 @@ settings.gradle
 src/main/kotlin/org/openapitools/client/apis/PetApi.kt
 src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
 src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
+src/main/kotlin/org/openapitools/client/auth/OAuth.kt
+src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt
+src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt
 src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
 src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/CollectionFormats.kt
 src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt
 src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
 src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt
 src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
diff --git a/samples/client/petstore/kotlin-retrofit2/README.md b/samples/client/petstore/kotlin-retrofit2/README.md
index aef4ea15beed..f374ed0b99f3 100644
--- a/samples/client/petstore/kotlin-retrofit2/README.md
+++ b/samples/client/petstore/kotlin-retrofit2/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
@@ -35,26 +35,26 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*PetApi* | [**addPet**](docs/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
-*PetApi* | [**deletePet**](docs/PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
-*PetApi* | [**findPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
-*PetApi* | [**findPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
-*PetApi* | [**getPetById**](docs/PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
-*PetApi* | [**updatePet**](docs/PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
-*PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
-*PetApi* | [**uploadFile**](docs/PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
-*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
-*StoreApi* | [**getInventory**](docs/StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**getOrderById**](docs/StoreApi.md#getorderbyid) | **GET** /store/order/{orderId} | Find purchase order by ID
-*StoreApi* | [**placeOrder**](docs/StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
-*UserApi* | [**createUser**](docs/UserApi.md#createuser) | **POST** /user | Create user
-*UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
-*UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
-*UserApi* | [**deleteUser**](docs/UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
-*UserApi* | [**getUserByName**](docs/UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
-*UserApi* | [**loginUser**](docs/UserApi.md#loginuser) | **GET** /user/login | Logs user into the system
-*UserApi* | [**logoutUser**](docs/UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
-*UserApi* | [**updateUser**](docs/UserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+*PetApi* | [**addPet**](docs/PetApi.md#addpet) | **POST** pet | Add a new pet to the store
+*PetApi* | [**deletePet**](docs/PetApi.md#deletepet) | **DELETE** pet/{petId} | Deletes a pet
+*PetApi* | [**findPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** pet/findByStatus | Finds Pets by status
+*PetApi* | [**findPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** pet/findByTags | Finds Pets by tags
+*PetApi* | [**getPetById**](docs/PetApi.md#getpetbyid) | **GET** pet/{petId} | Find pet by ID
+*PetApi* | [**updatePet**](docs/PetApi.md#updatepet) | **PUT** pet | Update an existing pet
+*PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**uploadFile**](docs/PetApi.md#uploadfile) | **POST** pet/{petId}/uploadImage | uploads an image
+*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** store/order/{orderId} | Delete purchase order by ID
+*StoreApi* | [**getInventory**](docs/StoreApi.md#getinventory) | **GET** store/inventory | Returns pet inventories by status
+*StoreApi* | [**getOrderById**](docs/StoreApi.md#getorderbyid) | **GET** store/order/{orderId} | Find purchase order by ID
+*StoreApi* | [**placeOrder**](docs/StoreApi.md#placeorder) | **POST** store/order | Place an order for a pet
+*UserApi* | [**createUser**](docs/UserApi.md#createuser) | **POST** user | Create user
+*UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** user/createWithArray | Creates list of users with given input array
+*UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** user/createWithList | Creates list of users with given input array
+*UserApi* | [**deleteUser**](docs/UserApi.md#deleteuser) | **DELETE** user/{username} | Delete user
+*UserApi* | [**getUserByName**](docs/UserApi.md#getuserbyname) | **GET** user/{username} | Get user by user name
+*UserApi* | [**loginUser**](docs/UserApi.md#loginuser) | **GET** user/login | Logs user into the system
+*UserApi* | [**logoutUser**](docs/UserApi.md#logoutuser) | **GET** user/logout | Logs out current logged in user session
+*UserApi* | [**updateUser**](docs/UserApi.md#updateuser) | **PUT** user/{username} | Updated user
 
 
 <a name="documentation-for-models"></a>
diff --git a/samples/client/petstore/kotlin-retrofit2/build.gradle b/samples/client/petstore/kotlin-retrofit2/build.gradle
index 392d9a352e68..035dac36829c 100644
--- a/samples/client/petstore/kotlin-retrofit2/build.gradle
+++ b/samples/client/petstore/kotlin-retrofit2/build.gradle
@@ -33,6 +33,8 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "com.squareup.moshi:moshi-kotlin:1.9.2"
     compile "com.squareup.moshi:moshi-adapters:1.9.2"
+    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.0"
+    compile "com.squareup.okhttp3:logging-interceptor:4.4.0"
     compile "com.squareup.retrofit2:retrofit:$retrofitVersion"
     compile "com.squareup.retrofit2:converter-moshi:$retrofitVersion"
     compile "com.squareup.retrofit2:converter-scalars:$retrofitVersion"
diff --git a/samples/client/petstore/kotlin-retrofit2/docs/Pet.md b/samples/client/petstore/kotlin-retrofit2/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/client/petstore/kotlin-retrofit2/docs/Pet.md
+++ b/samples/client/petstore/kotlin-retrofit2/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/client/petstore/kotlin-retrofit2/docs/PetApi.md b/samples/client/petstore/kotlin-retrofit2/docs/PetApi.md
index ea93e1745279..cd0240ec9897 100644
--- a/samples/client/petstore/kotlin-retrofit2/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-retrofit2/docs/PetApi.md
@@ -4,39 +4,31 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
-[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
-[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
-[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
-[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
-[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
-[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
-[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+[**addPet**](PetApi.md#addPet) | **POST** pet | Add a new pet to the store
+[**deletePet**](PetApi.md#deletePet) | **DELETE** pet/{petId} | Deletes a pet
+[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** pet/findByStatus | Finds Pets by status
+[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** pet/findByTags | Finds Pets by tags
+[**getPetById**](PetApi.md#getPetById) | **GET** pet/{petId} | Find pet by ID
+[**updatePet**](PetApi.md#updatePet) | **PUT** pet | Update an existing pet
+[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** pet/{petId} | Updates a pet in the store with form data
+[**uploadFile**](PetApi.md#uploadFile) | **POST** pet/{petId}/uploadImage | uploads an image
 
 
-<a name="addPet"></a>
-# **addPet**
-> addPet(body)
 
 Add a new pet to the store
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val body : Pet =  // Pet | Pet object that needs to be added to the store
-try {
-    apiInstance.addPet(body)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#addPet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#addPet")
-    e.printStackTrace()
-}
+
+webService.addPet(body)
 ```
 
 ### Parameters
@@ -52,38 +44,28 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
-<a name="deletePet"></a>
-# **deletePet**
-> deletePet(petId, apiKey)
 
 Deletes a pet
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | Pet id to delete
 val apiKey : kotlin.String = apiKey_example // kotlin.String | 
-try {
-    apiInstance.deletePet(petId, apiKey)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#deletePet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#deletePet")
-    e.printStackTrace()
-}
+
+webService.deletePet(petId, apiKey)
 ```
 
 ### Parameters
@@ -100,17 +82,12 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="findPetsByStatus"></a>
-# **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -119,47 +96,36 @@ Multiple status values can be provided with comma separated strings
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
-try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#findPetsByStatus")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#findPetsByStatus")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
+
+val result : kotlin.collections.List<Pet> = webService.findPetsByStatus(status)
 ```
 
 ### Parameters
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="findPetsByTags"></a>
-# **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -168,47 +134,36 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
-try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#findPetsByTags")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#findPetsByTags")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
+
+val result : kotlin.collections.List<Pet> = webService.findPetsByTags(tags)
 ```
 
 ### Parameters
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="getPetById"></a>
-# **getPetById**
-> Pet getPetById(petId)
 
 Find pet by ID
 
@@ -217,21 +172,15 @@ Returns a single pet
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to return
-try {
-    val result : Pet = apiInstance.getPetById(petId)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#getPetById")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#getPetById")
-    e.printStackTrace()
-}
+
+val result : Pet = webService.getPetById(petId)
 ```
 
 ### Parameters
@@ -247,38 +196,27 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure api_key:
-    ApiClient.apiKey["api_key"] = ""
-    ApiClient.apiKeyPrefix["api_key"] = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="updatePet"></a>
-# **updatePet**
-> updatePet(body)
 
 Update an existing pet
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val body : Pet =  // Pet | Pet object that needs to be added to the store
-try {
-    apiInstance.updatePet(body)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#updatePet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#updatePet")
-    e.printStackTrace()
-}
+
+webService.updatePet(body)
 ```
 
 ### Parameters
@@ -294,39 +232,29 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
-<a name="updatePetWithForm"></a>
-# **updatePetWithForm**
-> updatePetWithForm(petId, name, status)
 
 Updates a pet in the store with form data
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be updated
 val name : kotlin.String = name_example // kotlin.String | Updated name of the pet
 val status : kotlin.String = status_example // kotlin.String | Updated status of the pet
-try {
-    apiInstance.updatePetWithForm(petId, name, status)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#updatePetWithForm")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#updatePetWithForm")
-    e.printStackTrace()
-}
+
+webService.updatePetWithForm(petId, name, status)
 ```
 
 ### Parameters
@@ -344,40 +272,29 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
-<a name="uploadFile"></a>
-# **uploadFile**
-> ApiResponse uploadFile(petId, additionalMetadata, file)
 
 uploads an image
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to update
 val additionalMetadata : kotlin.String = additionalMetadata_example // kotlin.String | Additional data to pass to server
 val file : java.io.File = BINARY_DATA_HERE // java.io.File | file to upload
-try {
-    val result : ApiResponse = apiInstance.uploadFile(petId, additionalMetadata, file)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#uploadFile")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#uploadFile")
-    e.printStackTrace()
-}
+
+val result : ApiResponse = webService.uploadFile(petId, additionalMetadata, file)
 ```
 
 ### Parameters
@@ -395,8 +312,6 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
diff --git a/samples/client/petstore/kotlin-retrofit2/docs/StoreApi.md b/samples/client/petstore/kotlin-retrofit2/docs/StoreApi.md
index f4986041af8c..d3ca3e358965 100644
--- a/samples/client/petstore/kotlin-retrofit2/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-retrofit2/docs/StoreApi.md
@@ -4,15 +4,12 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
-[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
-[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
-[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
+[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** store/order/{orderId} | Delete purchase order by ID
+[**getInventory**](StoreApi.md#getInventory) | **GET** store/inventory | Returns pet inventories by status
+[**getOrderById**](StoreApi.md#getOrderById) | **GET** store/order/{orderId} | Find purchase order by ID
+[**placeOrder**](StoreApi.md#placeOrder) | **POST** store/order | Place an order for a pet
 
 
-<a name="deleteOrder"></a>
-# **deleteOrder**
-> deleteOrder(orderId)
 
 Delete purchase order by ID
 
@@ -21,20 +18,15 @@ For valid response try integer IDs with value &lt; 1000. Anything above 1000 or
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
 val orderId : kotlin.String = orderId_example // kotlin.String | ID of the order that needs to be deleted
-try {
-    apiInstance.deleteOrder(orderId)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#deleteOrder")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#deleteOrder")
-    e.printStackTrace()
-}
+
+webService.deleteOrder(orderId)
 ```
 
 ### Parameters
@@ -56,9 +48,6 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="getInventory"></a>
-# **getInventory**
-> kotlin.collections.Map&lt;kotlin.String, kotlin.Int&gt; getInventory()
 
 Returns pet inventories by status
 
@@ -67,20 +56,14 @@ Returns a map of status codes to quantities
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
-try {
-    val result : kotlin.collections.Map<kotlin.String, kotlin.Int> = apiInstance.getInventory()
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#getInventory")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#getInventory")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
+
+val result : kotlin.collections.Map<kotlin.String, kotlin.Int> = webService.getInventory()
 ```
 
 ### Parameters
@@ -93,18 +76,12 @@ This endpoint does not need any parameter.
 ### Authorization
 
 
-Configure api_key:
-    ApiClient.apiKey["api_key"] = ""
-    ApiClient.apiKeyPrefix["api_key"] = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
-<a name="getOrderById"></a>
-# **getOrderById**
-> Order getOrderById(orderId)
 
 Find purchase order by ID
 
@@ -113,21 +90,15 @@ For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other val
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
 val orderId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be fetched
-try {
-    val result : Order = apiInstance.getOrderById(orderId)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#getOrderById")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#getOrderById")
-    e.printStackTrace()
-}
+
+val result : Order = webService.getOrderById(orderId)
 ```
 
 ### Parameters
@@ -149,30 +120,21 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="placeOrder"></a>
-# **placeOrder**
-> Order placeOrder(body)
 
 Place an order for a pet
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
 val body : Order =  // Order | order placed for purchasing the pet
-try {
-    val result : Order = apiInstance.placeOrder(body)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#placeOrder")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#placeOrder")
-    e.printStackTrace()
-}
+
+val result : Order = webService.placeOrder(body)
 ```
 
 ### Parameters
diff --git a/samples/client/petstore/kotlin-retrofit2/docs/UserApi.md b/samples/client/petstore/kotlin-retrofit2/docs/UserApi.md
index 0f55f06bc629..6d27b5096f64 100644
--- a/samples/client/petstore/kotlin-retrofit2/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-retrofit2/docs/UserApi.md
@@ -4,19 +4,16 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**createUser**](UserApi.md#createUser) | **POST** /user | Create user
-[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
-[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
-[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
-[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
-[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
-[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
-[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
+[**createUser**](UserApi.md#createUser) | **POST** user | Create user
+[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** user/createWithArray | Creates list of users with given input array
+[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** user/createWithList | Creates list of users with given input array
+[**deleteUser**](UserApi.md#deleteUser) | **DELETE** user/{username} | Delete user
+[**getUserByName**](UserApi.md#getUserByName) | **GET** user/{username} | Get user by user name
+[**loginUser**](UserApi.md#loginUser) | **GET** user/login | Logs user into the system
+[**logoutUser**](UserApi.md#logoutUser) | **GET** user/logout | Logs out current logged in user session
+[**updateUser**](UserApi.md#updateUser) | **PUT** user/{username} | Updated user
 
 
-<a name="createUser"></a>
-# **createUser**
-> createUser(body)
 
 Create user
 
@@ -25,20 +22,15 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val body : User =  // User | Created user object
-try {
-    apiInstance.createUser(body)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#createUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#createUser")
-    e.printStackTrace()
-}
+
+webService.createUser(body)
 ```
 
 ### Parameters
@@ -60,36 +52,28 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="createUsersWithArrayInput"></a>
-# **createUsersWithArrayInput**
-> createUsersWithArrayInput(body)
 
 Creates list of users with given input array
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
-try {
-    apiInstance.createUsersWithArrayInput(body)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#createUsersWithArrayInput")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#createUsersWithArrayInput")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
+
+webService.createUsersWithArrayInput(body)
 ```
 
 ### Parameters
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -104,36 +88,28 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="createUsersWithListInput"></a>
-# **createUsersWithListInput**
-> createUsersWithListInput(body)
 
 Creates list of users with given input array
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
-try {
-    apiInstance.createUsersWithListInput(body)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#createUsersWithListInput")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#createUsersWithListInput")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
+
+webService.createUsersWithListInput(body)
 ```
 
 ### Parameters
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -148,9 +124,6 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="deleteUser"></a>
-# **deleteUser**
-> deleteUser(username)
 
 Delete user
 
@@ -159,20 +132,15 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be deleted
-try {
-    apiInstance.deleteUser(username)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#deleteUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#deleteUser")
-    e.printStackTrace()
-}
+
+webService.deleteUser(username)
 ```
 
 ### Parameters
@@ -194,30 +162,21 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="getUserByName"></a>
-# **getUserByName**
-> User getUserByName(username)
 
 Get user by user name
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be fetched. Use user1 for testing.
-try {
-    val result : User = apiInstance.getUserByName(username)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#getUserByName")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#getUserByName")
-    e.printStackTrace()
-}
+
+val result : User = webService.getUserByName(username)
 ```
 
 ### Parameters
@@ -239,31 +198,22 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="loginUser"></a>
-# **loginUser**
-> kotlin.String loginUser(username, password)
 
 Logs user into the system
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | The user name for login
 val password : kotlin.String = password_example // kotlin.String | The password for login in clear text
-try {
-    val result : kotlin.String = apiInstance.loginUser(username, password)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#loginUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#loginUser")
-    e.printStackTrace()
-}
+
+val result : kotlin.String = webService.loginUser(username, password)
 ```
 
 ### Parameters
@@ -286,28 +236,20 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="logoutUser"></a>
-# **logoutUser**
-> logoutUser()
 
 Logs out current logged in user session
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
-try {
-    apiInstance.logoutUser()
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#logoutUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#logoutUser")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
+
+webService.logoutUser()
 ```
 
 ### Parameters
@@ -326,9 +268,6 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="updateUser"></a>
-# **updateUser**
-> updateUser(username, body)
 
 Updated user
 
@@ -337,21 +276,16 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | name that need to be deleted
 val body : User =  // User | Updated user object
-try {
-    apiInstance.updateUser(username, body)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#updateUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#updateUser")
-    e.printStackTrace()
-}
+
+webService.updateUser(username, body)
 ```
 
 ### Parameters
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index e0257edb0f49..f3f9c057d241 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -4,38 +4,119 @@ import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import retrofit2.Call
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 
 import org.openapitools.client.models.ApiResponse
 import org.openapitools.client.models.Pet
 
 interface PetApi {
-    @POST("/pet")
+    /**
+     * Add a new pet to the store
+     * 
+     * Responses:
+     *  - 405: Invalid input
+     * 
+     * @param body Pet object that needs to be added to the store 
+    * @return [Call]<[Unit]>
+     */
+    @POST("pet")
     fun addPet(@Body body: Pet): Call<Unit>
 
-    @DELETE("/pet/{petId}")
+    /**
+     * Deletes a pet
+     * 
+     * Responses:
+     *  - 400: Invalid pet value
+     * 
+     * @param petId Pet id to delete 
+     * @param apiKey  (optional)
+    * @return [Call]<[Unit]>
+     */
+    @DELETE("pet/{petId}")
     fun deletePet(@Path("petId") petId: kotlin.Long, @Header("api_key") apiKey: kotlin.String): Call<Unit>
 
-    @GET("/pet/findByStatus")
-    fun findPetsByStatus(@Query("status") status: CSVParams): Call<kotlin.Array<Pet>>
+    /**
+     * Finds Pets by status
+     * Multiple status values can be provided with comma separated strings
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid status value
+     * 
+     * @param status Status values that need to be considered for filter 
+    * @return [Call]<[kotlin.collections.List<Pet>]>
+     */
+    @GET("pet/findByStatus")
+    fun findPetsByStatus(@Query("status") status: CSVParams): Call<kotlin.collections.List<Pet>>
 
+    /**
+     * Finds Pets by tags
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid tag value
+     * 
+     * @param tags Tags to filter by 
+    * @return [Call]<[kotlin.collections.List<Pet>]>
+     */
     @Deprecated("This api was deprecated")
-    @GET("/pet/findByTags")
-    fun findPetsByTags(@Query("tags") tags: CSVParams): Call<kotlin.Array<Pet>>
+    @GET("pet/findByTags")
+    fun findPetsByTags(@Query("tags") tags: CSVParams): Call<kotlin.collections.List<Pet>>
 
-    @GET("/pet/{petId}")
+    /**
+     * Find pet by ID
+     * Returns a single pet
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid ID supplied
+     *  - 404: Pet not found
+     * 
+     * @param petId ID of pet to return 
+    * @return [Call]<[Pet]>
+     */
+    @GET("pet/{petId}")
     fun getPetById(@Path("petId") petId: kotlin.Long): Call<Pet>
 
-    @PUT("/pet")
+    /**
+     * Update an existing pet
+     * 
+     * Responses:
+     *  - 400: Invalid ID supplied
+     *  - 404: Pet not found
+     *  - 405: Validation exception
+     * 
+     * @param body Pet object that needs to be added to the store 
+    * @return [Call]<[Unit]>
+     */
+    @PUT("pet")
     fun updatePet(@Body body: Pet): Call<Unit>
 
+    /**
+     * Updates a pet in the store with form data
+     * 
+     * Responses:
+     *  - 405: Invalid input
+     * 
+     * @param petId ID of pet that needs to be updated 
+     * @param name Updated name of the pet (optional)
+     * @param status Updated status of the pet (optional)
+    * @return [Call]<[Unit]>
+     */
     @FormUrlEncoded
-    @POST("/pet/{petId}")
+    @POST("pet/{petId}")
     fun updatePetWithForm(@Path("petId") petId: kotlin.Long, @Field("name") name: kotlin.String, @Field("status") status: kotlin.String): Call<Unit>
 
+    /**
+     * uploads an image
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param petId ID of pet to update 
+     * @param additionalMetadata Additional data to pass to server (optional)
+     * @param file file to upload (optional)
+    * @return [Call]<[ApiResponse]>
+     */
     @Multipart
-    @POST("/pet/{petId}/uploadImage")
+    @POST("pet/{petId}/uploadImage")
     fun uploadFile(@Path("petId") petId: kotlin.Long, @Part("additionalMetadata") additionalMetadata: kotlin.String, @Part file: MultipartBody.Part): Call<ApiResponse>
 
 }
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index cb0d5b8fa1b8..45b6d20b1c7f 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -4,22 +4,59 @@ import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import retrofit2.Call
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 
 import org.openapitools.client.models.Order
 
 interface StoreApi {
-    @DELETE("/store/order/{orderId}")
+    /**
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * Responses:
+     *  - 400: Invalid ID supplied
+     *  - 404: Order not found
+     * 
+     * @param orderId ID of the order that needs to be deleted 
+    * @return [Call]<[Unit]>
+     */
+    @DELETE("store/order/{orderId}")
     fun deleteOrder(@Path("orderId") orderId: kotlin.String): Call<Unit>
 
-    @GET("/store/inventory")
+    /**
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     * Responses:
+     *  - 200: successful operation
+     * 
+    * @return [Call]<[kotlin.collections.Map<kotlin.String, kotlin.Int>]>
+     */
+    @GET("store/inventory")
     fun getInventory(): Call<kotlin.collections.Map<kotlin.String, kotlin.Int>>
 
-    @GET("/store/order/{orderId}")
+    /**
+     * Find purchase order by ID
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid ID supplied
+     *  - 404: Order not found
+     * 
+     * @param orderId ID of pet that needs to be fetched 
+    * @return [Call]<[Order]>
+     */
+    @GET("store/order/{orderId}")
     fun getOrderById(@Path("orderId") orderId: kotlin.Long): Call<Order>
 
-    @POST("/store/order")
+    /**
+     * Place an order for a pet
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid Order
+     * 
+     * @param body order placed for purchasing the pet 
+    * @return [Call]<[Order]>
+     */
+    @POST("store/order")
     fun placeOrder(@Body body: Order): Call<Order>
 
 }
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 84a6cd43e5e2..33f031ec7142 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -4,34 +4,110 @@ import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import retrofit2.Call
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 
 import org.openapitools.client.models.User
 
 interface UserApi {
-    @POST("/user")
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param body Created user object 
+    * @return [Call]<[Unit]>
+     */
+    @POST("user")
     fun createUser(@Body body: User): Call<Unit>
 
-    @POST("/user/createWithArray")
-    fun createUsersWithArrayInput(@Body body: kotlin.Array<User>): Call<Unit>
+    /**
+     * Creates list of users with given input array
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param body List of user object 
+    * @return [Call]<[Unit]>
+     */
+    @POST("user/createWithArray")
+    fun createUsersWithArrayInput(@Body body: kotlin.collections.List<User>): Call<Unit>
 
-    @POST("/user/createWithList")
-    fun createUsersWithListInput(@Body body: kotlin.Array<User>): Call<Unit>
+    /**
+     * Creates list of users with given input array
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param body List of user object 
+    * @return [Call]<[Unit]>
+     */
+    @POST("user/createWithList")
+    fun createUsersWithListInput(@Body body: kotlin.collections.List<User>): Call<Unit>
 
-    @DELETE("/user/{username}")
+    /**
+     * Delete user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param username The name that needs to be deleted 
+    * @return [Call]<[Unit]>
+     */
+    @DELETE("user/{username}")
     fun deleteUser(@Path("username") username: kotlin.String): Call<Unit>
 
-    @GET("/user/{username}")
+    /**
+     * Get user by user name
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return [Call]<[User]>
+     */
+    @GET("user/{username}")
     fun getUserByName(@Path("username") username: kotlin.String): Call<User>
 
-    @GET("/user/login")
+    /**
+     * Logs user into the system
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid username/password supplied
+     * 
+     * @param username The user name for login 
+     * @param password The password for login in clear text 
+    * @return [Call]<[kotlin.String]>
+     */
+    @GET("user/login")
     fun loginUser(@Query("username") username: kotlin.String, @Query("password") password: kotlin.String): Call<kotlin.String>
 
-    @GET("/user/logout")
+    /**
+     * Logs out current logged in user session
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+    * @return [Call]<[Unit]>
+     */
+    @GET("user/logout")
     fun logoutUser(): Call<Unit>
 
-    @PUT("/user/{username}")
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 400: Invalid user supplied
+     *  - 404: User not found
+     * 
+     * @param username name that need to be deleted 
+     * @param body Updated user object 
+    * @return [Call]<[Unit]>
+     */
+    @PUT("user/{username}")
     fun updateUser(@Path("username") username: kotlin.String, @Body body: User): Call<Unit>
 
 }
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
new file mode 100644
index 000000000000..524d5190ef88
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
@@ -0,0 +1,50 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+import java.net.URI
+import java.net.URISyntaxException
+
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class ApiKeyAuth(
+        private val location: String = "",
+        private val paramName: String = "",
+        private var apiKey: String = ""
+) : Interceptor {
+    
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request = chain.request()
+
+        if ("query" == location) {
+            var newQuery = request.url.toUri().query
+            val paramValue = "$paramName=$apiKey"
+            if (newQuery == null) {
+                newQuery = paramValue
+            } else {
+                newQuery += "&$paramValue"
+            }
+
+            val newUri: URI
+            try {
+                val oldUri = request.url.toUri()
+                newUri = URI(oldUri.scheme, oldUri.authority,
+                    oldUri.path, newQuery, oldUri.fragment)
+            } catch (e: URISyntaxException) {
+                throw IOException(e)
+            }
+
+            request = request.newBuilder().url(newUri.toURL()).build()
+        } else if ("header" == location) {
+            request = request.newBuilder()
+                    .addHeader(paramName, apiKey)
+                    .build()
+        } else if ("cookie" == location) {
+            request = request.newBuilder()
+                    .addHeader("Cookie", "$paramName=$apiKey")
+                    .build()
+        }
+        return chain.proceed(request)
+    }
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/auth/OAuth.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/auth/OAuth.kt
new file mode 100644
index 000000000000..311a8f439794
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/auth/OAuth.kt
@@ -0,0 +1,151 @@
+package org.openapitools.client.auth
+
+import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
+import java.net.HttpURLConnection.HTTP_FORBIDDEN
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.OAuthClient
+import org.apache.oltu.oauth2.client.request.OAuthBearerClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+import org.apache.oltu.oauth2.common.message.types.GrantType
+import org.apache.oltu.oauth2.common.token.BasicOAuthToken
+
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Response
+
+class OAuth(
+        client: OkHttpClient,
+        var tokenRequestBuilder: TokenRequestBuilder
+) : Interceptor {
+
+    interface AccessTokenListener {
+        fun notify(token: BasicOAuthToken)
+    }
+
+    private var oauthClient: OAuthClient = OAuthClient(OAuthOkHttpClient(client))
+
+    @Volatile 
+    private var accessToken: String? = null
+    var authenticationRequestBuilder: AuthenticationRequestBuilder? = null
+    private var accessTokenListener: AccessTokenListener? = null
+
+    constructor(
+            requestBuilder: TokenRequestBuilder
+    ) : this(
+            OkHttpClient(), 
+            requestBuilder
+    )
+
+    constructor(
+            flow: OAuthFlow, 
+            authorizationUrl: String, 
+            tokenUrl: String, 
+            scopes: String
+    ) : this(
+            OAuthClientRequest.tokenLocation(tokenUrl).setScope(scopes)
+    ) {
+        setFlow(flow);
+        authenticationRequestBuilder = OAuthClientRequest.authorizationLocation(authorizationUrl);
+    }
+
+    fun setFlow(flow: OAuthFlow) {
+        when (flow) {
+            OAuthFlow.accessCode, OAuthFlow.implicit ->
+                tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE)
+            OAuthFlow.password ->
+                tokenRequestBuilder.setGrantType(GrantType.PASSWORD)
+            OAuthFlow.application ->
+                tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS)
+        }            
+    }
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        return retryingIntercept(chain, true)
+    }
+
+    @Throws(IOException::class)
+    private fun retryingIntercept(chain: Interceptor.Chain, updateTokenAndRetryOnAuthorizationFailure: Boolean): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") != null) {
+            return chain.proceed(request)
+        }
+
+        // If first time, get the token
+        val oAuthRequest: OAuthClientRequest
+        if (accessToken == null) {
+            updateAccessToken(null)
+        }
+
+        if (accessToken != null) {
+            // Build the request
+            val rb = request.newBuilder()
+
+            val requestAccessToken = accessToken
+            try {
+                oAuthRequest = OAuthBearerClientRequest(request.url.toString())
+                        .setAccessToken(requestAccessToken)
+                        .buildHeaderMessage()
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            }
+
+            oAuthRequest.headers.entries.forEach { header ->
+                rb.addHeader(header.key, header.value)
+            }
+            rb.url(oAuthRequest.locationUri)
+
+            //Execute the request
+            val response = chain.proceed(rb.build())
+
+            // 401/403 most likely indicates that access token has expired. Unless it happens two times in a row.
+            if ((response.code == HTTP_UNAUTHORIZED || response.code == HTTP_FORBIDDEN) && updateTokenAndRetryOnAuthorizationFailure) {
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body?.close()
+                        return retryingIntercept(chain, false)
+                    }
+                } catch (e: Exception) {
+                    response.body?.close()
+                    throw e
+                }
+            }
+            return response
+        } else {
+            return chain.proceed(chain.request())
+        }
+    }
+
+    /**
+     * Returns true if the access token has been updated
+     */
+    @Throws(IOException::class)
+    @Synchronized 
+    fun updateAccessToken(requestAccessToken: String?): Boolean {
+        if (accessToken == null || accessToken.equals(requestAccessToken)) {    
+            return try {
+                val accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage())
+                if (accessTokenResponse != null && accessTokenResponse.accessToken != null) {
+                    accessToken = accessTokenResponse.accessToken
+                    accessTokenListener?.notify(accessTokenResponse.oAuthToken as BasicOAuthToken)
+                    !accessToken.equals(requestAccessToken)
+                } else {
+                    false
+                }
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            } catch (e: OAuthProblemException) {
+                throw IOException(e)
+            }
+        }
+        return true;
+    }
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt
new file mode 100644
index 000000000000..bcada9b7a6a2
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt
@@ -0,0 +1,5 @@
+package org.openapitools.client.auth
+
+enum class OAuthFlow {
+    accessCode, implicit, password, application
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt
new file mode 100644
index 000000000000..93adbda3fc98
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt
@@ -0,0 +1,61 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.HttpClient
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.response.OAuthClientResponse
+import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody
+
+
+class OAuthOkHttpClient(
+        private var client: OkHttpClient
+) : HttpClient {
+
+    constructor() : this(OkHttpClient())
+
+    @Throws(OAuthSystemException::class, OAuthProblemException::class)
+    override fun <T : OAuthClientResponse?> execute(
+            request: OAuthClientRequest, 
+            headers: Map<String, String>?,
+            requestMethod: String, 
+            responseClass: Class<T>?): T {
+
+        var mediaType = "application/json".toMediaTypeOrNull()
+        val requestBuilder = Request.Builder().url(request.locationUri)
+
+        headers?.forEach { entry ->
+            if (entry.key.equals("Content-Type", true)) {
+                mediaType = entry.value.toMediaTypeOrNull()
+            } else {
+                requestBuilder.addHeader(entry.key, entry.value)
+            }
+        }
+
+        val body: RequestBody? = if (request.body != null) RequestBody.create(mediaType, request.body) else null
+        requestBuilder.method(requestMethod, body)
+
+        try {
+            val response = client.newCall(requestBuilder.build()).execute()
+            return OAuthClientResponseFactory.createCustomResponse(
+                    response.body?.string(), 
+                    response.body?.contentType()?.toString(),
+                    response.code,
+                    responseClass)
+        } catch (e: IOException) {
+            throw OAuthSystemException(e)
+        }
+    }
+
+    override fun shutdown() {
+        // Nothing to do here
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
index 2b657de46adb..5c4022ea3f2a 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -1,35 +1,177 @@
 package org.openapitools.client.infrastructure
 
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import org.openapitools.client.auth.ApiKeyAuth
+import org.openapitools.client.auth.OAuth
+import org.openapitools.client.auth.OAuth.AccessTokenListener
+import org.openapitools.client.auth.OAuthFlow
+
+import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.converter.scalars.ScalarsConverterFactory
+import com.squareup.moshi.Moshi
 import retrofit2.converter.moshi.MoshiConverterFactory
 
 class ApiClient(
     private var baseUrl: String = defaultBasePath,
-    private var okHttpClient: OkHttpClient
+    private val okHttpClientBuilder: OkHttpClient.Builder? = null,
+    private val serializerBuilder: Moshi.Builder = Serializer.moshiBuilder
 ) {
-    companion object {
-        @JvmStatic
-        val defaultBasePath: String by lazy {
-            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
-        }
+    private val apiAuthorizations = mutableMapOf<String, Interceptor>()
+    var logger: ((String) -> Unit)? = null
+
+    private val retrofitBuilder: Retrofit.Builder by lazy {
+        Retrofit.Builder()
+            .baseUrl(baseUrl)
+            .addConverterFactory(ScalarsConverterFactory.create())
+            .addConverterFactory(MoshiConverterFactory.create(serializerBuilder.build()))
+    }
+
+    private val clientBuilder: OkHttpClient.Builder by lazy {
+        okHttpClientBuilder ?: defaultClientBuilder
+    }
+
+    private val defaultClientBuilder: OkHttpClient.Builder by lazy {
+        OkHttpClient()
+            .newBuilder()
+            .addInterceptor(HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
+                override fun log(message: String) {
+                    logger?.invoke(message)
+                }
+            }).apply {
+                level = HttpLoggingInterceptor.Level.BODY
+            })
     }
 
     init {
         normalizeBaseUrl()
     }
 
-    val retrofitBuilder: Retrofit.Builder by lazy {
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: Moshi.Builder = Serializer.moshiBuilder,
+        authNames: Array<String>
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder) {
+        authNames.forEach { authName ->
+            val auth = when (authName) {
+                "api_key" -> ApiKeyAuth("header", "api_key")"petstore_auth" -> OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets")
+                else -> throw RuntimeException("auth name $authName not found in available auth names")
+            }
+            addAuthorization(authName, auth);
+        }
+    }
 
-        Retrofit.Builder()
-        .baseUrl(baseUrl)
-        .addConverterFactory(ScalarsConverterFactory.create())
-        .addConverterFactory(MoshiConverterFactory.create(Serializer.moshi))
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: Moshi.Builder = Serializer.moshiBuilder,
+        authName: String, 
+        clientId: String, 
+        secret: String, 
+        username: String, 
+        password: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        getTokenEndPoint()
+            ?.setClientId(clientId)
+            ?.setClientSecret(secret)
+            ?.setUsername(username)
+            ?.setPassword(password)
+    }
+
+    /**
+    * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Token request builder
+    */
+    fun getTokenEndPoint(): TokenRequestBuilder? {
+        var result: TokenRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = tokenRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Authentication request builder
+    */
+    fun getAuthorizationEndPoint(): AuthenticationRequestBuilder? {
+        var result: AuthenticationRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = authenticationRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
+    * @param accessToken Access token
+    * @return ApiClient
+    */
+    fun setAccessToken(accessToken: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            setAccessToken(accessToken)
+        }
+        return this
+    }
+
+    /**
+    * Helper method to configure the oauth accessCode/implicit flow parameters
+    * @param clientId Client ID
+    * @param clientSecret Client secret
+    * @param redirectURI Redirect URI
+    * @return ApiClient
+    */
+    fun configureAuthorizationFlow(clientId: String, clientSecret: String, redirectURI: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder
+                .setClientId(clientId)
+                .setClientSecret(clientSecret)
+                .setRedirectURI(redirectURI)
+            authenticationRequestBuilder
+                ?.setClientId(clientId)
+                ?.setRedirectURI(redirectURI)
+        }
+        return this;
+    }
+
+    /**
+    * Configures a listener which is notified when a new access token is received.
+    * @param accessTokenListener Access token listener
+    * @return ApiClient
+    */
+    fun registerAccessTokenListener(accessTokenListener: AccessTokenListener): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            registerAccessTokenListener(accessTokenListener)
+        }
+        return this;
+    }
+
+    /**
+     * Adds an authorization to be used by the client
+     * @param authName Authentication name
+     * @param authorization Authorization interceptor
+     * @return ApiClient
+     */
+    fun addAuthorization(authName: String, authorization: Interceptor): ApiClient {
+        if (apiAuthorizations.containsKey(authName)) {
+            throw RuntimeException("auth name $authName already in api authorizations")
+        }
+        apiAuthorizations[authName] = authorization
+        clientBuilder.addInterceptor(authorization)
+        return this
+    }
+
+    fun setLogger(logger: (String) -> Unit): ApiClient {
+        this.logger = logger
+        return this
     }
 
     fun <S> createService(serviceClass: Class<S>): S {
-        return retrofitBuilder.client(okHttpClient).build().create(serviceClass)
+        return retrofitBuilder.client(clientBuilder.build()).build().create(serviceClass)
     }
 
     private fun normalizeBaseUrl() {
@@ -37,4 +179,20 @@ class ApiClient(
             baseUrl += "/"
         }
     }
+
+    private inline fun <T, reified U> Iterable<T>.runOnFirst(callback: U.() -> Unit) {
+        for (element in this) {
+            if (element is U)  {
+                callback.invoke(element)
+                break
+            }
+        }
+    }
+
+    companion object {        
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt
new file mode 100644
index 000000000000..1804d1ae2bbd
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt
@@ -0,0 +1,16 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.JsonDataException
+import com.squareup.moshi.Moshi
+import retrofit2.Response
+
+@Throws(JsonDataException::class)
+inline fun <reified T> Response<*>.getErrorResponse(serializerBuilder: Moshi.Builder = Serializer.moshiBuilder): T? {
+    val serializer = serializerBuilder.build()
+    val parser = serializer.adapter(T::class.java)
+    val response = errorBody()?.string()
+    if(response != null) {
+        return parser.fromJson(response)
+    }
+    return null
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index ada15fee7a1b..fafca8738f66 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * Describes the result of uploading an image resource
  * @param code 
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Category.kt
index 426a0e515928..a4c17c3b49dd 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A category for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt
index 3cfa5ca96263..a66c335904e7 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * An order for a pets from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Pet.kt
index a94bb811c3b4..a3df06cb6eb3 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Category
 import org.openapitools.client.models.Tag
 
 import com.squareup.moshi.Json
+
 /**
  * A pet for sale in the pet store
  * @param name 
@@ -29,13 +30,13 @@ data class Pet (
     @Json(name = "name")
     val name: kotlin.String,
     @Json(name = "photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @Json(name = "id")
     val id: kotlin.Long? = null,
     @Json(name = "category")
     val category: Category? = null,
     @Json(name = "tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Tag.kt
index f9ef87e13fbf..6e619023a5c9 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A tag for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/User.kt
index dfd63806da94..af1e270325de 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A User who is purchasing from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-string/README.md b/samples/client/petstore/kotlin-string/README.md
index aef4ea15beed..8166d4aadbac 100644
--- a/samples/client/petstore/kotlin-string/README.md
+++ b/samples/client/petstore/kotlin-string/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
diff --git a/samples/client/petstore/kotlin-string/docs/Pet.md b/samples/client/petstore/kotlin-string/docs/Pet.md
index ec7756007379..73963abeb042 100644
--- a/samples/client/petstore/kotlin-string/docs/Pet.md
+++ b/samples/client/petstore/kotlin-string/docs/Pet.md
@@ -7,8 +7,8 @@ Name | Type | Description | Notes
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/client/petstore/kotlin-string/docs/PetApi.md b/samples/client/petstore/kotlin-string/docs/PetApi.md
index d4cc830afe07..a30ce4af5589 100644
--- a/samples/client/petstore/kotlin-string/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-string/docs/PetApi.md
@@ -110,7 +110,7 @@ Configure petstore_auth:
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
+> kotlin.collections.List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -123,9 +123,9 @@ Multiple status values can be provided with comma separated strings
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByStatus(status)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByStatus")
@@ -140,11 +140,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -159,7 +159,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -172,9 +172,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -189,11 +189,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/kotlin-string/docs/UserApi.md b/samples/client/petstore/kotlin-string/docs/UserApi.md
index 0f55f06bc629..fd98ce696add 100644
--- a/samples/client/petstore/kotlin-string/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-string/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(body)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(body)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 08155a50b8e3..c95dd04f915e 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -119,14 +119,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by status
     * Multiple status values can be provided with comma separated strings
     * @param status Status values that need to be considered for filter 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
     */
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun findPetsByStatus(status: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -139,13 +139,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -163,7 +163,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by tags
     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
     * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
@@ -171,7 +171,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
     @Deprecated(message = "This operation is deprecated.")
-    fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -184,13 +184,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 1e6e81fc1e91..258a2540e9e8 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -83,7 +83,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithArrayInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -123,7 +123,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithListInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 3c715519085b..7d40c8efbc2f 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * Describes the result of uploading an image resource
  * @param code 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
index 07955e4ff491..ceb0fbc8fe60 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * A category for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
index c71bb5bda0d4..ec768d1acefd 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * An order for a pets from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 0dd3a58bcaed..66667bf07cd1 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.Tag
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * A pet for sale in the pet store
  * @param id 
@@ -34,9 +35,9 @@ data class Pet (
     @Json(name = "name")
     val name: kotlin.String,
     @Json(name = "photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @Json(name = "tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
index fa228fbe1f49..944b1cd0a141 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * A tag for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
index d02cbd91abd9..9697f07d5bf8 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * A User who is purchasing from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-string/src/test/kotlin/org/openapitools/client/PetApiTest.kt b/samples/client/petstore/kotlin-string/src/test/kotlin/org/openapitools/client/PetApiTest.kt
index e410c780b27d..5ae1468ad074 100644
--- a/samples/client/petstore/kotlin-string/src/test/kotlin/org/openapitools/client/PetApiTest.kt
+++ b/samples/client/petstore/kotlin-string/src/test/kotlin/org/openapitools/client/PetApiTest.kt
@@ -22,9 +22,9 @@ class PetApiTest : ShouldSpec() {
             val pet = Pet(
                     id = petId,
                     name = "kotlin client test",
-                    photoUrls = arrayOf("http://test_kotlin_unit_test.com"),
+                    photoUrls = listOf("http://test_kotlin_unit_test.com"),
                     category = Category(petId, "test kotlin category"),
-                    tags = arrayOf(Tag(petId, "test kotlin tag"))
+                    tags = listOf(Tag(petId, "test kotlin tag"))
             )
             api.addPet(pet)
 
@@ -44,7 +44,7 @@ class PetApiTest : ShouldSpec() {
         }
 
         should("find pet by status") {
-            val result = api.findPetsByStatus(arrayOf("available"))
+            val result = api.findPetsByStatus(listOf("available"))
 
             result.size.shouldBeGreaterThan(0)
 
@@ -52,7 +52,7 @@ class PetApiTest : ShouldSpec() {
                 onePet.status.shouldBe(Pet.Status.available)
             }
 
-            val result2 = api.findPetsByStatus(arrayOf("unknown_and_incorrect_status"))
+            val result2 = api.findPetsByStatus(listOf("unknown_and_incorrect_status"))
 
             result2.size.shouldBe(0)
 
@@ -63,7 +63,7 @@ class PetApiTest : ShouldSpec() {
                     id = petId,
                     name = "kotlin client updatePet",
                     status = Pet.Status.pending,
-                    photoUrls = arrayOf("http://test_kotlin_unit_test.com")
+                    photoUrls = listOf("http://test_kotlin_unit_test.com")
             )
             api.updatePet(pet)
 
diff --git a/samples/client/petstore/kotlin-threetenbp/README.md b/samples/client/petstore/kotlin-threetenbp/README.md
index aef4ea15beed..8166d4aadbac 100644
--- a/samples/client/petstore/kotlin-threetenbp/README.md
+++ b/samples/client/petstore/kotlin-threetenbp/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
diff --git a/samples/client/petstore/kotlin-threetenbp/docs/Pet.md b/samples/client/petstore/kotlin-threetenbp/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/client/petstore/kotlin-threetenbp/docs/Pet.md
+++ b/samples/client/petstore/kotlin-threetenbp/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/client/petstore/kotlin-threetenbp/docs/PetApi.md b/samples/client/petstore/kotlin-threetenbp/docs/PetApi.md
index ea93e1745279..27289c31c243 100644
--- a/samples/client/petstore/kotlin-threetenbp/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-threetenbp/docs/PetApi.md
@@ -110,7 +110,7 @@ Configure petstore_auth:
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
+> kotlin.collections.List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -123,9 +123,9 @@ Multiple status values can be provided with comma separated strings
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByStatus(status)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByStatus")
@@ -140,11 +140,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -159,7 +159,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -172,9 +172,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -189,11 +189,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/kotlin-threetenbp/docs/UserApi.md b/samples/client/petstore/kotlin-threetenbp/docs/UserApi.md
index 0f55f06bc629..fd98ce696add 100644
--- a/samples/client/petstore/kotlin-threetenbp/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-threetenbp/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(body)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(body)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 1c78bae10dd4..60f72b51af95 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -119,14 +119,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by status
     * Multiple status values can be provided with comma separated strings
     * @param status Status values that need to be considered for filter 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
     */
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun findPetsByStatus(status: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -139,13 +139,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -163,7 +163,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by tags
     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
     * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
@@ -171,7 +171,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
     @Deprecated(message = "This operation is deprecated.")
-    fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -184,13 +184,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 1e6e81fc1e91..258a2540e9e8 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -83,7 +83,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithArrayInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -123,7 +123,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithListInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index ada15fee7a1b..fafca8738f66 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * Describes the result of uploading an image resource
  * @param code 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt
index 426a0e515928..a4c17c3b49dd 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A category for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
index 8f947e96651f..300f94d8545f 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * An order for a pets from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt
index a94bb811c3b4..a3df06cb6eb3 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Category
 import org.openapitools.client.models.Tag
 
 import com.squareup.moshi.Json
+
 /**
  * A pet for sale in the pet store
  * @param name 
@@ -29,13 +30,13 @@ data class Pet (
     @Json(name = "name")
     val name: kotlin.String,
     @Json(name = "photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @Json(name = "id")
     val id: kotlin.Long? = null,
     @Json(name = "category")
     val category: Category? = null,
     @Json(name = "tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt
index f9ef87e13fbf..6e619023a5c9 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A tag for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt
index dfd63806da94..af1e270325de 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -13,6 +13,7 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+
 /**
  * A User who is purchasing from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/test/kotlin/org/openapitools/client/PetApiTest.kt b/samples/client/petstore/kotlin-threetenbp/src/test/kotlin/org/openapitools/client/PetApiTest.kt
index d1c20493bccc..5da4f9082a8d 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/test/kotlin/org/openapitools/client/PetApiTest.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/test/kotlin/org/openapitools/client/PetApiTest.kt
@@ -22,9 +22,9 @@ class PetApiTest : ShouldSpec() {
             val pet = Pet(
                     id = petId,
                     name = "kotlin client test",
-                    photoUrls = arrayOf("http://test_kotlin_unit_test.com"),
+                    photoUrls = listOf("http://test_kotlin_unit_test.com"),
                     category = Category(petId, "test kotlin category"),
-                    tags = arrayOf(Tag(petId, "test kotlin tag"))
+                    tags = listOf(Tag(petId, "test kotlin tag"))
             )
             api.addPet(pet)
 
@@ -44,7 +44,7 @@ class PetApiTest : ShouldSpec() {
         }
 
         should("find pet by status") {
-            val result = api.findPetsByStatus(arrayOf("available"))
+            val result = api.findPetsByStatus(listOf("available"))
 
             result.size.shouldBeGreaterThan(0)
 
@@ -52,7 +52,7 @@ class PetApiTest : ShouldSpec() {
                 onePet.status.shouldBe(Pet.Status.available)
             }
 
-            val result2 = api.findPetsByStatus(arrayOf("unknown_and_incorrect_status"))
+            val result2 = api.findPetsByStatus(listOf("unknown_and_incorrect_status"))
 
             result2.size.shouldBe(0)
 
@@ -63,7 +63,7 @@ class PetApiTest : ShouldSpec() {
                     id = petId,
                     name = "kotlin client updatePet",
                     status = Pet.Status.pending,
-                    photoUrls = arrayOf("http://test_kotlin_unit_test.com")
+                    photoUrls = listOf("http://test_kotlin_unit_test.com")
             )
             api.updatePet(pet)
 
diff --git a/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/FILES b/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/FILES
new file mode 100644
index 000000000000..4833390d2456
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/FILES
@@ -0,0 +1,21 @@
+README.md
+build.gradle
+docs/EnumApi.md
+docs/PetEnum.md
+settings.gradle
+src/main/kotlin/org/openapitools/client/apis/EnumApi.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ApplicationDelegates.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
+src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
+src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt
+src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
+src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt
+src/main/kotlin/org/openapitools/client/models/PetEnum.kt
diff --git a/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION b/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION
index 58592f031f65..d99e7162d01f 100644
--- a/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION
@@ -1 +1 @@
-4.2.3-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-uppercase-enum/README.md b/samples/client/petstore/kotlin-uppercase-enum/README.md
index 9d5f9e7e33e0..0dbeb6c6ac5d 100644
--- a/samples/client/petstore/kotlin-uppercase-enum/README.md
+++ b/samples/client/petstore/kotlin-uppercase-enum/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
diff --git a/samples/client/petstore/kotlin-uppercase-enum/build.gradle b/samples/client/petstore/kotlin-uppercase-enum/build.gradle
index ed72aa19d9ef..adff312f725c 100644
--- a/samples/client/petstore/kotlin-uppercase-enum/build.gradle
+++ b/samples/client/petstore/kotlin-uppercase-enum/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     ext.kotlin_version = '1.3.61'
 
     repositories {
-        mavenCentral()
+        maven { url "https://repo1.maven.org/maven2" }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -20,7 +20,7 @@ buildscript {
 apply plugin: 'kotlin'
 
 repositories {
-    mavenCentral()
+    maven { url "https://repo1.maven.org/maven2" }
 }
 
 test {
@@ -33,5 +33,6 @@ dependencies {
     compile "com.squareup.moshi:moshi-kotlin:1.9.2"
     compile "com.squareup.moshi:moshi-adapters:1.9.2"
     compile "com.squareup.okhttp3:okhttp:4.2.2"
+    compile "com.squareup.okhttp3:logging-interceptor:4.4.0"
     testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0"
 }
diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt
index 8ed4de2768fe..ffe3e760317f 100644
--- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt
+++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt
@@ -25,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType
 import org.openapitools.client.infrastructure.Success
 import org.openapitools.client.infrastructure.toMultiValue
 
-class EnumApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) {
+class EnumApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
 
     /**
     * Get enums
@@ -58,11 +64,11 @@ class EnumApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
                 val localVarError = localVarResponse as ClientError<*>
-                throw ClientException(localVarError.body as? String ?: "Client error", localVarError.statusCode)
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
             }
             ResponseType.ServerError -> {
                 val localVarError = localVarResponse as ServerError<*>
-                throw ServerException(localVarError.message ?: "Server error", localVarError.statusCode)
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
             }
         }
     }
diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
index d1d58ffd0e96..76490dd26cea 100644
--- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
+++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -10,7 +10,16 @@ import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.ResponseBody
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.Request
+import okhttp3.Headers
+import okhttp3.MultipartBody
 import java.io.File
+import java.net.URLConnection
+import java.util.Date
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.OffsetTime
 
 open class ApiClient(val baseUrl: String) {
     companion object {
@@ -37,17 +46,55 @@ open class ApiClient(val baseUrl: String) {
         val builder: OkHttpClient.Builder = OkHttpClient.Builder()
     }
 
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
     protected inline fun <reified T> requestBody(content: T, mediaType: String = JsonMediaType): RequestBody =
         when {
             content is File -> content.asRequestBody(
                 mediaType.toMediaTypeOrNull()
             )
-            mediaType == FormDataMediaType || mediaType == FormUrlEncMediaType -> {
+            mediaType == FormDataMediaType -> {
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, Any?>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, Any?>).forEach { (key, value) ->
+                            if (value is File) {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\"; filename=\"${value.name}\""
+                                )
+                                val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull()
+                                addPart(partHeaders, value.asRequestBody(fileMediaType))
+                            } else {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\""
+                                )
+                                addPart(
+                                    partHeaders,
+                                    parameterToString(value).toRequestBody(null)
+                                )
+                            }
+                        }
+                    }.build()
+            }
+            mediaType == FormUrlEncMediaType -> {
                 FormBody.Builder().apply {
-                    // content's type *must* be Map<String, Any>
+                    // content's type *must* be Map<String, Any?>
                     @Suppress("UNCHECKED_CAST")
-                    (content as Map<String,String>).forEach { (key, value) ->
-                        add(key, value)
+                    (content as Map<String, Any?>).forEach { (key, value) ->
+                        add(key, parameterToString(value))
                     }
                 }.build()
             }
@@ -139,12 +186,13 @@ open class ApiClient(val baseUrl: String) {
                     response.headers.toMultimap()
             )
             response.isClientError -> return ClientError(
+                    response.message,
                     response.body?.string(),
                     response.code,
                     response.headers.toMultimap()
             )
             else -> return ServerError(
-                    null,
+                    response.message,
                     response.body?.string(),
                     response.code,
                     response.headers.toMultimap()
@@ -152,7 +200,33 @@ open class ApiClient(val baseUrl: String) {
         }
     }
 
+    protected fun parameterToString(value: Any?): String {
+        when (value) {
+            null -> {
+                return ""
+            }
+            is Array<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is Iterable<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> {
+                return parseDateToQueryString<Any>(value)
+            }
+            else -> {
+                return value.toString()
+            }
+        }
+    }
+
     protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
-        return value.toString()
+        /*
+        .replace("\"", "") converts the json object string to an actual string for the query parameter.
+        The moshi or gson adapter allows a more generic solution instead of trying to use a native
+        formatter. It also easily allows to provide a simple way to define a custom date format pattern
+        inside a gson/moshi adapter.
+        */
+        return Serializer.moshi.adapter(T::class.java).toJson(value).replace("\"", "")
     }
 }
diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
index f1a8aecc914b..9dc8d8dbbfaa 100644
--- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
+++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -4,7 +4,9 @@ enum class ResponseType {
     Success, Informational, Redirection, ClientError, ServerError
 }
 
-abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType) {
+interface Response
+
+abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType): Response {
     abstract val statusCode: Int
     abstract val headers: Map<String,List<String>>
 }
@@ -27,6 +29,7 @@ class Redirection<T>(
 ) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
 
 class ClientError<T>(
+    val message: String? = null,
     val body: Any? = null,
     override val statusCode: Int = -1,
     override val headers: Map<String, List<String>> = mapOf()
diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
index 41f529a5f36b..b5310e71f13c 100644
--- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
+++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
@@ -3,14 +3,14 @@ package org.openapitools.client.infrastructure
 
 import java.lang.RuntimeException
 
-open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1) : RuntimeException(message) {
+open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
 
     companion object {
         private const val serialVersionUID: Long = 123L
     }
 }
 
-open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1) : RuntimeException(message) {
+open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
 
     companion object {
         private const val serialVersionUID: Long = 456L
diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/models/PetEnum.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/models/PetEnum.kt
index 14d9c16c408b..a447bf920529 100644
--- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/models/PetEnum.kt
+++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/models/PetEnum.kt
@@ -31,5 +31,13 @@ enum class PetEnum(val value: kotlin.String){
 
 
 
+    /**
+    This override toString avoids using the enum var name and uses the actual api value instead.
+    In cases the var name and value are different, the client would send incorrect enums to the server.
+    **/
+    override fun toString(): String {
+        return value
+    }
+
 }
 
diff --git a/samples/client/petstore/kotlin/README.md b/samples/client/petstore/kotlin/README.md
index aef4ea15beed..8166d4aadbac 100644
--- a/samples/client/petstore/kotlin/README.md
+++ b/samples/client/petstore/kotlin/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
diff --git a/samples/client/petstore/kotlin/docs/Pet.md b/samples/client/petstore/kotlin/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/client/petstore/kotlin/docs/Pet.md
+++ b/samples/client/petstore/kotlin/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/client/petstore/kotlin/docs/PetApi.md b/samples/client/petstore/kotlin/docs/PetApi.md
index ea93e1745279..27289c31c243 100644
--- a/samples/client/petstore/kotlin/docs/PetApi.md
+++ b/samples/client/petstore/kotlin/docs/PetApi.md
@@ -110,7 +110,7 @@ Configure petstore_auth:
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
+> kotlin.collections.List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -123,9 +123,9 @@ Multiple status values can be provided with comma separated strings
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByStatus(status)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByStatus")
@@ -140,11 +140,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -159,7 +159,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -172,9 +172,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -189,11 +189,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/kotlin/docs/UserApi.md b/samples/client/petstore/kotlin/docs/UserApi.md
index 0f55f06bc629..fd98ce696add 100644
--- a/samples/client/petstore/kotlin/docs/UserApi.md
+++ b/samples/client/petstore/kotlin/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(body)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val body : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(body)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **body** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 1c78bae10dd4..60f72b51af95 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -119,14 +119,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by status
     * Multiple status values can be provided with comma separated strings
     * @param status Status values that need to be considered for filter 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
     */
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun findPetsByStatus(status: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -139,13 +139,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -163,7 +163,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by tags
     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
     * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
@@ -171,7 +171,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
     @Deprecated(message = "This operation is deprecated.")
-    fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -184,13 +184,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 1e6e81fc1e91..258a2540e9e8 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -83,7 +83,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithArrayInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -123,7 +123,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithListInput(body: kotlin.Array<User>) : Unit {
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = body
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 3c715519085b..7d40c8efbc2f 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * Describes the result of uploading an image resource
  * @param code 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
index 07955e4ff491..ceb0fbc8fe60 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * A category for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
index d5048059d44e..ed8f8b13a43b 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * An order for a pets from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 0f72fb6bd360..105f485f021d 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.Tag
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * A pet for sale in the pet store
  * @param name 
@@ -30,13 +31,13 @@ data class Pet (
     @Json(name = "name")
     val name: kotlin.String,
     @Json(name = "photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @Json(name = "id")
     val id: kotlin.Long? = null,
     @Json(name = "category")
     val category: Category? = null,
     @Json(name = "tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
index fa228fbe1f49..944b1cd0a141 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * A tag for a pet
  * @param id 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
index d02cbd91abd9..9697f07d5bf8 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * A User who is purchasing from the pet store
  * @param id 
diff --git a/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt b/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt
index d1c20493bccc..5da4f9082a8d 100644
--- a/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt
+++ b/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt
@@ -22,9 +22,9 @@ class PetApiTest : ShouldSpec() {
             val pet = Pet(
                     id = petId,
                     name = "kotlin client test",
-                    photoUrls = arrayOf("http://test_kotlin_unit_test.com"),
+                    photoUrls = listOf("http://test_kotlin_unit_test.com"),
                     category = Category(petId, "test kotlin category"),
-                    tags = arrayOf(Tag(petId, "test kotlin tag"))
+                    tags = listOf(Tag(petId, "test kotlin tag"))
             )
             api.addPet(pet)
 
@@ -44,7 +44,7 @@ class PetApiTest : ShouldSpec() {
         }
 
         should("find pet by status") {
-            val result = api.findPetsByStatus(arrayOf("available"))
+            val result = api.findPetsByStatus(listOf("available"))
 
             result.size.shouldBeGreaterThan(0)
 
@@ -52,7 +52,7 @@ class PetApiTest : ShouldSpec() {
                 onePet.status.shouldBe(Pet.Status.available)
             }
 
-            val result2 = api.findPetsByStatus(arrayOf("unknown_and_incorrect_status"))
+            val result2 = api.findPetsByStatus(listOf("unknown_and_incorrect_status"))
 
             result2.size.shouldBe(0)
 
@@ -63,7 +63,7 @@ class PetApiTest : ShouldSpec() {
                     id = petId,
                     name = "kotlin client updatePet",
                     status = Pet.Status.pending,
-                    photoUrls = arrayOf("http://test_kotlin_unit_test.com")
+                    photoUrls = listOf("http://test_kotlin_unit_test.com")
             )
             api.updatePet(pet)
 
diff --git a/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt b/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt
index 733df971a8b3..8c57ecf76147 100644
--- a/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt
+++ b/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt
@@ -18,7 +18,7 @@ class StoreApiTest : ShouldSpec() {
         val pet = Pet(
                 id = petId,
                 name = "kotlin client test",
-                photoUrls = arrayOf("http://test_kotlin_unit_test.com")
+                photoUrls = listOf("http://test_kotlin_unit_test.com")
         )
         petApi.addPet(pet)
 
diff --git a/samples/client/petstore/objc/core-data/.openapi-generator/FILES b/samples/client/petstore/objc/core-data/.openapi-generator/FILES
new file mode 100644
index 000000000000..3a1c6b9364ad
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/.openapi-generator/FILES
@@ -0,0 +1,86 @@
+.gitignore
+README.md
+SwaggerClient.podspec
+SwaggerClient/Api/SWGPetApi.h
+SwaggerClient/Api/SWGPetApi.m
+SwaggerClient/Api/SWGStoreApi.h
+SwaggerClient/Api/SWGStoreApi.m
+SwaggerClient/Api/SWGUserApi.h
+SwaggerClient/Api/SWGUserApi.m
+SwaggerClient/Core/JSONValueTransformer+ISO8601.h
+SwaggerClient/Core/JSONValueTransformer+ISO8601.m
+SwaggerClient/Core/SWGApi.h
+SwaggerClient/Core/SWGApiClient.h
+SwaggerClient/Core/SWGApiClient.m
+SwaggerClient/Core/SWGBasicAuthTokenProvider.h
+SwaggerClient/Core/SWGBasicAuthTokenProvider.m
+SwaggerClient/Core/SWGConfiguration.h
+SwaggerClient/Core/SWGDefaultConfiguration.h
+SwaggerClient/Core/SWGDefaultConfiguration.m
+SwaggerClient/Core/SWGJSONRequestSerializer.h
+SwaggerClient/Core/SWGJSONRequestSerializer.m
+SwaggerClient/Core/SWGLogger.h
+SwaggerClient/Core/SWGLogger.m
+SwaggerClient/Core/SWGObject.h
+SwaggerClient/Core/SWGObject.m
+SwaggerClient/Core/SWGQueryParamCollection.h
+SwaggerClient/Core/SWGQueryParamCollection.m
+SwaggerClient/Core/SWGResponseDeserializer.h
+SwaggerClient/Core/SWGResponseDeserializer.m
+SwaggerClient/Core/SWGSanitizer.h
+SwaggerClient/Core/SWGSanitizer.m
+SwaggerClient/Model/SWGCategory.h
+SwaggerClient/Model/SWGCategory.m
+SwaggerClient/Model/SWGCategoryManagedObject.h
+SwaggerClient/Model/SWGCategoryManagedObject.m
+SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h
+SwaggerClient/Model/SWGCategoryManagedObjectBuilder.m
+SwaggerClient/Model/SWGInlineObject.h
+SwaggerClient/Model/SWGInlineObject.m
+SwaggerClient/Model/SWGInlineObject1.h
+SwaggerClient/Model/SWGInlineObject1.m
+SwaggerClient/Model/SWGInlineObject1ManagedObject.h
+SwaggerClient/Model/SWGInlineObject1ManagedObject.m
+SwaggerClient/Model/SWGInlineObject1ManagedObjectBuilder.h
+SwaggerClient/Model/SWGInlineObject1ManagedObjectBuilder.m
+SwaggerClient/Model/SWGInlineObjectManagedObject.h
+SwaggerClient/Model/SWGInlineObjectManagedObject.m
+SwaggerClient/Model/SWGInlineObjectManagedObjectBuilder.h
+SwaggerClient/Model/SWGInlineObjectManagedObjectBuilder.m
+SwaggerClient/Model/SWGModel.xcdatamodeld/.xccurrentversion
+SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
+SwaggerClient/Model/SWGOrder.h
+SwaggerClient/Model/SWGOrder.m
+SwaggerClient/Model/SWGOrderManagedObject.h
+SwaggerClient/Model/SWGOrderManagedObject.m
+SwaggerClient/Model/SWGOrderManagedObjectBuilder.h
+SwaggerClient/Model/SWGOrderManagedObjectBuilder.m
+SwaggerClient/Model/SWGPet.h
+SwaggerClient/Model/SWGPet.m
+SwaggerClient/Model/SWGPetManagedObject.h
+SwaggerClient/Model/SWGPetManagedObject.m
+SwaggerClient/Model/SWGPetManagedObjectBuilder.h
+SwaggerClient/Model/SWGPetManagedObjectBuilder.m
+SwaggerClient/Model/SWGTag.h
+SwaggerClient/Model/SWGTag.m
+SwaggerClient/Model/SWGTagManagedObject.h
+SwaggerClient/Model/SWGTagManagedObject.m
+SwaggerClient/Model/SWGTagManagedObjectBuilder.h
+SwaggerClient/Model/SWGTagManagedObjectBuilder.m
+SwaggerClient/Model/SWGUser.h
+SwaggerClient/Model/SWGUser.m
+SwaggerClient/Model/SWGUserManagedObject.h
+SwaggerClient/Model/SWGUserManagedObject.m
+SwaggerClient/Model/SWGUserManagedObjectBuilder.h
+SwaggerClient/Model/SWGUserManagedObjectBuilder.m
+docs/SWGCategory.md
+docs/SWGInlineObject.md
+docs/SWGInlineObject1.md
+docs/SWGOrder.md
+docs/SWGPet.md
+docs/SWGPetApi.md
+docs/SWGStoreApi.md
+docs/SWGTag.md
+docs/SWGUser.md
+docs/SWGUserApi.md
+git_push.sh
diff --git a/samples/client/petstore/objc/core-data/.openapi-generator/VERSION b/samples/client/petstore/objc/core-data/.openapi-generator/VERSION
index 096bf47efe31..d99e7162d01f 100644
--- a/samples/client/petstore/objc/core-data/.openapi-generator/VERSION
+++ b/samples/client/petstore/objc/core-data/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/objc/core-data/README.md b/samples/client/petstore/objc/core-data/README.md
index 10694bd5135b..ac24d7bfc60f 100644
--- a/samples/client/petstore/objc/core-data/README.md
+++ b/samples/client/petstore/objc/core-data/README.md
@@ -42,6 +42,8 @@ Import the following:
 #import <SwaggerClient/SWGDefaultConfiguration.h>
 // load models
 #import <SwaggerClient/SWGCategory.h>
+#import <SwaggerClient/SWGInlineObject.h>
+#import <SwaggerClient/SWGInlineObject1.h>
 #import <SwaggerClient/SWGOrder.h>
 #import <SwaggerClient/SWGPet.h>
 #import <SwaggerClient/SWGTag.h>
@@ -114,6 +116,8 @@ Class | Method | HTTP request | Description
 ## Documentation For Models
 
  - [SWGCategory](docs/SWGCategory.md)
+ - [SWGInlineObject](docs/SWGInlineObject.md)
+ - [SWGInlineObject1](docs/SWGInlineObject1.md)
  - [SWGOrder](docs/SWGOrder.md)
  - [SWGPet](docs/SWGPet.md)
  - [SWGTag](docs/SWGTag.md)
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.h b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.h
index 3783ee23362b..1b1309c48761 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.h
@@ -6,7 +6,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.m b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.m
index e57006827b99..36fecb1dd44c 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.m
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.m
@@ -193,7 +193,7 @@ -(NSURLSessionTask*) findPetsByStatusWithStatus: (NSArray<NSString*>*) status
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     if (status != nil) {
-        queryParams[@"status"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: status format: @"csv"];
+        queryParams[@"status"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: status format: @"multi"];
     }
     NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.apiClient.configuration.defaultHeaders];
     [headerParams addEntriesFromDictionary:self.defaultHeaders];
@@ -250,7 +250,7 @@ -(NSURLSessionTask*) findPetsByTagsWithTags: (NSArray<NSString*>*) tags
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     if (tags != nil) {
-        queryParams[@"tags"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: tags format: @"csv"];
+        queryParams[@"tags"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: tags format: @"multi"];
     }
     NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.apiClient.configuration.defaultHeaders];
     [headerParams addEntriesFromDictionary:self.defaultHeaders];
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h
index d578190189c1..e67aa3c83572 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h
@@ -6,7 +6,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m
index 4231e138bdaf..eaf254a6ab3e 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m
@@ -263,7 +263,7 @@ -(NSURLSessionTask*) placeOrderWithOrder: (SWGOrder*) order
     NSString *responseContentType = [[acceptHeader componentsSeparatedByString:@", "] firstObject] ?: @"";
 
     // request content type
-    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];
+    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[@"application/json"]];
 
     // Authentication setting
     NSArray *authSettings = @[];
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.h b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.h
index 5e0b6bbc8d83..98a3a1756d5d 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.h
@@ -6,7 +6,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.m b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.m
index 6ba11b3a44a1..94651c70282f 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.m
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.m
@@ -75,7 +75,7 @@ -(NSURLSessionTask*) createUserWithUser: (SWGUser*) user
     NSString *responseContentType = [[acceptHeader componentsSeparatedByString:@", "] firstObject] ?: @"";
 
     // request content type
-    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];
+    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[@"application/json"]];
 
     // Authentication setting
     NSArray *authSettings = @[];
@@ -130,7 +130,7 @@ -(NSURLSessionTask*) createUsersWithArrayInputWithUser: (NSArray<SWGUser>*) user
     NSString *responseContentType = [[acceptHeader componentsSeparatedByString:@", "] firstObject] ?: @"";
 
     // request content type
-    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];
+    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[@"application/json"]];
 
     // Authentication setting
     NSArray *authSettings = @[];
@@ -185,7 +185,7 @@ -(NSURLSessionTask*) createUsersWithListInputWithUser: (NSArray<SWGUser>*) user
     NSString *responseContentType = [[acceptHeader componentsSeparatedByString:@", "] firstObject] ?: @"";
 
     // request content type
-    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];
+    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[@"application/json"]];
 
     // Authentication setting
     NSArray *authSettings = @[];
@@ -508,7 +508,7 @@ -(NSURLSessionTask*) updateUserWithUsername: (NSString*) username
     NSString *responseContentType = [[acceptHeader componentsSeparatedByString:@", "] firstObject] ?: @"";
 
     // request content type
-    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];
+    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[@"application/json"]];
 
     // Authentication setting
     NSArray *authSettings = @[];
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Core/JSONValueTransformer+ISO8601.h b/samples/client/petstore/objc/core-data/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
index 3925ca3728f8..5179ca2e99b8 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApi.h b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApi.h
index 2ac4a2cdc785..6c0396f0cac5 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApi.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApi.h
@@ -6,7 +6,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApiClient.h b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApiClient.h
index 844893553809..04558b3d0a05 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApiClient.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApiClient.h
@@ -7,7 +7,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGConfiguration.h b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGConfiguration.h
index 1c3c741442de..f6b12de5c5c3 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGConfiguration.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGConfiguration.h
@@ -6,7 +6,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGDefaultConfiguration.h b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGDefaultConfiguration.h
index 24d89beeb61e..e141e0d092d5 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGDefaultConfiguration.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGDefaultConfiguration.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -93,7 +93,7 @@
 /**
  * Sets API key
  *
- * To remove a apiKey for an identifier, just set the apiKey to nil.
+ * To remove an apiKey for an identifier, just set the apiKey to nil.
  *
  * @param apiKey     API key or token.
  * @param identifier API key identifier (authentication schema).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGJSONRequestSerializer.h b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGJSONRequestSerializer.h
index 500664a38c51..943ab1323133 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGJSONRequestSerializer.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGJSONRequestSerializer.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGLogger.h b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGLogger.h
index bb3cb672c3eb..23f57acd7b8a 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGLogger.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGLogger.h
@@ -4,7 +4,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGObject.h b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGObject.h
index 047f52c2bb5f..7d7112c5976a 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGObject.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGObject.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGObject.m b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGObject.m
index db970d34669b..1a90a21d1cc4 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGObject.m
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGObject.m
@@ -8,13 +8,15 @@ @implementation SWGObject
  */
 - (instancetype)initWithDictionary:(NSDictionary *)dict error:(NSError **)err {
     static NSMutableSet *classNames;
+    static NSObject *lock;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         classNames = [NSMutableSet new];
+        lock = [NSObject new];
     });
     
     BOOL initSync;
-    @synchronized([self class])
+    @synchronized(lock)
     {
         NSString *className = NSStringFromClass([self class]);
         initSync = ![classNames containsObject:className];
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGQueryParamCollection.h b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGQueryParamCollection.h
index 2fd7c6dbec8b..4bd35d86f352 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGQueryParamCollection.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGQueryParamCollection.h
@@ -4,7 +4,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGResponseDeserializer.h b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGResponseDeserializer.h
index e51705deb256..68f83704f495 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGResponseDeserializer.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGResponseDeserializer.h
@@ -4,7 +4,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -49,7 +49,7 @@ extern NSInteger const SWGUnknownResponseObjectErrorCode;
 @interface SWGResponseDeserializer : NSObject <SWGResponseDeserializer>
 
 /**
- *  If an null value occurs in dictionary or array if set to YES whole response will be invalid else will be ignored
+ *  If a null value occurs in dictionary or array if set to YES whole response will be invalid else will be ignored
  *  @default NO
  */
 @property (nonatomic, assign) BOOL treatNullAsError;
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGSanitizer.h b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGSanitizer.h
index 4a2bea99fd05..83853bec8cf0 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGSanitizer.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGSanitizer.h
@@ -4,7 +4,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGCategory.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGCategory.h
index efe582a11a46..31eb9e6b31ca 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGCategory.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGCategory.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGCategoryManagedObject.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGCategoryManagedObject.h
index 087efd870ee2..8bcb655d0fbc 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGCategoryManagedObject.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGCategoryManagedObject.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h
index a99ae9176ff8..18863d14baf7 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h
@@ -9,7 +9,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject.h
new file mode 100644
index 000000000000..1d3390dab8c4
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject.h
@@ -0,0 +1,32 @@
+#import <Foundation/Foundation.h>
+#import "SWGObject.h"
+
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* The version of the OpenAPI document: 1.0.0
+* 
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+
+
+
+
+@protocol SWGInlineObject
+@end
+
+@interface SWGInlineObject : SWGObject
+
+/* Updated name of the pet [optional]
+ */
+@property(nonatomic) NSString* name;
+/* Updated status of the pet [optional]
+ */
+@property(nonatomic) NSString* status;
+
+@end
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject.m b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject.m
new file mode 100644
index 000000000000..a10d7060973a
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject.m
@@ -0,0 +1,34 @@
+#import "SWGInlineObject.h"
+
+@implementation SWGInlineObject
+
+- (instancetype)init {
+  self = [super init];
+  if (self) {
+    // initialize property's default value, if any
+    
+  }
+  return self;
+}
+
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
++ (JSONKeyMapper *)keyMapper {
+  return [[JSONKeyMapper alloc] initWithModelToJSONDictionary:@{ @"name": @"name", @"status": @"status" }];
+}
+
+/**
+ * Indicates whether the property with the given name is optional.
+ * If `propertyName` is optional, then return `YES`, otherwise return `NO`.
+ * This method is used by `JSONModel`.
+ */
++ (BOOL)propertyIsOptional:(NSString *)propertyName {
+
+  NSArray *optionalProperties = @[@"name", @"status"];
+  return [optionalProperties containsObject:propertyName];
+}
+
+@end
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1.h
new file mode 100644
index 000000000000..36d1a7194cdd
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1.h
@@ -0,0 +1,32 @@
+#import <Foundation/Foundation.h>
+#import "SWGObject.h"
+
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* The version of the OpenAPI document: 1.0.0
+* 
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+
+
+
+
+@protocol SWGInlineObject1
+@end
+
+@interface SWGInlineObject1 : SWGObject
+
+/* Additional data to pass to server [optional]
+ */
+@property(nonatomic) NSString* additionalMetadata;
+/* file to upload [optional]
+ */
+@property(nonatomic) NSURL* file;
+
+@end
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1.m b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1.m
new file mode 100644
index 000000000000..825dbcc286ae
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1.m
@@ -0,0 +1,34 @@
+#import "SWGInlineObject1.h"
+
+@implementation SWGInlineObject1
+
+- (instancetype)init {
+  self = [super init];
+  if (self) {
+    // initialize property's default value, if any
+    
+  }
+  return self;
+}
+
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
++ (JSONKeyMapper *)keyMapper {
+  return [[JSONKeyMapper alloc] initWithModelToJSONDictionary:@{ @"additionalMetadata": @"additionalMetadata", @"file": @"file" }];
+}
+
+/**
+ * Indicates whether the property with the given name is optional.
+ * If `propertyName` is optional, then return `YES`, otherwise return `NO`.
+ * This method is used by `JSONModel`.
+ */
++ (BOOL)propertyIsOptional:(NSString *)propertyName {
+
+  NSArray *optionalProperties = @[@"additionalMetadata", @"file"];
+  return [optionalProperties containsObject:propertyName];
+}
+
+@end
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1ManagedObject.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1ManagedObject.h
new file mode 100644
index 000000000000..67d37a6fc9c2
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1ManagedObject.h
@@ -0,0 +1,36 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* The version of the OpenAPI document: 1.0.0
+* 
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SWGInlineObject1ManagedObject : NSManagedObject
+
+/* Additional data to pass to server [optional]
+ */
+@property (nullable, nonatomic, retain) NSString* additionalMetadata;
+/* file to upload [optional]
+ */
+@property (nullable, nonatomic, retain) NSURL* file;
+@end
+
+@interface SWGInlineObject1ManagedObject (GeneratedAccessors)
+
+@end
+
+
+NS_ASSUME_NONNULL_END
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1ManagedObject.m b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1ManagedObject.m
new file mode 100644
index 000000000000..8b83f2e40b99
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1ManagedObject.m
@@ -0,0 +1,12 @@
+#import "SWGInlineObject1ManagedObject.h"
+
+/**
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+@implementation SWGInlineObject1ManagedObject
+
+@dynamic additionalMetadata;
+@dynamic file;
+@end
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1ManagedObjectBuilder.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1ManagedObjectBuilder.h
new file mode 100644
index 000000000000..35f82beb9a9e
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1ManagedObjectBuilder.h
@@ -0,0 +1,35 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+
+#import "SWGInlineObject1ManagedObject.h"
+#import "SWGInlineObject1.h"
+
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* The version of the OpenAPI document: 1.0.0
+* 
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+
+@interface SWGInlineObject1ManagedObjectBuilder : NSObject
+
+
+
+-(SWGInlineObject1ManagedObject*)createNewSWGInlineObject1ManagedObjectInContext:(NSManagedObjectContext*)context;
+
+-(SWGInlineObject1ManagedObject*)SWGInlineObject1ManagedObjectFromSWGInlineObject1:(SWGInlineObject1*)object context:(NSManagedObjectContext*)context;
+
+-(void)updateSWGInlineObject1ManagedObject:(SWGInlineObject1ManagedObject*)object withSWGInlineObject1:(SWGInlineObject1*)object2;
+
+-(SWGInlineObject1*)SWGInlineObject1FromSWGInlineObject1ManagedObject:(SWGInlineObject1ManagedObject*)obj;
+
+-(void)updateSWGInlineObject1:(SWGInlineObject1*)object withSWGInlineObject1ManagedObject:(SWGInlineObject1ManagedObject*)object2;
+
+@end
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1ManagedObjectBuilder.m b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1ManagedObjectBuilder.m
new file mode 100644
index 000000000000..75031ff775da
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObject1ManagedObjectBuilder.m
@@ -0,0 +1,55 @@
+
+
+#import "SWGInlineObject1ManagedObjectBuilder.h"
+
+/**
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+@implementation SWGInlineObject1ManagedObjectBuilder
+
+-(instancetype)init {
+    self = [super init];
+    if (self != nil) {
+    }
+    return self;
+}
+
+-(SWGInlineObject1ManagedObject*)createNewSWGInlineObject1ManagedObjectInContext:(NSManagedObjectContext*)context {
+    SWGInlineObject1ManagedObject *managedObject = [NSEntityDescription insertNewObjectForEntityForName:NSStringFromClass([SWGInlineObject1ManagedObject class]) inManagedObjectContext:context];
+    return managedObject;
+}
+
+-(SWGInlineObject1ManagedObject*)SWGInlineObject1ManagedObjectFromSWGInlineObject1:(SWGInlineObject1*)object context:(NSManagedObjectContext*)context {
+    SWGInlineObject1ManagedObject* newSWGInlineObject1 = [self createNewSWGInlineObject1ManagedObjectInContext:context];
+    [self updateSWGInlineObject1ManagedObject:newSWGInlineObject1 withSWGInlineObject1:object];
+    return newSWGInlineObject1;
+}
+
+-(void)updateSWGInlineObject1ManagedObject:(SWGInlineObject1ManagedObject*)managedObject withSWGInlineObject1:(SWGInlineObject1*)object {
+    if(!managedObject || !object) {
+        return;
+    }
+    NSManagedObjectContext* context = managedObject.managedObjectContext;
+    managedObject.additionalMetadata = [object.additionalMetadata copy];
+    managedObject.file = [object.file copy];
+
+}
+
+-(SWGInlineObject1*)SWGInlineObject1FromSWGInlineObject1ManagedObject:(SWGInlineObject1ManagedObject*)obj {
+    if(!obj) {
+        return nil;
+    }
+    SWGInlineObject1* newSWGInlineObject1 = [[SWGInlineObject1 alloc] init];
+    [self updateSWGInlineObject1:newSWGInlineObject1 withSWGInlineObject1ManagedObject:obj];
+    return newSWGInlineObject1;
+}
+
+-(void)updateSWGInlineObject1:(SWGInlineObject1*)newSWGInlineObject1 withSWGInlineObject1ManagedObject:(SWGInlineObject1ManagedObject*)obj {
+    newSWGInlineObject1.additionalMetadata = [obj.additionalMetadata copy];
+    newSWGInlineObject1.file = [obj.file copy];
+}
+
+@end
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObjectManagedObject.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObjectManagedObject.h
new file mode 100644
index 000000000000..c7c95fca41c4
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObjectManagedObject.h
@@ -0,0 +1,36 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* The version of the OpenAPI document: 1.0.0
+* 
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SWGInlineObjectManagedObject : NSManagedObject
+
+/* Updated name of the pet [optional]
+ */
+@property (nullable, nonatomic, retain) NSString* name;
+/* Updated status of the pet [optional]
+ */
+@property (nullable, nonatomic, retain) NSString* status;
+@end
+
+@interface SWGInlineObjectManagedObject (GeneratedAccessors)
+
+@end
+
+
+NS_ASSUME_NONNULL_END
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObjectManagedObject.m b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObjectManagedObject.m
new file mode 100644
index 000000000000..b1eaec9c492b
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObjectManagedObject.m
@@ -0,0 +1,12 @@
+#import "SWGInlineObjectManagedObject.h"
+
+/**
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+@implementation SWGInlineObjectManagedObject
+
+@dynamic name;
+@dynamic status;
+@end
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObjectManagedObjectBuilder.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObjectManagedObjectBuilder.h
new file mode 100644
index 000000000000..7937b22ea1d8
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObjectManagedObjectBuilder.h
@@ -0,0 +1,35 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+
+#import "SWGInlineObjectManagedObject.h"
+#import "SWGInlineObject.h"
+
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* The version of the OpenAPI document: 1.0.0
+* 
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+
+@interface SWGInlineObjectManagedObjectBuilder : NSObject
+
+
+
+-(SWGInlineObjectManagedObject*)createNewSWGInlineObjectManagedObjectInContext:(NSManagedObjectContext*)context;
+
+-(SWGInlineObjectManagedObject*)SWGInlineObjectManagedObjectFromSWGInlineObject:(SWGInlineObject*)object context:(NSManagedObjectContext*)context;
+
+-(void)updateSWGInlineObjectManagedObject:(SWGInlineObjectManagedObject*)object withSWGInlineObject:(SWGInlineObject*)object2;
+
+-(SWGInlineObject*)SWGInlineObjectFromSWGInlineObjectManagedObject:(SWGInlineObjectManagedObject*)obj;
+
+-(void)updateSWGInlineObject:(SWGInlineObject*)object withSWGInlineObjectManagedObject:(SWGInlineObjectManagedObject*)object2;
+
+@end
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObjectManagedObjectBuilder.m b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObjectManagedObjectBuilder.m
new file mode 100644
index 000000000000..7d15720a5465
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGInlineObjectManagedObjectBuilder.m
@@ -0,0 +1,55 @@
+
+
+#import "SWGInlineObjectManagedObjectBuilder.h"
+
+/**
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+@implementation SWGInlineObjectManagedObjectBuilder
+
+-(instancetype)init {
+    self = [super init];
+    if (self != nil) {
+    }
+    return self;
+}
+
+-(SWGInlineObjectManagedObject*)createNewSWGInlineObjectManagedObjectInContext:(NSManagedObjectContext*)context {
+    SWGInlineObjectManagedObject *managedObject = [NSEntityDescription insertNewObjectForEntityForName:NSStringFromClass([SWGInlineObjectManagedObject class]) inManagedObjectContext:context];
+    return managedObject;
+}
+
+-(SWGInlineObjectManagedObject*)SWGInlineObjectManagedObjectFromSWGInlineObject:(SWGInlineObject*)object context:(NSManagedObjectContext*)context {
+    SWGInlineObjectManagedObject* newSWGInlineObject = [self createNewSWGInlineObjectManagedObjectInContext:context];
+    [self updateSWGInlineObjectManagedObject:newSWGInlineObject withSWGInlineObject:object];
+    return newSWGInlineObject;
+}
+
+-(void)updateSWGInlineObjectManagedObject:(SWGInlineObjectManagedObject*)managedObject withSWGInlineObject:(SWGInlineObject*)object {
+    if(!managedObject || !object) {
+        return;
+    }
+    NSManagedObjectContext* context = managedObject.managedObjectContext;
+    managedObject.name = [object.name copy];
+    managedObject.status = [object.status copy];
+
+}
+
+-(SWGInlineObject*)SWGInlineObjectFromSWGInlineObjectManagedObject:(SWGInlineObjectManagedObject*)obj {
+    if(!obj) {
+        return nil;
+    }
+    SWGInlineObject* newSWGInlineObject = [[SWGInlineObject alloc] init];
+    [self updateSWGInlineObject:newSWGInlineObject withSWGInlineObjectManagedObject:obj];
+    return newSWGInlineObject;
+}
+
+-(void)updateSWGInlineObject:(SWGInlineObject*)newSWGInlineObject withSWGInlineObjectManagedObject:(SWGInlineObjectManagedObject*)obj {
+    newSWGInlineObject.name = [obj.name copy];
+    newSWGInlineObject.status = [obj.status copy];
+}
+
+@end
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
index 4ec7a3b456b3..35f1c665a081 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
@@ -5,6 +5,14 @@
         <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
+    <entity name="SWGInlineObjectManagedObject" representedClassName="SWGInlineObjectManagedObject" syncable="YES">
+        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="status" optional="YES" attributeType="String" syncable="YES"/>
+    </entity>
+    <entity name="SWGInlineObject1ManagedObject" representedClassName="SWGInlineObject1ManagedObject" syncable="YES">
+        <attribute name="additionalMetadata" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="file" optional="YES" attributeType="Binary" syncable="YES"/>
+    </entity>
     <entity name="SWGOrderManagedObject" representedClassName="SWGOrderManagedObject" syncable="YES">
         <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
         <attribute name="petId" optional="YES" attributeType="Double" syncable="YES"/>
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGOrder.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGOrder.h
index 11f27bdba3f8..5ea7a94cfcbe 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGOrder.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGOrder.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGOrderManagedObject.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGOrderManagedObject.h
index 1b773bbdbeb3..05f83ca11fd6 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGOrderManagedObject.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGOrderManagedObject.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGOrderManagedObjectBuilder.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGOrderManagedObjectBuilder.h
index 300e63b3a852..f67159446bc9 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGOrderManagedObjectBuilder.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGOrderManagedObjectBuilder.h
@@ -9,7 +9,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGPet.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGPet.h
index b3586e9ea821..4b3729193265 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGPet.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGPet.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGPetManagedObject.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGPetManagedObject.h
index d4cd41870ebf..6ad378e95f76 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGPetManagedObject.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGPetManagedObject.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGPetManagedObjectBuilder.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGPetManagedObjectBuilder.h
index dff2ad8447ea..112ba8bbff4f 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGPetManagedObjectBuilder.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGPetManagedObjectBuilder.h
@@ -11,7 +11,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGTag.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGTag.h
index 991526f5d5aa..cdcedfd916bb 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGTag.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGTag.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGTagManagedObject.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGTagManagedObject.h
index a028b8ef62e7..a646e643d70c 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGTagManagedObject.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGTagManagedObject.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGTagManagedObjectBuilder.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGTagManagedObjectBuilder.h
index 6c9db4e9fdaa..fe1abf098e0c 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGTagManagedObjectBuilder.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGTagManagedObjectBuilder.h
@@ -9,7 +9,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGUser.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGUser.h
index de28b05c42e2..7786883ed29c 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGUser.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGUser.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGUserManagedObject.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGUserManagedObject.h
index ff3539edada6..89f0f4938d81 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGUserManagedObject.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGUserManagedObject.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGUserManagedObjectBuilder.h b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGUserManagedObjectBuilder.h
index b35db434e03c..de1c284cde24 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGUserManagedObjectBuilder.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Model/SWGUserManagedObjectBuilder.h
@@ -9,7 +9,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/core-data/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj b/samples/client/petstore/objc/core-data/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
index 02aab1261c1e..462f141372dd 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/objc/core-data/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
@@ -214,13 +214,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "SwaggerClient_Example" */;
 			buildPhases = (
-				841AD69C2F0A6609E3057F05 /* 📦 Check Pods Manifest.lock */,
+				841AD69C2F0A6609E3057F05 /* [CP] Check Pods Manifest.lock */,
 				799E7E29D924C30424DFBA28 /* [CP] Check Pods Manifest.lock */,
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
 				429AF5C69E165ED75311B4B0 /* [CP] Copy Pods Resources */,
-				183E54C09C54DAEB54B2546F /* [CP] Embed Pods Frameworks */,
 				FF3F107CF27E0A54D86C49F5 /* 📦 Embed Pods Frameworks */,
 				DA89ADFB80DCCB6691DED12D /* 📦 Copy Pods Resources */,
 			);
@@ -237,15 +236,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "SwaggerClient_Tests" */;
 			buildPhases = (
-				E0F523B17966072A199F040E /* 📦 Check Pods Manifest.lock */,
+				E0F523B17966072A199F040E /* [CP] Check Pods Manifest.lock */,
 				7B069562A9F91E498732474F /* [CP] Check Pods Manifest.lock */,
 				6003F5AA195388D20070C39A /* Sources */,
 				6003F5AB195388D20070C39A /* Frameworks */,
 				6003F5AC195388D20070C39A /* Resources */,
 				E337D7E459CCFFDF27046FFC /* [CP] Copy Pods Resources */,
-				111D7956304BD6E860AA8709 /* [CP] Embed Pods Frameworks */,
 				AA7CAD658C61D6EBA222B5F8 /* 📦 Embed Pods Frameworks */,
-				E994E0232EFD15F8EE665A4D /* 📦 Copy Pods Resources */,
+				E994E0232EFD15F8EE665A4D /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -309,49 +307,24 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		111D7956304BD6E860AA8709 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient_Tests/Pods-SwaggerClient_Tests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		183E54C09C54DAEB54B2546F /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient_Example/Pods-SwaggerClient_Example-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		429AF5C69E165ED75311B4B0 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-SwaggerClient_Example/Pods-SwaggerClient_Example-resources.sh",
+				"${PODS_ROOT}/../../SwaggerClient/Model/SWGModel.xcdatamodeld",
+				"${PODS_ROOT}/../../SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SWGModel.momd",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SWGModel.mom",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient_Example/Pods-SwaggerClient_Example-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SwaggerClient_Example/Pods-SwaggerClient_Example-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		799E7E29D924C30424DFBA28 /* [CP] Check Pods Manifest.lock */ = {
@@ -384,19 +357,22 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		841AD69C2F0A6609E3057F05 /* 📦 Check Pods Manifest.lock */ = {
+		841AD69C2F0A6609E3057F05 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-SwaggerClient_Example-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		AA7CAD658C61D6EBA222B5F8 /* 📦 Embed Pods Frameworks */ = {
@@ -429,19 +405,22 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient_Example/Pods-SwaggerClient_Example-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E0F523B17966072A199F040E /* 📦 Check Pods Manifest.lock */ = {
+		E0F523B17966072A199F040E /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-SwaggerClient_Tests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		E337D7E459CCFFDF27046FFC /* [CP] Copy Pods Resources */ = {
@@ -450,16 +429,21 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-SwaggerClient_Tests/Pods-SwaggerClient_Tests-resources.sh",
+				"${PODS_ROOT}/../../SwaggerClient/Model/SWGModel.xcdatamodeld",
+				"${PODS_ROOT}/../../SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SWGModel.momd",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SWGModel.mom",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient_Tests/Pods-SwaggerClient_Tests-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SwaggerClient_Tests/Pods-SwaggerClient_Tests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E994E0232EFD15F8EE665A4D /* 📦 Copy Pods Resources */ = {
+		E994E0232EFD15F8EE665A4D /* Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -474,21 +458,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient_Tests/Pods-SwaggerClient_Tests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E337D7E459CCFFDF27046FFC /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient_Tests/Pods-SwaggerClient_Tests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		FF3F107CF27E0A54D86C49F5 /* 📦 Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
diff --git a/samples/client/petstore/objc/core-data/SwaggerClientTests/run_xcodebuild.sh b/samples/client/petstore/objc/core-data/SwaggerClientTests/run_xcodebuild.sh
index 7553a165a4ce..5f88b8fcd74c 100755
--- a/samples/client/petstore/objc/core-data/SwaggerClientTests/run_xcodebuild.sh
+++ b/samples/client/petstore/objc/core-data/SwaggerClientTests/run_xcodebuild.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pod install && xcodebuild test -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient-Example" -destination "platform=iOS Simulator,name=iPhone 5s,OS=9.3" | xcpretty && exit ${PIPESTATUS[0]}
+pod install && xcodebuild test -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient-Example" -destination "platform=iOS Simulator,name=iPhone 8,OS=13.1" | xcpretty && exit ${PIPESTATUS[0]}
diff --git a/samples/client/petstore/objc/core-data/docs/SWGCategory.md b/samples/client/petstore/objc/core-data/docs/SWGCategory.md
new file mode 100644
index 000000000000..93a8d14ecb98
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/docs/SWGCategory.md
@@ -0,0 +1,11 @@
+# SWGCategory
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_id** | **NSNumber*** |  | [optional] 
+**name** | **NSString*** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/objc/core-data/docs/SWGInlineObject.md b/samples/client/petstore/objc/core-data/docs/SWGInlineObject.md
new file mode 100644
index 000000000000..1d66818927f4
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/docs/SWGInlineObject.md
@@ -0,0 +1,11 @@
+# SWGInlineObject
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **NSString*** | Updated name of the pet | [optional] 
+**status** | **NSString*** | Updated status of the pet | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/objc/core-data/docs/SWGInlineObject1.md b/samples/client/petstore/objc/core-data/docs/SWGInlineObject1.md
new file mode 100644
index 000000000000..c59e84858851
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/docs/SWGInlineObject1.md
@@ -0,0 +1,11 @@
+# SWGInlineObject1
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**additionalMetadata** | **NSString*** | Additional data to pass to server | [optional] 
+**file** | **NSURL*** | file to upload | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/objc/core-data/docs/SWGOrder.md b/samples/client/petstore/objc/core-data/docs/SWGOrder.md
new file mode 100644
index 000000000000..b2a9f25eae95
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/docs/SWGOrder.md
@@ -0,0 +1,15 @@
+# SWGOrder
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_id** | **NSNumber*** |  | [optional] 
+**petId** | **NSNumber*** |  | [optional] 
+**quantity** | **NSNumber*** |  | [optional] 
+**shipDate** | **NSDate*** |  | [optional] 
+**status** | **NSString*** | Order Status | [optional] 
+**complete** | **NSNumber*** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/objc/core-data/docs/SWGPet.md b/samples/client/petstore/objc/core-data/docs/SWGPet.md
new file mode 100644
index 000000000000..c8298c66bf14
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/docs/SWGPet.md
@@ -0,0 +1,15 @@
+# SWGPet
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_id** | **NSNumber*** |  | [optional] 
+**category** | [**SWGCategory***](SWGCategory.md) |  | [optional] 
+**name** | **NSString*** |  | 
+**photoUrls** | **NSArray&lt;NSString*&gt;*** |  | 
+**tags** | [**NSArray&lt;SWGTag&gt;***](SWGTag.md) |  | [optional] 
+**status** | **NSString*** | pet status in the store | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/objc/core-data/docs/SWGPetApi.md b/samples/client/petstore/objc/core-data/docs/SWGPetApi.md
new file mode 100644
index 000000000000..e2dde91d7987
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/docs/SWGPetApi.md
@@ -0,0 +1,456 @@
+# SWGPetApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**addPet**](SWGPetApi.md#addpet) | **POST** /pet | Add a new pet to the store
+[**deletePet**](SWGPetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
+[**findPetsByStatus**](SWGPetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
+[**findPetsByTags**](SWGPetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
+[**getPetById**](SWGPetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
+[**updatePet**](SWGPetApi.md#updatepet) | **PUT** /pet | Update an existing pet
+[**updatePetWithForm**](SWGPetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
+[**uploadFile**](SWGPetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
+
+
+# **addPet**
+```objc
+-(NSURLSessionTask*) addPetWithPet: (SWGPet*) pet
+        completionHandler: (void (^)(NSError* error)) handler;
+```
+
+Add a new pet to the store
+
+### Example 
+```objc
+SWGDefaultConfiguration *apiConfig = [SWGDefaultConfiguration sharedConfig];
+
+// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
+[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
+
+
+SWGPet* pet = [[SWGPet alloc] init]; // Pet object that needs to be added to the store (optional)
+
+SWGPetApi*apiInstance = [[SWGPetApi alloc] init];
+
+// Add a new pet to the store
+[apiInstance addPetWithPet:pet
+          completionHandler: ^(NSError* error) {
+                        if (error) {
+                            NSLog(@"Error calling SWGPetApi->addPet: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet** | [**SWGPet***](SWGPet.md)| Pet object that needs to be added to the store | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **deletePet**
+```objc
+-(NSURLSessionTask*) deletePetWithPetId: (NSNumber*) petId
+    apiKey: (NSString*) apiKey
+        completionHandler: (void (^)(NSError* error)) handler;
+```
+
+Deletes a pet
+
+### Example 
+```objc
+SWGDefaultConfiguration *apiConfig = [SWGDefaultConfiguration sharedConfig];
+
+// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
+[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
+
+
+NSNumber* petId = @56; // Pet id to delete
+NSString* apiKey = @"apiKey_example"; //  (optional)
+
+SWGPetApi*apiInstance = [[SWGPetApi alloc] init];
+
+// Deletes a pet
+[apiInstance deletePetWithPetId:petId
+              apiKey:apiKey
+          completionHandler: ^(NSError* error) {
+                        if (error) {
+                            NSLog(@"Error calling SWGPetApi->deletePet: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **NSNumber***| Pet id to delete | 
+ **apiKey** | **NSString***|  | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **findPetsByStatus**
+```objc
+-(NSURLSessionTask*) findPetsByStatusWithStatus: (NSArray<NSString*>*) status
+        completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error)) handler;
+```
+
+Finds Pets by status
+
+Multiple status values can be provided with comma separated strings
+
+### Example 
+```objc
+SWGDefaultConfiguration *apiConfig = [SWGDefaultConfiguration sharedConfig];
+
+// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
+[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
+
+
+NSArray<NSString*>* status = @[@"status_example"]; // Status values that need to be considered for filter (optional)
+
+SWGPetApi*apiInstance = [[SWGPetApi alloc] init];
+
+// Finds Pets by status
+[apiInstance findPetsByStatusWithStatus:status
+          completionHandler: ^(NSArray<SWGPet>* output, NSError* error) {
+                        if (output) {
+                            NSLog(@"%@", output);
+                        }
+                        if (error) {
+                            NSLog(@"Error calling SWGPetApi->findPetsByStatus: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | [**NSArray&lt;NSString*&gt;***](NSString*.md)| Status values that need to be considered for filter | [optional] 
+
+### Return type
+
+[**NSArray<SWGPet>***](SWGPet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **findPetsByTags**
+```objc
+-(NSURLSessionTask*) findPetsByTagsWithTags: (NSArray<NSString*>*) tags
+        completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error)) handler;
+```
+
+Finds Pets by tags
+
+Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+
+### Example 
+```objc
+SWGDefaultConfiguration *apiConfig = [SWGDefaultConfiguration sharedConfig];
+
+// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
+[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
+
+
+NSArray<NSString*>* tags = @[@"tags_example"]; // Tags to filter by (optional)
+
+SWGPetApi*apiInstance = [[SWGPetApi alloc] init];
+
+// Finds Pets by tags
+[apiInstance findPetsByTagsWithTags:tags
+          completionHandler: ^(NSArray<SWGPet>* output, NSError* error) {
+                        if (output) {
+                            NSLog(@"%@", output);
+                        }
+                        if (error) {
+                            NSLog(@"Error calling SWGPetApi->findPetsByTags: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **tags** | [**NSArray&lt;NSString*&gt;***](NSString*.md)| Tags to filter by | [optional] 
+
+### Return type
+
+[**NSArray<SWGPet>***](SWGPet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getPetById**
+```objc
+-(NSURLSessionTask*) getPetByIdWithPetId: (NSNumber*) petId
+        completionHandler: (void (^)(SWGPet* output, NSError* error)) handler;
+```
+
+Find pet by ID
+
+Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+### Example 
+```objc
+SWGDefaultConfiguration *apiConfig = [SWGDefaultConfiguration sharedConfig];
+
+// Configure API key authorization: (authentication scheme: api_key)
+[apiConfig setApiKey:@"YOUR_API_KEY" forApiKeyIdentifier:@"api_key"];
+// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//[apiConfig setApiKeyPrefix:@"Bearer" forApiKeyIdentifier:@"api_key"];
+
+// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
+[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
+
+
+NSNumber* petId = @56; // ID of pet that needs to be fetched
+
+SWGPetApi*apiInstance = [[SWGPetApi alloc] init];
+
+// Find pet by ID
+[apiInstance getPetByIdWithPetId:petId
+          completionHandler: ^(SWGPet* output, NSError* error) {
+                        if (output) {
+                            NSLog(@"%@", output);
+                        }
+                        if (error) {
+                            NSLog(@"Error calling SWGPetApi->getPetById: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **NSNumber***| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**SWGPet***](SWGPet.md)
+
+### Authorization
+
+[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **updatePet**
+```objc
+-(NSURLSessionTask*) updatePetWithPet: (SWGPet*) pet
+        completionHandler: (void (^)(NSError* error)) handler;
+```
+
+Update an existing pet
+
+### Example 
+```objc
+SWGDefaultConfiguration *apiConfig = [SWGDefaultConfiguration sharedConfig];
+
+// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
+[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
+
+
+SWGPet* pet = [[SWGPet alloc] init]; // Pet object that needs to be added to the store (optional)
+
+SWGPetApi*apiInstance = [[SWGPetApi alloc] init];
+
+// Update an existing pet
+[apiInstance updatePetWithPet:pet
+          completionHandler: ^(NSError* error) {
+                        if (error) {
+                            NSLog(@"Error calling SWGPetApi->updatePet: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet** | [**SWGPet***](SWGPet.md)| Pet object that needs to be added to the store | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **updatePetWithForm**
+```objc
+-(NSURLSessionTask*) updatePetWithFormWithPetId: (NSString*) petId
+    name: (NSString*) name
+    status: (NSString*) status
+        completionHandler: (void (^)(NSError* error)) handler;
+```
+
+Updates a pet in the store with form data
+
+### Example 
+```objc
+SWGDefaultConfiguration *apiConfig = [SWGDefaultConfiguration sharedConfig];
+
+// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
+[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
+
+
+NSString* petId = @"petId_example"; // ID of pet that needs to be updated
+NSString* name = @"name_example"; // Updated name of the pet (optional)
+NSString* status = @"status_example"; // Updated status of the pet (optional)
+
+SWGPetApi*apiInstance = [[SWGPetApi alloc] init];
+
+// Updates a pet in the store with form data
+[apiInstance updatePetWithFormWithPetId:petId
+              name:name
+              status:status
+          completionHandler: ^(NSError* error) {
+                        if (error) {
+                            NSLog(@"Error calling SWGPetApi->updatePetWithForm: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **NSString***| ID of pet that needs to be updated | 
+ **name** | **NSString***| Updated name of the pet | [optional] 
+ **status** | **NSString***| Updated status of the pet | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **uploadFile**
+```objc
+-(NSURLSessionTask*) uploadFileWithPetId: (NSNumber*) petId
+    additionalMetadata: (NSString*) additionalMetadata
+    file: (NSURL*) file
+        completionHandler: (void (^)(NSError* error)) handler;
+```
+
+uploads an image
+
+### Example 
+```objc
+SWGDefaultConfiguration *apiConfig = [SWGDefaultConfiguration sharedConfig];
+
+// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
+[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
+
+
+NSNumber* petId = @56; // ID of pet to update
+NSString* additionalMetadata = @"additionalMetadata_example"; // Additional data to pass to server (optional)
+NSURL* file = [NSURL fileURLWithPath:@"/path/to/file"]; // file to upload (optional)
+
+SWGPetApi*apiInstance = [[SWGPetApi alloc] init];
+
+// uploads an image
+[apiInstance uploadFileWithPetId:petId
+              additionalMetadata:additionalMetadata
+              file:file
+          completionHandler: ^(NSError* error) {
+                        if (error) {
+                            NSLog(@"Error calling SWGPetApi->uploadFile: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **NSNumber***| ID of pet to update | 
+ **additionalMetadata** | **NSString***| Additional data to pass to server | [optional] 
+ **file** | **NSURL*****NSURL***| file to upload | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/objc/core-data/docs/SWGStoreApi.md b/samples/client/petstore/objc/core-data/docs/SWGStoreApi.md
new file mode 100644
index 000000000000..0aec03add1dc
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/docs/SWGStoreApi.md
@@ -0,0 +1,210 @@
+# SWGStoreApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**deleteOrder**](SWGStoreApi.md#deleteorder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+[**getInventory**](SWGStoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
+[**getOrderById**](SWGStoreApi.md#getorderbyid) | **GET** /store/order/{orderId} | Find purchase order by ID
+[**placeOrder**](SWGStoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
+
+
+# **deleteOrder**
+```objc
+-(NSURLSessionTask*) deleteOrderWithOrderId: (NSString*) orderId
+        completionHandler: (void (^)(NSError* error)) handler;
+```
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+
+### Example 
+```objc
+
+NSString* orderId = @"orderId_example"; // ID of the order that needs to be deleted
+
+SWGStoreApi*apiInstance = [[SWGStoreApi alloc] init];
+
+// Delete purchase order by ID
+[apiInstance deleteOrderWithOrderId:orderId
+          completionHandler: ^(NSError* error) {
+                        if (error) {
+                            NSLog(@"Error calling SWGStoreApi->deleteOrder: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **NSString***| ID of the order that needs to be deleted | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getInventory**
+```objc
+-(NSURLSessionTask*) getInventoryWithCompletionHandler: 
+        (void (^)(NSDictionary<NSString*, NSNumber*>* output, NSError* error)) handler;
+```
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+### Example 
+```objc
+SWGDefaultConfiguration *apiConfig = [SWGDefaultConfiguration sharedConfig];
+
+// Configure API key authorization: (authentication scheme: api_key)
+[apiConfig setApiKey:@"YOUR_API_KEY" forApiKeyIdentifier:@"api_key"];
+// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//[apiConfig setApiKeyPrefix:@"Bearer" forApiKeyIdentifier:@"api_key"];
+
+
+
+SWGStoreApi*apiInstance = [[SWGStoreApi alloc] init];
+
+// Returns pet inventories by status
+[apiInstance getInventoryWithCompletionHandler: 
+          ^(NSDictionary<NSString*, NSNumber*>* output, NSError* error) {
+                        if (output) {
+                            NSLog(@"%@", output);
+                        }
+                        if (error) {
+                            NSLog(@"Error calling SWGStoreApi->getInventory: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**NSDictionary<NSString*, NSNumber*>***
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getOrderById**
+```objc
+-(NSURLSessionTask*) getOrderByIdWithOrderId: (NSString*) orderId
+        completionHandler: (void (^)(SWGOrder* output, NSError* error)) handler;
+```
+
+Find purchase order by ID
+
+For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+
+### Example 
+```objc
+
+NSString* orderId = @"orderId_example"; // ID of pet that needs to be fetched
+
+SWGStoreApi*apiInstance = [[SWGStoreApi alloc] init];
+
+// Find purchase order by ID
+[apiInstance getOrderByIdWithOrderId:orderId
+          completionHandler: ^(SWGOrder* output, NSError* error) {
+                        if (output) {
+                            NSLog(@"%@", output);
+                        }
+                        if (error) {
+                            NSLog(@"Error calling SWGStoreApi->getOrderById: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **NSString***| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**SWGOrder***](SWGOrder.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **placeOrder**
+```objc
+-(NSURLSessionTask*) placeOrderWithOrder: (SWGOrder*) order
+        completionHandler: (void (^)(SWGOrder* output, NSError* error)) handler;
+```
+
+Place an order for a pet
+
+### Example 
+```objc
+
+SWGOrder* order = [[SWGOrder alloc] init]; // order placed for purchasing the pet (optional)
+
+SWGStoreApi*apiInstance = [[SWGStoreApi alloc] init];
+
+// Place an order for a pet
+[apiInstance placeOrderWithOrder:order
+          completionHandler: ^(SWGOrder* output, NSError* error) {
+                        if (output) {
+                            NSLog(@"%@", output);
+                        }
+                        if (error) {
+                            NSLog(@"Error calling SWGStoreApi->placeOrder: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **order** | [**SWGOrder***](SWGOrder.md)| order placed for purchasing the pet | [optional] 
+
+### Return type
+
+[**SWGOrder***](SWGOrder.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/objc/core-data/docs/SWGTag.md b/samples/client/petstore/objc/core-data/docs/SWGTag.md
new file mode 100644
index 000000000000..5495d5c8a99f
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/docs/SWGTag.md
@@ -0,0 +1,11 @@
+# SWGTag
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_id** | **NSNumber*** |  | [optional] 
+**name** | **NSString*** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/objc/core-data/docs/SWGUser.md b/samples/client/petstore/objc/core-data/docs/SWGUser.md
new file mode 100644
index 000000000000..35bf5540cad0
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/docs/SWGUser.md
@@ -0,0 +1,17 @@
+# SWGUser
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_id** | **NSNumber*** |  | [optional] 
+**username** | **NSString*** |  | [optional] 
+**firstName** | **NSString*** |  | [optional] 
+**lastName** | **NSString*** |  | [optional] 
+**email** | **NSString*** |  | [optional] 
+**password** | **NSString*** |  | [optional] 
+**phone** | **NSString*** |  | [optional] 
+**userStatus** | **NSNumber*** | User Status | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/objc/core-data/docs/SWGUserApi.md b/samples/client/petstore/objc/core-data/docs/SWGUserApi.md
new file mode 100644
index 000000000000..549a9e0f72cf
--- /dev/null
+++ b/samples/client/petstore/objc/core-data/docs/SWGUserApi.md
@@ -0,0 +1,392 @@
+# SWGUserApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**createUser**](SWGUserApi.md#createuser) | **POST** /user | Create user
+[**createUsersWithArrayInput**](SWGUserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
+[**createUsersWithListInput**](SWGUserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
+[**deleteUser**](SWGUserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
+[**getUserByName**](SWGUserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
+[**loginUser**](SWGUserApi.md#loginuser) | **GET** /user/login | Logs user into the system
+[**logoutUser**](SWGUserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
+[**updateUser**](SWGUserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+
+
+# **createUser**
+```objc
+-(NSURLSessionTask*) createUserWithUser: (SWGUser*) user
+        completionHandler: (void (^)(NSError* error)) handler;
+```
+
+Create user
+
+This can only be done by the logged in user.
+
+### Example 
+```objc
+
+SWGUser* user = [[SWGUser alloc] init]; // Created user object (optional)
+
+SWGUserApi*apiInstance = [[SWGUserApi alloc] init];
+
+// Create user
+[apiInstance createUserWithUser:user
+          completionHandler: ^(NSError* error) {
+                        if (error) {
+                            NSLog(@"Error calling SWGUserApi->createUser: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **user** | [**SWGUser***](SWGUser.md)| Created user object | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **createUsersWithArrayInput**
+```objc
+-(NSURLSessionTask*) createUsersWithArrayInputWithUser: (NSArray<SWGUser>*) user
+        completionHandler: (void (^)(NSError* error)) handler;
+```
+
+Creates list of users with given input array
+
+### Example 
+```objc
+
+NSArray<SWGUser>* user = @[[[SWGUser alloc] init]]; // List of user object (optional)
+
+SWGUserApi*apiInstance = [[SWGUserApi alloc] init];
+
+// Creates list of users with given input array
+[apiInstance createUsersWithArrayInputWithUser:user
+          completionHandler: ^(NSError* error) {
+                        if (error) {
+                            NSLog(@"Error calling SWGUserApi->createUsersWithArrayInput: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **user** | [**NSArray&lt;SWGUser&gt;***](SWGUser.md)| List of user object | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **createUsersWithListInput**
+```objc
+-(NSURLSessionTask*) createUsersWithListInputWithUser: (NSArray<SWGUser>*) user
+        completionHandler: (void (^)(NSError* error)) handler;
+```
+
+Creates list of users with given input array
+
+### Example 
+```objc
+
+NSArray<SWGUser>* user = @[[[SWGUser alloc] init]]; // List of user object (optional)
+
+SWGUserApi*apiInstance = [[SWGUserApi alloc] init];
+
+// Creates list of users with given input array
+[apiInstance createUsersWithListInputWithUser:user
+          completionHandler: ^(NSError* error) {
+                        if (error) {
+                            NSLog(@"Error calling SWGUserApi->createUsersWithListInput: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **user** | [**NSArray&lt;SWGUser&gt;***](SWGUser.md)| List of user object | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **deleteUser**
+```objc
+-(NSURLSessionTask*) deleteUserWithUsername: (NSString*) username
+        completionHandler: (void (^)(NSError* error)) handler;
+```
+
+Delete user
+
+This can only be done by the logged in user.
+
+### Example 
+```objc
+
+NSString* username = @"username_example"; // The name that needs to be deleted
+
+SWGUserApi*apiInstance = [[SWGUserApi alloc] init];
+
+// Delete user
+[apiInstance deleteUserWithUsername:username
+          completionHandler: ^(NSError* error) {
+                        if (error) {
+                            NSLog(@"Error calling SWGUserApi->deleteUser: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **NSString***| The name that needs to be deleted | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getUserByName**
+```objc
+-(NSURLSessionTask*) getUserByNameWithUsername: (NSString*) username
+        completionHandler: (void (^)(SWGUser* output, NSError* error)) handler;
+```
+
+Get user by user name
+
+### Example 
+```objc
+
+NSString* username = @"username_example"; // The name that needs to be fetched. Use user1 for testing. 
+
+SWGUserApi*apiInstance = [[SWGUserApi alloc] init];
+
+// Get user by user name
+[apiInstance getUserByNameWithUsername:username
+          completionHandler: ^(SWGUser* output, NSError* error) {
+                        if (output) {
+                            NSLog(@"%@", output);
+                        }
+                        if (error) {
+                            NSLog(@"Error calling SWGUserApi->getUserByName: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **NSString***| The name that needs to be fetched. Use user1 for testing.  | 
+
+### Return type
+
+[**SWGUser***](SWGUser.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **loginUser**
+```objc
+-(NSURLSessionTask*) loginUserWithUsername: (NSString*) username
+    password: (NSString*) password
+        completionHandler: (void (^)(NSString* output, NSError* error)) handler;
+```
+
+Logs user into the system
+
+### Example 
+```objc
+
+NSString* username = @"username_example"; // The user name for login (optional)
+NSString* password = @"password_example"; // The password for login in clear text (optional)
+
+SWGUserApi*apiInstance = [[SWGUserApi alloc] init];
+
+// Logs user into the system
+[apiInstance loginUserWithUsername:username
+              password:password
+          completionHandler: ^(NSString* output, NSError* error) {
+                        if (output) {
+                            NSLog(@"%@", output);
+                        }
+                        if (error) {
+                            NSLog(@"Error calling SWGUserApi->loginUser: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **NSString***| The user name for login | [optional] 
+ **password** | **NSString***| The password for login in clear text | [optional] 
+
+### Return type
+
+**NSString***
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, application/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **logoutUser**
+```objc
+-(NSURLSessionTask*) logoutUserWithCompletionHandler: 
+        (void (^)(NSError* error)) handler;
+```
+
+Logs out current logged in user session
+
+### Example 
+```objc
+
+
+SWGUserApi*apiInstance = [[SWGUserApi alloc] init];
+
+// Logs out current logged in user session
+[apiInstance logoutUserWithCompletionHandler: 
+          ^(NSError* error) {
+                        if (error) {
+                            NSLog(@"Error calling SWGUserApi->logoutUser: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **updateUser**
+```objc
+-(NSURLSessionTask*) updateUserWithUsername: (NSString*) username
+    user: (SWGUser*) user
+        completionHandler: (void (^)(NSError* error)) handler;
+```
+
+Updated user
+
+This can only be done by the logged in user.
+
+### Example 
+```objc
+
+NSString* username = @"username_example"; // name that need to be deleted
+SWGUser* user = [[SWGUser alloc] init]; // Updated user object (optional)
+
+SWGUserApi*apiInstance = [[SWGUserApi alloc] init];
+
+// Updated user
+[apiInstance updateUserWithUsername:username
+              user:user
+          completionHandler: ^(NSError* error) {
+                        if (error) {
+                            NSLog(@"Error calling SWGUserApi->updateUser: %@", error);
+                        }
+                    }];
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **NSString***| name that need to be deleted | 
+ **user** | [**SWGUser***](SWGUser.md)| Updated user object | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/objc/core-data/git_push.sh b/samples/client/petstore/objc/core-data/git_push.sh
index 8442b80bb445..ced3be2b0c7b 100644
--- a/samples/client/petstore/objc/core-data/git_push.sh
+++ b/samples/client/petstore/objc/core-data/git_push.sh
@@ -1,11 +1,17 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
 release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
 
 if [ "$git_user_id" = "" ]; then
     git_user_id="GIT_USER_ID"
@@ -28,7 +34,7 @@ git init
 # Adds the files in the local repository and stages them for commit.
 git add .
 
-# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
 git commit -m "$release_note"
 
 # Sets the new remote
@@ -37,9 +43,9 @@ if [ "$git_remote" = "" ]; then # git remote not defined
 
     if [ "$GIT_TOKEN" = "" ]; then
         echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
-        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
     else
-        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
     fi
 
 fi
@@ -47,6 +53,6 @@ fi
 git pull origin master
 
 # Pushes (Forces) the changes in the local repository up to the remote repository
-echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
 git push origin master 2>&1 | grep -v 'To https'
 
diff --git a/samples/client/petstore/objc/default/.openapi-generator/FILES b/samples/client/petstore/objc/default/.openapi-generator/FILES
new file mode 100644
index 000000000000..d0985156c04f
--- /dev/null
+++ b/samples/client/petstore/objc/default/.openapi-generator/FILES
@@ -0,0 +1,56 @@
+.gitignore
+README.md
+SwaggerClient.podspec
+SwaggerClient/Api/SWGPetApi.h
+SwaggerClient/Api/SWGPetApi.m
+SwaggerClient/Api/SWGStoreApi.h
+SwaggerClient/Api/SWGStoreApi.m
+SwaggerClient/Api/SWGUserApi.h
+SwaggerClient/Api/SWGUserApi.m
+SwaggerClient/Core/JSONValueTransformer+ISO8601.h
+SwaggerClient/Core/JSONValueTransformer+ISO8601.m
+SwaggerClient/Core/SWGApi.h
+SwaggerClient/Core/SWGApiClient.h
+SwaggerClient/Core/SWGApiClient.m
+SwaggerClient/Core/SWGBasicAuthTokenProvider.h
+SwaggerClient/Core/SWGBasicAuthTokenProvider.m
+SwaggerClient/Core/SWGConfiguration.h
+SwaggerClient/Core/SWGDefaultConfiguration.h
+SwaggerClient/Core/SWGDefaultConfiguration.m
+SwaggerClient/Core/SWGJSONRequestSerializer.h
+SwaggerClient/Core/SWGJSONRequestSerializer.m
+SwaggerClient/Core/SWGLogger.h
+SwaggerClient/Core/SWGLogger.m
+SwaggerClient/Core/SWGObject.h
+SwaggerClient/Core/SWGObject.m
+SwaggerClient/Core/SWGQueryParamCollection.h
+SwaggerClient/Core/SWGQueryParamCollection.m
+SwaggerClient/Core/SWGResponseDeserializer.h
+SwaggerClient/Core/SWGResponseDeserializer.m
+SwaggerClient/Core/SWGSanitizer.h
+SwaggerClient/Core/SWGSanitizer.m
+SwaggerClient/Model/SWGCategory.h
+SwaggerClient/Model/SWGCategory.m
+SwaggerClient/Model/SWGInlineObject.h
+SwaggerClient/Model/SWGInlineObject.m
+SwaggerClient/Model/SWGInlineObject1.h
+SwaggerClient/Model/SWGInlineObject1.m
+SwaggerClient/Model/SWGOrder.h
+SwaggerClient/Model/SWGOrder.m
+SwaggerClient/Model/SWGPet.h
+SwaggerClient/Model/SWGPet.m
+SwaggerClient/Model/SWGTag.h
+SwaggerClient/Model/SWGTag.m
+SwaggerClient/Model/SWGUser.h
+SwaggerClient/Model/SWGUser.m
+docs/SWGCategory.md
+docs/SWGInlineObject.md
+docs/SWGInlineObject1.md
+docs/SWGOrder.md
+docs/SWGPet.md
+docs/SWGPetApi.md
+docs/SWGStoreApi.md
+docs/SWGTag.md
+docs/SWGUser.md
+docs/SWGUserApi.md
+git_push.sh
diff --git a/samples/client/petstore/objc/default/.openapi-generator/VERSION b/samples/client/petstore/objc/default/.openapi-generator/VERSION
index 096bf47efe31..d99e7162d01f 100644
--- a/samples/client/petstore/objc/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/objc/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/objc/default/README.md b/samples/client/petstore/objc/default/README.md
index 10694bd5135b..ac24d7bfc60f 100644
--- a/samples/client/petstore/objc/default/README.md
+++ b/samples/client/petstore/objc/default/README.md
@@ -42,6 +42,8 @@ Import the following:
 #import <SwaggerClient/SWGDefaultConfiguration.h>
 // load models
 #import <SwaggerClient/SWGCategory.h>
+#import <SwaggerClient/SWGInlineObject.h>
+#import <SwaggerClient/SWGInlineObject1.h>
 #import <SwaggerClient/SWGOrder.h>
 #import <SwaggerClient/SWGPet.h>
 #import <SwaggerClient/SWGTag.h>
@@ -114,6 +116,8 @@ Class | Method | HTTP request | Description
 ## Documentation For Models
 
  - [SWGCategory](docs/SWGCategory.md)
+ - [SWGInlineObject](docs/SWGInlineObject.md)
+ - [SWGInlineObject1](docs/SWGInlineObject1.md)
  - [SWGOrder](docs/SWGOrder.md)
  - [SWGPet](docs/SWGPet.md)
  - [SWGTag](docs/SWGTag.md)
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.h b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.h
index 3783ee23362b..1b1309c48761 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.h
@@ -6,7 +6,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.m b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.m
index e57006827b99..36fecb1dd44c 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.m
+++ b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.m
@@ -193,7 +193,7 @@ -(NSURLSessionTask*) findPetsByStatusWithStatus: (NSArray<NSString*>*) status
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     if (status != nil) {
-        queryParams[@"status"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: status format: @"csv"];
+        queryParams[@"status"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: status format: @"multi"];
     }
     NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.apiClient.configuration.defaultHeaders];
     [headerParams addEntriesFromDictionary:self.defaultHeaders];
@@ -250,7 +250,7 @@ -(NSURLSessionTask*) findPetsByTagsWithTags: (NSArray<NSString*>*) tags
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     if (tags != nil) {
-        queryParams[@"tags"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: tags format: @"csv"];
+        queryParams[@"tags"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: tags format: @"multi"];
     }
     NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.apiClient.configuration.defaultHeaders];
     [headerParams addEntriesFromDictionary:self.defaultHeaders];
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h
index d578190189c1..e67aa3c83572 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h
@@ -6,7 +6,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m
index 4231e138bdaf..eaf254a6ab3e 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m
+++ b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m
@@ -263,7 +263,7 @@ -(NSURLSessionTask*) placeOrderWithOrder: (SWGOrder*) order
     NSString *responseContentType = [[acceptHeader componentsSeparatedByString:@", "] firstObject] ?: @"";
 
     // request content type
-    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];
+    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[@"application/json"]];
 
     // Authentication setting
     NSArray *authSettings = @[];
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.h b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.h
index 5e0b6bbc8d83..98a3a1756d5d 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.h
@@ -6,7 +6,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.m b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.m
index 6ba11b3a44a1..94651c70282f 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.m
+++ b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.m
@@ -75,7 +75,7 @@ -(NSURLSessionTask*) createUserWithUser: (SWGUser*) user
     NSString *responseContentType = [[acceptHeader componentsSeparatedByString:@", "] firstObject] ?: @"";
 
     // request content type
-    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];
+    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[@"application/json"]];
 
     // Authentication setting
     NSArray *authSettings = @[];
@@ -130,7 +130,7 @@ -(NSURLSessionTask*) createUsersWithArrayInputWithUser: (NSArray<SWGUser>*) user
     NSString *responseContentType = [[acceptHeader componentsSeparatedByString:@", "] firstObject] ?: @"";
 
     // request content type
-    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];
+    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[@"application/json"]];
 
     // Authentication setting
     NSArray *authSettings = @[];
@@ -185,7 +185,7 @@ -(NSURLSessionTask*) createUsersWithListInputWithUser: (NSArray<SWGUser>*) user
     NSString *responseContentType = [[acceptHeader componentsSeparatedByString:@", "] firstObject] ?: @"";
 
     // request content type
-    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];
+    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[@"application/json"]];
 
     // Authentication setting
     NSArray *authSettings = @[];
@@ -508,7 +508,7 @@ -(NSURLSessionTask*) updateUserWithUsername: (NSString*) username
     NSString *responseContentType = [[acceptHeader componentsSeparatedByString:@", "] firstObject] ?: @"";
 
     // request content type
-    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];
+    NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[@"application/json"]];
 
     // Authentication setting
     NSArray *authSettings = @[];
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Core/JSONValueTransformer+ISO8601.h b/samples/client/petstore/objc/default/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
index 3925ca3728f8..5179ca2e99b8 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGApi.h b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGApi.h
index 2ac4a2cdc785..6c0396f0cac5 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGApi.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGApi.h
@@ -6,7 +6,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGApiClient.h b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGApiClient.h
index 844893553809..04558b3d0a05 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGApiClient.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGApiClient.h
@@ -7,7 +7,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGConfiguration.h b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGConfiguration.h
index 1c3c741442de..f6b12de5c5c3 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGConfiguration.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGConfiguration.h
@@ -6,7 +6,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGDefaultConfiguration.h b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGDefaultConfiguration.h
index 24d89beeb61e..e141e0d092d5 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGDefaultConfiguration.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGDefaultConfiguration.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -93,7 +93,7 @@
 /**
  * Sets API key
  *
- * To remove a apiKey for an identifier, just set the apiKey to nil.
+ * To remove an apiKey for an identifier, just set the apiKey to nil.
  *
  * @param apiKey     API key or token.
  * @param identifier API key identifier (authentication schema).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGJSONRequestSerializer.h b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGJSONRequestSerializer.h
index 500664a38c51..943ab1323133 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGJSONRequestSerializer.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGJSONRequestSerializer.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGLogger.h b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGLogger.h
index bb3cb672c3eb..23f57acd7b8a 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGLogger.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGLogger.h
@@ -4,7 +4,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGObject.h b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGObject.h
index 047f52c2bb5f..7d7112c5976a 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGObject.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGObject.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGObject.m b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGObject.m
index db970d34669b..1a90a21d1cc4 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGObject.m
+++ b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGObject.m
@@ -8,13 +8,15 @@ @implementation SWGObject
  */
 - (instancetype)initWithDictionary:(NSDictionary *)dict error:(NSError **)err {
     static NSMutableSet *classNames;
+    static NSObject *lock;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         classNames = [NSMutableSet new];
+        lock = [NSObject new];
     });
     
     BOOL initSync;
-    @synchronized([self class])
+    @synchronized(lock)
     {
         NSString *className = NSStringFromClass([self class]);
         initSync = ![classNames containsObject:className];
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGQueryParamCollection.h b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGQueryParamCollection.h
index 2fd7c6dbec8b..4bd35d86f352 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGQueryParamCollection.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGQueryParamCollection.h
@@ -4,7 +4,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGResponseDeserializer.h b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGResponseDeserializer.h
index e51705deb256..68f83704f495 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGResponseDeserializer.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGResponseDeserializer.h
@@ -4,7 +4,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -49,7 +49,7 @@ extern NSInteger const SWGUnknownResponseObjectErrorCode;
 @interface SWGResponseDeserializer : NSObject <SWGResponseDeserializer>
 
 /**
- *  If an null value occurs in dictionary or array if set to YES whole response will be invalid else will be ignored
+ *  If a null value occurs in dictionary or array if set to YES whole response will be invalid else will be ignored
  *  @default NO
  */
 @property (nonatomic, assign) BOOL treatNullAsError;
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGSanitizer.h b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGSanitizer.h
index 4a2bea99fd05..83853bec8cf0 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Core/SWGSanitizer.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Core/SWGSanitizer.h
@@ -4,7 +4,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGCategory.h b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGCategory.h
index efe582a11a46..31eb9e6b31ca 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGCategory.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGCategory.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGInlineObject.h b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGInlineObject.h
new file mode 100644
index 000000000000..1d3390dab8c4
--- /dev/null
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGInlineObject.h
@@ -0,0 +1,32 @@
+#import <Foundation/Foundation.h>
+#import "SWGObject.h"
+
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* The version of the OpenAPI document: 1.0.0
+* 
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+
+
+
+
+@protocol SWGInlineObject
+@end
+
+@interface SWGInlineObject : SWGObject
+
+/* Updated name of the pet [optional]
+ */
+@property(nonatomic) NSString* name;
+/* Updated status of the pet [optional]
+ */
+@property(nonatomic) NSString* status;
+
+@end
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGInlineObject.m b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGInlineObject.m
new file mode 100644
index 000000000000..a10d7060973a
--- /dev/null
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGInlineObject.m
@@ -0,0 +1,34 @@
+#import "SWGInlineObject.h"
+
+@implementation SWGInlineObject
+
+- (instancetype)init {
+  self = [super init];
+  if (self) {
+    // initialize property's default value, if any
+    
+  }
+  return self;
+}
+
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
++ (JSONKeyMapper *)keyMapper {
+  return [[JSONKeyMapper alloc] initWithModelToJSONDictionary:@{ @"name": @"name", @"status": @"status" }];
+}
+
+/**
+ * Indicates whether the property with the given name is optional.
+ * If `propertyName` is optional, then return `YES`, otherwise return `NO`.
+ * This method is used by `JSONModel`.
+ */
++ (BOOL)propertyIsOptional:(NSString *)propertyName {
+
+  NSArray *optionalProperties = @[@"name", @"status"];
+  return [optionalProperties containsObject:propertyName];
+}
+
+@end
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGInlineObject1.h b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGInlineObject1.h
new file mode 100644
index 000000000000..36d1a7194cdd
--- /dev/null
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGInlineObject1.h
@@ -0,0 +1,32 @@
+#import <Foundation/Foundation.h>
+#import "SWGObject.h"
+
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* The version of the OpenAPI document: 1.0.0
+* 
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+
+
+
+
+
+@protocol SWGInlineObject1
+@end
+
+@interface SWGInlineObject1 : SWGObject
+
+/* Additional data to pass to server [optional]
+ */
+@property(nonatomic) NSString* additionalMetadata;
+/* file to upload [optional]
+ */
+@property(nonatomic) NSURL* file;
+
+@end
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGInlineObject1.m b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGInlineObject1.m
new file mode 100644
index 000000000000..825dbcc286ae
--- /dev/null
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGInlineObject1.m
@@ -0,0 +1,34 @@
+#import "SWGInlineObject1.h"
+
+@implementation SWGInlineObject1
+
+- (instancetype)init {
+  self = [super init];
+  if (self) {
+    // initialize property's default value, if any
+    
+  }
+  return self;
+}
+
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
++ (JSONKeyMapper *)keyMapper {
+  return [[JSONKeyMapper alloc] initWithModelToJSONDictionary:@{ @"additionalMetadata": @"additionalMetadata", @"file": @"file" }];
+}
+
+/**
+ * Indicates whether the property with the given name is optional.
+ * If `propertyName` is optional, then return `YES`, otherwise return `NO`.
+ * This method is used by `JSONModel`.
+ */
++ (BOOL)propertyIsOptional:(NSString *)propertyName {
+
+  NSArray *optionalProperties = @[@"additionalMetadata", @"file"];
+  return [optionalProperties containsObject:propertyName];
+}
+
+@end
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGOrder.h b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGOrder.h
index 11f27bdba3f8..5ea7a94cfcbe 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGOrder.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGOrder.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGPet.h b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGPet.h
index b3586e9ea821..4b3729193265 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGPet.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGPet.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGTag.h b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGTag.h
index 991526f5d5aa..cdcedfd916bb 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGTag.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGTag.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGUser.h b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGUser.h
index de28b05c42e2..7786883ed29c 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGUser.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGUser.h
@@ -5,7 +5,7 @@
 * OpenAPI Petstore
 * This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters
 *
-* OpenAPI spec version: 1.0.0
+* The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/samples/client/petstore/objc/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj b/samples/client/petstore/objc/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
index c2b960038e1f..6407077fccd8 100644
--- a/samples/client/petstore/objc/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/objc/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
@@ -236,9 +236,6 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				429AF5C69E165ED75311B4B0 /* [CP] Copy Pods Resources */,
-				183E54C09C54DAEB54B2546F /* [CP] Embed Pods Frameworks */,
-				DA8DD6AAE903F2CD38F2D9D5 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -257,9 +254,6 @@
 				6003F5AA195388D20070C39A /* Sources */,
 				6003F5AB195388D20070C39A /* Frameworks */,
 				6003F5AC195388D20070C39A /* Resources */,
-				E337D7E459CCFFDF27046FFC /* [CP] Copy Pods Resources */,
-				111D7956304BD6E860AA8709 /* [CP] Embed Pods Frameworks */,
-				FD42985CC653969FE997DEC9 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -323,64 +317,22 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		111D7956304BD6E860AA8709 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient_Tests/Pods-SwaggerClient_Tests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		183E54C09C54DAEB54B2546F /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient_Example/Pods-SwaggerClient_Example-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		429AF5C69E165ED75311B4B0 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient_Example/Pods-SwaggerClient_Example-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		799E7E29D924C30424DFBA28 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-SwaggerClient_Example-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		7B069562A9F91E498732474F /* [CP] Check Pods Manifest.lock */ = {
@@ -389,58 +341,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-SwaggerClient_Tests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		DA8DD6AAE903F2CD38F2D9D5 /* Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient_Example/Pods-SwaggerClient_Example-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		E337D7E459CCFFDF27046FFC /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient_Tests/Pods-SwaggerClient_Tests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		FD42985CC653969FE997DEC9 /* Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient_Tests/Pods-SwaggerClient_Tests-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
diff --git a/samples/client/petstore/objc/default/SwaggerClientTests/run_xcodebuild.sh b/samples/client/petstore/objc/default/SwaggerClientTests/run_xcodebuild.sh
index 7553a165a4ce..5f88b8fcd74c 100755
--- a/samples/client/petstore/objc/default/SwaggerClientTests/run_xcodebuild.sh
+++ b/samples/client/petstore/objc/default/SwaggerClientTests/run_xcodebuild.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pod install && xcodebuild test -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient-Example" -destination "platform=iOS Simulator,name=iPhone 5s,OS=9.3" | xcpretty && exit ${PIPESTATUS[0]}
+pod install && xcodebuild test -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient-Example" -destination "platform=iOS Simulator,name=iPhone 8,OS=13.1" | xcpretty && exit ${PIPESTATUS[0]}
diff --git a/samples/client/petstore/objc/default/docs/SWGInlineObject.md b/samples/client/petstore/objc/default/docs/SWGInlineObject.md
new file mode 100644
index 000000000000..1d66818927f4
--- /dev/null
+++ b/samples/client/petstore/objc/default/docs/SWGInlineObject.md
@@ -0,0 +1,11 @@
+# SWGInlineObject
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **NSString*** | Updated name of the pet | [optional] 
+**status** | **NSString*** | Updated status of the pet | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/objc/default/docs/SWGInlineObject1.md b/samples/client/petstore/objc/default/docs/SWGInlineObject1.md
new file mode 100644
index 000000000000..c59e84858851
--- /dev/null
+++ b/samples/client/petstore/objc/default/docs/SWGInlineObject1.md
@@ -0,0 +1,11 @@
+# SWGInlineObject1
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**additionalMetadata** | **NSString*** | Additional data to pass to server | [optional] 
+**file** | **NSURL*** | file to upload | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/objc/default/docs/SWGStoreApi.md b/samples/client/petstore/objc/default/docs/SWGStoreApi.md
index 572b556ac041..0aec03add1dc 100644
--- a/samples/client/petstore/objc/default/docs/SWGStoreApi.md
+++ b/samples/client/petstore/objc/default/docs/SWGStoreApi.md
@@ -203,7 +203,7 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json, application/xml
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
diff --git a/samples/client/petstore/objc/default/docs/SWGUserApi.md b/samples/client/petstore/objc/default/docs/SWGUserApi.md
index 8d28e604d0b3..549a9e0f72cf 100644
--- a/samples/client/petstore/objc/default/docs/SWGUserApi.md
+++ b/samples/client/petstore/objc/default/docs/SWGUserApi.md
@@ -56,7 +56,7 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: Not defined
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
@@ -72,7 +72,7 @@ Creates list of users with given input array
 ### Example 
 ```objc
 
-NSArray<SWGUser>* user = @[[[NSArray alloc] init]]; // List of user object (optional)
+NSArray<SWGUser>* user = @[[[SWGUser alloc] init]]; // List of user object (optional)
 
 SWGUserApi*apiInstance = [[SWGUserApi alloc] init];
 
@@ -89,7 +89,7 @@ SWGUserApi*apiInstance = [[SWGUserApi alloc] init];
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**NSArray&lt;SWGUser&gt;***](NSArray.md)| List of user object | [optional] 
+ **user** | [**NSArray&lt;SWGUser&gt;***](SWGUser.md)| List of user object | [optional] 
 
 ### Return type
 
@@ -101,7 +101,7 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: Not defined
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
@@ -117,7 +117,7 @@ Creates list of users with given input array
 ### Example 
 ```objc
 
-NSArray<SWGUser>* user = @[[[NSArray alloc] init]]; // List of user object (optional)
+NSArray<SWGUser>* user = @[[[SWGUser alloc] init]]; // List of user object (optional)
 
 SWGUserApi*apiInstance = [[SWGUserApi alloc] init];
 
@@ -134,7 +134,7 @@ SWGUserApi*apiInstance = [[SWGUserApi alloc] init];
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**NSArray&lt;SWGUser&gt;***](NSArray.md)| List of user object | [optional] 
+ **user** | [**NSArray&lt;SWGUser&gt;***](SWGUser.md)| List of user object | [optional] 
 
 ### Return type
 
@@ -146,7 +146,7 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: Not defined
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
@@ -385,7 +385,7 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: Not defined
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
diff --git a/samples/client/petstore/objc/default/git_push.sh b/samples/client/petstore/objc/default/git_push.sh
index 8442b80bb445..ced3be2b0c7b 100644
--- a/samples/client/petstore/objc/default/git_push.sh
+++ b/samples/client/petstore/objc/default/git_push.sh
@@ -1,11 +1,17 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
 release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
 
 if [ "$git_user_id" = "" ]; then
     git_user_id="GIT_USER_ID"
@@ -28,7 +34,7 @@ git init
 # Adds the files in the local repository and stages them for commit.
 git add .
 
-# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
 git commit -m "$release_note"
 
 # Sets the new remote
@@ -37,9 +43,9 @@ if [ "$git_remote" = "" ]; then # git remote not defined
 
     if [ "$GIT_TOKEN" = "" ]; then
         echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
-        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
     else
-        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
     fi
 
 fi
@@ -47,6 +53,6 @@ fi
 git pull origin master
 
 # Pushes (Forces) the changes in the local repository up to the remote repository
-echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
 git push origin master 2>&1 | grep -v 'To https'
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/.gitignore b/samples/client/petstore/php/OpenAPIClient-php/.gitignore
index edcf63f6aee1..e2316dd486c6 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/.gitignore
+++ b/samples/client/petstore/php/OpenAPIClient-php/.gitignore
@@ -5,4 +5,10 @@ composer.phar
 
 # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
-composer.lock
\ No newline at end of file
+composer.lock
+
+# php-cs-fixer cache
+.php_cs.cache
+
+# PHPUnit cache
+.phpunit.result.cache
diff --git a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES
index 72f2a6e75849..6c0c0f87b523 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES
+++ b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES
@@ -4,26 +4,18 @@
 README.md
 composer.json
 docs/Api/AnotherFakeApi.md
+docs/Api/DefaultApi.md
 docs/Api/FakeApi.md
 docs/Api/FakeClassnameTags123Api.md
 docs/Api/PetApi.md
 docs/Api/StoreApi.md
 docs/Api/UserApi.md
-docs/Model/AdditionalPropertiesAnyType.md
-docs/Model/AdditionalPropertiesArray.md
-docs/Model/AdditionalPropertiesBoolean.md
 docs/Model/AdditionalPropertiesClass.md
-docs/Model/AdditionalPropertiesInteger.md
-docs/Model/AdditionalPropertiesNumber.md
-docs/Model/AdditionalPropertiesObject.md
-docs/Model/AdditionalPropertiesString.md
 docs/Model/Animal.md
 docs/Model/ApiResponse.md
 docs/Model/ArrayOfArrayOfNumberOnly.md
 docs/Model/ArrayOfNumberOnly.md
 docs/Model/ArrayTest.md
-docs/Model/BigCat.md
-docs/Model/BigCatAllOf.md
 docs/Model/Capitalization.md
 docs/Model/Cat.md
 docs/Model/CatAllOf.md
@@ -37,28 +29,39 @@ docs/Model/EnumClass.md
 docs/Model/EnumTest.md
 docs/Model/File.md
 docs/Model/FileSchemaTestClass.md
+docs/Model/Foo.md
 docs/Model/FormatTest.md
 docs/Model/HasOnlyReadOnly.md
+docs/Model/HealthCheckResult.md
+docs/Model/InlineObject.md
+docs/Model/InlineObject1.md
+docs/Model/InlineObject2.md
+docs/Model/InlineObject3.md
+docs/Model/InlineObject4.md
+docs/Model/InlineObject5.md
+docs/Model/InlineResponseDefault.md
 docs/Model/MapTest.md
 docs/Model/MixedPropertiesAndAdditionalPropertiesClass.md
 docs/Model/Model200Response.md
 docs/Model/ModelList.md
 docs/Model/ModelReturn.md
 docs/Model/Name.md
+docs/Model/NullableClass.md
 docs/Model/NumberOnly.md
 docs/Model/Order.md
 docs/Model/OuterComposite.md
 docs/Model/OuterEnum.md
+docs/Model/OuterEnumDefaultValue.md
+docs/Model/OuterEnumInteger.md
+docs/Model/OuterEnumIntegerDefaultValue.md
 docs/Model/Pet.md
 docs/Model/ReadOnlyFirst.md
 docs/Model/SpecialModelName.md
 docs/Model/Tag.md
-docs/Model/TypeHolderDefault.md
-docs/Model/TypeHolderExample.md
 docs/Model/User.md
-docs/Model/XmlItem.md
 git_push.sh
 lib/Api/AnotherFakeApi.php
+lib/Api/DefaultApi.php
 lib/Api/FakeApi.php
 lib/Api/FakeClassnameTags123Api.php
 lib/Api/PetApi.php
@@ -67,21 +70,12 @@ lib/Api/UserApi.php
 lib/ApiException.php
 lib/Configuration.php
 lib/HeaderSelector.php
-lib/Model/AdditionalPropertiesAnyType.php
-lib/Model/AdditionalPropertiesArray.php
-lib/Model/AdditionalPropertiesBoolean.php
 lib/Model/AdditionalPropertiesClass.php
-lib/Model/AdditionalPropertiesInteger.php
-lib/Model/AdditionalPropertiesNumber.php
-lib/Model/AdditionalPropertiesObject.php
-lib/Model/AdditionalPropertiesString.php
 lib/Model/Animal.php
 lib/Model/ApiResponse.php
 lib/Model/ArrayOfArrayOfNumberOnly.php
 lib/Model/ArrayOfNumberOnly.php
 lib/Model/ArrayTest.php
-lib/Model/BigCat.php
-lib/Model/BigCatAllOf.php
 lib/Model/Capitalization.php
 lib/Model/Cat.php
 lib/Model/CatAllOf.php
@@ -95,8 +89,17 @@ lib/Model/EnumClass.php
 lib/Model/EnumTest.php
 lib/Model/File.php
 lib/Model/FileSchemaTestClass.php
+lib/Model/Foo.php
 lib/Model/FormatTest.php
 lib/Model/HasOnlyReadOnly.php
+lib/Model/HealthCheckResult.php
+lib/Model/InlineObject.php
+lib/Model/InlineObject1.php
+lib/Model/InlineObject2.php
+lib/Model/InlineObject3.php
+lib/Model/InlineObject4.php
+lib/Model/InlineObject5.php
+lib/Model/InlineResponseDefault.php
 lib/Model/MapTest.php
 lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
 lib/Model/Model200Response.php
@@ -104,17 +107,18 @@ lib/Model/ModelInterface.php
 lib/Model/ModelList.php
 lib/Model/ModelReturn.php
 lib/Model/Name.php
+lib/Model/NullableClass.php
 lib/Model/NumberOnly.php
 lib/Model/Order.php
 lib/Model/OuterComposite.php
 lib/Model/OuterEnum.php
+lib/Model/OuterEnumDefaultValue.php
+lib/Model/OuterEnumInteger.php
+lib/Model/OuterEnumIntegerDefaultValue.php
 lib/Model/Pet.php
 lib/Model/ReadOnlyFirst.php
 lib/Model/SpecialModelName.php
 lib/Model/Tag.php
-lib/Model/TypeHolderDefault.php
-lib/Model/TypeHolderExample.php
 lib/Model/User.php
-lib/Model/XmlItem.php
 lib/ObjectSerializer.php
 phpunit.xml.dist
diff --git a/samples/client/petstore/php/OpenAPIClient-php/.travis.yml b/samples/client/petstore/php/OpenAPIClient-php/.travis.yml
index cf85d27981a5..b4b1d0a6b5a6 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/.travis.yml
+++ b/samples/client/petstore/php/OpenAPIClient-php/.travis.yml
@@ -1,6 +1,10 @@
 language: php
+# Bionic environment has preinstalled PHP from 7.1 to 7.4
+# https://docs.travis-ci.com/user/reference/bionic/#php-support
+dist: bionic
 php:
-    - 7.1
     - 7.2
+    - 7.3
+    - 7.4
 before_install: "composer install"
 script: "vendor/bin/phpunit"
diff --git a/samples/client/petstore/php/OpenAPIClient-php/README.md b/samples/client/petstore/php/OpenAPIClient-php/README.md
index 6577b1eeb36a..4a8f02871582 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/README.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/README.md
@@ -9,7 +9,7 @@ This PHP package is automatically generated by the [OpenAPI Generator](https://o
 
 ## Requirements
 
-PHP 7.1 and later
+PHP 7.2 and later
 
 ## Installation & Usage
 
@@ -65,10 +65,10 @@ $apiInstance = new OpenAPI\Client\Api\AnotherFakeApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$body = new \OpenAPI\Client\Model\Client(); // \OpenAPI\Client\Model\Client | client model
+$client = new \OpenAPI\Client\Model\Client(); // \OpenAPI\Client\Model\Client | client model
 
 try {
-    $result = $apiInstance->call123TestSpecialTags($body);
+    $result = $apiInstance->call123TestSpecialTags($client);
     print_r($result);
 } catch (Exception $e) {
     echo 'Exception when calling AnotherFakeApi->call123TestSpecialTags: ', $e->getMessage(), PHP_EOL;
@@ -84,7 +84,9 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *AnotherFakeApi* | [**call123TestSpecialTags**](docs/Api/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
-*FakeApi* | [**createXmlItem**](docs/Api/FakeApi.md#createxmlitem) | **POST** /fake/create_xml_item | creates an XmlItem
+*DefaultApi* | [**fooGet**](docs/Api/DefaultApi.md#fooget) | **GET** /foo | 
+*FakeApi* | [**fakeHealthGet**](docs/Api/FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint
+*FakeApi* | [**fakeHttpSignatureTest**](docs/Api/FakeApi.md#fakehttpsignaturetest) | **GET** /fake/http-signature-test | test http signature authentication
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/Api/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/Api/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/Api/FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
@@ -92,7 +94,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**testBodyWithFileSchema**](docs/Api/FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/Api/FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/Api/FakeApi.md#testclientmodel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/Api/FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+*FakeApi* | [**testEndpointParameters**](docs/Api/FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
 *FakeApi* | [**testEnumParameters**](docs/Api/FakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
 *FakeApi* | [**testGroupParameters**](docs/Api/FakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 *FakeApi* | [**testInlineAdditionalProperties**](docs/Api/FakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
@@ -124,21 +126,12 @@ Class | Method | HTTP request | Description
 
 ## Documentation For Models
 
- - [AdditionalPropertiesAnyType](docs/Model/AdditionalPropertiesAnyType.md)
- - [AdditionalPropertiesArray](docs/Model/AdditionalPropertiesArray.md)
- - [AdditionalPropertiesBoolean](docs/Model/AdditionalPropertiesBoolean.md)
  - [AdditionalPropertiesClass](docs/Model/AdditionalPropertiesClass.md)
- - [AdditionalPropertiesInteger](docs/Model/AdditionalPropertiesInteger.md)
- - [AdditionalPropertiesNumber](docs/Model/AdditionalPropertiesNumber.md)
- - [AdditionalPropertiesObject](docs/Model/AdditionalPropertiesObject.md)
- - [AdditionalPropertiesString](docs/Model/AdditionalPropertiesString.md)
  - [Animal](docs/Model/Animal.md)
  - [ApiResponse](docs/Model/ApiResponse.md)
  - [ArrayOfArrayOfNumberOnly](docs/Model/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/Model/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/Model/ArrayTest.md)
- - [BigCat](docs/Model/BigCat.md)
- - [BigCatAllOf](docs/Model/BigCatAllOf.md)
  - [Capitalization](docs/Model/Capitalization.md)
  - [Cat](docs/Model/Cat.md)
  - [CatAllOf](docs/Model/CatAllOf.md)
@@ -152,26 +145,36 @@ Class | Method | HTTP request | Description
  - [EnumTest](docs/Model/EnumTest.md)
  - [File](docs/Model/File.md)
  - [FileSchemaTestClass](docs/Model/FileSchemaTestClass.md)
+ - [Foo](docs/Model/Foo.md)
  - [FormatTest](docs/Model/FormatTest.md)
  - [HasOnlyReadOnly](docs/Model/HasOnlyReadOnly.md)
+ - [HealthCheckResult](docs/Model/HealthCheckResult.md)
+ - [InlineObject](docs/Model/InlineObject.md)
+ - [InlineObject1](docs/Model/InlineObject1.md)
+ - [InlineObject2](docs/Model/InlineObject2.md)
+ - [InlineObject3](docs/Model/InlineObject3.md)
+ - [InlineObject4](docs/Model/InlineObject4.md)
+ - [InlineObject5](docs/Model/InlineObject5.md)
+ - [InlineResponseDefault](docs/Model/InlineResponseDefault.md)
  - [MapTest](docs/Model/MapTest.md)
  - [MixedPropertiesAndAdditionalPropertiesClass](docs/Model/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [Model200Response](docs/Model/Model200Response.md)
  - [ModelList](docs/Model/ModelList.md)
  - [ModelReturn](docs/Model/ModelReturn.md)
  - [Name](docs/Model/Name.md)
+ - [NullableClass](docs/Model/NullableClass.md)
  - [NumberOnly](docs/Model/NumberOnly.md)
  - [Order](docs/Model/Order.md)
  - [OuterComposite](docs/Model/OuterComposite.md)
  - [OuterEnum](docs/Model/OuterEnum.md)
+ - [OuterEnumDefaultValue](docs/Model/OuterEnumDefaultValue.md)
+ - [OuterEnumInteger](docs/Model/OuterEnumInteger.md)
+ - [OuterEnumIntegerDefaultValue](docs/Model/OuterEnumIntegerDefaultValue.md)
  - [Pet](docs/Model/Pet.md)
  - [ReadOnlyFirst](docs/Model/ReadOnlyFirst.md)
  - [SpecialModelName](docs/Model/SpecialModelName.md)
  - [Tag](docs/Model/Tag.md)
- - [TypeHolderDefault](docs/Model/TypeHolderDefault.md)
- - [TypeHolderExample](docs/Model/TypeHolderExample.md)
  - [User](docs/Model/User.md)
- - [XmlItem](docs/Model/XmlItem.md)
 
 
 ## Documentation For Authorization
@@ -198,6 +201,13 @@ Class | Method | HTTP request | Description
 
 
 
+## bearer_test
+
+
+- **Type**: Bearer authentication (JWT)
+
+
+
 ## http_basic_test
 
 
@@ -205,6 +215,11 @@ Class | Method | HTTP request | Description
 
 
 
+## http_signature_test
+
+
+
+
 ## petstore_auth
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/composer.json b/samples/client/petstore/php/OpenAPIClient-php/composer.json
index 4ca57f24d544..823e9f92a7b9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/composer.json
+++ b/samples/client/petstore/php/OpenAPIClient-php/composer.json
@@ -19,14 +19,14 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.2",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "guzzlehttp/guzzle": "^6.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.4",
+        "phpunit/phpunit": "^8.0 || ^9.0",
         "friendsofphp/php-cs-fixer": "^2.12"
     },
     "autoload": {
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/AnotherFakeApi.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/AnotherFakeApi.md
index 1667501c4652..1ff76b69457c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/AnotherFakeApi.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/AnotherFakeApi.md
@@ -10,7 +10,7 @@ Method | HTTP request | Description
 
 ## call123TestSpecialTags
 
-> \OpenAPI\Client\Model\Client call123TestSpecialTags($body)
+> \OpenAPI\Client\Model\Client call123TestSpecialTags($client)
 
 To test special tags
 
@@ -28,10 +28,10 @@ $apiInstance = new OpenAPI\Client\Api\AnotherFakeApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$body = new \OpenAPI\Client\Model\Client(); // \OpenAPI\Client\Model\Client | client model
+$client = new \OpenAPI\Client\Model\Client(); // \OpenAPI\Client\Model\Client | client model
 
 try {
-    $result = $apiInstance->call123TestSpecialTags($body);
+    $result = $apiInstance->call123TestSpecialTags($client);
     print_r($result);
 } catch (Exception $e) {
     echo 'Exception when calling AnotherFakeApi->call123TestSpecialTags: ', $e->getMessage(), PHP_EOL;
@@ -44,7 +44,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\OpenAPI\Client\Model\Client**](../Model/Client.md)| client model |
+ **client** | [**\OpenAPI\Client\Model\Client**](../Model/Client.md)| client model |
 
 ### Return type
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/DefaultApi.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/DefaultApi.md
index 6696bd33785f..eff99ef159d0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/DefaultApi.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/DefaultApi.md
@@ -7,16 +7,20 @@ Method | HTTP request | Description
 [**fooGet**](DefaultApi.md#fooGet) | **GET** /foo | 
 
 
-# **fooGet**
+
+## fooGet
+
 > \OpenAPI\Client\Model\InlineResponseDefault fooGet()
 
 
 
 ### Example
+
 ```php
 <?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
+
 $apiInstance = new OpenAPI\Client\Api\DefaultApi(
     // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
     // This is optional, `GuzzleHttp\Client` will be used as default.
@@ -33,6 +37,7 @@ try {
 ```
 
 ### Parameters
+
 This endpoint does not need any parameter.
 
 ### Return type
@@ -45,8 +50,10 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
- - **Accept**: application/json
+- **Content-Type**: Not defined
+- **Accept**: application/json
 
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../README.md#documentation-for-models) [[Back to README]](../../README.md)
+[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
+[[Back to Model list]](../../README.md#documentation-for-models)
+[[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md
index c3ae680eff5d..5046a502e194 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md
@@ -4,7 +4,8 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**createXmlItem**](FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
+[**fakeHealthGet**](FakeApi.md#fakeHealthGet) | **GET** /fake/health | Health check endpoint
+[**fakeHttpSignatureTest**](FakeApi.md#fakeHttpSignatureTest) | **GET** /fake/http-signature-test | test http signature authentication
 [**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
@@ -12,7 +13,7 @@ Method | HTTP request | Description
 [**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 [**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 [**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
 [**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
 [**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
 [**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
@@ -21,13 +22,11 @@ Method | HTTP request | Description
 
 
 
-## createXmlItem
+## fakeHealthGet
 
-> createXmlItem($xml_item)
+> \OpenAPI\Client\Model\HealthCheckResult fakeHealthGet()
 
-creates an XmlItem
-
-this route creates an XmlItem
+Health check endpoint
 
 ### Example
 
@@ -41,12 +40,67 @@ $apiInstance = new OpenAPI\Client\Api\FakeApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$xml_item = new \OpenAPI\Client\Model\XmlItem(); // \OpenAPI\Client\Model\XmlItem | XmlItem Body
 
 try {
-    $apiInstance->createXmlItem($xml_item);
+    $result = $apiInstance->fakeHealthGet();
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling FakeApi->fakeHealthGet: ', $e->getMessage(), PHP_EOL;
+}
+?>
+```
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+[**\OpenAPI\Client\Model\HealthCheckResult**](../Model/HealthCheckResult.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
+[[Back to Model list]](../../README.md#documentation-for-models)
+[[Back to README]](../../README.md)
+
+
+## fakeHttpSignatureTest
+
+> fakeHttpSignatureTest($pet, $query_1, $header_1)
+
+test http signature authentication
+
+### Example
+
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+
+
+
+$apiInstance = new OpenAPI\Client\Api\FakeApi(
+    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
+    // This is optional, `GuzzleHttp\Client` will be used as default.
+    new GuzzleHttp\Client(),
+    $config
+);
+$pet = new \OpenAPI\Client\Model\Pet(); // \OpenAPI\Client\Model\Pet | Pet object that needs to be added to the store
+$query_1 = 'query_1_example'; // string | query parameter
+$header_1 = 'header_1_example'; // string | header parameter
+
+try {
+    $apiInstance->fakeHttpSignatureTest($pet, $query_1, $header_1);
 } catch (Exception $e) {
-    echo 'Exception when calling FakeApi->createXmlItem: ', $e->getMessage(), PHP_EOL;
+    echo 'Exception when calling FakeApi->fakeHttpSignatureTest: ', $e->getMessage(), PHP_EOL;
 }
 ?>
 ```
@@ -56,7 +110,9 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **xml_item** | [**\OpenAPI\Client\Model\XmlItem**](../Model/XmlItem.md)| XmlItem Body |
+ **pet** | [**\OpenAPI\Client\Model\Pet**](../Model/Pet.md)| Pet object that needs to be added to the store |
+ **query_1** | **string**| query parameter | [optional]
+ **header_1** | **string**| header parameter | [optional]
 
 ### Return type
 
@@ -64,11 +120,11 @@ void (empty response body)
 
 ### Authorization
 
-No authorization required
+[http_signature_test](../../README.md#http_signature_test)
 
 ### HTTP request headers
 
-- **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
+- **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
 [[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
@@ -124,7 +180,7 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+- **Content-Type**: application/json
 - **Accept**: */*
 
 [[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
@@ -134,7 +190,7 @@ No authorization required
 
 ## fakeOuterCompositeSerialize
 
-> \OpenAPI\Client\Model\OuterComposite fakeOuterCompositeSerialize($body)
+> \OpenAPI\Client\Model\OuterComposite fakeOuterCompositeSerialize($outer_composite)
 
 
 
@@ -152,10 +208,10 @@ $apiInstance = new OpenAPI\Client\Api\FakeApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$body = new \OpenAPI\Client\Model\OuterComposite(); // \OpenAPI\Client\Model\OuterComposite | Input composite as post body
+$outer_composite = new \OpenAPI\Client\Model\OuterComposite(); // \OpenAPI\Client\Model\OuterComposite | Input composite as post body
 
 try {
-    $result = $apiInstance->fakeOuterCompositeSerialize($body);
+    $result = $apiInstance->fakeOuterCompositeSerialize($outer_composite);
     print_r($result);
 } catch (Exception $e) {
     echo 'Exception when calling FakeApi->fakeOuterCompositeSerialize: ', $e->getMessage(), PHP_EOL;
@@ -168,7 +224,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\OpenAPI\Client\Model\OuterComposite**](../Model/OuterComposite.md)| Input composite as post body | [optional]
+ **outer_composite** | [**\OpenAPI\Client\Model\OuterComposite**](../Model/OuterComposite.md)| Input composite as post body | [optional]
 
 ### Return type
 
@@ -180,7 +236,7 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+- **Content-Type**: application/json
 - **Accept**: */*
 
 [[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
@@ -236,7 +292,7 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+- **Content-Type**: application/json
 - **Accept**: */*
 
 [[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
@@ -292,7 +348,7 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+- **Content-Type**: application/json
 - **Accept**: */*
 
 [[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
@@ -302,7 +358,7 @@ No authorization required
 
 ## testBodyWithFileSchema
 
-> testBodyWithFileSchema($body)
+> testBodyWithFileSchema($file_schema_test_class)
 
 
 
@@ -320,10 +376,10 @@ $apiInstance = new OpenAPI\Client\Api\FakeApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$body = new \OpenAPI\Client\Model\FileSchemaTestClass(); // \OpenAPI\Client\Model\FileSchemaTestClass | 
+$file_schema_test_class = new \OpenAPI\Client\Model\FileSchemaTestClass(); // \OpenAPI\Client\Model\FileSchemaTestClass | 
 
 try {
-    $apiInstance->testBodyWithFileSchema($body);
+    $apiInstance->testBodyWithFileSchema($file_schema_test_class);
 } catch (Exception $e) {
     echo 'Exception when calling FakeApi->testBodyWithFileSchema: ', $e->getMessage(), PHP_EOL;
 }
@@ -335,7 +391,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\OpenAPI\Client\Model\FileSchemaTestClass**](../Model/FileSchemaTestClass.md)|  |
+ **file_schema_test_class** | [**\OpenAPI\Client\Model\FileSchemaTestClass**](../Model/FileSchemaTestClass.md)|  |
 
 ### Return type
 
@@ -357,7 +413,7 @@ No authorization required
 
 ## testBodyWithQueryParams
 
-> testBodyWithQueryParams($query, $body)
+> testBodyWithQueryParams($query, $user)
 
 
 
@@ -374,10 +430,10 @@ $apiInstance = new OpenAPI\Client\Api\FakeApi(
     new GuzzleHttp\Client()
 );
 $query = 'query_example'; // string | 
-$body = new \OpenAPI\Client\Model\User(); // \OpenAPI\Client\Model\User | 
+$user = new \OpenAPI\Client\Model\User(); // \OpenAPI\Client\Model\User | 
 
 try {
-    $apiInstance->testBodyWithQueryParams($query, $body);
+    $apiInstance->testBodyWithQueryParams($query, $user);
 } catch (Exception $e) {
     echo 'Exception when calling FakeApi->testBodyWithQueryParams: ', $e->getMessage(), PHP_EOL;
 }
@@ -390,7 +446,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **query** | **string**|  |
- **body** | [**\OpenAPI\Client\Model\User**](../Model/User.md)|  |
+ **user** | [**\OpenAPI\Client\Model\User**](../Model/User.md)|  |
 
 ### Return type
 
@@ -412,7 +468,7 @@ No authorization required
 
 ## testClientModel
 
-> \OpenAPI\Client\Model\Client testClientModel($body)
+> \OpenAPI\Client\Model\Client testClientModel($client)
 
 To test \"client\" model
 
@@ -430,10 +486,10 @@ $apiInstance = new OpenAPI\Client\Api\FakeApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$body = new \OpenAPI\Client\Model\Client(); // \OpenAPI\Client\Model\Client | client model
+$client = new \OpenAPI\Client\Model\Client(); // \OpenAPI\Client\Model\Client | client model
 
 try {
-    $result = $apiInstance->testClientModel($body);
+    $result = $apiInstance->testClientModel($client);
     print_r($result);
 } catch (Exception $e) {
     echo 'Exception when calling FakeApi->testClientModel: ', $e->getMessage(), PHP_EOL;
@@ -446,7 +502,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\OpenAPI\Client\Model\Client**](../Model/Client.md)| client model |
+ **client** | [**\OpenAPI\Client\Model\Client**](../Model/Client.md)| client model |
 
 ### Return type
 
@@ -470,9 +526,9 @@ No authorization required
 
 > testEndpointParameters($number, $double, $pattern_without_delimiter, $byte, $integer, $int32, $int64, $float, $string, $binary, $date, $date_time, $password, $callback)
 
-Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
 
-Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
 
 ### Example
 
@@ -638,10 +694,15 @@ Fake endpoint to test group parameters (optional)
 require_once(__DIR__ . '/vendor/autoload.php');
 
 
+// Configure Bearer (JWT) authorization: bearer_test
+$config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
+
+
 $apiInstance = new OpenAPI\Client\Api\FakeApi(
     // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
     // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
+    new GuzzleHttp\Client(),
+    $config
 );
 $associate_array['required_string_group'] = 56; // int | Required String in group parameters
 $associate_array['required_boolean_group'] = True; // bool | Required Boolean in group parameters
@@ -678,7 +739,7 @@ void (empty response body)
 
 ### Authorization
 
-No authorization required
+[bearer_test](../../README.md#bearer_test)
 
 ### HTTP request headers
 
@@ -692,7 +753,7 @@ No authorization required
 
 ## testInlineAdditionalProperties
 
-> testInlineAdditionalProperties($param)
+> testInlineAdditionalProperties($request_body)
 
 test inline additionalProperties
 
@@ -708,10 +769,10 @@ $apiInstance = new OpenAPI\Client\Api\FakeApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$param = array('key' => 'param_example'); // map[string,string] | request body
+$request_body = array('key' => 'request_body_example'); // map[string,string] | request body
 
 try {
-    $apiInstance->testInlineAdditionalProperties($param);
+    $apiInstance->testInlineAdditionalProperties($request_body);
 } catch (Exception $e) {
     echo 'Exception when calling FakeApi->testInlineAdditionalProperties: ', $e->getMessage(), PHP_EOL;
 }
@@ -723,7 +784,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **param** | [**map[string,string]**](../Model/string.md)| request body |
+ **request_body** | [**map[string,string]**](../Model/string.md)| request body |
 
 ### Return type
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeClassnameTags123Api.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeClassnameTags123Api.md
index 5a1316267b1f..3faeaf3043ae 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeClassnameTags123Api.md
@@ -10,7 +10,7 @@ Method | HTTP request | Description
 
 ## testClassname
 
-> \OpenAPI\Client\Model\Client testClassname($body)
+> \OpenAPI\Client\Model\Client testClassname($client)
 
 To test class name in snake case
 
@@ -35,10 +35,10 @@ $apiInstance = new OpenAPI\Client\Api\FakeClassnameTags123Api(
     new GuzzleHttp\Client(),
     $config
 );
-$body = new \OpenAPI\Client\Model\Client(); // \OpenAPI\Client\Model\Client | client model
+$client = new \OpenAPI\Client\Model\Client(); // \OpenAPI\Client\Model\Client | client model
 
 try {
-    $result = $apiInstance->testClassname($body);
+    $result = $apiInstance->testClassname($client);
     print_r($result);
 } catch (Exception $e) {
     echo 'Exception when calling FakeClassnameTags123Api->testClassname: ', $e->getMessage(), PHP_EOL;
@@ -51,7 +51,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\OpenAPI\Client\Model\Client**](../Model/Client.md)| client model |
+ **client** | [**\OpenAPI\Client\Model\Client**](../Model/Client.md)| client model |
 
 ### Return type
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/PetApi.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/PetApi.md
index 28f4103e52f3..d96e2f2fb9b0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/PetApi.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/PetApi.md
@@ -18,7 +18,7 @@ Method | HTTP request | Description
 
 ## addPet
 
-> addPet($body)
+> addPet($pet)
 
 Add a new pet to the store
 
@@ -39,10 +39,10 @@ $apiInstance = new OpenAPI\Client\Api\PetApi(
     new GuzzleHttp\Client(),
     $config
 );
-$body = new \OpenAPI\Client\Model\Pet(); // \OpenAPI\Client\Model\Pet | Pet object that needs to be added to the store
+$pet = new \OpenAPI\Client\Model\Pet(); // \OpenAPI\Client\Model\Pet | Pet object that needs to be added to the store
 
 try {
-    $apiInstance->addPet($body);
+    $apiInstance->addPet($pet);
 } catch (Exception $e) {
     echo 'Exception when calling PetApi->addPet: ', $e->getMessage(), PHP_EOL;
 }
@@ -54,7 +54,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\OpenAPI\Client\Model\Pet**](../Model/Pet.md)| Pet object that needs to be added to the store |
+ **pet** | [**\OpenAPI\Client\Model\Pet**](../Model/Pet.md)| Pet object that needs to be added to the store |
 
 ### Return type
 
@@ -321,7 +321,7 @@ Name | Type | Description  | Notes
 
 ## updatePet
 
-> updatePet($body)
+> updatePet($pet)
 
 Update an existing pet
 
@@ -342,10 +342,10 @@ $apiInstance = new OpenAPI\Client\Api\PetApi(
     new GuzzleHttp\Client(),
     $config
 );
-$body = new \OpenAPI\Client\Model\Pet(); // \OpenAPI\Client\Model\Pet | Pet object that needs to be added to the store
+$pet = new \OpenAPI\Client\Model\Pet(); // \OpenAPI\Client\Model\Pet | Pet object that needs to be added to the store
 
 try {
-    $apiInstance->updatePet($body);
+    $apiInstance->updatePet($pet);
 } catch (Exception $e) {
     echo 'Exception when calling PetApi->updatePet: ', $e->getMessage(), PHP_EOL;
 }
@@ -357,7 +357,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\OpenAPI\Client\Model\Pet**](../Model/Pet.md)| Pet object that needs to be added to the store |
+ **pet** | [**\OpenAPI\Client\Model\Pet**](../Model/Pet.md)| Pet object that needs to be added to the store |
 
 ### Return type
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/StoreApi.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/StoreApi.md
index 8643062bd21a..318f68c2c6a0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/StoreApi.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/StoreApi.md
@@ -183,7 +183,7 @@ No authorization required
 
 ## placeOrder
 
-> \OpenAPI\Client\Model\Order placeOrder($body)
+> \OpenAPI\Client\Model\Order placeOrder($order)
 
 Place an order for a pet
 
@@ -199,10 +199,10 @@ $apiInstance = new OpenAPI\Client\Api\StoreApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$body = new \OpenAPI\Client\Model\Order(); // \OpenAPI\Client\Model\Order | order placed for purchasing the pet
+$order = new \OpenAPI\Client\Model\Order(); // \OpenAPI\Client\Model\Order | order placed for purchasing the pet
 
 try {
-    $result = $apiInstance->placeOrder($body);
+    $result = $apiInstance->placeOrder($order);
     print_r($result);
 } catch (Exception $e) {
     echo 'Exception when calling StoreApi->placeOrder: ', $e->getMessage(), PHP_EOL;
@@ -215,7 +215,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\OpenAPI\Client\Model\Order**](../Model/Order.md)| order placed for purchasing the pet |
+ **order** | [**\OpenAPI\Client\Model\Order**](../Model/Order.md)| order placed for purchasing the pet |
 
 ### Return type
 
@@ -227,7 +227,7 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+- **Content-Type**: application/json
 - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/UserApi.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/UserApi.md
index 7cb382f9c179..0784a1645181 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/UserApi.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/UserApi.md
@@ -17,7 +17,7 @@ Method | HTTP request | Description
 
 ## createUser
 
-> createUser($body)
+> createUser($user)
 
 Create user
 
@@ -35,10 +35,10 @@ $apiInstance = new OpenAPI\Client\Api\UserApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$body = new \OpenAPI\Client\Model\User(); // \OpenAPI\Client\Model\User | Created user object
+$user = new \OpenAPI\Client\Model\User(); // \OpenAPI\Client\Model\User | Created user object
 
 try {
-    $apiInstance->createUser($body);
+    $apiInstance->createUser($user);
 } catch (Exception $e) {
     echo 'Exception when calling UserApi->createUser: ', $e->getMessage(), PHP_EOL;
 }
@@ -50,7 +50,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\OpenAPI\Client\Model\User**](../Model/User.md)| Created user object |
+ **user** | [**\OpenAPI\Client\Model\User**](../Model/User.md)| Created user object |
 
 ### Return type
 
@@ -62,7 +62,7 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+- **Content-Type**: application/json
 - **Accept**: Not defined
 
 [[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
@@ -72,7 +72,7 @@ No authorization required
 
 ## createUsersWithArrayInput
 
-> createUsersWithArrayInput($body)
+> createUsersWithArrayInput($user)
 
 Creates list of users with given input array
 
@@ -88,10 +88,10 @@ $apiInstance = new OpenAPI\Client\Api\UserApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$body = array(new \OpenAPI\Client\Model\User()); // \OpenAPI\Client\Model\User[] | List of user object
+$user = array(new \OpenAPI\Client\Model\User()); // \OpenAPI\Client\Model\User[] | List of user object
 
 try {
-    $apiInstance->createUsersWithArrayInput($body);
+    $apiInstance->createUsersWithArrayInput($user);
 } catch (Exception $e) {
     echo 'Exception when calling UserApi->createUsersWithArrayInput: ', $e->getMessage(), PHP_EOL;
 }
@@ -103,7 +103,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\OpenAPI\Client\Model\User[]**](../Model/User.md)| List of user object |
+ **user** | [**\OpenAPI\Client\Model\User[]**](../Model/User.md)| List of user object |
 
 ### Return type
 
@@ -115,7 +115,7 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+- **Content-Type**: application/json
 - **Accept**: Not defined
 
 [[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
@@ -125,7 +125,7 @@ No authorization required
 
 ## createUsersWithListInput
 
-> createUsersWithListInput($body)
+> createUsersWithListInput($user)
 
 Creates list of users with given input array
 
@@ -141,10 +141,10 @@ $apiInstance = new OpenAPI\Client\Api\UserApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$body = array(new \OpenAPI\Client\Model\User()); // \OpenAPI\Client\Model\User[] | List of user object
+$user = array(new \OpenAPI\Client\Model\User()); // \OpenAPI\Client\Model\User[] | List of user object
 
 try {
-    $apiInstance->createUsersWithListInput($body);
+    $apiInstance->createUsersWithListInput($user);
 } catch (Exception $e) {
     echo 'Exception when calling UserApi->createUsersWithListInput: ', $e->getMessage(), PHP_EOL;
 }
@@ -156,7 +156,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\OpenAPI\Client\Model\User[]**](../Model/User.md)| List of user object |
+ **user** | [**\OpenAPI\Client\Model\User[]**](../Model/User.md)| List of user object |
 
 ### Return type
 
@@ -168,7 +168,7 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+- **Content-Type**: application/json
 - **Accept**: Not defined
 
 [[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
@@ -392,7 +392,7 @@ No authorization required
 
 ## updateUser
 
-> updateUser($username, $body)
+> updateUser($username, $user)
 
 Updated user
 
@@ -411,10 +411,10 @@ $apiInstance = new OpenAPI\Client\Api\UserApi(
     new GuzzleHttp\Client()
 );
 $username = 'username_example'; // string | name that need to be deleted
-$body = new \OpenAPI\Client\Model\User(); // \OpenAPI\Client\Model\User | Updated user object
+$user = new \OpenAPI\Client\Model\User(); // \OpenAPI\Client\Model\User | Updated user object
 
 try {
-    $apiInstance->updateUser($username, $body);
+    $apiInstance->updateUser($username, $user);
 } catch (Exception $e) {
     echo 'Exception when calling UserApi->updateUser: ', $e->getMessage(), PHP_EOL;
 }
@@ -427,7 +427,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **string**| name that need to be deleted |
- **body** | [**\OpenAPI\Client\Model\User**](../Model/User.md)| Updated user object |
+ **user** | [**\OpenAPI\Client\Model\User**](../Model/User.md)| Updated user object |
 
 ### Return type
 
@@ -439,7 +439,7 @@ No authorization required
 
 ### HTTP request headers
 
-- **Content-Type**: Not defined
+- **Content-Type**: application/json
 - **Accept**: Not defined
 
 [[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AdditionalPropertiesClass.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AdditionalPropertiesClass.md
index fc9b2c66e81a..8c2be69f6945 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AdditionalPropertiesClass.md
@@ -4,17 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**map_string** | **map[string,string]** |  | [optional] 
-**map_number** | **map[string,float]** |  | [optional] 
-**map_integer** | **map[string,int]** |  | [optional] 
-**map_boolean** | **map[string,bool]** |  | [optional] 
-**map_array_integer** | [**map[string,int[]]**](array.md) |  | [optional] 
-**map_array_anytype** | [**map[string,object[]]**](array.md) |  | [optional] 
-**map_map_string** | [**map[string,map[string,string]]**](map.md) |  | [optional] 
-**map_map_anytype** | [**map[string,map[string,object]]**](map.md) |  | [optional] 
-**anytype_1** | **object** |  | [optional] 
-**anytype_2** | **object** |  | [optional] 
-**anytype_3** | **object** |  | [optional] 
+**map_property** | **map[string,string]** |  | [optional] 
+**map_of_map_property** | [**map[string,map[string,string]]**](map.md) |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/EnumTest.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/EnumTest.md
index 5656aa6170c8..9a1ffa8a7e38 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/EnumTest.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/EnumTest.md
@@ -9,6 +9,9 @@ Name | Type | Description | Notes
 **enum_integer** | **int** |  | [optional] 
 **enum_number** | **double** |  | [optional] 
 **outer_enum** | [**\OpenAPI\Client\Model\OuterEnum**](OuterEnum.md) |  | [optional] 
+**outer_enum_integer** | [**\OpenAPI\Client\Model\OuterEnumInteger**](OuterEnumInteger.md) |  | [optional] 
+**outer_enum_default_value** | [**\OpenAPI\Client\Model\OuterEnumDefaultValue**](OuterEnumDefaultValue.md) |  | [optional] 
+**outer_enum_integer_default_value** | [**\OpenAPI\Client\Model\OuterEnumIntegerDefaultValue**](OuterEnumIntegerDefaultValue.md) |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/Foo.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/Foo.md
index ee5ddff7206b..9acc83cb6fa6 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/Foo.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/Foo.md
@@ -1,10 +1,11 @@
-# Foo
+# # Foo
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **bar** | **string** |  | [optional] [default to 'bar']
 
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/FormatTest.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/FormatTest.md
index 263f5b985cb7..b0b8785234a1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/FormatTest.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/FormatTest.md
@@ -17,7 +17,8 @@ Name | Type | Description | Notes
 **date_time** | [**\DateTime**](\DateTime.md) |  | [optional] 
 **uuid** | **string** |  | [optional] 
 **password** | **string** |  | 
-**big_decimal** | [**BigDecimal**](BigDecimal.md) |  | [optional] 
+**pattern_with_digits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] 
+**pattern_with_digits_and_delimiter** | **string** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/HealthCheckResult.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/HealthCheckResult.md
similarity index 100%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/HealthCheckResult.md
rename to samples/client/petstore/php/OpenAPIClient-php/docs/Model/HealthCheckResult.md
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject.md
index 101275879be3..b21b3c6d8877 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject.md
@@ -1,11 +1,12 @@
-# InlineObject
+# # InlineObject
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **string** | Updated name of the pet | [optional] 
 **status** | **string** | Updated status of the pet | [optional] 
 
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject1.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject1.md
index dc428e8ea6c5..25eb866417bc 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject1.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject1.md
@@ -1,11 +1,12 @@
-# InlineObject1
+# # InlineObject1
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **additional_metadata** | **string** | Additional data to pass to server | [optional] 
 **file** | [**\SplFileObject**](\SplFileObject.md) | file to upload | [optional] 
 
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject2.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject2.md
index 7e2ee7c9570c..a862611a011c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject2.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject2.md
@@ -1,11 +1,12 @@
-# InlineObject2
+# # InlineObject2
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **enum_form_string_array** | **string[]** | Form parameter enum test (string array) | [optional] 
 **enum_form_string** | **string** | Form parameter enum test (string) | [optional] [default to '-efg']
 
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject3.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject3.md
index cef75b28262b..8cd0a80c044c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject3.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject3.md
@@ -1,6 +1,7 @@
-# InlineObject3
+# # InlineObject3
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **integer** | **int** | None | [optional] 
@@ -18,6 +19,6 @@ Name | Type | Description | Notes
 **password** | **string** | None | [optional] 
 **callback** | **string** | None | [optional] 
 
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject4.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject4.md
index 6675b7f47ce7..6a940e80aca1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject4.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject4.md
@@ -1,11 +1,12 @@
-# InlineObject4
+# # InlineObject4
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **param** | **string** | field1 | 
 **param2** | **string** | field2 | 
 
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject5.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject5.md
index d1d27f7cc65f..240eb36860c6 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject5.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject5.md
@@ -1,11 +1,12 @@
-# InlineObject5
+# # InlineObject5
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **additional_metadata** | **string** | Additional data to pass to server | [optional] 
 **required_file** | [**\SplFileObject**](\SplFileObject.md) | file to upload | 
 
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineResponseDefault.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineResponseDefault.md
index 9f25c169f64e..a00c32479623 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineResponseDefault.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/InlineResponseDefault.md
@@ -1,10 +1,11 @@
-# InlineResponseDefault
+# # InlineResponseDefault
 
 ## Properties
+
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **string** | [**\OpenAPI\Client\Model\Foo**](Foo.md) |  | [optional] 
 
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/NullableClass.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/NullableClass.md
similarity index 100%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/NullableClass.md
rename to samples/client/petstore/php/OpenAPIClient-php/docs/Model/NullableClass.md
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumDefaultValue.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumDefaultValue.md
similarity index 100%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumDefaultValue.md
rename to samples/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumDefaultValue.md
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumInteger.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumInteger.md
similarity index 100%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumInteger.md
rename to samples/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumInteger.md
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumIntegerDefaultValue.md
similarity index 100%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumIntegerDefaultValue.md
rename to samples/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumIntegerDefaultValue.md
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
index 044d9f2b6270..ecceb4cdc12a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AnotherFakeApi
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -120,15 +120,15 @@ public function getConfig()
      *
      * To test special tags
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return \OpenAPI\Client\Model\Client
      */
-    public function call123TestSpecialTags($body)
+    public function call123TestSpecialTags($client)
     {
-        list($response) = $this->call123TestSpecialTagsWithHttpInfo($body);
+        list($response) = $this->call123TestSpecialTagsWithHttpInfo($client);
         return $response;
     }
 
@@ -137,15 +137,15 @@ public function call123TestSpecialTags($body)
      *
      * To test special tags
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of \OpenAPI\Client\Model\Client, HTTP status code, HTTP response headers (array of strings)
      */
-    public function call123TestSpecialTagsWithHttpInfo($body)
+    public function call123TestSpecialTagsWithHttpInfo($client)
     {
-        $request = $this->call123TestSpecialTagsRequest($body);
+        $request = $this->call123TestSpecialTagsRequest($client);
 
         try {
             $options = $this->createHttpClientOption();
@@ -225,14 +225,14 @@ public function call123TestSpecialTagsWithHttpInfo($body)
      *
      * To test special tags
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function call123TestSpecialTagsAsync($body)
+    public function call123TestSpecialTagsAsync($client)
     {
-        return $this->call123TestSpecialTagsAsyncWithHttpInfo($body)
+        return $this->call123TestSpecialTagsAsyncWithHttpInfo($client)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -245,15 +245,15 @@ function ($response) {
      *
      * To test special tags
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function call123TestSpecialTagsAsyncWithHttpInfo($body)
+    public function call123TestSpecialTagsAsyncWithHttpInfo($client)
     {
         $returnType = '\OpenAPI\Client\Model\Client';
-        $request = $this->call123TestSpecialTagsRequest($body);
+        $request = $this->call123TestSpecialTagsRequest($client);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -292,17 +292,17 @@ function ($exception) {
     /**
      * Create request for operation 'call123TestSpecialTags'
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function call123TestSpecialTagsRequest($body)
+    protected function call123TestSpecialTagsRequest($client)
     {
-        // verify the required parameter 'body' is set
-        if ($body === null || (is_array($body) && count($body) === 0)) {
+        // verify the required parameter 'client' is set
+        if ($client === null || (is_array($client) && count($client) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $body when calling call123TestSpecialTags'
+                'Missing the required parameter $client when calling call123TestSpecialTags'
             );
         }
 
@@ -318,8 +318,8 @@ protected function call123TestSpecialTagsRequest($body)
 
         // body params
         $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
+        if (isset($client)) {
+            $_tempBody = $client;
         }
 
         if ($multipart) {
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
index 96f465d3cb12..04841a98d9d9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DefaultApi
- * PHP version 5
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -14,10 +14,10 @@
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 4.0.0-SNAPSHOT
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
  */
 
 /**
@@ -64,19 +64,47 @@ class DefaultApi
      */
     protected $headerSelector;
 
+    /**
+     * @var int Host index
+     */
+    protected $hostIndex;
+
     /**
      * @param ClientInterface $client
      * @param Configuration   $config
      * @param HeaderSelector  $selector
+     * @param int             $host_index (Optional) host index to select the list of hosts if defined in the OpenAPI spec
      */
     public function __construct(
         ClientInterface $client = null,
         Configuration $config = null,
-        HeaderSelector $selector = null
+        HeaderSelector $selector = null,
+        $host_index = 0
     ) {
         $this->client = $client ?: new Client();
         $this->config = $config ?: new Configuration();
         $this->headerSelector = $selector ?: new HeaderSelector();
+        $this->hostIndex = $host_index;
+    }
+
+    /**
+     * Set the host index
+     *
+     * @param  int Host index (required)
+     */
+    public function setHostIndex($host_index)
+    {
+        $this->hostIndex = $host_index;
+    }
+
+    /**
+     * Get the host index
+     *
+     * @return Host index
+     */
+    public function getHostIndex()
+    {
+        return $this->hostIndex;
     }
 
     /**
@@ -122,7 +150,7 @@ public function fooGetWithHttpInfo()
                     "[{$e->getCode()}] {$e->getMessage()}",
                     $e->getCode(),
                     $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? $e->getResponse()->getBody()->getContents() : null
+                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
                 );
             }
 
@@ -147,7 +175,7 @@ public function fooGetWithHttpInfo()
                     if ('\OpenAPI\Client\Model\InlineResponseDefault' === '\SplFileObject') {
                         $content = $responseBody; //stream goes to serializer
                     } else {
-                        $content = $responseBody->getContents();
+                        $content = (string) $responseBody;
                     }
 
                     return [
@@ -162,7 +190,7 @@ public function fooGetWithHttpInfo()
             if ($returnType === '\SplFileObject') {
                 $content = $responseBody; //stream goes to serializer
             } else {
-                $content = $responseBody->getContents();
+                $content = (string) $responseBody;
             }
 
             return [
@@ -227,7 +255,7 @@ function ($response) use ($returnType) {
                     if ($returnType === '\SplFileObject') {
                         $content = $responseBody; //stream goes to serializer
                     } else {
-                        $content = $responseBody->getContents();
+                        $content = (string) $responseBody;
                     }
 
                     return [
@@ -272,6 +300,7 @@ protected function fooGetRequest()
 
 
 
+
         // body params
         $_tempBody = null;
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
index 50f5ecbf57dc..5c6d9819d6d9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FakeApi
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -116,35 +116,293 @@ public function getConfig()
     }
 
     /**
-     * Operation createXmlItem
+     * Operation fakeHealthGet
      *
-     * creates an XmlItem
+     * Health check endpoint
      *
-     * @param  \OpenAPI\Client\Model\XmlItem $xml_item XmlItem Body (required)
+     *
+     * @throws \OpenAPI\Client\ApiException on non-2xx response
+     * @throws \InvalidArgumentException
+     * @return \OpenAPI\Client\Model\HealthCheckResult
+     */
+    public function fakeHealthGet()
+    {
+        list($response) = $this->fakeHealthGetWithHttpInfo();
+        return $response;
+    }
+
+    /**
+     * Operation fakeHealthGetWithHttpInfo
+     *
+     * Health check endpoint
+     *
+     *
+     * @throws \OpenAPI\Client\ApiException on non-2xx response
+     * @throws \InvalidArgumentException
+     * @return array of \OpenAPI\Client\Model\HealthCheckResult, HTTP status code, HTTP response headers (array of strings)
+     */
+    public function fakeHealthGetWithHttpInfo()
+    {
+        $request = $this->fakeHealthGetRequest();
+
+        try {
+            $options = $this->createHttpClientOption();
+            try {
+                $response = $this->client->send($request, $options);
+            } catch (RequestException $e) {
+                throw new ApiException(
+                    "[{$e->getCode()}] {$e->getMessage()}",
+                    $e->getCode(),
+                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
+                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
+                );
+            }
+
+            $statusCode = $response->getStatusCode();
+
+            if ($statusCode < 200 || $statusCode > 299) {
+                throw new ApiException(
+                    sprintf(
+                        '[%d] Error connecting to the API (%s)',
+                        $statusCode,
+                        $request->getUri()
+                    ),
+                    $statusCode,
+                    $response->getHeaders(),
+                    $response->getBody()
+                );
+            }
+
+            $responseBody = $response->getBody();
+            switch($statusCode) {
+                case 200:
+                    if ('\OpenAPI\Client\Model\HealthCheckResult' === '\SplFileObject') {
+                        $content = $responseBody; //stream goes to serializer
+                    } else {
+                        $content = (string) $responseBody;
+                    }
+
+                    return [
+                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\HealthCheckResult', []),
+                        $response->getStatusCode(),
+                        $response->getHeaders()
+                    ];
+            }
+
+            $returnType = '\OpenAPI\Client\Model\HealthCheckResult';
+            $responseBody = $response->getBody();
+            if ($returnType === '\SplFileObject') {
+                $content = $responseBody; //stream goes to serializer
+            } else {
+                $content = (string) $responseBody;
+            }
+
+            return [
+                ObjectSerializer::deserialize($content, $returnType, []),
+                $response->getStatusCode(),
+                $response->getHeaders()
+            ];
+
+        } catch (ApiException $e) {
+            switch ($e->getCode()) {
+                case 200:
+                    $data = ObjectSerializer::deserialize(
+                        $e->getResponseBody(),
+                        '\OpenAPI\Client\Model\HealthCheckResult',
+                        $e->getResponseHeaders()
+                    );
+                    $e->setResponseObject($data);
+                    break;
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Operation fakeHealthGetAsync
+     *
+     * Health check endpoint
+     *
+     *
+     * @throws \InvalidArgumentException
+     * @return \GuzzleHttp\Promise\PromiseInterface
+     */
+    public function fakeHealthGetAsync()
+    {
+        return $this->fakeHealthGetAsyncWithHttpInfo()
+            ->then(
+                function ($response) {
+                    return $response[0];
+                }
+            );
+    }
+
+    /**
+     * Operation fakeHealthGetAsyncWithHttpInfo
+     *
+     * Health check endpoint
+     *
+     *
+     * @throws \InvalidArgumentException
+     * @return \GuzzleHttp\Promise\PromiseInterface
+     */
+    public function fakeHealthGetAsyncWithHttpInfo()
+    {
+        $returnType = '\OpenAPI\Client\Model\HealthCheckResult';
+        $request = $this->fakeHealthGetRequest();
+
+        return $this->client
+            ->sendAsync($request, $this->createHttpClientOption())
+            ->then(
+                function ($response) use ($returnType) {
+                    $responseBody = $response->getBody();
+                    if ($returnType === '\SplFileObject') {
+                        $content = $responseBody; //stream goes to serializer
+                    } else {
+                        $content = (string) $responseBody;
+                    }
+
+                    return [
+                        ObjectSerializer::deserialize($content, $returnType, []),
+                        $response->getStatusCode(),
+                        $response->getHeaders()
+                    ];
+                },
+                function ($exception) {
+                    $response = $exception->getResponse();
+                    $statusCode = $response->getStatusCode();
+                    throw new ApiException(
+                        sprintf(
+                            '[%d] Error connecting to the API (%s)',
+                            $statusCode,
+                            $exception->getRequest()->getUri()
+                        ),
+                        $statusCode,
+                        $response->getHeaders(),
+                        $response->getBody()
+                    );
+                }
+            );
+    }
+
+    /**
+     * Create request for operation 'fakeHealthGet'
+     *
+     *
+     * @throws \InvalidArgumentException
+     * @return \GuzzleHttp\Psr7\Request
+     */
+    protected function fakeHealthGetRequest()
+    {
+
+        $resourcePath = '/fake/health';
+        $formParams = [];
+        $queryParams = [];
+        $headerParams = [];
+        $httpBody = '';
+        $multipart = false;
+
+
+
+
+        // body params
+        $_tempBody = null;
+
+        if ($multipart) {
+            $headers = $this->headerSelector->selectHeadersForMultipart(
+                ['application/json']
+            );
+        } else {
+            $headers = $this->headerSelector->selectHeaders(
+                ['application/json'],
+                []
+            );
+        }
+
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            // $_tempBody is the method argument, if present
+            if ($headers['Content-Type'] === 'application/json') {
+                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
+            } else {
+                $httpBody = $_tempBody;
+            }
+        } elseif (count($formParams) > 0) {
+            if ($multipart) {
+                $multipartContents = [];
+                foreach ($formParams as $formParamName => $formParamValue) {
+                    $multipartContents[] = [
+                        'name' => $formParamName,
+                        'contents' => $formParamValue
+                    ];
+                }
+                // for HTTP post (form)
+                $httpBody = new MultipartStream($multipartContents);
+
+            } elseif ($headers['Content-Type'] === 'application/json') {
+                $httpBody = \GuzzleHttp\json_encode($formParams);
+
+            } else {
+                // for HTTP post (form)
+                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
+            }
+        }
+
+
+        $defaultHeaders = [];
+        if ($this->config->getUserAgent()) {
+            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
+        }
+
+        $headers = array_merge(
+            $defaultHeaders,
+            $headerParams,
+            $headers
+        );
+
+        $query = \GuzzleHttp\Psr7\build_query($queryParams);
+        return new Request(
+            'GET',
+            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
+            $headers,
+            $httpBody
+        );
+    }
+
+    /**
+     * Operation fakeHttpSignatureTest
+     *
+     * test http signature authentication
+     *
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
+     * @param  string $query_1 query parameter (optional)
+     * @param  string $header_1 header parameter (optional)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return void
      */
-    public function createXmlItem($xml_item)
+    public function fakeHttpSignatureTest($pet, $query_1 = null, $header_1 = null)
     {
-        $this->createXmlItemWithHttpInfo($xml_item);
+        $this->fakeHttpSignatureTestWithHttpInfo($pet, $query_1, $header_1);
     }
 
     /**
-     * Operation createXmlItemWithHttpInfo
+     * Operation fakeHttpSignatureTestWithHttpInfo
      *
-     * creates an XmlItem
+     * test http signature authentication
      *
-     * @param  \OpenAPI\Client\Model\XmlItem $xml_item XmlItem Body (required)
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
+     * @param  string $query_1 query parameter (optional)
+     * @param  string $header_1 header parameter (optional)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of null, HTTP status code, HTTP response headers (array of strings)
      */
-    public function createXmlItemWithHttpInfo($xml_item)
+    public function fakeHttpSignatureTestWithHttpInfo($pet, $query_1 = null, $header_1 = null)
     {
-        $request = $this->createXmlItemRequest($xml_item);
+        $request = $this->fakeHttpSignatureTestRequest($pet, $query_1, $header_1);
 
         try {
             $options = $this->createHttpClientOption();
@@ -184,18 +442,20 @@ public function createXmlItemWithHttpInfo($xml_item)
     }
 
     /**
-     * Operation createXmlItemAsync
+     * Operation fakeHttpSignatureTestAsync
      *
-     * creates an XmlItem
+     * test http signature authentication
      *
-     * @param  \OpenAPI\Client\Model\XmlItem $xml_item XmlItem Body (required)
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
+     * @param  string $query_1 query parameter (optional)
+     * @param  string $header_1 header parameter (optional)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function createXmlItemAsync($xml_item)
+    public function fakeHttpSignatureTestAsync($pet, $query_1 = null, $header_1 = null)
     {
-        return $this->createXmlItemAsyncWithHttpInfo($xml_item)
+        return $this->fakeHttpSignatureTestAsyncWithHttpInfo($pet, $query_1, $header_1)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -204,19 +464,21 @@ function ($response) {
     }
 
     /**
-     * Operation createXmlItemAsyncWithHttpInfo
+     * Operation fakeHttpSignatureTestAsyncWithHttpInfo
      *
-     * creates an XmlItem
+     * test http signature authentication
      *
-     * @param  \OpenAPI\Client\Model\XmlItem $xml_item XmlItem Body (required)
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
+     * @param  string $query_1 query parameter (optional)
+     * @param  string $header_1 header parameter (optional)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function createXmlItemAsyncWithHttpInfo($xml_item)
+    public function fakeHttpSignatureTestAsyncWithHttpInfo($pet, $query_1 = null, $header_1 = null)
     {
         $returnType = '';
-        $request = $this->createXmlItemRequest($xml_item);
+        $request = $this->fakeHttpSignatureTestRequest($pet, $query_1, $header_1);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -242,36 +504,53 @@ function ($exception) {
     }
 
     /**
-     * Create request for operation 'createXmlItem'
+     * Create request for operation 'fakeHttpSignatureTest'
      *
-     * @param  \OpenAPI\Client\Model\XmlItem $xml_item XmlItem Body (required)
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
+     * @param  string $query_1 query parameter (optional)
+     * @param  string $header_1 header parameter (optional)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function createXmlItemRequest($xml_item)
+    protected function fakeHttpSignatureTestRequest($pet, $query_1 = null, $header_1 = null)
     {
-        // verify the required parameter 'xml_item' is set
-        if ($xml_item === null || (is_array($xml_item) && count($xml_item) === 0)) {
+        // verify the required parameter 'pet' is set
+        if ($pet === null || (is_array($pet) && count($pet) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $xml_item when calling createXmlItem'
+                'Missing the required parameter $pet when calling fakeHttpSignatureTest'
             );
         }
 
-        $resourcePath = '/fake/create_xml_item';
+        $resourcePath = '/fake/http-signature-test';
         $formParams = [];
         $queryParams = [];
         $headerParams = [];
         $httpBody = '';
         $multipart = false;
 
+        // query params
+        if ($query_1 !== null) {
+            if('form' === 'form' && is_array($query_1)) {
+                foreach($query_1 as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['query_1'] = $query_1;
+            }
+        }
 
+        // header params
+        if ($header_1 !== null) {
+            $headerParams['header_1'] = ObjectSerializer::toHeaderValue($header_1);
+        }
 
 
         // body params
         $_tempBody = null;
-        if (isset($xml_item)) {
-            $_tempBody = $xml_item;
+        if (isset($pet)) {
+            $_tempBody = $pet;
         }
 
         if ($multipart) {
@@ -281,7 +560,7 @@ protected function createXmlItemRequest($xml_item)
         } else {
             $headers = $this->headerSelector->selectHeaders(
                 [],
-                ['application/xml', 'application/xml; charset=utf-8', 'application/xml; charset=utf-16', 'text/xml', 'text/xml; charset=utf-8', 'text/xml; charset=utf-16']
+                ['application/json', 'application/xml']
             );
         }
 
@@ -328,7 +607,7 @@ protected function createXmlItemRequest($xml_item)
 
         $query = \GuzzleHttp\Psr7\build_query($queryParams);
         return new Request(
-            'POST',
+            'GET',
             $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
             $headers,
             $httpBody
@@ -539,7 +818,7 @@ protected function fakeOuterBooleanSerializeRequest($body = null)
         } else {
             $headers = $this->headerSelector->selectHeaders(
                 ['*/*'],
-                []
+                ['application/json']
             );
         }
 
@@ -596,30 +875,30 @@ protected function fakeOuterBooleanSerializeRequest($body = null)
     /**
      * Operation fakeOuterCompositeSerialize
      *
-     * @param  \OpenAPI\Client\Model\OuterComposite $body Input composite as post body (optional)
+     * @param  \OpenAPI\Client\Model\OuterComposite $outer_composite Input composite as post body (optional)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return \OpenAPI\Client\Model\OuterComposite
      */
-    public function fakeOuterCompositeSerialize($body = null)
+    public function fakeOuterCompositeSerialize($outer_composite = null)
     {
-        list($response) = $this->fakeOuterCompositeSerializeWithHttpInfo($body);
+        list($response) = $this->fakeOuterCompositeSerializeWithHttpInfo($outer_composite);
         return $response;
     }
 
     /**
      * Operation fakeOuterCompositeSerializeWithHttpInfo
      *
-     * @param  \OpenAPI\Client\Model\OuterComposite $body Input composite as post body (optional)
+     * @param  \OpenAPI\Client\Model\OuterComposite $outer_composite Input composite as post body (optional)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of \OpenAPI\Client\Model\OuterComposite, HTTP status code, HTTP response headers (array of strings)
      */
-    public function fakeOuterCompositeSerializeWithHttpInfo($body = null)
+    public function fakeOuterCompositeSerializeWithHttpInfo($outer_composite = null)
     {
-        $request = $this->fakeOuterCompositeSerializeRequest($body);
+        $request = $this->fakeOuterCompositeSerializeRequest($outer_composite);
 
         try {
             $options = $this->createHttpClientOption();
@@ -699,14 +978,14 @@ public function fakeOuterCompositeSerializeWithHttpInfo($body = null)
      *
      * 
      *
-     * @param  \OpenAPI\Client\Model\OuterComposite $body Input composite as post body (optional)
+     * @param  \OpenAPI\Client\Model\OuterComposite $outer_composite Input composite as post body (optional)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function fakeOuterCompositeSerializeAsync($body = null)
+    public function fakeOuterCompositeSerializeAsync($outer_composite = null)
     {
-        return $this->fakeOuterCompositeSerializeAsyncWithHttpInfo($body)
+        return $this->fakeOuterCompositeSerializeAsyncWithHttpInfo($outer_composite)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -719,15 +998,15 @@ function ($response) {
      *
      * 
      *
-     * @param  \OpenAPI\Client\Model\OuterComposite $body Input composite as post body (optional)
+     * @param  \OpenAPI\Client\Model\OuterComposite $outer_composite Input composite as post body (optional)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function fakeOuterCompositeSerializeAsyncWithHttpInfo($body = null)
+    public function fakeOuterCompositeSerializeAsyncWithHttpInfo($outer_composite = null)
     {
         $returnType = '\OpenAPI\Client\Model\OuterComposite';
-        $request = $this->fakeOuterCompositeSerializeRequest($body);
+        $request = $this->fakeOuterCompositeSerializeRequest($outer_composite);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -766,12 +1045,12 @@ function ($exception) {
     /**
      * Create request for operation 'fakeOuterCompositeSerialize'
      *
-     * @param  \OpenAPI\Client\Model\OuterComposite $body Input composite as post body (optional)
+     * @param  \OpenAPI\Client\Model\OuterComposite $outer_composite Input composite as post body (optional)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function fakeOuterCompositeSerializeRequest($body = null)
+    protected function fakeOuterCompositeSerializeRequest($outer_composite = null)
     {
 
         $resourcePath = '/fake/outer/composite';
@@ -786,8 +1065,8 @@ protected function fakeOuterCompositeSerializeRequest($body = null)
 
         // body params
         $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
+        if (isset($outer_composite)) {
+            $_tempBody = $outer_composite;
         }
 
         if ($multipart) {
@@ -797,7 +1076,7 @@ protected function fakeOuterCompositeSerializeRequest($body = null)
         } else {
             $headers = $this->headerSelector->selectHeaders(
                 ['*/*'],
-                []
+                ['application/json']
             );
         }
 
@@ -1055,7 +1334,7 @@ protected function fakeOuterNumberSerializeRequest($body = null)
         } else {
             $headers = $this->headerSelector->selectHeaders(
                 ['*/*'],
-                []
+                ['application/json']
             );
         }
 
@@ -1313,7 +1592,7 @@ protected function fakeOuterStringSerializeRequest($body = null)
         } else {
             $headers = $this->headerSelector->selectHeaders(
                 ['*/*'],
-                []
+                ['application/json']
             );
         }
 
@@ -1370,29 +1649,29 @@ protected function fakeOuterStringSerializeRequest($body = null)
     /**
      * Operation testBodyWithFileSchema
      *
-     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $body body (required)
+     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $file_schema_test_class file_schema_test_class (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return void
      */
-    public function testBodyWithFileSchema($body)
+    public function testBodyWithFileSchema($file_schema_test_class)
     {
-        $this->testBodyWithFileSchemaWithHttpInfo($body);
+        $this->testBodyWithFileSchemaWithHttpInfo($file_schema_test_class);
     }
 
     /**
      * Operation testBodyWithFileSchemaWithHttpInfo
      *
-     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $body (required)
+     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $file_schema_test_class (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of null, HTTP status code, HTTP response headers (array of strings)
      */
-    public function testBodyWithFileSchemaWithHttpInfo($body)
+    public function testBodyWithFileSchemaWithHttpInfo($file_schema_test_class)
     {
-        $request = $this->testBodyWithFileSchemaRequest($body);
+        $request = $this->testBodyWithFileSchemaRequest($file_schema_test_class);
 
         try {
             $options = $this->createHttpClientOption();
@@ -1436,14 +1715,14 @@ public function testBodyWithFileSchemaWithHttpInfo($body)
      *
      * 
      *
-     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $body (required)
+     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $file_schema_test_class (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function testBodyWithFileSchemaAsync($body)
+    public function testBodyWithFileSchemaAsync($file_schema_test_class)
     {
-        return $this->testBodyWithFileSchemaAsyncWithHttpInfo($body)
+        return $this->testBodyWithFileSchemaAsyncWithHttpInfo($file_schema_test_class)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -1456,15 +1735,15 @@ function ($response) {
      *
      * 
      *
-     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $body (required)
+     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $file_schema_test_class (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function testBodyWithFileSchemaAsyncWithHttpInfo($body)
+    public function testBodyWithFileSchemaAsyncWithHttpInfo($file_schema_test_class)
     {
         $returnType = '';
-        $request = $this->testBodyWithFileSchemaRequest($body);
+        $request = $this->testBodyWithFileSchemaRequest($file_schema_test_class);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -1492,17 +1771,17 @@ function ($exception) {
     /**
      * Create request for operation 'testBodyWithFileSchema'
      *
-     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $body (required)
+     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $file_schema_test_class (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function testBodyWithFileSchemaRequest($body)
+    protected function testBodyWithFileSchemaRequest($file_schema_test_class)
     {
-        // verify the required parameter 'body' is set
-        if ($body === null || (is_array($body) && count($body) === 0)) {
+        // verify the required parameter 'file_schema_test_class' is set
+        if ($file_schema_test_class === null || (is_array($file_schema_test_class) && count($file_schema_test_class) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $body when calling testBodyWithFileSchema'
+                'Missing the required parameter $file_schema_test_class when calling testBodyWithFileSchema'
             );
         }
 
@@ -1518,8 +1797,8 @@ protected function testBodyWithFileSchemaRequest($body)
 
         // body params
         $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
+        if (isset($file_schema_test_class)) {
+            $_tempBody = $file_schema_test_class;
         }
 
         if ($multipart) {
@@ -1587,30 +1866,30 @@ protected function testBodyWithFileSchemaRequest($body)
      * Operation testBodyWithQueryParams
      *
      * @param  string $query query (required)
-     * @param  \OpenAPI\Client\Model\User $body body (required)
+     * @param  \OpenAPI\Client\Model\User $user user (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return void
      */
-    public function testBodyWithQueryParams($query, $body)
+    public function testBodyWithQueryParams($query, $user)
     {
-        $this->testBodyWithQueryParamsWithHttpInfo($query, $body);
+        $this->testBodyWithQueryParamsWithHttpInfo($query, $user);
     }
 
     /**
      * Operation testBodyWithQueryParamsWithHttpInfo
      *
      * @param  string $query (required)
-     * @param  \OpenAPI\Client\Model\User $body (required)
+     * @param  \OpenAPI\Client\Model\User $user (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of null, HTTP status code, HTTP response headers (array of strings)
      */
-    public function testBodyWithQueryParamsWithHttpInfo($query, $body)
+    public function testBodyWithQueryParamsWithHttpInfo($query, $user)
     {
-        $request = $this->testBodyWithQueryParamsRequest($query, $body);
+        $request = $this->testBodyWithQueryParamsRequest($query, $user);
 
         try {
             $options = $this->createHttpClientOption();
@@ -1655,14 +1934,14 @@ public function testBodyWithQueryParamsWithHttpInfo($query, $body)
      * 
      *
      * @param  string $query (required)
-     * @param  \OpenAPI\Client\Model\User $body (required)
+     * @param  \OpenAPI\Client\Model\User $user (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function testBodyWithQueryParamsAsync($query, $body)
+    public function testBodyWithQueryParamsAsync($query, $user)
     {
-        return $this->testBodyWithQueryParamsAsyncWithHttpInfo($query, $body)
+        return $this->testBodyWithQueryParamsAsyncWithHttpInfo($query, $user)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -1676,15 +1955,15 @@ function ($response) {
      * 
      *
      * @param  string $query (required)
-     * @param  \OpenAPI\Client\Model\User $body (required)
+     * @param  \OpenAPI\Client\Model\User $user (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function testBodyWithQueryParamsAsyncWithHttpInfo($query, $body)
+    public function testBodyWithQueryParamsAsyncWithHttpInfo($query, $user)
     {
         $returnType = '';
-        $request = $this->testBodyWithQueryParamsRequest($query, $body);
+        $request = $this->testBodyWithQueryParamsRequest($query, $user);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -1713,12 +1992,12 @@ function ($exception) {
      * Create request for operation 'testBodyWithQueryParams'
      *
      * @param  string $query (required)
-     * @param  \OpenAPI\Client\Model\User $body (required)
+     * @param  \OpenAPI\Client\Model\User $user (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function testBodyWithQueryParamsRequest($query, $body)
+    protected function testBodyWithQueryParamsRequest($query, $user)
     {
         // verify the required parameter 'query' is set
         if ($query === null || (is_array($query) && count($query) === 0)) {
@@ -1726,10 +2005,10 @@ protected function testBodyWithQueryParamsRequest($query, $body)
                 'Missing the required parameter $query when calling testBodyWithQueryParams'
             );
         }
-        // verify the required parameter 'body' is set
-        if ($body === null || (is_array($body) && count($body) === 0)) {
+        // verify the required parameter 'user' is set
+        if ($user === null || (is_array($user) && count($user) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $body when calling testBodyWithQueryParams'
+                'Missing the required parameter $user when calling testBodyWithQueryParams'
             );
         }
 
@@ -1741,19 +2020,23 @@ protected function testBodyWithQueryParamsRequest($query, $body)
         $multipart = false;
 
         // query params
-        if (is_array($query)) {
-            $query = ObjectSerializer::serializeCollection($query, '', true);
-        }
         if ($query !== null) {
-            $queryParams['query'] = $query;
+            if('form' === 'form' && is_array($query)) {
+                foreach($query as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['query'] = $query;
+            }
         }
 
 
 
         // body params
         $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
+        if (isset($user)) {
+            $_tempBody = $user;
         }
 
         if ($multipart) {
@@ -1822,15 +2105,15 @@ protected function testBodyWithQueryParamsRequest($query, $body)
      *
      * To test \"client\" model
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return \OpenAPI\Client\Model\Client
      */
-    public function testClientModel($body)
+    public function testClientModel($client)
     {
-        list($response) = $this->testClientModelWithHttpInfo($body);
+        list($response) = $this->testClientModelWithHttpInfo($client);
         return $response;
     }
 
@@ -1839,15 +2122,15 @@ public function testClientModel($body)
      *
      * To test \"client\" model
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of \OpenAPI\Client\Model\Client, HTTP status code, HTTP response headers (array of strings)
      */
-    public function testClientModelWithHttpInfo($body)
+    public function testClientModelWithHttpInfo($client)
     {
-        $request = $this->testClientModelRequest($body);
+        $request = $this->testClientModelRequest($client);
 
         try {
             $options = $this->createHttpClientOption();
@@ -1927,14 +2210,14 @@ public function testClientModelWithHttpInfo($body)
      *
      * To test \"client\" model
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function testClientModelAsync($body)
+    public function testClientModelAsync($client)
     {
-        return $this->testClientModelAsyncWithHttpInfo($body)
+        return $this->testClientModelAsyncWithHttpInfo($client)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -1947,15 +2230,15 @@ function ($response) {
      *
      * To test \"client\" model
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function testClientModelAsyncWithHttpInfo($body)
+    public function testClientModelAsyncWithHttpInfo($client)
     {
         $returnType = '\OpenAPI\Client\Model\Client';
-        $request = $this->testClientModelRequest($body);
+        $request = $this->testClientModelRequest($client);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -1994,17 +2277,17 @@ function ($exception) {
     /**
      * Create request for operation 'testClientModel'
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function testClientModelRequest($body)
+    protected function testClientModelRequest($client)
     {
-        // verify the required parameter 'body' is set
-        if ($body === null || (is_array($body) && count($body) === 0)) {
+        // verify the required parameter 'client' is set
+        if ($client === null || (is_array($client) && count($client) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $body when calling testClientModel'
+                'Missing the required parameter $client when calling testClientModel'
             );
         }
 
@@ -2020,8 +2303,8 @@ protected function testClientModelRequest($body)
 
         // body params
         $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
+        if (isset($client)) {
+            $_tempBody = $client;
         }
 
         if ($multipart) {
@@ -2088,7 +2371,7 @@ protected function testClientModelRequest($body)
     /**
      * Operation testEndpointParameters
      *
-     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
      *
      * @param  float $number None (required)
      * @param  double $double None (required)
@@ -2117,7 +2400,7 @@ public function testEndpointParameters($number, $double, $pattern_without_delimi
     /**
      * Operation testEndpointParametersWithHttpInfo
      *
-     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
      *
      * @param  float $number None (required)
      * @param  double $double None (required)
@@ -2182,7 +2465,7 @@ public function testEndpointParametersWithHttpInfo($number, $double, $pattern_wi
     /**
      * Operation testEndpointParametersAsync
      *
-     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
      *
      * @param  float $number None (required)
      * @param  double $double None (required)
@@ -2215,7 +2498,7 @@ function ($response) {
     /**
      * Operation testEndpointParametersAsyncWithHttpInfo
      *
-     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
      *
      * @param  float $number None (required)
      * @param  double $double None (required)
@@ -2673,32 +2956,48 @@ protected function testEnumParametersRequest($enum_header_string_array = null, $
         $multipart = false;
 
         // query params
-        if (is_array($enum_query_string_array)) {
-            $enum_query_string_array = ObjectSerializer::serializeCollection($enum_query_string_array, 'form', true);
-        }
         if ($enum_query_string_array !== null) {
-            $queryParams['enum_query_string_array'] = $enum_query_string_array;
+            if('form' === 'form' && is_array($enum_query_string_array)) {
+                foreach($enum_query_string_array as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['enum_query_string_array'] = $enum_query_string_array;
+            }
         }
         // query params
-        if (is_array($enum_query_string)) {
-            $enum_query_string = ObjectSerializer::serializeCollection($enum_query_string, '', true);
-        }
         if ($enum_query_string !== null) {
-            $queryParams['enum_query_string'] = $enum_query_string;
+            if('form' === 'form' && is_array($enum_query_string)) {
+                foreach($enum_query_string as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['enum_query_string'] = $enum_query_string;
+            }
         }
         // query params
-        if (is_array($enum_query_integer)) {
-            $enum_query_integer = ObjectSerializer::serializeCollection($enum_query_integer, '', true);
-        }
         if ($enum_query_integer !== null) {
-            $queryParams['enum_query_integer'] = $enum_query_integer;
+            if('form' === 'form' && is_array($enum_query_integer)) {
+                foreach($enum_query_integer as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['enum_query_integer'] = $enum_query_integer;
+            }
         }
         // query params
-        if (is_array($enum_query_double)) {
-            $enum_query_double = ObjectSerializer::serializeCollection($enum_query_double, '', true);
-        }
         if ($enum_query_double !== null) {
-            $queryParams['enum_query_double'] = $enum_query_double;
+            if('form' === 'form' && is_array($enum_query_double)) {
+                foreach($enum_query_double as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['enum_query_double'] = $enum_query_double;
+            }
         }
 
         // header params
@@ -2992,32 +3291,48 @@ protected function testGroupParametersRequest($associative_array)
         $multipart = false;
 
         // query params
-        if (is_array($required_string_group)) {
-            $required_string_group = ObjectSerializer::serializeCollection($required_string_group, '', true);
-        }
         if ($required_string_group !== null) {
-            $queryParams['required_string_group'] = $required_string_group;
+            if('form' === 'form' && is_array($required_string_group)) {
+                foreach($required_string_group as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['required_string_group'] = $required_string_group;
+            }
         }
         // query params
-        if (is_array($required_int64_group)) {
-            $required_int64_group = ObjectSerializer::serializeCollection($required_int64_group, '', true);
-        }
         if ($required_int64_group !== null) {
-            $queryParams['required_int64_group'] = $required_int64_group;
+            if('form' === 'form' && is_array($required_int64_group)) {
+                foreach($required_int64_group as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['required_int64_group'] = $required_int64_group;
+            }
         }
         // query params
-        if (is_array($string_group)) {
-            $string_group = ObjectSerializer::serializeCollection($string_group, '', true);
-        }
         if ($string_group !== null) {
-            $queryParams['string_group'] = $string_group;
+            if('form' === 'form' && is_array($string_group)) {
+                foreach($string_group as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['string_group'] = $string_group;
+            }
         }
         // query params
-        if (is_array($int64_group)) {
-            $int64_group = ObjectSerializer::serializeCollection($int64_group, '', true);
-        }
         if ($int64_group !== null) {
-            $queryParams['int64_group'] = $int64_group;
+            if('form' === 'form' && is_array($int64_group)) {
+                foreach($int64_group as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['int64_group'] = $int64_group;
+            }
         }
 
         // header params
@@ -3073,6 +3388,10 @@ protected function testGroupParametersRequest($associative_array)
             }
         }
 
+        // this endpoint requires Bearer (JWT) authentication (access token)
+        if ($this->config->getAccessToken() !== null) {
+            $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken();
+        }
 
         $defaultHeaders = [];
         if ($this->config->getUserAgent()) {
@@ -3099,15 +3418,15 @@ protected function testGroupParametersRequest($associative_array)
      *
      * test inline additionalProperties
      *
-     * @param  map[string,string] $param request body (required)
+     * @param  map[string,string] $request_body request body (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return void
      */
-    public function testInlineAdditionalProperties($param)
+    public function testInlineAdditionalProperties($request_body)
     {
-        $this->testInlineAdditionalPropertiesWithHttpInfo($param);
+        $this->testInlineAdditionalPropertiesWithHttpInfo($request_body);
     }
 
     /**
@@ -3115,15 +3434,15 @@ public function testInlineAdditionalProperties($param)
      *
      * test inline additionalProperties
      *
-     * @param  map[string,string] $param request body (required)
+     * @param  map[string,string] $request_body request body (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of null, HTTP status code, HTTP response headers (array of strings)
      */
-    public function testInlineAdditionalPropertiesWithHttpInfo($param)
+    public function testInlineAdditionalPropertiesWithHttpInfo($request_body)
     {
-        $request = $this->testInlineAdditionalPropertiesRequest($param);
+        $request = $this->testInlineAdditionalPropertiesRequest($request_body);
 
         try {
             $options = $this->createHttpClientOption();
@@ -3167,14 +3486,14 @@ public function testInlineAdditionalPropertiesWithHttpInfo($param)
      *
      * test inline additionalProperties
      *
-     * @param  map[string,string] $param request body (required)
+     * @param  map[string,string] $request_body request body (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function testInlineAdditionalPropertiesAsync($param)
+    public function testInlineAdditionalPropertiesAsync($request_body)
     {
-        return $this->testInlineAdditionalPropertiesAsyncWithHttpInfo($param)
+        return $this->testInlineAdditionalPropertiesAsyncWithHttpInfo($request_body)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -3187,15 +3506,15 @@ function ($response) {
      *
      * test inline additionalProperties
      *
-     * @param  map[string,string] $param request body (required)
+     * @param  map[string,string] $request_body request body (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function testInlineAdditionalPropertiesAsyncWithHttpInfo($param)
+    public function testInlineAdditionalPropertiesAsyncWithHttpInfo($request_body)
     {
         $returnType = '';
-        $request = $this->testInlineAdditionalPropertiesRequest($param);
+        $request = $this->testInlineAdditionalPropertiesRequest($request_body);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -3223,17 +3542,17 @@ function ($exception) {
     /**
      * Create request for operation 'testInlineAdditionalProperties'
      *
-     * @param  map[string,string] $param request body (required)
+     * @param  map[string,string] $request_body request body (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function testInlineAdditionalPropertiesRequest($param)
+    protected function testInlineAdditionalPropertiesRequest($request_body)
     {
-        // verify the required parameter 'param' is set
-        if ($param === null || (is_array($param) && count($param) === 0)) {
+        // verify the required parameter 'request_body' is set
+        if ($request_body === null || (is_array($request_body) && count($request_body) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $param when calling testInlineAdditionalProperties'
+                'Missing the required parameter $request_body when calling testInlineAdditionalProperties'
             );
         }
 
@@ -3249,8 +3568,8 @@ protected function testInlineAdditionalPropertiesRequest($param)
 
         // body params
         $_tempBody = null;
-        if (isset($param)) {
-            $_tempBody = $param;
+        if (isset($request_body)) {
+            $_tempBody = $request_body;
         }
 
         if ($multipart) {
@@ -3741,15 +4060,19 @@ protected function testQueryParameterCollectionFormatRequest($pipe, $ioutil, $ht
         $multipart = false;
 
         // query params
-        if (is_array($pipe)) {
-            $pipe = ObjectSerializer::serializeCollection($pipe, 'form', true);
-        }
         if ($pipe !== null) {
-            $queryParams['pipe'] = $pipe;
+            if('form' === 'form' && is_array($pipe)) {
+                foreach($pipe as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['pipe'] = $pipe;
+            }
         }
         // query params
         if (is_array($ioutil)) {
-            $ioutil = ObjectSerializer::serializeCollection($ioutil, 'csv', true);
+            $ioutil = ObjectSerializer::serializeCollection($ioutil, 'form', true);
         }
         if ($ioutil !== null) {
             $queryParams['ioutil'] = $ioutil;
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
index 81126bd5a587..cc37aa252bce 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FakeClassnameTags123Api
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -120,15 +120,15 @@ public function getConfig()
      *
      * To test class name in snake case
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return \OpenAPI\Client\Model\Client
      */
-    public function testClassname($body)
+    public function testClassname($client)
     {
-        list($response) = $this->testClassnameWithHttpInfo($body);
+        list($response) = $this->testClassnameWithHttpInfo($client);
         return $response;
     }
 
@@ -137,15 +137,15 @@ public function testClassname($body)
      *
      * To test class name in snake case
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of \OpenAPI\Client\Model\Client, HTTP status code, HTTP response headers (array of strings)
      */
-    public function testClassnameWithHttpInfo($body)
+    public function testClassnameWithHttpInfo($client)
     {
-        $request = $this->testClassnameRequest($body);
+        $request = $this->testClassnameRequest($client);
 
         try {
             $options = $this->createHttpClientOption();
@@ -225,14 +225,14 @@ public function testClassnameWithHttpInfo($body)
      *
      * To test class name in snake case
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function testClassnameAsync($body)
+    public function testClassnameAsync($client)
     {
-        return $this->testClassnameAsyncWithHttpInfo($body)
+        return $this->testClassnameAsyncWithHttpInfo($client)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -245,15 +245,15 @@ function ($response) {
      *
      * To test class name in snake case
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function testClassnameAsyncWithHttpInfo($body)
+    public function testClassnameAsyncWithHttpInfo($client)
     {
         $returnType = '\OpenAPI\Client\Model\Client';
-        $request = $this->testClassnameRequest($body);
+        $request = $this->testClassnameRequest($client);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -292,17 +292,17 @@ function ($exception) {
     /**
      * Create request for operation 'testClassname'
      *
-     * @param  \OpenAPI\Client\Model\Client $body client model (required)
+     * @param  \OpenAPI\Client\Model\Client $client client model (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function testClassnameRequest($body)
+    protected function testClassnameRequest($client)
     {
-        // verify the required parameter 'body' is set
-        if ($body === null || (is_array($body) && count($body) === 0)) {
+        // verify the required parameter 'client' is set
+        if ($client === null || (is_array($client) && count($client) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $body when calling testClassname'
+                'Missing the required parameter $client when calling testClassname'
             );
         }
 
@@ -318,8 +318,8 @@ protected function testClassnameRequest($body)
 
         // body params
         $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
+        if (isset($client)) {
+            $_tempBody = $client;
         }
 
         if ($multipart) {
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
index da30532e6537..de4bc86849f6 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PetApi
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -120,15 +120,19 @@ public function getConfig()
      *
      * Add a new pet to the store
      *
-     * @param  \OpenAPI\Client\Model\Pet $body Pet object that needs to be added to the store (required)
+     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
+     * URL: http://petstore.swagger.io/v2
+     * URL: http://path-server-test.petstore.local/v2
+     *
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return void
      */
-    public function addPet($body)
+    public function addPet($pet)
     {
-        $this->addPetWithHttpInfo($body);
+        $this->addPetWithHttpInfo($pet);
     }
 
     /**
@@ -136,15 +140,19 @@ public function addPet($body)
      *
      * Add a new pet to the store
      *
-     * @param  \OpenAPI\Client\Model\Pet $body Pet object that needs to be added to the store (required)
+     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
+     * URL: http://petstore.swagger.io/v2
+     * URL: http://path-server-test.petstore.local/v2
+     *
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of null, HTTP status code, HTTP response headers (array of strings)
      */
-    public function addPetWithHttpInfo($body)
+    public function addPetWithHttpInfo($pet)
     {
-        $request = $this->addPetRequest($body);
+        $request = $this->addPetRequest($pet);
 
         try {
             $options = $this->createHttpClientOption();
@@ -188,14 +196,18 @@ public function addPetWithHttpInfo($body)
      *
      * Add a new pet to the store
      *
-     * @param  \OpenAPI\Client\Model\Pet $body Pet object that needs to be added to the store (required)
+     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
+     * URL: http://petstore.swagger.io/v2
+     * URL: http://path-server-test.petstore.local/v2
+     *
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function addPetAsync($body)
+    public function addPetAsync($pet)
     {
-        return $this->addPetAsyncWithHttpInfo($body)
+        return $this->addPetAsyncWithHttpInfo($pet)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -208,15 +220,19 @@ function ($response) {
      *
      * Add a new pet to the store
      *
-     * @param  \OpenAPI\Client\Model\Pet $body Pet object that needs to be added to the store (required)
+     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
+     * URL: http://petstore.swagger.io/v2
+     * URL: http://path-server-test.petstore.local/v2
+     *
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function addPetAsyncWithHttpInfo($body)
+    public function addPetAsyncWithHttpInfo($pet)
     {
         $returnType = '';
-        $request = $this->addPetRequest($body);
+        $request = $this->addPetRequest($pet);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -244,17 +260,21 @@ function ($exception) {
     /**
      * Create request for operation 'addPet'
      *
-     * @param  \OpenAPI\Client\Model\Pet $body Pet object that needs to be added to the store (required)
+     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
+     * URL: http://petstore.swagger.io/v2
+     * URL: http://path-server-test.petstore.local/v2
+     *
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function addPetRequest($body)
+    protected function addPetRequest($pet)
     {
-        // verify the required parameter 'body' is set
-        if ($body === null || (is_array($body) && count($body) === 0)) {
+        // verify the required parameter 'pet' is set
+        if ($pet === null || (is_array($pet) && count($pet) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $body when calling addPet'
+                'Missing the required parameter $pet when calling addPet'
             );
         }
 
@@ -270,8 +290,8 @@ protected function addPetRequest($body)
 
         // body params
         $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
+        if (isset($pet)) {
+            $_tempBody = $pet;
         }
 
         if ($multipart) {
@@ -330,10 +350,16 @@ protected function addPetRequest($body)
             $headers
         );
 
+        $operationHosts = ["http://petstore.swagger.io/v2", "http://path-server-test.petstore.local/v2"];
+        if ($this->hostIndex < 0 || $this->hostIndex >= sizeof($operationHosts)) {
+            throw new \InvalidArgumentException("Invalid index {$this->hostIndex} when selecting the host. Must be less than ".sizeof($operationHosts));
+        }
+        $operationHost = $operationHosts[$this->hostIndex];
+
         $query = \GuzzleHttp\Psr7\build_query($queryParams);
         return new Request(
             'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
+            $operationHost . $resourcePath . ($query ? "?{$query}" : ''),
             $headers,
             $httpBody
         );
@@ -1412,15 +1438,19 @@ protected function getPetByIdRequest($pet_id)
      *
      * Update an existing pet
      *
-     * @param  \OpenAPI\Client\Model\Pet $body Pet object that needs to be added to the store (required)
+     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
+     * URL: http://petstore.swagger.io/v2
+     * URL: http://path-server-test.petstore.local/v2
+     *
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return void
      */
-    public function updatePet($body)
+    public function updatePet($pet)
     {
-        $this->updatePetWithHttpInfo($body);
+        $this->updatePetWithHttpInfo($pet);
     }
 
     /**
@@ -1428,15 +1458,19 @@ public function updatePet($body)
      *
      * Update an existing pet
      *
-     * @param  \OpenAPI\Client\Model\Pet $body Pet object that needs to be added to the store (required)
+     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
+     * URL: http://petstore.swagger.io/v2
+     * URL: http://path-server-test.petstore.local/v2
+     *
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of null, HTTP status code, HTTP response headers (array of strings)
      */
-    public function updatePetWithHttpInfo($body)
+    public function updatePetWithHttpInfo($pet)
     {
-        $request = $this->updatePetRequest($body);
+        $request = $this->updatePetRequest($pet);
 
         try {
             $options = $this->createHttpClientOption();
@@ -1480,14 +1514,18 @@ public function updatePetWithHttpInfo($body)
      *
      * Update an existing pet
      *
-     * @param  \OpenAPI\Client\Model\Pet $body Pet object that needs to be added to the store (required)
+     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
+     * URL: http://petstore.swagger.io/v2
+     * URL: http://path-server-test.petstore.local/v2
+     *
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function updatePetAsync($body)
+    public function updatePetAsync($pet)
     {
-        return $this->updatePetAsyncWithHttpInfo($body)
+        return $this->updatePetAsyncWithHttpInfo($pet)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -1500,15 +1538,19 @@ function ($response) {
      *
      * Update an existing pet
      *
-     * @param  \OpenAPI\Client\Model\Pet $body Pet object that needs to be added to the store (required)
+     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
+     * URL: http://petstore.swagger.io/v2
+     * URL: http://path-server-test.petstore.local/v2
+     *
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function updatePetAsyncWithHttpInfo($body)
+    public function updatePetAsyncWithHttpInfo($pet)
     {
         $returnType = '';
-        $request = $this->updatePetRequest($body);
+        $request = $this->updatePetRequest($pet);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -1536,17 +1578,21 @@ function ($exception) {
     /**
      * Create request for operation 'updatePet'
      *
-     * @param  \OpenAPI\Client\Model\Pet $body Pet object that needs to be added to the store (required)
+     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
+     * URL: http://petstore.swagger.io/v2
+     * URL: http://path-server-test.petstore.local/v2
+     *
+     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function updatePetRequest($body)
+    protected function updatePetRequest($pet)
     {
-        // verify the required parameter 'body' is set
-        if ($body === null || (is_array($body) && count($body) === 0)) {
+        // verify the required parameter 'pet' is set
+        if ($pet === null || (is_array($pet) && count($pet) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $body when calling updatePet'
+                'Missing the required parameter $pet when calling updatePet'
             );
         }
 
@@ -1562,8 +1608,8 @@ protected function updatePetRequest($body)
 
         // body params
         $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
+        if (isset($pet)) {
+            $_tempBody = $pet;
         }
 
         if ($multipart) {
@@ -1622,10 +1668,16 @@ protected function updatePetRequest($body)
             $headers
         );
 
+        $operationHosts = ["http://petstore.swagger.io/v2", "http://path-server-test.petstore.local/v2"];
+        if ($this->hostIndex < 0 || $this->hostIndex >= sizeof($operationHosts)) {
+            throw new \InvalidArgumentException("Invalid index {$this->hostIndex} when selecting the host. Must be less than ".sizeof($operationHosts));
+        }
+        $operationHost = $operationHosts[$this->hostIndex];
+
         $query = \GuzzleHttp\Psr7\build_query($queryParams);
         return new Request(
             'PUT',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
+            $operationHost . $resourcePath . ($query ? "?{$query}" : ''),
             $headers,
             $httpBody
         );
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
index c2acdbda8113..92a019106984 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StoreApi
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -884,15 +884,15 @@ protected function getOrderByIdRequest($order_id)
      *
      * Place an order for a pet
      *
-     * @param  \OpenAPI\Client\Model\Order $body order placed for purchasing the pet (required)
+     * @param  \OpenAPI\Client\Model\Order $order order placed for purchasing the pet (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return \OpenAPI\Client\Model\Order
      */
-    public function placeOrder($body)
+    public function placeOrder($order)
     {
-        list($response) = $this->placeOrderWithHttpInfo($body);
+        list($response) = $this->placeOrderWithHttpInfo($order);
         return $response;
     }
 
@@ -901,15 +901,15 @@ public function placeOrder($body)
      *
      * Place an order for a pet
      *
-     * @param  \OpenAPI\Client\Model\Order $body order placed for purchasing the pet (required)
+     * @param  \OpenAPI\Client\Model\Order $order order placed for purchasing the pet (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of \OpenAPI\Client\Model\Order, HTTP status code, HTTP response headers (array of strings)
      */
-    public function placeOrderWithHttpInfo($body)
+    public function placeOrderWithHttpInfo($order)
     {
-        $request = $this->placeOrderRequest($body);
+        $request = $this->placeOrderRequest($order);
 
         try {
             $options = $this->createHttpClientOption();
@@ -989,14 +989,14 @@ public function placeOrderWithHttpInfo($body)
      *
      * Place an order for a pet
      *
-     * @param  \OpenAPI\Client\Model\Order $body order placed for purchasing the pet (required)
+     * @param  \OpenAPI\Client\Model\Order $order order placed for purchasing the pet (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function placeOrderAsync($body)
+    public function placeOrderAsync($order)
     {
-        return $this->placeOrderAsyncWithHttpInfo($body)
+        return $this->placeOrderAsyncWithHttpInfo($order)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -1009,15 +1009,15 @@ function ($response) {
      *
      * Place an order for a pet
      *
-     * @param  \OpenAPI\Client\Model\Order $body order placed for purchasing the pet (required)
+     * @param  \OpenAPI\Client\Model\Order $order order placed for purchasing the pet (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function placeOrderAsyncWithHttpInfo($body)
+    public function placeOrderAsyncWithHttpInfo($order)
     {
         $returnType = '\OpenAPI\Client\Model\Order';
-        $request = $this->placeOrderRequest($body);
+        $request = $this->placeOrderRequest($order);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -1056,17 +1056,17 @@ function ($exception) {
     /**
      * Create request for operation 'placeOrder'
      *
-     * @param  \OpenAPI\Client\Model\Order $body order placed for purchasing the pet (required)
+     * @param  \OpenAPI\Client\Model\Order $order order placed for purchasing the pet (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function placeOrderRequest($body)
+    protected function placeOrderRequest($order)
     {
-        // verify the required parameter 'body' is set
-        if ($body === null || (is_array($body) && count($body) === 0)) {
+        // verify the required parameter 'order' is set
+        if ($order === null || (is_array($order) && count($order) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $body when calling placeOrder'
+                'Missing the required parameter $order when calling placeOrder'
             );
         }
 
@@ -1082,8 +1082,8 @@ protected function placeOrderRequest($body)
 
         // body params
         $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
+        if (isset($order)) {
+            $_tempBody = $order;
         }
 
         if ($multipart) {
@@ -1093,7 +1093,7 @@ protected function placeOrderRequest($body)
         } else {
             $headers = $this->headerSelector->selectHeaders(
                 ['application/xml', 'application/json'],
-                []
+                ['application/json']
             );
         }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
index 22f97f06382d..9c5ff0a76102 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * UserApi
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -120,15 +120,15 @@ public function getConfig()
      *
      * Create user
      *
-     * @param  \OpenAPI\Client\Model\User $body Created user object (required)
+     * @param  \OpenAPI\Client\Model\User $user Created user object (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return void
      */
-    public function createUser($body)
+    public function createUser($user)
     {
-        $this->createUserWithHttpInfo($body);
+        $this->createUserWithHttpInfo($user);
     }
 
     /**
@@ -136,15 +136,15 @@ public function createUser($body)
      *
      * Create user
      *
-     * @param  \OpenAPI\Client\Model\User $body Created user object (required)
+     * @param  \OpenAPI\Client\Model\User $user Created user object (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of null, HTTP status code, HTTP response headers (array of strings)
      */
-    public function createUserWithHttpInfo($body)
+    public function createUserWithHttpInfo($user)
     {
-        $request = $this->createUserRequest($body);
+        $request = $this->createUserRequest($user);
 
         try {
             $options = $this->createHttpClientOption();
@@ -188,14 +188,14 @@ public function createUserWithHttpInfo($body)
      *
      * Create user
      *
-     * @param  \OpenAPI\Client\Model\User $body Created user object (required)
+     * @param  \OpenAPI\Client\Model\User $user Created user object (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function createUserAsync($body)
+    public function createUserAsync($user)
     {
-        return $this->createUserAsyncWithHttpInfo($body)
+        return $this->createUserAsyncWithHttpInfo($user)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -208,15 +208,15 @@ function ($response) {
      *
      * Create user
      *
-     * @param  \OpenAPI\Client\Model\User $body Created user object (required)
+     * @param  \OpenAPI\Client\Model\User $user Created user object (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function createUserAsyncWithHttpInfo($body)
+    public function createUserAsyncWithHttpInfo($user)
     {
         $returnType = '';
-        $request = $this->createUserRequest($body);
+        $request = $this->createUserRequest($user);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -244,17 +244,17 @@ function ($exception) {
     /**
      * Create request for operation 'createUser'
      *
-     * @param  \OpenAPI\Client\Model\User $body Created user object (required)
+     * @param  \OpenAPI\Client\Model\User $user Created user object (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function createUserRequest($body)
+    protected function createUserRequest($user)
     {
-        // verify the required parameter 'body' is set
-        if ($body === null || (is_array($body) && count($body) === 0)) {
+        // verify the required parameter 'user' is set
+        if ($user === null || (is_array($user) && count($user) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $body when calling createUser'
+                'Missing the required parameter $user when calling createUser'
             );
         }
 
@@ -270,8 +270,8 @@ protected function createUserRequest($body)
 
         // body params
         $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
+        if (isset($user)) {
+            $_tempBody = $user;
         }
 
         if ($multipart) {
@@ -281,7 +281,7 @@ protected function createUserRequest($body)
         } else {
             $headers = $this->headerSelector->selectHeaders(
                 [],
-                []
+                ['application/json']
             );
         }
 
@@ -340,15 +340,15 @@ protected function createUserRequest($body)
      *
      * Creates list of users with given input array
      *
-     * @param  \OpenAPI\Client\Model\User[] $body List of user object (required)
+     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return void
      */
-    public function createUsersWithArrayInput($body)
+    public function createUsersWithArrayInput($user)
     {
-        $this->createUsersWithArrayInputWithHttpInfo($body);
+        $this->createUsersWithArrayInputWithHttpInfo($user);
     }
 
     /**
@@ -356,15 +356,15 @@ public function createUsersWithArrayInput($body)
      *
      * Creates list of users with given input array
      *
-     * @param  \OpenAPI\Client\Model\User[] $body List of user object (required)
+     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of null, HTTP status code, HTTP response headers (array of strings)
      */
-    public function createUsersWithArrayInputWithHttpInfo($body)
+    public function createUsersWithArrayInputWithHttpInfo($user)
     {
-        $request = $this->createUsersWithArrayInputRequest($body);
+        $request = $this->createUsersWithArrayInputRequest($user);
 
         try {
             $options = $this->createHttpClientOption();
@@ -408,14 +408,14 @@ public function createUsersWithArrayInputWithHttpInfo($body)
      *
      * Creates list of users with given input array
      *
-     * @param  \OpenAPI\Client\Model\User[] $body List of user object (required)
+     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function createUsersWithArrayInputAsync($body)
+    public function createUsersWithArrayInputAsync($user)
     {
-        return $this->createUsersWithArrayInputAsyncWithHttpInfo($body)
+        return $this->createUsersWithArrayInputAsyncWithHttpInfo($user)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -428,15 +428,15 @@ function ($response) {
      *
      * Creates list of users with given input array
      *
-     * @param  \OpenAPI\Client\Model\User[] $body List of user object (required)
+     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function createUsersWithArrayInputAsyncWithHttpInfo($body)
+    public function createUsersWithArrayInputAsyncWithHttpInfo($user)
     {
         $returnType = '';
-        $request = $this->createUsersWithArrayInputRequest($body);
+        $request = $this->createUsersWithArrayInputRequest($user);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -464,17 +464,17 @@ function ($exception) {
     /**
      * Create request for operation 'createUsersWithArrayInput'
      *
-     * @param  \OpenAPI\Client\Model\User[] $body List of user object (required)
+     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function createUsersWithArrayInputRequest($body)
+    protected function createUsersWithArrayInputRequest($user)
     {
-        // verify the required parameter 'body' is set
-        if ($body === null || (is_array($body) && count($body) === 0)) {
+        // verify the required parameter 'user' is set
+        if ($user === null || (is_array($user) && count($user) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $body when calling createUsersWithArrayInput'
+                'Missing the required parameter $user when calling createUsersWithArrayInput'
             );
         }
 
@@ -490,8 +490,8 @@ protected function createUsersWithArrayInputRequest($body)
 
         // body params
         $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
+        if (isset($user)) {
+            $_tempBody = $user;
         }
 
         if ($multipart) {
@@ -501,7 +501,7 @@ protected function createUsersWithArrayInputRequest($body)
         } else {
             $headers = $this->headerSelector->selectHeaders(
                 [],
-                []
+                ['application/json']
             );
         }
 
@@ -560,15 +560,15 @@ protected function createUsersWithArrayInputRequest($body)
      *
      * Creates list of users with given input array
      *
-     * @param  \OpenAPI\Client\Model\User[] $body List of user object (required)
+     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return void
      */
-    public function createUsersWithListInput($body)
+    public function createUsersWithListInput($user)
     {
-        $this->createUsersWithListInputWithHttpInfo($body);
+        $this->createUsersWithListInputWithHttpInfo($user);
     }
 
     /**
@@ -576,15 +576,15 @@ public function createUsersWithListInput($body)
      *
      * Creates list of users with given input array
      *
-     * @param  \OpenAPI\Client\Model\User[] $body List of user object (required)
+     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of null, HTTP status code, HTTP response headers (array of strings)
      */
-    public function createUsersWithListInputWithHttpInfo($body)
+    public function createUsersWithListInputWithHttpInfo($user)
     {
-        $request = $this->createUsersWithListInputRequest($body);
+        $request = $this->createUsersWithListInputRequest($user);
 
         try {
             $options = $this->createHttpClientOption();
@@ -628,14 +628,14 @@ public function createUsersWithListInputWithHttpInfo($body)
      *
      * Creates list of users with given input array
      *
-     * @param  \OpenAPI\Client\Model\User[] $body List of user object (required)
+     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function createUsersWithListInputAsync($body)
+    public function createUsersWithListInputAsync($user)
     {
-        return $this->createUsersWithListInputAsyncWithHttpInfo($body)
+        return $this->createUsersWithListInputAsyncWithHttpInfo($user)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -648,15 +648,15 @@ function ($response) {
      *
      * Creates list of users with given input array
      *
-     * @param  \OpenAPI\Client\Model\User[] $body List of user object (required)
+     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function createUsersWithListInputAsyncWithHttpInfo($body)
+    public function createUsersWithListInputAsyncWithHttpInfo($user)
     {
         $returnType = '';
-        $request = $this->createUsersWithListInputRequest($body);
+        $request = $this->createUsersWithListInputRequest($user);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -684,17 +684,17 @@ function ($exception) {
     /**
      * Create request for operation 'createUsersWithListInput'
      *
-     * @param  \OpenAPI\Client\Model\User[] $body List of user object (required)
+     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function createUsersWithListInputRequest($body)
+    protected function createUsersWithListInputRequest($user)
     {
-        // verify the required parameter 'body' is set
-        if ($body === null || (is_array($body) && count($body) === 0)) {
+        // verify the required parameter 'user' is set
+        if ($user === null || (is_array($user) && count($user) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $body when calling createUsersWithListInput'
+                'Missing the required parameter $user when calling createUsersWithListInput'
             );
         }
 
@@ -710,8 +710,8 @@ protected function createUsersWithListInputRequest($body)
 
         // body params
         $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
+        if (isset($user)) {
+            $_tempBody = $user;
         }
 
         if ($multipart) {
@@ -721,7 +721,7 @@ protected function createUsersWithListInputRequest($body)
         } else {
             $headers = $this->headerSelector->selectHeaders(
                 [],
-                []
+                ['application/json']
             );
         }
 
@@ -1483,18 +1483,26 @@ protected function loginUserRequest($username, $password)
         $multipart = false;
 
         // query params
-        if (is_array($username)) {
-            $username = ObjectSerializer::serializeCollection($username, '', true);
-        }
         if ($username !== null) {
-            $queryParams['username'] = $username;
+            if('form' === 'form' && is_array($username)) {
+                foreach($username as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['username'] = $username;
+            }
         }
         // query params
-        if (is_array($password)) {
-            $password = ObjectSerializer::serializeCollection($password, '', true);
-        }
         if ($password !== null) {
-            $queryParams['password'] = $password;
+            if('form' === 'form' && is_array($password)) {
+                foreach($password as $key => $value) {
+                    $queryParams[$key] = $value;
+                }
+            }
+            else {
+                $queryParams['password'] = $password;
+            }
         }
 
 
@@ -1775,15 +1783,15 @@ protected function logoutUserRequest()
      * Updated user
      *
      * @param  string $username name that need to be deleted (required)
-     * @param  \OpenAPI\Client\Model\User $body Updated user object (required)
+     * @param  \OpenAPI\Client\Model\User $user Updated user object (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return void
      */
-    public function updateUser($username, $body)
+    public function updateUser($username, $user)
     {
-        $this->updateUserWithHttpInfo($username, $body);
+        $this->updateUserWithHttpInfo($username, $user);
     }
 
     /**
@@ -1792,15 +1800,15 @@ public function updateUser($username, $body)
      * Updated user
      *
      * @param  string $username name that need to be deleted (required)
-     * @param  \OpenAPI\Client\Model\User $body Updated user object (required)
+     * @param  \OpenAPI\Client\Model\User $user Updated user object (required)
      *
      * @throws \OpenAPI\Client\ApiException on non-2xx response
      * @throws \InvalidArgumentException
      * @return array of null, HTTP status code, HTTP response headers (array of strings)
      */
-    public function updateUserWithHttpInfo($username, $body)
+    public function updateUserWithHttpInfo($username, $user)
     {
-        $request = $this->updateUserRequest($username, $body);
+        $request = $this->updateUserRequest($username, $user);
 
         try {
             $options = $this->createHttpClientOption();
@@ -1845,14 +1853,14 @@ public function updateUserWithHttpInfo($username, $body)
      * Updated user
      *
      * @param  string $username name that need to be deleted (required)
-     * @param  \OpenAPI\Client\Model\User $body Updated user object (required)
+     * @param  \OpenAPI\Client\Model\User $user Updated user object (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function updateUserAsync($username, $body)
+    public function updateUserAsync($username, $user)
     {
-        return $this->updateUserAsyncWithHttpInfo($username, $body)
+        return $this->updateUserAsyncWithHttpInfo($username, $user)
             ->then(
                 function ($response) {
                     return $response[0];
@@ -1866,15 +1874,15 @@ function ($response) {
      * Updated user
      *
      * @param  string $username name that need to be deleted (required)
-     * @param  \OpenAPI\Client\Model\User $body Updated user object (required)
+     * @param  \OpenAPI\Client\Model\User $user Updated user object (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Promise\PromiseInterface
      */
-    public function updateUserAsyncWithHttpInfo($username, $body)
+    public function updateUserAsyncWithHttpInfo($username, $user)
     {
         $returnType = '';
-        $request = $this->updateUserRequest($username, $body);
+        $request = $this->updateUserRequest($username, $user);
 
         return $this->client
             ->sendAsync($request, $this->createHttpClientOption())
@@ -1903,12 +1911,12 @@ function ($exception) {
      * Create request for operation 'updateUser'
      *
      * @param  string $username name that need to be deleted (required)
-     * @param  \OpenAPI\Client\Model\User $body Updated user object (required)
+     * @param  \OpenAPI\Client\Model\User $user Updated user object (required)
      *
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function updateUserRequest($username, $body)
+    protected function updateUserRequest($username, $user)
     {
         // verify the required parameter 'username' is set
         if ($username === null || (is_array($username) && count($username) === 0)) {
@@ -1916,10 +1924,10 @@ protected function updateUserRequest($username, $body)
                 'Missing the required parameter $username when calling updateUser'
             );
         }
-        // verify the required parameter 'body' is set
-        if ($body === null || (is_array($body) && count($body) === 0)) {
+        // verify the required parameter 'user' is set
+        if ($user === null || (is_array($user) && count($user) === 0)) {
             throw new \InvalidArgumentException(
-                'Missing the required parameter $body when calling updateUser'
+                'Missing the required parameter $user when calling updateUser'
             );
         }
 
@@ -1943,8 +1951,8 @@ protected function updateUserRequest($username, $body)
 
         // body params
         $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
+        if (isset($user)) {
+            $_tempBody = $user;
         }
 
         if ($multipart) {
@@ -1954,7 +1962,7 @@ protected function updateUserRequest($username, $body)
         } else {
             $headers = $this->headerSelector->selectHeaders(
                 [],
-                []
+                ['application/json']
             );
         }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
index e5ce75f4b3d2..f041f3e77239 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ApiException
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
index 75b0a956ee78..3ab5eda04ec4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Configuration
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -30,7 +30,7 @@
 
 /**
  * Configuration Class Doc Comment
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -434,12 +434,45 @@ public function getApiKeyWithPrefix($apiKeyIdentifier)
      */
     public function getHostSettings()
     {
-        return array(
-          array(
-            "url" => "http://petstore.swagger.io:80/v2",
-            "description" => "No description provided",
-          )
-        );
+        return [
+            [
+                "url" => "http://{server}.swagger.io:{port}/v2",
+                "description" => "petstore server",
+                "variables" => [
+                    "server" => [
+                        "description" => "No description provided",
+                        "default_value" => "petstore",
+                        "enum_values" => [
+                            "petstore",
+                            "qa-petstore",
+                            "dev-petstore"
+                        ]
+                    ],
+                    "port" => [
+                        "description" => "No description provided",
+                        "default_value" => "80",
+                        "enum_values" => [
+                            "80",
+                            "8080"
+                        ]
+                    ]
+                ]
+            ],
+            [
+                "url" => "https://localhost:8080/{version}",
+                "description" => "The local server",
+                "variables" => [
+                    "version" => [
+                        "description" => "No description provided",
+                        "default_value" => "v2",
+                        "enum_values" => [
+                            "v1",
+                            "v2"
+                        ]
+                    ]
+                ]
+            ]
+        ];
     }
 
     /**
@@ -452,7 +485,7 @@ public function getHostSettings()
     public function getHostFromSettings($index, $variables = null)
     {
         if (null === $variables) {
-            $variables = array();
+            $variables = [];
         }
 
         $hosts = $this->getHostSettings();
@@ -468,7 +501,7 @@ public function getHostFromSettings($index, $variables = null)
         // go through variable and assign a value
         foreach ($host["variables"] as $name => $variable) {
             if (array_key_exists($name, $variables)) { // check to see if it's in the variables provided by the user
-                if (in_array($variables[$name], $variable["enum_values"])) { // check to see if the value is in the enum
+                if (in_array($variables[$name], $variable["enum_values"], true)) { // check to see if the value is in the enum
                     $url = str_replace("{".$name."}", $variables[$name], $url);
                 } else {
                     throw new \InvalidArgumentException("The variable `$name` in the host URL has invalid value ".$variables[$name].". Must be ".join(',', $variable["enum_values"]).".");
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
index d5fec659084a..25a92414028b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ApiException
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php
index 711d6e4acbb0..b2b27ea5d1b2 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesAnyType
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php
index e9edcc96aac1..f24315bf50a4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesArray
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php
index afd80ebffbdc..3a96306f689b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesBoolean
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
index b063cb419863..2811e834099b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesClass
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -57,17 +57,8 @@ class AdditionalPropertiesClass implements ModelInterface, ArrayAccess
       * @var string[]
       */
     protected static $openAPITypes = [
-        'map_string' => 'map[string,string]',
-        'map_number' => 'map[string,float]',
-        'map_integer' => 'map[string,int]',
-        'map_boolean' => 'map[string,bool]',
-        'map_array_integer' => 'map[string,int[]]',
-        'map_array_anytype' => 'map[string,object[]]',
-        'map_map_string' => 'map[string,map[string,string]]',
-        'map_map_anytype' => 'map[string,map[string,object]]',
-        'anytype_1' => 'object',
-        'anytype_2' => 'object',
-        'anytype_3' => 'object'
+        'map_property' => 'map[string,string]',
+        'map_of_map_property' => 'map[string,map[string,string]]'
     ];
 
     /**
@@ -76,17 +67,8 @@ class AdditionalPropertiesClass implements ModelInterface, ArrayAccess
       * @var string[]
       */
     protected static $openAPIFormats = [
-        'map_string' => null,
-        'map_number' => null,
-        'map_integer' => null,
-        'map_boolean' => null,
-        'map_array_integer' => null,
-        'map_array_anytype' => null,
-        'map_map_string' => null,
-        'map_map_anytype' => null,
-        'anytype_1' => null,
-        'anytype_2' => null,
-        'anytype_3' => null
+        'map_property' => null,
+        'map_of_map_property' => null
     ];
 
     /**
@@ -116,17 +98,8 @@ public static function openAPIFormats()
      * @var string[]
      */
     protected static $attributeMap = [
-        'map_string' => 'map_string',
-        'map_number' => 'map_number',
-        'map_integer' => 'map_integer',
-        'map_boolean' => 'map_boolean',
-        'map_array_integer' => 'map_array_integer',
-        'map_array_anytype' => 'map_array_anytype',
-        'map_map_string' => 'map_map_string',
-        'map_map_anytype' => 'map_map_anytype',
-        'anytype_1' => 'anytype_1',
-        'anytype_2' => 'anytype_2',
-        'anytype_3' => 'anytype_3'
+        'map_property' => 'map_property',
+        'map_of_map_property' => 'map_of_map_property'
     ];
 
     /**
@@ -135,17 +108,8 @@ public static function openAPIFormats()
      * @var string[]
      */
     protected static $setters = [
-        'map_string' => 'setMapString',
-        'map_number' => 'setMapNumber',
-        'map_integer' => 'setMapInteger',
-        'map_boolean' => 'setMapBoolean',
-        'map_array_integer' => 'setMapArrayInteger',
-        'map_array_anytype' => 'setMapArrayAnytype',
-        'map_map_string' => 'setMapMapString',
-        'map_map_anytype' => 'setMapMapAnytype',
-        'anytype_1' => 'setAnytype1',
-        'anytype_2' => 'setAnytype2',
-        'anytype_3' => 'setAnytype3'
+        'map_property' => 'setMapProperty',
+        'map_of_map_property' => 'setMapOfMapProperty'
     ];
 
     /**
@@ -154,17 +118,8 @@ public static function openAPIFormats()
      * @var string[]
      */
     protected static $getters = [
-        'map_string' => 'getMapString',
-        'map_number' => 'getMapNumber',
-        'map_integer' => 'getMapInteger',
-        'map_boolean' => 'getMapBoolean',
-        'map_array_integer' => 'getMapArrayInteger',
-        'map_array_anytype' => 'getMapArrayAnytype',
-        'map_map_string' => 'getMapMapString',
-        'map_map_anytype' => 'getMapMapAnytype',
-        'anytype_1' => 'getAnytype1',
-        'anytype_2' => 'getAnytype2',
-        'anytype_3' => 'getAnytype3'
+        'map_property' => 'getMapProperty',
+        'map_of_map_property' => 'getMapOfMapProperty'
     ];
 
     /**
@@ -227,17 +182,8 @@ public function getModelName()
      */
     public function __construct(array $data = null)
     {
-        $this->container['map_string'] = isset($data['map_string']) ? $data['map_string'] : null;
-        $this->container['map_number'] = isset($data['map_number']) ? $data['map_number'] : null;
-        $this->container['map_integer'] = isset($data['map_integer']) ? $data['map_integer'] : null;
-        $this->container['map_boolean'] = isset($data['map_boolean']) ? $data['map_boolean'] : null;
-        $this->container['map_array_integer'] = isset($data['map_array_integer']) ? $data['map_array_integer'] : null;
-        $this->container['map_array_anytype'] = isset($data['map_array_anytype']) ? $data['map_array_anytype'] : null;
-        $this->container['map_map_string'] = isset($data['map_map_string']) ? $data['map_map_string'] : null;
-        $this->container['map_map_anytype'] = isset($data['map_map_anytype']) ? $data['map_map_anytype'] : null;
-        $this->container['anytype_1'] = isset($data['anytype_1']) ? $data['anytype_1'] : null;
-        $this->container['anytype_2'] = isset($data['anytype_2']) ? $data['anytype_2'] : null;
-        $this->container['anytype_3'] = isset($data['anytype_3']) ? $data['anytype_3'] : null;
+        $this->container['map_property'] = isset($data['map_property']) ? $data['map_property'] : null;
+        $this->container['map_of_map_property'] = isset($data['map_of_map_property']) ? $data['map_of_map_property'] : null;
     }
 
     /**
@@ -265,265 +211,49 @@ public function valid()
 
 
     /**
-     * Gets map_string
+     * Gets map_property
      *
      * @return map[string,string]|null
      */
-    public function getMapString()
+    public function getMapProperty()
     {
-        return $this->container['map_string'];
+        return $this->container['map_property'];
     }
 
     /**
-     * Sets map_string
+     * Sets map_property
      *
-     * @param map[string,string]|null $map_string map_string
+     * @param map[string,string]|null $map_property map_property
      *
      * @return $this
      */
-    public function setMapString($map_string)
+    public function setMapProperty($map_property)
     {
-        $this->container['map_string'] = $map_string;
+        $this->container['map_property'] = $map_property;
 
         return $this;
     }
 
     /**
-     * Gets map_number
-     *
-     * @return map[string,float]|null
-     */
-    public function getMapNumber()
-    {
-        return $this->container['map_number'];
-    }
-
-    /**
-     * Sets map_number
-     *
-     * @param map[string,float]|null $map_number map_number
-     *
-     * @return $this
-     */
-    public function setMapNumber($map_number)
-    {
-        $this->container['map_number'] = $map_number;
-
-        return $this;
-    }
-
-    /**
-     * Gets map_integer
-     *
-     * @return map[string,int]|null
-     */
-    public function getMapInteger()
-    {
-        return $this->container['map_integer'];
-    }
-
-    /**
-     * Sets map_integer
-     *
-     * @param map[string,int]|null $map_integer map_integer
-     *
-     * @return $this
-     */
-    public function setMapInteger($map_integer)
-    {
-        $this->container['map_integer'] = $map_integer;
-
-        return $this;
-    }
-
-    /**
-     * Gets map_boolean
-     *
-     * @return map[string,bool]|null
-     */
-    public function getMapBoolean()
-    {
-        return $this->container['map_boolean'];
-    }
-
-    /**
-     * Sets map_boolean
-     *
-     * @param map[string,bool]|null $map_boolean map_boolean
-     *
-     * @return $this
-     */
-    public function setMapBoolean($map_boolean)
-    {
-        $this->container['map_boolean'] = $map_boolean;
-
-        return $this;
-    }
-
-    /**
-     * Gets map_array_integer
-     *
-     * @return map[string,int[]]|null
-     */
-    public function getMapArrayInteger()
-    {
-        return $this->container['map_array_integer'];
-    }
-
-    /**
-     * Sets map_array_integer
-     *
-     * @param map[string,int[]]|null $map_array_integer map_array_integer
-     *
-     * @return $this
-     */
-    public function setMapArrayInteger($map_array_integer)
-    {
-        $this->container['map_array_integer'] = $map_array_integer;
-
-        return $this;
-    }
-
-    /**
-     * Gets map_array_anytype
-     *
-     * @return map[string,object[]]|null
-     */
-    public function getMapArrayAnytype()
-    {
-        return $this->container['map_array_anytype'];
-    }
-
-    /**
-     * Sets map_array_anytype
-     *
-     * @param map[string,object[]]|null $map_array_anytype map_array_anytype
-     *
-     * @return $this
-     */
-    public function setMapArrayAnytype($map_array_anytype)
-    {
-        $this->container['map_array_anytype'] = $map_array_anytype;
-
-        return $this;
-    }
-
-    /**
-     * Gets map_map_string
+     * Gets map_of_map_property
      *
      * @return map[string,map[string,string]]|null
      */
-    public function getMapMapString()
-    {
-        return $this->container['map_map_string'];
-    }
-
-    /**
-     * Sets map_map_string
-     *
-     * @param map[string,map[string,string]]|null $map_map_string map_map_string
-     *
-     * @return $this
-     */
-    public function setMapMapString($map_map_string)
-    {
-        $this->container['map_map_string'] = $map_map_string;
-
-        return $this;
-    }
-
-    /**
-     * Gets map_map_anytype
-     *
-     * @return map[string,map[string,object]]|null
-     */
-    public function getMapMapAnytype()
-    {
-        return $this->container['map_map_anytype'];
-    }
-
-    /**
-     * Sets map_map_anytype
-     *
-     * @param map[string,map[string,object]]|null $map_map_anytype map_map_anytype
-     *
-     * @return $this
-     */
-    public function setMapMapAnytype($map_map_anytype)
-    {
-        $this->container['map_map_anytype'] = $map_map_anytype;
-
-        return $this;
-    }
-
-    /**
-     * Gets anytype_1
-     *
-     * @return object|null
-     */
-    public function getAnytype1()
-    {
-        return $this->container['anytype_1'];
-    }
-
-    /**
-     * Sets anytype_1
-     *
-     * @param object|null $anytype_1 anytype_1
-     *
-     * @return $this
-     */
-    public function setAnytype1($anytype_1)
-    {
-        $this->container['anytype_1'] = $anytype_1;
-
-        return $this;
-    }
-
-    /**
-     * Gets anytype_2
-     *
-     * @return object|null
-     */
-    public function getAnytype2()
-    {
-        return $this->container['anytype_2'];
-    }
-
-    /**
-     * Sets anytype_2
-     *
-     * @param object|null $anytype_2 anytype_2
-     *
-     * @return $this
-     */
-    public function setAnytype2($anytype_2)
-    {
-        $this->container['anytype_2'] = $anytype_2;
-
-        return $this;
-    }
-
-    /**
-     * Gets anytype_3
-     *
-     * @return object|null
-     */
-    public function getAnytype3()
+    public function getMapOfMapProperty()
     {
-        return $this->container['anytype_3'];
+        return $this->container['map_of_map_property'];
     }
 
     /**
-     * Sets anytype_3
+     * Sets map_of_map_property
      *
-     * @param object|null $anytype_3 anytype_3
+     * @param map[string,map[string,string]]|null $map_of_map_property map_of_map_property
      *
      * @return $this
      */
-    public function setAnytype3($anytype_3)
+    public function setMapOfMapProperty($map_of_map_property)
     {
-        $this->container['anytype_3'] = $anytype_3;
+        $this->container['map_of_map_property'] = $map_of_map_property;
 
         return $this;
     }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php
index 451bd646887f..a88602bc852e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesInteger
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php
index 37903b9b2d0f..a3238f4af96d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesNumber
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php
index 368663e4c59f..a86548a858cd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesObject
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php
index c01c4c0e5460..e1d3148549a0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesString
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
index 3d0b6ec089b2..145ecc65ac0f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
@@ -2,7 +2,7 @@
 /**
  * Animal
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
index b621b9b85468..43244c474eea 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
@@ -2,7 +2,7 @@
 /**
  * ApiResponse
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
index 6427d34c821d..a0f5ccfd05a7 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -2,7 +2,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
index 5bbb390a9bf3..483ea4fbd9e7 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
@@ -2,7 +2,7 @@
 /**
  * ArrayOfNumberOnly
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
index 8bf78347cb43..bad6739097d4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
@@ -2,7 +2,7 @@
 /**
  * ArrayTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCat.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCat.php
index e3cdbfea26c7..e831b5a34749 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCat.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCat.php
@@ -2,7 +2,7 @@
 /**
  * BigCat
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCatAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCatAllOf.php
index fd99dcd6faae..468864545df8 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCatAllOf.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/BigCatAllOf.php
@@ -2,7 +2,7 @@
 /**
  * BigCatAllOf
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
index 87d9797bbd5d..973de7be8fce 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
@@ -2,7 +2,7 @@
 /**
  * Capitalization
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
index 3f401bf92576..5603aab4c7df 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
@@ -2,7 +2,7 @@
 /**
  * Cat
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
index c7bf3b6a899c..8d31dffa0f55 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
@@ -2,7 +2,7 @@
 /**
  * CatAllOf
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
index 9a5650889032..174fdd9b84f1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
@@ -2,7 +2,7 @@
 /**
  * Category
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
index 8b97176b5c47..f833dea74f39 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
@@ -2,7 +2,7 @@
 /**
  * ClassModel
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
index 3213c427076f..564b89cec449 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
@@ -2,7 +2,7 @@
 /**
  * Client
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
index 30fc3fd6f8ed..4a205e6a0acd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
@@ -2,7 +2,7 @@
 /**
  * Dog
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
index dbb1eaf631a3..dc8ac5fefe7f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
@@ -2,7 +2,7 @@
 /**
  * DogAllOf
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
index b8f8ca180d98..b26906a75cc4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
@@ -2,7 +2,7 @@
 /**
  * EnumArrays
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
index bdde07b3bc49..ba586a5606b4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
@@ -2,7 +2,7 @@
 /**
  * EnumClass
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
index 421ac634cc42..005a3fea0b3c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
@@ -2,7 +2,7 @@
 /**
  * EnumTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -61,7 +61,10 @@ class EnumTest implements ModelInterface, ArrayAccess
         'enum_string_required' => 'string',
         'enum_integer' => 'int',
         'enum_number' => 'double',
-        'outer_enum' => '\OpenAPI\Client\Model\OuterEnum'
+        'outer_enum' => '\OpenAPI\Client\Model\OuterEnum',
+        'outer_enum_integer' => '\OpenAPI\Client\Model\OuterEnumInteger',
+        'outer_enum_default_value' => '\OpenAPI\Client\Model\OuterEnumDefaultValue',
+        'outer_enum_integer_default_value' => '\OpenAPI\Client\Model\OuterEnumIntegerDefaultValue'
     ];
 
     /**
@@ -74,7 +77,10 @@ class EnumTest implements ModelInterface, ArrayAccess
         'enum_string_required' => null,
         'enum_integer' => 'int32',
         'enum_number' => 'double',
-        'outer_enum' => null
+        'outer_enum' => null,
+        'outer_enum_integer' => null,
+        'outer_enum_default_value' => null,
+        'outer_enum_integer_default_value' => null
     ];
 
     /**
@@ -108,7 +114,10 @@ public static function openAPIFormats()
         'enum_string_required' => 'enum_string_required',
         'enum_integer' => 'enum_integer',
         'enum_number' => 'enum_number',
-        'outer_enum' => 'outerEnum'
+        'outer_enum' => 'outerEnum',
+        'outer_enum_integer' => 'outerEnumInteger',
+        'outer_enum_default_value' => 'outerEnumDefaultValue',
+        'outer_enum_integer_default_value' => 'outerEnumIntegerDefaultValue'
     ];
 
     /**
@@ -121,7 +130,10 @@ public static function openAPIFormats()
         'enum_string_required' => 'setEnumStringRequired',
         'enum_integer' => 'setEnumInteger',
         'enum_number' => 'setEnumNumber',
-        'outer_enum' => 'setOuterEnum'
+        'outer_enum' => 'setOuterEnum',
+        'outer_enum_integer' => 'setOuterEnumInteger',
+        'outer_enum_default_value' => 'setOuterEnumDefaultValue',
+        'outer_enum_integer_default_value' => 'setOuterEnumIntegerDefaultValue'
     ];
 
     /**
@@ -134,7 +146,10 @@ public static function openAPIFormats()
         'enum_string_required' => 'getEnumStringRequired',
         'enum_integer' => 'getEnumInteger',
         'enum_number' => 'getEnumNumber',
-        'outer_enum' => 'getOuterEnum'
+        'outer_enum' => 'getOuterEnum',
+        'outer_enum_integer' => 'getOuterEnumInteger',
+        'outer_enum_default_value' => 'getOuterEnumDefaultValue',
+        'outer_enum_integer_default_value' => 'getOuterEnumIntegerDefaultValue'
     ];
 
     /**
@@ -266,6 +281,9 @@ public function __construct(array $data = null)
         $this->container['enum_integer'] = isset($data['enum_integer']) ? $data['enum_integer'] : null;
         $this->container['enum_number'] = isset($data['enum_number']) ? $data['enum_number'] : null;
         $this->container['outer_enum'] = isset($data['outer_enum']) ? $data['outer_enum'] : null;
+        $this->container['outer_enum_integer'] = isset($data['outer_enum_integer']) ? $data['outer_enum_integer'] : null;
+        $this->container['outer_enum_default_value'] = isset($data['outer_enum_default_value']) ? $data['outer_enum_default_value'] : null;
+        $this->container['outer_enum_integer_default_value'] = isset($data['outer_enum_integer_default_value']) ? $data['outer_enum_integer_default_value'] : null;
     }
 
     /**
@@ -482,6 +500,78 @@ public function setOuterEnum($outer_enum)
 
         return $this;
     }
+
+    /**
+     * Gets outer_enum_integer
+     *
+     * @return \OpenAPI\Client\Model\OuterEnumInteger|null
+     */
+    public function getOuterEnumInteger()
+    {
+        return $this->container['outer_enum_integer'];
+    }
+
+    /**
+     * Sets outer_enum_integer
+     *
+     * @param \OpenAPI\Client\Model\OuterEnumInteger|null $outer_enum_integer outer_enum_integer
+     *
+     * @return $this
+     */
+    public function setOuterEnumInteger($outer_enum_integer)
+    {
+        $this->container['outer_enum_integer'] = $outer_enum_integer;
+
+        return $this;
+    }
+
+    /**
+     * Gets outer_enum_default_value
+     *
+     * @return \OpenAPI\Client\Model\OuterEnumDefaultValue|null
+     */
+    public function getOuterEnumDefaultValue()
+    {
+        return $this->container['outer_enum_default_value'];
+    }
+
+    /**
+     * Sets outer_enum_default_value
+     *
+     * @param \OpenAPI\Client\Model\OuterEnumDefaultValue|null $outer_enum_default_value outer_enum_default_value
+     *
+     * @return $this
+     */
+    public function setOuterEnumDefaultValue($outer_enum_default_value)
+    {
+        $this->container['outer_enum_default_value'] = $outer_enum_default_value;
+
+        return $this;
+    }
+
+    /**
+     * Gets outer_enum_integer_default_value
+     *
+     * @return \OpenAPI\Client\Model\OuterEnumIntegerDefaultValue|null
+     */
+    public function getOuterEnumIntegerDefaultValue()
+    {
+        return $this->container['outer_enum_integer_default_value'];
+    }
+
+    /**
+     * Sets outer_enum_integer_default_value
+     *
+     * @param \OpenAPI\Client\Model\OuterEnumIntegerDefaultValue|null $outer_enum_integer_default_value outer_enum_integer_default_value
+     *
+     * @return $this
+     */
+    public function setOuterEnumIntegerDefaultValue($outer_enum_integer_default_value)
+    {
+        $this->container['outer_enum_integer_default_value'] = $outer_enum_integer_default_value;
+
+        return $this;
+    }
     /**
      * Returns true if offset exists. False otherwise.
      *
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
index bdfe4c716b7b..03a15d5b8021 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
@@ -2,7 +2,7 @@
 /**
  * File
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
index 53c02bb4e908..4f8ffd8d9de8 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
@@ -2,7 +2,7 @@
 /**
  * FileSchemaTestClass
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
index bbc53c2243b8..8213f1d0e348 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
@@ -2,7 +2,7 @@
 /**
  * Foo
  *
- * PHP version 5
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -15,10 +15,10 @@
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 4.0.0-SNAPSHOT
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
  */
 
 /**
@@ -292,6 +292,16 @@ public function __toString()
             JSON_PRETTY_PRINT
         );
     }
+
+    /**
+     * Gets a header-safe presentation of the object
+     *
+     * @return string
+     */
+    public function toHeaderValue()
+    {
+        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
+    }
 }
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
index 63c48102cabd..0394d187aca0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
@@ -2,7 +2,7 @@
 /**
  * FormatTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -70,7 +70,8 @@ class FormatTest implements ModelInterface, ArrayAccess
         'date_time' => '\DateTime',
         'uuid' => 'string',
         'password' => 'string',
-        'big_decimal' => 'BigDecimal'
+        'pattern_with_digits' => 'string',
+        'pattern_with_digits_and_delimiter' => 'string'
     ];
 
     /**
@@ -92,7 +93,8 @@ class FormatTest implements ModelInterface, ArrayAccess
         'date_time' => 'date-time',
         'uuid' => 'uuid',
         'password' => 'password',
-        'big_decimal' => 'number'
+        'pattern_with_digits' => null,
+        'pattern_with_digits_and_delimiter' => null
     ];
 
     /**
@@ -135,7 +137,8 @@ public static function openAPIFormats()
         'date_time' => 'dateTime',
         'uuid' => 'uuid',
         'password' => 'password',
-        'big_decimal' => 'BigDecimal'
+        'pattern_with_digits' => 'pattern_with_digits',
+        'pattern_with_digits_and_delimiter' => 'pattern_with_digits_and_delimiter'
     ];
 
     /**
@@ -157,7 +160,8 @@ public static function openAPIFormats()
         'date_time' => 'setDateTime',
         'uuid' => 'setUuid',
         'password' => 'setPassword',
-        'big_decimal' => 'setBigDecimal'
+        'pattern_with_digits' => 'setPatternWithDigits',
+        'pattern_with_digits_and_delimiter' => 'setPatternWithDigitsAndDelimiter'
     ];
 
     /**
@@ -179,7 +183,8 @@ public static function openAPIFormats()
         'date_time' => 'getDateTime',
         'uuid' => 'getUuid',
         'password' => 'getPassword',
-        'big_decimal' => 'getBigDecimal'
+        'pattern_with_digits' => 'getPatternWithDigits',
+        'pattern_with_digits_and_delimiter' => 'getPatternWithDigitsAndDelimiter'
     ];
 
     /**
@@ -255,7 +260,8 @@ public function __construct(array $data = null)
         $this->container['date_time'] = isset($data['date_time']) ? $data['date_time'] : null;
         $this->container['uuid'] = isset($data['uuid']) ? $data['uuid'] : null;
         $this->container['password'] = isset($data['password']) ? $data['password'] : null;
-        $this->container['big_decimal'] = isset($data['big_decimal']) ? $data['big_decimal'] : null;
+        $this->container['pattern_with_digits'] = isset($data['pattern_with_digits']) ? $data['pattern_with_digits'] : null;
+        $this->container['pattern_with_digits_and_delimiter'] = isset($data['pattern_with_digits_and_delimiter']) ? $data['pattern_with_digits_and_delimiter'] : null;
     }
 
     /**
@@ -317,10 +323,6 @@ public function listInvalidProperties()
         if ($this->container['byte'] === null) {
             $invalidProperties[] = "'byte' can't be null";
         }
-        if (!preg_match("/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/", $this->container['byte'])) {
-            $invalidProperties[] = "invalid value for 'byte', must be conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.";
-        }
-
         if ($this->container['date'] === null) {
             $invalidProperties[] = "'date' can't be null";
         }
@@ -335,6 +337,14 @@ public function listInvalidProperties()
             $invalidProperties[] = "invalid value for 'password', the character length must be bigger than or equal to 10.";
         }
 
+        if (!is_null($this->container['pattern_with_digits']) && !preg_match("/^\\d{10}$/", $this->container['pattern_with_digits'])) {
+            $invalidProperties[] = "invalid value for 'pattern_with_digits', must be conform to the pattern /^\\d{10}$/.";
+        }
+
+        if (!is_null($this->container['pattern_with_digits_and_delimiter']) && !preg_match("/^image_\\d{1,3}$/i", $this->container['pattern_with_digits_and_delimiter'])) {
+            $invalidProperties[] = "invalid value for 'pattern_with_digits_and_delimiter', must be conform to the pattern /^image_\\d{1,3}$/i.";
+        }
+
         return $invalidProperties;
     }
 
@@ -582,11 +592,6 @@ public function getByte()
      */
     public function setByte($byte)
     {
-
-        if ((!preg_match("/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/", $byte))) {
-            throw new \InvalidArgumentException("invalid value for $byte when calling FormatTest., must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.");
-        }
-
         $this->container['byte'] = $byte;
 
         return $this;
@@ -720,25 +725,59 @@ public function setPassword($password)
     }
 
     /**
-     * Gets big_decimal
+     * Gets pattern_with_digits
      *
-     * @return BigDecimal|null
+     * @return string|null
      */
-    public function getBigDecimal()
+    public function getPatternWithDigits()
     {
-        return $this->container['big_decimal'];
+        return $this->container['pattern_with_digits'];
     }
 
     /**
-     * Sets big_decimal
+     * Sets pattern_with_digits
      *
-     * @param BigDecimal|null $big_decimal big_decimal
+     * @param string|null $pattern_with_digits A string that is a 10 digit number. Can have leading zeros.
      *
      * @return $this
      */
-    public function setBigDecimal($big_decimal)
+    public function setPatternWithDigits($pattern_with_digits)
     {
-        $this->container['big_decimal'] = $big_decimal;
+
+        if (!is_null($pattern_with_digits) && (!preg_match("/^\\d{10}$/", $pattern_with_digits))) {
+            throw new \InvalidArgumentException("invalid value for $pattern_with_digits when calling FormatTest., must conform to the pattern /^\\d{10}$/.");
+        }
+
+        $this->container['pattern_with_digits'] = $pattern_with_digits;
+
+        return $this;
+    }
+
+    /**
+     * Gets pattern_with_digits_and_delimiter
+     *
+     * @return string|null
+     */
+    public function getPatternWithDigitsAndDelimiter()
+    {
+        return $this->container['pattern_with_digits_and_delimiter'];
+    }
+
+    /**
+     * Sets pattern_with_digits_and_delimiter
+     *
+     * @param string|null $pattern_with_digits_and_delimiter A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.
+     *
+     * @return $this
+     */
+    public function setPatternWithDigitsAndDelimiter($pattern_with_digits_and_delimiter)
+    {
+
+        if (!is_null($pattern_with_digits_and_delimiter) && (!preg_match("/^image_\\d{1,3}$/i", $pattern_with_digits_and_delimiter))) {
+            throw new \InvalidArgumentException("invalid value for $pattern_with_digits_and_delimiter when calling FormatTest., must conform to the pattern /^image_\\d{1,3}$/i.");
+        }
+
+        $this->container['pattern_with_digits_and_delimiter'] = $pattern_with_digits_and_delimiter;
 
         return $this;
     }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
index 6c7bf0aed692..40a8e5584fc3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
@@ -2,7 +2,7 @@
 /**
  * HasOnlyReadOnly
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php
new file mode 100644
index 000000000000..1f959f71635f
--- /dev/null
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php
@@ -0,0 +1,308 @@
+<?php
+/**
+ * HealthCheckResult
+ *
+ * PHP version 7.2
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPI\Client\Model;
+
+use \ArrayAccess;
+use \OpenAPI\Client\ObjectSerializer;
+
+/**
+ * HealthCheckResult Class Doc Comment
+ *
+ * @category Class
+ * @description Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+class HealthCheckResult implements ModelInterface, ArrayAccess
+{
+    const DISCRIMINATOR = null;
+
+    /**
+      * The original name of the model.
+      *
+      * @var string
+      */
+    protected static $openAPIModelName = 'HealthCheckResult';
+
+    /**
+      * Array of property to type mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPITypes = [
+        'nullable_message' => 'string'
+    ];
+
+    /**
+      * Array of property to format mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPIFormats = [
+        'nullable_message' => null
+    ];
+
+    /**
+     * Array of property to type mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPITypes()
+    {
+        return self::$openAPITypes;
+    }
+
+    /**
+     * Array of property to format mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPIFormats()
+    {
+        return self::$openAPIFormats;
+    }
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @var string[]
+     */
+    protected static $attributeMap = [
+        'nullable_message' => 'NullableMessage'
+    ];
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @var string[]
+     */
+    protected static $setters = [
+        'nullable_message' => 'setNullableMessage'
+    ];
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @var string[]
+     */
+    protected static $getters = [
+        'nullable_message' => 'getNullableMessage'
+    ];
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @return array
+     */
+    public static function attributeMap()
+    {
+        return self::$attributeMap;
+    }
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @return array
+     */
+    public static function setters()
+    {
+        return self::$setters;
+    }
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @return array
+     */
+    public static function getters()
+    {
+        return self::$getters;
+    }
+
+    /**
+     * The original name of the model.
+     *
+     * @return string
+     */
+    public function getModelName()
+    {
+        return self::$openAPIModelName;
+    }
+
+    
+
+    
+
+    /**
+     * Associative array for storing property values
+     *
+     * @var mixed[]
+     */
+    protected $container = [];
+
+    /**
+     * Constructor
+     *
+     * @param mixed[] $data Associated array of property values
+     *                      initializing the model
+     */
+    public function __construct(array $data = null)
+    {
+        $this->container['nullable_message'] = isset($data['nullable_message']) ? $data['nullable_message'] : null;
+    }
+
+    /**
+     * Show all the invalid properties with reasons.
+     *
+     * @return array invalid properties with reasons
+     */
+    public function listInvalidProperties()
+    {
+        $invalidProperties = [];
+
+        return $invalidProperties;
+    }
+
+    /**
+     * Validate all the properties in the model
+     * return true if all passed
+     *
+     * @return bool True if all properties are valid
+     */
+    public function valid()
+    {
+        return count($this->listInvalidProperties()) === 0;
+    }
+
+
+    /**
+     * Gets nullable_message
+     *
+     * @return string|null
+     */
+    public function getNullableMessage()
+    {
+        return $this->container['nullable_message'];
+    }
+
+    /**
+     * Sets nullable_message
+     *
+     * @param string|null $nullable_message nullable_message
+     *
+     * @return $this
+     */
+    public function setNullableMessage($nullable_message)
+    {
+        $this->container['nullable_message'] = $nullable_message;
+
+        return $this;
+    }
+    /**
+     * Returns true if offset exists. False otherwise.
+     *
+     * @param integer $offset Offset
+     *
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->container[$offset]);
+    }
+
+    /**
+     * Gets offset.
+     *
+     * @param integer $offset Offset
+     *
+     * @return mixed
+     */
+    public function offsetGet($offset)
+    {
+        return isset($this->container[$offset]) ? $this->container[$offset] : null;
+    }
+
+    /**
+     * Sets value based on offset.
+     *
+     * @param integer $offset Offset
+     * @param mixed   $value  Value to be set
+     *
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        if (is_null($offset)) {
+            $this->container[] = $value;
+        } else {
+            $this->container[$offset] = $value;
+        }
+    }
+
+    /**
+     * Unsets offset.
+     *
+     * @param integer $offset Offset
+     *
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->container[$offset]);
+    }
+
+    /**
+     * Gets the string presentation of the object
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
+
+    /**
+     * Gets a header-safe presentation of the object
+     *
+     * @return string
+     */
+    public function toHeaderValue()
+    {
+        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
+    }
+}
+
+
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
index 3a9aa4320070..17808cab18ec 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
@@ -2,7 +2,7 @@
 /**
  * InlineObject
  *
- * PHP version 5
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -15,10 +15,10 @@
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 4.0.0-SNAPSHOT
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
  */
 
 /**
@@ -322,6 +322,16 @@ public function __toString()
             JSON_PRETTY_PRINT
         );
     }
+
+    /**
+     * Gets a header-safe presentation of the object
+     *
+     * @return string
+     */
+    public function toHeaderValue()
+    {
+        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
+    }
 }
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
index 0da191b58331..7c16738bc07b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
@@ -2,7 +2,7 @@
 /**
  * InlineObject1
  *
- * PHP version 5
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -15,10 +15,10 @@
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 4.0.0-SNAPSHOT
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
  */
 
 /**
@@ -322,6 +322,16 @@ public function __toString()
             JSON_PRETTY_PRINT
         );
     }
+
+    /**
+     * Gets a header-safe presentation of the object
+     *
+     * @return string
+     */
+    public function toHeaderValue()
+    {
+        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
+    }
 }
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
index 802805186930..5459e3475bca 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
@@ -2,7 +2,7 @@
 /**
  * InlineObject2
  *
- * PHP version 5
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -15,10 +15,10 @@
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 4.0.0-SNAPSHOT
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
  */
 
 /**
@@ -380,6 +380,16 @@ public function __toString()
             JSON_PRETTY_PRINT
         );
     }
+
+    /**
+     * Gets a header-safe presentation of the object
+     *
+     * @return string
+     */
+    public function toHeaderValue()
+    {
+        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
+    }
 }
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
index b6c4e18fbf33..c1383f808038 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
@@ -2,7 +2,7 @@
 /**
  * InlineObject3
  *
- * PHP version 5
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -15,10 +15,10 @@
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 4.0.0-SNAPSHOT
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
  */
 
 /**
@@ -79,7 +79,7 @@ class InlineObject3 implements ModelInterface, ArrayAccess
       * @var string[]
       */
     protected static $openAPIFormats = [
-        'integer' => 'int32',
+        'integer' => null,
         'int32' => 'int32',
         'int64' => 'int64',
         'number' => null,
@@ -800,6 +800,16 @@ public function __toString()
             JSON_PRETTY_PRINT
         );
     }
+
+    /**
+     * Gets a header-safe presentation of the object
+     *
+     * @return string
+     */
+    public function toHeaderValue()
+    {
+        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
+    }
 }
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
index e06180ca5a3c..67120fcf6a47 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
@@ -2,7 +2,7 @@
 /**
  * InlineObject4
  *
- * PHP version 5
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -15,10 +15,10 @@
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 4.0.0-SNAPSHOT
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
  */
 
 /**
@@ -328,6 +328,16 @@ public function __toString()
             JSON_PRETTY_PRINT
         );
     }
+
+    /**
+     * Gets a header-safe presentation of the object
+     *
+     * @return string
+     */
+    public function toHeaderValue()
+    {
+        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
+    }
 }
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
index bf42a623537e..fe0456b3a838 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
@@ -2,7 +2,7 @@
 /**
  * InlineObject5
  *
- * PHP version 5
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -15,10 +15,10 @@
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 4.0.0-SNAPSHOT
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
  */
 
 /**
@@ -325,6 +325,16 @@ public function __toString()
             JSON_PRETTY_PRINT
         );
     }
+
+    /**
+     * Gets a header-safe presentation of the object
+     *
+     * @return string
+     */
+    public function toHeaderValue()
+    {
+        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
+    }
 }
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
index 9aab09e323e0..53146c15e459 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
@@ -2,7 +2,7 @@
 /**
  * InlineResponseDefault
  *
- * PHP version 5
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -15,10 +15,10 @@
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 4.0.0-SNAPSHOT
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
  */
 
 /**
@@ -292,6 +292,16 @@ public function __toString()
             JSON_PRETTY_PRINT
         );
     }
+
+    /**
+     * Gets a header-safe presentation of the object
+     *
+     * @return string
+     */
+    public function toHeaderValue()
+    {
+        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
+    }
 }
 
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
index 56d11e0d64ca..be76b2439b92 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
@@ -2,7 +2,7 @@
 /**
  * MapTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
index 315fb8920670..2522e4d5d523 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -2,7 +2,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
index 548396b393d3..5be747eb5253 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
@@ -2,7 +2,7 @@
 /**
  * Model200Response
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
index 65d496f8591d..fcfdd67eebfc 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
@@ -2,7 +2,7 @@
 /**
  * ModelInterface
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client\Model
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
index 3797ba6eef39..85335938efd3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
@@ -2,7 +2,7 @@
 /**
  * ModelList
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
index f9bf057b4d6d..7de6909e70b0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
@@ -2,7 +2,7 @@
 /**
  * ModelReturn
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
index 31d94ac67b27..a3eddb499868 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
@@ -2,7 +2,7 @@
 /**
  * Name
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php
new file mode 100644
index 000000000000..170f6a256fc9
--- /dev/null
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php
@@ -0,0 +1,637 @@
+<?php
+/**
+ * NullableClass
+ *
+ * PHP version 7.2
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPI\Client\Model;
+
+use \ArrayAccess;
+use \OpenAPI\Client\ObjectSerializer;
+
+/**
+ * NullableClass Class Doc Comment
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+class NullableClass implements ModelInterface, ArrayAccess
+{
+    const DISCRIMINATOR = null;
+
+    /**
+      * The original name of the model.
+      *
+      * @var string
+      */
+    protected static $openAPIModelName = 'NullableClass';
+
+    /**
+      * Array of property to type mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPITypes = [
+        'integer_prop' => 'int',
+        'number_prop' => 'float',
+        'boolean_prop' => 'bool',
+        'string_prop' => 'string',
+        'date_prop' => '\DateTime',
+        'datetime_prop' => '\DateTime',
+        'array_nullable_prop' => 'object[]',
+        'array_and_items_nullable_prop' => 'object[]',
+        'array_items_nullable' => 'object[]',
+        'object_nullable_prop' => 'map[string,object]',
+        'object_and_items_nullable_prop' => 'map[string,object]',
+        'object_items_nullable' => 'map[string,object]'
+    ];
+
+    /**
+      * Array of property to format mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPIFormats = [
+        'integer_prop' => null,
+        'number_prop' => null,
+        'boolean_prop' => null,
+        'string_prop' => null,
+        'date_prop' => 'date',
+        'datetime_prop' => 'date-time',
+        'array_nullable_prop' => null,
+        'array_and_items_nullable_prop' => null,
+        'array_items_nullable' => null,
+        'object_nullable_prop' => null,
+        'object_and_items_nullable_prop' => null,
+        'object_items_nullable' => null
+    ];
+
+    /**
+     * Array of property to type mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPITypes()
+    {
+        return self::$openAPITypes;
+    }
+
+    /**
+     * Array of property to format mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPIFormats()
+    {
+        return self::$openAPIFormats;
+    }
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @var string[]
+     */
+    protected static $attributeMap = [
+        'integer_prop' => 'integer_prop',
+        'number_prop' => 'number_prop',
+        'boolean_prop' => 'boolean_prop',
+        'string_prop' => 'string_prop',
+        'date_prop' => 'date_prop',
+        'datetime_prop' => 'datetime_prop',
+        'array_nullable_prop' => 'array_nullable_prop',
+        'array_and_items_nullable_prop' => 'array_and_items_nullable_prop',
+        'array_items_nullable' => 'array_items_nullable',
+        'object_nullable_prop' => 'object_nullable_prop',
+        'object_and_items_nullable_prop' => 'object_and_items_nullable_prop',
+        'object_items_nullable' => 'object_items_nullable'
+    ];
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @var string[]
+     */
+    protected static $setters = [
+        'integer_prop' => 'setIntegerProp',
+        'number_prop' => 'setNumberProp',
+        'boolean_prop' => 'setBooleanProp',
+        'string_prop' => 'setStringProp',
+        'date_prop' => 'setDateProp',
+        'datetime_prop' => 'setDatetimeProp',
+        'array_nullable_prop' => 'setArrayNullableProp',
+        'array_and_items_nullable_prop' => 'setArrayAndItemsNullableProp',
+        'array_items_nullable' => 'setArrayItemsNullable',
+        'object_nullable_prop' => 'setObjectNullableProp',
+        'object_and_items_nullable_prop' => 'setObjectAndItemsNullableProp',
+        'object_items_nullable' => 'setObjectItemsNullable'
+    ];
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @var string[]
+     */
+    protected static $getters = [
+        'integer_prop' => 'getIntegerProp',
+        'number_prop' => 'getNumberProp',
+        'boolean_prop' => 'getBooleanProp',
+        'string_prop' => 'getStringProp',
+        'date_prop' => 'getDateProp',
+        'datetime_prop' => 'getDatetimeProp',
+        'array_nullable_prop' => 'getArrayNullableProp',
+        'array_and_items_nullable_prop' => 'getArrayAndItemsNullableProp',
+        'array_items_nullable' => 'getArrayItemsNullable',
+        'object_nullable_prop' => 'getObjectNullableProp',
+        'object_and_items_nullable_prop' => 'getObjectAndItemsNullableProp',
+        'object_items_nullable' => 'getObjectItemsNullable'
+    ];
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @return array
+     */
+    public static function attributeMap()
+    {
+        return self::$attributeMap;
+    }
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @return array
+     */
+    public static function setters()
+    {
+        return self::$setters;
+    }
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @return array
+     */
+    public static function getters()
+    {
+        return self::$getters;
+    }
+
+    /**
+     * The original name of the model.
+     *
+     * @return string
+     */
+    public function getModelName()
+    {
+        return self::$openAPIModelName;
+    }
+
+    
+
+    
+
+    /**
+     * Associative array for storing property values
+     *
+     * @var mixed[]
+     */
+    protected $container = [];
+
+    /**
+     * Constructor
+     *
+     * @param mixed[] $data Associated array of property values
+     *                      initializing the model
+     */
+    public function __construct(array $data = null)
+    {
+        $this->container['integer_prop'] = isset($data['integer_prop']) ? $data['integer_prop'] : null;
+        $this->container['number_prop'] = isset($data['number_prop']) ? $data['number_prop'] : null;
+        $this->container['boolean_prop'] = isset($data['boolean_prop']) ? $data['boolean_prop'] : null;
+        $this->container['string_prop'] = isset($data['string_prop']) ? $data['string_prop'] : null;
+        $this->container['date_prop'] = isset($data['date_prop']) ? $data['date_prop'] : null;
+        $this->container['datetime_prop'] = isset($data['datetime_prop']) ? $data['datetime_prop'] : null;
+        $this->container['array_nullable_prop'] = isset($data['array_nullable_prop']) ? $data['array_nullable_prop'] : null;
+        $this->container['array_and_items_nullable_prop'] = isset($data['array_and_items_nullable_prop']) ? $data['array_and_items_nullable_prop'] : null;
+        $this->container['array_items_nullable'] = isset($data['array_items_nullable']) ? $data['array_items_nullable'] : null;
+        $this->container['object_nullable_prop'] = isset($data['object_nullable_prop']) ? $data['object_nullable_prop'] : null;
+        $this->container['object_and_items_nullable_prop'] = isset($data['object_and_items_nullable_prop']) ? $data['object_and_items_nullable_prop'] : null;
+        $this->container['object_items_nullable'] = isset($data['object_items_nullable']) ? $data['object_items_nullable'] : null;
+    }
+
+    /**
+     * Show all the invalid properties with reasons.
+     *
+     * @return array invalid properties with reasons
+     */
+    public function listInvalidProperties()
+    {
+        $invalidProperties = parent::listInvalidProperties();
+
+        return $invalidProperties;
+    }
+
+    /**
+     * Validate all the properties in the model
+     * return true if all passed
+     *
+     * @return bool True if all properties are valid
+     */
+    public function valid()
+    {
+        return count($this->listInvalidProperties()) === 0;
+    }
+
+
+    /**
+     * Gets integer_prop
+     *
+     * @return int|null
+     */
+    public function getIntegerProp()
+    {
+        return $this->container['integer_prop'];
+    }
+
+    /**
+     * Sets integer_prop
+     *
+     * @param int|null $integer_prop integer_prop
+     *
+     * @return $this
+     */
+    public function setIntegerProp($integer_prop)
+    {
+        $this->container['integer_prop'] = $integer_prop;
+
+        return $this;
+    }
+
+    /**
+     * Gets number_prop
+     *
+     * @return float|null
+     */
+    public function getNumberProp()
+    {
+        return $this->container['number_prop'];
+    }
+
+    /**
+     * Sets number_prop
+     *
+     * @param float|null $number_prop number_prop
+     *
+     * @return $this
+     */
+    public function setNumberProp($number_prop)
+    {
+        $this->container['number_prop'] = $number_prop;
+
+        return $this;
+    }
+
+    /**
+     * Gets boolean_prop
+     *
+     * @return bool|null
+     */
+    public function getBooleanProp()
+    {
+        return $this->container['boolean_prop'];
+    }
+
+    /**
+     * Sets boolean_prop
+     *
+     * @param bool|null $boolean_prop boolean_prop
+     *
+     * @return $this
+     */
+    public function setBooleanProp($boolean_prop)
+    {
+        $this->container['boolean_prop'] = $boolean_prop;
+
+        return $this;
+    }
+
+    /**
+     * Gets string_prop
+     *
+     * @return string|null
+     */
+    public function getStringProp()
+    {
+        return $this->container['string_prop'];
+    }
+
+    /**
+     * Sets string_prop
+     *
+     * @param string|null $string_prop string_prop
+     *
+     * @return $this
+     */
+    public function setStringProp($string_prop)
+    {
+        $this->container['string_prop'] = $string_prop;
+
+        return $this;
+    }
+
+    /**
+     * Gets date_prop
+     *
+     * @return \DateTime|null
+     */
+    public function getDateProp()
+    {
+        return $this->container['date_prop'];
+    }
+
+    /**
+     * Sets date_prop
+     *
+     * @param \DateTime|null $date_prop date_prop
+     *
+     * @return $this
+     */
+    public function setDateProp($date_prop)
+    {
+        $this->container['date_prop'] = $date_prop;
+
+        return $this;
+    }
+
+    /**
+     * Gets datetime_prop
+     *
+     * @return \DateTime|null
+     */
+    public function getDatetimeProp()
+    {
+        return $this->container['datetime_prop'];
+    }
+
+    /**
+     * Sets datetime_prop
+     *
+     * @param \DateTime|null $datetime_prop datetime_prop
+     *
+     * @return $this
+     */
+    public function setDatetimeProp($datetime_prop)
+    {
+        $this->container['datetime_prop'] = $datetime_prop;
+
+        return $this;
+    }
+
+    /**
+     * Gets array_nullable_prop
+     *
+     * @return object[]|null
+     */
+    public function getArrayNullableProp()
+    {
+        return $this->container['array_nullable_prop'];
+    }
+
+    /**
+     * Sets array_nullable_prop
+     *
+     * @param object[]|null $array_nullable_prop array_nullable_prop
+     *
+     * @return $this
+     */
+    public function setArrayNullableProp($array_nullable_prop)
+    {
+        $this->container['array_nullable_prop'] = $array_nullable_prop;
+
+        return $this;
+    }
+
+    /**
+     * Gets array_and_items_nullable_prop
+     *
+     * @return object[]|null
+     */
+    public function getArrayAndItemsNullableProp()
+    {
+        return $this->container['array_and_items_nullable_prop'];
+    }
+
+    /**
+     * Sets array_and_items_nullable_prop
+     *
+     * @param object[]|null $array_and_items_nullable_prop array_and_items_nullable_prop
+     *
+     * @return $this
+     */
+    public function setArrayAndItemsNullableProp($array_and_items_nullable_prop)
+    {
+        $this->container['array_and_items_nullable_prop'] = $array_and_items_nullable_prop;
+
+        return $this;
+    }
+
+    /**
+     * Gets array_items_nullable
+     *
+     * @return object[]|null
+     */
+    public function getArrayItemsNullable()
+    {
+        return $this->container['array_items_nullable'];
+    }
+
+    /**
+     * Sets array_items_nullable
+     *
+     * @param object[]|null $array_items_nullable array_items_nullable
+     *
+     * @return $this
+     */
+    public function setArrayItemsNullable($array_items_nullable)
+    {
+        $this->container['array_items_nullable'] = $array_items_nullable;
+
+        return $this;
+    }
+
+    /**
+     * Gets object_nullable_prop
+     *
+     * @return map[string,object]|null
+     */
+    public function getObjectNullableProp()
+    {
+        return $this->container['object_nullable_prop'];
+    }
+
+    /**
+     * Sets object_nullable_prop
+     *
+     * @param map[string,object]|null $object_nullable_prop object_nullable_prop
+     *
+     * @return $this
+     */
+    public function setObjectNullableProp($object_nullable_prop)
+    {
+        $this->container['object_nullable_prop'] = $object_nullable_prop;
+
+        return $this;
+    }
+
+    /**
+     * Gets object_and_items_nullable_prop
+     *
+     * @return map[string,object]|null
+     */
+    public function getObjectAndItemsNullableProp()
+    {
+        return $this->container['object_and_items_nullable_prop'];
+    }
+
+    /**
+     * Sets object_and_items_nullable_prop
+     *
+     * @param map[string,object]|null $object_and_items_nullable_prop object_and_items_nullable_prop
+     *
+     * @return $this
+     */
+    public function setObjectAndItemsNullableProp($object_and_items_nullable_prop)
+    {
+        $this->container['object_and_items_nullable_prop'] = $object_and_items_nullable_prop;
+
+        return $this;
+    }
+
+    /**
+     * Gets object_items_nullable
+     *
+     * @return map[string,object]|null
+     */
+    public function getObjectItemsNullable()
+    {
+        return $this->container['object_items_nullable'];
+    }
+
+    /**
+     * Sets object_items_nullable
+     *
+     * @param map[string,object]|null $object_items_nullable object_items_nullable
+     *
+     * @return $this
+     */
+    public function setObjectItemsNullable($object_items_nullable)
+    {
+        $this->container['object_items_nullable'] = $object_items_nullable;
+
+        return $this;
+    }
+    /**
+     * Returns true if offset exists. False otherwise.
+     *
+     * @param integer $offset Offset
+     *
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->container[$offset]);
+    }
+
+    /**
+     * Gets offset.
+     *
+     * @param integer $offset Offset
+     *
+     * @return mixed
+     */
+    public function offsetGet($offset)
+    {
+        return isset($this->container[$offset]) ? $this->container[$offset] : null;
+    }
+
+    /**
+     * Sets value based on offset.
+     *
+     * @param integer $offset Offset
+     * @param mixed   $value  Value to be set
+     *
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        if (is_null($offset)) {
+            $this->container[] = $value;
+        } else {
+            $this->container[$offset] = $value;
+        }
+    }
+
+    /**
+     * Unsets offset.
+     *
+     * @param integer $offset Offset
+     *
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->container[$offset]);
+    }
+
+    /**
+     * Gets the string presentation of the object
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
+
+    /**
+     * Gets a header-safe presentation of the object
+     *
+     * @return string
+     */
+    public function toHeaderValue()
+    {
+        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
+    }
+}
+
+
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
index 0e6fab77fa00..17b092299c13 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
@@ -2,7 +2,7 @@
 /**
  * NumberOnly
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
index d038fd963eab..0fce0df270cc 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
@@ -2,7 +2,7 @@
 /**
  * Order
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
index 045913dd7d43..cab3e72a8c48 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
@@ -2,7 +2,7 @@
 /**
  * OuterComposite
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
index f76eb48cb8e9..e9314682d6cd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
@@ -2,7 +2,7 @@
 /**
  * OuterEnum
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php
new file mode 100644
index 000000000000..4d911580c95a
--- /dev/null
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * OuterEnumDefaultValue
+ *
+ * PHP version 7.2
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPI\Client\Model;
+use \OpenAPI\Client\ObjectSerializer;
+
+/**
+ * OuterEnumDefaultValue Class Doc Comment
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+class OuterEnumDefaultValue
+{
+    /**
+     * Possible values of this enum
+     */
+    const PLACED = 'placed';
+    const APPROVED = 'approved';
+    const DELIVERED = 'delivered';
+    
+    /**
+     * Gets allowable values of the enum
+     * @return string[]
+     */
+    public static function getAllowableEnumValues()
+    {
+        return [
+            self::PLACED,
+            self::APPROVED,
+            self::DELIVERED,
+        ];
+    }
+}
+
+
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php
new file mode 100644
index 000000000000..afcb9b180544
--- /dev/null
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * OuterEnumInteger
+ *
+ * PHP version 7.2
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPI\Client\Model;
+use \OpenAPI\Client\ObjectSerializer;
+
+/**
+ * OuterEnumInteger Class Doc Comment
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+class OuterEnumInteger
+{
+    /**
+     * Possible values of this enum
+     */
+    const 0 = 0;
+    const 1 = 1;
+    const 2 = 2;
+    
+    /**
+     * Gets allowable values of the enum
+     * @return string[]
+     */
+    public static function getAllowableEnumValues()
+    {
+        return [
+            self::0,
+            self::1,
+            self::2,
+        ];
+    }
+}
+
+
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php
new file mode 100644
index 000000000000..bd3f0f9a79cb
--- /dev/null
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * OuterEnumIntegerDefaultValue
+ *
+ * PHP version 7.2
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 5.0.0-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPI\Client\Model;
+use \OpenAPI\Client\ObjectSerializer;
+
+/**
+ * OuterEnumIntegerDefaultValue Class Doc Comment
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+class OuterEnumIntegerDefaultValue
+{
+    /**
+     * Possible values of this enum
+     */
+    const 0 = 0;
+    const 1 = 1;
+    const 2 = 2;
+    
+    /**
+     * Gets allowable values of the enum
+     * @return string[]
+     */
+    public static function getAllowableEnumValues()
+    {
+        return [
+            self::0,
+            self::1,
+            self::2,
+        ];
+    }
+}
+
+
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
index e5e3097a0744..4e341c3f60ec 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
@@ -2,7 +2,7 @@
 /**
  * Pet
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
index 51cd0d372e70..1cdb5ac74daf 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
@@ -2,7 +2,7 @@
 /**
  * ReadOnlyFirst
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
index 6bc71b537baa..b58e8fcff1e2 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
@@ -2,7 +2,7 @@
 /**
  * SpecialModelName
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -49,7 +49,7 @@ class SpecialModelName implements ModelInterface, ArrayAccess
       *
       * @var string
       */
-    protected static $openAPIModelName = '$special[model.name]';
+    protected static $openAPIModelName = '_special_model.name_';
 
     /**
       * Array of property to type mappings. Used for (de)serialization
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
index 9b6ac589a474..1c3dd48126d1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
@@ -2,7 +2,7 @@
 /**
  * Tag
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php
index 21585e0f0e91..1d0a089165e5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php
@@ -2,7 +2,7 @@
 /**
  * TypeHolderDefault
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php
index 7fc22e386bdf..ecadbe0ec236 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php
@@ -2,7 +2,7 @@
 /**
  * TypeHolderExample
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
index af14d63c68e9..859a20252490 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
@@ -2,7 +2,7 @@
 /**
  * User
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php
index d4b763da92ec..0b27d4ff57f9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php
@@ -2,7 +2,7 @@
 /**
  * XmlItem
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
index cfc13fe19b0f..4c7108c94b6f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
@@ -2,7 +2,7 @@
 /**
  * ObjectSerializer
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -202,7 +202,7 @@ public static function toString($value)
     {
         if ($value instanceof \DateTime) { // datetime in ISO8601 format
             return $value->format(self::$dateTimeFormat);
-        } else if (is_bool($value)) {
+        } elseif (is_bool($value)) {
             return $value ? 'true' : 'false';
         } else {
             return $value;
@@ -262,6 +262,11 @@ public static function deserialize($data, $class, $httpHeaders = null)
             return null;
         } elseif (strcasecmp(substr($class, -2), '[]') === 0) {
             $data = is_string($data) ? json_decode($data) : $data;
+            
+            if (!is_array($data)) {
+                throw new \InvalidArgumentException("Invalid array '$class'");
+            }
+            
             $subClass = substr($class, 0, -2);
             $values = [];
             foreach ($data as $key => $value) {
diff --git a/samples/client/petstore/php/OpenAPIClient-php/pom.xml b/samples/client/petstore/php/OpenAPIClient-php/pom.xml
index da15e1c40968..d5d32c3bd1bf 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/pom.xml
+++ b/samples/client/petstore/php/OpenAPIClient-php/pom.xml
@@ -1,10 +1,10 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openapitools</groupId>
-    <artifactId>PhpPetstoreOAS2Tests</artifactId>
+    <artifactId>PhpPetstoreOAS3Tests</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
-    <name>PHP OpenAPI OAS2 Client</name>
+    <name>PHP OpenAPI OAS3 Client</name>
     <build>
         <plugins>
             <plugin>
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
index d6f116e518d1..e27cb94acc01 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * AnotherFakeApiTest
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -47,28 +47,28 @@ class AnotherFakeApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
similarity index 88%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
index 24cad51b401f..cc8d162dade3 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DefaultApiTest
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -47,28 +47,28 @@ class DefaultApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
index 9244b67d30ed..fbd7182acd42 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FakeApiTest
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -47,38 +47,48 @@ class FakeApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
     /**
-     * Test case for createXmlItem
+     * Test case for fakeHealthGet
      *
-     * creates an XmlItem.
+     * Health check endpoint.
      *
      */
-    public function testCreateXmlItem()
+    public function testFakeHealthGet()
+    {
+    }
+
+    /**
+     * Test case for fakeHttpSignatureTest
+     *
+     * test http signature authentication.
+     *
+     */
+    public function testFakeHttpSignatureTest()
     {
     }
 
@@ -155,7 +165,7 @@ public function testTestClientModel()
     /**
      * Test case for testEndpointParameters
      *
-     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트.
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트.
      *
      */
     public function testTestEndpointParameters()
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
index 8a077e3ab77e..da81da6bb3f5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FakeClassnameTags123ApiTest
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -47,28 +47,28 @@ class FakeClassnameTags123ApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
index b952ce93e59e..eb4cdb92bf8b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PetApiTest
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -47,28 +47,28 @@ class PetApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
index cf5bca60d7f6..2259f61d7abe 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StoreApiTest
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -47,28 +47,28 @@ class StoreApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
index 3802a30ca9e0..ede511de41d5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * UserApiTest
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -47,28 +47,28 @@ class UserApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php
index 120d71002b43..c818b85c9f31 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesAnyTypeTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class AdditionalPropertiesAnyTypeTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php
index e7cb9ce8071b..73e43e955a0c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesArrayTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class AdditionalPropertiesArrayTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php
index aed08a77feed..2adb68c379c4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesBooleanTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class AdditionalPropertiesBooleanTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
index d71078b0c218..a0dd868d418d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesClassTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class AdditionalPropertiesClassTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -79,79 +79,16 @@ public function testAdditionalPropertiesClass()
     }
 
     /**
-     * Test attribute "map_string"
+     * Test attribute "map_property"
      */
-    public function testPropertyMapString()
+    public function testPropertyMapProperty()
     {
     }
 
     /**
-     * Test attribute "map_number"
+     * Test attribute "map_of_map_property"
      */
-    public function testPropertyMapNumber()
-    {
-    }
-
-    /**
-     * Test attribute "map_integer"
-     */
-    public function testPropertyMapInteger()
-    {
-    }
-
-    /**
-     * Test attribute "map_boolean"
-     */
-    public function testPropertyMapBoolean()
-    {
-    }
-
-    /**
-     * Test attribute "map_array_integer"
-     */
-    public function testPropertyMapArrayInteger()
-    {
-    }
-
-    /**
-     * Test attribute "map_array_anytype"
-     */
-    public function testPropertyMapArrayAnytype()
-    {
-    }
-
-    /**
-     * Test attribute "map_map_string"
-     */
-    public function testPropertyMapMapString()
-    {
-    }
-
-    /**
-     * Test attribute "map_map_anytype"
-     */
-    public function testPropertyMapMapAnytype()
-    {
-    }
-
-    /**
-     * Test attribute "anytype_1"
-     */
-    public function testPropertyAnytype1()
-    {
-    }
-
-    /**
-     * Test attribute "anytype_2"
-     */
-    public function testPropertyAnytype2()
-    {
-    }
-
-    /**
-     * Test attribute "anytype_3"
-     */
-    public function testPropertyAnytype3()
+    public function testPropertyMapOfMapProperty()
     {
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php
index 25751044e33a..a8effc06061e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesIntegerTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class AdditionalPropertiesIntegerTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php
index 30a0dd735a68..1afebb748f5e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesNumberTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class AdditionalPropertiesNumberTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php
index abc4c8af319f..d7e900f7b8a1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesObjectTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class AdditionalPropertiesObjectTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php
index e9943ed97605..10462b0013bf 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php
@@ -2,7 +2,7 @@
 /**
  * AdditionalPropertiesStringTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class AdditionalPropertiesStringTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
index 28fa6fbb6425..d5b6085e2b47 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
@@ -2,7 +2,7 @@
 /**
  * AnimalTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class AnimalTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
index 66611c070701..21e716d1872a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
@@ -2,7 +2,7 @@
 /**
  * ApiResponseTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class ApiResponseTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
index 12a2fda635a3..edb49953d1d6 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -2,7 +2,7 @@
 /**
  * ArrayOfArrayOfNumberOnlyTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class ArrayOfArrayOfNumberOnlyTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
index 41f5db74ea07..4b2059689c57 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
@@ -2,7 +2,7 @@
 /**
  * ArrayOfNumberOnlyTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class ArrayOfNumberOnlyTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
index 6b1d05798038..498ba99a1e61 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
@@ -2,7 +2,7 @@
 /**
  * ArrayTestTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class ArrayTestTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatAllOfTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatAllOfTest.php
index dd030b7b4fd8..af0dad92c191 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatAllOfTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatAllOfTest.php
@@ -2,7 +2,7 @@
 /**
  * BigCatAllOfTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class BigCatAllOfTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatTest.php
index 7a7cbb366c2a..28a117ae5300 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/BigCatTest.php
@@ -2,7 +2,7 @@
 /**
  * BigCatTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class BigCatTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
index 75af321abab9..43c87d41f19b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
@@ -2,7 +2,7 @@
 /**
  * CapitalizationTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class CapitalizationTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
index 08dd782cda33..17db0e90059e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
@@ -2,7 +2,7 @@
 /**
  * CatAllOfTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class CatAllOfTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
index 40859e2966ba..c0f8d545892b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
@@ -2,7 +2,7 @@
 /**
  * CatTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class CatTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
index 0cced07b1e33..116dc3a24257 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
@@ -2,7 +2,7 @@
 /**
  * CategoryTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class CategoryTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
index 5aeb1825b7d4..661706de45ea 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
@@ -2,7 +2,7 @@
 /**
  * ClassModelTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class ClassModelTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
index 83d083aaf7a8..b68aedcc37b3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
@@ -2,7 +2,7 @@
 /**
  * ClientTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class ClientTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
index 51b9dd81e5bf..cd22f758c9d0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
@@ -2,7 +2,7 @@
 /**
  * DogAllOfTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class DogAllOfTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
index c68af2f92957..5618d4907a6a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
@@ -2,7 +2,7 @@
 /**
  * DogTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class DogTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
index be9eb943f243..b49ea71c299f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
@@ -2,7 +2,7 @@
 /**
  * EnumArraysTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class EnumArraysTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
index 552cc870ca58..a2ef8ea3e27d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
@@ -2,7 +2,7 @@
 /**
  * EnumClassTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class EnumClassTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
index 81210580c60c..479fc3e598c9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
@@ -2,7 +2,7 @@
 /**
  * EnumTestTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class EnumTestTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -112,4 +112,25 @@ public function testPropertyEnumNumber()
     public function testPropertyOuterEnum()
     {
     }
+
+    /**
+     * Test attribute "outer_enum_integer"
+     */
+    public function testPropertyOuterEnumInteger()
+    {
+    }
+
+    /**
+     * Test attribute "outer_enum_default_value"
+     */
+    public function testPropertyOuterEnumDefaultValue()
+    {
+    }
+
+    /**
+     * Test attribute "outer_enum_integer_default_value"
+     */
+    public function testPropertyOuterEnumIntegerDefaultValue()
+    {
+    }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
index 7af85f323dd7..aec72c16026e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
@@ -2,7 +2,7 @@
 /**
  * FileSchemaTestClassTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class FileSchemaTestClassTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
index de0a78bd59d0..dc76d50a1676 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
@@ -2,7 +2,7 @@
 /**
  * FileTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class FileTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
similarity index 88%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
index d7b7f8027059..2626d017d623 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
@@ -2,7 +2,7 @@
 /**
  * FooTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class FooTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
index e15fc37defb7..5514496b67eb 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
@@ -2,7 +2,7 @@
 /**
  * FormatTestTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class FormatTestTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -170,9 +170,16 @@ public function testPropertyPassword()
     }
 
     /**
-     * Test attribute "big_decimal"
+     * Test attribute "pattern_with_digits"
      */
-    public function testPropertyBigDecimal()
+    public function testPropertyPatternWithDigits()
+    {
+    }
+
+    /**
+     * Test attribute "pattern_with_digits_and_delimiter"
+     */
+    public function testPropertyPatternWithDigitsAndDelimiter()
     {
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
index e7da7dd8b3ce..0782a49d64d8 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
@@ -2,7 +2,7 @@
 /**
  * HasOnlyReadOnlyTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class HasOnlyReadOnlyTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
similarity index 89%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
index d1664acf0746..44b75f893a1d 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
@@ -2,7 +2,7 @@
 /**
  * HealthCheckResultTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class HealthCheckResultTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php
similarity index 89%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php
index b59ac0a36416..805c82a0daa2 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php
@@ -2,7 +2,7 @@
 /**
  * InlineObject1Test
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class InlineObject1Test extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php
similarity index 89%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php
index 44ab6028b4ee..097648295143 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php
@@ -2,7 +2,7 @@
 /**
  * InlineObject2Test
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class InlineObject2Test extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php
similarity index 93%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php
index 35caa1bcf321..3ce0794da200 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php
@@ -2,7 +2,7 @@
 /**
  * InlineObject3Test
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class InlineObject3Test extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php
similarity index 89%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php
index 8bd503f52b97..1c80df622de5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php
@@ -2,7 +2,7 @@
 /**
  * InlineObject4Test
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class InlineObject4Test extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php
similarity index 89%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php
index daca23c51b72..818927a1055b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php
@@ -2,7 +2,7 @@
 /**
  * InlineObject5Test
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class InlineObject5Test extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php
similarity index 89%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php
index 80d57d7c8446..b5069b1b349b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php
@@ -2,7 +2,7 @@
 /**
  * InlineObjectTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class InlineObjectTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php
similarity index 88%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php
index 63170190b02f..ea3682426ef8 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php
@@ -2,7 +2,7 @@
 /**
  * InlineResponseDefaultTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class InlineResponseDefaultTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
index a21d55a2ff8e..95eba370b1d6 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
@@ -2,7 +2,7 @@
 /**
  * MapTestTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class MapTestTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
index a40bdca44399..73dd17f1a658 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@@ -2,7 +2,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClassTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
index b762403aa608..625b13c5c34b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
@@ -2,7 +2,7 @@
 /**
  * Model200ResponseTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class Model200ResponseTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
index b20e645ff442..8c8eb959f950 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
@@ -2,7 +2,7 @@
 /**
  * ModelListTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class ModelListTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
index 5b3bb9aa7b3c..a8169b7d751e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
@@ -2,7 +2,7 @@
 /**
  * ModelReturnTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class ModelReturnTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
index 48ff19bb10a3..1a2af802b225 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
@@ -2,7 +2,7 @@
 /**
  * NameTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class NameTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
similarity index 93%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
index 6d297bd62d76..32bc5a67fa4c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
@@ -2,7 +2,7 @@
 /**
  * NullableClassTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class NullableClassTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
index 1300f264ba08..1cfc70818169 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
@@ -2,7 +2,7 @@
 /**
  * NumberOnlyTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class NumberOnlyTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
index 1625f8977003..836503bd762d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
@@ -2,7 +2,7 @@
 /**
  * OrderTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class OrderTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
index 4196e2be12ba..135abe5783e3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
@@ -2,7 +2,7 @@
 /**
  * OuterCompositeTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class OuterCompositeTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
similarity index 88%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
index 186970086253..42de969dc397 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
@@ -2,7 +2,7 @@
 /**
  * OuterEnumDefaultValueTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class OuterEnumDefaultValueTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
similarity index 88%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
index 098c90755fcd..cb423e0452a4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
@@ -2,7 +2,7 @@
 /**
  * OuterEnumIntegerDefaultValueTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class OuterEnumIntegerDefaultValueTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
similarity index 87%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
rename to samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
index e8f577994d09..f6a6c33beac5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
@@ -2,7 +2,7 @@
 /**
  * OuterEnumIntegerTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class OuterEnumIntegerTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
index cb5dd327a22d..37875f308b60 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
@@ -2,7 +2,7 @@
 /**
  * OuterEnumTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class OuterEnumTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
index 21d563f7561d..c096b6cfec39 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
@@ -2,7 +2,7 @@
 /**
  * PetTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class PetTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
index 661099d6215b..3cdf837b8f48 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
@@ -2,7 +2,7 @@
 /**
  * ReadOnlyFirstTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class ReadOnlyFirstTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
index f3d6630afbfc..04c7034330dd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
@@ -2,7 +2,7 @@
 /**
  * SpecialModelNameTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class SpecialModelNameTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
index 66c96f1bb9ab..d3b2e9259860 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
@@ -2,7 +2,7 @@
 /**
  * TagTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class TagTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php
index ae9c7c2c70ea..75ea9e66f55e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php
@@ -2,7 +2,7 @@
 /**
  * TypeHolderDefaultTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class TypeHolderDefaultTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php
index c993e9ba1375..4932edba4c4b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php
@@ -2,7 +2,7 @@
 /**
  * TypeHolderExampleTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class TypeHolderExampleTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
index 332ecd0dd1ca..e33f4ce3239c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
@@ -2,7 +2,7 @@
 /**
  * UserTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class UserTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php
index fa279ddebe58..4dc01deb482d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php
@@ -2,7 +2,7 @@
 /**
  * XmlItemTest
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @category Class
  * @package  OpenAPI\Client
@@ -46,28 +46,28 @@ class XmlItemTest extends TestCase
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/AsyncTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/AsyncTest.php
index a1af7b1238b8..421eef565ce1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/AsyncTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/AsyncTest.php
@@ -14,7 +14,7 @@ class AsyncTest extends TestCase
     /** @var  int */
     private $petId;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->api = new Api\PetApi();
 
@@ -58,15 +58,13 @@ public function testAsyncRequestWithHttpInfo()
 
         list($pet, $status, $headers) = $promise->wait();
         $this->assertEquals(200, $status);
-        $this->assertInternalType('array', $headers);
+        $this->assertIsArray($headers);
         $this->assertInstanceOf(Pet::class, $pet);
     }
 
-    /**
-     * @expectedException \OpenAPI\Client\ApiException
-     */
     public function testAsyncThrowingException()
     {
+        $this->expectException(\OpenAPI\Client\ApiException::class);
         $promise = $this->api->getPetByIdAsync(0);
         $promise->wait();
     }
@@ -80,11 +78,9 @@ public function testAsyncApiExceptionWithoutWaitIsNotThrown()
         sleep(1);
     }
 
-    /**
-     * @expectedException \OpenAPI\Client\ApiException
-     */
     public function testAsyncHttpInfoThrowingException()
     {
+        $this->expectException(\OpenAPI\Client\ApiException::class);
         $promise = $this->api->getPetByIdAsyncWithHttpInfo(0);
         $promise->wait();
     }
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ConfigurationTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/ConfigurationTest.php
similarity index 84%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ConfigurationTest.php
rename to samples/client/petstore/php/OpenAPIClient-php/tests/ConfigurationTest.php
index 4b2738841b43..4cc9954e90e0 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ConfigurationTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/ConfigurationTest.php
@@ -43,23 +43,23 @@ public function testServerUrl()
 
     /**
      * Test invalid index
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Invalid index 2 when selecting the host. Must be less than 2
      */
     public function testInvalidIndex()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid index 2 when selecting the host. Must be less than 2');
         $config = new Configuration();
         $url = $config->getHostFromSettings(2);
     }
 
     /**
      * Test host settings with invalid vaues
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage The variable `port` in the host URL has invalid value 8. Must be 80,8080
      */
     public function testHostUrlWithInvalidValues()
     {
         // using 2 variables with invalid values
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('The variable `port` in the host URL has invalid value 8. Must be 80,8080');
         $config = new Configuration();
         $url = $config->getHostFromSettings(0, array("server" => "dev-petstore", "port" => "8"));
         $this->assertSame("http://dev-petstore.swagger.io:8080/v2", $url);
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/DebugTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/DebugTest.php
index 375b054b4791..b14dd018df03 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/DebugTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/DebugTest.php
@@ -5,6 +5,16 @@
 
 class DebugTest extends TestCase
 {
+
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+        $newPet = new Model\Pet;
+        $newPet->setId(1);
+        $newPet->setName("PHP Unit Test");
+        (new Api\PetApi())->addPetWithHttpInfo($newPet);
+    }
+
     public function testEnableDebugOutput()
     {
         $this->expectOutputRegex('#GET /v2/pet/1 HTTP/1.1#');
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/EnumTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/EnumTestTest.php
index 24fdbeabb7e5..08151e353822 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/EnumTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/EnumTestTest.php
@@ -32,11 +32,9 @@ public function testStrictValidation()
         $this->assertSame($expected, $enum->listInvalidProperties());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testThrowExceptionWhenInvalidAmbiguousValueHasPassed()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $enum = new EnumTest();
         $enum->setEnumString(0);
     }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/ExceptionTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/ExceptionTest.php
index ac69620fa2fc..c12388187fd3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/ExceptionTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/ExceptionTest.php
@@ -7,13 +7,11 @@
 
 class ExceptionTest extends TestCase
 {
-    /**
-     * @expectedException \OpenAPI\Client\ApiException
-     * @expectedExceptionCode 404
-     * @expectedExceptionMessage http://petstore.swagger.io/INVALID_URL/store/inventory
-     */
     public function testNotFound()
     {
+        $this->expectException(\OpenAPI\Client\ApiException::class);
+        $this->expectExceptionCode(404);
+        $this->expectExceptionMessage('http://petstore.swagger.io/INVALID_URL/store/inventory');
         $config = new Configuration();
         $config->setHost('http://petstore.swagger.io/INVALID_URL');
 
@@ -24,12 +22,11 @@ public function testNotFound()
         $api->getInventory();
     }
 
-    /**
-     * @expectedException \OpenAPI\Client\ApiException
-     * @expectedExceptionMessage Could not resolve host
-     */
     public function testWrongHost()
     {
+        $this->expectException(\OpenAPI\Client\ApiException::class);
+        $this->expectExceptionMessage('Could not resolve');
+        $this->expectExceptionMessage('wrong_host.zxc');
         $config = new Configuration();
         $config->setHost('http://wrong_host.zxc');
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/HeadersTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/HeadersTest.php
index 4054876ee0e1..989516cc0c6e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/HeadersTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/HeadersTest.php
@@ -11,7 +11,7 @@ class HeadersTest extends TestCase
     /** @var  FakeHttpClient */
     private $fakeHttpClient;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->fakeHttpClient = new FakeHttpClient();
     }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/OrderApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/OrderApiTest.php
index 60c1fc6f47ed..3cfcc38f45a0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/OrderApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/OrderApiTest.php
@@ -8,7 +8,7 @@ class OrderApiTest extends TestCase
 {
 
     // add a new pet (id 10005) to ensure the pet object is available for all the tests
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         // for error reporting (need to run with php5.3 to get no warning)
         //ini_set('display_errors', 1);
@@ -31,13 +31,11 @@ public function testOrder()
         $order->setStatus("placed");
         $this->assertSame("placed", $order->getStatus());
     }
- 
-    /**
-     * @expectedException InvalidArgumentException
-     */
+
     public function testOrderException()
     {
         // initialize the API client
+        $this->expectException(\InvalidArgumentException::class);
         $order = new Model\Order();
         $order->setStatus("invalid_value");
     }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/OuterEnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/OuterEnumTest.php
index 71a28e466ce9..00777968f9ba 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/OuterEnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/OuterEnumTest.php
@@ -15,16 +15,14 @@ public function testDeserialize()
             OuterEnum::class
         );
 
-        $this->assertInternalType('string', $result);
+        $this->assertIsString($result);
         $this->assertEquals('placed', $result);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Invalid value for enum
-     */
     public function testDeserializeInvalidValue()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid value for enum');
         ObjectSerializer::deserialize(
             "lkjfalgkdfjg",
             OuterEnum::class
@@ -58,7 +56,7 @@ public function testSanitize()
             $json
         );
 
-        $this->assertInternalType('string', $result);
+        $this->assertIsString($result);
     }
 
     public function testSanitizeNested()
@@ -74,19 +72,17 @@ public function testSanitizeNested()
             $input
         );
 
-        $this->assertInternalType('object', $result);
+        $this->assertIsObject($result);
         $this->assertInstanceOf(\stdClass::class, $result);
 
-        $this->assertInternalType('string', $result->outerEnum);
+        $this->assertIsString($result->outerEnum);
         $this->assertEquals('approved', $result->outerEnum);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Invalid value for enum
-     */
     public function testSanitizeNestedInvalidValue()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid value for enum');
         $input = new EnumTest([
             'enum_string' => 'UPPER',
             'enum_integer' => -1,
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/ParametersTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/ParametersTest.php
index c70a5c60e471..aed0fade8080 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/ParametersTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/ParametersTest.php
@@ -17,7 +17,7 @@ class ParametersTest extends TestCase
     /** @var  UserApi */
     private $userApi;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->fakeHttpClient = new FakeHttpClient();
         $this->fakeApi = new Api\FakeApi($this->fakeHttpClient);
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/PetApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/PetApiTest.php
index 9e7f1c54b3a9..2a5bb49caa72 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/PetApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/PetApiTest.php
@@ -5,8 +5,8 @@
 use OpenAPI\Client\Api\PetApi;
 use OpenAPI\Client\Model\ApiResponse;
 use OpenAPI\Client\Model\Pet;
-use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Assert;
 
 class PetApiTest extends TestCase
 {
@@ -15,7 +15,7 @@ class PetApiTest extends TestCase
     private $api;
 
     // add a new pet (id 10005) to ensure the pet object is available for all the tests
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         // increase memory limit to avoid fatal error due to findPetByStatus
         // returning a lot of data
@@ -50,7 +50,7 @@ public static function setUpBeforeClass()
         Assert::assertEquals(200, $status);
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->api = new Api\PetApi();
     }
@@ -362,13 +362,12 @@ public function testDefaultValues()
 
     /**
      * test invalid argument
-     *
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Missing the required parameter $status when calling findPetsByStatus
      */
     public function testInvalidArgument()
     {
         // the argument is required, and we must specify one or some from 'available', 'pending', 'sold'
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Missing the required parameter $status when calling findPetsByStatus');
         $this->api->findPetsByStatus([]);
     }
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/RequestTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/RequestTest.php
index 3bec91563618..834e27588a7c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/RequestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/RequestTest.php
@@ -9,13 +9,12 @@
 
 class RequestTest extends TestCase
 {
-
     /** @var FakeApi */
     private $api;
     /** @var  FakeHttpClient */
     private $fakeClient;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->fakeClient = new FakeHttpClient();
         $this->api = new Api\FakeApi($this->fakeClient);
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/ResponseTypesTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/ResponseTypesTest.php
index 499007fa03e0..8d65396ccbc4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/ResponseTypesTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/ResponseTypesTest.php
@@ -16,7 +16,7 @@ class ResponseTypesTest extends TestCase
     /** @var  FakeHttpClient */
     private $fakeHttpClient;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->fakeHttpClient = new FakeHttpClient();
         $this->api = new PetApi($this->fakeHttpClient);
@@ -38,12 +38,10 @@ public function testDefault2xxReturnType()
         $this->assertInstanceOf(Pet::class, $result);
     }
 
-    /**
-     * @expectedException \OpenAPI\Client\ApiException
-     * @expectedExceptionCode 400
-     */
     public function testDefinedErrorException()
     {
+        $this->expectExceptionCode(400);
+        $this->expectException(\OpenAPI\Client\ApiException::class);
         $statusCode = 400;
 
         $this->fakeHttpClient->setResponse(new Response($statusCode, [], '{}'));
@@ -69,12 +67,10 @@ public function testDefinedErrorException()
 //        $this->assertInstanceOf(Error::class, $result);
 //    }
 
-    /**
-     * @expectedException \OpenAPI\Client\ApiException
-     * @expectedExceptionCode 404
-     */
     public function testDefaultErrorException()
     {
+        $this->expectExceptionCode(404);
+        $this->expectException(\OpenAPI\Client\ApiException::class);
         $statusCode = 404;
 
         $this->fakeHttpClient->setResponse(new Response($statusCode, [], '{}'));
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/StoreApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/StoreApiTest.php
index f18f3ce66cae..4bb85919dc5c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/StoreApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/StoreApiTest.php
@@ -14,7 +14,7 @@ class StoreApiTest extends TestCase
     /** @var  StoreApi */
     private $api;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->api = new StoreApi();
     }
@@ -22,7 +22,7 @@ public function setUp()
     /**
      * Setup before running each test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         // add a new pet (id 10005) to ensure the pet object is available for all the tests
         // new pet
@@ -51,7 +51,7 @@ public function testGetInventory()
     {
         $result = $this->api->getInventory();
 
-        $this->assertInternalType('array', $result);
-        $this->assertInternalType('int', $result['available']);
+        $this->assertIsArray($result);
+        $this->assertIsInt($result['available']);
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/UserApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/UserApiTest.php
index 756fa58f177b..929789670f91 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/UserApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/UserApiTest.php
@@ -11,7 +11,7 @@ class UserApiTest extends TestCase
     /** @var UserApi*/
     private $api;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->api = new Api\UserApi();
     }
@@ -23,11 +23,15 @@ public function testLoginUser()
         // login
         $response = $this->api->loginUser('xxxxx', 'yyyyyyyy');
         
-        $this->assertInternalType('string', $response);
-        $this->assertRegExp(
-            '/logged in user session/',
-            $response,
-            "response string starts with 'logged in user session'"
-        );
+        $this->assertIsString($response);
+
+        $pattern = '/logged in user session/';
+        $assertMessage = "response string starts with 'logged in user session'";
+        $this->assertIsString($response);
+        if (method_exists($this, 'assertMatchesRegularExpression')) {
+            $this->assertMatchesRegularExpression($pattern, $response, $assertMessage);
+        } else {
+            $this->assertRegExp($pattern, $response, $assertMessage);
+        }
     }
 }
diff --git a/samples/client/petstore/powershell/Build.ps1 b/samples/client/petstore/powershell/Build.ps1
index 72aa4fe183b6..c6cc0b75d958 100644
--- a/samples/client/petstore/powershell/Build.ps1
+++ b/samples/client/petstore/powershell/Build.ps1
@@ -59,7 +59,7 @@ $Manifest = @{
     RootModule = 'PSPetstore.psm1'
     Guid = 'a27b908d-2a20-467f-bc32-af6f3a654ac5' # Has to be static, otherwise each new build will be considered different module
 
-    PowerShellVersion = '3.0'
+    PowerShellVersion = '5.0'
 
     FunctionsToExport = $FunctionPath | Get-ChildItem -Filter *.ps1 | Get-FunctionsToExport
 
diff --git a/samples/client/petstore/powershell/src/PSPetstore/API/PSPetApi.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Api/PSPetApi.ps1
similarity index 99%
rename from samples/client/petstore/powershell/src/PSPetstore/API/PSPetApi.ps1
rename to samples/client/petstore/powershell/src/PSPetstore/Api/PSPetApi.ps1
index f7833bd5e695..fd9df6cce81b 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/API/PSPetApi.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Api/PSPetApi.ps1
@@ -73,7 +73,7 @@ function Add-PSPet {
             throw "Error! The required parameter `Pet` missing when calling addPet."
         }
 
-        $LocalVarBodyParameter = $Pet | ConvertTo-Json
+        $LocalVarBodyParameter = $Pet | ConvertTo-Json -Depth 100
 
 
         $LocalVarResult = Invoke-PSApiClient -Method 'POST' `
@@ -505,7 +505,7 @@ function Update-PSPet {
             throw "Error! The required parameter `Pet` missing when calling updatePet."
         }
 
-        $LocalVarBodyParameter = $Pet | ConvertTo-Json
+        $LocalVarBodyParameter = $Pet | ConvertTo-Json -Depth 100
 
 
         $LocalVarResult = Invoke-PSApiClient -Method 'PUT' `
diff --git a/samples/client/petstore/powershell/src/PSPetstore/API/PSStoreApi.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Api/PSStoreApi.ps1
similarity index 99%
rename from samples/client/petstore/powershell/src/PSPetstore/API/PSStoreApi.ps1
rename to samples/client/petstore/powershell/src/PSPetstore/Api/PSStoreApi.ps1
index b6f3645d5339..dc4ffa2b974b 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/API/PSStoreApi.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Api/PSStoreApi.ps1
@@ -293,7 +293,7 @@ function Invoke-PSPlaceOrder {
             throw "Error! The required parameter `Order` missing when calling placeOrder."
         }
 
-        $LocalVarBodyParameter = $Order | ConvertTo-Json
+        $LocalVarBodyParameter = $Order | ConvertTo-Json -Depth 100
 
         $LocalVarResult = Invoke-PSApiClient -Method 'POST' `
                                 -Uri $LocalVarUri `
diff --git a/samples/client/petstore/powershell/src/PSPetstore/API/PSUserApi.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Api/PSUserApi.ps1
similarity index 98%
rename from samples/client/petstore/powershell/src/PSPetstore/API/PSUserApi.ps1
rename to samples/client/petstore/powershell/src/PSPetstore/Api/PSUserApi.ps1
index 57422ca50a78..e6fb9a8e081f 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/API/PSUserApi.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Api/PSUserApi.ps1
@@ -58,7 +58,7 @@ function New-PSUser {
             throw "Error! The required parameter `User` missing when calling createUser."
         }
 
-        $LocalVarBodyParameter = $User | ConvertTo-Json
+        $LocalVarBodyParameter = $User | ConvertTo-Json -Depth 100
 
         if ($Configuration["Cookie"]) {
             $LocalVarCookieParameters['auth_cookie'] = $Configuration["Cookie"]
@@ -137,7 +137,7 @@ function New-PSUsersWithArrayInput {
             throw "Error! The required parameter `User` missing when calling createUsersWithArrayInput."
         }
 
-        $LocalVarBodyParameter = $User | ConvertTo-Json
+        $LocalVarBodyParameter = $User | ConvertTo-Json -Depth 100
 
         if ($Configuration["Cookie"]) {
             $LocalVarCookieParameters['auth_cookie'] = $Configuration["Cookie"]
@@ -216,7 +216,7 @@ function New-PSUsersWithListInput {
             throw "Error! The required parameter `User` missing when calling createUsersWithListInput."
         }
 
-        $LocalVarBodyParameter = $User | ConvertTo-Json
+        $LocalVarBodyParameter = $User | ConvertTo-Json -Depth 100
 
         if ($Configuration["Cookie"]) {
             $LocalVarCookieParameters['auth_cookie'] = $Configuration["Cookie"]
@@ -623,7 +623,7 @@ function Update-PSUser {
             throw "Error! The required parameter `User` missing when calling updateUser."
         }
 
-        $LocalVarBodyParameter = $User | ConvertTo-Json
+        $LocalVarBodyParameter = $User | ConvertTo-Json -Depth 100
 
         if ($Configuration["Cookie"]) {
             $LocalVarCookieParameters['auth_cookie'] = $Configuration["Cookie"]
diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/ApiResponse.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/ApiResponse.ps1
index 1cc58e9d5dc1..44be11154a37 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/Model/ApiResponse.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Model/ApiResponse.ps1
@@ -16,13 +16,10 @@ Describes the result of uploading an image resource
 
 .PARAMETER Code
 No description available.
-
 .PARAMETER Type
 No description available.
-
 .PARAMETER Message
 No description available.
-
 .OUTPUTS
 
 ApiResponse<PSCustomObject>
@@ -46,12 +43,14 @@ function Initialize-PSApiResponse {
         'Creating PSCustomObject: PSPetstore => PSApiResponse' | Write-Debug
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
+
         $PSO = [PSCustomObject]@{
             "code" = ${Code}
             "type" = ${Type}
             "message" = ${Message}
         }
 
+
         return $PSO
     }
 }
diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/Category.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/Category.ps1
index 5d5e93da8e54..cb05b8778cc6 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/Model/Category.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Model/Category.ps1
@@ -16,10 +16,8 @@ A category for a pet
 
 .PARAMETER Id
 No description available.
-
 .PARAMETER Name
 No description available.
-
 .OUTPUTS
 
 Category<PSCustomObject>
@@ -41,11 +39,13 @@ function Initialize-PSCategory {
         'Creating PSCustomObject: PSPetstore => PSCategory' | Write-Debug
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
+
         $PSO = [PSCustomObject]@{
             "id" = ${Id}
             "name" = ${Name}
         }
 
+
         return $PSO
     }
 }
diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject.ps1
index fbfde854a24b..fab7cf7e6a3e 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject.ps1
@@ -16,10 +16,8 @@ No description available.
 
 .PARAMETER Name
 Updated name of the pet
-
 .PARAMETER Status
 Updated status of the pet
-
 .OUTPUTS
 
 InlineObject<PSCustomObject>
@@ -40,11 +38,13 @@ function Initialize-PSInlineObject {
         'Creating PSCustomObject: PSPetstore => PSInlineObject' | Write-Debug
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
+
         $PSO = [PSCustomObject]@{
             "name" = ${Name}
             "status" = ${Status}
         }
 
+
         return $PSO
     }
 }
diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject1.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject1.ps1
index cfd49e06365d..0b49ac3942ce 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject1.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject1.ps1
@@ -16,10 +16,8 @@ No description available.
 
 .PARAMETER AdditionalMetadata
 Additional data to pass to server
-
 .PARAMETER File
 file to upload
-
 .OUTPUTS
 
 InlineObject1<PSCustomObject>
@@ -40,11 +38,13 @@ function Initialize-PSInlineObject1 {
         'Creating PSCustomObject: PSPetstore => PSInlineObject1' | Write-Debug
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
+
         $PSO = [PSCustomObject]@{
             "additionalMetadata" = ${AdditionalMetadata}
             "file" = ${File}
         }
 
+
         return $PSO
     }
 }
diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/Order.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/Order.ps1
index d74819356adc..253b47593210 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/Model/Order.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Model/Order.ps1
@@ -16,22 +16,16 @@ An order for a pets from the pet store
 
 .PARAMETER Id
 No description available.
-
 .PARAMETER PetId
 No description available.
-
 .PARAMETER Quantity
 No description available.
-
 .PARAMETER ShipDate
 No description available.
-
 .PARAMETER Status
 Order Status
-
 .PARAMETER Complete
 No description available.
-
 .OUTPUTS
 
 Order<PSCustomObject>
@@ -65,6 +59,7 @@ function Initialize-PSOrder {
         'Creating PSCustomObject: PSPetstore => PSOrder' | Write-Debug
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
+
         $PSO = [PSCustomObject]@{
             "id" = ${Id}
             "petId" = ${PetId}
@@ -74,6 +69,7 @@ function Initialize-PSOrder {
             "complete" = ${Complete}
         }
 
+
         return $PSO
     }
 }
diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/Pet.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/Pet.ps1
index d9c53786d541..7e93b07545df 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/Model/Pet.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Model/Pet.ps1
@@ -16,22 +16,16 @@ A pet for sale in the pet store
 
 .PARAMETER Id
 No description available.
-
 .PARAMETER Category
 No description available.
-
 .PARAMETER Name
 No description available.
-
 .PARAMETER PhotoUrls
 No description available.
-
 .PARAMETER Tags
 No description available.
-
 .PARAMETER Status
 pet status in the store
-
 .OUTPUTS
 
 Pet<PSCustomObject>
@@ -73,6 +67,7 @@ function Initialize-PSPet {
             throw "invalid value for 'PhotoUrls', 'PhotoUrls' cannot be null."
         }
 
+
         $PSO = [PSCustomObject]@{
             "id" = ${Id}
             "category" = ${Category}
@@ -82,6 +77,7 @@ function Initialize-PSPet {
             "status" = ${Status}
         }
 
+
         return $PSO
     }
 }
@@ -128,13 +124,13 @@ function ConvertFrom-PSJsonToPet {
         }
 
         if (!([bool]($JsonParameters.PSobject.Properties.name -match "name"))) {
-            throw "Error! JSON cannot be serialized due to the required property `name` missing." 
+            throw "Error! JSON cannot be serialized due to the required property `name` missing."
         } else {
             $Name = $JsonParameters.PSobject.Properties["name"].value
         }
 
         if (!([bool]($JsonParameters.PSobject.Properties.name -match "photoUrls"))) {
-            throw "Error! JSON cannot be serialized due to the required property `photoUrls` missing." 
+            throw "Error! JSON cannot be serialized due to the required property `photoUrls` missing."
         } else {
             $PhotoUrls = $JsonParameters.PSobject.Properties["photoUrls"].value
         }
diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/Tag.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/Tag.ps1
index 8a7caf8d562a..5a2d92bdb7c1 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/Model/Tag.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Model/Tag.ps1
@@ -16,10 +16,8 @@ A tag for a pet
 
 .PARAMETER Id
 No description available.
-
 .PARAMETER Name
 No description available.
-
 .OUTPUTS
 
 Tag<PSCustomObject>
@@ -40,11 +38,13 @@ function Initialize-PSTag {
         'Creating PSCustomObject: PSPetstore => PSTag' | Write-Debug
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
+
         $PSO = [PSCustomObject]@{
             "id" = ${Id}
             "name" = ${Name}
         }
 
+
         return $PSO
     }
 }
diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/User.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/User.ps1
index 493322216a22..a021b75ec4c9 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/Model/User.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Model/User.ps1
@@ -16,28 +16,20 @@ A User who is purchasing from the pet store
 
 .PARAMETER Id
 No description available.
-
 .PARAMETER Username
 No description available.
-
 .PARAMETER FirstName
 No description available.
-
 .PARAMETER LastName
 No description available.
-
 .PARAMETER Email
 No description available.
-
 .PARAMETER Password
 No description available.
-
 .PARAMETER Phone
 No description available.
-
 .PARAMETER UserStatus
 User Status
-
 .OUTPUTS
 
 User<PSCustomObject>
@@ -77,6 +69,7 @@ function Initialize-PSUser {
         'Creating PSCustomObject: PSPetstore => PSUser' | Write-Debug
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
+
         $PSO = [PSCustomObject]@{
             "id" = ${Id}
             "username" = ${Username}
@@ -88,6 +81,7 @@ function Initialize-PSUser {
             "userStatus" = ${UserStatus}
         }
 
+
         return $PSO
     }
 }
diff --git a/samples/client/petstore/powershell/tests/Api/PSPetApi.Tests.ps1 b/samples/client/petstore/powershell/tests/Api/PSPetApi.Tests.ps1
index a64121dd996b..89fba4eed997 100644
--- a/samples/client/petstore/powershell/tests/Api/PSPetApi.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Api/PSPetApi.Tests.ps1
@@ -8,7 +8,7 @@
 Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
     Context 'Add-PSPet' {
         It 'Test Add-PSPet' {
-            #$TestResult = Invoke-PetApiGetPetById -Pet "TEST_VALUE"
+            #$TestResult = Add-PSPet -Pet "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -16,7 +16,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Remove-Pet' {
         It 'Test Remove-Pet' {
-            #$TestResult = Invoke-PetApiGetPetById -PetId "TEST_VALUE" -ApiKey "TEST_VALUE"
+            #$TestResult = Remove-Pet -PetId "TEST_VALUE" -ApiKey "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -24,7 +24,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Find-PSPetsByStatus' {
         It 'Test Find-PSPetsByStatus' {
-            #$TestResult = Invoke-PetApiGetPetById -Status "TEST_VALUE"
+            #$TestResult = Find-PSPetsByStatus -Status "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -32,7 +32,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Find-PSPetsByTags' {
         It 'Test Find-PSPetsByTags' {
-            #$TestResult = Invoke-PetApiGetPetById -Tags "TEST_VALUE"
+            #$TestResult = Find-PSPetsByTags -Tags "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -40,7 +40,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Get-PSPetById' {
         It 'Test Get-PSPetById' {
-            #$TestResult = Invoke-PetApiGetPetById -PetId "TEST_VALUE"
+            #$TestResult = Get-PSPetById -PetId "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -48,7 +48,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Update-PSPet' {
         It 'Test Update-PSPet' {
-            #$TestResult = Invoke-PetApiGetPetById -Pet "TEST_VALUE"
+            #$TestResult = Update-PSPet -Pet "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -56,7 +56,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Update-PSPetWithForm' {
         It 'Test Update-PSPetWithForm' {
-            #$TestResult = Invoke-PetApiGetPetById -PetId "TEST_VALUE" -Name "TEST_VALUE" -Status "TEST_VALUE"
+            #$TestResult = Update-PSPetWithForm -PetId "TEST_VALUE" -Name "TEST_VALUE" -Status "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -64,7 +64,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Invoke-PSUploadFile' {
         It 'Test Invoke-PSUploadFile' {
-            #$TestResult = Invoke-PetApiGetPetById -PetId "TEST_VALUE" -AdditionalMetadata "TEST_VALUE" -File "TEST_VALUE"
+            #$TestResult = Invoke-PSUploadFile -PetId "TEST_VALUE" -AdditionalMetadata "TEST_VALUE" -File "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
diff --git a/samples/client/petstore/powershell/tests/Api/PSStoreApi.Tests.ps1 b/samples/client/petstore/powershell/tests/Api/PSStoreApi.Tests.ps1
index 95399b034f71..509019fe2ef9 100644
--- a/samples/client/petstore/powershell/tests/Api/PSStoreApi.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Api/PSStoreApi.Tests.ps1
@@ -8,7 +8,7 @@
 Describe -tag 'PSPetstore' -name 'PSPSStoreApi' {
     Context 'Remove-PSOrder' {
         It 'Test Remove-PSOrder' {
-            #$TestResult = Invoke-PetApiGetPetById -OrderId "TEST_VALUE"
+            #$TestResult = Remove-PSOrder -OrderId "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -16,7 +16,7 @@ Describe -tag 'PSPetstore' -name 'PSPSStoreApi' {
 
     Context 'Get-PSInventory' {
         It 'Test Get-PSInventory' {
-            #$TestResult = Invoke-PetApiGetPetById
+            #$TestResult = Get-PSInventory
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -24,7 +24,7 @@ Describe -tag 'PSPetstore' -name 'PSPSStoreApi' {
 
     Context 'Get-PSOrderById' {
         It 'Test Get-PSOrderById' {
-            #$TestResult = Invoke-PetApiGetPetById -OrderId "TEST_VALUE"
+            #$TestResult = Get-PSOrderById -OrderId "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -32,7 +32,7 @@ Describe -tag 'PSPetstore' -name 'PSPSStoreApi' {
 
     Context 'Invoke-PSPlaceOrder' {
         It 'Test Invoke-PSPlaceOrder' {
-            #$TestResult = Invoke-PetApiGetPetById -Order "TEST_VALUE"
+            #$TestResult = Invoke-PSPlaceOrder -Order "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
diff --git a/samples/client/petstore/powershell/tests/Api/PSUserApi.Tests.ps1 b/samples/client/petstore/powershell/tests/Api/PSUserApi.Tests.ps1
index 6a7f50b9f57e..21978edb37f3 100644
--- a/samples/client/petstore/powershell/tests/Api/PSUserApi.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Api/PSUserApi.Tests.ps1
@@ -8,7 +8,7 @@
 Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
     Context 'New-PSUser' {
         It 'Test New-PSUser' {
-            #$TestResult = Invoke-PetApiGetPetById -User "TEST_VALUE"
+            #$TestResult = New-PSUser -User "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -16,7 +16,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'New-PSUsersWithArrayInput' {
         It 'Test New-PSUsersWithArrayInput' {
-            #$TestResult = Invoke-PetApiGetPetById -User "TEST_VALUE"
+            #$TestResult = New-PSUsersWithArrayInput -User "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -24,7 +24,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'New-PSUsersWithListInput' {
         It 'Test New-PSUsersWithListInput' {
-            #$TestResult = Invoke-PetApiGetPetById -User "TEST_VALUE"
+            #$TestResult = New-PSUsersWithListInput -User "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -32,7 +32,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'Remove-PSUser' {
         It 'Test Remove-PSUser' {
-            #$TestResult = Invoke-PetApiGetPetById -Username "TEST_VALUE"
+            #$TestResult = Remove-PSUser -Username "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -40,7 +40,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'Get-PSUserByName' {
         It 'Test Get-PSUserByName' {
-            #$TestResult = Invoke-PetApiGetPetById -Username "TEST_VALUE"
+            #$TestResult = Get-PSUserByName -Username "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -48,7 +48,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'Invoke-PSLoginUser' {
         It 'Test Invoke-PSLoginUser' {
-            #$TestResult = Invoke-PetApiGetPetById -Username "TEST_VALUE" -Password "TEST_VALUE"
+            #$TestResult = Invoke-PSLoginUser -Username "TEST_VALUE" -Password "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -56,7 +56,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'Invoke-PSLogoutUser' {
         It 'Test Invoke-PSLogoutUser' {
-            #$TestResult = Invoke-PetApiGetPetById
+            #$TestResult = Invoke-PSLogoutUser
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -64,7 +64,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'Update-PSUser' {
         It 'Test Update-PSUser' {
-            #$TestResult = Invoke-PetApiGetPetById -Username "TEST_VALUE" -User "TEST_VALUE"
+            #$TestResult = Update-PSUser -Username "TEST_VALUE" -User "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/another_fake_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/another_fake_api.py
index 4d69b287ca8b..562b9faa58f2 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api/another_fake_api.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api/another_fake_api.py
@@ -91,6 +91,10 @@ def call_123_test_special_tags_with_http_info(self, body, **kwargs):  # noqa: E5
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def call_123_test_special_tags_with_http_info(self, body, **kwargs):  # noqa: E5
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -163,4 +168,5 @@ def call_123_test_special_tags_with_http_info(self, body, **kwargs):  # noqa: E5
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/fake_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/fake_api.py
index 7789acf51c3d..b171fe8b3d7d 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api/fake_api.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api/fake_api.py
@@ -91,6 +91,10 @@ def create_xml_item_with_http_info(self, xml_item, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def create_xml_item_with_http_info(self, xml_item, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -159,7 +164,8 @@ def create_xml_item_with_http_info(self, xml_item, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_boolean_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_boolean_serialize  # noqa: E501
@@ -216,6 +222,10 @@ def fake_outer_boolean_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -232,7 +242,8 @@ def fake_outer_boolean_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -280,7 +291,8 @@ def fake_outer_boolean_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_composite_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_composite_serialize  # noqa: E501
@@ -337,6 +349,10 @@ def fake_outer_composite_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -353,7 +369,8 @@ def fake_outer_composite_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -401,7 +418,8 @@ def fake_outer_composite_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_number_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_number_serialize  # noqa: E501
@@ -458,6 +476,10 @@ def fake_outer_number_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -474,7 +496,8 @@ def fake_outer_number_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -522,7 +545,8 @@ def fake_outer_number_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_string_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_string_serialize  # noqa: E501
@@ -579,6 +603,10 @@ def fake_outer_string_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -595,7 +623,8 @@ def fake_outer_string_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -643,7 +672,8 @@ def fake_outer_string_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_body_with_file_schema(self, body, **kwargs):  # noqa: E501
         """test_body_with_file_schema  # noqa: E501
@@ -700,6 +730,10 @@ def test_body_with_file_schema_with_http_info(self, body, **kwargs):  # noqa: E5
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -716,7 +750,8 @@ def test_body_with_file_schema_with_http_info(self, body, **kwargs):  # noqa: E5
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -768,7 +803,8 @@ def test_body_with_file_schema_with_http_info(self, body, **kwargs):  # noqa: E5
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_body_with_query_params(self, query, body, **kwargs):  # noqa: E501
         """test_body_with_query_params  # noqa: E501
@@ -827,6 +863,10 @@ def test_body_with_query_params_with_http_info(self, query, body, **kwargs):  #
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -844,7 +884,8 @@ def test_body_with_query_params_with_http_info(self, query, body, **kwargs):  #
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -902,7 +943,8 @@ def test_body_with_query_params_with_http_info(self, query, body, **kwargs):  #
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_client_model(self, body, **kwargs):  # noqa: E501
         """To test \"client\" model  # noqa: E501
@@ -959,6 +1001,10 @@ def test_client_model_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -975,7 +1021,8 @@ def test_client_model_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1031,7 +1078,8 @@ def test_client_model_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_endpoint_parameters(self, number, double, pattern_without_delimiter, byte, **kwargs):  # noqa: E501
         """Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트  # noqa: E501
@@ -1140,6 +1188,10 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1169,7 +1221,8 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1287,7 +1340,8 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_enum_parameters(self, **kwargs):  # noqa: E501
         """To test enum parameters  # noqa: E501
@@ -1372,6 +1426,10 @@ def test_enum_parameters_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1395,7 +1453,8 @@ def test_enum_parameters_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1460,7 +1519,8 @@ def test_enum_parameters_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_group_parameters(self, required_string_group, required_boolean_group, required_int64_group, **kwargs):  # noqa: E501
         """Fake endpoint to test group parameters (optional)  # noqa: E501
@@ -1537,6 +1597,10 @@ def test_group_parameters_with_http_info(self, required_string_group, required_b
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1558,7 +1622,8 @@ def test_group_parameters_with_http_info(self, required_string_group, required_b
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1624,7 +1689,8 @@ def test_group_parameters_with_http_info(self, required_string_group, required_b
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_inline_additional_properties(self, param, **kwargs):  # noqa: E501
         """test inline additionalProperties  # noqa: E501
@@ -1679,6 +1745,10 @@ def test_inline_additional_properties_with_http_info(self, param, **kwargs):  #
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1695,7 +1765,8 @@ def test_inline_additional_properties_with_http_info(self, param, **kwargs):  #
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1747,7 +1818,8 @@ def test_inline_additional_properties_with_http_info(self, param, **kwargs):  #
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_json_form_data(self, param, param2, **kwargs):  # noqa: E501
         """test json serialization of form data  # noqa: E501
@@ -1806,6 +1878,10 @@ def test_json_form_data_with_http_info(self, param, param2, **kwargs):  # noqa:
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1823,7 +1899,8 @@ def test_json_form_data_with_http_info(self, param, param2, **kwargs):  # noqa:
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1881,7 +1958,8 @@ def test_json_form_data_with_http_info(self, param, param2, **kwargs):  # noqa:
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_query_parameter_collection_format(self, pipe, ioutil, http, url, context, **kwargs):  # noqa: E501
         """test_query_parameter_collection_format  # noqa: E501
@@ -1954,6 +2032,10 @@ def test_query_parameter_collection_format_with_http_info(self, pipe, ioutil, ht
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1974,7 +2056,8 @@ def test_query_parameter_collection_format_with_http_info(self, pipe, ioutil, ht
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -2051,4 +2134,5 @@ def test_query_parameter_collection_format_with_http_info(self, pipe, ioutil, ht
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/fake_classname_tags_123_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/fake_classname_tags_123_api.py
index d963591a49a8..5cd445261491 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api/fake_classname_tags_123_api.py
@@ -91,6 +91,10 @@ def test_classname_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def test_classname_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -163,4 +168,5 @@ def test_classname_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/pet_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/pet_api.py
index 7002fe32740f..3119e2d60c45 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api/pet_api.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api/pet_api.py
@@ -89,6 +89,10 @@ def add_pet_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -105,7 +109,8 @@ def add_pet_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -157,7 +162,8 @@ def add_pet_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def delete_pet(self, pet_id, **kwargs):  # noqa: E501
         """Deletes a pet  # noqa: E501
@@ -216,6 +222,10 @@ def delete_pet_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -233,7 +243,8 @@ def delete_pet_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -283,7 +294,8 @@ def delete_pet_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def find_pets_by_status(self, status, **kwargs):  # noqa: E501
         """Finds Pets by status  # noqa: E501
@@ -340,6 +352,10 @@ def find_pets_by_status_with_http_info(self, status, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -356,7 +372,8 @@ def find_pets_by_status_with_http_info(self, status, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -409,7 +426,8 @@ def find_pets_by_status_with_http_info(self, status, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def find_pets_by_tags(self, tags, **kwargs):  # noqa: E501
         """Finds Pets by tags  # noqa: E501
@@ -466,6 +484,10 @@ def find_pets_by_tags_with_http_info(self, tags, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -482,7 +504,8 @@ def find_pets_by_tags_with_http_info(self, tags, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -535,7 +558,8 @@ def find_pets_by_tags_with_http_info(self, tags, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_pet_by_id(self, pet_id, **kwargs):  # noqa: E501
         """Find pet by ID  # noqa: E501
@@ -592,6 +616,10 @@ def get_pet_by_id_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -608,7 +636,8 @@ def get_pet_by_id_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -660,7 +689,8 @@ def get_pet_by_id_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def update_pet(self, body, **kwargs):  # noqa: E501
         """Update an existing pet  # noqa: E501
@@ -715,6 +745,10 @@ def update_pet_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -731,7 +765,8 @@ def update_pet_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -783,7 +818,8 @@ def update_pet_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def update_pet_with_form(self, pet_id, **kwargs):  # noqa: E501
         """Updates a pet in the store with form data  # noqa: E501
@@ -846,6 +882,10 @@ def update_pet_with_form_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -864,7 +904,8 @@ def update_pet_with_form_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -920,7 +961,8 @@ def update_pet_with_form_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def upload_file(self, pet_id, **kwargs):  # noqa: E501
         """uploads an image  # noqa: E501
@@ -983,6 +1025,10 @@ def upload_file_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1001,7 +1047,8 @@ def upload_file_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1061,7 +1108,8 @@ def upload_file_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def upload_file_with_required_file(self, pet_id, required_file, **kwargs):  # noqa: E501
         """uploads an image (required)  # noqa: E501
@@ -1124,6 +1172,10 @@ def upload_file_with_required_file_with_http_info(self, pet_id, required_file, *
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1142,7 +1194,8 @@ def upload_file_with_required_file_with_http_info(self, pet_id, required_file, *
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1206,4 +1259,5 @@ def upload_file_with_required_file_with_http_info(self, pet_id, required_file, *
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py
index 0ede23f05ba2..d2d4c3233341 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py
@@ -91,6 +91,10 @@ def delete_order_with_http_info(self, order_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def delete_order_with_http_info(self, order_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -155,7 +160,8 @@ def delete_order_with_http_info(self, order_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_inventory(self, **kwargs):  # noqa: E501
         """Returns pet inventories by status  # noqa: E501
@@ -208,6 +214,10 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -223,7 +233,8 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -269,7 +280,8 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_order_by_id(self, order_id, **kwargs):  # noqa: E501
         """Find purchase order by ID  # noqa: E501
@@ -326,6 +338,10 @@ def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -342,7 +358,8 @@ def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -398,7 +415,8 @@ def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def place_order(self, body, **kwargs):  # noqa: E501
         """Place an order for a pet  # noqa: E501
@@ -453,6 +471,10 @@ def place_order_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -469,7 +491,8 @@ def place_order_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -521,4 +544,5 @@ def place_order_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/user_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/user_api.py
index a912483b023b..9504f2834a6b 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api/user_api.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api/user_api.py
@@ -91,6 +91,10 @@ def create_user_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def create_user_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -155,7 +160,8 @@ def create_user_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def create_users_with_array_input(self, body, **kwargs):  # noqa: E501
         """Creates list of users with given input array  # noqa: E501
@@ -210,6 +216,10 @@ def create_users_with_array_input_with_http_info(self, body, **kwargs):  # noqa:
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -226,7 +236,8 @@ def create_users_with_array_input_with_http_info(self, body, **kwargs):  # noqa:
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -274,7 +285,8 @@ def create_users_with_array_input_with_http_info(self, body, **kwargs):  # noqa:
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def create_users_with_list_input(self, body, **kwargs):  # noqa: E501
         """Creates list of users with given input array  # noqa: E501
@@ -329,6 +341,10 @@ def create_users_with_list_input_with_http_info(self, body, **kwargs):  # noqa:
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -345,7 +361,8 @@ def create_users_with_list_input_with_http_info(self, body, **kwargs):  # noqa:
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -393,7 +410,8 @@ def create_users_with_list_input_with_http_info(self, body, **kwargs):  # noqa:
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def delete_user(self, username, **kwargs):  # noqa: E501
         """Delete user  # noqa: E501
@@ -450,6 +468,10 @@ def delete_user_with_http_info(self, username, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -466,7 +488,8 @@ def delete_user_with_http_info(self, username, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -514,7 +537,8 @@ def delete_user_with_http_info(self, username, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_user_by_name(self, username, **kwargs):  # noqa: E501
         """Get user by user name  # noqa: E501
@@ -569,6 +593,10 @@ def get_user_by_name_with_http_info(self, username, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -585,7 +613,8 @@ def get_user_by_name_with_http_info(self, username, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -637,7 +666,8 @@ def get_user_by_name_with_http_info(self, username, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def login_user(self, username, password, **kwargs):  # noqa: E501
         """Logs user into the system  # noqa: E501
@@ -696,6 +726,10 @@ def login_user_with_http_info(self, username, password, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -713,7 +747,8 @@ def login_user_with_http_info(self, username, password, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -771,7 +806,8 @@ def login_user_with_http_info(self, username, password, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def logout_user(self, **kwargs):  # noqa: E501
         """Logs out current logged in user session  # noqa: E501
@@ -822,6 +858,10 @@ def logout_user_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -837,7 +877,8 @@ def logout_user_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -879,7 +920,8 @@ def logout_user_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def update_user(self, username, body, **kwargs):  # noqa: E501
         """Updated user  # noqa: E501
@@ -940,6 +982,10 @@ def update_user_with_http_info(self, username, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -957,7 +1003,8 @@ def update_user_with_http_info(self, username, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1011,4 +1058,5 @@ def update_user_with_http_info(self, username, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api_client.py b/samples/client/petstore/python-asyncio/petstore_api/api_client.py
index 7e0d28cd4c68..cc78cbda5421 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api_client.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api_client.py
@@ -123,7 +123,8 @@ async def __call_api(
             query_params=None, header_params=None, body=None, post_params=None,
             files=None, response_type=None, auth_settings=None,
             _return_http_data_only=None, collection_formats=None,
-            _preload_content=True, _request_timeout=None, _host=None):
+            _preload_content=True, _request_timeout=None, _host=None,
+            _request_auth=None):
 
         config = self.configuration
 
@@ -164,7 +165,9 @@ async def __call_api(
             post_params.extend(self.files_parameters(files))
 
         # auth setting
-        self.update_params_for_auth(header_params, query_params, auth_settings)
+        self.update_params_for_auth(
+            header_params, query_params, auth_settings,
+            request_auth=_request_auth)
 
         # body
         if body:
@@ -324,7 +327,8 @@ def call_api(self, resource_path, method,
                  body=None, post_params=None, files=None,
                  response_type=None, auth_settings=None, async_req=None,
                  _return_http_data_only=None, collection_formats=None,
-                 _preload_content=True, _request_timeout=None, _host=None):
+                 _preload_content=True, _request_timeout=None, _host=None,
+                 _request_auth=None):
         """Makes the HTTP request (synchronous) and returns deserialized data.
 
         To make an async_req request, set the async_req parameter.
@@ -354,6 +358,10 @@ def call_api(self, resource_path, method,
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_token: dict, optional
         :return:
             If async_req parameter is True,
             the request will be called asynchronously.
@@ -367,7 +375,8 @@ def call_api(self, resource_path, method,
                                    body, post_params, files,
                                    response_type, auth_settings,
                                    _return_http_data_only, collection_formats,
-                                   _preload_content, _request_timeout, _host)
+                                   _preload_content, _request_timeout, _host,
+                                   _request_auth)
 
         return self.pool.apply_async(self.__call_api, (resource_path,
                                                        method, path_params,
@@ -380,7 +389,7 @@ def call_api(self, resource_path, method,
                                                        collection_formats,
                                                        _preload_content,
                                                        _request_timeout,
-                                                       _host))
+                                                       _host, _request_auth))
 
     def request(self, method, url, query_params=None, headers=None,
                 post_params=None, body=None, _preload_content=True,
@@ -527,29 +536,45 @@ def select_header_content_type(self, content_types):
         else:
             return content_types[0]
 
-    def update_params_for_auth(self, headers, querys, auth_settings):
+    def update_params_for_auth(self, headers, querys, auth_settings,
+                               request_auth=None):
         """Updates header and query params based on authentication setting.
 
         :param headers: Header parameters dict to be updated.
         :param querys: Query parameters tuple list to be updated.
         :param auth_settings: Authentication setting identifiers list.
+        :param request_auth: if set, the provided settings will
+                             override the token in the configuration.
         """
         if not auth_settings:
             return
 
+        if request_auth:
+            self._apply_auth_params(headers, querys, request_auth)
+            return
+
         for auth in auth_settings:
             auth_setting = self.configuration.auth_settings().get(auth)
             if auth_setting:
-                if auth_setting['in'] == 'cookie':
-                    headers['Cookie'] = auth_setting['value']
-                elif auth_setting['in'] == 'header':
-                    headers[auth_setting['key']] = auth_setting['value']
-                elif auth_setting['in'] == 'query':
-                    querys.append((auth_setting['key'], auth_setting['value']))
-                else:
-                    raise ApiValueError(
-                        'Authentication token must be in `query` or `header`'
-                    )
+                self._apply_auth_params(headers, querys, auth_setting)
+
+    def _apply_auth_params(self, headers, querys, auth_setting):
+        """Updates the request parameters based on a single auth_setting
+
+        :param headers: Header parameters dict to be updated.
+        :param querys: Query parameters tuple list to be updated.
+        :param auth_setting: auth settings for the endpoint
+        """
+        if auth_setting['in'] == 'cookie':
+            headers['Cookie'] = auth_setting['value']
+        elif auth_setting['in'] == 'header':
+            headers[auth_setting['key']] = auth_setting['value']
+        elif auth_setting['in'] == 'query':
+            querys.append((auth_setting['key'], auth_setting['value']))
+        else:
+            raise ApiValueError(
+                'Authentication token must be in `query` or `header`'
+            )
 
     def __deserialize_file(self, response):
         """Deserializes body to file
diff --git a/samples/client/petstore/python-asyncio/petstore_api/configuration.py b/samples/client/petstore/python-asyncio/petstore_api/configuration.py
index 5c860e8c9547..ce419432358c 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/configuration.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/configuration.py
@@ -68,6 +68,15 @@ class Configuration(object):
       disabled. This can be useful to troubleshoot data validation problem, such as
       when the OpenAPI document validation rules do not match the actual API data
       received by the server.
+    :param server_index: Index to servers configuration.
+    :param server_variables: Mapping with string values to replace variables in
+      templated server configuration. The validation of enums is performed for
+      variables with defined enum values before.
+    :param server_operation_index: Mapping from operation ID to an index to server
+      configuration.
+    :param server_operation_variables: Mapping from operation ID to a mapping with
+      string values to replace variables in templated server configuration.
+      The validation of enums is performed for variables with defined enum values before.
 
     :Example:
 
@@ -109,17 +118,27 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host="http://petstore.swagger.io:80/v2",
+    def __init__(self, host=None,
                  api_key=None, api_key_prefix=None,
                  username=None, password=None,
                  discard_unknown_keys=False,
                  disabled_client_side_validations="",
+                 server_index=None, server_variables=None,
+                 server_operation_index=None, server_operation_variables=None,
                  ):
         """Constructor
         """
-        self.host = host
+        self._base_path = "http://petstore.swagger.io:80/v2" if host is None else host
         """Default Base url
         """
+        self.server_index = 0 if server_index is None and host is None else server_index
+        self.server_operation_index = server_operation_index or {}
+        """Default server index
+        """
+        self.server_variables = server_variables or {}
+        self.server_operation_variables = server_operation_variables or {}
+        """Default server variables
+        """
         self.temp_folder_path = None
         """Temp file folder for downloading files
         """
@@ -204,7 +223,7 @@ def __init__(self, host="http://petstore.swagger.io:80/v2",
         self.retries = None
         """Adding retries to override urllib3 default value 3
         """
-        # Disable client side validation
+        # Enable client side validation
         self.client_side_validation = True
 
     def __deepcopy__(self, memo):
@@ -341,15 +360,16 @@ def logger_format(self, value):
         self.__logger_format = value
         self.logger_formatter = logging.Formatter(self.__logger_format)
 
-    def get_api_key_with_prefix(self, identifier):
+    def get_api_key_with_prefix(self, identifier, alias=None):
         """Gets API key (with prefix if set).
 
         :param identifier: The identifier of apiKey.
+        :param alias: The alternative identifier of apiKey.
         :return: The token for api key authentication.
         """
         if self.refresh_api_key_hook is not None:
             self.refresh_api_key_hook(self)
-        key = self.api_key.get(identifier)
+        key = self.api_key.get(identifier, self.api_key.get(alias) if alias is not None else None)
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
@@ -383,14 +403,18 @@ def auth_settings(self):
                 'type': 'api_key',
                 'in': 'header',
                 'key': 'api_key',
-                'value': self.get_api_key_with_prefix('api_key')
+                'value': self.get_api_key_with_prefix(
+                    'api_key',
+                ),
             }
         if 'api_key_query' in self.api_key:
             auth['api_key_query'] = {
                 'type': 'api_key',
                 'in': 'query',
                 'key': 'api_key_query',
-                'value': self.get_api_key_with_prefix('api_key_query')
+                'value': self.get_api_key_with_prefix(
+                    'api_key_query',
+                ),
             }
         if self.username is not None and self.password is not None:
             auth['http_basic_test'] = {
@@ -432,14 +456,18 @@ def get_host_settings(self):
             }
         ]
 
-    def get_host_from_settings(self, index, variables=None):
+    def get_host_from_settings(self, index, variables=None, servers=None):
         """Gets host URL based on the index and variables
         :param index: array index of the host settings
         :param variables: hash of variable and the corresponding value
+        :param servers: an array of host settings or None
         :return: URL based on host settings
         """
+        if index is None:
+            return self._base_path
+
         variables = {} if variables is None else variables
-        servers = self.get_host_settings()
+        servers = self.get_host_settings() if servers is None else servers
 
         try:
             server = servers[index]
@@ -451,7 +479,7 @@ def get_host_from_settings(self, index, variables=None):
         url = server['url']
 
         # go through variables and replace placeholders
-        for variable_name, variable in server['variables'].items():
+        for variable_name, variable in server.get('variables', {}).items():
             used_value = variables.get(
                 variable_name, variable['default_value'])
 
@@ -466,3 +494,14 @@ def get_host_from_settings(self, index, variables=None):
             url = url.replace("{" + variable_name + "}", used_value)
 
         return url
+
+    @property
+    def host(self):
+        """Return generated host."""
+        return self.get_host_from_settings(self.server_index, variables=self.server_variables)
+
+    @host.setter
+    def host(self, value):
+        """Fix base path."""
+        self._base_path = value
+        self.server_index = None
diff --git a/samples/client/petstore/python-experimental/petstore_api/api/another_fake_api.py b/samples/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
index 49f603489978..4324e43df1d8 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
@@ -18,11 +18,7 @@
 # python 2 and python 3 compatibility library
 import six
 
-from petstore_api.api_client import ApiClient
-from petstore_api.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from petstore_api.api_client import ApiClient, Endpoint
 from petstore_api.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -82,9 +78,9 @@ def __call_123_test_special_tags(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -110,7 +106,7 @@ def __call_123_test_special_tags(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['body'] = \
                 body
             return self.call_with_http_info(**kwargs)
@@ -122,7 +118,7 @@ def __call_123_test_special_tags(
                 'endpoint_path': '/another-fake/dummy',
                 'operation_id': 'call_123_test_special_tags',
                 'http_method': 'PATCH',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -166,223 +162,3 @@ def __call_123_test_special_tags(
             api_client=api_client,
             callable=__call_123_test_special_tags
         )
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/samples/client/petstore/python-experimental/petstore_api/api/fake_api.py b/samples/client/petstore/python-experimental/petstore_api/api/fake_api.py
index 3f2e1ae4bd94..12629f8357e9 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api/fake_api.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api/fake_api.py
@@ -18,11 +18,7 @@
 # python 2 and python 3 compatibility library
 import six
 
-from petstore_api.api_client import ApiClient
-from petstore_api.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from petstore_api.api_client import ApiClient, Endpoint
 from petstore_api.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -88,9 +84,9 @@ def __create_xml_item(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -116,7 +112,7 @@ def __create_xml_item(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['xml_item'] = \
                 xml_item
             return self.call_with_http_info(**kwargs)
@@ -128,7 +124,7 @@ def __create_xml_item(
                 'endpoint_path': '/fake/create_xml_item',
                 'operation_id': 'create_xml_item',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -207,9 +203,9 @@ def __fake_outer_boolean_serialize(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -235,7 +231,7 @@ def __fake_outer_boolean_serialize(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.fake_outer_boolean_serialize = Endpoint(
@@ -245,7 +241,7 @@ def __fake_outer_boolean_serialize(
                 'endpoint_path': '/fake/outer/boolean',
                 'operation_id': 'fake_outer_boolean_serialize',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -317,9 +313,9 @@ def __fake_outer_composite_serialize(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -345,7 +341,7 @@ def __fake_outer_composite_serialize(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.fake_outer_composite_serialize = Endpoint(
@@ -355,7 +351,7 @@ def __fake_outer_composite_serialize(
                 'endpoint_path': '/fake/outer/composite',
                 'operation_id': 'fake_outer_composite_serialize',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -427,9 +423,9 @@ def __fake_outer_enum_serialize(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -455,7 +451,7 @@ def __fake_outer_enum_serialize(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.fake_outer_enum_serialize = Endpoint(
@@ -465,7 +461,7 @@ def __fake_outer_enum_serialize(
                 'endpoint_path': '/fake/outer/enum',
                 'operation_id': 'fake_outer_enum_serialize',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -537,9 +533,9 @@ def __fake_outer_number_serialize(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -565,7 +561,7 @@ def __fake_outer_number_serialize(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.fake_outer_number_serialize = Endpoint(
@@ -575,7 +571,7 @@ def __fake_outer_number_serialize(
                 'endpoint_path': '/fake/outer/number',
                 'operation_id': 'fake_outer_number_serialize',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -647,9 +643,9 @@ def __fake_outer_string_serialize(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -675,7 +671,7 @@ def __fake_outer_string_serialize(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.fake_outer_string_serialize = Endpoint(
@@ -685,7 +681,7 @@ def __fake_outer_string_serialize(
                 'endpoint_path': '/fake/outer/string',
                 'operation_id': 'fake_outer_string_serialize',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -759,9 +755,9 @@ def __test_body_with_file_schema(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -787,7 +783,7 @@ def __test_body_with_file_schema(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['body'] = \
                 body
             return self.call_with_http_info(**kwargs)
@@ -799,7 +795,7 @@ def __test_body_with_file_schema(
                 'endpoint_path': '/fake/body-with-file-schema',
                 'operation_id': 'test_body_with_file_schema',
                 'http_method': 'PUT',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -876,9 +872,9 @@ def __test_body_with_query_params(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -904,7 +900,7 @@ def __test_body_with_query_params(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['query'] = \
                 query
             kwargs['body'] = \
@@ -918,7 +914,7 @@ def __test_body_with_query_params(
                 'endpoint_path': '/fake/body-with-query-params',
                 'operation_id': 'test_body_with_query_params',
                 'http_method': 'PUT',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1000,9 +996,9 @@ def __test_client_model(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1028,7 +1024,7 @@ def __test_client_model(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['body'] = \
                 body
             return self.call_with_http_info(**kwargs)
@@ -1040,7 +1036,7 @@ def __test_client_model(
                 'endpoint_path': '/fake',
                 'operation_id': 'test_client_model',
                 'http_method': 'PATCH',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1126,9 +1122,9 @@ def __test_endpoint_enums_length_one(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1154,7 +1150,7 @@ def __test_endpoint_enums_length_one(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['query_integer'] = \
                 query_integer
             kwargs['query_string'] = \
@@ -1174,7 +1170,7 @@ def __test_endpoint_enums_length_one(
                 'endpoint_path': '/fake/enums-of-length-one/{path_string}/{path_integer}',
                 'operation_id': 'test_endpoint_enums_length_one',
                 'http_method': 'PUT',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1314,9 +1310,9 @@ def __test_endpoint_parameters(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1342,7 +1338,7 @@ def __test_endpoint_parameters(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['number'] = \
                 number
             kwargs['double'] = \
@@ -1362,7 +1358,7 @@ def __test_endpoint_parameters(
                 'endpoint_path': '/fake',
                 'operation_id': 'test_endpoint_parameters',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1561,9 +1557,9 @@ def __test_enum_parameters(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1589,7 +1585,7 @@ def __test_enum_parameters(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.test_enum_parameters = Endpoint(
@@ -1599,7 +1595,7 @@ def __test_enum_parameters(
                 'endpoint_path': '/fake',
                 'operation_id': 'test_enum_parameters',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1770,9 +1766,9 @@ def __test_group_parameters(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1798,7 +1794,7 @@ def __test_group_parameters(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['required_string_group'] = \
                 required_string_group
             kwargs['required_boolean_group'] = \
@@ -1814,7 +1810,7 @@ def __test_group_parameters(
                 'endpoint_path': '/fake',
                 'operation_id': 'test_group_parameters',
                 'http_method': 'DELETE',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1915,9 +1911,9 @@ def __test_inline_additional_properties(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1943,7 +1939,7 @@ def __test_inline_additional_properties(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['param'] = \
                 param
             return self.call_with_http_info(**kwargs)
@@ -1955,7 +1951,7 @@ def __test_inline_additional_properties(
                 'endpoint_path': '/fake/inline-additionalProperties',
                 'operation_id': 'test_inline_additional_properties',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -2032,9 +2028,9 @@ def __test_json_form_data(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -2060,7 +2056,7 @@ def __test_json_form_data(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['param'] = \
                 param
             kwargs['param2'] = \
@@ -2074,7 +2070,7 @@ def __test_json_form_data(
                 'endpoint_path': '/fake/jsonFormData',
                 'operation_id': 'test_json_form_data',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -2123,223 +2119,3 @@ def __test_json_form_data(
             api_client=api_client,
             callable=__test_json_form_data
         )
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/samples/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py b/samples/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py
index 22b66a6a6c00..fb8838c8fcc7 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py
@@ -18,11 +18,7 @@
 # python 2 and python 3 compatibility library
 import six
 
-from petstore_api.api_client import ApiClient
-from petstore_api.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from petstore_api.api_client import ApiClient, Endpoint
 from petstore_api.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -82,9 +78,9 @@ def __test_classname(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -110,7 +106,7 @@ def __test_classname(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['body'] = \
                 body
             return self.call_with_http_info(**kwargs)
@@ -124,7 +120,7 @@ def __test_classname(
                 'endpoint_path': '/fake_classname_test',
                 'operation_id': 'test_classname',
                 'http_method': 'PATCH',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -168,223 +164,3 @@ def __test_classname(
             api_client=api_client,
             callable=__test_classname
         )
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/samples/client/petstore/python-experimental/petstore_api/api/pet_api.py b/samples/client/petstore/python-experimental/petstore_api/api/pet_api.py
index d917cb3cd678..0acb59cc01d2 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api/pet_api.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api/pet_api.py
@@ -18,11 +18,7 @@
 # python 2 and python 3 compatibility library
 import six
 
-from petstore_api.api_client import ApiClient
-from petstore_api.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from petstore_api.api_client import ApiClient, Endpoint
 from petstore_api.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -82,9 +78,9 @@ def __add_pet(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -110,7 +106,7 @@ def __add_pet(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['body'] = \
                 body
             return self.call_with_http_info(**kwargs)
@@ -124,7 +120,7 @@ def __add_pet(
                 'endpoint_path': '/pet',
                 'operation_id': 'add_pet',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -201,9 +197,9 @@ def __delete_pet(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -229,7 +225,7 @@ def __delete_pet(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['pet_id'] = \
                 pet_id
             return self.call_with_http_info(**kwargs)
@@ -243,7 +239,7 @@ def __delete_pet(
                 'endpoint_path': '/pet/{petId}',
                 'operation_id': 'delete_pet',
                 'http_method': 'DELETE',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -323,9 +319,9 @@ def __find_pets_by_status(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -351,7 +347,7 @@ def __find_pets_by_status(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['status'] = \
                 status
             return self.call_with_http_info(**kwargs)
@@ -365,7 +361,7 @@ def __find_pets_by_status(
                 'endpoint_path': '/pet/findByStatus',
                 'operation_id': 'find_pets_by_status',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -451,9 +447,9 @@ def __find_pets_by_tags(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -479,7 +475,7 @@ def __find_pets_by_tags(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['tags'] = \
                 tags
             return self.call_with_http_info(**kwargs)
@@ -493,7 +489,7 @@ def __find_pets_by_tags(
                 'endpoint_path': '/pet/findByTags',
                 'operation_id': 'find_pets_by_tags',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -572,9 +568,9 @@ def __get_pet_by_id(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -600,7 +596,7 @@ def __get_pet_by_id(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['pet_id'] = \
                 pet_id
             return self.call_with_http_info(**kwargs)
@@ -614,7 +610,7 @@ def __get_pet_by_id(
                 'endpoint_path': '/pet/{petId}',
                 'operation_id': 'get_pet_by_id',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -691,9 +687,9 @@ def __update_pet(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -719,7 +715,7 @@ def __update_pet(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['body'] = \
                 body
             return self.call_with_http_info(**kwargs)
@@ -733,7 +729,7 @@ def __update_pet(
                 'endpoint_path': '/pet',
                 'operation_id': 'update_pet',
                 'http_method': 'PUT',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -811,9 +807,9 @@ def __update_pet_with_form(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -839,7 +835,7 @@ def __update_pet_with_form(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['pet_id'] = \
                 pet_id
             return self.call_with_http_info(**kwargs)
@@ -853,7 +849,7 @@ def __update_pet_with_form(
                 'endpoint_path': '/pet/{petId}',
                 'operation_id': 'update_pet_with_form',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -942,9 +938,9 @@ def __upload_file(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -970,7 +966,7 @@ def __upload_file(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['pet_id'] = \
                 pet_id
             return self.call_with_http_info(**kwargs)
@@ -984,7 +980,7 @@ def __upload_file(
                 'endpoint_path': '/pet/{petId}/uploadImage',
                 'operation_id': 'upload_file',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1081,9 +1077,9 @@ def __upload_file_with_required_file(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1109,7 +1105,7 @@ def __upload_file_with_required_file(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['pet_id'] = \
                 pet_id
             kwargs['required_file'] = \
@@ -1125,7 +1121,7 @@ def __upload_file_with_required_file(
                 'endpoint_path': '/fake/{petId}/uploadImageWithRequiredFile',
                 'operation_id': 'upload_file_with_required_file',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1181,223 +1177,3 @@ def __upload_file_with_required_file(
             api_client=api_client,
             callable=__upload_file_with_required_file
         )
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/samples/client/petstore/python-experimental/petstore_api/api/store_api.py b/samples/client/petstore/python-experimental/petstore_api/api/store_api.py
index bd4c0e0a25ee..21f171650f99 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api/store_api.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api/store_api.py
@@ -18,11 +18,7 @@
 # python 2 and python 3 compatibility library
 import six
 
-from petstore_api.api_client import ApiClient
-from petstore_api.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from petstore_api.api_client import ApiClient, Endpoint
 from petstore_api.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -82,9 +78,9 @@ def __delete_order(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -110,7 +106,7 @@ def __delete_order(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['order_id'] = \
                 order_id
             return self.call_with_http_info(**kwargs)
@@ -122,7 +118,7 @@ def __delete_order(
                 'endpoint_path': '/store/order/{order_id}',
                 'operation_id': 'delete_order',
                 'http_method': 'DELETE',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -194,9 +190,9 @@ def __get_inventory(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -222,7 +218,7 @@ def __get_inventory(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.get_inventory = Endpoint(
@@ -234,7 +230,7 @@ def __get_inventory(
                 'endpoint_path': '/store/inventory',
                 'operation_id': 'get_inventory',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -304,9 +300,9 @@ def __get_order_by_id(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -332,7 +328,7 @@ def __get_order_by_id(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['order_id'] = \
                 order_id
             return self.call_with_http_info(**kwargs)
@@ -344,7 +340,7 @@ def __get_order_by_id(
                 'endpoint_path': '/store/order/{order_id}',
                 'operation_id': 'get_order_by_id',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -427,9 +423,9 @@ def __place_order(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -455,7 +451,7 @@ def __place_order(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['body'] = \
                 body
             return self.call_with_http_info(**kwargs)
@@ -467,7 +463,7 @@ def __place_order(
                 'endpoint_path': '/store/order',
                 'operation_id': 'place_order',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -510,223 +506,3 @@ def __place_order(
             api_client=api_client,
             callable=__place_order
         )
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/samples/client/petstore/python-experimental/petstore_api/api/user_api.py b/samples/client/petstore/python-experimental/petstore_api/api/user_api.py
index f313a2303546..75a3b54b584b 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api/user_api.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api/user_api.py
@@ -18,11 +18,7 @@
 # python 2 and python 3 compatibility library
 import six
 
-from petstore_api.api_client import ApiClient
-from petstore_api.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from petstore_api.api_client import ApiClient, Endpoint
 from petstore_api.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -82,9 +78,9 @@ def __create_user(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -110,7 +106,7 @@ def __create_user(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['body'] = \
                 body
             return self.call_with_http_info(**kwargs)
@@ -122,7 +118,7 @@ def __create_user(
                 'endpoint_path': '/user',
                 'operation_id': 'create_user',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -195,9 +191,9 @@ def __create_users_with_array_input(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -223,7 +219,7 @@ def __create_users_with_array_input(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['body'] = \
                 body
             return self.call_with_http_info(**kwargs)
@@ -235,7 +231,7 @@ def __create_users_with_array_input(
                 'endpoint_path': '/user/createWithArray',
                 'operation_id': 'create_users_with_array_input',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -308,9 +304,9 @@ def __create_users_with_list_input(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -336,7 +332,7 @@ def __create_users_with_list_input(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['body'] = \
                 body
             return self.call_with_http_info(**kwargs)
@@ -348,7 +344,7 @@ def __create_users_with_list_input(
                 'endpoint_path': '/user/createWithList',
                 'operation_id': 'create_users_with_list_input',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -422,9 +418,9 @@ def __delete_user(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -450,7 +446,7 @@ def __delete_user(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['username'] = \
                 username
             return self.call_with_http_info(**kwargs)
@@ -462,7 +458,7 @@ def __delete_user(
                 'endpoint_path': '/user/{username}',
                 'operation_id': 'delete_user',
                 'http_method': 'DELETE',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -536,9 +532,9 @@ def __get_user_by_name(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -564,7 +560,7 @@ def __get_user_by_name(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['username'] = \
                 username
             return self.call_with_http_info(**kwargs)
@@ -576,7 +572,7 @@ def __get_user_by_name(
                 'endpoint_path': '/user/{username}',
                 'operation_id': 'get_user_by_name',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -655,9 +651,9 @@ def __login_user(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -683,7 +679,7 @@ def __login_user(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['username'] = \
                 username
             kwargs['password'] = \
@@ -697,7 +693,7 @@ def __login_user(
                 'endpoint_path': '/user/login',
                 'operation_id': 'login_user',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -777,9 +773,9 @@ def __logout_user(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -805,7 +801,7 @@ def __logout_user(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.logout_user = Endpoint(
@@ -815,7 +811,7 @@ def __logout_user(
                 'endpoint_path': '/user/logout',
                 'operation_id': 'logout_user',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -885,9 +881,9 @@ def __update_user(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -913,7 +909,7 @@ def __update_user(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['username'] = \
                 username
             kwargs['body'] = \
@@ -927,7 +923,7 @@ def __update_user(
                 'endpoint_path': '/user/{username}',
                 'operation_id': 'update_user',
                 'http_method': 'PUT',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -973,223 +969,3 @@ def __update_user(
             api_client=api_client,
             callable=__update_user
         )
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/samples/client/petstore/python-experimental/petstore_api/api_client.py b/samples/client/petstore/python-experimental/petstore_api/api_client.py
index 58430c7459e9..891d42be49f3 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api_client.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api_client.py
@@ -23,16 +23,20 @@
 
 from petstore_api import rest
 from petstore_api.configuration import Configuration
-from petstore_api.exceptions import ApiValueError, ApiException
+from petstore_api.exceptions import ApiTypeError, ApiValueError, ApiException
 from petstore_api.model_utils import (
     ModelNormal,
     ModelSimple,
     ModelComposed,
+    check_allowed_values,
+    check_validations,
     date,
     datetime,
     deserialize_file,
     file_type,
+    int,
     model_to_dict,
+    none_type,
     str,
     validate_and_convert_types
 )
@@ -576,3 +580,231 @@ def update_params_for_auth(self, headers, querys, auth_settings,
                     raise ApiValueError(
                         'Authentication token must be in `query` or `header`'
                     )
+
+
+class Endpoint(object):
+    def __init__(self, settings=None, params_map=None, root_map=None,
+                 headers_map=None, api_client=None, callable=None):
+        """Creates an endpoint
+
+        Args:
+            settings (dict): see below key value pairs
+                'response_type' (tuple/None): response type
+                'auth' (list): a list of auth type keys
+                'endpoint_path' (str): the endpoint path
+                'operation_id' (str): endpoint string identifier
+                'http_method' (str): POST/PUT/PATCH/GET etc
+                'servers' (list): list of str servers that this endpoint is at
+            params_map (dict): see below key value pairs
+                'all' (list): list of str endpoint parameter names
+                'required' (list): list of required parameter names
+                'nullable' (list): list of nullable parameter names
+                'enum' (list): list of parameters with enum values
+                'validation' (list): list of parameters with validations
+            root_map
+                'validations' (dict): the dict mapping endpoint parameter tuple
+                    paths to their validation dictionaries
+                'allowed_values' (dict): the dict mapping endpoint parameter
+                    tuple paths to their allowed_values (enum) dictionaries
+                'openapi_types' (dict): param_name to openapi type
+                'attribute_map' (dict): param_name to camelCase name
+                'location_map' (dict): param_name to  'body', 'file', 'form',
+                    'header', 'path', 'query'
+                collection_format_map (dict): param_name to `csv` etc.
+            headers_map (dict): see below key value pairs
+                'accept' (list): list of Accept header strings
+                'content_type' (list): list of Content-Type header strings
+            api_client (ApiClient) api client instance
+            callable (function): the function which is invoked when the
+                Endpoint is called
+        """
+        self.settings = settings
+        self.params_map = params_map
+        self.params_map['all'].extend([
+            'async_req',
+            '_host_index',
+            '_preload_content',
+            '_request_timeout',
+            '_return_http_data_only',
+            '_check_input_type',
+            '_check_return_type'
+        ])
+        self.params_map['nullable'].extend(['_request_timeout'])
+        self.validations = root_map['validations']
+        self.allowed_values = root_map['allowed_values']
+        self.openapi_types = root_map['openapi_types']
+        extra_types = {
+            'async_req': (bool,),
+            '_host_index': (none_type, int),
+            '_preload_content': (bool,),
+            '_request_timeout': (none_type, int, (int,), [int]),
+            '_return_http_data_only': (bool,),
+            '_check_input_type': (bool,),
+            '_check_return_type': (bool,)
+        }
+        self.openapi_types.update(extra_types)
+        self.attribute_map = root_map['attribute_map']
+        self.location_map = root_map['location_map']
+        self.collection_format_map = root_map['collection_format_map']
+        self.headers_map = headers_map
+        self.api_client = api_client
+        self.callable = callable
+
+    def __validate_inputs(self, kwargs):
+        for param in self.params_map['enum']:
+            if param in kwargs:
+                check_allowed_values(
+                    self.allowed_values,
+                    (param,),
+                    kwargs[param]
+                )
+
+        for param in self.params_map['validation']:
+            if param in kwargs:
+                check_validations(
+                    self.validations,
+                    (param,),
+                    kwargs[param],
+                    configuration=self.api_client.configuration
+                )
+
+        if kwargs['_check_input_type'] is False:
+            return
+
+        for key, value in six.iteritems(kwargs):
+            fixed_val = validate_and_convert_types(
+                value,
+                self.openapi_types[key],
+                [key],
+                False,
+                kwargs['_check_input_type'],
+                configuration=self.api_client.configuration
+            )
+            kwargs[key] = fixed_val
+
+    def __gather_params(self, kwargs):
+        params = {
+            'body': None,
+            'collection_format': {},
+            'file': {},
+            'form': [],
+            'header': {},
+            'path': {},
+            'query': []
+        }
+
+        for param_name, param_value in six.iteritems(kwargs):
+            param_location = self.location_map.get(param_name)
+            if param_location is None:
+                continue
+            if param_location:
+                if param_location == 'body':
+                    params['body'] = param_value
+                    continue
+                base_name = self.attribute_map[param_name]
+                if (param_location == 'form' and
+                        self.openapi_types[param_name] == (file_type,)):
+                    params['file'][param_name] = [param_value]
+                elif (param_location == 'form' and
+                        self.openapi_types[param_name] == ([file_type],)):
+                    # param_value is already a list
+                    params['file'][param_name] = param_value
+                elif param_location in {'form', 'query'}:
+                    param_value_full = (base_name, param_value)
+                    params[param_location].append(param_value_full)
+                if param_location not in {'form', 'query'}:
+                    params[param_location][base_name] = param_value
+                collection_format = self.collection_format_map.get(param_name)
+                if collection_format:
+                    params['collection_format'][base_name] = collection_format
+
+        return params
+
+    def __call__(self, *args, **kwargs):
+        """ This method is invoked when endpoints are called
+        Example:
+        pet_api = PetApi()
+        pet_api.add_pet  # this is an instance of the class Endpoint
+        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
+        which then invokes the callable functions stored in that endpoint at
+        pet_api.add_pet.callable or self.callable in this class
+        """
+        return self.callable(self, *args, **kwargs)
+
+    def call_with_http_info(self, **kwargs):
+
+        try:
+            index = self.api_client.configuration.server_operation_index.get(
+                self.settings['operation_id'], self.api_client.configuration.server_index
+            ) if kwargs['_host_index'] is None else kwargs['_host_index']
+            server_variables = self.api_client.configuration.server_operation_variables.get(
+                self.settings['operation_id'], self.api_client.configuration.server_variables
+            )
+            _host = self.api_client.configuration.get_host_from_settings(
+                index, variables=server_variables, servers=self.settings['servers']
+            )
+        except IndexError:
+            if self.settings['servers']:
+                raise ApiValueError(
+                    "Invalid host index. Must be 0 <= index < %s" %
+                    len(self.settings['servers'])
+                )
+            _host = None
+
+        for key, value in six.iteritems(kwargs):
+            if key not in self.params_map['all']:
+                raise ApiTypeError(
+                    "Got an unexpected parameter '%s'"
+                    " to method `%s`" %
+                    (key, self.settings['operation_id'])
+                )
+            # only throw this nullable ApiValueError if _check_input_type
+            # is False, if _check_input_type==True we catch this case
+            # in self.__validate_inputs
+            if (key not in self.params_map['nullable'] and value is None
+                    and kwargs['_check_input_type'] is False):
+                raise ApiValueError(
+                    "Value may not be None for non-nullable parameter `%s`"
+                    " when calling `%s`" %
+                    (key, self.settings['operation_id'])
+                )
+
+        for key in self.params_map['required']:
+            if key not in kwargs.keys():
+                raise ApiValueError(
+                    "Missing the required parameter `%s` when calling "
+                    "`%s`" % (key, self.settings['operation_id'])
+                )
+
+        self.__validate_inputs(kwargs)
+
+        params = self.__gather_params(kwargs)
+
+        accept_headers_list = self.headers_map['accept']
+        if accept_headers_list:
+            params['header']['Accept'] = self.api_client.select_header_accept(
+                accept_headers_list)
+
+        content_type_headers_list = self.headers_map['content_type']
+        if content_type_headers_list:
+            header_list = self.api_client.select_header_content_type(
+                content_type_headers_list)
+            params['header']['Content-Type'] = header_list
+
+        return self.api_client.call_api(
+            self.settings['endpoint_path'], self.settings['http_method'],
+            params['path'],
+            params['query'],
+            params['header'],
+            body=params['body'],
+            post_params=params['form'],
+            files=params['file'],
+            response_type=self.settings['response_type'],
+            auth_settings=self.settings['auth'],
+            async_req=kwargs['async_req'],
+            _check_type=kwargs['_check_return_type'],
+            _return_http_data_only=kwargs['_return_http_data_only'],
+            _preload_content=kwargs['_preload_content'],
+            _request_timeout=kwargs['_request_timeout'],
+            _host=_host,
+            collection_formats=params['collection_format'])
diff --git a/samples/client/petstore/python-experimental/petstore_api/apis/__init__.py b/samples/client/petstore/python-experimental/petstore_api/apis/__init__.py
index f309caa3e651..2dda59f02eaa 100644
--- a/samples/client/petstore/python-experimental/petstore_api/apis/__init__.py
+++ b/samples/client/petstore/python-experimental/petstore_api/apis/__init__.py
@@ -2,16 +2,19 @@
 
 # flake8: noqa
 
-# import all apis into this package
-# if you have many ampis here with many many models used in each api this may
-# raise a RecursionError
-# to avoid this, import only the api that you directly need like:
-# from .api.pet_api import PetApi
+# Import all APIs into this package.
+# If you have many APIs here with many many models used in each API this may
+# raise a `RecursionError`.
+# In order to avoid this, import only the API that you directly need like:
+#
+#   from .api.pet_api import PetApi
+#
 # or import this package, but before doing it, use:
-# import sys
-# sys.setrecursionlimit(n)
+#
+#   import sys
+#   sys.setrecursionlimit(n)
 
-# import apis into api package
+# Import APIs into API package:
 from petstore_api.api.another_fake_api import AnotherFakeApi
 from petstore_api.api.fake_api import FakeApi
 from petstore_api.api.fake_classname_tags_123_api import FakeClassnameTags123Api
diff --git a/samples/client/petstore/python-experimental/petstore_api/configuration.py b/samples/client/petstore/python-experimental/petstore_api/configuration.py
index 18085f8b7485..81b2cd7e9d0e 100644
--- a/samples/client/petstore/python-experimental/petstore_api/configuration.py
+++ b/samples/client/petstore/python-experimental/petstore_api/configuration.py
@@ -69,6 +69,15 @@ class Configuration(object):
       disabled. This can be useful to troubleshoot data validation problem, such as
       when the OpenAPI document validation rules do not match the actual API data
       received by the server.
+    :param server_index: Index to servers configuration.
+    :param server_variables: Mapping with string values to replace variables in
+      templated server configuration. The validation of enums is performed for
+      variables with defined enum values before.
+    :param server_operation_index: Mapping from operation ID to an index to server
+      configuration.
+    :param server_operation_variables: Mapping from operation ID to a mapping with
+      string values to replace variables in templated server configuration.
+      The validation of enums is performed for variables with defined enum values before.
 
     :Example:
 
@@ -110,17 +119,27 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host="http://petstore.swagger.io:80/v2",
+    def __init__(self, host=None,
                  api_key=None, api_key_prefix=None,
                  username=None, password=None,
                  discard_unknown_keys=False,
                  disabled_client_side_validations="",
+                 server_index=None, server_variables=None,
+                 server_operation_index=None, server_operation_variables=None,
                  ):
         """Constructor
         """
-        self.host = host
+        self._base_path = "http://petstore.swagger.io:80/v2" if host is None else host
         """Default Base url
         """
+        self.server_index = 0 if server_index is None and host is None else server_index
+        self.server_operation_index = server_operation_index or {}
+        """Default server index
+        """
+        self.server_variables = server_variables or {}
+        self.server_operation_variables = server_operation_variables or {}
+        """Default server variables
+        """
         self.temp_folder_path = None
         """Temp file folder for downloading files
         """
@@ -208,7 +227,7 @@ def __init__(self, host="http://petstore.swagger.io:80/v2",
         self.retries = None
         """Adding retries to override urllib3 default value 3
         """
-        # Disable client side validation
+        # Enable client side validation
         self.client_side_validation = True
 
     def __deepcopy__(self, memo):
@@ -345,15 +364,16 @@ def logger_format(self, value):
         self.__logger_format = value
         self.logger_formatter = logging.Formatter(self.__logger_format)
 
-    def get_api_key_with_prefix(self, identifier):
+    def get_api_key_with_prefix(self, identifier, alias=None):
         """Gets API key (with prefix if set).
 
         :param identifier: The identifier of apiKey.
+        :param alias: The alternative identifier of apiKey.
         :return: The token for api key authentication.
         """
         if self.refresh_api_key_hook is not None:
             self.refresh_api_key_hook(self)
-        key = self.api_key.get(identifier)
+        key = self.api_key.get(identifier, self.api_key.get(alias) if alias is not None else None)
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
@@ -387,14 +407,18 @@ def auth_settings(self):
                 'type': 'api_key',
                 'in': 'header',
                 'key': 'api_key',
-                'value': self.get_api_key_with_prefix('api_key')
+                'value': self.get_api_key_with_prefix(
+                    'api_key',
+                ),
             }
         if 'api_key_query' in self.api_key:
             auth['api_key_query'] = {
                 'type': 'api_key',
                 'in': 'query',
                 'key': 'api_key_query',
-                'value': self.get_api_key_with_prefix('api_key_query')
+                'value': self.get_api_key_with_prefix(
+                    'api_key_query',
+                ),
             }
         if self.username is not None and self.password is not None:
             auth['http_basic_test'] = {
@@ -436,14 +460,18 @@ def get_host_settings(self):
             }
         ]
 
-    def get_host_from_settings(self, index, variables=None):
+    def get_host_from_settings(self, index, variables=None, servers=None):
         """Gets host URL based on the index and variables
         :param index: array index of the host settings
         :param variables: hash of variable and the corresponding value
+        :param servers: an array of host settings or None
         :return: URL based on host settings
         """
+        if index is None:
+            return self._base_path
+
         variables = {} if variables is None else variables
-        servers = self.get_host_settings()
+        servers = self.get_host_settings() if servers is None else servers
 
         try:
             server = servers[index]
@@ -455,7 +483,7 @@ def get_host_from_settings(self, index, variables=None):
         url = server['url']
 
         # go through variables and replace placeholders
-        for variable_name, variable in server['variables'].items():
+        for variable_name, variable in server.get('variables', {}).items():
             used_value = variables.get(
                 variable_name, variable['default_value'])
 
@@ -470,3 +498,14 @@ def get_host_from_settings(self, index, variables=None):
             url = url.replace("{" + variable_name + "}", used_value)
 
         return url
+
+    @property
+    def host(self):
+        """Return generated host."""
+        return self.get_host_from_settings(self.server_index, variables=self.server_variables)
+
+    @host.setter
+    def host(self, value):
+        """Fix base path."""
+        self._base_path = value
+        self.server_index = None
diff --git a/samples/client/petstore/python-experimental/petstore_api/model/animal_farm.py b/samples/client/petstore/python-experimental/petstore_api/model/animal_farm.py
index 3e6d723ff2b2..6f6ea3351a74 100644
--- a/samples/client/petstore/python-experimental/petstore_api/model/animal_farm.py
+++ b/samples/client/petstore/python-experimental/petstore_api/model/animal_farm.py
@@ -88,6 +88,8 @@ def openapi_types():
     def discriminator():
         return None
 
+    attribute_map = {}
+
     _composed_schemas = None
 
     required_properties = set([
diff --git a/samples/client/petstore/python-experimental/petstore_api/model/enum_class.py b/samples/client/petstore/python-experimental/petstore_api/model/enum_class.py
index 3fa95b69d0c9..896984fc77c2 100644
--- a/samples/client/petstore/python-experimental/petstore_api/model/enum_class.py
+++ b/samples/client/petstore/python-experimental/petstore_api/model/enum_class.py
@@ -88,6 +88,8 @@ def openapi_types():
     def discriminator():
         return None
 
+    attribute_map = {}
+
     _composed_schemas = None
 
     required_properties = set([
diff --git a/samples/client/petstore/python-experimental/petstore_api/model/outer_enum.py b/samples/client/petstore/python-experimental/petstore_api/model/outer_enum.py
index 013f6bdd112a..cbf2d5920fa8 100644
--- a/samples/client/petstore/python-experimental/petstore_api/model/outer_enum.py
+++ b/samples/client/petstore/python-experimental/petstore_api/model/outer_enum.py
@@ -88,6 +88,8 @@ def openapi_types():
     def discriminator():
         return None
 
+    attribute_map = {}
+
     _composed_schemas = None
 
     required_properties = set([
diff --git a/samples/client/petstore/python-experimental/petstore_api/model/outer_number.py b/samples/client/petstore/python-experimental/petstore_api/model/outer_number.py
index a6384cf9f5fd..e6d4d8d2768f 100644
--- a/samples/client/petstore/python-experimental/petstore_api/model/outer_number.py
+++ b/samples/client/petstore/python-experimental/petstore_api/model/outer_number.py
@@ -87,6 +87,8 @@ def openapi_types():
     def discriminator():
         return None
 
+    attribute_map = {}
+
     _composed_schemas = None
 
     required_properties = set([
diff --git a/samples/client/petstore/python-experimental/petstore_api/model_utils.py b/samples/client/petstore/python-experimental/petstore_api/model_utils.py
index 982115862d62..299a61dc1cc0 100644
--- a/samples/client/petstore/python-experimental/petstore_api/model_utils.py
+++ b/samples/client/petstore/python-experimental/petstore_api/model_utils.py
@@ -1218,7 +1218,7 @@ def is_type_nullable(input_type):
     if issubclass(input_type, OpenApiModel) and input_type._nullable:
         return True
     if issubclass(input_type, ModelComposed):
-        # If oneOf/anyOf, check if the 'null' type is one of the allowed types.          
+        # If oneOf/anyOf, check if the 'null' type is one of the allowed types.
         for t in input_type._composed_schemas.get('oneOf', ()):
             if is_type_nullable(t): return True
         for t in input_type._composed_schemas.get('anyOf', ()):
@@ -1242,7 +1242,7 @@ def is_valid_type(input_class_simple, valid_classes):
             input_class_simple is none_type):
         for valid_class in valid_classes:
             if input_class_simple is none_type and is_type_nullable(valid_class):
-                # Schema is oneOf/anyOf and the 'null' type is one of the allowed types.            
+                # Schema is oneOf/anyOf and the 'null' type is one of the allowed types.
                 return True
             if not (issubclass(valid_class, OpenApiModel) and valid_class.discriminator):
                 continue
@@ -1405,6 +1405,8 @@ def model_to_dict(model_instance, serialize=True):
                     if hasattr(item[1], '_data_store') else item,
                     value.items()
                 ))
+            elif isinstance(value, ModelSimple):
+                result[attr] = value.value
             elif hasattr(value, '_data_store'):
                 result[attr] = model_to_dict(value, serialize=serialize)
             else:
diff --git a/samples/client/petstore/python-experimental/test/test_fake_api.py b/samples/client/petstore/python-experimental/test/test_fake_api.py
index d55e538b8608..8c49c709ef5e 100644
--- a/samples/client/petstore/python-experimental/test/test_fake_api.py
+++ b/samples/client/petstore/python-experimental/test/test_fake_api.py
@@ -107,7 +107,7 @@ def test_test_endpoint_enums_length_one(self):
             call_with_http_info.assert_called_with(
                 _check_input_type=True,
                 _check_return_type=True,
-                _host_index=0,
+                _host_index=None,
                 _preload_content=True,
                 _request_timeout=None,
                 _return_http_data_only=True,
diff --git a/samples/client/petstore/python-experimental/tests/test_serialization.py b/samples/client/petstore/python-experimental/tests/test_serialization.py
new file mode 100644
index 000000000000..4b9e57652c5d
--- /dev/null
+++ b/samples/client/petstore/python-experimental/tests/test_serialization.py
@@ -0,0 +1,81 @@
+# coding: utf-8
+
+# flake8: noqa
+
+"""
+Run the tests.
+$ pip install nose (optional)
+$ cd OpenAPIPetstore-python
+$ nosetests -v
+"""
+from collections import namedtuple
+import json
+import os
+import time
+import unittest
+import datetime
+
+import six
+
+import petstore_api
+
+from petstore_api.exceptions import (
+    ApiTypeError,
+    ApiKeyError,
+    ApiValueError,
+)
+from petstore_api.model import (
+    enum_test,
+    pet,
+    animal,
+    dog,
+    parent_pet,
+    child_lizard,
+    category,
+    outer_enum,
+    outer_number,
+    string_boolean_map,
+)
+from petstore_api.model_utils import (
+    file_type,
+    int,
+    model_to_dict,
+    str,
+)
+
+from petstore_api.rest import RESTResponse
+
+MockResponse = namedtuple('MockResponse', 'data')
+
+class SerializationTests(unittest.TestCase):
+
+    def setUp(self):
+        self.api_client = petstore_api.ApiClient()
+        self.serialize = self.api_client.sanitize_for_serialization
+
+    def test_enum_test(self):
+        """ serialize dict(str, Enum_Test) """
+        value = (
+            outer_enum.OuterEnum.allowed_values[('value',)]["PLACED"])
+        outer_enum_val = outer_enum.OuterEnum(value)
+
+        source = enum_test.EnumTest(
+            enum_string="UPPER",
+            enum_string_required="lower",
+            enum_integer=1,
+            enum_number=1.1,
+            outer_enum=outer_enum_val
+        )
+
+        result = {
+            'enum_test': {
+                "enum_string": "UPPER",
+                "enum_string_required": "lower",
+                "enum_integer": 1,
+                "enum_number": 1.1,
+                "outerEnum": "placed"
+            }
+        }
+        serialized = self.serialize({"enum_test": source})
+
+        self.assertEqual(result, serialized)
diff --git a/samples/client/petstore/python-tornado/petstore_api/api/another_fake_api.py b/samples/client/petstore/python-tornado/petstore_api/api/another_fake_api.py
index 4d69b287ca8b..562b9faa58f2 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api/another_fake_api.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api/another_fake_api.py
@@ -91,6 +91,10 @@ def call_123_test_special_tags_with_http_info(self, body, **kwargs):  # noqa: E5
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def call_123_test_special_tags_with_http_info(self, body, **kwargs):  # noqa: E5
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -163,4 +168,5 @@ def call_123_test_special_tags_with_http_info(self, body, **kwargs):  # noqa: E5
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python-tornado/petstore_api/api/fake_api.py b/samples/client/petstore/python-tornado/petstore_api/api/fake_api.py
index 7789acf51c3d..b171fe8b3d7d 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api/fake_api.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api/fake_api.py
@@ -91,6 +91,10 @@ def create_xml_item_with_http_info(self, xml_item, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def create_xml_item_with_http_info(self, xml_item, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -159,7 +164,8 @@ def create_xml_item_with_http_info(self, xml_item, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_boolean_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_boolean_serialize  # noqa: E501
@@ -216,6 +222,10 @@ def fake_outer_boolean_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -232,7 +242,8 @@ def fake_outer_boolean_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -280,7 +291,8 @@ def fake_outer_boolean_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_composite_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_composite_serialize  # noqa: E501
@@ -337,6 +349,10 @@ def fake_outer_composite_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -353,7 +369,8 @@ def fake_outer_composite_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -401,7 +418,8 @@ def fake_outer_composite_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_number_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_number_serialize  # noqa: E501
@@ -458,6 +476,10 @@ def fake_outer_number_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -474,7 +496,8 @@ def fake_outer_number_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -522,7 +545,8 @@ def fake_outer_number_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_string_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_string_serialize  # noqa: E501
@@ -579,6 +603,10 @@ def fake_outer_string_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -595,7 +623,8 @@ def fake_outer_string_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -643,7 +672,8 @@ def fake_outer_string_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_body_with_file_schema(self, body, **kwargs):  # noqa: E501
         """test_body_with_file_schema  # noqa: E501
@@ -700,6 +730,10 @@ def test_body_with_file_schema_with_http_info(self, body, **kwargs):  # noqa: E5
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -716,7 +750,8 @@ def test_body_with_file_schema_with_http_info(self, body, **kwargs):  # noqa: E5
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -768,7 +803,8 @@ def test_body_with_file_schema_with_http_info(self, body, **kwargs):  # noqa: E5
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_body_with_query_params(self, query, body, **kwargs):  # noqa: E501
         """test_body_with_query_params  # noqa: E501
@@ -827,6 +863,10 @@ def test_body_with_query_params_with_http_info(self, query, body, **kwargs):  #
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -844,7 +884,8 @@ def test_body_with_query_params_with_http_info(self, query, body, **kwargs):  #
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -902,7 +943,8 @@ def test_body_with_query_params_with_http_info(self, query, body, **kwargs):  #
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_client_model(self, body, **kwargs):  # noqa: E501
         """To test \"client\" model  # noqa: E501
@@ -959,6 +1001,10 @@ def test_client_model_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -975,7 +1021,8 @@ def test_client_model_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1031,7 +1078,8 @@ def test_client_model_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_endpoint_parameters(self, number, double, pattern_without_delimiter, byte, **kwargs):  # noqa: E501
         """Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트  # noqa: E501
@@ -1140,6 +1188,10 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1169,7 +1221,8 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1287,7 +1340,8 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_enum_parameters(self, **kwargs):  # noqa: E501
         """To test enum parameters  # noqa: E501
@@ -1372,6 +1426,10 @@ def test_enum_parameters_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1395,7 +1453,8 @@ def test_enum_parameters_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1460,7 +1519,8 @@ def test_enum_parameters_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_group_parameters(self, required_string_group, required_boolean_group, required_int64_group, **kwargs):  # noqa: E501
         """Fake endpoint to test group parameters (optional)  # noqa: E501
@@ -1537,6 +1597,10 @@ def test_group_parameters_with_http_info(self, required_string_group, required_b
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1558,7 +1622,8 @@ def test_group_parameters_with_http_info(self, required_string_group, required_b
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1624,7 +1689,8 @@ def test_group_parameters_with_http_info(self, required_string_group, required_b
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_inline_additional_properties(self, param, **kwargs):  # noqa: E501
         """test inline additionalProperties  # noqa: E501
@@ -1679,6 +1745,10 @@ def test_inline_additional_properties_with_http_info(self, param, **kwargs):  #
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1695,7 +1765,8 @@ def test_inline_additional_properties_with_http_info(self, param, **kwargs):  #
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1747,7 +1818,8 @@ def test_inline_additional_properties_with_http_info(self, param, **kwargs):  #
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_json_form_data(self, param, param2, **kwargs):  # noqa: E501
         """test json serialization of form data  # noqa: E501
@@ -1806,6 +1878,10 @@ def test_json_form_data_with_http_info(self, param, param2, **kwargs):  # noqa:
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1823,7 +1899,8 @@ def test_json_form_data_with_http_info(self, param, param2, **kwargs):  # noqa:
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1881,7 +1958,8 @@ def test_json_form_data_with_http_info(self, param, param2, **kwargs):  # noqa:
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_query_parameter_collection_format(self, pipe, ioutil, http, url, context, **kwargs):  # noqa: E501
         """test_query_parameter_collection_format  # noqa: E501
@@ -1954,6 +2032,10 @@ def test_query_parameter_collection_format_with_http_info(self, pipe, ioutil, ht
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1974,7 +2056,8 @@ def test_query_parameter_collection_format_with_http_info(self, pipe, ioutil, ht
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -2051,4 +2134,5 @@ def test_query_parameter_collection_format_with_http_info(self, pipe, ioutil, ht
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python-tornado/petstore_api/api/fake_classname_tags_123_api.py b/samples/client/petstore/python-tornado/petstore_api/api/fake_classname_tags_123_api.py
index d963591a49a8..5cd445261491 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api/fake_classname_tags_123_api.py
@@ -91,6 +91,10 @@ def test_classname_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def test_classname_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -163,4 +168,5 @@ def test_classname_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python-tornado/petstore_api/api/pet_api.py b/samples/client/petstore/python-tornado/petstore_api/api/pet_api.py
index 7002fe32740f..3119e2d60c45 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api/pet_api.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api/pet_api.py
@@ -89,6 +89,10 @@ def add_pet_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -105,7 +109,8 @@ def add_pet_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -157,7 +162,8 @@ def add_pet_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def delete_pet(self, pet_id, **kwargs):  # noqa: E501
         """Deletes a pet  # noqa: E501
@@ -216,6 +222,10 @@ def delete_pet_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -233,7 +243,8 @@ def delete_pet_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -283,7 +294,8 @@ def delete_pet_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def find_pets_by_status(self, status, **kwargs):  # noqa: E501
         """Finds Pets by status  # noqa: E501
@@ -340,6 +352,10 @@ def find_pets_by_status_with_http_info(self, status, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -356,7 +372,8 @@ def find_pets_by_status_with_http_info(self, status, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -409,7 +426,8 @@ def find_pets_by_status_with_http_info(self, status, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def find_pets_by_tags(self, tags, **kwargs):  # noqa: E501
         """Finds Pets by tags  # noqa: E501
@@ -466,6 +484,10 @@ def find_pets_by_tags_with_http_info(self, tags, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -482,7 +504,8 @@ def find_pets_by_tags_with_http_info(self, tags, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -535,7 +558,8 @@ def find_pets_by_tags_with_http_info(self, tags, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_pet_by_id(self, pet_id, **kwargs):  # noqa: E501
         """Find pet by ID  # noqa: E501
@@ -592,6 +616,10 @@ def get_pet_by_id_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -608,7 +636,8 @@ def get_pet_by_id_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -660,7 +689,8 @@ def get_pet_by_id_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def update_pet(self, body, **kwargs):  # noqa: E501
         """Update an existing pet  # noqa: E501
@@ -715,6 +745,10 @@ def update_pet_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -731,7 +765,8 @@ def update_pet_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -783,7 +818,8 @@ def update_pet_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def update_pet_with_form(self, pet_id, **kwargs):  # noqa: E501
         """Updates a pet in the store with form data  # noqa: E501
@@ -846,6 +882,10 @@ def update_pet_with_form_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -864,7 +904,8 @@ def update_pet_with_form_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -920,7 +961,8 @@ def update_pet_with_form_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def upload_file(self, pet_id, **kwargs):  # noqa: E501
         """uploads an image  # noqa: E501
@@ -983,6 +1025,10 @@ def upload_file_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1001,7 +1047,8 @@ def upload_file_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1061,7 +1108,8 @@ def upload_file_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def upload_file_with_required_file(self, pet_id, required_file, **kwargs):  # noqa: E501
         """uploads an image (required)  # noqa: E501
@@ -1124,6 +1172,10 @@ def upload_file_with_required_file_with_http_info(self, pet_id, required_file, *
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1142,7 +1194,8 @@ def upload_file_with_required_file_with_http_info(self, pet_id, required_file, *
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1206,4 +1259,5 @@ def upload_file_with_required_file_with_http_info(self, pet_id, required_file, *
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python-tornado/petstore_api/api/store_api.py b/samples/client/petstore/python-tornado/petstore_api/api/store_api.py
index 0ede23f05ba2..d2d4c3233341 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api/store_api.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api/store_api.py
@@ -91,6 +91,10 @@ def delete_order_with_http_info(self, order_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def delete_order_with_http_info(self, order_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -155,7 +160,8 @@ def delete_order_with_http_info(self, order_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_inventory(self, **kwargs):  # noqa: E501
         """Returns pet inventories by status  # noqa: E501
@@ -208,6 +214,10 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -223,7 +233,8 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -269,7 +280,8 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_order_by_id(self, order_id, **kwargs):  # noqa: E501
         """Find purchase order by ID  # noqa: E501
@@ -326,6 +338,10 @@ def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -342,7 +358,8 @@ def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -398,7 +415,8 @@ def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def place_order(self, body, **kwargs):  # noqa: E501
         """Place an order for a pet  # noqa: E501
@@ -453,6 +471,10 @@ def place_order_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -469,7 +491,8 @@ def place_order_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -521,4 +544,5 @@ def place_order_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python-tornado/petstore_api/api/user_api.py b/samples/client/petstore/python-tornado/petstore_api/api/user_api.py
index a912483b023b..9504f2834a6b 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api/user_api.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api/user_api.py
@@ -91,6 +91,10 @@ def create_user_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def create_user_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -155,7 +160,8 @@ def create_user_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def create_users_with_array_input(self, body, **kwargs):  # noqa: E501
         """Creates list of users with given input array  # noqa: E501
@@ -210,6 +216,10 @@ def create_users_with_array_input_with_http_info(self, body, **kwargs):  # noqa:
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -226,7 +236,8 @@ def create_users_with_array_input_with_http_info(self, body, **kwargs):  # noqa:
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -274,7 +285,8 @@ def create_users_with_array_input_with_http_info(self, body, **kwargs):  # noqa:
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def create_users_with_list_input(self, body, **kwargs):  # noqa: E501
         """Creates list of users with given input array  # noqa: E501
@@ -329,6 +341,10 @@ def create_users_with_list_input_with_http_info(self, body, **kwargs):  # noqa:
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -345,7 +361,8 @@ def create_users_with_list_input_with_http_info(self, body, **kwargs):  # noqa:
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -393,7 +410,8 @@ def create_users_with_list_input_with_http_info(self, body, **kwargs):  # noqa:
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def delete_user(self, username, **kwargs):  # noqa: E501
         """Delete user  # noqa: E501
@@ -450,6 +468,10 @@ def delete_user_with_http_info(self, username, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -466,7 +488,8 @@ def delete_user_with_http_info(self, username, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -514,7 +537,8 @@ def delete_user_with_http_info(self, username, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_user_by_name(self, username, **kwargs):  # noqa: E501
         """Get user by user name  # noqa: E501
@@ -569,6 +593,10 @@ def get_user_by_name_with_http_info(self, username, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -585,7 +613,8 @@ def get_user_by_name_with_http_info(self, username, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -637,7 +666,8 @@ def get_user_by_name_with_http_info(self, username, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def login_user(self, username, password, **kwargs):  # noqa: E501
         """Logs user into the system  # noqa: E501
@@ -696,6 +726,10 @@ def login_user_with_http_info(self, username, password, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -713,7 +747,8 @@ def login_user_with_http_info(self, username, password, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -771,7 +806,8 @@ def login_user_with_http_info(self, username, password, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def logout_user(self, **kwargs):  # noqa: E501
         """Logs out current logged in user session  # noqa: E501
@@ -822,6 +858,10 @@ def logout_user_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -837,7 +877,8 @@ def logout_user_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -879,7 +920,8 @@ def logout_user_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def update_user(self, username, body, **kwargs):  # noqa: E501
         """Updated user  # noqa: E501
@@ -940,6 +982,10 @@ def update_user_with_http_info(self, username, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -957,7 +1003,8 @@ def update_user_with_http_info(self, username, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1011,4 +1058,5 @@ def update_user_with_http_info(self, username, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python-tornado/petstore_api/api_client.py b/samples/client/petstore/python-tornado/petstore_api/api_client.py
index 3fc10d72ab50..7782745e5096 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api_client.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api_client.py
@@ -124,7 +124,8 @@ def __call_api(
             query_params=None, header_params=None, body=None, post_params=None,
             files=None, response_type=None, auth_settings=None,
             _return_http_data_only=None, collection_formats=None,
-            _preload_content=True, _request_timeout=None, _host=None):
+            _preload_content=True, _request_timeout=None, _host=None,
+            _request_auth=None):
 
         config = self.configuration
 
@@ -165,7 +166,9 @@ def __call_api(
             post_params.extend(self.files_parameters(files))
 
         # auth setting
-        self.update_params_for_auth(header_params, query_params, auth_settings)
+        self.update_params_for_auth(
+            header_params, query_params, auth_settings,
+            request_auth=_request_auth)
 
         # body
         if body:
@@ -325,7 +328,8 @@ def call_api(self, resource_path, method,
                  body=None, post_params=None, files=None,
                  response_type=None, auth_settings=None, async_req=None,
                  _return_http_data_only=None, collection_formats=None,
-                 _preload_content=True, _request_timeout=None, _host=None):
+                 _preload_content=True, _request_timeout=None, _host=None,
+                 _request_auth=None):
         """Makes the HTTP request (synchronous) and returns deserialized data.
 
         To make an async_req request, set the async_req parameter.
@@ -355,6 +359,10 @@ def call_api(self, resource_path, method,
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_token: dict, optional
         :return:
             If async_req parameter is True,
             the request will be called asynchronously.
@@ -368,7 +376,8 @@ def call_api(self, resource_path, method,
                                    body, post_params, files,
                                    response_type, auth_settings,
                                    _return_http_data_only, collection_formats,
-                                   _preload_content, _request_timeout, _host)
+                                   _preload_content, _request_timeout, _host,
+                                   _request_auth)
 
         return self.pool.apply_async(self.__call_api, (resource_path,
                                                        method, path_params,
@@ -381,7 +390,7 @@ def call_api(self, resource_path, method,
                                                        collection_formats,
                                                        _preload_content,
                                                        _request_timeout,
-                                                       _host))
+                                                       _host, _request_auth))
 
     def request(self, method, url, query_params=None, headers=None,
                 post_params=None, body=None, _preload_content=True,
@@ -528,29 +537,45 @@ def select_header_content_type(self, content_types):
         else:
             return content_types[0]
 
-    def update_params_for_auth(self, headers, querys, auth_settings):
+    def update_params_for_auth(self, headers, querys, auth_settings,
+                               request_auth=None):
         """Updates header and query params based on authentication setting.
 
         :param headers: Header parameters dict to be updated.
         :param querys: Query parameters tuple list to be updated.
         :param auth_settings: Authentication setting identifiers list.
+        :param request_auth: if set, the provided settings will
+                             override the token in the configuration.
         """
         if not auth_settings:
             return
 
+        if request_auth:
+            self._apply_auth_params(headers, querys, request_auth)
+            return
+
         for auth in auth_settings:
             auth_setting = self.configuration.auth_settings().get(auth)
             if auth_setting:
-                if auth_setting['in'] == 'cookie':
-                    headers['Cookie'] = auth_setting['value']
-                elif auth_setting['in'] == 'header':
-                    headers[auth_setting['key']] = auth_setting['value']
-                elif auth_setting['in'] == 'query':
-                    querys.append((auth_setting['key'], auth_setting['value']))
-                else:
-                    raise ApiValueError(
-                        'Authentication token must be in `query` or `header`'
-                    )
+                self._apply_auth_params(headers, querys, auth_setting)
+
+    def _apply_auth_params(self, headers, querys, auth_setting):
+        """Updates the request parameters based on a single auth_setting
+
+        :param headers: Header parameters dict to be updated.
+        :param querys: Query parameters tuple list to be updated.
+        :param auth_setting: auth settings for the endpoint
+        """
+        if auth_setting['in'] == 'cookie':
+            headers['Cookie'] = auth_setting['value']
+        elif auth_setting['in'] == 'header':
+            headers[auth_setting['key']] = auth_setting['value']
+        elif auth_setting['in'] == 'query':
+            querys.append((auth_setting['key'], auth_setting['value']))
+        else:
+            raise ApiValueError(
+                'Authentication token must be in `query` or `header`'
+            )
 
     def __deserialize_file(self, response):
         """Deserializes body to file
diff --git a/samples/client/petstore/python-tornado/petstore_api/configuration.py b/samples/client/petstore/python-tornado/petstore_api/configuration.py
index 18085f8b7485..81b2cd7e9d0e 100644
--- a/samples/client/petstore/python-tornado/petstore_api/configuration.py
+++ b/samples/client/petstore/python-tornado/petstore_api/configuration.py
@@ -69,6 +69,15 @@ class Configuration(object):
       disabled. This can be useful to troubleshoot data validation problem, such as
       when the OpenAPI document validation rules do not match the actual API data
       received by the server.
+    :param server_index: Index to servers configuration.
+    :param server_variables: Mapping with string values to replace variables in
+      templated server configuration. The validation of enums is performed for
+      variables with defined enum values before.
+    :param server_operation_index: Mapping from operation ID to an index to server
+      configuration.
+    :param server_operation_variables: Mapping from operation ID to a mapping with
+      string values to replace variables in templated server configuration.
+      The validation of enums is performed for variables with defined enum values before.
 
     :Example:
 
@@ -110,17 +119,27 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host="http://petstore.swagger.io:80/v2",
+    def __init__(self, host=None,
                  api_key=None, api_key_prefix=None,
                  username=None, password=None,
                  discard_unknown_keys=False,
                  disabled_client_side_validations="",
+                 server_index=None, server_variables=None,
+                 server_operation_index=None, server_operation_variables=None,
                  ):
         """Constructor
         """
-        self.host = host
+        self._base_path = "http://petstore.swagger.io:80/v2" if host is None else host
         """Default Base url
         """
+        self.server_index = 0 if server_index is None and host is None else server_index
+        self.server_operation_index = server_operation_index or {}
+        """Default server index
+        """
+        self.server_variables = server_variables or {}
+        self.server_operation_variables = server_operation_variables or {}
+        """Default server variables
+        """
         self.temp_folder_path = None
         """Temp file folder for downloading files
         """
@@ -208,7 +227,7 @@ def __init__(self, host="http://petstore.swagger.io:80/v2",
         self.retries = None
         """Adding retries to override urllib3 default value 3
         """
-        # Disable client side validation
+        # Enable client side validation
         self.client_side_validation = True
 
     def __deepcopy__(self, memo):
@@ -345,15 +364,16 @@ def logger_format(self, value):
         self.__logger_format = value
         self.logger_formatter = logging.Formatter(self.__logger_format)
 
-    def get_api_key_with_prefix(self, identifier):
+    def get_api_key_with_prefix(self, identifier, alias=None):
         """Gets API key (with prefix if set).
 
         :param identifier: The identifier of apiKey.
+        :param alias: The alternative identifier of apiKey.
         :return: The token for api key authentication.
         """
         if self.refresh_api_key_hook is not None:
             self.refresh_api_key_hook(self)
-        key = self.api_key.get(identifier)
+        key = self.api_key.get(identifier, self.api_key.get(alias) if alias is not None else None)
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
@@ -387,14 +407,18 @@ def auth_settings(self):
                 'type': 'api_key',
                 'in': 'header',
                 'key': 'api_key',
-                'value': self.get_api_key_with_prefix('api_key')
+                'value': self.get_api_key_with_prefix(
+                    'api_key',
+                ),
             }
         if 'api_key_query' in self.api_key:
             auth['api_key_query'] = {
                 'type': 'api_key',
                 'in': 'query',
                 'key': 'api_key_query',
-                'value': self.get_api_key_with_prefix('api_key_query')
+                'value': self.get_api_key_with_prefix(
+                    'api_key_query',
+                ),
             }
         if self.username is not None and self.password is not None:
             auth['http_basic_test'] = {
@@ -436,14 +460,18 @@ def get_host_settings(self):
             }
         ]
 
-    def get_host_from_settings(self, index, variables=None):
+    def get_host_from_settings(self, index, variables=None, servers=None):
         """Gets host URL based on the index and variables
         :param index: array index of the host settings
         :param variables: hash of variable and the corresponding value
+        :param servers: an array of host settings or None
         :return: URL based on host settings
         """
+        if index is None:
+            return self._base_path
+
         variables = {} if variables is None else variables
-        servers = self.get_host_settings()
+        servers = self.get_host_settings() if servers is None else servers
 
         try:
             server = servers[index]
@@ -455,7 +483,7 @@ def get_host_from_settings(self, index, variables=None):
         url = server['url']
 
         # go through variables and replace placeholders
-        for variable_name, variable in server['variables'].items():
+        for variable_name, variable in server.get('variables', {}).items():
             used_value = variables.get(
                 variable_name, variable['default_value'])
 
@@ -470,3 +498,14 @@ def get_host_from_settings(self, index, variables=None):
             url = url.replace("{" + variable_name + "}", used_value)
 
         return url
+
+    @property
+    def host(self):
+        """Return generated host."""
+        return self.get_host_from_settings(self.server_index, variables=self.server_variables)
+
+    @host.setter
+    def host(self, value):
+        """Fix base path."""
+        self._base_path = value
+        self.server_index = None
diff --git a/samples/client/petstore/python/petstore_api/api/another_fake_api.py b/samples/client/petstore/python/petstore_api/api/another_fake_api.py
index 4d69b287ca8b..562b9faa58f2 100644
--- a/samples/client/petstore/python/petstore_api/api/another_fake_api.py
+++ b/samples/client/petstore/python/petstore_api/api/another_fake_api.py
@@ -91,6 +91,10 @@ def call_123_test_special_tags_with_http_info(self, body, **kwargs):  # noqa: E5
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def call_123_test_special_tags_with_http_info(self, body, **kwargs):  # noqa: E5
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -163,4 +168,5 @@ def call_123_test_special_tags_with_http_info(self, body, **kwargs):  # noqa: E5
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python/petstore_api/api/fake_api.py b/samples/client/petstore/python/petstore_api/api/fake_api.py
index 7789acf51c3d..b171fe8b3d7d 100644
--- a/samples/client/petstore/python/petstore_api/api/fake_api.py
+++ b/samples/client/petstore/python/petstore_api/api/fake_api.py
@@ -91,6 +91,10 @@ def create_xml_item_with_http_info(self, xml_item, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def create_xml_item_with_http_info(self, xml_item, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -159,7 +164,8 @@ def create_xml_item_with_http_info(self, xml_item, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_boolean_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_boolean_serialize  # noqa: E501
@@ -216,6 +222,10 @@ def fake_outer_boolean_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -232,7 +242,8 @@ def fake_outer_boolean_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -280,7 +291,8 @@ def fake_outer_boolean_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_composite_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_composite_serialize  # noqa: E501
@@ -337,6 +349,10 @@ def fake_outer_composite_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -353,7 +369,8 @@ def fake_outer_composite_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -401,7 +418,8 @@ def fake_outer_composite_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_number_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_number_serialize  # noqa: E501
@@ -458,6 +476,10 @@ def fake_outer_number_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -474,7 +496,8 @@ def fake_outer_number_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -522,7 +545,8 @@ def fake_outer_number_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_string_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_string_serialize  # noqa: E501
@@ -579,6 +603,10 @@ def fake_outer_string_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -595,7 +623,8 @@ def fake_outer_string_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -643,7 +672,8 @@ def fake_outer_string_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_body_with_file_schema(self, body, **kwargs):  # noqa: E501
         """test_body_with_file_schema  # noqa: E501
@@ -700,6 +730,10 @@ def test_body_with_file_schema_with_http_info(self, body, **kwargs):  # noqa: E5
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -716,7 +750,8 @@ def test_body_with_file_schema_with_http_info(self, body, **kwargs):  # noqa: E5
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -768,7 +803,8 @@ def test_body_with_file_schema_with_http_info(self, body, **kwargs):  # noqa: E5
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_body_with_query_params(self, query, body, **kwargs):  # noqa: E501
         """test_body_with_query_params  # noqa: E501
@@ -827,6 +863,10 @@ def test_body_with_query_params_with_http_info(self, query, body, **kwargs):  #
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -844,7 +884,8 @@ def test_body_with_query_params_with_http_info(self, query, body, **kwargs):  #
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -902,7 +943,8 @@ def test_body_with_query_params_with_http_info(self, query, body, **kwargs):  #
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_client_model(self, body, **kwargs):  # noqa: E501
         """To test \"client\" model  # noqa: E501
@@ -959,6 +1001,10 @@ def test_client_model_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -975,7 +1021,8 @@ def test_client_model_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1031,7 +1078,8 @@ def test_client_model_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_endpoint_parameters(self, number, double, pattern_without_delimiter, byte, **kwargs):  # noqa: E501
         """Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트  # noqa: E501
@@ -1140,6 +1188,10 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1169,7 +1221,8 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1287,7 +1340,8 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_enum_parameters(self, **kwargs):  # noqa: E501
         """To test enum parameters  # noqa: E501
@@ -1372,6 +1426,10 @@ def test_enum_parameters_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1395,7 +1453,8 @@ def test_enum_parameters_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1460,7 +1519,8 @@ def test_enum_parameters_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_group_parameters(self, required_string_group, required_boolean_group, required_int64_group, **kwargs):  # noqa: E501
         """Fake endpoint to test group parameters (optional)  # noqa: E501
@@ -1537,6 +1597,10 @@ def test_group_parameters_with_http_info(self, required_string_group, required_b
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1558,7 +1622,8 @@ def test_group_parameters_with_http_info(self, required_string_group, required_b
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1624,7 +1689,8 @@ def test_group_parameters_with_http_info(self, required_string_group, required_b
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_inline_additional_properties(self, param, **kwargs):  # noqa: E501
         """test inline additionalProperties  # noqa: E501
@@ -1679,6 +1745,10 @@ def test_inline_additional_properties_with_http_info(self, param, **kwargs):  #
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1695,7 +1765,8 @@ def test_inline_additional_properties_with_http_info(self, param, **kwargs):  #
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1747,7 +1818,8 @@ def test_inline_additional_properties_with_http_info(self, param, **kwargs):  #
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_json_form_data(self, param, param2, **kwargs):  # noqa: E501
         """test json serialization of form data  # noqa: E501
@@ -1806,6 +1878,10 @@ def test_json_form_data_with_http_info(self, param, param2, **kwargs):  # noqa:
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1823,7 +1899,8 @@ def test_json_form_data_with_http_info(self, param, param2, **kwargs):  # noqa:
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1881,7 +1958,8 @@ def test_json_form_data_with_http_info(self, param, param2, **kwargs):  # noqa:
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_query_parameter_collection_format(self, pipe, ioutil, http, url, context, **kwargs):  # noqa: E501
         """test_query_parameter_collection_format  # noqa: E501
@@ -1954,6 +2032,10 @@ def test_query_parameter_collection_format_with_http_info(self, pipe, ioutil, ht
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1974,7 +2056,8 @@ def test_query_parameter_collection_format_with_http_info(self, pipe, ioutil, ht
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -2051,4 +2134,5 @@ def test_query_parameter_collection_format_with_http_info(self, pipe, ioutil, ht
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py b/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
index d963591a49a8..5cd445261491 100644
--- a/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
@@ -91,6 +91,10 @@ def test_classname_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def test_classname_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -163,4 +168,5 @@ def test_classname_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python/petstore_api/api/pet_api.py b/samples/client/petstore/python/petstore_api/api/pet_api.py
index 7002fe32740f..3119e2d60c45 100644
--- a/samples/client/petstore/python/petstore_api/api/pet_api.py
+++ b/samples/client/petstore/python/petstore_api/api/pet_api.py
@@ -89,6 +89,10 @@ def add_pet_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -105,7 +109,8 @@ def add_pet_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -157,7 +162,8 @@ def add_pet_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def delete_pet(self, pet_id, **kwargs):  # noqa: E501
         """Deletes a pet  # noqa: E501
@@ -216,6 +222,10 @@ def delete_pet_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -233,7 +243,8 @@ def delete_pet_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -283,7 +294,8 @@ def delete_pet_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def find_pets_by_status(self, status, **kwargs):  # noqa: E501
         """Finds Pets by status  # noqa: E501
@@ -340,6 +352,10 @@ def find_pets_by_status_with_http_info(self, status, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -356,7 +372,8 @@ def find_pets_by_status_with_http_info(self, status, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -409,7 +426,8 @@ def find_pets_by_status_with_http_info(self, status, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def find_pets_by_tags(self, tags, **kwargs):  # noqa: E501
         """Finds Pets by tags  # noqa: E501
@@ -466,6 +484,10 @@ def find_pets_by_tags_with_http_info(self, tags, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -482,7 +504,8 @@ def find_pets_by_tags_with_http_info(self, tags, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -535,7 +558,8 @@ def find_pets_by_tags_with_http_info(self, tags, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_pet_by_id(self, pet_id, **kwargs):  # noqa: E501
         """Find pet by ID  # noqa: E501
@@ -592,6 +616,10 @@ def get_pet_by_id_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -608,7 +636,8 @@ def get_pet_by_id_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -660,7 +689,8 @@ def get_pet_by_id_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def update_pet(self, body, **kwargs):  # noqa: E501
         """Update an existing pet  # noqa: E501
@@ -715,6 +745,10 @@ def update_pet_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -731,7 +765,8 @@ def update_pet_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -783,7 +818,8 @@ def update_pet_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def update_pet_with_form(self, pet_id, **kwargs):  # noqa: E501
         """Updates a pet in the store with form data  # noqa: E501
@@ -846,6 +882,10 @@ def update_pet_with_form_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -864,7 +904,8 @@ def update_pet_with_form_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -920,7 +961,8 @@ def update_pet_with_form_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def upload_file(self, pet_id, **kwargs):  # noqa: E501
         """uploads an image  # noqa: E501
@@ -983,6 +1025,10 @@ def upload_file_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1001,7 +1047,8 @@ def upload_file_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1061,7 +1108,8 @@ def upload_file_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def upload_file_with_required_file(self, pet_id, required_file, **kwargs):  # noqa: E501
         """uploads an image (required)  # noqa: E501
@@ -1124,6 +1172,10 @@ def upload_file_with_required_file_with_http_info(self, pet_id, required_file, *
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1142,7 +1194,8 @@ def upload_file_with_required_file_with_http_info(self, pet_id, required_file, *
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1206,4 +1259,5 @@ def upload_file_with_required_file_with_http_info(self, pet_id, required_file, *
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python/petstore_api/api/store_api.py b/samples/client/petstore/python/petstore_api/api/store_api.py
index 0ede23f05ba2..d2d4c3233341 100644
--- a/samples/client/petstore/python/petstore_api/api/store_api.py
+++ b/samples/client/petstore/python/petstore_api/api/store_api.py
@@ -91,6 +91,10 @@ def delete_order_with_http_info(self, order_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def delete_order_with_http_info(self, order_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -155,7 +160,8 @@ def delete_order_with_http_info(self, order_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_inventory(self, **kwargs):  # noqa: E501
         """Returns pet inventories by status  # noqa: E501
@@ -208,6 +214,10 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -223,7 +233,8 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -269,7 +280,8 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_order_by_id(self, order_id, **kwargs):  # noqa: E501
         """Find purchase order by ID  # noqa: E501
@@ -326,6 +338,10 @@ def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -342,7 +358,8 @@ def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -398,7 +415,8 @@ def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def place_order(self, body, **kwargs):  # noqa: E501
         """Place an order for a pet  # noqa: E501
@@ -453,6 +471,10 @@ def place_order_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -469,7 +491,8 @@ def place_order_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -521,4 +544,5 @@ def place_order_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python/petstore_api/api/user_api.py b/samples/client/petstore/python/petstore_api/api/user_api.py
index a912483b023b..9504f2834a6b 100644
--- a/samples/client/petstore/python/petstore_api/api/user_api.py
+++ b/samples/client/petstore/python/petstore_api/api/user_api.py
@@ -91,6 +91,10 @@ def create_user_with_http_info(self, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def create_user_with_http_info(self, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -155,7 +160,8 @@ def create_user_with_http_info(self, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def create_users_with_array_input(self, body, **kwargs):  # noqa: E501
         """Creates list of users with given input array  # noqa: E501
@@ -210,6 +216,10 @@ def create_users_with_array_input_with_http_info(self, body, **kwargs):  # noqa:
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -226,7 +236,8 @@ def create_users_with_array_input_with_http_info(self, body, **kwargs):  # noqa:
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -274,7 +285,8 @@ def create_users_with_array_input_with_http_info(self, body, **kwargs):  # noqa:
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def create_users_with_list_input(self, body, **kwargs):  # noqa: E501
         """Creates list of users with given input array  # noqa: E501
@@ -329,6 +341,10 @@ def create_users_with_list_input_with_http_info(self, body, **kwargs):  # noqa:
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -345,7 +361,8 @@ def create_users_with_list_input_with_http_info(self, body, **kwargs):  # noqa:
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -393,7 +410,8 @@ def create_users_with_list_input_with_http_info(self, body, **kwargs):  # noqa:
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def delete_user(self, username, **kwargs):  # noqa: E501
         """Delete user  # noqa: E501
@@ -450,6 +468,10 @@ def delete_user_with_http_info(self, username, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -466,7 +488,8 @@ def delete_user_with_http_info(self, username, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -514,7 +537,8 @@ def delete_user_with_http_info(self, username, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_user_by_name(self, username, **kwargs):  # noqa: E501
         """Get user by user name  # noqa: E501
@@ -569,6 +593,10 @@ def get_user_by_name_with_http_info(self, username, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -585,7 +613,8 @@ def get_user_by_name_with_http_info(self, username, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -637,7 +666,8 @@ def get_user_by_name_with_http_info(self, username, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def login_user(self, username, password, **kwargs):  # noqa: E501
         """Logs user into the system  # noqa: E501
@@ -696,6 +726,10 @@ def login_user_with_http_info(self, username, password, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -713,7 +747,8 @@ def login_user_with_http_info(self, username, password, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -771,7 +806,8 @@ def login_user_with_http_info(self, username, password, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def logout_user(self, **kwargs):  # noqa: E501
         """Logs out current logged in user session  # noqa: E501
@@ -822,6 +858,10 @@ def logout_user_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -837,7 +877,8 @@ def logout_user_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -879,7 +920,8 @@ def logout_user_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def update_user(self, username, body, **kwargs):  # noqa: E501
         """Updated user  # noqa: E501
@@ -940,6 +982,10 @@ def update_user_with_http_info(self, username, body, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -957,7 +1003,8 @@ def update_user_with_http_info(self, username, body, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1011,4 +1058,5 @@ def update_user_with_http_info(self, username, body, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/client/petstore/python/petstore_api/api_client.py b/samples/client/petstore/python/petstore_api/api_client.py
index 7b1b0010a49a..80dbae6b7b8f 100644
--- a/samples/client/petstore/python/petstore_api/api_client.py
+++ b/samples/client/petstore/python/petstore_api/api_client.py
@@ -122,7 +122,8 @@ def __call_api(
             query_params=None, header_params=None, body=None, post_params=None,
             files=None, response_type=None, auth_settings=None,
             _return_http_data_only=None, collection_formats=None,
-            _preload_content=True, _request_timeout=None, _host=None):
+            _preload_content=True, _request_timeout=None, _host=None,
+            _request_auth=None):
 
         config = self.configuration
 
@@ -163,7 +164,9 @@ def __call_api(
             post_params.extend(self.files_parameters(files))
 
         # auth setting
-        self.update_params_for_auth(header_params, query_params, auth_settings)
+        self.update_params_for_auth(
+            header_params, query_params, auth_settings,
+            request_auth=_request_auth)
 
         # body
         if body:
@@ -323,7 +326,8 @@ def call_api(self, resource_path, method,
                  body=None, post_params=None, files=None,
                  response_type=None, auth_settings=None, async_req=None,
                  _return_http_data_only=None, collection_formats=None,
-                 _preload_content=True, _request_timeout=None, _host=None):
+                 _preload_content=True, _request_timeout=None, _host=None,
+                 _request_auth=None):
         """Makes the HTTP request (synchronous) and returns deserialized data.
 
         To make an async_req request, set the async_req parameter.
@@ -353,6 +357,10 @@ def call_api(self, resource_path, method,
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_token: dict, optional
         :return:
             If async_req parameter is True,
             the request will be called asynchronously.
@@ -366,7 +374,8 @@ def call_api(self, resource_path, method,
                                    body, post_params, files,
                                    response_type, auth_settings,
                                    _return_http_data_only, collection_formats,
-                                   _preload_content, _request_timeout, _host)
+                                   _preload_content, _request_timeout, _host,
+                                   _request_auth)
 
         return self.pool.apply_async(self.__call_api, (resource_path,
                                                        method, path_params,
@@ -379,7 +388,7 @@ def call_api(self, resource_path, method,
                                                        collection_formats,
                                                        _preload_content,
                                                        _request_timeout,
-                                                       _host))
+                                                       _host, _request_auth))
 
     def request(self, method, url, query_params=None, headers=None,
                 post_params=None, body=None, _preload_content=True,
@@ -526,29 +535,45 @@ def select_header_content_type(self, content_types):
         else:
             return content_types[0]
 
-    def update_params_for_auth(self, headers, querys, auth_settings):
+    def update_params_for_auth(self, headers, querys, auth_settings,
+                               request_auth=None):
         """Updates header and query params based on authentication setting.
 
         :param headers: Header parameters dict to be updated.
         :param querys: Query parameters tuple list to be updated.
         :param auth_settings: Authentication setting identifiers list.
+        :param request_auth: if set, the provided settings will
+                             override the token in the configuration.
         """
         if not auth_settings:
             return
 
+        if request_auth:
+            self._apply_auth_params(headers, querys, request_auth)
+            return
+
         for auth in auth_settings:
             auth_setting = self.configuration.auth_settings().get(auth)
             if auth_setting:
-                if auth_setting['in'] == 'cookie':
-                    headers['Cookie'] = auth_setting['value']
-                elif auth_setting['in'] == 'header':
-                    headers[auth_setting['key']] = auth_setting['value']
-                elif auth_setting['in'] == 'query':
-                    querys.append((auth_setting['key'], auth_setting['value']))
-                else:
-                    raise ApiValueError(
-                        'Authentication token must be in `query` or `header`'
-                    )
+                self._apply_auth_params(headers, querys, auth_setting)
+
+    def _apply_auth_params(self, headers, querys, auth_setting):
+        """Updates the request parameters based on a single auth_setting
+
+        :param headers: Header parameters dict to be updated.
+        :param querys: Query parameters tuple list to be updated.
+        :param auth_setting: auth settings for the endpoint
+        """
+        if auth_setting['in'] == 'cookie':
+            headers['Cookie'] = auth_setting['value']
+        elif auth_setting['in'] == 'header':
+            headers[auth_setting['key']] = auth_setting['value']
+        elif auth_setting['in'] == 'query':
+            querys.append((auth_setting['key'], auth_setting['value']))
+        else:
+            raise ApiValueError(
+                'Authentication token must be in `query` or `header`'
+            )
 
     def __deserialize_file(self, response):
         """Deserializes body to file
diff --git a/samples/client/petstore/python/petstore_api/configuration.py b/samples/client/petstore/python/petstore_api/configuration.py
index 18085f8b7485..81b2cd7e9d0e 100644
--- a/samples/client/petstore/python/petstore_api/configuration.py
+++ b/samples/client/petstore/python/petstore_api/configuration.py
@@ -69,6 +69,15 @@ class Configuration(object):
       disabled. This can be useful to troubleshoot data validation problem, such as
       when the OpenAPI document validation rules do not match the actual API data
       received by the server.
+    :param server_index: Index to servers configuration.
+    :param server_variables: Mapping with string values to replace variables in
+      templated server configuration. The validation of enums is performed for
+      variables with defined enum values before.
+    :param server_operation_index: Mapping from operation ID to an index to server
+      configuration.
+    :param server_operation_variables: Mapping from operation ID to a mapping with
+      string values to replace variables in templated server configuration.
+      The validation of enums is performed for variables with defined enum values before.
 
     :Example:
 
@@ -110,17 +119,27 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host="http://petstore.swagger.io:80/v2",
+    def __init__(self, host=None,
                  api_key=None, api_key_prefix=None,
                  username=None, password=None,
                  discard_unknown_keys=False,
                  disabled_client_side_validations="",
+                 server_index=None, server_variables=None,
+                 server_operation_index=None, server_operation_variables=None,
                  ):
         """Constructor
         """
-        self.host = host
+        self._base_path = "http://petstore.swagger.io:80/v2" if host is None else host
         """Default Base url
         """
+        self.server_index = 0 if server_index is None and host is None else server_index
+        self.server_operation_index = server_operation_index or {}
+        """Default server index
+        """
+        self.server_variables = server_variables or {}
+        self.server_operation_variables = server_operation_variables or {}
+        """Default server variables
+        """
         self.temp_folder_path = None
         """Temp file folder for downloading files
         """
@@ -208,7 +227,7 @@ def __init__(self, host="http://petstore.swagger.io:80/v2",
         self.retries = None
         """Adding retries to override urllib3 default value 3
         """
-        # Disable client side validation
+        # Enable client side validation
         self.client_side_validation = True
 
     def __deepcopy__(self, memo):
@@ -345,15 +364,16 @@ def logger_format(self, value):
         self.__logger_format = value
         self.logger_formatter = logging.Formatter(self.__logger_format)
 
-    def get_api_key_with_prefix(self, identifier):
+    def get_api_key_with_prefix(self, identifier, alias=None):
         """Gets API key (with prefix if set).
 
         :param identifier: The identifier of apiKey.
+        :param alias: The alternative identifier of apiKey.
         :return: The token for api key authentication.
         """
         if self.refresh_api_key_hook is not None:
             self.refresh_api_key_hook(self)
-        key = self.api_key.get(identifier)
+        key = self.api_key.get(identifier, self.api_key.get(alias) if alias is not None else None)
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
@@ -387,14 +407,18 @@ def auth_settings(self):
                 'type': 'api_key',
                 'in': 'header',
                 'key': 'api_key',
-                'value': self.get_api_key_with_prefix('api_key')
+                'value': self.get_api_key_with_prefix(
+                    'api_key',
+                ),
             }
         if 'api_key_query' in self.api_key:
             auth['api_key_query'] = {
                 'type': 'api_key',
                 'in': 'query',
                 'key': 'api_key_query',
-                'value': self.get_api_key_with_prefix('api_key_query')
+                'value': self.get_api_key_with_prefix(
+                    'api_key_query',
+                ),
             }
         if self.username is not None and self.password is not None:
             auth['http_basic_test'] = {
@@ -436,14 +460,18 @@ def get_host_settings(self):
             }
         ]
 
-    def get_host_from_settings(self, index, variables=None):
+    def get_host_from_settings(self, index, variables=None, servers=None):
         """Gets host URL based on the index and variables
         :param index: array index of the host settings
         :param variables: hash of variable and the corresponding value
+        :param servers: an array of host settings or None
         :return: URL based on host settings
         """
+        if index is None:
+            return self._base_path
+
         variables = {} if variables is None else variables
-        servers = self.get_host_settings()
+        servers = self.get_host_settings() if servers is None else servers
 
         try:
             server = servers[index]
@@ -455,7 +483,7 @@ def get_host_from_settings(self, index, variables=None):
         url = server['url']
 
         # go through variables and replace placeholders
-        for variable_name, variable in server['variables'].items():
+        for variable_name, variable in server.get('variables', {}).items():
             used_value = variables.get(
                 variable_name, variable['default_value'])
 
@@ -470,3 +498,14 @@ def get_host_from_settings(self, index, variables=None):
             url = url.replace("{" + variable_name + "}", used_value)
 
         return url
+
+    @property
+    def host(self):
+        """Return generated host."""
+        return self.get_host_from_settings(self.server_index, variables=self.server_variables)
+
+    @host.setter
+    def host(self, value):
+        """Fix base path."""
+        self._base_path = value
+        self.server_index = None
diff --git a/samples/client/petstore/python/tests/test_pet_api.py b/samples/client/petstore/python/tests/test_pet_api.py
index 500505735efa..a7b47bdc5670 100644
--- a/samples/client/petstore/python/tests/test_pet_api.py
+++ b/samples/client/petstore/python/tests/test_pet_api.py
@@ -121,6 +121,30 @@ def test_timeout(self):
         self.pet_api.add_pet(self.pet, _request_timeout=5)
         self.pet_api.add_pet(self.pet, _request_timeout=(1, 2))
 
+    def test_auth_settings(self):
+        mock_pool = MockPoolManager(self)
+        self.api_client.rest_client.pool_manager = mock_pool
+
+        mock_pool.expect_request('POST', HOST + '/pet',
+                                 body=json.dumps(self.api_client.sanitize_for_serialization(self.pet)),
+                                 headers={'Content-Type': 'application/json',
+                                          'Authorization': 'Bearer ACCESS_TOKEN',
+                                          'User-Agent': 'OpenAPI-Generator/1.0.0/python'},
+                                 preload_content=True, timeout=None)
+        mock_pool.expect_request('POST', HOST + '/pet',
+                                 body=json.dumps(self.api_client.sanitize_for_serialization(self.pet)),
+                                 headers={'Content-Type': 'application/json',
+                                          'Authorization': 'Prefix ANOTHER_TOKEN',
+                                          'User-Agent': 'OpenAPI-Generator/1.0.0/python'},
+                                 preload_content=True, timeout=None)
+
+        self.pet_api.add_pet(self.pet, _request_auth=None)
+        self.pet_api.add_pet(self.pet, _request_auth={
+            'in': 'header',
+            'key': 'Authorization',
+            'value': 'Prefix ANOTHER_TOKEN'
+        })
+
     def test_separate_default_client_instances(self):
         pet_api = petstore_api.PetApi()
         pet_api2 = petstore_api.PetApi()
diff --git a/samples/client/petstore/ruby-faraday/petstore.gemspec b/samples/client/petstore/ruby-faraday/petstore.gemspec
index 9ec5502dc6ab..8a77cf9fc5ce 100644
--- a/samples/client/petstore/ruby-faraday/petstore.gemspec
+++ b/samples/client/petstore/ruby-faraday/petstore.gemspec
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9"
 
   s.add_runtime_dependency 'faraday', '>= 0.14.0'
-  s.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0'
 
   s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
 
diff --git a/samples/client/petstore/ruby/petstore.gemspec b/samples/client/petstore/ruby/petstore.gemspec
index d563bfe8e68a..75e36fd2835f 100644
--- a/samples/client/petstore/ruby/petstore.gemspec
+++ b/samples/client/petstore/ruby/petstore.gemspec
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9"
 
   s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1'
-  s.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0'
 
   s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
 
diff --git a/samples/client/petstore/rust/reqwest/fileResponseTest/.openapi-generator/FILES b/samples/client/petstore/rust/reqwest/fileResponseTest/.openapi-generator/FILES
index eb0b5839042d..20457f1a6d03 100644
--- a/samples/client/petstore/rust/reqwest/fileResponseTest/.openapi-generator/FILES
+++ b/samples/client/petstore/rust/reqwest/fileResponseTest/.openapi-generator/FILES
@@ -4,7 +4,6 @@ Cargo.toml
 README.md
 docs/DefaultApi.md
 git_push.sh
-src/apis/client.rs
 src/apis/configuration.rs
 src/apis/default_api.rs
 src/apis/mod.rs
diff --git a/samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/client.rs b/samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/client.rs
index 7566e9e84799..b10fef0b5548 100644
--- a/samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/client.rs
+++ b/samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/client.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use super::configuration::Configuration;
 
 pub struct APIClient {
-    default_api: Box<dyn crate::apis::DefaultApi>,
+    default_api: Box<dyn crate::apis::default_api::DefaultApi>,
 }
 
 impl APIClient {
@@ -11,11 +11,11 @@ impl APIClient {
         let rc = Rc::new(configuration);
 
         APIClient {
-            default_api: Box::new(crate::apis::DefaultApiClient::new(rc.clone())),
+            default_api: Box::new(crate::apis::default_api::DefaultApiClient::new(rc.clone())),
         }
     }
 
-    pub fn default_api(&self) -> &dyn crate::apis::DefaultApi{
+    pub fn default_api(&self) -> &dyn crate::apis::default_api::DefaultApi{
         self.default_api.as_ref()
     }
 
diff --git a/samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/default_api.rs b/samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/default_api.rs
index 8c907ea7923f..1dad859d20d5 100644
--- a/samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/default_api.rs
+++ b/samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/default_api.rs
@@ -8,46 +8,44 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[allow(unused_imports)]
-use std::rc::Rc;
-use std::borrow::Borrow;
-use std::option::Option;
 
 use reqwest;
 
+use crate::apis::ResponseContent;
 use super::{Error, configuration};
 
-pub struct DefaultApiClient {
-    configuration: Rc<configuration::Configuration>,
-}
 
-impl DefaultApiClient {
-    pub fn new(configuration: Rc<configuration::Configuration>) -> DefaultApiClient {
-        DefaultApiClient {
-            configuration,
-        }
-    }
+/// struct for typed errors of method `fileresponsetest`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum FileresponsetestError {
+    UnknownValue(serde_json::Value),
 }
 
 
-pub trait DefaultApi {
-    fn fileresponsetest(&self, ) -> Result<std::path::PathBuf, Error>;
-}
-
-impl DefaultApi for DefaultApiClient {
-    fn fileresponsetest(&self, ) -> Result<std::path::PathBuf, Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+pub fn fileresponsetest(configuration: &configuration::Configuration, ) -> Result<std::path::PathBuf, Error<FileresponsetestError>> {
 
-        let uri_str = format!("{}/tests/fileResponse", configuration.base_path);
-        let mut req_builder = client.get(uri_str.as_str());
+    let client = &configuration.client;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let uri_str = format!("{}/tests/fileResponse", configuration.base_path);
+    let mut req_builder = client.get(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req)?.error_for_status()?.json()?)
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
 
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
+        serde_json::from_str(&content).map_err(Error::from)
+    } else {
+        let entity: Option<FileresponsetestError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
 }
+
diff --git a/samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/mod.rs b/samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/mod.rs
index 77bd60c058a5..aeab00a7bc06 100644
--- a/samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/mod.rs
+++ b/samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/mod.rs
@@ -1,26 +1,34 @@
 use reqwest;
 use serde_json;
 
+#[derive(Debug, Clone)]
+pub struct ResponseContent<T> {
+    pub status: reqwest::StatusCode,
+    pub content: String,
+    pub entity: Option<T>,
+}
+
 #[derive(Debug)]
-pub enum Error {
+pub enum Error<T> {
     Reqwest(reqwest::Error),
     Serde(serde_json::Error),
     Io(std::io::Error),
+    ResponseError(ResponseContent<T>),
 }
 
-impl From<reqwest::Error> for Error {
+impl <T> From<reqwest::Error> for Error<T> {
     fn from(e: reqwest::Error) -> Self {
         Error::Reqwest(e)
     }
 }
 
-impl From<serde_json::Error> for Error {
+impl <T> From<serde_json::Error> for Error<T> {
     fn from(e: serde_json::Error) -> Self {
         Error::Serde(e)
     }
 }
 
-impl From<std::io::Error> for Error {
+impl <T> From<std::io::Error> for Error<T> {
     fn from(e: std::io::Error) -> Self {
         Error::Io(e)
     }
@@ -30,8 +38,6 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
-mod default_api;
-pub use self::default_api::{ DefaultApi, DefaultApiClient };
+pub mod default_api;
 
-pub mod client;
 pub mod configuration;
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/mod.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/mod.rs
index 2bab29983bc3..087b76befa4e 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/mod.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/mod.rs
@@ -1,26 +1,34 @@
 use reqwest;
 use serde_json;
 
+#[derive(Debug, Clone)]
+pub struct ResponseContent<T> {
+    pub status: reqwest::StatusCode,
+    pub content: String,
+    pub entity: Option<T>,
+}
+
 #[derive(Debug)]
-pub enum Error {
+pub enum Error<T> {
     Reqwest(reqwest::Error),
     Serde(serde_json::Error),
     Io(std::io::Error),
+    ResponseError(ResponseContent<T>),
 }
 
-impl From<reqwest::Error> for Error {
+impl <T> From<reqwest::Error> for Error<T> {
     fn from(e: reqwest::Error) -> Self {
         Error::Reqwest(e)
     }
 }
 
-impl From<serde_json::Error> for Error {
+impl <T> From<serde_json::Error> for Error<T> {
     fn from(e: serde_json::Error) -> Self {
         Error::Serde(e)
     }
 }
 
-impl From<std::io::Error> for Error {
+impl <T> From<std::io::Error> for Error<T> {
     fn from(e: std::io::Error) -> Self {
         Error::Io(e)
     }
@@ -30,28 +38,8 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
-mod pet_api;
-pub use self::pet_api::{ add_pet };
-pub use self::pet_api::{ delete_pet };
-pub use self::pet_api::{ find_pets_by_status };
-pub use self::pet_api::{ find_pets_by_tags };
-pub use self::pet_api::{ get_pet_by_id };
-pub use self::pet_api::{ update_pet };
-pub use self::pet_api::{ update_pet_with_form };
-pub use self::pet_api::{ upload_file };
-mod store_api;
-pub use self::store_api::{ delete_order };
-pub use self::store_api::{ get_inventory };
-pub use self::store_api::{ get_order_by_id };
-pub use self::store_api::{ place_order };
-mod user_api;
-pub use self::user_api::{ create_user };
-pub use self::user_api::{ create_users_with_array_input };
-pub use self::user_api::{ create_users_with_list_input };
-pub use self::user_api::{ delete_user };
-pub use self::user_api::{ get_user_by_name };
-pub use self::user_api::{ login_user };
-pub use self::user_api::{ logout_user };
-pub use self::user_api::{ update_user };
+pub mod pet_api;
+pub mod store_api;
+pub mod user_api;
 
 pub mod configuration;
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs
index 8dfe56d1f1f4..d2d1b7c37a94 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs
@@ -8,179 +8,508 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[allow(unused_imports)]
-use std::rc::Rc;
-use std::borrow::Borrow;
-use std::option::Option;
 
 use reqwest;
 
+use crate::apis::ResponseContent;
 use super::{Error, configuration};
 
+/// struct for passing parameters to the method `add_pet`
+#[derive(Clone, Debug)]
+pub struct AddPetParams {
+    /// Pet object that needs to be added to the store
+    pub body: crate::models::Pet
+}
+
+/// struct for passing parameters to the method `delete_pet`
+#[derive(Clone, Debug)]
+pub struct DeletePetParams {
+    /// Pet id to delete
+    pub pet_id: i64,
+    pub api_key: Option<String>
+}
+
+/// struct for passing parameters to the method `find_pets_by_status`
+#[derive(Clone, Debug)]
+pub struct FindPetsByStatusParams {
+    /// Status values that need to be considered for filter
+    pub status: Vec<String>
+}
+
+/// struct for passing parameters to the method `find_pets_by_tags`
+#[derive(Clone, Debug)]
+pub struct FindPetsByTagsParams {
+    /// Tags to filter by
+    pub tags: Vec<String>
+}
+
+/// struct for passing parameters to the method `get_pet_by_id`
+#[derive(Clone, Debug)]
+pub struct GetPetByIdParams {
+    /// ID of pet to return
+    pub pet_id: i64
+}
+
+/// struct for passing parameters to the method `update_pet`
+#[derive(Clone, Debug)]
+pub struct UpdatePetParams {
+    /// Pet object that needs to be added to the store
+    pub body: crate::models::Pet
+}
+
+/// struct for passing parameters to the method `update_pet_with_form`
+#[derive(Clone, Debug)]
+pub struct UpdatePetWithFormParams {
+    /// ID of pet that needs to be updated
+    pub pet_id: i64,
+    /// Updated name of the pet
+    pub name: Option<String>,
+    /// Updated status of the pet
+    pub status: Option<String>
+}
+
+/// struct for passing parameters to the method `upload_file`
+#[derive(Clone, Debug)]
+pub struct UploadFileParams {
+    /// ID of pet to update
+    pub pet_id: i64,
+    /// Additional data to pass to server
+    pub additional_metadata: Option<String>,
+    /// file to upload
+    pub file: Option<std::path::PathBuf>
+}
+
+
+/// struct for typed successes of method `add_pet`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum AddPetSuccess {
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `delete_pet`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum DeletePetSuccess {
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `find_pets_by_status`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum FindPetsByStatusSuccess {
+    Status200(Vec<crate::models::Pet>),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `find_pets_by_tags`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum FindPetsByTagsSuccess {
+    Status200(Vec<crate::models::Pet>),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `get_pet_by_id`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum GetPetByIdSuccess {
+    Status200(crate::models::Pet),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `update_pet`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum UpdatePetSuccess {
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `update_pet_with_form`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum UpdatePetWithFormSuccess {
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `upload_file`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum UploadFileSuccess {
+    Status200(crate::models::ApiResponse),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `add_pet`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum AddPetError {
+    Status405(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `delete_pet`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum DeletePetError {
+    Status400(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `find_pets_by_status`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum FindPetsByStatusError {
+    Status400(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `find_pets_by_tags`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum FindPetsByTagsError {
+    Status400(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `get_pet_by_id`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum GetPetByIdError {
+    Status400(),
+    Status404(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `update_pet`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum UpdatePetError {
+    Status400(),
+    Status404(),
+    Status405(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `update_pet_with_form`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum UpdatePetWithFormError {
+    Status405(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `upload_file`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum UploadFileError {
+    UnknownValue(serde_json::Value),
+}
+
+
+pub async fn add_pet(configuration: &configuration::Configuration, params: AddPetParams) -> Result<ResponseContent<AddPetSuccess>, Error<AddPetError>> {
+    // unbox the parameters
+    let body = params.body;
+
+
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/pet", configuration.base_path);
+    let mut req_builder = client.post(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+    req_builder = req_builder.json(&body);
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<AddPetSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<AddPetError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
+}
 
-    pub async fn add_pet(configuration: &configuration::Configuration, body: crate::models::Pet) -> Result<(), Error> {
-        let client = &configuration.client;
+pub async fn delete_pet(configuration: &configuration::Configuration, params: DeletePetParams) -> Result<ResponseContent<DeletePetSuccess>, Error<DeletePetError>> {
+    // unbox the parameters
+    let pet_id = params.pet_id;
+    let api_key = params.api_key;
 
-        let uri_str = format!("{}/pet", configuration.base_path);
-        let mut req_builder = client.post(uri_str.as_str());
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
-        req_builder = req_builder.json(&body);
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
+    let mut req_builder = client.delete(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        client.execute(req).await?.error_for_status()?;
-        Ok(())
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
+    if let Some(param_value) = api_key {
+        req_builder = req_builder.header("api_key", param_value.to_string());
+    }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<DeletePetSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<DeletePetError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
+}
 
-    pub async fn delete_pet(configuration: &configuration::Configuration, pet_id: i64, api_key: Option<&str>) -> Result<(), Error> {
-        let client = &configuration.client;
+/// Multiple status values can be provided with comma separated strings
+pub async fn find_pets_by_status(configuration: &configuration::Configuration, params: FindPetsByStatusParams) -> Result<ResponseContent<FindPetsByStatusSuccess>, Error<FindPetsByStatusError>> {
+    // unbox the parameters
+    let status = params.status;
 
-        let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
-        let mut req_builder = client.delete(uri_str.as_str());
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(param_value) = api_key {
-            req_builder = req_builder.header("api_key", param_value.to_string());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/pet/findByStatus", configuration.base_path);
+    let mut req_builder = client.get(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        client.execute(req).await?.error_for_status()?;
-        Ok(())
+    req_builder = req_builder.query(&[("status", &status.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]);
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<FindPetsByStatusSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<FindPetsByStatusError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
+}
 
-    pub async fn find_pets_by_status(configuration: &configuration::Configuration, status: Vec<String>) -> Result<Vec<crate::models::Pet>, Error> {
-        let client = &configuration.client;
+/// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+pub async fn find_pets_by_tags(configuration: &configuration::Configuration, params: FindPetsByTagsParams) -> Result<ResponseContent<FindPetsByTagsSuccess>, Error<FindPetsByTagsError>> {
+    // unbox the parameters
+    let tags = params.tags;
 
-        let uri_str = format!("{}/pet/findByStatus", configuration.base_path);
-        let mut req_builder = client.get(uri_str.as_str());
 
-        req_builder = req_builder.query(&[("status", &status.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]);
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
+    let client = &configuration.client;
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req).await?.error_for_status()?.json::<Vec<crate::models::Pet>>().await?)
+    let uri_str = format!("{}/pet/findByTags", configuration.base_path);
+    let mut req_builder = client.get(uri_str.as_str());
+
+    req_builder = req_builder.query(&[("tags", &tags.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]);
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<FindPetsByTagsSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<FindPetsByTagsError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    pub async fn find_pets_by_tags(configuration: &configuration::Configuration, tags: Vec<String>) -> Result<Vec<crate::models::Pet>, Error> {
-        let client = &configuration.client;
+/// Returns a single pet
+pub async fn get_pet_by_id(configuration: &configuration::Configuration, params: GetPetByIdParams) -> Result<ResponseContent<GetPetByIdSuccess>, Error<GetPetByIdError>> {
+    // unbox the parameters
+    let pet_id = params.pet_id;
 
-        let uri_str = format!("{}/pet/findByTags", configuration.base_path);
-        let mut req_builder = client.get(uri_str.as_str());
 
-        req_builder = req_builder.query(&[("tags", &tags.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]);
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
+    let mut req_builder = client.get(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req).await?.error_for_status()?.json::<Vec<crate::models::Pet>>().await?)
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
+    if let Some(ref apikey) = configuration.api_key {
+        let key = apikey.key.clone();
+        let val = match apikey.prefix {
+            Some(ref prefix) => format!("{} {}", prefix, key),
+            None => key,
+        };
+        req_builder = req_builder.header("api_key", val);
+    };
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<GetPetByIdSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<GetPetByIdError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
+}
 
-    pub async fn get_pet_by_id(configuration: &configuration::Configuration, pet_id: i64) -> Result<crate::models::Pet, Error> {
-        let client = &configuration.client;
+pub async fn update_pet(configuration: &configuration::Configuration, params: UpdatePetParams) -> Result<ResponseContent<UpdatePetSuccess>, Error<UpdatePetError>> {
+    // unbox the parameters
+    let body = params.body;
 
-        let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
-        let mut req_builder = client.get(uri_str.as_str());
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref apikey) = configuration.api_key {
-            let key = apikey.key.clone();
-            let val = match apikey.prefix {
-                Some(ref prefix) => format!("{} {}", prefix, key),
-                None => key,
-            };
-            req_builder = req_builder.header("api_key", val);
-        };
+    let client = &configuration.client;
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req).await?.error_for_status()?.json::<crate::models::Pet>().await?)
+    let uri_str = format!("{}/pet", configuration.base_path);
+    let mut req_builder = client.put(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+    req_builder = req_builder.json(&body);
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<UpdatePetSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<UpdatePetError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    pub async fn update_pet(configuration: &configuration::Configuration, body: crate::models::Pet) -> Result<(), Error> {
-        let client = &configuration.client;
+pub async fn update_pet_with_form(configuration: &configuration::Configuration, params: UpdatePetWithFormParams) -> Result<ResponseContent<UpdatePetWithFormSuccess>, Error<UpdatePetWithFormError>> {
+    // unbox the parameters
+    let pet_id = params.pet_id;
+    let name = params.name;
+    let status = params.status;
 
-        let uri_str = format!("{}/pet", configuration.base_path);
-        let mut req_builder = client.put(uri_str.as_str());
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
-        req_builder = req_builder.json(&body);
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
+    let mut req_builder = client.post(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        client.execute(req).await?.error_for_status()?;
-        Ok(())
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+    let mut form_params = std::collections::HashMap::new();
+    if let Some(param_value) = name {
+        form_params.insert("name", param_value.to_string());
     }
+    if let Some(param_value) = status {
+        form_params.insert("status", param_value.to_string());
+    }
+    req_builder = req_builder.form(&form_params);
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<UpdatePetWithFormSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<UpdatePetWithFormError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
+}
 
-    pub async fn update_pet_with_form(configuration: &configuration::Configuration, pet_id: i64, name: Option<&str>, status: Option<&str>) -> Result<(), Error> {
-        let client = &configuration.client;
+pub async fn upload_file(configuration: &configuration::Configuration, params: UploadFileParams) -> Result<ResponseContent<UploadFileSuccess>, Error<UploadFileError>> {
+    // unbox the parameters
+    let pet_id = params.pet_id;
+    let additional_metadata = params.additional_metadata;
+    let file = params.file;
 
-        let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
-        let mut req_builder = client.post(uri_str.as_str());
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
-        let mut form_params = std::collections::HashMap::new();
-        if let Some(param_value) = name {
-            form_params.insert("name", param_value.to_string());
-        }
-        if let Some(param_value) = status {
-            form_params.insert("status", param_value.to_string());
-        }
-        req_builder = req_builder.form(&form_params);
-
-        let req = req_builder.build()?;
-        client.execute(req).await?.error_for_status()?;
-        Ok(())
-    }
-
-    pub async fn upload_file(configuration: &configuration::Configuration, pet_id: i64, additional_metadata: Option<&str>, file: Option<std::path::PathBuf>) -> Result<crate::models::ApiResponse, Error> {
-        let client = &configuration.client;
-
-        let uri_str = format!("{}/pet/{petId}/uploadImage", configuration.base_path, petId=pet_id);
-        let mut req_builder = client.post(uri_str.as_str());
-
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
-        let mut form = reqwest::multipart::Form::new();
-        if let Some(param_value) = additional_metadata {
-            form = form.text("additionalMetadata", param_value.to_string());
-        }
-        // TODO: support file upload for 'file' parameter
-        req_builder = req_builder.multipart(form);
+    let client = &configuration.client;
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req).await?.error_for_status()?.json::<crate::models::ApiResponse>().await?)
+    let uri_str = format!("{}/pet/{petId}/uploadImage", configuration.base_path, petId=pet_id);
+    let mut req_builder = client.post(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+    let mut form = reqwest::multipart::Form::new();
+    if let Some(param_value) = additional_metadata {
+        form = form.text("additionalMetadata", param_value.to_string());
+    }
+    // TODO: support file upload for 'file' parameter
+    req_builder = req_builder.multipart(form);
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<UploadFileSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<UploadFileError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs
index d9ab07295ec6..52f40c9ad5c2 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs
@@ -8,79 +8,231 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[allow(unused_imports)]
-use std::rc::Rc;
-use std::borrow::Borrow;
-use std::option::Option;
 
 use reqwest;
 
+use crate::apis::ResponseContent;
 use super::{Error, configuration};
 
+/// struct for passing parameters to the method `delete_order`
+#[derive(Clone, Debug)]
+pub struct DeleteOrderParams {
+    /// ID of the order that needs to be deleted
+    pub order_id: String
+}
+
+/// struct for passing parameters to the method `get_order_by_id`
+#[derive(Clone, Debug)]
+pub struct GetOrderByIdParams {
+    /// ID of pet that needs to be fetched
+    pub order_id: i64
+}
+
+/// struct for passing parameters to the method `place_order`
+#[derive(Clone, Debug)]
+pub struct PlaceOrderParams {
+    /// order placed for purchasing the pet
+    pub body: crate::models::Order
+}
+
+
+/// struct for typed successes of method `delete_order`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum DeleteOrderSuccess {
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `get_inventory`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum GetInventorySuccess {
+    Status200(::std::collections::HashMap<String, i32>),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `get_order_by_id`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum GetOrderByIdSuccess {
+    Status200(crate::models::Order),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `place_order`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum PlaceOrderSuccess {
+    Status200(crate::models::Order),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `delete_order`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum DeleteOrderError {
+    Status400(),
+    Status404(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `get_inventory`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum GetInventoryError {
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `get_order_by_id`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum GetOrderByIdError {
+    Status400(),
+    Status404(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `place_order`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum PlaceOrderError {
+    Status400(),
+    UnknownValue(serde_json::Value),
+}
+
+
+/// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+pub async fn delete_order(configuration: &configuration::Configuration, params: DeleteOrderParams) -> Result<ResponseContent<DeleteOrderSuccess>, Error<DeleteOrderError>> {
+    // unbox the parameters
+    let order_id = params.order_id;
+
+
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=crate::apis::urlencode(order_id));
+    let mut req_builder = client.delete(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
 
-    pub async fn delete_order(configuration: &configuration::Configuration, order_id: &str) -> Result<(), Error> {
-        let client = &configuration.client;
-
-        let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=crate::apis::urlencode(order_id));
-        let mut req_builder = client.delete(uri_str.as_str());
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let status = resp.status();
+    let content = resp.text().await?;
 
-        let req = req_builder.build()?;
-        client.execute(req).await?.error_for_status()?;
-        Ok(())
+    if status.is_success() {
+        let entity: Option<DeleteOrderSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<DeleteOrderError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
+
+/// Returns a map of status codes to quantities
+pub async fn get_inventory(configuration: &configuration::Configuration) -> Result<ResponseContent<GetInventorySuccess>, Error<GetInventoryError>> {
+    // unbox the parameters
 
-    pub async fn get_inventory(configuration: &configuration::Configuration, ) -> Result<::std::collections::HashMap<String, i32>, Error> {
-        let client = &configuration.client;
-
-        let uri_str = format!("{}/store/inventory", configuration.base_path);
-        let mut req_builder = client.get(uri_str.as_str());
-
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref apikey) = configuration.api_key {
-            let key = apikey.key.clone();
-            let val = match apikey.prefix {
-                Some(ref prefix) => format!("{} {}", prefix, key),
-                None => key,
-            };
-            req_builder = req_builder.header("api_key", val);
-        };
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req).await?.error_for_status()?.json::<::std::collections::HashMap<String, i32>>().await?)
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/store/inventory", configuration.base_path);
+    let mut req_builder = client.get(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    if let Some(ref apikey) = configuration.api_key {
+        let key = apikey.key.clone();
+        let val = match apikey.prefix {
+            Some(ref prefix) => format!("{} {}", prefix, key),
+            None => key,
+        };
+        req_builder = req_builder.header("api_key", val);
+    };
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<GetInventorySuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<GetInventoryError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    pub async fn get_order_by_id(configuration: &configuration::Configuration, order_id: i64) -> Result<crate::models::Order, Error> {
-        let client = &configuration.client;
+/// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+pub async fn get_order_by_id(configuration: &configuration::Configuration, params: GetOrderByIdParams) -> Result<ResponseContent<GetOrderByIdSuccess>, Error<GetOrderByIdError>> {
+    // unbox the parameters
+    let order_id = params.order_id;
 
-        let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=order_id);
-        let mut req_builder = client.get(uri_str.as_str());
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let client = &configuration.client;
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req).await?.error_for_status()?.json::<crate::models::Order>().await?)
+    let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=order_id);
+    let mut req_builder = client.get(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
 
-    pub async fn place_order(configuration: &configuration::Configuration, body: crate::models::Order) -> Result<crate::models::Order, Error> {
-        let client = &configuration.client;
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<GetOrderByIdSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<GetOrderByIdError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
+}
 
-        let uri_str = format!("{}/store/order", configuration.base_path);
-        let mut req_builder = client.post(uri_str.as_str());
+pub async fn place_order(configuration: &configuration::Configuration, params: PlaceOrderParams) -> Result<ResponseContent<PlaceOrderSuccess>, Error<PlaceOrderError>> {
+    // unbox the parameters
+    let body = params.body;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        req_builder = req_builder.json(&body);
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req).await?.error_for_status()?.json::<crate::models::Order>().await?)
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/store/order", configuration.base_path);
+    let mut req_builder = client.post(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    req_builder = req_builder.json(&body);
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<PlaceOrderSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<PlaceOrderError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/user_api.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/user_api.rs
index 618cca717893..6678d1ec8d0e 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/user_api.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/user_api.rs
@@ -8,137 +8,447 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[allow(unused_imports)]
-use std::rc::Rc;
-use std::borrow::Borrow;
-use std::option::Option;
 
 use reqwest;
 
+use crate::apis::ResponseContent;
 use super::{Error, configuration};
 
+/// struct for passing parameters to the method `create_user`
+#[derive(Clone, Debug)]
+pub struct CreateUserParams {
+    /// Created user object
+    pub body: crate::models::User
+}
+
+/// struct for passing parameters to the method `create_users_with_array_input`
+#[derive(Clone, Debug)]
+pub struct CreateUsersWithArrayInputParams {
+    /// List of user object
+    pub body: Vec<crate::models::User>
+}
+
+/// struct for passing parameters to the method `create_users_with_list_input`
+#[derive(Clone, Debug)]
+pub struct CreateUsersWithListInputParams {
+    /// List of user object
+    pub body: Vec<crate::models::User>
+}
+
+/// struct for passing parameters to the method `delete_user`
+#[derive(Clone, Debug)]
+pub struct DeleteUserParams {
+    /// The name that needs to be deleted
+    pub username: String
+}
+
+/// struct for passing parameters to the method `get_user_by_name`
+#[derive(Clone, Debug)]
+pub struct GetUserByNameParams {
+    /// The name that needs to be fetched. Use user1 for testing.
+    pub username: String
+}
+
+/// struct for passing parameters to the method `login_user`
+#[derive(Clone, Debug)]
+pub struct LoginUserParams {
+    /// The user name for login
+    pub username: String,
+    /// The password for login in clear text
+    pub password: String
+}
+
+/// struct for passing parameters to the method `update_user`
+#[derive(Clone, Debug)]
+pub struct UpdateUserParams {
+    /// name that need to be deleted
+    pub username: String,
+    /// Updated user object
+    pub body: crate::models::User
+}
+
+
+/// struct for typed successes of method `create_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum CreateUserSuccess {
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `create_users_with_array_input`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum CreateUsersWithArrayInputSuccess {
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `create_users_with_list_input`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum CreateUsersWithListInputSuccess {
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `delete_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum DeleteUserSuccess {
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `get_user_by_name`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum GetUserByNameSuccess {
+    Status200(crate::models::User),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `login_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum LoginUserSuccess {
+    Status200(String),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `logout_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum LogoutUserSuccess {
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed successes of method `update_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum UpdateUserSuccess {
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `create_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum CreateUserError {
+    DefaultResponse(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `create_users_with_array_input`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum CreateUsersWithArrayInputError {
+    DefaultResponse(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `create_users_with_list_input`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum CreateUsersWithListInputError {
+    DefaultResponse(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `delete_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum DeleteUserError {
+    Status400(),
+    Status404(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `get_user_by_name`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum GetUserByNameError {
+    Status400(),
+    Status404(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `login_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum LoginUserError {
+    Status400(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `logout_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum LogoutUserError {
+    DefaultResponse(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `update_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum UpdateUserError {
+    Status400(),
+    Status404(),
+    UnknownValue(serde_json::Value),
+}
+
+
+/// This can only be done by the logged in user.
+pub async fn create_user(configuration: &configuration::Configuration, params: CreateUserParams) -> Result<ResponseContent<CreateUserSuccess>, Error<CreateUserError>> {
+    // unbox the parameters
+    let body = params.body;
+
+
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/user", configuration.base_path);
+    let mut req_builder = client.post(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    req_builder = req_builder.json(&body);
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<CreateUserSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<CreateUserError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
+}
 
-    pub async fn create_user(configuration: &configuration::Configuration, body: crate::models::User) -> Result<(), Error> {
-        let client = &configuration.client;
+pub async fn create_users_with_array_input(configuration: &configuration::Configuration, params: CreateUsersWithArrayInputParams) -> Result<ResponseContent<CreateUsersWithArrayInputSuccess>, Error<CreateUsersWithArrayInputError>> {
+    // unbox the parameters
+    let body = params.body;
 
-        let uri_str = format!("{}/user", configuration.base_path);
-        let mut req_builder = client.post(uri_str.as_str());
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        req_builder = req_builder.json(&body);
+    let client = &configuration.client;
 
-        let req = req_builder.build()?;
-        client.execute(req).await?.error_for_status()?;
-        Ok(())
+    let uri_str = format!("{}/user/createWithArray", configuration.base_path);
+    let mut req_builder = client.post(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    req_builder = req_builder.json(&body);
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<CreateUsersWithArrayInputSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<CreateUsersWithArrayInputError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    pub async fn create_users_with_array_input(configuration: &configuration::Configuration, body: Vec<crate::models::User>) -> Result<(), Error> {
-        let client = &configuration.client;
+pub async fn create_users_with_list_input(configuration: &configuration::Configuration, params: CreateUsersWithListInputParams) -> Result<ResponseContent<CreateUsersWithListInputSuccess>, Error<CreateUsersWithListInputError>> {
+    // unbox the parameters
+    let body = params.body;
 
-        let uri_str = format!("{}/user/createWithArray", configuration.base_path);
-        let mut req_builder = client.post(uri_str.as_str());
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        req_builder = req_builder.json(&body);
+    let client = &configuration.client;
 
-        let req = req_builder.build()?;
-        client.execute(req).await?.error_for_status()?;
-        Ok(())
+    let uri_str = format!("{}/user/createWithList", configuration.base_path);
+    let mut req_builder = client.post(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    req_builder = req_builder.json(&body);
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<CreateUsersWithListInputSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<CreateUsersWithListInputError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    pub async fn create_users_with_list_input(configuration: &configuration::Configuration, body: Vec<crate::models::User>) -> Result<(), Error> {
-        let client = &configuration.client;
+/// This can only be done by the logged in user.
+pub async fn delete_user(configuration: &configuration::Configuration, params: DeleteUserParams) -> Result<ResponseContent<DeleteUserSuccess>, Error<DeleteUserError>> {
+    // unbox the parameters
+    let username = params.username;
 
-        let uri_str = format!("{}/user/createWithList", configuration.base_path);
-        let mut req_builder = client.post(uri_str.as_str());
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        req_builder = req_builder.json(&body);
+    let client = &configuration.client;
 
-        let req = req_builder.build()?;
-        client.execute(req).await?.error_for_status()?;
-        Ok(())
-    }
+    let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
+    let mut req_builder = client.delete(uri_str.as_str());
 
-    pub async fn delete_user(configuration: &configuration::Configuration, username: &str) -> Result<(), Error> {
-        let client = &configuration.client;
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
 
-        let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
-        let mut req_builder = client.delete(uri_str.as_str());
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let status = resp.status();
+    let content = resp.text().await?;
 
-        let req = req_builder.build()?;
-        client.execute(req).await?.error_for_status()?;
-        Ok(())
+    if status.is_success() {
+        let entity: Option<DeleteUserSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<DeleteUserError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
+
+pub async fn get_user_by_name(configuration: &configuration::Configuration, params: GetUserByNameParams) -> Result<ResponseContent<GetUserByNameSuccess>, Error<GetUserByNameError>> {
+    // unbox the parameters
+    let username = params.username;
+
 
-    pub async fn get_user_by_name(configuration: &configuration::Configuration, username: &str) -> Result<crate::models::User, Error> {
-        let client = &configuration.client;
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
+    let mut req_builder = client.get(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
 
-        let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
-        let mut req_builder = client.get(uri_str.as_str());
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let status = resp.status();
+    let content = resp.text().await?;
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req).await?.error_for_status()?.json::<crate::models::User>().await?)
+    if status.is_success() {
+        let entity: Option<GetUserByNameSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<GetUserByNameError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    pub async fn login_user(configuration: &configuration::Configuration, username: &str, password: &str) -> Result<String, Error> {
-        let client = &configuration.client;
+pub async fn login_user(configuration: &configuration::Configuration, params: LoginUserParams) -> Result<ResponseContent<LoginUserSuccess>, Error<LoginUserError>> {
+    // unbox the parameters
+    let username = params.username;
+    let password = params.password;
 
-        let uri_str = format!("{}/user/login", configuration.base_path);
-        let mut req_builder = client.get(uri_str.as_str());
 
-        req_builder = req_builder.query(&[("username", &username.to_string())]);
-        req_builder = req_builder.query(&[("password", &password.to_string())]);
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let client = &configuration.client;
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req).await?.error_for_status()?.json::<String>().await?)
+    let uri_str = format!("{}/user/login", configuration.base_path);
+    let mut req_builder = client.get(uri_str.as_str());
+
+    req_builder = req_builder.query(&[("username", &username.to_string())]);
+    req_builder = req_builder.query(&[("password", &password.to_string())]);
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<LoginUserSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<LoginUserError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
+
+pub async fn logout_user(configuration: &configuration::Configuration) -> Result<ResponseContent<LogoutUserSuccess>, Error<LogoutUserError>> {
+    // unbox the parameters
 
-    pub async fn logout_user(configuration: &configuration::Configuration, ) -> Result<(), Error> {
-        let client = &configuration.client;
 
-        let uri_str = format!("{}/user/logout", configuration.base_path);
-        let mut req_builder = client.get(uri_str.as_str());
+    let client = &configuration.client;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let uri_str = format!("{}/user/logout", configuration.base_path);
+    let mut req_builder = client.get(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        client.execute(req).await?.error_for_status()?;
-        Ok(())
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
 
-    pub async fn update_user(configuration: &configuration::Configuration, username: &str, body: crate::models::User) -> Result<(), Error> {
-        let client = &configuration.client;
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
 
-        let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
-        let mut req_builder = client.put(uri_str.as_str());
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<LogoutUserSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<LogoutUserError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
+}
+
+/// This can only be done by the logged in user.
+pub async fn update_user(configuration: &configuration::Configuration, params: UpdateUserParams) -> Result<ResponseContent<UpdateUserSuccess>, Error<UpdateUserError>> {
+    // unbox the parameters
+    let username = params.username;
+    let body = params.body;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        req_builder = req_builder.json(&body);
 
-        let req = req_builder.build()?;
-        client.execute(req).await?.error_for_status()?;
-        Ok(())
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
+    let mut req_builder = client.put(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    req_builder = req_builder.json(&body);
+
+    let req = req_builder.build()?;
+    let resp = client.execute(req).await?;
+
+    let status = resp.status();
+    let content = resp.text().await?;
+
+    if status.is_success() {
+        let entity: Option<UpdateUserSuccess> = serde_json::from_str(&content).ok();
+        let result = ResponseContent { status, content, entity };
+        Ok(result)
+    } else {
+        let entity: Option<UpdateUserError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/tests/pet_tests.rs b/samples/client/petstore/rust/reqwest/petstore-async/tests/pet_tests.rs
index 50829ebaa3e8..bf4cb42e867b 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/tests/pet_tests.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/tests/pet_tests.rs
@@ -5,7 +5,6 @@ use petstore_reqwest_async::apis::configuration;
 //use petstore_reqwest::apis::PetApiUpdatePetWithFormParams;
 use petstore_reqwest_async::models::{Pet};
 use std::option::Option;
-use std::rc::Rc;
 
 #[test]
 fn test_pet() {
@@ -17,18 +16,19 @@ fn test_pet() {
     let mut new_pet = Pet::new("Rust Pet".to_string(), photo_urls);
     new_pet.id = Option::Some(8787);
 
+    let new_pet_params = petstore_reqwest_async::apis::pet_api::AddPetParams {
+        body: new_pet,
+    };
+
     // add pet
-    let _add_result = petstore_reqwest_async::apis::add_pet(&config, new_pet);
+    let _add_result = petstore_reqwest_async::apis::pet_api::add_pet(&config, new_pet_params);
+
+    let get_pet_params = petstore_reqwest_async::apis::pet_api::GetPetByIdParams {
+        pet_id: 8787,
+    };
 
     // get pet
-    let pet_result = petstore_reqwest_async::apis::get_pet_by_id(&config, 8787);
+    let pet_result = petstore_reqwest_async::apis::pet_api::get_pet_by_id(&config, get_pet_params);
 
-    let _pet_result = match pet_result {
-        Ok(pet) => {
-            assert_eq!(pet.id, Option::Some(8787));
-            assert_eq!(pet.name, "Rust Pet");
-            assert_eq!(pet.photo_urls, vec!["https://11".to_string(), "https://22".to_string()]);
-        },
-        Err(error) => println!("error: {:?}", error),
-    };
+    // TODO Testing async functions requires some additionnal testing crates.
 }
diff --git a/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/FILES b/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/FILES
index 05a32e57f1d5..611ac7b6dd7c 100644
--- a/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/FILES
+++ b/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/FILES
@@ -12,7 +12,6 @@ docs/Tag.md
 docs/User.md
 docs/UserApi.md
 git_push.sh
-src/apis/client.rs
 src/apis/configuration.rs
 src/apis/mod.rs
 src/apis/pet_api.rs
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/client.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/client.rs
deleted file mode 100644
index 8a3963dcc539..000000000000
--- a/samples/client/petstore/rust/reqwest/petstore/src/apis/client.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use std::rc::Rc;
-
-use super::configuration::Configuration;
-
-pub struct APIClient {
-    pet_api: Box<dyn crate::apis::PetApi>,
-    store_api: Box<dyn crate::apis::StoreApi>,
-    user_api: Box<dyn crate::apis::UserApi>,
-}
-
-impl APIClient {
-    pub fn new(configuration: Configuration) -> APIClient {
-        let rc = Rc::new(configuration);
-
-        APIClient {
-            pet_api: Box::new(crate::apis::PetApiClient::new(rc.clone())),
-            store_api: Box::new(crate::apis::StoreApiClient::new(rc.clone())),
-            user_api: Box::new(crate::apis::UserApiClient::new(rc.clone())),
-        }
-    }
-
-    pub fn pet_api(&self) -> &dyn crate::apis::PetApi{
-        self.pet_api.as_ref()
-    }
-
-    pub fn store_api(&self) -> &dyn crate::apis::StoreApi{
-        self.store_api.as_ref()
-    }
-
-    pub fn user_api(&self) -> &dyn crate::apis::UserApi{
-        self.user_api.as_ref()
-    }
-
-}
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/mod.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/mod.rs
index 2ce86d2804a5..087b76befa4e 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/apis/mod.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/mod.rs
@@ -1,26 +1,34 @@
 use reqwest;
 use serde_json;
 
+#[derive(Debug, Clone)]
+pub struct ResponseContent<T> {
+    pub status: reqwest::StatusCode,
+    pub content: String,
+    pub entity: Option<T>,
+}
+
 #[derive(Debug)]
-pub enum Error {
+pub enum Error<T> {
     Reqwest(reqwest::Error),
     Serde(serde_json::Error),
     Io(std::io::Error),
+    ResponseError(ResponseContent<T>),
 }
 
-impl From<reqwest::Error> for Error {
+impl <T> From<reqwest::Error> for Error<T> {
     fn from(e: reqwest::Error) -> Self {
         Error::Reqwest(e)
     }
 }
 
-impl From<serde_json::Error> for Error {
+impl <T> From<serde_json::Error> for Error<T> {
     fn from(e: serde_json::Error) -> Self {
         Error::Serde(e)
     }
 }
 
-impl From<std::io::Error> for Error {
+impl <T> From<std::io::Error> for Error<T> {
     fn from(e: std::io::Error) -> Self {
         Error::Io(e)
     }
@@ -30,12 +38,8 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
-mod pet_api;
-pub use self::pet_api::{ PetApi, PetApiClient };
-mod store_api;
-pub use self::store_api::{ StoreApi, StoreApiClient };
-mod user_api;
-pub use self::user_api::{ UserApi, UserApiClient };
+pub mod pet_api;
+pub mod store_api;
+pub mod user_api;
 
-pub mod client;
 pub mod configuration;
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/pet_api.rs
index 1d90f2f1219b..c6715740fc47 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/apis/pet_api.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/pet_api.rs
@@ -8,214 +8,340 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[allow(unused_imports)]
-use std::rc::Rc;
-use std::borrow::Borrow;
-use std::option::Option;
 
 use reqwest;
 
+use crate::apis::ResponseContent;
 use super::{Error, configuration};
 
-pub struct PetApiClient {
-    configuration: Rc<configuration::Configuration>,
+
+/// struct for typed errors of method `add_pet`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum AddPetError {
+    Status405(),
+    UnknownValue(serde_json::Value),
 }
 
-impl PetApiClient {
-    pub fn new(configuration: Rc<configuration::Configuration>) -> PetApiClient {
-        PetApiClient {
-            configuration,
-        }
-    }
+/// struct for typed errors of method `delete_pet`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum DeletePetError {
+    Status400(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `find_pets_by_status`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum FindPetsByStatusError {
+    Status400(),
+    UnknownValue(serde_json::Value),
 }
 
+/// struct for typed errors of method `find_pets_by_tags`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum FindPetsByTagsError {
+    Status400(),
+    UnknownValue(serde_json::Value),
+}
 
-pub trait PetApi {
-    fn add_pet(&self, body: crate::models::Pet) -> Result<(), Error>;
-    fn delete_pet(&self, pet_id: i64, api_key: Option<&str>) -> Result<(), Error>;
-    fn find_pets_by_status(&self, status: Vec<String>) -> Result<Vec<crate::models::Pet>, Error>;
-    fn find_pets_by_tags(&self, tags: Vec<String>) -> Result<Vec<crate::models::Pet>, Error>;
-    fn get_pet_by_id(&self, pet_id: i64) -> Result<crate::models::Pet, Error>;
-    fn update_pet(&self, body: crate::models::Pet) -> Result<(), Error>;
-    fn update_pet_with_form(&self, pet_id: i64, name: Option<&str>, status: Option<&str>) -> Result<(), Error>;
-    fn upload_file(&self, pet_id: i64, additional_metadata: Option<&str>, file: Option<std::path::PathBuf>) -> Result<crate::models::ApiResponse, Error>;
+/// struct for typed errors of method `get_pet_by_id`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum GetPetByIdError {
+    Status400(),
+    Status404(),
+    UnknownValue(serde_json::Value),
 }
 
-impl PetApi for PetApiClient {
-    fn add_pet(&self, body: crate::models::Pet) -> Result<(), Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+/// struct for typed errors of method `update_pet`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum UpdatePetError {
+    Status400(),
+    Status404(),
+    Status405(),
+    UnknownValue(serde_json::Value),
+}
 
-        let uri_str = format!("{}/pet", configuration.base_path);
-        let mut req_builder = client.post(uri_str.as_str());
+/// struct for typed errors of method `update_pet_with_form`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum UpdatePetWithFormError {
+    Status405(),
+    UnknownValue(serde_json::Value),
+}
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
-        req_builder = req_builder.json(&body);
+/// struct for typed errors of method `upload_file`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum UploadFileError {
+    UnknownValue(serde_json::Value),
+}
+
+
+pub fn add_pet(configuration: &configuration::Configuration, body: crate::models::Pet) -> Result<(), Error<AddPetError>> {
+
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/pet", configuration.base_path);
+    let mut req_builder = client.post(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+    req_builder = req_builder.json(&body);
 
-        let req = req_builder.build()?;
-        client.execute(req)?.error_for_status()?;
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
         Ok(())
+    } else {
+        let entity: Option<AddPetError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    fn delete_pet(&self, pet_id: i64, api_key: Option<&str>) -> Result<(), Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+pub fn delete_pet(configuration: &configuration::Configuration, pet_id: i64, api_key: Option<&str>) -> Result<(), Error<DeletePetError>> {
 
-        let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
-        let mut req_builder = client.delete(uri_str.as_str());
+    let client = &configuration.client;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(param_value) = api_key {
-            req_builder = req_builder.header("api_key", param_value.to_string());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
+    let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
+    let mut req_builder = client.delete(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    if let Some(param_value) = api_key {
+        req_builder = req_builder.header("api_key", param_value.to_string());
+    }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
 
-        let req = req_builder.build()?;
-        client.execute(req)?.error_for_status()?;
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
         Ok(())
+    } else {
+        let entity: Option<DeletePetError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    fn find_pets_by_status(&self, status: Vec<String>) -> Result<Vec<crate::models::Pet>, Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+/// Multiple status values can be provided with comma separated strings
+pub fn find_pets_by_status(configuration: &configuration::Configuration, status: Vec<String>) -> Result<Vec<crate::models::Pet>, Error<FindPetsByStatusError>> {
 
-        let uri_str = format!("{}/pet/findByStatus", configuration.base_path);
-        let mut req_builder = client.get(uri_str.as_str());
+    let client = &configuration.client;
 
-        req_builder = req_builder.query(&[("status", &status.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]);
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
+    let uri_str = format!("{}/pet/findByStatus", configuration.base_path);
+    let mut req_builder = client.get(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req)?.error_for_status()?.json()?)
+    req_builder = req_builder.query(&[("status", &status.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]);
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
+        serde_json::from_str(&content).map_err(Error::from)
+    } else {
+        let entity: Option<FindPetsByStatusError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
+}
 
-    fn find_pets_by_tags(&self, tags: Vec<String>) -> Result<Vec<crate::models::Pet>, Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+/// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+pub fn find_pets_by_tags(configuration: &configuration::Configuration, tags: Vec<String>) -> Result<Vec<crate::models::Pet>, Error<FindPetsByTagsError>> {
 
-        let uri_str = format!("{}/pet/findByTags", configuration.base_path);
-        let mut req_builder = client.get(uri_str.as_str());
+    let client = &configuration.client;
 
-        req_builder = req_builder.query(&[("tags", &tags.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]);
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
+    let uri_str = format!("{}/pet/findByTags", configuration.base_path);
+    let mut req_builder = client.get(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req)?.error_for_status()?.json()?)
+    req_builder = req_builder.query(&[("tags", &tags.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]);
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
+        serde_json::from_str(&content).map_err(Error::from)
+    } else {
+        let entity: Option<FindPetsByTagsError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
+}
 
-    fn get_pet_by_id(&self, pet_id: i64) -> Result<crate::models::Pet, Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+/// Returns a single pet
+pub fn get_pet_by_id(configuration: &configuration::Configuration, pet_id: i64) -> Result<crate::models::Pet, Error<GetPetByIdError>> {
 
-        let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
-        let mut req_builder = client.get(uri_str.as_str());
+    let client = &configuration.client;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref apikey) = configuration.api_key {
-            let key = apikey.key.clone();
-            let val = match apikey.prefix {
-                Some(ref prefix) => format!("{} {}", prefix, key),
-                None => key,
-            };
-            req_builder = req_builder.header("api_key", val);
+    let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
+    let mut req_builder = client.get(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    if let Some(ref apikey) = configuration.api_key {
+        let key = apikey.key.clone();
+        let val = match apikey.prefix {
+            Some(ref prefix) => format!("{} {}", prefix, key),
+            None => key,
         };
+        req_builder = req_builder.header("api_key", val);
+    };
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req)?.error_for_status()?.json()?)
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
+        serde_json::from_str(&content).map_err(Error::from)
+    } else {
+        let entity: Option<GetPetByIdError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    fn update_pet(&self, body: crate::models::Pet) -> Result<(), Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+pub fn update_pet(configuration: &configuration::Configuration, body: crate::models::Pet) -> Result<(), Error<UpdatePetError>> {
 
-        let uri_str = format!("{}/pet", configuration.base_path);
-        let mut req_builder = client.put(uri_str.as_str());
+    let client = &configuration.client;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
-        req_builder = req_builder.json(&body);
+    let uri_str = format!("{}/pet", configuration.base_path);
+    let mut req_builder = client.put(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        client.execute(req)?.error_for_status()?;
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+    req_builder = req_builder.json(&body);
+
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
         Ok(())
+    } else {
+        let entity: Option<UpdatePetError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    fn update_pet_with_form(&self, pet_id: i64, name: Option<&str>, status: Option<&str>) -> Result<(), Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+pub fn update_pet_with_form(configuration: &configuration::Configuration, pet_id: i64, name: Option<&str>, status: Option<&str>) -> Result<(), Error<UpdatePetWithFormError>> {
 
-        let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
-        let mut req_builder = client.post(uri_str.as_str());
+    let client = &configuration.client;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
-        let mut form_params = std::collections::HashMap::new();
-        if let Some(param_value) = name {
-            form_params.insert("name", param_value.to_string());
-        }
-        if let Some(param_value) = status {
-            form_params.insert("status", param_value.to_string());
-        }
-        req_builder = req_builder.form(&form_params);
-
-        let req = req_builder.build()?;
-        client.execute(req)?.error_for_status()?;
+    let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
+    let mut req_builder = client.post(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+    let mut form_params = std::collections::HashMap::new();
+    if let Some(param_value) = name {
+        form_params.insert("name", param_value.to_string());
+    }
+    if let Some(param_value) = status {
+        form_params.insert("status", param_value.to_string());
+    }
+    req_builder = req_builder.form(&form_params);
+
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
         Ok(())
+    } else {
+        let entity: Option<UpdatePetWithFormError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    fn upload_file(&self, pet_id: i64, additional_metadata: Option<&str>, file: Option<std::path::PathBuf>) -> Result<crate::models::ApiResponse, Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+pub fn upload_file(configuration: &configuration::Configuration, pet_id: i64, additional_metadata: Option<&str>, file: Option<std::path::PathBuf>) -> Result<crate::models::ApiResponse, Error<UploadFileError>> {
 
-        let uri_str = format!("{}/pet/{petId}/uploadImage", configuration.base_path, petId=pet_id);
-        let mut req_builder = client.post(uri_str.as_str());
+    let client = &configuration.client;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref token) = configuration.oauth_access_token {
-            req_builder = req_builder.bearer_auth(token.to_owned());
-        };
-        let mut form = reqwest::multipart::Form::new();
-        if let Some(param_value) = additional_metadata {
-            form = form.text("additionalMetadata", param_value.to_string());
-        }
-        if let Some(param_value) = file {
-            form = form.file("file", param_value)?;
-        }
-        req_builder = req_builder.multipart(form);
+    let uri_str = format!("{}/pet/{petId}/uploadImage", configuration.base_path, petId=pet_id);
+    let mut req_builder = client.post(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req)?.error_for_status()?.json()?)
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    if let Some(ref token) = configuration.oauth_access_token {
+        req_builder = req_builder.bearer_auth(token.to_owned());
+    };
+    let mut form = reqwest::multipart::Form::new();
+    if let Some(param_value) = additional_metadata {
+        form = form.text("additionalMetadata", param_value.to_string());
     }
+    if let Some(param_value) = file {
+        form = form.file("file", param_value)?;
+    }
+    req_builder = req_builder.multipart(form);
+
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
 
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
+        serde_json::from_str(&content).map_err(Error::from)
+    } else {
+        let entity: Option<UploadFileError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
 }
+
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs
index fee0b120f13f..2474d591dbc1 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs
@@ -8,104 +8,160 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[allow(unused_imports)]
-use std::rc::Rc;
-use std::borrow::Borrow;
-use std::option::Option;
 
 use reqwest;
 
+use crate::apis::ResponseContent;
 use super::{Error, configuration};
 
-pub struct StoreApiClient {
-    configuration: Rc<configuration::Configuration>,
+
+/// struct for typed errors of method `delete_order`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum DeleteOrderError {
+    Status400(),
+    Status404(),
+    UnknownValue(serde_json::Value),
 }
 
-impl StoreApiClient {
-    pub fn new(configuration: Rc<configuration::Configuration>) -> StoreApiClient {
-        StoreApiClient {
-            configuration,
-        }
-    }
+/// struct for typed errors of method `get_inventory`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum GetInventoryError {
+    UnknownValue(serde_json::Value),
 }
 
+/// struct for typed errors of method `get_order_by_id`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum GetOrderByIdError {
+    Status400(),
+    Status404(),
+    UnknownValue(serde_json::Value),
+}
 
-pub trait StoreApi {
-    fn delete_order(&self, order_id: &str) -> Result<(), Error>;
-    fn get_inventory(&self, ) -> Result<::std::collections::HashMap<String, i32>, Error>;
-    fn get_order_by_id(&self, order_id: i64) -> Result<crate::models::Order, Error>;
-    fn place_order(&self, body: crate::models::Order) -> Result<crate::models::Order, Error>;
+/// struct for typed errors of method `place_order`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum PlaceOrderError {
+    Status400(),
+    UnknownValue(serde_json::Value),
 }
 
-impl StoreApi for StoreApiClient {
-    fn delete_order(&self, order_id: &str) -> Result<(), Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
 
-        let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=crate::apis::urlencode(order_id));
-        let mut req_builder = client.delete(uri_str.as_str());
+/// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+pub fn delete_order(configuration: &configuration::Configuration, order_id: &str) -> Result<(), Error<DeleteOrderError>> {
+
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=crate::apis::urlencode(order_id));
+    let mut req_builder = client.delete(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
 
-        let req = req_builder.build()?;
-        client.execute(req)?.error_for_status()?;
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
         Ok(())
+    } else {
+        let entity: Option<DeleteOrderError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
+
+/// Returns a map of status codes to quantities
+pub fn get_inventory(configuration: &configuration::Configuration, ) -> Result<::std::collections::HashMap<String, i32>, Error<GetInventoryError>> {
 
-    fn get_inventory(&self, ) -> Result<::std::collections::HashMap<String, i32>, Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
-
-        let uri_str = format!("{}/store/inventory", configuration.base_path);
-        let mut req_builder = client.get(uri_str.as_str());
-
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        if let Some(ref apikey) = configuration.api_key {
-            let key = apikey.key.clone();
-            let val = match apikey.prefix {
-                Some(ref prefix) => format!("{} {}", prefix, key),
-                None => key,
-            };
-            req_builder = req_builder.header("api_key", val);
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/store/inventory", configuration.base_path);
+    let mut req_builder = client.get(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    if let Some(ref apikey) = configuration.api_key {
+        let key = apikey.key.clone();
+        let val = match apikey.prefix {
+            Some(ref prefix) => format!("{} {}", prefix, key),
+            None => key,
         };
+        req_builder = req_builder.header("api_key", val);
+    };
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req)?.error_for_status()?.json()?)
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
+        serde_json::from_str(&content).map_err(Error::from)
+    } else {
+        let entity: Option<GetInventoryError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
+
+/// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+pub fn get_order_by_id(configuration: &configuration::Configuration, order_id: i64) -> Result<crate::models::Order, Error<GetOrderByIdError>> {
+
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=order_id);
+    let mut req_builder = client.get(uri_str.as_str());
 
-    fn get_order_by_id(&self, order_id: i64) -> Result<crate::models::Order, Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
 
-        let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=order_id);
-        let mut req_builder = client.get(uri_str.as_str());
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let status = resp.status();
+    let content = resp.text()?;
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req)?.error_for_status()?.json()?)
+    if status.is_success() {
+        serde_json::from_str(&content).map_err(Error::from)
+    } else {
+        let entity: Option<GetOrderByIdError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    fn place_order(&self, body: crate::models::Order) -> Result<crate::models::Order, Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+pub fn place_order(configuration: &configuration::Configuration, body: crate::models::Order) -> Result<crate::models::Order, Error<PlaceOrderError>> {
 
-        let uri_str = format!("{}/store/order", configuration.base_path);
-        let mut req_builder = client.post(uri_str.as_str());
+    let client = &configuration.client;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        req_builder = req_builder.json(&body);
+    let uri_str = format!("{}/store/order", configuration.base_path);
+    let mut req_builder = client.post(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req)?.error_for_status()?.json()?)
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
+    req_builder = req_builder.json(&body);
+
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
 
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
+        serde_json::from_str(&content).map_err(Error::from)
+    } else {
+        let entity: Option<PlaceOrderError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
 }
+
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/user_api.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/user_api.rs
index a57be5aa6283..de5fc2cc4f4e 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/apis/user_api.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/user_api.rs
@@ -8,170 +8,295 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[allow(unused_imports)]
-use std::rc::Rc;
-use std::borrow::Borrow;
-use std::option::Option;
 
 use reqwest;
 
+use crate::apis::ResponseContent;
 use super::{Error, configuration};
 
-pub struct UserApiClient {
-    configuration: Rc<configuration::Configuration>,
+
+/// struct for typed errors of method `create_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum CreateUserError {
+    DefaultResponse(),
+    UnknownValue(serde_json::Value),
 }
 
-impl UserApiClient {
-    pub fn new(configuration: Rc<configuration::Configuration>) -> UserApiClient {
-        UserApiClient {
-            configuration,
-        }
-    }
+/// struct for typed errors of method `create_users_with_array_input`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum CreateUsersWithArrayInputError {
+    DefaultResponse(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `create_users_with_list_input`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum CreateUsersWithListInputError {
+    DefaultResponse(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `delete_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum DeleteUserError {
+    Status400(),
+    Status404(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `get_user_by_name`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum GetUserByNameError {
+    Status400(),
+    Status404(),
+    UnknownValue(serde_json::Value),
+}
+
+/// struct for typed errors of method `login_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum LoginUserError {
+    Status400(),
+    UnknownValue(serde_json::Value),
 }
 
+/// struct for typed errors of method `logout_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum LogoutUserError {
+    DefaultResponse(),
+    UnknownValue(serde_json::Value),
+}
 
-pub trait UserApi {
-    fn create_user(&self, body: crate::models::User) -> Result<(), Error>;
-    fn create_users_with_array_input(&self, body: Vec<crate::models::User>) -> Result<(), Error>;
-    fn create_users_with_list_input(&self, body: Vec<crate::models::User>) -> Result<(), Error>;
-    fn delete_user(&self, username: &str) -> Result<(), Error>;
-    fn get_user_by_name(&self, username: &str) -> Result<crate::models::User, Error>;
-    fn login_user(&self, username: &str, password: &str) -> Result<String, Error>;
-    fn logout_user(&self, ) -> Result<(), Error>;
-    fn update_user(&self, username: &str, body: crate::models::User) -> Result<(), Error>;
+/// struct for typed errors of method `update_user`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum UpdateUserError {
+    Status400(),
+    Status404(),
+    UnknownValue(serde_json::Value),
 }
 
-impl UserApi for UserApiClient {
-    fn create_user(&self, body: crate::models::User) -> Result<(), Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
 
-        let uri_str = format!("{}/user", configuration.base_path);
-        let mut req_builder = client.post(uri_str.as_str());
+/// This can only be done by the logged in user.
+pub fn create_user(configuration: &configuration::Configuration, body: crate::models::User) -> Result<(), Error<CreateUserError>> {
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        req_builder = req_builder.json(&body);
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/user", configuration.base_path);
+    let mut req_builder = client.post(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    req_builder = req_builder.json(&body);
 
-        let req = req_builder.build()?;
-        client.execute(req)?.error_for_status()?;
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
         Ok(())
+    } else {
+        let entity: Option<CreateUserError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
+
+pub fn create_users_with_array_input(configuration: &configuration::Configuration, body: Vec<crate::models::User>) -> Result<(), Error<CreateUsersWithArrayInputError>> {
 
-    fn create_users_with_array_input(&self, body: Vec<crate::models::User>) -> Result<(), Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/user/createWithArray", configuration.base_path);
+    let mut req_builder = client.post(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    req_builder = req_builder.json(&body);
 
-        let uri_str = format!("{}/user/createWithArray", configuration.base_path);
-        let mut req_builder = client.post(uri_str.as_str());
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        req_builder = req_builder.json(&body);
+    let status = resp.status();
+    let content = resp.text()?;
 
-        let req = req_builder.build()?;
-        client.execute(req)?.error_for_status()?;
+    if status.is_success() {
         Ok(())
+    } else {
+        let entity: Option<CreateUsersWithArrayInputError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
+
+pub fn create_users_with_list_input(configuration: &configuration::Configuration, body: Vec<crate::models::User>) -> Result<(), Error<CreateUsersWithListInputError>> {
+
+    let client = &configuration.client;
 
-    fn create_users_with_list_input(&self, body: Vec<crate::models::User>) -> Result<(), Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+    let uri_str = format!("{}/user/createWithList", configuration.base_path);
+    let mut req_builder = client.post(uri_str.as_str());
 
-        let uri_str = format!("{}/user/createWithList", configuration.base_path);
-        let mut req_builder = client.post(uri_str.as_str());
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+    req_builder = req_builder.json(&body);
+
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        req_builder = req_builder.json(&body);
+    let status = resp.status();
+    let content = resp.text()?;
 
-        let req = req_builder.build()?;
-        client.execute(req)?.error_for_status()?;
+    if status.is_success() {
         Ok(())
+    } else {
+        let entity: Option<CreateUsersWithListInputError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    fn delete_user(&self, username: &str) -> Result<(), Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+/// This can only be done by the logged in user.
+pub fn delete_user(configuration: &configuration::Configuration, username: &str) -> Result<(), Error<DeleteUserError>> {
 
-        let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
-        let mut req_builder = client.delete(uri_str.as_str());
+    let client = &configuration.client;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
+    let mut req_builder = client.delete(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        client.execute(req)?.error_for_status()?;
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
         Ok(())
+    } else {
+        let entity: Option<DeleteUserError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    fn get_user_by_name(&self, username: &str) -> Result<crate::models::User, Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+pub fn get_user_by_name(configuration: &configuration::Configuration, username: &str) -> Result<crate::models::User, Error<GetUserByNameError>> {
 
-        let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
-        let mut req_builder = client.get(uri_str.as_str());
+    let client = &configuration.client;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
+    let mut req_builder = client.get(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req)?.error_for_status()?.json()?)
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
 
-    fn login_user(&self, username: &str, password: &str) -> Result<String, Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
+        serde_json::from_str(&content).map_err(Error::from)
+    } else {
+        let entity: Option<GetUserByNameError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
+}
+
+pub fn login_user(configuration: &configuration::Configuration, username: &str, password: &str) -> Result<String, Error<LoginUserError>> {
+
+    let client = &configuration.client;
+
+    let uri_str = format!("{}/user/login", configuration.base_path);
+    let mut req_builder = client.get(uri_str.as_str());
+
+    req_builder = req_builder.query(&[("username", &username.to_string())]);
+    req_builder = req_builder.query(&[("password", &password.to_string())]);
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
 
-        let uri_str = format!("{}/user/login", configuration.base_path);
-        let mut req_builder = client.get(uri_str.as_str());
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
 
-        req_builder = req_builder.query(&[("username", &username.to_string())]);
-        req_builder = req_builder.query(&[("password", &password.to_string())]);
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let status = resp.status();
+    let content = resp.text()?;
 
-        let req = req_builder.build()?;
-        Ok(client.execute(req)?.error_for_status()?.json()?)
+    if status.is_success() {
+        serde_json::from_str(&content).map_err(Error::from)
+    } else {
+        let entity: Option<LoginUserError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    fn logout_user(&self, ) -> Result<(), Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+pub fn logout_user(configuration: &configuration::Configuration, ) -> Result<(), Error<LogoutUserError>> {
 
-        let uri_str = format!("{}/user/logout", configuration.base_path);
-        let mut req_builder = client.get(uri_str.as_str());
+    let client = &configuration.client;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let uri_str = format!("{}/user/logout", configuration.base_path);
+    let mut req_builder = client.get(uri_str.as_str());
+
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
 
-        let req = req_builder.build()?;
-        client.execute(req)?.error_for_status()?;
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
+
+    if status.is_success() {
         Ok(())
+    } else {
+        let entity: Option<LogoutUserError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
+}
 
-    fn update_user(&self, username: &str, body: crate::models::User) -> Result<(), Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+/// This can only be done by the logged in user.
+pub fn update_user(configuration: &configuration::Configuration, username: &str, body: crate::models::User) -> Result<(), Error<UpdateUserError>> {
 
-        let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
-        let mut req_builder = client.put(uri_str.as_str());
+    let client = &configuration.client;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
-        req_builder = req_builder.json(&body);
+    let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
+    let mut req_builder = client.put(uri_str.as_str());
 
-        let req = req_builder.build()?;
-        client.execute(req)?.error_for_status()?;
-        Ok(())
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
+    req_builder = req_builder.json(&body);
+
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
+
+    let status = resp.status();
+    let content = resp.text()?;
 
+    if status.is_success() {
+        Ok(())
+    } else {
+        let entity: Option<UpdateUserError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
+    }
 }
+
diff --git a/samples/client/petstore/rust/reqwest/petstore/tests/pet_tests.rs b/samples/client/petstore/rust/reqwest/petstore/tests/pet_tests.rs
index 61d26eae4490..9a1e00a70a26 100644
--- a/samples/client/petstore/rust/reqwest/petstore/tests/pet_tests.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/tests/pet_tests.rs
@@ -1,16 +1,12 @@
 extern crate petstore_reqwest;
-use petstore_reqwest::apis::PetApi;
-use petstore_reqwest::apis::PetApiClient;
+
+use petstore_reqwest::apis::pet_api::{add_pet, get_pet_by_id};
 use petstore_reqwest::apis::configuration;
-//use petstore_reqwest::apis::PetApiUpdatePetWithFormParams;
 use petstore_reqwest::models::{Pet};
-use std::option::Option;
-use std::rc::Rc;
 
 #[test]
 fn test_pet() {
     let config = configuration::Configuration::new();
-    let pet_api_client = PetApiClient::new(Rc::new(config));
 
     // create pet object
     let photo_urls = vec!["https://11".to_string(), "https://22".to_string()];
@@ -18,17 +14,33 @@ fn test_pet() {
     new_pet.id = Option::Some(8787);
 
     // add pet
-    let _add_result = pet_api_client.add_pet(new_pet);
+    let _add_result = add_pet(&config, new_pet);
 
     // get pet
-    let pet_result = pet_api_client.get_pet_by_id(8787);
+    let pet_result = get_pet_by_id(&config, 8787);
 
-    let _pet_result = match pet_result {
-        Ok(pet) => {
-            assert_eq!(pet.id, Option::Some(8787));
-            assert_eq!(pet.name, "Rust Pet");
-            assert_eq!(pet.photo_urls, vec!["https://11".to_string(), "https://22".to_string()]);
+    match pet_result {
+        Ok(resp) => {
+            /* Test code when multiple returns option is not set. */
+            assert_eq!(resp.id, Option::Some(8787));
+            assert_eq!(resp.name, "Rust Pet");
+            assert_eq!(resp.photo_urls, vec!["https://11".to_string(), "https://22".to_string()]);
+            /* Test code for multiple returns option.
+            match resp.entity {
+                Some(petstore_reqwest::apis::pet_api::GetPetByIdSuccess::Status200(pet)) => {
+                    assert_eq!(pet.id, Option::Some(8787));
+                    assert_eq!(pet.name, "Rust Pet");
+                    assert_eq!(pet.photo_urls, vec!["https://11".to_string(), "https://22".to_string()]);
+                },
+                _ => {
+                    panic!("Response should contain a pet entity");
+                },
+            };
+            */
+        },
+        Err(error) => {
+            println!("error: {:?}", error);
+            panic!("Query should succeed");
         },
-        Err(error) => println!("error: {:?}", error),
     };
 }
diff --git a/samples/client/petstore/rust/reqwest/rust-test/.openapi-generator/FILES b/samples/client/petstore/rust/reqwest/rust-test/.openapi-generator/FILES
index 1f6d4ae85718..419360c647bf 100644
--- a/samples/client/petstore/rust/reqwest/rust-test/.openapi-generator/FILES
+++ b/samples/client/petstore/rust/reqwest/rust-test/.openapi-generator/FILES
@@ -5,7 +5,6 @@ README.md
 docs/DefaultApi.md
 docs/TypeTesting.md
 git_push.sh
-src/apis/client.rs
 src/apis/configuration.rs
 src/apis/default_api.rs
 src/apis/mod.rs
diff --git a/samples/client/petstore/rust/reqwest/rust-test/src/apis/client.rs b/samples/client/petstore/rust/reqwest/rust-test/src/apis/client.rs
index 7566e9e84799..b10fef0b5548 100644
--- a/samples/client/petstore/rust/reqwest/rust-test/src/apis/client.rs
+++ b/samples/client/petstore/rust/reqwest/rust-test/src/apis/client.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use super::configuration::Configuration;
 
 pub struct APIClient {
-    default_api: Box<dyn crate::apis::DefaultApi>,
+    default_api: Box<dyn crate::apis::default_api::DefaultApi>,
 }
 
 impl APIClient {
@@ -11,11 +11,11 @@ impl APIClient {
         let rc = Rc::new(configuration);
 
         APIClient {
-            default_api: Box::new(crate::apis::DefaultApiClient::new(rc.clone())),
+            default_api: Box::new(crate::apis::default_api::DefaultApiClient::new(rc.clone())),
         }
     }
 
-    pub fn default_api(&self) -> &dyn crate::apis::DefaultApi{
+    pub fn default_api(&self) -> &dyn crate::apis::default_api::DefaultApi{
         self.default_api.as_ref()
     }
 
diff --git a/samples/client/petstore/rust/reqwest/rust-test/src/apis/default_api.rs b/samples/client/petstore/rust/reqwest/rust-test/src/apis/default_api.rs
index 1bb79873dae8..098078bea89e 100644
--- a/samples/client/petstore/rust/reqwest/rust-test/src/apis/default_api.rs
+++ b/samples/client/petstore/rust/reqwest/rust-test/src/apis/default_api.rs
@@ -8,47 +8,44 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[allow(unused_imports)]
-use std::rc::Rc;
-use std::borrow::Borrow;
-use std::option::Option;
 
 use reqwest;
 
+use crate::apis::ResponseContent;
 use super::{Error, configuration};
 
-pub struct DefaultApiClient {
-    configuration: Rc<configuration::Configuration>,
-}
 
-impl DefaultApiClient {
-    pub fn new(configuration: Rc<configuration::Configuration>) -> DefaultApiClient {
-        DefaultApiClient {
-            configuration,
-        }
-    }
+/// struct for typed errors of method `dummy_get`
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum DummyGetError {
+    UnknownValue(serde_json::Value),
 }
 
 
-pub trait DefaultApi {
-    fn dummy_get(&self, ) -> Result<(), Error>;
-}
+pub fn dummy_get(configuration: &configuration::Configuration, ) -> Result<(), Error<DummyGetError>> {
+
+    let client = &configuration.client;
 
-impl DefaultApi for DefaultApiClient {
-    fn dummy_get(&self, ) -> Result<(), Error> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+    let uri_str = format!("{}/dummy", configuration.base_path);
+    let mut req_builder = client.get(uri_str.as_str());
 
-        let uri_str = format!("{}/dummy", configuration.base_path);
-        let mut req_builder = client.get(uri_str.as_str());
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
+
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    let status = resp.status();
+    let content = resp.text()?;
 
-        let req = req_builder.build()?;
-        client.execute(req)?.error_for_status()?;
+    if status.is_success() {
         Ok(())
+    } else {
+        let entity: Option<DummyGetError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
-
 }
+
diff --git a/samples/client/petstore/rust/reqwest/rust-test/src/apis/mod.rs b/samples/client/petstore/rust/reqwest/rust-test/src/apis/mod.rs
index 77bd60c058a5..aeab00a7bc06 100644
--- a/samples/client/petstore/rust/reqwest/rust-test/src/apis/mod.rs
+++ b/samples/client/petstore/rust/reqwest/rust-test/src/apis/mod.rs
@@ -1,26 +1,34 @@
 use reqwest;
 use serde_json;
 
+#[derive(Debug, Clone)]
+pub struct ResponseContent<T> {
+    pub status: reqwest::StatusCode,
+    pub content: String,
+    pub entity: Option<T>,
+}
+
 #[derive(Debug)]
-pub enum Error {
+pub enum Error<T> {
     Reqwest(reqwest::Error),
     Serde(serde_json::Error),
     Io(std::io::Error),
+    ResponseError(ResponseContent<T>),
 }
 
-impl From<reqwest::Error> for Error {
+impl <T> From<reqwest::Error> for Error<T> {
     fn from(e: reqwest::Error) -> Self {
         Error::Reqwest(e)
     }
 }
 
-impl From<serde_json::Error> for Error {
+impl <T> From<serde_json::Error> for Error<T> {
     fn from(e: serde_json::Error) -> Self {
         Error::Serde(e)
     }
 }
 
-impl From<std::io::Error> for Error {
+impl <T> From<std::io::Error> for Error<T> {
     fn from(e: std::io::Error) -> Self {
         Error::Io(e)
     }
@@ -30,8 +38,6 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
-mod default_api;
-pub use self::default_api::{ DefaultApi, DefaultApiClient };
+pub mod default_api;
 
-pub mod client;
 pub mod configuration;
diff --git a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/UserApi.scala b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/UserApi.scala
index 54809067608d..83a7a46de65e 100644
--- a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/UserApi.scala
+++ b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/UserApi.scala
@@ -38,7 +38,7 @@ class UserApi(baseUrl: String) {
     ApiRequest[Unit](ApiMethods.POST, baseUrl, "/user", "application/json")
       .withApiKey(apiKey, "AUTH_KEY", COOKIE)
       .withBody(user)
-      .withDefaultSuccessResponse[Unit]
+      .withDefaultErrorResponse[Unit]
       
 
   /**
@@ -54,7 +54,7 @@ class UserApi(baseUrl: String) {
     ApiRequest[Unit](ApiMethods.POST, baseUrl, "/user/createWithArray", "application/json")
       .withApiKey(apiKey, "AUTH_KEY", COOKIE)
       .withBody(user)
-      .withDefaultSuccessResponse[Unit]
+      .withDefaultErrorResponse[Unit]
       
 
   /**
@@ -70,7 +70,7 @@ class UserApi(baseUrl: String) {
     ApiRequest[Unit](ApiMethods.POST, baseUrl, "/user/createWithList", "application/json")
       .withApiKey(apiKey, "AUTH_KEY", COOKIE)
       .withBody(user)
-      .withDefaultSuccessResponse[Unit]
+      .withDefaultErrorResponse[Unit]
       
 
   /**
@@ -144,7 +144,7 @@ class UserApi(baseUrl: String) {
   def logoutUser()(implicit apiKey: ApiKeyValue): ApiRequest[Unit] =
     ApiRequest[Unit](ApiMethods.GET, baseUrl, "/user/logout", "application/json")
       .withApiKey(apiKey, "AUTH_KEY", COOKIE)
-      .withDefaultSuccessResponse[Unit]
+      .withDefaultErrorResponse[Unit]
       
 
   /**
diff --git a/samples/client/petstore/scala-sttp/.openapi-generator/FILES b/samples/client/petstore/scala-sttp/.openapi-generator/FILES
index ffe27d280813..bf41f88a7b36 100644
--- a/samples/client/petstore/scala-sttp/.openapi-generator/FILES
+++ b/samples/client/petstore/scala-sttp/.openapi-generator/FILES
@@ -1,12 +1,11 @@
 README.md
 build.sbt
-src/main/scala/org/openapitools/client/api/EnumsSerializers.scala
+project/build.properties
 src/main/scala/org/openapitools/client/api/PetApi.scala
 src/main/scala/org/openapitools/client/api/StoreApi.scala
 src/main/scala/org/openapitools/client/api/UserApi.scala
-src/main/scala/org/openapitools/client/core/ApiInvoker.scala
-src/main/scala/org/openapitools/client/core/Serializers.scala
-src/main/scala/org/openapitools/client/core/requests.scala
+src/main/scala/org/openapitools/client/core/DateSerializers.scala
+src/main/scala/org/openapitools/client/core/JsonSupport.scala
 src/main/scala/org/openapitools/client/model/ApiResponse.scala
 src/main/scala/org/openapitools/client/model/Category.scala
 src/main/scala/org/openapitools/client/model/InlineObject.scala
diff --git a/samples/client/petstore/scala-sttp/build.sbt b/samples/client/petstore/scala-sttp/build.sbt
index b940c8b67373..e7d77cdd2dba 100644
--- a/samples/client/petstore/scala-sttp/build.sbt
+++ b/samples/client/petstore/scala-sttp/build.sbt
@@ -2,17 +2,13 @@ version := "1.0.0"
 name := "scala-sttp-petstore"
 organization := "org.openapitools"
 
-scalaVersion := "2.13.0"
-
-crossScalaVersions := Seq(scalaVersion.value, "2.12.10",  "2.11.12")
+scalaVersion := "2.13.2"
+crossScalaVersions := Seq(scalaVersion.value, "2.12.10")
 
 libraryDependencies ++= Seq(
-  "com.softwaremill.sttp.client" %% "core" % "2.0.0",
-  "com.softwaremill.sttp.client" %% "json4s" % "2.0.0",
-  "org.json4s" %% "json4s-jackson" % "3.6.7",
-  // test dependencies
-  "org.scalatest" %% "scalatest" % "3.0.8" % Test,
-  "junit" % "junit" % "4.13" % "test"
+  "com.softwaremill.sttp.client" %% "core" % "2.2.0",
+  "com.softwaremill.sttp.client" %% "json4s" % "2.2.0",
+  "org.json4s" %% "json4s-jackson" % "3.6.8"
 )
 
 scalacOptions := Seq(
@@ -20,5 +16,3 @@ scalacOptions := Seq(
   "-deprecation",
   "-feature"
 )
-
-publishArtifact in (Compile, packageDoc) := false
\ No newline at end of file
diff --git a/samples/client/petstore/scala-sttp/project/build.properties b/samples/client/petstore/scala-sttp/project/build.properties
new file mode 100644
index 000000000000..654fe70c42c7
--- /dev/null
+++ b/samples/client/petstore/scala-sttp/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.3.12
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/EnumsSerializers.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/EnumsSerializers.scala
deleted file mode 100644
index 71ad618e31fb..000000000000
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/EnumsSerializers.scala
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-package org.openapitools.client.api
-
-import org.openapitools.client.model._
-import org.json4s._
-import scala.reflect.ClassTag
-
-object EnumsSerializers {
-
-  def all: Seq[Serializer[_]] = Seq[Serializer[_]]() :+
-    new EnumNameSerializer(OrderEnums.Status) :+
-    new EnumNameSerializer(PetEnums.Status)
-
-  private class EnumNameSerializer[E <: Enumeration: ClassTag](enum: E)
-    extends Serializer[E#Value] {
-    import JsonDSL._
-
-    val EnumerationClass: Class[E#Value] = classOf[E#Value]
-
-    def deserialize(implicit format: Formats):
-    PartialFunction[(TypeInfo, JValue), E#Value] = {
-      case (t @ TypeInfo(EnumerationClass, _), json) if isValid(json) =>
-        json match {
-          case JString(value) =>
-            enum.withName(value)
-          case value =>
-            throw new MappingException(s"Can't convert $value to $EnumerationClass")
-        }
-    }
-
-    private[this] def isValid(json: JValue) = json match {
-      case JString(value) if enum.values.exists(_.toString == value) => true
-      case _ => false
-    }
-
-    def serialize(implicit format: Formats): PartialFunction[Any, JValue] = {
-      case i: E#Value => i.toString
-    }
-  }
-
-}
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala
index 5211d09c9c5c..034cceb63cc7 100644
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala
@@ -14,20 +14,16 @@ package org.openapitools.client.api
 import org.openapitools.client.model.ApiResponse
 import java.io.File
 import org.openapitools.client.model.Pet
-import org.openapitools.client.core._
-import alias._
+import org.openapitools.client.core.JsonSupport._
 import sttp.client._
 import sttp.model.Method
 
 object PetApi {
 
-  def apply(baseUrl: String = "http://petstore.swagger.io/v2")(implicit serializer: SttpSerializer) = new PetApi(baseUrl)
+def apply(baseUrl: String = "http://petstore.swagger.io/v2") = new PetApi(baseUrl)
 }
 
-class PetApi(baseUrl: String)(implicit serializer: SttpSerializer) {
-
-  import Helpers._
-  import serializer._
+class PetApi(baseUrl: String) {
 
   /**
    * Expected answers:
@@ -36,7 +32,8 @@ class PetApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * 
    * @param pet Pet object that needs to be added to the store
    */
-  def addPet(pet: Pet): ApiRequestT[Pet] =
+  def addPet(pet: Pet
+): Request[Either[ResponseError[Exception], Pet], Nothing] =
     basicRequest
       .method(Method.POST, uri"$baseUrl/pet")
       .contentType("application/json")
@@ -50,7 +47,8 @@ class PetApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * @param petId Pet id to delete
    * @param apiKey 
    */
-  def deletePet(petId: Long, apiKey: Option[String] = None): ApiRequestT[Unit] =
+  def deletePet(petId: Long, apiKey: Option[String] = None
+): Request[Either[ResponseError[Exception], Unit], Nothing] =
     basicRequest
       .method(Method.DELETE, uri"$baseUrl/pet/${petId}")
       .contentType("application/json")
@@ -66,7 +64,8 @@ class PetApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * 
    * @param status Status values that need to be considered for filter
    */
-  def findPetsByStatus(status: Seq[String]): ApiRequestT[Seq[Pet]] =
+  def findPetsByStatus(status: Seq[String]
+): Request[Either[ResponseError[Exception], Seq[Pet]], Nothing] =
     basicRequest
       .method(Method.GET, uri"$baseUrl/pet/findByStatus?status=$status")
       .contentType("application/json")
@@ -81,7 +80,8 @@ class PetApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * 
    * @param tags Tags to filter by
    */
-  def findPetsByTags(tags: Seq[String]): ApiRequestT[Seq[Pet]] =
+  def findPetsByTags(tags: Seq[String]
+): Request[Either[ResponseError[Exception], Seq[Pet]], Nothing] =
     basicRequest
       .method(Method.GET, uri"$baseUrl/pet/findByTags?tags=$tags")
       .contentType("application/json")
@@ -100,11 +100,12 @@ class PetApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * 
    * @param petId ID of pet to return
    */
-  def getPetById(petId: Long)(implicit apiKey: ApiKeyValue): ApiRequestT[Pet] =
+  def getPetById(apiKey: String)(petId: Long
+): Request[Either[ResponseError[Exception], Pet], Nothing] =
     basicRequest
       .method(Method.GET, uri"$baseUrl/pet/${petId}")
       .contentType("application/json")
-      .header("api_key", apiKey.value)
+      .header("api_key", apiKey)
       .response(asJson[Pet])
 
   /**
@@ -116,7 +117,8 @@ class PetApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * 
    * @param pet Pet object that needs to be added to the store
    */
-  def updatePet(pet: Pet): ApiRequestT[Pet] =
+  def updatePet(pet: Pet
+): Request[Either[ResponseError[Exception], Pet], Nothing] =
     basicRequest
       .method(Method.PUT, uri"$baseUrl/pet")
       .contentType("application/json")
@@ -131,13 +133,14 @@ class PetApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * @param name Updated name of the pet
    * @param status Updated status of the pet
    */
-  def updatePetWithForm(petId: Long, name: Option[String] = None, status: Option[String] = None): ApiRequestT[Unit] =
+  def updatePetWithForm(petId: Long, name: Option[String] = None, status: Option[String] = None
+): Request[Either[ResponseError[Exception], Unit], Nothing] =
     basicRequest
       .method(Method.POST, uri"$baseUrl/pet/${petId}")
       .contentType("application/x-www-form-urlencoded")
       .body(Map(
-        "name" -> name,
-        "status" -> status,
+        "name" -> name, 
+        "status" -> status
       ))
       .response(asJson[Unit])
 
@@ -149,15 +152,17 @@ class PetApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * @param additionalMetadata Additional data to pass to server
    * @param file file to upload
    */
-  def uploadFile(petId: Long, additionalMetadata: Option[String] = None, file: Option[File] = None): ApiRequestT[ApiResponse] =
+  def uploadFile(petId: Long, additionalMetadata: Option[String] = None, file: Option[File] = None
+): Request[Either[ResponseError[Exception], ApiResponse], Nothing] =
     basicRequest
       .method(Method.POST, uri"$baseUrl/pet/${petId}/uploadImage")
       .contentType("multipart/form-data")
-      .body(Map(
-        "additionalMetadata" -> additionalMetadata,
-        "file" -> file,
-      ))
+      .multipartBody(Seq(
+                additionalMetadata.map(multipart("additionalMetadata", _))
+, 
+                file.map(multipartFile("file", _))
+
+      ).flatten)
       .response(asJson[ApiResponse])
 
 }
-
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/StoreApi.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/StoreApi.scala
index 907cc9f42f0f..e6ffcaae6297 100644
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/StoreApi.scala
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/StoreApi.scala
@@ -12,20 +12,16 @@
 package org.openapitools.client.api
 
 import org.openapitools.client.model.Order
-import org.openapitools.client.core._
-import alias._
+import org.openapitools.client.core.JsonSupport._
 import sttp.client._
 import sttp.model.Method
 
 object StoreApi {
 
-  def apply(baseUrl: String = "http://petstore.swagger.io/v2")(implicit serializer: SttpSerializer) = new StoreApi(baseUrl)
+def apply(baseUrl: String = "http://petstore.swagger.io/v2") = new StoreApi(baseUrl)
 }
 
-class StoreApi(baseUrl: String)(implicit serializer: SttpSerializer) {
-
-  import Helpers._
-  import serializer._
+class StoreApi(baseUrl: String) {
 
   /**
    * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -36,7 +32,8 @@ class StoreApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * 
    * @param orderId ID of the order that needs to be deleted
    */
-  def deleteOrder(orderId: String): ApiRequestT[Unit] =
+  def deleteOrder(orderId: String
+): Request[Either[ResponseError[Exception], Unit], Nothing] =
     basicRequest
       .method(Method.DELETE, uri"$baseUrl/store/order/${orderId}")
       .contentType("application/json")
@@ -51,11 +48,12 @@ class StoreApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * Available security schemes:
    *   api_key (apiKey)
    */
-  def getInventory()(implicit apiKey: ApiKeyValue): ApiRequestT[Map[String, Int]] =
+  def getInventory(apiKey: String)(
+): Request[Either[ResponseError[Exception], Map[String, Int]], Nothing] =
     basicRequest
       .method(Method.GET, uri"$baseUrl/store/inventory")
       .contentType("application/json")
-      .header("api_key", apiKey.value)
+      .header("api_key", apiKey)
       .response(asJson[Map[String, Int]])
 
   /**
@@ -68,7 +66,8 @@ class StoreApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * 
    * @param orderId ID of pet that needs to be fetched
    */
-  def getOrderById(orderId: Long): ApiRequestT[Order] =
+  def getOrderById(orderId: Long
+): Request[Either[ResponseError[Exception], Order], Nothing] =
     basicRequest
       .method(Method.GET, uri"$baseUrl/store/order/${orderId}")
       .contentType("application/json")
@@ -81,7 +80,8 @@ class StoreApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * 
    * @param order order placed for purchasing the pet
    */
-  def placeOrder(order: Order): ApiRequestT[Order] =
+  def placeOrder(order: Order
+): Request[Either[ResponseError[Exception], Order], Nothing] =
     basicRequest
       .method(Method.POST, uri"$baseUrl/store/order")
       .contentType("application/json")
@@ -89,4 +89,3 @@ class StoreApi(baseUrl: String)(implicit serializer: SttpSerializer) {
       .response(asJson[Order])
 
 }
-
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/UserApi.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/UserApi.scala
index 34679dea5d7a..fd3b82392b89 100644
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/UserApi.scala
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/UserApi.scala
@@ -12,20 +12,16 @@
 package org.openapitools.client.api
 
 import org.openapitools.client.model.User
-import org.openapitools.client.core._
-import alias._
+import org.openapitools.client.core.JsonSupport._
 import sttp.client._
 import sttp.model.Method
 
 object UserApi {
 
-  def apply(baseUrl: String = "http://petstore.swagger.io/v2")(implicit serializer: SttpSerializer) = new UserApi(baseUrl)
+def apply(baseUrl: String = "http://petstore.swagger.io/v2") = new UserApi(baseUrl)
 }
 
-class UserApi(baseUrl: String)(implicit serializer: SttpSerializer) {
-
-  import Helpers._
-  import serializer._
+class UserApi(baseUrl: String) {
 
   /**
    * This can only be done by the logged in user.
@@ -38,11 +34,12 @@ class UserApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * 
    * @param user Created user object
    */
-  def createUser(user: User)(implicit apiKey: ApiKeyValue): ApiRequestT[Unit] =
+  def createUser(apiKey: String)(user: User
+): Request[Either[ResponseError[Exception], Unit], Nothing] =
     basicRequest
       .method(Method.POST, uri"$baseUrl/user")
       .contentType("application/json")
-      .header("api_key", apiKey.value)
+      .header("api_key", apiKey)
       .body(user)
       .response(asJson[Unit])
 
@@ -55,11 +52,12 @@ class UserApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * 
    * @param user List of user object
    */
-  def createUsersWithArrayInput(user: Seq[User])(implicit apiKey: ApiKeyValue): ApiRequestT[Unit] =
+  def createUsersWithArrayInput(apiKey: String)(user: Seq[User]
+): Request[Either[ResponseError[Exception], Unit], Nothing] =
     basicRequest
       .method(Method.POST, uri"$baseUrl/user/createWithArray")
       .contentType("application/json")
-      .header("api_key", apiKey.value)
+      .header("api_key", apiKey)
       .body(user)
       .response(asJson[Unit])
 
@@ -72,11 +70,12 @@ class UserApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * 
    * @param user List of user object
    */
-  def createUsersWithListInput(user: Seq[User])(implicit apiKey: ApiKeyValue): ApiRequestT[Unit] =
+  def createUsersWithListInput(apiKey: String)(user: Seq[User]
+): Request[Either[ResponseError[Exception], Unit], Nothing] =
     basicRequest
       .method(Method.POST, uri"$baseUrl/user/createWithList")
       .contentType("application/json")
-      .header("api_key", apiKey.value)
+      .header("api_key", apiKey)
       .body(user)
       .response(asJson[Unit])
 
@@ -92,11 +91,12 @@ class UserApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * 
    * @param username The name that needs to be deleted
    */
-  def deleteUser(username: String)(implicit apiKey: ApiKeyValue): ApiRequestT[Unit] =
+  def deleteUser(apiKey: String)(username: String
+): Request[Either[ResponseError[Exception], Unit], Nothing] =
     basicRequest
       .method(Method.DELETE, uri"$baseUrl/user/${username}")
       .contentType("application/json")
-      .header("api_key", apiKey.value)
+      .header("api_key", apiKey)
       .response(asJson[Unit])
 
   /**
@@ -107,7 +107,8 @@ class UserApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * 
    * @param username The name that needs to be fetched. Use user1 for testing.
    */
-  def getUserByName(username: String): ApiRequestT[User] =
+  def getUserByName(username: String
+): Request[Either[ResponseError[Exception], User], Nothing] =
     basicRequest
       .method(Method.GET, uri"$baseUrl/user/${username}")
       .contentType("application/json")
@@ -125,7 +126,8 @@ class UserApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * @param username The user name for login
    * @param password The password for login in clear text
    */
-  def loginUser(username: String, password: String): ApiRequestT[String] =
+  def loginUser(username: String, password: String
+): Request[Either[ResponseError[Exception], String], Nothing] =
     basicRequest
       .method(Method.GET, uri"$baseUrl/user/login?username=$username&password=$password")
       .contentType("application/json")
@@ -138,11 +140,12 @@ class UserApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * Available security schemes:
    *   api_key (apiKey)
    */
-  def logoutUser()(implicit apiKey: ApiKeyValue): ApiRequestT[Unit] =
+  def logoutUser(apiKey: String)(
+): Request[Either[ResponseError[Exception], Unit], Nothing] =
     basicRequest
       .method(Method.GET, uri"$baseUrl/user/logout")
       .contentType("application/json")
-      .header("api_key", apiKey.value)
+      .header("api_key", apiKey)
       .response(asJson[Unit])
 
   /**
@@ -158,13 +161,13 @@ class UserApi(baseUrl: String)(implicit serializer: SttpSerializer) {
    * @param username name that need to be deleted
    * @param user Updated user object
    */
-  def updateUser(username: String, user: User)(implicit apiKey: ApiKeyValue): ApiRequestT[Unit] =
+  def updateUser(apiKey: String)(username: String, user: User
+): Request[Either[ResponseError[Exception], Unit], Nothing] =
     basicRequest
       .method(Method.PUT, uri"$baseUrl/user/${username}")
       .contentType("application/json")
-      .header("api_key", apiKey.value)
+      .header("api_key", apiKey)
       .body(user)
       .response(asJson[Unit])
 
 }
-
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/ApiInvoker.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/ApiInvoker.scala
deleted file mode 100644
index dc98ff4d1365..000000000000
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/ApiInvoker.scala
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-package org.openapitools.client.core
-
-import org.json4s._
-import sttp.client._
-import sttp.model.StatusCode
-import org.openapitools.client.api.EnumsSerializers
-import sttp.client.json4s.SttpJson4sApi
-import sttp.client.monad.MonadError
-
-class SttpSerializer(implicit val format: Formats = DefaultFormats ++ EnumsSerializers.all ++ Serializers.all,
-                     implicit val serialization: org.json4s.Serialization = org.json4s.jackson.Serialization) extends SttpJson4sApi
-
-class HttpException(val statusCode: StatusCode, val statusText: String, val message: String) extends Exception(s"[$statusCode] $statusText: $message")
-
-object Helpers {
-
-  // Helper to handle Optional header parameters
-  implicit class optionalParams(val request: RequestT[Identity, Either[String, String], Nothing]) extends AnyVal {
-    def header( header: String, optValue: Option[Any]): RequestT[Identity, Either[String, String], Nothing] = {
-      optValue.map( value => request.header(header, value.toString)).getOrElse(request)
-    }
-  }
-
-}
-
-object ApiInvoker {
-
-  /**
-    * Allows request execution without calling apiInvoker.execute(request)
-    * request.result can be used to get a monad wrapped content.
-    *
-    * @param request the apiRequest to be executed
-    */
-  implicit class ApiRequestImprovements[R[_], T](request: RequestT[Identity, Either[ResponseError[Exception], T], Nothing]) {
-
-    def result(implicit backend: SttpBackend[R, Nothing, Nothing]): R[T] = {
-      val responseT = request.send()
-      val ME: MonadError[R] = backend.responseMonad
-      ME.flatMap(responseT) {
-        response =>
-          response.body match {
-            case Left(ex) => ME.error[T](new HttpException(response.code, response.statusText, ex.body))
-            case Right(value) => ME.unit(value)
-          }
-      }
-    }
-  }
-
-}
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/DateSerializers.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/DateSerializers.scala
new file mode 100644
index 000000000000..cb2d1d2aa431
--- /dev/null
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/DateSerializers.scala
@@ -0,0 +1,29 @@
+package org.openapitools.client.core
+
+import java.time.{LocalDate, LocalDateTime, OffsetDateTime, ZoneId}
+import java.time.format.DateTimeFormatter
+import scala.util.Try
+
+object DateSerializers {
+    import org.json4s.{Serializer, CustomSerializer, JNull}
+    import org.json4s.JsonAST.JString
+      case object DateTimeSerializer extends CustomSerializer[OffsetDateTime](_ => ( {
+        case JString(s) =>
+          Try(OffsetDateTime.parse(s, DateTimeFormatter.ISO_OFFSET_DATE_TIME)) orElse
+            Try(LocalDateTime.parse(s).atZone(ZoneId.systemDefault()).toOffsetDateTime) getOrElse (null)
+        case JNull => null
+      }, {
+        case d: OffsetDateTime =>
+          JString(d.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME))
+      }))
+
+      case object LocalDateSerializer extends CustomSerializer[LocalDate]( _ => ( {
+        case JString(s) => LocalDate.parse(s)
+        case JNull => null
+      }, {
+        case d: LocalDate =>
+         JString(d.format(DateTimeFormatter.ISO_LOCAL_DATE))
+      }))
+
+  def all: Seq[Serializer[_]] = Seq[Serializer[_]]() :+ LocalDateSerializer :+ DateTimeSerializer
+}
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/JsonSupport.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/JsonSupport.scala
new file mode 100644
index 000000000000..51896325c2ab
--- /dev/null
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/JsonSupport.scala
@@ -0,0 +1,48 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+package org.openapitools.client.core
+
+import org.openapitools.client.model._
+import org.json4s._
+import sttp.client.json4s.SttpJson4sApi
+import scala.reflect.ClassTag
+
+object JsonSupport extends SttpJson4sApi {
+  def enumSerializers: Seq[Serializer[_]] = Seq[Serializer[_]]() :+
+    new EnumNameSerializer(OrderEnums.Status) :+
+    new EnumNameSerializer(PetEnums.Status)
+
+  private class EnumNameSerializer[E <: Enumeration: ClassTag](enum: E) extends Serializer[E#Value] {
+    import JsonDSL._
+    val EnumerationClass: Class[E#Value] = classOf[E#Value]
+
+    def deserialize(implicit format: Formats): PartialFunction[(TypeInfo, JValue), E#Value] = {
+      case (t @ TypeInfo(EnumerationClass, _), json) if isValid(json) =>
+        json match {
+          case JString(value) => enum.withName(value)
+          case value => throw new MappingException(s"Can't convert $value to $EnumerationClass")
+        }
+    }
+
+    private[this] def isValid(json: JValue) = json match {
+      case JString(value) if enum.values.exists(_.toString == value) => true
+      case _ => false
+    }
+
+    def serialize(implicit format: Formats): PartialFunction[Any, JValue] = {
+      case i: E#Value => i.toString
+      }
+    }
+
+  implicit val format: Formats = DefaultFormats ++ enumSerializers ++ DateSerializers.all
+  implicit val serialization: org.json4s.Serialization = org.json4s.jackson.Serialization
+}
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/Serializers.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/Serializers.scala
deleted file mode 100644
index dbd13545c738..000000000000
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/Serializers.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.openapitools.client.core
-
-import java.time.{LocalDate, LocalDateTime, OffsetDateTime, ZoneId}
-import java.time.format.DateTimeFormatter
-import scala.util.Try
-import org.json4s.{Serializer, CustomSerializer, JNull}
-import org.json4s.JsonAST.JString
-
-object Serializers {
-
-  case object DateTimeSerializer extends CustomSerializer[OffsetDateTime](_ => ( {
-    case JString(s) =>
-      Try(OffsetDateTime.parse(s, DateTimeFormatter.ISO_OFFSET_DATE_TIME)) orElse
-        Try(LocalDateTime.parse(s).atZone(ZoneId.systemDefault()).toOffsetDateTime) getOrElse (null)
-    case JNull => null
-  }, {
-    case d: OffsetDateTime =>
-      JString(d.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME))
-  }))
-
-  case object LocalDateSerializer extends CustomSerializer[LocalDate]( _ => ( {
-    case JString(s) => LocalDate.parse(s)
-    case JNull => null
-  }, {
-    case d: LocalDate =>
-     JString(d.format(DateTimeFormatter.ISO_LOCAL_DATE))
-  }))
-
-  def all: Seq[Serializer[_]] = Seq[Serializer[_]]() :+ LocalDateSerializer :+ DateTimeSerializer
-
-}
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/credentials.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/credentials.scala
new file mode 100644
index 000000000000..97d9ddcec81a
--- /dev/null
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/credentials.scala
@@ -0,0 +1,18 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+package org.openapitools.client.core
+
+final case class BasicCredentials(user: String, password: String)
+
+final case class BearerToken(token: String)
+
+final case class ApiKeyValue(value: String)
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/requests.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/requests.scala
deleted file mode 100644
index 1f45be8103e1..000000000000
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/core/requests.scala
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-package org.openapitools.client.core
-
-import sttp.client.{Identity, RequestT, ResponseError}
-
-/**
- * This trait needs to be added to any model defined by the api.
- */
-trait ApiModel
-
-/**
- * Sttp type aliases
- */
-object alias {
-  type ApiRequestT[T] = RequestT[Identity, Either[ResponseError[Exception], T], Nothing]
-}
-
-/**
- * Single trait defining a credential that can be transformed to a paramName / paramValue tupple
- */
-sealed trait Credentials {
-  def asQueryParam: Option[(String, String)] = None
-}
-
-sealed case class BasicCredentials(user: String, password: String) extends Credentials
-
-sealed case class BearerToken(token: String) extends Credentials
-
-sealed case class ApiKeyCredentials(key: ApiKeyValue, keyName: String, location: ApiKeyLocation) extends Credentials {
-  override def asQueryParam: Option[(String, String)] = location match {
-    case ApiKeyLocations.QUERY => Some((keyName, key.value))
-    case _ => None
-  }
-}
-
-sealed case class ApiKeyValue(value: String)
-
-sealed trait ApiKeyLocation
-
-object ApiKeyLocations {
-
-  case object QUERY extends ApiKeyLocation
-
-  case object HEADER extends ApiKeyLocation
-
-  case object COOKIE extends ApiKeyLocation
-
-}
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/ApiResponse.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/ApiResponse.scala
index 3a3b6d6f499a..aaaeae4c340c 100644
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/ApiResponse.scala
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/ApiResponse.scala
@@ -11,7 +11,6 @@
  */
 package org.openapitools.client.model
 
-import org.openapitools.client.core.ApiModel
 
   /**
    * An uploaded response
@@ -21,6 +20,6 @@ case class ApiResponse(
   code: Option[Int] = None,
   `type`: Option[String] = None,
   message: Option[String] = None
-) extends ApiModel
+)
 
 
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Category.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Category.scala
index 011164617cfb..81d132f226e7 100644
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Category.scala
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Category.scala
@@ -11,7 +11,6 @@
  */
 package org.openapitools.client.model
 
-import org.openapitools.client.core.ApiModel
 
   /**
    * Pet category
@@ -20,6 +19,6 @@ import org.openapitools.client.core.ApiModel
 case class Category(
   id: Option[Long] = None,
   name: Option[String] = None
-) extends ApiModel
+)
 
 
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/InlineObject.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/InlineObject.scala
index a8c5493161a1..bf97d86b279a 100644
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/InlineObject.scala
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/InlineObject.scala
@@ -11,13 +11,12 @@
  */
 package org.openapitools.client.model
 
-import org.openapitools.client.core.ApiModel
 
 case class InlineObject(
   /* Updated name of the pet */
   name: Option[String] = None,
   /* Updated status of the pet */
   status: Option[String] = None
-) extends ApiModel
+)
 
 
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/InlineObject1.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/InlineObject1.scala
index 480cf8c2e10a..73014a0bfdee 100644
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/InlineObject1.scala
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/InlineObject1.scala
@@ -12,13 +12,12 @@
 package org.openapitools.client.model
 
 import java.io.File
-import org.openapitools.client.core.ApiModel
 
 case class InlineObject1(
   /* Additional data to pass to server */
   additionalMetadata: Option[String] = None,
   /* file to upload */
   file: Option[File] = None
-) extends ApiModel
+)
 
 
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Order.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Order.scala
index baa0c0cb14a6..222b0564f544 100644
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Order.scala
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Order.scala
@@ -12,7 +12,6 @@
 package org.openapitools.client.model
 
 import java.time.OffsetDateTime
-import org.openapitools.client.core.ApiModel
 
   /**
    * Pet Order
@@ -26,7 +25,7 @@ case class Order(
   /* Order Status */
   status: Option[OrderEnums.Status] = None,
   complete: Option[Boolean] = None
-) extends ApiModel
+)
 
 object OrderEnums {
 
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Pet.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Pet.scala
index 75b528c3c0a1..0e48ba900d85 100644
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Pet.scala
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Pet.scala
@@ -11,7 +11,6 @@
  */
 package org.openapitools.client.model
 
-import org.openapitools.client.core.ApiModel
 
   /**
    * a Pet
@@ -25,7 +24,7 @@ case class Pet(
   tags: Option[Seq[Tag]] = None,
   /* pet status in the store */
   status: Option[PetEnums.Status] = None
-) extends ApiModel
+)
 
 object PetEnums {
 
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Tag.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Tag.scala
index 299ee5161a8b..d1ce00a9a84b 100644
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Tag.scala
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/Tag.scala
@@ -11,7 +11,6 @@
  */
 package org.openapitools.client.model
 
-import org.openapitools.client.core.ApiModel
 
   /**
    * Pet Tag
@@ -20,6 +19,6 @@ import org.openapitools.client.core.ApiModel
 case class Tag(
   id: Option[Long] = None,
   name: Option[String] = None
-) extends ApiModel
+)
 
 
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/User.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/User.scala
index bd2e6c3ba2a7..729b4bcc658c 100644
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/User.scala
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/model/User.scala
@@ -11,7 +11,6 @@
  */
 package org.openapitools.client.model
 
-import org.openapitools.client.core.ApiModel
 
   /**
    * a User
@@ -27,6 +26,6 @@ case class User(
   phone: Option[String] = None,
   /* User Status */
   userStatus: Option[Int] = None
-) extends ApiModel
+)
 
 
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
index c72b43a77426..eaf6262dc65c 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "Pet", description = "the Pet API")
 public interface PetApi {
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
index 0170cba2547b..2a6251140f4d 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
@@ -29,7 +29,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "Store", description = "the Store API")
 public interface StoreApi {
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java
index 639c2a987f26..fd4e234fb833 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java
@@ -29,7 +29,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "User", description = "the User API")
 public interface UserApi {
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
index b1ad95d3952b..6085b8abaea1 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
@@ -13,7 +13,7 @@
  * A category for a pet
  */
 @ApiModel(description = "A category for a pet")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
index cc9dc2341c6d..91ccb7a53215 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -13,7 +13,7 @@
  * Describes the result of uploading an image resource
  */
 @ApiModel(description = "Describes the result of uploading an image resource")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
index 7579caa6a3e4..dce9d64c17ac 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
@@ -15,7 +15,7 @@
  * An order for a pets from the pet store
  */
 @ApiModel(description = "An order for a pets from the pet store")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
index d14c54e6abac..5d01844092e4 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
@@ -18,7 +18,7 @@
  * A pet for sale in the pet store
  */
 @ApiModel(description = "A pet for sale in the pet store")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
index 8eb2e846891a..c78df75e2dfe 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
@@ -13,7 +13,7 @@
  * A tag for a pet
  */
 @ApiModel(description = "A tag for a pet")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
index 95d92cd2ecbf..53046e4d20fa 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
@@ -13,7 +13,7 @@
  * A User who is purchasing from the pet store
  */
 @ApiModel(description = "A User who is purchasing from the pet store")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
index 7992b968751e..7bc16f34a3b4 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "Pet", description = "the Pet API")
 public interface PetApi {
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
index 7857637ad574..75e8d381d799 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "Store", description = "the Store API")
 public interface StoreApi {
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
index 2a18d576d865..730f10645116 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "User", description = "the User API")
 public interface UserApi {
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
index b1ad95d3952b..6085b8abaea1 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
@@ -13,7 +13,7 @@
  * A category for a pet
  */
 @ApiModel(description = "A category for a pet")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
index cc9dc2341c6d..91ccb7a53215 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -13,7 +13,7 @@
  * Describes the result of uploading an image resource
  */
 @ApiModel(description = "Describes the result of uploading an image resource")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
index 7579caa6a3e4..dce9d64c17ac 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
@@ -15,7 +15,7 @@
  * An order for a pets from the pet store
  */
 @ApiModel(description = "An order for a pets from the pet store")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
index d14c54e6abac..5d01844092e4 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
@@ -18,7 +18,7 @@
  * A pet for sale in the pet store
  */
 @ApiModel(description = "A pet for sale in the pet store")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
index 8eb2e846891a..c78df75e2dfe 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
@@ -13,7 +13,7 @@
  * A tag for a pet
  */
 @ApiModel(description = "A tag for a pet")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
index 95d92cd2ecbf..53046e4d20fa 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
@@ -13,7 +13,7 @@
  * A User who is purchasing from the pet store
  */
 @ApiModel(description = "A User who is purchasing from the pet store")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
index 042661cce5e2..9ebeb1a6fca2 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
index 3d12e64586c1..e47b3272c439 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
index 184f74ac3b9f..f7fcd5c1fbcb 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "user", description = "the user API")
 public interface UserApi {
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
index b1ad95d3952b..6085b8abaea1 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
@@ -13,7 +13,7 @@
  * A category for a pet
  */
 @ApiModel(description = "A category for a pet")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
index cc9dc2341c6d..91ccb7a53215 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -13,7 +13,7 @@
  * Describes the result of uploading an image resource
  */
 @ApiModel(description = "Describes the result of uploading an image resource")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
index 7579caa6a3e4..dce9d64c17ac 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
@@ -15,7 +15,7 @@
  * An order for a pets from the pet store
  */
 @ApiModel(description = "An order for a pets from the pet store")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
index d14c54e6abac..5d01844092e4 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
@@ -18,7 +18,7 @@
  * A pet for sale in the pet store
  */
 @ApiModel(description = "A pet for sale in the pet store")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
index 8eb2e846891a..c78df75e2dfe 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
@@ -13,7 +13,7 @@
  * A tag for a pet
  */
 @ApiModel(description = "A tag for a pet")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
index 95d92cd2ecbf..53046e4d20fa 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
@@ -13,7 +13,7 @@
  * A User who is purchasing from the pet store
  */
 @ApiModel(description = "A User who is purchasing from the pet store")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/client/petstore/swift5/alamofireLibrary/Package.swift b/samples/client/petstore/swift5/alamofireLibrary/Package.swift
index 6e820c6971b0..9371b3d57bd4 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/Package.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/Package.swift
@@ -14,19 +14,19 @@ let package = Package(
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "PetstoreClient",
-            targets: ["PetstoreClient"]),
+            targets: ["PetstoreClient"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/Alamofire/Alamofire.git", from: "4.9.1"),
+        .package(url: "https://github.com/Alamofire/Alamofire.git", from: "4.9.1")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "PetstoreClient",
-            dependencies: ["Alamofire", ],
+            dependencies: ["Alamofire" ],
             path: "PetstoreClient/Classes"
-        ),
+        )
     ]
 )
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 2404bc8ffc6d..5b09f9557113 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+            if let collection = item.value as? [Any?] {
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -46,15 +46,15 @@ public struct APIHelper {
     }
 
     public static func mapValueToPathItem(_ source: Any) -> Any {
-        if let collection = source as? Array<Any?> {
+        if let collection = source as? [Any?] {
             return collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
         }
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
+            if let collection = item.value as? [Any?] {
                 collection.filter({ $0 != nil }).map({"\($0!)"}).forEach { value in
                     result.append(URLQueryItem(name: item.key, value: value))
                 }
@@ -69,4 +69,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
index 69e723d482f5..224d1fc911b6 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,23 +9,23 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
     public static var apiResponseQueue: DispatchQueue = .main
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
 
     /// Optional block to obtain a reference to the request's progress instance when available.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -35,7 +35,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -58,5 +58,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index bb3ae7178254..5bbf323f820c 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
@@ -17,7 +15,7 @@ open class AnotherFakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         call123testSpecialTagsWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index d1d81faa335c..134d6aea416a 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class FakeAPI {
     /**
 
@@ -16,7 +14,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?,_ error: Error?) -> Void)) {
+    open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) {
         fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -51,7 +49,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
+    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) {
         fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -86,7 +84,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?,_ error: Error?) -> Void)) {
+    open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) {
         fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -121,7 +119,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -156,7 +154,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -192,7 +190,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -231,7 +229,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -281,7 +279,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -318,7 +316,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -337,7 +335,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -426,7 +424,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -454,19 +452,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray?.encodeToJSON(),
             "enum_form_string": enumFormString?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(), 
-            "enum_query_string": enumQueryString?.encodeToJSON(), 
-            "enum_query_integer": enumQueryInteger?.encodeToJSON(), 
+            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(),
+            "enum_query_string": enumQueryString?.encodeToJSON(),
+            "enum_query_integer": enumQueryInteger?.encodeToJSON(),
             "enum_query_double": enumQueryDouble?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -492,7 +490,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -518,13 +516,13 @@ open class FakeAPI {
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -545,7 +543,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testInlineAdditionalProperties(param: [String:String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -562,7 +560,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -582,7 +580,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -603,14 +601,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param.encodeToJSON(),
             "param2": param2.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index d21c4a49d43d..48cfe7187b9a 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
@@ -17,7 +15,7 @@ open class FakeClassnameTags123API {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index f5366f5832ba..c938db720047 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -17,7 +15,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         addPetWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -57,7 +55,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -84,8 +82,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey?.encodeToJSON()
@@ -113,7 +111,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -137,8 +135,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status.encodeToJSON()
@@ -157,7 +155,7 @@ open class PetAPI {
      - parameter completion: completion handler to receive the data and the error objects
      */
     @available(*, deprecated, message: "This operation is deprecated.")
-    open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -182,8 +180,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags.encodeToJSON()
@@ -201,7 +199,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?,_ error: Error?) -> Void)) {
+    open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) {
         getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -228,8 +226,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -244,7 +242,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -285,7 +283,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -313,14 +311,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name?.encodeToJSON(),
             "status": status?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -337,7 +335,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -365,14 +363,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "file": file?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -389,7 +387,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -417,14 +415,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "requiredFile": requiredFile.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 3848eda85ad6..a8a83eda39a4 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -17,7 +15,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -41,8 +39,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -56,7 +54,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
+    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -76,14 +74,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -95,7 +93,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -119,8 +117,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -135,7 +133,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         placeOrderWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index 546166841d9e..505ed1b0c5c9 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -17,7 +15,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUserWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -54,7 +52,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithArrayInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -90,7 +88,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithListInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -126,7 +124,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -150,8 +148,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -166,7 +164,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?,_ error: Error?) -> Void)) {
+    open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) {
         getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -189,8 +187,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -206,7 +204,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -228,11 +226,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username.encodeToJSON(), 
+            "username": username.encodeToJSON(),
             "password": password.encodeToJSON()
         ])
 
@@ -247,7 +245,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         logoutUserWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -266,8 +264,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -283,7 +281,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
index e7320f28ec57..368b4edffb93 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
@@ -12,7 +12,7 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
         return AlamofireRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return AlamofireDecodableRequestBuilder<T>.self
     }
 }
@@ -21,7 +21,7 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
 private var managerStore = SynchronizedDictionary<String, Alamofire.SessionManager>()
 
 open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
 
@@ -59,17 +59,17 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the request
      configuration (e.g. to override the cache policy).
      */
-    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
+    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) -> DataRequest {
         return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
     }
 
     override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
-        let managerId:String = UUID().uuidString
+        let managerId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let manager = createSessionManager()
         managerStore[managerId] = manager
 
-        let encoding:ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
 
         let xMethod = Alamofire.HTTPMethod(rawValue: method)
         let fileKeys = parameters == nil ? [] : parameters!.filter { $1 is NSURL }
@@ -82,8 +82,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
                     case let fileURL as URL:
                         if let mimeType = self.contentTypeForFormPart(fileURL: fileURL) {
                             mpForm.append(fileURL, withName: k, fileName: fileURL.lastPathComponent, mimeType: mimeType)
-                        }
-                        else {
+                        } else {
                             mpForm.append(fileURL, withName: k)
                         }
                     case let string as String:
@@ -102,7 +101,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
                     }
                     self.processRequest(request: upload, managerId, apiResponseQueue, completion)
                 case .failure(let encodingError):
-                    apiResponseQueue.async{
+                    apiResponseQueue.async {
                         completion(.failure(ErrorResponse.error(415, nil, encodingError)))
                     }
                 }
@@ -132,14 +131,14 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         case is String.Type:
             validatedRequest.responseString(queue: apiResponseQueue, completionHandler: { (stringResponse) in
                 cleanupRequest()
-                
+
                 switch stringResponse.result {
                 case let .success(value):
                     completion(.success(Response(response: stringResponse.response!, body: value as? T)))
                 case let .failure(error):
                     completion(.failure(ErrorResponse.error(stringResponse.response?.statusCode ?? 500, stringResponse.data, error)))
                 }
-                
+
             })
         case is URL.Type:
             validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (dataResponse) in
@@ -188,26 +187,26 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         case is Void.Type:
             validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (voidResponse) in
                 cleanupRequest()
-                
+
                 switch voidResponse.result {
                 case .success:
                     completion(.success(Response(response: voidResponse.response!, body: nil)))
                 case let .failure(error):
                     completion(.failure(ErrorResponse.error(voidResponse.response?.statusCode ?? 500, voidResponse.data, error)))
                 }
-                
+
             })
         default:
             validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (dataResponse) in
                 cleanupRequest()
-                
+
                 switch dataResponse.result {
                 case .success:
                     completion(.success(Response(response: dataResponse.response!, body: dataResponse.data as? T)))
                 case let .failure(error):
                     completion(.failure(ErrorResponse.error(dataResponse.response?.statusCode ?? 500, dataResponse.data, error)))
                 }
-                
+
             })
         }
     }
@@ -220,7 +219,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -228,7 +227,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
         let items = contentDisposition.components(separatedBy: ";")
 
-        var filename : String? = nil
+        var filename: String?
 
         for contentItem in items {
 
@@ -239,7 +238,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
             filename = contentItem
             return filename?
-                .replacingCharacters(in: range, with:"")
+                .replacingCharacters(in: range, with: "")
                 .replacingOccurrences(of: "\"", with: "")
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
@@ -248,7 +247,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -262,7 +261,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -273,7 +272,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilder<T> {
+open class AlamofireDecodableRequestBuilder<T: Decodable>: AlamofireRequestBuilder<T> {
 
     override fileprivate func processRequest(request: DataRequest, _ managerId: String, _ apiResponseQueue: DispatchQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
         if let credential = self.credential {
@@ -290,7 +289,7 @@ open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilde
         case is String.Type:
             validatedRequest.responseString(queue: apiResponseQueue, completionHandler: { (stringResponse) in
                 cleanupRequest()
-                
+
                 switch stringResponse.result {
                 case let .success(value):
                     completion(.success(Response(response: stringResponse.response!, body: value as? T)))
@@ -302,7 +301,7 @@ open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilde
         case is Void.Type:
             validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (voidResponse) in
                 cleanupRequest()
-                
+
                 switch voidResponse.result {
                 case .success:
                     completion(.success(Response(response: voidResponse.response!, body: nil)))
@@ -314,7 +313,7 @@ open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilde
         case is Data.Type:
             validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (dataResponse) in
                 cleanupRequest()
-                
+
                 switch dataResponse.result {
                 case .success:
                     completion(.success(Response(response: dataResponse.response!, body: dataResponse.data as? T)))
@@ -343,14 +342,14 @@ open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilde
                 }
 
                 let decodeResult = CodableHelper.decode(T.self, from: data)
-                
+
                 switch decodeResult {
                 case let .success(decodableObj):
                     completion(.success(Response(response: httpResponse, body: decodableObj)))
                 case let .failure(error):
                     completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, error)))
                 }
-                
+
             })
         }
     }
@@ -358,9 +357,9 @@ open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilde
 }
 
 extension JSONDataEncoding: ParameterEncoding {
-    
+
     // MARK: Encoding
-    
+
     /// Creates a URL request by encoding parameters and applying them onto an existing request.
     ///
     /// - parameter urlRequest: The request to have parameters applied.
@@ -372,7 +371,7 @@ extension JSONDataEncoding: ParameterEncoding {
     /// - returns: The encoded request.
     public func encode(_ urlRequest: URLRequestConvertible, with parameters: Parameters?) throws -> URLRequest {
         let urlRequest = try urlRequest.asURLRequest()
-        
+
         return self.encode(urlRequest, with: parameters)
     }
 }
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 01b28a4bd42d..ef971ebadc60 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -45,4 +45,4 @@ open class CodableHelper {
     open class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
         return Swift.Result { try self.jsonEncoder.encode(value) }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index f171525e4394..627d9adb757e 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,10 +7,10 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
 	@available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.")
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 6e279679c67a..93ed6b90b376 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -108,24 +108,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -135,7 +135,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -147,8 +147,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -157,8 +157,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -177,5 +177,3 @@ extension HTTPURLResponse {
         return Array(200 ..< 300).contains(statusCode)
     }
 }
-
-
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
index 08f1ef334dff..b79e9f5e64d5 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
@@ -41,7 +41,7 @@ public struct JSONDataEncoding {
     }
 
     public static func encodingParameters(jsonData: Data?) -> [String: Any]? {
-        var returnedParams: [String: Any]? = nil
+        var returnedParams: [String: Any]?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params: [String: Any] = [:]
             params[jsonDataKey] = jsonData
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 314f1eff1f9b..02f78ffb4705 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -9,8 +9,8 @@ import Foundation
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
+        var params: [String: Any]?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -27,7 +27,7 @@ open class JSONEncodingHelper {
     }
 
     open class func encodingParameters(forEncodableObject encodableObj: Any?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+        var params: [String: Any]?
 
         if let encodableObj = encodableObj {
             do {
@@ -41,5 +41,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
index 11e81ffcc472..c0542c14c081 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,11 +10,11 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
-public enum DownloadException : Error {
+public enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -30,7 +30,6 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-
 open class Response<T> {
     public let statusCode: Int
     public let header: [String: String]
@@ -44,7 +43,7 @@ open class Response<T> {
 
     public convenience init(response: HTTPURLResponse, body: T?) {
         let rawHeader = response.allHeaderFields
-        var header = [String:String]()
+        var header = [String: String]()
         for (key, value) in rawHeader {
             if let key = key.base as? String, let value = value as? String {
                 header[key] = value
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 28ca8377b889..1af031535967 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,19 +7,17 @@
 
 import Foundation
 
+public struct AdditionalPropertiesClass: Codable {
 
-public struct AdditionalPropertiesClass: Codable { 
+    public var mapString: [String: String]?
+    public var mapMapString: [String: [String: String]]?
 
-
-    public var mapString: [String:String]?
-    public var mapMapString: [String:[String:String]]?
-
-    public init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index 1050d79dbe9d..5ed9f31e2a36 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Animal: Codable { 
-
+public struct Animal: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8ed2..e09b0e9efdc8 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index 4d0393b9ba45..ec270da89074 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ApiResponse: Codable { 
-
+public struct ApiResponse: Codable {
 
     public var code: Int?
     public var type: String?
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 1363c96394ba..6c252ed475b2 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public var arrayArrayNumber: [[Double]]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 6b8873730c43..e84eb5d65025 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfNumberOnly: Codable {
 
     public var arrayNumber: [Double]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayNumber = "ArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 64f7c6d9db99..d2140933d181 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayTest: Codable { 
-
+public struct ArrayTest: Codable {
 
     public var arrayOfString: [String]?
     public var arrayArrayOfInteger: [[Int64]]?
@@ -21,7 +19,7 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index ddb669a59045..d1b3b27616ed 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Capitalization: Codable { 
-
+public struct Capitalization: Codable {
 
     public var smallCamel: String?
     public var capitalCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index c4f6e0d488ca..7ab887f3113f 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Cat: Codable { 
-
+public struct Cat: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
index 7b1d7e32be80..a51ad0dffab1 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct CatAllOf: Codable { 
-
+public struct CatAllOf: Codable {
 
     public var declawed: Bool?
 
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index 3ec00f5ab10d..eb8f7e5e1974 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Category: Codable { 
-
+public struct Category: Codable {
 
     public var id: Int64?
     public var name: String = "default-name"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index af030c3dd626..e2a7d4427a06 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model with \&quot;_class\&quot; property */
-public struct ClassModel: Codable { 
-
+public struct ClassModel: Codable {
 
     public var _class: String?
 
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 0aae748c76b4..00245ca37280 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Client: Codable { 
-
+public struct Client: Codable {
 
     public var client: String?
 
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 198e28b94dd6..492c1228008e 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Dog: Codable { 
-
+public struct Dog: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
index 8ff49b2af23f..7786f8acc5ae 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct DogAllOf: Codable { 
-
+public struct DogAllOf: Codable {
 
     public var breed: String?
 
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index e2d3fa04f94b..9844e7c40e35 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumArrays: Codable { 
-
+public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable, CaseIterable {
         case greaterThanOrEqualTo = ">="
@@ -27,7 +25,7 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index c2c639ba3246..d4029d73f8af 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable, CaseIterable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index a56e1f36389b..789f583e1d77 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumTest: Codable { 
-
+public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index 773b53b2cb76..abf3ccffc485 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Must be named &#x60;File&#x60; for test. */
-public struct File: Codable { 
-
+public struct File: Codable {
 
     /** Test capitalization */
     public var sourceURI: String?
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 83dc1148cfa3..532f1457939a 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FileSchemaTestClass: Codable { 
-
+public struct FileSchemaTestClass: Codable {
 
     public var file: File?
     public var files: [File]?
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index bccd3f9fb178..20bd6d103b3d 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FormatTest: Codable { 
-
+public struct FormatTest: Codable {
 
     public var integer: Int?
     public var int32: Int?
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 566d71a35ef0..906ddb06fb17 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct HasOnlyReadOnly: Codable { 
-
+public struct HasOnlyReadOnly: Codable {
 
     public var bar: String?
     public var foo: String?
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 80cecab242f2..fe13d302ccbf 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct List: Codable { 
-
+public struct List: Codable {
 
     public var _123list: String?
 
@@ -17,7 +15,7 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _123list = "123-list"
     }
 
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index f0c02de95f7a..4b6037f378ee 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,27 +7,25 @@
 
 import Foundation
 
-
-public struct MapTest: Codable { 
-
+public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-    public var directMap: [String:Bool]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
+    public var directMap: [String: Bool]?
     public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 710e62a9b587..c3deb2f28932 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,15 +7,13 @@
 
 import Foundation
 
-
-public struct MixedPropertiesAndAdditionalPropertiesClass: Codable { 
-
+public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index 450a53b918ca..b61db7d6e716 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name starting with number */
-public struct Model200Response: Codable { 
-
+public struct Model200Response: Codable {
 
     public var name: Int?
     public var _class: String?
@@ -19,7 +18,7 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case _class = "class"
     }
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index 6deb69fcd731..8ab4db44b73a 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name same as property name */
-public struct Name: Codable { 
-
+public struct Name: Codable {
 
     public var name: Int
     public var snakeCase: Int?
@@ -23,7 +22,7 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case snakeCase = "snake_case"
         case property
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index 0c9ee2b7b9f4..4d1dafcc2c1f 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct NumberOnly: Codable { 
-
+public struct NumberOnly: Codable {
 
     public var justNumber: Double?
 
@@ -17,7 +15,7 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justNumber = "JustNumber"
     }
 
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index ab0eac0b304e..40c30cc8609c 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Order: Codable { 
-
+public struct Order: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case placed = "placed"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index 4a7d22710441..18c3a024f122 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct OuterComposite: Codable { 
-
+public struct OuterComposite: Codable {
 
     public var myNumber: Double?
     public var myString: String?
@@ -21,7 +19,7 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index 9e6b8d74e874..c3b778cbbed4 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable, CaseIterable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index a973071d6c96..b9ce0e933256 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Pet: Codable { 
-
+public struct Pet: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index b2a6b7e2b8a6..0acd21fd1000 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ReadOnlyFirst: Codable { 
-
+public struct ReadOnlyFirst: Codable {
 
     public var bar: String?
     public var baz: String?
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index 7e089dcee2b4..c223f993a69e 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing reserved words */
-public struct Return: Codable { 
-
+public struct Return: Codable {
 
     public var _return: Int?
 
@@ -17,7 +16,7 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _return = "return"
     }
 
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index e890ef952520..6e8650f76d8e 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct SpecialModelName: Codable { 
-
+public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
 
@@ -17,7 +15,7 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case specialPropertyName = "$special[property.name]"
     }
 
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index f65ae0623d6e..3f1237fee477 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
+public struct StringBooleanMap: Codable {
 
-public struct StringBooleanMap: Codable { 
-
-
-
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,5 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
 }
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index a91b6061bcf7..4dd8a9a9f5a0 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Tag: Codable { 
-
+public struct Tag: Codable {
 
     public var id: Int64?
     public var name: String?
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index 2d377c3edb02..a9e088808ed3 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderDefault: Codable { 
-
+public struct TypeHolderDefault: Codable {
 
     public var stringItem: String = "what"
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index e5eb92da696e..dff4083ae432 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderExample: Codable { 
-
+public struct TypeHolderExample: Codable {
 
     public var stringItem: String
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index f70328ca9e59..79f271ed7356 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct User: Codable { 
-
+public struct User: Codable {
 
     public var id: Int64?
     public var username: String?
diff --git a/samples/client/petstore/swift5/combineLibrary/Package.swift b/samples/client/petstore/swift5/combineLibrary/Package.swift
index 79f6f8188738..96dfff54edf4 100644
--- a/samples/client/petstore/swift5/combineLibrary/Package.swift
+++ b/samples/client/petstore/swift5/combineLibrary/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "PetstoreClient",
-            targets: ["PetstoreClient"]),
+            targets: ["PetstoreClient"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -26,6 +26,6 @@ let package = Package(
             name: "PetstoreClient",
             dependencies: [],
             path: "PetstoreClient/Classes"
-        ),
+        )
     ]
 )
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 2404bc8ffc6d..5b09f9557113 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+            if let collection = item.value as? [Any?] {
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -46,15 +46,15 @@ public struct APIHelper {
     }
 
     public static func mapValueToPathItem(_ source: Any) -> Any {
-        if let collection = source as? Array<Any?> {
+        if let collection = source as? [Any?] {
             return collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
         }
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
+            if let collection = item.value as? [Any?] {
                 collection.filter({ $0 != nil }).map({"\($0!)"}).forEach { value in
                     result.append(URLQueryItem(name: item.key, value: value))
                 }
@@ -69,4 +69,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
index c5d1b9b42df3..a5c2d605dff6 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,15 +9,15 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = URLSessionRequestBuilderFactory()
     public static var apiResponseQueue: DispatchQueue = .main
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
@@ -25,9 +25,9 @@ open class RequestBuilder<T> {
     /// Optional block to obtain a reference to the request's progress instance when available.
     /// With the URLSession http client the request's progress only works on iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0.
     /// If you need to get the request's progress in older OS versions, please use Alamofire http client.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -37,7 +37,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -60,5 +60,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index cf5a4a61c291..2df909dec9ad 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Combine
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index ccfdc072331f..47510b7781a5 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Combine
 
-
-
 open class FakeAPI {
     /**
 
@@ -343,7 +341,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -362,7 +360,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -482,19 +480,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray?.encodeToJSON(),
             "enum_form_string": enumFormString?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(), 
-            "enum_query_string": enumQueryString?.encodeToJSON(), 
-            "enum_query_integer": enumQueryInteger?.encodeToJSON(), 
+            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(),
+            "enum_query_string": enumQueryString?.encodeToJSON(),
+            "enum_query_integer": enumQueryInteger?.encodeToJSON(),
             "enum_query_double": enumQueryDouble?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -549,13 +547,13 @@ open class FakeAPI {
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -577,7 +575,7 @@ open class FakeAPI {
      - returns: AnyPublisher<Void, Error>
      */
     @available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-    open class func testInlineAdditionalProperties(param: [String:String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Void, Error> {
+    open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<Void, Error> {
         return Future<Void, Error>.init { promisse in
             testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result -> Void in
                 switch result {
@@ -596,7 +594,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -640,14 +638,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param.encodeToJSON(),
             "param2": param2.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index 7d04bd796bb7..6f0401af8885 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Combine
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 6c288c225c7a..309ee4e9686e 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Combine
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -91,8 +89,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey?.encodeToJSON()
@@ -147,8 +145,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status.encodeToJSON()
@@ -195,8 +193,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags.encodeToJSON()
@@ -244,8 +242,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -335,14 +333,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name?.encodeToJSON(),
             "status": status?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -390,14 +388,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "file": file?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -445,14 +443,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "requiredFile": requiredFile.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 1a4392975b6b..b36a3a30c3a5 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Combine
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -45,8 +43,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -61,8 +59,8 @@ open class StoreAPI {
      - returns: AnyPublisher<[String:Int], Error>
      */
     @available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<[String:Int], Error> {
-        return Future<[String:Int], Error>.init { promisse in
+    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> AnyPublisher<[String: Int], Error> {
+        return Future<[String: Int], Error>.init { promisse in
             getInventoryWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
                 switch result {
                 case let .success(response):
@@ -83,14 +81,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -129,8 +127,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index 59fec6d34fe6..3d5694cc935c 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Combine
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -163,8 +161,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -205,8 +203,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -247,11 +245,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username.encodeToJSON(), 
+            "username": username.encodeToJSON(),
             "password": password.encodeToJSON()
         ])
 
@@ -288,8 +286,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 01b28a4bd42d..ef971ebadc60 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -45,4 +45,4 @@ open class CodableHelper {
     open class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
         return Swift.Result { try self.jsonEncoder.encode(value) }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index f171525e4394..627d9adb757e 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,10 +7,10 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
 	@available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.")
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 6e279679c67a..93ed6b90b376 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -108,24 +108,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -135,7 +135,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -147,8 +147,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -157,8 +157,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -177,5 +177,3 @@ extension HTTPURLResponse {
         return Array(200 ..< 300).contains(statusCode)
     }
 }
-
-
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
index 08f1ef334dff..b79e9f5e64d5 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
@@ -41,7 +41,7 @@ public struct JSONDataEncoding {
     }
 
     public static func encodingParameters(jsonData: Data?) -> [String: Any]? {
-        var returnedParams: [String: Any]? = nil
+        var returnedParams: [String: Any]?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params: [String: Any] = [:]
             params[jsonDataKey] = jsonData
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 314f1eff1f9b..02f78ffb4705 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -9,8 +9,8 @@ import Foundation
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
+        var params: [String: Any]?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -27,7 +27,7 @@ open class JSONEncodingHelper {
     }
 
     open class func encodingParameters(forEncodableObject encodableObj: Any?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+        var params: [String: Any]?
 
         if let encodableObj = encodableObj {
             do {
@@ -41,5 +41,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
index 11e81ffcc472..c0542c14c081 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,11 +10,11 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
-public enum DownloadException : Error {
+public enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -30,7 +30,6 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-
 open class Response<T> {
     public let statusCode: Int
     public let header: [String: String]
@@ -44,7 +43,7 @@ open class Response<T> {
 
     public convenience init(response: HTTPURLResponse, body: T?) {
         let rawHeader = response.allHeaderFields
-        var header = [String:String]()
+        var header = [String: String]()
         for (key, value) in rawHeader {
             if let key = key.base as? String, let value = value as? String {
                 header[key] = value
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 28ca8377b889..1af031535967 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,19 +7,17 @@
 
 import Foundation
 
+public struct AdditionalPropertiesClass: Codable {
 
-public struct AdditionalPropertiesClass: Codable { 
+    public var mapString: [String: String]?
+    public var mapMapString: [String: [String: String]]?
 
-
-    public var mapString: [String:String]?
-    public var mapMapString: [String:[String:String]]?
-
-    public init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index 1050d79dbe9d..5ed9f31e2a36 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Animal: Codable { 
-
+public struct Animal: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8ed2..e09b0e9efdc8 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index 4d0393b9ba45..ec270da89074 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ApiResponse: Codable { 
-
+public struct ApiResponse: Codable {
 
     public var code: Int?
     public var type: String?
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 1363c96394ba..6c252ed475b2 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public var arrayArrayNumber: [[Double]]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 6b8873730c43..e84eb5d65025 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfNumberOnly: Codable {
 
     public var arrayNumber: [Double]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayNumber = "ArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 64f7c6d9db99..d2140933d181 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayTest: Codable { 
-
+public struct ArrayTest: Codable {
 
     public var arrayOfString: [String]?
     public var arrayArrayOfInteger: [[Int64]]?
@@ -21,7 +19,7 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index ddb669a59045..d1b3b27616ed 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Capitalization: Codable { 
-
+public struct Capitalization: Codable {
 
     public var smallCamel: String?
     public var capitalCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index c4f6e0d488ca..7ab887f3113f 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Cat: Codable { 
-
+public struct Cat: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
index 7b1d7e32be80..a51ad0dffab1 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct CatAllOf: Codable { 
-
+public struct CatAllOf: Codable {
 
     public var declawed: Bool?
 
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index 3ec00f5ab10d..eb8f7e5e1974 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Category: Codable { 
-
+public struct Category: Codable {
 
     public var id: Int64?
     public var name: String = "default-name"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index af030c3dd626..e2a7d4427a06 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model with \&quot;_class\&quot; property */
-public struct ClassModel: Codable { 
-
+public struct ClassModel: Codable {
 
     public var _class: String?
 
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 0aae748c76b4..00245ca37280 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Client: Codable { 
-
+public struct Client: Codable {
 
     public var client: String?
 
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 198e28b94dd6..492c1228008e 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Dog: Codable { 
-
+public struct Dog: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
index 8ff49b2af23f..7786f8acc5ae 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct DogAllOf: Codable { 
-
+public struct DogAllOf: Codable {
 
     public var breed: String?
 
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index e2d3fa04f94b..9844e7c40e35 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumArrays: Codable { 
-
+public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable, CaseIterable {
         case greaterThanOrEqualTo = ">="
@@ -27,7 +25,7 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index c2c639ba3246..d4029d73f8af 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable, CaseIterable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index a56e1f36389b..789f583e1d77 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumTest: Codable { 
-
+public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index 773b53b2cb76..abf3ccffc485 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Must be named &#x60;File&#x60; for test. */
-public struct File: Codable { 
-
+public struct File: Codable {
 
     /** Test capitalization */
     public var sourceURI: String?
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 83dc1148cfa3..532f1457939a 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FileSchemaTestClass: Codable { 
-
+public struct FileSchemaTestClass: Codable {
 
     public var file: File?
     public var files: [File]?
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index bccd3f9fb178..20bd6d103b3d 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FormatTest: Codable { 
-
+public struct FormatTest: Codable {
 
     public var integer: Int?
     public var int32: Int?
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 566d71a35ef0..906ddb06fb17 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct HasOnlyReadOnly: Codable { 
-
+public struct HasOnlyReadOnly: Codable {
 
     public var bar: String?
     public var foo: String?
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 80cecab242f2..fe13d302ccbf 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct List: Codable { 
-
+public struct List: Codable {
 
     public var _123list: String?
 
@@ -17,7 +15,7 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _123list = "123-list"
     }
 
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index f0c02de95f7a..4b6037f378ee 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,27 +7,25 @@
 
 import Foundation
 
-
-public struct MapTest: Codable { 
-
+public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-    public var directMap: [String:Bool]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
+    public var directMap: [String: Bool]?
     public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 710e62a9b587..c3deb2f28932 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,15 +7,13 @@
 
 import Foundation
 
-
-public struct MixedPropertiesAndAdditionalPropertiesClass: Codable { 
-
+public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index 450a53b918ca..b61db7d6e716 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name starting with number */
-public struct Model200Response: Codable { 
-
+public struct Model200Response: Codable {
 
     public var name: Int?
     public var _class: String?
@@ -19,7 +18,7 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case _class = "class"
     }
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index 6deb69fcd731..8ab4db44b73a 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name same as property name */
-public struct Name: Codable { 
-
+public struct Name: Codable {
 
     public var name: Int
     public var snakeCase: Int?
@@ -23,7 +22,7 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case snakeCase = "snake_case"
         case property
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index 0c9ee2b7b9f4..4d1dafcc2c1f 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct NumberOnly: Codable { 
-
+public struct NumberOnly: Codable {
 
     public var justNumber: Double?
 
@@ -17,7 +15,7 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justNumber = "JustNumber"
     }
 
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index ab0eac0b304e..40c30cc8609c 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Order: Codable { 
-
+public struct Order: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case placed = "placed"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index 4a7d22710441..18c3a024f122 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct OuterComposite: Codable { 
-
+public struct OuterComposite: Codable {
 
     public var myNumber: Double?
     public var myString: String?
@@ -21,7 +19,7 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index 9e6b8d74e874..c3b778cbbed4 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable, CaseIterable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index a973071d6c96..b9ce0e933256 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Pet: Codable { 
-
+public struct Pet: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index b2a6b7e2b8a6..0acd21fd1000 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ReadOnlyFirst: Codable { 
-
+public struct ReadOnlyFirst: Codable {
 
     public var bar: String?
     public var baz: String?
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index 7e089dcee2b4..c223f993a69e 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing reserved words */
-public struct Return: Codable { 
-
+public struct Return: Codable {
 
     public var _return: Int?
 
@@ -17,7 +16,7 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _return = "return"
     }
 
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index e890ef952520..6e8650f76d8e 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct SpecialModelName: Codable { 
-
+public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
 
@@ -17,7 +15,7 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case specialPropertyName = "$special[property.name]"
     }
 
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index f65ae0623d6e..3f1237fee477 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
+public struct StringBooleanMap: Codable {
 
-public struct StringBooleanMap: Codable { 
-
-
-
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,5 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
 }
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index a91b6061bcf7..4dd8a9a9f5a0 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Tag: Codable { 
-
+public struct Tag: Codable {
 
     public var id: Int64?
     public var name: String?
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index 2d377c3edb02..a9e088808ed3 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderDefault: Codable { 
-
+public struct TypeHolderDefault: Codable {
 
     public var stringItem: String = "what"
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index e5eb92da696e..dff4083ae432 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderExample: Codable { 
-
+public struct TypeHolderExample: Codable {
 
     public var stringItem: String
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index f70328ca9e59..79f271ed7356 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct User: Codable { 
-
+public struct User: Codable {
 
     public var id: Int64?
     public var username: String?
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
index 22261e2ce948..55d0eb421919 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -14,7 +14,7 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
         return URLSessionRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return URLSessionDecodableRequestBuilder<T>.self
     }
 }
@@ -23,16 +23,16 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
 private var urlSessionStore = SynchronizedDictionary<String, URLSession>()
 
 open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
-    
+
     private var observation: NSKeyValueObservation?
-    
+
     deinit {
         observation?.invalidate()
     }
-    
+
     // swiftlint:disable:next weak_delegate
     fileprivate let sessionDelegate = SessionDelegate()
-    
+
     /**
      May be assigned if you want to control the authentication challenges.
      */
@@ -45,11 +45,11 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      - retry the request.
      */
     public var taskCompletionShouldRetry: ((Data?, URLResponse?, Error?, @escaping (Bool) -> Void) -> Void)?
-    
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
-    
+
     /**
      May be overridden by a subclass if you want to control the URLSession
      configuration.
@@ -77,40 +77,40 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the URLRequest
      configuration (e.g. to override the cache policy).
      */
-    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) throws -> URLRequest {
-        
+    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) throws -> URLRequest {
+
         guard let url = URL(string: URLString) else {
             throw DownloadException.requestMissingURL
         }
-        
+
         var originalRequest = URLRequest(url: url)
-        
+
         originalRequest.httpMethod = method.rawValue
-        
+
         buildHeaders().forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         headers.forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         let modifiedRequest = try encoding.encode(originalRequest, with: parameters)
-        
+
         return modifiedRequest
     }
 
     override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
-        let urlSessionId:String = UUID().uuidString
+        let urlSessionId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let urlSession = createURLSession()
         urlSessionStore[urlSessionId] = urlSession
-        
+
         let parameters: [String: Any] = self.parameters ?? [:]
-        
+
         let fileKeys = parameters.filter { $1 is URL }
             .map { $0.0 }
-        
+
         let encoding: ParameterEncoding
         if fileKeys.count > 0 {
             encoding = FileUploadEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
@@ -119,29 +119,29 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         } else {
             encoding = URLEncoding()
         }
-        
+
         guard let xMethod = HTTPMethod(rawValue: method) else {
             fatalError("Unsuported Http method - \(method)")
         }
-        
+
         let cleanupRequest = {
             urlSessionStore[urlSessionId] = nil
             self.observation?.invalidate()
         }
-        
+
         do {
             let request = try createURLRequest(urlSession: urlSession, method: xMethod, encoding: encoding, headers: headers)
-            
+
             let dataTask = urlSession.dataTask(with: request) { [weak self] data, response, error in
-                
+
                 guard let self = self else { return }
-                
+
                 if let taskCompletionShouldRetry = self.taskCompletionShouldRetry {
-                    
+
                     taskCompletionShouldRetry(data, response, error) { [weak self] shouldRetry in
-                        
+
                         guard let self = self else { return }
-                        
+
                         if shouldRetry {
                             cleanupRequest()
                             self.execute(apiResponseQueue, completion)
@@ -157,13 +157,13 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
                     }
                 }
             }
-            
+
             if #available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) {
                 onProgressReady?(dataTask.progress)
             }
-            
+
             dataTask.resume()
-            
+
         } catch {
             apiResponseQueue.async {
                 cleanupRequest()
@@ -172,7 +172,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         }
 
     }
-    
+
     fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -192,52 +192,52 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is URL.Type:
             do {
-                
+
                 guard error == nil else {
                     throw DownloadException.responseFailed
                 }
-                
+
                 guard let data = data else {
                     throw DownloadException.responseDataMissing
                 }
-                
+
                 let fileManager = FileManager.default
                 let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
                 let requestURL = try self.getURL(from: urlRequest)
-                
+
                 var requestPath = try self.getPath(from: requestURL)
-                
+
                 if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) {
                     requestPath = requestPath.appending("/\(headerFileName)")
                 }
-                
+
                 let filePath = documentsDirectory.appendingPathComponent(requestPath)
                 let directoryPath = filePath.deletingLastPathComponent().path
-                
+
                 try fileManager.createDirectory(atPath: directoryPath, withIntermediateDirectories: true, attributes: nil)
                 try data.write(to: filePath, options: .atomic)
-                
+
                 completion(.success(Response(response: httpResponse, body: filePath as? T)))
-                
+
             } catch let requestParserError as DownloadException {
                 completion(.failure(ErrorResponse.error(400, data, requestParserError)))
             } catch let error {
                 completion(.failure(ErrorResponse.error(400, data, error)))
             }
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         default:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
         }
 
@@ -251,7 +251,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -270,7 +270,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
             filename = contentItem
             return filename?
-                .replacingCharacters(in: range, with:"")
+                .replacingCharacters(in: range, with: "")
                 .replacingOccurrences(of: "\"", with: "")
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
@@ -279,7 +279,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -293,7 +293,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -304,7 +304,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuilder<T> {
+open class URLSessionDecodableRequestBuilder<T: Decodable>: URLSessionRequestBuilder<T> {
     override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -324,28 +324,28 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         case is Data.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
-            
+
         default:
-            
+
             guard let data = data, !data.isEmpty else {
                 completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, DecodableRequestBuilderError.emptyDataResponse)))
                 return
             }
-            
+
             let decodeResult = CodableHelper.decode(T.self, from: data)
-            
+
             switch decodeResult {
             case let .success(decodableObj):
                 completion(.success(Response(response: httpResponse, body: decodableObj)))
@@ -356,10 +356,10 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
     }
 }
 
-fileprivate class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
-    
+private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
+
     var credential: URLCredential?
-    
+
     var taskDidReceiveChallenge: ((URLSession, URLSessionTask, URLAuthenticationChallenge) -> (URLSession.AuthChallengeDisposition, URLCredential?))?
 
     func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
@@ -402,13 +402,13 @@ public protocol ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest
 }
 
-fileprivate class URLEncoding: ParameterEncoding {
-    func encode(_ urlRequest: URLRequest, with parameters: [String : Any]?) throws -> URLRequest {
-        
+private class URLEncoding: ParameterEncoding {
+    func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
+
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters else { return urlRequest }
-        
+
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
         }
@@ -417,12 +417,12 @@ fileprivate class URLEncoding: ParameterEncoding {
             urlComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters)
             urlRequest.url = urlComponents.url
         }
-        
+
         return urlRequest
     }
 }
 
-fileprivate class FileUploadEncoding: ParameterEncoding {
+private class FileUploadEncoding: ParameterEncoding {
 
     let contentTypeForFormPart: (_ fileURL: URL) -> String?
 
@@ -433,13 +433,13 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters, !parameters.isEmpty else {
             return urlRequest
         }
-        
+
         let boundary = "Boundary-\(UUID().uuidString)"
-                
+
         urlRequest.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
 
         for (key, value) in parameters {
@@ -479,7 +479,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
                 fatalError("Unprocessable value \(value) with key \(key)")
             }
         }
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         body.append("\r\n--\(boundary)--\r\n")
@@ -494,7 +494,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         var urlRequest = urlRequest
 
         var body = urlRequest.httpBody.orEmpty
-        
+
         let fileData = try Data(contentsOf: fileURL)
 
         let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL)
@@ -502,7 +502,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         let fileName = fileURL.lastPathComponent
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
@@ -518,20 +518,20 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
 
         // The value data.
         body.append(fileData)
-        
+
         urlRequest.httpBody = body
 
         return urlRequest
     }
-    
+
     private func configureDataUploadRequest(urlRequest: URLRequest, boundary: String, name: String, data: Data) -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
diff --git a/samples/client/petstore/swift5/default/Package.swift b/samples/client/petstore/swift5/default/Package.swift
index 79f6f8188738..96dfff54edf4 100644
--- a/samples/client/petstore/swift5/default/Package.swift
+++ b/samples/client/petstore/swift5/default/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "PetstoreClient",
-            targets: ["PetstoreClient"]),
+            targets: ["PetstoreClient"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -26,6 +26,6 @@ let package = Package(
             name: "PetstoreClient",
             dependencies: [],
             path: "PetstoreClient/Classes"
-        ),
+        )
     ]
 )
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 2404bc8ffc6d..5b09f9557113 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+            if let collection = item.value as? [Any?] {
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -46,15 +46,15 @@ public struct APIHelper {
     }
 
     public static func mapValueToPathItem(_ source: Any) -> Any {
-        if let collection = source as? Array<Any?> {
+        if let collection = source as? [Any?] {
             return collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
         }
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
+            if let collection = item.value as? [Any?] {
                 collection.filter({ $0 != nil }).map({"\($0!)"}).forEach { value in
                     result.append(URLQueryItem(name: item.key, value: value))
                 }
@@ -69,4 +69,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift
index c5d1b9b42df3..a5c2d605dff6 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,15 +9,15 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = URLSessionRequestBuilderFactory()
     public static var apiResponseQueue: DispatchQueue = .main
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
@@ -25,9 +25,9 @@ open class RequestBuilder<T> {
     /// Optional block to obtain a reference to the request's progress instance when available.
     /// With the URLSession http client the request's progress only works on iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0.
     /// If you need to get the request's progress in older OS versions, please use Alamofire http client.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -37,7 +37,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -60,5 +60,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index bb3ae7178254..5bbf323f820c 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
@@ -17,7 +15,7 @@ open class AnotherFakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         call123testSpecialTagsWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index d1d81faa335c..134d6aea416a 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class FakeAPI {
     /**
 
@@ -16,7 +14,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?,_ error: Error?) -> Void)) {
+    open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) {
         fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -51,7 +49,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
+    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) {
         fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -86,7 +84,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?,_ error: Error?) -> Void)) {
+    open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) {
         fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -121,7 +119,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -156,7 +154,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -192,7 +190,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -231,7 +229,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -281,7 +279,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -318,7 +316,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -337,7 +335,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -426,7 +424,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -454,19 +452,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray?.encodeToJSON(),
             "enum_form_string": enumFormString?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(), 
-            "enum_query_string": enumQueryString?.encodeToJSON(), 
-            "enum_query_integer": enumQueryInteger?.encodeToJSON(), 
+            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(),
+            "enum_query_string": enumQueryString?.encodeToJSON(),
+            "enum_query_integer": enumQueryInteger?.encodeToJSON(),
             "enum_query_double": enumQueryDouble?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -492,7 +490,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -518,13 +516,13 @@ open class FakeAPI {
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -545,7 +543,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testInlineAdditionalProperties(param: [String:String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -562,7 +560,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -582,7 +580,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -603,14 +601,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param.encodeToJSON(),
             "param2": param2.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index d21c4a49d43d..48cfe7187b9a 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
@@ -17,7 +15,7 @@ open class FakeClassnameTags123API {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index f5366f5832ba..c938db720047 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -17,7 +15,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         addPetWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -57,7 +55,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -84,8 +82,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey?.encodeToJSON()
@@ -113,7 +111,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -137,8 +135,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status.encodeToJSON()
@@ -157,7 +155,7 @@ open class PetAPI {
      - parameter completion: completion handler to receive the data and the error objects
      */
     @available(*, deprecated, message: "This operation is deprecated.")
-    open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -182,8 +180,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags.encodeToJSON()
@@ -201,7 +199,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?,_ error: Error?) -> Void)) {
+    open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) {
         getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -228,8 +226,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -244,7 +242,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -285,7 +283,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -313,14 +311,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name?.encodeToJSON(),
             "status": status?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -337,7 +335,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -365,14 +363,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "file": file?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -389,7 +387,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -417,14 +415,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "requiredFile": requiredFile.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 3848eda85ad6..a8a83eda39a4 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -17,7 +15,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -41,8 +39,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -56,7 +54,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
+    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -76,14 +74,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -95,7 +93,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -119,8 +117,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -135,7 +133,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         placeOrderWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index 546166841d9e..505ed1b0c5c9 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -17,7 +15,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUserWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -54,7 +52,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithArrayInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -90,7 +88,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithListInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -126,7 +124,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -150,8 +148,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -166,7 +164,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?,_ error: Error?) -> Void)) {
+    open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) {
         getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -189,8 +187,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -206,7 +204,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -228,11 +226,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username.encodeToJSON(), 
+            "username": username.encodeToJSON(),
             "password": password.encodeToJSON()
         ])
 
@@ -247,7 +245,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         logoutUserWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -266,8 +264,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -283,7 +281,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 01b28a4bd42d..ef971ebadc60 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -45,4 +45,4 @@ open class CodableHelper {
     open class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
         return Swift.Result { try self.jsonEncoder.encode(value) }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index f171525e4394..627d9adb757e 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,10 +7,10 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
 	@available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.")
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 6e279679c67a..93ed6b90b376 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -108,24 +108,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -135,7 +135,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -147,8 +147,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -157,8 +157,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -177,5 +177,3 @@ extension HTTPURLResponse {
         return Array(200 ..< 300).contains(statusCode)
     }
 }
-
-
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
index 08f1ef334dff..b79e9f5e64d5 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
@@ -41,7 +41,7 @@ public struct JSONDataEncoding {
     }
 
     public static func encodingParameters(jsonData: Data?) -> [String: Any]? {
-        var returnedParams: [String: Any]? = nil
+        var returnedParams: [String: Any]?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params: [String: Any] = [:]
             params[jsonDataKey] = jsonData
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 314f1eff1f9b..02f78ffb4705 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -9,8 +9,8 @@ import Foundation
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
+        var params: [String: Any]?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -27,7 +27,7 @@ open class JSONEncodingHelper {
     }
 
     open class func encodingParameters(forEncodableObject encodableObj: Any?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+        var params: [String: Any]?
 
         if let encodableObj = encodableObj {
             do {
@@ -41,5 +41,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models.swift
index 11e81ffcc472..c0542c14c081 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,11 +10,11 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
-public enum DownloadException : Error {
+public enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -30,7 +30,6 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-
 open class Response<T> {
     public let statusCode: Int
     public let header: [String: String]
@@ -44,7 +43,7 @@ open class Response<T> {
 
     public convenience init(response: HTTPURLResponse, body: T?) {
         let rawHeader = response.allHeaderFields
-        var header = [String:String]()
+        var header = [String: String]()
         for (key, value) in rawHeader {
             if let key = key.base as? String, let value = value as? String {
                 header[key] = value
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 28ca8377b889..1af031535967 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,19 +7,17 @@
 
 import Foundation
 
+public struct AdditionalPropertiesClass: Codable {
 
-public struct AdditionalPropertiesClass: Codable { 
+    public var mapString: [String: String]?
+    public var mapMapString: [String: [String: String]]?
 
-
-    public var mapString: [String:String]?
-    public var mapMapString: [String:[String:String]]?
-
-    public init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index 1050d79dbe9d..5ed9f31e2a36 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Animal: Codable { 
-
+public struct Animal: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8ed2..e09b0e9efdc8 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index 4d0393b9ba45..ec270da89074 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ApiResponse: Codable { 
-
+public struct ApiResponse: Codable {
 
     public var code: Int?
     public var type: String?
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 1363c96394ba..6c252ed475b2 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public var arrayArrayNumber: [[Double]]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 6b8873730c43..e84eb5d65025 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfNumberOnly: Codable {
 
     public var arrayNumber: [Double]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayNumber = "ArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 64f7c6d9db99..d2140933d181 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayTest: Codable { 
-
+public struct ArrayTest: Codable {
 
     public var arrayOfString: [String]?
     public var arrayArrayOfInteger: [[Int64]]?
@@ -21,7 +19,7 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index ddb669a59045..d1b3b27616ed 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Capitalization: Codable { 
-
+public struct Capitalization: Codable {
 
     public var smallCamel: String?
     public var capitalCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index c4f6e0d488ca..7ab887f3113f 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Cat: Codable { 
-
+public struct Cat: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
index 7b1d7e32be80..a51ad0dffab1 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct CatAllOf: Codable { 
-
+public struct CatAllOf: Codable {
 
     public var declawed: Bool?
 
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index 3ec00f5ab10d..eb8f7e5e1974 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Category: Codable { 
-
+public struct Category: Codable {
 
     public var id: Int64?
     public var name: String = "default-name"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index af030c3dd626..e2a7d4427a06 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model with \&quot;_class\&quot; property */
-public struct ClassModel: Codable { 
-
+public struct ClassModel: Codable {
 
     public var _class: String?
 
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 0aae748c76b4..00245ca37280 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Client: Codable { 
-
+public struct Client: Codable {
 
     public var client: String?
 
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 198e28b94dd6..492c1228008e 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Dog: Codable { 
-
+public struct Dog: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
index 8ff49b2af23f..7786f8acc5ae 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct DogAllOf: Codable { 
-
+public struct DogAllOf: Codable {
 
     public var breed: String?
 
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index e2d3fa04f94b..9844e7c40e35 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumArrays: Codable { 
-
+public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable, CaseIterable {
         case greaterThanOrEqualTo = ">="
@@ -27,7 +25,7 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index c2c639ba3246..d4029d73f8af 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable, CaseIterable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index a56e1f36389b..789f583e1d77 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumTest: Codable { 
-
+public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index 773b53b2cb76..abf3ccffc485 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Must be named &#x60;File&#x60; for test. */
-public struct File: Codable { 
-
+public struct File: Codable {
 
     /** Test capitalization */
     public var sourceURI: String?
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 83dc1148cfa3..532f1457939a 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FileSchemaTestClass: Codable { 
-
+public struct FileSchemaTestClass: Codable {
 
     public var file: File?
     public var files: [File]?
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index bccd3f9fb178..20bd6d103b3d 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FormatTest: Codable { 
-
+public struct FormatTest: Codable {
 
     public var integer: Int?
     public var int32: Int?
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 566d71a35ef0..906ddb06fb17 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct HasOnlyReadOnly: Codable { 
-
+public struct HasOnlyReadOnly: Codable {
 
     public var bar: String?
     public var foo: String?
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 80cecab242f2..fe13d302ccbf 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct List: Codable { 
-
+public struct List: Codable {
 
     public var _123list: String?
 
@@ -17,7 +15,7 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _123list = "123-list"
     }
 
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index f0c02de95f7a..4b6037f378ee 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,27 +7,25 @@
 
 import Foundation
 
-
-public struct MapTest: Codable { 
-
+public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-    public var directMap: [String:Bool]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
+    public var directMap: [String: Bool]?
     public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 710e62a9b587..c3deb2f28932 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,15 +7,13 @@
 
 import Foundation
 
-
-public struct MixedPropertiesAndAdditionalPropertiesClass: Codable { 
-
+public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index 450a53b918ca..b61db7d6e716 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name starting with number */
-public struct Model200Response: Codable { 
-
+public struct Model200Response: Codable {
 
     public var name: Int?
     public var _class: String?
@@ -19,7 +18,7 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case _class = "class"
     }
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index 6deb69fcd731..8ab4db44b73a 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name same as property name */
-public struct Name: Codable { 
-
+public struct Name: Codable {
 
     public var name: Int
     public var snakeCase: Int?
@@ -23,7 +22,7 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case snakeCase = "snake_case"
         case property
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index 0c9ee2b7b9f4..4d1dafcc2c1f 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct NumberOnly: Codable { 
-
+public struct NumberOnly: Codable {
 
     public var justNumber: Double?
 
@@ -17,7 +15,7 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justNumber = "JustNumber"
     }
 
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index ab0eac0b304e..40c30cc8609c 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Order: Codable { 
-
+public struct Order: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case placed = "placed"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index 4a7d22710441..18c3a024f122 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct OuterComposite: Codable { 
-
+public struct OuterComposite: Codable {
 
     public var myNumber: Double?
     public var myString: String?
@@ -21,7 +19,7 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index 9e6b8d74e874..c3b778cbbed4 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable, CaseIterable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index a973071d6c96..b9ce0e933256 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Pet: Codable { 
-
+public struct Pet: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index b2a6b7e2b8a6..0acd21fd1000 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ReadOnlyFirst: Codable { 
-
+public struct ReadOnlyFirst: Codable {
 
     public var bar: String?
     public var baz: String?
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index 7e089dcee2b4..c223f993a69e 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing reserved words */
-public struct Return: Codable { 
-
+public struct Return: Codable {
 
     public var _return: Int?
 
@@ -17,7 +16,7 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _return = "return"
     }
 
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index e890ef952520..6e8650f76d8e 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct SpecialModelName: Codable { 
-
+public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
 
@@ -17,7 +15,7 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case specialPropertyName = "$special[property.name]"
     }
 
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index f65ae0623d6e..3f1237fee477 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
+public struct StringBooleanMap: Codable {
 
-public struct StringBooleanMap: Codable { 
-
-
-
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,5 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
 }
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index a91b6061bcf7..4dd8a9a9f5a0 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Tag: Codable { 
-
+public struct Tag: Codable {
 
     public var id: Int64?
     public var name: String?
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index 2d377c3edb02..a9e088808ed3 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderDefault: Codable { 
-
+public struct TypeHolderDefault: Codable {
 
     public var stringItem: String = "what"
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index e5eb92da696e..dff4083ae432 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderExample: Codable { 
-
+public struct TypeHolderExample: Codable {
 
     public var stringItem: String
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index f70328ca9e59..79f271ed7356 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct User: Codable { 
-
+public struct User: Codable {
 
     public var id: Int64?
     public var username: String?
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
index 22261e2ce948..55d0eb421919 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -14,7 +14,7 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
         return URLSessionRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return URLSessionDecodableRequestBuilder<T>.self
     }
 }
@@ -23,16 +23,16 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
 private var urlSessionStore = SynchronizedDictionary<String, URLSession>()
 
 open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
-    
+
     private var observation: NSKeyValueObservation?
-    
+
     deinit {
         observation?.invalidate()
     }
-    
+
     // swiftlint:disable:next weak_delegate
     fileprivate let sessionDelegate = SessionDelegate()
-    
+
     /**
      May be assigned if you want to control the authentication challenges.
      */
@@ -45,11 +45,11 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      - retry the request.
      */
     public var taskCompletionShouldRetry: ((Data?, URLResponse?, Error?, @escaping (Bool) -> Void) -> Void)?
-    
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
-    
+
     /**
      May be overridden by a subclass if you want to control the URLSession
      configuration.
@@ -77,40 +77,40 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the URLRequest
      configuration (e.g. to override the cache policy).
      */
-    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) throws -> URLRequest {
-        
+    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) throws -> URLRequest {
+
         guard let url = URL(string: URLString) else {
             throw DownloadException.requestMissingURL
         }
-        
+
         var originalRequest = URLRequest(url: url)
-        
+
         originalRequest.httpMethod = method.rawValue
-        
+
         buildHeaders().forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         headers.forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         let modifiedRequest = try encoding.encode(originalRequest, with: parameters)
-        
+
         return modifiedRequest
     }
 
     override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
-        let urlSessionId:String = UUID().uuidString
+        let urlSessionId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let urlSession = createURLSession()
         urlSessionStore[urlSessionId] = urlSession
-        
+
         let parameters: [String: Any] = self.parameters ?? [:]
-        
+
         let fileKeys = parameters.filter { $1 is URL }
             .map { $0.0 }
-        
+
         let encoding: ParameterEncoding
         if fileKeys.count > 0 {
             encoding = FileUploadEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
@@ -119,29 +119,29 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         } else {
             encoding = URLEncoding()
         }
-        
+
         guard let xMethod = HTTPMethod(rawValue: method) else {
             fatalError("Unsuported Http method - \(method)")
         }
-        
+
         let cleanupRequest = {
             urlSessionStore[urlSessionId] = nil
             self.observation?.invalidate()
         }
-        
+
         do {
             let request = try createURLRequest(urlSession: urlSession, method: xMethod, encoding: encoding, headers: headers)
-            
+
             let dataTask = urlSession.dataTask(with: request) { [weak self] data, response, error in
-                
+
                 guard let self = self else { return }
-                
+
                 if let taskCompletionShouldRetry = self.taskCompletionShouldRetry {
-                    
+
                     taskCompletionShouldRetry(data, response, error) { [weak self] shouldRetry in
-                        
+
                         guard let self = self else { return }
-                        
+
                         if shouldRetry {
                             cleanupRequest()
                             self.execute(apiResponseQueue, completion)
@@ -157,13 +157,13 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
                     }
                 }
             }
-            
+
             if #available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) {
                 onProgressReady?(dataTask.progress)
             }
-            
+
             dataTask.resume()
-            
+
         } catch {
             apiResponseQueue.async {
                 cleanupRequest()
@@ -172,7 +172,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         }
 
     }
-    
+
     fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -192,52 +192,52 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is URL.Type:
             do {
-                
+
                 guard error == nil else {
                     throw DownloadException.responseFailed
                 }
-                
+
                 guard let data = data else {
                     throw DownloadException.responseDataMissing
                 }
-                
+
                 let fileManager = FileManager.default
                 let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
                 let requestURL = try self.getURL(from: urlRequest)
-                
+
                 var requestPath = try self.getPath(from: requestURL)
-                
+
                 if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) {
                     requestPath = requestPath.appending("/\(headerFileName)")
                 }
-                
+
                 let filePath = documentsDirectory.appendingPathComponent(requestPath)
                 let directoryPath = filePath.deletingLastPathComponent().path
-                
+
                 try fileManager.createDirectory(atPath: directoryPath, withIntermediateDirectories: true, attributes: nil)
                 try data.write(to: filePath, options: .atomic)
-                
+
                 completion(.success(Response(response: httpResponse, body: filePath as? T)))
-                
+
             } catch let requestParserError as DownloadException {
                 completion(.failure(ErrorResponse.error(400, data, requestParserError)))
             } catch let error {
                 completion(.failure(ErrorResponse.error(400, data, error)))
             }
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         default:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
         }
 
@@ -251,7 +251,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -270,7 +270,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
             filename = contentItem
             return filename?
-                .replacingCharacters(in: range, with:"")
+                .replacingCharacters(in: range, with: "")
                 .replacingOccurrences(of: "\"", with: "")
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
@@ -279,7 +279,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -293,7 +293,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -304,7 +304,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuilder<T> {
+open class URLSessionDecodableRequestBuilder<T: Decodable>: URLSessionRequestBuilder<T> {
     override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -324,28 +324,28 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         case is Data.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
-            
+
         default:
-            
+
             guard let data = data, !data.isEmpty else {
                 completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, DecodableRequestBuilderError.emptyDataResponse)))
                 return
             }
-            
+
             let decodeResult = CodableHelper.decode(T.self, from: data)
-            
+
             switch decodeResult {
             case let .success(decodableObj):
                 completion(.success(Response(response: httpResponse, body: decodableObj)))
@@ -356,10 +356,10 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
     }
 }
 
-fileprivate class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
-    
+private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
+
     var credential: URLCredential?
-    
+
     var taskDidReceiveChallenge: ((URLSession, URLSessionTask, URLAuthenticationChallenge) -> (URLSession.AuthChallengeDisposition, URLCredential?))?
 
     func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
@@ -402,13 +402,13 @@ public protocol ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest
 }
 
-fileprivate class URLEncoding: ParameterEncoding {
-    func encode(_ urlRequest: URLRequest, with parameters: [String : Any]?) throws -> URLRequest {
-        
+private class URLEncoding: ParameterEncoding {
+    func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
+
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters else { return urlRequest }
-        
+
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
         }
@@ -417,12 +417,12 @@ fileprivate class URLEncoding: ParameterEncoding {
             urlComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters)
             urlRequest.url = urlComponents.url
         }
-        
+
         return urlRequest
     }
 }
 
-fileprivate class FileUploadEncoding: ParameterEncoding {
+private class FileUploadEncoding: ParameterEncoding {
 
     let contentTypeForFormPart: (_ fileURL: URL) -> String?
 
@@ -433,13 +433,13 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters, !parameters.isEmpty else {
             return urlRequest
         }
-        
+
         let boundary = "Boundary-\(UUID().uuidString)"
-                
+
         urlRequest.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
 
         for (key, value) in parameters {
@@ -479,7 +479,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
                 fatalError("Unprocessable value \(value) with key \(key)")
             }
         }
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         body.append("\r\n--\(boundary)--\r\n")
@@ -494,7 +494,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         var urlRequest = urlRequest
 
         var body = urlRequest.httpBody.orEmpty
-        
+
         let fileData = try Data(contentsOf: fileURL)
 
         let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL)
@@ -502,7 +502,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         let fileName = fileURL.lastPathComponent
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
@@ -518,20 +518,20 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
 
         // The value data.
         body.append(fileData)
-        
+
         urlRequest.httpBody = body
 
         return urlRequest
     }
-    
+
     private func configureDataUploadRequest(urlRequest: URLRequest, boundary: String, name: String, data: Data) -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
diff --git a/samples/client/petstore/swift5/deprecated/Package.swift b/samples/client/petstore/swift5/deprecated/Package.swift
index 79f6f8188738..96dfff54edf4 100644
--- a/samples/client/petstore/swift5/deprecated/Package.swift
+++ b/samples/client/petstore/swift5/deprecated/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "PetstoreClient",
-            targets: ["PetstoreClient"]),
+            targets: ["PetstoreClient"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -26,6 +26,6 @@ let package = Package(
             name: "PetstoreClient",
             dependencies: [],
             path: "PetstoreClient/Classes"
-        ),
+        )
     ]
 )
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 2404bc8ffc6d..5b09f9557113 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+            if let collection = item.value as? [Any?] {
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -46,15 +46,15 @@ public struct APIHelper {
     }
 
     public static func mapValueToPathItem(_ source: Any) -> Any {
-        if let collection = source as? Array<Any?> {
+        if let collection = source as? [Any?] {
             return collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
         }
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
+            if let collection = item.value as? [Any?] {
                 collection.filter({ $0 != nil }).map({"\($0!)"}).forEach { value in
                     result.append(URLQueryItem(name: item.key, value: value))
                 }
@@ -69,4 +69,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs.swift
index 92d547e0d69d..74babd69f97c 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,15 +9,15 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = URLSessionRequestBuilderFactory()
     public static var apiResponseQueue: DispatchQueue = .main
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
@@ -25,9 +25,9 @@ open class RequestBuilder<T> {
     /// Optional block to obtain a reference to the request's progress instance when available.
     /// With the URLSession http client the request's progress only works on iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0.
     /// If you need to get the request's progress in older OS versions, please use Alamofire http client.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -37,7 +37,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -60,5 +60,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index dbbbd66db265..06a266aab47c 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -17,7 +15,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func addPet(pet: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func addPet(pet: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         addPetWithRequestBuilder(pet: pet).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -57,7 +55,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -84,8 +82,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey?.encodeToJSON()
@@ -113,7 +111,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -137,8 +135,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status.encodeToJSON()
@@ -157,7 +155,7 @@ open class PetAPI {
      - parameter completion: completion handler to receive the data and the error objects
      */
     @available(*, deprecated, message: "This operation is deprecated.")
-    open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -182,8 +180,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags.encodeToJSON()
@@ -201,7 +199,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?,_ error: Error?) -> Void)) {
+    open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) {
         getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -228,8 +226,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -244,7 +242,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePet(pet: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePet(pet: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithRequestBuilder(pet: pet).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -285,7 +283,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -313,14 +311,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name?.encodeToJSON(),
             "status": status?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -337,7 +335,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -365,14 +363,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "file": file?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 16fb9c207a4f..ff1100159542 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -17,7 +15,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -41,8 +39,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{orderId}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -56,7 +54,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
+    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -76,14 +74,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -95,7 +93,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -119,8 +117,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{orderId}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -135,7 +133,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func placeOrder(order: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func placeOrder(order: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         placeOrderWithRequestBuilder(order: order).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index 8220640259af..04a9b99643c0 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -17,7 +15,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUser(user: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUser(user: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUserWithRequestBuilder(user: user).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -57,7 +55,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithArrayInput(user: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithArrayInput(user: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithArrayInputWithRequestBuilder(user: user).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -96,7 +94,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithListInput(user: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithListInput(user: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithListInputWithRequestBuilder(user: user).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -135,7 +133,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -162,8 +160,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -178,7 +176,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?,_ error: Error?) -> Void)) {
+    open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) {
         getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -201,8 +199,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -218,7 +216,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -240,11 +238,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username.encodeToJSON(), 
+            "username": username.encodeToJSON(),
             "password": password.encodeToJSON()
         ])
 
@@ -259,7 +257,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         logoutUserWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -281,8 +279,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -298,7 +296,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updateUser(username: String, user: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updateUser(username: String, user: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updateUserWithRequestBuilder(username: username, user: user).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 01b28a4bd42d..ef971ebadc60 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -45,4 +45,4 @@ open class CodableHelper {
     open class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
         return Swift.Result { try self.jsonEncoder.encode(value) }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index f171525e4394..627d9adb757e 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,10 +7,10 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
 	@available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.")
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 6e279679c67a..93ed6b90b376 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -108,24 +108,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -135,7 +135,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -147,8 +147,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -157,8 +157,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -177,5 +177,3 @@ extension HTTPURLResponse {
         return Array(200 ..< 300).contains(statusCode)
     }
 }
-
-
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
index 08f1ef334dff..b79e9f5e64d5 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
@@ -41,7 +41,7 @@ public struct JSONDataEncoding {
     }
 
     public static func encodingParameters(jsonData: Data?) -> [String: Any]? {
-        var returnedParams: [String: Any]? = nil
+        var returnedParams: [String: Any]?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params: [String: Any] = [:]
             params[jsonDataKey] = jsonData
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 314f1eff1f9b..02f78ffb4705 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -9,8 +9,8 @@ import Foundation
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
+        var params: [String: Any]?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -27,7 +27,7 @@ open class JSONEncodingHelper {
     }
 
     open class func encodingParameters(forEncodableObject encodableObj: Any?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+        var params: [String: Any]?
 
         if let encodableObj = encodableObj {
             do {
@@ -41,5 +41,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models.swift
index 11e81ffcc472..c0542c14c081 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,11 +10,11 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
-public enum DownloadException : Error {
+public enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -30,7 +30,6 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-
 open class Response<T> {
     public let statusCode: Int
     public let header: [String: String]
@@ -44,7 +43,7 @@ open class Response<T> {
 
     public convenience init(response: HTTPURLResponse, body: T?) {
         let rawHeader = response.allHeaderFields
-        var header = [String:String]()
+        var header = [String: String]()
         for (key, value) in rawHeader {
             if let key = key.base as? String, let value = value as? String {
                 header[key] = value
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index cab2fbb07782..e74820fd28ac 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Describes the result of uploading an image resource */
-public struct ApiResponse: Codable { 
-
+public struct ApiResponse: Codable {
 
     public var code: Int?
     public var type: String?
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index 7006e56507f5..fec18cc7a6c7 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** A category for a pet */
-public struct Category: Codable { 
-
+public struct Category: Codable {
 
     public var id: Int64?
     public var name: String?
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/InlineObject.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/InlineObject.swift
index 1c8072f6bada..ac5216fe6876 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/InlineObject.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/InlineObject.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct InlineObject: Codable { 
-
+public struct InlineObject: Codable {
 
     /** Updated name of the pet */
     public var name: String?
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/InlineObject1.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/InlineObject1.swift
index fa806b07294d..1c2fd3255dd1 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/InlineObject1.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/InlineObject1.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct InlineObject1: Codable { 
-
+public struct InlineObject1: Codable {
 
     /** Additional data to pass to server */
     public var additionalMetadata: String?
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index 1adf3d7acc7e..1fa6995d1c7b 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -9,8 +9,7 @@ import Foundation
 
 /** An order for a pets from the pet store */
 @available(*, deprecated, message: "This schema is deprecated.")
-public struct Order: Codable { 
-
+public struct Order: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case placed = "placed"
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index ffd5eb5d9165..622f2c9bd432 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** A pet for sale in the pet store */
-public struct Pet: Codable { 
-
+public struct Pet: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"
@@ -19,7 +18,7 @@ public struct Pet: Codable {
     public var id: Int64?
     public var category: Category?
     public var name: String?
-    
+
     @available(*, deprecated, message: "This property is deprecated.")
     public var photoUrls: [String]
     public var tags: [Tag]?
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index 55993174744a..98a78982e592 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** A tag for a pet */
-public struct Tag: Codable { 
-
+public struct Tag: Codable {
 
     public var id: Int64?
     public var name: String?
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index ddf682b7dde2..4e42f6f28595 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** A User who is purchasing from the pet store */
-public struct User: Codable { 
-
+public struct User: Codable {
 
     public var id: Int64?
     public var username: String?
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
index 22261e2ce948..55d0eb421919 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -14,7 +14,7 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
         return URLSessionRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return URLSessionDecodableRequestBuilder<T>.self
     }
 }
@@ -23,16 +23,16 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
 private var urlSessionStore = SynchronizedDictionary<String, URLSession>()
 
 open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
-    
+
     private var observation: NSKeyValueObservation?
-    
+
     deinit {
         observation?.invalidate()
     }
-    
+
     // swiftlint:disable:next weak_delegate
     fileprivate let sessionDelegate = SessionDelegate()
-    
+
     /**
      May be assigned if you want to control the authentication challenges.
      */
@@ -45,11 +45,11 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      - retry the request.
      */
     public var taskCompletionShouldRetry: ((Data?, URLResponse?, Error?, @escaping (Bool) -> Void) -> Void)?
-    
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
-    
+
     /**
      May be overridden by a subclass if you want to control the URLSession
      configuration.
@@ -77,40 +77,40 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the URLRequest
      configuration (e.g. to override the cache policy).
      */
-    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) throws -> URLRequest {
-        
+    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) throws -> URLRequest {
+
         guard let url = URL(string: URLString) else {
             throw DownloadException.requestMissingURL
         }
-        
+
         var originalRequest = URLRequest(url: url)
-        
+
         originalRequest.httpMethod = method.rawValue
-        
+
         buildHeaders().forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         headers.forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         let modifiedRequest = try encoding.encode(originalRequest, with: parameters)
-        
+
         return modifiedRequest
     }
 
     override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
-        let urlSessionId:String = UUID().uuidString
+        let urlSessionId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let urlSession = createURLSession()
         urlSessionStore[urlSessionId] = urlSession
-        
+
         let parameters: [String: Any] = self.parameters ?? [:]
-        
+
         let fileKeys = parameters.filter { $1 is URL }
             .map { $0.0 }
-        
+
         let encoding: ParameterEncoding
         if fileKeys.count > 0 {
             encoding = FileUploadEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
@@ -119,29 +119,29 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         } else {
             encoding = URLEncoding()
         }
-        
+
         guard let xMethod = HTTPMethod(rawValue: method) else {
             fatalError("Unsuported Http method - \(method)")
         }
-        
+
         let cleanupRequest = {
             urlSessionStore[urlSessionId] = nil
             self.observation?.invalidate()
         }
-        
+
         do {
             let request = try createURLRequest(urlSession: urlSession, method: xMethod, encoding: encoding, headers: headers)
-            
+
             let dataTask = urlSession.dataTask(with: request) { [weak self] data, response, error in
-                
+
                 guard let self = self else { return }
-                
+
                 if let taskCompletionShouldRetry = self.taskCompletionShouldRetry {
-                    
+
                     taskCompletionShouldRetry(data, response, error) { [weak self] shouldRetry in
-                        
+
                         guard let self = self else { return }
-                        
+
                         if shouldRetry {
                             cleanupRequest()
                             self.execute(apiResponseQueue, completion)
@@ -157,13 +157,13 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
                     }
                 }
             }
-            
+
             if #available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) {
                 onProgressReady?(dataTask.progress)
             }
-            
+
             dataTask.resume()
-            
+
         } catch {
             apiResponseQueue.async {
                 cleanupRequest()
@@ -172,7 +172,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         }
 
     }
-    
+
     fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -192,52 +192,52 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is URL.Type:
             do {
-                
+
                 guard error == nil else {
                     throw DownloadException.responseFailed
                 }
-                
+
                 guard let data = data else {
                     throw DownloadException.responseDataMissing
                 }
-                
+
                 let fileManager = FileManager.default
                 let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
                 let requestURL = try self.getURL(from: urlRequest)
-                
+
                 var requestPath = try self.getPath(from: requestURL)
-                
+
                 if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) {
                     requestPath = requestPath.appending("/\(headerFileName)")
                 }
-                
+
                 let filePath = documentsDirectory.appendingPathComponent(requestPath)
                 let directoryPath = filePath.deletingLastPathComponent().path
-                
+
                 try fileManager.createDirectory(atPath: directoryPath, withIntermediateDirectories: true, attributes: nil)
                 try data.write(to: filePath, options: .atomic)
-                
+
                 completion(.success(Response(response: httpResponse, body: filePath as? T)))
-                
+
             } catch let requestParserError as DownloadException {
                 completion(.failure(ErrorResponse.error(400, data, requestParserError)))
             } catch let error {
                 completion(.failure(ErrorResponse.error(400, data, error)))
             }
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         default:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
         }
 
@@ -251,7 +251,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -270,7 +270,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
             filename = contentItem
             return filename?
-                .replacingCharacters(in: range, with:"")
+                .replacingCharacters(in: range, with: "")
                 .replacingOccurrences(of: "\"", with: "")
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
@@ -279,7 +279,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -293,7 +293,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -304,7 +304,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuilder<T> {
+open class URLSessionDecodableRequestBuilder<T: Decodable>: URLSessionRequestBuilder<T> {
     override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -324,28 +324,28 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         case is Data.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
-            
+
         default:
-            
+
             guard let data = data, !data.isEmpty else {
                 completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, DecodableRequestBuilderError.emptyDataResponse)))
                 return
             }
-            
+
             let decodeResult = CodableHelper.decode(T.self, from: data)
-            
+
             switch decodeResult {
             case let .success(decodableObj):
                 completion(.success(Response(response: httpResponse, body: decodableObj)))
@@ -356,10 +356,10 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
     }
 }
 
-fileprivate class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
-    
+private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
+
     var credential: URLCredential?
-    
+
     var taskDidReceiveChallenge: ((URLSession, URLSessionTask, URLAuthenticationChallenge) -> (URLSession.AuthChallengeDisposition, URLCredential?))?
 
     func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
@@ -402,13 +402,13 @@ public protocol ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest
 }
 
-fileprivate class URLEncoding: ParameterEncoding {
-    func encode(_ urlRequest: URLRequest, with parameters: [String : Any]?) throws -> URLRequest {
-        
+private class URLEncoding: ParameterEncoding {
+    func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
+
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters else { return urlRequest }
-        
+
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
         }
@@ -417,12 +417,12 @@ fileprivate class URLEncoding: ParameterEncoding {
             urlComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters)
             urlRequest.url = urlComponents.url
         }
-        
+
         return urlRequest
     }
 }
 
-fileprivate class FileUploadEncoding: ParameterEncoding {
+private class FileUploadEncoding: ParameterEncoding {
 
     let contentTypeForFormPart: (_ fileURL: URL) -> String?
 
@@ -433,13 +433,13 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters, !parameters.isEmpty else {
             return urlRequest
         }
-        
+
         let boundary = "Boundary-\(UUID().uuidString)"
-                
+
         urlRequest.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
 
         for (key, value) in parameters {
@@ -479,7 +479,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
                 fatalError("Unprocessable value \(value) with key \(key)")
             }
         }
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         body.append("\r\n--\(boundary)--\r\n")
@@ -494,7 +494,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         var urlRequest = urlRequest
 
         var body = urlRequest.httpBody.orEmpty
-        
+
         let fileData = try Data(contentsOf: fileURL)
 
         let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL)
@@ -502,7 +502,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         let fileName = fileURL.lastPathComponent
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
@@ -518,20 +518,20 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
 
         // The value data.
         body.append(fileData)
-        
+
         urlRequest.httpBody = body
 
         return urlRequest
     }
-    
+
     private func configureDataUploadRequest(urlRequest: URLRequest, boundary: String, name: String, data: Data) -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
diff --git a/samples/client/petstore/swift5/nonPublicApi/Package.swift b/samples/client/petstore/swift5/nonPublicApi/Package.swift
index 79f6f8188738..96dfff54edf4 100644
--- a/samples/client/petstore/swift5/nonPublicApi/Package.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "PetstoreClient",
-            targets: ["PetstoreClient"]),
+            targets: ["PetstoreClient"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -26,6 +26,6 @@ let package = Package(
             name: "PetstoreClient",
             dependencies: [],
             path: "PetstoreClient/Classes"
-        ),
+        )
     ]
 )
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 799478f138f9..1a1716eb8a3a 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 internal struct APIHelper {
-    internal static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    internal static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ internal struct APIHelper {
         return destination
     }
 
-    internal static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    internal static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+            if let collection = item.value as? [Any?] {
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    internal static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    internal static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -46,15 +46,15 @@ internal struct APIHelper {
     }
 
     internal static func mapValueToPathItem(_ source: Any) -> Any {
-        if let collection = source as? Array<Any?> {
+        if let collection = source as? [Any?] {
             return collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
         }
         return source
     }
 
-    internal static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    internal static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
+            if let collection = item.value as? [Any?] {
                 collection.filter({ $0 != nil }).map({"\($0!)"}).forEach { value in
                     result.append(URLQueryItem(name: item.key, value: value))
                 }
@@ -69,4 +69,3 @@ internal struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs.swift
index 7fa1e45632eb..5dfbd9cea8d9 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,15 +9,15 @@ import Foundation
 internal class PetstoreClientAPI {
     internal static var basePath = "http://petstore.swagger.io:80/v2"
     internal static var credential: URLCredential?
-    internal static var customHeaders: [String:String] = [:]
+    internal static var customHeaders: [String: String] = [:]
     internal static var requestBuilderFactory: RequestBuilderFactory = URLSessionRequestBuilderFactory()
     internal static var apiResponseQueue: DispatchQueue = .main
 }
 
 internal class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    internal let parameters: [String:Any]?
+    var headers: [String: String]
+    internal let parameters: [String: Any]?
     internal let isBody: Bool
     internal let method: String
     internal let URLString: String
@@ -25,9 +25,9 @@ internal class RequestBuilder<T> {
     /// Optional block to obtain a reference to the request's progress instance when available.
     /// With the URLSession http client the request's progress only works on iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0.
     /// If you need to get the request's progress in older OS versions, please use Alamofire http client.
-    internal var onProgressReady: ((Progress) -> ())?
+    internal var onProgressReady: ((Progress) -> Void)?
 
-    required internal init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required internal init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -37,7 +37,7 @@ internal class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    internal func addHeaders(_ aHeaders:[String:String]) {
+    internal func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -60,5 +60,5 @@ internal class RequestBuilder<T> {
 
 internal protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index 81f23f107ad6..174e6c12aedd 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 internal class AnotherFakeAPI {
     /**
      To test special tags
@@ -17,7 +15,7 @@ internal class AnotherFakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    internal class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         call123testSpecialTagsWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index e52322c01c51..ab1b8f092475 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 internal class FakeAPI {
     /**
 
@@ -16,7 +14,7 @@ internal class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?,_ error: Error?) -> Void)) {
+    internal class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) {
         fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -51,7 +49,7 @@ internal class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
+    internal class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) {
         fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -86,7 +84,7 @@ internal class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?,_ error: Error?) -> Void)) {
+    internal class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) {
         fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -121,7 +119,7 @@ internal class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    internal class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -156,7 +154,7 @@ internal class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -192,7 +190,7 @@ internal class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -231,7 +229,7 @@ internal class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    internal class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -281,7 +279,7 @@ internal class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func testEndpointParameters(integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, number: Double, float: Float? = nil, double: Double, string: String? = nil, patternWithoutDelimiter: String, byte: Data, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func testEndpointParameters(integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, number: Double, float: Float? = nil, double: Double, string: String? = nil, patternWithoutDelimiter: String, byte: Data, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEndpointParametersWithRequestBuilder(integer: integer, int32: int32, int64: int64, number: number, float: float, double: double, string: string, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -318,7 +316,7 @@ internal class FakeAPI {
     internal class func testEndpointParametersWithRequestBuilder(integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, number: Double, float: Float? = nil, double: Double, string: String? = nil, patternWithoutDelimiter: String, byte: Data, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -337,7 +335,7 @@ internal class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -426,7 +424,7 @@ internal class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -454,19 +452,19 @@ internal class FakeAPI {
     internal class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray?.encodeToJSON(),
             "enum_form_string": enumFormString?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(), 
-            "enum_query_string": enumQueryString?.encodeToJSON(), 
-            "enum_query_integer": enumQueryInteger?.encodeToJSON(), 
+            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(),
+            "enum_query_string": enumQueryString?.encodeToJSON(),
+            "enum_query_integer": enumQueryInteger?.encodeToJSON(),
             "enum_query_double": enumQueryDouble?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -492,7 +490,7 @@ internal class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -518,13 +516,13 @@ internal class FakeAPI {
     internal class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -545,7 +543,7 @@ internal class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func testInlineAdditionalProperties(param: [String:String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -562,7 +560,7 @@ internal class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    internal class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    internal class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -582,7 +580,7 @@ internal class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -603,14 +601,14 @@ internal class FakeAPI {
     internal class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param.encodeToJSON(),
             "param2": param2.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index 969fc92e025d..548c5fb35236 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 internal class FakeClassnameTags123API {
     /**
      To test class name in snake case
@@ -17,7 +15,7 @@ internal class FakeClassnameTags123API {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    internal class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index d4b32bb967e5..cb54fce0dcb1 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 internal class PetAPI {
     /**
      Add a new pet to the store
@@ -17,7 +15,7 @@ internal class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         addPetWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -57,7 +55,7 @@ internal class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func deletePet(apiKey: String? = nil, petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func deletePet(apiKey: String? = nil, petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deletePetWithRequestBuilder(apiKey: apiKey, petId: petId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -84,8 +82,8 @@ internal class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey?.encodeToJSON()
@@ -113,7 +111,7 @@ internal class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    internal class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -137,8 +135,8 @@ internal class PetAPI {
     internal class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status.encodeToJSON()
@@ -157,7 +155,7 @@ internal class PetAPI {
      - parameter completion: completion handler to receive the data and the error objects
      */
     @available(*, deprecated, message: "This operation is deprecated.")
-    internal class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    internal class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -182,8 +180,8 @@ internal class PetAPI {
     internal class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags.encodeToJSON()
@@ -201,7 +199,7 @@ internal class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?,_ error: Error?) -> Void)) {
+    internal class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) {
         getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -228,8 +226,8 @@ internal class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -244,7 +242,7 @@ internal class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -285,7 +283,7 @@ internal class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -313,14 +311,14 @@ internal class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name?.encodeToJSON(),
             "status": status?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -337,7 +335,7 @@ internal class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    internal class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -365,14 +363,14 @@ internal class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "file": file?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -389,7 +387,7 @@ internal class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func uploadFileWithRequiredFile(petId: Int64, additionalMetadata: String? = nil, requiredFile: URL, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    internal class func uploadFileWithRequiredFile(petId: Int64, additionalMetadata: String? = nil, requiredFile: URL, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequiredFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, requiredFile: requiredFile).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -417,14 +415,14 @@ internal class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "requiredFile": requiredFile.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 528a19a9032b..f1e423111d09 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 internal class StoreAPI {
     /**
      Delete purchase order by ID
@@ -17,7 +15,7 @@ internal class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -41,8 +39,8 @@ internal class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -56,7 +54,7 @@ internal class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
+    internal class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -76,14 +74,14 @@ internal class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    internal class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    internal class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -95,7 +93,7 @@ internal class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    internal class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -119,8 +117,8 @@ internal class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -135,7 +133,7 @@ internal class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    internal class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         placeOrderWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index 298a7fee4850..c8d714e89916 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 internal class UserAPI {
     /**
      Create user
@@ -17,7 +15,7 @@ internal class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUserWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -54,7 +52,7 @@ internal class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithArrayInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -90,7 +88,7 @@ internal class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithListInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -126,7 +124,7 @@ internal class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -150,8 +148,8 @@ internal class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -166,7 +164,7 @@ internal class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?,_ error: Error?) -> Void)) {
+    internal class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) {
         getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -189,8 +187,8 @@ internal class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -206,7 +204,7 @@ internal class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    internal class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -228,11 +226,11 @@ internal class UserAPI {
     internal class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username.encodeToJSON(), 
+            "username": username.encodeToJSON(),
             "password": password.encodeToJSON()
         ])
 
@@ -247,7 +245,7 @@ internal class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         logoutUserWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -266,8 +264,8 @@ internal class UserAPI {
     internal class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -283,7 +281,7 @@ internal class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    internal class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    internal class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 1fcfa109860d..280238b8263d 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -45,4 +45,4 @@ internal class CodableHelper {
     internal class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
         return Swift.Result { try self.jsonEncoder.encode(value) }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index 400d8bd126c7..4dfbe7b0cde7 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,10 +7,10 @@
 import Foundation
 
 internal class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
 	@available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.")
     internal static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index f7550a684a7a..e5511b3aa373 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -108,24 +108,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    internal mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    internal mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    internal mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    internal mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    internal mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    internal mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    internal mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    internal mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -135,7 +135,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    internal func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    internal func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -147,8 +147,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    internal func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
+    internal func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -157,8 +157,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    internal func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    internal func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -177,5 +177,3 @@ extension HTTPURLResponse {
         return Array(200 ..< 300).contains(statusCode)
     }
 }
-
-
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
index 332e960ac68c..6b69f3b1bd50 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
@@ -41,7 +41,7 @@ internal struct JSONDataEncoding {
     }
 
     internal static func encodingParameters(jsonData: Data?) -> [String: Any]? {
-        var returnedParams: [String: Any]? = nil
+        var returnedParams: [String: Any]?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params: [String: Any] = [:]
             params[jsonDataKey] = jsonData
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 47329d53ee41..7d8f433dfea7 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -9,8 +9,8 @@ import Foundation
 
 internal class JSONEncodingHelper {
 
-    internal class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+    internal class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
+        var params: [String: Any]?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -27,7 +27,7 @@ internal class JSONEncodingHelper {
     }
 
     internal class func encodingParameters(forEncodableObject encodableObj: Any?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+        var params: [String: Any]?
 
         if let encodableObj = encodableObj {
             do {
@@ -41,5 +41,5 @@ internal class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models.swift
index 236120acc15e..6089ac67d0d8 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,11 +10,11 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-internal enum ErrorResponse : Error {
+internal enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
-internal enum DownloadException : Error {
+internal enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -30,7 +30,6 @@ internal enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-
 internal class Response<T> {
     internal let statusCode: Int
     internal let header: [String: String]
@@ -44,7 +43,7 @@ internal class Response<T> {
 
     internal convenience init(response: HTTPURLResponse, body: T?) {
         let rawHeader = response.allHeaderFields
-        var header = [String:String]()
+        var header = [String: String]()
         for (key, value) in rawHeader {
             if let key = key.base as? String, let value = value as? String {
                 header[key] = value
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index c8876320f47a..b4d5ae6faf93 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,19 +7,17 @@
 
 import Foundation
 
+internal struct AdditionalPropertiesClass: Codable {
 
-internal struct AdditionalPropertiesClass: Codable { 
+    internal var mapString: [String: String]?
+    internal var mapMapString: [String: [String: String]]?
 
-
-    internal var mapString: [String:String]?
-    internal var mapMapString: [String:[String:String]]?
-
-    internal init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    internal init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index 20d157f4ebcb..ada7f86de509 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct Animal: Codable { 
-
+internal struct Animal: Codable {
 
     internal var className: String
     internal var color: String? = "red"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index 9c570350859f..3ebe9e9a5dea 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 internal typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index 88b4b69c1668..b60d8999b4b2 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct ApiResponse: Codable { 
-
+internal struct ApiResponse: Codable {
 
     internal var code: Int?
     internal var type: String?
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 3e8bc3da83b1..67371b816b30 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct ArrayOfArrayOfNumberOnly: Codable { 
-
+internal struct ArrayOfArrayOfNumberOnly: Codable {
 
     internal var arrayArrayNumber: [[Double]]?
 
@@ -17,7 +15,7 @@ internal struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 8e92c78e4da3..2c7047eac4b0 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct ArrayOfNumberOnly: Codable { 
-
+internal struct ArrayOfNumberOnly: Codable {
 
     internal var arrayNumber: [Double]?
 
@@ -17,7 +15,7 @@ internal struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayNumber = "ArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index d7916cf20b9c..9c3a3a9f5e1f 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct ArrayTest: Codable { 
-
+internal struct ArrayTest: Codable {
 
     internal var arrayOfString: [String]?
     internal var arrayArrayOfInteger: [[Int64]]?
@@ -21,7 +19,7 @@ internal struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index 17221a54edb6..965ec5aefba3 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct Capitalization: Codable { 
-
+internal struct Capitalization: Codable {
 
     internal var smallCamel: String?
     internal var capitalCamel: String?
@@ -28,7 +26,7 @@ internal struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index 28292469ddae..8a603dee5f1f 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct Cat: Codable { 
-
+internal struct Cat: Codable {
 
     internal var className: String
     internal var color: String? = "red"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
index cdcb1aa14b57..45b7dbb26dcf 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct CatAllOf: Codable { 
-
+internal struct CatAllOf: Codable {
 
     internal var declawed: Bool?
 
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index 9b061937e091..849bf788dfb3 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct Category: Codable { 
-
+internal struct Category: Codable {
 
     internal var id: Int64?
     internal var name: String = "default-name"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index 034cbadc8dd6..0f1bc19fe595 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model with \&quot;_class\&quot; property */
-internal struct ClassModel: Codable { 
-
+internal struct ClassModel: Codable {
 
     internal var _class: String?
 
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index e33907ca3a3c..ddee836043fa 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct Client: Codable { 
-
+internal struct Client: Codable {
 
     internal var client: String?
 
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 3d45b8ac7a13..6b5250de4a4a 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct Dog: Codable { 
-
+internal struct Dog: Codable {
 
     internal var className: String
     internal var color: String? = "red"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
index 6fb9a0505161..ef3ff7f1d78b 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct DogAllOf: Codable { 
-
+internal struct DogAllOf: Codable {
 
     internal var breed: String?
 
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index 8aa9c2bd58d2..bb9f64cfb438 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct EnumArrays: Codable { 
-
+internal struct EnumArrays: Codable {
 
     internal enum JustSymbol: String, Codable, CaseIterable {
         case greaterThanOrEqualTo = ">="
@@ -27,7 +25,7 @@ internal struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index 07dfc16a69f2..71fd29e0d2a5 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 internal enum EnumClass: String, Codable, CaseIterable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index 4081beae4c0a..421aa5436b04 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct EnumTest: Codable { 
-
+internal struct EnumTest: Codable {
 
     internal enum EnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
@@ -43,7 +41,7 @@ internal struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index 166138041ecf..632402fb9e03 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Must be named &#x60;File&#x60; for test. */
-internal struct File: Codable { 
-
+internal struct File: Codable {
 
     /** Test capitalization */
     internal var sourceURI: String?
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 2245e94bcc90..e478e6c4b7d1 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct FileSchemaTestClass: Codable { 
-
+internal struct FileSchemaTestClass: Codable {
 
     internal var file: File?
     internal var files: [File]?
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index 30b11efb2e19..23395c93b569 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct FormatTest: Codable { 
-
+internal struct FormatTest: Codable {
 
     internal var integer: Int?
     internal var int32: Int?
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index d51b4421dfe6..831963ba2ed2 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct HasOnlyReadOnly: Codable { 
-
+internal struct HasOnlyReadOnly: Codable {
 
     internal var bar: String?
     internal var foo: String?
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 0a76cba0ed92..c5960de21513 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct List: Codable { 
-
+internal struct List: Codable {
 
     internal var _123list: String?
 
@@ -17,7 +15,7 @@ internal struct List: Codable {
         self._123list = _123list
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case _123list = "123-list"
     }
 
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index b0a860092bc6..db4f8f436aa5 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,27 +7,25 @@
 
 import Foundation
 
-
-internal struct MapTest: Codable { 
-
+internal struct MapTest: Codable {
 
     internal enum MapOfEnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    internal var mapMapOfString: [String:[String:String]]?
-    internal var mapOfEnumString: [String:String]?
-    internal var directMap: [String:Bool]?
+    internal var mapMapOfString: [String: [String: String]]?
+    internal var mapOfEnumString: [String: String]?
+    internal var directMap: [String: Bool]?
     internal var indirectMap: StringBooleanMap?
 
-    internal init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    internal init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index c6fa4baaecd7..c71bb9256b0a 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,15 +7,13 @@
 
 import Foundation
 
-
-internal struct MixedPropertiesAndAdditionalPropertiesClass: Codable { 
-
+internal struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     internal var uuid: UUID?
     internal var dateTime: Date?
-    internal var map: [String:Animal]?
+    internal var map: [String: Animal]?
 
-    internal init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    internal init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index 2a81b0ac9273..5d31a885f751 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name starting with number */
-internal struct Model200Response: Codable { 
-
+internal struct Model200Response: Codable {
 
     internal var name: Int?
     internal var _class: String?
@@ -19,7 +18,7 @@ internal struct Model200Response: Codable {
         self._class = _class
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case _class = "class"
     }
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index 5c7df2148768..2aa8fb1524c3 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name same as property name */
-internal struct Name: Codable { 
-
+internal struct Name: Codable {
 
     internal var name: Int
     internal var snakeCase: Int?
@@ -23,7 +22,7 @@ internal struct Name: Codable {
         self._123number = _123number
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case snakeCase = "snake_case"
         case property
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index 3473e7016447..49d73706e398 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct NumberOnly: Codable { 
-
+internal struct NumberOnly: Codable {
 
     internal var justNumber: Double?
 
@@ -17,7 +15,7 @@ internal struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case justNumber = "JustNumber"
     }
 
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index b6fd07e148b5..dcefb40efa2b 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct Order: Codable { 
-
+internal struct Order: Codable {
 
     internal enum Status: String, Codable, CaseIterable {
         case placed = "placed"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index 592f9a849ce3..c61c2c4a4620 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct OuterComposite: Codable { 
-
+internal struct OuterComposite: Codable {
 
     internal var myNumber: Double?
     internal var myString: String?
@@ -21,7 +19,7 @@ internal struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index ab1397d4f31d..e0cdcbea0558 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 internal enum OuterEnum: String, Codable, CaseIterable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index 0cf0f0d3b4b5..b71700544d06 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct Pet: Codable { 
-
+internal struct Pet: Codable {
 
     internal enum Status: String, Codable, CaseIterable {
         case available = "available"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index 8792cf4aa754..d02c6cc5fd9f 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct ReadOnlyFirst: Codable { 
-
+internal struct ReadOnlyFirst: Codable {
 
     internal var bar: String?
     internal var baz: String?
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index 82b73db4b37e..95a18b571ade 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing reserved words */
-internal struct Return: Codable { 
-
+internal struct Return: Codable {
 
     internal var _return: Int?
 
@@ -17,7 +16,7 @@ internal struct Return: Codable {
         self._return = _return
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case _return = "return"
     }
 
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index e98a8fd7955c..b6ac3651f0e7 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct SpecialModelName: Codable { 
-
+internal struct SpecialModelName: Codable {
 
     internal var specialPropertyName: Int64?
 
@@ -17,7 +15,7 @@ internal struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case specialPropertyName = "$special[property.name]"
     }
 
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index d1afe6732a46..dc3d00e13014 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
+internal struct StringBooleanMap: Codable {
 
-internal struct StringBooleanMap: Codable { 
-
-
-
-    internal var additionalProperties: [String:Bool] = [:]
+    internal var additionalProperties: [String: Bool] = [:]
 
     internal subscript(key: String) -> Bool? {
         get {
@@ -45,5 +42,4 @@ internal struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
 }
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index 923acc9b1f69..1e4de951fb2c 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct Tag: Codable { 
-
+internal struct Tag: Codable {
 
     internal var id: Int64?
     internal var name: String?
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index e78ae839f503..83908bb4fc94 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct TypeHolderDefault: Codable { 
-
+internal struct TypeHolderDefault: Codable {
 
     internal var stringItem: String = "what"
     internal var numberItem: Double
@@ -25,7 +23,7 @@ internal struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index c829014f0d44..3e2c6193aa3e 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct TypeHolderExample: Codable { 
-
+internal struct TypeHolderExample: Codable {
 
     internal var stringItem: String
     internal var numberItem: Double
@@ -25,7 +23,7 @@ internal struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    internal enum CodingKeys: String, CodingKey, CaseIterable { 
+    internal enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index c2865a579220..ada8a7f82d96 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-internal struct User: Codable { 
-
+internal struct User: Codable {
 
     internal var id: Int64?
     internal var username: String?
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
index bf6cc62224b2..a907ec1d345e 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -14,7 +14,7 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
         return URLSessionRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return URLSessionDecodableRequestBuilder<T>.self
     }
 }
@@ -23,16 +23,16 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
 private var urlSessionStore = SynchronizedDictionary<String, URLSession>()
 
 internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
-    
+
     private var observation: NSKeyValueObservation?
-    
+
     deinit {
         observation?.invalidate()
     }
-    
+
     // swiftlint:disable:next weak_delegate
     fileprivate let sessionDelegate = SessionDelegate()
-    
+
     /**
      May be assigned if you want to control the authentication challenges.
      */
@@ -45,11 +45,11 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      - retry the request.
      */
     internal var taskCompletionShouldRetry: ((Data?, URLResponse?, Error?, @escaping (Bool) -> Void) -> Void)?
-    
-    required internal init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+
+    required internal init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
-    
+
     /**
      May be overridden by a subclass if you want to control the URLSession
      configuration.
@@ -77,40 +77,40 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the URLRequest
      configuration (e.g. to override the cache policy).
      */
-    internal func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) throws -> URLRequest {
-        
+    internal func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) throws -> URLRequest {
+
         guard let url = URL(string: URLString) else {
             throw DownloadException.requestMissingURL
         }
-        
+
         var originalRequest = URLRequest(url: url)
-        
+
         originalRequest.httpMethod = method.rawValue
-        
+
         buildHeaders().forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         headers.forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         let modifiedRequest = try encoding.encode(originalRequest, with: parameters)
-        
+
         return modifiedRequest
     }
 
     override internal func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
-        let urlSessionId:String = UUID().uuidString
+        let urlSessionId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let urlSession = createURLSession()
         urlSessionStore[urlSessionId] = urlSession
-        
+
         let parameters: [String: Any] = self.parameters ?? [:]
-        
+
         let fileKeys = parameters.filter { $1 is URL }
             .map { $0.0 }
-        
+
         let encoding: ParameterEncoding
         if fileKeys.count > 0 {
             encoding = FileUploadEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
@@ -119,29 +119,29 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         } else {
             encoding = URLEncoding()
         }
-        
+
         guard let xMethod = HTTPMethod(rawValue: method) else {
             fatalError("Unsuported Http method - \(method)")
         }
-        
+
         let cleanupRequest = {
             urlSessionStore[urlSessionId] = nil
             self.observation?.invalidate()
         }
-        
+
         do {
             let request = try createURLRequest(urlSession: urlSession, method: xMethod, encoding: encoding, headers: headers)
-            
+
             let dataTask = urlSession.dataTask(with: request) { [weak self] data, response, error in
-                
+
                 guard let self = self else { return }
-                
+
                 if let taskCompletionShouldRetry = self.taskCompletionShouldRetry {
-                    
+
                     taskCompletionShouldRetry(data, response, error) { [weak self] shouldRetry in
-                        
+
                         guard let self = self else { return }
-                        
+
                         if shouldRetry {
                             cleanupRequest()
                             self.execute(apiResponseQueue, completion)
@@ -157,13 +157,13 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
                     }
                 }
             }
-            
+
             if #available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) {
                 onProgressReady?(dataTask.progress)
             }
-            
+
             dataTask.resume()
-            
+
         } catch {
             apiResponseQueue.async {
                 cleanupRequest()
@@ -172,7 +172,7 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         }
 
     }
-    
+
     fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -192,52 +192,52 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is URL.Type:
             do {
-                
+
                 guard error == nil else {
                     throw DownloadException.responseFailed
                 }
-                
+
                 guard let data = data else {
                     throw DownloadException.responseDataMissing
                 }
-                
+
                 let fileManager = FileManager.default
                 let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
                 let requestURL = try self.getURL(from: urlRequest)
-                
+
                 var requestPath = try self.getPath(from: requestURL)
-                
+
                 if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) {
                     requestPath = requestPath.appending("/\(headerFileName)")
                 }
-                
+
                 let filePath = documentsDirectory.appendingPathComponent(requestPath)
                 let directoryPath = filePath.deletingLastPathComponent().path
-                
+
                 try fileManager.createDirectory(atPath: directoryPath, withIntermediateDirectories: true, attributes: nil)
                 try data.write(to: filePath, options: .atomic)
-                
+
                 completion(.success(Response(response: httpResponse, body: filePath as? T)))
-                
+
             } catch let requestParserError as DownloadException {
                 completion(.failure(ErrorResponse.error(400, data, requestParserError)))
             } catch let error {
                 completion(.failure(ErrorResponse.error(400, data, error)))
             }
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         default:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
         }
 
@@ -251,7 +251,7 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -270,7 +270,7 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
             filename = contentItem
             return filename?
-                .replacingCharacters(in: range, with:"")
+                .replacingCharacters(in: range, with: "")
                 .replacingOccurrences(of: "\"", with: "")
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
@@ -279,7 +279,7 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -293,7 +293,7 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -304,7 +304,7 @@ internal class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-internal class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuilder<T> {
+internal class URLSessionDecodableRequestBuilder<T: Decodable>: URLSessionRequestBuilder<T> {
     override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -324,28 +324,28 @@ internal class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequest
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         case is Data.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
-            
+
         default:
-            
+
             guard let data = data, !data.isEmpty else {
                 completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, DecodableRequestBuilderError.emptyDataResponse)))
                 return
             }
-            
+
             let decodeResult = CodableHelper.decode(T.self, from: data)
-            
+
             switch decodeResult {
             case let .success(decodableObj):
                 completion(.success(Response(response: httpResponse, body: decodableObj)))
@@ -356,10 +356,10 @@ internal class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequest
     }
 }
 
-fileprivate class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
-    
+private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
+
     var credential: URLCredential?
-    
+
     var taskDidReceiveChallenge: ((URLSession, URLSessionTask, URLAuthenticationChallenge) -> (URLSession.AuthChallengeDisposition, URLCredential?))?
 
     func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
@@ -402,13 +402,13 @@ internal protocol ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest
 }
 
-fileprivate class URLEncoding: ParameterEncoding {
-    func encode(_ urlRequest: URLRequest, with parameters: [String : Any]?) throws -> URLRequest {
-        
+private class URLEncoding: ParameterEncoding {
+    func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
+
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters else { return urlRequest }
-        
+
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
         }
@@ -417,12 +417,12 @@ fileprivate class URLEncoding: ParameterEncoding {
             urlComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters)
             urlRequest.url = urlComponents.url
         }
-        
+
         return urlRequest
     }
 }
 
-fileprivate class FileUploadEncoding: ParameterEncoding {
+private class FileUploadEncoding: ParameterEncoding {
 
     let contentTypeForFormPart: (_ fileURL: URL) -> String?
 
@@ -433,13 +433,13 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters, !parameters.isEmpty else {
             return urlRequest
         }
-        
+
         let boundary = "Boundary-\(UUID().uuidString)"
-                
+
         urlRequest.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
 
         for (key, value) in parameters {
@@ -479,7 +479,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
                 fatalError("Unprocessable value \(value) with key \(key)")
             }
         }
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         body.append("\r\n--\(boundary)--\r\n")
@@ -494,7 +494,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         var urlRequest = urlRequest
 
         var body = urlRequest.httpBody.orEmpty
-        
+
         let fileData = try Data(contentsOf: fileURL)
 
         let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL)
@@ -502,7 +502,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         let fileName = fileURL.lastPathComponent
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
@@ -518,20 +518,20 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
 
         // The value data.
         body.append(fileData)
-        
+
         urlRequest.httpBody = body
 
         return urlRequest
     }
-    
+
     private func configureDataUploadRequest(urlRequest: URLRequest, boundary: String, name: String, data: Data) -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
diff --git a/samples/client/petstore/swift5/objcCompatible/Package.swift b/samples/client/petstore/swift5/objcCompatible/Package.swift
index 79f6f8188738..96dfff54edf4 100644
--- a/samples/client/petstore/swift5/objcCompatible/Package.swift
+++ b/samples/client/petstore/swift5/objcCompatible/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "PetstoreClient",
-            targets: ["PetstoreClient"]),
+            targets: ["PetstoreClient"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -26,6 +26,6 @@ let package = Package(
             name: "PetstoreClient",
             dependencies: [],
             path: "PetstoreClient/Classes"
-        ),
+        )
     ]
 )
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 2404bc8ffc6d..5b09f9557113 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+            if let collection = item.value as? [Any?] {
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -46,15 +46,15 @@ public struct APIHelper {
     }
 
     public static func mapValueToPathItem(_ source: Any) -> Any {
-        if let collection = source as? Array<Any?> {
+        if let collection = source as? [Any?] {
             return collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
         }
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
+            if let collection = item.value as? [Any?] {
                 collection.filter({ $0 != nil }).map({"\($0!)"}).forEach { value in
                     result.append(URLQueryItem(name: item.key, value: value))
                 }
@@ -69,4 +69,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift
index c5d1b9b42df3..a5c2d605dff6 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,15 +9,15 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = URLSessionRequestBuilderFactory()
     public static var apiResponseQueue: DispatchQueue = .main
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
@@ -25,9 +25,9 @@ open class RequestBuilder<T> {
     /// Optional block to obtain a reference to the request's progress instance when available.
     /// With the URLSession http client the request's progress only works on iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0.
     /// If you need to get the request's progress in older OS versions, please use Alamofire http client.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -37,7 +37,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -60,5 +60,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index 41731036ab60..2e9ad96a66b5 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc open class AnotherFakeAPI : NSObject {
+@objc open class AnotherFakeAPI: NSObject {
     /**
      To test special tags
      
@@ -17,7 +15,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         call123testSpecialTagsWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index fc51b0022277..6483ab29bcc3 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -7,16 +7,14 @@
 
 import Foundation
 
-
-
-@objc open class FakeAPI : NSObject {
+@objc open class FakeAPI: NSObject {
     /**
 
      - parameter body: (body) Input boolean as post body (optional)
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?,_ error: Error?) -> Void)) {
+    open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) {
         fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -51,7 +49,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
+    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) {
         fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -86,7 +84,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?,_ error: Error?) -> Void)) {
+    open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) {
         fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -121,7 +119,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -156,7 +154,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -192,7 +190,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -231,7 +229,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -281,7 +279,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -318,7 +316,7 @@ import Foundation
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -337,7 +335,7 @@ import Foundation
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -426,7 +424,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -454,19 +452,19 @@ import Foundation
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray?.encodeToJSON(),
             "enum_form_string": enumFormString?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(), 
-            "enum_query_string": enumQueryString?.encodeToJSON(), 
-            "enum_query_integer": enumQueryInteger?.encodeToJSON(), 
+            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(),
+            "enum_query_string": enumQueryString?.encodeToJSON(),
+            "enum_query_integer": enumQueryInteger?.encodeToJSON(),
             "enum_query_double": enumQueryDouble?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -492,7 +490,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -518,13 +516,13 @@ import Foundation
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -545,7 +543,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testInlineAdditionalProperties(param: [String:String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -562,7 +560,7 @@ import Foundation
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -582,7 +580,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -603,14 +601,14 @@ import Foundation
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param.encodeToJSON(),
             "param2": param2.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index 3793f6dc4128..b9cfc75eeb4c 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc open class FakeClassnameTags123API : NSObject {
+@objc open class FakeClassnameTags123API: NSObject {
     /**
      To test class name in snake case
      
@@ -17,7 +15,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 86c6dcc9778f..d022b687736e 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc open class PetAPI : NSObject {
+@objc open class PetAPI: NSObject {
     /**
      Add a new pet to the store
      
@@ -17,7 +15,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         addPetWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -57,7 +55,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -84,8 +82,8 @@ import Foundation
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey?.encodeToJSON()
@@ -113,7 +111,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -137,8 +135,8 @@ import Foundation
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status.encodeToJSON()
@@ -157,7 +155,7 @@ import Foundation
      - parameter completion: completion handler to receive the data and the error objects
      */
     @available(*, deprecated, message: "This operation is deprecated.")
-    open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -182,8 +180,8 @@ import Foundation
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags.encodeToJSON()
@@ -201,7 +199,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?,_ error: Error?) -> Void)) {
+    open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) {
         getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -228,8 +226,8 @@ import Foundation
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -244,7 +242,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -285,7 +283,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -313,14 +311,14 @@ import Foundation
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name?.encodeToJSON(),
             "status": status?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -337,7 +335,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -365,14 +363,14 @@ import Foundation
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "file": file?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -389,7 +387,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -417,14 +415,14 @@ import Foundation
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "requiredFile": requiredFile.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index cc15cd3ae88c..a19d12c7d24b 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc open class StoreAPI : NSObject {
+@objc open class StoreAPI: NSObject {
     /**
      Delete purchase order by ID
      
@@ -17,7 +15,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -41,8 +39,8 @@ import Foundation
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -56,7 +54,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
+    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -76,14 +74,14 @@ import Foundation
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -95,7 +93,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -119,8 +117,8 @@ import Foundation
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -135,7 +133,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         placeOrderWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index 6e0e10bc7b22..4dfe4da1a021 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc open class UserAPI : NSObject {
+@objc open class UserAPI: NSObject {
     /**
      Create user
      
@@ -17,7 +15,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUserWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -54,7 +52,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithArrayInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -90,7 +88,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithListInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -126,7 +124,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -150,8 +148,8 @@ import Foundation
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -166,7 +164,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?,_ error: Error?) -> Void)) {
+    open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) {
         getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -189,8 +187,8 @@ import Foundation
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -206,7 +204,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -228,11 +226,11 @@ import Foundation
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username.encodeToJSON(), 
+            "username": username.encodeToJSON(),
             "password": password.encodeToJSON()
         ])
 
@@ -247,7 +245,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         logoutUserWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -266,8 +264,8 @@ import Foundation
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -283,7 +281,7 @@ import Foundation
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 01b28a4bd42d..ef971ebadc60 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -45,4 +45,4 @@ open class CodableHelper {
     open class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
         return Swift.Result { try self.jsonEncoder.encode(value) }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index f171525e4394..627d9adb757e 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,10 +7,10 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
 	@available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.")
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 6e279679c67a..93ed6b90b376 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -108,24 +108,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -135,7 +135,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -147,8 +147,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -157,8 +157,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -177,5 +177,3 @@ extension HTTPURLResponse {
         return Array(200 ..< 300).contains(statusCode)
     }
 }
-
-
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
index 08f1ef334dff..b79e9f5e64d5 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
@@ -41,7 +41,7 @@ public struct JSONDataEncoding {
     }
 
     public static func encodingParameters(jsonData: Data?) -> [String: Any]? {
-        var returnedParams: [String: Any]? = nil
+        var returnedParams: [String: Any]?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params: [String: Any] = [:]
             params[jsonDataKey] = jsonData
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 314f1eff1f9b..02f78ffb4705 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -9,8 +9,8 @@ import Foundation
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
+        var params: [String: Any]?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -27,7 +27,7 @@ open class JSONEncodingHelper {
     }
 
     open class func encodingParameters(forEncodableObject encodableObj: Any?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+        var params: [String: Any]?
 
         if let encodableObj = encodableObj {
             do {
@@ -41,5 +41,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models.swift
index 11e81ffcc472..c0542c14c081 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,11 +10,11 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
-public enum DownloadException : Error {
+public enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -30,7 +30,6 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-
 open class Response<T> {
     public let statusCode: Int
     public let header: [String: String]
@@ -44,7 +43,7 @@ open class Response<T> {
 
     public convenience init(response: HTTPURLResponse, body: T?) {
         let rawHeader = response.allHeaderFields
-        var header = [String:String]()
+        var header = [String: String]()
         for (key, value) in rawHeader {
             if let key = key.base as? String, let value = value as? String {
                 header[key] = value
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index d4e1b3697e71..e184d7691799 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,19 +7,17 @@
 
 import Foundation
 
+@objc public class AdditionalPropertiesClass: NSObject, Codable {
 
+    public var mapString: [String: String]?
+    public var mapMapString: [String: [String: String]]?
 
-@objc public class AdditionalPropertiesClass: NSObject, Codable { 
-
-    public var mapString: [String:String]?
-    public var mapMapString: [String:[String:String]]?
-
-    public init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index f34ba3bb63e7..88152934da2b 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class Animal: NSObject, Codable { 
+@objc public class Animal: NSObject, Codable {
 
     public var _className: String
     public var color: String? = "red"
@@ -19,7 +17,7 @@ import Foundation
         self.color = color
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _className = "className"
         case color
     }
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8ed2..e09b0e9efdc8 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index d9a7fae21446..d0fcd4368854 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class ApiResponse: NSObject, Codable { 
+@objc public class ApiResponse: NSObject, Codable {
 
     public var code: Int?
     public var codeNum: NSNumber? {
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index e57e63b6ed28..9e3f3aba246a 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class ArrayOfArrayOfNumberOnly: NSObject, Codable { 
+@objc public class ArrayOfArrayOfNumberOnly: NSObject, Codable {
 
     public var arrayArrayNumber: [[Double]]?
 
@@ -17,7 +15,7 @@ import Foundation
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index e087329fdc44..d287cc1563aa 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class ArrayOfNumberOnly: NSObject, Codable { 
+@objc public class ArrayOfNumberOnly: NSObject, Codable {
 
     public var arrayNumber: [Double]?
 
@@ -17,7 +15,7 @@ import Foundation
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayNumber = "ArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index c7e6b0b27a4b..dcc3e9c3dd51 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class ArrayTest: NSObject, Codable { 
+@objc public class ArrayTest: NSObject, Codable {
 
     public var arrayOfString: [String]?
     public var arrayArrayOfInteger: [[Int64]]?
@@ -21,7 +19,7 @@ import Foundation
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index e472eaaa7916..80a5667445f2 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class Capitalization: NSObject, Codable { 
+@objc public class Capitalization: NSObject, Codable {
 
     public var smallCamel: String?
     public var capitalCamel: String?
@@ -28,7 +26,7 @@ import Foundation
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index 1b19800ae3c3..78de5a909f54 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class Cat: NSObject, Codable { 
+@objc public class Cat: NSObject, Codable {
 
     public var _className: String
     public var color: String? = "red"
@@ -26,7 +24,7 @@ import Foundation
         self.declawed = declawed
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _className = "className"
         case color
         case declawed
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
index 8758762c40bf..ef8cec45aff1 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class CatAllOf: NSObject, Codable { 
+@objc public class CatAllOf: NSObject, Codable {
 
     public var declawed: Bool?
     public var declawedNum: NSNumber? {
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index df7771efc457..0610c10c982f 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class Category: NSObject, Codable { 
+@objc public class Category: NSObject, Codable {
 
     public var _id: Int64?
     public var _idNum: NSNumber? {
@@ -24,7 +22,7 @@ import Foundation
         self.name = name
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _id = "id"
         case name
     }
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index c221ccf2a0de..4197ffcaed6c 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -9,7 +9,7 @@ import Foundation
 
 /** Model for testing model with \&quot;_class\&quot; property */
 
-@objc public class ClassModel: NSObject, Codable { 
+@objc public class ClassModel: NSObject, Codable {
 
     public var _class: String?
 
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 5aea86fbb06e..517dbbba2ec2 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class Client: NSObject, Codable { 
+@objc public class Client: NSObject, Codable {
 
     public var client: String?
 
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 464f0c7ae4e7..37733cd1f3be 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class Dog: NSObject, Codable { 
+@objc public class Dog: NSObject, Codable {
 
     public var _className: String
     public var color: String? = "red"
@@ -21,7 +19,7 @@ import Foundation
         self.breed = breed
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _className = "className"
         case color
         case breed
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
index efcd880f10b3..73fd1822725c 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class DogAllOf: NSObject, Codable { 
+@objc public class DogAllOf: NSObject, Codable {
 
     public var breed: String?
 
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index 3c1c26139314..034a58c6c0eb 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class EnumArrays: NSObject, Codable { 
+@objc public class EnumArrays: NSObject, Codable {
 
     public enum JustSymbol: String, Codable, CaseIterable {
         case greaterThanOrEqualTo = ">="
@@ -27,7 +25,7 @@ import Foundation
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index c2c639ba3246..d4029d73f8af 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable, CaseIterable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index 60b754914d42..ce3a03006097 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class EnumTest: NSObject, Codable { 
+@objc public class EnumTest: NSObject, Codable {
 
     public enum EnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
@@ -43,7 +41,7 @@ import Foundation
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index 120d5bb78797..7a320c177d38 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -9,7 +9,7 @@ import Foundation
 
 /** Must be named &#x60;File&#x60; for test. */
 
-@objc public class File: NSObject, Codable { 
+@objc public class File: NSObject, Codable {
 
     /** Test capitalization */
     public var sourceURI: String?
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index e60109a85334..a6437b4fe901 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class FileSchemaTestClass: NSObject, Codable { 
+@objc public class FileSchemaTestClass: NSObject, Codable {
 
     public var file: File?
     public var files: [File]?
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index 664481c02fc4..df2c46d3757b 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class FormatTest: NSObject, Codable { 
+@objc public class FormatTest: NSObject, Codable {
 
     public var integer: Int?
     public var integerNum: NSNumber? {
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 974726b3e65d..b9f5b39117d7 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class HasOnlyReadOnly: NSObject, Codable { 
+@objc public class HasOnlyReadOnly: NSObject, Codable {
 
     public var bar: String?
     public var foo: String?
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 4942b7502244..826dc9e27f2b 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class List: NSObject, Codable { 
+@objc public class List: NSObject, Codable {
 
     public var _123list: String?
 
@@ -17,7 +15,7 @@ import Foundation
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _123list = "123-list"
     }
 
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index 2acd08f46a45..2b97660b80e8 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,27 +7,25 @@
 
 import Foundation
 
-
-
-@objc public class MapTest: NSObject, Codable { 
+@objc public class MapTest: NSObject, Codable {
 
     public enum MapOfEnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-    public var directMap: [String:Bool]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
+    public var directMap: [String: Bool]?
     public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 3ecb79bf9f43..e10adad0a7e1 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,15 +7,13 @@
 
 import Foundation
 
-
-
-@objc public class MixedPropertiesAndAdditionalPropertiesClass: NSObject, Codable { 
+@objc public class MixedPropertiesAndAdditionalPropertiesClass: NSObject, Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index 031badf4be9e..1c5410f61dde 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -9,7 +9,7 @@ import Foundation
 
 /** Model for testing model name starting with number */
 
-@objc public class Model200Response: NSObject, Codable { 
+@objc public class Model200Response: NSObject, Codable {
 
     public var name: Int?
     public var nameNum: NSNumber? {
@@ -24,7 +24,7 @@ import Foundation
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case _class = "class"
     }
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index c863b854d468..06f8a2f81a3a 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -9,7 +9,7 @@ import Foundation
 
 /** Model for testing model name same as property name */
 
-@objc public class Name: NSObject, Codable { 
+@objc public class Name: NSObject, Codable {
 
     public var name: Int
     public var snakeCase: Int?
@@ -33,7 +33,7 @@ import Foundation
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case snakeCase = "snake_case"
         case property
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index 1db3ace43047..3bd9859378d8 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class NumberOnly: NSObject, Codable { 
+@objc public class NumberOnly: NSObject, Codable {
 
     public var justNumber: Double?
 
@@ -17,7 +15,7 @@ import Foundation
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justNumber = "JustNumber"
     }
 
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index 5fdd493dbedb..586a4c2d55a8 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class Order: NSObject, Codable { 
+@objc public class Order: NSObject, Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case placed = "placed"
@@ -53,7 +51,7 @@ import Foundation
         self.complete = complete
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _id = "id"
         case petId
         case quantity
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index 0d1791d3fa8d..434111678de7 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class OuterComposite: NSObject, Codable { 
+@objc public class OuterComposite: NSObject, Codable {
 
     public var myNumber: Double?
     public var myString: String?
@@ -26,7 +24,7 @@ import Foundation
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index 9e6b8d74e874..c3b778cbbed4 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable, CaseIterable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index 29d4e3d9e37a..d84079a2b48d 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class Pet: NSObject, Codable { 
+@objc public class Pet: NSObject, Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"
@@ -38,7 +36,7 @@ import Foundation
         self.status = status
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _id = "id"
         case category
         case name
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index 2c806ac6d756..d1252433b2d8 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class ReadOnlyFirst: NSObject, Codable { 
+@objc public class ReadOnlyFirst: NSObject, Codable {
 
     public var bar: String?
     public var baz: String?
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index 948f6f4d3846..4b10ac18cf0d 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -9,7 +9,7 @@ import Foundation
 
 /** Model for testing reserved words */
 
-@objc public class Return: NSObject, Codable { 
+@objc public class Return: NSObject, Codable {
 
     public var _return: Int?
     public var _returnNum: NSNumber? {
@@ -22,7 +22,7 @@ import Foundation
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _return = "return"
     }
 
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index c01c4065998b..85e33352531d 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class SpecialModelName: NSObject, Codable { 
+@objc public class SpecialModelName: NSObject, Codable {
 
     public var specialPropertyName: Int64?
     public var specialPropertyNameNum: NSNumber? {
@@ -22,7 +20,7 @@ import Foundation
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case specialPropertyName = "$special[property.name]"
     }
 
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index 3116d99bff0c..ffe9730a6fe4 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
+@objc public class StringBooleanMap: NSObject, Codable {
 
-
-@objc public class StringBooleanMap: NSObject, Codable { 
-
-
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,5 +42,4 @@ import Foundation
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
 }
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index 1bd7489826dd..88583be7f5dd 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class Tag: NSObject, Codable { 
+@objc public class Tag: NSObject, Codable {
 
     public var _id: Int64?
     public var _idNum: NSNumber? {
@@ -24,7 +22,7 @@ import Foundation
         self.name = name
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _id = "id"
         case name
     }
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index 273b7b31aefd..6d51f44540c0 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class TypeHolderDefault: NSObject, Codable { 
+@objc public class TypeHolderDefault: NSObject, Codable {
 
     public var stringItem: String = "what"
     public var numberItem: Double
@@ -25,7 +23,7 @@ import Foundation
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index 3cb1929d4394..40e3a41c34d9 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class TypeHolderExample: NSObject, Codable { 
+@objc public class TypeHolderExample: NSObject, Codable {
 
     public var stringItem: String
     public var numberItem: Double
@@ -25,7 +23,7 @@ import Foundation
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index eb8ec0552741..7dc3cc5954d6 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-
-@objc public class User: NSObject, Codable { 
+@objc public class User: NSObject, Codable {
 
     public var _id: Int64?
     public var _idNum: NSNumber? {
@@ -42,7 +40,7 @@ import Foundation
         self.userStatus = userStatus
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _id = "id"
         case username
         case firstName
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
index 22261e2ce948..55d0eb421919 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -14,7 +14,7 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
         return URLSessionRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return URLSessionDecodableRequestBuilder<T>.self
     }
 }
@@ -23,16 +23,16 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
 private var urlSessionStore = SynchronizedDictionary<String, URLSession>()
 
 open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
-    
+
     private var observation: NSKeyValueObservation?
-    
+
     deinit {
         observation?.invalidate()
     }
-    
+
     // swiftlint:disable:next weak_delegate
     fileprivate let sessionDelegate = SessionDelegate()
-    
+
     /**
      May be assigned if you want to control the authentication challenges.
      */
@@ -45,11 +45,11 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      - retry the request.
      */
     public var taskCompletionShouldRetry: ((Data?, URLResponse?, Error?, @escaping (Bool) -> Void) -> Void)?
-    
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
-    
+
     /**
      May be overridden by a subclass if you want to control the URLSession
      configuration.
@@ -77,40 +77,40 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the URLRequest
      configuration (e.g. to override the cache policy).
      */
-    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) throws -> URLRequest {
-        
+    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) throws -> URLRequest {
+
         guard let url = URL(string: URLString) else {
             throw DownloadException.requestMissingURL
         }
-        
+
         var originalRequest = URLRequest(url: url)
-        
+
         originalRequest.httpMethod = method.rawValue
-        
+
         buildHeaders().forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         headers.forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         let modifiedRequest = try encoding.encode(originalRequest, with: parameters)
-        
+
         return modifiedRequest
     }
 
     override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
-        let urlSessionId:String = UUID().uuidString
+        let urlSessionId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let urlSession = createURLSession()
         urlSessionStore[urlSessionId] = urlSession
-        
+
         let parameters: [String: Any] = self.parameters ?? [:]
-        
+
         let fileKeys = parameters.filter { $1 is URL }
             .map { $0.0 }
-        
+
         let encoding: ParameterEncoding
         if fileKeys.count > 0 {
             encoding = FileUploadEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
@@ -119,29 +119,29 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         } else {
             encoding = URLEncoding()
         }
-        
+
         guard let xMethod = HTTPMethod(rawValue: method) else {
             fatalError("Unsuported Http method - \(method)")
         }
-        
+
         let cleanupRequest = {
             urlSessionStore[urlSessionId] = nil
             self.observation?.invalidate()
         }
-        
+
         do {
             let request = try createURLRequest(urlSession: urlSession, method: xMethod, encoding: encoding, headers: headers)
-            
+
             let dataTask = urlSession.dataTask(with: request) { [weak self] data, response, error in
-                
+
                 guard let self = self else { return }
-                
+
                 if let taskCompletionShouldRetry = self.taskCompletionShouldRetry {
-                    
+
                     taskCompletionShouldRetry(data, response, error) { [weak self] shouldRetry in
-                        
+
                         guard let self = self else { return }
-                        
+
                         if shouldRetry {
                             cleanupRequest()
                             self.execute(apiResponseQueue, completion)
@@ -157,13 +157,13 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
                     }
                 }
             }
-            
+
             if #available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) {
                 onProgressReady?(dataTask.progress)
             }
-            
+
             dataTask.resume()
-            
+
         } catch {
             apiResponseQueue.async {
                 cleanupRequest()
@@ -172,7 +172,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         }
 
     }
-    
+
     fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -192,52 +192,52 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is URL.Type:
             do {
-                
+
                 guard error == nil else {
                     throw DownloadException.responseFailed
                 }
-                
+
                 guard let data = data else {
                     throw DownloadException.responseDataMissing
                 }
-                
+
                 let fileManager = FileManager.default
                 let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
                 let requestURL = try self.getURL(from: urlRequest)
-                
+
                 var requestPath = try self.getPath(from: requestURL)
-                
+
                 if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) {
                     requestPath = requestPath.appending("/\(headerFileName)")
                 }
-                
+
                 let filePath = documentsDirectory.appendingPathComponent(requestPath)
                 let directoryPath = filePath.deletingLastPathComponent().path
-                
+
                 try fileManager.createDirectory(atPath: directoryPath, withIntermediateDirectories: true, attributes: nil)
                 try data.write(to: filePath, options: .atomic)
-                
+
                 completion(.success(Response(response: httpResponse, body: filePath as? T)))
-                
+
             } catch let requestParserError as DownloadException {
                 completion(.failure(ErrorResponse.error(400, data, requestParserError)))
             } catch let error {
                 completion(.failure(ErrorResponse.error(400, data, error)))
             }
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         default:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
         }
 
@@ -251,7 +251,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -270,7 +270,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
             filename = contentItem
             return filename?
-                .replacingCharacters(in: range, with:"")
+                .replacingCharacters(in: range, with: "")
                 .replacingOccurrences(of: "\"", with: "")
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
@@ -279,7 +279,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -293,7 +293,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -304,7 +304,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuilder<T> {
+open class URLSessionDecodableRequestBuilder<T: Decodable>: URLSessionRequestBuilder<T> {
     override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -324,28 +324,28 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         case is Data.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
-            
+
         default:
-            
+
             guard let data = data, !data.isEmpty else {
                 completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, DecodableRequestBuilderError.emptyDataResponse)))
                 return
             }
-            
+
             let decodeResult = CodableHelper.decode(T.self, from: data)
-            
+
             switch decodeResult {
             case let .success(decodableObj):
                 completion(.success(Response(response: httpResponse, body: decodableObj)))
@@ -356,10 +356,10 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
     }
 }
 
-fileprivate class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
-    
+private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
+
     var credential: URLCredential?
-    
+
     var taskDidReceiveChallenge: ((URLSession, URLSessionTask, URLAuthenticationChallenge) -> (URLSession.AuthChallengeDisposition, URLCredential?))?
 
     func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
@@ -402,13 +402,13 @@ public protocol ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest
 }
 
-fileprivate class URLEncoding: ParameterEncoding {
-    func encode(_ urlRequest: URLRequest, with parameters: [String : Any]?) throws -> URLRequest {
-        
+private class URLEncoding: ParameterEncoding {
+    func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
+
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters else { return urlRequest }
-        
+
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
         }
@@ -417,12 +417,12 @@ fileprivate class URLEncoding: ParameterEncoding {
             urlComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters)
             urlRequest.url = urlComponents.url
         }
-        
+
         return urlRequest
     }
 }
 
-fileprivate class FileUploadEncoding: ParameterEncoding {
+private class FileUploadEncoding: ParameterEncoding {
 
     let contentTypeForFormPart: (_ fileURL: URL) -> String?
 
@@ -433,13 +433,13 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters, !parameters.isEmpty else {
             return urlRequest
         }
-        
+
         let boundary = "Boundary-\(UUID().uuidString)"
-                
+
         urlRequest.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
 
         for (key, value) in parameters {
@@ -479,7 +479,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
                 fatalError("Unprocessable value \(value) with key \(key)")
             }
         }
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         body.append("\r\n--\(boundary)--\r\n")
@@ -494,7 +494,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         var urlRequest = urlRequest
 
         var body = urlRequest.httpBody.orEmpty
-        
+
         let fileData = try Data(contentsOf: fileURL)
 
         let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL)
@@ -502,7 +502,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         let fileName = fileURL.lastPathComponent
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
@@ -518,20 +518,20 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
 
         // The value data.
         body.append(fileData)
-        
+
         urlRequest.httpBody = body
 
         return urlRequest
     }
-    
+
     private func configureDataUploadRequest(urlRequest: URLRequest, boundary: String, name: String, data: Data) -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
diff --git a/samples/client/petstore/swift5/promisekitLibrary/Package.swift b/samples/client/petstore/swift5/promisekitLibrary/Package.swift
index 10dac4053846..4445c9794907 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/Package.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/Package.swift
@@ -14,19 +14,19 @@ let package = Package(
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "PetstoreClient",
-            targets: ["PetstoreClient"]),
+            targets: ["PetstoreClient"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.12.0"),
+        .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.12.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "PetstoreClient",
-            dependencies: ["PromiseKit", ],
+            dependencies: ["PromiseKit" ],
             path: "PetstoreClient/Classes"
-        ),
+        )
     ]
 )
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 2404bc8ffc6d..5b09f9557113 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+            if let collection = item.value as? [Any?] {
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -46,15 +46,15 @@ public struct APIHelper {
     }
 
     public static func mapValueToPathItem(_ source: Any) -> Any {
-        if let collection = source as? Array<Any?> {
+        if let collection = source as? [Any?] {
             return collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
         }
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
+            if let collection = item.value as? [Any?] {
                 collection.filter({ $0 != nil }).map({"\($0!)"}).forEach { value in
                     result.append(URLQueryItem(name: item.key, value: value))
                 }
@@ -69,4 +69,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
index c5d1b9b42df3..a5c2d605dff6 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,15 +9,15 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = URLSessionRequestBuilderFactory()
     public static var apiResponseQueue: DispatchQueue = .main
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
@@ -25,9 +25,9 @@ open class RequestBuilder<T> {
     /// Optional block to obtain a reference to the request's progress instance when available.
     /// With the URLSession http client the request's progress only works on iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0.
     /// If you need to get the request's progress in older OS versions, please use Alamofire http client.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -37,7 +37,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -60,5 +60,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index ffce4d7c4e81..c3a97ff074c1 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import PromiseKit
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index 47b6ec5f196f..80153ba634d3 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import PromiseKit
 
-
-
 open class FakeAPI {
     /**
 
@@ -203,7 +201,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Promise<Void>
      */
-    open class func testBodyWithQueryParams( query: String,  body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
+    open class func testBodyWithQueryParams( query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
@@ -296,7 +294,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Promise<Void>
      */
-    open class func testEndpointParameters( number: Double,  double: Double,  patternWithoutDelimiter: String,  byte: Data,  integer: Int? = nil,  int32: Int? = nil,  int64: Int64? = nil,  float: Float? = nil,  string: String? = nil,  binary: URL? = nil,  date: Date? = nil,  dateTime: Date? = nil,  password: String? = nil,  callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
+    open class func testEndpointParameters( number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result -> Void in
             switch result {
@@ -335,7 +333,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -354,7 +352,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -443,7 +441,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Promise<Void>
      */
-    open class func testEnumParameters( enumHeaderStringArray: [String]? = nil,  enumHeaderString: EnumHeaderString_testEnumParameters? = nil,  enumQueryStringArray: [String]? = nil,  enumQueryString: EnumQueryString_testEnumParameters? = nil,  enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil,  enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil,  enumFormStringArray: [String]? = nil,  enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
+    open class func testEnumParameters( enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result -> Void in
             switch result {
@@ -473,19 +471,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray?.encodeToJSON(),
             "enum_form_string": enumFormString?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(), 
-            "enum_query_string": enumQueryString?.encodeToJSON(), 
-            "enum_query_integer": enumQueryInteger?.encodeToJSON(), 
+            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(),
+            "enum_query_string": enumQueryString?.encodeToJSON(),
+            "enum_query_integer": enumQueryInteger?.encodeToJSON(),
             "enum_query_double": enumQueryDouble?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -511,7 +509,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Promise<Void>
      */
-    open class func testGroupParameters( requiredStringGroup: Int,  requiredBooleanGroup: Bool,  requiredInt64Group: Int64,  stringGroup: Int? = nil,  booleanGroup: Bool? = nil,  int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
+    open class func testGroupParameters( requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result -> Void in
             switch result {
@@ -539,13 +537,13 @@ open class FakeAPI {
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -566,7 +564,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Promise<Void>
      */
-    open class func testInlineAdditionalProperties( param: [String:String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
+    open class func testInlineAdditionalProperties( param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result -> Void in
             switch result {
@@ -585,7 +583,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -605,7 +603,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Promise<Void>
      */
-    open class func testJsonFormData( param: String,  param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
+    open class func testJsonFormData( param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result -> Void in
             switch result {
@@ -628,14 +626,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param.encodeToJSON(),
             "param2": param2.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index e749c654de5c..3a05f8eaf60e 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -8,8 +8,6 @@
 import Foundation
 import PromiseKit
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 88269c38385b..18d3fd1d094f 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import PromiseKit
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -60,7 +58,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Promise<Void>
      */
-    open class func deletePet( petId: Int64,  apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
+    open class func deletePet( petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute(apiResponseQueue) { result -> Void in
             switch result {
@@ -89,8 +87,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey?.encodeToJSON()
@@ -144,8 +142,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status.encodeToJSON()
@@ -191,8 +189,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags.encodeToJSON()
@@ -239,8 +237,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -298,7 +296,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Promise<Void>
      */
-    open class func updatePetWithForm( petId: Int64,  name: String? = nil,  status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
+    open class func updatePetWithForm( petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
@@ -328,14 +326,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name?.encodeToJSON(),
             "status": status?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -352,7 +350,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Promise<ApiResponse>
      */
-    open class func uploadFile( petId: Int64,  additionalMetadata: String? = nil,  file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<ApiResponse> {
+    open class func uploadFile( petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<ApiResponse> {
         let deferred = Promise<ApiResponse>.pending()
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result -> Void in
             switch result {
@@ -382,14 +380,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "file": file?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -406,7 +404,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Promise<ApiResponse>
      */
-    open class func uploadFileWithRequiredFile( petId: Int64,  requiredFile: URL,  additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<ApiResponse> {
+    open class func uploadFileWithRequiredFile( petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<ApiResponse> {
         let deferred = Promise<ApiResponse>.pending()
         uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute(apiResponseQueue) { result -> Void in
             switch result {
@@ -436,14 +434,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "requiredFile": requiredFile.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 9bb66f3699f7..20fc8a1468c7 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import PromiseKit
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -44,8 +42,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -59,8 +57,8 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Promise<[String:Int]>
      */
-    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<[String:Int]> {
-        let deferred = Promise<[String:Int]>.pending()
+    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<[String: Int]> {
+        let deferred = Promise<[String: Int]>.pending()
         getInventoryWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -81,14 +79,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -126,8 +124,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index 237961c96a08..89c48c3b28f8 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import PromiseKit
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -159,8 +157,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -200,8 +198,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -217,7 +215,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Promise<String>
      */
-    open class func loginUser( username: String,  password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<String> {
+    open class func loginUser( username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<String> {
         let deferred = Promise<String>.pending()
         loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result -> Void in
             switch result {
@@ -241,11 +239,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username.encodeToJSON(), 
+            "username": username.encodeToJSON(),
             "password": password.encodeToJSON()
         ])
 
@@ -281,8 +279,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -298,7 +296,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Promise<Void>
      */
-    open class func updateUser( username: String,  body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
+    open class func updateUser( username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 01b28a4bd42d..ef971ebadc60 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -45,4 +45,4 @@ open class CodableHelper {
     open class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
         return Swift.Result { try self.jsonEncoder.encode(value) }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index f171525e4394..627d9adb757e 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,10 +7,10 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
 	@available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.")
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 5b98ba296730..736702ea5dd9 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -109,24 +109,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -136,7 +136,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -148,8 +148,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -158,8 +158,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -180,7 +180,7 @@ extension HTTPURLResponse {
 }
 
 extension RequestBuilder {
-    public func execute() -> Promise<Response<T>>  {
+    public func execute() -> Promise<Response<T>> {
         let deferred = Promise<Response<T>>.pending()
         self.execute { result in
             switch result {
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
index 08f1ef334dff..b79e9f5e64d5 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
@@ -41,7 +41,7 @@ public struct JSONDataEncoding {
     }
 
     public static func encodingParameters(jsonData: Data?) -> [String: Any]? {
-        var returnedParams: [String: Any]? = nil
+        var returnedParams: [String: Any]?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params: [String: Any] = [:]
             params[jsonDataKey] = jsonData
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 314f1eff1f9b..02f78ffb4705 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -9,8 +9,8 @@ import Foundation
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
+        var params: [String: Any]?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -27,7 +27,7 @@ open class JSONEncodingHelper {
     }
 
     open class func encodingParameters(forEncodableObject encodableObj: Any?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+        var params: [String: Any]?
 
         if let encodableObj = encodableObj {
             do {
@@ -41,5 +41,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
index 11e81ffcc472..c0542c14c081 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,11 +10,11 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
-public enum DownloadException : Error {
+public enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -30,7 +30,6 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-
 open class Response<T> {
     public let statusCode: Int
     public let header: [String: String]
@@ -44,7 +43,7 @@ open class Response<T> {
 
     public convenience init(response: HTTPURLResponse, body: T?) {
         let rawHeader = response.allHeaderFields
-        var header = [String:String]()
+        var header = [String: String]()
         for (key, value) in rawHeader {
             if let key = key.base as? String, let value = value as? String {
                 header[key] = value
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 28ca8377b889..1af031535967 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,19 +7,17 @@
 
 import Foundation
 
+public struct AdditionalPropertiesClass: Codable {
 
-public struct AdditionalPropertiesClass: Codable { 
+    public var mapString: [String: String]?
+    public var mapMapString: [String: [String: String]]?
 
-
-    public var mapString: [String:String]?
-    public var mapMapString: [String:[String:String]]?
-
-    public init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index 1050d79dbe9d..5ed9f31e2a36 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Animal: Codable { 
-
+public struct Animal: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8ed2..e09b0e9efdc8 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index 4d0393b9ba45..ec270da89074 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ApiResponse: Codable { 
-
+public struct ApiResponse: Codable {
 
     public var code: Int?
     public var type: String?
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 1363c96394ba..6c252ed475b2 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public var arrayArrayNumber: [[Double]]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 6b8873730c43..e84eb5d65025 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfNumberOnly: Codable {
 
     public var arrayNumber: [Double]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayNumber = "ArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 64f7c6d9db99..d2140933d181 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayTest: Codable { 
-
+public struct ArrayTest: Codable {
 
     public var arrayOfString: [String]?
     public var arrayArrayOfInteger: [[Int64]]?
@@ -21,7 +19,7 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index ddb669a59045..d1b3b27616ed 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Capitalization: Codable { 
-
+public struct Capitalization: Codable {
 
     public var smallCamel: String?
     public var capitalCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index c4f6e0d488ca..7ab887f3113f 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Cat: Codable { 
-
+public struct Cat: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
index 7b1d7e32be80..a51ad0dffab1 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct CatAllOf: Codable { 
-
+public struct CatAllOf: Codable {
 
     public var declawed: Bool?
 
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index 3ec00f5ab10d..eb8f7e5e1974 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Category: Codable { 
-
+public struct Category: Codable {
 
     public var id: Int64?
     public var name: String = "default-name"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index af030c3dd626..e2a7d4427a06 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model with \&quot;_class\&quot; property */
-public struct ClassModel: Codable { 
-
+public struct ClassModel: Codable {
 
     public var _class: String?
 
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 0aae748c76b4..00245ca37280 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Client: Codable { 
-
+public struct Client: Codable {
 
     public var client: String?
 
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 198e28b94dd6..492c1228008e 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Dog: Codable { 
-
+public struct Dog: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
index 8ff49b2af23f..7786f8acc5ae 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct DogAllOf: Codable { 
-
+public struct DogAllOf: Codable {
 
     public var breed: String?
 
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index e2d3fa04f94b..9844e7c40e35 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumArrays: Codable { 
-
+public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable, CaseIterable {
         case greaterThanOrEqualTo = ">="
@@ -27,7 +25,7 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index c2c639ba3246..d4029d73f8af 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable, CaseIterable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index a56e1f36389b..789f583e1d77 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumTest: Codable { 
-
+public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index 773b53b2cb76..abf3ccffc485 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Must be named &#x60;File&#x60; for test. */
-public struct File: Codable { 
-
+public struct File: Codable {
 
     /** Test capitalization */
     public var sourceURI: String?
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 83dc1148cfa3..532f1457939a 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FileSchemaTestClass: Codable { 
-
+public struct FileSchemaTestClass: Codable {
 
     public var file: File?
     public var files: [File]?
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index bccd3f9fb178..20bd6d103b3d 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FormatTest: Codable { 
-
+public struct FormatTest: Codable {
 
     public var integer: Int?
     public var int32: Int?
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 566d71a35ef0..906ddb06fb17 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct HasOnlyReadOnly: Codable { 
-
+public struct HasOnlyReadOnly: Codable {
 
     public var bar: String?
     public var foo: String?
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 80cecab242f2..fe13d302ccbf 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct List: Codable { 
-
+public struct List: Codable {
 
     public var _123list: String?
 
@@ -17,7 +15,7 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _123list = "123-list"
     }
 
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index f0c02de95f7a..4b6037f378ee 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,27 +7,25 @@
 
 import Foundation
 
-
-public struct MapTest: Codable { 
-
+public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-    public var directMap: [String:Bool]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
+    public var directMap: [String: Bool]?
     public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 710e62a9b587..c3deb2f28932 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,15 +7,13 @@
 
 import Foundation
 
-
-public struct MixedPropertiesAndAdditionalPropertiesClass: Codable { 
-
+public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index 450a53b918ca..b61db7d6e716 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name starting with number */
-public struct Model200Response: Codable { 
-
+public struct Model200Response: Codable {
 
     public var name: Int?
     public var _class: String?
@@ -19,7 +18,7 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case _class = "class"
     }
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index 6deb69fcd731..8ab4db44b73a 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name same as property name */
-public struct Name: Codable { 
-
+public struct Name: Codable {
 
     public var name: Int
     public var snakeCase: Int?
@@ -23,7 +22,7 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case snakeCase = "snake_case"
         case property
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index 0c9ee2b7b9f4..4d1dafcc2c1f 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct NumberOnly: Codable { 
-
+public struct NumberOnly: Codable {
 
     public var justNumber: Double?
 
@@ -17,7 +15,7 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justNumber = "JustNumber"
     }
 
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index ab0eac0b304e..40c30cc8609c 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Order: Codable { 
-
+public struct Order: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case placed = "placed"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index 4a7d22710441..18c3a024f122 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct OuterComposite: Codable { 
-
+public struct OuterComposite: Codable {
 
     public var myNumber: Double?
     public var myString: String?
@@ -21,7 +19,7 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index 9e6b8d74e874..c3b778cbbed4 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable, CaseIterable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index a973071d6c96..b9ce0e933256 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Pet: Codable { 
-
+public struct Pet: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index b2a6b7e2b8a6..0acd21fd1000 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ReadOnlyFirst: Codable { 
-
+public struct ReadOnlyFirst: Codable {
 
     public var bar: String?
     public var baz: String?
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index 7e089dcee2b4..c223f993a69e 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing reserved words */
-public struct Return: Codable { 
-
+public struct Return: Codable {
 
     public var _return: Int?
 
@@ -17,7 +16,7 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _return = "return"
     }
 
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index e890ef952520..6e8650f76d8e 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct SpecialModelName: Codable { 
-
+public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
 
@@ -17,7 +15,7 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case specialPropertyName = "$special[property.name]"
     }
 
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index f65ae0623d6e..3f1237fee477 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
+public struct StringBooleanMap: Codable {
 
-public struct StringBooleanMap: Codable { 
-
-
-
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,5 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
 }
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index a91b6061bcf7..4dd8a9a9f5a0 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Tag: Codable { 
-
+public struct Tag: Codable {
 
     public var id: Int64?
     public var name: String?
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index 2d377c3edb02..a9e088808ed3 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderDefault: Codable { 
-
+public struct TypeHolderDefault: Codable {
 
     public var stringItem: String = "what"
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index e5eb92da696e..dff4083ae432 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderExample: Codable { 
-
+public struct TypeHolderExample: Codable {
 
     public var stringItem: String
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index f70328ca9e59..79f271ed7356 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct User: Codable { 
-
+public struct User: Codable {
 
     public var id: Int64?
     public var username: String?
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
index 22261e2ce948..55d0eb421919 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -14,7 +14,7 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
         return URLSessionRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return URLSessionDecodableRequestBuilder<T>.self
     }
 }
@@ -23,16 +23,16 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
 private var urlSessionStore = SynchronizedDictionary<String, URLSession>()
 
 open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
-    
+
     private var observation: NSKeyValueObservation?
-    
+
     deinit {
         observation?.invalidate()
     }
-    
+
     // swiftlint:disable:next weak_delegate
     fileprivate let sessionDelegate = SessionDelegate()
-    
+
     /**
      May be assigned if you want to control the authentication challenges.
      */
@@ -45,11 +45,11 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      - retry the request.
      */
     public var taskCompletionShouldRetry: ((Data?, URLResponse?, Error?, @escaping (Bool) -> Void) -> Void)?
-    
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
-    
+
     /**
      May be overridden by a subclass if you want to control the URLSession
      configuration.
@@ -77,40 +77,40 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the URLRequest
      configuration (e.g. to override the cache policy).
      */
-    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) throws -> URLRequest {
-        
+    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) throws -> URLRequest {
+
         guard let url = URL(string: URLString) else {
             throw DownloadException.requestMissingURL
         }
-        
+
         var originalRequest = URLRequest(url: url)
-        
+
         originalRequest.httpMethod = method.rawValue
-        
+
         buildHeaders().forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         headers.forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         let modifiedRequest = try encoding.encode(originalRequest, with: parameters)
-        
+
         return modifiedRequest
     }
 
     override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
-        let urlSessionId:String = UUID().uuidString
+        let urlSessionId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let urlSession = createURLSession()
         urlSessionStore[urlSessionId] = urlSession
-        
+
         let parameters: [String: Any] = self.parameters ?? [:]
-        
+
         let fileKeys = parameters.filter { $1 is URL }
             .map { $0.0 }
-        
+
         let encoding: ParameterEncoding
         if fileKeys.count > 0 {
             encoding = FileUploadEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
@@ -119,29 +119,29 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         } else {
             encoding = URLEncoding()
         }
-        
+
         guard let xMethod = HTTPMethod(rawValue: method) else {
             fatalError("Unsuported Http method - \(method)")
         }
-        
+
         let cleanupRequest = {
             urlSessionStore[urlSessionId] = nil
             self.observation?.invalidate()
         }
-        
+
         do {
             let request = try createURLRequest(urlSession: urlSession, method: xMethod, encoding: encoding, headers: headers)
-            
+
             let dataTask = urlSession.dataTask(with: request) { [weak self] data, response, error in
-                
+
                 guard let self = self else { return }
-                
+
                 if let taskCompletionShouldRetry = self.taskCompletionShouldRetry {
-                    
+
                     taskCompletionShouldRetry(data, response, error) { [weak self] shouldRetry in
-                        
+
                         guard let self = self else { return }
-                        
+
                         if shouldRetry {
                             cleanupRequest()
                             self.execute(apiResponseQueue, completion)
@@ -157,13 +157,13 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
                     }
                 }
             }
-            
+
             if #available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) {
                 onProgressReady?(dataTask.progress)
             }
-            
+
             dataTask.resume()
-            
+
         } catch {
             apiResponseQueue.async {
                 cleanupRequest()
@@ -172,7 +172,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         }
 
     }
-    
+
     fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -192,52 +192,52 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is URL.Type:
             do {
-                
+
                 guard error == nil else {
                     throw DownloadException.responseFailed
                 }
-                
+
                 guard let data = data else {
                     throw DownloadException.responseDataMissing
                 }
-                
+
                 let fileManager = FileManager.default
                 let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
                 let requestURL = try self.getURL(from: urlRequest)
-                
+
                 var requestPath = try self.getPath(from: requestURL)
-                
+
                 if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) {
                     requestPath = requestPath.appending("/\(headerFileName)")
                 }
-                
+
                 let filePath = documentsDirectory.appendingPathComponent(requestPath)
                 let directoryPath = filePath.deletingLastPathComponent().path
-                
+
                 try fileManager.createDirectory(atPath: directoryPath, withIntermediateDirectories: true, attributes: nil)
                 try data.write(to: filePath, options: .atomic)
-                
+
                 completion(.success(Response(response: httpResponse, body: filePath as? T)))
-                
+
             } catch let requestParserError as DownloadException {
                 completion(.failure(ErrorResponse.error(400, data, requestParserError)))
             } catch let error {
                 completion(.failure(ErrorResponse.error(400, data, error)))
             }
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         default:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
         }
 
@@ -251,7 +251,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -270,7 +270,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
             filename = contentItem
             return filename?
-                .replacingCharacters(in: range, with:"")
+                .replacingCharacters(in: range, with: "")
                 .replacingOccurrences(of: "\"", with: "")
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
@@ -279,7 +279,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -293,7 +293,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -304,7 +304,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuilder<T> {
+open class URLSessionDecodableRequestBuilder<T: Decodable>: URLSessionRequestBuilder<T> {
     override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -324,28 +324,28 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         case is Data.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
-            
+
         default:
-            
+
             guard let data = data, !data.isEmpty else {
                 completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, DecodableRequestBuilderError.emptyDataResponse)))
                 return
             }
-            
+
             let decodeResult = CodableHelper.decode(T.self, from: data)
-            
+
             switch decodeResult {
             case let .success(decodableObj):
                 completion(.success(Response(response: httpResponse, body: decodableObj)))
@@ -356,10 +356,10 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
     }
 }
 
-fileprivate class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
-    
+private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
+
     var credential: URLCredential?
-    
+
     var taskDidReceiveChallenge: ((URLSession, URLSessionTask, URLAuthenticationChallenge) -> (URLSession.AuthChallengeDisposition, URLCredential?))?
 
     func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
@@ -402,13 +402,13 @@ public protocol ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest
 }
 
-fileprivate class URLEncoding: ParameterEncoding {
-    func encode(_ urlRequest: URLRequest, with parameters: [String : Any]?) throws -> URLRequest {
-        
+private class URLEncoding: ParameterEncoding {
+    func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
+
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters else { return urlRequest }
-        
+
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
         }
@@ -417,12 +417,12 @@ fileprivate class URLEncoding: ParameterEncoding {
             urlComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters)
             urlRequest.url = urlComponents.url
         }
-        
+
         return urlRequest
     }
 }
 
-fileprivate class FileUploadEncoding: ParameterEncoding {
+private class FileUploadEncoding: ParameterEncoding {
 
     let contentTypeForFormPart: (_ fileURL: URL) -> String?
 
@@ -433,13 +433,13 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters, !parameters.isEmpty else {
             return urlRequest
         }
-        
+
         let boundary = "Boundary-\(UUID().uuidString)"
-                
+
         urlRequest.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
 
         for (key, value) in parameters {
@@ -479,7 +479,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
                 fatalError("Unprocessable value \(value) with key \(key)")
             }
         }
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         body.append("\r\n--\(boundary)--\r\n")
@@ -494,7 +494,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         var urlRequest = urlRequest
 
         var body = urlRequest.httpBody.orEmpty
-        
+
         let fileData = try Data(contentsOf: fileURL)
 
         let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL)
@@ -502,7 +502,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         let fileName = fileURL.lastPathComponent
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
@@ -518,20 +518,20 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
 
         // The value data.
         body.append(fileData)
-        
+
         urlRequest.httpBody = body
 
         return urlRequest
     }
-    
+
     private func configureDataUploadRequest(urlRequest: URLRequest, boundary: String, name: String, data: Data) -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
diff --git a/samples/client/petstore/swift5/readonlyProperties/Package.swift b/samples/client/petstore/swift5/readonlyProperties/Package.swift
index 79f6f8188738..96dfff54edf4 100644
--- a/samples/client/petstore/swift5/readonlyProperties/Package.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "PetstoreClient",
-            targets: ["PetstoreClient"]),
+            targets: ["PetstoreClient"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -26,6 +26,6 @@ let package = Package(
             name: "PetstoreClient",
             dependencies: [],
             path: "PetstoreClient/Classes"
-        ),
+        )
     ]
 )
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 2404bc8ffc6d..5b09f9557113 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+            if let collection = item.value as? [Any?] {
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -46,15 +46,15 @@ public struct APIHelper {
     }
 
     public static func mapValueToPathItem(_ source: Any) -> Any {
-        if let collection = source as? Array<Any?> {
+        if let collection = source as? [Any?] {
             return collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
         }
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
+            if let collection = item.value as? [Any?] {
                 collection.filter({ $0 != nil }).map({"\($0!)"}).forEach { value in
                     result.append(URLQueryItem(name: item.key, value: value))
                 }
@@ -69,4 +69,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs.swift
index c5d1b9b42df3..a5c2d605dff6 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,15 +9,15 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = URLSessionRequestBuilderFactory()
     public static var apiResponseQueue: DispatchQueue = .main
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
@@ -25,9 +25,9 @@ open class RequestBuilder<T> {
     /// Optional block to obtain a reference to the request's progress instance when available.
     /// With the URLSession http client the request's progress only works on iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0.
     /// If you need to get the request's progress in older OS versions, please use Alamofire http client.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -37,7 +37,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -60,5 +60,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index bb3ae7178254..5bbf323f820c 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
@@ -17,7 +15,7 @@ open class AnotherFakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         call123testSpecialTagsWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index d1d81faa335c..134d6aea416a 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class FakeAPI {
     /**
 
@@ -16,7 +14,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?,_ error: Error?) -> Void)) {
+    open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) {
         fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -51,7 +49,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
+    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) {
         fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -86,7 +84,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?,_ error: Error?) -> Void)) {
+    open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) {
         fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -121,7 +119,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -156,7 +154,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -192,7 +190,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -231,7 +229,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -281,7 +279,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -318,7 +316,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -337,7 +335,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -426,7 +424,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -454,19 +452,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray?.encodeToJSON(),
             "enum_form_string": enumFormString?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(), 
-            "enum_query_string": enumQueryString?.encodeToJSON(), 
-            "enum_query_integer": enumQueryInteger?.encodeToJSON(), 
+            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(),
+            "enum_query_string": enumQueryString?.encodeToJSON(),
+            "enum_query_integer": enumQueryInteger?.encodeToJSON(),
             "enum_query_double": enumQueryDouble?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -492,7 +490,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -518,13 +516,13 @@ open class FakeAPI {
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -545,7 +543,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testInlineAdditionalProperties(param: [String:String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -562,7 +560,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -582,7 +580,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -603,14 +601,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param.encodeToJSON(),
             "param2": param2.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index d21c4a49d43d..48cfe7187b9a 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
@@ -17,7 +15,7 @@ open class FakeClassnameTags123API {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index f5366f5832ba..c938db720047 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -17,7 +15,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         addPetWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -57,7 +55,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -84,8 +82,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey?.encodeToJSON()
@@ -113,7 +111,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -137,8 +135,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status.encodeToJSON()
@@ -157,7 +155,7 @@ open class PetAPI {
      - parameter completion: completion handler to receive the data and the error objects
      */
     @available(*, deprecated, message: "This operation is deprecated.")
-    open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -182,8 +180,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags.encodeToJSON()
@@ -201,7 +199,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?,_ error: Error?) -> Void)) {
+    open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) {
         getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -228,8 +226,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -244,7 +242,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -285,7 +283,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -313,14 +311,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name?.encodeToJSON(),
             "status": status?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -337,7 +335,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -365,14 +363,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "file": file?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -389,7 +387,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -417,14 +415,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "requiredFile": requiredFile.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 3848eda85ad6..a8a83eda39a4 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -17,7 +15,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -41,8 +39,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -56,7 +54,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
+    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -76,14 +74,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -95,7 +93,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -119,8 +117,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -135,7 +133,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         placeOrderWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index 546166841d9e..505ed1b0c5c9 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -17,7 +15,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUserWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -54,7 +52,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithArrayInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -90,7 +88,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithListInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -126,7 +124,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -150,8 +148,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -166,7 +164,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?,_ error: Error?) -> Void)) {
+    open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) {
         getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -189,8 +187,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -206,7 +204,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -228,11 +226,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username.encodeToJSON(), 
+            "username": username.encodeToJSON(),
             "password": password.encodeToJSON()
         ])
 
@@ -247,7 +245,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         logoutUserWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -266,8 +264,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -283,7 +281,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 01b28a4bd42d..ef971ebadc60 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -45,4 +45,4 @@ open class CodableHelper {
     open class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
         return Swift.Result { try self.jsonEncoder.encode(value) }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index f171525e4394..627d9adb757e 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,10 +7,10 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
 	@available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.")
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 6e279679c67a..93ed6b90b376 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -108,24 +108,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -135,7 +135,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -147,8 +147,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -157,8 +157,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -177,5 +177,3 @@ extension HTTPURLResponse {
         return Array(200 ..< 300).contains(statusCode)
     }
 }
-
-
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
index 08f1ef334dff..b79e9f5e64d5 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
@@ -41,7 +41,7 @@ public struct JSONDataEncoding {
     }
 
     public static func encodingParameters(jsonData: Data?) -> [String: Any]? {
-        var returnedParams: [String: Any]? = nil
+        var returnedParams: [String: Any]?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params: [String: Any] = [:]
             params[jsonDataKey] = jsonData
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 314f1eff1f9b..02f78ffb4705 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -9,8 +9,8 @@ import Foundation
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
+        var params: [String: Any]?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -27,7 +27,7 @@ open class JSONEncodingHelper {
     }
 
     open class func encodingParameters(forEncodableObject encodableObj: Any?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+        var params: [String: Any]?
 
         if let encodableObj = encodableObj {
             do {
@@ -41,5 +41,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models.swift
index 11e81ffcc472..c0542c14c081 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,11 +10,11 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
-public enum DownloadException : Error {
+public enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -30,7 +30,6 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-
 open class Response<T> {
     public let statusCode: Int
     public let header: [String: String]
@@ -44,7 +43,7 @@ open class Response<T> {
 
     public convenience init(response: HTTPURLResponse, body: T?) {
         let rawHeader = response.allHeaderFields
-        var header = [String:String]()
+        var header = [String: String]()
         for (key, value) in rawHeader {
             if let key = key.base as? String, let value = value as? String {
                 header[key] = value
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 341b729479e8..3fda7052a7d3 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,19 +7,17 @@
 
 import Foundation
 
+public struct AdditionalPropertiesClass: Codable {
 
-public struct AdditionalPropertiesClass: Codable { 
+    public private(set) var mapString: [String: String]?
+    public private(set) var mapMapString: [String: [String: String]]?
 
-
-    public private(set) var mapString: [String:String]?
-    public private(set) var mapMapString: [String:[String:String]]?
-
-    public init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index fc8bdfae7d5c..af59c2a9ef62 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Animal: Codable { 
-
+public struct Animal: Codable {
 
     public private(set) var className: String
     public private(set) var color: String? = "red"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8ed2..e09b0e9efdc8 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index 48e052b3802d..a89768595cc5 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ApiResponse: Codable { 
-
+public struct ApiResponse: Codable {
 
     public private(set) var code: Int?
     public private(set) var type: String?
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 08f1b7e89b7c..a2593b7c1a39 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public private(set) var arrayArrayNumber: [[Double]]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 579f65acb928..c5edf1100537 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfNumberOnly: Codable {
 
     public private(set) var arrayNumber: [Double]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayNumber = "ArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 8fdf0a286909..8ad39b8c09fc 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayTest: Codable { 
-
+public struct ArrayTest: Codable {
 
     public private(set) var arrayOfString: [String]?
     public private(set) var arrayArrayOfInteger: [[Int64]]?
@@ -21,7 +19,7 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index f4c7a90c3a85..eb3d6777e52b 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Capitalization: Codable { 
-
+public struct Capitalization: Codable {
 
     public private(set) var smallCamel: String?
     public private(set) var capitalCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index 3e509835b0b6..2978b016f98e 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Cat: Codable { 
-
+public struct Cat: Codable {
 
     public private(set) var className: String
     public private(set) var color: String? = "red"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
index f1627ee097a4..4ab80fbcd99e 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct CatAllOf: Codable { 
-
+public struct CatAllOf: Codable {
 
     public private(set) var declawed: Bool?
 
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index bce83565cabc..3482703a6b41 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Category: Codable { 
-
+public struct Category: Codable {
 
     public private(set) var id: Int64?
     public private(set) var name: String = "default-name"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index 1d6271aef8a5..319d88a70f7a 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model with \&quot;_class\&quot; property */
-public struct ClassModel: Codable { 
-
+public struct ClassModel: Codable {
 
     public private(set) var _class: String?
 
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 1e06ac73271d..5dd8cc3062dd 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Client: Codable { 
-
+public struct Client: Codable {
 
     public private(set) var client: String?
 
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index fde6641dd77c..16ab196b8724 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Dog: Codable { 
-
+public struct Dog: Codable {
 
     public private(set) var className: String
     public private(set) var color: String? = "red"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
index 26d6da9def44..d8a838725cbf 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct DogAllOf: Codable { 
-
+public struct DogAllOf: Codable {
 
     public private(set) var breed: String?
 
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index faa0ba8afb1f..d9ce69e9fc86 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumArrays: Codable { 
-
+public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable, CaseIterable {
         case greaterThanOrEqualTo = ">="
@@ -27,7 +25,7 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index c2c639ba3246..d4029d73f8af 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable, CaseIterable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index 576278be14d9..2b114d422d1b 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumTest: Codable { 
-
+public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index 81dac248edae..eeab58194415 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Must be named &#x60;File&#x60; for test. */
-public struct File: Codable { 
-
+public struct File: Codable {
 
     /** Test capitalization */
     public private(set) var sourceURI: String?
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 4be9d64d2f26..94574ca9955b 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FileSchemaTestClass: Codable { 
-
+public struct FileSchemaTestClass: Codable {
 
     public private(set) var file: File?
     public private(set) var files: [File]?
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index 152b1b6277f4..57bbd464b510 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FormatTest: Codable { 
-
+public struct FormatTest: Codable {
 
     public private(set) var integer: Int?
     public private(set) var int32: Int?
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 78b14697863f..4de261f092d2 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct HasOnlyReadOnly: Codable { 
-
+public struct HasOnlyReadOnly: Codable {
 
     public private(set) var bar: String?
     public private(set) var foo: String?
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 50e66b8c199a..135160ff8de2 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct List: Codable { 
-
+public struct List: Codable {
 
     public private(set) var _123list: String?
 
@@ -17,7 +15,7 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _123list = "123-list"
     }
 
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index 2df0bccb3039..ebd9dd5b5bc7 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,27 +7,25 @@
 
 import Foundation
 
-
-public struct MapTest: Codable { 
-
+public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public private(set) var mapMapOfString: [String:[String:String]]?
-    public private(set) var mapOfEnumString: [String:String]?
-    public private(set) var directMap: [String:Bool]?
+    public private(set) var mapMapOfString: [String: [String: String]]?
+    public private(set) var mapOfEnumString: [String: String]?
+    public private(set) var directMap: [String: Bool]?
     public private(set) var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index c8cac41d37b1..dc1ee0461be7 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,15 +7,13 @@
 
 import Foundation
 
-
-public struct MixedPropertiesAndAdditionalPropertiesClass: Codable { 
-
+public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public private(set) var uuid: UUID?
     public private(set) var dateTime: Date?
-    public private(set) var map: [String:Animal]?
+    public private(set) var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index ded3fb6912c6..a0f7127ef65c 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name starting with number */
-public struct Model200Response: Codable { 
-
+public struct Model200Response: Codable {
 
     public private(set) var name: Int?
     public private(set) var _class: String?
@@ -19,7 +18,7 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case _class = "class"
     }
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index 98f02ee6e9d7..ee70b1f6ee9b 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name same as property name */
-public struct Name: Codable { 
-
+public struct Name: Codable {
 
     public private(set) var name: Int
     public private(set) var snakeCase: Int?
@@ -23,7 +22,7 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case snakeCase = "snake_case"
         case property
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index 8555908ced43..007dfab800ce 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct NumberOnly: Codable { 
-
+public struct NumberOnly: Codable {
 
     public private(set) var justNumber: Double?
 
@@ -17,7 +15,7 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justNumber = "JustNumber"
     }
 
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index 6e2f5e57710c..41a1d7d664e7 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Order: Codable { 
-
+public struct Order: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case placed = "placed"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index ae7f8e53f7f1..df6d2512d6e4 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct OuterComposite: Codable { 
-
+public struct OuterComposite: Codable {
 
     public private(set) var myNumber: Double?
     public private(set) var myString: String?
@@ -21,7 +19,7 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index 9e6b8d74e874..c3b778cbbed4 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable, CaseIterable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index 95e4aea41c26..7b99ef33751a 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Pet: Codable { 
-
+public struct Pet: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index 17f4a4c49646..30cd4837cc78 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ReadOnlyFirst: Codable { 
-
+public struct ReadOnlyFirst: Codable {
 
     public private(set) var bar: String?
     public private(set) var baz: String?
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index cf81158bec9b..b28b6e99d777 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing reserved words */
-public struct Return: Codable { 
-
+public struct Return: Codable {
 
     public private(set) var _return: Int?
 
@@ -17,7 +16,7 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _return = "return"
     }
 
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index f3b2e7cf40b5..266833a0dbc6 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct SpecialModelName: Codable { 
-
+public struct SpecialModelName: Codable {
 
     public private(set) var specialPropertyName: Int64?
 
@@ -17,7 +15,7 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case specialPropertyName = "$special[property.name]"
     }
 
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index 9642286b2630..dbd5afe27091 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
+public struct StringBooleanMap: Codable {
 
-public struct StringBooleanMap: Codable { 
-
-
-
-    public private(set) var additionalProperties: [String:Bool] = [:]
+    public private(set) var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,5 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
 }
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index 4f97c69f6832..f827ccf107ad 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Tag: Codable { 
-
+public struct Tag: Codable {
 
     public private(set) var id: Int64?
     public private(set) var name: String?
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index 528a2bdd07c1..ed3641fdb2fc 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderDefault: Codable { 
-
+public struct TypeHolderDefault: Codable {
 
     public private(set) var stringItem: String = "what"
     public private(set) var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index 5d68a286685c..4985005bdaf1 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderExample: Codable { 
-
+public struct TypeHolderExample: Codable {
 
     public private(set) var stringItem: String
     public private(set) var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index be82224b2628..9fba7de81820 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct User: Codable { 
-
+public struct User: Codable {
 
     public private(set) var id: Int64?
     public private(set) var username: String?
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
index 22261e2ce948..55d0eb421919 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -14,7 +14,7 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
         return URLSessionRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return URLSessionDecodableRequestBuilder<T>.self
     }
 }
@@ -23,16 +23,16 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
 private var urlSessionStore = SynchronizedDictionary<String, URLSession>()
 
 open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
-    
+
     private var observation: NSKeyValueObservation?
-    
+
     deinit {
         observation?.invalidate()
     }
-    
+
     // swiftlint:disable:next weak_delegate
     fileprivate let sessionDelegate = SessionDelegate()
-    
+
     /**
      May be assigned if you want to control the authentication challenges.
      */
@@ -45,11 +45,11 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      - retry the request.
      */
     public var taskCompletionShouldRetry: ((Data?, URLResponse?, Error?, @escaping (Bool) -> Void) -> Void)?
-    
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
-    
+
     /**
      May be overridden by a subclass if you want to control the URLSession
      configuration.
@@ -77,40 +77,40 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the URLRequest
      configuration (e.g. to override the cache policy).
      */
-    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) throws -> URLRequest {
-        
+    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) throws -> URLRequest {
+
         guard let url = URL(string: URLString) else {
             throw DownloadException.requestMissingURL
         }
-        
+
         var originalRequest = URLRequest(url: url)
-        
+
         originalRequest.httpMethod = method.rawValue
-        
+
         buildHeaders().forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         headers.forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         let modifiedRequest = try encoding.encode(originalRequest, with: parameters)
-        
+
         return modifiedRequest
     }
 
     override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
-        let urlSessionId:String = UUID().uuidString
+        let urlSessionId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let urlSession = createURLSession()
         urlSessionStore[urlSessionId] = urlSession
-        
+
         let parameters: [String: Any] = self.parameters ?? [:]
-        
+
         let fileKeys = parameters.filter { $1 is URL }
             .map { $0.0 }
-        
+
         let encoding: ParameterEncoding
         if fileKeys.count > 0 {
             encoding = FileUploadEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
@@ -119,29 +119,29 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         } else {
             encoding = URLEncoding()
         }
-        
+
         guard let xMethod = HTTPMethod(rawValue: method) else {
             fatalError("Unsuported Http method - \(method)")
         }
-        
+
         let cleanupRequest = {
             urlSessionStore[urlSessionId] = nil
             self.observation?.invalidate()
         }
-        
+
         do {
             let request = try createURLRequest(urlSession: urlSession, method: xMethod, encoding: encoding, headers: headers)
-            
+
             let dataTask = urlSession.dataTask(with: request) { [weak self] data, response, error in
-                
+
                 guard let self = self else { return }
-                
+
                 if let taskCompletionShouldRetry = self.taskCompletionShouldRetry {
-                    
+
                     taskCompletionShouldRetry(data, response, error) { [weak self] shouldRetry in
-                        
+
                         guard let self = self else { return }
-                        
+
                         if shouldRetry {
                             cleanupRequest()
                             self.execute(apiResponseQueue, completion)
@@ -157,13 +157,13 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
                     }
                 }
             }
-            
+
             if #available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) {
                 onProgressReady?(dataTask.progress)
             }
-            
+
             dataTask.resume()
-            
+
         } catch {
             apiResponseQueue.async {
                 cleanupRequest()
@@ -172,7 +172,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         }
 
     }
-    
+
     fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -192,52 +192,52 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is URL.Type:
             do {
-                
+
                 guard error == nil else {
                     throw DownloadException.responseFailed
                 }
-                
+
                 guard let data = data else {
                     throw DownloadException.responseDataMissing
                 }
-                
+
                 let fileManager = FileManager.default
                 let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
                 let requestURL = try self.getURL(from: urlRequest)
-                
+
                 var requestPath = try self.getPath(from: requestURL)
-                
+
                 if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) {
                     requestPath = requestPath.appending("/\(headerFileName)")
                 }
-                
+
                 let filePath = documentsDirectory.appendingPathComponent(requestPath)
                 let directoryPath = filePath.deletingLastPathComponent().path
-                
+
                 try fileManager.createDirectory(atPath: directoryPath, withIntermediateDirectories: true, attributes: nil)
                 try data.write(to: filePath, options: .atomic)
-                
+
                 completion(.success(Response(response: httpResponse, body: filePath as? T)))
-                
+
             } catch let requestParserError as DownloadException {
                 completion(.failure(ErrorResponse.error(400, data, requestParserError)))
             } catch let error {
                 completion(.failure(ErrorResponse.error(400, data, error)))
             }
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         default:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
         }
 
@@ -251,7 +251,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -270,7 +270,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
             filename = contentItem
             return filename?
-                .replacingCharacters(in: range, with:"")
+                .replacingCharacters(in: range, with: "")
                 .replacingOccurrences(of: "\"", with: "")
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
@@ -279,7 +279,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -293,7 +293,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -304,7 +304,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuilder<T> {
+open class URLSessionDecodableRequestBuilder<T: Decodable>: URLSessionRequestBuilder<T> {
     override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -324,28 +324,28 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         case is Data.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
-            
+
         default:
-            
+
             guard let data = data, !data.isEmpty else {
                 completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, DecodableRequestBuilderError.emptyDataResponse)))
                 return
             }
-            
+
             let decodeResult = CodableHelper.decode(T.self, from: data)
-            
+
             switch decodeResult {
             case let .success(decodableObj):
                 completion(.success(Response(response: httpResponse, body: decodableObj)))
@@ -356,10 +356,10 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
     }
 }
 
-fileprivate class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
-    
+private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
+
     var credential: URLCredential?
-    
+
     var taskDidReceiveChallenge: ((URLSession, URLSessionTask, URLAuthenticationChallenge) -> (URLSession.AuthChallengeDisposition, URLCredential?))?
 
     func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
@@ -402,13 +402,13 @@ public protocol ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest
 }
 
-fileprivate class URLEncoding: ParameterEncoding {
-    func encode(_ urlRequest: URLRequest, with parameters: [String : Any]?) throws -> URLRequest {
-        
+private class URLEncoding: ParameterEncoding {
+    func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
+
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters else { return urlRequest }
-        
+
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
         }
@@ -417,12 +417,12 @@ fileprivate class URLEncoding: ParameterEncoding {
             urlComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters)
             urlRequest.url = urlComponents.url
         }
-        
+
         return urlRequest
     }
 }
 
-fileprivate class FileUploadEncoding: ParameterEncoding {
+private class FileUploadEncoding: ParameterEncoding {
 
     let contentTypeForFormPart: (_ fileURL: URL) -> String?
 
@@ -433,13 +433,13 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters, !parameters.isEmpty else {
             return urlRequest
         }
-        
+
         let boundary = "Boundary-\(UUID().uuidString)"
-                
+
         urlRequest.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
 
         for (key, value) in parameters {
@@ -479,7 +479,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
                 fatalError("Unprocessable value \(value) with key \(key)")
             }
         }
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         body.append("\r\n--\(boundary)--\r\n")
@@ -494,7 +494,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         var urlRequest = urlRequest
 
         var body = urlRequest.httpBody.orEmpty
-        
+
         let fileData = try Data(contentsOf: fileURL)
 
         let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL)
@@ -502,7 +502,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         let fileName = fileURL.lastPathComponent
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
@@ -518,20 +518,20 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
 
         // The value data.
         body.append(fileData)
-        
+
         urlRequest.httpBody = body
 
         return urlRequest
     }
-    
+
     private func configureDataUploadRequest(urlRequest: URLRequest, boundary: String, name: String, data: Data) -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
diff --git a/samples/client/petstore/swift5/resultLibrary/Package.swift b/samples/client/petstore/swift5/resultLibrary/Package.swift
index 79f6f8188738..96dfff54edf4 100644
--- a/samples/client/petstore/swift5/resultLibrary/Package.swift
+++ b/samples/client/petstore/swift5/resultLibrary/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "PetstoreClient",
-            targets: ["PetstoreClient"]),
+            targets: ["PetstoreClient"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -26,6 +26,6 @@ let package = Package(
             name: "PetstoreClient",
             dependencies: [],
             path: "PetstoreClient/Classes"
-        ),
+        )
     ]
 )
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 2404bc8ffc6d..5b09f9557113 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+            if let collection = item.value as? [Any?] {
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -46,15 +46,15 @@ public struct APIHelper {
     }
 
     public static func mapValueToPathItem(_ source: Any) -> Any {
-        if let collection = source as? Array<Any?> {
+        if let collection = source as? [Any?] {
             return collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
         }
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
+            if let collection = item.value as? [Any?] {
                 collection.filter({ $0 != nil }).map({"\($0!)"}).forEach { value in
                     result.append(URLQueryItem(name: item.key, value: value))
                 }
@@ -69,4 +69,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
index c5d1b9b42df3..a5c2d605dff6 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,15 +9,15 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = URLSessionRequestBuilderFactory()
     public static var apiResponseQueue: DispatchQueue = .main
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
@@ -25,9 +25,9 @@ open class RequestBuilder<T> {
     /// Optional block to obtain a reference to the request's progress instance when available.
     /// With the URLSession http client the request's progress only works on iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0.
     /// If you need to get the request's progress in older OS versions, please use Alamofire http client.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -37,7 +37,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -60,5 +60,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index a2e5a2ab250c..001f71608114 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index e891da3f12e8..1289d6e2a94a 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class FakeAPI {
     /**
 
@@ -318,7 +316,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -337,7 +335,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -454,19 +452,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray?.encodeToJSON(),
             "enum_form_string": enumFormString?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(), 
-            "enum_query_string": enumQueryString?.encodeToJSON(), 
-            "enum_query_integer": enumQueryInteger?.encodeToJSON(), 
+            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(),
+            "enum_query_string": enumQueryString?.encodeToJSON(),
+            "enum_query_integer": enumQueryInteger?.encodeToJSON(),
             "enum_query_double": enumQueryDouble?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -518,13 +516,13 @@ open class FakeAPI {
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -545,7 +543,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the result
      */
-    open class func testInlineAdditionalProperties(param: [String:String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<Void, Error>) -> Void)) {
+    open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<Void, Error>) -> Void)) {
         testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -562,7 +560,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -603,14 +601,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param.encodeToJSON(),
             "param2": param2.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index 84cf6f9a09e6..f54d6e7fcf02 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index f35144f8e57b..92893a31295c 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -84,8 +82,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey?.encodeToJSON()
@@ -137,8 +135,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status.encodeToJSON()
@@ -182,8 +180,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags.encodeToJSON()
@@ -228,8 +226,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -313,14 +311,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name?.encodeToJSON(),
             "status": status?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -365,14 +363,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "file": file?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -417,14 +415,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "requiredFile": requiredFile.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 3990c38d237f..5024c9dc8f63 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -41,8 +39,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -56,7 +54,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the result
      */
-    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<[String:Int], Error>) -> Void)) {
+    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ result: Swift.Result<[String: Int], Error>) -> Void)) {
         getInventoryWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -76,14 +74,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -119,8 +117,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index ee4c7a5f35f2..c96c572b50c0 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -150,8 +148,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -189,8 +187,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -228,11 +226,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username.encodeToJSON(), 
+            "username": username.encodeToJSON(),
             "password": password.encodeToJSON()
         ])
 
@@ -266,8 +264,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 01b28a4bd42d..ef971ebadc60 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -45,4 +45,4 @@ open class CodableHelper {
     open class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
         return Swift.Result { try self.jsonEncoder.encode(value) }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index f171525e4394..627d9adb757e 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,10 +7,10 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
 	@available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.")
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 6e279679c67a..93ed6b90b376 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -108,24 +108,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -135,7 +135,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -147,8 +147,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -157,8 +157,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -177,5 +177,3 @@ extension HTTPURLResponse {
         return Array(200 ..< 300).contains(statusCode)
     }
 }
-
-
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
index 08f1ef334dff..b79e9f5e64d5 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
@@ -41,7 +41,7 @@ public struct JSONDataEncoding {
     }
 
     public static func encodingParameters(jsonData: Data?) -> [String: Any]? {
-        var returnedParams: [String: Any]? = nil
+        var returnedParams: [String: Any]?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params: [String: Any] = [:]
             params[jsonDataKey] = jsonData
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 314f1eff1f9b..02f78ffb4705 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -9,8 +9,8 @@ import Foundation
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
+        var params: [String: Any]?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -27,7 +27,7 @@ open class JSONEncodingHelper {
     }
 
     open class func encodingParameters(forEncodableObject encodableObj: Any?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+        var params: [String: Any]?
 
         if let encodableObj = encodableObj {
             do {
@@ -41,5 +41,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
index 11e81ffcc472..c0542c14c081 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,11 +10,11 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
-public enum DownloadException : Error {
+public enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -30,7 +30,6 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-
 open class Response<T> {
     public let statusCode: Int
     public let header: [String: String]
@@ -44,7 +43,7 @@ open class Response<T> {
 
     public convenience init(response: HTTPURLResponse, body: T?) {
         let rawHeader = response.allHeaderFields
-        var header = [String:String]()
+        var header = [String: String]()
         for (key, value) in rawHeader {
             if let key = key.base as? String, let value = value as? String {
                 header[key] = value
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 28ca8377b889..1af031535967 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,19 +7,17 @@
 
 import Foundation
 
+public struct AdditionalPropertiesClass: Codable {
 
-public struct AdditionalPropertiesClass: Codable { 
+    public var mapString: [String: String]?
+    public var mapMapString: [String: [String: String]]?
 
-
-    public var mapString: [String:String]?
-    public var mapMapString: [String:[String:String]]?
-
-    public init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index 1050d79dbe9d..5ed9f31e2a36 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Animal: Codable { 
-
+public struct Animal: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8ed2..e09b0e9efdc8 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index 4d0393b9ba45..ec270da89074 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ApiResponse: Codable { 
-
+public struct ApiResponse: Codable {
 
     public var code: Int?
     public var type: String?
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 1363c96394ba..6c252ed475b2 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public var arrayArrayNumber: [[Double]]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 6b8873730c43..e84eb5d65025 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfNumberOnly: Codable {
 
     public var arrayNumber: [Double]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayNumber = "ArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 64f7c6d9db99..d2140933d181 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayTest: Codable { 
-
+public struct ArrayTest: Codable {
 
     public var arrayOfString: [String]?
     public var arrayArrayOfInteger: [[Int64]]?
@@ -21,7 +19,7 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index ddb669a59045..d1b3b27616ed 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Capitalization: Codable { 
-
+public struct Capitalization: Codable {
 
     public var smallCamel: String?
     public var capitalCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index c4f6e0d488ca..7ab887f3113f 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Cat: Codable { 
-
+public struct Cat: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
index 7b1d7e32be80..a51ad0dffab1 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct CatAllOf: Codable { 
-
+public struct CatAllOf: Codable {
 
     public var declawed: Bool?
 
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index 3ec00f5ab10d..eb8f7e5e1974 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Category: Codable { 
-
+public struct Category: Codable {
 
     public var id: Int64?
     public var name: String = "default-name"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index af030c3dd626..e2a7d4427a06 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model with \&quot;_class\&quot; property */
-public struct ClassModel: Codable { 
-
+public struct ClassModel: Codable {
 
     public var _class: String?
 
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 0aae748c76b4..00245ca37280 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Client: Codable { 
-
+public struct Client: Codable {
 
     public var client: String?
 
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 198e28b94dd6..492c1228008e 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Dog: Codable { 
-
+public struct Dog: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
index 8ff49b2af23f..7786f8acc5ae 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct DogAllOf: Codable { 
-
+public struct DogAllOf: Codable {
 
     public var breed: String?
 
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index e2d3fa04f94b..9844e7c40e35 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumArrays: Codable { 
-
+public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable, CaseIterable {
         case greaterThanOrEqualTo = ">="
@@ -27,7 +25,7 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index c2c639ba3246..d4029d73f8af 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable, CaseIterable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index a56e1f36389b..789f583e1d77 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumTest: Codable { 
-
+public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index 773b53b2cb76..abf3ccffc485 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Must be named &#x60;File&#x60; for test. */
-public struct File: Codable { 
-
+public struct File: Codable {
 
     /** Test capitalization */
     public var sourceURI: String?
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 83dc1148cfa3..532f1457939a 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FileSchemaTestClass: Codable { 
-
+public struct FileSchemaTestClass: Codable {
 
     public var file: File?
     public var files: [File]?
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index bccd3f9fb178..20bd6d103b3d 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FormatTest: Codable { 
-
+public struct FormatTest: Codable {
 
     public var integer: Int?
     public var int32: Int?
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 566d71a35ef0..906ddb06fb17 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct HasOnlyReadOnly: Codable { 
-
+public struct HasOnlyReadOnly: Codable {
 
     public var bar: String?
     public var foo: String?
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 80cecab242f2..fe13d302ccbf 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct List: Codable { 
-
+public struct List: Codable {
 
     public var _123list: String?
 
@@ -17,7 +15,7 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _123list = "123-list"
     }
 
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index f0c02de95f7a..4b6037f378ee 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,27 +7,25 @@
 
 import Foundation
 
-
-public struct MapTest: Codable { 
-
+public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-    public var directMap: [String:Bool]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
+    public var directMap: [String: Bool]?
     public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 710e62a9b587..c3deb2f28932 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,15 +7,13 @@
 
 import Foundation
 
-
-public struct MixedPropertiesAndAdditionalPropertiesClass: Codable { 
-
+public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index 450a53b918ca..b61db7d6e716 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name starting with number */
-public struct Model200Response: Codable { 
-
+public struct Model200Response: Codable {
 
     public var name: Int?
     public var _class: String?
@@ -19,7 +18,7 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case _class = "class"
     }
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index 6deb69fcd731..8ab4db44b73a 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name same as property name */
-public struct Name: Codable { 
-
+public struct Name: Codable {
 
     public var name: Int
     public var snakeCase: Int?
@@ -23,7 +22,7 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case snakeCase = "snake_case"
         case property
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index 0c9ee2b7b9f4..4d1dafcc2c1f 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct NumberOnly: Codable { 
-
+public struct NumberOnly: Codable {
 
     public var justNumber: Double?
 
@@ -17,7 +15,7 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justNumber = "JustNumber"
     }
 
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index ab0eac0b304e..40c30cc8609c 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Order: Codable { 
-
+public struct Order: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case placed = "placed"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index 4a7d22710441..18c3a024f122 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct OuterComposite: Codable { 
-
+public struct OuterComposite: Codable {
 
     public var myNumber: Double?
     public var myString: String?
@@ -21,7 +19,7 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index 9e6b8d74e874..c3b778cbbed4 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable, CaseIterable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index a973071d6c96..b9ce0e933256 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Pet: Codable { 
-
+public struct Pet: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index b2a6b7e2b8a6..0acd21fd1000 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ReadOnlyFirst: Codable { 
-
+public struct ReadOnlyFirst: Codable {
 
     public var bar: String?
     public var baz: String?
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index 7e089dcee2b4..c223f993a69e 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing reserved words */
-public struct Return: Codable { 
-
+public struct Return: Codable {
 
     public var _return: Int?
 
@@ -17,7 +16,7 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _return = "return"
     }
 
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index e890ef952520..6e8650f76d8e 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct SpecialModelName: Codable { 
-
+public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
 
@@ -17,7 +15,7 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case specialPropertyName = "$special[property.name]"
     }
 
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index f65ae0623d6e..3f1237fee477 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
+public struct StringBooleanMap: Codable {
 
-public struct StringBooleanMap: Codable { 
-
-
-
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,5 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
 }
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index a91b6061bcf7..4dd8a9a9f5a0 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Tag: Codable { 
-
+public struct Tag: Codable {
 
     public var id: Int64?
     public var name: String?
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index 2d377c3edb02..a9e088808ed3 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderDefault: Codable { 
-
+public struct TypeHolderDefault: Codable {
 
     public var stringItem: String = "what"
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index e5eb92da696e..dff4083ae432 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderExample: Codable { 
-
+public struct TypeHolderExample: Codable {
 
     public var stringItem: String
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index f70328ca9e59..79f271ed7356 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct User: Codable { 
-
+public struct User: Codable {
 
     public var id: Int64?
     public var username: String?
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
index 22261e2ce948..55d0eb421919 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -14,7 +14,7 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
         return URLSessionRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return URLSessionDecodableRequestBuilder<T>.self
     }
 }
@@ -23,16 +23,16 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
 private var urlSessionStore = SynchronizedDictionary<String, URLSession>()
 
 open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
-    
+
     private var observation: NSKeyValueObservation?
-    
+
     deinit {
         observation?.invalidate()
     }
-    
+
     // swiftlint:disable:next weak_delegate
     fileprivate let sessionDelegate = SessionDelegate()
-    
+
     /**
      May be assigned if you want to control the authentication challenges.
      */
@@ -45,11 +45,11 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      - retry the request.
      */
     public var taskCompletionShouldRetry: ((Data?, URLResponse?, Error?, @escaping (Bool) -> Void) -> Void)?
-    
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
-    
+
     /**
      May be overridden by a subclass if you want to control the URLSession
      configuration.
@@ -77,40 +77,40 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the URLRequest
      configuration (e.g. to override the cache policy).
      */
-    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) throws -> URLRequest {
-        
+    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) throws -> URLRequest {
+
         guard let url = URL(string: URLString) else {
             throw DownloadException.requestMissingURL
         }
-        
+
         var originalRequest = URLRequest(url: url)
-        
+
         originalRequest.httpMethod = method.rawValue
-        
+
         buildHeaders().forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         headers.forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         let modifiedRequest = try encoding.encode(originalRequest, with: parameters)
-        
+
         return modifiedRequest
     }
 
     override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
-        let urlSessionId:String = UUID().uuidString
+        let urlSessionId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let urlSession = createURLSession()
         urlSessionStore[urlSessionId] = urlSession
-        
+
         let parameters: [String: Any] = self.parameters ?? [:]
-        
+
         let fileKeys = parameters.filter { $1 is URL }
             .map { $0.0 }
-        
+
         let encoding: ParameterEncoding
         if fileKeys.count > 0 {
             encoding = FileUploadEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
@@ -119,29 +119,29 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         } else {
             encoding = URLEncoding()
         }
-        
+
         guard let xMethod = HTTPMethod(rawValue: method) else {
             fatalError("Unsuported Http method - \(method)")
         }
-        
+
         let cleanupRequest = {
             urlSessionStore[urlSessionId] = nil
             self.observation?.invalidate()
         }
-        
+
         do {
             let request = try createURLRequest(urlSession: urlSession, method: xMethod, encoding: encoding, headers: headers)
-            
+
             let dataTask = urlSession.dataTask(with: request) { [weak self] data, response, error in
-                
+
                 guard let self = self else { return }
-                
+
                 if let taskCompletionShouldRetry = self.taskCompletionShouldRetry {
-                    
+
                     taskCompletionShouldRetry(data, response, error) { [weak self] shouldRetry in
-                        
+
                         guard let self = self else { return }
-                        
+
                         if shouldRetry {
                             cleanupRequest()
                             self.execute(apiResponseQueue, completion)
@@ -157,13 +157,13 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
                     }
                 }
             }
-            
+
             if #available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) {
                 onProgressReady?(dataTask.progress)
             }
-            
+
             dataTask.resume()
-            
+
         } catch {
             apiResponseQueue.async {
                 cleanupRequest()
@@ -172,7 +172,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         }
 
     }
-    
+
     fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -192,52 +192,52 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is URL.Type:
             do {
-                
+
                 guard error == nil else {
                     throw DownloadException.responseFailed
                 }
-                
+
                 guard let data = data else {
                     throw DownloadException.responseDataMissing
                 }
-                
+
                 let fileManager = FileManager.default
                 let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
                 let requestURL = try self.getURL(from: urlRequest)
-                
+
                 var requestPath = try self.getPath(from: requestURL)
-                
+
                 if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) {
                     requestPath = requestPath.appending("/\(headerFileName)")
                 }
-                
+
                 let filePath = documentsDirectory.appendingPathComponent(requestPath)
                 let directoryPath = filePath.deletingLastPathComponent().path
-                
+
                 try fileManager.createDirectory(atPath: directoryPath, withIntermediateDirectories: true, attributes: nil)
                 try data.write(to: filePath, options: .atomic)
-                
+
                 completion(.success(Response(response: httpResponse, body: filePath as? T)))
-                
+
             } catch let requestParserError as DownloadException {
                 completion(.failure(ErrorResponse.error(400, data, requestParserError)))
             } catch let error {
                 completion(.failure(ErrorResponse.error(400, data, error)))
             }
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         default:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
         }
 
@@ -251,7 +251,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -270,7 +270,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
             filename = contentItem
             return filename?
-                .replacingCharacters(in: range, with:"")
+                .replacingCharacters(in: range, with: "")
                 .replacingOccurrences(of: "\"", with: "")
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
@@ -279,7 +279,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -293,7 +293,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -304,7 +304,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuilder<T> {
+open class URLSessionDecodableRequestBuilder<T: Decodable>: URLSessionRequestBuilder<T> {
     override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -324,28 +324,28 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         case is Data.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
-            
+
         default:
-            
+
             guard let data = data, !data.isEmpty else {
                 completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, DecodableRequestBuilderError.emptyDataResponse)))
                 return
             }
-            
+
             let decodeResult = CodableHelper.decode(T.self, from: data)
-            
+
             switch decodeResult {
             case let .success(decodableObj):
                 completion(.success(Response(response: httpResponse, body: decodableObj)))
@@ -356,10 +356,10 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
     }
 }
 
-fileprivate class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
-    
+private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
+
     var credential: URLCredential?
-    
+
     var taskDidReceiveChallenge: ((URLSession, URLSessionTask, URLAuthenticationChallenge) -> (URLSession.AuthChallengeDisposition, URLCredential?))?
 
     func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
@@ -402,13 +402,13 @@ public protocol ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest
 }
 
-fileprivate class URLEncoding: ParameterEncoding {
-    func encode(_ urlRequest: URLRequest, with parameters: [String : Any]?) throws -> URLRequest {
-        
+private class URLEncoding: ParameterEncoding {
+    func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
+
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters else { return urlRequest }
-        
+
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
         }
@@ -417,12 +417,12 @@ fileprivate class URLEncoding: ParameterEncoding {
             urlComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters)
             urlRequest.url = urlComponents.url
         }
-        
+
         return urlRequest
     }
 }
 
-fileprivate class FileUploadEncoding: ParameterEncoding {
+private class FileUploadEncoding: ParameterEncoding {
 
     let contentTypeForFormPart: (_ fileURL: URL) -> String?
 
@@ -433,13 +433,13 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters, !parameters.isEmpty else {
             return urlRequest
         }
-        
+
         let boundary = "Boundary-\(UUID().uuidString)"
-                
+
         urlRequest.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
 
         for (key, value) in parameters {
@@ -479,7 +479,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
                 fatalError("Unprocessable value \(value) with key \(key)")
             }
         }
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         body.append("\r\n--\(boundary)--\r\n")
@@ -494,7 +494,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         var urlRequest = urlRequest
 
         var body = urlRequest.httpBody.orEmpty
-        
+
         let fileData = try Data(contentsOf: fileURL)
 
         let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL)
@@ -502,7 +502,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         let fileName = fileURL.lastPathComponent
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
@@ -518,20 +518,20 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
 
         // The value data.
         body.append(fileData)
-        
+
         urlRequest.httpBody = body
 
         return urlRequest
     }
-    
+
     private func configureDataUploadRequest(urlRequest: URLRequest, boundary: String, name: String, data: Data) -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/Package.swift b/samples/client/petstore/swift5/rxswiftLibrary/Package.swift
index 4b20458197f3..24f9a6c99ae5 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/Package.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/Package.swift
@@ -14,11 +14,11 @@ let package = Package(
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "PetstoreClient",
-            targets: ["PetstoreClient"]),
+            targets: ["PetstoreClient"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0"),
+        .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -27,6 +27,6 @@ let package = Package(
             name: "PetstoreClient",
             dependencies: ["RxSwift"],
             path: "PetstoreClient/Classes"
-        ),
+        )
     ]
 )
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 2404bc8ffc6d..5b09f9557113 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+            if let collection = item.value as? [Any?] {
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -46,15 +46,15 @@ public struct APIHelper {
     }
 
     public static func mapValueToPathItem(_ source: Any) -> Any {
-        if let collection = source as? Array<Any?> {
+        if let collection = source as? [Any?] {
             return collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
         }
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
+            if let collection = item.value as? [Any?] {
                 collection.filter({ $0 != nil }).map({"\($0!)"}).forEach { value in
                     result.append(URLQueryItem(name: item.key, value: value))
                 }
@@ -69,4 +69,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
index c5d1b9b42df3..a5c2d605dff6 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,15 +9,15 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = URLSessionRequestBuilderFactory()
     public static var apiResponseQueue: DispatchQueue = .main
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
@@ -25,9 +25,9 @@ open class RequestBuilder<T> {
     /// Optional block to obtain a reference to the request's progress instance when available.
     /// With the URLSession http client the request's progress only works on iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0.
     /// If you need to get the request's progress in older OS versions, please use Alamofire http client.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -37,7 +37,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -60,5 +60,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index 4090e37b32c9..792371b38421 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import RxSwift
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index fa3d09834ff0..3e9b32438c82 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import RxSwift
 
-
-
 open class FakeAPI {
     /**
 
@@ -351,7 +349,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -370,7 +368,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -491,19 +489,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray?.encodeToJSON(),
             "enum_form_string": enumFormString?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(), 
-            "enum_query_string": enumQueryString?.encodeToJSON(), 
-            "enum_query_integer": enumQueryInteger?.encodeToJSON(), 
+            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(),
+            "enum_query_string": enumQueryString?.encodeToJSON(),
+            "enum_query_integer": enumQueryInteger?.encodeToJSON(),
             "enum_query_double": enumQueryDouble?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -559,13 +557,13 @@ open class FakeAPI {
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -586,7 +584,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Observable<Void>
      */
-    open class func testInlineAdditionalProperties(param: [String:String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable<Void> {
+    open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable<Void> {
         return Observable.create { observer -> Disposable in
             testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result -> Void in
                 switch result {
@@ -607,7 +605,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -652,14 +650,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param.encodeToJSON(),
             "param2": param2.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index 1353f91b278f..989a914f3795 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -8,8 +8,6 @@
 import Foundation
 import RxSwift
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 41cb591c8955..b3a26902360e 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import RxSwift
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -93,8 +91,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey?.encodeToJSON()
@@ -150,8 +148,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status.encodeToJSON()
@@ -199,8 +197,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags.encodeToJSON()
@@ -249,8 +247,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -342,14 +340,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name?.encodeToJSON(),
             "status": status?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -398,14 +396,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "file": file?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -454,14 +452,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "requiredFile": requiredFile.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index f5c974ba3824..dea3933433cf 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import RxSwift
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -46,8 +44,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -61,7 +59,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - returns: Observable<[String:Int]>
      */
-    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable<[String:Int]> {
+    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue) -> Observable<[String: Int]> {
         return Observable.create { observer -> Disposable in
             getInventoryWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
                 switch result {
@@ -85,14 +83,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -132,8 +130,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index 2228363cfccd..3447ea28c0ed 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import RxSwift
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -167,8 +165,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -210,8 +208,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -253,11 +251,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username.encodeToJSON(), 
+            "username": username.encodeToJSON(),
             "password": password.encodeToJSON()
         ])
 
@@ -295,8 +293,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 01b28a4bd42d..ef971ebadc60 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -45,4 +45,4 @@ open class CodableHelper {
     open class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
         return Swift.Result { try self.jsonEncoder.encode(value) }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index f171525e4394..627d9adb757e 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,10 +7,10 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
 	@available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.")
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 6e279679c67a..93ed6b90b376 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -108,24 +108,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -135,7 +135,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -147,8 +147,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -157,8 +157,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -177,5 +177,3 @@ extension HTTPURLResponse {
         return Array(200 ..< 300).contains(statusCode)
     }
 }
-
-
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
index 08f1ef334dff..b79e9f5e64d5 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
@@ -41,7 +41,7 @@ public struct JSONDataEncoding {
     }
 
     public static func encodingParameters(jsonData: Data?) -> [String: Any]? {
-        var returnedParams: [String: Any]? = nil
+        var returnedParams: [String: Any]?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params: [String: Any] = [:]
             params[jsonDataKey] = jsonData
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 314f1eff1f9b..02f78ffb4705 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -9,8 +9,8 @@ import Foundation
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
+        var params: [String: Any]?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -27,7 +27,7 @@ open class JSONEncodingHelper {
     }
 
     open class func encodingParameters(forEncodableObject encodableObj: Any?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+        var params: [String: Any]?
 
         if let encodableObj = encodableObj {
             do {
@@ -41,5 +41,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
index 11e81ffcc472..c0542c14c081 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,11 +10,11 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
-public enum DownloadException : Error {
+public enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -30,7 +30,6 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-
 open class Response<T> {
     public let statusCode: Int
     public let header: [String: String]
@@ -44,7 +43,7 @@ open class Response<T> {
 
     public convenience init(response: HTTPURLResponse, body: T?) {
         let rawHeader = response.allHeaderFields
-        var header = [String:String]()
+        var header = [String: String]()
         for (key, value) in rawHeader {
             if let key = key.base as? String, let value = value as? String {
                 header[key] = value
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 28ca8377b889..1af031535967 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,19 +7,17 @@
 
 import Foundation
 
+public struct AdditionalPropertiesClass: Codable {
 
-public struct AdditionalPropertiesClass: Codable { 
+    public var mapString: [String: String]?
+    public var mapMapString: [String: [String: String]]?
 
-
-    public var mapString: [String:String]?
-    public var mapMapString: [String:[String:String]]?
-
-    public init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index 1050d79dbe9d..5ed9f31e2a36 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Animal: Codable { 
-
+public struct Animal: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8ed2..e09b0e9efdc8 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index 4d0393b9ba45..ec270da89074 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ApiResponse: Codable { 
-
+public struct ApiResponse: Codable {
 
     public var code: Int?
     public var type: String?
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 1363c96394ba..6c252ed475b2 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public var arrayArrayNumber: [[Double]]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 6b8873730c43..e84eb5d65025 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfNumberOnly: Codable {
 
     public var arrayNumber: [Double]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayNumber = "ArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 64f7c6d9db99..d2140933d181 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayTest: Codable { 
-
+public struct ArrayTest: Codable {
 
     public var arrayOfString: [String]?
     public var arrayArrayOfInteger: [[Int64]]?
@@ -21,7 +19,7 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index ddb669a59045..d1b3b27616ed 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Capitalization: Codable { 
-
+public struct Capitalization: Codable {
 
     public var smallCamel: String?
     public var capitalCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index c4f6e0d488ca..7ab887f3113f 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Cat: Codable { 
-
+public struct Cat: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
index 7b1d7e32be80..a51ad0dffab1 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct CatAllOf: Codable { 
-
+public struct CatAllOf: Codable {
 
     public var declawed: Bool?
 
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index 3ec00f5ab10d..eb8f7e5e1974 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Category: Codable { 
-
+public struct Category: Codable {
 
     public var id: Int64?
     public var name: String = "default-name"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index af030c3dd626..e2a7d4427a06 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model with \&quot;_class\&quot; property */
-public struct ClassModel: Codable { 
-
+public struct ClassModel: Codable {
 
     public var _class: String?
 
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 0aae748c76b4..00245ca37280 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Client: Codable { 
-
+public struct Client: Codable {
 
     public var client: String?
 
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 198e28b94dd6..492c1228008e 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Dog: Codable { 
-
+public struct Dog: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
index 8ff49b2af23f..7786f8acc5ae 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct DogAllOf: Codable { 
-
+public struct DogAllOf: Codable {
 
     public var breed: String?
 
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index e2d3fa04f94b..9844e7c40e35 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumArrays: Codable { 
-
+public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable, CaseIterable {
         case greaterThanOrEqualTo = ">="
@@ -27,7 +25,7 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index c2c639ba3246..d4029d73f8af 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable, CaseIterable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index a56e1f36389b..789f583e1d77 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumTest: Codable { 
-
+public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index 773b53b2cb76..abf3ccffc485 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Must be named &#x60;File&#x60; for test. */
-public struct File: Codable { 
-
+public struct File: Codable {
 
     /** Test capitalization */
     public var sourceURI: String?
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 83dc1148cfa3..532f1457939a 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FileSchemaTestClass: Codable { 
-
+public struct FileSchemaTestClass: Codable {
 
     public var file: File?
     public var files: [File]?
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index bccd3f9fb178..20bd6d103b3d 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FormatTest: Codable { 
-
+public struct FormatTest: Codable {
 
     public var integer: Int?
     public var int32: Int?
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 566d71a35ef0..906ddb06fb17 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct HasOnlyReadOnly: Codable { 
-
+public struct HasOnlyReadOnly: Codable {
 
     public var bar: String?
     public var foo: String?
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 80cecab242f2..fe13d302ccbf 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct List: Codable { 
-
+public struct List: Codable {
 
     public var _123list: String?
 
@@ -17,7 +15,7 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _123list = "123-list"
     }
 
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index f0c02de95f7a..4b6037f378ee 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,27 +7,25 @@
 
 import Foundation
 
-
-public struct MapTest: Codable { 
-
+public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-    public var directMap: [String:Bool]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
+    public var directMap: [String: Bool]?
     public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 710e62a9b587..c3deb2f28932 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,15 +7,13 @@
 
 import Foundation
 
-
-public struct MixedPropertiesAndAdditionalPropertiesClass: Codable { 
-
+public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index 450a53b918ca..b61db7d6e716 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name starting with number */
-public struct Model200Response: Codable { 
-
+public struct Model200Response: Codable {
 
     public var name: Int?
     public var _class: String?
@@ -19,7 +18,7 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case _class = "class"
     }
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index 6deb69fcd731..8ab4db44b73a 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name same as property name */
-public struct Name: Codable { 
-
+public struct Name: Codable {
 
     public var name: Int
     public var snakeCase: Int?
@@ -23,7 +22,7 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case snakeCase = "snake_case"
         case property
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index 0c9ee2b7b9f4..4d1dafcc2c1f 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct NumberOnly: Codable { 
-
+public struct NumberOnly: Codable {
 
     public var justNumber: Double?
 
@@ -17,7 +15,7 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justNumber = "JustNumber"
     }
 
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index ab0eac0b304e..40c30cc8609c 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Order: Codable { 
-
+public struct Order: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case placed = "placed"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index 4a7d22710441..18c3a024f122 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct OuterComposite: Codable { 
-
+public struct OuterComposite: Codable {
 
     public var myNumber: Double?
     public var myString: String?
@@ -21,7 +19,7 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index 9e6b8d74e874..c3b778cbbed4 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable, CaseIterable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index a973071d6c96..b9ce0e933256 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Pet: Codable { 
-
+public struct Pet: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index b2a6b7e2b8a6..0acd21fd1000 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ReadOnlyFirst: Codable { 
-
+public struct ReadOnlyFirst: Codable {
 
     public var bar: String?
     public var baz: String?
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index 7e089dcee2b4..c223f993a69e 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing reserved words */
-public struct Return: Codable { 
-
+public struct Return: Codable {
 
     public var _return: Int?
 
@@ -17,7 +16,7 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _return = "return"
     }
 
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index e890ef952520..6e8650f76d8e 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct SpecialModelName: Codable { 
-
+public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
 
@@ -17,7 +15,7 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case specialPropertyName = "$special[property.name]"
     }
 
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index f65ae0623d6e..3f1237fee477 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
+public struct StringBooleanMap: Codable {
 
-public struct StringBooleanMap: Codable { 
-
-
-
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,5 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
 }
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index a91b6061bcf7..4dd8a9a9f5a0 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Tag: Codable { 
-
+public struct Tag: Codable {
 
     public var id: Int64?
     public var name: String?
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index 2d377c3edb02..a9e088808ed3 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderDefault: Codable { 
-
+public struct TypeHolderDefault: Codable {
 
     public var stringItem: String = "what"
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index e5eb92da696e..dff4083ae432 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderExample: Codable { 
-
+public struct TypeHolderExample: Codable {
 
     public var stringItem: String
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index f70328ca9e59..79f271ed7356 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct User: Codable { 
-
+public struct User: Codable {
 
     public var id: Int64?
     public var username: String?
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
index 22261e2ce948..55d0eb421919 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -14,7 +14,7 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
         return URLSessionRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return URLSessionDecodableRequestBuilder<T>.self
     }
 }
@@ -23,16 +23,16 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
 private var urlSessionStore = SynchronizedDictionary<String, URLSession>()
 
 open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
-    
+
     private var observation: NSKeyValueObservation?
-    
+
     deinit {
         observation?.invalidate()
     }
-    
+
     // swiftlint:disable:next weak_delegate
     fileprivate let sessionDelegate = SessionDelegate()
-    
+
     /**
      May be assigned if you want to control the authentication challenges.
      */
@@ -45,11 +45,11 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      - retry the request.
      */
     public var taskCompletionShouldRetry: ((Data?, URLResponse?, Error?, @escaping (Bool) -> Void) -> Void)?
-    
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
-    
+
     /**
      May be overridden by a subclass if you want to control the URLSession
      configuration.
@@ -77,40 +77,40 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the URLRequest
      configuration (e.g. to override the cache policy).
      */
-    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) throws -> URLRequest {
-        
+    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) throws -> URLRequest {
+
         guard let url = URL(string: URLString) else {
             throw DownloadException.requestMissingURL
         }
-        
+
         var originalRequest = URLRequest(url: url)
-        
+
         originalRequest.httpMethod = method.rawValue
-        
+
         buildHeaders().forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         headers.forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         let modifiedRequest = try encoding.encode(originalRequest, with: parameters)
-        
+
         return modifiedRequest
     }
 
     override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
-        let urlSessionId:String = UUID().uuidString
+        let urlSessionId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let urlSession = createURLSession()
         urlSessionStore[urlSessionId] = urlSession
-        
+
         let parameters: [String: Any] = self.parameters ?? [:]
-        
+
         let fileKeys = parameters.filter { $1 is URL }
             .map { $0.0 }
-        
+
         let encoding: ParameterEncoding
         if fileKeys.count > 0 {
             encoding = FileUploadEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
@@ -119,29 +119,29 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         } else {
             encoding = URLEncoding()
         }
-        
+
         guard let xMethod = HTTPMethod(rawValue: method) else {
             fatalError("Unsuported Http method - \(method)")
         }
-        
+
         let cleanupRequest = {
             urlSessionStore[urlSessionId] = nil
             self.observation?.invalidate()
         }
-        
+
         do {
             let request = try createURLRequest(urlSession: urlSession, method: xMethod, encoding: encoding, headers: headers)
-            
+
             let dataTask = urlSession.dataTask(with: request) { [weak self] data, response, error in
-                
+
                 guard let self = self else { return }
-                
+
                 if let taskCompletionShouldRetry = self.taskCompletionShouldRetry {
-                    
+
                     taskCompletionShouldRetry(data, response, error) { [weak self] shouldRetry in
-                        
+
                         guard let self = self else { return }
-                        
+
                         if shouldRetry {
                             cleanupRequest()
                             self.execute(apiResponseQueue, completion)
@@ -157,13 +157,13 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
                     }
                 }
             }
-            
+
             if #available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) {
                 onProgressReady?(dataTask.progress)
             }
-            
+
             dataTask.resume()
-            
+
         } catch {
             apiResponseQueue.async {
                 cleanupRequest()
@@ -172,7 +172,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         }
 
     }
-    
+
     fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -192,52 +192,52 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is URL.Type:
             do {
-                
+
                 guard error == nil else {
                     throw DownloadException.responseFailed
                 }
-                
+
                 guard let data = data else {
                     throw DownloadException.responseDataMissing
                 }
-                
+
                 let fileManager = FileManager.default
                 let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
                 let requestURL = try self.getURL(from: urlRequest)
-                
+
                 var requestPath = try self.getPath(from: requestURL)
-                
+
                 if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) {
                     requestPath = requestPath.appending("/\(headerFileName)")
                 }
-                
+
                 let filePath = documentsDirectory.appendingPathComponent(requestPath)
                 let directoryPath = filePath.deletingLastPathComponent().path
-                
+
                 try fileManager.createDirectory(atPath: directoryPath, withIntermediateDirectories: true, attributes: nil)
                 try data.write(to: filePath, options: .atomic)
-                
+
                 completion(.success(Response(response: httpResponse, body: filePath as? T)))
-                
+
             } catch let requestParserError as DownloadException {
                 completion(.failure(ErrorResponse.error(400, data, requestParserError)))
             } catch let error {
                 completion(.failure(ErrorResponse.error(400, data, error)))
             }
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         default:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
         }
 
@@ -251,7 +251,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -270,7 +270,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
             filename = contentItem
             return filename?
-                .replacingCharacters(in: range, with:"")
+                .replacingCharacters(in: range, with: "")
                 .replacingOccurrences(of: "\"", with: "")
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
@@ -279,7 +279,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -293,7 +293,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -304,7 +304,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuilder<T> {
+open class URLSessionDecodableRequestBuilder<T: Decodable>: URLSessionRequestBuilder<T> {
     override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -324,28 +324,28 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         case is Data.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
-            
+
         default:
-            
+
             guard let data = data, !data.isEmpty else {
                 completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, DecodableRequestBuilderError.emptyDataResponse)))
                 return
             }
-            
+
             let decodeResult = CodableHelper.decode(T.self, from: data)
-            
+
             switch decodeResult {
             case let .success(decodableObj):
                 completion(.success(Response(response: httpResponse, body: decodableObj)))
@@ -356,10 +356,10 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
     }
 }
 
-fileprivate class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
-    
+private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
+
     var credential: URLCredential?
-    
+
     var taskDidReceiveChallenge: ((URLSession, URLSessionTask, URLAuthenticationChallenge) -> (URLSession.AuthChallengeDisposition, URLCredential?))?
 
     func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
@@ -402,13 +402,13 @@ public protocol ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest
 }
 
-fileprivate class URLEncoding: ParameterEncoding {
-    func encode(_ urlRequest: URLRequest, with parameters: [String : Any]?) throws -> URLRequest {
-        
+private class URLEncoding: ParameterEncoding {
+    func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
+
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters else { return urlRequest }
-        
+
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
         }
@@ -417,12 +417,12 @@ fileprivate class URLEncoding: ParameterEncoding {
             urlComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters)
             urlRequest.url = urlComponents.url
         }
-        
+
         return urlRequest
     }
 }
 
-fileprivate class FileUploadEncoding: ParameterEncoding {
+private class FileUploadEncoding: ParameterEncoding {
 
     let contentTypeForFormPart: (_ fileURL: URL) -> String?
 
@@ -433,13 +433,13 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters, !parameters.isEmpty else {
             return urlRequest
         }
-        
+
         let boundary = "Boundary-\(UUID().uuidString)"
-                
+
         urlRequest.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
 
         for (key, value) in parameters {
@@ -479,7 +479,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
                 fatalError("Unprocessable value \(value) with key \(key)")
             }
         }
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         body.append("\r\n--\(boundary)--\r\n")
@@ -494,7 +494,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         var urlRequest = urlRequest
 
         var body = urlRequest.httpBody.orEmpty
-        
+
         let fileData = try Data(contentsOf: fileURL)
 
         let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL)
@@ -502,7 +502,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         let fileName = fileURL.lastPathComponent
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
@@ -518,20 +518,20 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
 
         // The value data.
         body.append(fileData)
-        
+
         urlRequest.httpBody = body
 
         return urlRequest
     }
-    
+
     private func configureDataUploadRequest(urlRequest: URLRequest, boundary: String, name: String, data: Data) -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Package.swift b/samples/client/petstore/swift5/urlsessionLibrary/Package.swift
index 79f6f8188738..96dfff54edf4 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/Package.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "PetstoreClient",
-            targets: ["PetstoreClient"]),
+            targets: ["PetstoreClient"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -26,6 +26,6 @@ let package = Package(
             name: "PetstoreClient",
             dependencies: [],
             path: "PetstoreClient/Classes"
-        ),
+        )
     ]
 )
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 2404bc8ffc6d..5b09f9557113 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+            if let collection = item.value as? [Any?] {
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -46,15 +46,15 @@ public struct APIHelper {
     }
 
     public static func mapValueToPathItem(_ source: Any) -> Any {
-        if let collection = source as? Array<Any?> {
+        if let collection = source as? [Any?] {
             return collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
         }
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
+            if let collection = item.value as? [Any?] {
                 collection.filter({ $0 != nil }).map({"\($0!)"}).forEach { value in
                     result.append(URLQueryItem(name: item.key, value: value))
                 }
@@ -69,4 +69,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
index c5d1b9b42df3..a5c2d605dff6 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,15 +9,15 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = URLSessionRequestBuilderFactory()
     public static var apiResponseQueue: DispatchQueue = .main
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
@@ -25,9 +25,9 @@ open class RequestBuilder<T> {
     /// Optional block to obtain a reference to the request's progress instance when available.
     /// With the URLSession http client the request's progress only works on iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0.
     /// If you need to get the request's progress in older OS versions, please use Alamofire http client.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -37,7 +37,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -60,5 +60,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index bb3ae7178254..5bbf323f820c 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
@@ -17,7 +15,7 @@ open class AnotherFakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func call123testSpecialTags(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         call123testSpecialTagsWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index d1d81faa335c..134d6aea416a 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class FakeAPI {
     /**
 
@@ -16,7 +14,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?,_ error: Error?) -> Void)) {
+    open class func fakeOuterBooleanSerialize(body: Bool? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) {
         fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -51,7 +49,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
+    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) {
         fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -86,7 +84,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?,_ error: Error?) -> Void)) {
+    open class func fakeOuterNumberSerialize(body: Double? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) {
         fakeOuterNumberSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -121,7 +119,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func fakeOuterStringSerialize(body: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         fakeOuterStringSerializeWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -156,7 +154,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithFileSchema(body: FileSchemaTestClass, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithFileSchemaWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -192,7 +190,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithQueryParams(query: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -231,7 +229,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClientModel(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClientModelWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -281,7 +279,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -318,7 +316,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -337,7 +335,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -426,7 +424,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -454,19 +452,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray?.encodeToJSON(),
             "enum_form_string": enumFormString?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(), 
-            "enum_query_string": enumQueryString?.encodeToJSON(), 
-            "enum_query_integer": enumQueryInteger?.encodeToJSON(), 
+            "enum_query_string_array": enumQueryStringArray?.encodeToJSON(),
+            "enum_query_string": enumQueryString?.encodeToJSON(),
+            "enum_query_integer": enumQueryInteger?.encodeToJSON(),
             "enum_query_double": enumQueryDouble?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -492,7 +490,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -518,13 +516,13 @@ open class FakeAPI {
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -545,7 +543,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testInlineAdditionalProperties(param: [String:String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testInlineAdditionalProperties(param: [String: String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -562,7 +560,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -582,7 +580,7 @@ open class FakeAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testJsonFormData(param: String, param2: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -603,14 +601,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param.encodeToJSON(),
             "param2": param2.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index d21c4a49d43d..48cfe7187b9a 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
@@ -17,7 +15,7 @@ open class FakeClassnameTags123API {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClassname(body: Client, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClassnameWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index f5366f5832ba..c938db720047 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -17,7 +15,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func addPet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         addPetWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -57,7 +55,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deletePet(petId: Int64, apiKey: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -84,8 +82,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey?.encodeToJSON()
@@ -113,7 +111,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByStatus(status: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByStatusWithRequestBuilder(status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -137,8 +135,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status.encodeToJSON()
@@ -157,7 +155,7 @@ open class PetAPI {
      - parameter completion: completion handler to receive the data and the error objects
      */
     @available(*, deprecated, message: "This operation is deprecated.")
-    open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByTags(tags: [String], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByTagsWithRequestBuilder(tags: tags).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -182,8 +180,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags.encodeToJSON()
@@ -201,7 +199,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?,_ error: Error?) -> Void)) {
+    open class func getPetById(petId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) {
         getPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -228,8 +226,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -244,7 +242,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePet(body: Pet, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -285,7 +283,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -313,14 +311,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name?.encodeToJSON(),
             "status": status?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -337,7 +335,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -365,14 +363,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "file": file?.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -389,7 +387,7 @@ open class PetAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -417,14 +415,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata?.encodeToJSON(),
             "requiredFile": requiredFile.encodeToJSON()
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 3848eda85ad6..a8a83eda39a4 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -17,7 +15,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteOrder(orderId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteOrderWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -41,8 +39,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -56,7 +54,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
+    open class func getInventory(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -76,14 +74,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -95,7 +93,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func getOrderById(orderId: Int64, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         getOrderByIdWithRequestBuilder(orderId: orderId).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -119,8 +117,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -135,7 +133,7 @@ open class StoreAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func placeOrder(body: Order, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         placeOrderWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index 546166841d9e..505ed1b0c5c9 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -17,7 +15,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUser(body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUserWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -54,7 +52,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithArrayInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithArrayInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -90,7 +88,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithListInput(body: [User], apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithListInputWithRequestBuilder(body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -126,7 +124,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteUser(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteUserWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -150,8 +148,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -166,7 +164,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?,_ error: Error?) -> Void)) {
+    open class func getUserByName(username: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) {
         getUserByNameWithRequestBuilder(username: username).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -189,8 +187,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -206,7 +204,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func loginUser(username: String, password: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         loginUserWithRequestBuilder(username: username, password: password).execute(apiResponseQueue) { result -> Void in
             switch result {
             case let .success(response):
@@ -228,11 +226,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username.encodeToJSON(), 
+            "username": username.encodeToJSON(),
             "password": password.encodeToJSON()
         ])
 
@@ -247,7 +245,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func logoutUser(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         logoutUserWithRequestBuilder().execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
@@ -266,8 +264,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -283,7 +281,7 @@ open class UserAPI {
      - parameter apiResponseQueue: The queue on which api response is dispatched.
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updateUser(username: String, body: User, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updateUserWithRequestBuilder(username: username, body: body).execute(apiResponseQueue) { result -> Void in
             switch result {
             case .success:
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 01b28a4bd42d..ef971ebadc60 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -45,4 +45,4 @@ open class CodableHelper {
     open class func encode<T>(_ value: T) -> Swift.Result<Data, Error> where T: Encodable {
         return Swift.Result { try self.jsonEncoder.encode(value) }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index f171525e4394..627d9adb757e 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,10 +7,10 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
 	@available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.")
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 6e279679c67a..93ed6b90b376 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -108,24 +108,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -135,7 +135,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -147,8 +147,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -157,8 +157,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -177,5 +177,3 @@ extension HTTPURLResponse {
         return Array(200 ..< 300).contains(statusCode)
     }
 }
-
-
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
index 08f1ef334dff..b79e9f5e64d5 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift
@@ -41,7 +41,7 @@ public struct JSONDataEncoding {
     }
 
     public static func encodingParameters(jsonData: Data?) -> [String: Any]? {
-        var returnedParams: [String: Any]? = nil
+        var returnedParams: [String: Any]?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params: [String: Any] = [:]
             params[jsonDataKey] = jsonData
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 314f1eff1f9b..02f78ffb4705 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -9,8 +9,8 @@ import Foundation
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> [String: Any]? {
+        var params: [String: Any]?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -27,7 +27,7 @@ open class JSONEncodingHelper {
     }
 
     open class func encodingParameters(forEncodableObject encodableObj: Any?) -> [String: Any]? {
-        var params: [String: Any]? = nil
+        var params: [String: Any]?
 
         if let encodableObj = encodableObj {
             do {
@@ -41,5 +41,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
index 11e81ffcc472..c0542c14c081 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,11 +10,11 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
-public enum DownloadException : Error {
+public enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -30,7 +30,6 @@ public enum DecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-
 open class Response<T> {
     public let statusCode: Int
     public let header: [String: String]
@@ -44,7 +43,7 @@ open class Response<T> {
 
     public convenience init(response: HTTPURLResponse, body: T?) {
         let rawHeader = response.allHeaderFields
-        var header = [String:String]()
+        var header = [String: String]()
         for (key, value) in rawHeader {
             if let key = key.base as? String, let value = value as? String {
                 header[key] = value
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 28ca8377b889..1af031535967 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,19 +7,17 @@
 
 import Foundation
 
+public struct AdditionalPropertiesClass: Codable {
 
-public struct AdditionalPropertiesClass: Codable { 
+    public var mapString: [String: String]?
+    public var mapMapString: [String: [String: String]]?
 
-
-    public var mapString: [String:String]?
-    public var mapMapString: [String:[String:String]]?
-
-    public init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index 1050d79dbe9d..5ed9f31e2a36 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Animal: Codable { 
-
+public struct Animal: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8ed2..e09b0e9efdc8 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index 4d0393b9ba45..ec270da89074 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ApiResponse: Codable { 
-
+public struct ApiResponse: Codable {
 
     public var code: Int?
     public var type: String?
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 1363c96394ba..6c252ed475b2 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public var arrayArrayNumber: [[Double]]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 6b8873730c43..e84eb5d65025 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayOfNumberOnly: Codable { 
-
+public struct ArrayOfNumberOnly: Codable {
 
     public var arrayNumber: [Double]?
 
@@ -17,7 +15,7 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayNumber = "ArrayNumber"
     }
 
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 64f7c6d9db99..d2140933d181 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ArrayTest: Codable { 
-
+public struct ArrayTest: Codable {
 
     public var arrayOfString: [String]?
     public var arrayArrayOfInteger: [[Int64]]?
@@ -21,7 +19,7 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index ddb669a59045..d1b3b27616ed 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Capitalization: Codable { 
-
+public struct Capitalization: Codable {
 
     public var smallCamel: String?
     public var capitalCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index c4f6e0d488ca..7ab887f3113f 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Cat: Codable { 
-
+public struct Cat: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
index 7b1d7e32be80..a51ad0dffab1 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct CatAllOf: Codable { 
-
+public struct CatAllOf: Codable {
 
     public var declawed: Bool?
 
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index 3ec00f5ab10d..eb8f7e5e1974 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Category: Codable { 
-
+public struct Category: Codable {
 
     public var id: Int64?
     public var name: String = "default-name"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index af030c3dd626..e2a7d4427a06 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model with \&quot;_class\&quot; property */
-public struct ClassModel: Codable { 
-
+public struct ClassModel: Codable {
 
     public var _class: String?
 
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 0aae748c76b4..00245ca37280 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Client: Codable { 
-
+public struct Client: Codable {
 
     public var client: String?
 
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 198e28b94dd6..492c1228008e 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Dog: Codable { 
-
+public struct Dog: Codable {
 
     public var className: String
     public var color: String? = "red"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
index 8ff49b2af23f..7786f8acc5ae 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct DogAllOf: Codable { 
-
+public struct DogAllOf: Codable {
 
     public var breed: String?
 
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index e2d3fa04f94b..9844e7c40e35 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumArrays: Codable { 
-
+public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable, CaseIterable {
         case greaterThanOrEqualTo = ">="
@@ -27,7 +25,7 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index c2c639ba3246..d4029d73f8af 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable, CaseIterable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index a56e1f36389b..789f583e1d77 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct EnumTest: Codable { 
-
+public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index 773b53b2cb76..abf3ccffc485 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Must be named &#x60;File&#x60; for test. */
-public struct File: Codable { 
-
+public struct File: Codable {
 
     /** Test capitalization */
     public var sourceURI: String?
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 83dc1148cfa3..532f1457939a 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FileSchemaTestClass: Codable { 
-
+public struct FileSchemaTestClass: Codable {
 
     public var file: File?
     public var files: [File]?
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index bccd3f9fb178..20bd6d103b3d 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct FormatTest: Codable { 
-
+public struct FormatTest: Codable {
 
     public var integer: Int?
     public var int32: Int?
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 566d71a35ef0..906ddb06fb17 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct HasOnlyReadOnly: Codable { 
-
+public struct HasOnlyReadOnly: Codable {
 
     public var bar: String?
     public var foo: String?
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 80cecab242f2..fe13d302ccbf 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct List: Codable { 
-
+public struct List: Codable {
 
     public var _123list: String?
 
@@ -17,7 +15,7 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _123list = "123-list"
     }
 
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index f0c02de95f7a..4b6037f378ee 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,27 +7,25 @@
 
 import Foundation
 
-
-public struct MapTest: Codable { 
-
+public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable, CaseIterable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-    public var directMap: [String:Bool]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
+    public var directMap: [String: Bool]?
     public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 710e62a9b587..c3deb2f28932 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,15 +7,13 @@
 
 import Foundation
 
-
-public struct MixedPropertiesAndAdditionalPropertiesClass: Codable { 
-
+public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index 450a53b918ca..b61db7d6e716 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name starting with number */
-public struct Model200Response: Codable { 
-
+public struct Model200Response: Codable {
 
     public var name: Int?
     public var _class: String?
@@ -19,7 +18,7 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case _class = "class"
     }
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index 6deb69fcd731..8ab4db44b73a 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing model name same as property name */
-public struct Name: Codable { 
-
+public struct Name: Codable {
 
     public var name: Int
     public var snakeCase: Int?
@@ -23,7 +22,7 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case name
         case snakeCase = "snake_case"
         case property
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index 0c9ee2b7b9f4..4d1dafcc2c1f 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct NumberOnly: Codable { 
-
+public struct NumberOnly: Codable {
 
     public var justNumber: Double?
 
@@ -17,7 +15,7 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case justNumber = "JustNumber"
     }
 
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index ab0eac0b304e..40c30cc8609c 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Order: Codable { 
-
+public struct Order: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case placed = "placed"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index 4a7d22710441..18c3a024f122 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct OuterComposite: Codable { 
-
+public struct OuterComposite: Codable {
 
     public var myNumber: Double?
     public var myString: String?
@@ -21,7 +19,7 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index 9e6b8d74e874..c3b778cbbed4 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable, CaseIterable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index a973071d6c96..b9ce0e933256 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Pet: Codable { 
-
+public struct Pet: Codable {
 
     public enum Status: String, Codable, CaseIterable {
         case available = "available"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index b2a6b7e2b8a6..0acd21fd1000 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct ReadOnlyFirst: Codable { 
-
+public struct ReadOnlyFirst: Codable {
 
     public var bar: String?
     public var baz: String?
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index 7e089dcee2b4..c223f993a69e 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -8,8 +8,7 @@
 import Foundation
 
 /** Model for testing reserved words */
-public struct Return: Codable { 
-
+public struct Return: Codable {
 
     public var _return: Int?
 
@@ -17,7 +16,7 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case _return = "return"
     }
 
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index e890ef952520..6e8650f76d8e 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct SpecialModelName: Codable { 
-
+public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
 
@@ -17,7 +15,7 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case specialPropertyName = "$special[property.name]"
     }
 
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index f65ae0623d6e..3f1237fee477 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
+public struct StringBooleanMap: Codable {
 
-public struct StringBooleanMap: Codable { 
-
-
-
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,5 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
 }
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index a91b6061bcf7..4dd8a9a9f5a0 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct Tag: Codable { 
-
+public struct Tag: Codable {
 
     public var id: Int64?
     public var name: String?
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index 2d377c3edb02..a9e088808ed3 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderDefault: Codable { 
-
+public struct TypeHolderDefault: Codable {
 
     public var stringItem: String = "what"
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index e5eb92da696e..dff4083ae432 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct TypeHolderExample: Codable { 
-
+public struct TypeHolderExample: Codable {
 
     public var stringItem: String
     public var numberItem: Double
@@ -25,7 +23,7 @@ public struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey, CaseIterable { 
+    public enum CodingKeys: String, CodingKey, CaseIterable {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index f70328ca9e59..79f271ed7356 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,9 +7,7 @@
 
 import Foundation
 
-
-public struct User: Codable { 
-
+public struct User: Codable {
 
     public var id: Int64?
     public var username: String?
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
index 22261e2ce948..55d0eb421919 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift
@@ -14,7 +14,7 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
         return URLSessionRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return URLSessionDecodableRequestBuilder<T>.self
     }
 }
@@ -23,16 +23,16 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
 private var urlSessionStore = SynchronizedDictionary<String, URLSession>()
 
 open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
-    
+
     private var observation: NSKeyValueObservation?
-    
+
     deinit {
         observation?.invalidate()
     }
-    
+
     // swiftlint:disable:next weak_delegate
     fileprivate let sessionDelegate = SessionDelegate()
-    
+
     /**
      May be assigned if you want to control the authentication challenges.
      */
@@ -45,11 +45,11 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      - retry the request.
      */
     public var taskCompletionShouldRetry: ((Data?, URLResponse?, Error?, @escaping (Bool) -> Void) -> Void)?
-    
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
-    
+
     /**
      May be overridden by a subclass if you want to control the URLSession
      configuration.
@@ -77,40 +77,40 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the URLRequest
      configuration (e.g. to override the cache policy).
      */
-    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) throws -> URLRequest {
-        
+    open func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) throws -> URLRequest {
+
         guard let url = URL(string: URLString) else {
             throw DownloadException.requestMissingURL
         }
-        
+
         var originalRequest = URLRequest(url: url)
-        
+
         originalRequest.httpMethod = method.rawValue
-        
+
         buildHeaders().forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         headers.forEach { key, value in
             originalRequest.setValue(value, forHTTPHeaderField: key)
         }
-        
+
         let modifiedRequest = try encoding.encode(originalRequest, with: parameters)
-        
+
         return modifiedRequest
     }
 
     override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
-        let urlSessionId:String = UUID().uuidString
+        let urlSessionId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let urlSession = createURLSession()
         urlSessionStore[urlSessionId] = urlSession
-        
+
         let parameters: [String: Any] = self.parameters ?? [:]
-        
+
         let fileKeys = parameters.filter { $1 is URL }
             .map { $0.0 }
-        
+
         let encoding: ParameterEncoding
         if fileKeys.count > 0 {
             encoding = FileUploadEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:))
@@ -119,29 +119,29 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         } else {
             encoding = URLEncoding()
         }
-        
+
         guard let xMethod = HTTPMethod(rawValue: method) else {
             fatalError("Unsuported Http method - \(method)")
         }
-        
+
         let cleanupRequest = {
             urlSessionStore[urlSessionId] = nil
             self.observation?.invalidate()
         }
-        
+
         do {
             let request = try createURLRequest(urlSession: urlSession, method: xMethod, encoding: encoding, headers: headers)
-            
+
             let dataTask = urlSession.dataTask(with: request) { [weak self] data, response, error in
-                
+
                 guard let self = self else { return }
-                
+
                 if let taskCompletionShouldRetry = self.taskCompletionShouldRetry {
-                    
+
                     taskCompletionShouldRetry(data, response, error) { [weak self] shouldRetry in
-                        
+
                         guard let self = self else { return }
-                        
+
                         if shouldRetry {
                             cleanupRequest()
                             self.execute(apiResponseQueue, completion)
@@ -157,13 +157,13 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
                     }
                 }
             }
-            
+
             if #available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) {
                 onProgressReady?(dataTask.progress)
             }
-            
+
             dataTask.resume()
-            
+
         } catch {
             apiResponseQueue.async {
                 cleanupRequest()
@@ -172,7 +172,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         }
 
     }
-    
+
     fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -192,52 +192,52 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is URL.Type:
             do {
-                
+
                 guard error == nil else {
                     throw DownloadException.responseFailed
                 }
-                
+
                 guard let data = data else {
                     throw DownloadException.responseDataMissing
                 }
-                
+
                 let fileManager = FileManager.default
                 let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
                 let requestURL = try self.getURL(from: urlRequest)
-                
+
                 var requestPath = try self.getPath(from: requestURL)
-                
+
                 if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) {
                     requestPath = requestPath.appending("/\(headerFileName)")
                 }
-                
+
                 let filePath = documentsDirectory.appendingPathComponent(requestPath)
                 let directoryPath = filePath.deletingLastPathComponent().path
-                
+
                 try fileManager.createDirectory(atPath: directoryPath, withIntermediateDirectories: true, attributes: nil)
                 try data.write(to: filePath, options: .atomic)
-                
+
                 completion(.success(Response(response: httpResponse, body: filePath as? T)))
-                
+
             } catch let requestParserError as DownloadException {
                 completion(.failure(ErrorResponse.error(400, data, requestParserError)))
             } catch let error {
                 completion(.failure(ErrorResponse.error(400, data, error)))
             }
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         default:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
         }
 
@@ -251,7 +251,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -270,7 +270,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
             filename = contentItem
             return filename?
-                .replacingCharacters(in: range, with:"")
+                .replacingCharacters(in: range, with: "")
                 .replacingOccurrences(of: "\"", with: "")
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
@@ -279,7 +279,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -293,7 +293,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -304,7 +304,7 @@ open class URLSessionRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuilder<T> {
+open class URLSessionDecodableRequestBuilder<T: Decodable>: URLSessionRequestBuilder<T> {
     override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, Error>) -> Void) {
 
         if let error = error {
@@ -324,28 +324,28 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
 
         switch T.self {
         case is String.Type:
-            
+
             let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? ""
-            
+
             completion(.success(Response<T>(response: httpResponse, body: body as? T)))
-            
+
         case is Void.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: nil)))
-            
+
         case is Data.Type:
-            
+
             completion(.success(Response(response: httpResponse, body: data as? T)))
-            
+
         default:
-            
+
             guard let data = data, !data.isEmpty else {
                 completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, DecodableRequestBuilderError.emptyDataResponse)))
                 return
             }
-            
+
             let decodeResult = CodableHelper.decode(T.self, from: data)
-            
+
             switch decodeResult {
             case let .success(decodableObj):
                 completion(.success(Response(response: httpResponse, body: decodableObj)))
@@ -356,10 +356,10 @@ open class URLSessionDecodableRequestBuilder<T:Decodable>: URLSessionRequestBuil
     }
 }
 
-fileprivate class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
-    
+private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDelegate {
+
     var credential: URLCredential?
-    
+
     var taskDidReceiveChallenge: ((URLSession, URLSessionTask, URLAuthenticationChallenge) -> (URLSession.AuthChallengeDisposition, URLCredential?))?
 
     func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
@@ -402,13 +402,13 @@ public protocol ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest
 }
 
-fileprivate class URLEncoding: ParameterEncoding {
-    func encode(_ urlRequest: URLRequest, with parameters: [String : Any]?) throws -> URLRequest {
-        
+private class URLEncoding: ParameterEncoding {
+    func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
+
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters else { return urlRequest }
-        
+
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
         }
@@ -417,12 +417,12 @@ fileprivate class URLEncoding: ParameterEncoding {
             urlComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters)
             urlRequest.url = urlComponents.url
         }
-        
+
         return urlRequest
     }
 }
 
-fileprivate class FileUploadEncoding: ParameterEncoding {
+private class FileUploadEncoding: ParameterEncoding {
 
     let contentTypeForFormPart: (_ fileURL: URL) -> String?
 
@@ -433,13 +433,13 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
     func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         guard let parameters = parameters, !parameters.isEmpty else {
             return urlRequest
         }
-        
+
         let boundary = "Boundary-\(UUID().uuidString)"
-                
+
         urlRequest.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
 
         for (key, value) in parameters {
@@ -479,7 +479,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
                 fatalError("Unprocessable value \(value) with key \(key)")
             }
         }
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         body.append("\r\n--\(boundary)--\r\n")
@@ -494,7 +494,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         var urlRequest = urlRequest
 
         var body = urlRequest.httpBody.orEmpty
-        
+
         let fileData = try Data(contentsOf: fileURL)
 
         let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL)
@@ -502,7 +502,7 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
         let fileName = fileURL.lastPathComponent
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
@@ -518,20 +518,20 @@ fileprivate class FileUploadEncoding: ParameterEncoding {
 
         // The value data.
         body.append(fileData)
-        
+
         urlRequest.httpBody = body
 
         return urlRequest
     }
-    
+
     private func configureDataUploadRequest(urlRequest: URLRequest, boundary: String, name: String, data: Data) -> URLRequest {
 
         var urlRequest = urlRequest
-        
+
         var body = urlRequest.httpBody.orEmpty
 
         // If we already added something then we need an additional newline.
-        if (body.count > 0) {
+        if body.count > 0 {
             body.append("\r\n")
         }
 
diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts
index 9bfc1ba1f178..495012df96a6 100644
--- a/samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * Example
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/base.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/base.ts
index 46e25c2e6de2..ce4043f006b2 100644
--- a/samples/client/petstore/typescript-axios/builds/composed-schemas/base.ts
+++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/base.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * Example
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts
index 96f755e21cd2..dbeeafb2da99 100644
--- a/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts
+++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/configuration.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * Example
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/index.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/index.ts
index 435b97b80dbf..9f1fc0aca1a7 100644
--- a/samples/client/petstore/typescript-axios/builds/composed-schemas/index.ts
+++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/index.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * Example
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
diff --git a/samples/client/petstore/typescript-axios/builds/default/api.ts b/samples/client/petstore/typescript-axios/builds/default/api.ts
index c82afd1ed5d4..dcc79aff27a0 100644
--- a/samples/client/petstore/typescript-axios/builds/default/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/default/api.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/default/base.ts b/samples/client/petstore/typescript-axios/builds/default/base.ts
index 71e2f198af3e..c7eaf57bf474 100644
--- a/samples/client/petstore/typescript-axios/builds/default/base.ts
+++ b/samples/client/petstore/typescript-axios/builds/default/base.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/default/configuration.ts b/samples/client/petstore/typescript-axios/builds/default/configuration.ts
index 3d5dc74ee608..96fa41b21122 100644
--- a/samples/client/petstore/typescript-axios/builds/default/configuration.ts
+++ b/samples/client/petstore/typescript-axios/builds/default/configuration.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/default/index.ts b/samples/client/petstore/typescript-axios/builds/default/index.ts
index 0cb247adefaf..efc3ab5be819 100644
--- a/samples/client/petstore/typescript-axios/builds/default/index.ts
+++ b/samples/client/petstore/typescript-axios/builds/default/index.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts
index c82afd1ed5d4..dcc79aff27a0 100644
--- a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/base.ts b/samples/client/petstore/typescript-axios/builds/es6-target/base.ts
index 71e2f198af3e..c7eaf57bf474 100644
--- a/samples/client/petstore/typescript-axios/builds/es6-target/base.ts
+++ b/samples/client/petstore/typescript-axios/builds/es6-target/base.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts b/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts
index 3d5dc74ee608..96fa41b21122 100644
--- a/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts
+++ b/samples/client/petstore/typescript-axios/builds/es6-target/configuration.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/index.ts b/samples/client/petstore/typescript-axios/builds/es6-target/index.ts
index 0cb247adefaf..efc3ab5be819 100644
--- a/samples/client/petstore/typescript-axios/builds/es6-target/index.ts
+++ b/samples/client/petstore/typescript-axios/builds/es6-target/index.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
index dc1fc46ef7b3..a1d3e7782694 100644
--- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/base.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/base.ts
index 71e2f198af3e..c7eaf57bf474 100644
--- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/base.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/base.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts
index 3d5dc74ee608..96fa41b21122 100644
--- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/configuration.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/index.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/index.ts
index 0cb247adefaf..efc3ab5be819 100644
--- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/index.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/index.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts
index ac4f6d9e9d4b..0ff5c368f501 100644
--- a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/base.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/base.ts
index 71e2f198af3e..c7eaf57bf474 100644
--- a/samples/client/petstore/typescript-axios/builds/with-interfaces/base.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/base.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts
index 3d5dc74ee608..96fa41b21122 100644
--- a/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/configuration.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/index.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/index.ts
index 0cb247adefaf..efc3ab5be819 100644
--- a/samples/client/petstore/typescript-axios/builds/with-interfaces/index.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/index.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api.ts
index ac5b143e6601..a93cf65f62d6 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts
index d3147eece07b..688c880a0feb 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts
index f6f895bc2149..4dc676eb0e38 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts
index 88cf7e898eed..6111d0a09e25 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/base.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/base.ts
index 71e2f198af3e..c7eaf57bf474 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/base.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/base.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts
index 3d5dc74ee608..96fa41b21122 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/configuration.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/index.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/index.ts
index 0cb247adefaf..efc3ab5be819 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/index.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/index.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/api-response.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/api-response.ts
index 1ce626260192..9a706d3e6c5f 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/api-response.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/api-response.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/category.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/category.ts
index 6a836ab3f55f..a51d595dbf4f 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/category.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/category.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/order.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/order.ts
index cc229cb85e6d..96693b94262e 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/order.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/order.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/pet.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/pet.ts
index d2e38753f00d..9eba0fe99aec 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/pet.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/pet.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/tag.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/tag.ts
index 3514962f6a47..ef7ccf845ff6 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/tag.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/tag.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/user.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/user.ts
index b5f98b2f692f..f24b822626ee 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/user.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/user.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts
index c82afd1ed5d4..dcc79aff27a0 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/base.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/base.ts
index 71e2f198af3e..c7eaf57bf474 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version/base.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/base.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts
index 3d5dc74ee608..96fa41b21122 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/configuration.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/index.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/index.ts
index 0cb247adefaf..efc3ab5be819 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version/index.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/index.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts
index 0f28039687c3..d3bb2f8787f0 100644
--- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/base.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/base.ts
index 71e2f198af3e..c7eaf57bf474 100644
--- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/base.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/base.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts
index 3d5dc74ee608..96fa41b21122 100644
--- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/configuration.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/index.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/index.ts
index 0cb247adefaf..efc3ab5be819 100644
--- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/index.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/index.ts
@@ -1,4 +1,5 @@
-// tslint:disable
+/* tslint:disable */
+/* eslint-disable */
 /**
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts
index 9d891d9ea72f..a219f15f7e2c 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts
@@ -73,7 +73,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -114,7 +114,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -157,7 +157,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.status) {
             queryParameters['status'] = requestParameters.status.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -202,7 +202,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.tags) {
             queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -247,7 +247,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -282,7 +282,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -323,7 +323,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -384,7 +384,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts
index c26e3c52185f..e3c0f89691ac 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts
@@ -46,7 +46,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -73,7 +73,7 @@ export class StoreApi extends runtime.BaseAPI {
      * Returns pet inventories by status
      */
     async getInventoryRaw(): Promise<runtime.ApiResponse<{ [key: string]: number; }>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -109,7 +109,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -140,7 +140,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts
index 036aacf74854..2e57d7b18ffc 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts
@@ -64,7 +64,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -97,7 +97,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -129,7 +129,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -162,7 +162,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -192,7 +192,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -226,7 +226,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('password','Required parameter requestParameters.password was null or undefined when calling loginUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.username !== undefined) {
             queryParameters['username'] = requestParameters.username;
@@ -260,7 +260,7 @@ export class UserApi extends runtime.BaseAPI {
      * Logs out current logged in user session
      */
     async logoutUserRaw(): Promise<runtime.ApiResponse<void>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -294,7 +294,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts
index 9d891d9ea72f..a219f15f7e2c 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts
@@ -73,7 +73,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -114,7 +114,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -157,7 +157,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.status) {
             queryParameters['status'] = requestParameters.status.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -202,7 +202,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.tags) {
             queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -247,7 +247,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -282,7 +282,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -323,7 +323,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -384,7 +384,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts
index c26e3c52185f..e3c0f89691ac 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts
@@ -46,7 +46,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -73,7 +73,7 @@ export class StoreApi extends runtime.BaseAPI {
      * Returns pet inventories by status
      */
     async getInventoryRaw(): Promise<runtime.ApiResponse<{ [key: string]: number; }>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -109,7 +109,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -140,7 +140,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts
index 036aacf74854..2e57d7b18ffc 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts
@@ -64,7 +64,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -97,7 +97,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -129,7 +129,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -162,7 +162,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -192,7 +192,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -226,7 +226,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('password','Required parameter requestParameters.password was null or undefined when calling loginUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.username !== undefined) {
             queryParameters['username'] = requestParameters.username;
@@ -260,7 +260,7 @@ export class UserApi extends runtime.BaseAPI {
      * Logs out current logged in user session
      */
     async logoutUserRaw(): Promise<runtime.ApiResponse<void>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -294,7 +294,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts
index 6975933a9658..4c47ea2e1f10 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts
@@ -73,7 +73,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -114,7 +114,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -157,7 +157,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.status) {
             queryParameters['status'] = requestParameters.status.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -202,7 +202,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.tags) {
             queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -247,7 +247,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -282,7 +282,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -323,7 +323,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -384,7 +384,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts
index c8f7ac7c5368..51382e766aaa 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts
@@ -46,7 +46,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -73,7 +73,7 @@ export class StoreApi extends runtime.BaseAPI {
      * Returns pet inventories by status
      */
     async getInventoryRaw(): Promise<runtime.ApiResponse<{ [key: string]: number; }>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -109,7 +109,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -140,7 +140,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts
index e64925bda21a..922b79e9b501 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts
@@ -64,7 +64,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -97,7 +97,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -129,7 +129,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -162,7 +162,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -192,7 +192,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -226,7 +226,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('password','Required parameter requestParameters.password was null or undefined when calling loginUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.username !== undefined) {
             queryParameters['username'] = requestParameters.username;
@@ -260,7 +260,7 @@ export class UserApi extends runtime.BaseAPI {
      * Logs out current logged in user session
      */
     async logoutUserRaw(): Promise<runtime.ApiResponse<void>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -294,7 +294,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts
index e8d463f39e26..b98247c01daf 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts
@@ -73,7 +73,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -114,7 +114,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -157,7 +157,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.status) {
             queryParameters['status'] = requestParameters.status.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -202,7 +202,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.tags) {
             queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -247,7 +247,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -282,7 +282,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -323,7 +323,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -384,7 +384,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts
index 805aa3365009..7ac2687add07 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts
@@ -46,7 +46,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -73,7 +73,7 @@ export class StoreApi extends runtime.BaseAPI {
      * Returns pet inventories by status
      */
     async getInventoryRaw(): Promise<runtime.ApiResponse<{ [key: string]: number; }>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -109,7 +109,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -140,7 +140,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts
index 3fd0e8e13704..e4a6a8b81db9 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts
@@ -64,7 +64,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -97,7 +97,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -129,7 +129,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -162,7 +162,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -192,7 +192,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -226,7 +226,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('password','Required parameter requestParameters.password was null or undefined when calling loginUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.username !== undefined) {
             queryParameters['username'] = requestParameters.username;
@@ -260,7 +260,7 @@ export class UserApi extends runtime.BaseAPI {
      * Logs out current logged in user session
      */
     async logoutUserRaw(): Promise<runtime.ApiResponse<void>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -294,7 +294,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/PetApi.ts
index 9d891d9ea72f..a219f15f7e2c 100644
--- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/PetApi.ts
@@ -73,7 +73,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -114,7 +114,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -157,7 +157,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.status) {
             queryParameters['status'] = requestParameters.status.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -202,7 +202,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.tags) {
             queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -247,7 +247,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -282,7 +282,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -323,7 +323,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -384,7 +384,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/StoreApi.ts
index c26e3c52185f..e3c0f89691ac 100644
--- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/StoreApi.ts
@@ -46,7 +46,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -73,7 +73,7 @@ export class StoreApi extends runtime.BaseAPI {
      * Returns pet inventories by status
      */
     async getInventoryRaw(): Promise<runtime.ApiResponse<{ [key: string]: number; }>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -109,7 +109,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -140,7 +140,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/UserApi.ts
index 036aacf74854..2e57d7b18ffc 100644
--- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/UserApi.ts
@@ -64,7 +64,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -97,7 +97,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -129,7 +129,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -162,7 +162,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -192,7 +192,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -226,7 +226,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('password','Required parameter requestParameters.password was null or undefined when calling loginUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.username !== undefined) {
             queryParameters['username'] = requestParameters.username;
@@ -260,7 +260,7 @@ export class UserApi extends runtime.BaseAPI {
      * Logs out current logged in user session
      */
     async logoutUserRaw(): Promise<runtime.ApiResponse<void>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -294,7 +294,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts
index 95a3c8d2ee57..d7f8f8a62fe8 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts
@@ -210,7 +210,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -251,7 +251,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -294,7 +294,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface {
             throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.status) {
             queryParameters['status'] = requestParameters.status.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -339,7 +339,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface {
             throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.tags) {
             queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -384,7 +384,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -419,7 +419,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -460,7 +460,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -521,7 +521,7 @@ export class PetApi extends runtime.BaseAPI implements PetApiInterface {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts
index cd2e4e760330..20edb9a49bee 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts
@@ -117,7 +117,7 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -144,7 +144,7 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface {
      * Returns pet inventories by status
      */
     async getInventoryRaw(): Promise<runtime.ApiResponse<{ [key: string]: number; }>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -180,7 +180,7 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -211,7 +211,7 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts
index 257dde3bfe08..85159f4221c9 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts
@@ -197,7 +197,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -230,7 +230,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -262,7 +262,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -295,7 +295,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -325,7 +325,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -359,7 +359,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface {
             throw new runtime.RequiredError('password','Required parameter requestParameters.password was null or undefined when calling loginUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.username !== undefined) {
             queryParameters['username'] = requestParameters.username;
@@ -393,7 +393,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface {
      * Logs out current logged in user session
      */
     async logoutUserRaw(): Promise<runtime.ApiResponse<void>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -427,7 +427,7 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts
index 9d891d9ea72f..a219f15f7e2c 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts
@@ -73,7 +73,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -114,7 +114,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -157,7 +157,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.status) {
             queryParameters['status'] = requestParameters.status.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -202,7 +202,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.tags) {
             queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
@@ -247,7 +247,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -282,7 +282,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -323,7 +323,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -384,7 +384,7 @@ export class PetApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts
index c26e3c52185f..e3c0f89691ac 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts
@@ -46,7 +46,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -73,7 +73,7 @@ export class StoreApi extends runtime.BaseAPI {
      * Returns pet inventories by status
      */
     async getInventoryRaw(): Promise<runtime.ApiResponse<{ [key: string]: number; }>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -109,7 +109,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -140,7 +140,7 @@ export class StoreApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts
index 036aacf74854..2e57d7b18ffc 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts
@@ -64,7 +64,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -97,7 +97,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -129,7 +129,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -162,7 +162,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -192,7 +192,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -226,7 +226,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('password','Required parameter requestParameters.password was null or undefined when calling loginUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         if (requestParameters.username !== undefined) {
             queryParameters['username'] = requestParameters.username;
@@ -260,7 +260,7 @@ export class UserApi extends runtime.BaseAPI {
      * Logs out current logged in user session
      */
     async logoutUserRaw(): Promise<runtime.ApiResponse<void>> {
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
@@ -294,7 +294,7 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.');
         }
 
-        const queryParameters: runtime.HTTPQuery = {};
+        const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts
index 021781fd7abb..026381b12b2b 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI, COLLECTION_FORMATS, OperationOpts, RawAjaxResponse } from '../runtime';
 import {
     ApiResponse,
     Pet,
@@ -63,7 +63,9 @@ export class PetApi extends BaseAPI {
     /**
      * Add a new pet to the store
      */
-    addPet = ({ body }: AddPetRequest): Observable<void> => {
+    addPet({ body }: AddPetRequest): Observable<void>
+    addPet({ body }: AddPetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    addPet({ body }: AddPetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'addPet');
 
         const headers: HttpHeaders = {
@@ -78,17 +80,19 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/pet',
+            url: '/pet',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Deletes a pet
      */
-    deletePet = ({ petId, apiKey }: DeletePetRequest): Observable<void> => {
+    deletePet({ petId, apiKey }: DeletePetRequest): Observable<void>
+    deletePet({ petId, apiKey }: DeletePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    deletePet({ petId, apiKey }: DeletePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(petId, 'petId', 'deletePet');
 
         const headers: HttpHeaders = {
@@ -103,17 +107,19 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
+            url: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
             method: 'DELETE',
             headers,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      */
-    findPetsByStatus = ({ status }: FindPetsByStatusRequest): Observable<Array<Pet>> => {
+    findPetsByStatus({ status }: FindPetsByStatusRequest): Observable<Array<Pet>>
+    findPetsByStatus({ status }: FindPetsByStatusRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Array<Pet>>>
+    findPetsByStatus({ status }: FindPetsByStatusRequest, opts?: OperationOpts): Observable<Array<Pet> | RawAjaxResponse<Array<Pet>>> {
         throwIfNullOrUndefined(status, 'status', 'findPetsByStatus');
 
         const headers: HttpHeaders = {
@@ -131,18 +137,20 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: '/pet/findByStatus',
+            url: '/pet/findByStatus',
             method: 'GET',
             headers,
             query,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      */
-    findPetsByTags = ({ tags }: FindPetsByTagsRequest): Observable<Array<Pet>> => {
+    findPetsByTags({ tags }: FindPetsByTagsRequest): Observable<Array<Pet>>
+    findPetsByTags({ tags }: FindPetsByTagsRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Array<Pet>>>
+    findPetsByTags({ tags }: FindPetsByTagsRequest, opts?: OperationOpts): Observable<Array<Pet> | RawAjaxResponse<Array<Pet>>> {
         throwIfNullOrUndefined(tags, 'tags', 'findPetsByTags');
 
         const headers: HttpHeaders = {
@@ -160,18 +168,20 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: '/pet/findByTags',
+            url: '/pet/findByTags',
             method: 'GET',
             headers,
             query,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Returns a single pet
      * Find pet by ID
      */
-    getPetById = ({ petId }: GetPetByIdRequest): Observable<Pet> => {
+    getPetById({ petId }: GetPetByIdRequest): Observable<Pet>
+    getPetById({ petId }: GetPetByIdRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Pet>>
+    getPetById({ petId }: GetPetByIdRequest, opts?: OperationOpts): Observable<Pet | RawAjaxResponse<Pet>> {
         throwIfNullOrUndefined(petId, 'petId', 'getPetById');
 
         const headers: HttpHeaders = {
@@ -179,16 +189,18 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Pet>({
-            path: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
+            url: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
             method: 'GET',
             headers,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Update an existing pet
      */
-    updatePet = ({ body }: UpdatePetRequest): Observable<void> => {
+    updatePet({ body }: UpdatePetRequest): Observable<void>
+    updatePet({ body }: UpdatePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    updatePet({ body }: UpdatePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'updatePet');
 
         const headers: HttpHeaders = {
@@ -203,17 +215,19 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/pet',
+            url: '/pet',
             method: 'PUT',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Updates a pet in the store with form data
      */
-    updatePetWithForm = ({ petId, name, status }: UpdatePetWithFormRequest): Observable<void> => {
+    updatePetWithForm({ petId, name, status }: UpdatePetWithFormRequest): Observable<void>
+    updatePetWithForm({ petId, name, status }: UpdatePetWithFormRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    updatePetWithForm({ petId, name, status }: UpdatePetWithFormRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(petId, 'petId', 'updatePetWithForm');
 
         const headers: HttpHeaders = {
@@ -231,17 +245,19 @@ export class PetApi extends BaseAPI {
         if (status !== undefined) { formData.append('status', status as any); }
 
         return this.request<void>({
-            path: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
+            url: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
             method: 'POST',
             headers,
             body: formData,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * uploads an image
      */
-    uploadFile = ({ petId, additionalMetadata, file }: UploadFileRequest): Observable<ApiResponse> => {
+    uploadFile({ petId, additionalMetadata, file }: UploadFileRequest): Observable<ApiResponse>
+    uploadFile({ petId, additionalMetadata, file }: UploadFileRequest, opts?: OperationOpts): Observable<RawAjaxResponse<ApiResponse>>
+    uploadFile({ petId, additionalMetadata, file }: UploadFileRequest, opts?: OperationOpts): Observable<ApiResponse | RawAjaxResponse<ApiResponse>> {
         throwIfNullOrUndefined(petId, 'petId', 'uploadFile');
 
         const headers: HttpHeaders = {
@@ -259,11 +275,11 @@ export class PetApi extends BaseAPI {
         if (file !== undefined) { formData.append('file', file as any); }
 
         return this.request<ApiResponse>({
-            path: '/pet/{petId}/uploadImage'.replace('{petId}', encodeURI(petId)),
+            url: '/pet/{petId}/uploadImage'.replace('{petId}', encodeURI(petId)),
             method: 'POST',
             headers,
             body: formData,
-        });
+        }, opts?.responseOpts);
     };
 
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
index 8ce04d16aa04..5575fe6c3d64 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, HttpHeaders, throwIfNullOrUndefined, encodeURI } from '../runtime';
+import { BaseAPI, HttpHeaders, throwIfNullOrUndefined, encodeURI, OperationOpts, RawAjaxResponse } from '../runtime';
 import {
     Order,
 } from '../models';
@@ -38,48 +38,56 @@ export class StoreApi extends BaseAPI {
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      * Delete purchase order by ID
      */
-    deleteOrder = ({ orderId }: DeleteOrderRequest): Observable<void> => {
+    deleteOrder({ orderId }: DeleteOrderRequest): Observable<void>
+    deleteOrder({ orderId }: DeleteOrderRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    deleteOrder({ orderId }: DeleteOrderRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(orderId, 'orderId', 'deleteOrder');
 
         return this.request<void>({
-            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
+            url: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
             method: 'DELETE',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
-    getInventory = (): Observable<{ [key: string]: number; }> => {
+    getInventory(): Observable<{ [key: string]: number; }>
+    getInventory(opts?: OperationOpts): Observable<RawAjaxResponse<{ [key: string]: number; }>>
+    getInventory(opts?: OperationOpts): Observable<{ [key: string]: number; } | RawAjaxResponse<{ [key: string]: number; }>> {
         const headers: HttpHeaders = {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
         };
 
         return this.request<{ [key: string]: number; }>({
-            path: '/store/inventory',
+            url: '/store/inventory',
             method: 'GET',
             headers,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      */
-    getOrderById = ({ orderId }: GetOrderByIdRequest): Observable<Order> => {
+    getOrderById({ orderId }: GetOrderByIdRequest): Observable<Order>
+    getOrderById({ orderId }: GetOrderByIdRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Order>>
+    getOrderById({ orderId }: GetOrderByIdRequest, opts?: OperationOpts): Observable<Order | RawAjaxResponse<Order>> {
         throwIfNullOrUndefined(orderId, 'orderId', 'getOrderById');
 
         return this.request<Order>({
-            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
+            url: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
             method: 'GET',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Place an order for a pet
      */
-    placeOrder = ({ body }: PlaceOrderRequest): Observable<Order> => {
+    placeOrder({ body }: PlaceOrderRequest): Observable<Order>
+    placeOrder({ body }: PlaceOrderRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Order>>
+    placeOrder({ body }: PlaceOrderRequest, opts?: OperationOpts): Observable<Order | RawAjaxResponse<Order>> {
         throwIfNullOrUndefined(body, 'body', 'placeOrder');
 
         const headers: HttpHeaders = {
@@ -87,11 +95,11 @@ export class StoreApi extends BaseAPI {
         };
 
         return this.request<Order>({
-            path: '/store/order',
+            url: '/store/order',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts
index a223874786eb..5f08fdfd6580 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI, OperationOpts, RawAjaxResponse } from '../runtime';
 import {
     User,
 } from '../models';
@@ -56,7 +56,9 @@ export class UserApi extends BaseAPI {
      * This can only be done by the logged in user.
      * Create user
      */
-    createUser = ({ body }: CreateUserRequest): Observable<void> => {
+    createUser({ body }: CreateUserRequest): Observable<void>
+    createUser({ body }: CreateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    createUser({ body }: CreateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'createUser');
 
         const headers: HttpHeaders = {
@@ -64,17 +66,19 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/user',
+            url: '/user',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Creates list of users with given input array
      */
-    createUsersWithArrayInput = ({ body }: CreateUsersWithArrayInputRequest): Observable<void> => {
+    createUsersWithArrayInput({ body }: CreateUsersWithArrayInputRequest): Observable<void>
+    createUsersWithArrayInput({ body }: CreateUsersWithArrayInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    createUsersWithArrayInput({ body }: CreateUsersWithArrayInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'createUsersWithArrayInput');
 
         const headers: HttpHeaders = {
@@ -82,17 +86,19 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/user/createWithArray',
+            url: '/user/createWithArray',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Creates list of users with given input array
      */
-    createUsersWithListInput = ({ body }: CreateUsersWithListInputRequest): Observable<void> => {
+    createUsersWithListInput({ body }: CreateUsersWithListInputRequest): Observable<void>
+    createUsersWithListInput({ body }: CreateUsersWithListInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    createUsersWithListInput({ body }: CreateUsersWithListInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'createUsersWithListInput');
 
         const headers: HttpHeaders = {
@@ -100,42 +106,48 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/user/createWithList',
+            url: '/user/createWithList',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * This can only be done by the logged in user.
      * Delete user
      */
-    deleteUser = ({ username }: DeleteUserRequest): Observable<void> => {
+    deleteUser({ username }: DeleteUserRequest): Observable<void>
+    deleteUser({ username }: DeleteUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    deleteUser({ username }: DeleteUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(username, 'username', 'deleteUser');
 
         return this.request<void>({
-            path: '/user/{username}'.replace('{username}', encodeURI(username)),
+            url: '/user/{username}'.replace('{username}', encodeURI(username)),
             method: 'DELETE',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Get user by user name
      */
-    getUserByName = ({ username }: GetUserByNameRequest): Observable<User> => {
+    getUserByName({ username }: GetUserByNameRequest): Observable<User>
+    getUserByName({ username }: GetUserByNameRequest, opts?: OperationOpts): Observable<RawAjaxResponse<User>>
+    getUserByName({ username }: GetUserByNameRequest, opts?: OperationOpts): Observable<User | RawAjaxResponse<User>> {
         throwIfNullOrUndefined(username, 'username', 'getUserByName');
 
         return this.request<User>({
-            path: '/user/{username}'.replace('{username}', encodeURI(username)),
+            url: '/user/{username}'.replace('{username}', encodeURI(username)),
             method: 'GET',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Logs user into the system
      */
-    loginUser = ({ username, password }: LoginUserRequest): Observable<string> => {
+    loginUser({ username, password }: LoginUserRequest): Observable<string>
+    loginUser({ username, password }: LoginUserRequest, opts?: OperationOpts): Observable<RawAjaxResponse<string>>
+    loginUser({ username, password }: LoginUserRequest, opts?: OperationOpts): Observable<string | RawAjaxResponse<string>> {
         throwIfNullOrUndefined(username, 'username', 'loginUser');
         throwIfNullOrUndefined(password, 'password', 'loginUser');
 
@@ -145,27 +157,31 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<string>({
-            path: '/user/login',
+            url: '/user/login',
             method: 'GET',
             query,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Logs out current logged in user session
      */
-    logoutUser = (): Observable<void> => {
+    logoutUser(): Observable<void>
+    logoutUser(opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    logoutUser(opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         return this.request<void>({
-            path: '/user/logout',
+            url: '/user/logout',
             method: 'GET',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * This can only be done by the logged in user.
      * Updated user
      */
-    updateUser = ({ username, body }: UpdateUserRequest): Observable<void> => {
+    updateUser({ username, body }: UpdateUserRequest): Observable<void>
+    updateUser({ username, body }: UpdateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    updateUser({ username, body }: UpdateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(username, 'username', 'updateUser');
         throwIfNullOrUndefined(body, 'body', 'updateUser');
 
@@ -174,11 +190,11 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/user/{username}'.replace('{username}', encodeURI(username)),
+            url: '/user/{username}'.replace('{username}', encodeURI(username)),
             method: 'PUT',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts
index 42ddef55ae1c..b93291601c1c 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts
@@ -11,7 +11,7 @@
  * Do not edit the class manually.
  */
 
-import { Observable, of } from 'rxjs';
+import { Observable, of, Subscriber } from 'rxjs';
 import { ajax, AjaxRequest, AjaxResponse } from 'rxjs/ajax';
 import { map, concatMap } from 'rxjs/operators';
 
@@ -30,11 +30,11 @@ export class Configuration {
     constructor(private configuration: ConfigurationParameters = {}) {}
 
     get basePath(): string {
-        return this.configuration.basePath || BASE_PATH;
+        return this.configuration.basePath ?? BASE_PATH;
     }
 
     get middleware(): Middleware[] {
-        return this.configuration.middleware || [];
+        return this.configuration.middleware ?? [];
     }
 
     get username(): string | undefined {
@@ -47,18 +47,12 @@ export class Configuration {
 
     get apiKey(): ((name: string) => string) | undefined {
         const { apiKey } = this.configuration;
-        if (!apiKey) {
-            return undefined;
-        }
-        return typeof apiKey === 'string' ? () => apiKey : apiKey;
+        return apiKey ? (typeof apiKey === 'string' ? () => apiKey : apiKey) : undefined;
     }
 
     get accessToken(): ((name: string, scopes?: string[]) => string) | undefined {
         const { accessToken } = this.configuration;
-        if (!accessToken) {
-            return undefined;
-        }
-        return typeof accessToken === 'string' ? () => accessToken : accessToken;
+        return accessToken ? (typeof accessToken === 'string' ? () => accessToken : accessToken) : undefined;
     }
 }
 
@@ -84,31 +78,32 @@ export class BaseAPI {
     withPostMiddleware = (postMiddlewares: Array<Middleware['post']>) =>
         this.withMiddleware(postMiddlewares.map((post) => ({ post })));
 
-    protected request = <T>(requestOpts: RequestOpts): Observable<T> =>
-        this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
+    protected request<T>(requestOpts: RequestOpts): Observable<T>
+    protected request<T>(requestOpts: RequestOpts, responseOpts?: ResponseOpts): Observable<RawAjaxResponse<T>>
+    protected request<T>(requestOpts: RequestOpts, responseOpts?: ResponseOpts): Observable<T | RawAjaxResponse<T>> {
+        return this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
             map((res) => {
-                if (res.status >= 200 && res.status < 300) {
-                    return res.response as T;
+                const { status, response } = res;
+                if (status >= 200 && status < 300) {
+                    return responseOpts?.respone === 'raw' ? res : response;
                 }
                 throw res;
             })
         );
+    }
 
-    private createRequestArgs = (requestOpts: RequestOpts): RequestArgs => {
-        let url = this.configuration.basePath + requestOpts.path;
-        if (requestOpts.query !== undefined && Object.keys(requestOpts.query).length !== 0) {
-            // only add the queryString to the URL if there are query parameters.
-            // this is done to avoid urls ending with a '?' character which buggy webservers
-            // do not handle correctly sometimes.
-            url += '?' + queryString(requestOpts.query);
-        }
+    private createRequestArgs = ({ url: baseUrl, query, method, headers, body, responseType }: RequestOpts): RequestArgs => {
+        // only add the queryString to the URL if there are query parameters.
+        // this is done to avoid urls ending with a '?' character which buggy webservers
+        // do not handle correctly sometimes.
+        const url = `${this.configuration.basePath}${baseUrl}${query && Object.keys(query).length ? `?${queryString(query)}`: ''}`;
 
         return {
             url,
-            method: requestOpts.method,
-            headers: requestOpts.headers,
-            body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
-            responseType: requestOpts.responseType || 'json',
+            method,
+            headers,
+            body: body instanceof FormData ? body : JSON.stringify(body),
+            responseType: responseType ?? 'json',
         };
     }
 
@@ -157,24 +152,35 @@ export type HttpHeaders = { [key: string]: string };
 export type HttpQuery = Partial<{ [key: string]: string | number | null | boolean | Array<string | number | null | boolean> }>; // partial is needed for strict mode
 export type HttpBody = Json | FormData;
 
-export interface RequestOpts {
-    path: string;
+export interface RequestOpts extends AjaxRequest {
+    query?: HttpQuery; // additional prop
+    // the following props have improved types over AjaxRequest 
     method: HttpMethod;
     headers?: HttpHeaders;
-    query?: HttpQuery;
     body?: HttpBody;
     responseType?: 'json' | 'blob' | 'arraybuffer' | 'text';
 }
 
-export const encodeURI = (value: any) => encodeURIComponent(String(value));
+export interface ResponseOpts {
+    respone?: 'raw';
+}
+
+export interface OperationOpts {
+    responseOpts?: ResponseOpts;
+}
+
+// AjaxResponse with typed response 
+export interface RawAjaxResponse<T> extends AjaxResponse {
+    response: T;
+}
+
+export const encodeURI = (value: any) => encodeURIComponent(`${value}`);
 
-const queryString = (params: HttpQuery): string => Object.keys(params)
-    .map((key) => {
-        const value = params[key];
-        return (value instanceof Array)
-            ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
-            : `${encodeURI(key)}=${encodeURI(value)}`;
-    })
+const queryString = (params: HttpQuery): string => Object.entries(params)
+    .map(([key, value]) => value instanceof Array
+        ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
+        : `${encodeURI(key)}=${encodeURI(value)}`
+    )
     .join('&');
 
 // alias fallback for not being a breaking change
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/tsconfig.json b/samples/client/petstore/typescript-rxjs/builds/default/tsconfig.json
index d65f2a95afc1..59a60838a05c 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/tsconfig.json
+++ b/samples/client/petstore/typescript-rxjs/builds/default/tsconfig.json
@@ -8,7 +8,8 @@
     "rootDir": ".",
     "lib": [
       "es6",
-      "dom"
+      "dom",
+      "es2017"
     ],
     "typeRoots": [
       "node_modules/@types"
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts
index 021781fd7abb..026381b12b2b 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI, COLLECTION_FORMATS, OperationOpts, RawAjaxResponse } from '../runtime';
 import {
     ApiResponse,
     Pet,
@@ -63,7 +63,9 @@ export class PetApi extends BaseAPI {
     /**
      * Add a new pet to the store
      */
-    addPet = ({ body }: AddPetRequest): Observable<void> => {
+    addPet({ body }: AddPetRequest): Observable<void>
+    addPet({ body }: AddPetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    addPet({ body }: AddPetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'addPet');
 
         const headers: HttpHeaders = {
@@ -78,17 +80,19 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/pet',
+            url: '/pet',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Deletes a pet
      */
-    deletePet = ({ petId, apiKey }: DeletePetRequest): Observable<void> => {
+    deletePet({ petId, apiKey }: DeletePetRequest): Observable<void>
+    deletePet({ petId, apiKey }: DeletePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    deletePet({ petId, apiKey }: DeletePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(petId, 'petId', 'deletePet');
 
         const headers: HttpHeaders = {
@@ -103,17 +107,19 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
+            url: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
             method: 'DELETE',
             headers,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      */
-    findPetsByStatus = ({ status }: FindPetsByStatusRequest): Observable<Array<Pet>> => {
+    findPetsByStatus({ status }: FindPetsByStatusRequest): Observable<Array<Pet>>
+    findPetsByStatus({ status }: FindPetsByStatusRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Array<Pet>>>
+    findPetsByStatus({ status }: FindPetsByStatusRequest, opts?: OperationOpts): Observable<Array<Pet> | RawAjaxResponse<Array<Pet>>> {
         throwIfNullOrUndefined(status, 'status', 'findPetsByStatus');
 
         const headers: HttpHeaders = {
@@ -131,18 +137,20 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: '/pet/findByStatus',
+            url: '/pet/findByStatus',
             method: 'GET',
             headers,
             query,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      */
-    findPetsByTags = ({ tags }: FindPetsByTagsRequest): Observable<Array<Pet>> => {
+    findPetsByTags({ tags }: FindPetsByTagsRequest): Observable<Array<Pet>>
+    findPetsByTags({ tags }: FindPetsByTagsRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Array<Pet>>>
+    findPetsByTags({ tags }: FindPetsByTagsRequest, opts?: OperationOpts): Observable<Array<Pet> | RawAjaxResponse<Array<Pet>>> {
         throwIfNullOrUndefined(tags, 'tags', 'findPetsByTags');
 
         const headers: HttpHeaders = {
@@ -160,18 +168,20 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: '/pet/findByTags',
+            url: '/pet/findByTags',
             method: 'GET',
             headers,
             query,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Returns a single pet
      * Find pet by ID
      */
-    getPetById = ({ petId }: GetPetByIdRequest): Observable<Pet> => {
+    getPetById({ petId }: GetPetByIdRequest): Observable<Pet>
+    getPetById({ petId }: GetPetByIdRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Pet>>
+    getPetById({ petId }: GetPetByIdRequest, opts?: OperationOpts): Observable<Pet | RawAjaxResponse<Pet>> {
         throwIfNullOrUndefined(petId, 'petId', 'getPetById');
 
         const headers: HttpHeaders = {
@@ -179,16 +189,18 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Pet>({
-            path: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
+            url: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
             method: 'GET',
             headers,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Update an existing pet
      */
-    updatePet = ({ body }: UpdatePetRequest): Observable<void> => {
+    updatePet({ body }: UpdatePetRequest): Observable<void>
+    updatePet({ body }: UpdatePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    updatePet({ body }: UpdatePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'updatePet');
 
         const headers: HttpHeaders = {
@@ -203,17 +215,19 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/pet',
+            url: '/pet',
             method: 'PUT',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Updates a pet in the store with form data
      */
-    updatePetWithForm = ({ petId, name, status }: UpdatePetWithFormRequest): Observable<void> => {
+    updatePetWithForm({ petId, name, status }: UpdatePetWithFormRequest): Observable<void>
+    updatePetWithForm({ petId, name, status }: UpdatePetWithFormRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    updatePetWithForm({ petId, name, status }: UpdatePetWithFormRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(petId, 'petId', 'updatePetWithForm');
 
         const headers: HttpHeaders = {
@@ -231,17 +245,19 @@ export class PetApi extends BaseAPI {
         if (status !== undefined) { formData.append('status', status as any); }
 
         return this.request<void>({
-            path: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
+            url: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
             method: 'POST',
             headers,
             body: formData,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * uploads an image
      */
-    uploadFile = ({ petId, additionalMetadata, file }: UploadFileRequest): Observable<ApiResponse> => {
+    uploadFile({ petId, additionalMetadata, file }: UploadFileRequest): Observable<ApiResponse>
+    uploadFile({ petId, additionalMetadata, file }: UploadFileRequest, opts?: OperationOpts): Observable<RawAjaxResponse<ApiResponse>>
+    uploadFile({ petId, additionalMetadata, file }: UploadFileRequest, opts?: OperationOpts): Observable<ApiResponse | RawAjaxResponse<ApiResponse>> {
         throwIfNullOrUndefined(petId, 'petId', 'uploadFile');
 
         const headers: HttpHeaders = {
@@ -259,11 +275,11 @@ export class PetApi extends BaseAPI {
         if (file !== undefined) { formData.append('file', file as any); }
 
         return this.request<ApiResponse>({
-            path: '/pet/{petId}/uploadImage'.replace('{petId}', encodeURI(petId)),
+            url: '/pet/{petId}/uploadImage'.replace('{petId}', encodeURI(petId)),
             method: 'POST',
             headers,
             body: formData,
-        });
+        }, opts?.responseOpts);
     };
 
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
index 8ce04d16aa04..5575fe6c3d64 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, HttpHeaders, throwIfNullOrUndefined, encodeURI } from '../runtime';
+import { BaseAPI, HttpHeaders, throwIfNullOrUndefined, encodeURI, OperationOpts, RawAjaxResponse } from '../runtime';
 import {
     Order,
 } from '../models';
@@ -38,48 +38,56 @@ export class StoreApi extends BaseAPI {
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      * Delete purchase order by ID
      */
-    deleteOrder = ({ orderId }: DeleteOrderRequest): Observable<void> => {
+    deleteOrder({ orderId }: DeleteOrderRequest): Observable<void>
+    deleteOrder({ orderId }: DeleteOrderRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    deleteOrder({ orderId }: DeleteOrderRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(orderId, 'orderId', 'deleteOrder');
 
         return this.request<void>({
-            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
+            url: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
             method: 'DELETE',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
-    getInventory = (): Observable<{ [key: string]: number; }> => {
+    getInventory(): Observable<{ [key: string]: number; }>
+    getInventory(opts?: OperationOpts): Observable<RawAjaxResponse<{ [key: string]: number; }>>
+    getInventory(opts?: OperationOpts): Observable<{ [key: string]: number; } | RawAjaxResponse<{ [key: string]: number; }>> {
         const headers: HttpHeaders = {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
         };
 
         return this.request<{ [key: string]: number; }>({
-            path: '/store/inventory',
+            url: '/store/inventory',
             method: 'GET',
             headers,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      */
-    getOrderById = ({ orderId }: GetOrderByIdRequest): Observable<Order> => {
+    getOrderById({ orderId }: GetOrderByIdRequest): Observable<Order>
+    getOrderById({ orderId }: GetOrderByIdRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Order>>
+    getOrderById({ orderId }: GetOrderByIdRequest, opts?: OperationOpts): Observable<Order | RawAjaxResponse<Order>> {
         throwIfNullOrUndefined(orderId, 'orderId', 'getOrderById');
 
         return this.request<Order>({
-            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
+            url: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
             method: 'GET',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Place an order for a pet
      */
-    placeOrder = ({ body }: PlaceOrderRequest): Observable<Order> => {
+    placeOrder({ body }: PlaceOrderRequest): Observable<Order>
+    placeOrder({ body }: PlaceOrderRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Order>>
+    placeOrder({ body }: PlaceOrderRequest, opts?: OperationOpts): Observable<Order | RawAjaxResponse<Order>> {
         throwIfNullOrUndefined(body, 'body', 'placeOrder');
 
         const headers: HttpHeaders = {
@@ -87,11 +95,11 @@ export class StoreApi extends BaseAPI {
         };
 
         return this.request<Order>({
-            path: '/store/order',
+            url: '/store/order',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts
index a223874786eb..5f08fdfd6580 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI, OperationOpts, RawAjaxResponse } from '../runtime';
 import {
     User,
 } from '../models';
@@ -56,7 +56,9 @@ export class UserApi extends BaseAPI {
      * This can only be done by the logged in user.
      * Create user
      */
-    createUser = ({ body }: CreateUserRequest): Observable<void> => {
+    createUser({ body }: CreateUserRequest): Observable<void>
+    createUser({ body }: CreateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    createUser({ body }: CreateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'createUser');
 
         const headers: HttpHeaders = {
@@ -64,17 +66,19 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/user',
+            url: '/user',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Creates list of users with given input array
      */
-    createUsersWithArrayInput = ({ body }: CreateUsersWithArrayInputRequest): Observable<void> => {
+    createUsersWithArrayInput({ body }: CreateUsersWithArrayInputRequest): Observable<void>
+    createUsersWithArrayInput({ body }: CreateUsersWithArrayInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    createUsersWithArrayInput({ body }: CreateUsersWithArrayInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'createUsersWithArrayInput');
 
         const headers: HttpHeaders = {
@@ -82,17 +86,19 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/user/createWithArray',
+            url: '/user/createWithArray',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Creates list of users with given input array
      */
-    createUsersWithListInput = ({ body }: CreateUsersWithListInputRequest): Observable<void> => {
+    createUsersWithListInput({ body }: CreateUsersWithListInputRequest): Observable<void>
+    createUsersWithListInput({ body }: CreateUsersWithListInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    createUsersWithListInput({ body }: CreateUsersWithListInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'createUsersWithListInput');
 
         const headers: HttpHeaders = {
@@ -100,42 +106,48 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/user/createWithList',
+            url: '/user/createWithList',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * This can only be done by the logged in user.
      * Delete user
      */
-    deleteUser = ({ username }: DeleteUserRequest): Observable<void> => {
+    deleteUser({ username }: DeleteUserRequest): Observable<void>
+    deleteUser({ username }: DeleteUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    deleteUser({ username }: DeleteUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(username, 'username', 'deleteUser');
 
         return this.request<void>({
-            path: '/user/{username}'.replace('{username}', encodeURI(username)),
+            url: '/user/{username}'.replace('{username}', encodeURI(username)),
             method: 'DELETE',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Get user by user name
      */
-    getUserByName = ({ username }: GetUserByNameRequest): Observable<User> => {
+    getUserByName({ username }: GetUserByNameRequest): Observable<User>
+    getUserByName({ username }: GetUserByNameRequest, opts?: OperationOpts): Observable<RawAjaxResponse<User>>
+    getUserByName({ username }: GetUserByNameRequest, opts?: OperationOpts): Observable<User | RawAjaxResponse<User>> {
         throwIfNullOrUndefined(username, 'username', 'getUserByName');
 
         return this.request<User>({
-            path: '/user/{username}'.replace('{username}', encodeURI(username)),
+            url: '/user/{username}'.replace('{username}', encodeURI(username)),
             method: 'GET',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Logs user into the system
      */
-    loginUser = ({ username, password }: LoginUserRequest): Observable<string> => {
+    loginUser({ username, password }: LoginUserRequest): Observable<string>
+    loginUser({ username, password }: LoginUserRequest, opts?: OperationOpts): Observable<RawAjaxResponse<string>>
+    loginUser({ username, password }: LoginUserRequest, opts?: OperationOpts): Observable<string | RawAjaxResponse<string>> {
         throwIfNullOrUndefined(username, 'username', 'loginUser');
         throwIfNullOrUndefined(password, 'password', 'loginUser');
 
@@ -145,27 +157,31 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<string>({
-            path: '/user/login',
+            url: '/user/login',
             method: 'GET',
             query,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Logs out current logged in user session
      */
-    logoutUser = (): Observable<void> => {
+    logoutUser(): Observable<void>
+    logoutUser(opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    logoutUser(opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         return this.request<void>({
-            path: '/user/logout',
+            url: '/user/logout',
             method: 'GET',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * This can only be done by the logged in user.
      * Updated user
      */
-    updateUser = ({ username, body }: UpdateUserRequest): Observable<void> => {
+    updateUser({ username, body }: UpdateUserRequest): Observable<void>
+    updateUser({ username, body }: UpdateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    updateUser({ username, body }: UpdateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(username, 'username', 'updateUser');
         throwIfNullOrUndefined(body, 'body', 'updateUser');
 
@@ -174,11 +190,11 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/user/{username}'.replace('{username}', encodeURI(username)),
+            url: '/user/{username}'.replace('{username}', encodeURI(username)),
             method: 'PUT',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/package.json b/samples/client/petstore/typescript-rxjs/builds/es6-target/package.json
index c9c00ca9cf31..69a56b7d42b5 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/package.json
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/package.json
@@ -6,14 +6,14 @@
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
   "scripts" : {
-    "build": "tsc --outDir dist/",
+    "build": "node_modules/.bin/tsc --outDir dist/",
     "prepare": "npm run build"
   },
   "dependencies": {
     "rxjs": "^6.3.3"
   },
   "devDependencies": {
-    "typescript": "^3.0.1"
+    "typescript": "^3.7"
   },
   "publishConfig": {
     "registry": "https://skimdb.npmjs.com/registry"
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts
index 42ddef55ae1c..b93291601c1c 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts
@@ -11,7 +11,7 @@
  * Do not edit the class manually.
  */
 
-import { Observable, of } from 'rxjs';
+import { Observable, of, Subscriber } from 'rxjs';
 import { ajax, AjaxRequest, AjaxResponse } from 'rxjs/ajax';
 import { map, concatMap } from 'rxjs/operators';
 
@@ -30,11 +30,11 @@ export class Configuration {
     constructor(private configuration: ConfigurationParameters = {}) {}
 
     get basePath(): string {
-        return this.configuration.basePath || BASE_PATH;
+        return this.configuration.basePath ?? BASE_PATH;
     }
 
     get middleware(): Middleware[] {
-        return this.configuration.middleware || [];
+        return this.configuration.middleware ?? [];
     }
 
     get username(): string | undefined {
@@ -47,18 +47,12 @@ export class Configuration {
 
     get apiKey(): ((name: string) => string) | undefined {
         const { apiKey } = this.configuration;
-        if (!apiKey) {
-            return undefined;
-        }
-        return typeof apiKey === 'string' ? () => apiKey : apiKey;
+        return apiKey ? (typeof apiKey === 'string' ? () => apiKey : apiKey) : undefined;
     }
 
     get accessToken(): ((name: string, scopes?: string[]) => string) | undefined {
         const { accessToken } = this.configuration;
-        if (!accessToken) {
-            return undefined;
-        }
-        return typeof accessToken === 'string' ? () => accessToken : accessToken;
+        return accessToken ? (typeof accessToken === 'string' ? () => accessToken : accessToken) : undefined;
     }
 }
 
@@ -84,31 +78,32 @@ export class BaseAPI {
     withPostMiddleware = (postMiddlewares: Array<Middleware['post']>) =>
         this.withMiddleware(postMiddlewares.map((post) => ({ post })));
 
-    protected request = <T>(requestOpts: RequestOpts): Observable<T> =>
-        this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
+    protected request<T>(requestOpts: RequestOpts): Observable<T>
+    protected request<T>(requestOpts: RequestOpts, responseOpts?: ResponseOpts): Observable<RawAjaxResponse<T>>
+    protected request<T>(requestOpts: RequestOpts, responseOpts?: ResponseOpts): Observable<T | RawAjaxResponse<T>> {
+        return this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
             map((res) => {
-                if (res.status >= 200 && res.status < 300) {
-                    return res.response as T;
+                const { status, response } = res;
+                if (status >= 200 && status < 300) {
+                    return responseOpts?.respone === 'raw' ? res : response;
                 }
                 throw res;
             })
         );
+    }
 
-    private createRequestArgs = (requestOpts: RequestOpts): RequestArgs => {
-        let url = this.configuration.basePath + requestOpts.path;
-        if (requestOpts.query !== undefined && Object.keys(requestOpts.query).length !== 0) {
-            // only add the queryString to the URL if there are query parameters.
-            // this is done to avoid urls ending with a '?' character which buggy webservers
-            // do not handle correctly sometimes.
-            url += '?' + queryString(requestOpts.query);
-        }
+    private createRequestArgs = ({ url: baseUrl, query, method, headers, body, responseType }: RequestOpts): RequestArgs => {
+        // only add the queryString to the URL if there are query parameters.
+        // this is done to avoid urls ending with a '?' character which buggy webservers
+        // do not handle correctly sometimes.
+        const url = `${this.configuration.basePath}${baseUrl}${query && Object.keys(query).length ? `?${queryString(query)}`: ''}`;
 
         return {
             url,
-            method: requestOpts.method,
-            headers: requestOpts.headers,
-            body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
-            responseType: requestOpts.responseType || 'json',
+            method,
+            headers,
+            body: body instanceof FormData ? body : JSON.stringify(body),
+            responseType: responseType ?? 'json',
         };
     }
 
@@ -157,24 +152,35 @@ export type HttpHeaders = { [key: string]: string };
 export type HttpQuery = Partial<{ [key: string]: string | number | null | boolean | Array<string | number | null | boolean> }>; // partial is needed for strict mode
 export type HttpBody = Json | FormData;
 
-export interface RequestOpts {
-    path: string;
+export interface RequestOpts extends AjaxRequest {
+    query?: HttpQuery; // additional prop
+    // the following props have improved types over AjaxRequest 
     method: HttpMethod;
     headers?: HttpHeaders;
-    query?: HttpQuery;
     body?: HttpBody;
     responseType?: 'json' | 'blob' | 'arraybuffer' | 'text';
 }
 
-export const encodeURI = (value: any) => encodeURIComponent(String(value));
+export interface ResponseOpts {
+    respone?: 'raw';
+}
+
+export interface OperationOpts {
+    responseOpts?: ResponseOpts;
+}
+
+// AjaxResponse with typed response 
+export interface RawAjaxResponse<T> extends AjaxResponse {
+    response: T;
+}
+
+export const encodeURI = (value: any) => encodeURIComponent(`${value}`);
 
-const queryString = (params: HttpQuery): string => Object.keys(params)
-    .map((key) => {
-        const value = params[key];
-        return (value instanceof Array)
-            ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
-            : `${encodeURI(key)}=${encodeURI(value)}`;
-    })
+const queryString = (params: HttpQuery): string => Object.entries(params)
+    .map(([key, value]) => value instanceof Array
+        ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
+        : `${encodeURI(key)}=${encodeURI(value)}`
+    )
     .join('&');
 
 // alias fallback for not being a breaking change
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/tsconfig.json b/samples/client/petstore/typescript-rxjs/builds/es6-target/tsconfig.json
index 6cc02878fb79..00d4d5cc478a 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/tsconfig.json
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/tsconfig.json
@@ -6,6 +6,10 @@
     "moduleResolution": "node",
     "outDir": "dist",
     "rootDir": ".",
+    "lib": [
+      "dom",
+      "es2017"
+    ],
     "typeRoots": [
       "node_modules/@types"
     ]
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts
deleted file mode 100644
index 021781fd7abb..000000000000
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts
+++ /dev/null
@@ -1,279 +0,0 @@
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { Observable } from 'rxjs';
-import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI, COLLECTION_FORMATS } from '../runtime';
-import {
-    ApiResponse,
-    Pet,
-} from '../models';
-
-export interface AddPetRequest {
-    body: Pet;
-}
-
-export interface DeletePetRequest {
-    petId: number;
-    apiKey?: string;
-}
-
-export interface FindPetsByStatusRequest {
-    status: Array<FindPetsByStatusStatusEnum>;
-}
-
-export interface FindPetsByTagsRequest {
-    tags: Array<string>;
-}
-
-export interface GetPetByIdRequest {
-    petId: number;
-}
-
-export interface UpdatePetRequest {
-    body: Pet;
-}
-
-export interface UpdatePetWithFormRequest {
-    petId: number;
-    name?: string;
-    status?: string;
-}
-
-export interface UploadFileRequest {
-    petId: number;
-    additionalMetadata?: string;
-    file?: Blob;
-}
-
-/**
- * no description
- */
-export class PetApi extends BaseAPI {
-
-    /**
-     * Add a new pet to the store
-     */
-    addPet = ({ body }: AddPetRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'body', 'addPet');
-
-        const headers: HttpHeaders = {
-            'Content-Type': 'application/json',
-            // oauth required
-            ...(this.configuration.accessToken != null
-                ? { Authorization: typeof this.configuration.accessToken === 'function'
-                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
-                    : this.configuration.accessToken }
-                : undefined
-            ),
-        };
-
-        return this.request<void>({
-            path: '/pet',
-            method: 'POST',
-            headers,
-            body: body,
-        });
-    };
-
-    /**
-     * Deletes a pet
-     */
-    deletePet = ({ petId, apiKey }: DeletePetRequest): Observable<void> => {
-        throwIfNullOrUndefined(petId, 'petId', 'deletePet');
-
-        const headers: HttpHeaders = {
-            ...(apiKey != null ? { 'api_key': String(apiKey) } : undefined),
-            // oauth required
-            ...(this.configuration.accessToken != null
-                ? { Authorization: typeof this.configuration.accessToken === 'function'
-                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
-                    : this.configuration.accessToken }
-                : undefined
-            ),
-        };
-
-        return this.request<void>({
-            path: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
-            method: 'DELETE',
-            headers,
-        });
-    };
-
-    /**
-     * Multiple status values can be provided with comma separated strings
-     * Finds Pets by status
-     */
-    findPetsByStatus = ({ status }: FindPetsByStatusRequest): Observable<Array<Pet>> => {
-        throwIfNullOrUndefined(status, 'status', 'findPetsByStatus');
-
-        const headers: HttpHeaders = {
-            // oauth required
-            ...(this.configuration.accessToken != null
-                ? { Authorization: typeof this.configuration.accessToken === 'function'
-                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
-                    : this.configuration.accessToken }
-                : undefined
-            ),
-        };
-
-        const query: HttpQuery = { // required parameters are used directly since they are already checked by throwIfNullOrUndefined
-            'status': status.join(COLLECTION_FORMATS['csv']),
-        };
-
-        return this.request<Array<Pet>>({
-            path: '/pet/findByStatus',
-            method: 'GET',
-            headers,
-            query,
-        });
-    };
-
-    /**
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * Finds Pets by tags
-     */
-    findPetsByTags = ({ tags }: FindPetsByTagsRequest): Observable<Array<Pet>> => {
-        throwIfNullOrUndefined(tags, 'tags', 'findPetsByTags');
-
-        const headers: HttpHeaders = {
-            // oauth required
-            ...(this.configuration.accessToken != null
-                ? { Authorization: typeof this.configuration.accessToken === 'function'
-                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
-                    : this.configuration.accessToken }
-                : undefined
-            ),
-        };
-
-        const query: HttpQuery = { // required parameters are used directly since they are already checked by throwIfNullOrUndefined
-            'tags': tags.join(COLLECTION_FORMATS['csv']),
-        };
-
-        return this.request<Array<Pet>>({
-            path: '/pet/findByTags',
-            method: 'GET',
-            headers,
-            query,
-        });
-    };
-
-    /**
-     * Returns a single pet
-     * Find pet by ID
-     */
-    getPetById = ({ petId }: GetPetByIdRequest): Observable<Pet> => {
-        throwIfNullOrUndefined(petId, 'petId', 'getPetById');
-
-        const headers: HttpHeaders = {
-            ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
-        };
-
-        return this.request<Pet>({
-            path: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
-            method: 'GET',
-            headers,
-        });
-    };
-
-    /**
-     * Update an existing pet
-     */
-    updatePet = ({ body }: UpdatePetRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'body', 'updatePet');
-
-        const headers: HttpHeaders = {
-            'Content-Type': 'application/json',
-            // oauth required
-            ...(this.configuration.accessToken != null
-                ? { Authorization: typeof this.configuration.accessToken === 'function'
-                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
-                    : this.configuration.accessToken }
-                : undefined
-            ),
-        };
-
-        return this.request<void>({
-            path: '/pet',
-            method: 'PUT',
-            headers,
-            body: body,
-        });
-    };
-
-    /**
-     * Updates a pet in the store with form data
-     */
-    updatePetWithForm = ({ petId, name, status }: UpdatePetWithFormRequest): Observable<void> => {
-        throwIfNullOrUndefined(petId, 'petId', 'updatePetWithForm');
-
-        const headers: HttpHeaders = {
-            // oauth required
-            ...(this.configuration.accessToken != null
-                ? { Authorization: typeof this.configuration.accessToken === 'function'
-                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
-                    : this.configuration.accessToken }
-                : undefined
-            ),
-        };
-
-        const formData = new FormData();
-        if (name !== undefined) { formData.append('name', name as any); }
-        if (status !== undefined) { formData.append('status', status as any); }
-
-        return this.request<void>({
-            path: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
-            method: 'POST',
-            headers,
-            body: formData,
-        });
-    };
-
-    /**
-     * uploads an image
-     */
-    uploadFile = ({ petId, additionalMetadata, file }: UploadFileRequest): Observable<ApiResponse> => {
-        throwIfNullOrUndefined(petId, 'petId', 'uploadFile');
-
-        const headers: HttpHeaders = {
-            // oauth required
-            ...(this.configuration.accessToken != null
-                ? { Authorization: typeof this.configuration.accessToken === 'function'
-                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
-                    : this.configuration.accessToken }
-                : undefined
-            ),
-        };
-
-        const formData = new FormData();
-        if (additionalMetadata !== undefined) { formData.append('additionalMetadata', additionalMetadata as any); }
-        if (file !== undefined) { formData.append('file', file as any); }
-
-        return this.request<ApiResponse>({
-            path: '/pet/{petId}/uploadImage'.replace('{petId}', encodeURI(petId)),
-            method: 'POST',
-            headers,
-            body: formData,
-        });
-    };
-
-}
-
-/**
- * @export
- * @enum {string}
- */
-export enum FindPetsByStatusStatusEnum {
-    Available = 'available',
-    Pending = 'pending',
-    Sold = 'sold'
-}
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts
deleted file mode 100644
index 8ce04d16aa04..000000000000
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { Observable } from 'rxjs';
-import { BaseAPI, HttpHeaders, throwIfNullOrUndefined, encodeURI } from '../runtime';
-import {
-    Order,
-} from '../models';
-
-export interface DeleteOrderRequest {
-    orderId: string;
-}
-
-export interface GetOrderByIdRequest {
-    orderId: number;
-}
-
-export interface PlaceOrderRequest {
-    body: Order;
-}
-
-/**
- * no description
- */
-export class StoreApi extends BaseAPI {
-
-    /**
-     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     * Delete purchase order by ID
-     */
-    deleteOrder = ({ orderId }: DeleteOrderRequest): Observable<void> => {
-        throwIfNullOrUndefined(orderId, 'orderId', 'deleteOrder');
-
-        return this.request<void>({
-            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
-            method: 'DELETE',
-        });
-    };
-
-    /**
-     * Returns a map of status codes to quantities
-     * Returns pet inventories by status
-     */
-    getInventory = (): Observable<{ [key: string]: number; }> => {
-        const headers: HttpHeaders = {
-            ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
-        };
-
-        return this.request<{ [key: string]: number; }>({
-            path: '/store/inventory',
-            method: 'GET',
-            headers,
-        });
-    };
-
-    /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-     * Find purchase order by ID
-     */
-    getOrderById = ({ orderId }: GetOrderByIdRequest): Observable<Order> => {
-        throwIfNullOrUndefined(orderId, 'orderId', 'getOrderById');
-
-        return this.request<Order>({
-            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
-            method: 'GET',
-        });
-    };
-
-    /**
-     * Place an order for a pet
-     */
-    placeOrder = ({ body }: PlaceOrderRequest): Observable<Order> => {
-        throwIfNullOrUndefined(body, 'body', 'placeOrder');
-
-        const headers: HttpHeaders = {
-            'Content-Type': 'application/json',
-        };
-
-        return this.request<Order>({
-            path: '/store/order',
-            method: 'POST',
-            headers,
-            body: body,
-        });
-    };
-
-}
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts
deleted file mode 100644
index a223874786eb..000000000000
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { Observable } from 'rxjs';
-import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI } from '../runtime';
-import {
-    User,
-} from '../models';
-
-export interface CreateUserRequest {
-    body: User;
-}
-
-export interface CreateUsersWithArrayInputRequest {
-    body: Array<User>;
-}
-
-export interface CreateUsersWithListInputRequest {
-    body: Array<User>;
-}
-
-export interface DeleteUserRequest {
-    username: string;
-}
-
-export interface GetUserByNameRequest {
-    username: string;
-}
-
-export interface LoginUserRequest {
-    username: string;
-    password: string;
-}
-
-export interface UpdateUserRequest {
-    username: string;
-    body: User;
-}
-
-/**
- * no description
- */
-export class UserApi extends BaseAPI {
-
-    /**
-     * This can only be done by the logged in user.
-     * Create user
-     */
-    createUser = ({ body }: CreateUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'body', 'createUser');
-
-        const headers: HttpHeaders = {
-            'Content-Type': 'application/json',
-        };
-
-        return this.request<void>({
-            path: '/user',
-            method: 'POST',
-            headers,
-            body: body,
-        });
-    };
-
-    /**
-     * Creates list of users with given input array
-     */
-    createUsersWithArrayInput = ({ body }: CreateUsersWithArrayInputRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'body', 'createUsersWithArrayInput');
-
-        const headers: HttpHeaders = {
-            'Content-Type': 'application/json',
-        };
-
-        return this.request<void>({
-            path: '/user/createWithArray',
-            method: 'POST',
-            headers,
-            body: body,
-        });
-    };
-
-    /**
-     * Creates list of users with given input array
-     */
-    createUsersWithListInput = ({ body }: CreateUsersWithListInputRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'body', 'createUsersWithListInput');
-
-        const headers: HttpHeaders = {
-            'Content-Type': 'application/json',
-        };
-
-        return this.request<void>({
-            path: '/user/createWithList',
-            method: 'POST',
-            headers,
-            body: body,
-        });
-    };
-
-    /**
-     * This can only be done by the logged in user.
-     * Delete user
-     */
-    deleteUser = ({ username }: DeleteUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(username, 'username', 'deleteUser');
-
-        return this.request<void>({
-            path: '/user/{username}'.replace('{username}', encodeURI(username)),
-            method: 'DELETE',
-        });
-    };
-
-    /**
-     * Get user by user name
-     */
-    getUserByName = ({ username }: GetUserByNameRequest): Observable<User> => {
-        throwIfNullOrUndefined(username, 'username', 'getUserByName');
-
-        return this.request<User>({
-            path: '/user/{username}'.replace('{username}', encodeURI(username)),
-            method: 'GET',
-        });
-    };
-
-    /**
-     * Logs user into the system
-     */
-    loginUser = ({ username, password }: LoginUserRequest): Observable<string> => {
-        throwIfNullOrUndefined(username, 'username', 'loginUser');
-        throwIfNullOrUndefined(password, 'password', 'loginUser');
-
-        const query: HttpQuery = { // required parameters are used directly since they are already checked by throwIfNullOrUndefined
-            'username': username,
-            'password': password,
-        };
-
-        return this.request<string>({
-            path: '/user/login',
-            method: 'GET',
-            query,
-        });
-    };
-
-    /**
-     * Logs out current logged in user session
-     */
-    logoutUser = (): Observable<void> => {
-        return this.request<void>({
-            path: '/user/logout',
-            method: 'GET',
-        });
-    };
-
-    /**
-     * This can only be done by the logged in user.
-     * Updated user
-     */
-    updateUser = ({ username, body }: UpdateUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(username, 'username', 'updateUser');
-        throwIfNullOrUndefined(body, 'body', 'updateUser');
-
-        const headers: HttpHeaders = {
-            'Content-Type': 'application/json',
-        };
-
-        return this.request<void>({
-            path: '/user/{username}'.replace('{username}', encodeURI(username)),
-            method: 'PUT',
-            headers,
-            body: body,
-        });
-    };
-
-}
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts
deleted file mode 100644
index 42ddef55ae1c..000000000000
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { Observable, of } from 'rxjs';
-import { ajax, AjaxRequest, AjaxResponse } from 'rxjs/ajax';
-import { map, concatMap } from 'rxjs/operators';
-
-export const BASE_PATH = 'http://petstore.swagger.io/v2'.replace(/\/+$/, '');
-
-export interface ConfigurationParameters {
-    basePath?: string; // override base path
-    middleware?: Middleware[]; // middleware to apply before/after rxjs requests
-    username?: string; // parameter for basic security
-    password?: string; // parameter for basic security
-    apiKey?: string | ((name: string) => string); // parameter for apiKey security
-    accessToken?: string | ((name?: string, scopes?: string[]) => string); // parameter for oauth2 security
-}
-
-export class Configuration {
-    constructor(private configuration: ConfigurationParameters = {}) {}
-
-    get basePath(): string {
-        return this.configuration.basePath || BASE_PATH;
-    }
-
-    get middleware(): Middleware[] {
-        return this.configuration.middleware || [];
-    }
-
-    get username(): string | undefined {
-        return this.configuration.username;
-    }
-
-    get password(): string | undefined {
-        return this.configuration.password;
-    }
-
-    get apiKey(): ((name: string) => string) | undefined {
-        const { apiKey } = this.configuration;
-        if (!apiKey) {
-            return undefined;
-        }
-        return typeof apiKey === 'string' ? () => apiKey : apiKey;
-    }
-
-    get accessToken(): ((name: string, scopes?: string[]) => string) | undefined {
-        const { accessToken } = this.configuration;
-        if (!accessToken) {
-            return undefined;
-        }
-        return typeof accessToken === 'string' ? () => accessToken : accessToken;
-    }
-}
-
-/**
- * This is the base class for all generated API classes.
- */
-export class BaseAPI {
-    private middleware: Middleware[] = [];
-
-    constructor(protected configuration = new Configuration()) {
-        this.middleware = configuration.middleware;
-    }
-
-    withMiddleware = (middlewares: Middleware[]): this => {
-        const next = this.clone();
-        next.middleware = next.middleware.concat(middlewares);
-        return next;
-    };
-
-    withPreMiddleware = (preMiddlewares: Array<Middleware['pre']>) =>
-        this.withMiddleware(preMiddlewares.map((pre) => ({ pre })));
-
-    withPostMiddleware = (postMiddlewares: Array<Middleware['post']>) =>
-        this.withMiddleware(postMiddlewares.map((post) => ({ post })));
-
-    protected request = <T>(requestOpts: RequestOpts): Observable<T> =>
-        this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
-            map((res) => {
-                if (res.status >= 200 && res.status < 300) {
-                    return res.response as T;
-                }
-                throw res;
-            })
-        );
-
-    private createRequestArgs = (requestOpts: RequestOpts): RequestArgs => {
-        let url = this.configuration.basePath + requestOpts.path;
-        if (requestOpts.query !== undefined && Object.keys(requestOpts.query).length !== 0) {
-            // only add the queryString to the URL if there are query parameters.
-            // this is done to avoid urls ending with a '?' character which buggy webservers
-            // do not handle correctly sometimes.
-            url += '?' + queryString(requestOpts.query);
-        }
-
-        return {
-            url,
-            method: requestOpts.method,
-            headers: requestOpts.headers,
-            body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
-            responseType: requestOpts.responseType || 'json',
-        };
-    }
-
-    private rxjsRequest = (params: RequestArgs): Observable<AjaxResponse> =>
-        of(params).pipe(
-            map((request) => {
-                this.middleware.filter((item) => item.pre).forEach((mw) => (request = mw.pre!(request)));
-                return request;
-            }),
-            concatMap((args) =>
-                ajax(args).pipe(
-                    map((response) => {
-                        this.middleware.filter((item) => item.post).forEach((mw) => (response = mw.post!(response)));
-                        return response;
-                    })
-                )
-            )
-        );
-
-    /**
-     * Create a shallow clone of `this` by constructing a new instance
-     * and then shallow cloning data members.
-     */
-    private clone = (): this =>
-        Object.assign(Object.create(Object.getPrototypeOf(this)), this);
-}
-
-/**
- * @deprecated
- * export for not being a breaking change
- */
-export class RequiredError extends Error {
-    name: 'RequiredError' = 'RequiredError';
-}
-
-export const COLLECTION_FORMATS = {
-    csv: ',',
-    ssv: ' ',
-    tsv: '\t',
-    pipes: '|',
-};
-
-export type Json = any;
-export type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | 'HEAD';
-export type HttpHeaders = { [key: string]: string };
-export type HttpQuery = Partial<{ [key: string]: string | number | null | boolean | Array<string | number | null | boolean> }>; // partial is needed for strict mode
-export type HttpBody = Json | FormData;
-
-export interface RequestOpts {
-    path: string;
-    method: HttpMethod;
-    headers?: HttpHeaders;
-    query?: HttpQuery;
-    body?: HttpBody;
-    responseType?: 'json' | 'blob' | 'arraybuffer' | 'text';
-}
-
-export const encodeURI = (value: any) => encodeURIComponent(String(value));
-
-const queryString = (params: HttpQuery): string => Object.keys(params)
-    .map((key) => {
-        const value = params[key];
-        return (value instanceof Array)
-            ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
-            : `${encodeURI(key)}=${encodeURI(value)}`;
-    })
-    .join('&');
-
-// alias fallback for not being a breaking change
-export const querystring = queryString;
-
-/**
- * @deprecated
- */
-export const throwIfRequired = (params: {[key: string]: any}, key: string, nickname: string) => {
-    if (!params || params[key] == null) {
-        throw new RequiredError(`Required parameter ${key} was null or undefined when calling ${nickname}.`);
-    }
-};
-
-export const throwIfNullOrUndefined = (value: any, paramName: string, nickname: string) => {
-    if (value == null) {
-        throw new Error(`Parameter "${paramName}" was null or undefined when calling "${nickname}".`);
-    }
-};
-
-// alias for easier importing
-export interface RequestArgs extends AjaxRequest {}
-export interface ResponseArgs extends AjaxResponse {}
-
-export interface Middleware {
-    pre?(request: RequestArgs): RequestArgs;
-    post?(response: ResponseArgs): ResponseArgs;
-}
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/tsconfig.json b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/tsconfig.json
deleted file mode 100644
index d65f2a95afc1..000000000000
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/tsconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "compilerOptions": {
-    "declaration": true,
-    "target": "es5",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "outDir": "dist",
-    "rootDir": ".",
-    "lib": [
-      "es6",
-      "dom"
-    ],
-    "typeRoots": [
-      "node_modules/@types"
-    ]
-  },
-  "exclude": [
-    "dist",
-    "node_modules"
-  ]
-}
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts
index 021781fd7abb..026381b12b2b 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI, COLLECTION_FORMATS, OperationOpts, RawAjaxResponse } from '../runtime';
 import {
     ApiResponse,
     Pet,
@@ -63,7 +63,9 @@ export class PetApi extends BaseAPI {
     /**
      * Add a new pet to the store
      */
-    addPet = ({ body }: AddPetRequest): Observable<void> => {
+    addPet({ body }: AddPetRequest): Observable<void>
+    addPet({ body }: AddPetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    addPet({ body }: AddPetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'addPet');
 
         const headers: HttpHeaders = {
@@ -78,17 +80,19 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/pet',
+            url: '/pet',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Deletes a pet
      */
-    deletePet = ({ petId, apiKey }: DeletePetRequest): Observable<void> => {
+    deletePet({ petId, apiKey }: DeletePetRequest): Observable<void>
+    deletePet({ petId, apiKey }: DeletePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    deletePet({ petId, apiKey }: DeletePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(petId, 'petId', 'deletePet');
 
         const headers: HttpHeaders = {
@@ -103,17 +107,19 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
+            url: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
             method: 'DELETE',
             headers,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      */
-    findPetsByStatus = ({ status }: FindPetsByStatusRequest): Observable<Array<Pet>> => {
+    findPetsByStatus({ status }: FindPetsByStatusRequest): Observable<Array<Pet>>
+    findPetsByStatus({ status }: FindPetsByStatusRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Array<Pet>>>
+    findPetsByStatus({ status }: FindPetsByStatusRequest, opts?: OperationOpts): Observable<Array<Pet> | RawAjaxResponse<Array<Pet>>> {
         throwIfNullOrUndefined(status, 'status', 'findPetsByStatus');
 
         const headers: HttpHeaders = {
@@ -131,18 +137,20 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: '/pet/findByStatus',
+            url: '/pet/findByStatus',
             method: 'GET',
             headers,
             query,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      */
-    findPetsByTags = ({ tags }: FindPetsByTagsRequest): Observable<Array<Pet>> => {
+    findPetsByTags({ tags }: FindPetsByTagsRequest): Observable<Array<Pet>>
+    findPetsByTags({ tags }: FindPetsByTagsRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Array<Pet>>>
+    findPetsByTags({ tags }: FindPetsByTagsRequest, opts?: OperationOpts): Observable<Array<Pet> | RawAjaxResponse<Array<Pet>>> {
         throwIfNullOrUndefined(tags, 'tags', 'findPetsByTags');
 
         const headers: HttpHeaders = {
@@ -160,18 +168,20 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: '/pet/findByTags',
+            url: '/pet/findByTags',
             method: 'GET',
             headers,
             query,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Returns a single pet
      * Find pet by ID
      */
-    getPetById = ({ petId }: GetPetByIdRequest): Observable<Pet> => {
+    getPetById({ petId }: GetPetByIdRequest): Observable<Pet>
+    getPetById({ petId }: GetPetByIdRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Pet>>
+    getPetById({ petId }: GetPetByIdRequest, opts?: OperationOpts): Observable<Pet | RawAjaxResponse<Pet>> {
         throwIfNullOrUndefined(petId, 'petId', 'getPetById');
 
         const headers: HttpHeaders = {
@@ -179,16 +189,18 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Pet>({
-            path: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
+            url: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
             method: 'GET',
             headers,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Update an existing pet
      */
-    updatePet = ({ body }: UpdatePetRequest): Observable<void> => {
+    updatePet({ body }: UpdatePetRequest): Observable<void>
+    updatePet({ body }: UpdatePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    updatePet({ body }: UpdatePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'updatePet');
 
         const headers: HttpHeaders = {
@@ -203,17 +215,19 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/pet',
+            url: '/pet',
             method: 'PUT',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Updates a pet in the store with form data
      */
-    updatePetWithForm = ({ petId, name, status }: UpdatePetWithFormRequest): Observable<void> => {
+    updatePetWithForm({ petId, name, status }: UpdatePetWithFormRequest): Observable<void>
+    updatePetWithForm({ petId, name, status }: UpdatePetWithFormRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    updatePetWithForm({ petId, name, status }: UpdatePetWithFormRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(petId, 'petId', 'updatePetWithForm');
 
         const headers: HttpHeaders = {
@@ -231,17 +245,19 @@ export class PetApi extends BaseAPI {
         if (status !== undefined) { formData.append('status', status as any); }
 
         return this.request<void>({
-            path: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
+            url: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
             method: 'POST',
             headers,
             body: formData,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * uploads an image
      */
-    uploadFile = ({ petId, additionalMetadata, file }: UploadFileRequest): Observable<ApiResponse> => {
+    uploadFile({ petId, additionalMetadata, file }: UploadFileRequest): Observable<ApiResponse>
+    uploadFile({ petId, additionalMetadata, file }: UploadFileRequest, opts?: OperationOpts): Observable<RawAjaxResponse<ApiResponse>>
+    uploadFile({ petId, additionalMetadata, file }: UploadFileRequest, opts?: OperationOpts): Observable<ApiResponse | RawAjaxResponse<ApiResponse>> {
         throwIfNullOrUndefined(petId, 'petId', 'uploadFile');
 
         const headers: HttpHeaders = {
@@ -259,11 +275,11 @@ export class PetApi extends BaseAPI {
         if (file !== undefined) { formData.append('file', file as any); }
 
         return this.request<ApiResponse>({
-            path: '/pet/{petId}/uploadImage'.replace('{petId}', encodeURI(petId)),
+            url: '/pet/{petId}/uploadImage'.replace('{petId}', encodeURI(petId)),
             method: 'POST',
             headers,
             body: formData,
-        });
+        }, opts?.responseOpts);
     };
 
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
index 8ce04d16aa04..5575fe6c3d64 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, HttpHeaders, throwIfNullOrUndefined, encodeURI } from '../runtime';
+import { BaseAPI, HttpHeaders, throwIfNullOrUndefined, encodeURI, OperationOpts, RawAjaxResponse } from '../runtime';
 import {
     Order,
 } from '../models';
@@ -38,48 +38,56 @@ export class StoreApi extends BaseAPI {
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      * Delete purchase order by ID
      */
-    deleteOrder = ({ orderId }: DeleteOrderRequest): Observable<void> => {
+    deleteOrder({ orderId }: DeleteOrderRequest): Observable<void>
+    deleteOrder({ orderId }: DeleteOrderRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    deleteOrder({ orderId }: DeleteOrderRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(orderId, 'orderId', 'deleteOrder');
 
         return this.request<void>({
-            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
+            url: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
             method: 'DELETE',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
-    getInventory = (): Observable<{ [key: string]: number; }> => {
+    getInventory(): Observable<{ [key: string]: number; }>
+    getInventory(opts?: OperationOpts): Observable<RawAjaxResponse<{ [key: string]: number; }>>
+    getInventory(opts?: OperationOpts): Observable<{ [key: string]: number; } | RawAjaxResponse<{ [key: string]: number; }>> {
         const headers: HttpHeaders = {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
         };
 
         return this.request<{ [key: string]: number; }>({
-            path: '/store/inventory',
+            url: '/store/inventory',
             method: 'GET',
             headers,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      */
-    getOrderById = ({ orderId }: GetOrderByIdRequest): Observable<Order> => {
+    getOrderById({ orderId }: GetOrderByIdRequest): Observable<Order>
+    getOrderById({ orderId }: GetOrderByIdRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Order>>
+    getOrderById({ orderId }: GetOrderByIdRequest, opts?: OperationOpts): Observable<Order | RawAjaxResponse<Order>> {
         throwIfNullOrUndefined(orderId, 'orderId', 'getOrderById');
 
         return this.request<Order>({
-            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
+            url: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
             method: 'GET',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Place an order for a pet
      */
-    placeOrder = ({ body }: PlaceOrderRequest): Observable<Order> => {
+    placeOrder({ body }: PlaceOrderRequest): Observable<Order>
+    placeOrder({ body }: PlaceOrderRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Order>>
+    placeOrder({ body }: PlaceOrderRequest, opts?: OperationOpts): Observable<Order | RawAjaxResponse<Order>> {
         throwIfNullOrUndefined(body, 'body', 'placeOrder');
 
         const headers: HttpHeaders = {
@@ -87,11 +95,11 @@ export class StoreApi extends BaseAPI {
         };
 
         return this.request<Order>({
-            path: '/store/order',
+            url: '/store/order',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts
index a223874786eb..5f08fdfd6580 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI, OperationOpts, RawAjaxResponse } from '../runtime';
 import {
     User,
 } from '../models';
@@ -56,7 +56,9 @@ export class UserApi extends BaseAPI {
      * This can only be done by the logged in user.
      * Create user
      */
-    createUser = ({ body }: CreateUserRequest): Observable<void> => {
+    createUser({ body }: CreateUserRequest): Observable<void>
+    createUser({ body }: CreateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    createUser({ body }: CreateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'createUser');
 
         const headers: HttpHeaders = {
@@ -64,17 +66,19 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/user',
+            url: '/user',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Creates list of users with given input array
      */
-    createUsersWithArrayInput = ({ body }: CreateUsersWithArrayInputRequest): Observable<void> => {
+    createUsersWithArrayInput({ body }: CreateUsersWithArrayInputRequest): Observable<void>
+    createUsersWithArrayInput({ body }: CreateUsersWithArrayInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    createUsersWithArrayInput({ body }: CreateUsersWithArrayInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'createUsersWithArrayInput');
 
         const headers: HttpHeaders = {
@@ -82,17 +86,19 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/user/createWithArray',
+            url: '/user/createWithArray',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Creates list of users with given input array
      */
-    createUsersWithListInput = ({ body }: CreateUsersWithListInputRequest): Observable<void> => {
+    createUsersWithListInput({ body }: CreateUsersWithListInputRequest): Observable<void>
+    createUsersWithListInput({ body }: CreateUsersWithListInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    createUsersWithListInput({ body }: CreateUsersWithListInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(body, 'body', 'createUsersWithListInput');
 
         const headers: HttpHeaders = {
@@ -100,42 +106,48 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/user/createWithList',
+            url: '/user/createWithList',
             method: 'POST',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * This can only be done by the logged in user.
      * Delete user
      */
-    deleteUser = ({ username }: DeleteUserRequest): Observable<void> => {
+    deleteUser({ username }: DeleteUserRequest): Observable<void>
+    deleteUser({ username }: DeleteUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    deleteUser({ username }: DeleteUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(username, 'username', 'deleteUser');
 
         return this.request<void>({
-            path: '/user/{username}'.replace('{username}', encodeURI(username)),
+            url: '/user/{username}'.replace('{username}', encodeURI(username)),
             method: 'DELETE',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Get user by user name
      */
-    getUserByName = ({ username }: GetUserByNameRequest): Observable<User> => {
+    getUserByName({ username }: GetUserByNameRequest): Observable<User>
+    getUserByName({ username }: GetUserByNameRequest, opts?: OperationOpts): Observable<RawAjaxResponse<User>>
+    getUserByName({ username }: GetUserByNameRequest, opts?: OperationOpts): Observable<User | RawAjaxResponse<User>> {
         throwIfNullOrUndefined(username, 'username', 'getUserByName');
 
         return this.request<User>({
-            path: '/user/{username}'.replace('{username}', encodeURI(username)),
+            url: '/user/{username}'.replace('{username}', encodeURI(username)),
             method: 'GET',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Logs user into the system
      */
-    loginUser = ({ username, password }: LoginUserRequest): Observable<string> => {
+    loginUser({ username, password }: LoginUserRequest): Observable<string>
+    loginUser({ username, password }: LoginUserRequest, opts?: OperationOpts): Observable<RawAjaxResponse<string>>
+    loginUser({ username, password }: LoginUserRequest, opts?: OperationOpts): Observable<string | RawAjaxResponse<string>> {
         throwIfNullOrUndefined(username, 'username', 'loginUser');
         throwIfNullOrUndefined(password, 'password', 'loginUser');
 
@@ -145,27 +157,31 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<string>({
-            path: '/user/login',
+            url: '/user/login',
             method: 'GET',
             query,
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * Logs out current logged in user session
      */
-    logoutUser = (): Observable<void> => {
+    logoutUser(): Observable<void>
+    logoutUser(opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    logoutUser(opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         return this.request<void>({
-            path: '/user/logout',
+            url: '/user/logout',
             method: 'GET',
-        });
+        }, opts?.responseOpts);
     };
 
     /**
      * This can only be done by the logged in user.
      * Updated user
      */
-    updateUser = ({ username, body }: UpdateUserRequest): Observable<void> => {
+    updateUser({ username, body }: UpdateUserRequest): Observable<void>
+    updateUser({ username, body }: UpdateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    updateUser({ username, body }: UpdateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
         throwIfNullOrUndefined(username, 'username', 'updateUser');
         throwIfNullOrUndefined(body, 'body', 'updateUser');
 
@@ -174,11 +190,11 @@ export class UserApi extends BaseAPI {
         };
 
         return this.request<void>({
-            path: '/user/{username}'.replace('{username}', encodeURI(username)),
+            url: '/user/{username}'.replace('{username}', encodeURI(username)),
             method: 'PUT',
             headers,
             body: body,
-        });
+        }, opts?.responseOpts);
     };
 
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/package.json b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/package.json
index c9c00ca9cf31..69a56b7d42b5 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/package.json
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/package.json
@@ -6,14 +6,14 @@
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
   "scripts" : {
-    "build": "tsc --outDir dist/",
+    "build": "node_modules/.bin/tsc --outDir dist/",
     "prepare": "npm run build"
   },
   "dependencies": {
     "rxjs": "^6.3.3"
   },
   "devDependencies": {
-    "typescript": "^3.0.1"
+    "typescript": "^3.7"
   },
   "publishConfig": {
     "registry": "https://skimdb.npmjs.com/registry"
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts
index 42ddef55ae1c..b93291601c1c 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts
@@ -11,7 +11,7 @@
  * Do not edit the class manually.
  */
 
-import { Observable, of } from 'rxjs';
+import { Observable, of, Subscriber } from 'rxjs';
 import { ajax, AjaxRequest, AjaxResponse } from 'rxjs/ajax';
 import { map, concatMap } from 'rxjs/operators';
 
@@ -30,11 +30,11 @@ export class Configuration {
     constructor(private configuration: ConfigurationParameters = {}) {}
 
     get basePath(): string {
-        return this.configuration.basePath || BASE_PATH;
+        return this.configuration.basePath ?? BASE_PATH;
     }
 
     get middleware(): Middleware[] {
-        return this.configuration.middleware || [];
+        return this.configuration.middleware ?? [];
     }
 
     get username(): string | undefined {
@@ -47,18 +47,12 @@ export class Configuration {
 
     get apiKey(): ((name: string) => string) | undefined {
         const { apiKey } = this.configuration;
-        if (!apiKey) {
-            return undefined;
-        }
-        return typeof apiKey === 'string' ? () => apiKey : apiKey;
+        return apiKey ? (typeof apiKey === 'string' ? () => apiKey : apiKey) : undefined;
     }
 
     get accessToken(): ((name: string, scopes?: string[]) => string) | undefined {
         const { accessToken } = this.configuration;
-        if (!accessToken) {
-            return undefined;
-        }
-        return typeof accessToken === 'string' ? () => accessToken : accessToken;
+        return accessToken ? (typeof accessToken === 'string' ? () => accessToken : accessToken) : undefined;
     }
 }
 
@@ -84,31 +78,32 @@ export class BaseAPI {
     withPostMiddleware = (postMiddlewares: Array<Middleware['post']>) =>
         this.withMiddleware(postMiddlewares.map((post) => ({ post })));
 
-    protected request = <T>(requestOpts: RequestOpts): Observable<T> =>
-        this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
+    protected request<T>(requestOpts: RequestOpts): Observable<T>
+    protected request<T>(requestOpts: RequestOpts, responseOpts?: ResponseOpts): Observable<RawAjaxResponse<T>>
+    protected request<T>(requestOpts: RequestOpts, responseOpts?: ResponseOpts): Observable<T | RawAjaxResponse<T>> {
+        return this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
             map((res) => {
-                if (res.status >= 200 && res.status < 300) {
-                    return res.response as T;
+                const { status, response } = res;
+                if (status >= 200 && status < 300) {
+                    return responseOpts?.respone === 'raw' ? res : response;
                 }
                 throw res;
             })
         );
+    }
 
-    private createRequestArgs = (requestOpts: RequestOpts): RequestArgs => {
-        let url = this.configuration.basePath + requestOpts.path;
-        if (requestOpts.query !== undefined && Object.keys(requestOpts.query).length !== 0) {
-            // only add the queryString to the URL if there are query parameters.
-            // this is done to avoid urls ending with a '?' character which buggy webservers
-            // do not handle correctly sometimes.
-            url += '?' + queryString(requestOpts.query);
-        }
+    private createRequestArgs = ({ url: baseUrl, query, method, headers, body, responseType }: RequestOpts): RequestArgs => {
+        // only add the queryString to the URL if there are query parameters.
+        // this is done to avoid urls ending with a '?' character which buggy webservers
+        // do not handle correctly sometimes.
+        const url = `${this.configuration.basePath}${baseUrl}${query && Object.keys(query).length ? `?${queryString(query)}`: ''}`;
 
         return {
             url,
-            method: requestOpts.method,
-            headers: requestOpts.headers,
-            body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
-            responseType: requestOpts.responseType || 'json',
+            method,
+            headers,
+            body: body instanceof FormData ? body : JSON.stringify(body),
+            responseType: responseType ?? 'json',
         };
     }
 
@@ -157,24 +152,35 @@ export type HttpHeaders = { [key: string]: string };
 export type HttpQuery = Partial<{ [key: string]: string | number | null | boolean | Array<string | number | null | boolean> }>; // partial is needed for strict mode
 export type HttpBody = Json | FormData;
 
-export interface RequestOpts {
-    path: string;
+export interface RequestOpts extends AjaxRequest {
+    query?: HttpQuery; // additional prop
+    // the following props have improved types over AjaxRequest 
     method: HttpMethod;
     headers?: HttpHeaders;
-    query?: HttpQuery;
     body?: HttpBody;
     responseType?: 'json' | 'blob' | 'arraybuffer' | 'text';
 }
 
-export const encodeURI = (value: any) => encodeURIComponent(String(value));
+export interface ResponseOpts {
+    respone?: 'raw';
+}
+
+export interface OperationOpts {
+    responseOpts?: ResponseOpts;
+}
+
+// AjaxResponse with typed response 
+export interface RawAjaxResponse<T> extends AjaxResponse {
+    response: T;
+}
+
+export const encodeURI = (value: any) => encodeURIComponent(`${value}`);
 
-const queryString = (params: HttpQuery): string => Object.keys(params)
-    .map((key) => {
-        const value = params[key];
-        return (value instanceof Array)
-            ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
-            : `${encodeURI(key)}=${encodeURI(value)}`;
-    })
+const queryString = (params: HttpQuery): string => Object.entries(params)
+    .map(([key, value]) => value instanceof Array
+        ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
+        : `${encodeURI(key)}=${encodeURI(value)}`
+    )
     .join('&');
 
 // alias fallback for not being a breaking change
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/tsconfig.json b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/tsconfig.json
index d65f2a95afc1..59a60838a05c 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/tsconfig.json
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/tsconfig.json
@@ -8,7 +8,8 @@
     "rootDir": ".",
     "lib": [
       "es6",
-      "dom"
+      "dom",
+      "es2017"
     ],
     "typeRoots": [
       "node_modules/@types"
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.gitignore b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.gitignore
similarity index 100%
rename from samples/client/petstore/typescript-rxjs/builds/with-interfaces/.gitignore
rename to samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.gitignore
diff --git a/samples/client/petstore/java/retrofit2rx/.openapi-generator-ignore b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/.openapi-generator-ignore
rename to samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator-ignore
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/FILES b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/FILES
similarity index 100%
rename from samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/FILES
rename to samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/FILES
diff --git a/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
rename to samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/PetApi.ts
new file mode 100644
index 000000000000..0fc16a28bbfb
--- /dev/null
+++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/PetApi.ts
@@ -0,0 +1,311 @@
+// tslint:disable
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { Observable } from 'rxjs';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI, COLLECTION_FORMATS, OperationOpts, RawAjaxResponse } from '../runtime';
+import {
+    ApiResponse,
+    Pet,
+} from '../models';
+
+export interface AddPetRequest {
+    body: Pet;
+}
+
+export interface DeletePetRequest {
+    petId: number;
+    apiKey?: string;
+}
+
+export interface FindPetsByStatusRequest {
+    status: Array<FindPetsByStatusStatusEnum>;
+}
+
+export interface FindPetsByTagsRequest {
+    tags: Array<string>;
+}
+
+export interface GetPetByIdRequest {
+    petId: number;
+}
+
+export interface UpdatePetRequest {
+    body: Pet;
+}
+
+export interface UpdatePetWithFormRequest {
+    petId: number;
+    name?: string;
+    status?: string;
+}
+
+export interface UploadFileRequest {
+    petId: number;
+    additionalMetadata?: string;
+    file?: Blob;
+}
+
+/**
+ * no description
+ */
+export class PetApi extends BaseAPI {
+
+    /**
+     * Add a new pet to the store
+     */
+    addPet({ body }: AddPetRequest): Observable<void>
+    addPet({ body }: AddPetRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<void>
+    addPet({ body }: AddPetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    addPet({ body }: AddPetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
+        throwIfNullOrUndefined(body, 'body', 'addPet');
+
+        const headers: HttpHeaders = {
+            'Content-Type': 'application/json',
+            // oauth required
+            ...(this.configuration.accessToken != null
+                ? { Authorization: typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
+                    : this.configuration.accessToken }
+                : undefined
+            ),
+        };
+
+        return this.request<void>({
+            url: '/pet',
+            method: 'POST',
+            headers,
+            body: body,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * Deletes a pet
+     */
+    deletePet({ petId, apiKey }: DeletePetRequest): Observable<void>
+    deletePet({ petId, apiKey }: DeletePetRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<void>
+    deletePet({ petId, apiKey }: DeletePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    deletePet({ petId, apiKey }: DeletePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
+        throwIfNullOrUndefined(petId, 'petId', 'deletePet');
+
+        const headers: HttpHeaders = {
+            ...(apiKey != null ? { 'api_key': String(apiKey) } : undefined),
+            // oauth required
+            ...(this.configuration.accessToken != null
+                ? { Authorization: typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
+                    : this.configuration.accessToken }
+                : undefined
+            ),
+        };
+
+        return this.request<void>({
+            url: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
+            method: 'DELETE',
+            headers,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     */
+    findPetsByStatus({ status }: FindPetsByStatusRequest): Observable<Array<Pet>>
+    findPetsByStatus({ status }: FindPetsByStatusRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<Array<Pet>>
+    findPetsByStatus({ status }: FindPetsByStatusRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Array<Pet>>>
+    findPetsByStatus({ status }: FindPetsByStatusRequest, opts?: OperationOpts): Observable<Array<Pet> | RawAjaxResponse<Array<Pet>>> {
+        throwIfNullOrUndefined(status, 'status', 'findPetsByStatus');
+
+        const headers: HttpHeaders = {
+            // oauth required
+            ...(this.configuration.accessToken != null
+                ? { Authorization: typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
+                    : this.configuration.accessToken }
+                : undefined
+            ),
+        };
+
+        const query: HttpQuery = { // required parameters are used directly since they are already checked by throwIfNullOrUndefined
+            'status': status.join(COLLECTION_FORMATS['csv']),
+        };
+
+        return this.request<Array<Pet>>({
+            url: '/pet/findByStatus',
+            method: 'GET',
+            headers,
+            query,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     */
+    findPetsByTags({ tags }: FindPetsByTagsRequest): Observable<Array<Pet>>
+    findPetsByTags({ tags }: FindPetsByTagsRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<Array<Pet>>
+    findPetsByTags({ tags }: FindPetsByTagsRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Array<Pet>>>
+    findPetsByTags({ tags }: FindPetsByTagsRequest, opts?: OperationOpts): Observable<Array<Pet> | RawAjaxResponse<Array<Pet>>> {
+        throwIfNullOrUndefined(tags, 'tags', 'findPetsByTags');
+
+        const headers: HttpHeaders = {
+            // oauth required
+            ...(this.configuration.accessToken != null
+                ? { Authorization: typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
+                    : this.configuration.accessToken }
+                : undefined
+            ),
+        };
+
+        const query: HttpQuery = { // required parameters are used directly since they are already checked by throwIfNullOrUndefined
+            'tags': tags.join(COLLECTION_FORMATS['csv']),
+        };
+
+        return this.request<Array<Pet>>({
+            url: '/pet/findByTags',
+            method: 'GET',
+            headers,
+            query,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     */
+    getPetById({ petId }: GetPetByIdRequest): Observable<Pet>
+    getPetById({ petId }: GetPetByIdRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<Pet>
+    getPetById({ petId }: GetPetByIdRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Pet>>
+    getPetById({ petId }: GetPetByIdRequest, opts?: OperationOpts): Observable<Pet | RawAjaxResponse<Pet>> {
+        throwIfNullOrUndefined(petId, 'petId', 'getPetById');
+
+        const headers: HttpHeaders = {
+            ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
+        };
+
+        return this.request<Pet>({
+            url: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
+            method: 'GET',
+            headers,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * Update an existing pet
+     */
+    updatePet({ body }: UpdatePetRequest): Observable<void>
+    updatePet({ body }: UpdatePetRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<void>
+    updatePet({ body }: UpdatePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    updatePet({ body }: UpdatePetRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
+        throwIfNullOrUndefined(body, 'body', 'updatePet');
+
+        const headers: HttpHeaders = {
+            'Content-Type': 'application/json',
+            // oauth required
+            ...(this.configuration.accessToken != null
+                ? { Authorization: typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
+                    : this.configuration.accessToken }
+                : undefined
+            ),
+        };
+
+        return this.request<void>({
+            url: '/pet',
+            method: 'PUT',
+            headers,
+            body: body,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * Updates a pet in the store with form data
+     */
+    updatePetWithForm({ petId, name, status }: UpdatePetWithFormRequest): Observable<void>
+    updatePetWithForm({ petId, name, status }: UpdatePetWithFormRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<void>
+    updatePetWithForm({ petId, name, status }: UpdatePetWithFormRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    updatePetWithForm({ petId, name, status }: UpdatePetWithFormRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
+        throwIfNullOrUndefined(petId, 'petId', 'updatePetWithForm');
+
+        const headers: HttpHeaders = {
+            // oauth required
+            ...(this.configuration.accessToken != null
+                ? { Authorization: typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
+                    : this.configuration.accessToken }
+                : undefined
+            ),
+        };
+
+        const formData = new FormData();
+        if (name !== undefined) { formData.append('name', name as any); }
+        if (status !== undefined) { formData.append('status', status as any); }
+
+        return this.request<void>({
+            url: '/pet/{petId}'.replace('{petId}', encodeURI(petId)),
+            method: 'POST',
+            headers,
+            body: formData,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * uploads an image
+     */
+    uploadFile({ petId, additionalMetadata, file }: UploadFileRequest): Observable<ApiResponse>
+    uploadFile({ petId, additionalMetadata, file }: UploadFileRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<ApiResponse>
+    uploadFile({ petId, additionalMetadata, file }: UploadFileRequest, opts?: OperationOpts): Observable<RawAjaxResponse<ApiResponse>>
+    uploadFile({ petId, additionalMetadata, file }: UploadFileRequest, opts?: OperationOpts): Observable<ApiResponse | RawAjaxResponse<ApiResponse>> {
+        throwIfNullOrUndefined(petId, 'petId', 'uploadFile');
+
+        const headers: HttpHeaders = {
+            // oauth required
+            ...(this.configuration.accessToken != null
+                ? { Authorization: typeof this.configuration.accessToken === 'function'
+                    ? this.configuration.accessToken('petstore_auth', ['write:pets', 'read:pets'])
+                    : this.configuration.accessToken }
+                : undefined
+            ),
+        };
+
+        const formData = new FormData();
+        if (additionalMetadata !== undefined) { formData.append('additionalMetadata', additionalMetadata as any); }
+        if (file !== undefined) { formData.append('file', file as any); }
+
+        return this.request<ApiResponse>({
+            url: '/pet/{petId}/uploadImage'.replace('{petId}', encodeURI(petId)),
+            method: 'POST',
+            headers,
+            body: formData,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+}
+
+/**
+ * @export
+ * @enum {string}
+ */
+export enum FindPetsByStatusStatusEnum {
+    Available = 'available',
+    Pending = 'pending',
+    Sold = 'sold'
+}
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/StoreApi.ts
new file mode 100644
index 000000000000..55672fd90697
--- /dev/null
+++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/StoreApi.ts
@@ -0,0 +1,113 @@
+// tslint:disable
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { Observable } from 'rxjs';
+import { BaseAPI, HttpHeaders, throwIfNullOrUndefined, encodeURI, OperationOpts, RawAjaxResponse } from '../runtime';
+import {
+    Order,
+} from '../models';
+
+export interface DeleteOrderRequest {
+    orderId: string;
+}
+
+export interface GetOrderByIdRequest {
+    orderId: number;
+}
+
+export interface PlaceOrderRequest {
+    body: Order;
+}
+
+/**
+ * no description
+ */
+export class StoreApi extends BaseAPI {
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     */
+    deleteOrder({ orderId }: DeleteOrderRequest): Observable<void>
+    deleteOrder({ orderId }: DeleteOrderRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<void>
+    deleteOrder({ orderId }: DeleteOrderRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    deleteOrder({ orderId }: DeleteOrderRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
+        throwIfNullOrUndefined(orderId, 'orderId', 'deleteOrder');
+
+        return this.request<void>({
+            url: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
+            method: 'DELETE',
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    getInventory(): Observable<{ [key: string]: number; }>
+    getInventory(opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<{ [key: string]: number; }>
+    getInventory(opts?: OperationOpts): Observable<RawAjaxResponse<{ [key: string]: number; }>>
+    getInventory(opts?: OperationOpts): Observable<{ [key: string]: number; } | RawAjaxResponse<{ [key: string]: number; }>> {
+        const headers: HttpHeaders = {
+            ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
+        };
+
+        return this.request<{ [key: string]: number; }>({
+            url: '/store/inventory',
+            method: 'GET',
+            headers,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     */
+    getOrderById({ orderId }: GetOrderByIdRequest): Observable<Order>
+    getOrderById({ orderId }: GetOrderByIdRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<Order>
+    getOrderById({ orderId }: GetOrderByIdRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Order>>
+    getOrderById({ orderId }: GetOrderByIdRequest, opts?: OperationOpts): Observable<Order | RawAjaxResponse<Order>> {
+        throwIfNullOrUndefined(orderId, 'orderId', 'getOrderById');
+
+        return this.request<Order>({
+            url: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
+            method: 'GET',
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * Place an order for a pet
+     */
+    placeOrder({ body }: PlaceOrderRequest): Observable<Order>
+    placeOrder({ body }: PlaceOrderRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<Order>
+    placeOrder({ body }: PlaceOrderRequest, opts?: OperationOpts): Observable<RawAjaxResponse<Order>>
+    placeOrder({ body }: PlaceOrderRequest, opts?: OperationOpts): Observable<Order | RawAjaxResponse<Order>> {
+        throwIfNullOrUndefined(body, 'body', 'placeOrder');
+
+        const headers: HttpHeaders = {
+            'Content-Type': 'application/json',
+        };
+
+        return this.request<Order>({
+            url: '/store/order',
+            method: 'POST',
+            headers,
+            body: body,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+}
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/UserApi.ts
new file mode 100644
index 000000000000..1b216533a2fb
--- /dev/null
+++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/UserApi.ts
@@ -0,0 +1,216 @@
+// tslint:disable
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { Observable } from 'rxjs';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI, OperationOpts, RawAjaxResponse } from '../runtime';
+import {
+    User,
+} from '../models';
+
+export interface CreateUserRequest {
+    body: User;
+}
+
+export interface CreateUsersWithArrayInputRequest {
+    body: Array<User>;
+}
+
+export interface CreateUsersWithListInputRequest {
+    body: Array<User>;
+}
+
+export interface DeleteUserRequest {
+    username: string;
+}
+
+export interface GetUserByNameRequest {
+    username: string;
+}
+
+export interface LoginUserRequest {
+    username: string;
+    password: string;
+}
+
+export interface UpdateUserRequest {
+    username: string;
+    body: User;
+}
+
+/**
+ * no description
+ */
+export class UserApi extends BaseAPI {
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     */
+    createUser({ body }: CreateUserRequest): Observable<void>
+    createUser({ body }: CreateUserRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<void>
+    createUser({ body }: CreateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    createUser({ body }: CreateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
+        throwIfNullOrUndefined(body, 'body', 'createUser');
+
+        const headers: HttpHeaders = {
+            'Content-Type': 'application/json',
+        };
+
+        return this.request<void>({
+            url: '/user',
+            method: 'POST',
+            headers,
+            body: body,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * Creates list of users with given input array
+     */
+    createUsersWithArrayInput({ body }: CreateUsersWithArrayInputRequest): Observable<void>
+    createUsersWithArrayInput({ body }: CreateUsersWithArrayInputRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<void>
+    createUsersWithArrayInput({ body }: CreateUsersWithArrayInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    createUsersWithArrayInput({ body }: CreateUsersWithArrayInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
+        throwIfNullOrUndefined(body, 'body', 'createUsersWithArrayInput');
+
+        const headers: HttpHeaders = {
+            'Content-Type': 'application/json',
+        };
+
+        return this.request<void>({
+            url: '/user/createWithArray',
+            method: 'POST',
+            headers,
+            body: body,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * Creates list of users with given input array
+     */
+    createUsersWithListInput({ body }: CreateUsersWithListInputRequest): Observable<void>
+    createUsersWithListInput({ body }: CreateUsersWithListInputRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<void>
+    createUsersWithListInput({ body }: CreateUsersWithListInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    createUsersWithListInput({ body }: CreateUsersWithListInputRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
+        throwIfNullOrUndefined(body, 'body', 'createUsersWithListInput');
+
+        const headers: HttpHeaders = {
+            'Content-Type': 'application/json',
+        };
+
+        return this.request<void>({
+            url: '/user/createWithList',
+            method: 'POST',
+            headers,
+            body: body,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     */
+    deleteUser({ username }: DeleteUserRequest): Observable<void>
+    deleteUser({ username }: DeleteUserRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<void>
+    deleteUser({ username }: DeleteUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    deleteUser({ username }: DeleteUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
+        throwIfNullOrUndefined(username, 'username', 'deleteUser');
+
+        return this.request<void>({
+            url: '/user/{username}'.replace('{username}', encodeURI(username)),
+            method: 'DELETE',
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * Get user by user name
+     */
+    getUserByName({ username }: GetUserByNameRequest): Observable<User>
+    getUserByName({ username }: GetUserByNameRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<User>
+    getUserByName({ username }: GetUserByNameRequest, opts?: OperationOpts): Observable<RawAjaxResponse<User>>
+    getUserByName({ username }: GetUserByNameRequest, opts?: OperationOpts): Observable<User | RawAjaxResponse<User>> {
+        throwIfNullOrUndefined(username, 'username', 'getUserByName');
+
+        return this.request<User>({
+            url: '/user/{username}'.replace('{username}', encodeURI(username)),
+            method: 'GET',
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * Logs user into the system
+     */
+    loginUser({ username, password }: LoginUserRequest): Observable<string>
+    loginUser({ username, password }: LoginUserRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<string>
+    loginUser({ username, password }: LoginUserRequest, opts?: OperationOpts): Observable<RawAjaxResponse<string>>
+    loginUser({ username, password }: LoginUserRequest, opts?: OperationOpts): Observable<string | RawAjaxResponse<string>> {
+        throwIfNullOrUndefined(username, 'username', 'loginUser');
+        throwIfNullOrUndefined(password, 'password', 'loginUser');
+
+        const query: HttpQuery = { // required parameters are used directly since they are already checked by throwIfNullOrUndefined
+            'username': username,
+            'password': password,
+        };
+
+        return this.request<string>({
+            url: '/user/login',
+            method: 'GET',
+            query,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * Logs out current logged in user session
+     */
+    logoutUser(): Observable<void>
+    logoutUser(opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<void>
+    logoutUser(opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    logoutUser(opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
+        return this.request<void>({
+            url: '/user/logout',
+            method: 'GET',
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     */
+    updateUser({ username, body }: UpdateUserRequest): Observable<void>
+    updateUser({ username, body }: UpdateUserRequest, opts?: Pick<OperationOpts, 'progressSubscriber'>): Observable<void>
+    updateUser({ username, body }: UpdateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>>
+    updateUser({ username, body }: UpdateUserRequest, opts?: OperationOpts): Observable<void | RawAjaxResponse<void>> {
+        throwIfNullOrUndefined(username, 'username', 'updateUser');
+        throwIfNullOrUndefined(body, 'body', 'updateUser');
+
+        const headers: HttpHeaders = {
+            'Content-Type': 'application/json',
+        };
+
+        return this.request<void>({
+            url: '/user/{username}'.replace('{username}', encodeURI(username)),
+            method: 'PUT',
+            headers,
+            body: body,
+            progressSubscriber: opts?.progressSubscriber,
+        }, opts?.responseOpts);
+    };
+
+}
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/index.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/index.ts
similarity index 100%
rename from samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/index.ts
rename to samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/index.ts
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/index.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/index.ts
similarity index 100%
rename from samples/client/petstore/typescript-rxjs/builds/with-interfaces/index.ts
rename to samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/index.ts
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/ApiResponse.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/ApiResponse.ts
similarity index 100%
rename from samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/ApiResponse.ts
rename to samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/ApiResponse.ts
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Category.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Category.ts
similarity index 100%
rename from samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Category.ts
rename to samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Category.ts
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Order.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Order.ts
similarity index 100%
rename from samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Order.ts
rename to samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Order.ts
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Pet.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Pet.ts
similarity index 100%
rename from samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Pet.ts
rename to samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Pet.ts
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Tag.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Tag.ts
similarity index 100%
rename from samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Tag.ts
rename to samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Tag.ts
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/User.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/User.ts
similarity index 100%
rename from samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/User.ts
rename to samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/User.ts
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/index.ts
similarity index 100%
rename from samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/index.ts
rename to samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/index.ts
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/runtime.ts
new file mode 100644
index 000000000000..2fb0ef154ab6
--- /dev/null
+++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/runtime.ts
@@ -0,0 +1,214 @@
+// tslint:disable
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { Observable, of, Subscriber } from 'rxjs';
+import { ajax, AjaxRequest, AjaxResponse } from 'rxjs/ajax';
+import { map, concatMap } from 'rxjs/operators';
+
+export const BASE_PATH = 'http://petstore.swagger.io/v2'.replace(/\/+$/, '');
+
+export interface ConfigurationParameters {
+    basePath?: string; // override base path
+    middleware?: Middleware[]; // middleware to apply before/after rxjs requests
+    username?: string; // parameter for basic security
+    password?: string; // parameter for basic security
+    apiKey?: string | ((name: string) => string); // parameter for apiKey security
+    accessToken?: string | ((name?: string, scopes?: string[]) => string); // parameter for oauth2 security
+}
+
+export class Configuration {
+    constructor(private configuration: ConfigurationParameters = {}) {}
+
+    get basePath(): string {
+        return this.configuration.basePath ?? BASE_PATH;
+    }
+
+    get middleware(): Middleware[] {
+        return this.configuration.middleware ?? [];
+    }
+
+    get username(): string | undefined {
+        return this.configuration.username;
+    }
+
+    get password(): string | undefined {
+        return this.configuration.password;
+    }
+
+    get apiKey(): ((name: string) => string) | undefined {
+        const { apiKey } = this.configuration;
+        return apiKey ? (typeof apiKey === 'string' ? () => apiKey : apiKey) : undefined;
+    }
+
+    get accessToken(): ((name: string, scopes?: string[]) => string) | undefined {
+        const { accessToken } = this.configuration;
+        return accessToken ? (typeof accessToken === 'string' ? () => accessToken : accessToken) : undefined;
+    }
+}
+
+/**
+ * This is the base class for all generated API classes.
+ */
+export class BaseAPI {
+    private middleware: Middleware[] = [];
+
+    constructor(protected configuration = new Configuration()) {
+        this.middleware = configuration.middleware;
+    }
+
+    withMiddleware = (middlewares: Middleware[]): this => {
+        const next = this.clone();
+        next.middleware = next.middleware.concat(middlewares);
+        return next;
+    };
+
+    withPreMiddleware = (preMiddlewares: Array<Middleware['pre']>) =>
+        this.withMiddleware(preMiddlewares.map((pre) => ({ pre })));
+
+    withPostMiddleware = (postMiddlewares: Array<Middleware['post']>) =>
+        this.withMiddleware(postMiddlewares.map((post) => ({ post })));
+
+    protected request<T>(requestOpts: RequestOpts): Observable<T>
+    protected request<T>(requestOpts: RequestOpts, responseOpts?: ResponseOpts): Observable<RawAjaxResponse<T>>
+    protected request<T>(requestOpts: RequestOpts, responseOpts?: ResponseOpts): Observable<T | RawAjaxResponse<T>> {
+        return this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
+            map((res) => {
+                const { status, response } = res;
+                if (status >= 200 && status < 300) {
+                    return responseOpts?.respone === 'raw' ? res : response;
+                }
+                throw res;
+            })
+        );
+    }
+
+    private createRequestArgs = ({ url: baseUrl, query, method, headers, body, responseType, progressSubscriber }: RequestOpts): RequestArgs => {
+        // only add the queryString to the URL if there are query parameters.
+        // this is done to avoid urls ending with a '?' character which buggy webservers
+        // do not handle correctly sometimes.
+        const url = `${this.configuration.basePath}${baseUrl}${query && Object.keys(query).length ? `?${queryString(query)}`: ''}`;
+
+        return {
+            url,
+            method,
+            headers,
+            body: body instanceof FormData ? body : JSON.stringify(body),
+            responseType: responseType ?? 'json',
+            progressSubscriber,
+        };
+    }
+
+    private rxjsRequest = (params: RequestArgs): Observable<AjaxResponse> =>
+        of(params).pipe(
+            map((request) => {
+                this.middleware.filter((item) => item.pre).forEach((mw) => (request = mw.pre!(request)));
+                return request;
+            }),
+            concatMap((args) =>
+                ajax(args).pipe(
+                    map((response) => {
+                        this.middleware.filter((item) => item.post).forEach((mw) => (response = mw.post!(response)));
+                        return response;
+                    })
+                )
+            )
+        );
+
+    /**
+     * Create a shallow clone of `this` by constructing a new instance
+     * and then shallow cloning data members.
+     */
+    private clone = (): this =>
+        Object.assign(Object.create(Object.getPrototypeOf(this)), this);
+}
+
+/**
+ * @deprecated
+ * export for not being a breaking change
+ */
+export class RequiredError extends Error {
+    name: 'RequiredError' = 'RequiredError';
+}
+
+export const COLLECTION_FORMATS = {
+    csv: ',',
+    ssv: ' ',
+    tsv: '\t',
+    pipes: '|',
+};
+
+export type Json = any;
+export type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | 'HEAD';
+export type HttpHeaders = { [key: string]: string };
+export type HttpQuery = Partial<{ [key: string]: string | number | null | boolean | Array<string | number | null | boolean> }>; // partial is needed for strict mode
+export type HttpBody = Json | FormData;
+
+export interface RequestOpts extends AjaxRequest {
+    query?: HttpQuery; // additional prop
+    // the following props have improved types over AjaxRequest 
+    method: HttpMethod;
+    headers?: HttpHeaders;
+    body?: HttpBody;
+    responseType?: 'json' | 'blob' | 'arraybuffer' | 'text';
+    progressSubscriber?: Subscriber<ProgressEvent>;
+}
+
+export interface ResponseOpts {
+    respone?: 'raw';
+}
+
+export interface OperationOpts {
+    progressSubscriber?: Subscriber<ProgressEvent>;
+    responseOpts?: ResponseOpts;
+}
+
+// AjaxResponse with typed response 
+export interface RawAjaxResponse<T> extends AjaxResponse {
+    response: T;
+}
+
+export const encodeURI = (value: any) => encodeURIComponent(`${value}`);
+
+const queryString = (params: HttpQuery): string => Object.entries(params)
+    .map(([key, value]) => value instanceof Array
+        ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
+        : `${encodeURI(key)}=${encodeURI(value)}`
+    )
+    .join('&');
+
+// alias fallback for not being a breaking change
+export const querystring = queryString;
+
+/**
+ * @deprecated
+ */
+export const throwIfRequired = (params: {[key: string]: any}, key: string, nickname: string) => {
+    if (!params || params[key] == null) {
+        throw new RequiredError(`Required parameter ${key} was null or undefined when calling ${nickname}.`);
+    }
+};
+
+export const throwIfNullOrUndefined = (value: any, paramName: string, nickname: string) => {
+    if (value == null) {
+        throw new Error(`Parameter "${paramName}" was null or undefined when calling "${nickname}".`);
+    }
+};
+
+// alias for easier importing
+export interface RequestArgs extends AjaxRequest {}
+export interface ResponseArgs extends AjaxResponse {}
+
+export interface Middleware {
+    pre?(request: RequestArgs): RequestArgs;
+    post?(response: ResponseArgs): ResponseArgs;
+}
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/tsconfig.json b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/tsconfig.json
new file mode 100644
index 000000000000..59a60838a05c
--- /dev/null
+++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "declaration": true,
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "dist",
+    "rootDir": ".",
+    "lib": [
+      "es6",
+      "dom",
+      "es2017"
+    ],
+    "typeRoots": [
+      "node_modules/@types"
+    ]
+  },
+  "exclude": [
+    "dist",
+    "node_modules"
+  ]
+}
diff --git a/samples/documentation/asciidoc/index.adoc b/samples/documentation/asciidoc/index.adoc
index 5b8e07a5705a..bc9f84fa1f28 100644
--- a/samples/documentation/asciidoc/index.adoc
+++ b/samples/documentation/asciidoc/index.adoc
@@ -24,8 +24,6 @@ This is a sample server Petstore server. For this sample, you can use the api ke
 
 
 * *APIKey* KeyParamName:     _api_key_,     KeyInQuery: _false_, KeyInHeader: _true_
-
-* *APIKey* KeyParamName:     _AUTH_KEY_,     KeyInQuery: _false_, KeyInHeader: _false_
 * *OAuth*  AuthorizationUrl: _http://petstore.swagger.io/api/oauth/dialog_, TokenUrl:   __ 
 
 
@@ -56,7 +54,7 @@ Add a new pet to the store
 ===== Parameters
 
 
-===== Body Parameter
+====== Body Parameter
 
 [cols="2,3,1,1,1"]
 |===         
@@ -506,7 +504,7 @@ Update an existing pet
 ===== Parameters
 
 
-===== Body Parameter
+====== Body Parameter
 
 [cols="2,3,1,1,1"]
 |===         
@@ -618,7 +616,7 @@ Updates a pet in the store with form data
 |===         
 
 
-===== Form Parameter
+====== Form Parameters
 
 [cols="2,3,1,1,1"]
 |===         
@@ -717,7 +715,7 @@ uploads an image
 |===         
 
 
-===== Form Parameter
+====== Form Parameters
 
 [cols="2,3,1,1,1"]
 |===         
@@ -1056,7 +1054,7 @@ Place an order for a pet
 ===== Parameters
 
 
-===== Body Parameter
+====== Body Parameter
 
 [cols="2,3,1,1,1"]
 |===         
@@ -1148,7 +1146,7 @@ This can only be done by the logged in user.
 ===== Parameters
 
 
-===== Body Parameter
+====== Body Parameter
 
 [cols="2,3,1,1,1"]
 |===         
@@ -1228,7 +1226,7 @@ Creates list of users with given input array
 ===== Parameters
 
 
-===== Body Parameter
+====== Body Parameter
 
 [cols="2,3,1,1,1"]
 |===         
@@ -1308,7 +1306,7 @@ Creates list of users with given input array
 ===== Parameters
 
 
-===== Body Parameter
+====== Body Parameter
 
 [cols="2,3,1,1,1"]
 |===         
@@ -1741,7 +1739,7 @@ This can only be done by the logged in user.
 
 |===         
 
-===== Body Parameter
+====== Body Parameter
 
 [cols="2,3,1,1,1"]
 |===         
diff --git a/samples/server/petstore/python-flask-python2/.gitignore b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.gitignore
similarity index 100%
rename from samples/server/petstore/python-flask-python2/.gitignore
rename to samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.gitignore
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.gitlab-ci.yml b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.gitlab-ci.yml
new file mode 100644
index 000000000000..475aaf9bb75b
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.gitlab-ci.yml
@@ -0,0 +1,33 @@
+# ref: https://docs.gitlab.com/ee/ci/README.html
+
+stages:
+  - test
+
+.nosetest:
+  stage: test
+  script:
+   - pip install -r requirements.txt
+   - pip install -r test-requirements.txt
+   - pytest --cov=x_auth_id_alias
+
+nosetest-2.7:
+  extends: .nosetest
+  image: python:2.7-alpine
+nosetest-3.3:
+  extends: .nosetest
+  image: python:3.3-alpine
+nosetest-3.4:
+  extends: .nosetest
+  image: python:3.4-alpine
+nosetest-3.5:
+  extends: .nosetest
+  image: python:3.5-alpine
+nosetest-3.6:
+  extends: .nosetest
+  image: python:3.6-alpine
+nosetest-3.7:
+  extends: .nosetest
+  image: python:3.7-alpine
+nosetest-3.8:
+  extends: .nosetest
+  image: python:3.8-alpine
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator-ignore b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator-ignore
rename to samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.openapi-generator-ignore
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.openapi-generator/FILES b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.openapi-generator/FILES
new file mode 100644
index 000000000000..93cf0c21cbdb
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.openapi-generator/FILES
@@ -0,0 +1,23 @@
+.gitignore
+.gitlab-ci.yml
+.travis.yml
+README.md
+docs/UsageApi.md
+git_push.sh
+requirements.txt
+setup.cfg
+setup.py
+test-requirements.txt
+test/__init__.py
+tox.ini
+x_auth_id_alias/__init__.py
+x_auth_id_alias/api/__init__.py
+x_auth_id_alias/api/usage_api.py
+x_auth_id_alias/api_client.py
+x_auth_id_alias/apis/__init__.py
+x_auth_id_alias/configuration.py
+x_auth_id_alias/exceptions.py
+x_auth_id_alias/model/__init__.py
+x_auth_id_alias/model_utils.py
+x_auth_id_alias/models/__init__.py
+x_auth_id_alias/rest.py
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION
rename to samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.openapi-generator/VERSION
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.travis.yml b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.travis.yml
new file mode 100644
index 000000000000..97a849816e36
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/.travis.yml
@@ -0,0 +1,17 @@
+# ref: https://docs.travis-ci.com/user/languages/python
+language: python
+python:
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+# command to install dependencies
+install:
+  - "pip install -r requirements.txt"
+  - "pip install -r test-requirements.txt"
+# command to run tests
+script: pytest --cov=x_auth_id_alias
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/README.md b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/README.md
new file mode 100644
index 000000000000..38273d89a1dc
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/README.md
@@ -0,0 +1,155 @@
+# x-auth-id-alias
+This specification shows how to use x-auth-id-alias extension for API keys.
+
+This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 1.0.0
+- Package version: 1.0.0
+- Build package: org.openapitools.codegen.languages.PythonClientExperimentalCodegen
+
+## Requirements.
+
+Python 2.7 and 3.4+
+
+## Installation & Usage
+### pip install
+
+If the python package is hosted on a repository, you can install directly using:
+
+```sh
+pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
+```
+(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git`)
+
+Then import the package:
+```python
+import x_auth_id_alias
+```
+
+### Setuptools
+
+Install via [Setuptools](http://pypi.python.org/pypi/setuptools).
+
+```sh
+python setup.py install --user
+```
+(or `sudo python setup.py install` to install the package for all users)
+
+Then import the package:
+```python
+import x_auth_id_alias
+```
+
+## Getting Started
+
+Please follow the [installation procedure](#installation--usage) and then run the following:
+
+```python
+from __future__ import print_function
+
+import time
+import x_auth_id_alias
+from pprint import pprint
+from x_auth_id_alias.api import usage_api
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = x_auth_id_alias.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure API key authorization: api_key
+configuration = x_auth_id_alias.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    api_key = {
+        'api_key': 'YOUR_API_KEY'
+    }
+)
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['api_key'] = 'Bearer'
+
+# Configure API key authorization: api_key_query
+configuration = x_auth_id_alias.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    api_key = {
+        'api_key_query': 'YOUR_API_KEY'
+    }
+)
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['api_key_query'] = 'Bearer'
+
+
+# Enter a context with an instance of the API client
+with x_auth_id_alias.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = usage_api.UsageApi(api_client)
+    
+    try:
+        # Use any API key
+        api_response = api_instance.any_key()
+        pprint(api_response)
+    except x_auth_id_alias.ApiException as e:
+        print("Exception when calling UsageApi->any_key: %s\n" % e)
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*UsageApi* | [**any_key**](docs/UsageApi.md#any_key) | **GET** /any | Use any API key
+*UsageApi* | [**both_keys**](docs/UsageApi.md#both_keys) | **GET** /both | Use both API keys
+*UsageApi* | [**key_in_header**](docs/UsageApi.md#key_in_header) | **GET** /header | Use API key in header
+*UsageApi* | [**key_in_query**](docs/UsageApi.md#key_in_query) | **GET** /query | Use API key in query
+
+
+## Documentation For Models
+
+
+
+## Documentation For Authorization
+
+
+## api_key
+
+- **Type**: API key
+- **API key parameter name**: X-Api-Key
+- **Location**: HTTP header
+
+
+## api_key_query
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: URL query string
+
+
+## Author
+
+
+
+
+## Notes for Large OpenAPI documents
+If the OpenAPI document is large, imports in x_auth_id_alias.apis and x_auth_id_alias.models may fail with a
+RecursionError indicating the maximum recursion limit has been exceeded. In that case, there are a couple of solutions:
+
+Solution 1:
+Use specific imports for apis and models like:
+- `from x_auth_id_alias.api.default_api import DefaultApi`
+- `from x_auth_id_alias.model.pet import Pet`
+
+Solution 1:
+Before importing the package, adjust the maximum recursion limit as shown below:
+```
+import sys
+sys.setrecursionlimit(1500)
+import x_auth_id_alias
+from x_auth_id_alias.apis import *
+from x_auth_id_alias.models import *
+```
+
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/docs/UsageApi.md b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/docs/UsageApi.md
new file mode 100644
index 000000000000..bea1ee7ce196
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/docs/UsageApi.md
@@ -0,0 +1,330 @@
+# x_auth_id_alias.UsageApi
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**any_key**](UsageApi.md#any_key) | **GET** /any | Use any API key
+[**both_keys**](UsageApi.md#both_keys) | **GET** /both | Use both API keys
+[**key_in_header**](UsageApi.md#key_in_header) | **GET** /header | Use API key in header
+[**key_in_query**](UsageApi.md#key_in_query) | **GET** /query | Use API key in query
+
+
+# **any_key**
+> {str: (bool, date, datetime, dict, float, int, list, str, none_type)} any_key()
+
+Use any API key
+
+Use any API key
+
+### Example
+
+* Api Key Authentication (api_key):
+* Api Key Authentication (api_key_query):
+```python
+from __future__ import print_function
+import time
+import x_auth_id_alias
+from x_auth_id_alias.api import usage_api
+from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = x_auth_id_alias.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure API key authorization: api_key
+configuration = x_auth_id_alias.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    api_key = {
+        'api_key': 'YOUR_API_KEY'
+    }
+)
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['api_key'] = 'Bearer'
+
+# Configure API key authorization: api_key_query
+configuration = x_auth_id_alias.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    api_key = {
+        'api_key_query': 'YOUR_API_KEY'
+    }
+)
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['api_key_query'] = 'Bearer'
+
+# Enter a context with an instance of the API client
+with x_auth_id_alias.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = usage_api.UsageApi(api_client)
+    
+    # example, this endpoint has no required or optional parameters
+    try:
+        # Use any API key
+        api_response = api_instance.any_key()
+        pprint(api_response)
+    except x_auth_id_alias.ApiException as e:
+        print("Exception when calling UsageApi->any_key: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**
+
+### Authorization
+
+[api_key](../README.md#api_key), [api_key_query](../README.md#api_key_query)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | successful operation |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **both_keys**
+> {str: (bool, date, datetime, dict, float, int, list, str, none_type)} both_keys()
+
+Use both API keys
+
+Use both API keys
+
+### Example
+
+* Api Key Authentication (api_key):
+* Api Key Authentication (api_key_query):
+```python
+from __future__ import print_function
+import time
+import x_auth_id_alias
+from x_auth_id_alias.api import usage_api
+from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = x_auth_id_alias.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure API key authorization: api_key
+configuration = x_auth_id_alias.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    api_key = {
+        'api_key': 'YOUR_API_KEY'
+    }
+)
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['api_key'] = 'Bearer'
+
+# Configure API key authorization: api_key_query
+configuration = x_auth_id_alias.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    api_key = {
+        'api_key_query': 'YOUR_API_KEY'
+    }
+)
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['api_key_query'] = 'Bearer'
+
+# Enter a context with an instance of the API client
+with x_auth_id_alias.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = usage_api.UsageApi(api_client)
+    
+    # example, this endpoint has no required or optional parameters
+    try:
+        # Use both API keys
+        api_response = api_instance.both_keys()
+        pprint(api_response)
+    except x_auth_id_alias.ApiException as e:
+        print("Exception when calling UsageApi->both_keys: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**
+
+### Authorization
+
+[api_key](../README.md#api_key), [api_key_query](../README.md#api_key_query)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | successful operation |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **key_in_header**
+> {str: (bool, date, datetime, dict, float, int, list, str, none_type)} key_in_header()
+
+Use API key in header
+
+Use API key in header
+
+### Example
+
+* Api Key Authentication (api_key):
+```python
+from __future__ import print_function
+import time
+import x_auth_id_alias
+from x_auth_id_alias.api import usage_api
+from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = x_auth_id_alias.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure API key authorization: api_key
+configuration = x_auth_id_alias.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    api_key = {
+        'api_key': 'YOUR_API_KEY'
+    }
+)
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['api_key'] = 'Bearer'
+
+# Enter a context with an instance of the API client
+with x_auth_id_alias.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = usage_api.UsageApi(api_client)
+    
+    # example, this endpoint has no required or optional parameters
+    try:
+        # Use API key in header
+        api_response = api_instance.key_in_header()
+        pprint(api_response)
+    except x_auth_id_alias.ApiException as e:
+        print("Exception when calling UsageApi->key_in_header: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | successful operation |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **key_in_query**
+> {str: (bool, date, datetime, dict, float, int, list, str, none_type)} key_in_query()
+
+Use API key in query
+
+Use API key in query
+
+### Example
+
+* Api Key Authentication (api_key_query):
+```python
+from __future__ import print_function
+import time
+import x_auth_id_alias
+from x_auth_id_alias.api import usage_api
+from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = x_auth_id_alias.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure API key authorization: api_key_query
+configuration = x_auth_id_alias.Configuration(
+    host = "http://petstore.swagger.io:80/v2",
+    api_key = {
+        'api_key_query': 'YOUR_API_KEY'
+    }
+)
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['api_key_query'] = 'Bearer'
+
+# Enter a context with an instance of the API client
+with x_auth_id_alias.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = usage_api.UsageApi(api_client)
+    
+    # example, this endpoint has no required or optional parameters
+    try:
+        # Use API key in query
+        api_response = api_instance.key_in_query()
+        pprint(api_response)
+    except x_auth_id_alias.ApiException as e:
+        print("Exception when calling UsageApi->key_in_query: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**
+
+### Authorization
+
+[api_key_query](../README.md#api_key_query)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | successful operation |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/java/retrofit2rx/git_push.sh b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/git_push.sh
similarity index 100%
rename from samples/client/petstore/java/retrofit2rx/git_push.sh
rename to samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/git_push.sh
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/requirements.txt b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/requirements.txt
new file mode 100644
index 000000000000..a56bedffbf57
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/requirements.txt
@@ -0,0 +1,7 @@
+nulltype
+certifi >= 14.05.14
+future; python_version<="2.7"
+six >= 1.10
+python_dateutil >= 2.5.3
+setuptools >= 21.0.0
+urllib3 >= 1.15.1
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/setup.cfg b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/setup.cfg
new file mode 100644
index 000000000000..11433ee875ab
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/setup.cfg
@@ -0,0 +1,2 @@
+[flake8]
+max-line-length=99
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/setup.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/setup.py
new file mode 100644
index 000000000000..d266f0ac09fb
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/setup.py
@@ -0,0 +1,49 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension x-auth-id-alias
+
+    This specification shows how to use x-auth-id-alias extension for API keys.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from setuptools import setup, find_packages  # noqa: H301
+
+NAME = "x-auth-id-alias"
+VERSION = "1.0.0"
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = [
+  "urllib3 >= 1.15",
+  "six >= 1.10",
+  "certifi",
+  "python-dateutil",
+  "nulltype",
+]
+EXTRAS = {':python_version <= "2.7"': ['future']}
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="OpenAPI Extension x-auth-id-alias",
+    author="OpenAPI Generator community",
+    author_email="team@openapitools.org",
+    url="",
+    keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Extension x-auth-id-alias"],
+    install_requires=REQUIRES,
+    extras_require=EXTRAS,
+    packages=find_packages(exclude=["test", "tests"]),
+    include_package_data=True,
+    license="Apache-2.0",
+    long_description="""\
+    This specification shows how to use x-auth-id-alias extension for API keys.  # noqa: E501
+    """
+)
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/test-requirements.txt b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/test-requirements.txt
new file mode 100644
index 000000000000..06f7754d2044
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/test-requirements.txt
@@ -0,0 +1,4 @@
+pytest~=4.6.7 # needed for python 2.7+3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 2.7+3.4
+mock; python_version<="2.7"
\ No newline at end of file
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/__init__.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/test/__init__.py
similarity index 100%
rename from samples/server/petstore/python-flask-python2/openapi_server/__init__.py
rename to samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/test/__init__.py
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/test/test_usage_api.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/test/test_usage_api.py
new file mode 100644
index 000000000000..f7d98a751b40
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/test/test_usage_api.py
@@ -0,0 +1,60 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension x-auth-id-alias
+
+    This specification shows how to use x-auth-id-alias extension for API keys.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import x_auth_id_alias
+from x_auth_id_alias.api.usage_api import UsageApi  # noqa: E501
+
+
+class TestUsageApi(unittest.TestCase):
+    """UsageApi unit test stubs"""
+
+    def setUp(self):
+        self.api = UsageApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_any_key(self):
+        """Test case for any_key
+
+        Use any API key  # noqa: E501
+        """
+        pass
+
+    def test_both_keys(self):
+        """Test case for both_keys
+
+        Use both API keys  # noqa: E501
+        """
+        pass
+
+    def test_key_in_header(self):
+        """Test case for key_in_header
+
+        Use API key in header  # noqa: E501
+        """
+        pass
+
+    def test_key_in_query(self):
+        """Test case for key_in_query
+
+        Use API key in query  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/tests/test_api_keys.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/tests/test_api_keys.py
new file mode 100644
index 000000000000..4852fd4b9136
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/tests/test_api_keys.py
@@ -0,0 +1,104 @@
+# coding: utf-8
+
+"""
+    Test usage of x-auth-id-alias.
+"""
+
+from __future__ import absolute_import
+
+import unittest
+
+import x_auth_id_alias
+from x_auth_id_alias.api.usage_api import UsageApi
+
+
+class TestUsageApi(unittest.TestCase):
+    """UsageApi unit test stubs"""
+
+    def setUp(self):
+        self.configuration = x_auth_id_alias.Configuration(
+            host="http://localhost/",
+            api_key={"api_key": "SECRET_VALUE"},
+            api_key_prefix={"api_key": "PREFIX"},
+        )
+        self.client = x_auth_id_alias.ApiClient(self.configuration)
+        self.api = UsageApi(self.client)
+
+    def tearDown(self):
+        self.client.close()
+
+    def test_any_key(self):
+        """Test case for any_key
+
+        Use any API key  # noqa: E501
+        """
+
+        def request(*args, **kwargs):
+            assert ("api_key", "SECRET_VALUE") in kwargs["query_params"]
+            assert "PREFIX SECRET_VALUE" == kwargs["headers"]["X-Api-Key"]
+            raise RuntimeError("passed")
+
+        self.client.request = request
+
+        try:
+            self.api.any_key()
+        except RuntimeError as e:
+            assert "passed" == str(e)
+
+    def test_both_keys(self):
+        """Test case for both_keys
+
+        Use both API keys  # noqa: E501
+        """
+
+        def request(*args, **kwargs):
+            assert ("api_key", "SECRET_VALUE") in kwargs["query_params"]
+            assert "PREFIX SECRET_VALUE" == kwargs["headers"]["X-Api-Key"]
+            raise RuntimeError("passed")
+
+        self.client.request = request
+
+        try:
+            self.api.both_keys()
+        except RuntimeError as e:
+            assert "passed" == str(e)
+
+    def test_key_in_header(self):
+        """Test case for key_in_header
+
+        Use API key in header  # noqa: E501
+        """
+
+        def request(*args, **kwargs):
+            assert ("api_key", "SECRET_VALUE") not in kwargs["query_params"]
+            assert "PREFIX SECRET_VALUE" == kwargs["headers"]["X-Api-Key"]
+            raise RuntimeError("passed")
+
+        self.client.request = request
+
+        try:
+            self.api.key_in_header()
+        except RuntimeError as e:
+            assert "passed" == str(e)
+
+    def test_key_in_query(self):
+        """Test case for key_in_query
+
+        Use API key in query  # noqa: E501
+        """
+
+        def request(*args, **kwargs):
+            assert ("api_key", "SECRET_VALUE") in kwargs["query_params"]
+            assert "X-Api-Key" not in kwargs["headers"]
+            raise RuntimeError("passed")
+
+        self.client.request = request
+
+        try:
+            self.api.key_in_query()
+        except RuntimeError as e:
+            assert "passed" == str(e)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/tox.ini b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/tox.ini
new file mode 100644
index 000000000000..1eebd7b9dd51
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/tox.ini
@@ -0,0 +1,9 @@
+[tox]
+envlist = py27, py3
+
+[testenv]
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+
+commands=
+   pytest --cov=x_auth_id_alias
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/__init__.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/__init__.py
new file mode 100644
index 000000000000..7b41721baa3c
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/__init__.py
@@ -0,0 +1,31 @@
+# coding: utf-8
+
+# flake8: noqa
+
+"""
+    OpenAPI Extension x-auth-id-alias
+
+    This specification shows how to use x-auth-id-alias extension for API keys.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+
+__version__ = "1.0.0"
+
+# import ApiClient
+from x_auth_id_alias.api_client import ApiClient
+
+# import Configuration
+from x_auth_id_alias.configuration import Configuration
+
+# import exceptions
+from x_auth_id_alias.exceptions import OpenApiException
+from x_auth_id_alias.exceptions import ApiAttributeError
+from x_auth_id_alias.exceptions import ApiTypeError
+from x_auth_id_alias.exceptions import ApiValueError
+from x_auth_id_alias.exceptions import ApiKeyError
+from x_auth_id_alias.exceptions import ApiException
\ No newline at end of file
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/api/__init__.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/api/__init__.py
new file mode 100644
index 000000000000..37e0c5bbdb68
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/api/__init__.py
@@ -0,0 +1,6 @@
+from __future__ import absolute_import
+
+# flake8: noqa
+
+# import apis into api package
+from x_auth_id_alias.api.usage_api import UsageApi
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/api/usage_api.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/api/usage_api.py
new file mode 100644
index 000000000000..454eefd6b391
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/api/usage_api.py
@@ -0,0 +1,475 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension x-auth-id-alias
+
+    This specification shows how to use x-auth-id-alias extension for API keys.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+import sys  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from x_auth_id_alias.api_client import ApiClient, Endpoint
+from x_auth_id_alias.model_utils import (  # noqa: F401
+    check_allowed_values,
+    check_validations,
+    date,
+    datetime,
+    file_type,
+    int,
+    none_type,
+    str,
+    validate_and_convert_types
+)
+
+
+class UsageApi(object):
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+        def __any_key(
+            self,
+            **kwargs
+        ):
+            """Use any API key  # noqa: E501
+
+            Use any API key  # noqa: E501
+            This method makes a synchronous HTTP request by default. To make an
+            asynchronous HTTP request, please pass async_req=True
+
+            >>> thread = api.any_key(async_req=True)
+            >>> result = thread.get()
+
+
+            Keyword Args:
+                _return_http_data_only (bool): response data without head status
+                    code and headers. Default is True.
+                _preload_content (bool): if False, the urllib3.HTTPResponse object
+                    will be returned without reading/decoding response data.
+                    Default is True.
+                _request_timeout (float/tuple): timeout setting for this request. If one
+                    number provided, it will be total request timeout. It can also
+                    be a pair (tuple) of (connection, read) timeouts.
+                    Default is None.
+                _check_input_type (bool): specifies if type checking
+                    should be done one the data sent to the server.
+                    Default is True.
+                _check_return_type (bool): specifies if type checking
+                    should be done one the data received from the server.
+                    Default is True.
+                _host_index (int/None): specifies the index of the server
+                    that we want to use.
+                    Default is read from the configuration.
+                async_req (bool): execute request asynchronously
+
+            Returns:
+                {str: (bool, date, datetime, dict, float, int, list, str, none_type)}
+                    If the method is called asynchronously, returns the request
+                    thread.
+            """
+            kwargs['async_req'] = kwargs.get(
+                'async_req', False
+            )
+            kwargs['_return_http_data_only'] = kwargs.get(
+                '_return_http_data_only', True
+            )
+            kwargs['_preload_content'] = kwargs.get(
+                '_preload_content', True
+            )
+            kwargs['_request_timeout'] = kwargs.get(
+                '_request_timeout', None
+            )
+            kwargs['_check_input_type'] = kwargs.get(
+                '_check_input_type', True
+            )
+            kwargs['_check_return_type'] = kwargs.get(
+                '_check_return_type', True
+            )
+            kwargs['_host_index'] = kwargs.get('_host_index')
+            return self.call_with_http_info(**kwargs)
+
+        self.any_key = Endpoint(
+            settings={
+                'response_type': ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},),
+                'auth': [
+                    'api_key',
+                    'api_key_query'
+                ],
+                'endpoint_path': '/any',
+                'operation_id': 'any_key',
+                'http_method': 'GET',
+                'servers': None,
+            },
+            params_map={
+                'all': [
+                ],
+                'required': [],
+                'nullable': [
+                ],
+                'enum': [
+                ],
+                'validation': [
+                ]
+            },
+            root_map={
+                'validations': {
+                },
+                'allowed_values': {
+                },
+                'openapi_types': {
+                },
+                'attribute_map': {
+                },
+                'location_map': {
+                },
+                'collection_format_map': {
+                }
+            },
+            headers_map={
+                'accept': [
+                    'application/json'
+                ],
+                'content_type': [],
+            },
+            api_client=api_client,
+            callable=__any_key
+        )
+
+        def __both_keys(
+            self,
+            **kwargs
+        ):
+            """Use both API keys  # noqa: E501
+
+            Use both API keys  # noqa: E501
+            This method makes a synchronous HTTP request by default. To make an
+            asynchronous HTTP request, please pass async_req=True
+
+            >>> thread = api.both_keys(async_req=True)
+            >>> result = thread.get()
+
+
+            Keyword Args:
+                _return_http_data_only (bool): response data without head status
+                    code and headers. Default is True.
+                _preload_content (bool): if False, the urllib3.HTTPResponse object
+                    will be returned without reading/decoding response data.
+                    Default is True.
+                _request_timeout (float/tuple): timeout setting for this request. If one
+                    number provided, it will be total request timeout. It can also
+                    be a pair (tuple) of (connection, read) timeouts.
+                    Default is None.
+                _check_input_type (bool): specifies if type checking
+                    should be done one the data sent to the server.
+                    Default is True.
+                _check_return_type (bool): specifies if type checking
+                    should be done one the data received from the server.
+                    Default is True.
+                _host_index (int/None): specifies the index of the server
+                    that we want to use.
+                    Default is read from the configuration.
+                async_req (bool): execute request asynchronously
+
+            Returns:
+                {str: (bool, date, datetime, dict, float, int, list, str, none_type)}
+                    If the method is called asynchronously, returns the request
+                    thread.
+            """
+            kwargs['async_req'] = kwargs.get(
+                'async_req', False
+            )
+            kwargs['_return_http_data_only'] = kwargs.get(
+                '_return_http_data_only', True
+            )
+            kwargs['_preload_content'] = kwargs.get(
+                '_preload_content', True
+            )
+            kwargs['_request_timeout'] = kwargs.get(
+                '_request_timeout', None
+            )
+            kwargs['_check_input_type'] = kwargs.get(
+                '_check_input_type', True
+            )
+            kwargs['_check_return_type'] = kwargs.get(
+                '_check_return_type', True
+            )
+            kwargs['_host_index'] = kwargs.get('_host_index')
+            return self.call_with_http_info(**kwargs)
+
+        self.both_keys = Endpoint(
+            settings={
+                'response_type': ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},),
+                'auth': [
+                    'api_key',
+                    'api_key_query'
+                ],
+                'endpoint_path': '/both',
+                'operation_id': 'both_keys',
+                'http_method': 'GET',
+                'servers': None,
+            },
+            params_map={
+                'all': [
+                ],
+                'required': [],
+                'nullable': [
+                ],
+                'enum': [
+                ],
+                'validation': [
+                ]
+            },
+            root_map={
+                'validations': {
+                },
+                'allowed_values': {
+                },
+                'openapi_types': {
+                },
+                'attribute_map': {
+                },
+                'location_map': {
+                },
+                'collection_format_map': {
+                }
+            },
+            headers_map={
+                'accept': [
+                    'application/json'
+                ],
+                'content_type': [],
+            },
+            api_client=api_client,
+            callable=__both_keys
+        )
+
+        def __key_in_header(
+            self,
+            **kwargs
+        ):
+            """Use API key in header  # noqa: E501
+
+            Use API key in header  # noqa: E501
+            This method makes a synchronous HTTP request by default. To make an
+            asynchronous HTTP request, please pass async_req=True
+
+            >>> thread = api.key_in_header(async_req=True)
+            >>> result = thread.get()
+
+
+            Keyword Args:
+                _return_http_data_only (bool): response data without head status
+                    code and headers. Default is True.
+                _preload_content (bool): if False, the urllib3.HTTPResponse object
+                    will be returned without reading/decoding response data.
+                    Default is True.
+                _request_timeout (float/tuple): timeout setting for this request. If one
+                    number provided, it will be total request timeout. It can also
+                    be a pair (tuple) of (connection, read) timeouts.
+                    Default is None.
+                _check_input_type (bool): specifies if type checking
+                    should be done one the data sent to the server.
+                    Default is True.
+                _check_return_type (bool): specifies if type checking
+                    should be done one the data received from the server.
+                    Default is True.
+                _host_index (int/None): specifies the index of the server
+                    that we want to use.
+                    Default is read from the configuration.
+                async_req (bool): execute request asynchronously
+
+            Returns:
+                {str: (bool, date, datetime, dict, float, int, list, str, none_type)}
+                    If the method is called asynchronously, returns the request
+                    thread.
+            """
+            kwargs['async_req'] = kwargs.get(
+                'async_req', False
+            )
+            kwargs['_return_http_data_only'] = kwargs.get(
+                '_return_http_data_only', True
+            )
+            kwargs['_preload_content'] = kwargs.get(
+                '_preload_content', True
+            )
+            kwargs['_request_timeout'] = kwargs.get(
+                '_request_timeout', None
+            )
+            kwargs['_check_input_type'] = kwargs.get(
+                '_check_input_type', True
+            )
+            kwargs['_check_return_type'] = kwargs.get(
+                '_check_return_type', True
+            )
+            kwargs['_host_index'] = kwargs.get('_host_index')
+            return self.call_with_http_info(**kwargs)
+
+        self.key_in_header = Endpoint(
+            settings={
+                'response_type': ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},),
+                'auth': [
+                    'api_key'
+                ],
+                'endpoint_path': '/header',
+                'operation_id': 'key_in_header',
+                'http_method': 'GET',
+                'servers': None,
+            },
+            params_map={
+                'all': [
+                ],
+                'required': [],
+                'nullable': [
+                ],
+                'enum': [
+                ],
+                'validation': [
+                ]
+            },
+            root_map={
+                'validations': {
+                },
+                'allowed_values': {
+                },
+                'openapi_types': {
+                },
+                'attribute_map': {
+                },
+                'location_map': {
+                },
+                'collection_format_map': {
+                }
+            },
+            headers_map={
+                'accept': [
+                    'application/json'
+                ],
+                'content_type': [],
+            },
+            api_client=api_client,
+            callable=__key_in_header
+        )
+
+        def __key_in_query(
+            self,
+            **kwargs
+        ):
+            """Use API key in query  # noqa: E501
+
+            Use API key in query  # noqa: E501
+            This method makes a synchronous HTTP request by default. To make an
+            asynchronous HTTP request, please pass async_req=True
+
+            >>> thread = api.key_in_query(async_req=True)
+            >>> result = thread.get()
+
+
+            Keyword Args:
+                _return_http_data_only (bool): response data without head status
+                    code and headers. Default is True.
+                _preload_content (bool): if False, the urllib3.HTTPResponse object
+                    will be returned without reading/decoding response data.
+                    Default is True.
+                _request_timeout (float/tuple): timeout setting for this request. If one
+                    number provided, it will be total request timeout. It can also
+                    be a pair (tuple) of (connection, read) timeouts.
+                    Default is None.
+                _check_input_type (bool): specifies if type checking
+                    should be done one the data sent to the server.
+                    Default is True.
+                _check_return_type (bool): specifies if type checking
+                    should be done one the data received from the server.
+                    Default is True.
+                _host_index (int/None): specifies the index of the server
+                    that we want to use.
+                    Default is read from the configuration.
+                async_req (bool): execute request asynchronously
+
+            Returns:
+                {str: (bool, date, datetime, dict, float, int, list, str, none_type)}
+                    If the method is called asynchronously, returns the request
+                    thread.
+            """
+            kwargs['async_req'] = kwargs.get(
+                'async_req', False
+            )
+            kwargs['_return_http_data_only'] = kwargs.get(
+                '_return_http_data_only', True
+            )
+            kwargs['_preload_content'] = kwargs.get(
+                '_preload_content', True
+            )
+            kwargs['_request_timeout'] = kwargs.get(
+                '_request_timeout', None
+            )
+            kwargs['_check_input_type'] = kwargs.get(
+                '_check_input_type', True
+            )
+            kwargs['_check_return_type'] = kwargs.get(
+                '_check_return_type', True
+            )
+            kwargs['_host_index'] = kwargs.get('_host_index')
+            return self.call_with_http_info(**kwargs)
+
+        self.key_in_query = Endpoint(
+            settings={
+                'response_type': ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},),
+                'auth': [
+                    'api_key_query'
+                ],
+                'endpoint_path': '/query',
+                'operation_id': 'key_in_query',
+                'http_method': 'GET',
+                'servers': None,
+            },
+            params_map={
+                'all': [
+                ],
+                'required': [],
+                'nullable': [
+                ],
+                'enum': [
+                ],
+                'validation': [
+                ]
+            },
+            root_map={
+                'validations': {
+                },
+                'allowed_values': {
+                },
+                'openapi_types': {
+                },
+                'attribute_map': {
+                },
+                'location_map': {
+                },
+                'collection_format_map': {
+                }
+            },
+            headers_map={
+                'accept': [
+                    'application/json'
+                ],
+                'content_type': [],
+            },
+            api_client=api_client,
+            callable=__key_in_query
+        )
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/api_client.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/api_client.py
new file mode 100644
index 000000000000..d2559726f6d1
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/api_client.py
@@ -0,0 +1,810 @@
+# coding: utf-8
+"""
+    OpenAPI Extension x-auth-id-alias
+
+    This specification shows how to use x-auth-id-alias extension for API keys.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+from __future__ import absolute_import
+
+import json
+import atexit
+import mimetypes
+from multiprocessing.pool import ThreadPool
+import os
+import re
+
+# python 2 and python 3 compatibility library
+import six
+from six.moves.urllib.parse import quote
+
+from x_auth_id_alias import rest
+from x_auth_id_alias.configuration import Configuration
+from x_auth_id_alias.exceptions import ApiTypeError, ApiValueError, ApiException
+from x_auth_id_alias.model_utils import (
+    ModelNormal,
+    ModelSimple,
+    ModelComposed,
+    check_allowed_values,
+    check_validations,
+    date,
+    datetime,
+    deserialize_file,
+    file_type,
+    int,
+    model_to_dict,
+    none_type,
+    str,
+    validate_and_convert_types
+)
+
+
+class ApiClient(object):
+    """Generic API client for OpenAPI client library builds.
+
+    OpenAPI generic API client. This client handles the client-
+    server communication, and is invariant across implementations. Specifics of
+    the methods and models for each application are generated from the OpenAPI
+    templates.
+
+    NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+    Do not edit the class manually.
+
+    :param configuration: .Configuration object for this client
+    :param header_name: a header to pass when making calls to the API.
+    :param header_value: a header value to pass when making calls to
+        the API.
+    :param cookie: a cookie to include in the header when making calls
+        to the API
+    :param pool_threads: The number of threads to use for async requests
+        to the API. More threads means more concurrent API requests.
+    """
+
+    # six.binary_type python2=str, python3=bytes
+    # six.text_type python2=unicode, python3=str
+    PRIMITIVE_TYPES = (
+        (float, bool, six.binary_type, six.text_type) + six.integer_types
+    )
+    _pool = None
+
+    def __init__(self, configuration=None, header_name=None, header_value=None,
+                 cookie=None, pool_threads=1):
+        if configuration is None:
+            configuration = Configuration()
+        self.configuration = configuration
+        self.pool_threads = pool_threads
+
+        self.rest_client = rest.RESTClientObject(configuration)
+        self.default_headers = {}
+        if header_name is not None:
+            self.default_headers[header_name] = header_value
+        self.cookie = cookie
+        # Set default User-Agent.
+        self.user_agent = 'OpenAPI-Generator/1.0.0/python'
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.close()
+
+    def close(self):
+        if self._pool:
+            self._pool.close()
+            self._pool.join()
+            self._pool = None
+            if hasattr(atexit, 'unregister'):
+                atexit.unregister(self.close)
+
+    @property
+    def pool(self):
+        """Create thread pool on first request
+         avoids instantiating unused threadpool for blocking clients.
+        """
+        if self._pool is None:
+            atexit.register(self.close)
+            self._pool = ThreadPool(self.pool_threads)
+        return self._pool
+
+    @property
+    def user_agent(self):
+        """User agent for this API client"""
+        return self.default_headers['User-Agent']
+
+    @user_agent.setter
+    def user_agent(self, value):
+        self.default_headers['User-Agent'] = value
+
+    def set_default_header(self, header_name, header_value):
+        self.default_headers[header_name] = header_value
+
+    def __call_api(
+            self, resource_path, method, path_params=None,
+            query_params=None, header_params=None, body=None, post_params=None,
+            files=None, response_type=None, auth_settings=None,
+            _return_http_data_only=None, collection_formats=None,
+            _preload_content=True, _request_timeout=None, _host=None,
+            _check_type=None):
+
+        config = self.configuration
+
+        # header parameters
+        header_params = header_params or {}
+        header_params.update(self.default_headers)
+        if self.cookie:
+            header_params['Cookie'] = self.cookie
+        if header_params:
+            header_params = self.sanitize_for_serialization(header_params)
+            header_params = dict(self.parameters_to_tuples(header_params,
+                                                           collection_formats))
+
+        # path parameters
+        if path_params:
+            path_params = self.sanitize_for_serialization(path_params)
+            path_params = self.parameters_to_tuples(path_params,
+                                                    collection_formats)
+            for k, v in path_params:
+                # specified safe chars, encode everything
+                resource_path = resource_path.replace(
+                    '{%s}' % k,
+                    quote(str(v), safe=config.safe_chars_for_path_param)
+                )
+
+        # query parameters
+        if query_params:
+            query_params = self.sanitize_for_serialization(query_params)
+            query_params = self.parameters_to_tuples(query_params,
+                                                     collection_formats)
+
+        # post parameters
+        if post_params or files:
+            post_params = post_params if post_params else []
+            post_params = self.sanitize_for_serialization(post_params)
+            post_params = self.parameters_to_tuples(post_params,
+                                                    collection_formats)
+            post_params.extend(self.files_parameters(files))
+
+        # body
+        if body:
+            body = self.sanitize_for_serialization(body)
+
+        # auth setting
+        self.update_params_for_auth(header_params, query_params,
+                                    auth_settings, resource_path, method, body)
+
+        # request url
+        if _host is None:
+            url = self.configuration.host + resource_path
+        else:
+            # use server/host defined in path or operation instead
+            url = _host + resource_path
+
+        try:
+            # perform request and return response
+            response_data = self.request(
+                method, url, query_params=query_params, headers=header_params,
+                post_params=post_params, body=body,
+                _preload_content=_preload_content,
+                _request_timeout=_request_timeout)
+        except ApiException as e:
+            e.body = e.body.decode('utf-8') if six.PY3 else e.body
+            raise e
+
+        content_type = response_data.getheader('content-type')
+
+        self.last_response = response_data
+
+        return_data = response_data
+
+        if not _preload_content:
+            return (return_data)
+            return return_data
+
+        if six.PY3 and response_type not in ["file", "bytes"]:
+            match = None
+            if content_type is not None:
+                match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type)
+            encoding = match.group(1) if match else "utf-8"
+            response_data.data = response_data.data.decode(encoding)
+
+        # deserialize response data
+        if response_type:
+            return_data = self.deserialize(
+                response_data,
+                response_type,
+                _check_type
+            )
+        else:
+            return_data = None
+
+        if _return_http_data_only:
+            return (return_data)
+        else:
+            return (return_data, response_data.status,
+                    response_data.getheaders())
+
+    def sanitize_for_serialization(self, obj):
+        """Builds a JSON POST object.
+
+        If obj is None, return None.
+        If obj is str, int, long, float, bool, return directly.
+        If obj is datetime.datetime, datetime.date
+            convert to string in iso8601 format.
+        If obj is list, sanitize each element in the list.
+        If obj is dict, return the dict.
+        If obj is OpenAPI model, return the properties dict.
+
+        :param obj: The data to serialize.
+        :return: The serialized form of data.
+        """
+        if obj is None:
+            return None
+        elif isinstance(obj, self.PRIMITIVE_TYPES):
+            return obj
+        elif isinstance(obj, list):
+            return [self.sanitize_for_serialization(sub_obj)
+                    for sub_obj in obj]
+        elif isinstance(obj, tuple):
+            return tuple(self.sanitize_for_serialization(sub_obj)
+                         for sub_obj in obj)
+        elif isinstance(obj, (datetime, date)):
+            return obj.isoformat()
+
+        if isinstance(obj, dict):
+            obj_dict = obj
+        elif isinstance(obj, ModelNormal) or isinstance(obj, ModelComposed):
+            # Convert model obj to dict
+            # Convert attribute name to json key in
+            # model definition for request
+            obj_dict = model_to_dict(obj, serialize=True)
+        elif isinstance(obj, ModelSimple):
+            return self.sanitize_for_serialization(obj.value)
+
+        return {key: self.sanitize_for_serialization(val)
+                for key, val in six.iteritems(obj_dict)}
+
+    def deserialize(self, response, response_type, _check_type):
+        """Deserializes response into an object.
+
+        :param response: RESTResponse object to be deserialized.
+        :param response_type: For the response, a tuple containing:
+            valid classes
+            a list containing valid classes (for list schemas)
+            a dict containing a tuple of valid classes as the value
+            Example values:
+            (str,)
+            (Pet,)
+            (float, none_type)
+            ([int, none_type],)
+            ({str: (bool, str, int, float, date, datetime, str, none_type)},)
+        :param _check_type: boolean, whether to check the types of the data
+            received from the server
+        :type _check_type: bool
+
+        :return: deserialized object.
+        """
+        # handle file downloading
+        # save response body into a tmp file and return the instance
+        if response_type == (file_type,):
+            content_disposition = response.getheader("Content-Disposition")
+            return deserialize_file(response.data, self.configuration,
+                                    content_disposition=content_disposition)
+
+        # fetch data from response object
+        try:
+            received_data = json.loads(response.data)
+        except ValueError:
+            received_data = response.data
+
+        # store our data under the key of 'received_data' so users have some
+        # context if they are deserializing a string and the data type is wrong
+        deserialized_data = validate_and_convert_types(
+            received_data,
+            response_type,
+            ['received_data'],
+            True,
+            _check_type,
+            configuration=self.configuration
+        )
+        return deserialized_data
+
+    def call_api(self, resource_path, method,
+                 path_params=None, query_params=None, header_params=None,
+                 body=None, post_params=None, files=None,
+                 response_type=None, auth_settings=None, async_req=None,
+                 _return_http_data_only=None, collection_formats=None,
+                 _preload_content=True, _request_timeout=None, _host=None,
+                 _check_type=None):
+        """Makes the HTTP request (synchronous) and returns deserialized data.
+
+        To make an async_req request, set the async_req parameter.
+
+        :param resource_path: Path to method endpoint.
+        :param method: Method to call.
+        :param path_params: Path parameters in the url.
+        :param query_params: Query parameters in the url.
+        :param header_params: Header parameters to be
+            placed in the request header.
+        :param body: Request body.
+        :param post_params dict: Request post form parameters,
+            for `application/x-www-form-urlencoded`, `multipart/form-data`.
+        :param auth_settings list: Auth Settings names for the request.
+        :param response_type: For the response, a tuple containing:
+            valid classes
+            a list containing valid classes (for list schemas)
+            a dict containing a tuple of valid classes as the value
+            Example values:
+            (str,)
+            (Pet,)
+            (float, none_type)
+            ([int, none_type],)
+            ({str: (bool, str, int, float, date, datetime, str, none_type)},)
+        :param files: key -> field name, value -> a list of open file
+            objects for `multipart/form-data`.
+        :type files: dict
+        :param async_req bool: execute request asynchronously
+        :type async_req: bool, optional
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :type _return_http_data_only: bool, optional
+        :param collection_formats: dict of collection formats for path, query,
+            header, and post parameters.
+        :type collection_formats: dict, optional
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :type _preload_content: bool, optional
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :param _check_type: boolean describing if the data back from the server
+            should have its type checked.
+        :type _check_type: bool, optional
+        :return:
+            If async_req parameter is True,
+            the request will be called asynchronously.
+            The method will return the request thread.
+            If parameter async_req is False or missing,
+            then the method will return the response directly.
+        """
+        if not async_req:
+            return self.__call_api(resource_path, method,
+                                   path_params, query_params, header_params,
+                                   body, post_params, files,
+                                   response_type, auth_settings,
+                                   _return_http_data_only, collection_formats,
+                                   _preload_content, _request_timeout, _host,
+                                   _check_type)
+
+        return self.pool.apply_async(self.__call_api, (resource_path,
+                                                       method, path_params,
+                                                       query_params,
+                                                       header_params, body,
+                                                       post_params, files,
+                                                       response_type,
+                                                       auth_settings,
+                                                       _return_http_data_only,
+                                                       collection_formats,
+                                                       _preload_content,
+                                                       _request_timeout,
+                                                       _host, _check_type))
+
+    def request(self, method, url, query_params=None, headers=None,
+                post_params=None, body=None, _preload_content=True,
+                _request_timeout=None):
+        """Makes the HTTP request using RESTClient."""
+        if method == "GET":
+            return self.rest_client.GET(url,
+                                        query_params=query_params,
+                                        _preload_content=_preload_content,
+                                        _request_timeout=_request_timeout,
+                                        headers=headers)
+        elif method == "HEAD":
+            return self.rest_client.HEAD(url,
+                                         query_params=query_params,
+                                         _preload_content=_preload_content,
+                                         _request_timeout=_request_timeout,
+                                         headers=headers)
+        elif method == "OPTIONS":
+            return self.rest_client.OPTIONS(url,
+                                            query_params=query_params,
+                                            headers=headers,
+                                            post_params=post_params,
+                                            _preload_content=_preload_content,
+                                            _request_timeout=_request_timeout,
+                                            body=body)
+        elif method == "POST":
+            return self.rest_client.POST(url,
+                                         query_params=query_params,
+                                         headers=headers,
+                                         post_params=post_params,
+                                         _preload_content=_preload_content,
+                                         _request_timeout=_request_timeout,
+                                         body=body)
+        elif method == "PUT":
+            return self.rest_client.PUT(url,
+                                        query_params=query_params,
+                                        headers=headers,
+                                        post_params=post_params,
+                                        _preload_content=_preload_content,
+                                        _request_timeout=_request_timeout,
+                                        body=body)
+        elif method == "PATCH":
+            return self.rest_client.PATCH(url,
+                                          query_params=query_params,
+                                          headers=headers,
+                                          post_params=post_params,
+                                          _preload_content=_preload_content,
+                                          _request_timeout=_request_timeout,
+                                          body=body)
+        elif method == "DELETE":
+            return self.rest_client.DELETE(url,
+                                           query_params=query_params,
+                                           headers=headers,
+                                           _preload_content=_preload_content,
+                                           _request_timeout=_request_timeout,
+                                           body=body)
+        else:
+            raise ApiValueError(
+                "http method must be `GET`, `HEAD`, `OPTIONS`,"
+                " `POST`, `PATCH`, `PUT` or `DELETE`."
+            )
+
+    def parameters_to_tuples(self, params, collection_formats):
+        """Get parameters as list of tuples, formatting collections.
+
+        :param params: Parameters as dict or list of two-tuples
+        :param dict collection_formats: Parameter collection formats
+        :return: Parameters as list of tuples, collections formatted
+        """
+        new_params = []
+        if collection_formats is None:
+            collection_formats = {}
+        for k, v in six.iteritems(params) if isinstance(params, dict) else params:  # noqa: E501
+            if k in collection_formats:
+                collection_format = collection_formats[k]
+                if collection_format == 'multi':
+                    new_params.extend((k, value) for value in v)
+                else:
+                    if collection_format == 'ssv':
+                        delimiter = ' '
+                    elif collection_format == 'tsv':
+                        delimiter = '\t'
+                    elif collection_format == 'pipes':
+                        delimiter = '|'
+                    else:  # csv is the default
+                        delimiter = ','
+                    new_params.append(
+                        (k, delimiter.join(str(value) for value in v)))
+            else:
+                new_params.append((k, v))
+        return new_params
+
+    def files_parameters(self, files=None):
+        """Builds form parameters.
+
+        :param files: None or a dict with key=param_name and
+            value is a list of open file objects
+        :return: List of tuples of form parameters with file data
+        """
+        if files is None:
+            return []
+
+        params = []
+        for param_name, file_instances in six.iteritems(files):
+            if file_instances is None:
+                # if the file field is nullable, skip None values
+                continue
+            for file_instance in file_instances:
+                if file_instance is None:
+                    # if the file field is nullable, skip None values
+                    continue
+                if file_instance.closed is True:
+                    raise ApiValueError(
+                        "Cannot read a closed file. The passed in file_type "
+                        "for %s must be open." % param_name
+                    )
+                filename = os.path.basename(file_instance.name)
+                filedata = file_instance.read()
+                mimetype = (mimetypes.guess_type(filename)[0] or
+                            'application/octet-stream')
+                params.append(
+                    tuple([param_name, tuple([filename, filedata, mimetype])]))
+                file_instance.close()
+
+        return params
+
+    def select_header_accept(self, accepts):
+        """Returns `Accept` based on an array of accepts provided.
+
+        :param accepts: List of headers.
+        :return: Accept (e.g. application/json).
+        """
+        if not accepts:
+            return
+
+        accepts = [x.lower() for x in accepts]
+
+        if 'application/json' in accepts:
+            return 'application/json'
+        else:
+            return ', '.join(accepts)
+
+    def select_header_content_type(self, content_types):
+        """Returns `Content-Type` based on an array of content_types provided.
+
+        :param content_types: List of content-types.
+        :return: Content-Type (e.g. application/json).
+        """
+        if not content_types:
+            return 'application/json'
+
+        content_types = [x.lower() for x in content_types]
+
+        if 'application/json' in content_types or '*/*' in content_types:
+            return 'application/json'
+        else:
+            return content_types[0]
+
+    def update_params_for_auth(self, headers, querys, auth_settings,
+                               resource_path, method, body):
+        """Updates header and query params based on authentication setting.
+
+        :param headers: Header parameters dict to be updated.
+        :param querys: Query parameters tuple list to be updated.
+        :param auth_settings: Authentication setting identifiers list.
+        :param resource_path: A string representation of the HTTP request resource path.
+        :param method: A string representation of the HTTP request method.
+        :param body: A object representing the body of the HTTP request.
+            The object type is the return value of sanitize_for_serialization().
+        """
+        if not auth_settings:
+            return
+
+        for auth in auth_settings:
+            auth_setting = self.configuration.auth_settings().get(auth)
+            if auth_setting:
+                if auth_setting['in'] == 'cookie':
+                    headers['Cookie'] = auth_setting['value']
+                elif auth_setting['in'] == 'header':
+                    if auth_setting['type'] != 'http-signature':
+                        headers[auth_setting['key']] = auth_setting['value']
+                elif auth_setting['in'] == 'query':
+                    querys.append((auth_setting['key'], auth_setting['value']))
+                else:
+                    raise ApiValueError(
+                        'Authentication token must be in `query` or `header`'
+                    )
+
+
+class Endpoint(object):
+    def __init__(self, settings=None, params_map=None, root_map=None,
+                 headers_map=None, api_client=None, callable=None):
+        """Creates an endpoint
+
+        Args:
+            settings (dict): see below key value pairs
+                'response_type' (tuple/None): response type
+                'auth' (list): a list of auth type keys
+                'endpoint_path' (str): the endpoint path
+                'operation_id' (str): endpoint string identifier
+                'http_method' (str): POST/PUT/PATCH/GET etc
+                'servers' (list): list of str servers that this endpoint is at
+            params_map (dict): see below key value pairs
+                'all' (list): list of str endpoint parameter names
+                'required' (list): list of required parameter names
+                'nullable' (list): list of nullable parameter names
+                'enum' (list): list of parameters with enum values
+                'validation' (list): list of parameters with validations
+            root_map
+                'validations' (dict): the dict mapping endpoint parameter tuple
+                    paths to their validation dictionaries
+                'allowed_values' (dict): the dict mapping endpoint parameter
+                    tuple paths to their allowed_values (enum) dictionaries
+                'openapi_types' (dict): param_name to openapi type
+                'attribute_map' (dict): param_name to camelCase name
+                'location_map' (dict): param_name to  'body', 'file', 'form',
+                    'header', 'path', 'query'
+                collection_format_map (dict): param_name to `csv` etc.
+            headers_map (dict): see below key value pairs
+                'accept' (list): list of Accept header strings
+                'content_type' (list): list of Content-Type header strings
+            api_client (ApiClient) api client instance
+            callable (function): the function which is invoked when the
+                Endpoint is called
+        """
+        self.settings = settings
+        self.params_map = params_map
+        self.params_map['all'].extend([
+            'async_req',
+            '_host_index',
+            '_preload_content',
+            '_request_timeout',
+            '_return_http_data_only',
+            '_check_input_type',
+            '_check_return_type'
+        ])
+        self.params_map['nullable'].extend(['_request_timeout'])
+        self.validations = root_map['validations']
+        self.allowed_values = root_map['allowed_values']
+        self.openapi_types = root_map['openapi_types']
+        extra_types = {
+            'async_req': (bool,),
+            '_host_index': (none_type, int),
+            '_preload_content': (bool,),
+            '_request_timeout': (none_type, int, (int,), [int]),
+            '_return_http_data_only': (bool,),
+            '_check_input_type': (bool,),
+            '_check_return_type': (bool,)
+        }
+        self.openapi_types.update(extra_types)
+        self.attribute_map = root_map['attribute_map']
+        self.location_map = root_map['location_map']
+        self.collection_format_map = root_map['collection_format_map']
+        self.headers_map = headers_map
+        self.api_client = api_client
+        self.callable = callable
+
+    def __validate_inputs(self, kwargs):
+        for param in self.params_map['enum']:
+            if param in kwargs:
+                check_allowed_values(
+                    self.allowed_values,
+                    (param,),
+                    kwargs[param]
+                )
+
+        for param in self.params_map['validation']:
+            if param in kwargs:
+                check_validations(
+                    self.validations,
+                    (param,),
+                    kwargs[param],
+                    configuration=self.api_client.configuration
+                )
+
+        if kwargs['_check_input_type'] is False:
+            return
+
+        for key, value in six.iteritems(kwargs):
+            fixed_val = validate_and_convert_types(
+                value,
+                self.openapi_types[key],
+                [key],
+                False,
+                kwargs['_check_input_type'],
+                configuration=self.api_client.configuration
+            )
+            kwargs[key] = fixed_val
+
+    def __gather_params(self, kwargs):
+        params = {
+            'body': None,
+            'collection_format': {},
+            'file': {},
+            'form': [],
+            'header': {},
+            'path': {},
+            'query': []
+        }
+
+        for param_name, param_value in six.iteritems(kwargs):
+            param_location = self.location_map.get(param_name)
+            if param_location is None:
+                continue
+            if param_location:
+                if param_location == 'body':
+                    params['body'] = param_value
+                    continue
+                base_name = self.attribute_map[param_name]
+                if (param_location == 'form' and
+                        self.openapi_types[param_name] == (file_type,)):
+                    params['file'][param_name] = [param_value]
+                elif (param_location == 'form' and
+                        self.openapi_types[param_name] == ([file_type],)):
+                    # param_value is already a list
+                    params['file'][param_name] = param_value
+                elif param_location in {'form', 'query'}:
+                    param_value_full = (base_name, param_value)
+                    params[param_location].append(param_value_full)
+                if param_location not in {'form', 'query'}:
+                    params[param_location][base_name] = param_value
+                collection_format = self.collection_format_map.get(param_name)
+                if collection_format:
+                    params['collection_format'][base_name] = collection_format
+
+        return params
+
+    def __call__(self, *args, **kwargs):
+        """ This method is invoked when endpoints are called
+        Example:
+        pet_api = PetApi()
+        pet_api.add_pet  # this is an instance of the class Endpoint
+        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
+        which then invokes the callable functions stored in that endpoint at
+        pet_api.add_pet.callable or self.callable in this class
+        """
+        return self.callable(self, *args, **kwargs)
+
+    def call_with_http_info(self, **kwargs):
+
+        try:
+            index = self.api_client.configuration.server_operation_index.get(
+                self.settings['operation_id'], self.api_client.configuration.server_index
+            ) if kwargs['_host_index'] is None else kwargs['_host_index']
+            server_variables = self.api_client.configuration.server_operation_variables.get(
+                self.settings['operation_id'], self.api_client.configuration.server_variables
+            )
+            _host = self.api_client.configuration.get_host_from_settings(
+                index, variables=server_variables, servers=self.settings['servers']
+            )
+        except IndexError:
+            if self.settings['servers']:
+                raise ApiValueError(
+                    "Invalid host index. Must be 0 <= index < %s" %
+                    len(self.settings['servers'])
+                )
+            _host = None
+
+        for key, value in six.iteritems(kwargs):
+            if key not in self.params_map['all']:
+                raise ApiTypeError(
+                    "Got an unexpected parameter '%s'"
+                    " to method `%s`" %
+                    (key, self.settings['operation_id'])
+                )
+            # only throw this nullable ApiValueError if _check_input_type
+            # is False, if _check_input_type==True we catch this case
+            # in self.__validate_inputs
+            if (key not in self.params_map['nullable'] and value is None
+                    and kwargs['_check_input_type'] is False):
+                raise ApiValueError(
+                    "Value may not be None for non-nullable parameter `%s`"
+                    " when calling `%s`" %
+                    (key, self.settings['operation_id'])
+                )
+
+        for key in self.params_map['required']:
+            if key not in kwargs.keys():
+                raise ApiValueError(
+                    "Missing the required parameter `%s` when calling "
+                    "`%s`" % (key, self.settings['operation_id'])
+                )
+
+        self.__validate_inputs(kwargs)
+
+        params = self.__gather_params(kwargs)
+
+        accept_headers_list = self.headers_map['accept']
+        if accept_headers_list:
+            params['header']['Accept'] = self.api_client.select_header_accept(
+                accept_headers_list)
+
+        content_type_headers_list = self.headers_map['content_type']
+        if content_type_headers_list:
+            header_list = self.api_client.select_header_content_type(
+                content_type_headers_list)
+            params['header']['Content-Type'] = header_list
+
+        return self.api_client.call_api(
+            self.settings['endpoint_path'], self.settings['http_method'],
+            params['path'],
+            params['query'],
+            params['header'],
+            body=params['body'],
+            post_params=params['form'],
+            files=params['file'],
+            response_type=self.settings['response_type'],
+            auth_settings=self.settings['auth'],
+            async_req=kwargs['async_req'],
+            _check_type=kwargs['_check_return_type'],
+            _return_http_data_only=kwargs['_return_http_data_only'],
+            _preload_content=kwargs['_preload_content'],
+            _request_timeout=kwargs['_request_timeout'],
+            _host=_host,
+            collection_formats=params['collection_format'])
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/apis/__init__.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/apis/__init__.py
new file mode 100644
index 000000000000..c1333f3c2ad1
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/apis/__init__.py
@@ -0,0 +1,18 @@
+# coding: utf-8
+
+# flake8: noqa
+
+# Import all APIs into this package.
+# If you have many APIs here with many many models used in each API this may
+# raise a `RecursionError`.
+# In order to avoid this, import only the API that you directly need like:
+#
+#   from .api.pet_api import PetApi
+#
+# or import this package, but before doing it, use:
+#
+#   import sys
+#   sys.setrecursionlimit(n)
+
+# Import APIs into API package:
+from x_auth_id_alias.api.usage_api import UsageApi
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/configuration.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/configuration.py
new file mode 100644
index 000000000000..278f7aa13dbf
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/configuration.py
@@ -0,0 +1,512 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension x-auth-id-alias
+
+    This specification shows how to use x-auth-id-alias extension for API keys.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+
+import copy
+import logging
+import multiprocessing
+import sys
+import urllib3
+
+import six
+from six.moves import http_client as httplib
+from x_auth_id_alias.exceptions import ApiValueError
+
+
+JSON_SCHEMA_VALIDATION_KEYWORDS = {
+    'multipleOf', 'maximum', 'exclusiveMaximum',
+    'minimum', 'exclusiveMinimum', 'maxLength',
+    'minLength', 'pattern', 'maxItems', 'minItems'
+}
+
+class Configuration(object):
+    """NOTE: This class is auto generated by OpenAPI Generator
+
+    Ref: https://openapi-generator.tech
+    Do not edit the class manually.
+
+    :param host: Base url
+    :param api_key: Dict to store API key(s).
+      Each entry in the dict specifies an API key.
+      The dict key is the name of the security scheme in the OAS specification.
+      The dict value is the API key secret.
+    :param api_key_prefix: Dict to store API prefix (e.g. Bearer)
+      The dict key is the name of the security scheme in the OAS specification.
+      The dict value is an API key prefix when generating the auth data.
+    :param username: Username for HTTP basic authentication
+    :param password: Password for HTTP basic authentication
+    :param discard_unknown_keys: Boolean value indicating whether to discard
+      unknown properties. A server may send a response that includes additional
+      properties that are not known by the client in the following scenarios:
+      1. The OpenAPI document is incomplete, i.e. it does not match the server
+         implementation.
+      2. The client was generated using an older version of the OpenAPI document
+         and the server has been upgraded since then.
+      If a schema in the OpenAPI document defines the additionalProperties attribute,
+      then all undeclared properties received by the server are injected into the
+      additional properties map. In that case, there are undeclared properties, and
+      nothing to discard.
+    :param disabled_client_side_validations (string): Comma-separated list of
+      JSON schema validation keywords to disable JSON schema structural validation
+      rules. The following keywords may be specified: multipleOf, maximum,
+      exclusiveMaximum, minimum, exclusiveMinimum, maxLength, minLength, pattern,
+      maxItems, minItems.
+      By default, the validation is performed for data generated locally by the client
+      and data received from the server, independent of any validation performed by
+      the server side. If the input data does not satisfy the JSON schema validation
+      rules specified in the OpenAPI document, an exception is raised.
+      If disabled_client_side_validations is set, structural validation is
+      disabled. This can be useful to troubleshoot data validation problem, such as
+      when the OpenAPI document validation rules do not match the actual API data
+      received by the server.
+    :param server_index: Index to servers configuration.
+    :param server_variables: Mapping with string values to replace variables in
+      templated server configuration. The validation of enums is performed for
+      variables with defined enum values before.
+    :param server_operation_index: Mapping from operation ID to an index to server
+      configuration.
+    :param server_operation_variables: Mapping from operation ID to a mapping with
+      string values to replace variables in templated server configuration.
+      The validation of enums is performed for variables with defined enum values before.
+
+    :Example:
+
+    API Key Authentication Example.
+    Given the following security scheme in the OpenAPI specification:
+      components:
+        securitySchemes:
+          cookieAuth:         # name for the security scheme
+            type: apiKey
+            in: cookie
+            name: JSESSIONID  # cookie name
+
+    You can programmatically set the cookie:
+
+conf = x_auth_id_alias.Configuration(
+    api_key={'cookieAuth': 'abc123'}
+    api_key_prefix={'cookieAuth': 'JSESSIONID'}
+)
+
+    The following cookie will be added to the HTTP request:
+       Cookie: JSESSIONID abc123
+    """
+
+    _default = None
+
+    def __init__(self, host=None,
+                 api_key=None, api_key_prefix=None,
+                 username=None, password=None,
+                 discard_unknown_keys=False,
+                 disabled_client_side_validations="",
+                 server_index=None, server_variables=None,
+                 server_operation_index=None, server_operation_variables=None,
+                 ):
+        """Constructor
+        """
+        self._base_path = "http://petstore.swagger.io:80/v2" if host is None else host
+        """Default Base url
+        """
+        self.server_index = 0 if server_index is None and host is None else server_index
+        self.server_operation_index = server_operation_index or {}
+        """Default server index
+        """
+        self.server_variables = server_variables or {}
+        self.server_operation_variables = server_operation_variables or {}
+        """Default server variables
+        """
+        self.temp_folder_path = None
+        """Temp file folder for downloading files
+        """
+        # Authentication Settings
+        self.api_key = {}
+        if api_key:
+            self.api_key = api_key
+        """dict to store API key(s)
+        """
+        self.api_key_prefix = {}
+        if api_key_prefix:
+            self.api_key_prefix = api_key_prefix
+        """dict to store API prefix (e.g. Bearer)
+        """
+        self.refresh_api_key_hook = None
+        """function hook to refresh API key if expired
+        """
+        self.username = username
+        """Username for HTTP basic authentication
+        """
+        self.password = password
+        """Password for HTTP basic authentication
+        """
+        self.discard_unknown_keys = discard_unknown_keys
+        self.disabled_client_side_validations = disabled_client_side_validations
+        self.logger = {}
+        """Logging Settings
+        """
+        self.logger["package_logger"] = logging.getLogger("x_auth_id_alias")
+        self.logger["urllib3_logger"] = logging.getLogger("urllib3")
+        self.logger_format = '%(asctime)s %(levelname)s %(message)s'
+        """Log format
+        """
+        self.logger_stream_handler = None
+        """Log stream handler
+        """
+        self.logger_file_handler = None
+        """Log file handler
+        """
+        self.logger_file = None
+        """Debug file location
+        """
+        self.debug = False
+        """Debug switch
+        """
+
+        self.verify_ssl = True
+        """SSL/TLS verification
+           Set this to false to skip verifying SSL certificate when calling API
+           from https server.
+        """
+        self.ssl_ca_cert = None
+        """Set this to customize the certificate file to verify the peer.
+        """
+        self.cert_file = None
+        """client certificate file
+        """
+        self.key_file = None
+        """client key file
+        """
+        self.assert_hostname = None
+        """Set this to True/False to enable/disable SSL hostname verification.
+        """
+
+        self.connection_pool_maxsize = multiprocessing.cpu_count() * 5
+        """urllib3 connection pool's maximum number of connections saved
+           per pool. urllib3 uses 1 connection as default value, but this is
+           not the best value when you are making a lot of possibly parallel
+           requests to the same host, which is often the case here.
+           cpu_count * 5 is used as default value to increase performance.
+        """
+
+        self.proxy = None
+        """Proxy URL
+        """
+        self.proxy_headers = None
+        """Proxy headers
+        """
+        self.safe_chars_for_path_param = ''
+        """Safe chars for path_param
+        """
+        self.retries = None
+        """Adding retries to override urllib3 default value 3
+        """
+        # Enable client side validation
+        self.client_side_validation = True
+
+    def __deepcopy__(self, memo):
+        cls = self.__class__
+        result = cls.__new__(cls)
+        memo[id(self)] = result
+        for k, v in self.__dict__.items():
+            if k not in ('logger', 'logger_file_handler'):
+                setattr(result, k, copy.deepcopy(v, memo))
+        # shallow copy of loggers
+        result.logger = copy.copy(self.logger)
+        # use setters to configure loggers
+        result.logger_file = self.logger_file
+        result.debug = self.debug
+        return result
+
+    def __setattr__(self, name, value):
+        object.__setattr__(self, name, value)
+        if name == 'disabled_client_side_validations':
+            s = set(filter(None, value.split(',')))
+            for v in s:
+                if v not in JSON_SCHEMA_VALIDATION_KEYWORDS:
+                    raise ApiValueError(
+                        "Invalid keyword: '{0}''".format(v))
+            self._disabled_client_side_validations = s
+
+    @classmethod
+    def set_default(cls, default):
+        """Set default instance of configuration.
+
+        It stores default configuration, which can be
+        returned by get_default_copy method.
+
+        :param default: object of Configuration
+        """
+        cls._default = copy.deepcopy(default)
+
+    @classmethod
+    def get_default_copy(cls):
+        """Return new instance of configuration.
+
+        This method returns newly created, based on default constructor,
+        object of Configuration class or returns a copy of default
+        configuration passed by the set_default method.
+
+        :return: The configuration object.
+        """
+        if cls._default is not None:
+            return copy.deepcopy(cls._default)
+        return Configuration()
+
+    @property
+    def logger_file(self):
+        """The logger file.
+
+        If the logger_file is None, then add stream handler and remove file
+        handler. Otherwise, add file handler and remove stream handler.
+
+        :param value: The logger_file path.
+        :type: str
+        """
+        return self.__logger_file
+
+    @logger_file.setter
+    def logger_file(self, value):
+        """The logger file.
+
+        If the logger_file is None, then add stream handler and remove file
+        handler. Otherwise, add file handler and remove stream handler.
+
+        :param value: The logger_file path.
+        :type: str
+        """
+        self.__logger_file = value
+        if self.__logger_file:
+            # If set logging file,
+            # then add file handler and remove stream handler.
+            self.logger_file_handler = logging.FileHandler(self.__logger_file)
+            self.logger_file_handler.setFormatter(self.logger_formatter)
+            for _, logger in six.iteritems(self.logger):
+                logger.addHandler(self.logger_file_handler)
+
+    @property
+    def debug(self):
+        """Debug status
+
+        :param value: The debug status, True or False.
+        :type: bool
+        """
+        return self.__debug
+
+    @debug.setter
+    def debug(self, value):
+        """Debug status
+
+        :param value: The debug status, True or False.
+        :type: bool
+        """
+        self.__debug = value
+        if self.__debug:
+            # if debug status is True, turn on debug logging
+            for _, logger in six.iteritems(self.logger):
+                logger.setLevel(logging.DEBUG)
+            # turn on httplib debug
+            httplib.HTTPConnection.debuglevel = 1
+        else:
+            # if debug status is False, turn off debug logging,
+            # setting log level to default `logging.WARNING`
+            for _, logger in six.iteritems(self.logger):
+                logger.setLevel(logging.WARNING)
+            # turn off httplib debug
+            httplib.HTTPConnection.debuglevel = 0
+
+    @property
+    def logger_format(self):
+        """The logger format.
+
+        The logger_formatter will be updated when sets logger_format.
+
+        :param value: The format string.
+        :type: str
+        """
+        return self.__logger_format
+
+    @logger_format.setter
+    def logger_format(self, value):
+        """The logger format.
+
+        The logger_formatter will be updated when sets logger_format.
+
+        :param value: The format string.
+        :type: str
+        """
+        self.__logger_format = value
+        self.logger_formatter = logging.Formatter(self.__logger_format)
+
+    def get_api_key_with_prefix(self, identifier, alias=None):
+        """Gets API key (with prefix if set).
+
+        :param identifier: The identifier of apiKey.
+        :param alias: The alternative identifier of apiKey.
+        :return: The token for api key authentication.
+        """
+        if self.refresh_api_key_hook is not None:
+            self.refresh_api_key_hook(self)
+        key = self.api_key.get(identifier, self.api_key.get(alias) if alias is not None else None)
+        if key:
+            prefix = self.api_key_prefix.get(identifier)
+            if prefix:
+                return "%s %s" % (prefix, key)
+            else:
+                return key
+
+    def get_basic_auth_token(self):
+        """Gets HTTP basic authentication header (string).
+
+        :return: The token for basic HTTP authentication.
+        """
+        username = ""
+        if self.username is not None:
+            username = self.username
+        password = ""
+        if self.password is not None:
+            password = self.password
+        return urllib3.util.make_headers(
+            basic_auth=username + ':' + password
+        ).get('authorization')
+
+    def auth_settings(self):
+        """Gets Auth Settings dict for api client.
+
+        :return: The Auth Settings information dict.
+        """
+        auth = {}
+        if 'api_key' in self.api_key:
+            auth['api_key'] = {
+                'type': 'api_key',
+                'in': 'header',
+                'key': 'X-Api-Key',
+                'value': self.get_api_key_with_prefix(
+                    'api_key',
+                ),
+            }
+        if 'api_key_query' in self.api_key or 'api_key' in self.api_key:
+            auth['api_key_query'] = {
+                'type': 'api_key',
+                'in': 'query',
+                'key': 'api_key',
+                'value': self.get_api_key_with_prefix(
+                    'api_key_query',
+                    alias='api_key',
+                ),
+            }
+        return auth
+
+    def to_debug_report(self):
+        """Gets the essential information for debugging.
+
+        :return: The report for debugging.
+        """
+        return "Python SDK Debug Report:\n"\
+               "OS: {env}\n"\
+               "Python Version: {pyversion}\n"\
+               "Version of the API: 1.0.0\n"\
+               "SDK Package Version: 1.0.0".\
+               format(env=sys.platform, pyversion=sys.version)
+
+    def get_host_settings(self):
+        """Gets an array of host settings
+
+        :return: An array of host settings
+        """
+        return [
+            {
+                'url': "http://{server}.swagger.io:{port}/v2",
+                'description': "petstore server",
+                'variables': {
+                    'server': {
+                        'description': "No description provided",
+                        'default_value': "petstore",
+                        'enum_values': [
+                            "petstore",
+                            "qa-petstore",
+                            "dev-petstore"
+                        ]
+                        },
+                    'port': {
+                        'description': "No description provided",
+                        'default_value': "80",
+                        'enum_values': [
+                            "80",
+                            "8080"
+                        ]
+                        }
+                    }
+            },
+            {
+                'url': "https://localhost:8080/{version}",
+                'description': "The local server",
+                'variables': {
+                    'version': {
+                        'description': "No description provided",
+                        'default_value': "v2",
+                        'enum_values': [
+                            "v1",
+                            "v2"
+                        ]
+                        }
+                    }
+            }
+        ]
+
+    def get_host_from_settings(self, index, variables=None, servers=None):
+        """Gets host URL based on the index and variables
+        :param index: array index of the host settings
+        :param variables: hash of variable and the corresponding value
+        :param servers: an array of host settings or None
+        :return: URL based on host settings
+        """
+        if index is None:
+            return self._base_path
+
+        variables = {} if variables is None else variables
+        servers = self.get_host_settings() if servers is None else servers
+
+        try:
+            server = servers[index]
+        except IndexError:
+            raise ValueError(
+                "Invalid index {0} when selecting the host settings. "
+                "Must be less than {1}".format(index, len(servers)))
+
+        url = server['url']
+
+        # go through variables and replace placeholders
+        for variable_name, variable in server.get('variables', {}).items():
+            used_value = variables.get(
+                variable_name, variable['default_value'])
+
+            if 'enum_values' in variable \
+                    and used_value not in variable['enum_values']:
+                raise ValueError(
+                    "The variable `{0}` in the host URL has invalid value "
+                    "{1}. Must be {2}.".format(
+                        variable_name, variables[variable_name],
+                        variable['enum_values']))
+
+            url = url.replace("{" + variable_name + "}", used_value)
+
+        return url
+
+    @property
+    def host(self):
+        """Return generated host."""
+        return self.get_host_from_settings(self.server_index, variables=self.server_variables)
+
+    @host.setter
+    def host(self, value):
+        """Fix base path."""
+        self._base_path = value
+        self.server_index = None
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/exceptions.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/exceptions.py
new file mode 100644
index 000000000000..13f8852a90fa
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/exceptions.py
@@ -0,0 +1,139 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension x-auth-id-alias
+
+    This specification shows how to use x-auth-id-alias extension for API keys.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+import six
+
+
+class OpenApiException(Exception):
+    """The base exception class for all OpenAPIExceptions"""
+
+
+class ApiTypeError(OpenApiException, TypeError):
+    def __init__(self, msg, path_to_item=None, valid_classes=None,
+                 key_type=None):
+        """ Raises an exception for TypeErrors
+
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (list): a list of keys an indices to get to the
+                                 current_item
+                                 None if unset
+            valid_classes (tuple): the primitive classes that current item
+                                   should be an instance of
+                                   None if unset
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a list
+                             None if unset
+        """
+        self.path_to_item = path_to_item
+        self.valid_classes = valid_classes
+        self.key_type = key_type
+        full_msg = msg
+        if path_to_item:
+            full_msg = "{0} at {1}".format(msg, render_path(path_to_item))
+        super(ApiTypeError, self).__init__(full_msg)
+
+
+class ApiValueError(OpenApiException, ValueError):
+    def __init__(self, msg, path_to_item=None):
+        """
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (list) the path to the exception in the
+                received_data dict. None if unset
+        """
+
+        self.path_to_item = path_to_item
+        full_msg = msg
+        if path_to_item:
+            full_msg = "{0} at {1}".format(msg, render_path(path_to_item))
+        super(ApiValueError, self).__init__(full_msg)
+
+
+class ApiAttributeError(OpenApiException, AttributeError):
+    def __init__(self, msg, path_to_item=None):
+        """
+        Raised when an attribute reference or assignment fails.
+
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (None/list) the path to the exception in the
+                received_data dict
+        """
+        self.path_to_item = path_to_item
+        full_msg = msg
+        if path_to_item:
+            full_msg = "{0} at {1}".format(msg, render_path(path_to_item))
+        super(ApiAttributeError, self).__init__(full_msg)
+
+
+class ApiKeyError(OpenApiException, KeyError):
+    def __init__(self, msg, path_to_item=None):
+        """
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (None/list) the path to the exception in the
+                received_data dict
+        """
+        self.path_to_item = path_to_item
+        full_msg = msg
+        if path_to_item:
+            full_msg = "{0} at {1}".format(msg, render_path(path_to_item))
+        super(ApiKeyError, self).__init__(full_msg)
+
+
+class ApiException(OpenApiException):
+
+    def __init__(self, status=None, reason=None, http_resp=None):
+        if http_resp:
+            self.status = http_resp.status
+            self.reason = http_resp.reason
+            self.body = http_resp.data
+            self.headers = http_resp.getheaders()
+        else:
+            self.status = status
+            self.reason = reason
+            self.body = None
+            self.headers = None
+
+    def __str__(self):
+        """Custom error messages for exception"""
+        error_message = "({0})\n"\
+                        "Reason: {1}\n".format(self.status, self.reason)
+        if self.headers:
+            error_message += "HTTP response headers: {0}\n".format(
+                self.headers)
+
+        if self.body:
+            error_message += "HTTP response body: {0}\n".format(self.body)
+
+        return error_message
+
+
+def render_path(path_to_item):
+    """Returns a string representation of a path"""
+    result = ""
+    for pth in path_to_item:
+        if isinstance(pth, six.integer_types):
+            result += "[{0}]".format(pth)
+        else:
+            result += "['{0}']".format(pth)
+    return result
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/model/__init__.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/model/__init__.py
new file mode 100644
index 000000000000..cfe32b784926
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/model/__init__.py
@@ -0,0 +1,5 @@
+# we can not import model classes here because that would create a circular
+# reference which would not work in python2
+# do not import all models into this module because that uses a lot of memory and stack frames
+# if you need the ability to import all models from one package, import them with
+# from {{packageName}.models import ModelA, ModelB
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/model_utils.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/model_utils.py
new file mode 100644
index 000000000000..3606170c6f5f
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/model_utils.py
@@ -0,0 +1,1772 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension x-auth-id-alias
+
+    This specification shows how to use x-auth-id-alias extension for API keys.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from datetime import date, datetime  # noqa: F401
+import inspect
+import os
+import pprint
+import re
+import tempfile
+
+from dateutil.parser import parse
+import six
+
+from x_auth_id_alias.exceptions import (
+    ApiKeyError,
+    ApiAttributeError,
+    ApiTypeError,
+    ApiValueError,
+)
+
+none_type = type(None)
+if six.PY3:
+    import io
+    file_type = io.IOBase
+    # these are needed for when other modules import str and int from here
+    str = str
+    int = int
+else:
+    file_type = file  # noqa: F821
+    str_py2 = str
+    unicode_py2 = unicode  # noqa: F821
+    long_py2 = long  # noqa: F821
+    int_py2 = int
+    # this requires that the future library is installed
+    from builtins import int, str
+
+
+class cached_property(object):
+    # this caches the result of the function call for fn with no inputs
+    # use this as a decorator on fuction methods that you want converted
+    # into cached properties
+    result_key = '_results'
+
+    def __init__(self, fn):
+        self._fn = fn
+
+    def __get__(self, instance, cls=None):
+        try:
+            return vars(self)[self.result_key]
+        except KeyError:
+            result = self._fn()
+            setattr(self, self.result_key, result)
+            return result
+
+
+class OpenApiModel(object):
+    """The base class for all OpenAPIModels"""
+
+    def set_attribute(self, name, value):
+        # this is only used to set properties on self
+
+        path_to_item = []
+        if self._path_to_item:
+            path_to_item.extend(self._path_to_item)
+        path_to_item.append(name)
+
+        if name in self.openapi_types:
+            required_types_mixed = self.openapi_types[name]
+        elif self.additional_properties_type is None:
+            raise ApiAttributeError(
+                "{0} has no attribute '{1}'".format(
+                    type(self).__name__, name),
+                path_to_item
+            )
+        elif self.additional_properties_type is not None:
+            required_types_mixed = self.additional_properties_type
+
+        if get_simple_class(name) != str:
+            error_msg = type_error_message(
+                var_name=name,
+                var_value=name,
+                valid_classes=(str,),
+                key_type=True
+            )
+            raise ApiTypeError(
+                error_msg,
+                path_to_item=path_to_item,
+                valid_classes=(str,),
+                key_type=True
+            )
+
+        if self._check_type:
+            value = validate_and_convert_types(
+                value, required_types_mixed, path_to_item, self._spec_property_naming,
+                self._check_type, configuration=self._configuration)
+        if (name,) in self.allowed_values:
+            check_allowed_values(
+                self.allowed_values,
+                (name,),
+                value
+            )
+        if (name,) in self.validations:
+            check_validations(
+                self.validations,
+                (name,),
+                value,
+                self._configuration
+            )
+        self.__dict__['_data_store'][name] = value
+
+    def __setitem__(self, name, value):
+        """this allows us to set values with instance[field_name] = val"""
+        self.__setattr__(name, value)
+
+    def __getitem__(self, name):
+        """this allows us to get a value with val = instance[field_name]"""
+        return self.__getattr__(name)
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
+
+    def __new__(cls, *args, **kwargs):
+        # this function uses the discriminator to
+        # pick a new schema/class to instantiate because a discriminator
+        # propertyName value was passed in
+
+        if len(args) == 1 and args[0] is None and is_type_nullable(cls):
+            # The input data is the 'null' value and the type is nullable.
+            return None
+
+        visited_composed_classes = kwargs.get('_visited_composed_classes', ())
+        if (
+            cls.discriminator is None or
+            cls in visited_composed_classes
+        ):
+            # Use case 1: this openapi schema (cls) does not have a discriminator
+            # Use case 2: we have already visited this class before and are sure that we
+            # want to instantiate it this time. We have visited this class deserializing
+            # a payload with a discriminator. During that process we traveled through
+            # this class but did not make an instance of it. Now we are making an
+            # instance of a composed class which contains cls in it, so this time make an instance of cls.
+            #
+            # Here's an example of use case 2: If Animal has a discriminator
+            # petType and we pass in "Dog", and the class Dog
+            # allOf includes Animal, we move through Animal
+            # once using the discriminator, and pick Dog.
+            # Then in the composed schema dog Dog, we will make an instance of the
+            # Animal class (because Dal has allOf: Animal) but this time we won't travel
+            # through Animal's discriminator because we passed in
+            # _visited_composed_classes = (Animal,)
+
+            return super(OpenApiModel, cls).__new__(cls)
+
+        # Get the name and value of the discriminator property.
+        # The discriminator name is obtained from the discriminator meta-data
+        # and the discriminator value is obtained from the input data.
+        discr_propertyname_py = list(cls.discriminator.keys())[0]
+        discr_propertyname_js = cls.attribute_map[discr_propertyname_py]
+        if discr_propertyname_js in kwargs:
+            discr_value = kwargs[discr_propertyname_js]
+        elif discr_propertyname_py in kwargs:
+            discr_value = kwargs[discr_propertyname_py]
+        else:
+            # The input data does not contain the discriminator property.
+            path_to_item = kwargs.get('_path_to_item', ())
+            raise ApiValueError(
+                "Cannot deserialize input data due to missing discriminator. "
+                "The discriminator property '%s' is missing at path: %s" %
+                (discr_propertyname_js, path_to_item)
+            )
+
+        # Implementation note: the last argument to get_discriminator_class
+        # is a list of visited classes. get_discriminator_class may recursively
+        # call itself and update the list of visited classes, and the initial
+        # value must be an empty list. Hence not using 'visited_composed_classes'
+        new_cls = get_discriminator_class(
+                    cls, discr_propertyname_py, discr_value, [])
+        if new_cls is None:
+            path_to_item = kwargs.get('_path_to_item', ())
+            disc_prop_value = kwargs.get(
+                discr_propertyname_js, kwargs.get(discr_propertyname_py))
+            raise ApiValueError(
+                "Cannot deserialize input data due to invalid discriminator "
+                "value. The OpenAPI document has no mapping for discriminator "
+                "property '%s'='%s' at path: %s" %
+                (discr_propertyname_js, disc_prop_value, path_to_item)
+            )
+
+        if new_cls in visited_composed_classes:
+            # if we are making an instance of a composed schema Descendent
+            # which allOf includes Ancestor, then Ancestor contains
+            # a discriminator that includes Descendent.
+            # So if we make an instance of Descendent, we have to make an
+            # instance of Ancestor to hold the allOf properties.
+            # This code detects that use case and makes the instance of Ancestor
+            # For example:
+            # When making an instance of Dog, _visited_composed_classes = (Dog,)
+            # then we make an instance of Animal to include in dog._composed_instances
+            # so when we are here, cls is Animal
+            # cls.discriminator != None
+            # cls not in _visited_composed_classes
+            # new_cls = Dog
+            # but we know we know that we already have Dog
+            # because it is in visited_composed_classes
+            # so make Animal here
+            return super(OpenApiModel, cls).__new__(cls)
+
+        # Build a list containing all oneOf and anyOf descendants.
+        oneof_anyof_classes = None
+        if cls._composed_schemas is not None:
+            oneof_anyof_classes = (
+                cls._composed_schemas.get('oneOf', ()) +
+                cls._composed_schemas.get('anyOf', ()))
+        oneof_anyof_child = new_cls in oneof_anyof_classes
+        kwargs['_visited_composed_classes'] = visited_composed_classes + (cls,)
+
+        if cls._composed_schemas.get('allOf') and oneof_anyof_child:
+            # Validate that we can make self because when we make the
+            # new_cls it will not include the allOf validations in self
+            self_inst = super(OpenApiModel, cls).__new__(cls)
+            self_inst.__init__(*args, **kwargs)
+
+        new_inst = new_cls.__new__(new_cls, *args, **kwargs)
+        new_inst.__init__(*args, **kwargs)
+        return new_inst
+
+
+class ModelSimple(OpenApiModel):
+    """the parent class of models whose type != object in their
+    swagger/openapi"""
+
+    def __setattr__(self, name, value):
+        """this allows us to set a value with instance.field_name = val"""
+        if name in self.required_properties:
+            self.__dict__[name] = value
+            return
+
+        self.set_attribute(name, value)
+
+    def __getattr__(self, name):
+        """this allows us to get a value with val = instance.field_name"""
+        if name in self.required_properties:
+            return self.__dict__[name]
+
+        if name in self.__dict__['_data_store']:
+            return self.__dict__['_data_store'][name]
+
+        path_to_item = []
+        if self._path_to_item:
+            path_to_item.extend(self._path_to_item)
+        path_to_item.append(name)
+        raise ApiAttributeError(
+            "{0} has no attribute '{1}'".format(
+                type(self).__name__, name),
+            [name]
+        )
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return str(self.value)
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, self.__class__):
+            return False
+
+        this_val = self._data_store['value']
+        that_val = other._data_store['value']
+        types = set()
+        types.add(this_val.__class__)
+        types.add(that_val.__class__)
+        vals_equal = this_val == that_val
+        if not six.PY3 and len(types) == 2 and unicode in types:  # noqa: F821
+            vals_equal = (
+                this_val.encode('utf-8') == that_val.encode('utf-8')
+            )
+        if not vals_equal:
+            return False
+        return True
+
+
+class ModelNormal(OpenApiModel):
+    """the parent class of models whose type == object in their
+    swagger/openapi"""
+
+    def __setattr__(self, name, value):
+        """this allows us to set a value with instance.field_name = val"""
+        if name in self.required_properties:
+            self.__dict__[name] = value
+            return
+
+        self.set_attribute(name, value)
+
+    def __getattr__(self, name):
+        """this allows us to get a value with val = instance.field_name"""
+        if name in self.required_properties:
+            return self.__dict__[name]
+
+        if name in self.__dict__['_data_store']:
+            return self.__dict__['_data_store'][name]
+
+        path_to_item = []
+        if self._path_to_item:
+            path_to_item.extend(self._path_to_item)
+        path_to_item.append(name)
+        raise ApiAttributeError(
+            "{0} has no attribute '{1}'".format(
+                type(self).__name__, name),
+            [name]
+        )
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        return model_to_dict(self, serialize=False)
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, self.__class__):
+            return False
+
+        if not set(self._data_store.keys()) == set(other._data_store.keys()):
+            return False
+        for _var_name, this_val in six.iteritems(self._data_store):
+            that_val = other._data_store[_var_name]
+            types = set()
+            types.add(this_val.__class__)
+            types.add(that_val.__class__)
+            vals_equal = this_val == that_val
+            if (not six.PY3 and
+                    len(types) == 2 and unicode in types):  # noqa: F821
+                vals_equal = (
+                    this_val.encode('utf-8') == that_val.encode('utf-8')
+                )
+            if not vals_equal:
+                return False
+        return True
+
+
+class ModelComposed(OpenApiModel):
+    """the parent class of models whose type == object in their
+    swagger/openapi and have oneOf/allOf/anyOf
+
+    When one sets a property we use var_name_to_model_instances to store the value in
+    the correct class instances + run any type checking + validation code.
+    When one gets a property we use var_name_to_model_instances to get the value
+    from the correct class instances.
+    This allows multiple composed schemas to contain the same property with additive
+    constraints on the value.
+
+    _composed_schemas (dict) stores the anyOf/allOf/oneOf classes
+    key (str): allOf/oneOf/anyOf
+    value (list): the classes in the XOf definition.
+        Note: none_type can be included when the openapi document version >= 3.1.0
+    _composed_instances (list): stores a list of instances of the composed schemas
+    defined in _composed_schemas. When properties are accessed in the self instance,
+    they are returned from the self._data_store or the data stores in the instances
+    in self._composed_schemas
+    _var_name_to_model_instances (dict): maps between a variable name on self and
+    the composed instances (self included) which contain that data
+    key (str): property name
+    value (list): list of class instances, self or instances in _composed_instances
+    which contain the value that the key is referring to.
+    """
+
+    def __setattr__(self, name, value):
+        """this allows us to set a value with instance.field_name = val"""
+        if name in self.required_properties:
+            self.__dict__[name] = value
+            return
+
+        # set the attribute on the correct instance
+        model_instances = self._var_name_to_model_instances.get(
+            name, self._additional_properties_model_instances)
+        if model_instances:
+            for model_instance in model_instances:
+                if model_instance == self:
+                    self.set_attribute(name, value)
+                else:
+                    setattr(model_instance, name, value)
+                if name not in self._var_name_to_model_instances:
+                    # we assigned an additional property
+                    self.__dict__['_var_name_to_model_instances'][name] = (
+                        model_instance
+                    )
+            return None
+
+        path_to_item = []
+        if self._path_to_item:
+            path_to_item.extend(self._path_to_item)
+        path_to_item.append(name)
+        raise ApiAttributeError(
+            "{0} has no attribute '{1}'".format(
+                type(self).__name__, name),
+            path_to_item
+        )
+
+    def __getattr__(self, name):
+        """this allows us to get a value with val = instance.field_name"""
+        if name in self.required_properties:
+            return self.__dict__[name]
+
+        # get the attribute from the correct instance
+        model_instances = self._var_name_to_model_instances.get(
+            name, self._additional_properties_model_instances)
+        path_to_item = []
+        if self._path_to_item:
+            path_to_item.extend(self._path_to_item)
+        path_to_item.append(name)
+        values = []
+        # A composed model stores child (oneof/anyOf/allOf) models under
+        # self._var_name_to_model_instances. A named property can exist in
+        # multiple child models. If the property is present in more than one
+        # child model, the value must be the same across all the child models.
+        if model_instances:
+            for model_instance in model_instances:
+                if name in model_instance._data_store:
+                    v = model_instance._data_store[name]
+                    if v not in values:
+                        values.append(v)
+        len_values = len(values)
+        if len_values == 0:
+            raise ApiAttributeError(
+                "{0} has no attribute '{1}'".format(
+                    type(self).__name__, name),
+                path_to_item
+            )
+        elif len_values == 1:
+            return values[0]
+        elif len_values > 1:
+            raise ApiValueError(
+                "Values stored for property {0} in {1} differ when looking "
+                "at self and self's composed instances. All values must be "
+                "the same".format(name, type(self).__name__),
+                path_to_item
+            )
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        return model_to_dict(self, serialize=False)
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, self.__class__):
+            return False
+
+        if not set(self._data_store.keys()) == set(other._data_store.keys()):
+            return False
+        for _var_name, this_val in six.iteritems(self._data_store):
+            that_val = other._data_store[_var_name]
+            types = set()
+            types.add(this_val.__class__)
+            types.add(that_val.__class__)
+            vals_equal = this_val == that_val
+            if (not six.PY3 and
+                    len(types) == 2 and unicode in types):  # noqa: F821
+                vals_equal = (
+                    this_val.encode('utf-8') == that_val.encode('utf-8')
+                )
+            if not vals_equal:
+                return False
+        return True
+
+
+COERCION_INDEX_BY_TYPE = {
+    ModelComposed: 0,
+    ModelNormal: 1,
+    ModelSimple: 2,
+    none_type: 3,    # The type of 'None'.
+    list: 4,
+    dict: 5,
+    float: 6,
+    int: 7,
+    bool: 8,
+    datetime: 9,
+    date: 10,
+    str: 11,
+    file_type: 12,   # 'file_type' is an alias for the built-in 'file' or 'io.IOBase' type.
+}
+
+# these are used to limit what type conversions we try to do
+# when we have a valid type already and we want to try converting
+# to another type
+UPCONVERSION_TYPE_PAIRS = (
+    (str, datetime),
+    (str, date),
+    (int, float),             # A float may be serialized as an integer, e.g. '3' is a valid serialized float.
+    (list, ModelComposed),
+    (dict, ModelComposed),
+    (list, ModelNormal),
+    (dict, ModelNormal),
+    (str, ModelSimple),
+    (int, ModelSimple),
+    (float, ModelSimple),
+    (list, ModelSimple),
+)
+
+COERCIBLE_TYPE_PAIRS = {
+    False: (  # client instantiation of a model with client data
+        # (dict, ModelComposed),
+        # (list, ModelComposed),
+        # (dict, ModelNormal),
+        # (list, ModelNormal),
+        # (str, ModelSimple),
+        # (int, ModelSimple),
+        # (float, ModelSimple),
+        # (list, ModelSimple),
+        # (str, int),
+        # (str, float),
+        # (str, datetime),
+        # (str, date),
+        # (int, str),
+        # (float, str),
+    ),
+    True: (  # server -> client data
+        (dict, ModelComposed),
+        (list, ModelComposed),
+        (dict, ModelNormal),
+        (list, ModelNormal),
+        (str, ModelSimple),
+        (int, ModelSimple),
+        (float, ModelSimple),
+        (list, ModelSimple),
+        # (str, int),
+        # (str, float),
+        (str, datetime),
+        (str, date),
+        # (int, str),
+        # (float, str),
+        (str, file_type)
+    ),
+}
+
+
+def get_simple_class(input_value):
+    """Returns an input_value's simple class that we will use for type checking
+    Python2:
+    float and int will return int, where int is the python3 int backport
+    str and unicode will return str, where str is the python3 str backport
+    Note: float and int ARE both instances of int backport
+    Note: str_py2 and unicode_py2 are NOT both instances of str backport
+
+    Args:
+        input_value (class/class_instance): the item for which we will return
+                                            the simple class
+    """
+    if isinstance(input_value, type):
+        # input_value is a class
+        return input_value
+    elif isinstance(input_value, tuple):
+        return tuple
+    elif isinstance(input_value, list):
+        return list
+    elif isinstance(input_value, dict):
+        return dict
+    elif isinstance(input_value, none_type):
+        return none_type
+    elif isinstance(input_value, file_type):
+        return file_type
+    elif isinstance(input_value, bool):
+        # this must be higher than the int check because
+        # isinstance(True, int) == True
+        return bool
+    elif isinstance(input_value, int):
+        # for python2 input_value==long_instance -> return int
+        # where int is the python3 int backport
+        return int
+    elif isinstance(input_value, datetime):
+        # this must be higher than the date check because
+        # isinstance(datetime_instance, date) == True
+        return datetime
+    elif isinstance(input_value, date):
+        return date
+    elif (six.PY2 and isinstance(input_value, (str_py2, unicode_py2, str)) or
+            isinstance(input_value, str)):
+        return str
+    return type(input_value)
+
+
+def check_allowed_values(allowed_values, input_variable_path, input_values):
+    """Raises an exception if the input_values are not allowed
+
+    Args:
+        allowed_values (dict): the allowed_values dict
+        input_variable_path (tuple): the path to the input variable
+        input_values (list/str/int/float/date/datetime): the values that we
+            are checking to see if they are in allowed_values
+    """
+    these_allowed_values = list(allowed_values[input_variable_path].values())
+    if (isinstance(input_values, list)
+            and not set(input_values).issubset(
+                set(these_allowed_values))):
+        invalid_values = ", ".join(
+            map(str, set(input_values) - set(these_allowed_values))),
+        raise ApiValueError(
+            "Invalid values for `%s` [%s], must be a subset of [%s]" %
+            (
+                input_variable_path[0],
+                invalid_values,
+                ", ".join(map(str, these_allowed_values))
+            )
+        )
+    elif (isinstance(input_values, dict)
+            and not set(
+                input_values.keys()).issubset(set(these_allowed_values))):
+        invalid_values = ", ".join(
+            map(str, set(input_values.keys()) - set(these_allowed_values)))
+        raise ApiValueError(
+            "Invalid keys in `%s` [%s], must be a subset of [%s]" %
+            (
+                input_variable_path[0],
+                invalid_values,
+                ", ".join(map(str, these_allowed_values))
+            )
+        )
+    elif (not isinstance(input_values, (list, dict))
+            and input_values not in these_allowed_values):
+        raise ApiValueError(
+            "Invalid value for `%s` (%s), must be one of %s" %
+            (
+                input_variable_path[0],
+                input_values,
+                these_allowed_values
+            )
+        )
+
+
+def is_json_validation_enabled(schema_keyword, configuration=None):
+    """Returns true if JSON schema validation is enabled for the specified
+    validation keyword. This can be used to skip JSON schema structural validation
+    as requested in the configuration.
+
+    Args:
+        schema_keyword (string): the name of a JSON schema validation keyword.
+        configuration (Configuration): the configuration class.
+    """
+
+    return (configuration is None or
+        not hasattr(configuration, '_disabled_client_side_validations') or
+        schema_keyword not in configuration._disabled_client_side_validations)
+
+
+def check_validations(
+        validations, input_variable_path, input_values,
+        configuration=None):
+    """Raises an exception if the input_values are invalid
+
+    Args:
+        validations (dict): the validation dictionary.
+        input_variable_path (tuple): the path to the input variable.
+        input_values (list/str/int/float/date/datetime): the values that we
+            are checking.
+        configuration (Configuration): the configuration class.
+    """
+
+    current_validations = validations[input_variable_path]
+    if (is_json_validation_enabled('multipleOf', configuration) and
+            'multiple_of' in current_validations and
+            isinstance(input_values, (int, float)) and
+            not (float(input_values) / current_validations['multiple_of']).is_integer()):
+        # Note 'multipleOf' will be as good as the floating point arithmetic.
+        raise ApiValueError(
+            "Invalid value for `%s`, value must be a multiple of "
+            "`%s`" % (
+                input_variable_path[0],
+                current_validations['multiple_of']
+            )
+        )
+
+    if (is_json_validation_enabled('maxLength', configuration) and
+            'max_length' in current_validations and
+            len(input_values) > current_validations['max_length']):
+        raise ApiValueError(
+            "Invalid value for `%s`, length must be less than or equal to "
+            "`%s`" % (
+                input_variable_path[0],
+                current_validations['max_length']
+            )
+        )
+
+    if (is_json_validation_enabled('minLength', configuration) and
+            'min_length' in current_validations and
+            len(input_values) < current_validations['min_length']):
+        raise ApiValueError(
+            "Invalid value for `%s`, length must be greater than or equal to "
+            "`%s`" % (
+                input_variable_path[0],
+                current_validations['min_length']
+            )
+        )
+
+    if (is_json_validation_enabled('maxItems', configuration) and
+            'max_items' in current_validations and
+            len(input_values) > current_validations['max_items']):
+        raise ApiValueError(
+            "Invalid value for `%s`, number of items must be less than or "
+            "equal to `%s`" % (
+                input_variable_path[0],
+                current_validations['max_items']
+            )
+        )
+
+    if (is_json_validation_enabled('minItems', configuration) and
+            'min_items' in current_validations and
+            len(input_values) < current_validations['min_items']):
+        raise ValueError(
+            "Invalid value for `%s`, number of items must be greater than or "
+            "equal to `%s`" % (
+                input_variable_path[0],
+                current_validations['min_items']
+            )
+        )
+
+    items = ('exclusive_maximum', 'inclusive_maximum', 'exclusive_minimum',
+             'inclusive_minimum')
+    if (any(item in current_validations for item in items)):
+        if isinstance(input_values, list):
+            max_val = max(input_values)
+            min_val = min(input_values)
+        elif isinstance(input_values, dict):
+            max_val = max(input_values.values())
+            min_val = min(input_values.values())
+        else:
+            max_val = input_values
+            min_val = input_values
+
+    if (is_json_validation_enabled('exclusiveMaximum', configuration) and
+            'exclusive_maximum' in current_validations and
+            max_val >= current_validations['exclusive_maximum']):
+        raise ApiValueError(
+            "Invalid value for `%s`, must be a value less than `%s`" % (
+                input_variable_path[0],
+                current_validations['exclusive_maximum']
+            )
+        )
+
+    if (is_json_validation_enabled('maximum', configuration) and
+            'inclusive_maximum' in current_validations and
+            max_val > current_validations['inclusive_maximum']):
+        raise ApiValueError(
+            "Invalid value for `%s`, must be a value less than or equal to "
+            "`%s`" % (
+                input_variable_path[0],
+                current_validations['inclusive_maximum']
+            )
+        )
+
+    if (is_json_validation_enabled('exclusiveMinimum', configuration) and
+            'exclusive_minimum' in current_validations and
+            min_val <= current_validations['exclusive_minimum']):
+        raise ApiValueError(
+            "Invalid value for `%s`, must be a value greater than `%s`" %
+            (
+                input_variable_path[0],
+                current_validations['exclusive_maximum']
+            )
+        )
+
+    if (is_json_validation_enabled('minimum', configuration) and
+            'inclusive_minimum' in current_validations and
+            min_val < current_validations['inclusive_minimum']):
+        raise ApiValueError(
+            "Invalid value for `%s`, must be a value greater than or equal "
+            "to `%s`" % (
+                input_variable_path[0],
+                current_validations['inclusive_minimum']
+            )
+        )
+    flags = current_validations.get('regex', {}).get('flags', 0)
+    if (is_json_validation_enabled('pattern', configuration) and
+            'regex' in current_validations and
+            not re.search(current_validations['regex']['pattern'],
+                          input_values, flags=flags)):
+        err_msg = r"Invalid value for `%s`, must match regular expression `%s`" % (
+                    input_variable_path[0],
+                    current_validations['regex']['pattern']
+                )
+        if flags != 0:
+            # Don't print the regex flags if the flags are not
+            # specified in the OAS document.
+            err_msg = r"%s with flags=`%s`" % (err_msg, flags)
+        raise ApiValueError(err_msg)
+
+
+def order_response_types(required_types):
+    """Returns the required types sorted in coercion order
+
+    Args:
+        required_types (list/tuple): collection of classes or instance of
+            list or dict with class information inside it.
+
+    Returns:
+        (list): coercion order sorted collection of classes or instance
+            of list or dict with class information inside it.
+    """
+
+    def index_getter(class_or_instance):
+        if isinstance(class_or_instance, list):
+            return COERCION_INDEX_BY_TYPE[list]
+        elif isinstance(class_or_instance, dict):
+            return COERCION_INDEX_BY_TYPE[dict]
+        elif (inspect.isclass(class_or_instance)
+                and issubclass(class_or_instance, ModelComposed)):
+            return COERCION_INDEX_BY_TYPE[ModelComposed]
+        elif (inspect.isclass(class_or_instance)
+                and issubclass(class_or_instance, ModelNormal)):
+            return COERCION_INDEX_BY_TYPE[ModelNormal]
+        elif (inspect.isclass(class_or_instance)
+                and issubclass(class_or_instance, ModelSimple)):
+            return COERCION_INDEX_BY_TYPE[ModelSimple]
+        elif class_or_instance in COERCION_INDEX_BY_TYPE:
+            return COERCION_INDEX_BY_TYPE[class_or_instance]
+        raise ApiValueError("Unsupported type: %s" % class_or_instance)
+
+    sorted_types = sorted(
+        required_types,
+        key=lambda class_or_instance: index_getter(class_or_instance)
+    )
+    return sorted_types
+
+
+def remove_uncoercible(required_types_classes, current_item, spec_property_naming,
+                       must_convert=True):
+    """Only keeps the type conversions that are possible
+
+    Args:
+        required_types_classes (tuple): tuple of classes that are required
+                          these should be ordered by COERCION_INDEX_BY_TYPE
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
+        current_item (any): the current item (input data) to be converted
+
+    Keyword Args:
+        must_convert (bool): if True the item to convert is of the wrong
+                          type and we want a big list of coercibles
+                          if False, we want a limited list of coercibles
+
+    Returns:
+        (list): the remaining coercible required types, classes only
+    """
+    current_type_simple = get_simple_class(current_item)
+
+    results_classes = []
+    for required_type_class in required_types_classes:
+        # convert our models to OpenApiModel
+        required_type_class_simplified = required_type_class
+        if isinstance(required_type_class_simplified, type):
+            if issubclass(required_type_class_simplified, ModelComposed):
+                required_type_class_simplified = ModelComposed
+            elif issubclass(required_type_class_simplified, ModelNormal):
+                required_type_class_simplified = ModelNormal
+            elif issubclass(required_type_class_simplified, ModelSimple):
+                required_type_class_simplified = ModelSimple
+
+        if required_type_class_simplified == current_type_simple:
+            # don't consider converting to one's own class
+            continue
+
+        class_pair = (current_type_simple, required_type_class_simplified)
+        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[spec_property_naming]:
+            results_classes.append(required_type_class)
+        elif class_pair in UPCONVERSION_TYPE_PAIRS:
+            results_classes.append(required_type_class)
+    return results_classes
+
+
+def get_required_type_classes(required_types_mixed):
+    """Converts the tuple required_types into a tuple and a dict described
+    below
+
+    Args:
+        required_types_mixed (tuple/list): will contain either classes or
+            instance of list or dict
+
+    Returns:
+        (valid_classes, dict_valid_class_to_child_types_mixed):
+            valid_classes (tuple): the valid classes that the current item
+                                   should be
+            dict_valid_class_to_child_types_mixed (doct):
+                valid_class (class): this is the key
+                child_types_mixed (list/dict/tuple): describes the valid child
+                    types
+    """
+    valid_classes = []
+    child_req_types_by_current_type = {}
+    for required_type in required_types_mixed:
+        if isinstance(required_type, list):
+            valid_classes.append(list)
+            child_req_types_by_current_type[list] = required_type
+        elif isinstance(required_type, tuple):
+            valid_classes.append(tuple)
+            child_req_types_by_current_type[tuple] = required_type
+        elif isinstance(required_type, dict):
+            valid_classes.append(dict)
+            child_req_types_by_current_type[dict] = required_type[str]
+        else:
+            valid_classes.append(required_type)
+    return tuple(valid_classes), child_req_types_by_current_type
+
+
+def change_keys_js_to_python(input_dict, model_class):
+    """
+    Converts from javascript_key keys in the input_dict to python_keys in
+    the output dict using the mapping in model_class.
+    If the input_dict contains a key which does not declared in the model_class,
+    the key is added to the output dict as is. The assumption is the model_class
+    may have undeclared properties (additionalProperties attribute in the OAS
+    document).
+    """
+
+    if getattr(model_class, 'attribute_map', None) is None:
+        return input_dict
+    output_dict = {}
+    reversed_attr_map = {value: key for key, value in
+                         model_class.attribute_map.items()}
+    for javascript_key, value in input_dict.items():
+        python_key = reversed_attr_map.get(javascript_key)
+        if python_key is None:
+            # if the key is unknown, it is in error or it is an
+            # additionalProperties variable
+            python_key = javascript_key
+        output_dict[python_key] = value
+    return output_dict
+
+
+def get_type_error(var_value, path_to_item, valid_classes, key_type=False):
+    error_msg = type_error_message(
+        var_name=path_to_item[-1],
+        var_value=var_value,
+        valid_classes=valid_classes,
+        key_type=key_type
+    )
+    return ApiTypeError(
+        error_msg,
+        path_to_item=path_to_item,
+        valid_classes=valid_classes,
+        key_type=key_type
+    )
+
+
+def deserialize_primitive(data, klass, path_to_item):
+    """Deserializes string to primitive type.
+
+    :param data: str/int/float
+    :param klass: str/class the class to convert to
+
+    :return: int, float, str, bool, date, datetime
+    """
+    additional_message = ""
+    try:
+        if klass in {datetime, date}:
+            additional_message = (
+                "If you need your parameter to have a fallback "
+                "string value, please set its type as `type: {}` in your "
+                "spec. That allows the value to be any type. "
+            )
+            if klass == datetime:
+                if len(data) < 8:
+                    raise ValueError("This is not a datetime")
+                # The string should be in iso8601 datetime format.
+                parsed_datetime = parse(data)
+                date_only = (
+                    parsed_datetime.hour == 0 and
+                    parsed_datetime.minute == 0 and
+                    parsed_datetime.second == 0 and
+                    parsed_datetime.tzinfo is None and
+                    8 <= len(data) <= 10
+                )
+                if date_only:
+                    raise ValueError("This is a date, not a datetime")
+                return parsed_datetime
+            elif klass == date:
+                if len(data) < 8:
+                    raise ValueError("This is not a date")
+                return parse(data).date()
+        else:
+            converted_value = klass(data)
+            if isinstance(data, str) and klass == float:
+                if str(converted_value) != data:
+                    # '7' -> 7.0 -> '7.0' != '7'
+                    raise ValueError('This is not a float')
+            return converted_value
+    except (OverflowError, ValueError) as ex:
+        # parse can raise OverflowError
+        six.raise_from(ApiValueError(
+            "{0}Failed to parse {1} as {2}".format(
+                additional_message, repr(data), get_py3_class_name(klass)
+            ),
+            path_to_item=path_to_item
+        ), ex)
+
+
+def get_discriminator_class(model_class,
+                            discr_name,
+                            discr_value, cls_visited):
+    """Returns the child class specified by the discriminator.
+
+    Args:
+        model_class (OpenApiModel): the model class.
+        discr_name (string): the name of the discriminator property.
+        discr_value (any): the discriminator value.
+        cls_visited (list): list of model classes that have been visited.
+            Used to determine the discriminator class without
+            visiting circular references indefinitely.
+
+    Returns:
+        used_model_class (class/None): the chosen child class that will be used
+            to deserialize the data, for example dog.Dog.
+            If a class is not found, None is returned.
+    """
+
+    if model_class in cls_visited:
+        # The class has already been visited and no suitable class was found.
+        return None
+    cls_visited.append(model_class)
+    used_model_class = None
+    if discr_name in model_class.discriminator:
+        class_name_to_discr_class = model_class.discriminator[discr_name]
+        used_model_class = class_name_to_discr_class.get(discr_value)
+    if used_model_class is None:
+        # We didn't find a discriminated class in class_name_to_discr_class.
+        # So look in the ancestor or descendant discriminators
+        # The discriminator mapping may exist in a descendant (anyOf, oneOf)
+        # or ancestor (allOf).
+        # Ancestor example: in the GrandparentAnimal -> ParentPet -> ChildCat
+        #   hierarchy, the discriminator mappings may be defined at any level
+        #   in the hierarchy.
+        # Descendant example:  mammal -> whale/zebra/Pig -> BasquePig/DanishPig
+        #   if we try to make BasquePig from mammal, we need to travel through
+        #   the oneOf descendant discriminators to find BasquePig
+        descendant_classes =  model_class._composed_schemas.get('oneOf', ()) + \
+            model_class._composed_schemas.get('anyOf', ())
+        ancestor_classes = model_class._composed_schemas.get('allOf', ())
+        possible_classes = descendant_classes + ancestor_classes
+        for cls in possible_classes:
+            # Check if the schema has inherited discriminators.
+            if hasattr(cls, 'discriminator') and cls.discriminator is not None:
+                used_model_class = get_discriminator_class(
+                                    cls, discr_name, discr_value, cls_visited)
+                if used_model_class is not None:
+                    return used_model_class
+    return used_model_class
+
+
+def deserialize_model(model_data, model_class, path_to_item, check_type,
+                      configuration, spec_property_naming):
+    """Deserializes model_data to model instance.
+
+    Args:
+        model_data (list/dict): data to instantiate the model
+        model_class (OpenApiModel): the model class
+        path_to_item (list): path to the model in the received data
+        check_type (bool): whether to check the data tupe for the values in
+            the model
+        configuration (Configuration): the instance to use to convert files
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
+
+    Returns:
+        model instance
+
+    Raise:
+        ApiTypeError
+        ApiValueError
+        ApiKeyError
+    """
+
+    kw_args = dict(_check_type=check_type,
+                   _path_to_item=path_to_item,
+                   _configuration=configuration,
+                   _spec_property_naming=spec_property_naming)
+
+    if issubclass(model_class, ModelSimple):
+        instance = model_class(value=model_data, **kw_args)
+        return instance
+    if isinstance(model_data, list):
+        instance = model_class(*model_data, **kw_args)
+    if isinstance(model_data, dict):
+        kw_args.update(model_data)
+        instance = model_class(**kw_args)
+    return instance
+
+
+def deserialize_file(response_data, configuration, content_disposition=None):
+    """Deserializes body to file
+
+    Saves response body into a file in a temporary folder,
+    using the filename from the `Content-Disposition` header if provided.
+
+    Args:
+        param response_data (str):  the file data to write
+        configuration (Configuration): the instance to use to convert files
+
+    Keyword Args:
+        content_disposition (str):  the value of the Content-Disposition
+            header
+
+    Returns:
+        (file_type): the deserialized file which is open
+            The user is responsible for closing and reading the file
+    """
+    fd, path = tempfile.mkstemp(dir=configuration.temp_folder_path)
+    os.close(fd)
+    os.remove(path)
+
+    if content_disposition:
+        filename = re.search(r'filename=[\'"]?([^\'"\s]+)[\'"]?',
+                             content_disposition).group(1)
+        path = os.path.join(os.path.dirname(path), filename)
+
+    with open(path, "wb") as f:
+        if six.PY3 and isinstance(response_data, str):
+            # in python3 change str to bytes so we can write it
+            response_data = response_data.encode('utf-8')
+        f.write(response_data)
+
+    f = open(path, "rb")
+    return f
+
+
+def attempt_convert_item(input_value, valid_classes, path_to_item,
+                         configuration, spec_property_naming, key_type=False,
+                         must_convert=False, check_type=True):
+    """
+    Args:
+        input_value (any): the data to convert
+        valid_classes (any): the classes that are valid
+        path_to_item (list): the path to the item to convert
+        configuration (Configuration): the instance to use to convert files
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
+        key_type (bool): if True we need to convert a key type (not supported)
+        must_convert (bool): if True we must convert
+        check_type (bool): if True we check the type or the returned data in
+            ModelComposed/ModelNormal/ModelSimple instances
+
+    Returns:
+        instance (any) the fixed item
+
+    Raises:
+        ApiTypeError
+        ApiValueError
+        ApiKeyError
+    """
+    valid_classes_ordered = order_response_types(valid_classes)
+    valid_classes_coercible = remove_uncoercible(
+        valid_classes_ordered, input_value, spec_property_naming)
+    if not valid_classes_coercible or key_type:
+        # we do not handle keytype errors, json will take care
+        # of this for us
+        if configuration is None or not configuration.discard_unknown_keys:
+            raise get_type_error(input_value, path_to_item, valid_classes,
+                                 key_type=key_type)
+    for valid_class in valid_classes_coercible:
+        try:
+            if issubclass(valid_class, OpenApiModel):
+                return deserialize_model(input_value, valid_class,
+                                         path_to_item, check_type,
+                                         configuration, spec_property_naming)
+            elif valid_class == file_type:
+                return deserialize_file(input_value, configuration)
+            return deserialize_primitive(input_value, valid_class,
+                                         path_to_item)
+        except (ApiTypeError, ApiValueError, ApiKeyError) as conversion_exc:
+            if must_convert:
+                raise conversion_exc
+            # if we have conversion errors when must_convert == False
+            # we ignore the exception and move on to the next class
+            continue
+    # we were unable to convert, must_convert == False
+    return input_value
+
+
+def is_type_nullable(input_type):
+    """
+    Returns true if None is an allowed value for the specified input_type.
+
+    A type is nullable if at least one of the following conditions is true:
+    1. The OAS 'nullable' attribute has been specified,
+    1. The type is the 'null' type,
+    1. The type is a anyOf/oneOf composed schema, and a child schema is
+       the 'null' type.
+    Args:
+        input_type (type): the class of the input_value that we are
+            checking
+    Returns:
+        bool
+    """
+    if input_type is none_type:
+        return True
+    if issubclass(input_type, OpenApiModel) and input_type._nullable:
+        return True
+    if issubclass(input_type, ModelComposed):
+        # If oneOf/anyOf, check if the 'null' type is one of the allowed types.
+        for t in input_type._composed_schemas.get('oneOf', ()):
+            if is_type_nullable(t): return True
+        for t in input_type._composed_schemas.get('anyOf', ()):
+            if is_type_nullable(t): return True
+    return False
+
+
+def is_valid_type(input_class_simple, valid_classes):
+    """
+    Args:
+        input_class_simple (class): the class of the input_value that we are
+            checking
+        valid_classes (tuple): the valid classes that the current item
+            should be
+    Returns:
+        bool
+    """
+    valid_type = input_class_simple in valid_classes
+    if not valid_type and (
+            issubclass(input_class_simple, OpenApiModel) or
+            input_class_simple is none_type):
+        for valid_class in valid_classes:
+            if input_class_simple is none_type and is_type_nullable(valid_class):
+                # Schema is oneOf/anyOf and the 'null' type is one of the allowed types.
+                return True
+            if not (issubclass(valid_class, OpenApiModel) and valid_class.discriminator):
+                continue
+            discr_propertyname_py = list(valid_class.discriminator.keys())[0]
+            discriminator_classes = (
+                valid_class.discriminator[discr_propertyname_py].values()
+            )
+            valid_type = is_valid_type(input_class_simple, discriminator_classes)
+            if valid_type:
+                return True
+    return valid_type
+
+
+def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
+                               spec_property_naming, _check_type, configuration=None):
+    """Raises a TypeError is there is a problem, otherwise returns value
+
+    Args:
+        input_value (any): the data to validate/convert
+        required_types_mixed (list/dict/tuple): A list of
+            valid classes, or a list tuples of valid classes, or a dict where
+            the value is a tuple of value classes
+        path_to_item: (list) the path to the data being validated
+            this stores a list of keys or indices to get to the data being
+            validated
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
+        _check_type: (boolean) if true, type will be checked and conversion
+            will be attempted.
+        configuration: (Configuration): the configuration class to use
+            when converting file_type items.
+            If passed, conversion will be attempted when possible
+            If not passed, no conversions will be attempted and
+            exceptions will be raised
+
+    Returns:
+        the correctly typed value
+
+    Raises:
+        ApiTypeError
+    """
+    results = get_required_type_classes(required_types_mixed)
+    valid_classes, child_req_types_by_current_type = results
+
+    input_class_simple = get_simple_class(input_value)
+    valid_type = is_valid_type(input_class_simple, valid_classes)
+    if not valid_type:
+        if configuration:
+            # if input_value is not valid_type try to convert it
+            converted_instance = attempt_convert_item(
+                input_value,
+                valid_classes,
+                path_to_item,
+                configuration,
+                spec_property_naming,
+                key_type=False,
+                must_convert=True
+            )
+            return converted_instance
+        else:
+            raise get_type_error(input_value, path_to_item, valid_classes,
+                                 key_type=False)
+
+    # input_value's type is in valid_classes
+    if len(valid_classes) > 1 and configuration:
+        # there are valid classes which are not the current class
+        valid_classes_coercible = remove_uncoercible(
+            valid_classes, input_value, spec_property_naming, must_convert=False)
+        if valid_classes_coercible:
+            converted_instance = attempt_convert_item(
+                input_value,
+                valid_classes_coercible,
+                path_to_item,
+                configuration,
+                spec_property_naming,
+                key_type=False,
+                must_convert=False
+            )
+            return converted_instance
+
+    if child_req_types_by_current_type == {}:
+        # all types are of the required types and there are no more inner
+        # variables left to look at
+        return input_value
+    inner_required_types = child_req_types_by_current_type.get(
+        type(input_value)
+    )
+    if inner_required_types is None:
+        # for this type, there are not more inner variables left to look at
+        return input_value
+    if isinstance(input_value, list):
+        if input_value == []:
+            # allow an empty list
+            return input_value
+        for index, inner_value in enumerate(input_value):
+            inner_path = list(path_to_item)
+            inner_path.append(index)
+            input_value[index] = validate_and_convert_types(
+                inner_value,
+                inner_required_types,
+                inner_path,
+                spec_property_naming,
+                _check_type,
+                configuration=configuration
+            )
+    elif isinstance(input_value, dict):
+        if input_value == {}:
+            # allow an empty dict
+            return input_value
+        for inner_key, inner_val in six.iteritems(input_value):
+            inner_path = list(path_to_item)
+            inner_path.append(inner_key)
+            if get_simple_class(inner_key) != str:
+                raise get_type_error(inner_key, inner_path, valid_classes,
+                                     key_type=True)
+            input_value[inner_key] = validate_and_convert_types(
+                inner_val,
+                inner_required_types,
+                inner_path,
+                spec_property_naming,
+                _check_type,
+                configuration=configuration
+            )
+    return input_value
+
+
+def model_to_dict(model_instance, serialize=True):
+    """Returns the model properties as a dict
+
+    Args:
+        model_instance (one of your model instances): the model instance that
+            will be converted to a dict.
+
+    Keyword Args:
+        serialize (bool): if True, the keys in the dict will be values from
+            attribute_map
+    """
+    result = {}
+
+    model_instances = [model_instance]
+    if model_instance._composed_schemas:
+        model_instances.extend(model_instance._composed_instances)
+    for model_instance in model_instances:
+        for attr, value in six.iteritems(model_instance._data_store):
+            if serialize:
+                # we use get here because additional property key names do not
+                # exist in attribute_map
+                attr = model_instance.attribute_map.get(attr, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: model_to_dict(x, serialize=serialize)
+                    if hasattr(x, '_data_store') else x, value
+                ))
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0],
+                                  model_to_dict(item[1], serialize=serialize))
+                    if hasattr(item[1], '_data_store') else item,
+                    value.items()
+                ))
+            elif isinstance(value, ModelSimple):
+                result[attr] = value.value
+            elif hasattr(value, '_data_store'):
+                result[attr] = model_to_dict(value, serialize=serialize)
+            else:
+                result[attr] = value
+
+    return result
+
+
+def type_error_message(var_value=None, var_name=None, valid_classes=None,
+                       key_type=None):
+    """
+    Keyword Args:
+        var_value (any): the variable which has the type_error
+        var_name (str): the name of the variable which has the typ error
+        valid_classes (tuple): the accepted classes for current_item's
+                                  value
+        key_type (bool): False if our value is a value in a dict
+                         True if it is a key in a dict
+                         False if our item is an item in a list
+    """
+    key_or_value = 'value'
+    if key_type:
+        key_or_value = 'key'
+    valid_classes_phrase = get_valid_classes_phrase(valid_classes)
+    msg = (
+        "Invalid type for variable '{0}'. Required {1} type {2} and "
+        "passed type was {3}".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+    )
+    return msg
+
+
+def get_valid_classes_phrase(input_classes):
+    """Returns a string phrase describing what types are allowed
+    Note: Adds the extra valid classes in python2
+    """
+    all_classes = list(input_classes)
+    if six.PY2 and str in input_classes:
+        all_classes.extend([str_py2, unicode_py2])
+    if six.PY2 and int in input_classes:
+        all_classes.extend([int_py2, long_py2])
+    all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+    all_class_names = [cls.__name__ for cls in all_classes]
+    if len(all_class_names) == 1:
+        return 'is {0}'.format(all_class_names[0])
+    return "is one of [{0}]".format(", ".join(all_class_names))
+
+
+def get_py3_class_name(input_class):
+    if six.PY2:
+        if input_class == str:
+            return 'str'
+        elif input_class == int:
+            return 'int'
+    return input_class.__name__
+
+
+def convert_js_args_to_python_args(fn):
+    from functools import wraps
+    @wraps(fn)
+    def wrapped_init(self, *args, **kwargs):
+        spec_property_naming = kwargs.get('_spec_property_naming', False)
+        if spec_property_naming:
+            kwargs = change_keys_js_to_python(kwargs, self.__class__)
+        return fn(self, *args, **kwargs)
+    return wrapped_init
+
+
+def get_allof_instances(self, model_args, constant_args):
+    """
+    Args:
+        self: the class we are handling
+        model_args (dict): var_name to var_value
+            used to make instances
+        constant_args (dict): var_name to var_value
+            used to make instances
+
+    Returns
+        composed_instances (list)
+    """
+    composed_instances = []
+    for allof_class in self._composed_schemas['allOf']:
+
+        # no need to handle changing js keys to python because
+        # for composed schemas, allof parameters are included in the
+        # composed schema and were changed to python keys in __new__
+        # extract a dict of only required keys from fixed_model_args
+        kwargs = {}
+        var_names = set(allof_class.openapi_types.keys())
+        for var_name in var_names:
+            if var_name in model_args:
+                kwargs[var_name] = model_args[var_name]
+
+        # and use it to make the instance
+        kwargs.update(constant_args)
+        try:
+            allof_instance = allof_class(**kwargs)
+            composed_instances.append(allof_instance)
+        except Exception as ex:
+            six.raise_from(ApiValueError(
+                "Invalid inputs given to generate an instance of '%s'. The "
+                "input data was invalid for the allOf schema '%s' in the composed "
+                "schema '%s'. Error=%s" % (
+                    allof_class.__name__,
+                    allof_class.__name__,
+                    self.__class__.__name__,
+                    str(ex)
+                )
+            ), ex)
+    return composed_instances
+
+
+def get_oneof_instance(self, model_args, constant_args):
+    """
+    Find the oneOf schema that matches the input data (e.g. payload).
+    If exactly one schema matches the input data, an instance of that schema
+    is returned.
+    If zero or more than one schema match the input data, an exception is raised.
+    In OAS 3.x, the payload MUST, by validation, match exactly one of the
+    schemas described by oneOf.
+    Args:
+        self: the class we are handling
+        model_args (dict): var_name to var_value
+            The input data, e.g. the payload that must match a oneOf schema
+            in the OpenAPI document.
+        constant_args (dict): var_name to var_value
+            args that every model requires, including configuration, server
+            and path to item.
+
+    Returns
+        oneof_instance (instance)
+    """
+    if len(self._composed_schemas['oneOf']) == 0:
+        return None
+
+    oneof_instances = []
+    # Iterate over each oneOf schema and determine if the input data
+    # matches the oneOf schemas.
+    for oneof_class in self._composed_schemas['oneOf']:
+        # The composed oneOf schema allows the 'null' type and the input data
+        # is the null value. This is a OAS >= 3.1 feature.
+        if oneof_class is none_type:
+            # skip none_types because we are deserializing dict data.
+            # none_type deserialization is handled in the __new__ method
+            continue
+
+        # transform js keys from input data to python keys in fixed_model_args
+        fixed_model_args = change_keys_js_to_python(
+            model_args, oneof_class)
+
+        # Extract a dict with the properties that are declared in the oneOf schema.
+        # Undeclared properties (e.g. properties that are allowed because of the
+        # additionalProperties attribute in the OAS document) are not added to
+        # the dict.
+        kwargs = {}
+        var_names = set(oneof_class.openapi_types.keys())
+        for var_name in var_names:
+            if var_name in fixed_model_args:
+                kwargs[var_name] = fixed_model_args[var_name]
+
+        # do not try to make a model with no input args
+        if len(kwargs) == 0:
+            continue
+
+        # and use it to make the instance
+        kwargs.update(constant_args)
+        try:
+            oneof_instance = oneof_class(**kwargs)
+            oneof_instances.append(oneof_instance)
+        except Exception:
+            pass
+    if len(oneof_instances) == 0:
+        raise ApiValueError(
+            "Invalid inputs given to generate an instance of %s. None "
+            "of the oneOf schemas matched the input data." %
+            self.__class__.__name__
+        )
+    elif len(oneof_instances) > 1:
+        raise ApiValueError(
+            "Invalid inputs given to generate an instance of %s. Multiple "
+            "oneOf schemas matched the inputs, but a max of one is allowed." %
+            self.__class__.__name__
+        )
+    return oneof_instances[0]
+
+
+def get_anyof_instances(self, model_args, constant_args):
+    """
+    Args:
+        self: the class we are handling
+        model_args (dict): var_name to var_value
+            The input data, e.g. the payload that must match at least one
+            anyOf child schema in the OpenAPI document.
+        constant_args (dict): var_name to var_value
+            args that every model requires, including configuration, server
+            and path to item.
+
+    Returns
+        anyof_instances (list)
+    """
+    anyof_instances = []
+    if len(self._composed_schemas['anyOf']) == 0:
+        return anyof_instances
+
+    for anyof_class in self._composed_schemas['anyOf']:
+        # The composed oneOf schema allows the 'null' type and the input data
+        # is the null value. This is a OAS >= 3.1 feature.
+        if anyof_class is none_type:
+            # skip none_types because we are deserializing dict data.
+            # none_type deserialization is handled in the __new__ method
+            continue
+
+        # transform js keys to python keys in fixed_model_args
+        fixed_model_args = change_keys_js_to_python(model_args, anyof_class)
+
+        # extract a dict of only required keys from these_model_vars
+        kwargs = {}
+        var_names = set(anyof_class.openapi_types.keys())
+        for var_name in var_names:
+            if var_name in fixed_model_args:
+                kwargs[var_name] = fixed_model_args[var_name]
+
+        # do not try to make a model with no input args
+        if len(kwargs) == 0:
+            continue
+
+        # and use it to make the instance
+        kwargs.update(constant_args)
+        try:
+            anyof_instance = anyof_class(**kwargs)
+            anyof_instances.append(anyof_instance)
+        except Exception:
+            pass
+    if len(anyof_instances) == 0:
+        raise ApiValueError(
+            "Invalid inputs given to generate an instance of %s. None of the "
+            "anyOf schemas matched the inputs." %
+            self.__class__.__name__
+        )
+    return anyof_instances
+
+
+def get_additional_properties_model_instances(
+        composed_instances, self):
+    additional_properties_model_instances = []
+    all_instances = [self]
+    all_instances.extend(composed_instances)
+    for instance in all_instances:
+        if instance.additional_properties_type is not None:
+            additional_properties_model_instances.append(instance)
+    return additional_properties_model_instances
+
+
+def get_var_name_to_model_instances(self, composed_instances):
+    var_name_to_model_instances = {}
+    all_instances = [self]
+    all_instances.extend(composed_instances)
+    for instance in all_instances:
+        for var_name in instance.openapi_types:
+            if var_name not in var_name_to_model_instances:
+                var_name_to_model_instances[var_name] = [instance]
+            else:
+                var_name_to_model_instances[var_name].append(instance)
+    return var_name_to_model_instances
+
+
+def get_unused_args(self, composed_instances, model_args):
+    unused_args = dict(model_args)
+    # arguments apssed to self were already converted to python names
+    # before __init__ was called
+    for var_name_py in self.attribute_map:
+        if var_name_py in unused_args:
+            del unused_args[var_name_py]
+    for instance in composed_instances:
+        if instance.__class__ in self._composed_schemas['allOf']:
+            for var_name_py in instance.attribute_map:
+                if var_name_py in unused_args:
+                    del unused_args[var_name_py]
+        else:
+            for var_name_js in instance.attribute_map.values():
+                if var_name_js in unused_args:
+                    del unused_args[var_name_js]
+    return unused_args
+
+
+def validate_get_composed_info(constant_args, model_args, self):
+    """
+    For composed schemas, generate schema instances for
+    all schemas in the oneOf/anyOf/allOf definition. If additional
+    properties are allowed, also assign those properties on
+    all matched schemas that contain additionalProperties.
+    Openapi schemas are python classes.
+
+    Exceptions are raised if:
+    - 0 or > 1 oneOf schema matches the model_args input data
+    - no anyOf schema matches the model_args input data
+    - any of the allOf schemas do not match the model_args input data
+
+    Args:
+        constant_args (dict): these are the args that every model requires
+        model_args (dict): these are the required and optional spec args that
+            were passed in to make this model
+        self (class): the class that we are instantiating
+            This class contains self._composed_schemas
+
+    Returns:
+        composed_info (list): length three
+            composed_instances (list): the composed instances which are not
+                self
+            var_name_to_model_instances (dict): a dict going from var_name
+                to the model_instance which holds that var_name
+                the model_instance may be self or an instance of one of the
+                classes in self.composed_instances()
+            additional_properties_model_instances (list): a list of the
+                model instances which have the property
+                additional_properties_type. This list can include self
+    """
+    # create composed_instances
+    composed_instances = []
+    allof_instances = get_allof_instances(self, model_args, constant_args)
+    composed_instances.extend(allof_instances)
+    oneof_instance = get_oneof_instance(self, model_args, constant_args)
+    if oneof_instance is not None:
+        composed_instances.append(oneof_instance)
+    anyof_instances = get_anyof_instances(self, model_args, constant_args)
+    composed_instances.extend(anyof_instances)
+
+    # map variable names to composed_instances
+    var_name_to_model_instances = get_var_name_to_model_instances(
+        self, composed_instances)
+
+    # set additional_properties_model_instances
+    additional_properties_model_instances = (
+        get_additional_properties_model_instances(composed_instances, self)
+    )
+
+    # set any remaining values
+    unused_args = get_unused_args(self, composed_instances, model_args)
+    if len(unused_args) > 0 and \
+            len(additional_properties_model_instances) == 0 and \
+            (self._configuration is None or
+                not self._configuration.discard_unknown_keys):
+        raise ApiValueError(
+            "Invalid input arguments input when making an instance of "
+            "class %s. Not all inputs were used. The unused input data "
+            "is %s" % (self.__class__.__name__, unused_args)
+        )
+
+    # no need to add additional_properties to var_name_to_model_instances here
+    # because additional_properties_model_instances will direct us to that
+    # instance when we use getattr or setattr
+    # and we update var_name_to_model_instances in setattr
+
+    return [
+      composed_instances,
+      var_name_to_model_instances,
+      additional_properties_model_instances,
+      unused_args
+    ]
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/models/__init__.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/models/__init__.py
new file mode 100644
index 000000000000..57bbacb357b7
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/models/__init__.py
@@ -0,0 +1,13 @@
+# coding: utf-8
+
+# flake8: noqa
+
+# import all models into this package
+# if you have many models here with many references from one model to another this may
+# raise a RecursionError
+# to avoid this, import only the models that you directly need like:
+# from from x_auth_id_alias.model.pet import Pet
+# or import this package, but before doing it, use:
+# import sys
+# sys.setrecursionlimit(n)
+
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/rest.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/rest.py
new file mode 100644
index 000000000000..354091c3a977
--- /dev/null
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/rest.py
@@ -0,0 +1,291 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension x-auth-id-alias
+
+    This specification shows how to use x-auth-id-alias extension for API keys.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+
+import io
+import json
+import logging
+import re
+import ssl
+
+import certifi
+# python 2 and python 3 compatibility library
+import six
+from six.moves.urllib.parse import urlencode
+import urllib3
+
+from x_auth_id_alias.exceptions import ApiException, ApiValueError
+
+
+logger = logging.getLogger(__name__)
+
+
+class RESTResponse(io.IOBase):
+
+    def __init__(self, resp):
+        self.urllib3_response = resp
+        self.status = resp.status
+        self.reason = resp.reason
+        self.data = resp.data
+
+    def getheaders(self):
+        """Returns a dictionary of the response headers."""
+        return self.urllib3_response.getheaders()
+
+    def getheader(self, name, default=None):
+        """Returns a given response header."""
+        return self.urllib3_response.getheader(name, default)
+
+
+class RESTClientObject(object):
+
+    def __init__(self, configuration, pools_size=4, maxsize=None):
+        # urllib3.PoolManager will pass all kw parameters to connectionpool
+        # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/poolmanager.py#L75  # noqa: E501
+        # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/connectionpool.py#L680  # noqa: E501
+        # maxsize is the number of requests to host that are allowed in parallel  # noqa: E501
+        # Custom SSL certificates and client certificates: http://urllib3.readthedocs.io/en/latest/advanced-usage.html  # noqa: E501
+
+        # cert_reqs
+        if configuration.verify_ssl:
+            cert_reqs = ssl.CERT_REQUIRED
+        else:
+            cert_reqs = ssl.CERT_NONE
+
+        # ca_certs
+        if configuration.ssl_ca_cert:
+            ca_certs = configuration.ssl_ca_cert
+        else:
+            # if not set certificate file, use Mozilla's root certificates.
+            ca_certs = certifi.where()
+
+        addition_pool_args = {}
+        if configuration.assert_hostname is not None:
+            addition_pool_args['assert_hostname'] = configuration.assert_hostname  # noqa: E501
+
+        if configuration.retries is not None:
+            addition_pool_args['retries'] = configuration.retries
+
+        if maxsize is None:
+            if configuration.connection_pool_maxsize is not None:
+                maxsize = configuration.connection_pool_maxsize
+            else:
+                maxsize = 4
+
+        # https pool manager
+        if configuration.proxy:
+            self.pool_manager = urllib3.ProxyManager(
+                num_pools=pools_size,
+                maxsize=maxsize,
+                cert_reqs=cert_reqs,
+                ca_certs=ca_certs,
+                cert_file=configuration.cert_file,
+                key_file=configuration.key_file,
+                proxy_url=configuration.proxy,
+                proxy_headers=configuration.proxy_headers,
+                **addition_pool_args
+            )
+        else:
+            self.pool_manager = urllib3.PoolManager(
+                num_pools=pools_size,
+                maxsize=maxsize,
+                cert_reqs=cert_reqs,
+                ca_certs=ca_certs,
+                cert_file=configuration.cert_file,
+                key_file=configuration.key_file,
+                **addition_pool_args
+            )
+
+    def request(self, method, url, query_params=None, headers=None,
+                body=None, post_params=None, _preload_content=True,
+                _request_timeout=None):
+        """Perform requests.
+
+        :param method: http request method
+        :param url: http request url
+        :param query_params: query parameters in the url
+        :param headers: http request headers
+        :param body: request json body, for `application/json`
+        :param post_params: request post parameters,
+                            `application/x-www-form-urlencoded`
+                            and `multipart/form-data`
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        """
+        method = method.upper()
+        assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT',
+                          'PATCH', 'OPTIONS']
+
+        if post_params and body:
+            raise ApiValueError(
+                "body parameter cannot be used with post_params parameter."
+            )
+
+        post_params = post_params or {}
+        headers = headers or {}
+
+        timeout = None
+        if _request_timeout:
+            if isinstance(_request_timeout, (int, ) if six.PY3 else (int, long)):  # noqa: E501,F821
+                timeout = urllib3.Timeout(total=_request_timeout)
+            elif (isinstance(_request_timeout, tuple) and
+                  len(_request_timeout) == 2):
+                timeout = urllib3.Timeout(
+                    connect=_request_timeout[0], read=_request_timeout[1])
+
+        if 'Content-Type' not in headers:
+            headers['Content-Type'] = 'application/json'
+
+        try:
+            # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
+            if method in ['POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE']:
+                if query_params:
+                    url += '?' + urlencode(query_params)
+                if re.search('json', headers['Content-Type'], re.IGNORECASE):
+                    request_body = None
+                    if body is not None:
+                        request_body = json.dumps(body)
+                    r = self.pool_manager.request(
+                        method, url,
+                        body=request_body,
+                        preload_content=_preload_content,
+                        timeout=timeout,
+                        headers=headers)
+                elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
+                    r = self.pool_manager.request(
+                        method, url,
+                        fields=post_params,
+                        encode_multipart=False,
+                        preload_content=_preload_content,
+                        timeout=timeout,
+                        headers=headers)
+                elif headers['Content-Type'] == 'multipart/form-data':
+                    # must del headers['Content-Type'], or the correct
+                    # Content-Type which generated by urllib3 will be
+                    # overwritten.
+                    del headers['Content-Type']
+                    r = self.pool_manager.request(
+                        method, url,
+                        fields=post_params,
+                        encode_multipart=True,
+                        preload_content=_preload_content,
+                        timeout=timeout,
+                        headers=headers)
+                # Pass a `string` parameter directly in the body to support
+                # other content types than Json when `body` argument is
+                # provided in serialized form
+                elif isinstance(body, str) or isinstance(body, bytes):
+                    request_body = body
+                    r = self.pool_manager.request(
+                        method, url,
+                        body=request_body,
+                        preload_content=_preload_content,
+                        timeout=timeout,
+                        headers=headers)
+                else:
+                    # Cannot generate the request from given parameters
+                    msg = """Cannot prepare a request message for provided
+                             arguments. Please check that your arguments match
+                             declared content type."""
+                    raise ApiException(status=0, reason=msg)
+            # For `GET`, `HEAD`
+            else:
+                r = self.pool_manager.request(method, url,
+                                              fields=query_params,
+                                              preload_content=_preload_content,
+                                              timeout=timeout,
+                                              headers=headers)
+        except urllib3.exceptions.SSLError as e:
+            msg = "{0}\n{1}".format(type(e).__name__, str(e))
+            raise ApiException(status=0, reason=msg)
+
+        if _preload_content:
+            r = RESTResponse(r)
+
+            # log response body
+            logger.debug("response body: %s", r.data)
+
+        if not 200 <= r.status <= 299:
+            raise ApiException(http_resp=r)
+
+        return r
+
+    def GET(self, url, headers=None, query_params=None, _preload_content=True,
+            _request_timeout=None):
+        return self.request("GET", url,
+                            headers=headers,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            query_params=query_params)
+
+    def HEAD(self, url, headers=None, query_params=None, _preload_content=True,
+             _request_timeout=None):
+        return self.request("HEAD", url,
+                            headers=headers,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            query_params=query_params)
+
+    def OPTIONS(self, url, headers=None, query_params=None, post_params=None,
+                body=None, _preload_content=True, _request_timeout=None):
+        return self.request("OPTIONS", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            body=body)
+
+    def DELETE(self, url, headers=None, query_params=None, body=None,
+               _preload_content=True, _request_timeout=None):
+        return self.request("DELETE", url,
+                            headers=headers,
+                            query_params=query_params,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            body=body)
+
+    def POST(self, url, headers=None, query_params=None, post_params=None,
+             body=None, _preload_content=True, _request_timeout=None):
+        return self.request("POST", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            body=body)
+
+    def PUT(self, url, headers=None, query_params=None, post_params=None,
+            body=None, _preload_content=True, _request_timeout=None):
+        return self.request("PUT", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            body=body)
+
+    def PATCH(self, url, headers=None, query_params=None, post_params=None,
+              body=None, _preload_content=True, _request_timeout=None):
+        return self.request("PATCH", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            body=body)
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/.gitignore b/samples/openapi3/client/features/dynamic-servers/python-experimental/.gitignore
new file mode 100644
index 000000000000..43995bd42fa2
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/.gitignore
@@ -0,0 +1,66 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.venv/
+.python-version
+.pytest_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/.gitlab-ci.yml b/samples/openapi3/client/features/dynamic-servers/python-experimental/.gitlab-ci.yml
new file mode 100644
index 000000000000..b242dc37516c
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/.gitlab-ci.yml
@@ -0,0 +1,33 @@
+# ref: https://docs.gitlab.com/ee/ci/README.html
+
+stages:
+  - test
+
+.nosetest:
+  stage: test
+  script:
+   - pip install -r requirements.txt
+   - pip install -r test-requirements.txt
+   - pytest --cov=dynamic_servers
+
+nosetest-2.7:
+  extends: .nosetest
+  image: python:2.7-alpine
+nosetest-3.3:
+  extends: .nosetest
+  image: python:3.3-alpine
+nosetest-3.4:
+  extends: .nosetest
+  image: python:3.4-alpine
+nosetest-3.5:
+  extends: .nosetest
+  image: python:3.5-alpine
+nosetest-3.6:
+  extends: .nosetest
+  image: python:3.6-alpine
+nosetest-3.7:
+  extends: .nosetest
+  image: python:3.7-alpine
+nosetest-3.8:
+  extends: .nosetest
+  image: python:3.8-alpine
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator-ignore b/samples/openapi3/client/features/dynamic-servers/python-experimental/.openapi-generator-ignore
similarity index 100%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator-ignore
rename to samples/openapi3/client/features/dynamic-servers/python-experimental/.openapi-generator-ignore
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/.openapi-generator/FILES b/samples/openapi3/client/features/dynamic-servers/python-experimental/.openapi-generator/FILES
new file mode 100644
index 000000000000..e9b184541660
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/.openapi-generator/FILES
@@ -0,0 +1,23 @@
+.gitignore
+.gitlab-ci.yml
+.travis.yml
+README.md
+docs/UsageApi.md
+dynamic_servers/__init__.py
+dynamic_servers/api/__init__.py
+dynamic_servers/api/usage_api.py
+dynamic_servers/api_client.py
+dynamic_servers/apis/__init__.py
+dynamic_servers/configuration.py
+dynamic_servers/exceptions.py
+dynamic_servers/model/__init__.py
+dynamic_servers/model_utils.py
+dynamic_servers/models/__init__.py
+dynamic_servers/rest.py
+git_push.sh
+requirements.txt
+setup.cfg
+setup.py
+test-requirements.txt
+test/__init__.py
+tox.ini
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/openapi3/client/features/dynamic-servers/python-experimental/.openapi-generator/VERSION
similarity index 100%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
rename to samples/openapi3/client/features/dynamic-servers/python-experimental/.openapi-generator/VERSION
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/.travis.yml b/samples/openapi3/client/features/dynamic-servers/python-experimental/.travis.yml
new file mode 100644
index 000000000000..e6f2ea657f76
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/.travis.yml
@@ -0,0 +1,17 @@
+# ref: https://docs.travis-ci.com/user/languages/python
+language: python
+python:
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+# command to install dependencies
+install:
+  - "pip install -r requirements.txt"
+  - "pip install -r test-requirements.txt"
+# command to run tests
+script: pytest --cov=dynamic_servers
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/README.md b/samples/openapi3/client/features/dynamic-servers/python-experimental/README.md
new file mode 100644
index 000000000000..81db8a329f8f
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/README.md
@@ -0,0 +1,116 @@
+# dynamic-servers
+This specification shows how to use dynamic servers.
+
+This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 1.0.0
+- Package version: 1.0.0
+- Build package: org.openapitools.codegen.languages.PythonClientExperimentalCodegen
+
+## Requirements.
+
+Python 2.7 and 3.4+
+
+## Installation & Usage
+### pip install
+
+If the python package is hosted on a repository, you can install directly using:
+
+```sh
+pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
+```
+(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git`)
+
+Then import the package:
+```python
+import dynamic_servers
+```
+
+### Setuptools
+
+Install via [Setuptools](http://pypi.python.org/pypi/setuptools).
+
+```sh
+python setup.py install --user
+```
+(or `sudo python setup.py install` to install the package for all users)
+
+Then import the package:
+```python
+import dynamic_servers
+```
+
+## Getting Started
+
+Please follow the [installation procedure](#installation--usage) and then run the following:
+
+```python
+from __future__ import print_function
+
+import time
+import dynamic_servers
+from pprint import pprint
+from dynamic_servers.api import usage_api
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = dynamic_servers.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+
+
+# Enter a context with an instance of the API client
+with dynamic_servers.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = usage_api.UsageApi(api_client)
+    
+    try:
+        # Use custom server
+        api_response = api_instance.custom_server()
+        pprint(api_response)
+    except dynamic_servers.ApiException as e:
+        print("Exception when calling UsageApi->custom_server: %s\n" % e)
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*UsageApi* | [**custom_server**](docs/UsageApi.md#custom_server) | **GET** /custom | Use custom server
+*UsageApi* | [**default_server**](docs/UsageApi.md#default_server) | **GET** /default | Use default server
+
+
+## Documentation For Models
+
+
+
+## Documentation For Authorization
+
+ All endpoints do not require authorization.
+
+## Author
+
+
+
+
+## Notes for Large OpenAPI documents
+If the OpenAPI document is large, imports in dynamic_servers.apis and dynamic_servers.models may fail with a
+RecursionError indicating the maximum recursion limit has been exceeded. In that case, there are a couple of solutions:
+
+Solution 1:
+Use specific imports for apis and models like:
+- `from dynamic_servers.api.default_api import DefaultApi`
+- `from dynamic_servers.model.pet import Pet`
+
+Solution 1:
+Before importing the package, adjust the maximum recursion limit as shown below:
+```
+import sys
+sys.setrecursionlimit(1500)
+import dynamic_servers
+from dynamic_servers.apis import *
+from dynamic_servers.models import *
+```
+
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/docs/UsageApi.md b/samples/openapi3/client/features/dynamic-servers/python-experimental/docs/UsageApi.md
new file mode 100644
index 000000000000..3c4ed134c538
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/docs/UsageApi.md
@@ -0,0 +1,128 @@
+# dynamic_servers.UsageApi
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**custom_server**](UsageApi.md#custom_server) | **GET** /custom | Use custom server
+[**default_server**](UsageApi.md#default_server) | **GET** /default | Use default server
+
+
+# **custom_server**
+> {str: (bool, date, datetime, dict, float, int, list, str, none_type)} custom_server()
+
+Use custom server
+
+Use custom server
+
+### Example
+
+```python
+from __future__ import print_function
+import time
+import dynamic_servers
+from dynamic_servers.api import usage_api
+from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = dynamic_servers.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+
+# Enter a context with an instance of the API client
+with dynamic_servers.ApiClient() as api_client:
+    # Create an instance of the API class
+    api_instance = usage_api.UsageApi(api_client)
+    
+    # example, this endpoint has no required or optional parameters
+    try:
+        # Use custom server
+        api_response = api_instance.custom_server()
+        pprint(api_response)
+    except dynamic_servers.ApiException as e:
+        print("Exception when calling UsageApi->custom_server: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | successful operation |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **default_server**
+> {str: (bool, date, datetime, dict, float, int, list, str, none_type)} default_server()
+
+Use default server
+
+Use default server
+
+### Example
+
+```python
+from __future__ import print_function
+import time
+import dynamic_servers
+from dynamic_servers.api import usage_api
+from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = dynamic_servers.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+
+# Enter a context with an instance of the API client
+with dynamic_servers.ApiClient() as api_client:
+    # Create an instance of the API class
+    api_instance = usage_api.UsageApi(api_client)
+    
+    # example, this endpoint has no required or optional parameters
+    try:
+        # Use default server
+        api_response = api_instance.default_server()
+        pprint(api_response)
+    except dynamic_servers.ApiException as e:
+        print("Exception when calling UsageApi->default_server: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | successful operation |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/__init__.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/__init__.py
new file mode 100644
index 000000000000..e42afd4939e5
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/__init__.py
@@ -0,0 +1,31 @@
+# coding: utf-8
+
+# flake8: noqa
+
+"""
+    OpenAPI Extension with dynamic servers
+
+    This specification shows how to use dynamic servers.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+
+__version__ = "1.0.0"
+
+# import ApiClient
+from dynamic_servers.api_client import ApiClient
+
+# import Configuration
+from dynamic_servers.configuration import Configuration
+
+# import exceptions
+from dynamic_servers.exceptions import OpenApiException
+from dynamic_servers.exceptions import ApiAttributeError
+from dynamic_servers.exceptions import ApiTypeError
+from dynamic_servers.exceptions import ApiValueError
+from dynamic_servers.exceptions import ApiKeyError
+from dynamic_servers.exceptions import ApiException
\ No newline at end of file
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/api/__init__.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/api/__init__.py
new file mode 100644
index 000000000000..e4e46e3843e0
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/api/__init__.py
@@ -0,0 +1,6 @@
+from __future__ import absolute_import
+
+# flake8: noqa
+
+# import apis into api package
+from dynamic_servers.api.usage_api import UsageApi
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/api/usage_api.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/api/usage_api.py
new file mode 100644
index 000000000000..d73b46b4ebba
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/api/usage_api.py
@@ -0,0 +1,304 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension with dynamic servers
+
+    This specification shows how to use dynamic servers.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+import sys  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from dynamic_servers.api_client import ApiClient, Endpoint
+from dynamic_servers.model_utils import (  # noqa: F401
+    check_allowed_values,
+    check_validations,
+    date,
+    datetime,
+    file_type,
+    int,
+    none_type,
+    str,
+    validate_and_convert_types
+)
+
+
+class UsageApi(object):
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+        def __custom_server(
+            self,
+            **kwargs
+        ):
+            """Use custom server  # noqa: E501
+
+            Use custom server  # noqa: E501
+            This method makes a synchronous HTTP request by default. To make an
+            asynchronous HTTP request, please pass async_req=True
+
+            >>> thread = api.custom_server(async_req=True)
+            >>> result = thread.get()
+
+
+            Keyword Args:
+                _return_http_data_only (bool): response data without head status
+                    code and headers. Default is True.
+                _preload_content (bool): if False, the urllib3.HTTPResponse object
+                    will be returned without reading/decoding response data.
+                    Default is True.
+                _request_timeout (float/tuple): timeout setting for this request. If one
+                    number provided, it will be total request timeout. It can also
+                    be a pair (tuple) of (connection, read) timeouts.
+                    Default is None.
+                _check_input_type (bool): specifies if type checking
+                    should be done one the data sent to the server.
+                    Default is True.
+                _check_return_type (bool): specifies if type checking
+                    should be done one the data received from the server.
+                    Default is True.
+                _host_index (int/None): specifies the index of the server
+                    that we want to use.
+                    Default is read from the configuration.
+                async_req (bool): execute request asynchronously
+
+            Returns:
+                {str: (bool, date, datetime, dict, float, int, list, str, none_type)}
+                    If the method is called asynchronously, returns the request
+                    thread.
+            """
+            kwargs['async_req'] = kwargs.get(
+                'async_req', False
+            )
+            kwargs['_return_http_data_only'] = kwargs.get(
+                '_return_http_data_only', True
+            )
+            kwargs['_preload_content'] = kwargs.get(
+                '_preload_content', True
+            )
+            kwargs['_request_timeout'] = kwargs.get(
+                '_request_timeout', None
+            )
+            kwargs['_check_input_type'] = kwargs.get(
+                '_check_input_type', True
+            )
+            kwargs['_check_return_type'] = kwargs.get(
+                '_check_return_type', True
+            )
+            kwargs['_host_index'] = kwargs.get('_host_index')
+            return self.call_with_http_info(**kwargs)
+
+        self.custom_server = Endpoint(
+            settings={
+                'response_type': ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},),
+                'auth': [],
+                'endpoint_path': '/custom',
+                'operation_id': 'custom_server',
+                'http_method': 'GET',
+                'servers': [
+                    {
+                        'url': "https://{server}.swagger.io:{port}/v2",
+                        'description': "No description provided",
+                        'variables': {
+                            'server': {
+                                'description': "No description provided",
+                                'default_value': "custom-petstore",
+                                'enum_values': [
+                                    "custom-petstore",
+                                    "custom-qa-petstore",
+                                    "custom-dev-petstore"
+                                ]
+                                },
+                            'port': {
+                                'description': "No description provided",
+                                'default_value': "8080",
+                                'enum_values': [
+                                    "80",
+                                    "8080"
+                                ]
+                                }
+                            }
+                    },
+                    {
+                        'url': "https://localhost:8081/{version}",
+                        'description': "The local custom server",
+                        'variables': {
+                            'version': {
+                                'description': "No description provided",
+                                'default_value': "v2",
+                                'enum_values': [
+                                    "v1",
+                                    "v2",
+                                    "v3"
+                                ]
+                                }
+                            }
+                    },
+                    {
+                        'url': "https://third.example.com/{prefix}",
+                        'description': "The local custom server",
+                        'variables': {
+                            'prefix': {
+                                'description': "No description provided",
+                                'default_value': "custom",
+                                }
+                            }
+                    },
+                ]
+            },
+            params_map={
+                'all': [
+                ],
+                'required': [],
+                'nullable': [
+                ],
+                'enum': [
+                ],
+                'validation': [
+                ]
+            },
+            root_map={
+                'validations': {
+                },
+                'allowed_values': {
+                },
+                'openapi_types': {
+                },
+                'attribute_map': {
+                },
+                'location_map': {
+                },
+                'collection_format_map': {
+                }
+            },
+            headers_map={
+                'accept': [
+                    'application/json'
+                ],
+                'content_type': [],
+            },
+            api_client=api_client,
+            callable=__custom_server
+        )
+
+        def __default_server(
+            self,
+            **kwargs
+        ):
+            """Use default server  # noqa: E501
+
+            Use default server  # noqa: E501
+            This method makes a synchronous HTTP request by default. To make an
+            asynchronous HTTP request, please pass async_req=True
+
+            >>> thread = api.default_server(async_req=True)
+            >>> result = thread.get()
+
+
+            Keyword Args:
+                _return_http_data_only (bool): response data without head status
+                    code and headers. Default is True.
+                _preload_content (bool): if False, the urllib3.HTTPResponse object
+                    will be returned without reading/decoding response data.
+                    Default is True.
+                _request_timeout (float/tuple): timeout setting for this request. If one
+                    number provided, it will be total request timeout. It can also
+                    be a pair (tuple) of (connection, read) timeouts.
+                    Default is None.
+                _check_input_type (bool): specifies if type checking
+                    should be done one the data sent to the server.
+                    Default is True.
+                _check_return_type (bool): specifies if type checking
+                    should be done one the data received from the server.
+                    Default is True.
+                _host_index (int/None): specifies the index of the server
+                    that we want to use.
+                    Default is read from the configuration.
+                async_req (bool): execute request asynchronously
+
+            Returns:
+                {str: (bool, date, datetime, dict, float, int, list, str, none_type)}
+                    If the method is called asynchronously, returns the request
+                    thread.
+            """
+            kwargs['async_req'] = kwargs.get(
+                'async_req', False
+            )
+            kwargs['_return_http_data_only'] = kwargs.get(
+                '_return_http_data_only', True
+            )
+            kwargs['_preload_content'] = kwargs.get(
+                '_preload_content', True
+            )
+            kwargs['_request_timeout'] = kwargs.get(
+                '_request_timeout', None
+            )
+            kwargs['_check_input_type'] = kwargs.get(
+                '_check_input_type', True
+            )
+            kwargs['_check_return_type'] = kwargs.get(
+                '_check_return_type', True
+            )
+            kwargs['_host_index'] = kwargs.get('_host_index')
+            return self.call_with_http_info(**kwargs)
+
+        self.default_server = Endpoint(
+            settings={
+                'response_type': ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},),
+                'auth': [],
+                'endpoint_path': '/default',
+                'operation_id': 'default_server',
+                'http_method': 'GET',
+                'servers': None,
+            },
+            params_map={
+                'all': [
+                ],
+                'required': [],
+                'nullable': [
+                ],
+                'enum': [
+                ],
+                'validation': [
+                ]
+            },
+            root_map={
+                'validations': {
+                },
+                'allowed_values': {
+                },
+                'openapi_types': {
+                },
+                'attribute_map': {
+                },
+                'location_map': {
+                },
+                'collection_format_map': {
+                }
+            },
+            headers_map={
+                'accept': [
+                    'application/json'
+                ],
+                'content_type': [],
+            },
+            api_client=api_client,
+            callable=__default_server
+        )
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/api_client.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/api_client.py
new file mode 100644
index 000000000000..ca8d70ce9a53
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/api_client.py
@@ -0,0 +1,810 @@
+# coding: utf-8
+"""
+    OpenAPI Extension with dynamic servers
+
+    This specification shows how to use dynamic servers.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+from __future__ import absolute_import
+
+import json
+import atexit
+import mimetypes
+from multiprocessing.pool import ThreadPool
+import os
+import re
+
+# python 2 and python 3 compatibility library
+import six
+from six.moves.urllib.parse import quote
+
+from dynamic_servers import rest
+from dynamic_servers.configuration import Configuration
+from dynamic_servers.exceptions import ApiTypeError, ApiValueError, ApiException
+from dynamic_servers.model_utils import (
+    ModelNormal,
+    ModelSimple,
+    ModelComposed,
+    check_allowed_values,
+    check_validations,
+    date,
+    datetime,
+    deserialize_file,
+    file_type,
+    int,
+    model_to_dict,
+    none_type,
+    str,
+    validate_and_convert_types
+)
+
+
+class ApiClient(object):
+    """Generic API client for OpenAPI client library builds.
+
+    OpenAPI generic API client. This client handles the client-
+    server communication, and is invariant across implementations. Specifics of
+    the methods and models for each application are generated from the OpenAPI
+    templates.
+
+    NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+    Do not edit the class manually.
+
+    :param configuration: .Configuration object for this client
+    :param header_name: a header to pass when making calls to the API.
+    :param header_value: a header value to pass when making calls to
+        the API.
+    :param cookie: a cookie to include in the header when making calls
+        to the API
+    :param pool_threads: The number of threads to use for async requests
+        to the API. More threads means more concurrent API requests.
+    """
+
+    # six.binary_type python2=str, python3=bytes
+    # six.text_type python2=unicode, python3=str
+    PRIMITIVE_TYPES = (
+        (float, bool, six.binary_type, six.text_type) + six.integer_types
+    )
+    _pool = None
+
+    def __init__(self, configuration=None, header_name=None, header_value=None,
+                 cookie=None, pool_threads=1):
+        if configuration is None:
+            configuration = Configuration()
+        self.configuration = configuration
+        self.pool_threads = pool_threads
+
+        self.rest_client = rest.RESTClientObject(configuration)
+        self.default_headers = {}
+        if header_name is not None:
+            self.default_headers[header_name] = header_value
+        self.cookie = cookie
+        # Set default User-Agent.
+        self.user_agent = 'OpenAPI-Generator/1.0.0/python'
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.close()
+
+    def close(self):
+        if self._pool:
+            self._pool.close()
+            self._pool.join()
+            self._pool = None
+            if hasattr(atexit, 'unregister'):
+                atexit.unregister(self.close)
+
+    @property
+    def pool(self):
+        """Create thread pool on first request
+         avoids instantiating unused threadpool for blocking clients.
+        """
+        if self._pool is None:
+            atexit.register(self.close)
+            self._pool = ThreadPool(self.pool_threads)
+        return self._pool
+
+    @property
+    def user_agent(self):
+        """User agent for this API client"""
+        return self.default_headers['User-Agent']
+
+    @user_agent.setter
+    def user_agent(self, value):
+        self.default_headers['User-Agent'] = value
+
+    def set_default_header(self, header_name, header_value):
+        self.default_headers[header_name] = header_value
+
+    def __call_api(
+            self, resource_path, method, path_params=None,
+            query_params=None, header_params=None, body=None, post_params=None,
+            files=None, response_type=None, auth_settings=None,
+            _return_http_data_only=None, collection_formats=None,
+            _preload_content=True, _request_timeout=None, _host=None,
+            _check_type=None):
+
+        config = self.configuration
+
+        # header parameters
+        header_params = header_params or {}
+        header_params.update(self.default_headers)
+        if self.cookie:
+            header_params['Cookie'] = self.cookie
+        if header_params:
+            header_params = self.sanitize_for_serialization(header_params)
+            header_params = dict(self.parameters_to_tuples(header_params,
+                                                           collection_formats))
+
+        # path parameters
+        if path_params:
+            path_params = self.sanitize_for_serialization(path_params)
+            path_params = self.parameters_to_tuples(path_params,
+                                                    collection_formats)
+            for k, v in path_params:
+                # specified safe chars, encode everything
+                resource_path = resource_path.replace(
+                    '{%s}' % k,
+                    quote(str(v), safe=config.safe_chars_for_path_param)
+                )
+
+        # query parameters
+        if query_params:
+            query_params = self.sanitize_for_serialization(query_params)
+            query_params = self.parameters_to_tuples(query_params,
+                                                     collection_formats)
+
+        # post parameters
+        if post_params or files:
+            post_params = post_params if post_params else []
+            post_params = self.sanitize_for_serialization(post_params)
+            post_params = self.parameters_to_tuples(post_params,
+                                                    collection_formats)
+            post_params.extend(self.files_parameters(files))
+
+        # body
+        if body:
+            body = self.sanitize_for_serialization(body)
+
+        # auth setting
+        self.update_params_for_auth(header_params, query_params,
+                                    auth_settings, resource_path, method, body)
+
+        # request url
+        if _host is None:
+            url = self.configuration.host + resource_path
+        else:
+            # use server/host defined in path or operation instead
+            url = _host + resource_path
+
+        try:
+            # perform request and return response
+            response_data = self.request(
+                method, url, query_params=query_params, headers=header_params,
+                post_params=post_params, body=body,
+                _preload_content=_preload_content,
+                _request_timeout=_request_timeout)
+        except ApiException as e:
+            e.body = e.body.decode('utf-8') if six.PY3 else e.body
+            raise e
+
+        content_type = response_data.getheader('content-type')
+
+        self.last_response = response_data
+
+        return_data = response_data
+
+        if not _preload_content:
+            return (return_data)
+            return return_data
+
+        if six.PY3 and response_type not in ["file", "bytes"]:
+            match = None
+            if content_type is not None:
+                match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type)
+            encoding = match.group(1) if match else "utf-8"
+            response_data.data = response_data.data.decode(encoding)
+
+        # deserialize response data
+        if response_type:
+            return_data = self.deserialize(
+                response_data,
+                response_type,
+                _check_type
+            )
+        else:
+            return_data = None
+
+        if _return_http_data_only:
+            return (return_data)
+        else:
+            return (return_data, response_data.status,
+                    response_data.getheaders())
+
+    def sanitize_for_serialization(self, obj):
+        """Builds a JSON POST object.
+
+        If obj is None, return None.
+        If obj is str, int, long, float, bool, return directly.
+        If obj is datetime.datetime, datetime.date
+            convert to string in iso8601 format.
+        If obj is list, sanitize each element in the list.
+        If obj is dict, return the dict.
+        If obj is OpenAPI model, return the properties dict.
+
+        :param obj: The data to serialize.
+        :return: The serialized form of data.
+        """
+        if obj is None:
+            return None
+        elif isinstance(obj, self.PRIMITIVE_TYPES):
+            return obj
+        elif isinstance(obj, list):
+            return [self.sanitize_for_serialization(sub_obj)
+                    for sub_obj in obj]
+        elif isinstance(obj, tuple):
+            return tuple(self.sanitize_for_serialization(sub_obj)
+                         for sub_obj in obj)
+        elif isinstance(obj, (datetime, date)):
+            return obj.isoformat()
+
+        if isinstance(obj, dict):
+            obj_dict = obj
+        elif isinstance(obj, ModelNormal) or isinstance(obj, ModelComposed):
+            # Convert model obj to dict
+            # Convert attribute name to json key in
+            # model definition for request
+            obj_dict = model_to_dict(obj, serialize=True)
+        elif isinstance(obj, ModelSimple):
+            return self.sanitize_for_serialization(obj.value)
+
+        return {key: self.sanitize_for_serialization(val)
+                for key, val in six.iteritems(obj_dict)}
+
+    def deserialize(self, response, response_type, _check_type):
+        """Deserializes response into an object.
+
+        :param response: RESTResponse object to be deserialized.
+        :param response_type: For the response, a tuple containing:
+            valid classes
+            a list containing valid classes (for list schemas)
+            a dict containing a tuple of valid classes as the value
+            Example values:
+            (str,)
+            (Pet,)
+            (float, none_type)
+            ([int, none_type],)
+            ({str: (bool, str, int, float, date, datetime, str, none_type)},)
+        :param _check_type: boolean, whether to check the types of the data
+            received from the server
+        :type _check_type: bool
+
+        :return: deserialized object.
+        """
+        # handle file downloading
+        # save response body into a tmp file and return the instance
+        if response_type == (file_type,):
+            content_disposition = response.getheader("Content-Disposition")
+            return deserialize_file(response.data, self.configuration,
+                                    content_disposition=content_disposition)
+
+        # fetch data from response object
+        try:
+            received_data = json.loads(response.data)
+        except ValueError:
+            received_data = response.data
+
+        # store our data under the key of 'received_data' so users have some
+        # context if they are deserializing a string and the data type is wrong
+        deserialized_data = validate_and_convert_types(
+            received_data,
+            response_type,
+            ['received_data'],
+            True,
+            _check_type,
+            configuration=self.configuration
+        )
+        return deserialized_data
+
+    def call_api(self, resource_path, method,
+                 path_params=None, query_params=None, header_params=None,
+                 body=None, post_params=None, files=None,
+                 response_type=None, auth_settings=None, async_req=None,
+                 _return_http_data_only=None, collection_formats=None,
+                 _preload_content=True, _request_timeout=None, _host=None,
+                 _check_type=None):
+        """Makes the HTTP request (synchronous) and returns deserialized data.
+
+        To make an async_req request, set the async_req parameter.
+
+        :param resource_path: Path to method endpoint.
+        :param method: Method to call.
+        :param path_params: Path parameters in the url.
+        :param query_params: Query parameters in the url.
+        :param header_params: Header parameters to be
+            placed in the request header.
+        :param body: Request body.
+        :param post_params dict: Request post form parameters,
+            for `application/x-www-form-urlencoded`, `multipart/form-data`.
+        :param auth_settings list: Auth Settings names for the request.
+        :param response_type: For the response, a tuple containing:
+            valid classes
+            a list containing valid classes (for list schemas)
+            a dict containing a tuple of valid classes as the value
+            Example values:
+            (str,)
+            (Pet,)
+            (float, none_type)
+            ([int, none_type],)
+            ({str: (bool, str, int, float, date, datetime, str, none_type)},)
+        :param files: key -> field name, value -> a list of open file
+            objects for `multipart/form-data`.
+        :type files: dict
+        :param async_req bool: execute request asynchronously
+        :type async_req: bool, optional
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :type _return_http_data_only: bool, optional
+        :param collection_formats: dict of collection formats for path, query,
+            header, and post parameters.
+        :type collection_formats: dict, optional
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :type _preload_content: bool, optional
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :param _check_type: boolean describing if the data back from the server
+            should have its type checked.
+        :type _check_type: bool, optional
+        :return:
+            If async_req parameter is True,
+            the request will be called asynchronously.
+            The method will return the request thread.
+            If parameter async_req is False or missing,
+            then the method will return the response directly.
+        """
+        if not async_req:
+            return self.__call_api(resource_path, method,
+                                   path_params, query_params, header_params,
+                                   body, post_params, files,
+                                   response_type, auth_settings,
+                                   _return_http_data_only, collection_formats,
+                                   _preload_content, _request_timeout, _host,
+                                   _check_type)
+
+        return self.pool.apply_async(self.__call_api, (resource_path,
+                                                       method, path_params,
+                                                       query_params,
+                                                       header_params, body,
+                                                       post_params, files,
+                                                       response_type,
+                                                       auth_settings,
+                                                       _return_http_data_only,
+                                                       collection_formats,
+                                                       _preload_content,
+                                                       _request_timeout,
+                                                       _host, _check_type))
+
+    def request(self, method, url, query_params=None, headers=None,
+                post_params=None, body=None, _preload_content=True,
+                _request_timeout=None):
+        """Makes the HTTP request using RESTClient."""
+        if method == "GET":
+            return self.rest_client.GET(url,
+                                        query_params=query_params,
+                                        _preload_content=_preload_content,
+                                        _request_timeout=_request_timeout,
+                                        headers=headers)
+        elif method == "HEAD":
+            return self.rest_client.HEAD(url,
+                                         query_params=query_params,
+                                         _preload_content=_preload_content,
+                                         _request_timeout=_request_timeout,
+                                         headers=headers)
+        elif method == "OPTIONS":
+            return self.rest_client.OPTIONS(url,
+                                            query_params=query_params,
+                                            headers=headers,
+                                            post_params=post_params,
+                                            _preload_content=_preload_content,
+                                            _request_timeout=_request_timeout,
+                                            body=body)
+        elif method == "POST":
+            return self.rest_client.POST(url,
+                                         query_params=query_params,
+                                         headers=headers,
+                                         post_params=post_params,
+                                         _preload_content=_preload_content,
+                                         _request_timeout=_request_timeout,
+                                         body=body)
+        elif method == "PUT":
+            return self.rest_client.PUT(url,
+                                        query_params=query_params,
+                                        headers=headers,
+                                        post_params=post_params,
+                                        _preload_content=_preload_content,
+                                        _request_timeout=_request_timeout,
+                                        body=body)
+        elif method == "PATCH":
+            return self.rest_client.PATCH(url,
+                                          query_params=query_params,
+                                          headers=headers,
+                                          post_params=post_params,
+                                          _preload_content=_preload_content,
+                                          _request_timeout=_request_timeout,
+                                          body=body)
+        elif method == "DELETE":
+            return self.rest_client.DELETE(url,
+                                           query_params=query_params,
+                                           headers=headers,
+                                           _preload_content=_preload_content,
+                                           _request_timeout=_request_timeout,
+                                           body=body)
+        else:
+            raise ApiValueError(
+                "http method must be `GET`, `HEAD`, `OPTIONS`,"
+                " `POST`, `PATCH`, `PUT` or `DELETE`."
+            )
+
+    def parameters_to_tuples(self, params, collection_formats):
+        """Get parameters as list of tuples, formatting collections.
+
+        :param params: Parameters as dict or list of two-tuples
+        :param dict collection_formats: Parameter collection formats
+        :return: Parameters as list of tuples, collections formatted
+        """
+        new_params = []
+        if collection_formats is None:
+            collection_formats = {}
+        for k, v in six.iteritems(params) if isinstance(params, dict) else params:  # noqa: E501
+            if k in collection_formats:
+                collection_format = collection_formats[k]
+                if collection_format == 'multi':
+                    new_params.extend((k, value) for value in v)
+                else:
+                    if collection_format == 'ssv':
+                        delimiter = ' '
+                    elif collection_format == 'tsv':
+                        delimiter = '\t'
+                    elif collection_format == 'pipes':
+                        delimiter = '|'
+                    else:  # csv is the default
+                        delimiter = ','
+                    new_params.append(
+                        (k, delimiter.join(str(value) for value in v)))
+            else:
+                new_params.append((k, v))
+        return new_params
+
+    def files_parameters(self, files=None):
+        """Builds form parameters.
+
+        :param files: None or a dict with key=param_name and
+            value is a list of open file objects
+        :return: List of tuples of form parameters with file data
+        """
+        if files is None:
+            return []
+
+        params = []
+        for param_name, file_instances in six.iteritems(files):
+            if file_instances is None:
+                # if the file field is nullable, skip None values
+                continue
+            for file_instance in file_instances:
+                if file_instance is None:
+                    # if the file field is nullable, skip None values
+                    continue
+                if file_instance.closed is True:
+                    raise ApiValueError(
+                        "Cannot read a closed file. The passed in file_type "
+                        "for %s must be open." % param_name
+                    )
+                filename = os.path.basename(file_instance.name)
+                filedata = file_instance.read()
+                mimetype = (mimetypes.guess_type(filename)[0] or
+                            'application/octet-stream')
+                params.append(
+                    tuple([param_name, tuple([filename, filedata, mimetype])]))
+                file_instance.close()
+
+        return params
+
+    def select_header_accept(self, accepts):
+        """Returns `Accept` based on an array of accepts provided.
+
+        :param accepts: List of headers.
+        :return: Accept (e.g. application/json).
+        """
+        if not accepts:
+            return
+
+        accepts = [x.lower() for x in accepts]
+
+        if 'application/json' in accepts:
+            return 'application/json'
+        else:
+            return ', '.join(accepts)
+
+    def select_header_content_type(self, content_types):
+        """Returns `Content-Type` based on an array of content_types provided.
+
+        :param content_types: List of content-types.
+        :return: Content-Type (e.g. application/json).
+        """
+        if not content_types:
+            return 'application/json'
+
+        content_types = [x.lower() for x in content_types]
+
+        if 'application/json' in content_types or '*/*' in content_types:
+            return 'application/json'
+        else:
+            return content_types[0]
+
+    def update_params_for_auth(self, headers, querys, auth_settings,
+                               resource_path, method, body):
+        """Updates header and query params based on authentication setting.
+
+        :param headers: Header parameters dict to be updated.
+        :param querys: Query parameters tuple list to be updated.
+        :param auth_settings: Authentication setting identifiers list.
+        :param resource_path: A string representation of the HTTP request resource path.
+        :param method: A string representation of the HTTP request method.
+        :param body: A object representing the body of the HTTP request.
+            The object type is the return value of sanitize_for_serialization().
+        """
+        if not auth_settings:
+            return
+
+        for auth in auth_settings:
+            auth_setting = self.configuration.auth_settings().get(auth)
+            if auth_setting:
+                if auth_setting['in'] == 'cookie':
+                    headers['Cookie'] = auth_setting['value']
+                elif auth_setting['in'] == 'header':
+                    if auth_setting['type'] != 'http-signature':
+                        headers[auth_setting['key']] = auth_setting['value']
+                elif auth_setting['in'] == 'query':
+                    querys.append((auth_setting['key'], auth_setting['value']))
+                else:
+                    raise ApiValueError(
+                        'Authentication token must be in `query` or `header`'
+                    )
+
+
+class Endpoint(object):
+    def __init__(self, settings=None, params_map=None, root_map=None,
+                 headers_map=None, api_client=None, callable=None):
+        """Creates an endpoint
+
+        Args:
+            settings (dict): see below key value pairs
+                'response_type' (tuple/None): response type
+                'auth' (list): a list of auth type keys
+                'endpoint_path' (str): the endpoint path
+                'operation_id' (str): endpoint string identifier
+                'http_method' (str): POST/PUT/PATCH/GET etc
+                'servers' (list): list of str servers that this endpoint is at
+            params_map (dict): see below key value pairs
+                'all' (list): list of str endpoint parameter names
+                'required' (list): list of required parameter names
+                'nullable' (list): list of nullable parameter names
+                'enum' (list): list of parameters with enum values
+                'validation' (list): list of parameters with validations
+            root_map
+                'validations' (dict): the dict mapping endpoint parameter tuple
+                    paths to their validation dictionaries
+                'allowed_values' (dict): the dict mapping endpoint parameter
+                    tuple paths to their allowed_values (enum) dictionaries
+                'openapi_types' (dict): param_name to openapi type
+                'attribute_map' (dict): param_name to camelCase name
+                'location_map' (dict): param_name to  'body', 'file', 'form',
+                    'header', 'path', 'query'
+                collection_format_map (dict): param_name to `csv` etc.
+            headers_map (dict): see below key value pairs
+                'accept' (list): list of Accept header strings
+                'content_type' (list): list of Content-Type header strings
+            api_client (ApiClient) api client instance
+            callable (function): the function which is invoked when the
+                Endpoint is called
+        """
+        self.settings = settings
+        self.params_map = params_map
+        self.params_map['all'].extend([
+            'async_req',
+            '_host_index',
+            '_preload_content',
+            '_request_timeout',
+            '_return_http_data_only',
+            '_check_input_type',
+            '_check_return_type'
+        ])
+        self.params_map['nullable'].extend(['_request_timeout'])
+        self.validations = root_map['validations']
+        self.allowed_values = root_map['allowed_values']
+        self.openapi_types = root_map['openapi_types']
+        extra_types = {
+            'async_req': (bool,),
+            '_host_index': (none_type, int),
+            '_preload_content': (bool,),
+            '_request_timeout': (none_type, int, (int,), [int]),
+            '_return_http_data_only': (bool,),
+            '_check_input_type': (bool,),
+            '_check_return_type': (bool,)
+        }
+        self.openapi_types.update(extra_types)
+        self.attribute_map = root_map['attribute_map']
+        self.location_map = root_map['location_map']
+        self.collection_format_map = root_map['collection_format_map']
+        self.headers_map = headers_map
+        self.api_client = api_client
+        self.callable = callable
+
+    def __validate_inputs(self, kwargs):
+        for param in self.params_map['enum']:
+            if param in kwargs:
+                check_allowed_values(
+                    self.allowed_values,
+                    (param,),
+                    kwargs[param]
+                )
+
+        for param in self.params_map['validation']:
+            if param in kwargs:
+                check_validations(
+                    self.validations,
+                    (param,),
+                    kwargs[param],
+                    configuration=self.api_client.configuration
+                )
+
+        if kwargs['_check_input_type'] is False:
+            return
+
+        for key, value in six.iteritems(kwargs):
+            fixed_val = validate_and_convert_types(
+                value,
+                self.openapi_types[key],
+                [key],
+                False,
+                kwargs['_check_input_type'],
+                configuration=self.api_client.configuration
+            )
+            kwargs[key] = fixed_val
+
+    def __gather_params(self, kwargs):
+        params = {
+            'body': None,
+            'collection_format': {},
+            'file': {},
+            'form': [],
+            'header': {},
+            'path': {},
+            'query': []
+        }
+
+        for param_name, param_value in six.iteritems(kwargs):
+            param_location = self.location_map.get(param_name)
+            if param_location is None:
+                continue
+            if param_location:
+                if param_location == 'body':
+                    params['body'] = param_value
+                    continue
+                base_name = self.attribute_map[param_name]
+                if (param_location == 'form' and
+                        self.openapi_types[param_name] == (file_type,)):
+                    params['file'][param_name] = [param_value]
+                elif (param_location == 'form' and
+                        self.openapi_types[param_name] == ([file_type],)):
+                    # param_value is already a list
+                    params['file'][param_name] = param_value
+                elif param_location in {'form', 'query'}:
+                    param_value_full = (base_name, param_value)
+                    params[param_location].append(param_value_full)
+                if param_location not in {'form', 'query'}:
+                    params[param_location][base_name] = param_value
+                collection_format = self.collection_format_map.get(param_name)
+                if collection_format:
+                    params['collection_format'][base_name] = collection_format
+
+        return params
+
+    def __call__(self, *args, **kwargs):
+        """ This method is invoked when endpoints are called
+        Example:
+        pet_api = PetApi()
+        pet_api.add_pet  # this is an instance of the class Endpoint
+        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
+        which then invokes the callable functions stored in that endpoint at
+        pet_api.add_pet.callable or self.callable in this class
+        """
+        return self.callable(self, *args, **kwargs)
+
+    def call_with_http_info(self, **kwargs):
+
+        try:
+            index = self.api_client.configuration.server_operation_index.get(
+                self.settings['operation_id'], self.api_client.configuration.server_index
+            ) if kwargs['_host_index'] is None else kwargs['_host_index']
+            server_variables = self.api_client.configuration.server_operation_variables.get(
+                self.settings['operation_id'], self.api_client.configuration.server_variables
+            )
+            _host = self.api_client.configuration.get_host_from_settings(
+                index, variables=server_variables, servers=self.settings['servers']
+            )
+        except IndexError:
+            if self.settings['servers']:
+                raise ApiValueError(
+                    "Invalid host index. Must be 0 <= index < %s" %
+                    len(self.settings['servers'])
+                )
+            _host = None
+
+        for key, value in six.iteritems(kwargs):
+            if key not in self.params_map['all']:
+                raise ApiTypeError(
+                    "Got an unexpected parameter '%s'"
+                    " to method `%s`" %
+                    (key, self.settings['operation_id'])
+                )
+            # only throw this nullable ApiValueError if _check_input_type
+            # is False, if _check_input_type==True we catch this case
+            # in self.__validate_inputs
+            if (key not in self.params_map['nullable'] and value is None
+                    and kwargs['_check_input_type'] is False):
+                raise ApiValueError(
+                    "Value may not be None for non-nullable parameter `%s`"
+                    " when calling `%s`" %
+                    (key, self.settings['operation_id'])
+                )
+
+        for key in self.params_map['required']:
+            if key not in kwargs.keys():
+                raise ApiValueError(
+                    "Missing the required parameter `%s` when calling "
+                    "`%s`" % (key, self.settings['operation_id'])
+                )
+
+        self.__validate_inputs(kwargs)
+
+        params = self.__gather_params(kwargs)
+
+        accept_headers_list = self.headers_map['accept']
+        if accept_headers_list:
+            params['header']['Accept'] = self.api_client.select_header_accept(
+                accept_headers_list)
+
+        content_type_headers_list = self.headers_map['content_type']
+        if content_type_headers_list:
+            header_list = self.api_client.select_header_content_type(
+                content_type_headers_list)
+            params['header']['Content-Type'] = header_list
+
+        return self.api_client.call_api(
+            self.settings['endpoint_path'], self.settings['http_method'],
+            params['path'],
+            params['query'],
+            params['header'],
+            body=params['body'],
+            post_params=params['form'],
+            files=params['file'],
+            response_type=self.settings['response_type'],
+            auth_settings=self.settings['auth'],
+            async_req=kwargs['async_req'],
+            _check_type=kwargs['_check_return_type'],
+            _return_http_data_only=kwargs['_return_http_data_only'],
+            _preload_content=kwargs['_preload_content'],
+            _request_timeout=kwargs['_request_timeout'],
+            _host=_host,
+            collection_formats=params['collection_format'])
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/apis/__init__.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/apis/__init__.py
new file mode 100644
index 000000000000..74230e156deb
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/apis/__init__.py
@@ -0,0 +1,18 @@
+# coding: utf-8
+
+# flake8: noqa
+
+# Import all APIs into this package.
+# If you have many APIs here with many many models used in each API this may
+# raise a `RecursionError`.
+# In order to avoid this, import only the API that you directly need like:
+#
+#   from .api.pet_api import PetApi
+#
+# or import this package, but before doing it, use:
+#
+#   import sys
+#   sys.setrecursionlimit(n)
+
+# Import APIs into API package:
+from dynamic_servers.api.usage_api import UsageApi
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/configuration.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/configuration.py
new file mode 100644
index 000000000000..8ece9e3c1350
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/configuration.py
@@ -0,0 +1,474 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension with dynamic servers
+
+    This specification shows how to use dynamic servers.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+
+import copy
+import logging
+import multiprocessing
+import sys
+import urllib3
+
+import six
+from six.moves import http_client as httplib
+from dynamic_servers.exceptions import ApiValueError
+
+
+JSON_SCHEMA_VALIDATION_KEYWORDS = {
+    'multipleOf', 'maximum', 'exclusiveMaximum',
+    'minimum', 'exclusiveMinimum', 'maxLength',
+    'minLength', 'pattern', 'maxItems', 'minItems'
+}
+
+class Configuration(object):
+    """NOTE: This class is auto generated by OpenAPI Generator
+
+    Ref: https://openapi-generator.tech
+    Do not edit the class manually.
+
+    :param host: Base url
+    :param api_key: Dict to store API key(s).
+      Each entry in the dict specifies an API key.
+      The dict key is the name of the security scheme in the OAS specification.
+      The dict value is the API key secret.
+    :param api_key_prefix: Dict to store API prefix (e.g. Bearer)
+      The dict key is the name of the security scheme in the OAS specification.
+      The dict value is an API key prefix when generating the auth data.
+    :param username: Username for HTTP basic authentication
+    :param password: Password for HTTP basic authentication
+    :param discard_unknown_keys: Boolean value indicating whether to discard
+      unknown properties. A server may send a response that includes additional
+      properties that are not known by the client in the following scenarios:
+      1. The OpenAPI document is incomplete, i.e. it does not match the server
+         implementation.
+      2. The client was generated using an older version of the OpenAPI document
+         and the server has been upgraded since then.
+      If a schema in the OpenAPI document defines the additionalProperties attribute,
+      then all undeclared properties received by the server are injected into the
+      additional properties map. In that case, there are undeclared properties, and
+      nothing to discard.
+    :param disabled_client_side_validations (string): Comma-separated list of
+      JSON schema validation keywords to disable JSON schema structural validation
+      rules. The following keywords may be specified: multipleOf, maximum,
+      exclusiveMaximum, minimum, exclusiveMinimum, maxLength, minLength, pattern,
+      maxItems, minItems.
+      By default, the validation is performed for data generated locally by the client
+      and data received from the server, independent of any validation performed by
+      the server side. If the input data does not satisfy the JSON schema validation
+      rules specified in the OpenAPI document, an exception is raised.
+      If disabled_client_side_validations is set, structural validation is
+      disabled. This can be useful to troubleshoot data validation problem, such as
+      when the OpenAPI document validation rules do not match the actual API data
+      received by the server.
+    :param server_index: Index to servers configuration.
+    :param server_variables: Mapping with string values to replace variables in
+      templated server configuration. The validation of enums is performed for
+      variables with defined enum values before.
+    :param server_operation_index: Mapping from operation ID to an index to server
+      configuration.
+    :param server_operation_variables: Mapping from operation ID to a mapping with
+      string values to replace variables in templated server configuration.
+      The validation of enums is performed for variables with defined enum values before.
+
+    """
+
+    _default = None
+
+    def __init__(self, host=None,
+                 api_key=None, api_key_prefix=None,
+                 username=None, password=None,
+                 discard_unknown_keys=False,
+                 disabled_client_side_validations="",
+                 server_index=None, server_variables=None,
+                 server_operation_index=None, server_operation_variables=None,
+                 ):
+        """Constructor
+        """
+        self._base_path = "http://petstore.swagger.io:80/v2" if host is None else host
+        """Default Base url
+        """
+        self.server_index = 0 if server_index is None and host is None else server_index
+        self.server_operation_index = server_operation_index or {}
+        """Default server index
+        """
+        self.server_variables = server_variables or {}
+        self.server_operation_variables = server_operation_variables or {}
+        """Default server variables
+        """
+        self.temp_folder_path = None
+        """Temp file folder for downloading files
+        """
+        # Authentication Settings
+        self.api_key = {}
+        if api_key:
+            self.api_key = api_key
+        """dict to store API key(s)
+        """
+        self.api_key_prefix = {}
+        if api_key_prefix:
+            self.api_key_prefix = api_key_prefix
+        """dict to store API prefix (e.g. Bearer)
+        """
+        self.refresh_api_key_hook = None
+        """function hook to refresh API key if expired
+        """
+        self.username = username
+        """Username for HTTP basic authentication
+        """
+        self.password = password
+        """Password for HTTP basic authentication
+        """
+        self.discard_unknown_keys = discard_unknown_keys
+        self.disabled_client_side_validations = disabled_client_side_validations
+        self.logger = {}
+        """Logging Settings
+        """
+        self.logger["package_logger"] = logging.getLogger("dynamic_servers")
+        self.logger["urllib3_logger"] = logging.getLogger("urllib3")
+        self.logger_format = '%(asctime)s %(levelname)s %(message)s'
+        """Log format
+        """
+        self.logger_stream_handler = None
+        """Log stream handler
+        """
+        self.logger_file_handler = None
+        """Log file handler
+        """
+        self.logger_file = None
+        """Debug file location
+        """
+        self.debug = False
+        """Debug switch
+        """
+
+        self.verify_ssl = True
+        """SSL/TLS verification
+           Set this to false to skip verifying SSL certificate when calling API
+           from https server.
+        """
+        self.ssl_ca_cert = None
+        """Set this to customize the certificate file to verify the peer.
+        """
+        self.cert_file = None
+        """client certificate file
+        """
+        self.key_file = None
+        """client key file
+        """
+        self.assert_hostname = None
+        """Set this to True/False to enable/disable SSL hostname verification.
+        """
+
+        self.connection_pool_maxsize = multiprocessing.cpu_count() * 5
+        """urllib3 connection pool's maximum number of connections saved
+           per pool. urllib3 uses 1 connection as default value, but this is
+           not the best value when you are making a lot of possibly parallel
+           requests to the same host, which is often the case here.
+           cpu_count * 5 is used as default value to increase performance.
+        """
+
+        self.proxy = None
+        """Proxy URL
+        """
+        self.proxy_headers = None
+        """Proxy headers
+        """
+        self.safe_chars_for_path_param = ''
+        """Safe chars for path_param
+        """
+        self.retries = None
+        """Adding retries to override urllib3 default value 3
+        """
+        # Enable client side validation
+        self.client_side_validation = True
+
+    def __deepcopy__(self, memo):
+        cls = self.__class__
+        result = cls.__new__(cls)
+        memo[id(self)] = result
+        for k, v in self.__dict__.items():
+            if k not in ('logger', 'logger_file_handler'):
+                setattr(result, k, copy.deepcopy(v, memo))
+        # shallow copy of loggers
+        result.logger = copy.copy(self.logger)
+        # use setters to configure loggers
+        result.logger_file = self.logger_file
+        result.debug = self.debug
+        return result
+
+    def __setattr__(self, name, value):
+        object.__setattr__(self, name, value)
+        if name == 'disabled_client_side_validations':
+            s = set(filter(None, value.split(',')))
+            for v in s:
+                if v not in JSON_SCHEMA_VALIDATION_KEYWORDS:
+                    raise ApiValueError(
+                        "Invalid keyword: '{0}''".format(v))
+            self._disabled_client_side_validations = s
+
+    @classmethod
+    def set_default(cls, default):
+        """Set default instance of configuration.
+
+        It stores default configuration, which can be
+        returned by get_default_copy method.
+
+        :param default: object of Configuration
+        """
+        cls._default = copy.deepcopy(default)
+
+    @classmethod
+    def get_default_copy(cls):
+        """Return new instance of configuration.
+
+        This method returns newly created, based on default constructor,
+        object of Configuration class or returns a copy of default
+        configuration passed by the set_default method.
+
+        :return: The configuration object.
+        """
+        if cls._default is not None:
+            return copy.deepcopy(cls._default)
+        return Configuration()
+
+    @property
+    def logger_file(self):
+        """The logger file.
+
+        If the logger_file is None, then add stream handler and remove file
+        handler. Otherwise, add file handler and remove stream handler.
+
+        :param value: The logger_file path.
+        :type: str
+        """
+        return self.__logger_file
+
+    @logger_file.setter
+    def logger_file(self, value):
+        """The logger file.
+
+        If the logger_file is None, then add stream handler and remove file
+        handler. Otherwise, add file handler and remove stream handler.
+
+        :param value: The logger_file path.
+        :type: str
+        """
+        self.__logger_file = value
+        if self.__logger_file:
+            # If set logging file,
+            # then add file handler and remove stream handler.
+            self.logger_file_handler = logging.FileHandler(self.__logger_file)
+            self.logger_file_handler.setFormatter(self.logger_formatter)
+            for _, logger in six.iteritems(self.logger):
+                logger.addHandler(self.logger_file_handler)
+
+    @property
+    def debug(self):
+        """Debug status
+
+        :param value: The debug status, True or False.
+        :type: bool
+        """
+        return self.__debug
+
+    @debug.setter
+    def debug(self, value):
+        """Debug status
+
+        :param value: The debug status, True or False.
+        :type: bool
+        """
+        self.__debug = value
+        if self.__debug:
+            # if debug status is True, turn on debug logging
+            for _, logger in six.iteritems(self.logger):
+                logger.setLevel(logging.DEBUG)
+            # turn on httplib debug
+            httplib.HTTPConnection.debuglevel = 1
+        else:
+            # if debug status is False, turn off debug logging,
+            # setting log level to default `logging.WARNING`
+            for _, logger in six.iteritems(self.logger):
+                logger.setLevel(logging.WARNING)
+            # turn off httplib debug
+            httplib.HTTPConnection.debuglevel = 0
+
+    @property
+    def logger_format(self):
+        """The logger format.
+
+        The logger_formatter will be updated when sets logger_format.
+
+        :param value: The format string.
+        :type: str
+        """
+        return self.__logger_format
+
+    @logger_format.setter
+    def logger_format(self, value):
+        """The logger format.
+
+        The logger_formatter will be updated when sets logger_format.
+
+        :param value: The format string.
+        :type: str
+        """
+        self.__logger_format = value
+        self.logger_formatter = logging.Formatter(self.__logger_format)
+
+    def get_api_key_with_prefix(self, identifier, alias=None):
+        """Gets API key (with prefix if set).
+
+        :param identifier: The identifier of apiKey.
+        :param alias: The alternative identifier of apiKey.
+        :return: The token for api key authentication.
+        """
+        if self.refresh_api_key_hook is not None:
+            self.refresh_api_key_hook(self)
+        key = self.api_key.get(identifier, self.api_key.get(alias) if alias is not None else None)
+        if key:
+            prefix = self.api_key_prefix.get(identifier)
+            if prefix:
+                return "%s %s" % (prefix, key)
+            else:
+                return key
+
+    def get_basic_auth_token(self):
+        """Gets HTTP basic authentication header (string).
+
+        :return: The token for basic HTTP authentication.
+        """
+        username = ""
+        if self.username is not None:
+            username = self.username
+        password = ""
+        if self.password is not None:
+            password = self.password
+        return urllib3.util.make_headers(
+            basic_auth=username + ':' + password
+        ).get('authorization')
+
+    def auth_settings(self):
+        """Gets Auth Settings dict for api client.
+
+        :return: The Auth Settings information dict.
+        """
+        auth = {}
+        return auth
+
+    def to_debug_report(self):
+        """Gets the essential information for debugging.
+
+        :return: The report for debugging.
+        """
+        return "Python SDK Debug Report:\n"\
+               "OS: {env}\n"\
+               "Python Version: {pyversion}\n"\
+               "Version of the API: 1.0.0\n"\
+               "SDK Package Version: 1.0.0".\
+               format(env=sys.platform, pyversion=sys.version)
+
+    def get_host_settings(self):
+        """Gets an array of host settings
+
+        :return: An array of host settings
+        """
+        return [
+            {
+                'url': "http://{server}.swagger.io:{port}/v2",
+                'description': "petstore server",
+                'variables': {
+                    'server': {
+                        'description': "No description provided",
+                        'default_value': "petstore",
+                        'enum_values': [
+                            "petstore",
+                            "qa-petstore",
+                            "dev-petstore"
+                        ]
+                        },
+                    'port': {
+                        'description': "No description provided",
+                        'default_value': "80",
+                        'enum_values': [
+                            "80",
+                            "8080"
+                        ]
+                        }
+                    }
+            },
+            {
+                'url': "https://localhost:8080/{version}",
+                'description': "The local server",
+                'variables': {
+                    'version': {
+                        'description': "No description provided",
+                        'default_value': "v1",
+                        'enum_values': [
+                            "v1",
+                            "v2",
+                            "v3"
+                        ]
+                        }
+                    }
+            }
+        ]
+
+    def get_host_from_settings(self, index, variables=None, servers=None):
+        """Gets host URL based on the index and variables
+        :param index: array index of the host settings
+        :param variables: hash of variable and the corresponding value
+        :param servers: an array of host settings or None
+        :return: URL based on host settings
+        """
+        if index is None:
+            return self._base_path
+
+        variables = {} if variables is None else variables
+        servers = self.get_host_settings() if servers is None else servers
+
+        try:
+            server = servers[index]
+        except IndexError:
+            raise ValueError(
+                "Invalid index {0} when selecting the host settings. "
+                "Must be less than {1}".format(index, len(servers)))
+
+        url = server['url']
+
+        # go through variables and replace placeholders
+        for variable_name, variable in server.get('variables', {}).items():
+            used_value = variables.get(
+                variable_name, variable['default_value'])
+
+            if 'enum_values' in variable \
+                    and used_value not in variable['enum_values']:
+                raise ValueError(
+                    "The variable `{0}` in the host URL has invalid value "
+                    "{1}. Must be {2}.".format(
+                        variable_name, variables[variable_name],
+                        variable['enum_values']))
+
+            url = url.replace("{" + variable_name + "}", used_value)
+
+        return url
+
+    @property
+    def host(self):
+        """Return generated host."""
+        return self.get_host_from_settings(self.server_index, variables=self.server_variables)
+
+    @host.setter
+    def host(self, value):
+        """Fix base path."""
+        self._base_path = value
+        self.server_index = None
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/exceptions.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/exceptions.py
new file mode 100644
index 000000000000..8cafe7240c1d
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/exceptions.py
@@ -0,0 +1,139 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension with dynamic servers
+
+    This specification shows how to use dynamic servers.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+import six
+
+
+class OpenApiException(Exception):
+    """The base exception class for all OpenAPIExceptions"""
+
+
+class ApiTypeError(OpenApiException, TypeError):
+    def __init__(self, msg, path_to_item=None, valid_classes=None,
+                 key_type=None):
+        """ Raises an exception for TypeErrors
+
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (list): a list of keys an indices to get to the
+                                 current_item
+                                 None if unset
+            valid_classes (tuple): the primitive classes that current item
+                                   should be an instance of
+                                   None if unset
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a list
+                             None if unset
+        """
+        self.path_to_item = path_to_item
+        self.valid_classes = valid_classes
+        self.key_type = key_type
+        full_msg = msg
+        if path_to_item:
+            full_msg = "{0} at {1}".format(msg, render_path(path_to_item))
+        super(ApiTypeError, self).__init__(full_msg)
+
+
+class ApiValueError(OpenApiException, ValueError):
+    def __init__(self, msg, path_to_item=None):
+        """
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (list) the path to the exception in the
+                received_data dict. None if unset
+        """
+
+        self.path_to_item = path_to_item
+        full_msg = msg
+        if path_to_item:
+            full_msg = "{0} at {1}".format(msg, render_path(path_to_item))
+        super(ApiValueError, self).__init__(full_msg)
+
+
+class ApiAttributeError(OpenApiException, AttributeError):
+    def __init__(self, msg, path_to_item=None):
+        """
+        Raised when an attribute reference or assignment fails.
+
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (None/list) the path to the exception in the
+                received_data dict
+        """
+        self.path_to_item = path_to_item
+        full_msg = msg
+        if path_to_item:
+            full_msg = "{0} at {1}".format(msg, render_path(path_to_item))
+        super(ApiAttributeError, self).__init__(full_msg)
+
+
+class ApiKeyError(OpenApiException, KeyError):
+    def __init__(self, msg, path_to_item=None):
+        """
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (None/list) the path to the exception in the
+                received_data dict
+        """
+        self.path_to_item = path_to_item
+        full_msg = msg
+        if path_to_item:
+            full_msg = "{0} at {1}".format(msg, render_path(path_to_item))
+        super(ApiKeyError, self).__init__(full_msg)
+
+
+class ApiException(OpenApiException):
+
+    def __init__(self, status=None, reason=None, http_resp=None):
+        if http_resp:
+            self.status = http_resp.status
+            self.reason = http_resp.reason
+            self.body = http_resp.data
+            self.headers = http_resp.getheaders()
+        else:
+            self.status = status
+            self.reason = reason
+            self.body = None
+            self.headers = None
+
+    def __str__(self):
+        """Custom error messages for exception"""
+        error_message = "({0})\n"\
+                        "Reason: {1}\n".format(self.status, self.reason)
+        if self.headers:
+            error_message += "HTTP response headers: {0}\n".format(
+                self.headers)
+
+        if self.body:
+            error_message += "HTTP response body: {0}\n".format(self.body)
+
+        return error_message
+
+
+def render_path(path_to_item):
+    """Returns a string representation of a path"""
+    result = ""
+    for pth in path_to_item:
+        if isinstance(pth, six.integer_types):
+            result += "[{0}]".format(pth)
+        else:
+            result += "['{0}']".format(pth)
+    return result
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/model/__init__.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/model/__init__.py
new file mode 100644
index 000000000000..cfe32b784926
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/model/__init__.py
@@ -0,0 +1,5 @@
+# we can not import model classes here because that would create a circular
+# reference which would not work in python2
+# do not import all models into this module because that uses a lot of memory and stack frames
+# if you need the ability to import all models from one package, import them with
+# from {{packageName}.models import ModelA, ModelB
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/model_utils.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/model_utils.py
new file mode 100644
index 000000000000..d1069e0651cf
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/model_utils.py
@@ -0,0 +1,1772 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension with dynamic servers
+
+    This specification shows how to use dynamic servers.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from datetime import date, datetime  # noqa: F401
+import inspect
+import os
+import pprint
+import re
+import tempfile
+
+from dateutil.parser import parse
+import six
+
+from dynamic_servers.exceptions import (
+    ApiKeyError,
+    ApiAttributeError,
+    ApiTypeError,
+    ApiValueError,
+)
+
+none_type = type(None)
+if six.PY3:
+    import io
+    file_type = io.IOBase
+    # these are needed for when other modules import str and int from here
+    str = str
+    int = int
+else:
+    file_type = file  # noqa: F821
+    str_py2 = str
+    unicode_py2 = unicode  # noqa: F821
+    long_py2 = long  # noqa: F821
+    int_py2 = int
+    # this requires that the future library is installed
+    from builtins import int, str
+
+
+class cached_property(object):
+    # this caches the result of the function call for fn with no inputs
+    # use this as a decorator on fuction methods that you want converted
+    # into cached properties
+    result_key = '_results'
+
+    def __init__(self, fn):
+        self._fn = fn
+
+    def __get__(self, instance, cls=None):
+        try:
+            return vars(self)[self.result_key]
+        except KeyError:
+            result = self._fn()
+            setattr(self, self.result_key, result)
+            return result
+
+
+class OpenApiModel(object):
+    """The base class for all OpenAPIModels"""
+
+    def set_attribute(self, name, value):
+        # this is only used to set properties on self
+
+        path_to_item = []
+        if self._path_to_item:
+            path_to_item.extend(self._path_to_item)
+        path_to_item.append(name)
+
+        if name in self.openapi_types:
+            required_types_mixed = self.openapi_types[name]
+        elif self.additional_properties_type is None:
+            raise ApiAttributeError(
+                "{0} has no attribute '{1}'".format(
+                    type(self).__name__, name),
+                path_to_item
+            )
+        elif self.additional_properties_type is not None:
+            required_types_mixed = self.additional_properties_type
+
+        if get_simple_class(name) != str:
+            error_msg = type_error_message(
+                var_name=name,
+                var_value=name,
+                valid_classes=(str,),
+                key_type=True
+            )
+            raise ApiTypeError(
+                error_msg,
+                path_to_item=path_to_item,
+                valid_classes=(str,),
+                key_type=True
+            )
+
+        if self._check_type:
+            value = validate_and_convert_types(
+                value, required_types_mixed, path_to_item, self._spec_property_naming,
+                self._check_type, configuration=self._configuration)
+        if (name,) in self.allowed_values:
+            check_allowed_values(
+                self.allowed_values,
+                (name,),
+                value
+            )
+        if (name,) in self.validations:
+            check_validations(
+                self.validations,
+                (name,),
+                value,
+                self._configuration
+            )
+        self.__dict__['_data_store'][name] = value
+
+    def __setitem__(self, name, value):
+        """this allows us to set values with instance[field_name] = val"""
+        self.__setattr__(name, value)
+
+    def __getitem__(self, name):
+        """this allows us to get a value with val = instance[field_name]"""
+        return self.__getattr__(name)
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
+
+    def __new__(cls, *args, **kwargs):
+        # this function uses the discriminator to
+        # pick a new schema/class to instantiate because a discriminator
+        # propertyName value was passed in
+
+        if len(args) == 1 and args[0] is None and is_type_nullable(cls):
+            # The input data is the 'null' value and the type is nullable.
+            return None
+
+        visited_composed_classes = kwargs.get('_visited_composed_classes', ())
+        if (
+            cls.discriminator is None or
+            cls in visited_composed_classes
+        ):
+            # Use case 1: this openapi schema (cls) does not have a discriminator
+            # Use case 2: we have already visited this class before and are sure that we
+            # want to instantiate it this time. We have visited this class deserializing
+            # a payload with a discriminator. During that process we traveled through
+            # this class but did not make an instance of it. Now we are making an
+            # instance of a composed class which contains cls in it, so this time make an instance of cls.
+            #
+            # Here's an example of use case 2: If Animal has a discriminator
+            # petType and we pass in "Dog", and the class Dog
+            # allOf includes Animal, we move through Animal
+            # once using the discriminator, and pick Dog.
+            # Then in the composed schema dog Dog, we will make an instance of the
+            # Animal class (because Dal has allOf: Animal) but this time we won't travel
+            # through Animal's discriminator because we passed in
+            # _visited_composed_classes = (Animal,)
+
+            return super(OpenApiModel, cls).__new__(cls)
+
+        # Get the name and value of the discriminator property.
+        # The discriminator name is obtained from the discriminator meta-data
+        # and the discriminator value is obtained from the input data.
+        discr_propertyname_py = list(cls.discriminator.keys())[0]
+        discr_propertyname_js = cls.attribute_map[discr_propertyname_py]
+        if discr_propertyname_js in kwargs:
+            discr_value = kwargs[discr_propertyname_js]
+        elif discr_propertyname_py in kwargs:
+            discr_value = kwargs[discr_propertyname_py]
+        else:
+            # The input data does not contain the discriminator property.
+            path_to_item = kwargs.get('_path_to_item', ())
+            raise ApiValueError(
+                "Cannot deserialize input data due to missing discriminator. "
+                "The discriminator property '%s' is missing at path: %s" %
+                (discr_propertyname_js, path_to_item)
+            )
+
+        # Implementation note: the last argument to get_discriminator_class
+        # is a list of visited classes. get_discriminator_class may recursively
+        # call itself and update the list of visited classes, and the initial
+        # value must be an empty list. Hence not using 'visited_composed_classes'
+        new_cls = get_discriminator_class(
+                    cls, discr_propertyname_py, discr_value, [])
+        if new_cls is None:
+            path_to_item = kwargs.get('_path_to_item', ())
+            disc_prop_value = kwargs.get(
+                discr_propertyname_js, kwargs.get(discr_propertyname_py))
+            raise ApiValueError(
+                "Cannot deserialize input data due to invalid discriminator "
+                "value. The OpenAPI document has no mapping for discriminator "
+                "property '%s'='%s' at path: %s" %
+                (discr_propertyname_js, disc_prop_value, path_to_item)
+            )
+
+        if new_cls in visited_composed_classes:
+            # if we are making an instance of a composed schema Descendent
+            # which allOf includes Ancestor, then Ancestor contains
+            # a discriminator that includes Descendent.
+            # So if we make an instance of Descendent, we have to make an
+            # instance of Ancestor to hold the allOf properties.
+            # This code detects that use case and makes the instance of Ancestor
+            # For example:
+            # When making an instance of Dog, _visited_composed_classes = (Dog,)
+            # then we make an instance of Animal to include in dog._composed_instances
+            # so when we are here, cls is Animal
+            # cls.discriminator != None
+            # cls not in _visited_composed_classes
+            # new_cls = Dog
+            # but we know we know that we already have Dog
+            # because it is in visited_composed_classes
+            # so make Animal here
+            return super(OpenApiModel, cls).__new__(cls)
+
+        # Build a list containing all oneOf and anyOf descendants.
+        oneof_anyof_classes = None
+        if cls._composed_schemas is not None:
+            oneof_anyof_classes = (
+                cls._composed_schemas.get('oneOf', ()) +
+                cls._composed_schemas.get('anyOf', ()))
+        oneof_anyof_child = new_cls in oneof_anyof_classes
+        kwargs['_visited_composed_classes'] = visited_composed_classes + (cls,)
+
+        if cls._composed_schemas.get('allOf') and oneof_anyof_child:
+            # Validate that we can make self because when we make the
+            # new_cls it will not include the allOf validations in self
+            self_inst = super(OpenApiModel, cls).__new__(cls)
+            self_inst.__init__(*args, **kwargs)
+
+        new_inst = new_cls.__new__(new_cls, *args, **kwargs)
+        new_inst.__init__(*args, **kwargs)
+        return new_inst
+
+
+class ModelSimple(OpenApiModel):
+    """the parent class of models whose type != object in their
+    swagger/openapi"""
+
+    def __setattr__(self, name, value):
+        """this allows us to set a value with instance.field_name = val"""
+        if name in self.required_properties:
+            self.__dict__[name] = value
+            return
+
+        self.set_attribute(name, value)
+
+    def __getattr__(self, name):
+        """this allows us to get a value with val = instance.field_name"""
+        if name in self.required_properties:
+            return self.__dict__[name]
+
+        if name in self.__dict__['_data_store']:
+            return self.__dict__['_data_store'][name]
+
+        path_to_item = []
+        if self._path_to_item:
+            path_to_item.extend(self._path_to_item)
+        path_to_item.append(name)
+        raise ApiAttributeError(
+            "{0} has no attribute '{1}'".format(
+                type(self).__name__, name),
+            [name]
+        )
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return str(self.value)
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, self.__class__):
+            return False
+
+        this_val = self._data_store['value']
+        that_val = other._data_store['value']
+        types = set()
+        types.add(this_val.__class__)
+        types.add(that_val.__class__)
+        vals_equal = this_val == that_val
+        if not six.PY3 and len(types) == 2 and unicode in types:  # noqa: F821
+            vals_equal = (
+                this_val.encode('utf-8') == that_val.encode('utf-8')
+            )
+        if not vals_equal:
+            return False
+        return True
+
+
+class ModelNormal(OpenApiModel):
+    """the parent class of models whose type == object in their
+    swagger/openapi"""
+
+    def __setattr__(self, name, value):
+        """this allows us to set a value with instance.field_name = val"""
+        if name in self.required_properties:
+            self.__dict__[name] = value
+            return
+
+        self.set_attribute(name, value)
+
+    def __getattr__(self, name):
+        """this allows us to get a value with val = instance.field_name"""
+        if name in self.required_properties:
+            return self.__dict__[name]
+
+        if name in self.__dict__['_data_store']:
+            return self.__dict__['_data_store'][name]
+
+        path_to_item = []
+        if self._path_to_item:
+            path_to_item.extend(self._path_to_item)
+        path_to_item.append(name)
+        raise ApiAttributeError(
+            "{0} has no attribute '{1}'".format(
+                type(self).__name__, name),
+            [name]
+        )
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        return model_to_dict(self, serialize=False)
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, self.__class__):
+            return False
+
+        if not set(self._data_store.keys()) == set(other._data_store.keys()):
+            return False
+        for _var_name, this_val in six.iteritems(self._data_store):
+            that_val = other._data_store[_var_name]
+            types = set()
+            types.add(this_val.__class__)
+            types.add(that_val.__class__)
+            vals_equal = this_val == that_val
+            if (not six.PY3 and
+                    len(types) == 2 and unicode in types):  # noqa: F821
+                vals_equal = (
+                    this_val.encode('utf-8') == that_val.encode('utf-8')
+                )
+            if not vals_equal:
+                return False
+        return True
+
+
+class ModelComposed(OpenApiModel):
+    """the parent class of models whose type == object in their
+    swagger/openapi and have oneOf/allOf/anyOf
+
+    When one sets a property we use var_name_to_model_instances to store the value in
+    the correct class instances + run any type checking + validation code.
+    When one gets a property we use var_name_to_model_instances to get the value
+    from the correct class instances.
+    This allows multiple composed schemas to contain the same property with additive
+    constraints on the value.
+
+    _composed_schemas (dict) stores the anyOf/allOf/oneOf classes
+    key (str): allOf/oneOf/anyOf
+    value (list): the classes in the XOf definition.
+        Note: none_type can be included when the openapi document version >= 3.1.0
+    _composed_instances (list): stores a list of instances of the composed schemas
+    defined in _composed_schemas. When properties are accessed in the self instance,
+    they are returned from the self._data_store or the data stores in the instances
+    in self._composed_schemas
+    _var_name_to_model_instances (dict): maps between a variable name on self and
+    the composed instances (self included) which contain that data
+    key (str): property name
+    value (list): list of class instances, self or instances in _composed_instances
+    which contain the value that the key is referring to.
+    """
+
+    def __setattr__(self, name, value):
+        """this allows us to set a value with instance.field_name = val"""
+        if name in self.required_properties:
+            self.__dict__[name] = value
+            return
+
+        # set the attribute on the correct instance
+        model_instances = self._var_name_to_model_instances.get(
+            name, self._additional_properties_model_instances)
+        if model_instances:
+            for model_instance in model_instances:
+                if model_instance == self:
+                    self.set_attribute(name, value)
+                else:
+                    setattr(model_instance, name, value)
+                if name not in self._var_name_to_model_instances:
+                    # we assigned an additional property
+                    self.__dict__['_var_name_to_model_instances'][name] = (
+                        model_instance
+                    )
+            return None
+
+        path_to_item = []
+        if self._path_to_item:
+            path_to_item.extend(self._path_to_item)
+        path_to_item.append(name)
+        raise ApiAttributeError(
+            "{0} has no attribute '{1}'".format(
+                type(self).__name__, name),
+            path_to_item
+        )
+
+    def __getattr__(self, name):
+        """this allows us to get a value with val = instance.field_name"""
+        if name in self.required_properties:
+            return self.__dict__[name]
+
+        # get the attribute from the correct instance
+        model_instances = self._var_name_to_model_instances.get(
+            name, self._additional_properties_model_instances)
+        path_to_item = []
+        if self._path_to_item:
+            path_to_item.extend(self._path_to_item)
+        path_to_item.append(name)
+        values = []
+        # A composed model stores child (oneof/anyOf/allOf) models under
+        # self._var_name_to_model_instances. A named property can exist in
+        # multiple child models. If the property is present in more than one
+        # child model, the value must be the same across all the child models.
+        if model_instances:
+            for model_instance in model_instances:
+                if name in model_instance._data_store:
+                    v = model_instance._data_store[name]
+                    if v not in values:
+                        values.append(v)
+        len_values = len(values)
+        if len_values == 0:
+            raise ApiAttributeError(
+                "{0} has no attribute '{1}'".format(
+                    type(self).__name__, name),
+                path_to_item
+            )
+        elif len_values == 1:
+            return values[0]
+        elif len_values > 1:
+            raise ApiValueError(
+                "Values stored for property {0} in {1} differ when looking "
+                "at self and self's composed instances. All values must be "
+                "the same".format(name, type(self).__name__),
+                path_to_item
+            )
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        return model_to_dict(self, serialize=False)
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, self.__class__):
+            return False
+
+        if not set(self._data_store.keys()) == set(other._data_store.keys()):
+            return False
+        for _var_name, this_val in six.iteritems(self._data_store):
+            that_val = other._data_store[_var_name]
+            types = set()
+            types.add(this_val.__class__)
+            types.add(that_val.__class__)
+            vals_equal = this_val == that_val
+            if (not six.PY3 and
+                    len(types) == 2 and unicode in types):  # noqa: F821
+                vals_equal = (
+                    this_val.encode('utf-8') == that_val.encode('utf-8')
+                )
+            if not vals_equal:
+                return False
+        return True
+
+
+COERCION_INDEX_BY_TYPE = {
+    ModelComposed: 0,
+    ModelNormal: 1,
+    ModelSimple: 2,
+    none_type: 3,    # The type of 'None'.
+    list: 4,
+    dict: 5,
+    float: 6,
+    int: 7,
+    bool: 8,
+    datetime: 9,
+    date: 10,
+    str: 11,
+    file_type: 12,   # 'file_type' is an alias for the built-in 'file' or 'io.IOBase' type.
+}
+
+# these are used to limit what type conversions we try to do
+# when we have a valid type already and we want to try converting
+# to another type
+UPCONVERSION_TYPE_PAIRS = (
+    (str, datetime),
+    (str, date),
+    (int, float),             # A float may be serialized as an integer, e.g. '3' is a valid serialized float.
+    (list, ModelComposed),
+    (dict, ModelComposed),
+    (list, ModelNormal),
+    (dict, ModelNormal),
+    (str, ModelSimple),
+    (int, ModelSimple),
+    (float, ModelSimple),
+    (list, ModelSimple),
+)
+
+COERCIBLE_TYPE_PAIRS = {
+    False: (  # client instantiation of a model with client data
+        # (dict, ModelComposed),
+        # (list, ModelComposed),
+        # (dict, ModelNormal),
+        # (list, ModelNormal),
+        # (str, ModelSimple),
+        # (int, ModelSimple),
+        # (float, ModelSimple),
+        # (list, ModelSimple),
+        # (str, int),
+        # (str, float),
+        # (str, datetime),
+        # (str, date),
+        # (int, str),
+        # (float, str),
+    ),
+    True: (  # server -> client data
+        (dict, ModelComposed),
+        (list, ModelComposed),
+        (dict, ModelNormal),
+        (list, ModelNormal),
+        (str, ModelSimple),
+        (int, ModelSimple),
+        (float, ModelSimple),
+        (list, ModelSimple),
+        # (str, int),
+        # (str, float),
+        (str, datetime),
+        (str, date),
+        # (int, str),
+        # (float, str),
+        (str, file_type)
+    ),
+}
+
+
+def get_simple_class(input_value):
+    """Returns an input_value's simple class that we will use for type checking
+    Python2:
+    float and int will return int, where int is the python3 int backport
+    str and unicode will return str, where str is the python3 str backport
+    Note: float and int ARE both instances of int backport
+    Note: str_py2 and unicode_py2 are NOT both instances of str backport
+
+    Args:
+        input_value (class/class_instance): the item for which we will return
+                                            the simple class
+    """
+    if isinstance(input_value, type):
+        # input_value is a class
+        return input_value
+    elif isinstance(input_value, tuple):
+        return tuple
+    elif isinstance(input_value, list):
+        return list
+    elif isinstance(input_value, dict):
+        return dict
+    elif isinstance(input_value, none_type):
+        return none_type
+    elif isinstance(input_value, file_type):
+        return file_type
+    elif isinstance(input_value, bool):
+        # this must be higher than the int check because
+        # isinstance(True, int) == True
+        return bool
+    elif isinstance(input_value, int):
+        # for python2 input_value==long_instance -> return int
+        # where int is the python3 int backport
+        return int
+    elif isinstance(input_value, datetime):
+        # this must be higher than the date check because
+        # isinstance(datetime_instance, date) == True
+        return datetime
+    elif isinstance(input_value, date):
+        return date
+    elif (six.PY2 and isinstance(input_value, (str_py2, unicode_py2, str)) or
+            isinstance(input_value, str)):
+        return str
+    return type(input_value)
+
+
+def check_allowed_values(allowed_values, input_variable_path, input_values):
+    """Raises an exception if the input_values are not allowed
+
+    Args:
+        allowed_values (dict): the allowed_values dict
+        input_variable_path (tuple): the path to the input variable
+        input_values (list/str/int/float/date/datetime): the values that we
+            are checking to see if they are in allowed_values
+    """
+    these_allowed_values = list(allowed_values[input_variable_path].values())
+    if (isinstance(input_values, list)
+            and not set(input_values).issubset(
+                set(these_allowed_values))):
+        invalid_values = ", ".join(
+            map(str, set(input_values) - set(these_allowed_values))),
+        raise ApiValueError(
+            "Invalid values for `%s` [%s], must be a subset of [%s]" %
+            (
+                input_variable_path[0],
+                invalid_values,
+                ", ".join(map(str, these_allowed_values))
+            )
+        )
+    elif (isinstance(input_values, dict)
+            and not set(
+                input_values.keys()).issubset(set(these_allowed_values))):
+        invalid_values = ", ".join(
+            map(str, set(input_values.keys()) - set(these_allowed_values)))
+        raise ApiValueError(
+            "Invalid keys in `%s` [%s], must be a subset of [%s]" %
+            (
+                input_variable_path[0],
+                invalid_values,
+                ", ".join(map(str, these_allowed_values))
+            )
+        )
+    elif (not isinstance(input_values, (list, dict))
+            and input_values not in these_allowed_values):
+        raise ApiValueError(
+            "Invalid value for `%s` (%s), must be one of %s" %
+            (
+                input_variable_path[0],
+                input_values,
+                these_allowed_values
+            )
+        )
+
+
+def is_json_validation_enabled(schema_keyword, configuration=None):
+    """Returns true if JSON schema validation is enabled for the specified
+    validation keyword. This can be used to skip JSON schema structural validation
+    as requested in the configuration.
+
+    Args:
+        schema_keyword (string): the name of a JSON schema validation keyword.
+        configuration (Configuration): the configuration class.
+    """
+
+    return (configuration is None or
+        not hasattr(configuration, '_disabled_client_side_validations') or
+        schema_keyword not in configuration._disabled_client_side_validations)
+
+
+def check_validations(
+        validations, input_variable_path, input_values,
+        configuration=None):
+    """Raises an exception if the input_values are invalid
+
+    Args:
+        validations (dict): the validation dictionary.
+        input_variable_path (tuple): the path to the input variable.
+        input_values (list/str/int/float/date/datetime): the values that we
+            are checking.
+        configuration (Configuration): the configuration class.
+    """
+
+    current_validations = validations[input_variable_path]
+    if (is_json_validation_enabled('multipleOf', configuration) and
+            'multiple_of' in current_validations and
+            isinstance(input_values, (int, float)) and
+            not (float(input_values) / current_validations['multiple_of']).is_integer()):
+        # Note 'multipleOf' will be as good as the floating point arithmetic.
+        raise ApiValueError(
+            "Invalid value for `%s`, value must be a multiple of "
+            "`%s`" % (
+                input_variable_path[0],
+                current_validations['multiple_of']
+            )
+        )
+
+    if (is_json_validation_enabled('maxLength', configuration) and
+            'max_length' in current_validations and
+            len(input_values) > current_validations['max_length']):
+        raise ApiValueError(
+            "Invalid value for `%s`, length must be less than or equal to "
+            "`%s`" % (
+                input_variable_path[0],
+                current_validations['max_length']
+            )
+        )
+
+    if (is_json_validation_enabled('minLength', configuration) and
+            'min_length' in current_validations and
+            len(input_values) < current_validations['min_length']):
+        raise ApiValueError(
+            "Invalid value for `%s`, length must be greater than or equal to "
+            "`%s`" % (
+                input_variable_path[0],
+                current_validations['min_length']
+            )
+        )
+
+    if (is_json_validation_enabled('maxItems', configuration) and
+            'max_items' in current_validations and
+            len(input_values) > current_validations['max_items']):
+        raise ApiValueError(
+            "Invalid value for `%s`, number of items must be less than or "
+            "equal to `%s`" % (
+                input_variable_path[0],
+                current_validations['max_items']
+            )
+        )
+
+    if (is_json_validation_enabled('minItems', configuration) and
+            'min_items' in current_validations and
+            len(input_values) < current_validations['min_items']):
+        raise ValueError(
+            "Invalid value for `%s`, number of items must be greater than or "
+            "equal to `%s`" % (
+                input_variable_path[0],
+                current_validations['min_items']
+            )
+        )
+
+    items = ('exclusive_maximum', 'inclusive_maximum', 'exclusive_minimum',
+             'inclusive_minimum')
+    if (any(item in current_validations for item in items)):
+        if isinstance(input_values, list):
+            max_val = max(input_values)
+            min_val = min(input_values)
+        elif isinstance(input_values, dict):
+            max_val = max(input_values.values())
+            min_val = min(input_values.values())
+        else:
+            max_val = input_values
+            min_val = input_values
+
+    if (is_json_validation_enabled('exclusiveMaximum', configuration) and
+            'exclusive_maximum' in current_validations and
+            max_val >= current_validations['exclusive_maximum']):
+        raise ApiValueError(
+            "Invalid value for `%s`, must be a value less than `%s`" % (
+                input_variable_path[0],
+                current_validations['exclusive_maximum']
+            )
+        )
+
+    if (is_json_validation_enabled('maximum', configuration) and
+            'inclusive_maximum' in current_validations and
+            max_val > current_validations['inclusive_maximum']):
+        raise ApiValueError(
+            "Invalid value for `%s`, must be a value less than or equal to "
+            "`%s`" % (
+                input_variable_path[0],
+                current_validations['inclusive_maximum']
+            )
+        )
+
+    if (is_json_validation_enabled('exclusiveMinimum', configuration) and
+            'exclusive_minimum' in current_validations and
+            min_val <= current_validations['exclusive_minimum']):
+        raise ApiValueError(
+            "Invalid value for `%s`, must be a value greater than `%s`" %
+            (
+                input_variable_path[0],
+                current_validations['exclusive_maximum']
+            )
+        )
+
+    if (is_json_validation_enabled('minimum', configuration) and
+            'inclusive_minimum' in current_validations and
+            min_val < current_validations['inclusive_minimum']):
+        raise ApiValueError(
+            "Invalid value for `%s`, must be a value greater than or equal "
+            "to `%s`" % (
+                input_variable_path[0],
+                current_validations['inclusive_minimum']
+            )
+        )
+    flags = current_validations.get('regex', {}).get('flags', 0)
+    if (is_json_validation_enabled('pattern', configuration) and
+            'regex' in current_validations and
+            not re.search(current_validations['regex']['pattern'],
+                          input_values, flags=flags)):
+        err_msg = r"Invalid value for `%s`, must match regular expression `%s`" % (
+                    input_variable_path[0],
+                    current_validations['regex']['pattern']
+                )
+        if flags != 0:
+            # Don't print the regex flags if the flags are not
+            # specified in the OAS document.
+            err_msg = r"%s with flags=`%s`" % (err_msg, flags)
+        raise ApiValueError(err_msg)
+
+
+def order_response_types(required_types):
+    """Returns the required types sorted in coercion order
+
+    Args:
+        required_types (list/tuple): collection of classes or instance of
+            list or dict with class information inside it.
+
+    Returns:
+        (list): coercion order sorted collection of classes or instance
+            of list or dict with class information inside it.
+    """
+
+    def index_getter(class_or_instance):
+        if isinstance(class_or_instance, list):
+            return COERCION_INDEX_BY_TYPE[list]
+        elif isinstance(class_or_instance, dict):
+            return COERCION_INDEX_BY_TYPE[dict]
+        elif (inspect.isclass(class_or_instance)
+                and issubclass(class_or_instance, ModelComposed)):
+            return COERCION_INDEX_BY_TYPE[ModelComposed]
+        elif (inspect.isclass(class_or_instance)
+                and issubclass(class_or_instance, ModelNormal)):
+            return COERCION_INDEX_BY_TYPE[ModelNormal]
+        elif (inspect.isclass(class_or_instance)
+                and issubclass(class_or_instance, ModelSimple)):
+            return COERCION_INDEX_BY_TYPE[ModelSimple]
+        elif class_or_instance in COERCION_INDEX_BY_TYPE:
+            return COERCION_INDEX_BY_TYPE[class_or_instance]
+        raise ApiValueError("Unsupported type: %s" % class_or_instance)
+
+    sorted_types = sorted(
+        required_types,
+        key=lambda class_or_instance: index_getter(class_or_instance)
+    )
+    return sorted_types
+
+
+def remove_uncoercible(required_types_classes, current_item, spec_property_naming,
+                       must_convert=True):
+    """Only keeps the type conversions that are possible
+
+    Args:
+        required_types_classes (tuple): tuple of classes that are required
+                          these should be ordered by COERCION_INDEX_BY_TYPE
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
+        current_item (any): the current item (input data) to be converted
+
+    Keyword Args:
+        must_convert (bool): if True the item to convert is of the wrong
+                          type and we want a big list of coercibles
+                          if False, we want a limited list of coercibles
+
+    Returns:
+        (list): the remaining coercible required types, classes only
+    """
+    current_type_simple = get_simple_class(current_item)
+
+    results_classes = []
+    for required_type_class in required_types_classes:
+        # convert our models to OpenApiModel
+        required_type_class_simplified = required_type_class
+        if isinstance(required_type_class_simplified, type):
+            if issubclass(required_type_class_simplified, ModelComposed):
+                required_type_class_simplified = ModelComposed
+            elif issubclass(required_type_class_simplified, ModelNormal):
+                required_type_class_simplified = ModelNormal
+            elif issubclass(required_type_class_simplified, ModelSimple):
+                required_type_class_simplified = ModelSimple
+
+        if required_type_class_simplified == current_type_simple:
+            # don't consider converting to one's own class
+            continue
+
+        class_pair = (current_type_simple, required_type_class_simplified)
+        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[spec_property_naming]:
+            results_classes.append(required_type_class)
+        elif class_pair in UPCONVERSION_TYPE_PAIRS:
+            results_classes.append(required_type_class)
+    return results_classes
+
+
+def get_required_type_classes(required_types_mixed):
+    """Converts the tuple required_types into a tuple and a dict described
+    below
+
+    Args:
+        required_types_mixed (tuple/list): will contain either classes or
+            instance of list or dict
+
+    Returns:
+        (valid_classes, dict_valid_class_to_child_types_mixed):
+            valid_classes (tuple): the valid classes that the current item
+                                   should be
+            dict_valid_class_to_child_types_mixed (doct):
+                valid_class (class): this is the key
+                child_types_mixed (list/dict/tuple): describes the valid child
+                    types
+    """
+    valid_classes = []
+    child_req_types_by_current_type = {}
+    for required_type in required_types_mixed:
+        if isinstance(required_type, list):
+            valid_classes.append(list)
+            child_req_types_by_current_type[list] = required_type
+        elif isinstance(required_type, tuple):
+            valid_classes.append(tuple)
+            child_req_types_by_current_type[tuple] = required_type
+        elif isinstance(required_type, dict):
+            valid_classes.append(dict)
+            child_req_types_by_current_type[dict] = required_type[str]
+        else:
+            valid_classes.append(required_type)
+    return tuple(valid_classes), child_req_types_by_current_type
+
+
+def change_keys_js_to_python(input_dict, model_class):
+    """
+    Converts from javascript_key keys in the input_dict to python_keys in
+    the output dict using the mapping in model_class.
+    If the input_dict contains a key which does not declared in the model_class,
+    the key is added to the output dict as is. The assumption is the model_class
+    may have undeclared properties (additionalProperties attribute in the OAS
+    document).
+    """
+
+    if getattr(model_class, 'attribute_map', None) is None:
+        return input_dict
+    output_dict = {}
+    reversed_attr_map = {value: key for key, value in
+                         model_class.attribute_map.items()}
+    for javascript_key, value in input_dict.items():
+        python_key = reversed_attr_map.get(javascript_key)
+        if python_key is None:
+            # if the key is unknown, it is in error or it is an
+            # additionalProperties variable
+            python_key = javascript_key
+        output_dict[python_key] = value
+    return output_dict
+
+
+def get_type_error(var_value, path_to_item, valid_classes, key_type=False):
+    error_msg = type_error_message(
+        var_name=path_to_item[-1],
+        var_value=var_value,
+        valid_classes=valid_classes,
+        key_type=key_type
+    )
+    return ApiTypeError(
+        error_msg,
+        path_to_item=path_to_item,
+        valid_classes=valid_classes,
+        key_type=key_type
+    )
+
+
+def deserialize_primitive(data, klass, path_to_item):
+    """Deserializes string to primitive type.
+
+    :param data: str/int/float
+    :param klass: str/class the class to convert to
+
+    :return: int, float, str, bool, date, datetime
+    """
+    additional_message = ""
+    try:
+        if klass in {datetime, date}:
+            additional_message = (
+                "If you need your parameter to have a fallback "
+                "string value, please set its type as `type: {}` in your "
+                "spec. That allows the value to be any type. "
+            )
+            if klass == datetime:
+                if len(data) < 8:
+                    raise ValueError("This is not a datetime")
+                # The string should be in iso8601 datetime format.
+                parsed_datetime = parse(data)
+                date_only = (
+                    parsed_datetime.hour == 0 and
+                    parsed_datetime.minute == 0 and
+                    parsed_datetime.second == 0 and
+                    parsed_datetime.tzinfo is None and
+                    8 <= len(data) <= 10
+                )
+                if date_only:
+                    raise ValueError("This is a date, not a datetime")
+                return parsed_datetime
+            elif klass == date:
+                if len(data) < 8:
+                    raise ValueError("This is not a date")
+                return parse(data).date()
+        else:
+            converted_value = klass(data)
+            if isinstance(data, str) and klass == float:
+                if str(converted_value) != data:
+                    # '7' -> 7.0 -> '7.0' != '7'
+                    raise ValueError('This is not a float')
+            return converted_value
+    except (OverflowError, ValueError) as ex:
+        # parse can raise OverflowError
+        six.raise_from(ApiValueError(
+            "{0}Failed to parse {1} as {2}".format(
+                additional_message, repr(data), get_py3_class_name(klass)
+            ),
+            path_to_item=path_to_item
+        ), ex)
+
+
+def get_discriminator_class(model_class,
+                            discr_name,
+                            discr_value, cls_visited):
+    """Returns the child class specified by the discriminator.
+
+    Args:
+        model_class (OpenApiModel): the model class.
+        discr_name (string): the name of the discriminator property.
+        discr_value (any): the discriminator value.
+        cls_visited (list): list of model classes that have been visited.
+            Used to determine the discriminator class without
+            visiting circular references indefinitely.
+
+    Returns:
+        used_model_class (class/None): the chosen child class that will be used
+            to deserialize the data, for example dog.Dog.
+            If a class is not found, None is returned.
+    """
+
+    if model_class in cls_visited:
+        # The class has already been visited and no suitable class was found.
+        return None
+    cls_visited.append(model_class)
+    used_model_class = None
+    if discr_name in model_class.discriminator:
+        class_name_to_discr_class = model_class.discriminator[discr_name]
+        used_model_class = class_name_to_discr_class.get(discr_value)
+    if used_model_class is None:
+        # We didn't find a discriminated class in class_name_to_discr_class.
+        # So look in the ancestor or descendant discriminators
+        # The discriminator mapping may exist in a descendant (anyOf, oneOf)
+        # or ancestor (allOf).
+        # Ancestor example: in the GrandparentAnimal -> ParentPet -> ChildCat
+        #   hierarchy, the discriminator mappings may be defined at any level
+        #   in the hierarchy.
+        # Descendant example:  mammal -> whale/zebra/Pig -> BasquePig/DanishPig
+        #   if we try to make BasquePig from mammal, we need to travel through
+        #   the oneOf descendant discriminators to find BasquePig
+        descendant_classes =  model_class._composed_schemas.get('oneOf', ()) + \
+            model_class._composed_schemas.get('anyOf', ())
+        ancestor_classes = model_class._composed_schemas.get('allOf', ())
+        possible_classes = descendant_classes + ancestor_classes
+        for cls in possible_classes:
+            # Check if the schema has inherited discriminators.
+            if hasattr(cls, 'discriminator') and cls.discriminator is not None:
+                used_model_class = get_discriminator_class(
+                                    cls, discr_name, discr_value, cls_visited)
+                if used_model_class is not None:
+                    return used_model_class
+    return used_model_class
+
+
+def deserialize_model(model_data, model_class, path_to_item, check_type,
+                      configuration, spec_property_naming):
+    """Deserializes model_data to model instance.
+
+    Args:
+        model_data (list/dict): data to instantiate the model
+        model_class (OpenApiModel): the model class
+        path_to_item (list): path to the model in the received data
+        check_type (bool): whether to check the data tupe for the values in
+            the model
+        configuration (Configuration): the instance to use to convert files
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
+
+    Returns:
+        model instance
+
+    Raise:
+        ApiTypeError
+        ApiValueError
+        ApiKeyError
+    """
+
+    kw_args = dict(_check_type=check_type,
+                   _path_to_item=path_to_item,
+                   _configuration=configuration,
+                   _spec_property_naming=spec_property_naming)
+
+    if issubclass(model_class, ModelSimple):
+        instance = model_class(value=model_data, **kw_args)
+        return instance
+    if isinstance(model_data, list):
+        instance = model_class(*model_data, **kw_args)
+    if isinstance(model_data, dict):
+        kw_args.update(model_data)
+        instance = model_class(**kw_args)
+    return instance
+
+
+def deserialize_file(response_data, configuration, content_disposition=None):
+    """Deserializes body to file
+
+    Saves response body into a file in a temporary folder,
+    using the filename from the `Content-Disposition` header if provided.
+
+    Args:
+        param response_data (str):  the file data to write
+        configuration (Configuration): the instance to use to convert files
+
+    Keyword Args:
+        content_disposition (str):  the value of the Content-Disposition
+            header
+
+    Returns:
+        (file_type): the deserialized file which is open
+            The user is responsible for closing and reading the file
+    """
+    fd, path = tempfile.mkstemp(dir=configuration.temp_folder_path)
+    os.close(fd)
+    os.remove(path)
+
+    if content_disposition:
+        filename = re.search(r'filename=[\'"]?([^\'"\s]+)[\'"]?',
+                             content_disposition).group(1)
+        path = os.path.join(os.path.dirname(path), filename)
+
+    with open(path, "wb") as f:
+        if six.PY3 and isinstance(response_data, str):
+            # in python3 change str to bytes so we can write it
+            response_data = response_data.encode('utf-8')
+        f.write(response_data)
+
+    f = open(path, "rb")
+    return f
+
+
+def attempt_convert_item(input_value, valid_classes, path_to_item,
+                         configuration, spec_property_naming, key_type=False,
+                         must_convert=False, check_type=True):
+    """
+    Args:
+        input_value (any): the data to convert
+        valid_classes (any): the classes that are valid
+        path_to_item (list): the path to the item to convert
+        configuration (Configuration): the instance to use to convert files
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
+        key_type (bool): if True we need to convert a key type (not supported)
+        must_convert (bool): if True we must convert
+        check_type (bool): if True we check the type or the returned data in
+            ModelComposed/ModelNormal/ModelSimple instances
+
+    Returns:
+        instance (any) the fixed item
+
+    Raises:
+        ApiTypeError
+        ApiValueError
+        ApiKeyError
+    """
+    valid_classes_ordered = order_response_types(valid_classes)
+    valid_classes_coercible = remove_uncoercible(
+        valid_classes_ordered, input_value, spec_property_naming)
+    if not valid_classes_coercible or key_type:
+        # we do not handle keytype errors, json will take care
+        # of this for us
+        if configuration is None or not configuration.discard_unknown_keys:
+            raise get_type_error(input_value, path_to_item, valid_classes,
+                                 key_type=key_type)
+    for valid_class in valid_classes_coercible:
+        try:
+            if issubclass(valid_class, OpenApiModel):
+                return deserialize_model(input_value, valid_class,
+                                         path_to_item, check_type,
+                                         configuration, spec_property_naming)
+            elif valid_class == file_type:
+                return deserialize_file(input_value, configuration)
+            return deserialize_primitive(input_value, valid_class,
+                                         path_to_item)
+        except (ApiTypeError, ApiValueError, ApiKeyError) as conversion_exc:
+            if must_convert:
+                raise conversion_exc
+            # if we have conversion errors when must_convert == False
+            # we ignore the exception and move on to the next class
+            continue
+    # we were unable to convert, must_convert == False
+    return input_value
+
+
+def is_type_nullable(input_type):
+    """
+    Returns true if None is an allowed value for the specified input_type.
+
+    A type is nullable if at least one of the following conditions is true:
+    1. The OAS 'nullable' attribute has been specified,
+    1. The type is the 'null' type,
+    1. The type is a anyOf/oneOf composed schema, and a child schema is
+       the 'null' type.
+    Args:
+        input_type (type): the class of the input_value that we are
+            checking
+    Returns:
+        bool
+    """
+    if input_type is none_type:
+        return True
+    if issubclass(input_type, OpenApiModel) and input_type._nullable:
+        return True
+    if issubclass(input_type, ModelComposed):
+        # If oneOf/anyOf, check if the 'null' type is one of the allowed types.
+        for t in input_type._composed_schemas.get('oneOf', ()):
+            if is_type_nullable(t): return True
+        for t in input_type._composed_schemas.get('anyOf', ()):
+            if is_type_nullable(t): return True
+    return False
+
+
+def is_valid_type(input_class_simple, valid_classes):
+    """
+    Args:
+        input_class_simple (class): the class of the input_value that we are
+            checking
+        valid_classes (tuple): the valid classes that the current item
+            should be
+    Returns:
+        bool
+    """
+    valid_type = input_class_simple in valid_classes
+    if not valid_type and (
+            issubclass(input_class_simple, OpenApiModel) or
+            input_class_simple is none_type):
+        for valid_class in valid_classes:
+            if input_class_simple is none_type and is_type_nullable(valid_class):
+                # Schema is oneOf/anyOf and the 'null' type is one of the allowed types.
+                return True
+            if not (issubclass(valid_class, OpenApiModel) and valid_class.discriminator):
+                continue
+            discr_propertyname_py = list(valid_class.discriminator.keys())[0]
+            discriminator_classes = (
+                valid_class.discriminator[discr_propertyname_py].values()
+            )
+            valid_type = is_valid_type(input_class_simple, discriminator_classes)
+            if valid_type:
+                return True
+    return valid_type
+
+
+def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
+                               spec_property_naming, _check_type, configuration=None):
+    """Raises a TypeError is there is a problem, otherwise returns value
+
+    Args:
+        input_value (any): the data to validate/convert
+        required_types_mixed (list/dict/tuple): A list of
+            valid classes, or a list tuples of valid classes, or a dict where
+            the value is a tuple of value classes
+        path_to_item: (list) the path to the data being validated
+            this stores a list of keys or indices to get to the data being
+            validated
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
+        _check_type: (boolean) if true, type will be checked and conversion
+            will be attempted.
+        configuration: (Configuration): the configuration class to use
+            when converting file_type items.
+            If passed, conversion will be attempted when possible
+            If not passed, no conversions will be attempted and
+            exceptions will be raised
+
+    Returns:
+        the correctly typed value
+
+    Raises:
+        ApiTypeError
+    """
+    results = get_required_type_classes(required_types_mixed)
+    valid_classes, child_req_types_by_current_type = results
+
+    input_class_simple = get_simple_class(input_value)
+    valid_type = is_valid_type(input_class_simple, valid_classes)
+    if not valid_type:
+        if configuration:
+            # if input_value is not valid_type try to convert it
+            converted_instance = attempt_convert_item(
+                input_value,
+                valid_classes,
+                path_to_item,
+                configuration,
+                spec_property_naming,
+                key_type=False,
+                must_convert=True
+            )
+            return converted_instance
+        else:
+            raise get_type_error(input_value, path_to_item, valid_classes,
+                                 key_type=False)
+
+    # input_value's type is in valid_classes
+    if len(valid_classes) > 1 and configuration:
+        # there are valid classes which are not the current class
+        valid_classes_coercible = remove_uncoercible(
+            valid_classes, input_value, spec_property_naming, must_convert=False)
+        if valid_classes_coercible:
+            converted_instance = attempt_convert_item(
+                input_value,
+                valid_classes_coercible,
+                path_to_item,
+                configuration,
+                spec_property_naming,
+                key_type=False,
+                must_convert=False
+            )
+            return converted_instance
+
+    if child_req_types_by_current_type == {}:
+        # all types are of the required types and there are no more inner
+        # variables left to look at
+        return input_value
+    inner_required_types = child_req_types_by_current_type.get(
+        type(input_value)
+    )
+    if inner_required_types is None:
+        # for this type, there are not more inner variables left to look at
+        return input_value
+    if isinstance(input_value, list):
+        if input_value == []:
+            # allow an empty list
+            return input_value
+        for index, inner_value in enumerate(input_value):
+            inner_path = list(path_to_item)
+            inner_path.append(index)
+            input_value[index] = validate_and_convert_types(
+                inner_value,
+                inner_required_types,
+                inner_path,
+                spec_property_naming,
+                _check_type,
+                configuration=configuration
+            )
+    elif isinstance(input_value, dict):
+        if input_value == {}:
+            # allow an empty dict
+            return input_value
+        for inner_key, inner_val in six.iteritems(input_value):
+            inner_path = list(path_to_item)
+            inner_path.append(inner_key)
+            if get_simple_class(inner_key) != str:
+                raise get_type_error(inner_key, inner_path, valid_classes,
+                                     key_type=True)
+            input_value[inner_key] = validate_and_convert_types(
+                inner_val,
+                inner_required_types,
+                inner_path,
+                spec_property_naming,
+                _check_type,
+                configuration=configuration
+            )
+    return input_value
+
+
+def model_to_dict(model_instance, serialize=True):
+    """Returns the model properties as a dict
+
+    Args:
+        model_instance (one of your model instances): the model instance that
+            will be converted to a dict.
+
+    Keyword Args:
+        serialize (bool): if True, the keys in the dict will be values from
+            attribute_map
+    """
+    result = {}
+
+    model_instances = [model_instance]
+    if model_instance._composed_schemas:
+        model_instances.extend(model_instance._composed_instances)
+    for model_instance in model_instances:
+        for attr, value in six.iteritems(model_instance._data_store):
+            if serialize:
+                # we use get here because additional property key names do not
+                # exist in attribute_map
+                attr = model_instance.attribute_map.get(attr, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: model_to_dict(x, serialize=serialize)
+                    if hasattr(x, '_data_store') else x, value
+                ))
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0],
+                                  model_to_dict(item[1], serialize=serialize))
+                    if hasattr(item[1], '_data_store') else item,
+                    value.items()
+                ))
+            elif isinstance(value, ModelSimple):
+                result[attr] = value.value
+            elif hasattr(value, '_data_store'):
+                result[attr] = model_to_dict(value, serialize=serialize)
+            else:
+                result[attr] = value
+
+    return result
+
+
+def type_error_message(var_value=None, var_name=None, valid_classes=None,
+                       key_type=None):
+    """
+    Keyword Args:
+        var_value (any): the variable which has the type_error
+        var_name (str): the name of the variable which has the typ error
+        valid_classes (tuple): the accepted classes for current_item's
+                                  value
+        key_type (bool): False if our value is a value in a dict
+                         True if it is a key in a dict
+                         False if our item is an item in a list
+    """
+    key_or_value = 'value'
+    if key_type:
+        key_or_value = 'key'
+    valid_classes_phrase = get_valid_classes_phrase(valid_classes)
+    msg = (
+        "Invalid type for variable '{0}'. Required {1} type {2} and "
+        "passed type was {3}".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+    )
+    return msg
+
+
+def get_valid_classes_phrase(input_classes):
+    """Returns a string phrase describing what types are allowed
+    Note: Adds the extra valid classes in python2
+    """
+    all_classes = list(input_classes)
+    if six.PY2 and str in input_classes:
+        all_classes.extend([str_py2, unicode_py2])
+    if six.PY2 and int in input_classes:
+        all_classes.extend([int_py2, long_py2])
+    all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+    all_class_names = [cls.__name__ for cls in all_classes]
+    if len(all_class_names) == 1:
+        return 'is {0}'.format(all_class_names[0])
+    return "is one of [{0}]".format(", ".join(all_class_names))
+
+
+def get_py3_class_name(input_class):
+    if six.PY2:
+        if input_class == str:
+            return 'str'
+        elif input_class == int:
+            return 'int'
+    return input_class.__name__
+
+
+def convert_js_args_to_python_args(fn):
+    from functools import wraps
+    @wraps(fn)
+    def wrapped_init(self, *args, **kwargs):
+        spec_property_naming = kwargs.get('_spec_property_naming', False)
+        if spec_property_naming:
+            kwargs = change_keys_js_to_python(kwargs, self.__class__)
+        return fn(self, *args, **kwargs)
+    return wrapped_init
+
+
+def get_allof_instances(self, model_args, constant_args):
+    """
+    Args:
+        self: the class we are handling
+        model_args (dict): var_name to var_value
+            used to make instances
+        constant_args (dict): var_name to var_value
+            used to make instances
+
+    Returns
+        composed_instances (list)
+    """
+    composed_instances = []
+    for allof_class in self._composed_schemas['allOf']:
+
+        # no need to handle changing js keys to python because
+        # for composed schemas, allof parameters are included in the
+        # composed schema and were changed to python keys in __new__
+        # extract a dict of only required keys from fixed_model_args
+        kwargs = {}
+        var_names = set(allof_class.openapi_types.keys())
+        for var_name in var_names:
+            if var_name in model_args:
+                kwargs[var_name] = model_args[var_name]
+
+        # and use it to make the instance
+        kwargs.update(constant_args)
+        try:
+            allof_instance = allof_class(**kwargs)
+            composed_instances.append(allof_instance)
+        except Exception as ex:
+            six.raise_from(ApiValueError(
+                "Invalid inputs given to generate an instance of '%s'. The "
+                "input data was invalid for the allOf schema '%s' in the composed "
+                "schema '%s'. Error=%s" % (
+                    allof_class.__name__,
+                    allof_class.__name__,
+                    self.__class__.__name__,
+                    str(ex)
+                )
+            ), ex)
+    return composed_instances
+
+
+def get_oneof_instance(self, model_args, constant_args):
+    """
+    Find the oneOf schema that matches the input data (e.g. payload).
+    If exactly one schema matches the input data, an instance of that schema
+    is returned.
+    If zero or more than one schema match the input data, an exception is raised.
+    In OAS 3.x, the payload MUST, by validation, match exactly one of the
+    schemas described by oneOf.
+    Args:
+        self: the class we are handling
+        model_args (dict): var_name to var_value
+            The input data, e.g. the payload that must match a oneOf schema
+            in the OpenAPI document.
+        constant_args (dict): var_name to var_value
+            args that every model requires, including configuration, server
+            and path to item.
+
+    Returns
+        oneof_instance (instance)
+    """
+    if len(self._composed_schemas['oneOf']) == 0:
+        return None
+
+    oneof_instances = []
+    # Iterate over each oneOf schema and determine if the input data
+    # matches the oneOf schemas.
+    for oneof_class in self._composed_schemas['oneOf']:
+        # The composed oneOf schema allows the 'null' type and the input data
+        # is the null value. This is a OAS >= 3.1 feature.
+        if oneof_class is none_type:
+            # skip none_types because we are deserializing dict data.
+            # none_type deserialization is handled in the __new__ method
+            continue
+
+        # transform js keys from input data to python keys in fixed_model_args
+        fixed_model_args = change_keys_js_to_python(
+            model_args, oneof_class)
+
+        # Extract a dict with the properties that are declared in the oneOf schema.
+        # Undeclared properties (e.g. properties that are allowed because of the
+        # additionalProperties attribute in the OAS document) are not added to
+        # the dict.
+        kwargs = {}
+        var_names = set(oneof_class.openapi_types.keys())
+        for var_name in var_names:
+            if var_name in fixed_model_args:
+                kwargs[var_name] = fixed_model_args[var_name]
+
+        # do not try to make a model with no input args
+        if len(kwargs) == 0:
+            continue
+
+        # and use it to make the instance
+        kwargs.update(constant_args)
+        try:
+            oneof_instance = oneof_class(**kwargs)
+            oneof_instances.append(oneof_instance)
+        except Exception:
+            pass
+    if len(oneof_instances) == 0:
+        raise ApiValueError(
+            "Invalid inputs given to generate an instance of %s. None "
+            "of the oneOf schemas matched the input data." %
+            self.__class__.__name__
+        )
+    elif len(oneof_instances) > 1:
+        raise ApiValueError(
+            "Invalid inputs given to generate an instance of %s. Multiple "
+            "oneOf schemas matched the inputs, but a max of one is allowed." %
+            self.__class__.__name__
+        )
+    return oneof_instances[0]
+
+
+def get_anyof_instances(self, model_args, constant_args):
+    """
+    Args:
+        self: the class we are handling
+        model_args (dict): var_name to var_value
+            The input data, e.g. the payload that must match at least one
+            anyOf child schema in the OpenAPI document.
+        constant_args (dict): var_name to var_value
+            args that every model requires, including configuration, server
+            and path to item.
+
+    Returns
+        anyof_instances (list)
+    """
+    anyof_instances = []
+    if len(self._composed_schemas['anyOf']) == 0:
+        return anyof_instances
+
+    for anyof_class in self._composed_schemas['anyOf']:
+        # The composed oneOf schema allows the 'null' type and the input data
+        # is the null value. This is a OAS >= 3.1 feature.
+        if anyof_class is none_type:
+            # skip none_types because we are deserializing dict data.
+            # none_type deserialization is handled in the __new__ method
+            continue
+
+        # transform js keys to python keys in fixed_model_args
+        fixed_model_args = change_keys_js_to_python(model_args, anyof_class)
+
+        # extract a dict of only required keys from these_model_vars
+        kwargs = {}
+        var_names = set(anyof_class.openapi_types.keys())
+        for var_name in var_names:
+            if var_name in fixed_model_args:
+                kwargs[var_name] = fixed_model_args[var_name]
+
+        # do not try to make a model with no input args
+        if len(kwargs) == 0:
+            continue
+
+        # and use it to make the instance
+        kwargs.update(constant_args)
+        try:
+            anyof_instance = anyof_class(**kwargs)
+            anyof_instances.append(anyof_instance)
+        except Exception:
+            pass
+    if len(anyof_instances) == 0:
+        raise ApiValueError(
+            "Invalid inputs given to generate an instance of %s. None of the "
+            "anyOf schemas matched the inputs." %
+            self.__class__.__name__
+        )
+    return anyof_instances
+
+
+def get_additional_properties_model_instances(
+        composed_instances, self):
+    additional_properties_model_instances = []
+    all_instances = [self]
+    all_instances.extend(composed_instances)
+    for instance in all_instances:
+        if instance.additional_properties_type is not None:
+            additional_properties_model_instances.append(instance)
+    return additional_properties_model_instances
+
+
+def get_var_name_to_model_instances(self, composed_instances):
+    var_name_to_model_instances = {}
+    all_instances = [self]
+    all_instances.extend(composed_instances)
+    for instance in all_instances:
+        for var_name in instance.openapi_types:
+            if var_name not in var_name_to_model_instances:
+                var_name_to_model_instances[var_name] = [instance]
+            else:
+                var_name_to_model_instances[var_name].append(instance)
+    return var_name_to_model_instances
+
+
+def get_unused_args(self, composed_instances, model_args):
+    unused_args = dict(model_args)
+    # arguments apssed to self were already converted to python names
+    # before __init__ was called
+    for var_name_py in self.attribute_map:
+        if var_name_py in unused_args:
+            del unused_args[var_name_py]
+    for instance in composed_instances:
+        if instance.__class__ in self._composed_schemas['allOf']:
+            for var_name_py in instance.attribute_map:
+                if var_name_py in unused_args:
+                    del unused_args[var_name_py]
+        else:
+            for var_name_js in instance.attribute_map.values():
+                if var_name_js in unused_args:
+                    del unused_args[var_name_js]
+    return unused_args
+
+
+def validate_get_composed_info(constant_args, model_args, self):
+    """
+    For composed schemas, generate schema instances for
+    all schemas in the oneOf/anyOf/allOf definition. If additional
+    properties are allowed, also assign those properties on
+    all matched schemas that contain additionalProperties.
+    Openapi schemas are python classes.
+
+    Exceptions are raised if:
+    - 0 or > 1 oneOf schema matches the model_args input data
+    - no anyOf schema matches the model_args input data
+    - any of the allOf schemas do not match the model_args input data
+
+    Args:
+        constant_args (dict): these are the args that every model requires
+        model_args (dict): these are the required and optional spec args that
+            were passed in to make this model
+        self (class): the class that we are instantiating
+            This class contains self._composed_schemas
+
+    Returns:
+        composed_info (list): length three
+            composed_instances (list): the composed instances which are not
+                self
+            var_name_to_model_instances (dict): a dict going from var_name
+                to the model_instance which holds that var_name
+                the model_instance may be self or an instance of one of the
+                classes in self.composed_instances()
+            additional_properties_model_instances (list): a list of the
+                model instances which have the property
+                additional_properties_type. This list can include self
+    """
+    # create composed_instances
+    composed_instances = []
+    allof_instances = get_allof_instances(self, model_args, constant_args)
+    composed_instances.extend(allof_instances)
+    oneof_instance = get_oneof_instance(self, model_args, constant_args)
+    if oneof_instance is not None:
+        composed_instances.append(oneof_instance)
+    anyof_instances = get_anyof_instances(self, model_args, constant_args)
+    composed_instances.extend(anyof_instances)
+
+    # map variable names to composed_instances
+    var_name_to_model_instances = get_var_name_to_model_instances(
+        self, composed_instances)
+
+    # set additional_properties_model_instances
+    additional_properties_model_instances = (
+        get_additional_properties_model_instances(composed_instances, self)
+    )
+
+    # set any remaining values
+    unused_args = get_unused_args(self, composed_instances, model_args)
+    if len(unused_args) > 0 and \
+            len(additional_properties_model_instances) == 0 and \
+            (self._configuration is None or
+                not self._configuration.discard_unknown_keys):
+        raise ApiValueError(
+            "Invalid input arguments input when making an instance of "
+            "class %s. Not all inputs were used. The unused input data "
+            "is %s" % (self.__class__.__name__, unused_args)
+        )
+
+    # no need to add additional_properties to var_name_to_model_instances here
+    # because additional_properties_model_instances will direct us to that
+    # instance when we use getattr or setattr
+    # and we update var_name_to_model_instances in setattr
+
+    return [
+      composed_instances,
+      var_name_to_model_instances,
+      additional_properties_model_instances,
+      unused_args
+    ]
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/models/__init__.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/models/__init__.py
new file mode 100644
index 000000000000..0cb2976e7c10
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/models/__init__.py
@@ -0,0 +1,13 @@
+# coding: utf-8
+
+# flake8: noqa
+
+# import all models into this package
+# if you have many models here with many references from one model to another this may
+# raise a RecursionError
+# to avoid this, import only the models that you directly need like:
+# from from dynamic_servers.model.pet import Pet
+# or import this package, but before doing it, use:
+# import sys
+# sys.setrecursionlimit(n)
+
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/rest.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/rest.py
new file mode 100644
index 000000000000..e9bd23610fe3
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/rest.py
@@ -0,0 +1,291 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension with dynamic servers
+
+    This specification shows how to use dynamic servers.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+
+import io
+import json
+import logging
+import re
+import ssl
+
+import certifi
+# python 2 and python 3 compatibility library
+import six
+from six.moves.urllib.parse import urlencode
+import urllib3
+
+from dynamic_servers.exceptions import ApiException, ApiValueError
+
+
+logger = logging.getLogger(__name__)
+
+
+class RESTResponse(io.IOBase):
+
+    def __init__(self, resp):
+        self.urllib3_response = resp
+        self.status = resp.status
+        self.reason = resp.reason
+        self.data = resp.data
+
+    def getheaders(self):
+        """Returns a dictionary of the response headers."""
+        return self.urllib3_response.getheaders()
+
+    def getheader(self, name, default=None):
+        """Returns a given response header."""
+        return self.urllib3_response.getheader(name, default)
+
+
+class RESTClientObject(object):
+
+    def __init__(self, configuration, pools_size=4, maxsize=None):
+        # urllib3.PoolManager will pass all kw parameters to connectionpool
+        # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/poolmanager.py#L75  # noqa: E501
+        # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/connectionpool.py#L680  # noqa: E501
+        # maxsize is the number of requests to host that are allowed in parallel  # noqa: E501
+        # Custom SSL certificates and client certificates: http://urllib3.readthedocs.io/en/latest/advanced-usage.html  # noqa: E501
+
+        # cert_reqs
+        if configuration.verify_ssl:
+            cert_reqs = ssl.CERT_REQUIRED
+        else:
+            cert_reqs = ssl.CERT_NONE
+
+        # ca_certs
+        if configuration.ssl_ca_cert:
+            ca_certs = configuration.ssl_ca_cert
+        else:
+            # if not set certificate file, use Mozilla's root certificates.
+            ca_certs = certifi.where()
+
+        addition_pool_args = {}
+        if configuration.assert_hostname is not None:
+            addition_pool_args['assert_hostname'] = configuration.assert_hostname  # noqa: E501
+
+        if configuration.retries is not None:
+            addition_pool_args['retries'] = configuration.retries
+
+        if maxsize is None:
+            if configuration.connection_pool_maxsize is not None:
+                maxsize = configuration.connection_pool_maxsize
+            else:
+                maxsize = 4
+
+        # https pool manager
+        if configuration.proxy:
+            self.pool_manager = urllib3.ProxyManager(
+                num_pools=pools_size,
+                maxsize=maxsize,
+                cert_reqs=cert_reqs,
+                ca_certs=ca_certs,
+                cert_file=configuration.cert_file,
+                key_file=configuration.key_file,
+                proxy_url=configuration.proxy,
+                proxy_headers=configuration.proxy_headers,
+                **addition_pool_args
+            )
+        else:
+            self.pool_manager = urllib3.PoolManager(
+                num_pools=pools_size,
+                maxsize=maxsize,
+                cert_reqs=cert_reqs,
+                ca_certs=ca_certs,
+                cert_file=configuration.cert_file,
+                key_file=configuration.key_file,
+                **addition_pool_args
+            )
+
+    def request(self, method, url, query_params=None, headers=None,
+                body=None, post_params=None, _preload_content=True,
+                _request_timeout=None):
+        """Perform requests.
+
+        :param method: http request method
+        :param url: http request url
+        :param query_params: query parameters in the url
+        :param headers: http request headers
+        :param body: request json body, for `application/json`
+        :param post_params: request post parameters,
+                            `application/x-www-form-urlencoded`
+                            and `multipart/form-data`
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        """
+        method = method.upper()
+        assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT',
+                          'PATCH', 'OPTIONS']
+
+        if post_params and body:
+            raise ApiValueError(
+                "body parameter cannot be used with post_params parameter."
+            )
+
+        post_params = post_params or {}
+        headers = headers or {}
+
+        timeout = None
+        if _request_timeout:
+            if isinstance(_request_timeout, (int, ) if six.PY3 else (int, long)):  # noqa: E501,F821
+                timeout = urllib3.Timeout(total=_request_timeout)
+            elif (isinstance(_request_timeout, tuple) and
+                  len(_request_timeout) == 2):
+                timeout = urllib3.Timeout(
+                    connect=_request_timeout[0], read=_request_timeout[1])
+
+        if 'Content-Type' not in headers:
+            headers['Content-Type'] = 'application/json'
+
+        try:
+            # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
+            if method in ['POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE']:
+                if query_params:
+                    url += '?' + urlencode(query_params)
+                if re.search('json', headers['Content-Type'], re.IGNORECASE):
+                    request_body = None
+                    if body is not None:
+                        request_body = json.dumps(body)
+                    r = self.pool_manager.request(
+                        method, url,
+                        body=request_body,
+                        preload_content=_preload_content,
+                        timeout=timeout,
+                        headers=headers)
+                elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
+                    r = self.pool_manager.request(
+                        method, url,
+                        fields=post_params,
+                        encode_multipart=False,
+                        preload_content=_preload_content,
+                        timeout=timeout,
+                        headers=headers)
+                elif headers['Content-Type'] == 'multipart/form-data':
+                    # must del headers['Content-Type'], or the correct
+                    # Content-Type which generated by urllib3 will be
+                    # overwritten.
+                    del headers['Content-Type']
+                    r = self.pool_manager.request(
+                        method, url,
+                        fields=post_params,
+                        encode_multipart=True,
+                        preload_content=_preload_content,
+                        timeout=timeout,
+                        headers=headers)
+                # Pass a `string` parameter directly in the body to support
+                # other content types than Json when `body` argument is
+                # provided in serialized form
+                elif isinstance(body, str) or isinstance(body, bytes):
+                    request_body = body
+                    r = self.pool_manager.request(
+                        method, url,
+                        body=request_body,
+                        preload_content=_preload_content,
+                        timeout=timeout,
+                        headers=headers)
+                else:
+                    # Cannot generate the request from given parameters
+                    msg = """Cannot prepare a request message for provided
+                             arguments. Please check that your arguments match
+                             declared content type."""
+                    raise ApiException(status=0, reason=msg)
+            # For `GET`, `HEAD`
+            else:
+                r = self.pool_manager.request(method, url,
+                                              fields=query_params,
+                                              preload_content=_preload_content,
+                                              timeout=timeout,
+                                              headers=headers)
+        except urllib3.exceptions.SSLError as e:
+            msg = "{0}\n{1}".format(type(e).__name__, str(e))
+            raise ApiException(status=0, reason=msg)
+
+        if _preload_content:
+            r = RESTResponse(r)
+
+            # log response body
+            logger.debug("response body: %s", r.data)
+
+        if not 200 <= r.status <= 299:
+            raise ApiException(http_resp=r)
+
+        return r
+
+    def GET(self, url, headers=None, query_params=None, _preload_content=True,
+            _request_timeout=None):
+        return self.request("GET", url,
+                            headers=headers,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            query_params=query_params)
+
+    def HEAD(self, url, headers=None, query_params=None, _preload_content=True,
+             _request_timeout=None):
+        return self.request("HEAD", url,
+                            headers=headers,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            query_params=query_params)
+
+    def OPTIONS(self, url, headers=None, query_params=None, post_params=None,
+                body=None, _preload_content=True, _request_timeout=None):
+        return self.request("OPTIONS", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            body=body)
+
+    def DELETE(self, url, headers=None, query_params=None, body=None,
+               _preload_content=True, _request_timeout=None):
+        return self.request("DELETE", url,
+                            headers=headers,
+                            query_params=query_params,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            body=body)
+
+    def POST(self, url, headers=None, query_params=None, post_params=None,
+             body=None, _preload_content=True, _request_timeout=None):
+        return self.request("POST", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            body=body)
+
+    def PUT(self, url, headers=None, query_params=None, post_params=None,
+            body=None, _preload_content=True, _request_timeout=None):
+        return self.request("PUT", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            body=body)
+
+    def PATCH(self, url, headers=None, query_params=None, post_params=None,
+              body=None, _preload_content=True, _request_timeout=None):
+        return self.request("PATCH", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            _preload_content=_preload_content,
+                            _request_timeout=_request_timeout,
+                            body=body)
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/git_push.sh b/samples/openapi3/client/features/dynamic-servers/python-experimental/git_push.sh
similarity index 100%
rename from samples/openapi3/client/petstore/php/OpenAPIClient-php/git_push.sh
rename to samples/openapi3/client/features/dynamic-servers/python-experimental/git_push.sh
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/requirements.txt b/samples/openapi3/client/features/dynamic-servers/python-experimental/requirements.txt
new file mode 100644
index 000000000000..a56bedffbf57
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/requirements.txt
@@ -0,0 +1,7 @@
+nulltype
+certifi >= 14.05.14
+future; python_version<="2.7"
+six >= 1.10
+python_dateutil >= 2.5.3
+setuptools >= 21.0.0
+urllib3 >= 1.15.1
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/setup.cfg b/samples/openapi3/client/features/dynamic-servers/python-experimental/setup.cfg
new file mode 100644
index 000000000000..11433ee875ab
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/setup.cfg
@@ -0,0 +1,2 @@
+[flake8]
+max-line-length=99
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/setup.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/setup.py
new file mode 100644
index 000000000000..5da7badc9768
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/setup.py
@@ -0,0 +1,49 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension with dynamic servers
+
+    This specification shows how to use dynamic servers.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from setuptools import setup, find_packages  # noqa: H301
+
+NAME = "dynamic-servers"
+VERSION = "1.0.0"
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = [
+  "urllib3 >= 1.15",
+  "six >= 1.10",
+  "certifi",
+  "python-dateutil",
+  "nulltype",
+]
+EXTRAS = {':python_version <= "2.7"': ['future']}
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="OpenAPI Extension with dynamic servers",
+    author="OpenAPI Generator community",
+    author_email="team@openapitools.org",
+    url="",
+    keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Extension with dynamic servers"],
+    install_requires=REQUIRES,
+    extras_require=EXTRAS,
+    packages=find_packages(exclude=["test", "tests"]),
+    include_package_data=True,
+    license="Apache-2.0",
+    long_description="""\
+    This specification shows how to use dynamic servers.  # noqa: E501
+    """
+)
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/test-requirements.txt b/samples/openapi3/client/features/dynamic-servers/python-experimental/test-requirements.txt
new file mode 100644
index 000000000000..06f7754d2044
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/test-requirements.txt
@@ -0,0 +1,4 @@
+pytest~=4.6.7 # needed for python 2.7+3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 2.7+3.4
+mock; python_version<="2.7"
\ No newline at end of file
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/controllers/__init__.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/test/__init__.py
similarity index 100%
rename from samples/server/petstore/python-flask-python2/openapi_server/controllers/__init__.py
rename to samples/openapi3/client/features/dynamic-servers/python-experimental/test/__init__.py
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/test/test_usage_api.py b/samples/openapi3/client/features/dynamic-servers/python-experimental/test/test_usage_api.py
new file mode 100644
index 000000000000..faffb9263dda
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/test/test_usage_api.py
@@ -0,0 +1,123 @@
+# coding: utf-8
+
+"""
+    OpenAPI Extension with dynamic servers
+
+    This specification shows how to use dynamic servers.  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+from __future__ import absolute_import
+
+import functools
+import unittest
+
+import dynamic_servers
+from dynamic_servers.api.usage_api import UsageApi  # noqa: E501
+
+
+class TestUsageApi(unittest.TestCase):
+    """UsageApi unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def test_custom_server(self):
+        """Test case for custom_server
+
+        Use custom server  # noqa: E501
+        """
+        # expected value, config
+        servers = (
+            ("https://custom-petstore.swagger.io:8080/v2/custom", {}),
+            (
+                "https://custom-petstore.swagger.io:80/v2/custom",
+                {
+                    "server_index": 0,
+                    "server_variables": {"port": "80"},  # global override
+                },
+            ),
+            (
+                "https://custom-petstore.swagger.io:8080/v2/custom",
+                {
+                    "server_index": 0,
+                    "server_variables": {"port": "80"},
+                    "server_operation_variables": {"custom_server": {"port": "8080"}},  # operation override
+                },
+            ),
+            (
+                "https://third.example.com/global-prefix/custom",
+                {
+                    "server_index": 2,
+                    "server_variables": {"prefix": "global-prefix"},  # global override
+                },
+            ),
+            (
+                "https://third.example.com/local-prefix/custom",
+                {
+                    "server_index": 1,
+                    "server_variables": {"prefix": "global-prefix"},
+                    "server_operation_index": {"custom_server": 2},
+                    "server_operation_variables": {"custom_server": {"prefix": "local-prefix"}},  # operation override
+                },
+            ),
+        )
+
+        def request(expected_url, method, url, **kwargs):
+            assert expected_url == url
+            raise RuntimeError("pass")
+
+        for expected_url, kwargs in servers:
+            client = dynamic_servers.ApiClient(dynamic_servers.Configuration(**kwargs))
+            client.request = functools.partial(request, expected_url)
+            api = UsageApi(client)
+
+            try:
+                api.custom_server()
+            except RuntimeError as e:
+                assert "pass" == str(e)
+
+    def test_default_server(self):
+        """Test case for default_server
+
+        Use default server  # noqa: E501
+        """
+        # expected value, config
+        servers = (
+            ("http://petstore.swagger.io:80/v2/default", {}),
+            (
+                "http://dev-petstore.swagger.io:8080/v2/default",
+                {
+                    "server_index": 0,
+                    "server_variables": {"server": "dev-petstore", "port": "8080"},
+                },
+            ),
+            ("https://localhost:8080/v1/default", {"server_index": 1}),
+            (
+                "https://localhost:8080/v3/default",
+                {"server_index": 1, "server_variables": {"version": "v3"}},
+            ),
+        )
+
+        def request(expected_url, method, url, **kwargs):
+            assert expected_url == url
+            raise RuntimeError("pass")
+
+        for expected_url, kwargs in servers:
+            client = dynamic_servers.ApiClient(dynamic_servers.Configuration(**kwargs))
+            client.request = functools.partial(request, expected_url)
+            api = UsageApi(client)
+
+            try:
+                api.default_server()
+            except RuntimeError as e:
+                assert "pass" == str(e)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/samples/openapi3/client/features/dynamic-servers/python-experimental/tox.ini b/samples/openapi3/client/features/dynamic-servers/python-experimental/tox.ini
new file mode 100644
index 000000000000..85712433c51c
--- /dev/null
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/tox.ini
@@ -0,0 +1,9 @@
+[tox]
+envlist = py27, py3
+
+[testenv]
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+
+commands=
+   pytest --cov=dynamic_servers
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/api_pet.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/api_pet.go
index 4031a35683a6..66c99d700564 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/api_pet.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/api_pet.go
@@ -171,7 +171,7 @@ func (r apiDeletePetRequest) Execute() (*_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(r.petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(r.petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -480,7 +480,7 @@ func (r apiGetPetByIdRequest) Execute() (Pet, *_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(r.petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(r.petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -704,7 +704,7 @@ func (r apiUpdatePetWithFormRequest) Execute() (*_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(r.petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(r.petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -813,7 +813,7 @@ func (r apiUploadFileRequest) Execute() (ApiResponse, *_nethttp.Response, error)
 	}
 
 	localVarPath := localBasePath + "/pet/{petId}/uploadImage"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(r.petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(r.petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -939,7 +939,7 @@ func (r apiUploadFileWithRequiredFileRequest) Execute() (ApiResponse, *_nethttp.
 	}
 
 	localVarPath := localBasePath + "/fake/{petId}/uploadImageWithRequiredFile"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(r.petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(r.petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/api_store.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/api_store.go
index b953699dcc97..a4bdc3009ea9 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/api_store.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/api_store.go
@@ -67,7 +67,7 @@ func (r apiDeleteOrderRequest) Execute() (*_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/store/order/{order_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.QueryEscape(parameterToString(r.orderId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.PathEscape(parameterToString(r.orderId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -269,7 +269,7 @@ func (r apiGetOrderByIdRequest) Execute() (Order, *_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/store/order/{order_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.QueryEscape(parameterToString(r.orderId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.PathEscape(parameterToString(r.orderId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/api_user.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/api_user.go
index aac20879b628..09570f58d9fb 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/api_user.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/api_user.go
@@ -362,7 +362,7 @@ func (r apiDeleteUserRequest) Execute() (*_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(r.username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(r.username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -453,7 +453,7 @@ func (r apiGetUserByNameRequest) Execute() (User, *_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(r.username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(r.username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -763,7 +763,7 @@ func (r apiUpdateUserRequest) Execute() (*_nethttp.Response, error) {
 	}
 
 	localVarPath := localBasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(r.username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(r.username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Animal.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Animal.md
index dd124c1d2615..293f75c51717 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Animal.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Animal.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ClassName** | Pointer to **string** |  | 
+**ClassName** | **string** |  | 
 **Color** | Pointer to **string** |  | [optional] [default to "red"]
 
 ## Methods
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/AppleReq.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/AppleReq.md
index 31286b798875..d56e3051f58d 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/AppleReq.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/AppleReq.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Cultivar** | Pointer to **string** |  | 
+**Cultivar** | **string** |  | 
 **Mealy** | Pointer to **bool** |  | [optional] 
 
 ## Methods
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/BananaReq.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/BananaReq.md
index 2f9887641ecc..3d4ebb281916 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/BananaReq.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/BananaReq.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**LengthCm** | Pointer to **float32** |  | 
+**LengthCm** | **float32** |  | 
 **Sweet** | Pointer to **bool** |  | [optional] 
 
 ## Methods
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Category.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Category.md
index 0fa542e093ae..0d3f6d4ff226 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Category.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Category.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Id** | Pointer to **int64** |  | [optional] 
-**Name** | Pointer to **string** |  | [default to "default-name"]
+**Name** | **string** |  | [default to "default-name"]
 
 ## Methods
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/EnumTest.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
index 451b33b57c82..a1761a7cd725 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EnumString** | Pointer to **string** |  | [optional] 
-**EnumStringRequired** | Pointer to **string** |  | 
+**EnumStringRequired** | **string** |  | 
 **EnumInteger** | Pointer to **int32** |  | [optional] 
 **EnumNumber** | Pointer to **float64** |  | [optional] 
 **OuterEnum** | Pointer to [**NullableOuterEnum**](OuterEnum.md) |  | [optional] 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FormatTest.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
index d6b81be4e115..f94ef3040f25 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
@@ -7,16 +7,16 @@ Name | Type | Description | Notes
 **Integer** | Pointer to **int32** |  | [optional] 
 **Int32** | Pointer to **int32** |  | [optional] 
 **Int64** | Pointer to **int64** |  | [optional] 
-**Number** | Pointer to **float32** |  | 
+**Number** | **float32** |  | 
 **Float** | Pointer to **float32** |  | [optional] 
 **Double** | Pointer to **float64** |  | [optional] 
 **String** | Pointer to **string** |  | [optional] 
-**Byte** | Pointer to **string** |  | 
+**Byte** | **string** |  | 
 **Binary** | Pointer to [***os.File**](*os.File.md) |  | [optional] 
-**Date** | Pointer to **string** |  | 
+**Date** | **string** |  | 
 **DateTime** | Pointer to [**time.Time**](time.Time.md) |  | [optional] 
 **Uuid** | Pointer to **string** |  | [optional] 
-**Password** | Pointer to **string** |  | 
+**Password** | **string** |  | 
 **PatternWithDigits** | Pointer to **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] 
 **PatternWithDigitsAndDelimiter** | Pointer to **string** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. | [optional] 
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FruitReq.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FruitReq.md
index 0eac3bb84f16..1128c2be20e1 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FruitReq.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FruitReq.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Cultivar** | Pointer to **string** |  | 
+**Cultivar** | **string** |  | 
 **Mealy** | Pointer to **bool** |  | [optional] 
-**LengthCm** | Pointer to **float32** |  | 
+**LengthCm** | **float32** |  | 
 **Sweet** | Pointer to **bool** |  | [optional] 
 
 ## Methods
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject3.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject3.md
index e0ababa0b506..e0c1472b2f7e 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject3.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject3.md
@@ -7,12 +7,12 @@ Name | Type | Description | Notes
 **Integer** | Pointer to **int32** | None | [optional] 
 **Int32** | Pointer to **int32** | None | [optional] 
 **Int64** | Pointer to **int64** | None | [optional] 
-**Number** | Pointer to **float32** | None | 
+**Number** | **float32** | None | 
 **Float** | Pointer to **float32** | None | [optional] 
-**Double** | Pointer to **float64** | None | 
+**Double** | **float64** | None | 
 **String** | Pointer to **string** | None | [optional] 
-**PatternWithoutDelimiter** | Pointer to **string** | None | 
-**Byte** | Pointer to **string** | None | 
+**PatternWithoutDelimiter** | **string** | None | 
+**Byte** | **string** | None | 
 **Binary** | Pointer to [***os.File**](*os.File.md) | None | [optional] 
 **Date** | Pointer to **string** | None | [optional] 
 **DateTime** | Pointer to [**time.Time**](time.Time.md) | None | [optional] 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject4.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject4.md
index 848986f31d11..e716f8dd913e 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject4.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject4.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Param** | Pointer to **string** | field1 | 
-**Param2** | Pointer to **string** | field2 | 
+**Param** | **string** | field1 | 
+**Param2** | **string** | field2 | 
 
 ## Methods
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject5.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject5.md
index f0dd583ce152..a6a4f9367b5d 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject5.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/InlineObject5.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **AdditionalMetadata** | Pointer to **string** | Additional data to pass to server | [optional] 
-**RequiredFile** | Pointer to [***os.File**](*os.File.md) | file to upload | 
+**RequiredFile** | [***os.File**](*os.File.md) | file to upload | 
 
 ## Methods
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Mammal.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Mammal.md
index 9f14ab561652..6e926911167b 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Mammal.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Mammal.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **HasBaleen** | Pointer to **bool** |  | [optional] 
 **HasTeeth** | Pointer to **bool** |  | [optional] 
-**ClassName** | Pointer to **string** |  | 
+**ClassName** | **string** |  | 
 **Type** | Pointer to **string** |  | [optional] 
 
 ## Methods
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Name.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Name.md
index 52fb687af7be..18cf04789d6e 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Name.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Name.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | Pointer to **int32** |  | 
+**Name** | **int32** |  | 
 **SnakeCase** | Pointer to **int32** |  | [optional] [readonly] 
 **Property** | Pointer to **string** |  | [optional] 
 **Var123Number** | Pointer to **int32** |  | [optional] [readonly] 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Pet.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Pet.md
index 6b4776422396..a6eae34657d3 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Pet.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Pet.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Id** | Pointer to **int64** |  | [optional] 
 **Category** | Pointer to [**Category**](Category.md) |  | [optional] 
-**Name** | Pointer to **string** |  | 
-**PhotoUrls** | Pointer to **[]string** |  | 
+**Name** | **string** |  | 
+**PhotoUrls** | **[]string** |  | 
 **Tags** | Pointer to [**[]Tag**](Tag.md) |  | [optional] 
 **Status** | Pointer to **string** | pet status in the store | [optional] 
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Whale.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Whale.md
index 8f346ab7206f..f4478f612657 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Whale.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Whale.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **HasBaleen** | Pointer to **bool** |  | [optional] 
 **HasTeeth** | Pointer to **bool** |  | [optional] 
-**ClassName** | Pointer to **string** |  | 
+**ClassName** | **string** |  | 
 
 ## Methods
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Zebra.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Zebra.md
index 13fd37c0ed69..72f9fea8dbcc 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Zebra.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/Zebra.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Type** | Pointer to **string** |  | [optional] 
-**ClassName** | Pointer to **string** |  | 
+**ClassName** | **string** |  | 
 
 ## Methods
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_class.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_class.go
index 97094c05ce8a..9c03714608c2 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_class.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_class.go
@@ -38,7 +38,7 @@ func (v *EnumClass) UnmarshalJSON(src []byte) error {
 		}
 	}
 
-	return fmt.Errorf("%+v is not a valid EnumClass", *v)
+	return fmt.Errorf("%+v is not a valid EnumClass", value)
 }
 
 // Ptr returns reference to EnumClass value
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum.go
index 35561af59cba..f0297f941ddc 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum.go
@@ -38,7 +38,7 @@ func (v *OuterEnum) UnmarshalJSON(src []byte) error {
 		}
 	}
 
-	return fmt.Errorf("%+v is not a valid OuterEnum", *v)
+	return fmt.Errorf("%+v is not a valid OuterEnum", value)
 }
 
 // Ptr returns reference to OuterEnum value
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_default_value.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_default_value.go
index fe33ab9e7cfe..334feef54a51 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_default_value.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_default_value.go
@@ -38,7 +38,7 @@ func (v *OuterEnumDefaultValue) UnmarshalJSON(src []byte) error {
 		}
 	}
 
-	return fmt.Errorf("%+v is not a valid OuterEnumDefaultValue", *v)
+	return fmt.Errorf("%+v is not a valid OuterEnumDefaultValue", value)
 }
 
 // Ptr returns reference to OuterEnumDefaultValue value
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer.go
index d1f5a80197df..025b8a7c70a9 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer.go
@@ -38,7 +38,7 @@ func (v *OuterEnumInteger) UnmarshalJSON(src []byte) error {
 		}
 	}
 
-	return fmt.Errorf("%+v is not a valid OuterEnumInteger", *v)
+	return fmt.Errorf("%+v is not a valid OuterEnumInteger", value)
 }
 
 // Ptr returns reference to OuterEnumInteger value
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer_default_value.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer_default_value.go
index 9e785ac967de..07afc92fac91 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer_default_value.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer_default_value.go
@@ -38,7 +38,7 @@ func (v *OuterEnumIntegerDefaultValue) UnmarshalJSON(src []byte) error {
 		}
 	}
 
-	return fmt.Errorf("%+v is not a valid OuterEnumIntegerDefaultValue", *v)
+	return fmt.Errorf("%+v is not a valid OuterEnumIntegerDefaultValue", value)
 }
 
 // Ptr returns reference to OuterEnumIntegerDefaultValue value
diff --git a/samples/openapi3/client/petstore/go-experimental/http_signature_test.go b/samples/openapi3/client/petstore/go-experimental/http_signature_test.go
index 9336d0ca420a..6348599111a6 100644
--- a/samples/openapi3/client/petstore/go-experimental/http_signature_test.go
+++ b/samples/openapi3/client/petstore/go-experimental/http_signature_test.go
@@ -11,6 +11,7 @@ import (
 	"context"
 	"crypto"
 	"crypto/ecdsa"
+	"crypto/elliptic"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
@@ -60,9 +61,9 @@ func writeTestRsaPemKey(t *testing.T, filePath string) {
 type keyFormat int // The serialization format of the private key.
 
 const (
-	keyFormatPem keyFormat = iota // Private key is serialized in PEM format.
-	keyFormatPkcs8Pem             // Private key is serialized as PKCS#8 encoded in PEM format.
-	keyFormatPkcs8Der             // Private key is serialized as PKCS#8 encoded in DER format.
+	keyFormatPem      keyFormat = iota // Private key is serialized in PEM format.
+	keyFormatPkcs8Pem                  // Private key is serialized as PKCS#8 encoded in PEM format.
+	keyFormatPkcs8Der                  // Private key is serialized as PKCS#8 encoded in DER format.
 )
 
 func writeRandomTestRsaPemKey(t *testing.T, filePath string, bits int, format keyFormat, passphrase string, alg *x509.PEMCipher) {
@@ -126,9 +127,6 @@ func writeRandomTestRsaPemKey(t *testing.T, filePath string, bits int, format ke
 	fmt.Printf("Wrote private key '%s'\n", filePath)
 }
 
-/*
-Commented out because OpenAPITools is configured to use golang 1.8 at build time
-x509.MarshalPKCS8PrivateKey is not present.
 func writeRandomTestEcdsaPemKey(t *testing.T, filePath string) {
 	key, err := ecdsa.GenerateKey(elliptic.P521(), rand.Reader)
 	if err != nil {
@@ -156,7 +154,6 @@ func writeRandomTestEcdsaPemKey(t *testing.T, filePath string) {
 		t.Fatalf("Error encoding ECDSA private key: %v", err)
 	}
 }
-*/
 
 // TestHttpSignaturePrivateKeys creates private keys of various sizes, serialization format,
 // clear-text and password encrypted.
@@ -196,11 +193,11 @@ func TestHttpSignaturePrivateKeys(t *testing.T) {
 			writeRandomTestRsaPemKey(t, privateKeyPath, bits, format, "", nil)
 
 			authConfig := sw.HttpSignatureAuth{
-				KeyId:           "my-key-id",
-				PrivateKeyPath:  privateKeyPath,
-				Passphrase:      "",
-				SigningScheme:   "hs2019",
-				SignedHeaders:   []string{"Content-Type"},
+				KeyId:          "my-key-id",
+				PrivateKeyPath: privateKeyPath,
+				Passphrase:     "",
+				SigningScheme:  "hs2019",
+				SignedHeaders:  []string{"Content-Type"},
 			}
 
 			// Create a context with the HTTP signature configuration parameters.
@@ -208,13 +205,13 @@ func TestHttpSignaturePrivateKeys(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Error loading private key '%s': %v", privateKeyPath, err)
 			}
-			
+
 			authConfig = sw.HttpSignatureAuth{
-				KeyId:           "my-key-id",
-				PrivateKeyPath:  privateKeyPath,
-				Passphrase:      "my-secret-passphrase",
-				SigningScheme:   "hs2019",
-				SignedHeaders:   []string{"Content-Type"},
+				KeyId:          "my-key-id",
+				PrivateKeyPath: privateKeyPath,
+				Passphrase:     "my-secret-passphrase",
+				SigningScheme:  "hs2019",
+				SignedHeaders:  []string{"Content-Type"},
 			}
 			switch format {
 			case keyFormatPem:
@@ -231,24 +228,21 @@ func TestHttpSignaturePrivateKeys(t *testing.T) {
 		}
 	}
 
-	/*
-		Unfortunately, currently the build environment for OpenAPITools is using an old version
-		of golang that does not support ECDSA keys.
-		{
-			privateKeyPath := "privatekey.pem"
-			authConfig := sw.HttpSignatureAuth{
-				KeyId:         "my-key-id",
-				SigningScheme:     "hs2019",
-				SignedHeaders: []string{"Content-Type"},
-			}
-			// Generate test private key.
-			writeRandomTestEcdsaPemKey(t, privateKeyPath)
-			err := authConfig.LoadPrivateKey(privateKeyPath)
-			if err != nil {
-				t.Fatalf("Error loading private key '%s': %v", privateKeyPath, err)
-			}
+	{
+		privateKeyPath := "privatekey.pem"
+		authConfig := sw.HttpSignatureAuth{
+			KeyId:          "my-key-id",
+			PrivateKeyPath: privateKeyPath,
+			SigningScheme:  "hs2019",
+			SignedHeaders:  []string{"Content-Type"},
+		}
+		// Generate test private key.
+		writeRandomTestEcdsaPemKey(t, privateKeyPath)
+		_, err := authConfig.ContextWithValue(context.Background())
+		if err != nil {
+			t.Fatalf("Error loading private key '%s': %v", privateKeyPath, err)
 		}
-	*/
+	}
 }
 
 func executeHttpSignatureAuth(t *testing.T, authConfig *sw.HttpSignatureAuth, expectSuccess bool) string {
@@ -371,7 +365,7 @@ func executeHttpSignatureAuth(t *testing.T, authConfig *sw.HttpSignatureAuth, ex
 	if !re.MatchString(actual) {
 		t.Errorf("Authorization header is incorrect. Expected regex\n'%s'\nbut got\n'%s'", sb.String(), actual)
 	}
-	
+
 	validateHttpAuthorizationSignature(t, authConfig, r)
 	return r.Request.Header.Get("Authorization")
 }
@@ -380,7 +374,7 @@ var (
 	// signatureRe is a regular expression to capture the fields from the signature.
 	signatureRe = regexp.MustCompile(
 		`Signature keyId="(?P<keyId>[^"]+)",algorithm="(?P<algorithm>[^"]+)"` +
-		`(,created=(?P<created>[0-9]+))?(,expires=(?P<expires>[0-9.]+))?,headers="(?P<headers>[^"]+)",signature="(?P<signature>[^"]+)"`)
+			`(,created=(?P<created>[0-9]+))?(,expires=(?P<expires>[0-9.]+))?,headers="(?P<headers>[^"]+)",signature="(?P<signature>[^"]+)"`)
 )
 
 // validateHttpAuthorizationSignature validates the HTTP signature in the HTTP request.
@@ -396,10 +390,10 @@ func validateHttpAuthorizationSignature(t *testing.T, authConfig *sw.HttpSignatu
 	}
 	result := make(map[string]string)
 	for i, name := range signatureRe.SubexpNames() {
-        if i != 0 && name != "" {
-            result[name] = match[i]
-        }
-    }
+		if i != 0 && name != "" {
+			result[name] = match[i]
+		}
+	}
 	b64signature := result["signature"]
 	fmt.Printf("Algorithm: '%s' Headers: '%s' b64signature: '%s'\n", result["algorithm"], result["headers"], b64signature)
 	var sb bytes.Buffer
@@ -418,14 +412,14 @@ func validateHttpAuthorizationSignature(t *testing.T, authConfig *sw.HttpSignatu
 	for _, h := range signedHeaders {
 		var value string
 		switch h {
-			case sw.HttpSignatureParameterRequestTarget:
-				value = requestTarget
-			case sw.HttpSignatureParameterCreated:
-				value = result["created"]
-			case sw.HttpSignatureParameterExpires:
-				value = result["expires"]
-			default:
-				value = r.Request.Header.Get(h)
+		case sw.HttpSignatureParameterRequestTarget:
+			value = requestTarget
+		case sw.HttpSignatureParameterCreated:
+			value = result["created"]
+		case sw.HttpSignatureParameterExpires:
+			value = result["expires"]
+		default:
+			value = r.Request.Header.Get(h)
 		}
 		signedHeaderKvs = append(signedHeaderKvs, fmt.Sprintf("%s: %s", h, value))
 	}
@@ -654,15 +648,14 @@ func TestInvalidHttpSignatureConfiguration(t *testing.T) {
 	var err error
 	var authConfig sw.HttpSignatureAuth
 
-	authConfig = sw.HttpSignatureAuth{
-	}
+	authConfig = sw.HttpSignatureAuth{}
 	_, err = authConfig.ContextWithValue(context.Background())
 	if err == nil || !strings.Contains(err.Error(), "Key ID must be specified") {
 		t.Fatalf("Invalid configuration: %v", err)
 	}
 
 	authConfig = sw.HttpSignatureAuth{
-		KeyId:            "my-key-id",
+		KeyId: "my-key-id",
 	}
 	_, err = authConfig.ContextWithValue(context.Background())
 	if err == nil || !strings.Contains(err.Error(), "Private key path must be specified") {
@@ -670,8 +663,8 @@ func TestInvalidHttpSignatureConfiguration(t *testing.T) {
 	}
 
 	authConfig = sw.HttpSignatureAuth{
-		KeyId:            "my-key-id",
-		PrivateKeyPath:    "test.pem",
+		KeyId:          "my-key-id",
+		PrivateKeyPath: "test.pem",
 	}
 	_, err = authConfig.ContextWithValue(context.Background())
 	if err == nil || !strings.Contains(err.Error(), "Invalid signing scheme") {
@@ -679,9 +672,9 @@ func TestInvalidHttpSignatureConfiguration(t *testing.T) {
 	}
 
 	authConfig = sw.HttpSignatureAuth{
-		KeyId:            "my-key-id",
-		PrivateKeyPath:   "test.pem",
-		SigningScheme:    "garbage",
+		KeyId:          "my-key-id",
+		PrivateKeyPath: "test.pem",
+		SigningScheme:  "garbage",
 	}
 	_, err = authConfig.ContextWithValue(context.Background())
 	if err == nil || !strings.Contains(err.Error(), "Invalid signing scheme") {
@@ -689,10 +682,10 @@ func TestInvalidHttpSignatureConfiguration(t *testing.T) {
 	}
 
 	authConfig = sw.HttpSignatureAuth{
-		KeyId:            "my-key-id",
-		PrivateKeyPath:   "test.pem",
-		SigningScheme:    sw.HttpSigningSchemeHs2019,
-		SignedHeaders:    []string{"foo", "bar", "foo"},
+		KeyId:          "my-key-id",
+		PrivateKeyPath: "test.pem",
+		SigningScheme:  sw.HttpSigningSchemeHs2019,
+		SignedHeaders:  []string{"foo", "bar", "foo"},
 	}
 	_, err = authConfig.ContextWithValue(context.Background())
 	if err == nil || !strings.Contains(err.Error(), "cannot have duplicate names") {
@@ -700,10 +693,10 @@ func TestInvalidHttpSignatureConfiguration(t *testing.T) {
 	}
 
 	authConfig = sw.HttpSignatureAuth{
-		KeyId:            "my-key-id",
-		PrivateKeyPath:   "test.pem",
-		SigningScheme:    sw.HttpSigningSchemeHs2019,
-		SignedHeaders:    []string{"foo", "bar", "Authorization"},
+		KeyId:          "my-key-id",
+		PrivateKeyPath: "test.pem",
+		SigningScheme:  sw.HttpSigningSchemeHs2019,
+		SignedHeaders:  []string{"foo", "bar", "Authorization"},
 	}
 	_, err = authConfig.ContextWithValue(context.Background())
 	if err == nil || !strings.Contains(err.Error(), "Signed headers cannot include the 'Authorization' header") {
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
index a494c12b5c45..972b3afbb650 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
@@ -116,7 +116,7 @@ func (a *PetApiService) DeletePet(ctx _context.Context, petId int64, localVarOpt
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -342,7 +342,7 @@ func (a *PetApiService) GetPetById(ctx _context.Context, petId int64) (Pet, *_ne
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -504,7 +504,7 @@ func (a *PetApiService) UpdatePetWithForm(ctx _context.Context, petId int64, loc
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/pet/{petId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -587,7 +587,7 @@ func (a *PetApiService) UploadFile(ctx _context.Context, petId int64, localVarOp
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/pet/{petId}/uploadImage"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -690,7 +690,7 @@ func (a *PetApiService) UploadFileWithRequiredFile(ctx _context.Context, petId i
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/fake/{petId}/uploadImageWithRequiredFile"
-	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.QueryEscape(parameterToString(petId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"petId"+"}", _neturl.PathEscape(parameterToString(petId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_store.go b/samples/openapi3/client/petstore/go/go-petstore/api_store.go
index 3f122ef01286..2feef61031d1 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_store.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_store.go
@@ -42,7 +42,7 @@ func (a *StoreApiService) DeleteOrder(ctx _context.Context, orderId string) (*_n
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/store/order/{order_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.QueryEscape(parameterToString(orderId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.PathEscape(parameterToString(orderId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -198,7 +198,7 @@ func (a *StoreApiService) GetOrderById(ctx _context.Context, orderId int64) (Ord
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/store/order/{order_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.QueryEscape(parameterToString(orderId, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"order_id"+"}", _neturl.PathEscape(parameterToString(orderId, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_user.go b/samples/openapi3/client/petstore/go/go-petstore/api_user.go
index 9b2caa40deb9..77ed89d574f1 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_user.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_user.go
@@ -241,7 +241,7 @@ func (a *UserApiService) DeleteUser(ctx _context.Context, username string) (*_ne
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -309,7 +309,7 @@ func (a *UserApiService) GetUserByName(ctx _context.Context, username string) (U
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
@@ -527,7 +527,7 @@ func (a *UserApiService) UpdateUser(ctx _context.Context, username string, user
 
 	// create path and map variables
 	localVarPath := a.client.cfg.BasePath + "/user/{username}"
-	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.QueryEscape(parameterToString(username, "")) , -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"username"+"}", _neturl.PathEscape(parameterToString(username, "")) , -1)
 
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle b/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle
index 6c7675d844bc..621ae35ce3a9 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle
@@ -117,6 +117,7 @@ dependencies {
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     compile "com.github.scribejava:scribejava-apis:$scribejava_apis_version"
     compile "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/build.sbt b/samples/openapi3/client/petstore/java/jersey2-java8/build.sbt
index f83f373eda21..b5852c87ea39 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/build.sbt
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/build.sbt
@@ -19,6 +19,7 @@ lazy val root = (project in file(".")).
       "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
       "com.github.scribejava" % "scribejava-apis" % "6.9.0" % "compile",
       "org.tomitribe" % "tomitribe-http-signatures" % "1.3" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Fruit.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Fruit.md
index 996ca25a611c..41b3152250e1 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Fruit.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Fruit.md
@@ -2,14 +2,36 @@
 
 # Fruit
 
-## Properties
+## oneOf schemas
+* [Apple](Apple.md)
+* [Banana](Banana.md)
 
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**color** | **String** |  |  [optional]
-**cultivar** | **String** |  |  [optional]
-**origin** | **String** |  |  [optional]
-**lengthCm** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
+## Example
+```java
+// Import classes:
+import org.openapitools.client.model.Fruit;
+import org.openapitools.client.model.Apple;
+import org.openapitools.client.model.Banana;
 
+public class Example {
+    public static void main(String[] args) {
+        Fruit exampleFruit = new Fruit();
+
+        // create a new Apple
+        Apple exampleApple = new Apple();
+        // set Fruit to Apple
+        exampleFruit.setActualInstance(exampleApple);
+        // to get back the Apple set earlier
+        Apple testApple = (Apple) exampleFruit.getActualInstance();
+
+        // create a new Banana
+        Banana exampleBanana = new Banana();
+        // set Fruit to Banana
+        exampleFruit.setActualInstance(exampleBanana);
+        // to get back the Banana set earlier
+        Banana testBanana = (Banana) exampleFruit.getActualInstance();
+    }
+}
+```
 
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FruitReq.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FruitReq.md
index fee546976b09..9d9c875cd39a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FruitReq.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FruitReq.md
@@ -2,14 +2,38 @@
 
 # FruitReq
 
-## Properties
+## oneOf schemas
+* [AppleReq](AppleReq.md)
+* [BananaReq](BananaReq.md)
 
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**cultivar** | **String** |  | 
-**mealy** | **Boolean** |  |  [optional]
-**lengthCm** | [**BigDecimal**](BigDecimal.md) |  | 
-**sweet** | **Boolean** |  |  [optional]
+NOTE: this class is nullable.
 
+## Example
+```java
+// Import classes:
+import org.openapitools.client.model.FruitReq;
+import org.openapitools.client.model.AppleReq;
+import org.openapitools.client.model.BananaReq;
+
+public class Example {
+    public static void main(String[] args) {
+        FruitReq exampleFruitReq = new FruitReq();
+
+        // create a new AppleReq
+        AppleReq exampleAppleReq = new AppleReq();
+        // set FruitReq to AppleReq
+        exampleFruitReq.setActualInstance(exampleAppleReq);
+        // to get back the AppleReq set earlier
+        AppleReq testAppleReq = (AppleReq) exampleFruitReq.getActualInstance();
+
+        // create a new BananaReq
+        BananaReq exampleBananaReq = new BananaReq();
+        // set FruitReq to BananaReq
+        exampleFruitReq.setActualInstance(exampleBananaReq);
+        // to get back the BananaReq set earlier
+        BananaReq testBananaReq = (BananaReq) exampleFruitReq.getActualInstance();
+    }
+}
+```
 
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/GmFruit.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/GmFruit.md
index eca752bf3120..c9dc50b92cb7 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/GmFruit.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/GmFruit.md
@@ -2,14 +2,36 @@
 
 # GmFruit
 
-## Properties
+## anyOf schemas
+* [Apple](Apple.md)
+* [Banana](Banana.md)
 
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**color** | **String** |  |  [optional]
-**cultivar** | **String** |  |  [optional]
-**origin** | **String** |  |  [optional]
-**lengthCm** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
+## Example
+```java
+// Import classes:
+import org.openapitools.client.model.GmFruit;
+import org.openapitools.client.model.Apple;
+import org.openapitools.client.model.Banana;
 
+public class Example {
+    public static void main(String[] args) {
+        GmFruit exampleGmFruit = new GmFruit();
+
+        // create a new Apple
+        Apple exampleApple = new Apple();
+        // set GmFruit to Apple
+        exampleGmFruit.setActualInstance(exampleApple);
+        // to get back the Apple set earlier
+        Apple testApple = (Apple) exampleGmFruit.getActualInstance();
+
+        // create a new Banana
+        Banana exampleBanana = new Banana();
+        // set GmFruit to Banana
+        exampleGmFruit.setActualInstance(exampleBanana);
+        // to get back the Banana set earlier
+        Banana testBanana = (Banana) exampleGmFruit.getActualInstance();
+    }
+}
+```
 
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Mammal.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Mammal.md
index 24eaa1de4f50..11bbff5e2ba9 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Mammal.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Mammal.md
@@ -2,24 +2,45 @@
 
 # Mammal
 
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**hasBaleen** | **Boolean** |  |  [optional]
-**hasTeeth** | **Boolean** |  |  [optional]
-**className** | **String** |  | 
-**type** | [**TypeEnum**](#TypeEnum) |  |  [optional]
-
-
-
-## Enum: TypeEnum
-
-Name | Value
----- | -----
-PLAINS | &quot;plains&quot;
-MOUNTAIN | &quot;mountain&quot;
-GREVYS | &quot;grevys&quot;
-
+## oneOf schemas
+* [Pig](Pig.md)
+* [Whale](Whale.md)
+* [Zebra](Zebra.md)
+
+## Example
+```java
+// Import classes:
+import org.openapitools.client.model.Mammal;
+import org.openapitools.client.model.Pig;
+import org.openapitools.client.model.Whale;
+import org.openapitools.client.model.Zebra;
+
+public class Example {
+    public static void main(String[] args) {
+        Mammal exampleMammal = new Mammal();
+
+        // create a new Pig
+        Pig examplePig = new Pig();
+        // set Mammal to Pig
+        exampleMammal.setActualInstance(examplePig);
+        // to get back the Pig set earlier
+        Pig testPig = (Pig) exampleMammal.getActualInstance();
+
+        // create a new Whale
+        Whale exampleWhale = new Whale();
+        // set Mammal to Whale
+        exampleMammal.setActualInstance(exampleWhale);
+        // to get back the Whale set earlier
+        Whale testWhale = (Whale) exampleMammal.getActualInstance();
+
+        // create a new Zebra
+        Zebra exampleZebra = new Zebra();
+        // set Mammal to Zebra
+        exampleMammal.setActualInstance(exampleZebra);
+        // to get back the Zebra set earlier
+        Zebra testZebra = (Zebra) exampleMammal.getActualInstance();
+    }
+}
+```
 
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/NullableShape.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/NullableShape.md
index 11a9785c3bad..60c45b268406 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/NullableShape.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/NullableShape.md
@@ -3,12 +3,39 @@
 # NullableShape
 
 The value may be a shape or the 'null' value. The 'nullable' attribute was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema >= 3.1.
-## Properties
 
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**shapeType** | **String** |  | 
-**quadrilateralType** | **String** |  | 
+## oneOf schemas
+* [Quadrilateral](Quadrilateral.md)
+* [Triangle](Triangle.md)
 
+NOTE: this class is nullable.
+
+## Example
+```java
+// Import classes:
+import org.openapitools.client.model.NullableShape;
+import org.openapitools.client.model.Quadrilateral;
+import org.openapitools.client.model.Triangle;
+
+public class Example {
+    public static void main(String[] args) {
+        NullableShape exampleNullableShape = new NullableShape();
+
+        // create a new Quadrilateral
+        Quadrilateral exampleQuadrilateral = new Quadrilateral();
+        // set NullableShape to Quadrilateral
+        exampleNullableShape.setActualInstance(exampleQuadrilateral);
+        // to get back the Quadrilateral set earlier
+        Quadrilateral testQuadrilateral = (Quadrilateral) exampleNullableShape.getActualInstance();
+
+        // create a new Triangle
+        Triangle exampleTriangle = new Triangle();
+        // set NullableShape to Triangle
+        exampleNullableShape.setActualInstance(exampleTriangle);
+        // to get back the Triangle set earlier
+        Triangle testTriangle = (Triangle) exampleNullableShape.getActualInstance();
+    }
+}
+```
 
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Pig.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Pig.md
index 46c64ad2039c..f0a92bbe61b8 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Pig.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Pig.md
@@ -2,11 +2,36 @@
 
 # Pig
 
-## Properties
+## oneOf schemas
+* [BasquePig](BasquePig.md)
+* [DanishPig](DanishPig.md)
 
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**className** | **String** |  | 
+## Example
+```java
+// Import classes:
+import org.openapitools.client.model.Pig;
+import org.openapitools.client.model.BasquePig;
+import org.openapitools.client.model.DanishPig;
 
+public class Example {
+    public static void main(String[] args) {
+        Pig examplePig = new Pig();
+
+        // create a new BasquePig
+        BasquePig exampleBasquePig = new BasquePig();
+        // set Pig to BasquePig
+        examplePig.setActualInstance(exampleBasquePig);
+        // to get back the BasquePig set earlier
+        BasquePig testBasquePig = (BasquePig) examplePig.getActualInstance();
+
+        // create a new DanishPig
+        DanishPig exampleDanishPig = new DanishPig();
+        // set Pig to DanishPig
+        examplePig.setActualInstance(exampleDanishPig);
+        // to get back the DanishPig set earlier
+        DanishPig testDanishPig = (DanishPig) examplePig.getActualInstance();
+    }
+}
+```
 
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Quadrilateral.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Quadrilateral.md
index 66243e75dd0d..83ffea0c742f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Quadrilateral.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Quadrilateral.md
@@ -2,12 +2,36 @@
 
 # Quadrilateral
 
-## Properties
+## oneOf schemas
+* [ComplexQuadrilateral](ComplexQuadrilateral.md)
+* [SimpleQuadrilateral](SimpleQuadrilateral.md)
 
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**shapeType** | **String** |  | 
-**quadrilateralType** | **String** |  | 
+## Example
+```java
+// Import classes:
+import org.openapitools.client.model.Quadrilateral;
+import org.openapitools.client.model.ComplexQuadrilateral;
+import org.openapitools.client.model.SimpleQuadrilateral;
 
+public class Example {
+    public static void main(String[] args) {
+        Quadrilateral exampleQuadrilateral = new Quadrilateral();
+
+        // create a new ComplexQuadrilateral
+        ComplexQuadrilateral exampleComplexQuadrilateral = new ComplexQuadrilateral();
+        // set Quadrilateral to ComplexQuadrilateral
+        exampleQuadrilateral.setActualInstance(exampleComplexQuadrilateral);
+        // to get back the ComplexQuadrilateral set earlier
+        ComplexQuadrilateral testComplexQuadrilateral = (ComplexQuadrilateral) exampleQuadrilateral.getActualInstance();
+
+        // create a new SimpleQuadrilateral
+        SimpleQuadrilateral exampleSimpleQuadrilateral = new SimpleQuadrilateral();
+        // set Quadrilateral to SimpleQuadrilateral
+        exampleQuadrilateral.setActualInstance(exampleSimpleQuadrilateral);
+        // to get back the SimpleQuadrilateral set earlier
+        SimpleQuadrilateral testSimpleQuadrilateral = (SimpleQuadrilateral) exampleQuadrilateral.getActualInstance();
+    }
+}
+```
 
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Shape.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Shape.md
index 06c79169b0b1..9c237eefb048 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Shape.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Shape.md
@@ -2,12 +2,36 @@
 
 # Shape
 
-## Properties
+## oneOf schemas
+* [Quadrilateral](Quadrilateral.md)
+* [Triangle](Triangle.md)
 
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**shapeType** | **String** |  | 
-**quadrilateralType** | **String** |  | 
+## Example
+```java
+// Import classes:
+import org.openapitools.client.model.Shape;
+import org.openapitools.client.model.Quadrilateral;
+import org.openapitools.client.model.Triangle;
 
+public class Example {
+    public static void main(String[] args) {
+        Shape exampleShape = new Shape();
+
+        // create a new Quadrilateral
+        Quadrilateral exampleQuadrilateral = new Quadrilateral();
+        // set Shape to Quadrilateral
+        exampleShape.setActualInstance(exampleQuadrilateral);
+        // to get back the Quadrilateral set earlier
+        Quadrilateral testQuadrilateral = (Quadrilateral) exampleShape.getActualInstance();
+
+        // create a new Triangle
+        Triangle exampleTriangle = new Triangle();
+        // set Shape to Triangle
+        exampleShape.setActualInstance(exampleTriangle);
+        // to get back the Triangle set earlier
+        Triangle testTriangle = (Triangle) exampleShape.getActualInstance();
+    }
+}
+```
 
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ShapeOrNull.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ShapeOrNull.md
index a4b9f4f00580..6a738c4b9870 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ShapeOrNull.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ShapeOrNull.md
@@ -3,12 +3,39 @@
 # ShapeOrNull
 
 The value may be a shape or the 'null' value. This is introduced in OAS schema >= 3.1.
-## Properties
 
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**shapeType** | **String** |  | 
-**quadrilateralType** | **String** |  | 
+## oneOf schemas
+* [Quadrilateral](Quadrilateral.md)
+* [Triangle](Triangle.md)
 
+NOTE: this class is nullable.
+
+## Example
+```java
+// Import classes:
+import org.openapitools.client.model.ShapeOrNull;
+import org.openapitools.client.model.Quadrilateral;
+import org.openapitools.client.model.Triangle;
+
+public class Example {
+    public static void main(String[] args) {
+        ShapeOrNull exampleShapeOrNull = new ShapeOrNull();
+
+        // create a new Quadrilateral
+        Quadrilateral exampleQuadrilateral = new Quadrilateral();
+        // set ShapeOrNull to Quadrilateral
+        exampleShapeOrNull.setActualInstance(exampleQuadrilateral);
+        // to get back the Quadrilateral set earlier
+        Quadrilateral testQuadrilateral = (Quadrilateral) exampleShapeOrNull.getActualInstance();
+
+        // create a new Triangle
+        Triangle exampleTriangle = new Triangle();
+        // set ShapeOrNull to Triangle
+        exampleShapeOrNull.setActualInstance(exampleTriangle);
+        // to get back the Triangle set earlier
+        Triangle testTriangle = (Triangle) exampleShapeOrNull.getActualInstance();
+    }
+}
+```
 
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Triangle.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Triangle.md
index 80d75b28e70f..daf9d153ff61 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Triangle.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Triangle.md
@@ -2,12 +2,45 @@
 
 # Triangle
 
-## Properties
+## oneOf schemas
+* [EquilateralTriangle](EquilateralTriangle.md)
+* [IsoscelesTriangle](IsoscelesTriangle.md)
+* [ScaleneTriangle](ScaleneTriangle.md)
 
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**shapeType** | **String** |  | 
-**triangleType** | **String** |  | 
+## Example
+```java
+// Import classes:
+import org.openapitools.client.model.Triangle;
+import org.openapitools.client.model.EquilateralTriangle;
+import org.openapitools.client.model.IsoscelesTriangle;
+import org.openapitools.client.model.ScaleneTriangle;
 
+public class Example {
+    public static void main(String[] args) {
+        Triangle exampleTriangle = new Triangle();
+
+        // create a new EquilateralTriangle
+        EquilateralTriangle exampleEquilateralTriangle = new EquilateralTriangle();
+        // set Triangle to EquilateralTriangle
+        exampleTriangle.setActualInstance(exampleEquilateralTriangle);
+        // to get back the EquilateralTriangle set earlier
+        EquilateralTriangle testEquilateralTriangle = (EquilateralTriangle) exampleTriangle.getActualInstance();
+
+        // create a new IsoscelesTriangle
+        IsoscelesTriangle exampleIsoscelesTriangle = new IsoscelesTriangle();
+        // set Triangle to IsoscelesTriangle
+        exampleTriangle.setActualInstance(exampleIsoscelesTriangle);
+        // to get back the IsoscelesTriangle set earlier
+        IsoscelesTriangle testIsoscelesTriangle = (IsoscelesTriangle) exampleTriangle.getActualInstance();
+
+        // create a new ScaleneTriangle
+        ScaleneTriangle exampleScaleneTriangle = new ScaleneTriangle();
+        // set Triangle to ScaleneTriangle
+        exampleTriangle.setActualInstance(exampleScaleneTriangle);
+        // to get back the ScaleneTriangle set earlier
+        ScaleneTriangle testScaleneTriangle = (ScaleneTriangle) exampleTriangle.getActualInstance();
+    }
+}
+```
 
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml b/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml
index 9652f6687d4c..6a6527cd133a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml
@@ -67,6 +67,7 @@
                     <argLine>-Xms512m -Xmx1500m</argLine>
                     <parallel>methods</parallel>
                     <threadCount>10</threadCount>
+                    <trimStackTrace>false</trimStackTrace>
                 </configuration>
             </plugin>
             <plugin>
@@ -162,6 +163,7 @@
                 </executions>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.8</source>
                     <tags>
                         <tag>
                             <name>http.response.details</name>
@@ -283,6 +285,12 @@
             <artifactId>scribejava-apis</artifactId>
             <version>${scribejava-apis-version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -298,8 +306,9 @@
         <jackson-version>2.10.4</jackson-version>
         <jackson-databind-version>2.10.4</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
-        <http-signature-version>1.4</http-signature-version>
+        <http-signature-version>1.5</http-signature-version>
         <scribejava-apis-version>6.9.0</scribejava-apis-version>
     </properties>
 </project>
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
index 67bb225a52eb..68024ca7114a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
@@ -25,6 +25,13 @@
 import java.io.InputStream;
 
 import java.net.URI;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.security.cert.X509Certificate;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import org.glassfish.jersey.logging.LoggingFeature;
@@ -56,13 +63,13 @@
 import org.openapitools.client.auth.HttpSignatureAuth;
 import org.openapitools.client.auth.ApiKeyAuth;
 import org.openapitools.client.auth.OAuth;
-import org.openapitools.client.model.AbstractOpenApiSchema;
-
 
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiClient {
   protected Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   protected Map<String, String> defaultCookieMap = new HashMap<String, String>();
   protected String basePath = "http://petstore.swagger.io:80/v2";
+  protected String userAgent;
   private static final Logger log = Logger.getLogger(ApiClient.class.getName());
 
   protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
@@ -452,7 +459,7 @@ public ApiClient setAccessToken(String accessToken) {
   public ApiClient setOauthCredentials(String clientId, String clientSecret) {
     for (Authentication auth : authentications.values()) {
       if (auth instanceof OAuth) {
-        ((OAuth) auth).setCredentials(clientId, clientSecret);
+        ((OAuth) auth).setCredentials(clientId, clientSecret, isDebugging());
         return this;
       }
     }
@@ -511,10 +518,19 @@ public ApiClient setOauthScope(String scope) {
    * @return API client
    */
   public ApiClient setUserAgent(String userAgent) {
+    userAgent = userAgent;
     addDefaultHeader("User-Agent", userAgent);
     return this;
   }
 
+  /**
+   * Get the User-Agent header's value.
+   * @return User-Agent string
+   */
+  public String getUserAgent(){
+    return userAgent;
+  }
+
   /**
    * Add a default header.
    *
@@ -829,7 +845,7 @@ public String escapeString(String str) {
    * @return Entity
    * @throws ApiException API exception
    */
-  public Entity<?> serialize(Object obj, Map<String, Object> formParams, String contentType) throws ApiException {
+  public Entity<?> serialize(Object obj, Map<String, Object> formParams, String contentType, boolean isBodyNullable) throws ApiException {
     Entity<?> entity;
     if (contentType.startsWith("multipart/form-data")) {
       MultiPart multiPart = new MultiPart();
@@ -853,7 +869,11 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
       entity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE);
     } else {
       // We let jersey handle the serialization
-      entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
+      if (isBodyNullable) { // payload is nullable
+        entity = Entity.entity(obj == null ? Entity.text("null") : obj, contentType);
+      } else {
+        entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
+      }
     }
     return entity;
   }
@@ -864,10 +884,11 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
    * @param obj Object
    * @param formParams Form parameters
    * @param contentType Context type
+   * @param isBodyNulalble True if the body is nullable
    * @return String
    * @throws ApiException API exception
    */
-  public String serializeToString(Object obj, Map<String, Object> formParams, String contentType) throws ApiException {
+  public String serializeToString(Object obj, Map<String, Object> formParams, String contentType, boolean isBodyNullable) throws ApiException {
     try {
       if (contentType.startsWith("multipart/form-data")) {
         throw new ApiException("multipart/form-data not yet supported for serializeToString (http signature authentication)");
@@ -883,74 +904,17 @@ public String serializeToString(Object obj, Map<String, Object> formParams, Stri
           return formString.substring(0, formString.length() - 1);
         }
       } else {
-        return json.getMapper().writeValueAsString(obj);
+        if (isBodyNullable) {
+          return obj == null ? "null" : json.getMapper().writeValueAsString(obj);
+        } else {
+          return json.getMapper().writeValueAsString(obj);
+        }
       }
     } catch (Exception ex) {
       throw new ApiException("Failed to perform serializeToString: " + ex.toString());
     }
   }
 
-  public AbstractOpenApiSchema deserializeSchemas(Response response, AbstractOpenApiSchema schema) throws ApiException{
-
-    Object result = null;
-    int matchCounter = 0;
-    ArrayList<String> matchSchemas = new ArrayList<>();
-
-    if (schema.isNullable()) {
-      response.bufferEntity();
-      if ("{}".equals(String.valueOf(response.readEntity(String.class))) ||
-          "".equals(String.valueOf(response.readEntity(String.class)))) {
-        // schema is nullable and the response body is {} or empty string
-        return schema;
-      }
-    }
-
-    for (Map.Entry<String, GenericType> entry : schema.getSchemas().entrySet()) {
-      String schemaName = entry.getKey();
-      GenericType schemaType = entry.getValue();
-
-      if (schemaType instanceof GenericType) { // model
-        try {
-          Object deserializedObject = deserialize(response, schemaType);
-          if (deserializedObject != null) {
-            result = deserializedObject;
-            matchCounter++;
-
-            if ("anyOf".equals(schema.getSchemaType())) {
-              break;
-            } else if ("oneOf".equals(schema.getSchemaType())) {
-              matchSchemas.add(schemaName);
-            } else {
-              throw new ApiException("Unknowe type found while expecting anyOf/oneOf:" + schema.getSchemaType());
-            }
-          } else {
-            // failed to deserialize the response in the schema provided, proceed to the next one if any
-          }
-        } catch (Exception ex) {
-          // failed to deserialize, do nothing and try next one (schema)
-          // Logging the error may be useful to troubleshoot why a payload fails to match
-          // the schema.
-          log.log(Level.FINE, "Input data does not match schema '" + schemaName + "'", ex);
-        }
-      } else {// unknown type
-        throw new ApiException(schemaType.getClass() + " is not a GenericType and cannot be handled properly in deserialization.");
-      }
-
-    }
-
-    if (matchCounter > 1 && "oneOf".equals(schema.getSchemaType())) {// more than 1 match for oneOf
-      throw new ApiException("Response body is invalid as it matches more than one schema (" + StringUtil.join(matchSchemas, ", ") + ") defined in the oneOf model: " + schema.getClass().getName());
-    } else if (matchCounter == 0) { // fail to match any in oneOf/anyOf schemas
-      throw new ApiException("Response body is invalid as it does not match any schemas (" + StringUtil.join(schema.getSchemas().keySet(), ", ") + ") defined in the oneOf/anyOf model: " + schema.getClass().getName());
-    } else { // only one matched
-      schema.setActualInstance(result);
-      return schema;
-    }
-
-  }
-
-
-
   /**
    * Deserialize response body to Java object according to the Content-Type.
    * @param <T> Type
@@ -1052,7 +1016,7 @@ public File prepareDownloadFile(Response response) throws IOException {
    * @param contentType The request's Content-Type header
    * @param authNames The authentications to apply
    * @param returnType The return type into which to deserialize the response
-   * @param schema An instance of the response that uses oneOf/anyOf
+   * @param isBodyNullable True if the body is nullable
    * @return The response body in type of string
    * @throws ApiException API exception
    */
@@ -1069,7 +1033,7 @@ public <T> ApiResponse<T> invokeAPI(
       String contentType,
       String[] authNames,
       GenericType<T> returnType,
-      AbstractOpenApiSchema schema)
+      boolean isBodyNullable)
       throws ApiException {
 
     // Not using `.target(targetURL).path(path)` below,
@@ -1116,7 +1080,7 @@ public <T> ApiResponse<T> invokeAPI(
       }
     }
 
-    Entity<?> entity = serialize(body, formParams, contentType);
+    Entity<?> entity = serialize(body, formParams, contentType, isBodyNullable);
 
     // put all headers in one place
     Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
@@ -1128,7 +1092,7 @@ public <T> ApiResponse<T> invokeAPI(
         queryParams,
         allHeaderParams,
         cookieParams,
-        serializeToString(body, formParams, contentType),
+        serializeToString(body, formParams, contentType, isBodyNullable),
         method,
         target.getUri());
 
@@ -1166,12 +1130,10 @@ public <T> ApiResponse<T> invokeAPI(
       if (response.getStatusInfo() == Status.NO_CONTENT) {
         return new ApiResponse<T>(statusCode, responseHeaders);
       } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) {
-        if (returnType == null) return new ApiResponse<T>(statusCode, responseHeaders);
-        else if (schema == null) {
+        if (returnType == null) {
+          return new ApiResponse<T>(statusCode, responseHeaders);
+        } else {
           return new ApiResponse<T>(statusCode, responseHeaders, deserialize(response, returnType));
-        } else { // oneOf/anyOf
-          return new ApiResponse<T>(
-              statusCode, responseHeaders, (T) deserializeSchemas(response, schema));
         }
       } else {
         String message = "error";
@@ -1217,8 +1179,8 @@ private Response sendRequest(String method, Invocation.Builder invocationBuilder
    * @deprecated Add qualified name of the operation as a first parameter.
    */
   @Deprecated
-  public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType, AbstractOpenApiSchema schema) throws ApiException {
-    return invokeAPI(null, path, method, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames, returnType, schema);
+  public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType, boolean isBodyNullable) throws ApiException {
+    return invokeAPI(null, path, method, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames, returnType, isBodyNullable);
   }
 
   /**
@@ -1244,13 +1206,64 @@ protected Client buildHttpClient(boolean debugging) {
       java.util.logging.Logger.getLogger("org.glassfish.jersey.client").setLevel(java.util.logging.Level.SEVERE);
     }
     performAdditionalClientConfiguration(clientConfig);
-    return ClientBuilder.newClient(clientConfig);
+    ClientBuilder clientBuilder = ClientBuilder.newBuilder();
+    customizeClientBuilder(clientBuilder);
+    clientBuilder = clientBuilder.withConfig(clientConfig);
+    return clientBuilder.build();
   }
 
+  /**
+   * Perform additional configuration of the API client.
+   * This method can be overriden to customize the API client.
+   */
   protected void performAdditionalClientConfiguration(ClientConfig clientConfig) {
     // No-op extension point
   }
 
+  /**
+   * Customize the client builder.
+   *
+   * This method can be overriden to customize the API client. For example, this can be used to:
+   * 1. Set the hostname verifier to be used by the client to verify the endpoint's hostname
+   *    against its identification information.
+   * 2. Set the client-side key store.
+   * 3. Set the SSL context that will be used when creating secured transport connections to
+   *    server endpoints from web targets created by the client instance that is using this SSL context.
+   * 4. Set the client-side trust store.
+   *
+   * To completely disable certificate validation (at your own risk), you can
+   * override this method and invoke disableCertificateValidation(clientBuilder).
+   */
+  protected void customizeClientBuilder(ClientBuilder clientBuilder) {
+    // No-op extension point
+  }
+
+  /**
+   * Disable X.509 certificate validation in TLS connections.
+   *
+   * Please note that trusting all certificates is extremely risky.
+   * This may be useful in a development environment with self-signed certificates.
+   */
+  protected void disableCertificateValidation(ClientBuilder clientBuilder) throws KeyManagementException, NoSuchAlgorithmException {
+    TrustManager[] trustAllCerts = new X509TrustManager[] {
+      new X509TrustManager() {
+        @Override
+        public X509Certificate[] getAcceptedIssuers() {
+          return null;
+        }
+        @Override
+        public void checkClientTrusted(X509Certificate[] certs, String authType) {
+        }
+        @Override
+        public void checkServerTrusted(X509Certificate[] certs, String authType) {
+        }
+      }
+    };
+    SSLContext sslContext = SSLContext.getInstance("TLS");
+    sslContext.init(null, trustAllCerts, new SecureRandom());
+    clientBuilder.sslContext(sslContext);
+  }
+
   protected Map<String, List<String>> buildResponseHeaders(Response response) {
     Map<String, List<String>> responseHeaders = new HashMap<String, List<String>>();
     for (Entry<String, List<Object>> entry: response.getHeaders().entrySet()) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiException.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiException.java
index 3612265bc619..1c98dfd2a4b1 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiException.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiException.java
@@ -19,7 +19,7 @@
 /**
  * API Exception
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java
index acbecda489dd..476456fd4ed6 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java
index fd834ef6b4a0..9d748f6e7c22 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java
@@ -4,12 +4,17 @@
 import com.fasterxml.jackson.databind.*;
 import org.openapitools.jackson.nullable.JsonNullableModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.openapitools.client.model.*;
 
 import java.text.DateFormat;
-
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.core.GenericType;
 import javax.ws.rs.ext.ContextResolver;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class JSON implements ContextResolver<ObjectMapper> {
   private ObjectMapper mapper;
 
@@ -46,4 +51,197 @@ public ObjectMapper getContext(Class<?> type) {
    * @return object mapper
    */
   public ObjectMapper getMapper() { return mapper; }
+
+  /**
+   * Returns the target model class that should be used to deserialize the input data.
+   * The discriminator mappings are used to determine the target model class.
+   *
+   * @param node The input data.
+   * @param modelClass The class that contains the discriminator mappings.
+   */
+  public static Class<?> getClassForElement(JsonNode node, Class<?> modelClass) {
+    ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass);
+    if (cdm != null) {
+      return cdm.getClassForElement(node, new HashSet<Class<?>>());
+    }
+    return null;
+  }
+
+  /**
+   * Helper class to register the discriminator mappings.
+   */
+  private static class ClassDiscriminatorMapping {
+    // The model class name.
+    Class<?> modelClass;
+    // The name of the discriminator property.
+    String discriminatorName;
+    // The discriminator mappings for a model class.
+    Map<String, Class<?>> discriminatorMappings;
+
+    // Constructs a new class discriminator.
+    ClassDiscriminatorMapping(Class<?> cls, String propertyName, Map<String, Class<?>> mappings) {
+      modelClass = cls;
+      discriminatorName = propertyName;
+      discriminatorMappings = new HashMap<String, Class<?>>();
+      if (mappings != null) {
+        discriminatorMappings.putAll(mappings);
+      }
+    }
+
+    // Return the name of the discriminator property for this model class.
+    String getDiscriminatorPropertyName() {
+      return discriminatorName;
+    }
+
+    // Return the discriminator value or null if the discriminator is not
+    // present in the payload.
+    String getDiscriminatorValue(JsonNode node) {
+      // Determine the value of the discriminator property in the input data.
+      if (discriminatorName != null) {
+        // Get the value of the discriminator property, if present in the input payload.
+        node = node.get(discriminatorName);
+        if (node != null && node.isValueNode()) {
+          String discrValue = node.asText();
+          if (discrValue != null) {
+            return discrValue;
+          }
+        }
+      }
+      return null;
+    }
+
+    /**
+     * Returns the target model class that should be used to deserialize the input data.
+     * This function can be invoked for anyOf/oneOf composed models with discriminator mappings.
+     * The discriminator mappings are used to determine the target model class.
+     *
+     * @param node The input data.
+     * @param visitedClasses The set of classes that have already been visited.
+     */
+    Class<?> getClassForElement(JsonNode node, Set<Class<?>> visitedClasses) {
+      if (visitedClasses.contains(modelClass)) {
+        // Class has already been visited.
+        return null;
+      }
+      // Determine the value of the discriminator property in the input data.
+      String discrValue = getDiscriminatorValue(node);
+      if (discrValue == null) {
+        return null;
+      }
+      Class<?> cls = discriminatorMappings.get(discrValue);
+      // It may not be sufficient to return this cls directly because that target class
+      // may itself be a composed schema, possibly with its own discriminator.
+      visitedClasses.add(modelClass);
+      for (Class<?> childClass : discriminatorMappings.values()) {
+        ClassDiscriminatorMapping childCdm = modelDiscriminators.get(childClass);
+        if (childCdm == null) {
+          continue;
+        }
+        if (!discriminatorName.equals(childCdm.discriminatorName)) {
+          discrValue = getDiscriminatorValue(node);
+          if (discrValue == null) {
+            continue;
+          }
+        }
+        if (childCdm != null) {
+          // Recursively traverse the discriminator mappings.
+          Class<?> childDiscr = childCdm.getClassForElement(node, visitedClasses);
+          if (childDiscr != null) {
+            return childDiscr;
+          }
+        }
+      }
+      return cls;
+    }
+  }
+
+  /**
+   * Returns true if inst is an instance of modelClass in the OpenAPI model hierarchy.
+   *
+   * The Java class hierarchy is not implemented the same way as the OpenAPI model hierarchy,
+   * so it's not possible to use the instanceof keyword.
+   *
+   * @param modelClass A OpenAPI model class.
+   * @param inst The instance object.
+   */
+  public static boolean isInstanceOf(Class<?> modelClass, Object inst, Set<Class<?>> visitedClasses) {
+    if (modelClass.isInstance(inst)) {
+      // This handles the 'allOf' use case with single parent inheritance.
+      return true;
+    }
+    if (visitedClasses.contains(modelClass)) {
+      // This is to prevent infinite recursion when the composed schemas have
+      // a circular dependency.
+      return false;
+    }
+    visitedClasses.add(modelClass);
+    
+    // Traverse the oneOf/anyOf composed schemas.
+    Map<String, GenericType> descendants = modelDescendants.get(modelClass);
+    if (descendants != null) {
+      for (GenericType childType : descendants.values()) {
+        if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  /**
+   * A map of discriminators for all model classes.
+   */
+  private static Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<Class<?>, ClassDiscriminatorMapping>();
+
+  /**
+   * A map of oneOf/anyOf descendants for each model class.
+   */
+  private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<Class<?>, Map<String, GenericType>>();
+
+  /**
+    * Register a model class discriminator.
+    *
+    * @param modelClass the model class
+    * @param discriminatorPropertyName the name of the discriminator property
+    * @param mappings a map with the discriminator mappings.
+    */
+  public static void registerDiscriminator(Class<?> modelClass, String discriminatorPropertyName, Map<String, Class<?>> mappings) {
+    ClassDiscriminatorMapping m = new ClassDiscriminatorMapping(modelClass, discriminatorPropertyName, mappings);
+    modelDiscriminators.put(modelClass, m);
+  }
+
+  /**
+    * Register the oneOf/anyOf descendants of the modelClass.
+    *
+    * @param modelClass the model class
+    * @param descendants a map of oneOf/anyOf descendants.
+    */
+  public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
+    modelDescendants.put(modelClass, descendants);
+  }
+
+  private static JSON json;
+
+  static
+  {
+    json = new JSON();
+  }
+
+  /**
+    * Get the default JSON instance.
+    *
+    * @return the default JSON instance
+    */
+  public static JSON getDefault() {
+    return json;
+  }
+
+  /**
+    * Set the default JSON instance.
+    *
+    * @param json JSON instance to be used
+    */
+  public static void setDefault(JSON json) {
+    JSON.json = json;
+  }
 }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Pair.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Pair.java
index ae89aa614543..8352d84046a7 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Pair.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Pair.java
@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/StringUtil.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/StringUtil.java
index 747a23f5bf23..4dc60597910a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/StringUtil.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 4d808ec6f5f1..7a9f7b08b63e 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AnotherFakeApi {
   private ApiClient apiClient;
 
@@ -110,6 +110,6 @@ public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client client) thr
 
     return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", localVarPath, "PATCH", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
 }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/DefaultApi.java
index eb269e49f800..a49fdc11d859 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/DefaultApi.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DefaultApi {
   private ApiClient apiClient;
 
@@ -103,6 +103,6 @@ public ApiResponse<InlineResponseDefault> fooGetWithHttpInfo() throws ApiExcepti
 
     return apiClient.invokeAPI("DefaultApi.fooGet", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
 }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
index 95e2aed6acd9..b8893ee704f7 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeApi {
   private ApiClient apiClient;
 
@@ -112,7 +112,7 @@ public ApiResponse<HealthCheckResult> fakeHealthGetWithHttpInfo() throws ApiExce
 
     return apiClient.invokeAPI("FakeApi.fakeHealthGet", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * 
@@ -174,7 +174,7 @@ public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(Boolean body)
 
     return apiClient.invokeAPI("FakeApi.fakeOuterBooleanSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * 
@@ -236,7 +236,7 @@ public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(Outer
 
     return apiClient.invokeAPI("FakeApi.fakeOuterCompositeSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * 
@@ -298,7 +298,7 @@ public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(BigDecimal b
 
     return apiClient.invokeAPI("FakeApi.fakeOuterNumberSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * 
@@ -360,7 +360,7 @@ public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(String body) thr
 
     return apiClient.invokeAPI("FakeApi.fakeOuterStringSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Array of Enums
@@ -420,7 +420,7 @@ public ApiResponse<List<OuterEnum>> getArrayOfEnumsWithHttpInfo() throws ApiExce
 
     return apiClient.invokeAPI("FakeApi.getArrayOfEnums", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * 
@@ -484,7 +484,7 @@ public ApiResponse<Void> testBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass
 
     return apiClient.invokeAPI("FakeApi.testBodyWithFileSchema", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * 
@@ -556,7 +556,7 @@ public ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(String query, User
 
     return apiClient.invokeAPI("FakeApi.testBodyWithQueryParams", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * To test \&quot;client\&quot; model
@@ -623,7 +623,7 @@ public ApiResponse<Client> testClientModelWithHttpInfo(Client client) throws Api
 
     return apiClient.invokeAPI("FakeApi.testClientModel", localVarPath, "PATCH", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -758,7 +758,7 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
 
     return apiClient.invokeAPI("FakeApi.testEndpointParameters", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * To test enum parameters
@@ -845,7 +845,7 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderS
 
     return apiClient.invokeAPI("FakeApi.testEnumParameters", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
 
 private ApiResponse<Void> testGroupParametersWithHttpInfo(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {
@@ -901,7 +901,7 @@ private ApiResponse<Void> testGroupParametersWithHttpInfo(Integer requiredString
 
     return apiClient.invokeAPI("FakeApi.testGroupParameters", localVarPath, "DELETE", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
 
   public class APItestGroupParametersRequest {
@@ -1080,7 +1080,7 @@ public ApiResponse<Void> testInlineAdditionalPropertiesWithHttpInfo(Map<String,
 
     return apiClient.invokeAPI("FakeApi.testInlineAdditionalProperties", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * test json serialization of form data
@@ -1155,7 +1155,7 @@ public ApiResponse<Void> testJsonFormDataWithHttpInfo(String param, String param
 
     return apiClient.invokeAPI("FakeApi.testJsonFormData", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * 
@@ -1252,6 +1252,6 @@ public ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(List<Str
 
     return apiClient.invokeAPI("FakeApi.testQueryParameterCollectionFormat", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
 }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 339851556a57..fe39623440e6 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FakeClassnameTags123Api {
   private ApiClient apiClient;
 
@@ -110,6 +110,6 @@ public ApiResponse<Client> testClassnameWithHttpInfo(Client client) throws ApiEx
 
     return apiClient.invokeAPI("FakeClassnameTags123Api.testClassname", localVarPath, "PATCH", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
 }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java
index d1bd8c6a5104..3637b9e61a5a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java
@@ -17,7 +17,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class PetApi {
   private ApiClient apiClient;
 
@@ -109,7 +109,7 @@ public ApiResponse<Void> addPetWithHttpInfo(Pet pet) throws ApiException {
 
     return apiClient.invokeAPI("PetApi.addPet", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Deletes a pet
@@ -178,7 +178,7 @@ public ApiResponse<Void> deletePetWithHttpInfo(Long petId, String apiKey) throws
 
     return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Finds Pets by status
@@ -248,7 +248,7 @@ public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status)
 
     return apiClient.invokeAPI("PetApi.findPetsByStatus", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Finds Pets by tags
@@ -322,7 +322,7 @@ public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(List<String> tags) thro
 
     return apiClient.invokeAPI("PetApi.findPetsByTags", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Find pet by ID
@@ -394,7 +394,7 @@ public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
 
     return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Update an existing pet
@@ -462,7 +462,7 @@ public ApiResponse<Void> updatePetWithHttpInfo(Pet pet) throws ApiException {
 
     return apiClient.invokeAPI("PetApi.updatePet", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Updates a pet in the store with form data
@@ -535,7 +535,7 @@ public ApiResponse<Void> updatePetWithFormWithHttpInfo(Long petId, String name,
 
     return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * uploads an image
@@ -611,7 +611,7 @@ public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String a
 
     return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * uploads an image (required)
@@ -692,6 +692,6 @@ public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(Long
 
     return apiClient.invokeAPI("PetApi.uploadFileWithRequiredFile", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
 }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
index 0e29deb7564f..75fa95592c05 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StoreApi {
   private ApiClient apiClient;
 
@@ -110,7 +110,7 @@ public ApiResponse<Void> deleteOrderWithHttpInfo(String orderId) throws ApiExcep
 
     return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Returns pet inventories by status
@@ -170,7 +170,7 @@ public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiEx
 
     return apiClient.invokeAPI("StoreApi.getInventory", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Find purchase order by ID
@@ -242,7 +242,7 @@ public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiExcep
 
     return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Place an order for a pet
@@ -311,6 +311,6 @@ public ApiResponse<Order> placeOrderWithHttpInfo(Order order) throws ApiExceptio
 
     return apiClient.invokeAPI("StoreApi.placeOrder", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
 }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java
index 9b6250da568d..bdf2c62fcf0a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class UserApi {
   private ApiClient apiClient;
 
@@ -107,7 +107,7 @@ public ApiResponse<Void> createUserWithHttpInfo(User user) throws ApiException {
 
     return apiClient.invokeAPI("UserApi.createUser", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Creates list of users with given input array
@@ -171,7 +171,7 @@ public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(List<User> user)
 
     return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Creates list of users with given input array
@@ -235,7 +235,7 @@ public ApiResponse<Void> createUsersWithListInputWithHttpInfo(List<User> user) t
 
     return apiClient.invokeAPI("UserApi.createUsersWithListInput", localVarPath, "POST", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Delete user
@@ -302,7 +302,7 @@ public ApiResponse<Void> deleteUserWithHttpInfo(String username) throws ApiExcep
 
     return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Get user by user name
@@ -374,7 +374,7 @@ public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiEx
 
     return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Logs user into the system
@@ -452,7 +452,7 @@ public ApiResponse<String> loginUserWithHttpInfo(String username, String passwor
 
     return apiClient.invokeAPI("UserApi.loginUser", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
+                               localVarAuthNames, localVarReturnType, false);
   }
   /**
    * Logs out current logged in user session
@@ -509,7 +509,7 @@ public ApiResponse<Void> logoutUserWithHttpInfo() throws ApiException {
 
     return apiClient.invokeAPI("UserApi.logoutUser", localVarPath, "GET", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
   /**
    * Updated user
@@ -583,6 +583,6 @@ public ApiResponse<Void> updateUserWithHttpInfo(String username, User user) thro
 
     return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
                                localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
+                               localVarAuthNames, null, false);
   }
 }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
index c1b2e4840702..d6c8c0f6aee0 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
index e6f95e585639..13e6ca480d97 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
index 1b46b4c6839f..eacc5d02d024 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpSignatureAuth.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpSignatureAuth.java
index 5f0e4dba3509..a85f4ae3a822 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpSignatureAuth.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpSignatureAuth.java
@@ -60,6 +60,9 @@ public class HttpSignatureAuth implements Authentication {
   // The digest algorithm which is used to calculate a cryptographic digest of the HTTP request body.
   private String digestAlgorithm;
 
+  // The maximum validity duration of the HTTP signature. 
+  private Long maxSignatureValidity;
+
   /**
    * Construct a new HTTP signature auth configuration object.
    *
@@ -68,19 +71,23 @@ public class HttpSignatureAuth implements Authentication {
    * @param algorithm The cryptographic algorithm.
    * @param digestAlgorithm The digest algorithm.
    * @param headers The list of HTTP headers that should be included in the HTTP signature.
+   * @param maxSignatureValidity The maximum validity duration of the HTTP signature.
+   *                             Used to set the '(expires)' field in the HTTP signature.
    */
   public HttpSignatureAuth(String keyId,
                            SigningAlgorithm signingAlgorithm,
                            Algorithm algorithm,
                            String digestAlgorithm,
                            AlgorithmParameterSpec parameterSpec,
-                           List<String> headers) {
+                           List<String> headers,
+                           Long maxSignatureValidity) {
     this.keyId = keyId;
     this.signingAlgorithm = signingAlgorithm;
     this.algorithm = algorithm;
     this.parameterSpec = parameterSpec;
     this.digestAlgorithm = digestAlgorithm;
     this.headers = headers;
+    this.maxSignatureValidity = maxSignatureValidity;
   }
 
   /**
@@ -190,6 +197,14 @@ public void setHeaders(List<String> headers) {
     this.headers = headers;
   }
 
+  /**
+   * Returns the maximum validity duration of the HTTP signature.
+   * @return The maximum validity duration of the HTTP signature.
+   */
+  public Long getMaxSignatureValidity() {
+    return maxSignatureValidity;
+  }
+
   /**
    * Returns the signer instance used to sign HTTP messages.
    *
@@ -220,7 +235,7 @@ public void setPrivateKey(Key key) throws InvalidKeyException, ApiException {
     if (key == null) {
       throw new ApiException("Private key (java.security.Key) cannot be null");
     }
-    signer = new Signer(key, new Signature(keyId, signingAlgorithm, algorithm, parameterSpec, null, headers));
+    signer = new Signer(key, new Signature(keyId, signingAlgorithm, algorithm, parameterSpec, null, headers, maxSignatureValidity));
   }
 
   @Override
@@ -245,16 +260,12 @@ public void applyToParams(List<Pair> queryParams, Map<String, String> headerPara
         throw new ApiException("Signer cannot be null. Please call the method `setPrivateKey` to set it up correctly");
       }
 
-      // construct the path with the URL query string
-      String path = uri.getPath();
-
-      List<String> urlQueries = new ArrayList<String>();
-      for (Pair queryParam : queryParams) {
-        urlQueries.add(queryParam.getName() + "=" + URLEncoder.encode(queryParam.getValue(), "utf8").replaceAll("\\+", "%20"));
-      }
-
-      if (!urlQueries.isEmpty()) {
-        path = path + "?" + String.join("&", urlQueries);
+      // construct the path with the URL-encoded path and query.
+      // Calling getRawPath and getRawQuery ensures the path is URL-encoded as it will be serialized
+      // on the wire. The HTTP signature must use the encode URL as it is sent on the wire.
+      String path = uri.getRawPath();
+      if (uri.getRawQuery() != "") {
+        path += "?" + uri.getRawQuery();
       }
 
       headerParams.put("Authorization", signer.sign(method, path, headerParams).toString());
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java
index 5751094fa1db..8a468063c987 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -31,153 +31,163 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OAuth implements Authentication {
-  private static final Logger log = Logger.getLogger(OAuth.class.getName());
-
-  private String tokenUrl;
-  private String absoluteTokenUrl;
-  private OAuthFlow flow = OAuthFlow.application;
-  private OAuth20Service service;
-  private DefaultApi20 authApi;
-  private String scope;
-  private String username;
-  private String password;
-  private String code;
-  private volatile OAuth2AccessToken accessToken;
-
-  public OAuth(String basePath, String tokenUrl) {
-    this.tokenUrl = tokenUrl;
-    this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
-    authApi = new DefaultApi20() {
-      @Override
-      public String getAccessTokenEndpoint() {
-        return absoluteTokenUrl;
-      }
-
-      @Override
-      protected String getAuthorizationBaseUrl() {
-        throw new UnsupportedOperationException("Shouldn't get there !");
-      }
-    };
-  }
-
-  private static String createAbsoluteTokenUrl(String basePath, String tokenUrl) {
-    if (!URI.create(tokenUrl).isAbsolute()) {
-      try {
-        return UriBuilder.fromPath(basePath).path(tokenUrl).build().toURL().toString();
-      } catch (MalformedURLException e) {
-        log.log(Level.SEVERE, "Couldn't create absolute token URL", e);
-      }
+    private static final Logger log = Logger.getLogger(OAuth.class.getName());
+
+    private String tokenUrl;
+    private String absoluteTokenUrl;
+    private OAuthFlow flow = OAuthFlow.application;
+    private OAuth20Service service;
+    private DefaultApi20 authApi;
+    private String scope;
+    private String username;
+    private String password;
+    private String code;
+    private volatile OAuth2AccessToken accessToken;
+
+    public OAuth(String basePath, String tokenUrl) {
+        this.tokenUrl = tokenUrl;
+        this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
+        authApi = new DefaultApi20() {
+            @Override
+            public String getAccessTokenEndpoint() {
+              return absoluteTokenUrl;
+            }
+
+            @Override
+            protected String getAuthorizationBaseUrl() {
+              throw new UnsupportedOperationException("Shouldn't get there !");
+            }
+        };
+    }
+
+    private static String createAbsoluteTokenUrl(String basePath, String tokenUrl) {
+        if (!URI.create(tokenUrl).isAbsolute()) {
+            try {
+                return UriBuilder.fromPath(basePath).path(tokenUrl).build().toURL().toString();
+            } catch (MalformedURLException e) {
+                log.log(Level.SEVERE, "Couldn't create absolute token URL", e);
+            }
+        }
+        return tokenUrl;
+    }
+
+    @Override
+    public void applyToParams(
+        List<Pair> queryParams,
+        Map<String, String> headerParams,
+        Map<String, String> cookieParams,
+        String payload,
+        String method,
+        URI uri)
+        throws ApiException {
+
+        if (accessToken == null) {
+            obtainAccessToken(null);
+        }
+        if (accessToken != null) {
+            headerParams.put("Authorization", "Bearer " + accessToken.getAccessToken());
+        }
     }
-    return tokenUrl;
-  }
-
-  @Override
-  public void applyToParams(
-      List<Pair> queryParams,
-      Map<String, String> headerParams,
-      Map<String, String> cookieParams,
-      String payload,
-      String method,
-      URI uri)
-      throws ApiException {
-
-    if (accessToken == null) {
-      obtainAccessToken(null);
+
+    public OAuth2AccessToken renewAccessToken() throws ApiException {
+        String refreshToken = null;
+        if (accessToken != null) {
+            refreshToken = accessToken.getRefreshToken();
+            accessToken = null;
+        }
+        return obtainAccessToken(refreshToken);
     }
-    if (accessToken != null) {
-      headerParams.put("Authorization", "Bearer " + accessToken.getAccessToken());
+
+    public synchronized OAuth2AccessToken obtainAccessToken(String refreshToken) throws ApiException {
+        if (service == null) {
+            log.log(Level.FINE, "service is null in obtainAccessToken.");
+            return null;
+        }
+        try {
+            if (refreshToken != null) {
+                return service.refreshAccessToken(refreshToken);
+            }
+        } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
+            log.log(Level.FINE, "Refreshing the access token using the refresh token failed", e);
+        }
+        try {
+            switch (flow) {
+                case password:
+                    if (username != null && password != null) {
+                        accessToken = service.getAccessTokenPasswordGrant(username, password, scope);
+                    }
+                    break;
+                case accessCode:
+                    if (code != null) {
+                        accessToken = service.getAccessToken(code);
+                        code = null;
+                    }
+                    break;
+                case application:
+                    accessToken = service.getAccessTokenClientCredentialsGrant(scope);
+                    break;
+                default:
+                    log.log(Level.SEVERE, "Invalid flow in obtainAccessToken: " + flow);
+            }
+        } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
+            throw new ApiException(e);
+        }
+        return accessToken;
     }
-  }
 
-  public OAuth2AccessToken renewAccessToken() throws ApiException {
-    String refreshToken = null;
-    if (accessToken != null) {
-      refreshToken = accessToken.getRefreshToken();
-      accessToken = null;
+    public OAuth2AccessToken getAccessToken() {
+        return accessToken;
     }
-    return obtainAccessToken(refreshToken);
-  }
 
-  public synchronized OAuth2AccessToken obtainAccessToken(String refreshToken) throws ApiException {
-    if (service == null) {
-      return null;
+    public OAuth setAccessToken(OAuth2AccessToken accessToken) {
+        this.accessToken = accessToken;
+        return this;
     }
-    try {
-      if (refreshToken != null) {
-        return service.refreshAccessToken(refreshToken);
-      }
-    } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
-      log.log(Level.FINE, "Refreshing the access token using the refresh token failed", e);
+
+    public OAuth setAccessToken(String accessToken) {
+        this.accessToken = new OAuth2AccessToken(accessToken);
+        return this;
+    }
+
+    public OAuth setScope(String scope) {
+       this.scope = scope;
+       return this;
     }
-    try {
-      switch (flow) {
-        case password:
-          if (username != null && password != null) {
-            accessToken = service.getAccessTokenPasswordGrant(username, password, scope);
-          }
-          break;
-        case accessCode:
-          if (code != null) {
-            accessToken = service.getAccessToken(code);
-            code = null;
-          }
-          break;
-        case application:
-          accessToken = service.getAccessTokenClientCredentialsGrant(scope);
-      }
-    } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
-      throw new ApiException(e);
+
+    public OAuth setCredentials(String clientId, String clientSecret, Boolean debug) {
+        if (Boolean.TRUE.equals(debug)) {
+            service = new ServiceBuilder(clientId)
+                .apiSecret(clientSecret).debug()
+                .build(authApi);
+        } else {
+            service = new ServiceBuilder(clientId)
+                .apiSecret(clientSecret)
+                .build(authApi);
+        }
+        return this;
+    }
+
+    public OAuth usePasswordFlow(String username, String password) {
+        this.flow = OAuthFlow.password;
+        this.username = username;
+        this.password = password;
+        return this;
+    }
+
+    public OAuth useAuthorizationCodeFlow(String code) {
+        this.flow = OAuthFlow.accessCode;
+        this.code = code;
+        return this;
+    }
+
+    public OAuth setFlow(OAuthFlow flow) {
+        this.flow = flow;
+        return this;
+    }
+
+    public void setBasePath(String basePath) {
+        this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
     }
-    return accessToken;
-  }
-
-  public OAuth2AccessToken getAccessToken() {
-    return accessToken;
-  }
-
-  public OAuth setAccessToken(OAuth2AccessToken accessToken) {
-    this.accessToken = accessToken;
-    return this;
-  }
-
-  public OAuth setAccessToken(String accessToken) {
-    this.accessToken = new OAuth2AccessToken(accessToken);
-    return this;
-  }
-
-  public OAuth setScope(String scope) {
-    this.scope = scope;
-    return this;
-  }
-
-  public OAuth setCredentials(String clientId, String clientSecret) {
-    service = new ServiceBuilder(clientId)
-        .apiSecret(clientSecret)
-        .build(authApi);
-    return this;
-  }
-
-  public OAuth usePasswordFlow(String username, String password) {
-    this.flow = OAuthFlow.password;
-    this.username = username;
-    this.password = password;
-    return this;
-  }
-
-  public OAuth useAuthorizationCodeFlow(String code) {
-    this.flow = OAuthFlow.accessCode;
-    this.code = code;
-    return this;
-  }
-
-  public OAuth setFlow(OAuthFlow flow) {
-    this.flow = flow;
-    return this;
-  }
-
-  public void setBasePath(String basePath) {
-    this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
-  }
 }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
index 892694344461..40d56df0ce25 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
@@ -24,7 +24,7 @@
 /**
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -41,14 +41,14 @@ public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
         this.isNullable = isNullable;
     }
 
-    /***
-     * Get the list of schemas allowed to be stored in this object
+    /**
+     * Get the list of oneOf/anyOf composed schemas allowed to be stored in this object
      *
      * @return an instance of the actual schema/object
      */
     public abstract Map<String, GenericType> getSchemas();
 
-    /***
+    /**
      * Get the actual instance
      *
      * @return an instance of the actual schema/object
@@ -56,14 +56,33 @@ public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
     @JsonValue
     public Object getActualInstance() {return instance;}
 
-    /***
+    /**
      * Set the actual instance
      *
      * @param instance the actual instance of the schema/object
      */
     public void setActualInstance(Object instance) {this.instance = instance;}
 
-    /***
+    /**
+     * Get the instant recursively when the schemas defined in oneOf/anyof happen to be oneOf/anyOf schema as well
+     *
+     * @return an instance of the actual schema/object
+     */
+    public Object getActualInstanceRecursively() {
+        return getActualInstanceRecursively(this);
+    }
+
+    private Object getActualInstanceRecursively(AbstractOpenApiSchema object) {
+        if (object.getActualInstance() == null) {
+            return null;
+        } else if (object.getActualInstance() instanceof AbstractOpenApiSchema) {
+            return getActualInstanceRecursively((AbstractOpenApiSchema)object.getActualInstance());
+        } else {
+            return object.getActualInstance();
+        }
+    }
+
+    /**
      * Get the schema type (e.g. anyOf, oneOf)
      *
      * @return the schema type
@@ -112,7 +131,7 @@ public int hashCode() {
         return Objects.hash(instance, isNullable, schemaType);
     }
 
-    /***
+    /**
      * Is nullalble
      *
      * @return true if it's nullable
@@ -124,4 +143,7 @@ public Boolean isNullable() {
             return Boolean.FALSE;
         }
     }
+
+
+
 }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 624b19e97f3d..84a9d6915ba0 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -28,6 +30,8 @@
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.util.NoSuchElementException;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * AdditionalPropertiesClass
@@ -42,7 +46,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_EMPTY_MAP,
   AdditionalPropertiesClass.JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_STRING
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_PROPERTY = "map_property";
   private Map<String, String> mapProperty = null;
@@ -70,7 +74,6 @@ public class AdditionalPropertiesClass {
 
 
   public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {
-    
     this.mapProperty = mapProperty;
     return this;
   }
@@ -103,7 +106,6 @@ public void setMapProperty(Map<String, String> mapProperty) {
 
 
   public AdditionalPropertiesClass mapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
-    
     this.mapOfMapProperty = mapOfMapProperty;
     return this;
   }
@@ -137,7 +139,6 @@ public void setMapOfMapProperty(Map<String, Map<String, String>> mapOfMapPropert
 
   public AdditionalPropertiesClass anytype1(Object anytype1) {
     this.anytype1 = JsonNullable.<Object>of(anytype1);
-    
     return this;
   }
 
@@ -171,7 +172,6 @@ public void setAnytype1(Object anytype1) {
 
 
   public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype1(Object mapWithUndeclaredPropertiesAnytype1) {
-    
     this.mapWithUndeclaredPropertiesAnytype1 = mapWithUndeclaredPropertiesAnytype1;
     return this;
   }
@@ -196,7 +196,6 @@ public void setMapWithUndeclaredPropertiesAnytype1(Object mapWithUndeclaredPrope
 
 
   public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype2(Object mapWithUndeclaredPropertiesAnytype2) {
-    
     this.mapWithUndeclaredPropertiesAnytype2 = mapWithUndeclaredPropertiesAnytype2;
     return this;
   }
@@ -221,7 +220,6 @@ public void setMapWithUndeclaredPropertiesAnytype2(Object mapWithUndeclaredPrope
 
 
   public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype3(Map<String, Object> mapWithUndeclaredPropertiesAnytype3) {
-    
     this.mapWithUndeclaredPropertiesAnytype3 = mapWithUndeclaredPropertiesAnytype3;
     return this;
   }
@@ -254,7 +252,6 @@ public void setMapWithUndeclaredPropertiesAnytype3(Map<String, Object> mapWithUn
 
 
   public AdditionalPropertiesClass emptyMap(Object emptyMap) {
-    
     this.emptyMap = emptyMap;
     return this;
   }
@@ -279,7 +276,6 @@ public void setEmptyMap(Object emptyMap) {
 
 
   public AdditionalPropertiesClass mapWithUndeclaredPropertiesString(Map<String, String> mapWithUndeclaredPropertiesString) {
-    
     this.mapWithUndeclaredPropertiesString = mapWithUndeclaredPropertiesString;
     return this;
   }
@@ -311,6 +307,9 @@ public void setMapWithUndeclaredPropertiesString(Map<String, String> mapWithUnde
   }
 
 
+  /**
+   * Return true if this AdditionalPropertiesClass object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
index 307baecc9634..3ba4db8445f1 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +28,8 @@
 import org.openapitools.client.model.Cat;
 import org.openapitools.client.model.Dog;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Animal
@@ -34,7 +38,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
@@ -50,7 +54,6 @@ public class Animal {
 
 
   public Animal className(String className) {
-    
     this.className = className;
     return this;
   }
@@ -74,7 +77,6 @@ public void setClassName(String className) {
 
 
   public Animal color(String color) {
-    
     this.color = color;
     return this;
   }
@@ -98,6 +100,9 @@ public void setColor(String color) {
   }
 
 
+  /**
+   * Return true if this Animal object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -138,5 +143,13 @@ private String toIndentedString(java.lang.Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 
+static {
+  // Initialize and register the discriminator mappings.
+  Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+  mappings.put("Cat", Cat.class);
+  mappings.put("Dog", Dog.class);
+  mappings.put("Animal", Animal.class);
+  JSON.registerDiscriminator(Animal.class, "className", mappings);
+}
 }
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Apple.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Apple.java
index e74a41ea1991..f3d482ee19ea 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Apple.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Apple.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Apple
@@ -30,7 +34,7 @@
   Apple.JSON_PROPERTY_CULTIVAR,
   Apple.JSON_PROPERTY_ORIGIN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Apple {
   public static final String JSON_PROPERTY_CULTIVAR = "cultivar";
   private String cultivar;
@@ -40,7 +44,6 @@ public class Apple {
 
 
   public Apple cultivar(String cultivar) {
-    
     this.cultivar = cultivar;
     return this;
   }
@@ -65,7 +68,6 @@ public void setCultivar(String cultivar) {
 
 
   public Apple origin(String origin) {
-    
     this.origin = origin;
     return this;
   }
@@ -89,6 +91,9 @@ public void setOrigin(String origin) {
   }
 
 
+  /**
+   * Return true if this apple object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AppleReq.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AppleReq.java
index 90a3207fc704..19b48f42441b 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AppleReq.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AppleReq.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * AppleReq
@@ -30,7 +34,7 @@
   AppleReq.JSON_PROPERTY_CULTIVAR,
   AppleReq.JSON_PROPERTY_MEALY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AppleReq {
   public static final String JSON_PROPERTY_CULTIVAR = "cultivar";
   private String cultivar;
@@ -40,7 +44,6 @@ public class AppleReq {
 
 
   public AppleReq cultivar(String cultivar) {
-    
     this.cultivar = cultivar;
     return this;
   }
@@ -64,7 +67,6 @@ public void setCultivar(String cultivar) {
 
 
   public AppleReq mealy(Boolean mealy) {
-    
     this.mealy = mealy;
     return this;
   }
@@ -88,6 +90,9 @@ public void setMealy(Boolean mealy) {
   }
 
 
+  /**
+   * Return true if this appleReq object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 28d19953c345..ae6c3866e081 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ArrayOfArrayOfNumberOnly
@@ -32,14 +36,13 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
 
 
   public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
-    
     this.arrayArrayNumber = arrayArrayNumber;
     return this;
   }
@@ -71,6 +74,9 @@ public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
   }
 
 
+  /**
+   * Return true if this ArrayOfArrayOfNumberOnly object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 5eeac9d8ac5d..5197dda9bc4f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ArrayOfNumberOnly
@@ -32,14 +36,13 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
 
 
   public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
-    
     this.arrayNumber = arrayNumber;
     return this;
   }
@@ -71,6 +74,9 @@ public void setArrayNumber(List<BigDecimal> arrayNumber) {
   }
 
 
+  /**
+   * Return true if this ArrayOfNumberOnly object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
index df57098053eb..0d125019fe68 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import java.util.List;
 import org.openapitools.client.model.ReadOnlyFirst;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ArrayTest
@@ -34,7 +38,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   private List<String> arrayOfString = null;
@@ -47,7 +51,6 @@ public class ArrayTest {
 
 
   public ArrayTest arrayOfString(List<String> arrayOfString) {
-    
     this.arrayOfString = arrayOfString;
     return this;
   }
@@ -80,7 +83,6 @@ public void setArrayOfString(List<String> arrayOfString) {
 
 
   public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
-    
     this.arrayArrayOfInteger = arrayArrayOfInteger;
     return this;
   }
@@ -113,7 +115,6 @@ public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
 
 
   public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
-    
     this.arrayArrayOfModel = arrayArrayOfModel;
     return this;
   }
@@ -145,6 +146,9 @@ public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
   }
 
 
+  /**
+   * Return true if this ArrayTest object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Banana.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Banana.java
index bb8fd654e455..a0327d574d9f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Banana.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Banana.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -23,6 +25,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Banana
@@ -30,14 +34,13 @@
 @JsonPropertyOrder({
   Banana.JSON_PROPERTY_LENGTH_CM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Banana {
   public static final String JSON_PROPERTY_LENGTH_CM = "lengthCm";
   private BigDecimal lengthCm;
 
 
   public Banana lengthCm(BigDecimal lengthCm) {
-    
     this.lengthCm = lengthCm;
     return this;
   }
@@ -61,6 +64,9 @@ public void setLengthCm(BigDecimal lengthCm) {
   }
 
 
+  /**
+   * Return true if this banana object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BananaReq.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BananaReq.java
index 719d1034095d..90ec98636024 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BananaReq.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BananaReq.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -23,6 +25,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * BananaReq
@@ -31,7 +35,7 @@
   BananaReq.JSON_PROPERTY_LENGTH_CM,
   BananaReq.JSON_PROPERTY_SWEET
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BananaReq {
   public static final String JSON_PROPERTY_LENGTH_CM = "lengthCm";
   private BigDecimal lengthCm;
@@ -41,7 +45,6 @@ public class BananaReq {
 
 
   public BananaReq lengthCm(BigDecimal lengthCm) {
-    
     this.lengthCm = lengthCm;
     return this;
   }
@@ -65,7 +68,6 @@ public void setLengthCm(BigDecimal lengthCm) {
 
 
   public BananaReq sweet(Boolean sweet) {
-    
     this.sweet = sweet;
     return this;
   }
@@ -89,6 +91,9 @@ public void setSweet(Boolean sweet) {
   }
 
 
+  /**
+   * Return true if this bananaReq object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BasquePig.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BasquePig.java
index d13bc304b2da..af7505951619 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BasquePig.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BasquePig.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * BasquePig
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   BasquePig.JSON_PROPERTY_CLASS_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BasquePig {
   public static final String JSON_PROPERTY_CLASS_NAME = "className";
   private String className;
 
 
   public BasquePig className(String className) {
-    
     this.className = className;
     return this;
   }
@@ -59,6 +62,9 @@ public void setClassName(String className) {
   }
 
 
+  /**
+   * Return true if this BasquePig object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
index 033e97881105..c87ca1ea948b 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Capitalization
@@ -34,7 +38,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   private String smallCamel;
@@ -56,7 +60,6 @@ public class Capitalization {
 
 
   public Capitalization smallCamel(String smallCamel) {
-    
     this.smallCamel = smallCamel;
     return this;
   }
@@ -81,7 +84,6 @@ public void setSmallCamel(String smallCamel) {
 
 
   public Capitalization capitalCamel(String capitalCamel) {
-    
     this.capitalCamel = capitalCamel;
     return this;
   }
@@ -106,7 +108,6 @@ public void setCapitalCamel(String capitalCamel) {
 
 
   public Capitalization smallSnake(String smallSnake) {
-    
     this.smallSnake = smallSnake;
     return this;
   }
@@ -131,7 +132,6 @@ public void setSmallSnake(String smallSnake) {
 
 
   public Capitalization capitalSnake(String capitalSnake) {
-    
     this.capitalSnake = capitalSnake;
     return this;
   }
@@ -156,7 +156,6 @@ public void setCapitalSnake(String capitalSnake) {
 
 
   public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
-    
     this.scAETHFlowPoints = scAETHFlowPoints;
     return this;
   }
@@ -181,7 +180,6 @@ public void setScAETHFlowPoints(String scAETHFlowPoints) {
 
 
   public Capitalization ATT_NAME(String ATT_NAME) {
-    
     this.ATT_NAME = ATT_NAME;
     return this;
   }
@@ -205,6 +203,9 @@ public void setATTNAME(String ATT_NAME) {
   }
 
 
+  /**
+   * Return true if this Capitalization object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
index 05e080b32291..226af44187b2 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +32,8 @@
 import org.openapitools.client.model.Animal;
 import org.openapitools.client.model.CatAllOf;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Cat
@@ -33,7 +41,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
@@ -44,7 +52,6 @@ public class Cat extends Animal {
 
 
   public Cat declawed(Boolean declawed) {
-    
     this.declawed = declawed;
     return this;
   }
@@ -67,7 +74,47 @@ public void setDeclawed(Boolean declawed) {
     this.declawed = declawed;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public Cat putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
 
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this Cat object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -77,13 +124,14 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     Cat cat = (Cat) o;
-    return Objects.equals(this.declawed, cat.declawed) &&
+    return Objects.equals(this.declawed, cat.declawed)&&
+        Objects.equals(this.additionalProperties, cat.additionalProperties) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(declawed, super.hashCode());
+    return Objects.hash(declawed, super.hashCode(), additionalProperties);
   }
 
 
@@ -93,6 +141,7 @@ public String toString() {
     sb.append("class Cat {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -108,5 +157,11 @@ private String toIndentedString(java.lang.Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 
+static {
+  // Initialize and register the discriminator mappings.
+  Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+  mappings.put("Cat", Cat.class);
+  JSON.registerDiscriminator(Cat.class, "className", mappings);
+}
 }
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
index 3e7b991436aa..f3060f5d0e36 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * CatAllOf
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
 
 
   public CatAllOf declawed(Boolean declawed) {
-    
     this.declawed = declawed;
     return this;
   }
@@ -60,6 +63,9 @@ public void setDeclawed(Boolean declawed) {
   }
 
 
+  /**
+   * Return true if this Cat_allOf object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
index 868ba8750742..de082b6e900f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Category
@@ -30,7 +34,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
@@ -40,7 +44,6 @@ public class Category {
 
 
   public Category id(Long id) {
-    
     this.id = id;
     return this;
   }
@@ -65,7 +68,6 @@ public void setId(Long id) {
 
 
   public Category name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -88,6 +90,9 @@ public void setName(String name) {
   }
 
 
+  /**
+   * Return true if this Category object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java
index 272be70fc2a6..3331e50125fb 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +32,8 @@
 import org.openapitools.client.model.ChildCatAllOf;
 import org.openapitools.client.model.ParentPet;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ChildCat
@@ -33,7 +41,7 @@
 @JsonPropertyOrder({
   ChildCat.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "pet_type", visible = true)
 @JsonSubTypes({
 })
@@ -44,7 +52,6 @@ public class ChildCat extends ParentPet {
 
 
   public ChildCat name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -67,7 +74,47 @@ public void setName(String name) {
     this.name = name;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public ChildCat putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
 
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this ChildCat object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -77,13 +124,14 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     ChildCat childCat = (ChildCat) o;
-    return Objects.equals(this.name, childCat.name) &&
+    return Objects.equals(this.name, childCat.name)&&
+        Objects.equals(this.additionalProperties, childCat.additionalProperties) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, super.hashCode());
+    return Objects.hash(name, super.hashCode(), additionalProperties);
   }
 
 
@@ -93,6 +141,7 @@ public String toString() {
     sb.append("class ChildCat {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -108,5 +157,11 @@ private String toIndentedString(java.lang.Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 
+static {
+  // Initialize and register the discriminator mappings.
+  Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+  mappings.put("ChildCat", ChildCat.class);
+  JSON.registerDiscriminator(ChildCat.class, "pet_type", mappings);
+}
 }
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCatAllOf.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCatAllOf.java
index aa495e74cd43..14279b43796d 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCatAllOf.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCatAllOf.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ChildCatAllOf
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   ChildCatAllOf.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ChildCatAllOf {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
 
   public ChildCatAllOf name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -60,6 +63,9 @@ public void setName(String name) {
   }
 
 
+  /**
+   * Return true if this ChildCat_allOf object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
index 4de7664b26a7..ebaa83367832 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Model for testing model with \&quot;_class\&quot; property
@@ -30,14 +34,13 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
 
 
   public ClassModel propertyClass(String propertyClass) {
-    
     this.propertyClass = propertyClass;
     return this;
   }
@@ -61,6 +64,9 @@ public void setPropertyClass(String propertyClass) {
   }
 
 
+  /**
+   * Return true if this ClassModel object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
index 02b0aac2247a..1bc59615daea 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Client
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
 
 
   public Client client(String client) {
-    
     this.client = client;
     return this;
   }
@@ -60,6 +63,9 @@ public void setClient(String client) {
   }
 
 
+  /**
+   * Return true if this Client object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
index 7e99e3ec4bf6..01cb6c6a837c 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -24,6 +30,8 @@
 import org.openapitools.client.model.QuadrilateralInterface;
 import org.openapitools.client.model.ShapeInterface;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ComplexQuadrilateral
@@ -32,7 +40,7 @@
   ComplexQuadrilateral.JSON_PROPERTY_SHAPE_TYPE,
   ComplexQuadrilateral.JSON_PROPERTY_QUADRILATERAL_TYPE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ComplexQuadrilateral {
   public static final String JSON_PROPERTY_SHAPE_TYPE = "shapeType";
   private String shapeType;
@@ -42,7 +50,6 @@ public class ComplexQuadrilateral {
 
 
   public ComplexQuadrilateral shapeType(String shapeType) {
-    
     this.shapeType = shapeType;
     return this;
   }
@@ -66,7 +73,6 @@ public void setShapeType(String shapeType) {
 
 
   public ComplexQuadrilateral quadrilateralType(String quadrilateralType) {
-    
     this.quadrilateralType = quadrilateralType;
     return this;
   }
@@ -88,7 +94,47 @@ public void setQuadrilateralType(String quadrilateralType) {
     this.quadrilateralType = quadrilateralType;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public ComplexQuadrilateral putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this ComplexQuadrilateral object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -99,12 +145,13 @@ public boolean equals(java.lang.Object o) {
     }
     ComplexQuadrilateral complexQuadrilateral = (ComplexQuadrilateral) o;
     return Objects.equals(this.shapeType, complexQuadrilateral.shapeType) &&
-        Objects.equals(this.quadrilateralType, complexQuadrilateral.quadrilateralType);
+        Objects.equals(this.quadrilateralType, complexQuadrilateral.quadrilateralType)&&
+        Objects.equals(this.additionalProperties, complexQuadrilateral.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(shapeType, quadrilateralType);
+    return Objects.hash(shapeType, quadrilateralType, additionalProperties);
   }
 
 
@@ -114,6 +161,7 @@ public String toString() {
     sb.append("class ComplexQuadrilateral {\n");
     sb.append("    shapeType: ").append(toIndentedString(shapeType)).append("\n");
     sb.append("    quadrilateralType: ").append(toIndentedString(quadrilateralType)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DanishPig.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DanishPig.java
index cf4907374211..289134c8f174 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DanishPig.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DanishPig.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * DanishPig
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   DanishPig.JSON_PROPERTY_CLASS_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DanishPig {
   public static final String JSON_PROPERTY_CLASS_NAME = "className";
   private String className;
 
 
   public DanishPig className(String className) {
-    
     this.className = className;
     return this;
   }
@@ -59,6 +62,9 @@ public void setClassName(String className) {
   }
 
 
+  /**
+   * Return true if this DanishPig object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
index f56658043689..b41fe77d7d5a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +32,8 @@
 import org.openapitools.client.model.Animal;
 import org.openapitools.client.model.DogAllOf;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Dog
@@ -33,7 +41,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
 })
@@ -44,7 +52,6 @@ public class Dog extends Animal {
 
 
   public Dog breed(String breed) {
-    
     this.breed = breed;
     return this;
   }
@@ -67,7 +74,47 @@ public void setBreed(String breed) {
     this.breed = breed;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public Dog putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
 
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this Dog object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -77,13 +124,14 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     Dog dog = (Dog) o;
-    return Objects.equals(this.breed, dog.breed) &&
+    return Objects.equals(this.breed, dog.breed)&&
+        Objects.equals(this.additionalProperties, dog.additionalProperties) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(breed, super.hashCode());
+    return Objects.hash(breed, super.hashCode(), additionalProperties);
   }
 
 
@@ -93,6 +141,7 @@ public String toString() {
     sb.append("class Dog {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -108,5 +157,11 @@ private String toIndentedString(java.lang.Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 
+static {
+  // Initialize and register the discriminator mappings.
+  Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+  mappings.put("Dog", Dog.class);
+  JSON.registerDiscriminator(Dog.class, "className", mappings);
+}
 }
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
index dd42595cf202..c8e362e0e9d7 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * DogAllOf
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
 
 
   public DogAllOf breed(String breed) {
-    
     this.breed = breed;
     return this;
   }
@@ -60,6 +63,9 @@ public void setBreed(String breed) {
   }
 
 
+  /**
+   * Return true if this Dog_allOf object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java
index f92f7d3f461d..e4b5708cb179 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,9 +28,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import org.openapitools.client.model.Fruit;
 import org.openapitools.client.model.NullableShape;
 import org.openapitools.client.model.Shape;
@@ -33,6 +37,8 @@
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.util.NoSuchElementException;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Drawing
@@ -43,8 +49,8 @@
   Drawing.JSON_PROPERTY_NULLABLE_SHAPE,
   Drawing.JSON_PROPERTY_SHAPES
 })
-
-public class Drawing extends HashMap<String, Fruit> {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Drawing {
   public static final String JSON_PROPERTY_MAIN_SHAPE = "mainShape";
   private Shape mainShape = null;
 
@@ -59,7 +65,6 @@ public class Drawing extends HashMap<String, Fruit> {
 
 
   public Drawing mainShape(Shape mainShape) {
-    
     this.mainShape = mainShape;
     return this;
   }
@@ -84,7 +89,6 @@ public void setMainShape(Shape mainShape) {
 
 
   public Drawing shapeOrNull(ShapeOrNull shapeOrNull) {
-    
     this.shapeOrNull = shapeOrNull;
     return this;
   }
@@ -110,7 +114,6 @@ public void setShapeOrNull(ShapeOrNull shapeOrNull) {
 
   public Drawing nullableShape(NullableShape nullableShape) {
     this.nullableShape = JsonNullable.<NullableShape>of(nullableShape);
-    
     return this;
   }
 
@@ -144,7 +147,6 @@ public void setNullableShape(NullableShape nullableShape) {
 
 
   public Drawing shapes(List<Shape> shapes) {
-    
     this.shapes = shapes;
     return this;
   }
@@ -175,7 +177,47 @@ public void setShapes(List<Shape> shapes) {
     this.shapes = shapes;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Fruit> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public Drawing putAdditionalProperty(String key, Fruit value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Fruit>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Fruit> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Fruit getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this Drawing object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -188,13 +230,13 @@ public boolean equals(java.lang.Object o) {
     return Objects.equals(this.mainShape, drawing.mainShape) &&
         Objects.equals(this.shapeOrNull, drawing.shapeOrNull) &&
         Objects.equals(this.nullableShape, drawing.nullableShape) &&
-        Objects.equals(this.shapes, drawing.shapes) &&
-        super.equals(o);
+        Objects.equals(this.shapes, drawing.shapes)&&
+        Objects.equals(this.additionalProperties, drawing.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mainShape, shapeOrNull, nullableShape, shapes, super.hashCode());
+    return Objects.hash(mainShape, shapeOrNull, nullableShape, shapes, additionalProperties);
   }
 
 
@@ -202,11 +244,11 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Drawing {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    mainShape: ").append(toIndentedString(mainShape)).append("\n");
     sb.append("    shapeOrNull: ").append(toIndentedString(shapeOrNull)).append("\n");
     sb.append("    nullableShape: ").append(toIndentedString(nullableShape)).append("\n");
     sb.append("    shapes: ").append(toIndentedString(shapes)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
index 86526adb3fa7..7916b8a9cd7e 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -24,6 +26,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * EnumArrays
@@ -32,7 +36,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
@@ -112,7 +116,6 @@ public static ArrayEnumEnum fromValue(String value) {
 
 
   public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
-    
     this.justSymbol = justSymbol;
     return this;
   }
@@ -137,7 +140,6 @@ public void setJustSymbol(JustSymbolEnum justSymbol) {
 
 
   public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
-    
     this.arrayEnum = arrayEnum;
     return this;
   }
@@ -169,6 +171,9 @@ public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
   }
 
 
+  /**
+   * Return true if this EnumArrays object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java
index e9102d974276..973b51cc93e4 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java
@@ -15,7 +15,11 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
index cf6d574a5f97..631def3aa1a8 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -29,6 +31,8 @@
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.util.NoSuchElementException;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * EnumTest
@@ -43,7 +47,7 @@
   EnumTest.JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE,
   EnumTest.JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EnumTest {
   /**
    * Gets or Sets enumString
@@ -215,7 +219,6 @@ public static EnumNumberEnum fromValue(Double value) {
 
 
   public EnumTest enumString(EnumStringEnum enumString) {
-    
     this.enumString = enumString;
     return this;
   }
@@ -240,7 +243,6 @@ public void setEnumString(EnumStringEnum enumString) {
 
 
   public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
-    
     this.enumStringRequired = enumStringRequired;
     return this;
   }
@@ -264,7 +266,6 @@ public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
 
 
   public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
-    
     this.enumInteger = enumInteger;
     return this;
   }
@@ -289,7 +290,6 @@ public void setEnumInteger(EnumIntegerEnum enumInteger) {
 
 
   public EnumTest enumNumber(EnumNumberEnum enumNumber) {
-    
     this.enumNumber = enumNumber;
     return this;
   }
@@ -315,7 +315,6 @@ public void setEnumNumber(EnumNumberEnum enumNumber) {
 
   public EnumTest outerEnum(OuterEnum outerEnum) {
     this.outerEnum = JsonNullable.<OuterEnum>of(outerEnum);
-    
     return this;
   }
 
@@ -349,7 +348,6 @@ public void setOuterEnum(OuterEnum outerEnum) {
 
 
   public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
-    
     this.outerEnumInteger = outerEnumInteger;
     return this;
   }
@@ -374,7 +372,6 @@ public void setOuterEnumInteger(OuterEnumInteger outerEnumInteger) {
 
 
   public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValue) {
-    
     this.outerEnumDefaultValue = outerEnumDefaultValue;
     return this;
   }
@@ -399,7 +396,6 @@ public void setOuterEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValue
 
 
   public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) {
-    
     this.outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValue;
     return this;
   }
@@ -423,6 +419,9 @@ public void setOuterEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerEn
   }
 
 
+  /**
+   * Return true if this Enum_Test object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
index 6e93c9efbf8d..a396d5cfd704 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -24,6 +30,8 @@
 import org.openapitools.client.model.ShapeInterface;
 import org.openapitools.client.model.TriangleInterface;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * EquilateralTriangle
@@ -32,7 +40,7 @@
   EquilateralTriangle.JSON_PROPERTY_SHAPE_TYPE,
   EquilateralTriangle.JSON_PROPERTY_TRIANGLE_TYPE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class EquilateralTriangle {
   public static final String JSON_PROPERTY_SHAPE_TYPE = "shapeType";
   private String shapeType;
@@ -42,7 +50,6 @@ public class EquilateralTriangle {
 
 
   public EquilateralTriangle shapeType(String shapeType) {
-    
     this.shapeType = shapeType;
     return this;
   }
@@ -66,7 +73,6 @@ public void setShapeType(String shapeType) {
 
 
   public EquilateralTriangle triangleType(String triangleType) {
-    
     this.triangleType = triangleType;
     return this;
   }
@@ -88,7 +94,47 @@ public void setTriangleType(String triangleType) {
     this.triangleType = triangleType;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public EquilateralTriangle putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this EquilateralTriangle object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -99,12 +145,13 @@ public boolean equals(java.lang.Object o) {
     }
     EquilateralTriangle equilateralTriangle = (EquilateralTriangle) o;
     return Objects.equals(this.shapeType, equilateralTriangle.shapeType) &&
-        Objects.equals(this.triangleType, equilateralTriangle.triangleType);
+        Objects.equals(this.triangleType, equilateralTriangle.triangleType)&&
+        Objects.equals(this.additionalProperties, equilateralTriangle.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(shapeType, triangleType);
+    return Objects.hash(shapeType, triangleType, additionalProperties);
   }
 
 
@@ -114,6 +161,7 @@ public String toString() {
     sb.append("class EquilateralTriangle {\n");
     sb.append("    shapeType: ").append(toIndentedString(shapeType)).append("\n");
     sb.append("    triangleType: ").append(toIndentedString(triangleType)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index cfd62fbce628..4680680d6d78 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -24,6 +26,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * FileSchemaTestClass
@@ -32,7 +36,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
   private java.io.File file;
@@ -42,7 +46,6 @@ public class FileSchemaTestClass {
 
 
   public FileSchemaTestClass file(java.io.File file) {
-    
     this.file = file;
     return this;
   }
@@ -67,7 +70,6 @@ public void setFile(java.io.File file) {
 
 
   public FileSchemaTestClass files(List<java.io.File> files) {
-    
     this.files = files;
     return this;
   }
@@ -99,6 +101,9 @@ public void setFiles(List<java.io.File> files) {
   }
 
 
+  /**
+   * Return true if this FileSchemaTestClass object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Foo.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Foo.java
index e531ce87dbf2..5bf7d18a1f64 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Foo.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Foo
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   Foo.JSON_PROPERTY_BAR
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Foo {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar = "bar";
 
 
   public Foo bar(String bar) {
-    
     this.bar = bar;
     return this;
   }
@@ -60,6 +63,9 @@ public void setBar(String bar) {
   }
 
 
+  /**
+   * Return true if this Foo object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
index a0570d0445e5..4c9736ee758e 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -27,6 +29,8 @@
 import java.time.OffsetDateTime;
 import java.util.UUID;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * FormatTest
@@ -48,7 +52,7 @@
   FormatTest.JSON_PROPERTY_PATTERN_WITH_DIGITS,
   FormatTest.JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
@@ -97,7 +101,6 @@ public class FormatTest {
 
 
   public FormatTest integer(Integer integer) {
-    
     this.integer = integer;
     return this;
   }
@@ -124,7 +127,6 @@ public void setInteger(Integer integer) {
 
 
   public FormatTest int32(Integer int32) {
-    
     this.int32 = int32;
     return this;
   }
@@ -151,7 +153,6 @@ public void setInt32(Integer int32) {
 
 
   public FormatTest int64(Long int64) {
-    
     this.int64 = int64;
     return this;
   }
@@ -176,7 +177,6 @@ public void setInt64(Long int64) {
 
 
   public FormatTest number(BigDecimal number) {
-    
     this.number = number;
     return this;
   }
@@ -202,7 +202,6 @@ public void setNumber(BigDecimal number) {
 
 
   public FormatTest _float(Float _float) {
-    
     this._float = _float;
     return this;
   }
@@ -229,7 +228,6 @@ public void setFloat(Float _float) {
 
 
   public FormatTest _double(Double _double) {
-    
     this._double = _double;
     return this;
   }
@@ -256,7 +254,6 @@ public void setDouble(Double _double) {
 
 
   public FormatTest string(String string) {
-    
     this.string = string;
     return this;
   }
@@ -281,7 +278,6 @@ public void setString(String string) {
 
 
   public FormatTest _byte(byte[] _byte) {
-    
     this._byte = _byte;
     return this;
   }
@@ -305,7 +301,6 @@ public void setByte(byte[] _byte) {
 
 
   public FormatTest binary(File binary) {
-    
     this.binary = binary;
     return this;
   }
@@ -330,7 +325,6 @@ public void setBinary(File binary) {
 
 
   public FormatTest date(LocalDate date) {
-    
     this.date = date;
     return this;
   }
@@ -354,7 +348,6 @@ public void setDate(LocalDate date) {
 
 
   public FormatTest dateTime(OffsetDateTime dateTime) {
-    
     this.dateTime = dateTime;
     return this;
   }
@@ -379,7 +372,6 @@ public void setDateTime(OffsetDateTime dateTime) {
 
 
   public FormatTest uuid(UUID uuid) {
-    
     this.uuid = uuid;
     return this;
   }
@@ -404,7 +396,6 @@ public void setUuid(UUID uuid) {
 
 
   public FormatTest password(String password) {
-    
     this.password = password;
     return this;
   }
@@ -428,7 +419,6 @@ public void setPassword(String password) {
 
 
   public FormatTest patternWithDigits(String patternWithDigits) {
-    
     this.patternWithDigits = patternWithDigits;
     return this;
   }
@@ -453,7 +443,6 @@ public void setPatternWithDigits(String patternWithDigits) {
 
 
   public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelimiter) {
-    
     this.patternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter;
     return this;
   }
@@ -477,6 +466,9 @@ public void setPatternWithDigitsAndDelimiter(String patternWithDigitsAndDelimite
   }
 
 
+  /**
+   * Return true if this format_test object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java
index a9eeee525b6e..913931949a44 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,9 @@
 import org.openapitools.client.model.Apple;
 import org.openapitools.client.model.Banana;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
+import com.fasterxml.jackson.core.type.TypeReference;
 
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
@@ -32,21 +37,44 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.HashSet;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.openapitools.client.JSON;
 
-
-@JsonDeserialize(using=Fruit.FruitDeserializer.class)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonDeserialize(using = Fruit.FruitDeserializer.class)
+@JsonSerialize(using = Fruit.FruitSerializer.class)
 public class Fruit extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(Fruit.class.getName());
 
+    public static class FruitSerializer extends StdSerializer<Fruit> {
+        public FruitSerializer(Class<Fruit> t) {
+            super(t);
+        }
+
+        public FruitSerializer() {
+            this(null);
+        }
+
+        @Override
+        public void serialize(Fruit value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeObject(value.getActualInstance());
+        }
+    }
+
     public static class FruitDeserializer extends StdDeserializer<Fruit> {
         public FruitDeserializer() {
             this(Fruit.class);
@@ -59,12 +87,14 @@ public FruitDeserializer(Class<?> vc) {
         @Override
         public Fruit deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             JsonNode tree = jp.readValueAsTree();
-
-            int match = 0;
             Object deserialized = null;
+            int match = 0;
             // deserialize Apple
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(Apple.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'Apple'");
             } catch (Exception e) {
@@ -75,6 +105,9 @@ public Fruit deserialize(JsonParser jp, DeserializationContext ctxt) throws IOEx
             // deserialize Banana
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(Banana.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'Banana'");
             } catch (Exception e) {
@@ -89,6 +122,14 @@ public Fruit deserialize(JsonParser jp, DeserializationContext ctxt) throws IOEx
             }
             throw new IOException(String.format("Failed deserialization for Fruit: %d classes match result, expected 1", match));
         }
+
+        /**
+         * Handle deserialization of the 'null' value.
+         */
+        @Override
+        public Fruit getNullValue(DeserializationContext ctxt) throws JsonMappingException {
+            throw new JsonMappingException(ctxt.getParser(), "Fruit cannot be null");
+        }
     }
 
     // store a list of schema names defined in oneOf
@@ -113,6 +154,7 @@ public Fruit(Banana o) {
         });
         schemas.put("Banana", new GenericType<Banana>() {
         });
+        JSON.registerDescendants(Fruit.class, Collections.unmodifiableMap(schemas));
     }
 
     @Override
@@ -120,14 +162,21 @@ public Map<String, GenericType> getSchemas() {
         return Fruit.schemas;
     }
 
+    /**
+     * Set the instance that matches the oneOf child schema, check
+     * the instance parameter is valid against the oneOf child schemas.
+     *
+     * It could be an instance of the 'oneOf' schemas.
+     * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
+     */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof Apple) {
+        if (JSON.isInstanceOf(Apple.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof Banana) {
+        if (JSON.isInstanceOf(Banana.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java
index 2a46202a7ed3..183f0035f9e0 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,9 @@
 import org.openapitools.client.model.AppleReq;
 import org.openapitools.client.model.BananaReq;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
+import com.fasterxml.jackson.core.type.TypeReference;
 
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
@@ -32,21 +37,44 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.HashSet;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.openapitools.client.JSON;
 
-
-@JsonDeserialize(using=FruitReq.FruitReqDeserializer.class)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonDeserialize(using = FruitReq.FruitReqDeserializer.class)
+@JsonSerialize(using = FruitReq.FruitReqSerializer.class)
 public class FruitReq extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(FruitReq.class.getName());
 
+    public static class FruitReqSerializer extends StdSerializer<FruitReq> {
+        public FruitReqSerializer(Class<FruitReq> t) {
+            super(t);
+        }
+
+        public FruitReqSerializer() {
+            this(null);
+        }
+
+        @Override
+        public void serialize(FruitReq value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeObject(value.getActualInstance());
+        }
+    }
+
     public static class FruitReqDeserializer extends StdDeserializer<FruitReq> {
         public FruitReqDeserializer() {
             this(FruitReq.class);
@@ -59,12 +87,14 @@ public FruitReqDeserializer(Class<?> vc) {
         @Override
         public FruitReq deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             JsonNode tree = jp.readValueAsTree();
-
-            int match = 0;
             Object deserialized = null;
+            int match = 0;
             // deserialize AppleReq
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(AppleReq.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'AppleReq'");
             } catch (Exception e) {
@@ -75,6 +105,9 @@ public FruitReq deserialize(JsonParser jp, DeserializationContext ctxt) throws I
             // deserialize BananaReq
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(BananaReq.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'BananaReq'");
             } catch (Exception e) {
@@ -89,6 +122,14 @@ public FruitReq deserialize(JsonParser jp, DeserializationContext ctxt) throws I
             }
             throw new IOException(String.format("Failed deserialization for FruitReq: %d classes match result, expected 1", match));
         }
+
+        /**
+         * Handle deserialization of the 'null' value.
+         */
+        @Override
+        public FruitReq getNullValue(DeserializationContext ctxt) throws JsonMappingException {
+            return null;
+        }
     }
 
     // store a list of schema names defined in oneOf
@@ -113,6 +154,7 @@ public FruitReq(BananaReq o) {
         });
         schemas.put("BananaReq", new GenericType<BananaReq>() {
         });
+        JSON.registerDescendants(FruitReq.class, Collections.unmodifiableMap(schemas));
     }
 
     @Override
@@ -120,14 +162,26 @@ public Map<String, GenericType> getSchemas() {
         return FruitReq.schemas;
     }
 
+    /**
+     * Set the instance that matches the oneOf child schema, check
+     * the instance parameter is valid against the oneOf child schemas.
+     *
+     * It could be an instance of the 'oneOf' schemas.
+     * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
+     */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof AppleReq) {
+        if (instance == null) {
+           super.setActualInstance(instance);
+           return;
+        }
+
+        if (JSON.isInstanceOf(AppleReq.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof BananaReq) {
+        if (JSON.isInstanceOf(BananaReq.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java
index 6dd57e7c3a55..dfb38363a244 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import org.openapitools.client.model.Apple;
 import org.openapitools.client.model.Banana;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
@@ -32,21 +36,44 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.HashSet;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.openapitools.client.JSON;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonDeserialize(using=GmFruit.GmFruitDeserializer.class)
+@JsonSerialize(using = GmFruit.GmFruitSerializer.class)
 public class GmFruit extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(GmFruit.class.getName());
 
+    public static class GmFruitSerializer extends StdSerializer<GmFruit> {
+        public GmFruitSerializer(Class<GmFruit> t) {
+            super(t);
+        }
+
+        public GmFruitSerializer() {
+            this(null);
+        }
+
+        @Override
+        public void serialize(GmFruit value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeObject(value.getActualInstance());
+        }
+    }
+
     public static class GmFruitDeserializer extends StdDeserializer<GmFruit> {
         public GmFruitDeserializer() {
             this(GmFruit.class);
@@ -85,6 +112,14 @@ public GmFruit deserialize(JsonParser jp, DeserializationContext ctxt) throws IO
 
             throw new IOException(String.format("Failed deserialization for GmFruit: no match found"));
         }
+
+        /**
+         * Handle deserialization of the 'null' value.
+         */
+        @Override
+        public GmFruit getNullValue(DeserializationContext ctxt) throws JsonMappingException {
+            throw new JsonMappingException(ctxt.getParser(), "GmFruit cannot be null");
+        }
     }
 
     // store a list of schema names defined in anyOf
@@ -109,6 +144,7 @@ public GmFruit(Banana o) {
         });
         schemas.put("Banana", new GenericType<Banana>() {
         });
+        JSON.registerDescendants(GmFruit.class, Collections.unmodifiableMap(schemas));
     }
 
     @Override
@@ -118,12 +154,12 @@ public Map<String, GenericType> getSchemas() {
 
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof Apple) {
+        if (JSON.isInstanceOf(Apple.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof Banana) {
+        if (JSON.isInstanceOf(Banana.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
index 18f7c9f55be0..ded3b825b138 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +28,8 @@
 import org.openapitools.client.model.ChildCat;
 import org.openapitools.client.model.ParentPet;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * GrandparentAnimal
@@ -33,7 +37,7 @@
 @JsonPropertyOrder({
   GrandparentAnimal.JSON_PROPERTY_PET_TYPE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "pet_type", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = ChildCat.class, name = "ChildCat"),
@@ -46,7 +50,6 @@ public class GrandparentAnimal {
 
 
   public GrandparentAnimal petType(String petType) {
-    
     this.petType = petType;
     return this;
   }
@@ -69,6 +72,9 @@ public void setPetType(String petType) {
   }
 
 
+  /**
+   * Return true if this GrandparentAnimal object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -107,5 +113,13 @@ private String toIndentedString(java.lang.Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 
+static {
+  // Initialize and register the discriminator mappings.
+  Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+  mappings.put("ChildCat", ChildCat.class);
+  mappings.put("ParentPet", ParentPet.class);
+  mappings.put("GrandparentAnimal", GrandparentAnimal.class);
+  JSON.registerDiscriminator(GrandparentAnimal.class, "pet_type", mappings);
+}
 }
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 0a3f0d464360..b802d5acf615 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * HasOnlyReadOnly
@@ -30,7 +34,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
@@ -71,6 +75,9 @@ public String getFoo() {
 
 
 
+  /**
+   * Return true if this hasOnlyReadOnly object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index efb77061df17..274da7a611a8 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.util.NoSuchElementException;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
@@ -33,7 +37,7 @@
 @JsonPropertyOrder({
   HealthCheckResult.JSON_PROPERTY_NULLABLE_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HealthCheckResult {
   public static final String JSON_PROPERTY_NULLABLE_MESSAGE = "NullableMessage";
   private JsonNullable<String> nullableMessage = JsonNullable.<String>undefined();
@@ -41,7 +45,6 @@ public class HealthCheckResult {
 
   public HealthCheckResult nullableMessage(String nullableMessage) {
     this.nullableMessage = JsonNullable.<String>of(nullableMessage);
-    
     return this;
   }
 
@@ -74,6 +77,9 @@ public void setNullableMessage(String nullableMessage) {
   }
 
 
+  /**
+   * Return true if this HealthCheckResult object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject.java
index bb0804c5240e..d654560f8d94 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * InlineObject
@@ -30,7 +34,7 @@
   InlineObject.JSON_PROPERTY_NAME,
   InlineObject.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class InlineObject {
   public static final String JSON_PROPERTY_NAME = "name";
   private String name;
@@ -40,7 +44,6 @@ public class InlineObject {
 
 
   public InlineObject name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -65,7 +68,6 @@ public void setName(String name) {
 
 
   public InlineObject status(String status) {
-    
     this.status = status;
     return this;
   }
@@ -89,6 +91,9 @@ public void setStatus(String status) {
   }
 
 
+  /**
+   * Return true if this inline_object object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject1.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject1.java
index 99b98f4c848e..ca065161d459 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject1.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject1.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -23,6 +25,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.io.File;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * InlineObject1
@@ -31,7 +35,7 @@
   InlineObject1.JSON_PROPERTY_ADDITIONAL_METADATA,
   InlineObject1.JSON_PROPERTY_FILE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class InlineObject1 {
   public static final String JSON_PROPERTY_ADDITIONAL_METADATA = "additionalMetadata";
   private String additionalMetadata;
@@ -41,7 +45,6 @@ public class InlineObject1 {
 
 
   public InlineObject1 additionalMetadata(String additionalMetadata) {
-    
     this.additionalMetadata = additionalMetadata;
     return this;
   }
@@ -66,7 +69,6 @@ public void setAdditionalMetadata(String additionalMetadata) {
 
 
   public InlineObject1 file(File file) {
-    
     this.file = file;
     return this;
   }
@@ -90,6 +92,9 @@ public void setFile(File file) {
   }
 
 
+  /**
+   * Return true if this inline_object_1 object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject2.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject2.java
index 468545bb3427..eb33026ba175 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject2.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject2.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -24,6 +26,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * InlineObject2
@@ -32,7 +36,7 @@
   InlineObject2.JSON_PROPERTY_ENUM_FORM_STRING_ARRAY,
   InlineObject2.JSON_PROPERTY_ENUM_FORM_STRING
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class InlineObject2 {
   /**
    * Gets or Sets enumFormStringArray
@@ -114,7 +118,6 @@ public static EnumFormStringEnum fromValue(String value) {
 
 
   public InlineObject2 enumFormStringArray(List<EnumFormStringArrayEnum> enumFormStringArray) {
-    
     this.enumFormStringArray = enumFormStringArray;
     return this;
   }
@@ -147,7 +150,6 @@ public void setEnumFormStringArray(List<EnumFormStringArrayEnum> enumFormStringA
 
 
   public InlineObject2 enumFormString(EnumFormStringEnum enumFormString) {
-    
     this.enumFormString = enumFormString;
     return this;
   }
@@ -171,6 +173,9 @@ public void setEnumFormString(EnumFormStringEnum enumFormString) {
   }
 
 
+  /**
+   * Return true if this inline_object_2 object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject3.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject3.java
index deac7f8d41f7..384e2ffeb7bb 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject3.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject3.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +28,8 @@
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * InlineObject3
@@ -46,7 +50,7 @@
   InlineObject3.JSON_PROPERTY_PASSWORD,
   InlineObject3.JSON_PROPERTY_CALLBACK
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class InlineObject3 {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
@@ -92,7 +96,6 @@ public class InlineObject3 {
 
 
   public InlineObject3 integer(Integer integer) {
-    
     this.integer = integer;
     return this;
   }
@@ -119,7 +122,6 @@ public void setInteger(Integer integer) {
 
 
   public InlineObject3 int32(Integer int32) {
-    
     this.int32 = int32;
     return this;
   }
@@ -146,7 +148,6 @@ public void setInt32(Integer int32) {
 
 
   public InlineObject3 int64(Long int64) {
-    
     this.int64 = int64;
     return this;
   }
@@ -171,7 +172,6 @@ public void setInt64(Long int64) {
 
 
   public InlineObject3 number(BigDecimal number) {
-    
     this.number = number;
     return this;
   }
@@ -197,7 +197,6 @@ public void setNumber(BigDecimal number) {
 
 
   public InlineObject3 _float(Float _float) {
-    
     this._float = _float;
     return this;
   }
@@ -223,7 +222,6 @@ public void setFloat(Float _float) {
 
 
   public InlineObject3 _double(Double _double) {
-    
     this._double = _double;
     return this;
   }
@@ -249,7 +247,6 @@ public void setDouble(Double _double) {
 
 
   public InlineObject3 string(String string) {
-    
     this.string = string;
     return this;
   }
@@ -274,7 +271,6 @@ public void setString(String string) {
 
 
   public InlineObject3 patternWithoutDelimiter(String patternWithoutDelimiter) {
-    
     this.patternWithoutDelimiter = patternWithoutDelimiter;
     return this;
   }
@@ -298,7 +294,6 @@ public void setPatternWithoutDelimiter(String patternWithoutDelimiter) {
 
 
   public InlineObject3 _byte(byte[] _byte) {
-    
     this._byte = _byte;
     return this;
   }
@@ -322,7 +317,6 @@ public void setByte(byte[] _byte) {
 
 
   public InlineObject3 binary(File binary) {
-    
     this.binary = binary;
     return this;
   }
@@ -347,7 +341,6 @@ public void setBinary(File binary) {
 
 
   public InlineObject3 date(LocalDate date) {
-    
     this.date = date;
     return this;
   }
@@ -372,7 +365,6 @@ public void setDate(LocalDate date) {
 
 
   public InlineObject3 dateTime(OffsetDateTime dateTime) {
-    
     this.dateTime = dateTime;
     return this;
   }
@@ -397,7 +389,6 @@ public void setDateTime(OffsetDateTime dateTime) {
 
 
   public InlineObject3 password(String password) {
-    
     this.password = password;
     return this;
   }
@@ -422,7 +413,6 @@ public void setPassword(String password) {
 
 
   public InlineObject3 callback(String callback) {
-    
     this.callback = callback;
     return this;
   }
@@ -446,6 +436,9 @@ public void setCallback(String callback) {
   }
 
 
+  /**
+   * Return true if this inline_object_3 object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject4.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject4.java
index 953ca1d5b2bc..a48edb4f787e 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject4.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject4.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * InlineObject4
@@ -30,7 +34,7 @@
   InlineObject4.JSON_PROPERTY_PARAM,
   InlineObject4.JSON_PROPERTY_PARAM2
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class InlineObject4 {
   public static final String JSON_PROPERTY_PARAM = "param";
   private String param;
@@ -40,7 +44,6 @@ public class InlineObject4 {
 
 
   public InlineObject4 param(String param) {
-    
     this.param = param;
     return this;
   }
@@ -64,7 +67,6 @@ public void setParam(String param) {
 
 
   public InlineObject4 param2(String param2) {
-    
     this.param2 = param2;
     return this;
   }
@@ -87,6 +89,9 @@ public void setParam2(String param2) {
   }
 
 
+  /**
+   * Return true if this inline_object_4 object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject5.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject5.java
index 1b079adfcf91..8e4286c430fa 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject5.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject5.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -23,6 +25,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.io.File;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * InlineObject5
@@ -31,7 +35,7 @@
   InlineObject5.JSON_PROPERTY_ADDITIONAL_METADATA,
   InlineObject5.JSON_PROPERTY_REQUIRED_FILE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class InlineObject5 {
   public static final String JSON_PROPERTY_ADDITIONAL_METADATA = "additionalMetadata";
   private String additionalMetadata;
@@ -41,7 +45,6 @@ public class InlineObject5 {
 
 
   public InlineObject5 additionalMetadata(String additionalMetadata) {
-    
     this.additionalMetadata = additionalMetadata;
     return this;
   }
@@ -66,7 +69,6 @@ public void setAdditionalMetadata(String additionalMetadata) {
 
 
   public InlineObject5 requiredFile(File requiredFile) {
-    
     this.requiredFile = requiredFile;
     return this;
   }
@@ -89,6 +91,9 @@ public void setRequiredFile(File requiredFile) {
   }
 
 
+  /**
+   * Return true if this inline_object_5 object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineResponseDefault.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineResponseDefault.java
index 6b90bf2a18fa..d3ad145c119a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineResponseDefault.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineResponseDefault.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -23,6 +25,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Foo;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * InlineResponseDefault
@@ -30,14 +34,13 @@
 @JsonPropertyOrder({
   InlineResponseDefault.JSON_PROPERTY_STRING
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class InlineResponseDefault {
   public static final String JSON_PROPERTY_STRING = "string";
   private Foo string;
 
 
   public InlineResponseDefault string(Foo string) {
-    
     this.string = string;
     return this;
   }
@@ -61,6 +64,9 @@ public void setString(Foo string) {
   }
 
 
+  /**
+   * Return true if this inline_response_default object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
index 6282304a20bd..82de9e88f44c 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -24,6 +26,8 @@
 import org.openapitools.client.model.ShapeInterface;
 import org.openapitools.client.model.TriangleInterface;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * IsoscelesTriangle
@@ -32,7 +36,7 @@
   IsoscelesTriangle.JSON_PROPERTY_SHAPE_TYPE,
   IsoscelesTriangle.JSON_PROPERTY_TRIANGLE_TYPE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class IsoscelesTriangle {
   public static final String JSON_PROPERTY_SHAPE_TYPE = "shapeType";
   private String shapeType;
@@ -42,7 +46,6 @@ public class IsoscelesTriangle {
 
 
   public IsoscelesTriangle shapeType(String shapeType) {
-    
     this.shapeType = shapeType;
     return this;
   }
@@ -66,7 +69,6 @@ public void setShapeType(String shapeType) {
 
 
   public IsoscelesTriangle triangleType(String triangleType) {
-    
     this.triangleType = triangleType;
     return this;
   }
@@ -89,6 +91,9 @@ public void setTriangleType(String triangleType) {
   }
 
 
+  /**
+   * Return true if this IsoscelesTriangle object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java
index dff6e3b29c0b..68016799e068 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -27,6 +33,9 @@
 import org.openapitools.client.model.Whale;
 import org.openapitools.client.model.Zebra;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
+import com.fasterxml.jackson.core.type.TypeReference;
 
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
@@ -34,21 +43,44 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.HashSet;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.openapitools.client.JSON;
 
-
-@JsonDeserialize(using=Mammal.MammalDeserializer.class)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonDeserialize(using = Mammal.MammalDeserializer.class)
+@JsonSerialize(using = Mammal.MammalSerializer.class)
 public class Mammal extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(Mammal.class.getName());
 
+    public static class MammalSerializer extends StdSerializer<Mammal> {
+        public MammalSerializer(Class<Mammal> t) {
+            super(t);
+        }
+
+        public MammalSerializer() {
+            this(null);
+        }
+
+        @Override
+        public void serialize(Mammal value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeObject(value.getActualInstance());
+        }
+    }
+
     public static class MammalDeserializer extends StdDeserializer<Mammal> {
         public MammalDeserializer() {
             this(Mammal.class);
@@ -61,12 +93,34 @@ public MammalDeserializer(Class<?> vc) {
         @Override
         public Mammal deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             JsonNode tree = jp.readValueAsTree();
+            Object deserialized = null;
+            Mammal newMammal = new Mammal();
+            Map<String,Object> result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference<Map<String, Object>>() {});
+            String discriminatorValue = (String)result2.get("className");
+            switch (discriminatorValue) {
+                case "Pig":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(Pig.class);
+                    newMammal.setActualInstance(deserialized);
+                    return newMammal;
+                case "whale":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(Whale.class);
+                    newMammal.setActualInstance(deserialized);
+                    return newMammal;
+                case "zebra":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(Zebra.class);
+                    newMammal.setActualInstance(deserialized);
+                    return newMammal;
+                default:
+                    log.log(Level.WARNING, String.format("Failed to lookup discriminator value `%s` for Mammal. Possible values: Pig whale zebra", discriminatorValue));
+            }
 
             int match = 0;
-            Object deserialized = null;
             // deserialize Pig
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(Pig.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'Pig'");
             } catch (Exception e) {
@@ -77,6 +131,9 @@ public Mammal deserialize(JsonParser jp, DeserializationContext ctxt) throws IOE
             // deserialize Whale
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(Whale.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'Whale'");
             } catch (Exception e) {
@@ -87,6 +144,9 @@ public Mammal deserialize(JsonParser jp, DeserializationContext ctxt) throws IOE
             // deserialize Zebra
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(Zebra.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'Zebra'");
             } catch (Exception e) {
@@ -101,6 +161,14 @@ public Mammal deserialize(JsonParser jp, DeserializationContext ctxt) throws IOE
             }
             throw new IOException(String.format("Failed deserialization for Mammal: %d classes match result, expected 1", match));
         }
+
+        /**
+         * Handle deserialization of the 'null' value.
+         */
+        @Override
+        public Mammal getNullValue(DeserializationContext ctxt) throws JsonMappingException {
+            throw new JsonMappingException(ctxt.getParser(), "Mammal cannot be null");
+        }
     }
 
     // store a list of schema names defined in oneOf
@@ -109,7 +177,56 @@ public Mammal deserialize(JsonParser jp, DeserializationContext ctxt) throws IOE
     public Mammal() {
         super("oneOf", Boolean.FALSE);
     }
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public Mammal putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
 
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+    /**
+     * Return true if this mammal object is equal to o.
+     */
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o) && Objects.equals(this.additionalProperties, ((Mammal)o).additionalProperties);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getActualInstance(), isNullable(), getSchemaType(), additionalProperties);
+    }
     public Mammal(Pig o) {
         super("oneOf", Boolean.FALSE);
         setActualInstance(o);
@@ -132,6 +249,14 @@ public Mammal(Zebra o) {
         });
         schemas.put("Zebra", new GenericType<Zebra>() {
         });
+        JSON.registerDescendants(Mammal.class, Collections.unmodifiableMap(schemas));
+        // Initialize and register the discriminator mappings.
+        Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+        mappings.put("Pig", Pig.class);
+        mappings.put("whale", Whale.class);
+        mappings.put("zebra", Zebra.class);
+        mappings.put("mammal", Mammal.class);
+        JSON.registerDiscriminator(Mammal.class, "className", mappings);
     }
 
     @Override
@@ -139,19 +264,26 @@ public Map<String, GenericType> getSchemas() {
         return Mammal.schemas;
     }
 
+    /**
+     * Set the instance that matches the oneOf child schema, check
+     * the instance parameter is valid against the oneOf child schemas.
+     *
+     * It could be an instance of the 'oneOf' schemas.
+     * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
+     */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof Pig) {
+        if (JSON.isInstanceOf(Pig.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof Whale) {
+        if (JSON.isInstanceOf(Whale.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof Zebra) {
+        if (JSON.isInstanceOf(Zebra.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
index 3e72350aa8b1..d2f49b5bb632 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import java.util.List;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * MapTest
@@ -35,7 +39,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   private Map<String, Map<String, String>> mapMapOfString = null;
@@ -86,7 +90,6 @@ public static InnerEnum fromValue(String value) {
 
 
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
-    
     this.mapMapOfString = mapMapOfString;
     return this;
   }
@@ -119,7 +122,6 @@ public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
 
 
   public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
-    
     this.mapOfEnumString = mapOfEnumString;
     return this;
   }
@@ -152,7 +154,6 @@ public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
 
 
   public MapTest directMap(Map<String, Boolean> directMap) {
-    
     this.directMap = directMap;
     return this;
   }
@@ -185,7 +186,6 @@ public void setDirectMap(Map<String, Boolean> directMap) {
 
 
   public MapTest indirectMap(Map<String, Boolean> indirectMap) {
-    
     this.indirectMap = indirectMap;
     return this;
   }
@@ -217,6 +217,9 @@ public void setIndirectMap(Map<String, Boolean> indirectMap) {
   }
 
 
+  /**
+   * Return true if this MapTest object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 07d314691a97..3d3037cfb68d 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -28,6 +30,8 @@
 import java.util.UUID;
 import org.openapitools.client.model.Animal;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
@@ -37,7 +41,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
@@ -50,7 +54,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
 
 
   public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    
     this.uuid = uuid;
     return this;
   }
@@ -75,7 +78,6 @@ public void setUuid(UUID uuid) {
 
 
   public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    
     this.dateTime = dateTime;
     return this;
   }
@@ -100,7 +102,6 @@ public void setDateTime(OffsetDateTime dateTime) {
 
 
   public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    
     this.map = map;
     return this;
   }
@@ -132,6 +133,9 @@ public void setMap(Map<String, Animal> map) {
   }
 
 
+  /**
+   * Return true if this MixedPropertiesAndAdditionalPropertiesClass object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
index dd99468a0059..7775d5835ca3 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Model for testing model name starting with number
@@ -31,7 +35,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
@@ -41,7 +45,6 @@ public class Model200Response {
 
 
   public Model200Response name(Integer name) {
-    
     this.name = name;
     return this;
   }
@@ -66,7 +69,6 @@ public void setName(Integer name) {
 
 
   public Model200Response propertyClass(String propertyClass) {
-    
     this.propertyClass = propertyClass;
     return this;
   }
@@ -90,6 +92,9 @@ public void setPropertyClass(String propertyClass) {
   }
 
 
+  /**
+   * Return true if this 200_response object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 383cafdd3a5a..da4182452b58 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ModelApiResponse
@@ -31,7 +35,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
   private Integer code;
@@ -44,7 +48,6 @@ public class ModelApiResponse {
 
 
   public ModelApiResponse code(Integer code) {
-    
     this.code = code;
     return this;
   }
@@ -69,7 +72,6 @@ public void setCode(Integer code) {
 
 
   public ModelApiResponse type(String type) {
-    
     this.type = type;
     return this;
   }
@@ -94,7 +96,6 @@ public void setType(String type) {
 
 
   public ModelApiResponse message(String message) {
-    
     this.message = message;
     return this;
   }
@@ -118,6 +119,9 @@ public void setMessage(String message) {
   }
 
 
+  /**
+   * Return true if this ApiResponse object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
index b62e13a90a0c..ba4143056b7e 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Model for testing reserved words
@@ -30,14 +34,13 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
 
 
   public ModelReturn _return(Integer _return) {
-    
     this._return = _return;
     return this;
   }
@@ -61,6 +64,9 @@ public void setReturn(Integer _return) {
   }
 
 
+  /**
+   * Return true if this Return object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
index bd625c5f66f3..0dd87332e679 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Model for testing model name same as property name
@@ -33,7 +37,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
@@ -49,7 +53,6 @@ public class Name {
 
 
   public Name name(Integer name) {
-    
     this.name = name;
     return this;
   }
@@ -89,7 +92,6 @@ public Integer getSnakeCase() {
 
 
   public Name property(String property) {
-    
     this.property = property;
     return this;
   }
@@ -129,6 +131,9 @@ public Integer get123number() {
 
 
 
+  /**
+   * Return true if this Name object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java
index 6ade4828624e..982e0d5df7e7 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -32,6 +38,8 @@
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.util.NoSuchElementException;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * NullableClass
@@ -50,8 +58,8 @@
   NullableClass.JSON_PROPERTY_OBJECT_AND_ITEMS_NULLABLE_PROP,
   NullableClass.JSON_PROPERTY_OBJECT_ITEMS_NULLABLE
 })
-
-public class NullableClass extends HashMap<String, Object> {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class NullableClass {
   public static final String JSON_PROPERTY_INTEGER_PROP = "integer_prop";
   private JsonNullable<Integer> integerProp = JsonNullable.<Integer>undefined();
 
@@ -91,7 +99,6 @@ public class NullableClass extends HashMap<String, Object> {
 
   public NullableClass integerProp(Integer integerProp) {
     this.integerProp = JsonNullable.<Integer>of(integerProp);
-    
     return this;
   }
 
@@ -126,7 +133,6 @@ public void setIntegerProp(Integer integerProp) {
 
   public NullableClass numberProp(BigDecimal numberProp) {
     this.numberProp = JsonNullable.<BigDecimal>of(numberProp);
-    
     return this;
   }
 
@@ -161,7 +167,6 @@ public void setNumberProp(BigDecimal numberProp) {
 
   public NullableClass booleanProp(Boolean booleanProp) {
     this.booleanProp = JsonNullable.<Boolean>of(booleanProp);
-    
     return this;
   }
 
@@ -196,7 +201,6 @@ public void setBooleanProp(Boolean booleanProp) {
 
   public NullableClass stringProp(String stringProp) {
     this.stringProp = JsonNullable.<String>of(stringProp);
-    
     return this;
   }
 
@@ -231,7 +235,6 @@ public void setStringProp(String stringProp) {
 
   public NullableClass dateProp(LocalDate dateProp) {
     this.dateProp = JsonNullable.<LocalDate>of(dateProp);
-    
     return this;
   }
 
@@ -266,7 +269,6 @@ public void setDateProp(LocalDate dateProp) {
 
   public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     this.datetimeProp = JsonNullable.<OffsetDateTime>of(datetimeProp);
-    
     return this;
   }
 
@@ -301,7 +303,6 @@ public void setDatetimeProp(OffsetDateTime datetimeProp) {
 
   public NullableClass arrayNullableProp(List<Object> arrayNullableProp) {
     this.arrayNullableProp = JsonNullable.<List<Object>>of(arrayNullableProp);
-    
     return this;
   }
 
@@ -348,7 +349,6 @@ public void setArrayNullableProp(List<Object> arrayNullableProp) {
 
   public NullableClass arrayAndItemsNullableProp(List<Object> arrayAndItemsNullableProp) {
     this.arrayAndItemsNullableProp = JsonNullable.<List<Object>>of(arrayAndItemsNullableProp);
-    
     return this;
   }
 
@@ -394,7 +394,6 @@ public void setArrayAndItemsNullableProp(List<Object> arrayAndItemsNullableProp)
 
 
   public NullableClass arrayItemsNullable(List<Object> arrayItemsNullable) {
-    
     this.arrayItemsNullable = arrayItemsNullable;
     return this;
   }
@@ -428,7 +427,6 @@ public void setArrayItemsNullable(List<Object> arrayItemsNullable) {
 
   public NullableClass objectNullableProp(Map<String, Object> objectNullableProp) {
     this.objectNullableProp = JsonNullable.<Map<String, Object>>of(objectNullableProp);
-    
     return this;
   }
 
@@ -475,7 +473,6 @@ public void setObjectNullableProp(Map<String, Object> objectNullableProp) {
 
   public NullableClass objectAndItemsNullableProp(Map<String, Object> objectAndItemsNullableProp) {
     this.objectAndItemsNullableProp = JsonNullable.<Map<String, Object>>of(objectAndItemsNullableProp);
-    
     return this;
   }
 
@@ -521,7 +518,6 @@ public void setObjectAndItemsNullableProp(Map<String, Object> objectAndItemsNull
 
 
   public NullableClass objectItemsNullable(Map<String, Object> objectItemsNullable) {
-    
     this.objectItemsNullable = objectItemsNullable;
     return this;
   }
@@ -552,7 +548,47 @@ public void setObjectItemsNullable(Map<String, Object> objectItemsNullable) {
     this.objectItemsNullable = objectItemsNullable;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public NullableClass putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this NullableClass object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -573,13 +609,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.arrayItemsNullable, nullableClass.arrayItemsNullable) &&
         Objects.equals(this.objectNullableProp, nullableClass.objectNullableProp) &&
         Objects.equals(this.objectAndItemsNullableProp, nullableClass.objectAndItemsNullableProp) &&
-        Objects.equals(this.objectItemsNullable, nullableClass.objectItemsNullable) &&
-        super.equals(o);
+        Objects.equals(this.objectItemsNullable, nullableClass.objectItemsNullable)&&
+        Objects.equals(this.additionalProperties, nullableClass.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable, super.hashCode());
+    return Objects.hash(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable, additionalProperties);
   }
 
 
@@ -587,7 +623,6 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class NullableClass {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    integerProp: ").append(toIndentedString(integerProp)).append("\n");
     sb.append("    numberProp: ").append(toIndentedString(numberProp)).append("\n");
     sb.append("    booleanProp: ").append(toIndentedString(booleanProp)).append("\n");
@@ -600,6 +635,7 @@ public String toString() {
     sb.append("    objectNullableProp: ").append(toIndentedString(objectNullableProp)).append("\n");
     sb.append("    objectAndItemsNullableProp: ").append(toIndentedString(objectAndItemsNullableProp)).append("\n");
     sb.append("    objectItemsNullable: ").append(toIndentedString(objectItemsNullable)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java
index bdf4fc1dc388..e34b9618312d 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +32,9 @@
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
+import com.fasterxml.jackson.core.type.TypeReference;
 
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
@@ -33,21 +42,44 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.HashSet;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.openapitools.client.JSON;
 
-
-@JsonDeserialize(using=NullableShape.NullableShapeDeserializer.class)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonDeserialize(using = NullableShape.NullableShapeDeserializer.class)
+@JsonSerialize(using = NullableShape.NullableShapeSerializer.class)
 public class NullableShape extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(NullableShape.class.getName());
 
+    public static class NullableShapeSerializer extends StdSerializer<NullableShape> {
+        public NullableShapeSerializer(Class<NullableShape> t) {
+            super(t);
+        }
+
+        public NullableShapeSerializer() {
+            this(null);
+        }
+
+        @Override
+        public void serialize(NullableShape value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeObject(value.getActualInstance());
+        }
+    }
+
     public static class NullableShapeDeserializer extends StdDeserializer<NullableShape> {
         public NullableShapeDeserializer() {
             this(NullableShape.class);
@@ -60,12 +92,30 @@ public NullableShapeDeserializer(Class<?> vc) {
         @Override
         public NullableShape deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             JsonNode tree = jp.readValueAsTree();
+            Object deserialized = null;
+            NullableShape newNullableShape = new NullableShape();
+            Map<String,Object> result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference<Map<String, Object>>() {});
+            String discriminatorValue = (String)result2.get("shapeType");
+            switch (discriminatorValue) {
+                case "Quadrilateral":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(Quadrilateral.class);
+                    newNullableShape.setActualInstance(deserialized);
+                    return newNullableShape;
+                case "Triangle":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(Triangle.class);
+                    newNullableShape.setActualInstance(deserialized);
+                    return newNullableShape;
+                default:
+                    log.log(Level.WARNING, String.format("Failed to lookup discriminator value `%s` for NullableShape. Possible values: Quadrilateral Triangle", discriminatorValue));
+            }
 
             int match = 0;
-            Object deserialized = null;
             // deserialize Quadrilateral
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(Quadrilateral.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'Quadrilateral'");
             } catch (Exception e) {
@@ -76,6 +126,9 @@ public NullableShape deserialize(JsonParser jp, DeserializationContext ctxt) thr
             // deserialize Triangle
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(Triangle.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'Triangle'");
             } catch (Exception e) {
@@ -90,6 +143,14 @@ public NullableShape deserialize(JsonParser jp, DeserializationContext ctxt) thr
             }
             throw new IOException(String.format("Failed deserialization for NullableShape: %d classes match result, expected 1", match));
         }
+
+        /**
+         * Handle deserialization of the 'null' value.
+         */
+        @Override
+        public NullableShape getNullValue(DeserializationContext ctxt) throws JsonMappingException {
+            return null;
+        }
     }
 
     // store a list of schema names defined in oneOf
@@ -98,7 +159,56 @@ public NullableShape deserialize(JsonParser jp, DeserializationContext ctxt) thr
     public NullableShape() {
         super("oneOf", Boolean.TRUE);
     }
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public NullableShape putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+    /**
+     * Return true if this NullableShape object is equal to o.
+     */
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o) && Objects.equals(this.additionalProperties, ((NullableShape)o).additionalProperties);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getActualInstance(), isNullable(), getSchemaType(), additionalProperties);
+    }
     public NullableShape(Quadrilateral o) {
         super("oneOf", Boolean.TRUE);
         setActualInstance(o);
@@ -114,6 +224,13 @@ public NullableShape(Triangle o) {
         });
         schemas.put("Triangle", new GenericType<Triangle>() {
         });
+        JSON.registerDescendants(NullableShape.class, Collections.unmodifiableMap(schemas));
+        // Initialize and register the discriminator mappings.
+        Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+        mappings.put("Quadrilateral", Quadrilateral.class);
+        mappings.put("Triangle", Triangle.class);
+        mappings.put("NullableShape", NullableShape.class);
+        JSON.registerDiscriminator(NullableShape.class, "shapeType", mappings);
     }
 
     @Override
@@ -121,14 +238,26 @@ public Map<String, GenericType> getSchemas() {
         return NullableShape.schemas;
     }
 
+    /**
+     * Set the instance that matches the oneOf child schema, check
+     * the instance parameter is valid against the oneOf child schemas.
+     *
+     * It could be an instance of the 'oneOf' schemas.
+     * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
+     */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof Quadrilateral) {
+        if (instance == null) {
+           super.setActualInstance(instance);
+           return;
+        }
+
+        if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof Triangle) {
+        if (JSON.isInstanceOf(Triangle.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5ca72a169fe8..751777ec56f4 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -23,6 +25,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * NumberOnly
@@ -30,14 +34,13 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
 
 
   public NumberOnly justNumber(BigDecimal justNumber) {
-    
     this.justNumber = justNumber;
     return this;
   }
@@ -61,6 +64,9 @@ public void setJustNumber(BigDecimal justNumber) {
   }
 
 
+  /**
+   * Return true if this NumberOnly object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
index 1d1f87726a54..46263dec990d 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -23,6 +25,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Order
@@ -35,7 +39,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
@@ -94,7 +98,6 @@ public static StatusEnum fromValue(String value) {
 
 
   public Order id(Long id) {
-    
     this.id = id;
     return this;
   }
@@ -119,7 +122,6 @@ public void setId(Long id) {
 
 
   public Order petId(Long petId) {
-    
     this.petId = petId;
     return this;
   }
@@ -144,7 +146,6 @@ public void setPetId(Long petId) {
 
 
   public Order quantity(Integer quantity) {
-    
     this.quantity = quantity;
     return this;
   }
@@ -169,7 +170,6 @@ public void setQuantity(Integer quantity) {
 
 
   public Order shipDate(OffsetDateTime shipDate) {
-    
     this.shipDate = shipDate;
     return this;
   }
@@ -194,7 +194,6 @@ public void setShipDate(OffsetDateTime shipDate) {
 
 
   public Order status(StatusEnum status) {
-    
     this.status = status;
     return this;
   }
@@ -219,7 +218,6 @@ public void setStatus(StatusEnum status) {
 
 
   public Order complete(Boolean complete) {
-    
     this.complete = complete;
     return this;
   }
@@ -243,6 +241,9 @@ public void setComplete(Boolean complete) {
   }
 
 
+  /**
+   * Return true if this Order object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
index d4d9ac6ba110..93630fda594e 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -23,6 +25,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * OuterComposite
@@ -32,7 +36,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   private BigDecimal myNumber;
@@ -45,7 +49,6 @@ public class OuterComposite {
 
 
   public OuterComposite myNumber(BigDecimal myNumber) {
-    
     this.myNumber = myNumber;
     return this;
   }
@@ -70,7 +73,6 @@ public void setMyNumber(BigDecimal myNumber) {
 
 
   public OuterComposite myString(String myString) {
-    
     this.myString = myString;
     return this;
   }
@@ -95,7 +97,6 @@ public void setMyString(String myString) {
 
 
   public OuterComposite myBoolean(Boolean myBoolean) {
-    
     this.myBoolean = myBoolean;
     return this;
   }
@@ -119,6 +120,9 @@ public void setMyBoolean(Boolean myBoolean) {
   }
 
 
+  /**
+   * Return true if this OuterComposite object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java
index d0c0bc3c9d20..a2c3043d7629 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java
@@ -15,7 +15,11 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java
index 7f6c2c73aa24..a7437d939b36 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java
@@ -15,7 +15,11 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumInteger.java
index c747a2e6daef..d937d68bc1f7 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumInteger.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumInteger.java
@@ -15,7 +15,11 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java
index 4f5fcd1cd95f..fa04cfa387bd 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java
@@ -15,7 +15,11 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java
index 5b3dc1ffcaa0..f7df618a065a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,20 +32,62 @@
 import org.openapitools.client.model.ChildCat;
 import org.openapitools.client.model.GrandparentAnimal;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ParentPet
  */
 @JsonPropertyOrder({
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "pet_type", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = ChildCat.class, name = "ChildCat"),
 })
 
 public class ParentPet extends GrandparentAnimal {
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public ParentPet putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this ParentPet object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -53,7 +101,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode());
+    return Objects.hash(super.hashCode(), additionalProperties);
   }
 
 
@@ -62,6 +110,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ParentPet {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -77,5 +126,12 @@ private String toIndentedString(java.lang.Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 
+static {
+  // Initialize and register the discriminator mappings.
+  Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+  mappings.put("ChildCat", ChildCat.class);
+  mappings.put("ParentPet", ParentPet.class);
+  JSON.registerDiscriminator(ParentPet.class, "pet_type", mappings);
+}
 }
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
index 2df466732f74..8e78e031ea37 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +28,8 @@
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Pet
@@ -38,7 +42,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
@@ -97,7 +101,6 @@ public static StatusEnum fromValue(String value) {
 
 
   public Pet id(Long id) {
-    
     this.id = id;
     return this;
   }
@@ -122,7 +125,6 @@ public void setId(Long id) {
 
 
   public Pet category(Category category) {
-    
     this.category = category;
     return this;
   }
@@ -147,7 +149,6 @@ public void setCategory(Category category) {
 
 
   public Pet name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -171,7 +172,6 @@ public void setName(String name) {
 
 
   public Pet photoUrls(List<String> photoUrls) {
-    
     this.photoUrls = photoUrls;
     return this;
   }
@@ -200,7 +200,6 @@ public void setPhotoUrls(List<String> photoUrls) {
 
 
   public Pet tags(List<Tag> tags) {
-    
     this.tags = tags;
     return this;
   }
@@ -233,7 +232,6 @@ public void setTags(List<Tag> tags) {
 
 
   public Pet status(StatusEnum status) {
-    
     this.status = status;
     return this;
   }
@@ -257,6 +255,9 @@ public void setStatus(StatusEnum status) {
   }
 
 
+  /**
+   * Return true if this Pet object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java
index edf17c3ce78d..2e22a0cfa6af 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +32,9 @@
 import org.openapitools.client.model.BasquePig;
 import org.openapitools.client.model.DanishPig;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
+import com.fasterxml.jackson.core.type.TypeReference;
 
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
@@ -33,21 +42,44 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.HashSet;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.openapitools.client.JSON;
 
-
-@JsonDeserialize(using=Pig.PigDeserializer.class)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonDeserialize(using = Pig.PigDeserializer.class)
+@JsonSerialize(using = Pig.PigSerializer.class)
 public class Pig extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(Pig.class.getName());
 
+    public static class PigSerializer extends StdSerializer<Pig> {
+        public PigSerializer(Class<Pig> t) {
+            super(t);
+        }
+
+        public PigSerializer() {
+            this(null);
+        }
+
+        @Override
+        public void serialize(Pig value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeObject(value.getActualInstance());
+        }
+    }
+
     public static class PigDeserializer extends StdDeserializer<Pig> {
         public PigDeserializer() {
             this(Pig.class);
@@ -60,12 +92,30 @@ public PigDeserializer(Class<?> vc) {
         @Override
         public Pig deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             JsonNode tree = jp.readValueAsTree();
+            Object deserialized = null;
+            Pig newPig = new Pig();
+            Map<String,Object> result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference<Map<String, Object>>() {});
+            String discriminatorValue = (String)result2.get("className");
+            switch (discriminatorValue) {
+                case "BasquePig":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(BasquePig.class);
+                    newPig.setActualInstance(deserialized);
+                    return newPig;
+                case "DanishPig":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(DanishPig.class);
+                    newPig.setActualInstance(deserialized);
+                    return newPig;
+                default:
+                    log.log(Level.WARNING, String.format("Failed to lookup discriminator value `%s` for Pig. Possible values: BasquePig DanishPig", discriminatorValue));
+            }
 
             int match = 0;
-            Object deserialized = null;
             // deserialize BasquePig
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(BasquePig.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'BasquePig'");
             } catch (Exception e) {
@@ -76,6 +126,9 @@ public Pig deserialize(JsonParser jp, DeserializationContext ctxt) throws IOExce
             // deserialize DanishPig
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(DanishPig.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'DanishPig'");
             } catch (Exception e) {
@@ -90,6 +143,14 @@ public Pig deserialize(JsonParser jp, DeserializationContext ctxt) throws IOExce
             }
             throw new IOException(String.format("Failed deserialization for Pig: %d classes match result, expected 1", match));
         }
+
+        /**
+         * Handle deserialization of the 'null' value.
+         */
+        @Override
+        public Pig getNullValue(DeserializationContext ctxt) throws JsonMappingException {
+            throw new JsonMappingException(ctxt.getParser(), "Pig cannot be null");
+        }
     }
 
     // store a list of schema names defined in oneOf
@@ -98,7 +159,56 @@ public Pig deserialize(JsonParser jp, DeserializationContext ctxt) throws IOExce
     public Pig() {
         super("oneOf", Boolean.FALSE);
     }
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public Pig putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
 
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+    /**
+     * Return true if this Pig object is equal to o.
+     */
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o) && Objects.equals(this.additionalProperties, ((Pig)o).additionalProperties);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getActualInstance(), isNullable(), getSchemaType(), additionalProperties);
+    }
     public Pig(BasquePig o) {
         super("oneOf", Boolean.FALSE);
         setActualInstance(o);
@@ -114,6 +224,13 @@ public Pig(DanishPig o) {
         });
         schemas.put("DanishPig", new GenericType<DanishPig>() {
         });
+        JSON.registerDescendants(Pig.class, Collections.unmodifiableMap(schemas));
+        // Initialize and register the discriminator mappings.
+        Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+        mappings.put("BasquePig", BasquePig.class);
+        mappings.put("DanishPig", DanishPig.class);
+        mappings.put("Pig", Pig.class);
+        JSON.registerDiscriminator(Pig.class, "className", mappings);
     }
 
     @Override
@@ -121,14 +238,21 @@ public Map<String, GenericType> getSchemas() {
         return Pig.schemas;
     }
 
+    /**
+     * Set the instance that matches the oneOf child schema, check
+     * the instance parameter is valid against the oneOf child schemas.
+     *
+     * It could be an instance of the 'oneOf' schemas.
+     * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
+     */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof BasquePig) {
+        if (JSON.isInstanceOf(BasquePig.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof DanishPig) {
+        if (JSON.isInstanceOf(DanishPig.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java
index a943d3b0db3a..4f6331b8f9d5 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +32,9 @@
 import org.openapitools.client.model.ComplexQuadrilateral;
 import org.openapitools.client.model.SimpleQuadrilateral;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
+import com.fasterxml.jackson.core.type.TypeReference;
 
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
@@ -33,21 +42,44 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.HashSet;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.openapitools.client.JSON;
 
-
-@JsonDeserialize(using=Quadrilateral.QuadrilateralDeserializer.class)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonDeserialize(using = Quadrilateral.QuadrilateralDeserializer.class)
+@JsonSerialize(using = Quadrilateral.QuadrilateralSerializer.class)
 public class Quadrilateral extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(Quadrilateral.class.getName());
 
+    public static class QuadrilateralSerializer extends StdSerializer<Quadrilateral> {
+        public QuadrilateralSerializer(Class<Quadrilateral> t) {
+            super(t);
+        }
+
+        public QuadrilateralSerializer() {
+            this(null);
+        }
+
+        @Override
+        public void serialize(Quadrilateral value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeObject(value.getActualInstance());
+        }
+    }
+
     public static class QuadrilateralDeserializer extends StdDeserializer<Quadrilateral> {
         public QuadrilateralDeserializer() {
             this(Quadrilateral.class);
@@ -60,12 +92,30 @@ public QuadrilateralDeserializer(Class<?> vc) {
         @Override
         public Quadrilateral deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             JsonNode tree = jp.readValueAsTree();
+            Object deserialized = null;
+            Quadrilateral newQuadrilateral = new Quadrilateral();
+            Map<String,Object> result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference<Map<String, Object>>() {});
+            String discriminatorValue = (String)result2.get("quadrilateralType");
+            switch (discriminatorValue) {
+                case "ComplexQuadrilateral":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(ComplexQuadrilateral.class);
+                    newQuadrilateral.setActualInstance(deserialized);
+                    return newQuadrilateral;
+                case "SimpleQuadrilateral":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(SimpleQuadrilateral.class);
+                    newQuadrilateral.setActualInstance(deserialized);
+                    return newQuadrilateral;
+                default:
+                    log.log(Level.WARNING, String.format("Failed to lookup discriminator value `%s` for Quadrilateral. Possible values: ComplexQuadrilateral SimpleQuadrilateral", discriminatorValue));
+            }
 
             int match = 0;
-            Object deserialized = null;
             // deserialize ComplexQuadrilateral
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(ComplexQuadrilateral.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'ComplexQuadrilateral'");
             } catch (Exception e) {
@@ -76,6 +126,9 @@ public Quadrilateral deserialize(JsonParser jp, DeserializationContext ctxt) thr
             // deserialize SimpleQuadrilateral
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(SimpleQuadrilateral.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'SimpleQuadrilateral'");
             } catch (Exception e) {
@@ -90,6 +143,14 @@ public Quadrilateral deserialize(JsonParser jp, DeserializationContext ctxt) thr
             }
             throw new IOException(String.format("Failed deserialization for Quadrilateral: %d classes match result, expected 1", match));
         }
+
+        /**
+         * Handle deserialization of the 'null' value.
+         */
+        @Override
+        public Quadrilateral getNullValue(DeserializationContext ctxt) throws JsonMappingException {
+            throw new JsonMappingException(ctxt.getParser(), "Quadrilateral cannot be null");
+        }
     }
 
     // store a list of schema names defined in oneOf
@@ -98,7 +159,56 @@ public Quadrilateral deserialize(JsonParser jp, DeserializationContext ctxt) thr
     public Quadrilateral() {
         super("oneOf", Boolean.FALSE);
     }
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public Quadrilateral putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
 
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+    /**
+     * Return true if this Quadrilateral object is equal to o.
+     */
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o) && Objects.equals(this.additionalProperties, ((Quadrilateral)o).additionalProperties);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getActualInstance(), isNullable(), getSchemaType(), additionalProperties);
+    }
     public Quadrilateral(ComplexQuadrilateral o) {
         super("oneOf", Boolean.FALSE);
         setActualInstance(o);
@@ -114,6 +224,13 @@ public Quadrilateral(SimpleQuadrilateral o) {
         });
         schemas.put("SimpleQuadrilateral", new GenericType<SimpleQuadrilateral>() {
         });
+        JSON.registerDescendants(Quadrilateral.class, Collections.unmodifiableMap(schemas));
+        // Initialize and register the discriminator mappings.
+        Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+        mappings.put("ComplexQuadrilateral", ComplexQuadrilateral.class);
+        mappings.put("SimpleQuadrilateral", SimpleQuadrilateral.class);
+        mappings.put("Quadrilateral", Quadrilateral.class);
+        JSON.registerDiscriminator(Quadrilateral.class, "quadrilateralType", mappings);
     }
 
     @Override
@@ -121,14 +238,21 @@ public Map<String, GenericType> getSchemas() {
         return Quadrilateral.schemas;
     }
 
+    /**
+     * Set the instance that matches the oneOf child schema, check
+     * the instance parameter is valid against the oneOf child schemas.
+     *
+     * It could be an instance of the 'oneOf' schemas.
+     * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
+     */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof ComplexQuadrilateral) {
+        if (JSON.isInstanceOf(ComplexQuadrilateral.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof SimpleQuadrilateral) {
+        if (JSON.isInstanceOf(SimpleQuadrilateral.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
index 7a586c4ca775..de4eeadca38c 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * QuadrilateralInterface
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   QuadrilateralInterface.JSON_PROPERTY_QUADRILATERAL_TYPE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class QuadrilateralInterface {
   public static final String JSON_PROPERTY_QUADRILATERAL_TYPE = "quadrilateralType";
   private String quadrilateralType;
 
 
   public QuadrilateralInterface quadrilateralType(String quadrilateralType) {
-    
     this.quadrilateralType = quadrilateralType;
     return this;
   }
@@ -59,6 +62,9 @@ public void setQuadrilateralType(String quadrilateralType) {
   }
 
 
+  /**
+   * Return true if this QuadrilateralInterface object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b3e58ef3d2c5..ba58c8cb29fe 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ReadOnlyFirst
@@ -30,7 +34,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
@@ -56,7 +60,6 @@ public String getBar() {
 
 
   public ReadOnlyFirst baz(String baz) {
-    
     this.baz = baz;
     return this;
   }
@@ -80,6 +83,9 @@ public void setBaz(String baz) {
   }
 
 
+  /**
+   * Return true if this ReadOnlyFirst object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
index b8f6d9955d57..7efe8c1e967e 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -24,6 +30,8 @@
 import org.openapitools.client.model.ShapeInterface;
 import org.openapitools.client.model.TriangleInterface;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ScaleneTriangle
@@ -32,7 +40,7 @@
   ScaleneTriangle.JSON_PROPERTY_SHAPE_TYPE,
   ScaleneTriangle.JSON_PROPERTY_TRIANGLE_TYPE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ScaleneTriangle {
   public static final String JSON_PROPERTY_SHAPE_TYPE = "shapeType";
   private String shapeType;
@@ -42,7 +50,6 @@ public class ScaleneTriangle {
 
 
   public ScaleneTriangle shapeType(String shapeType) {
-    
     this.shapeType = shapeType;
     return this;
   }
@@ -66,7 +73,6 @@ public void setShapeType(String shapeType) {
 
 
   public ScaleneTriangle triangleType(String triangleType) {
-    
     this.triangleType = triangleType;
     return this;
   }
@@ -88,7 +94,47 @@ public void setTriangleType(String triangleType) {
     this.triangleType = triangleType;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public ScaleneTriangle putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this ScaleneTriangle object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -99,12 +145,13 @@ public boolean equals(java.lang.Object o) {
     }
     ScaleneTriangle scaleneTriangle = (ScaleneTriangle) o;
     return Objects.equals(this.shapeType, scaleneTriangle.shapeType) &&
-        Objects.equals(this.triangleType, scaleneTriangle.triangleType);
+        Objects.equals(this.triangleType, scaleneTriangle.triangleType)&&
+        Objects.equals(this.additionalProperties, scaleneTriangle.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(shapeType, triangleType);
+    return Objects.hash(shapeType, triangleType, additionalProperties);
   }
 
 
@@ -114,6 +161,7 @@ public String toString() {
     sb.append("class ScaleneTriangle {\n");
     sb.append("    shapeType: ").append(toIndentedString(shapeType)).append("\n");
     sb.append("    triangleType: ").append(toIndentedString(triangleType)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java
index b97481242e5d..7e25253a1228 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +32,9 @@
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
+import com.fasterxml.jackson.core.type.TypeReference;
 
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
@@ -33,21 +42,44 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.HashSet;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.openapitools.client.JSON;
 
-
-@JsonDeserialize(using=Shape.ShapeDeserializer.class)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonDeserialize(using = Shape.ShapeDeserializer.class)
+@JsonSerialize(using = Shape.ShapeSerializer.class)
 public class Shape extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(Shape.class.getName());
 
+    public static class ShapeSerializer extends StdSerializer<Shape> {
+        public ShapeSerializer(Class<Shape> t) {
+            super(t);
+        }
+
+        public ShapeSerializer() {
+            this(null);
+        }
+
+        @Override
+        public void serialize(Shape value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeObject(value.getActualInstance());
+        }
+    }
+
     public static class ShapeDeserializer extends StdDeserializer<Shape> {
         public ShapeDeserializer() {
             this(Shape.class);
@@ -60,12 +92,30 @@ public ShapeDeserializer(Class<?> vc) {
         @Override
         public Shape deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             JsonNode tree = jp.readValueAsTree();
+            Object deserialized = null;
+            Shape newShape = new Shape();
+            Map<String,Object> result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference<Map<String, Object>>() {});
+            String discriminatorValue = (String)result2.get("shapeType");
+            switch (discriminatorValue) {
+                case "Quadrilateral":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(Quadrilateral.class);
+                    newShape.setActualInstance(deserialized);
+                    return newShape;
+                case "Triangle":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(Triangle.class);
+                    newShape.setActualInstance(deserialized);
+                    return newShape;
+                default:
+                    log.log(Level.WARNING, String.format("Failed to lookup discriminator value `%s` for Shape. Possible values: Quadrilateral Triangle", discriminatorValue));
+            }
 
             int match = 0;
-            Object deserialized = null;
             // deserialize Quadrilateral
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(Quadrilateral.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'Quadrilateral'");
             } catch (Exception e) {
@@ -76,6 +126,9 @@ public Shape deserialize(JsonParser jp, DeserializationContext ctxt) throws IOEx
             // deserialize Triangle
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(Triangle.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'Triangle'");
             } catch (Exception e) {
@@ -90,6 +143,14 @@ public Shape deserialize(JsonParser jp, DeserializationContext ctxt) throws IOEx
             }
             throw new IOException(String.format("Failed deserialization for Shape: %d classes match result, expected 1", match));
         }
+
+        /**
+         * Handle deserialization of the 'null' value.
+         */
+        @Override
+        public Shape getNullValue(DeserializationContext ctxt) throws JsonMappingException {
+            throw new JsonMappingException(ctxt.getParser(), "Shape cannot be null");
+        }
     }
 
     // store a list of schema names defined in oneOf
@@ -98,7 +159,56 @@ public Shape deserialize(JsonParser jp, DeserializationContext ctxt) throws IOEx
     public Shape() {
         super("oneOf", Boolean.FALSE);
     }
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public Shape putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
 
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+    /**
+     * Return true if this Shape object is equal to o.
+     */
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o) && Objects.equals(this.additionalProperties, ((Shape)o).additionalProperties);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getActualInstance(), isNullable(), getSchemaType(), additionalProperties);
+    }
     public Shape(Quadrilateral o) {
         super("oneOf", Boolean.FALSE);
         setActualInstance(o);
@@ -114,6 +224,13 @@ public Shape(Triangle o) {
         });
         schemas.put("Triangle", new GenericType<Triangle>() {
         });
+        JSON.registerDescendants(Shape.class, Collections.unmodifiableMap(schemas));
+        // Initialize and register the discriminator mappings.
+        Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+        mappings.put("Quadrilateral", Quadrilateral.class);
+        mappings.put("Triangle", Triangle.class);
+        mappings.put("Shape", Shape.class);
+        JSON.registerDiscriminator(Shape.class, "shapeType", mappings);
     }
 
     @Override
@@ -121,14 +238,21 @@ public Map<String, GenericType> getSchemas() {
         return Shape.schemas;
     }
 
+    /**
+     * Set the instance that matches the oneOf child schema, check
+     * the instance parameter is valid against the oneOf child schemas.
+     *
+     * It could be an instance of the 'oneOf' schemas.
+     * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
+     */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof Quadrilateral) {
+        if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof Triangle) {
+        if (JSON.isInstanceOf(Triangle.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeInterface.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeInterface.java
index 2b4cf2193066..e4463b62545a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeInterface.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeInterface.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * ShapeInterface
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   ShapeInterface.JSON_PROPERTY_SHAPE_TYPE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ShapeInterface {
   public static final String JSON_PROPERTY_SHAPE_TYPE = "shapeType";
   private String shapeType;
 
 
   public ShapeInterface shapeType(String shapeType) {
-    
     this.shapeType = shapeType;
     return this;
   }
@@ -59,6 +62,9 @@ public void setShapeType(String shapeType) {
   }
 
 
+  /**
+   * Return true if this ShapeInterface object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java
index 6a47a10de5f0..cde595039ac8 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +32,9 @@
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
+import com.fasterxml.jackson.core.type.TypeReference;
 
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
@@ -33,21 +42,44 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.HashSet;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.openapitools.client.JSON;
 
-
-@JsonDeserialize(using=ShapeOrNull.ShapeOrNullDeserializer.class)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonDeserialize(using = ShapeOrNull.ShapeOrNullDeserializer.class)
+@JsonSerialize(using = ShapeOrNull.ShapeOrNullSerializer.class)
 public class ShapeOrNull extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(ShapeOrNull.class.getName());
 
+    public static class ShapeOrNullSerializer extends StdSerializer<ShapeOrNull> {
+        public ShapeOrNullSerializer(Class<ShapeOrNull> t) {
+            super(t);
+        }
+
+        public ShapeOrNullSerializer() {
+            this(null);
+        }
+
+        @Override
+        public void serialize(ShapeOrNull value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeObject(value.getActualInstance());
+        }
+    }
+
     public static class ShapeOrNullDeserializer extends StdDeserializer<ShapeOrNull> {
         public ShapeOrNullDeserializer() {
             this(ShapeOrNull.class);
@@ -60,12 +92,30 @@ public ShapeOrNullDeserializer(Class<?> vc) {
         @Override
         public ShapeOrNull deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             JsonNode tree = jp.readValueAsTree();
+            Object deserialized = null;
+            ShapeOrNull newShapeOrNull = new ShapeOrNull();
+            Map<String,Object> result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference<Map<String, Object>>() {});
+            String discriminatorValue = (String)result2.get("shapeType");
+            switch (discriminatorValue) {
+                case "Quadrilateral":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(Quadrilateral.class);
+                    newShapeOrNull.setActualInstance(deserialized);
+                    return newShapeOrNull;
+                case "Triangle":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(Triangle.class);
+                    newShapeOrNull.setActualInstance(deserialized);
+                    return newShapeOrNull;
+                default:
+                    log.log(Level.WARNING, String.format("Failed to lookup discriminator value `%s` for ShapeOrNull. Possible values: Quadrilateral Triangle", discriminatorValue));
+            }
 
             int match = 0;
-            Object deserialized = null;
             // deserialize Quadrilateral
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(Quadrilateral.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'Quadrilateral'");
             } catch (Exception e) {
@@ -76,6 +126,9 @@ public ShapeOrNull deserialize(JsonParser jp, DeserializationContext ctxt) throw
             // deserialize Triangle
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(Triangle.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'Triangle'");
             } catch (Exception e) {
@@ -90,6 +143,14 @@ public ShapeOrNull deserialize(JsonParser jp, DeserializationContext ctxt) throw
             }
             throw new IOException(String.format("Failed deserialization for ShapeOrNull: %d classes match result, expected 1", match));
         }
+
+        /**
+         * Handle deserialization of the 'null' value.
+         */
+        @Override
+        public ShapeOrNull getNullValue(DeserializationContext ctxt) throws JsonMappingException {
+            return null;
+        }
     }
 
     // store a list of schema names defined in oneOf
@@ -98,7 +159,56 @@ public ShapeOrNull deserialize(JsonParser jp, DeserializationContext ctxt) throw
     public ShapeOrNull() {
         super("oneOf", Boolean.TRUE);
     }
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public ShapeOrNull putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+    /**
+     * Return true if this ShapeOrNull object is equal to o.
+     */
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o) && Objects.equals(this.additionalProperties, ((ShapeOrNull)o).additionalProperties);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getActualInstance(), isNullable(), getSchemaType(), additionalProperties);
+    }
     public ShapeOrNull(Quadrilateral o) {
         super("oneOf", Boolean.TRUE);
         setActualInstance(o);
@@ -114,6 +224,13 @@ public ShapeOrNull(Triangle o) {
         });
         schemas.put("Triangle", new GenericType<Triangle>() {
         });
+        JSON.registerDescendants(ShapeOrNull.class, Collections.unmodifiableMap(schemas));
+        // Initialize and register the discriminator mappings.
+        Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+        mappings.put("Quadrilateral", Quadrilateral.class);
+        mappings.put("Triangle", Triangle.class);
+        mappings.put("ShapeOrNull", ShapeOrNull.class);
+        JSON.registerDiscriminator(ShapeOrNull.class, "shapeType", mappings);
     }
 
     @Override
@@ -121,14 +238,26 @@ public Map<String, GenericType> getSchemas() {
         return ShapeOrNull.schemas;
     }
 
+    /**
+     * Set the instance that matches the oneOf child schema, check
+     * the instance parameter is valid against the oneOf child schemas.
+     *
+     * It could be an instance of the 'oneOf' schemas.
+     * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
+     */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof Quadrilateral) {
+        if (instance == null) {
+           super.setActualInstance(instance);
+           return;
+        }
+
+        if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof Triangle) {
+        if (JSON.isInstanceOf(Triangle.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
index 0ad65aa09dd6..dd378b6cf9bc 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -24,6 +30,8 @@
 import org.openapitools.client.model.QuadrilateralInterface;
 import org.openapitools.client.model.ShapeInterface;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * SimpleQuadrilateral
@@ -32,7 +40,7 @@
   SimpleQuadrilateral.JSON_PROPERTY_SHAPE_TYPE,
   SimpleQuadrilateral.JSON_PROPERTY_QUADRILATERAL_TYPE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SimpleQuadrilateral {
   public static final String JSON_PROPERTY_SHAPE_TYPE = "shapeType";
   private String shapeType;
@@ -42,7 +50,6 @@ public class SimpleQuadrilateral {
 
 
   public SimpleQuadrilateral shapeType(String shapeType) {
-    
     this.shapeType = shapeType;
     return this;
   }
@@ -66,7 +73,6 @@ public void setShapeType(String shapeType) {
 
 
   public SimpleQuadrilateral quadrilateralType(String quadrilateralType) {
-    
     this.quadrilateralType = quadrilateralType;
     return this;
   }
@@ -88,7 +94,47 @@ public void setQuadrilateralType(String quadrilateralType) {
     this.quadrilateralType = quadrilateralType;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public SimpleQuadrilateral putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this SimpleQuadrilateral object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -99,12 +145,13 @@ public boolean equals(java.lang.Object o) {
     }
     SimpleQuadrilateral simpleQuadrilateral = (SimpleQuadrilateral) o;
     return Objects.equals(this.shapeType, simpleQuadrilateral.shapeType) &&
-        Objects.equals(this.quadrilateralType, simpleQuadrilateral.quadrilateralType);
+        Objects.equals(this.quadrilateralType, simpleQuadrilateral.quadrilateralType)&&
+        Objects.equals(this.additionalProperties, simpleQuadrilateral.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(shapeType, quadrilateralType);
+    return Objects.hash(shapeType, quadrilateralType, additionalProperties);
   }
 
 
@@ -114,6 +161,7 @@ public String toString() {
     sb.append("class SimpleQuadrilateral {\n");
     sb.append("    shapeType: ").append(toIndentedString(shapeType)).append("\n");
     sb.append("    quadrilateralType: ").append(toIndentedString(quadrilateralType)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
index b588ef95226b..744d18f94ef6 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * SpecialModelName
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
 
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
-    
     this.$specialPropertyName = $specialPropertyName;
     return this;
   }
@@ -60,6 +63,9 @@ public class SpecialModelName {
   }
 
 
+  /**
+   * Return true if this _special_model.name_ object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
index a3ecb398faa3..78b29486f2e7 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Tag
@@ -30,7 +34,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
@@ -40,7 +44,6 @@ public class Tag {
 
 
   public Tag id(Long id) {
-    
     this.id = id;
     return this;
   }
@@ -65,7 +68,6 @@ public void setId(Long id) {
 
 
   public Tag name(String name) {
-    
     this.name = name;
     return this;
   }
@@ -89,6 +91,9 @@ public void setName(String name) {
   }
 
 
+  /**
+   * Return true if this Tag object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java
index 0db61e7c1601..9135fa670e49 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java
@@ -13,8 +13,14 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -27,6 +33,9 @@
 import org.openapitools.client.model.IsoscelesTriangle;
 import org.openapitools.client.model.ScaleneTriangle;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
+import com.fasterxml.jackson.core.type.TypeReference;
 
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
@@ -34,21 +43,44 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.HashSet;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.openapitools.client.JSON;
 
-
-@JsonDeserialize(using=Triangle.TriangleDeserializer.class)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@JsonDeserialize(using = Triangle.TriangleDeserializer.class)
+@JsonSerialize(using = Triangle.TriangleSerializer.class)
 public class Triangle extends AbstractOpenApiSchema {
     private static final Logger log = Logger.getLogger(Triangle.class.getName());
 
+    public static class TriangleSerializer extends StdSerializer<Triangle> {
+        public TriangleSerializer(Class<Triangle> t) {
+            super(t);
+        }
+
+        public TriangleSerializer() {
+            this(null);
+        }
+
+        @Override
+        public void serialize(Triangle value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeObject(value.getActualInstance());
+        }
+    }
+
     public static class TriangleDeserializer extends StdDeserializer<Triangle> {
         public TriangleDeserializer() {
             this(Triangle.class);
@@ -61,12 +93,34 @@ public TriangleDeserializer(Class<?> vc) {
         @Override
         public Triangle deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             JsonNode tree = jp.readValueAsTree();
+            Object deserialized = null;
+            Triangle newTriangle = new Triangle();
+            Map<String,Object> result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference<Map<String, Object>>() {});
+            String discriminatorValue = (String)result2.get("triangleType");
+            switch (discriminatorValue) {
+                case "EquilateralTriangle":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(EquilateralTriangle.class);
+                    newTriangle.setActualInstance(deserialized);
+                    return newTriangle;
+                case "IsoscelesTriangle":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(IsoscelesTriangle.class);
+                    newTriangle.setActualInstance(deserialized);
+                    return newTriangle;
+                case "ScaleneTriangle":
+                    deserialized = tree.traverse(jp.getCodec()).readValueAs(ScaleneTriangle.class);
+                    newTriangle.setActualInstance(deserialized);
+                    return newTriangle;
+                default:
+                    log.log(Level.WARNING, String.format("Failed to lookup discriminator value `%s` for Triangle. Possible values: EquilateralTriangle IsoscelesTriangle ScaleneTriangle", discriminatorValue));
+            }
 
             int match = 0;
-            Object deserialized = null;
             // deserialize EquilateralTriangle
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(EquilateralTriangle.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'EquilateralTriangle'");
             } catch (Exception e) {
@@ -77,6 +131,9 @@ public Triangle deserialize(JsonParser jp, DeserializationContext ctxt) throws I
             // deserialize IsoscelesTriangle
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(IsoscelesTriangle.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'IsoscelesTriangle'");
             } catch (Exception e) {
@@ -87,6 +144,9 @@ public Triangle deserialize(JsonParser jp, DeserializationContext ctxt) throws I
             // deserialize ScaleneTriangle
             try {
                 deserialized = tree.traverse(jp.getCodec()).readValueAs(ScaleneTriangle.class);
+                // TODO: there is no validation against JSON schema constraints
+                // (min, max, enum, pattern...), this does not perform a strict JSON
+                // validation, which means the 'match' count may be higher than it should be.
                 match++;
                 log.log(Level.FINER, "Input data matches schema 'ScaleneTriangle'");
             } catch (Exception e) {
@@ -101,6 +161,14 @@ public Triangle deserialize(JsonParser jp, DeserializationContext ctxt) throws I
             }
             throw new IOException(String.format("Failed deserialization for Triangle: %d classes match result, expected 1", match));
         }
+
+        /**
+         * Handle deserialization of the 'null' value.
+         */
+        @Override
+        public Triangle getNullValue(DeserializationContext ctxt) throws JsonMappingException {
+            throw new JsonMappingException(ctxt.getParser(), "Triangle cannot be null");
+        }
     }
 
     // store a list of schema names defined in oneOf
@@ -109,7 +177,56 @@ public Triangle deserialize(JsonParser jp, DeserializationContext ctxt) throws I
     public Triangle() {
         super("oneOf", Boolean.FALSE);
     }
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public Triangle putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
 
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+    /**
+     * Return true if this Triangle object is equal to o.
+     */
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o) && Objects.equals(this.additionalProperties, ((Triangle)o).additionalProperties);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getActualInstance(), isNullable(), getSchemaType(), additionalProperties);
+    }
     public Triangle(EquilateralTriangle o) {
         super("oneOf", Boolean.FALSE);
         setActualInstance(o);
@@ -132,6 +249,14 @@ public Triangle(ScaleneTriangle o) {
         });
         schemas.put("ScaleneTriangle", new GenericType<ScaleneTriangle>() {
         });
+        JSON.registerDescendants(Triangle.class, Collections.unmodifiableMap(schemas));
+        // Initialize and register the discriminator mappings.
+        Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
+        mappings.put("EquilateralTriangle", EquilateralTriangle.class);
+        mappings.put("IsoscelesTriangle", IsoscelesTriangle.class);
+        mappings.put("ScaleneTriangle", ScaleneTriangle.class);
+        mappings.put("Triangle", Triangle.class);
+        JSON.registerDiscriminator(Triangle.class, "triangleType", mappings);
     }
 
     @Override
@@ -139,19 +264,26 @@ public Map<String, GenericType> getSchemas() {
         return Triangle.schemas;
     }
 
+    /**
+     * Set the instance that matches the oneOf child schema, check
+     * the instance parameter is valid against the oneOf child schemas.
+     *
+     * It could be an instance of the 'oneOf' schemas.
+     * The oneOf child schemas may themselves be a composed schema (allOf, anyOf, oneOf).
+     */
     @Override
     public void setActualInstance(Object instance) {
-        if (instance instanceof EquilateralTriangle) {
+        if (JSON.isInstanceOf(EquilateralTriangle.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof IsoscelesTriangle) {
+        if (JSON.isInstanceOf(IsoscelesTriangle.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
 
-        if (instance instanceof ScaleneTriangle) {
+        if (JSON.isInstanceOf(ScaleneTriangle.class, instance, new HashSet<Class<?>>())) {
             super.setActualInstance(instance);
             return;
         }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TriangleInterface.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TriangleInterface.java
index 5064ab5e3e6a..b2e6b74311cc 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TriangleInterface.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TriangleInterface.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * TriangleInterface
@@ -29,14 +33,13 @@
 @JsonPropertyOrder({
   TriangleInterface.JSON_PROPERTY_TRIANGLE_TYPE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TriangleInterface {
   public static final String JSON_PROPERTY_TRIANGLE_TYPE = "triangleType";
   private String triangleType;
 
 
   public TriangleInterface triangleType(String triangleType) {
-    
     this.triangleType = triangleType;
     return this;
   }
@@ -59,6 +62,9 @@ public void setTriangleType(String triangleType) {
   }
 
 
+  /**
+   * Return true if this TriangleInterface object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
index 570d1ace3ff4..bdd939b38c21 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -25,6 +27,8 @@
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.util.NoSuchElementException;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * User
@@ -43,7 +47,7 @@
   User.JSON_PROPERTY_ANY_TYPE_PROP,
   User.JSON_PROPERTY_ANY_TYPE_PROP_NULLABLE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
   private Long id;
@@ -83,7 +87,6 @@ public class User {
 
 
   public User id(Long id) {
-    
     this.id = id;
     return this;
   }
@@ -108,7 +111,6 @@ public void setId(Long id) {
 
 
   public User username(String username) {
-    
     this.username = username;
     return this;
   }
@@ -133,7 +135,6 @@ public void setUsername(String username) {
 
 
   public User firstName(String firstName) {
-    
     this.firstName = firstName;
     return this;
   }
@@ -158,7 +159,6 @@ public void setFirstName(String firstName) {
 
 
   public User lastName(String lastName) {
-    
     this.lastName = lastName;
     return this;
   }
@@ -183,7 +183,6 @@ public void setLastName(String lastName) {
 
 
   public User email(String email) {
-    
     this.email = email;
     return this;
   }
@@ -208,7 +207,6 @@ public void setEmail(String email) {
 
 
   public User password(String password) {
-    
     this.password = password;
     return this;
   }
@@ -233,7 +231,6 @@ public void setPassword(String password) {
 
 
   public User phone(String phone) {
-    
     this.phone = phone;
     return this;
   }
@@ -258,7 +255,6 @@ public void setPhone(String phone) {
 
 
   public User userStatus(Integer userStatus) {
-    
     this.userStatus = userStatus;
     return this;
   }
@@ -283,7 +279,6 @@ public void setUserStatus(Integer userStatus) {
 
 
   public User objectWithNoDeclaredProps(Object objectWithNoDeclaredProps) {
-    
     this.objectWithNoDeclaredProps = objectWithNoDeclaredProps;
     return this;
   }
@@ -309,7 +304,6 @@ public void setObjectWithNoDeclaredProps(Object objectWithNoDeclaredProps) {
 
   public User objectWithNoDeclaredPropsNullable(Object objectWithNoDeclaredPropsNullable) {
     this.objectWithNoDeclaredPropsNullable = JsonNullable.<Object>of(objectWithNoDeclaredPropsNullable);
-    
     return this;
   }
 
@@ -344,7 +338,6 @@ public void setObjectWithNoDeclaredPropsNullable(Object objectWithNoDeclaredProp
 
   public User anyTypeProp(Object anyTypeProp) {
     this.anyTypeProp = JsonNullable.<Object>of(anyTypeProp);
-    
     return this;
   }
 
@@ -379,7 +372,6 @@ public void setAnyTypeProp(Object anyTypeProp) {
 
   public User anyTypePropNullable(Object anyTypePropNullable) {
     this.anyTypePropNullable = JsonNullable.<Object>of(anyTypePropNullable);
-    
     return this;
   }
 
@@ -412,6 +404,9 @@ public void setAnyTypePropNullable(Object anyTypePropNullable) {
   }
 
 
+  /**
+   * Return true if this User object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Whale.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Whale.java
index 64c82e711aca..e0979080f0b0 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Whale.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Whale.java
@@ -15,6 +15,8 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,6 +24,8 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Whale
@@ -31,7 +35,7 @@
   Whale.JSON_PROPERTY_HAS_TEETH,
   Whale.JSON_PROPERTY_CLASS_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Whale {
   public static final String JSON_PROPERTY_HAS_BALEEN = "hasBaleen";
   private Boolean hasBaleen;
@@ -44,7 +48,6 @@ public class Whale {
 
 
   public Whale hasBaleen(Boolean hasBaleen) {
-    
     this.hasBaleen = hasBaleen;
     return this;
   }
@@ -69,7 +72,6 @@ public void setHasBaleen(Boolean hasBaleen) {
 
 
   public Whale hasTeeth(Boolean hasTeeth) {
-    
     this.hasTeeth = hasTeeth;
     return this;
   }
@@ -94,7 +96,6 @@ public void setHasTeeth(Boolean hasTeeth) {
 
 
   public Whale className(String className) {
-    
     this.className = className;
     return this;
   }
@@ -117,6 +118,9 @@ public void setClassName(String className) {
   }
 
 
+  /**
+   * Return true if this whale object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java
index 84436cf0de92..9a062c4c7297 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java
@@ -13,17 +13,23 @@
 
 package org.openapitools.client.model;
 
+import java.util.Map;
+import java.util.HashMap;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.openapitools.client.JSON;
+
 
 /**
  * Zebra
@@ -32,8 +38,8 @@
   Zebra.JSON_PROPERTY_TYPE,
   Zebra.JSON_PROPERTY_CLASS_NAME
 })
-
-public class Zebra extends HashMap<String, Object> {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class Zebra {
   /**
    * Gets or Sets type
    */
@@ -79,7 +85,6 @@ public static TypeEnum fromValue(String value) {
 
 
   public Zebra type(TypeEnum type) {
-    
     this.type = type;
     return this;
   }
@@ -104,7 +109,6 @@ public void setType(TypeEnum type) {
 
 
   public Zebra className(String className) {
-    
     this.className = className;
     return this;
   }
@@ -126,7 +130,47 @@ public void setClassName(String className) {
     this.className = className;
   }
 
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
 
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  @JsonAnySetter
+  public Zebra putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /**
+   * Return true if this zebra object is equal to o.
+   */
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -137,13 +181,13 @@ public boolean equals(java.lang.Object o) {
     }
     Zebra zebra = (Zebra) o;
     return Objects.equals(this.type, zebra.type) &&
-        Objects.equals(this.className, zebra.className) &&
-        super.equals(o);
+        Objects.equals(this.className, zebra.className)&&
+        Objects.equals(this.additionalProperties, zebra.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(type, className, super.hashCode());
+    return Objects.hash(type, className, additionalProperties);
   }
 
 
@@ -151,9 +195,9 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Zebra {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    type: ").append(toIndentedString(type)).append("\n");
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONComposedSchemaTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONComposedSchemaTest.java
index 89227f3d252c..54eeda72ee75 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONComposedSchemaTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONComposedSchemaTest.java
@@ -1,14 +1,10 @@
 package org.openapitools.client;
 
-import org.openapitools.client.model.Mammal;
-import org.openapitools.client.model.AppleReq;
-import org.openapitools.client.model.BananaReq;
-import org.openapitools.client.model.FruitReq;
-import org.openapitools.client.model.BasquePig;
-import org.openapitools.client.model.Pig;
-import org.openapitools.client.model.Whale;
-import org.openapitools.client.model.Zebra;
+import org.openapitools.client.model.*;
 import java.lang.Exception;
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.databind.JsonMappingException;
 
 import org.junit.*;
 import static org.junit.Assert.*;
@@ -16,12 +12,58 @@
 
 public class JSONComposedSchemaTest {
     JSON json = null;
-    Mammal mammal = null;
 
     @Before
     public void setup() {
         json = new JSON();
-        mammal = new Mammal();
+    }
+
+    @Test
+    public void testOneOfSchemaAdditionalProperties() throws Exception {
+        {
+            // The discriminator value is zebra but the properties belong to Whale.
+            // The 'whale' properties are considered to be additional (undeclared) properties
+            // because in the 'zebra' schema, the 'additionalProperties' keyword has been set
+            // to true.
+            // TODO: The outcome should depend on the value of the 'useOneOfDiscriminatorLookup' CLI.
+            String str = "{ \"className\": \"zebra\", \"hasBaleen\": true, \"hasTeeth\": false }";
+            AbstractOpenApiSchema o = json.getContext(null).readValue(str, Mammal.class);
+            assertNotNull(o);
+            assertTrue(o.getActualInstance() instanceof Zebra);
+            Zebra z = (Zebra)o.getActualInstance();
+            assertNotNull(z.getAdditionalProperties());
+            assertEquals(2, z.getAdditionalProperties().size());
+            assertTrue(z.getAdditionalProperties().containsKey("hasBaleen"));
+        }
+        {
+            // Same test as above, but this time deserializing directly into the Zebra class.
+            String str = "{ \"className\": \"zebra\", \"hasBaleen\": true, \"hasTeeth\": false }";
+            Zebra o = json.getContext(null).readValue(str, Zebra.class);
+            assertNotNull(o);
+            assertNotNull(o.getAdditionalProperties());
+            assertEquals(2, o.getAdditionalProperties().size());
+        }
+        {
+            // Same test as above, but with properties that belong neither to zebra nor whale
+            String str = "{ \"className\": \"zebra\", \"some_other_property\": \"abc\" }";
+            AbstractOpenApiSchema o = json.getContext(null).readValue(str, Mammal.class);
+            assertNotNull(o);
+            assertTrue(o.getActualInstance() instanceof Zebra);
+            Zebra z = (Zebra)o.getActualInstance();
+            assertNotNull(z.getAdditionalProperties());
+            assertEquals(1, z.getAdditionalProperties().size());
+        }
+        {
+            // Same test as above, but with properties that belong neither to zebra nor whale
+            // Deserialize directly into Zebra.
+            String str = "{ \"className\": \"zebra\", \"some_other_property\": \"abc\" }";
+            Zebra o = json.getContext(null).readValue(str, Zebra.class);
+            assertNotNull(o);
+            assertNotNull(o.getAdditionalProperties());
+            assertEquals(1, o.getAdditionalProperties().size());
+            assertTrue(o.getAdditionalProperties().containsKey("some_other_property"));
+            assertTrue(o.getAdditionalProperties().containsValue("abc"));
+        }
     }
 
     /**
@@ -32,9 +74,49 @@ public void setup() {
     public void testOneOfSchemaWithoutDiscriminator() throws Exception {
         // BananaReq and AppleReq have explicitly defined properties that are different by name.
         // There is no discriminator property.
-        String str = "{ \"cultivar\": \"golden delicious\", \"mealy\": false }";
-        FruitReq o = json.getContext(null).readValue(str, FruitReq.class);
-        assertTrue(o.getActualInstance() instanceof AppleReq);
+        {
+            String str = "{ \"cultivar\": \"golden delicious\", \"mealy\": false }";
+            FruitReq o = json.getContext(null).readValue(str, FruitReq.class);
+            assertTrue(o.getActualInstance() instanceof AppleReq);
+            AppleReq inst = (AppleReq) o.getActualInstance();
+            assertEquals(inst.getCultivar(), "golden delicious");
+            assertEquals(inst.getMealy(), false);
+        }
+        {
+            // Same test, but this time with additional (undeclared) properties.
+            // Since FruitReq has additionalProperties: false, deserialization should fail.
+            String str = "{ \"cultivar\": \"golden delicious\", \"mealy\": false, \"garbage_prop\": \"abc\" }";
+            Exception exception = assertThrows(JsonMappingException.class, () -> {
+                FruitReq o = json.getContext(null).readValue(str, FruitReq.class);
+            });
+            assertTrue(exception.getMessage().contains("Failed deserialization for FruitReq: 0 classes match result"));
+        }
+        {
+            String str = "{ \"lengthCm\": 17 }";
+            FruitReq o = json.getContext(null).readValue(str, FruitReq.class);
+            assertTrue(o.getActualInstance() instanceof BananaReq);
+            BananaReq inst = (BananaReq) o.getActualInstance();
+            assertEquals(inst.getLengthCm(), new java.math.BigDecimal(17));
+        }
+        {
+            // Try to deserialize empty object. This should fail 'oneOf' because that will match
+            // both AppleReq and BananaReq.
+            String str = "{ }";
+            Exception exception = assertThrows(JsonMappingException.class, () -> {
+                json.getContext(null).readValue(str, FruitReq.class);
+            });
+            assertTrue(exception.getMessage().contains("Failed deserialization for FruitReq: 2 classes match result"));
+            // TODO: add a similar unit test where the oneOf child schemas have required properties.
+            // If the implementation is correct, the unmarshaling should take the "required" keyword
+            // into consideration, which it is not doing currently.
+        }
+        {
+            // Deserialize the null value. This should be allowed because the 'FruitReq' schema
+            // has nullable: true.
+            String str = "null";
+            FruitReq o = json.getContext(null).readValue(str, FruitReq.class);
+            assertNull(o);
+        }        
     }
 
     /**
@@ -45,24 +127,291 @@ public void testOneOfSchemaWithoutDiscriminator() throws Exception {
     public void testOneOfSchemaWithDiscriminator() throws Exception {
         // Mammal can be one of whale, pig and zebra.
         // pig has sub-classes.
-        String str = "{ \"className\": \"whale\", \"hasBaleen\": true, \"hasTeeth\": false }";
-        /*
-        DISABLING unit test for now until ambiguity of discriminator is resolved.
-        
-        // Note that the 'zebra' schema does not have any explicit property defined AND
-        // it has additionalProperties: true. Hence without a discriminator the above
-        // JSON payload would match both 'whale' and 'zebra'. This is because the 'hasBaleen'
-        // and 'hasTeeth' would be considered additional (undeclared) properties for 'zebra'.
-        Mammal o = json.getContext(null).readValue(str, Mammal.class);
-        assertTrue(o.getActualInstance() instanceof Whale);
-
-        str = "{ \"className\": \"zebra\" }";
-        o = json.getContext(null).readValue(str, Mammal.class);
-        assertTrue(o.getActualInstance() instanceof Zebra);
-
-        str = "{ \"className\": \"BasquePig\" }";
-        o = json.getContext(null).readValue(str, Mammal.class);
-        assertTrue(o.getActualInstance() instanceof BasquePig);
+        {
+            String str = "{ \"className\": \"whale\", \"hasBaleen\": true, \"hasTeeth\": false }";
+            
+            // Note that the 'zebra' schema does not have any explicit property defined AND
+            // it has additionalProperties: true. Hence without a discriminator the above
+            // JSON payload would match both 'whale' and 'zebra'. This is because the 'hasBaleen'
+            // and 'hasTeeth' would be considered additional (undeclared) properties for 'zebra'.
+            AbstractOpenApiSchema o = json.getContext(null).readValue(str, Mammal.class);
+            assertNotNull(o);
+            assertTrue(o.getActualInstance() instanceof Whale);
+        }
+        {
+            String str = "{ \"className\": \"zebra\", \"type\": \"plains\" }";
+            AbstractOpenApiSchema o = json.getContext(null).readValue(str, Mammal.class);
+            assertNotNull(o);
+            assertTrue(o.getActualInstance() instanceof Zebra);
+            Zebra z = (Zebra)o.getActualInstance();
+            assertEquals(Zebra.TypeEnum.PLAINS, z.getType());
+        }
+        {
+            // The discriminator value is valid but the 'type' value is invalid.
+            String str = "{ \"className\": \"zebra\", \"type\": \"garbage_value\" }";
+            Exception exception = assertThrows(JsonMappingException.class, () -> {
+                json.getContext(null).readValue(str, Mammal.class);
+            });
+        }
+        {
+            String str = "{ \"className\": \"zebra\" }";
+            AbstractOpenApiSchema o = json.getContext(null).readValue(str, Mammal.class);
+            assertNotNull(o);
+            assertTrue(o.getActualInstance() instanceof Zebra);
+            Zebra z = (Zebra)o.getActualInstance();
+            assertNull(z.getAdditionalProperties());
+        }
+        {
+            /* comment out while unboxing nested oneOf/anyOf is still in discussion
+            // Deserialization test with indirections of 'oneOf' child schemas.
+            // Mammal is oneOf whale, zebra and pig, and pig is itself one of BasquePig, DanishPig.
+            String str = "{ \"className\": \"BasquePig\" }";
+            AbstractOpenApiSchema o = json.getContext(null).readValue(str, Mammal.class);
+            assertTrue(o.getActualInstance() instanceof BasquePig);
+            */
+        }
+    }
+
+    @Test
+    public void testOneOfNullable() throws Exception {
+        String str = "null";
+        // 'null' is a valid value for NullableShape because it is nullable.
+        AbstractOpenApiSchema o = json.getContext(null).readValue(str, NullableShape.class);
+        assertNull(o);
+
+        // 'null' is a valid value for ShapeOrNull because it is a oneOf with one of the
+        // children being the null type.
+        o = json.getContext(null).readValue(str, ShapeOrNull.class);
+        assertNull(o);
+
+        // 'null' is not a valid value for the Shape model because it is not nullable.
+        // An exception should be raised.
+        Exception exception = assertThrows(JsonMappingException.class, () -> {
+            json.getContext(null).readValue(str, Shape.class);
+        });
+        assertTrue(exception.getMessage().contains("Shape cannot be null"));
+    }
+
+    /**
+     * Test payload with more than one discriminator.
+     */
+    @Test
+    public void testOneOfMultipleDiscriminators() throws Exception {
+        // 'shapeType' is a discriminator for the 'Shape' model and
+        // 'triangleType' is a discriminator forr the 'Triangle' model.
+        String str = "{ \"shapeType\": \"Triangle\", \"triangleType\": \"EquilateralTriangle\" }";
+
+        // We should be able to deserialize a equilateral triangle into a EquilateralTriangle class.
+        EquilateralTriangle t = json.getContext(null).readValue(str, EquilateralTriangle.class);
+        assertNotNull(t);
+
+        // We should be able to deserialize a equilateral triangle into a triangle.
+        AbstractOpenApiSchema o = json.getContext(null).readValue(str, Triangle.class);
+        assertNotNull(o);
+        assertTrue(o.getActualInstance() instanceof EquilateralTriangle);
+
+        // We should be able to deserialize a equilateral triangle into a shape.
+        o = json.getContext(null).readValue(str, Shape.class);
+        // The container is a shape, and the actual instance should be a EquilateralTriangle.        
+        assertTrue(o instanceof Shape);
+        /* comment out while unboxing nested oneOf/anyOf is still in discussion
+        assertTrue(o.getActualInstance() instanceof EquilateralTriangle);
+
+        // It is not valid to deserialize a equilateral triangle into a quadrilateral.
+        Exception exception = assertThrows(JsonMappingException.class, () -> {
+            json.getContext(null).readValue(str, Quadrilateral.class);
+        });
+        assertTrue(exception.getMessage().contains("Failed deserialization for Quadrilateral: 0 classes match result"));
         */
     }
-}
\ No newline at end of file
+
+    @Test
+    public void testOneOfNestedComposedSchema() throws Exception {
+        {
+            String str = "{ " +
+                " \"mainShape\":      { \"shapeType\": \"Triangle\", \"triangleType\": \"EquilateralTriangle\" }, " +
+                " \"shapeOrNull\":    { \"shapeType\": \"Quadrilateral\", \"quadrilateralType\": \"SimpleQuadrilateral\" }, " +
+                " \"nullableShape\":  { \"shapeType\": \"Triangle\", \"triangleType\": \"ScaleneTriangle\" } " +
+            "}";
+            Drawing d = json.getContext(null).readValue(str, Drawing.class);
+            assertNotNull(d);
+            assertNotNull(d.getMainShape());
+            assertNotNull(d.getShapeOrNull());
+            assertNotNull(d.getNullableShape());
+            assertTrue(d.getMainShape().getActualInstance() instanceof Triangle);
+            assertTrue(d.getShapeOrNull().getActualInstance() instanceof Quadrilateral);
+            assertTrue(d.getNullableShape().getActualInstance() instanceof Triangle);
+            // TODO: add assertions with call to getActualInstanceRecursively().
+            //assertTrue(d.getMainShape().getActualInstanceRecursively() instanceof EquilateralTriangle);
+            //assertTrue(d.getShapeOrNull().getActualInstanceRecursively() instanceof SimpleQuadrilateral);
+            //assertTrue(d.getNullableShape().getActualInstanceRecursively() instanceof ScaleneTriangle);
+        }
+
+        {
+            String str = "{ " +
+                " \"mainShape\":      { \"shapeType\": \"Triangle\", \"triangleType\": \"EquilateralTriangle\" }, " +
+                " \"shapeOrNull\":    null, " +
+                " \"nullableShape\":  null " +
+            "}";
+            Drawing d = json.getContext(null).readValue(str, Drawing.class);
+            assertNotNull(d);
+            assertNotNull(d.getMainShape());
+            assertNull(d.getShapeOrNull());
+            assertNull(d.getNullableShape());
+            assertTrue(d.getMainShape().getActualInstance() instanceof Triangle);
+        }
+    }
+
+    @Test
+    public void testOneOfNestedComposedSchemaWithAdditionalProperties() throws Exception {
+        {
+            String str = "{ " +
+                " \"mainShape\":      { \"shapeType\": \"Triangle\", \"triangleType\": \"EquilateralTriangle\" }, " +
+                " \"shapeOrNull\":    { \"shapeType\": \"Quadrilateral\", \"quadrilateralType\": \"SimpleQuadrilateral\" }, " +
+                " \"nullableShape\":  { \"shapeType\": \"Triangle\", \"triangleType\": \"ScaleneTriangle\" }, " +
+                " \"fruit_1\":        { \"cultivar\": \"golden delicious\", \"origin\": \"California\" }," +
+                " \"fruit_2\":        { \"cultivar\": \"honeycrisp\", \"origin\": \"California\" }" +
+            "}";
+            Drawing d = json.getContext(null).readValue(str, Drawing.class);
+            assertNotNull(d);
+            assertNotNull(d.getMainShape());
+            assertNotNull(d.getShapeOrNull());
+            assertNotNull(d.getNullableShape());
+            assertTrue(d.getMainShape().getActualInstance() instanceof Triangle);
+            assertTrue(d.getShapeOrNull().getActualInstance() instanceof Quadrilateral);
+            assertTrue(d.getNullableShape().getActualInstance() instanceof Triangle);
+            // TODO: add assertions with call to getActualInstanceRecursively().
+            //assertTrue(d.getMainShape().getActualInstanceRecursively() instanceof EquilateralTriangle);
+            //assertTrue(d.getShapeOrNull().getActualInstanceRecursively() instanceof SimpleQuadrilateral);
+            //assertTrue(d.getNullableShape().getActualInstanceRecursively() instanceof ScaleneTriangle);
+            assertNotNull(d.getAdditionalProperties());
+            assertEquals(2, d.getAdditionalProperties().size());
+            assertTrue(d.getAdditionalProperties().containsKey("fruit_1"));
+            assertTrue(d.getAdditionalProperties().containsKey("fruit_2"));
+            Fruit f1 = d.getAdditionalProperties().get("fruit_1");
+            assertTrue(f1.getActualInstance() instanceof Apple);
+            Apple a = (Apple)f1.getActualInstance();
+            assertEquals("golden delicious", a.getCultivar());
+            assertEquals("California", a.getOrigin());
+        }
+    }
+
+    /**
+     * Validate a allOf schema can be deserialized into the expected class.
+     */
+    @Test
+    public void testAllOfSchema() throws Exception {
+        {
+            String str = "{ \"className\": \"Dog\", \"color\": \"white\",  \"breed\": \"Siberian Husky\" }";
+
+            // We should be able to deserialize a dog into a Dog.
+            Dog d = json.getContext(null).readValue(str, Dog.class);            
+            assertNotNull(d);
+            assertEquals("white", d.getColor());
+        }
+        {
+            String str = "{ \"pet_type\": \"ChildCat\", \"name\": \"fluffy\", " +
+                " \"stuff1\": \"the_value\", " +      // additional, undeclared property of type string.
+                " \"stuff2\": { \"p1\": 123 }, " +    // additional, undeclared property of type object.
+                " \"stuff3\": null," +                // additional, undeclared property with null value.
+                " \"stuff4\": [ 12, \"abc\" ]" +      // additional, undeclared property of type array.
+                " }";
+            GrandparentAnimal o = json.getContext(null).readValue(str, GrandparentAnimal.class);            
+            assertNotNull(o);
+            assertTrue(o instanceof ParentPet);
+            assertTrue(o instanceof ChildCat);
+            ChildCat c = (ChildCat)o;
+            assertEquals("fluffy", c.getName());
+            assertNotNull(c.getAdditionalProperties());
+            assertEquals(4, c.getAdditionalProperties().size());
+            assertTrue(c.getAdditionalProperties().containsKey("stuff1"));
+            assertTrue(c.getAdditionalProperties().containsKey("stuff2"));
+            assertTrue(c.getAdditionalProperties().containsKey("stuff3"));
+            assertTrue(c.getAdditionalProperties().containsKey("stuff4"));
+            assertEquals("the_value", c.getAdditionalProperties().get("stuff1"));
+            assertNotNull(c.getAdditionalProperties().get("stuff2"));
+            assertTrue(c.getAdditionalProperties().get("stuff2") instanceof Map);
+            assertNull(c.getAdditionalProperties().get("stuff3"));
+            assertNotNull(c.getAdditionalProperties().get("stuff4"));
+            assertTrue(c.getAdditionalProperties().get("stuff4") instanceof List);
+        }
+        {
+            String str = "{ \"pet_type\": \"ChildCat\", \"name\": \"fluffy\" }";
+            ParentPet o = json.getContext(null).readValue(str, ParentPet.class);            
+            assertNotNull(o);
+            assertTrue(o instanceof ChildCat);
+            ChildCat c = (ChildCat)o;
+            assertEquals("fluffy", c.getName());
+        }
+        {
+            // Wrong discriminator value in the payload.
+            String str = "{ \"pet_type\": \"Garbage\", \"name\": \"fluffy\" }";
+            Exception exception = assertThrows(JsonMappingException.class, () -> {
+                json.getContext(null).readValue(str, GrandparentAnimal.class);
+            });
+            assertTrue(exception.getMessage().contains("Could not resolve type id 'Garbage'"));
+        }
+    }
+
+    @Test
+    public void testNullValueDisallowed() throws Exception {
+        {
+            String str = "{ \"id\": 123, \"petId\": 345, \"quantity\": 100, \"status\": \"placed\" }";
+            Order o = json.getContext(null).readValue(str, Order.class);
+            assertEquals(100L, (long)o.getQuantity());
+            assertEquals(Order.StatusEnum.PLACED, o.getStatus());
+        }
+        {
+            String str = "{ \"id\": 123, \"petId\": 345, \"quantity\": null }";
+            Order o = json.getContext(null).readValue(str, Order.class);
+            // TODO: the null value is not allowed per OAS document.
+            // The deserialization should fail.
+            assertNull(o.getQuantity());
+        }
+    }
+
+    /**
+     * Validate a anyOf schema can be deserialized into the expected class.
+     * The anyOf schema has a discriminator. 
+     */
+    @Test
+    public void testAnyOfSchemaWithoutDiscriminator() throws Exception {
+        {
+            // TODO: the GmFruit defines a 'color' property, which should be allowed
+            // in the input data, but the generated code does not have it.
+            String str = "{ \"cultivar\": \"golden delicious\", \"origin\": \"California\" }";
+            GmFruit o = json.getContext(null).readValue(str, GmFruit.class);
+            assertTrue(o.getActualInstance() instanceof Apple);
+            Apple inst = (Apple) o.getActualInstance();
+            assertEquals("golden delicious", inst.getCultivar());
+            assertEquals("California", inst.getOrigin());
+            // TODO: the 'Color' property is not generated for the 'GmFruit'.
+            //assertEquals("yellow", o.getColor());
+        }
+        {
+            String str = "{ \"lengthCm\": 17 }";
+            GmFruit o = json.getContext(null).readValue(str, GmFruit.class);
+            assertTrue(o.getActualInstance() instanceof Banana);
+            Banana inst = (Banana) o.getActualInstance();
+            assertEquals(new java.math.BigDecimal(17), inst.getLengthCm());
+        }
+        {
+            // Deserialize empty object. This should work because it will match either apple or banana.
+            String str = "{ }";
+            GmFruit o = json.getContext(null).readValue(str, GmFruit.class);
+            // The payload matches against either apple or banana, so either model could be returned,
+            // but the implementation always picks the first anyOf child schema that matches the
+            // input payload.
+            assertTrue(o.getActualInstance() instanceof Apple);
+        }
+        {
+            // Deserialize the null value. This is not allowed because the 'gmFruit' schema
+            // is not nullable.
+            String str = "null";
+            Exception exception = assertThrows(JsonMappingException.class, () -> {
+                GmFruit o = json.getContext(null).readValue(str, GmFruit.class);
+            });
+            assertTrue(exception.getMessage().contains("GmFruit cannot be null"));
+        }  
+    }
+}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONTest.java
index 7fb307a3df8d..dda1ef9c1efd 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONTest.java
@@ -3,7 +3,9 @@
 import org.openapitools.client.model.Order;
 
 import java.lang.Exception;
-
+import java.util.Date;
+import java.util.TimeZone;
+import java.text.SimpleDateFormat;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -32,6 +34,33 @@ public void testDefaultDate() throws Exception {
         assertEquals(dateStr, dateFormat.format(o.getShipDate()));
     }
 
+    @Test
+    public void testRFC3339DateFormatDate() throws Exception {
+        {
+            String dateStr = "2011-01-18 00:00:00.0Z";
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S'Z'");
+            sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
+            Date date = sdf.parse(dateStr);
+            
+            RFC3339DateFormat df = new RFC3339DateFormat();
+            StringBuffer sb = new StringBuffer();
+            String s = df.format(date);
+            System.out.println("DATE: " + s);
+            assertEquals("2011-01-18T00:00:00.000Z", s);
+        }
+        {
+            String dateStr = "2011-01-18 00:00:00.0";
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");
+            sdf.setTimeZone(TimeZone.getTimeZone("America/Los_Angeles"));
+            Date date = sdf.parse(dateStr);
+            
+            RFC3339DateFormat df = new RFC3339DateFormat();
+            StringBuffer sb = new StringBuffer();
+            String s = df.format(date);
+            assertEquals("2011-01-18T08:00:00.000Z", s);
+        }
+    }
+
     @Test
     public void testCustomDate() throws Exception {
         final DateTimeFormatter dateFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("Etc/GMT+2"));
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/PetApiTest.java
index 866d46d816dc..bddf4c4db819 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -16,14 +16,15 @@
 import org.openapitools.client.*;
 import org.openapitools.client.auth.*;
 import java.io.File;
-import org.openapitools.client.model.ModelApiResponse;
-import org.openapitools.client.model.Pet;
+import org.openapitools.client.model.*;
 import org.junit.Test;
 import org.junit.Ignore;
 import org.junit.Assert;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +34,7 @@
 public class PetApiTest {
 
     private final PetApi api = new PetApi();
+    private final long petId = 5638l;
 
     /**
      * Add a new pet to the store
@@ -44,9 +46,61 @@ public class PetApiTest {
      */
     @Test
     public void addPetTest() throws ApiException {
-        //Pet pet = null;
-        //api.addPet(pet);
-        // TODO: test validations
+        // add pet
+        Pet body = new Pet();
+        body.setId(petId);
+        body.setName("jersey2 java8 pet");
+        Category category = new Category();
+        category.setId(petId);
+        category.setName("jersey2 java8 category");
+        body.setCategory(category);
+        body.setStatus(Pet.StatusEnum.AVAILABLE);
+        body.setPhotoUrls(Arrays.asList("A", "B", "C"));
+        Tag tag = new Tag();
+        tag.setId(petId);
+        tag.setName("jersey2 java8 tag");
+        body.setTags(Arrays.asList(tag));
+
+        api.addPet(body);
+
+        //get pet by ID
+        Pet result = api.getPetById(petId);
+        Assert.assertEquals(result.getId(), body.getId());
+        Assert.assertEquals(result.getCategory(), category);
+        Assert.assertEquals(result.getName(), body.getName());
+        Assert.assertEquals(result.getPhotoUrls(), body.getPhotoUrls());
+        Assert.assertEquals(result.getStatus(), body.getStatus());
+        Assert.assertEquals(result.getTags(), body.getTags());
+
+        // update pet
+        api.updatePetWithForm(petId, "jersey2 java8 pet 2", "sold");
+
+        //get pet by ID
+        Pet result2 = api.getPetById(petId);
+        Assert.assertEquals(result2.getId(), body.getId());
+        Assert.assertEquals(result2.getCategory(), category);
+        Assert.assertEquals(result2.getName(), "jersey2 java8 pet 2");
+        Assert.assertEquals(result2.getPhotoUrls(), body.getPhotoUrls());
+        Assert.assertEquals(result2.getStatus(), Pet.StatusEnum.SOLD);
+        Assert.assertEquals(result2.getTags(), body.getTags());
+
+        // delete pet
+        api.deletePet(petId, "empty api key");
+
+        try {
+            Pet result3 = api.getPetById(petId);
+            Assert.assertEquals(false, true);
+        } catch (ApiException e) {
+//            System.err.println("Exception when calling PetApi#getPetById");
+//            System.err.println("Status code: " + e.getCode());
+//            System.err.println("Reason: " + e.getResponseBody());
+//            System.err.println("Response headers: " + e.getResponseHeaders());
+
+            Assert.assertEquals(e.getCode(), 404);
+            Assert.assertEquals(e.getResponseBody(), "{\"code\":1,\"type\":\"error\",\"message\":\"Pet not found\"}");
+
+        }
+
     }
 
     /**
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/MammalTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/MammalTest.java
index 58c9e49194e8..3bbcb214d3e9 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/MammalTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/MammalTest.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.JSON;
 import org.openapitools.client.model.Pig;
 import org.openapitools.client.model.Whale;
 import org.openapitools.client.model.Zebra;
@@ -39,8 +40,32 @@ public class MammalTest {
      * Model tests for Mammal
      */
     @Test
-    public void testMammal() {
-        // TODO: test Mammal
+    public void testMammal() throws Exception {
+        Mammal m = new Mammal();
+        Zebra z = new Zebra();
+        z.setType(Zebra.TypeEnum.MOUNTAIN);
+        z.setClassName("zebra");
+        m.setActualInstance(z);
+        Assert.assertEquals(JSON.getDefault().getMapper().writeValueAsString(m), "{\"type\":\"mountain\",\"className\":\"zebra\"}");
+    }
+
+    /**
+     * Model tests for getActualInstanceRecursively
+     */
+    @Test
+    public void testGetActualInstanceRecursively() throws Exception {
+        Mammal m = new Mammal();
+        Pig p = new Pig();
+        DanishPig dp = new DanishPig();
+        dp.setClassName("danish_pig");
+        p.setActualInstance(dp);
+        m.setActualInstance(p);
+        Assert.assertTrue(m.getActualInstanceRecursively() instanceof DanishPig);
+
+        Pig p2 = new Pig();
+        m.setActualInstance(p2);
+        Assert.assertEquals(m.getActualInstanceRecursively(), null);
+
     }
 
     /**
@@ -75,4 +100,33 @@ public void typeTest() {
         // TODO: test type
     }
 
+    /**
+     * Test code sample
+     */
+    @Test
+    public void codeSampleTest() {
+        Mammal exampleMammal = new Mammal();
+ 
+        // create a new Pig
+        Pig examplePig = new Pig();
+        // set Mammal to Pig
+        exampleMammal.setActualInstance(examplePig);
+        // to get back the Pig set earlier
+        Pig testPig = (Pig) exampleMammal.getActualInstance();
+
+        // create a new Whale
+        Whale exampleWhale = new Whale();
+        // set Mammal to Whale
+        exampleMammal.setActualInstance(exampleWhale);
+        // to get back the Whale set earlier
+        Whale testWhale = (Whale) exampleMammal.getActualInstance();
+
+        // create a new Zebra
+        Zebra exampleZebra = new Zebra();
+        // set Mammal to Zebra
+        exampleMammal.setActualInstance(exampleZebra);
+        // to get back the Zebra set earlier
+        Zebra testZebra = (Zebra) exampleMammal.getActualInstance();
+    }
+
 }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/ZebraTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/ZebraTest.java
index 28ce0c1d7f88..357d7837928a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/ZebraTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/ZebraTest.java
@@ -3,7 +3,7 @@
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * The version of the OpenAPI document: 1.0.0
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -13,18 +13,15 @@
 
 package org.openapitools.client.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
+import com.fasterxml.jackson.databind.type.MapType;
+import com.fasterxml.jackson.databind.type.TypeFactory;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
+import org.openapitools.client.JSON;
 
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Model tests for Zebra
@@ -37,7 +34,29 @@ public class ZebraTest {
      */
     @Test
     public void testZebra() {
-        // TODO: test Zebra
+        Zebra z = new Zebra();
+        z.setClassName("zebra");
+        Map<String, String> m = new HashMap<>();
+        z.putAdditionalProperty("key1", "value1");
+        z.putAdditionalProperty("key2", 12321);
+        z.setType(Zebra.TypeEnum.MOUNTAIN);
+
+        JSON j = new JSON();
+        try {
+            // serialize
+            Assert.assertEquals(j.getMapper().writeValueAsString(z), "{\"type\":\"mountain\",\"className\":\"zebra\",\"key1\":\"value1\",\"key2\":12321}");
+
+            // deserialize
+            String zebraJson = "{\"type\":\"mountain\",\"className\":\"zebra\",\"key1\":\"value1\",\"key2\":12321}";
+            Zebra zebraFromJson = j.getMapper().readValue(zebraJson, Zebra.class);
+            Assert.assertEquals(zebraFromJson.getType(), Zebra.TypeEnum.MOUNTAIN);
+            Assert.assertEquals(zebraFromJson.getClassName(), "zebra");
+            Assert.assertEquals(zebraFromJson.getAdditionalProperties().size(), 2);
+            Assert.assertEquals(zebraFromJson.getAdditionalProperty("key1"), "value1");
+            Assert.assertEquals(zebraFromJson.getAdditionalProperty("key2"), 12321);
+        } catch (Exception ex) {
+            Assert.assertEquals(true, false); // exception shouldn't be thrown
+        }
     }
 
     /**
@@ -45,7 +64,23 @@ public void testZebra() {
      */
     @Test
     public void typeTest() {
-        // TODO: test type
+        String zebraJson = "{\"type\":\"mountain\",\"className\":\"zebra\",\"key1\":\"value1\",\"key2\":12321}";
+
+        JSON j = new JSON();
+        TypeFactory typeFactory = j.getMapper().getTypeFactory();
+        MapType mapType = typeFactory.constructMapType(HashMap.class, String.class, Object.class);
+        try {
+            HashMap<String, Object> map = j.getMapper().readValue(zebraJson, mapType);
+            Assert.assertEquals(map.get("type"), "mountain");
+
+            Map<String,Object> result =
+                    j.getMapper().readValue(zebraJson, new TypeReference<Map<String,Object>>() {});
+
+            Assert.assertEquals(result.get("type"), "mountain");
+        } catch (Exception ex) {
+            Assert.assertEquals(true, false); // exception shouldn't be thrown
+        }
+
     }
 
     /**
@@ -53,7 +88,7 @@ public void typeTest() {
      */
     @Test
     public void classNameTest() {
-        // TODO: test className
+
     }
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/.openapi-generator/FILES b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/.openapi-generator/FILES
index 63cd1381e9d8..106ea4db2ae5 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/.openapi-generator/FILES
@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 build.gradle
 docs/200Response.md
@@ -64,6 +63,12 @@ src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
 src/main/kotlin/org/openapitools/client/apis/PetApi.kt
 src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
 src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
+src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
+src/main/kotlin/org/openapitools/client/auth/HttpBearerAuth.kt
+src/main/kotlin/org/openapitools/client/auth/OAuth.kt
+src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt
+src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt
 src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
 src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/CollectionFormats.kt
@@ -71,6 +76,7 @@ src/main/kotlin/org/openapitools/client/infrastructure/DateAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt
 src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
 src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
 src/main/kotlin/org/openapitools/client/models/Animal.kt
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/README.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/README.md
index b7028d917a24..7d37a6283317 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/README.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
@@ -35,45 +35,45 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
-*DefaultApi* | [**fooGet**](docs/DefaultApi.md#fooget) | **GET** /foo | 
-*FakeApi* | [**fakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint
-*FakeApi* | [**fakeHttpSignatureTest**](docs/FakeApi.md#fakehttpsignaturetest) | **GET** /fake/http-signature-test | test http signature authentication
-*FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
-*FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
-*FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
-*FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
-*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
-*FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
-*FakeApi* | [**testClientModel**](docs/FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-*FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
-*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-*FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-*FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
-*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-paramters | 
-*FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case
-*PetApi* | [**addPet**](docs/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
-*PetApi* | [**deletePet**](docs/PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
-*PetApi* | [**findPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
-*PetApi* | [**findPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
-*PetApi* | [**getPetById**](docs/PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
-*PetApi* | [**updatePet**](docs/PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
-*PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
-*PetApi* | [**uploadFile**](docs/PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
-*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-*StoreApi* | [**getInventory**](docs/StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**getOrderById**](docs/StoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID
-*StoreApi* | [**placeOrder**](docs/StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
-*UserApi* | [**createUser**](docs/UserApi.md#createuser) | **POST** /user | Create user
-*UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
-*UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
-*UserApi* | [**deleteUser**](docs/UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
-*UserApi* | [**getUserByName**](docs/UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
-*UserApi* | [**loginUser**](docs/UserApi.md#loginuser) | **GET** /user/login | Logs user into the system
-*UserApi* | [**logoutUser**](docs/UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
-*UserApi* | [**updateUser**](docs/UserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** another-fake/dummy | To test special tags
+*DefaultApi* | [**fooGet**](docs/DefaultApi.md#fooget) | **GET** foo | 
+*FakeApi* | [**fakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** fake/health | Health check endpoint
+*FakeApi* | [**fakeHttpSignatureTest**](docs/FakeApi.md#fakehttpsignaturetest) | **GET** fake/http-signature-test | test http signature authentication
+*FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** fake/outer/boolean | 
+*FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** fake/outer/composite | 
+*FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **POST** fake/outer/number | 
+*FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeouterstringserialize) | **POST** fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testbodywithfileschema) | **PUT** fake/body-with-file-schema | 
+*FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testbodywithqueryparams) | **PUT** fake/body-with-query-params | 
+*FakeApi* | [**testClientModel**](docs/FakeApi.md#testclientmodel) | **PATCH** fake | To test \"client\" model
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testendpointparameters) | **POST** fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testenumparameters) | **GET** fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testgroupparameters) | **DELETE** fake | Fake endpoint to test group parameters (optional)
+*FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testinlineadditionalproperties) | **POST** fake/inline-additionalProperties | test inline additionalProperties
+*FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testjsonformdata) | **GET** fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testqueryparametercollectionformat) | **PUT** fake/test-query-paramters | 
+*FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testclassname) | **PATCH** fake_classname_test | To test class name in snake case
+*PetApi* | [**addPet**](docs/PetApi.md#addpet) | **POST** pet | Add a new pet to the store
+*PetApi* | [**deletePet**](docs/PetApi.md#deletepet) | **DELETE** pet/{petId} | Deletes a pet
+*PetApi* | [**findPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** pet/findByStatus | Finds Pets by status
+*PetApi* | [**findPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** pet/findByTags | Finds Pets by tags
+*PetApi* | [**getPetById**](docs/PetApi.md#getpetbyid) | **GET** pet/{petId} | Find pet by ID
+*PetApi* | [**updatePet**](docs/PetApi.md#updatepet) | **PUT** pet | Update an existing pet
+*PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**uploadFile**](docs/PetApi.md#uploadfile) | **POST** pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadfilewithrequiredfile) | **POST** fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** store/order/{order_id} | Delete purchase order by ID
+*StoreApi* | [**getInventory**](docs/StoreApi.md#getinventory) | **GET** store/inventory | Returns pet inventories by status
+*StoreApi* | [**getOrderById**](docs/StoreApi.md#getorderbyid) | **GET** store/order/{order_id} | Find purchase order by ID
+*StoreApi* | [**placeOrder**](docs/StoreApi.md#placeorder) | **POST** store/order | Place an order for a pet
+*UserApi* | [**createUser**](docs/UserApi.md#createuser) | **POST** user | Create user
+*UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** user/createWithArray | Creates list of users with given input array
+*UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** user/createWithList | Creates list of users with given input array
+*UserApi* | [**deleteUser**](docs/UserApi.md#deleteuser) | **DELETE** user/{username} | Delete user
+*UserApi* | [**getUserByName**](docs/UserApi.md#getuserbyname) | **GET** user/{username} | Get user by user name
+*UserApi* | [**loginUser**](docs/UserApi.md#loginuser) | **GET** user/login | Logs user into the system
+*UserApi* | [**logoutUser**](docs/UserApi.md#logoutuser) | **GET** user/logout | Logs out current logged in user session
+*UserApi* | [**updateUser**](docs/UserApi.md#updateuser) | **PUT** user/{username} | Updated user
 
 
 <a name="documentation-for-models"></a>
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/build.gradle b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/build.gradle
index 9f83d5b1d793..9c970542197e 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/build.gradle
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/build.gradle
@@ -30,6 +30,7 @@ test {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.0"
     compile "com.google.code.gson:gson:2.8.6"
     compile "com.squareup.retrofit2:retrofit:$retrofitVersion"
     compile "com.squareup.retrofit2:converter-gson:$retrofitVersion"
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/AnotherFakeApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/AnotherFakeApi.md
index 55d482238db4..156775968354 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/AnotherFakeApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/AnotherFakeApi.md
@@ -4,12 +4,9 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** another-fake/dummy | To test special tags
 
 
-<a name="call123testSpecialTags"></a>
-# **call123testSpecialTags**
-> Client call123testSpecialTags(client)
 
 To test special tags
 
@@ -18,20 +15,16 @@ To test special tags and operation ID starting with number
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = AnotherFakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(AnotherFakeApi::class.java)
 val client : Client =  // Client | client model
-try {
-    val result : Client = apiInstance.call123testSpecialTags(client)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling AnotherFakeApi#call123testSpecialTags")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling AnotherFakeApi#call123testSpecialTags")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : Client = webService.call123testSpecialTags(client)
 }
 ```
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/ArrayOfArrayOfNumberOnly.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/ArrayOfArrayOfNumberOnly.md
index 23a475664205..bcc306caeb6d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/ArrayOfArrayOfNumberOnly.md
@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayArrayNumber** | **kotlin.Array&lt;kotlin.Array&lt;java.math.BigDecimal&gt;&gt;** |  |  [optional]
+**arrayArrayNumber** | **kotlin.collections.List&lt;kotlin.collections.List&lt;java.math.BigDecimal&gt;&gt;** |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/ArrayOfNumberOnly.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/ArrayOfNumberOnly.md
index b115a5d54c22..00c57a7885e8 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/ArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/ArrayOfNumberOnly.md
@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayNumber** | [**kotlin.Array&lt;java.math.BigDecimal&gt;**](java.math.BigDecimal.md) |  |  [optional]
+**arrayNumber** | [**kotlin.collections.List&lt;java.math.BigDecimal&gt;**](java.math.BigDecimal.md) |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/ArrayTest.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/ArrayTest.md
index aa0bbbe936c1..45e59c8fe77c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/ArrayTest.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/ArrayTest.md
@@ -4,9 +4,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayOfString** | **kotlin.Array&lt;kotlin.String&gt;** |  |  [optional]
-**arrayArrayOfInteger** | **kotlin.Array&lt;kotlin.Array&lt;kotlin.Long&gt;&gt;** |  |  [optional]
-**arrayArrayOfModel** | **kotlin.Array&lt;kotlin.Array&lt;ReadOnlyFirst&gt;&gt;** |  |  [optional]
+**arrayOfString** | **kotlin.collections.List&lt;kotlin.String&gt;** |  |  [optional]
+**arrayArrayOfInteger** | **kotlin.collections.List&lt;kotlin.collections.List&lt;kotlin.Long&gt;&gt;** |  |  [optional]
+**arrayArrayOfModel** | **kotlin.collections.List&lt;kotlin.collections.List&lt;ReadOnlyFirst&gt;&gt;** |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/DefaultApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/DefaultApi.md
index 784be537594d..94fd5b8b07e6 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/DefaultApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/DefaultApi.md
@@ -4,31 +4,24 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**fooGet**](DefaultApi.md#fooGet) | **GET** /foo | 
+[**fooGet**](DefaultApi.md#fooGet) | **GET** foo | 
 
 
-<a name="fooGet"></a>
-# **fooGet**
-> InlineResponseDefault fooGet()
 
 
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = DefaultApi()
-try {
-    val result : InlineResponseDefault = apiInstance.fooGet()
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling DefaultApi#fooGet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling DefaultApi#fooGet")
-    e.printStackTrace()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(DefaultApi::class.java)
+
+launch(Dispatchers.IO) {
+    val result : InlineResponseDefault = webService.fooGet()
 }
 ```
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/EnumArrays.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/EnumArrays.md
index 719084e5f949..c3c5e235bfed 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/EnumArrays.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **justSymbol** | [**inline**](#JustSymbolEnum) |  |  [optional]
-**arrayEnum** | [**inline**](#kotlin.Array&lt;ArrayEnumEnum&gt;) |  |  [optional]
+**arrayEnum** | [**inline**](#kotlin.collections.List&lt;ArrayEnumEnum&gt;) |  |  [optional]
 
 
 <a name="JustSymbolEnum"></a>
@@ -15,7 +15,7 @@ Name | Value
 justSymbol | &gt;&#x3D;, $
 
 
-<a name="kotlin.Array<ArrayEnumEnum>"></a>
+<a name="kotlin.collections.List<ArrayEnumEnum>"></a>
 ## Enum: array_enum
 Name | Value
 ---- | -----
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
index 0a28947aa843..6220efdaa290 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
@@ -4,45 +4,38 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**fakeHealthGet**](FakeApi.md#fakeHealthGet) | **GET** /fake/health | Health check endpoint
-[**fakeHttpSignatureTest**](FakeApi.md#fakeHttpSignatureTest) | **GET** /fake/http-signature-test | test http signature authentication
-[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
-[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
-[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
-[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
-[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
-[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
-[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
-[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
-[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
-
-
-<a name="fakeHealthGet"></a>
-# **fakeHealthGet**
-> HealthCheckResult fakeHealthGet()
+[**fakeHealthGet**](FakeApi.md#fakeHealthGet) | **GET** fake/health | Health check endpoint
+[**fakeHttpSignatureTest**](FakeApi.md#fakeHttpSignatureTest) | **GET** fake/http-signature-test | test http signature authentication
+[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** fake/outer/boolean | 
+[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** fake/outer/composite | 
+[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** fake/outer/number | 
+[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** fake/outer/string | 
+[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** fake/body-with-file-schema | 
+[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** fake/body-with-query-params | 
+[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** fake | To test \&quot;client\&quot; model
+[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** fake | To test enum parameters
+[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** fake | Fake endpoint to test group parameters (optional)
+[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** fake/inline-additionalProperties | test inline additionalProperties
+[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** fake/jsonFormData | test json serialization of form data
+[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** fake/test-query-paramters | 
+
+
 
 Health check endpoint
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
-try {
-    val result : HealthCheckResult = apiInstance.fakeHealthGet()
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeHealthGet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeHealthGet")
-    e.printStackTrace()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
+
+launch(Dispatchers.IO) {
+    val result : HealthCheckResult = webService.fakeHealthGet()
 }
 ```
 
@@ -62,30 +55,24 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
-<a name="fakeHttpSignatureTest"></a>
-# **fakeHttpSignatureTest**
-> fakeHttpSignatureTest(pet, query1, header1)
 
 test http signature authentication
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val pet : Pet =  // Pet | Pet object that needs to be added to the store
 val query1 : kotlin.String = query1_example // kotlin.String | query parameter
 val header1 : kotlin.String = header1_example // kotlin.String | header parameter
-try {
-    apiInstance.fakeHttpSignatureTest(pet, query1, header1)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeHttpSignatureTest")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeHttpSignatureTest")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.fakeHttpSignatureTest(pet, query1, header1)
 }
 ```
 
@@ -110,9 +97,6 @@ null (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
-<a name="fakeOuterBooleanSerialize"></a>
-# **fakeOuterBooleanSerialize**
-> kotlin.Boolean fakeOuterBooleanSerialize(body)
 
 
 
@@ -121,20 +105,16 @@ Test serialization of outer boolean types
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val body : kotlin.Boolean = true // kotlin.Boolean | Input boolean as post body
-try {
-    val result : kotlin.Boolean = apiInstance.fakeOuterBooleanSerialize(body)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeOuterBooleanSerialize")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeOuterBooleanSerialize")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : kotlin.Boolean = webService.fakeOuterBooleanSerialize(body)
 }
 ```
 
@@ -157,9 +137,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
-<a name="fakeOuterCompositeSerialize"></a>
-# **fakeOuterCompositeSerialize**
-> OuterComposite fakeOuterCompositeSerialize(outerComposite)
 
 
 
@@ -168,20 +145,16 @@ Test serialization of object with outer number type
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val outerComposite : OuterComposite =  // OuterComposite | Input composite as post body
-try {
-    val result : OuterComposite = apiInstance.fakeOuterCompositeSerialize(outerComposite)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeOuterCompositeSerialize")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeOuterCompositeSerialize")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : OuterComposite = webService.fakeOuterCompositeSerialize(outerComposite)
 }
 ```
 
@@ -204,9 +177,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
-<a name="fakeOuterNumberSerialize"></a>
-# **fakeOuterNumberSerialize**
-> java.math.BigDecimal fakeOuterNumberSerialize(body)
 
 
 
@@ -215,20 +185,16 @@ Test serialization of outer number types
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val body : java.math.BigDecimal = 8.14 // java.math.BigDecimal | Input number as post body
-try {
-    val result : java.math.BigDecimal = apiInstance.fakeOuterNumberSerialize(body)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeOuterNumberSerialize")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeOuterNumberSerialize")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : java.math.BigDecimal = webService.fakeOuterNumberSerialize(body)
 }
 ```
 
@@ -251,9 +217,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
-<a name="fakeOuterStringSerialize"></a>
-# **fakeOuterStringSerialize**
-> kotlin.String fakeOuterStringSerialize(body)
 
 
 
@@ -262,20 +225,16 @@ Test serialization of outer string types
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val body : kotlin.String = body_example // kotlin.String | Input string as post body
-try {
-    val result : kotlin.String = apiInstance.fakeOuterStringSerialize(body)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeOuterStringSerialize")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeOuterStringSerialize")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : kotlin.String = webService.fakeOuterStringSerialize(body)
 }
 ```
 
@@ -298,9 +257,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
-<a name="testBodyWithFileSchema"></a>
-# **testBodyWithFileSchema**
-> testBodyWithFileSchema(fileSchemaTestClass)
 
 
 
@@ -309,19 +265,16 @@ For this test, the body for this request much reference a schema named &#x60;Fil
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val fileSchemaTestClass : FileSchemaTestClass =  // FileSchemaTestClass | 
-try {
-    apiInstance.testBodyWithFileSchema(fileSchemaTestClass)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testBodyWithFileSchema")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testBodyWithFileSchema")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.testBodyWithFileSchema(fileSchemaTestClass)
 }
 ```
 
@@ -344,29 +297,23 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="testBodyWithQueryParams"></a>
-# **testBodyWithQueryParams**
-> testBodyWithQueryParams(query, user)
 
 
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val query : kotlin.String = query_example // kotlin.String | 
 val user : User =  // User | 
-try {
-    apiInstance.testBodyWithQueryParams(query, user)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testBodyWithQueryParams")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testBodyWithQueryParams")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.testBodyWithQueryParams(query, user)
 }
 ```
 
@@ -390,9 +337,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="testClientModel"></a>
-# **testClientModel**
-> Client testClientModel(client)
 
 To test \&quot;client\&quot; model
 
@@ -401,20 +345,16 @@ To test \&quot;client\&quot; model
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val client : Client =  // Client | client model
-try {
-    val result : Client = apiInstance.testClientModel(client)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testClientModel")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testClientModel")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : Client = webService.testClientModel(client)
 }
 ```
 
@@ -437,9 +377,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
-<a name="testEndpointParameters"></a>
-# **testEndpointParameters**
-> testEndpointParameters(number, double, patternWithoutDelimiter, byte, integer, int32, int64, float, string, binary, date, dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -448,10 +385,13 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+apiClient.setCredentials("USERNAME", "PASSWORD")
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val number : java.math.BigDecimal = 8.14 // java.math.BigDecimal | None
 val double : kotlin.Double = 1.2 // kotlin.Double | None
 val patternWithoutDelimiter : kotlin.String = patternWithoutDelimiter_example // kotlin.String | None
@@ -466,14 +406,9 @@ val date : java.time.LocalDate = 2013-10-20 // java.time.LocalDate | None
 val dateTime : java.time.OffsetDateTime = 2013-10-20T19:20:30+01:00 // java.time.OffsetDateTime | None
 val password : kotlin.String = password_example // kotlin.String | None
 val paramCallback : kotlin.String = paramCallback_example // kotlin.String | None
-try {
-    apiInstance.testEndpointParameters(number, double, patternWithoutDelimiter, byte, integer, int32, int64, float, string, binary, date, dateTime, password, paramCallback)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testEndpointParameters")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testEndpointParameters")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.testEndpointParameters(number, double, patternWithoutDelimiter, byte, integer, int32, int64, float, string, binary, date, dateTime, password, paramCallback)
 }
 ```
 
@@ -504,17 +439,13 @@ null (empty response body)
 
 
 Configure http_basic_test:
-    ApiClient.username = ""
-    ApiClient.password = ""
+    ApiClient().setCredentials("USERNAME", "PASSWORD")
 
 ### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
-<a name="testEnumParameters"></a>
-# **testEnumParameters**
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
 
 To test enum parameters
 
@@ -523,10 +454,12 @@ To test enum parameters
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val enumHeaderStringArray : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Header parameter enum test (string array)
 val enumHeaderString : kotlin.String = enumHeaderString_example // kotlin.String | Header parameter enum test (string)
 val enumQueryStringArray : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Query parameter enum test (string array)
@@ -535,14 +468,9 @@ val enumQueryInteger : kotlin.Int = 56 // kotlin.Int | Query parameter enum test
 val enumQueryDouble : kotlin.Double = 1.2 // kotlin.Double | Query parameter enum test (double)
 val enumFormStringArray : kotlin.Array<kotlin.String> = enumFormStringArray_example // kotlin.Array<kotlin.String> | Form parameter enum test (string array)
 val enumFormString : kotlin.String = enumFormString_example // kotlin.String | Form parameter enum test (string)
-try {
-    apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testEnumParameters")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testEnumParameters")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
 }
 ```
 
@@ -572,9 +500,6 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
-<a name="testGroupParameters"></a>
-# **testGroupParameters**
-> testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
 
 Fake endpoint to test group parameters (optional)
 
@@ -583,24 +508,22 @@ Fake endpoint to test group parameters (optional)
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+apiClient.setBearerToken("TOKEN")
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val requiredStringGroup : kotlin.Int = 56 // kotlin.Int | Required String in group parameters
 val requiredBooleanGroup : kotlin.Boolean = true // kotlin.Boolean | Required Boolean in group parameters
 val requiredInt64Group : kotlin.Long = 789 // kotlin.Long | Required Integer in group parameters
 val stringGroup : kotlin.Int = 56 // kotlin.Int | String in group parameters
 val booleanGroup : kotlin.Boolean = true // kotlin.Boolean | Boolean in group parameters
 val int64Group : kotlin.Long = 789 // kotlin.Long | Integer in group parameters
-try {
-    apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testGroupParameters")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testGroupParameters")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
 }
 ```
 
@@ -623,35 +546,29 @@ null (empty response body)
 
 
 Configure bearer_test:
-    ApiClient.accessToken = ""
+    ApiClient().setBearerToken("TOKEN")
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="testInlineAdditionalProperties"></a>
-# **testInlineAdditionalProperties**
-> testInlineAdditionalProperties(requestBody)
 
 test inline additionalProperties
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val requestBody : kotlin.collections.Map<kotlin.String, kotlin.String> =  // kotlin.collections.Map<kotlin.String, kotlin.String> | request body
-try {
-    apiInstance.testInlineAdditionalProperties(requestBody)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testInlineAdditionalProperties")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testInlineAdditionalProperties")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.testInlineAdditionalProperties(requestBody)
 }
 ```
 
@@ -674,29 +591,23 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="testJsonFormData"></a>
-# **testJsonFormData**
-> testJsonFormData(param, param2)
 
 test json serialization of form data
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val param : kotlin.String = param_example // kotlin.String | field1
 val param2 : kotlin.String = param2_example // kotlin.String | field2
-try {
-    apiInstance.testJsonFormData(param, param2)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testJsonFormData")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testJsonFormData")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.testJsonFormData(param, param2)
 }
 ```
 
@@ -720,9 +631,6 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
-<a name="testQueryParameterCollectionFormat"></a>
-# **testQueryParameterCollectionFormat**
-> testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
 
 
 
@@ -731,23 +639,20 @@ To test the collection format in query parameters
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val pipe : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
 val ioutil : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
 val http : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
 val url : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
 val context : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
-try {
-    apiInstance.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testQueryParameterCollectionFormat")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testQueryParameterCollectionFormat")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
 }
 ```
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeClassnameTags123Api.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeClassnameTags123Api.md
index 962dfd4d2dc2..a4f74c60610d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeClassnameTags123Api.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeClassnameTags123Api.md
@@ -4,12 +4,9 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
+[**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** fake_classname_test | To test class name in snake case
 
 
-<a name="testClassname"></a>
-# **testClassname**
-> Client testClassname(client)
 
 To test class name in snake case
 
@@ -18,20 +15,16 @@ To test class name in snake case
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeClassnameTags123Api()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeClassnameTags123Api::class.java)
 val client : Client =  // Client | client model
-try {
-    val result : Client = apiInstance.testClassname(client)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeClassnameTags123Api#testClassname")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeClassnameTags123Api#testClassname")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : Client = webService.testClassname(client)
 }
 ```
 
@@ -48,9 +41,6 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure api_key_query:
-    ApiClient.apiKey["api_key_query"] = ""
-    ApiClient.apiKeyPrefix["api_key_query"] = ""
 
 ### HTTP request headers
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FileSchemaTestClass.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FileSchemaTestClass.md
index 089e61862c2a..e5512f82f6f6 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FileSchemaTestClass.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FileSchemaTestClass.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **file** | [**java.io.File**](java.io.File.md) |  |  [optional]
-**files** | [**kotlin.Array&lt;java.io.File&gt;**](java.io.File.md) |  |  [optional]
+**files** | [**kotlin.collections.List&lt;java.io.File&gt;**](java.io.File.md) |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/InlineObject2.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/InlineObject2.md
index 0720925918bf..a98ffe031b3d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/InlineObject2.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/InlineObject2.md
@@ -4,11 +4,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**enumFormStringArray** | [**inline**](#kotlin.Array&lt;EnumFormStringArrayEnum&gt;) | Form parameter enum test (string array) |  [optional]
+**enumFormStringArray** | [**inline**](#kotlin.collections.List&lt;EnumFormStringArrayEnum&gt;) | Form parameter enum test (string array) |  [optional]
 **enumFormString** | [**inline**](#EnumFormStringEnum) | Form parameter enum test (string) |  [optional]
 
 
-<a name="kotlin.Array<EnumFormStringArrayEnum>"></a>
+<a name="kotlin.collections.List<EnumFormStringArrayEnum>"></a>
 ## Enum: enum_form_string_array
 Name | Value
 ---- | -----
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/NullableClass.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/NullableClass.md
index 9ec43d0b87c6..335943c01eae 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/NullableClass.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/NullableClass.md
@@ -10,9 +10,9 @@ Name | Type | Description | Notes
 **stringProp** | **kotlin.String** |  |  [optional]
 **dateProp** | [**java.time.LocalDate**](java.time.LocalDate.md) |  |  [optional]
 **datetimeProp** | [**java.time.OffsetDateTime**](java.time.OffsetDateTime.md) |  |  [optional]
-**arrayNullableProp** | [**kotlin.Array&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
-**arrayAndItemsNullableProp** | [**kotlin.Array&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
-**arrayItemsNullable** | [**kotlin.Array&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
+**arrayNullableProp** | [**kotlin.collections.List&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
+**arrayAndItemsNullableProp** | [**kotlin.collections.List&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
+**arrayItemsNullable** | [**kotlin.collections.List&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
 **objectNullableProp** | [**kotlin.collections.Map&lt;kotlin.String, kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
 **objectAndItemsNullableProp** | [**kotlin.collections.Map&lt;kotlin.String, kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
 **objectItemsNullable** | [**kotlin.collections.Map&lt;kotlin.String, kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/Pet.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/Pet.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/PetApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/PetApi.md
index 576d2f04ca85..44d832909311 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/PetApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/PetApi.md
@@ -4,39 +4,33 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
-[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
-[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
-[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
-[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
-[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
-[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
-[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
-[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+[**addPet**](PetApi.md#addPet) | **POST** pet | Add a new pet to the store
+[**deletePet**](PetApi.md#deletePet) | **DELETE** pet/{petId} | Deletes a pet
+[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** pet/findByStatus | Finds Pets by status
+[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** pet/findByTags | Finds Pets by tags
+[**getPetById**](PetApi.md#getPetById) | **GET** pet/{petId} | Find pet by ID
+[**updatePet**](PetApi.md#updatePet) | **PUT** pet | Update an existing pet
+[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** pet/{petId} | Updates a pet in the store with form data
+[**uploadFile**](PetApi.md#uploadFile) | **POST** pet/{petId}/uploadImage | uploads an image
+[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 
 
-<a name="addPet"></a>
-# **addPet**
-> addPet(pet)
 
 Add a new pet to the store
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val pet : Pet =  // Pet | Pet object that needs to be added to the store
-try {
-    apiInstance.addPet(pet)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#addPet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#addPet")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.addPet(pet)
 }
 ```
 
@@ -53,37 +47,29 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
-<a name="deletePet"></a>
-# **deletePet**
-> deletePet(petId, apiKey)
 
 Deletes a pet
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | Pet id to delete
 val apiKey : kotlin.String = apiKey_example // kotlin.String | 
-try {
-    apiInstance.deletePet(petId, apiKey)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#deletePet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#deletePet")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.deletePet(petId, apiKey)
 }
 ```
 
@@ -101,17 +87,12 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="findPetsByStatus"></a>
-# **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -120,20 +101,16 @@ Multiple status values can be provided with comma separated strings
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
-try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#findPetsByStatus")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#findPetsByStatus")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : kotlin.Array<Pet> = webService.findPetsByStatus(status)
 }
 ```
 
@@ -150,17 +127,12 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="findPetsByTags"></a>
-# **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -169,20 +141,16 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
-try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#findPetsByTags")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#findPetsByTags")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : kotlin.Array<Pet> = webService.findPetsByTags(tags)
 }
 ```
 
@@ -199,17 +167,12 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="getPetById"></a>
-# **getPetById**
-> Pet getPetById(petId)
 
 Find pet by ID
 
@@ -218,20 +181,16 @@ Returns a single pet
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to return
-try {
-    val result : Pet = apiInstance.getPetById(petId)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#getPetById")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#getPetById")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : Pet = webService.getPetById(petId)
 }
 ```
 
@@ -248,37 +207,28 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure api_key:
-    ApiClient.apiKey["api_key"] = ""
-    ApiClient.apiKeyPrefix["api_key"] = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="updatePet"></a>
-# **updatePet**
-> updatePet(pet)
 
 Update an existing pet
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val pet : Pet =  // Pet | Pet object that needs to be added to the store
-try {
-    apiInstance.updatePet(pet)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#updatePet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#updatePet")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.updatePet(pet)
 }
 ```
 
@@ -295,38 +245,30 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
-<a name="updatePetWithForm"></a>
-# **updatePetWithForm**
-> updatePetWithForm(petId, name, status)
 
 Updates a pet in the store with form data
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be updated
 val name : kotlin.String = name_example // kotlin.String | Updated name of the pet
 val status : kotlin.String = status_example // kotlin.String | Updated status of the pet
-try {
-    apiInstance.updatePetWithForm(petId, name, status)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#updatePetWithForm")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#updatePetWithForm")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.updatePetWithForm(petId, name, status)
 }
 ```
 
@@ -345,39 +287,30 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
-<a name="uploadFile"></a>
-# **uploadFile**
-> ApiResponse uploadFile(petId, additionalMetadata, file)
 
 uploads an image
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to update
 val additionalMetadata : kotlin.String = additionalMetadata_example // kotlin.String | Additional data to pass to server
 val file : java.io.File = BINARY_DATA_HERE // java.io.File | file to upload
-try {
-    val result : ApiResponse = apiInstance.uploadFile(petId, additionalMetadata, file)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#uploadFile")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#uploadFile")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : ApiResponse = webService.uploadFile(petId, additionalMetadata, file)
 }
 ```
 
@@ -396,39 +329,30 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
-<a name="uploadFileWithRequiredFile"></a>
-# **uploadFileWithRequiredFile**
-> ApiResponse uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
 
 uploads an image (required)
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to update
 val requiredFile : java.io.File = BINARY_DATA_HERE // java.io.File | file to upload
 val additionalMetadata : kotlin.String = additionalMetadata_example // kotlin.String | Additional data to pass to server
-try {
-    val result : ApiResponse = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#uploadFileWithRequiredFile")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#uploadFileWithRequiredFile")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : ApiResponse = webService.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
 }
 ```
 
@@ -447,8 +371,6 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/StoreApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/StoreApi.md
index 55bd8afdbc09..426b7c2695e6 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/StoreApi.md
@@ -4,15 +4,12 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
-[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
-[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
+[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** store/order/{order_id} | Delete purchase order by ID
+[**getInventory**](StoreApi.md#getInventory) | **GET** store/inventory | Returns pet inventories by status
+[**getOrderById**](StoreApi.md#getOrderById) | **GET** store/order/{order_id} | Find purchase order by ID
+[**placeOrder**](StoreApi.md#placeOrder) | **POST** store/order | Place an order for a pet
 
 
-<a name="deleteOrder"></a>
-# **deleteOrder**
-> deleteOrder(orderId)
 
 Delete purchase order by ID
 
@@ -21,19 +18,16 @@ For valid response try integer IDs with value &lt; 1000. Anything above 1000 or
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
 val orderId : kotlin.String = orderId_example // kotlin.String | ID of the order that needs to be deleted
-try {
-    apiInstance.deleteOrder(orderId)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#deleteOrder")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#deleteOrder")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.deleteOrder(orderId)
 }
 ```
 
@@ -56,9 +50,6 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="getInventory"></a>
-# **getInventory**
-> kotlin.collections.Map&lt;kotlin.String, kotlin.Int&gt; getInventory()
 
 Returns pet inventories by status
 
@@ -67,19 +58,15 @@ Returns a map of status codes to quantities
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
-try {
-    val result : kotlin.collections.Map<kotlin.String, kotlin.Int> = apiInstance.getInventory()
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#getInventory")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#getInventory")
-    e.printStackTrace()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
+
+launch(Dispatchers.IO) {
+    val result : kotlin.collections.Map<kotlin.String, kotlin.Int> = webService.getInventory()
 }
 ```
 
@@ -93,18 +80,12 @@ This endpoint does not need any parameter.
 ### Authorization
 
 
-Configure api_key:
-    ApiClient.apiKey["api_key"] = ""
-    ApiClient.apiKeyPrefix["api_key"] = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
-<a name="getOrderById"></a>
-# **getOrderById**
-> Order getOrderById(orderId)
 
 Find purchase order by ID
 
@@ -113,20 +94,16 @@ For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other val
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
 val orderId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be fetched
-try {
-    val result : Order = apiInstance.getOrderById(orderId)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#getOrderById")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#getOrderById")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : Order = webService.getOrderById(orderId)
 }
 ```
 
@@ -149,29 +126,22 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="placeOrder"></a>
-# **placeOrder**
-> Order placeOrder(order)
 
 Place an order for a pet
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
 val order : Order =  // Order | order placed for purchasing the pet
-try {
-    val result : Order = apiInstance.placeOrder(order)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#placeOrder")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#placeOrder")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : Order = webService.placeOrder(order)
 }
 ```
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/UserApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/UserApi.md
index dbf78e81eb22..5cf484387734 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/UserApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/UserApi.md
@@ -4,19 +4,16 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**createUser**](UserApi.md#createUser) | **POST** /user | Create user
-[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
-[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
-[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
-[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
-[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
-[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
-[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
+[**createUser**](UserApi.md#createUser) | **POST** user | Create user
+[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** user/createWithArray | Creates list of users with given input array
+[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** user/createWithList | Creates list of users with given input array
+[**deleteUser**](UserApi.md#deleteUser) | **DELETE** user/{username} | Delete user
+[**getUserByName**](UserApi.md#getUserByName) | **GET** user/{username} | Get user by user name
+[**loginUser**](UserApi.md#loginUser) | **GET** user/login | Logs user into the system
+[**logoutUser**](UserApi.md#logoutUser) | **GET** user/logout | Logs out current logged in user session
+[**updateUser**](UserApi.md#updateUser) | **PUT** user/{username} | Updated user
 
 
-<a name="createUser"></a>
-# **createUser**
-> createUser(user)
 
 Create user
 
@@ -25,19 +22,16 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val user : User =  // User | Created user object
-try {
-    apiInstance.createUser(user)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#createUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#createUser")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.createUser(user)
 }
 ```
 
@@ -60,28 +54,22 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="createUsersWithArrayInput"></a>
-# **createUsersWithArrayInput**
-> createUsersWithArrayInput(user)
 
 Creates list of users with given input array
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
-try {
-    apiInstance.createUsersWithArrayInput(user)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#createUsersWithArrayInput")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#createUsersWithArrayInput")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.createUsersWithArrayInput(user)
 }
 ```
 
@@ -104,28 +92,22 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="createUsersWithListInput"></a>
-# **createUsersWithListInput**
-> createUsersWithListInput(user)
 
 Creates list of users with given input array
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
-try {
-    apiInstance.createUsersWithListInput(user)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#createUsersWithListInput")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#createUsersWithListInput")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.createUsersWithListInput(user)
 }
 ```
 
@@ -148,9 +130,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="deleteUser"></a>
-# **deleteUser**
-> deleteUser(username)
 
 Delete user
 
@@ -159,19 +138,16 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be deleted
-try {
-    apiInstance.deleteUser(username)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#deleteUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#deleteUser")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.deleteUser(username)
 }
 ```
 
@@ -194,29 +170,22 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="getUserByName"></a>
-# **getUserByName**
-> User getUserByName(username)
 
 Get user by user name
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be fetched. Use user1 for testing.
-try {
-    val result : User = apiInstance.getUserByName(username)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#getUserByName")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#getUserByName")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : User = webService.getUserByName(username)
 }
 ```
 
@@ -239,30 +208,23 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="loginUser"></a>
-# **loginUser**
-> kotlin.String loginUser(username, password)
 
 Logs user into the system
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | The user name for login
 val password : kotlin.String = password_example // kotlin.String | The password for login in clear text
-try {
-    val result : kotlin.String = apiInstance.loginUser(username, password)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#loginUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#loginUser")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    val result : kotlin.String = webService.loginUser(username, password)
 }
 ```
 
@@ -286,27 +248,21 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="logoutUser"></a>
-# **logoutUser**
-> logoutUser()
 
 Logs out current logged in user session
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
-try {
-    apiInstance.logoutUser()
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#logoutUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#logoutUser")
-    e.printStackTrace()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
+
+launch(Dispatchers.IO) {
+    webService.logoutUser()
 }
 ```
 
@@ -326,9 +282,6 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="updateUser"></a>
-# **updateUser**
-> updateUser(username, user)
 
 Updated user
 
@@ -337,20 +290,17 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | name that need to be deleted
 val user : User =  // User | Updated user object
-try {
-    apiInstance.updateUser(username, user)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#updateUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#updateUser")
-    e.printStackTrace()
+
+launch(Dispatchers.IO) {
+    webService.updateUser(username, user)
 }
 ```
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
index af9af8a9f2dd..8dc4e6d334e9 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
@@ -2,14 +2,22 @@ package org.openapitools.client.apis
 
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
+import retrofit2.Response
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 
 import org.openapitools.client.models.Client
 
 interface AnotherFakeApi {
-    @PATCH("/another-fake/dummy")
-    suspend fun call123testSpecialTags(@Body client: Client): Client
+    /**
+     * To test special tags
+     * To test special tags and operation ID starting with number
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param client client model 
+    * @return [Client]
+     */
+    @PATCH("another-fake/dummy")
+    suspend fun call123testSpecialTags(@Body client: Client): Response<Client>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
index 74104da77ca4..27bde56495c0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
@@ -2,14 +2,21 @@ package org.openapitools.client.apis
 
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
+import retrofit2.Response
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 
 import org.openapitools.client.models.InlineResponseDefault
 
 interface DefaultApi {
-    @GET("/foo")
-    suspend fun fooGet(): InlineResponseDefault
+    /**
+     * 
+     * 
+     * Responses:
+     *  - 0: response
+     * 
+    * @return [InlineResponseDefault]
+     */
+    @GET("foo")
+    suspend fun fooGet(): Response<InlineResponseDefault>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
index e32a633abb65..8e8d0a6bf63e 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
@@ -2,9 +2,8 @@ package org.openapitools.client.apis
 
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
+import retrofit2.Response
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 
 import org.openapitools.client.models.Client
 import org.openapitools.client.models.FileSchemaTestClass
@@ -14,52 +13,221 @@ import org.openapitools.client.models.Pet
 import org.openapitools.client.models.User
 
 interface FakeApi {
-    @GET("/fake/health")
-    suspend fun fakeHealthGet(): HealthCheckResult
-
-    @GET("/fake/http-signature-test")
-    suspend fun fakeHttpSignatureTest(@Body pet: Pet, @Query("query_1") query1: kotlin.String, @Header("header_1") header1: kotlin.String): Unit
-
-    @POST("/fake/outer/boolean")
-    suspend fun fakeOuterBooleanSerialize(@Body body: kotlin.Boolean): kotlin.Boolean
-
-    @POST("/fake/outer/composite")
-    suspend fun fakeOuterCompositeSerialize(@Body outerComposite: OuterComposite): OuterComposite
-
-    @POST("/fake/outer/number")
-    suspend fun fakeOuterNumberSerialize(@Body body: java.math.BigDecimal): java.math.BigDecimal
-
-    @POST("/fake/outer/string")
-    suspend fun fakeOuterStringSerialize(@Body body: kotlin.String): kotlin.String
-
-    @PUT("/fake/body-with-file-schema")
-    suspend fun testBodyWithFileSchema(@Body fileSchemaTestClass: FileSchemaTestClass): Unit
-
-    @PUT("/fake/body-with-query-params")
-    suspend fun testBodyWithQueryParams(@Query("query") query: kotlin.String, @Body user: User): Unit
-
-    @PATCH("/fake")
-    suspend fun testClientModel(@Body client: Client): Client
-
+    /**
+     * Health check endpoint
+     * 
+     * Responses:
+     *  - 200: The instance started successfully
+     * 
+    * @return [HealthCheckResult]
+     */
+    @GET("fake/health")
+    suspend fun fakeHealthGet(): Response<HealthCheckResult>
+
+    /**
+     * test http signature authentication
+     * 
+     * Responses:
+     *  - 200: The instance started successfully
+     * 
+     * @param pet Pet object that needs to be added to the store 
+     * @param query1 query parameter (optional)
+     * @param header1 header parameter (optional)
+    * @return [Unit]
+     */
+    @GET("fake/http-signature-test")
+    suspend fun fakeHttpSignatureTest(@Body pet: Pet, @Query("query_1") query1: kotlin.String, @Header("header_1") header1: kotlin.String): Response<Unit>
+
+    /**
+     * 
+     * Test serialization of outer boolean types
+     * Responses:
+     *  - 200: Output boolean
+     * 
+     * @param body Input boolean as post body (optional)
+    * @return [kotlin.Boolean]
+     */
+    @POST("fake/outer/boolean")
+    suspend fun fakeOuterBooleanSerialize(@Body body: kotlin.Boolean? = null): Response<kotlin.Boolean>
+
+    /**
+     * 
+     * Test serialization of object with outer number type
+     * Responses:
+     *  - 200: Output composite
+     * 
+     * @param outerComposite Input composite as post body (optional)
+    * @return [OuterComposite]
+     */
+    @POST("fake/outer/composite")
+    suspend fun fakeOuterCompositeSerialize(@Body outerComposite: OuterComposite? = null): Response<OuterComposite>
+
+    /**
+     * 
+     * Test serialization of outer number types
+     * Responses:
+     *  - 200: Output number
+     * 
+     * @param body Input number as post body (optional)
+    * @return [java.math.BigDecimal]
+     */
+    @POST("fake/outer/number")
+    suspend fun fakeOuterNumberSerialize(@Body body: java.math.BigDecimal? = null): Response<java.math.BigDecimal>
+
+    /**
+     * 
+     * Test serialization of outer string types
+     * Responses:
+     *  - 200: Output string
+     * 
+     * @param body Input string as post body (optional)
+    * @return [kotlin.String]
+     */
+    @POST("fake/outer/string")
+    suspend fun fakeOuterStringSerialize(@Body body: kotlin.String? = null): Response<kotlin.String>
+
+    /**
+     * 
+     * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+     * Responses:
+     *  - 200: Success
+     * 
+     * @param fileSchemaTestClass  
+    * @return [Unit]
+     */
+    @PUT("fake/body-with-file-schema")
+    suspend fun testBodyWithFileSchema(@Body fileSchemaTestClass: FileSchemaTestClass): Response<Unit>
+
+    /**
+     * 
+     * 
+     * Responses:
+     *  - 200: Success
+     * 
+     * @param query  
+     * @param user  
+    * @return [Unit]
+     */
+    @PUT("fake/body-with-query-params")
+    suspend fun testBodyWithQueryParams(@Query("query") query: kotlin.String, @Body user: User): Response<Unit>
+
+    /**
+     * To test \&quot;client\&quot; model
+     * To test \&quot;client\&quot; model
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param client client model 
+    * @return [Client]
+     */
+    @PATCH("fake")
+    suspend fun testClientModel(@Body client: Client): Response<Client>
+
+    /**
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Responses:
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param number None 
+     * @param double None 
+     * @param patternWithoutDelimiter None 
+     * @param byte None 
+     * @param integer None (optional)
+     * @param int32 None (optional)
+     * @param int64 None (optional)
+     * @param float None (optional)
+     * @param string None (optional)
+     * @param binary None (optional)
+     * @param date None (optional)
+     * @param dateTime None (optional)
+     * @param password None (optional)
+     * @param paramCallback None (optional)
+    * @return [Unit]
+     */
     @FormUrlEncoded
-    @POST("/fake")
-    suspend fun testEndpointParameters(@Field("number") number: java.math.BigDecimal, @Field("double") double: kotlin.Double, @Field("pattern_without_delimiter") patternWithoutDelimiter: kotlin.String, @Field("byte") byte: kotlin.ByteArray, @Field("integer") integer: kotlin.Int, @Field("int32") int32: kotlin.Int, @Field("int64") int64: kotlin.Long, @Field("float") float: kotlin.Float, @Field("string") string: kotlin.String, @Field("binary") binary: MultipartBody.Part, @Field("date") date: java.time.LocalDate, @Field("dateTime") dateTime: java.time.OffsetDateTime, @Field("password") password: kotlin.String, @Field("callback") paramCallback: kotlin.String): Unit
-
+    @POST("fake")
+    suspend fun testEndpointParameters(@Field("number") number: java.math.BigDecimal, @Field("double") double: kotlin.Double, @Field("pattern_without_delimiter") patternWithoutDelimiter: kotlin.String, @Field("byte") byte: kotlin.ByteArray, @Field("integer") integer: kotlin.Int, @Field("int32") int32: kotlin.Int, @Field("int64") int64: kotlin.Long, @Field("float") float: kotlin.Float, @Field("string") string: kotlin.String, @Field("binary") binary: MultipartBody.Part, @Field("date") date: java.time.LocalDate, @Field("dateTime") dateTime: java.time.OffsetDateTime, @Field("password") password: kotlin.String, @Field("callback") paramCallback: kotlin.String): Response<Unit>
+
+    /**
+     * To test enum parameters
+     * To test enum parameters
+     * Responses:
+     *  - 400: Invalid request
+     *  - 404: Not found
+     * 
+     * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
+     * @param enumHeaderString Header parameter enum test (string) (optional, default to "-efg")
+     * @param enumQueryStringArray Query parameter enum test (string array) (optional)
+     * @param enumQueryString Query parameter enum test (string) (optional, default to "-efg")
+     * @param enumQueryInteger Query parameter enum test (double) (optional)
+     * @param enumQueryDouble Query parameter enum test (double) (optional)
+     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to "$")
+     * @param enumFormString Form parameter enum test (string) (optional, default to "-efg")
+    * @return [Unit]
+     */
     @FormUrlEncoded
-    @GET("/fake")
-    suspend fun testEnumParameters(@Header("enum_header_string_array") enumHeaderStringArray: kotlin.Array<kotlin.String>, @Header("enum_header_string") enumHeaderString: kotlin.String, @Query("enum_query_string_array") enumQueryStringArray: kotlin.Array<kotlin.String>, @Query("enum_query_string") enumQueryString: kotlin.String, @Query("enum_query_integer") enumQueryInteger: kotlin.Int, @Query("enum_query_double") enumQueryDouble: kotlin.Double, @Field("enum_form_string_array") enumFormStringArray: kotlin.Array<kotlin.String>, @Field("enum_form_string") enumFormString: kotlin.String): Unit
-
-    @DELETE("/fake")
-    suspend fun testGroupParameters(@Query("required_string_group") requiredStringGroup: kotlin.Int, @Header("required_boolean_group") requiredBooleanGroup: kotlin.Boolean, @Query("required_int64_group") requiredInt64Group: kotlin.Long, @Query("string_group") stringGroup: kotlin.Int, @Header("boolean_group") booleanGroup: kotlin.Boolean, @Query("int64_group") int64Group: kotlin.Long): Unit
-
-    @POST("/fake/inline-additionalProperties")
-    suspend fun testInlineAdditionalProperties(@Body requestBody: kotlin.collections.Map<kotlin.String, kotlin.String>): Unit
-
+    @GET("fake")
+    suspend fun testEnumParameters(@Header("enum_header_string_array") enumHeaderStringArray: kotlin.Array<kotlin.String>, @Header("enum_header_string") enumHeaderString: kotlin.String, @Query("enum_query_string_array") enumQueryStringArray: kotlin.Array<kotlin.String>, @Query("enum_query_string") enumQueryString: kotlin.String, @Query("enum_query_integer") enumQueryInteger: kotlin.Int, @Query("enum_query_double") enumQueryDouble: kotlin.Double, @Field("enum_form_string_array") enumFormStringArray: kotlin.Array<kotlin.String>, @Field("enum_form_string") enumFormString: kotlin.String): Response<Unit>
+
+    /**
+     * Fake endpoint to test group parameters (optional)
+     * Fake endpoint to test group parameters (optional)
+     * Responses:
+     *  - 400: Someting wrong
+     * 
+     * @param requiredStringGroup Required String in group parameters 
+     * @param requiredBooleanGroup Required Boolean in group parameters 
+     * @param requiredInt64Group Required Integer in group parameters 
+     * @param stringGroup String in group parameters (optional)
+     * @param booleanGroup Boolean in group parameters (optional)
+     * @param int64Group Integer in group parameters (optional)
+    * @return [Unit]
+     */
+    @DELETE("fake")
+    suspend fun testGroupParameters(@Query("required_string_group") requiredStringGroup: kotlin.Int, @Header("required_boolean_group") requiredBooleanGroup: kotlin.Boolean, @Query("required_int64_group") requiredInt64Group: kotlin.Long, @Query("string_group") stringGroup: kotlin.Int, @Header("boolean_group") booleanGroup: kotlin.Boolean, @Query("int64_group") int64Group: kotlin.Long): Response<Unit>
+
+    /**
+     * test inline additionalProperties
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param requestBody request body 
+    * @return [Unit]
+     */
+    @POST("fake/inline-additionalProperties")
+    suspend fun testInlineAdditionalProperties(@Body requestBody: kotlin.collections.Map<kotlin.String, kotlin.String>): Response<Unit>
+
+    /**
+     * test json serialization of form data
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param param field1 
+     * @param param2 field2 
+    * @return [Unit]
+     */
     @FormUrlEncoded
-    @GET("/fake/jsonFormData")
-    suspend fun testJsonFormData(@Field("param") param: kotlin.String, @Field("param2") param2: kotlin.String): Unit
-
-    @PUT("/fake/test-query-paramters")
-    suspend fun testQueryParameterCollectionFormat(@Query("pipe") pipe: kotlin.Array<kotlin.String>, @Query("ioutil") ioutil: CSVParams, @Query("http") http: SPACEParams, @Query("url") url: CSVParams, @Query("context") context: kotlin.Array<kotlin.String>): Unit
+    @GET("fake/jsonFormData")
+    suspend fun testJsonFormData(@Field("param") param: kotlin.String, @Field("param2") param2: kotlin.String): Response<Unit>
+
+    /**
+     * 
+     * To test the collection format in query parameters
+     * Responses:
+     *  - 200: Success
+     * 
+     * @param pipe  
+     * @param ioutil  
+     * @param http  
+     * @param url  
+     * @param context  
+    * @return [Unit]
+     */
+    @PUT("fake/test-query-paramters")
+    suspend fun testQueryParameterCollectionFormat(@Query("pipe") pipe: kotlin.Array<kotlin.String>, @Query("ioutil") ioutil: CSVParams, @Query("http") http: SSVParams, @Query("url") url: CSVParams, @Query("context") context: kotlin.Array<kotlin.String>): Response<Unit>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
index 12d94ffec19b..773483df2a67 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
@@ -2,14 +2,22 @@ package org.openapitools.client.apis
 
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
+import retrofit2.Response
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 
 import org.openapitools.client.models.Client
 
 interface FakeClassnameTags123Api {
-    @PATCH("/fake_classname_test")
-    suspend fun testClassname(@Body client: Client): Client
+    /**
+     * To test class name in snake case
+     * To test class name in snake case
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param client client model 
+    * @return [Client]
+     */
+    @PATCH("fake_classname_test")
+    suspend fun testClassname(@Body client: Client): Response<Client>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 9c0ceaaef457..c4a95abd2f3f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -2,43 +2,136 @@ package org.openapitools.client.apis
 
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
+import retrofit2.Response
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 
 import org.openapitools.client.models.ApiResponse
 import org.openapitools.client.models.Pet
 
 interface PetApi {
-    @POST("/pet")
-    suspend fun addPet(@Body pet: Pet): Unit
+    /**
+     * Add a new pet to the store
+     * 
+     * Responses:
+     *  - 405: Invalid input
+     * 
+     * @param pet Pet object that needs to be added to the store 
+    * @return [Unit]
+     */
+    @POST("pet")
+    suspend fun addPet(@Body pet: Pet): Response<Unit>
 
-    @DELETE("/pet/{petId}")
-    suspend fun deletePet(@Path("petId") petId: kotlin.Long, @Header("api_key") apiKey: kotlin.String): Unit
+    /**
+     * Deletes a pet
+     * 
+     * Responses:
+     *  - 400: Invalid pet value
+     * 
+     * @param petId Pet id to delete 
+     * @param apiKey  (optional)
+    * @return [Unit]
+     */
+    @DELETE("pet/{petId}")
+    suspend fun deletePet(@Path("petId") petId: kotlin.Long, @Header("api_key") apiKey: kotlin.String): Response<Unit>
 
-    @GET("/pet/findByStatus")
-    suspend fun findPetsByStatus(@Query("status") status: CSVParams): kotlin.Array<Pet>
+    /**
+     * Finds Pets by status
+     * Multiple status values can be provided with comma separated strings
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid status value
+     * 
+     * @param status Status values that need to be considered for filter 
+    * @return [kotlin.Array<Pet>]
+     */
+    @GET("pet/findByStatus")
+    suspend fun findPetsByStatus(@Query("status") status: CSVParams): Response<kotlin.Array<Pet>>
 
+    /**
+     * Finds Pets by tags
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid tag value
+     * 
+     * @param tags Tags to filter by 
+    * @return [kotlin.Array<Pet>]
+     */
     @Deprecated("This api was deprecated")
-    @GET("/pet/findByTags")
-    suspend fun findPetsByTags(@Query("tags") tags: CSVParams): kotlin.Array<Pet>
+    @GET("pet/findByTags")
+    suspend fun findPetsByTags(@Query("tags") tags: CSVParams): Response<kotlin.Array<Pet>>
 
-    @GET("/pet/{petId}")
-    suspend fun getPetById(@Path("petId") petId: kotlin.Long): Pet
+    /**
+     * Find pet by ID
+     * Returns a single pet
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid ID supplied
+     *  - 404: Pet not found
+     * 
+     * @param petId ID of pet to return 
+    * @return [Pet]
+     */
+    @GET("pet/{petId}")
+    suspend fun getPetById(@Path("petId") petId: kotlin.Long): Response<Pet>
 
-    @PUT("/pet")
-    suspend fun updatePet(@Body pet: Pet): Unit
+    /**
+     * Update an existing pet
+     * 
+     * Responses:
+     *  - 400: Invalid ID supplied
+     *  - 404: Pet not found
+     *  - 405: Validation exception
+     * 
+     * @param pet Pet object that needs to be added to the store 
+    * @return [Unit]
+     */
+    @PUT("pet")
+    suspend fun updatePet(@Body pet: Pet): Response<Unit>
 
+    /**
+     * Updates a pet in the store with form data
+     * 
+     * Responses:
+     *  - 405: Invalid input
+     * 
+     * @param petId ID of pet that needs to be updated 
+     * @param name Updated name of the pet (optional)
+     * @param status Updated status of the pet (optional)
+    * @return [Unit]
+     */
     @FormUrlEncoded
-    @POST("/pet/{petId}")
-    suspend fun updatePetWithForm(@Path("petId") petId: kotlin.Long, @Field("name") name: kotlin.String, @Field("status") status: kotlin.String): Unit
+    @POST("pet/{petId}")
+    suspend fun updatePetWithForm(@Path("petId") petId: kotlin.Long, @Field("name") name: kotlin.String, @Field("status") status: kotlin.String): Response<Unit>
 
+    /**
+     * uploads an image
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param petId ID of pet to update 
+     * @param additionalMetadata Additional data to pass to server (optional)
+     * @param file file to upload (optional)
+    * @return [ApiResponse]
+     */
     @Multipart
-    @POST("/pet/{petId}/uploadImage")
-    suspend fun uploadFile(@Path("petId") petId: kotlin.Long, @Part("additionalMetadata") additionalMetadata: kotlin.String, @Part file: MultipartBody.Part): ApiResponse
+    @POST("pet/{petId}/uploadImage")
+    suspend fun uploadFile(@Path("petId") petId: kotlin.Long, @Part("additionalMetadata") additionalMetadata: kotlin.String, @Part file: MultipartBody.Part): Response<ApiResponse>
 
+    /**
+     * uploads an image (required)
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param petId ID of pet to update 
+     * @param requiredFile file to upload 
+     * @param additionalMetadata Additional data to pass to server (optional)
+    * @return [ApiResponse]
+     */
     @Multipart
-    @POST("/fake/{petId}/uploadImageWithRequiredFile")
-    suspend fun uploadFileWithRequiredFile(@Path("petId") petId: kotlin.Long, @Part requiredFile: MultipartBody.Part, @Part("additionalMetadata") additionalMetadata: kotlin.String): ApiResponse
+    @POST("fake/{petId}/uploadImageWithRequiredFile")
+    suspend fun uploadFileWithRequiredFile(@Path("petId") petId: kotlin.Long, @Part requiredFile: MultipartBody.Part, @Part("additionalMetadata") additionalMetadata: kotlin.String): Response<ApiResponse>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 8d434e5589e7..7171b3d45c58 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -2,23 +2,61 @@ package org.openapitools.client.apis
 
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
+import retrofit2.Response
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 
 import org.openapitools.client.models.Order
 
 interface StoreApi {
-    @DELETE("/store/order/{order_id}")
-    suspend fun deleteOrder(@Path("order_id") orderId: kotlin.String): Unit
+    /**
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * Responses:
+     *  - 400: Invalid ID supplied
+     *  - 404: Order not found
+     * 
+     * @param orderId ID of the order that needs to be deleted 
+    * @return [Unit]
+     */
+    @DELETE("store/order/{order_id}")
+    suspend fun deleteOrder(@Path("order_id") orderId: kotlin.String): Response<Unit>
 
-    @GET("/store/inventory")
-    suspend fun getInventory(): kotlin.collections.Map<kotlin.String, kotlin.Int>
+    /**
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     * Responses:
+     *  - 200: successful operation
+     * 
+    * @return [kotlin.collections.Map<kotlin.String, kotlin.Int>]
+     */
+    @GET("store/inventory")
+    suspend fun getInventory(): Response<kotlin.collections.Map<kotlin.String, kotlin.Int>>
 
-    @GET("/store/order/{order_id}")
-    suspend fun getOrderById(@Path("order_id") orderId: kotlin.Long): Order
+    /**
+     * Find purchase order by ID
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid ID supplied
+     *  - 404: Order not found
+     * 
+     * @param orderId ID of pet that needs to be fetched 
+    * @return [Order]
+     */
+    @GET("store/order/{order_id}")
+    suspend fun getOrderById(@Path("order_id") orderId: kotlin.Long): Response<Order>
 
-    @POST("/store/order")
-    suspend fun placeOrder(@Body order: Order): Order
+    /**
+     * Place an order for a pet
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid Order
+     * 
+     * @param order order placed for purchasing the pet 
+    * @return [Order]
+     */
+    @POST("store/order")
+    suspend fun placeOrder(@Body order: Order): Response<Order>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 88ba45486a42..2d0bd056b8ef 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -2,35 +2,112 @@ package org.openapitools.client.apis
 
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
+import retrofit2.Response
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 
 import org.openapitools.client.models.User
 
 interface UserApi {
-    @POST("/user")
-    suspend fun createUser(@Body user: User): Unit
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param user Created user object 
+    * @return [Unit]
+     */
+    @POST("user")
+    suspend fun createUser(@Body user: User): Response<Unit>
 
-    @POST("/user/createWithArray")
-    suspend fun createUsersWithArrayInput(@Body user: kotlin.Array<User>): Unit
+    /**
+     * Creates list of users with given input array
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param user List of user object 
+    * @return [Unit]
+     */
+    @POST("user/createWithArray")
+    suspend fun createUsersWithArrayInput(@Body user: kotlin.Array<User>): Response<Unit>
 
-    @POST("/user/createWithList")
-    suspend fun createUsersWithListInput(@Body user: kotlin.Array<User>): Unit
+    /**
+     * Creates list of users with given input array
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param user List of user object 
+    * @return [Unit]
+     */
+    @POST("user/createWithList")
+    suspend fun createUsersWithListInput(@Body user: kotlin.Array<User>): Response<Unit>
 
-    @DELETE("/user/{username}")
-    suspend fun deleteUser(@Path("username") username: kotlin.String): Unit
+    /**
+     * Delete user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param username The name that needs to be deleted 
+    * @return [Unit]
+     */
+    @DELETE("user/{username}")
+    suspend fun deleteUser(@Path("username") username: kotlin.String): Response<Unit>
 
-    @GET("/user/{username}")
-    suspend fun getUserByName(@Path("username") username: kotlin.String): User
+    /**
+     * Get user by user name
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return [User]
+     */
+    @GET("user/{username}")
+    suspend fun getUserByName(@Path("username") username: kotlin.String): Response<User>
 
-    @GET("/user/login")
-    suspend fun loginUser(@Query("username") username: kotlin.String, @Query("password") password: kotlin.String): kotlin.String
+    /**
+     * Logs user into the system
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid username/password supplied
+     * 
+     * @param username The user name for login 
+     * @param password The password for login in clear text 
+    * @return [kotlin.String]
+     */
+    @GET("user/login")
+    suspend fun loginUser(@Query("username") username: kotlin.String, @Query("password") password: kotlin.String): Response<kotlin.String>
 
-    @GET("/user/logout")
-    suspend fun logoutUser(): Unit
+    /**
+     * Logs out current logged in user session
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+    * @return [Unit]
+     */
+    @GET("user/logout")
+    suspend fun logoutUser(): Response<Unit>
 
-    @PUT("/user/{username}")
-    suspend fun updateUser(@Path("username") username: kotlin.String, @Body user: User): Unit
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 400: Invalid user supplied
+     *  - 404: User not found
+     * 
+     * @param username name that need to be deleted 
+     * @param user Updated user object 
+    * @return [Unit]
+     */
+    @PUT("user/{username}")
+    suspend fun updateUser(@Path("username") username: kotlin.String, @Body user: User): Response<Unit>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
new file mode 100644
index 000000000000..524d5190ef88
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
@@ -0,0 +1,50 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+import java.net.URI
+import java.net.URISyntaxException
+
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class ApiKeyAuth(
+        private val location: String = "",
+        private val paramName: String = "",
+        private var apiKey: String = ""
+) : Interceptor {
+    
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request = chain.request()
+
+        if ("query" == location) {
+            var newQuery = request.url.toUri().query
+            val paramValue = "$paramName=$apiKey"
+            if (newQuery == null) {
+                newQuery = paramValue
+            } else {
+                newQuery += "&$paramValue"
+            }
+
+            val newUri: URI
+            try {
+                val oldUri = request.url.toUri()
+                newUri = URI(oldUri.scheme, oldUri.authority,
+                    oldUri.path, newQuery, oldUri.fragment)
+            } catch (e: URISyntaxException) {
+                throw IOException(e)
+            }
+
+            request = request.newBuilder().url(newUri.toURL()).build()
+        } else if ("header" == location) {
+            request = request.newBuilder()
+                    .addHeader(paramName, apiKey)
+                    .build()
+        } else if ("cookie" == location) {
+            request = request.newBuilder()
+                    .addHeader("Cookie", "$paramName=$apiKey")
+                    .build()
+        }
+        return chain.proceed(request)
+    }
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
new file mode 100644
index 000000000000..575bea19540d
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
@@ -0,0 +1,33 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+
+import kotlin.jvm.Throws
+import okhttp3.Interceptor
+import okhttp3.Interceptor.Chain
+import okhttp3.Response
+import okhttp3.Credentials
+
+class HttpBasicAuth(
+    private var username: String = "",
+    private var password: String = ""
+) : Interceptor {
+
+    fun setCredentials(username: String, password: String) {
+        this.username = username
+        this.password = password
+    }
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Chain): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") == null && username.isNotBlank() && password.isNotBlank()) {
+            request = request.newBuilder()
+                .addHeader("Authorization", Credentials.basic(username, password))
+                .build()
+        }
+        return chain.proceed(request)
+    }
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/HttpBearerAuth.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/HttpBearerAuth.kt
new file mode 100644
index 000000000000..775ad903c438
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/HttpBearerAuth.kt
@@ -0,0 +1,39 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+
+import okhttp3.Interceptor
+import okhttp3.Interceptor.Chain
+import okhttp3.Response
+
+class HttpBearerAuth(
+    private var schema: String = "",
+    var bearerToken: String = ""
+) : Interceptor {
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Chain): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") == null && bearerToken.isNotBlank()) {
+            request = request.newBuilder()
+                .addHeader("Authorization", headerValue())
+                .build()
+        }
+        return chain.proceed(request)
+    }
+
+    private fun headerValue(): String {
+        return if (schema.isNotBlank()) {
+            "${upperCaseBearer()} $bearerToken"
+        } else {
+            bearerToken
+        }
+    }
+
+    private fun upperCaseBearer(): String {
+        return if (schema.toLowerCase().equals("bearer")) "Bearer" else schema
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/OAuth.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/OAuth.kt
new file mode 100644
index 000000000000..311a8f439794
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/OAuth.kt
@@ -0,0 +1,151 @@
+package org.openapitools.client.auth
+
+import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
+import java.net.HttpURLConnection.HTTP_FORBIDDEN
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.OAuthClient
+import org.apache.oltu.oauth2.client.request.OAuthBearerClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+import org.apache.oltu.oauth2.common.message.types.GrantType
+import org.apache.oltu.oauth2.common.token.BasicOAuthToken
+
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Response
+
+class OAuth(
+        client: OkHttpClient,
+        var tokenRequestBuilder: TokenRequestBuilder
+) : Interceptor {
+
+    interface AccessTokenListener {
+        fun notify(token: BasicOAuthToken)
+    }
+
+    private var oauthClient: OAuthClient = OAuthClient(OAuthOkHttpClient(client))
+
+    @Volatile 
+    private var accessToken: String? = null
+    var authenticationRequestBuilder: AuthenticationRequestBuilder? = null
+    private var accessTokenListener: AccessTokenListener? = null
+
+    constructor(
+            requestBuilder: TokenRequestBuilder
+    ) : this(
+            OkHttpClient(), 
+            requestBuilder
+    )
+
+    constructor(
+            flow: OAuthFlow, 
+            authorizationUrl: String, 
+            tokenUrl: String, 
+            scopes: String
+    ) : this(
+            OAuthClientRequest.tokenLocation(tokenUrl).setScope(scopes)
+    ) {
+        setFlow(flow);
+        authenticationRequestBuilder = OAuthClientRequest.authorizationLocation(authorizationUrl);
+    }
+
+    fun setFlow(flow: OAuthFlow) {
+        when (flow) {
+            OAuthFlow.accessCode, OAuthFlow.implicit ->
+                tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE)
+            OAuthFlow.password ->
+                tokenRequestBuilder.setGrantType(GrantType.PASSWORD)
+            OAuthFlow.application ->
+                tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS)
+        }            
+    }
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        return retryingIntercept(chain, true)
+    }
+
+    @Throws(IOException::class)
+    private fun retryingIntercept(chain: Interceptor.Chain, updateTokenAndRetryOnAuthorizationFailure: Boolean): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") != null) {
+            return chain.proceed(request)
+        }
+
+        // If first time, get the token
+        val oAuthRequest: OAuthClientRequest
+        if (accessToken == null) {
+            updateAccessToken(null)
+        }
+
+        if (accessToken != null) {
+            // Build the request
+            val rb = request.newBuilder()
+
+            val requestAccessToken = accessToken
+            try {
+                oAuthRequest = OAuthBearerClientRequest(request.url.toString())
+                        .setAccessToken(requestAccessToken)
+                        .buildHeaderMessage()
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            }
+
+            oAuthRequest.headers.entries.forEach { header ->
+                rb.addHeader(header.key, header.value)
+            }
+            rb.url(oAuthRequest.locationUri)
+
+            //Execute the request
+            val response = chain.proceed(rb.build())
+
+            // 401/403 most likely indicates that access token has expired. Unless it happens two times in a row.
+            if ((response.code == HTTP_UNAUTHORIZED || response.code == HTTP_FORBIDDEN) && updateTokenAndRetryOnAuthorizationFailure) {
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body?.close()
+                        return retryingIntercept(chain, false)
+                    }
+                } catch (e: Exception) {
+                    response.body?.close()
+                    throw e
+                }
+            }
+            return response
+        } else {
+            return chain.proceed(chain.request())
+        }
+    }
+
+    /**
+     * Returns true if the access token has been updated
+     */
+    @Throws(IOException::class)
+    @Synchronized 
+    fun updateAccessToken(requestAccessToken: String?): Boolean {
+        if (accessToken == null || accessToken.equals(requestAccessToken)) {    
+            return try {
+                val accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage())
+                if (accessTokenResponse != null && accessTokenResponse.accessToken != null) {
+                    accessToken = accessTokenResponse.accessToken
+                    accessTokenListener?.notify(accessTokenResponse.oAuthToken as BasicOAuthToken)
+                    !accessToken.equals(requestAccessToken)
+                } else {
+                    false
+                }
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            } catch (e: OAuthProblemException) {
+                throw IOException(e)
+            }
+        }
+        return true;
+    }
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt
new file mode 100644
index 000000000000..bcada9b7a6a2
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt
@@ -0,0 +1,5 @@
+package org.openapitools.client.auth
+
+enum class OAuthFlow {
+    accessCode, implicit, password, application
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt
new file mode 100644
index 000000000000..93adbda3fc98
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt
@@ -0,0 +1,61 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.HttpClient
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.response.OAuthClientResponse
+import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody
+
+
+class OAuthOkHttpClient(
+        private var client: OkHttpClient
+) : HttpClient {
+
+    constructor() : this(OkHttpClient())
+
+    @Throws(OAuthSystemException::class, OAuthProblemException::class)
+    override fun <T : OAuthClientResponse?> execute(
+            request: OAuthClientRequest, 
+            headers: Map<String, String>?,
+            requestMethod: String, 
+            responseClass: Class<T>?): T {
+
+        var mediaType = "application/json".toMediaTypeOrNull()
+        val requestBuilder = Request.Builder().url(request.locationUri)
+
+        headers?.forEach { entry ->
+            if (entry.key.equals("Content-Type", true)) {
+                mediaType = entry.value.toMediaTypeOrNull()
+            } else {
+                requestBuilder.addHeader(entry.key, entry.value)
+            }
+        }
+
+        val body: RequestBody? = if (request.body != null) RequestBody.create(mediaType, request.body) else null
+        requestBuilder.method(requestMethod, body)
+
+        try {
+            val response = client.newCall(requestBuilder.build()).execute()
+            return OAuthClientResponseFactory.createCustomResponse(
+                    response.body?.string(), 
+                    response.body?.contentType()?.toString(),
+                    response.code,
+                    responseClass)
+        } catch (e: IOException) {
+            throw OAuthSystemException(e)
+        }
+    }
+
+    override fun shutdown() {
+        // Nothing to do here
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
index 085d78c72a53..d40b63497826 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -1,35 +1,230 @@
 package org.openapitools.client.infrastructure
 
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import org.openapitools.client.auth.ApiKeyAuth
+import org.openapitools.client.auth.OAuth
+import org.openapitools.client.auth.OAuth.AccessTokenListener
+import org.openapitools.client.auth.OAuthFlow
+import org.openapitools.client.auth.HttpBearerAuth
+import org.openapitools.client.auth.HttpBasicAuth
+
+import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.converter.scalars.ScalarsConverterFactory
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
 import retrofit2.converter.gson.GsonConverterFactory
 
 class ApiClient(
     private var baseUrl: String = defaultBasePath,
-    private var okHttpClient: OkHttpClient
+    private val okHttpClientBuilder: OkHttpClient.Builder? = null,
+    private val serializerBuilder: GsonBuilder = Serializer.gsonBuilder
 ) {
-    companion object {
-        @JvmStatic
-        val defaultBasePath: String by lazy {
-            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io:80/v2")
-        }
+    private val apiAuthorizations = mutableMapOf<String, Interceptor>()
+    var logger: ((String) -> Unit)? = null
+
+    private val retrofitBuilder: Retrofit.Builder by lazy {
+        Retrofit.Builder()
+            .baseUrl(baseUrl)
+            .addConverterFactory(ScalarsConverterFactory.create())
+            .addConverterFactory(GsonConverterFactory.create(serializerBuilder.create()))
+    }
+
+    private val clientBuilder: OkHttpClient.Builder by lazy {
+        okHttpClientBuilder ?: defaultClientBuilder
+    }
+
+    private val defaultClientBuilder: OkHttpClient.Builder by lazy {
+        OkHttpClient()
+            .newBuilder()
+            .addInterceptor(HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
+                override fun log(message: String) {
+                    logger?.invoke(message)
+                }
+            }).apply {
+                level = HttpLoggingInterceptor.Level.BODY
+            })
     }
 
     init {
         normalizeBaseUrl()
     }
 
-    val retrofitBuilder: Retrofit.Builder by lazy {
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: GsonBuilder = Serializer.gsonBuilder,
+        authNames: Array<String>
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder) {
+        authNames.forEach { authName ->
+            val auth = when (authName) {
+                "api_key" -> ApiKeyAuth("header", "api_key")"api_key_query" -> ApiKeyAuth("query", "api_key_query")"bearer_test" -> HttpBearerAuth("bearer")"http_basic_test" -> HttpBasicAuth()"http_signature_test" -> "petstore_auth" -> OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets")
+                else -> throw RuntimeException("auth name $authName not found in available auth names")
+            }
+            addAuthorization(authName, auth);
+        }
+    }
 
-        Retrofit.Builder()
-        .baseUrl(baseUrl)
-        .addConverterFactory(ScalarsConverterFactory.create())
-        .addConverterFactory(GsonConverterFactory.create(Serializer.gson))
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: GsonBuilder = Serializer.gsonBuilder,
+        authName: String, 
+        bearerToken: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        setBearerToken(bearerToken)
+    }
+
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: GsonBuilder = Serializer.gsonBuilder,
+        authName: String, 
+        username: String, 
+        password: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        setCredentials(username, password)
+    }
+
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: GsonBuilder = Serializer.gsonBuilder,
+        authName: String, 
+        clientId: String, 
+        secret: String, 
+        username: String, 
+        password: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        getTokenEndPoint()
+            ?.setClientId(clientId)
+            ?.setClientSecret(secret)
+            ?.setUsername(username)
+            ?.setPassword(password)
+    }
+
+    fun setCredentials(username: String, password: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder.setUsername(username).setPassword(password)
+        }
+        return this
+    }
+    fun setBearerToken(bearerToken: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, HttpBearerAuth> {
+            this.bearerToken = bearerToken
+        }
+        return this
+    }
+
+    fun setCredentials(username: String, password: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, HttpBasicAuth> {
+            setCredentials(username, password);
+        }
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder.setUsername(username).setPassword(password)
+        }
+        return this
+    }
+
+    fun setCredentials(username: String, password: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder.setUsername(username).setPassword(password)
+        }
+        return this
+    }
+    /**
+    * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Token request builder
+    */
+    fun getTokenEndPoint(): TokenRequestBuilder? {
+        var result: TokenRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = tokenRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Authentication request builder
+    */
+    fun getAuthorizationEndPoint(): AuthenticationRequestBuilder? {
+        var result: AuthenticationRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = authenticationRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
+    * @param accessToken Access token
+    * @return ApiClient
+    */
+    fun setAccessToken(accessToken: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            setAccessToken(accessToken)
+        }
+        return this
+    }
+
+    /**
+    * Helper method to configure the oauth accessCode/implicit flow parameters
+    * @param clientId Client ID
+    * @param clientSecret Client secret
+    * @param redirectURI Redirect URI
+    * @return ApiClient
+    */
+    fun configureAuthorizationFlow(clientId: String, clientSecret: String, redirectURI: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder
+                .setClientId(clientId)
+                .setClientSecret(clientSecret)
+                .setRedirectURI(redirectURI)
+            authenticationRequestBuilder
+                ?.setClientId(clientId)
+                ?.setRedirectURI(redirectURI)
+        }
+        return this;
+    }
+
+    /**
+    * Configures a listener which is notified when a new access token is received.
+    * @param accessTokenListener Access token listener
+    * @return ApiClient
+    */
+    fun registerAccessTokenListener(accessTokenListener: AccessTokenListener): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            registerAccessTokenListener(accessTokenListener)
+        }
+        return this;
+    }
+
+    /**
+     * Adds an authorization to be used by the client
+     * @param authName Authentication name
+     * @param authorization Authorization interceptor
+     * @return ApiClient
+     */
+    fun addAuthorization(authName: String, authorization: Interceptor): ApiClient {
+        if (apiAuthorizations.containsKey(authName)) {
+            throw RuntimeException("auth name $authName already in api authorizations")
+        }
+        apiAuthorizations[authName] = authorization
+        clientBuilder.addInterceptor(authorization)
+        return this
+    }
+
+    fun setLogger(logger: (String) -> Unit): ApiClient {
+        this.logger = logger
+        return this
     }
 
     fun <S> createService(serviceClass: Class<S>): S {
-        return retrofitBuilder.client(okHttpClient).build().create(serviceClass)
+        return retrofitBuilder.client(clientBuilder.build()).build().create(serviceClass)
     }
 
     private fun normalizeBaseUrl() {
@@ -37,4 +232,20 @@ class ApiClient(
             baseUrl += "/"
         }
     }
+
+    private inline fun <T, reified U> Iterable<T>.runOnFirst(callback: U.() -> Unit) {
+        for (element in this) {
+            if (element is U)  {
+                callback.invoke(element)
+                break
+            }
+        }
+    }
+
+    companion object {        
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io:80/v2")
+        }
+    }
 }
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt
new file mode 100644
index 000000000000..3369ea29aa99
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt
@@ -0,0 +1,15 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonParseException
+import retrofit2.Response
+
+@Throws(JsonParseException::class)
+inline fun <reified T> Response<*>.getErrorResponse(serializerBuilder: GsonBuilder = Serializer.gsonBuilder): T? {
+    val serializer = serializerBuilder.create()
+    val reader = errorBody()?.charStream()
+    if(reader != null) {
+        return serializer.fromJson(reader, T::class.java)
+    }
+    return null
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
index 04e474059f25..152cbc0cddf3 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param mapProperty 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Animal.kt
index 59234b2684f5..ab6e55151fc8 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Animal.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Animal.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 4d49a464621a..60f2617cafb2 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param code 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
index 0c88337e9c1e..db44a13b4373 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param arrayArrayNumber 
@@ -21,7 +22,7 @@ import java.io.Serializable
 
 data class ArrayOfArrayOfNumberOnly (
     @SerializedName("ArrayArrayNumber")
-    val arrayArrayNumber: kotlin.Array<kotlin.Array<java.math.BigDecimal>>? = null
+    val arrayArrayNumber: kotlin.collections.List<kotlin.collections.List<java.math.BigDecimal>>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
index 4da5b8e6d5fb..128acc125416 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param arrayNumber 
@@ -21,7 +22,7 @@ import java.io.Serializable
 
 data class ArrayOfNumberOnly (
     @SerializedName("ArrayNumber")
-    val arrayNumber: kotlin.Array<java.math.BigDecimal>? = null
+    val arrayNumber: kotlin.collections.List<java.math.BigDecimal>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
index 855cd60a3274..afb0414957b9 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.ReadOnlyFirst
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param arrayOfString 
@@ -24,11 +25,11 @@ import java.io.Serializable
 
 data class ArrayTest (
     @SerializedName("array_of_string")
-    val arrayOfString: kotlin.Array<kotlin.String>? = null,
+    val arrayOfString: kotlin.collections.List<kotlin.String>? = null,
     @SerializedName("array_array_of_integer")
-    val arrayArrayOfInteger: kotlin.Array<kotlin.Array<kotlin.Long>>? = null,
+    val arrayArrayOfInteger: kotlin.collections.List<kotlin.collections.List<kotlin.Long>>? = null,
     @SerializedName("array_array_of_model")
-    val arrayArrayOfModel: kotlin.Array<kotlin.Array<ReadOnlyFirst>>? = null
+    val arrayArrayOfModel: kotlin.collections.List<kotlin.collections.List<ReadOnlyFirst>>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Capitalization.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
index 24e13278871b..cf876c94035c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param smallCamel 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Cat.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Cat.kt
index 7470f2504322..647155c428fc 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Cat.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Cat.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.CatAllOf
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
index 17d5df7c0db1..b3888433c7bb 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param declawed 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
index 6bfa3b0d01fb..befccbefa9ac 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ClassModel.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
index 174d49148f0d..c5222d7169e0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Model for testing model with \"_class\" property
  * @param propertyClass 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Client.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Client.kt
index 31fa6e51bf7b..3debe1d542f7 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Client.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Client.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param client 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Dog.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Dog.kt
index 7965fadd703c..5be6d075450e 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Dog.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Dog.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.DogAllOf
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
index d67d72c09671..be81eda59734 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param breed 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
index d4ffb01a388d..2b97721e7f53 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param justSymbol 
@@ -24,7 +25,7 @@ data class EnumArrays (
     @SerializedName("just_symbol")
     val justSymbol: EnumArrays.JustSymbol? = null,
     @SerializedName("array_enum")
-    val arrayEnum: kotlin.Array<EnumArrays.ArrayEnum>? = null
+    val arrayEnum: kotlin.collections.List<EnumArrays.ArrayEnum>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
index 507fbaa3c059..3aceec7fe933 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
@@ -18,6 +18,7 @@ import org.openapitools.client.models.OuterEnumIntegerDefaultValue
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param enumStringRequired 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
index 1511af5d49b2..b82eddd47ccf 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param file 
@@ -24,7 +25,7 @@ data class FileSchemaTestClass (
     @SerializedName("file")
     val file: java.io.File? = null,
     @SerializedName("files")
-    val files: kotlin.Array<java.io.File>? = null
+    val files: kotlin.collections.List<java.io.File>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Foo.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Foo.kt
index 1ca746f908c3..33952e4b66f1 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Foo.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Foo.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FormatTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
index 5b9be0b89c01..d69683337761 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param number 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
index 7608a258ae5f..3d662d38a504 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
index 9e5a085a2c01..fe3b639cfc39 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
  * @param nullableMessage 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
index d75c0ded4369..24f157d5d750 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param name Updated name of the pet
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
index 1f26364b834e..2382fda34b0f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param additionalMetadata Additional data to pass to server
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
index 57634dd3f5a2..0c85be510de8 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param enumFormStringArray Form parameter enum test (string array)
@@ -23,7 +24,7 @@ import java.io.Serializable
 data class InlineObject2 (
     /* Form parameter enum test (string array) */
     @SerializedName("enum_form_string_array")
-    val enumFormStringArray: kotlin.Array<InlineObject2.EnumFormStringArray>? = null,
+    val enumFormStringArray: kotlin.collections.List<InlineObject2.EnumFormStringArray>? = null,
     /* Form parameter enum test (string) */
     @SerializedName("enum_form_string")
     val enumFormString: InlineObject2.EnumFormString? = null
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
index f70af3efc5a3..37a4dbaeb49d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param number None
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
index 5c38c52ba8d1..06b2d303be85 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param param field1
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
index 6389765702b9..76a04940bbf6 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param requiredFile file to upload
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
index e1d3c615222a..aceb74085fee 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Foo
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param string 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/List.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/List.kt
index 1aa7715f047f..8de0d080cedc 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/List.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/List.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param `123minusList` 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MapTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MapTest.kt
index 9c0bef747fbd..351506589b9a 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MapTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MapTest.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param mapMapOfString 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
index f1dda9dc0efe..39b0152a33f0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Animal
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param uuid 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Model200Response.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
index 1bdb62d1b23b..1360386ee2bb 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Model for testing model name starting with number
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Name.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Name.kt
index 2e30b6b7cd95..e3113d603d4c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Name.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Name.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Model for testing model name same as property name
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NullableClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
index 534bb572e4f1..81366b145ba2 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param integerProp 
@@ -44,11 +45,11 @@ data class NullableClass (
     @SerializedName("datetime_prop")
     val datetimeProp: java.time.OffsetDateTime? = null,
     @SerializedName("array_nullable_prop")
-    val arrayNullableProp: kotlin.Array<kotlin.Any>? = null,
+    val arrayNullableProp: kotlin.collections.List<kotlin.Any>? = null,
     @SerializedName("array_and_items_nullable_prop")
-    val arrayAndItemsNullableProp: kotlin.Array<kotlin.Any>? = null,
+    val arrayAndItemsNullableProp: kotlin.collections.List<kotlin.Any>? = null,
     @SerializedName("array_items_nullable")
-    val arrayItemsNullable: kotlin.Array<kotlin.Any>? = null,
+    val arrayItemsNullable: kotlin.collections.List<kotlin.Any>? = null,
     @SerializedName("object_nullable_prop")
     val objectNullableProp: kotlin.collections.Map<kotlin.String, kotlin.Any>? = null,
     @SerializedName("object_and_items_nullable_prop")
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
index c7138f597e10..31f01f97b083 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param justNumber 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
index 2a58f2be7c0d..048659fa99fa 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
index 6303e05739bc..dec8db2d9b8a 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param myNumber 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 5865f9d672cd..0b389b22ba63 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.Tag
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param name 
@@ -30,13 +31,13 @@ data class Pet (
     @SerializedName("name")
     val name: kotlin.String,
     @SerializedName("photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @SerializedName("id")
     val id: kotlin.Long? = null,
     @SerializedName("category")
     val category: Category? = null,
     @SerializedName("tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @SerializedName("status")
     val status: Pet.Status? = null
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
index 81c3bab8745e..ef98374a6955 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Return.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Return.kt
index 166cb5aa391c..19f61d416732 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Return.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Return.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Model for testing reserved words
  * @param `return` 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
index c9585969b251..23cd075e530d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
index e11be325ef39..9e08a3d8ae0e 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
index 433872af1e9c..ca2ce7188e52 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/.openapi-generator/FILES b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/.openapi-generator/FILES
index 63cd1381e9d8..106ea4db2ae5 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/.openapi-generator/FILES
@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 build.gradle
 docs/200Response.md
@@ -64,6 +63,12 @@ src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
 src/main/kotlin/org/openapitools/client/apis/PetApi.kt
 src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
 src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
+src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
+src/main/kotlin/org/openapitools/client/auth/HttpBearerAuth.kt
+src/main/kotlin/org/openapitools/client/auth/OAuth.kt
+src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt
+src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt
 src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
 src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/CollectionFormats.kt
@@ -71,6 +76,7 @@ src/main/kotlin/org/openapitools/client/infrastructure/DateAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt
 src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
 src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
 src/main/kotlin/org/openapitools/client/models/Animal.kt
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/README.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/README.md
index b7028d917a24..7d37a6283317 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/README.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
@@ -35,45 +35,45 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
-*DefaultApi* | [**fooGet**](docs/DefaultApi.md#fooget) | **GET** /foo | 
-*FakeApi* | [**fakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint
-*FakeApi* | [**fakeHttpSignatureTest**](docs/FakeApi.md#fakehttpsignaturetest) | **GET** /fake/http-signature-test | test http signature authentication
-*FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
-*FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
-*FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
-*FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
-*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
-*FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
-*FakeApi* | [**testClientModel**](docs/FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-*FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
-*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-*FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-*FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
-*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-paramters | 
-*FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case
-*PetApi* | [**addPet**](docs/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
-*PetApi* | [**deletePet**](docs/PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
-*PetApi* | [**findPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
-*PetApi* | [**findPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
-*PetApi* | [**getPetById**](docs/PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
-*PetApi* | [**updatePet**](docs/PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
-*PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
-*PetApi* | [**uploadFile**](docs/PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
-*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-*StoreApi* | [**getInventory**](docs/StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**getOrderById**](docs/StoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID
-*StoreApi* | [**placeOrder**](docs/StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
-*UserApi* | [**createUser**](docs/UserApi.md#createuser) | **POST** /user | Create user
-*UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
-*UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
-*UserApi* | [**deleteUser**](docs/UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
-*UserApi* | [**getUserByName**](docs/UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
-*UserApi* | [**loginUser**](docs/UserApi.md#loginuser) | **GET** /user/login | Logs user into the system
-*UserApi* | [**logoutUser**](docs/UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
-*UserApi* | [**updateUser**](docs/UserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** another-fake/dummy | To test special tags
+*DefaultApi* | [**fooGet**](docs/DefaultApi.md#fooget) | **GET** foo | 
+*FakeApi* | [**fakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** fake/health | Health check endpoint
+*FakeApi* | [**fakeHttpSignatureTest**](docs/FakeApi.md#fakehttpsignaturetest) | **GET** fake/http-signature-test | test http signature authentication
+*FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** fake/outer/boolean | 
+*FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** fake/outer/composite | 
+*FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **POST** fake/outer/number | 
+*FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeouterstringserialize) | **POST** fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testbodywithfileschema) | **PUT** fake/body-with-file-schema | 
+*FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testbodywithqueryparams) | **PUT** fake/body-with-query-params | 
+*FakeApi* | [**testClientModel**](docs/FakeApi.md#testclientmodel) | **PATCH** fake | To test \"client\" model
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testendpointparameters) | **POST** fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testenumparameters) | **GET** fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testgroupparameters) | **DELETE** fake | Fake endpoint to test group parameters (optional)
+*FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testinlineadditionalproperties) | **POST** fake/inline-additionalProperties | test inline additionalProperties
+*FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testjsonformdata) | **GET** fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testqueryparametercollectionformat) | **PUT** fake/test-query-paramters | 
+*FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testclassname) | **PATCH** fake_classname_test | To test class name in snake case
+*PetApi* | [**addPet**](docs/PetApi.md#addpet) | **POST** pet | Add a new pet to the store
+*PetApi* | [**deletePet**](docs/PetApi.md#deletepet) | **DELETE** pet/{petId} | Deletes a pet
+*PetApi* | [**findPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** pet/findByStatus | Finds Pets by status
+*PetApi* | [**findPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** pet/findByTags | Finds Pets by tags
+*PetApi* | [**getPetById**](docs/PetApi.md#getpetbyid) | **GET** pet/{petId} | Find pet by ID
+*PetApi* | [**updatePet**](docs/PetApi.md#updatepet) | **PUT** pet | Update an existing pet
+*PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**uploadFile**](docs/PetApi.md#uploadfile) | **POST** pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadfilewithrequiredfile) | **POST** fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** store/order/{order_id} | Delete purchase order by ID
+*StoreApi* | [**getInventory**](docs/StoreApi.md#getinventory) | **GET** store/inventory | Returns pet inventories by status
+*StoreApi* | [**getOrderById**](docs/StoreApi.md#getorderbyid) | **GET** store/order/{order_id} | Find purchase order by ID
+*StoreApi* | [**placeOrder**](docs/StoreApi.md#placeorder) | **POST** store/order | Place an order for a pet
+*UserApi* | [**createUser**](docs/UserApi.md#createuser) | **POST** user | Create user
+*UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** user/createWithArray | Creates list of users with given input array
+*UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** user/createWithList | Creates list of users with given input array
+*UserApi* | [**deleteUser**](docs/UserApi.md#deleteuser) | **DELETE** user/{username} | Delete user
+*UserApi* | [**getUserByName**](docs/UserApi.md#getuserbyname) | **GET** user/{username} | Get user by user name
+*UserApi* | [**loginUser**](docs/UserApi.md#loginuser) | **GET** user/login | Logs user into the system
+*UserApi* | [**logoutUser**](docs/UserApi.md#logoutuser) | **GET** user/logout | Logs out current logged in user session
+*UserApi* | [**updateUser**](docs/UserApi.md#updateuser) | **PUT** user/{username} | Updated user
 
 
 <a name="documentation-for-models"></a>
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/build.gradle b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/build.gradle
index 94e4916b6dfd..a6f5c0fe4927 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/build.gradle
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/build.gradle
@@ -31,6 +31,7 @@ test {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.0"
     compile "com.google.code.gson:gson:2.8.6"
     compile "io.reactivex:rxjava:$rxJavaVersion"
     compile "com.squareup.retrofit2:adapter-rxjava:$retrofitVersion"
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/AnotherFakeApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/AnotherFakeApi.md
index 55d482238db4..807d93ebe748 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/AnotherFakeApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/AnotherFakeApi.md
@@ -4,12 +4,9 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** another-fake/dummy | To test special tags
 
 
-<a name="call123testSpecialTags"></a>
-# **call123testSpecialTags**
-> Client call123testSpecialTags(client)
 
 To test special tags
 
@@ -18,21 +15,15 @@ To test special tags and operation ID starting with number
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = AnotherFakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(AnotherFakeApi::class.java)
 val client : Client =  // Client | client model
-try {
-    val result : Client = apiInstance.call123testSpecialTags(client)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling AnotherFakeApi#call123testSpecialTags")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling AnotherFakeApi#call123testSpecialTags")
-    e.printStackTrace()
-}
+
+val result : Client = webService.call123testSpecialTags(client)
 ```
 
 ### Parameters
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/ArrayOfArrayOfNumberOnly.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/ArrayOfArrayOfNumberOnly.md
index 23a475664205..bcc306caeb6d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/ArrayOfArrayOfNumberOnly.md
@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayArrayNumber** | **kotlin.Array&lt;kotlin.Array&lt;java.math.BigDecimal&gt;&gt;** |  |  [optional]
+**arrayArrayNumber** | **kotlin.collections.List&lt;kotlin.collections.List&lt;java.math.BigDecimal&gt;&gt;** |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/ArrayOfNumberOnly.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/ArrayOfNumberOnly.md
index b115a5d54c22..00c57a7885e8 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/ArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/ArrayOfNumberOnly.md
@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayNumber** | [**kotlin.Array&lt;java.math.BigDecimal&gt;**](java.math.BigDecimal.md) |  |  [optional]
+**arrayNumber** | [**kotlin.collections.List&lt;java.math.BigDecimal&gt;**](java.math.BigDecimal.md) |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/ArrayTest.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/ArrayTest.md
index aa0bbbe936c1..45e59c8fe77c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/ArrayTest.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/ArrayTest.md
@@ -4,9 +4,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayOfString** | **kotlin.Array&lt;kotlin.String&gt;** |  |  [optional]
-**arrayArrayOfInteger** | **kotlin.Array&lt;kotlin.Array&lt;kotlin.Long&gt;&gt;** |  |  [optional]
-**arrayArrayOfModel** | **kotlin.Array&lt;kotlin.Array&lt;ReadOnlyFirst&gt;&gt;** |  |  [optional]
+**arrayOfString** | **kotlin.collections.List&lt;kotlin.String&gt;** |  |  [optional]
+**arrayArrayOfInteger** | **kotlin.collections.List&lt;kotlin.collections.List&lt;kotlin.Long&gt;&gt;** |  |  [optional]
+**arrayArrayOfModel** | **kotlin.collections.List&lt;kotlin.collections.List&lt;ReadOnlyFirst&gt;&gt;** |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/DefaultApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/DefaultApi.md
index 784be537594d..1b907e27cb65 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/DefaultApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/DefaultApi.md
@@ -4,32 +4,23 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**fooGet**](DefaultApi.md#fooGet) | **GET** /foo | 
+[**fooGet**](DefaultApi.md#fooGet) | **GET** foo | 
 
 
-<a name="fooGet"></a>
-# **fooGet**
-> InlineResponseDefault fooGet()
 
 
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = DefaultApi()
-try {
-    val result : InlineResponseDefault = apiInstance.fooGet()
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling DefaultApi#fooGet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling DefaultApi#fooGet")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(DefaultApi::class.java)
+
+val result : InlineResponseDefault = webService.fooGet()
 ```
 
 ### Parameters
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/EnumArrays.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/EnumArrays.md
index 719084e5f949..c3c5e235bfed 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/EnumArrays.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **justSymbol** | [**inline**](#JustSymbolEnum) |  |  [optional]
-**arrayEnum** | [**inline**](#kotlin.Array&lt;ArrayEnumEnum&gt;) |  |  [optional]
+**arrayEnum** | [**inline**](#kotlin.collections.List&lt;ArrayEnumEnum&gt;) |  |  [optional]
 
 
 <a name="JustSymbolEnum"></a>
@@ -15,7 +15,7 @@ Name | Value
 justSymbol | &gt;&#x3D;, $
 
 
-<a name="kotlin.Array<ArrayEnumEnum>"></a>
+<a name="kotlin.collections.List<ArrayEnumEnum>"></a>
 ## Enum: array_enum
 Name | Value
 ---- | -----
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
index 0a28947aa843..6f5c1cbb479b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
@@ -4,46 +4,37 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**fakeHealthGet**](FakeApi.md#fakeHealthGet) | **GET** /fake/health | Health check endpoint
-[**fakeHttpSignatureTest**](FakeApi.md#fakeHttpSignatureTest) | **GET** /fake/http-signature-test | test http signature authentication
-[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
-[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
-[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
-[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
-[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
-[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
-[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
-[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
-[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
-
-
-<a name="fakeHealthGet"></a>
-# **fakeHealthGet**
-> HealthCheckResult fakeHealthGet()
+[**fakeHealthGet**](FakeApi.md#fakeHealthGet) | **GET** fake/health | Health check endpoint
+[**fakeHttpSignatureTest**](FakeApi.md#fakeHttpSignatureTest) | **GET** fake/http-signature-test | test http signature authentication
+[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** fake/outer/boolean | 
+[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** fake/outer/composite | 
+[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** fake/outer/number | 
+[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** fake/outer/string | 
+[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** fake/body-with-file-schema | 
+[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** fake/body-with-query-params | 
+[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** fake | To test \&quot;client\&quot; model
+[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** fake | To test enum parameters
+[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** fake | Fake endpoint to test group parameters (optional)
+[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** fake/inline-additionalProperties | test inline additionalProperties
+[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** fake/jsonFormData | test json serialization of form data
+[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** fake/test-query-paramters | 
+
+
 
 Health check endpoint
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
-try {
-    val result : HealthCheckResult = apiInstance.fakeHealthGet()
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeHealthGet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeHealthGet")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
+
+val result : HealthCheckResult = webService.fakeHealthGet()
 ```
 
 ### Parameters
@@ -62,31 +53,23 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
-<a name="fakeHttpSignatureTest"></a>
-# **fakeHttpSignatureTest**
-> fakeHttpSignatureTest(pet, query1, header1)
 
 test http signature authentication
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val pet : Pet =  // Pet | Pet object that needs to be added to the store
 val query1 : kotlin.String = query1_example // kotlin.String | query parameter
 val header1 : kotlin.String = header1_example // kotlin.String | header parameter
-try {
-    apiInstance.fakeHttpSignatureTest(pet, query1, header1)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeHttpSignatureTest")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeHttpSignatureTest")
-    e.printStackTrace()
-}
+
+webService.fakeHttpSignatureTest(pet, query1, header1)
 ```
 
 ### Parameters
@@ -110,9 +93,6 @@ null (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
-<a name="fakeOuterBooleanSerialize"></a>
-# **fakeOuterBooleanSerialize**
-> kotlin.Boolean fakeOuterBooleanSerialize(body)
 
 
 
@@ -121,21 +101,15 @@ Test serialization of outer boolean types
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val body : kotlin.Boolean = true // kotlin.Boolean | Input boolean as post body
-try {
-    val result : kotlin.Boolean = apiInstance.fakeOuterBooleanSerialize(body)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeOuterBooleanSerialize")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeOuterBooleanSerialize")
-    e.printStackTrace()
-}
+
+val result : kotlin.Boolean = webService.fakeOuterBooleanSerialize(body)
 ```
 
 ### Parameters
@@ -157,9 +131,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
-<a name="fakeOuterCompositeSerialize"></a>
-# **fakeOuterCompositeSerialize**
-> OuterComposite fakeOuterCompositeSerialize(outerComposite)
 
 
 
@@ -168,21 +139,15 @@ Test serialization of object with outer number type
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val outerComposite : OuterComposite =  // OuterComposite | Input composite as post body
-try {
-    val result : OuterComposite = apiInstance.fakeOuterCompositeSerialize(outerComposite)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeOuterCompositeSerialize")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeOuterCompositeSerialize")
-    e.printStackTrace()
-}
+
+val result : OuterComposite = webService.fakeOuterCompositeSerialize(outerComposite)
 ```
 
 ### Parameters
@@ -204,9 +169,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
-<a name="fakeOuterNumberSerialize"></a>
-# **fakeOuterNumberSerialize**
-> java.math.BigDecimal fakeOuterNumberSerialize(body)
 
 
 
@@ -215,21 +177,15 @@ Test serialization of outer number types
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val body : java.math.BigDecimal = 8.14 // java.math.BigDecimal | Input number as post body
-try {
-    val result : java.math.BigDecimal = apiInstance.fakeOuterNumberSerialize(body)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeOuterNumberSerialize")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeOuterNumberSerialize")
-    e.printStackTrace()
-}
+
+val result : java.math.BigDecimal = webService.fakeOuterNumberSerialize(body)
 ```
 
 ### Parameters
@@ -251,9 +207,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
-<a name="fakeOuterStringSerialize"></a>
-# **fakeOuterStringSerialize**
-> kotlin.String fakeOuterStringSerialize(body)
 
 
 
@@ -262,21 +215,15 @@ Test serialization of outer string types
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val body : kotlin.String = body_example // kotlin.String | Input string as post body
-try {
-    val result : kotlin.String = apiInstance.fakeOuterStringSerialize(body)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeOuterStringSerialize")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeOuterStringSerialize")
-    e.printStackTrace()
-}
+
+val result : kotlin.String = webService.fakeOuterStringSerialize(body)
 ```
 
 ### Parameters
@@ -298,9 +245,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
-<a name="testBodyWithFileSchema"></a>
-# **testBodyWithFileSchema**
-> testBodyWithFileSchema(fileSchemaTestClass)
 
 
 
@@ -309,20 +253,15 @@ For this test, the body for this request much reference a schema named &#x60;Fil
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val fileSchemaTestClass : FileSchemaTestClass =  // FileSchemaTestClass | 
-try {
-    apiInstance.testBodyWithFileSchema(fileSchemaTestClass)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testBodyWithFileSchema")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testBodyWithFileSchema")
-    e.printStackTrace()
-}
+
+webService.testBodyWithFileSchema(fileSchemaTestClass)
 ```
 
 ### Parameters
@@ -344,30 +283,22 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="testBodyWithQueryParams"></a>
-# **testBodyWithQueryParams**
-> testBodyWithQueryParams(query, user)
 
 
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val query : kotlin.String = query_example // kotlin.String | 
 val user : User =  // User | 
-try {
-    apiInstance.testBodyWithQueryParams(query, user)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testBodyWithQueryParams")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testBodyWithQueryParams")
-    e.printStackTrace()
-}
+
+webService.testBodyWithQueryParams(query, user)
 ```
 
 ### Parameters
@@ -390,9 +321,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="testClientModel"></a>
-# **testClientModel**
-> Client testClientModel(client)
 
 To test \&quot;client\&quot; model
 
@@ -401,21 +329,15 @@ To test \&quot;client\&quot; model
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val client : Client =  // Client | client model
-try {
-    val result : Client = apiInstance.testClientModel(client)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testClientModel")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testClientModel")
-    e.printStackTrace()
-}
+
+val result : Client = webService.testClientModel(client)
 ```
 
 ### Parameters
@@ -437,9 +359,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
-<a name="testEndpointParameters"></a>
-# **testEndpointParameters**
-> testEndpointParameters(number, double, patternWithoutDelimiter, byte, integer, int32, int64, float, string, binary, date, dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -448,10 +367,13 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+apiClient.setCredentials("USERNAME", "PASSWORD")
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val number : java.math.BigDecimal = 8.14 // java.math.BigDecimal | None
 val double : kotlin.Double = 1.2 // kotlin.Double | None
 val patternWithoutDelimiter : kotlin.String = patternWithoutDelimiter_example // kotlin.String | None
@@ -466,15 +388,8 @@ val date : java.time.LocalDate = 2013-10-20 // java.time.LocalDate | None
 val dateTime : java.time.OffsetDateTime = 2013-10-20T19:20:30+01:00 // java.time.OffsetDateTime | None
 val password : kotlin.String = password_example // kotlin.String | None
 val paramCallback : kotlin.String = paramCallback_example // kotlin.String | None
-try {
-    apiInstance.testEndpointParameters(number, double, patternWithoutDelimiter, byte, integer, int32, int64, float, string, binary, date, dateTime, password, paramCallback)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testEndpointParameters")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testEndpointParameters")
-    e.printStackTrace()
-}
+
+webService.testEndpointParameters(number, double, patternWithoutDelimiter, byte, integer, int32, int64, float, string, binary, date, dateTime, password, paramCallback)
 ```
 
 ### Parameters
@@ -504,17 +419,13 @@ null (empty response body)
 
 
 Configure http_basic_test:
-    ApiClient.username = ""
-    ApiClient.password = ""
+    ApiClient().setCredentials("USERNAME", "PASSWORD")
 
 ### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
-<a name="testEnumParameters"></a>
-# **testEnumParameters**
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
 
 To test enum parameters
 
@@ -523,10 +434,12 @@ To test enum parameters
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val enumHeaderStringArray : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Header parameter enum test (string array)
 val enumHeaderString : kotlin.String = enumHeaderString_example // kotlin.String | Header parameter enum test (string)
 val enumQueryStringArray : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Query parameter enum test (string array)
@@ -535,15 +448,8 @@ val enumQueryInteger : kotlin.Int = 56 // kotlin.Int | Query parameter enum test
 val enumQueryDouble : kotlin.Double = 1.2 // kotlin.Double | Query parameter enum test (double)
 val enumFormStringArray : kotlin.Array<kotlin.String> = enumFormStringArray_example // kotlin.Array<kotlin.String> | Form parameter enum test (string array)
 val enumFormString : kotlin.String = enumFormString_example // kotlin.String | Form parameter enum test (string)
-try {
-    apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testEnumParameters")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testEnumParameters")
-    e.printStackTrace()
-}
+
+webService.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
 ```
 
 ### Parameters
@@ -572,9 +478,6 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
-<a name="testGroupParameters"></a>
-# **testGroupParameters**
-> testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
 
 Fake endpoint to test group parameters (optional)
 
@@ -583,25 +486,21 @@ Fake endpoint to test group parameters (optional)
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+apiClient.setBearerToken("TOKEN")
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val requiredStringGroup : kotlin.Int = 56 // kotlin.Int | Required String in group parameters
 val requiredBooleanGroup : kotlin.Boolean = true // kotlin.Boolean | Required Boolean in group parameters
 val requiredInt64Group : kotlin.Long = 789 // kotlin.Long | Required Integer in group parameters
 val stringGroup : kotlin.Int = 56 // kotlin.Int | String in group parameters
 val booleanGroup : kotlin.Boolean = true // kotlin.Boolean | Boolean in group parameters
 val int64Group : kotlin.Long = 789 // kotlin.Long | Integer in group parameters
-try {
-    apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testGroupParameters")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testGroupParameters")
-    e.printStackTrace()
-}
+
+webService.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
 ```
 
 ### Parameters
@@ -623,36 +522,28 @@ null (empty response body)
 
 
 Configure bearer_test:
-    ApiClient.accessToken = ""
+    ApiClient().setBearerToken("TOKEN")
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="testInlineAdditionalProperties"></a>
-# **testInlineAdditionalProperties**
-> testInlineAdditionalProperties(requestBody)
 
 test inline additionalProperties
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val requestBody : kotlin.collections.Map<kotlin.String, kotlin.String> =  // kotlin.collections.Map<kotlin.String, kotlin.String> | request body
-try {
-    apiInstance.testInlineAdditionalProperties(requestBody)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testInlineAdditionalProperties")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testInlineAdditionalProperties")
-    e.printStackTrace()
-}
+
+webService.testInlineAdditionalProperties(requestBody)
 ```
 
 ### Parameters
@@ -674,30 +565,22 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="testJsonFormData"></a>
-# **testJsonFormData**
-> testJsonFormData(param, param2)
 
 test json serialization of form data
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val param : kotlin.String = param_example // kotlin.String | field1
 val param2 : kotlin.String = param2_example // kotlin.String | field2
-try {
-    apiInstance.testJsonFormData(param, param2)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testJsonFormData")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testJsonFormData")
-    e.printStackTrace()
-}
+
+webService.testJsonFormData(param, param2)
 ```
 
 ### Parameters
@@ -720,9 +603,6 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
-<a name="testQueryParameterCollectionFormat"></a>
-# **testQueryParameterCollectionFormat**
-> testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
 
 
 
@@ -731,24 +611,19 @@ To test the collection format in query parameters
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val pipe : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
 val ioutil : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
 val http : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
 val url : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
 val context : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
-try {
-    apiInstance.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testQueryParameterCollectionFormat")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testQueryParameterCollectionFormat")
-    e.printStackTrace()
-}
+
+webService.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
 ```
 
 ### Parameters
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeClassnameTags123Api.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeClassnameTags123Api.md
index 962dfd4d2dc2..2f6a955e4876 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeClassnameTags123Api.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeClassnameTags123Api.md
@@ -4,12 +4,9 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
+[**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** fake_classname_test | To test class name in snake case
 
 
-<a name="testClassname"></a>
-# **testClassname**
-> Client testClassname(client)
 
 To test class name in snake case
 
@@ -18,21 +15,15 @@ To test class name in snake case
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeClassnameTags123Api()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeClassnameTags123Api::class.java)
 val client : Client =  // Client | client model
-try {
-    val result : Client = apiInstance.testClassname(client)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeClassnameTags123Api#testClassname")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeClassnameTags123Api#testClassname")
-    e.printStackTrace()
-}
+
+val result : Client = webService.testClassname(client)
 ```
 
 ### Parameters
@@ -48,9 +39,6 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure api_key_query:
-    ApiClient.apiKey["api_key_query"] = ""
-    ApiClient.apiKeyPrefix["api_key_query"] = ""
 
 ### HTTP request headers
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FileSchemaTestClass.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FileSchemaTestClass.md
index 089e61862c2a..e5512f82f6f6 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FileSchemaTestClass.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FileSchemaTestClass.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **file** | [**java.io.File**](java.io.File.md) |  |  [optional]
-**files** | [**kotlin.Array&lt;java.io.File&gt;**](java.io.File.md) |  |  [optional]
+**files** | [**kotlin.collections.List&lt;java.io.File&gt;**](java.io.File.md) |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/InlineObject2.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/InlineObject2.md
index 0720925918bf..a98ffe031b3d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/InlineObject2.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/InlineObject2.md
@@ -4,11 +4,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**enumFormStringArray** | [**inline**](#kotlin.Array&lt;EnumFormStringArrayEnum&gt;) | Form parameter enum test (string array) |  [optional]
+**enumFormStringArray** | [**inline**](#kotlin.collections.List&lt;EnumFormStringArrayEnum&gt;) | Form parameter enum test (string array) |  [optional]
 **enumFormString** | [**inline**](#EnumFormStringEnum) | Form parameter enum test (string) |  [optional]
 
 
-<a name="kotlin.Array<EnumFormStringArrayEnum>"></a>
+<a name="kotlin.collections.List<EnumFormStringArrayEnum>"></a>
 ## Enum: enum_form_string_array
 Name | Value
 ---- | -----
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/NullableClass.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/NullableClass.md
index 9ec43d0b87c6..335943c01eae 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/NullableClass.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/NullableClass.md
@@ -10,9 +10,9 @@ Name | Type | Description | Notes
 **stringProp** | **kotlin.String** |  |  [optional]
 **dateProp** | [**java.time.LocalDate**](java.time.LocalDate.md) |  |  [optional]
 **datetimeProp** | [**java.time.OffsetDateTime**](java.time.OffsetDateTime.md) |  |  [optional]
-**arrayNullableProp** | [**kotlin.Array&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
-**arrayAndItemsNullableProp** | [**kotlin.Array&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
-**arrayItemsNullable** | [**kotlin.Array&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
+**arrayNullableProp** | [**kotlin.collections.List&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
+**arrayAndItemsNullableProp** | [**kotlin.collections.List&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
+**arrayItemsNullable** | [**kotlin.collections.List&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
 **objectNullableProp** | [**kotlin.collections.Map&lt;kotlin.String, kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
 **objectAndItemsNullableProp** | [**kotlin.collections.Map&lt;kotlin.String, kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
 **objectItemsNullable** | [**kotlin.collections.Map&lt;kotlin.String, kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/Pet.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/Pet.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/PetApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/PetApi.md
index 576d2f04ca85..7445920ab036 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/PetApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/PetApi.md
@@ -4,40 +4,32 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
-[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
-[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
-[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
-[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
-[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
-[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
-[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
-[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+[**addPet**](PetApi.md#addPet) | **POST** pet | Add a new pet to the store
+[**deletePet**](PetApi.md#deletePet) | **DELETE** pet/{petId} | Deletes a pet
+[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** pet/findByStatus | Finds Pets by status
+[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** pet/findByTags | Finds Pets by tags
+[**getPetById**](PetApi.md#getPetById) | **GET** pet/{petId} | Find pet by ID
+[**updatePet**](PetApi.md#updatePet) | **PUT** pet | Update an existing pet
+[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** pet/{petId} | Updates a pet in the store with form data
+[**uploadFile**](PetApi.md#uploadFile) | **POST** pet/{petId}/uploadImage | uploads an image
+[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 
 
-<a name="addPet"></a>
-# **addPet**
-> addPet(pet)
 
 Add a new pet to the store
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val pet : Pet =  // Pet | Pet object that needs to be added to the store
-try {
-    apiInstance.addPet(pet)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#addPet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#addPet")
-    e.printStackTrace()
-}
+
+webService.addPet(pet)
 ```
 
 ### Parameters
@@ -53,38 +45,28 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
-<a name="deletePet"></a>
-# **deletePet**
-> deletePet(petId, apiKey)
 
 Deletes a pet
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | Pet id to delete
 val apiKey : kotlin.String = apiKey_example // kotlin.String | 
-try {
-    apiInstance.deletePet(petId, apiKey)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#deletePet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#deletePet")
-    e.printStackTrace()
-}
+
+webService.deletePet(petId, apiKey)
 ```
 
 ### Parameters
@@ -101,17 +83,12 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="findPetsByStatus"></a>
-# **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -120,21 +97,15 @@ Multiple status values can be provided with comma separated strings
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
-try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#findPetsByStatus")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#findPetsByStatus")
-    e.printStackTrace()
-}
+
+val result : kotlin.Array<Pet> = webService.findPetsByStatus(status)
 ```
 
 ### Parameters
@@ -150,17 +121,12 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="findPetsByTags"></a>
-# **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -169,21 +135,15 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
-try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#findPetsByTags")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#findPetsByTags")
-    e.printStackTrace()
-}
+
+val result : kotlin.Array<Pet> = webService.findPetsByTags(tags)
 ```
 
 ### Parameters
@@ -199,17 +159,12 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="getPetById"></a>
-# **getPetById**
-> Pet getPetById(petId)
 
 Find pet by ID
 
@@ -218,21 +173,15 @@ Returns a single pet
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to return
-try {
-    val result : Pet = apiInstance.getPetById(petId)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#getPetById")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#getPetById")
-    e.printStackTrace()
-}
+
+val result : Pet = webService.getPetById(petId)
 ```
 
 ### Parameters
@@ -248,38 +197,27 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure api_key:
-    ApiClient.apiKey["api_key"] = ""
-    ApiClient.apiKeyPrefix["api_key"] = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="updatePet"></a>
-# **updatePet**
-> updatePet(pet)
 
 Update an existing pet
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val pet : Pet =  // Pet | Pet object that needs to be added to the store
-try {
-    apiInstance.updatePet(pet)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#updatePet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#updatePet")
-    e.printStackTrace()
-}
+
+webService.updatePet(pet)
 ```
 
 ### Parameters
@@ -295,39 +233,29 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
-<a name="updatePetWithForm"></a>
-# **updatePetWithForm**
-> updatePetWithForm(petId, name, status)
 
 Updates a pet in the store with form data
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be updated
 val name : kotlin.String = name_example // kotlin.String | Updated name of the pet
 val status : kotlin.String = status_example // kotlin.String | Updated status of the pet
-try {
-    apiInstance.updatePetWithForm(petId, name, status)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#updatePetWithForm")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#updatePetWithForm")
-    e.printStackTrace()
-}
+
+webService.updatePetWithForm(petId, name, status)
 ```
 
 ### Parameters
@@ -345,40 +273,29 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
-<a name="uploadFile"></a>
-# **uploadFile**
-> ApiResponse uploadFile(petId, additionalMetadata, file)
 
 uploads an image
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to update
 val additionalMetadata : kotlin.String = additionalMetadata_example // kotlin.String | Additional data to pass to server
 val file : java.io.File = BINARY_DATA_HERE // java.io.File | file to upload
-try {
-    val result : ApiResponse = apiInstance.uploadFile(petId, additionalMetadata, file)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#uploadFile")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#uploadFile")
-    e.printStackTrace()
-}
+
+val result : ApiResponse = webService.uploadFile(petId, additionalMetadata, file)
 ```
 
 ### Parameters
@@ -396,40 +313,29 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
-<a name="uploadFileWithRequiredFile"></a>
-# **uploadFileWithRequiredFile**
-> ApiResponse uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
 
 uploads an image (required)
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to update
 val requiredFile : java.io.File = BINARY_DATA_HERE // java.io.File | file to upload
 val additionalMetadata : kotlin.String = additionalMetadata_example // kotlin.String | Additional data to pass to server
-try {
-    val result : ApiResponse = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#uploadFileWithRequiredFile")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#uploadFileWithRequiredFile")
-    e.printStackTrace()
-}
+
+val result : ApiResponse = webService.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
 ```
 
 ### Parameters
@@ -447,8 +353,6 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/StoreApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/StoreApi.md
index 55bd8afdbc09..af9cc98c26be 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/StoreApi.md
@@ -4,15 +4,12 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
-[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
-[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
+[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** store/order/{order_id} | Delete purchase order by ID
+[**getInventory**](StoreApi.md#getInventory) | **GET** store/inventory | Returns pet inventories by status
+[**getOrderById**](StoreApi.md#getOrderById) | **GET** store/order/{order_id} | Find purchase order by ID
+[**placeOrder**](StoreApi.md#placeOrder) | **POST** store/order | Place an order for a pet
 
 
-<a name="deleteOrder"></a>
-# **deleteOrder**
-> deleteOrder(orderId)
 
 Delete purchase order by ID
 
@@ -21,20 +18,15 @@ For valid response try integer IDs with value &lt; 1000. Anything above 1000 or
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
 val orderId : kotlin.String = orderId_example // kotlin.String | ID of the order that needs to be deleted
-try {
-    apiInstance.deleteOrder(orderId)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#deleteOrder")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#deleteOrder")
-    e.printStackTrace()
-}
+
+webService.deleteOrder(orderId)
 ```
 
 ### Parameters
@@ -56,9 +48,6 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="getInventory"></a>
-# **getInventory**
-> kotlin.collections.Map&lt;kotlin.String, kotlin.Int&gt; getInventory()
 
 Returns pet inventories by status
 
@@ -67,20 +56,14 @@ Returns a map of status codes to quantities
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
-try {
-    val result : kotlin.collections.Map<kotlin.String, kotlin.Int> = apiInstance.getInventory()
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#getInventory")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#getInventory")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
+
+val result : kotlin.collections.Map<kotlin.String, kotlin.Int> = webService.getInventory()
 ```
 
 ### Parameters
@@ -93,18 +76,12 @@ This endpoint does not need any parameter.
 ### Authorization
 
 
-Configure api_key:
-    ApiClient.apiKey["api_key"] = ""
-    ApiClient.apiKeyPrefix["api_key"] = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
-<a name="getOrderById"></a>
-# **getOrderById**
-> Order getOrderById(orderId)
 
 Find purchase order by ID
 
@@ -113,21 +90,15 @@ For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other val
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
 val orderId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be fetched
-try {
-    val result : Order = apiInstance.getOrderById(orderId)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#getOrderById")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#getOrderById")
-    e.printStackTrace()
-}
+
+val result : Order = webService.getOrderById(orderId)
 ```
 
 ### Parameters
@@ -149,30 +120,21 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="placeOrder"></a>
-# **placeOrder**
-> Order placeOrder(order)
 
 Place an order for a pet
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
 val order : Order =  // Order | order placed for purchasing the pet
-try {
-    val result : Order = apiInstance.placeOrder(order)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#placeOrder")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#placeOrder")
-    e.printStackTrace()
-}
+
+val result : Order = webService.placeOrder(order)
 ```
 
 ### Parameters
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/UserApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/UserApi.md
index dbf78e81eb22..b667d3b0a600 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/UserApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/UserApi.md
@@ -4,19 +4,16 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**createUser**](UserApi.md#createUser) | **POST** /user | Create user
-[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
-[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
-[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
-[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
-[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
-[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
-[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
+[**createUser**](UserApi.md#createUser) | **POST** user | Create user
+[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** user/createWithArray | Creates list of users with given input array
+[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** user/createWithList | Creates list of users with given input array
+[**deleteUser**](UserApi.md#deleteUser) | **DELETE** user/{username} | Delete user
+[**getUserByName**](UserApi.md#getUserByName) | **GET** user/{username} | Get user by user name
+[**loginUser**](UserApi.md#loginUser) | **GET** user/login | Logs user into the system
+[**logoutUser**](UserApi.md#logoutUser) | **GET** user/logout | Logs out current logged in user session
+[**updateUser**](UserApi.md#updateUser) | **PUT** user/{username} | Updated user
 
 
-<a name="createUser"></a>
-# **createUser**
-> createUser(user)
 
 Create user
 
@@ -25,20 +22,15 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val user : User =  // User | Created user object
-try {
-    apiInstance.createUser(user)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#createUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#createUser")
-    e.printStackTrace()
-}
+
+webService.createUser(user)
 ```
 
 ### Parameters
@@ -60,29 +52,21 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="createUsersWithArrayInput"></a>
-# **createUsersWithArrayInput**
-> createUsersWithArrayInput(user)
 
 Creates list of users with given input array
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
-try {
-    apiInstance.createUsersWithArrayInput(user)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#createUsersWithArrayInput")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#createUsersWithArrayInput")
-    e.printStackTrace()
-}
+
+webService.createUsersWithArrayInput(user)
 ```
 
 ### Parameters
@@ -104,29 +88,21 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="createUsersWithListInput"></a>
-# **createUsersWithListInput**
-> createUsersWithListInput(user)
 
 Creates list of users with given input array
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
-try {
-    apiInstance.createUsersWithListInput(user)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#createUsersWithListInput")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#createUsersWithListInput")
-    e.printStackTrace()
-}
+
+webService.createUsersWithListInput(user)
 ```
 
 ### Parameters
@@ -148,9 +124,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="deleteUser"></a>
-# **deleteUser**
-> deleteUser(username)
 
 Delete user
 
@@ -159,20 +132,15 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be deleted
-try {
-    apiInstance.deleteUser(username)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#deleteUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#deleteUser")
-    e.printStackTrace()
-}
+
+webService.deleteUser(username)
 ```
 
 ### Parameters
@@ -194,30 +162,21 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="getUserByName"></a>
-# **getUserByName**
-> User getUserByName(username)
 
 Get user by user name
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be fetched. Use user1 for testing.
-try {
-    val result : User = apiInstance.getUserByName(username)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#getUserByName")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#getUserByName")
-    e.printStackTrace()
-}
+
+val result : User = webService.getUserByName(username)
 ```
 
 ### Parameters
@@ -239,31 +198,22 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="loginUser"></a>
-# **loginUser**
-> kotlin.String loginUser(username, password)
 
 Logs user into the system
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | The user name for login
 val password : kotlin.String = password_example // kotlin.String | The password for login in clear text
-try {
-    val result : kotlin.String = apiInstance.loginUser(username, password)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#loginUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#loginUser")
-    e.printStackTrace()
-}
+
+val result : kotlin.String = webService.loginUser(username, password)
 ```
 
 ### Parameters
@@ -286,28 +236,20 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="logoutUser"></a>
-# **logoutUser**
-> logoutUser()
 
 Logs out current logged in user session
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
-try {
-    apiInstance.logoutUser()
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#logoutUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#logoutUser")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
+
+webService.logoutUser()
 ```
 
 ### Parameters
@@ -326,9 +268,6 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="updateUser"></a>
-# **updateUser**
-> updateUser(username, user)
 
 Updated user
 
@@ -337,21 +276,16 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | name that need to be deleted
 val user : User =  // User | Updated user object
-try {
-    apiInstance.updateUser(username, user)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#updateUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#updateUser")
-    e.printStackTrace()
-}
+
+webService.updateUser(username, user)
 ```
 
 ### Parameters
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
index 8814c97b6b42..e2a7aad9b72e 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
@@ -3,14 +3,21 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import rx.Observable
 
 import org.openapitools.client.models.Client
 
 interface AnotherFakeApi {
-    @PATCH("/another-fake/dummy")
+    /**
+     * To test special tags
+     * To test special tags and operation ID starting with number
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param client client model 
+    * @return [Call]<[Client]>
+     */
+    @PATCH("another-fake/dummy")
     fun call123testSpecialTags(@Body client: Client): Observable<Client>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
index a7cc4c43ea6c..6d4eae90743f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
@@ -3,14 +3,20 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import rx.Observable
 
 import org.openapitools.client.models.InlineResponseDefault
 
 interface DefaultApi {
-    @GET("/foo")
+    /**
+     * 
+     * 
+     * Responses:
+     *  - 0: response
+     * 
+    * @return [Call]<[InlineResponseDefault]>
+     */
+    @GET("foo")
     fun fooGet(): Observable<InlineResponseDefault>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
index d9ba172b3275..cf681d2069ce 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
@@ -3,8 +3,6 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import rx.Observable
 
 import org.openapitools.client.models.Client
@@ -15,52 +13,221 @@ import org.openapitools.client.models.Pet
 import org.openapitools.client.models.User
 
 interface FakeApi {
-    @GET("/fake/health")
+    /**
+     * Health check endpoint
+     * 
+     * Responses:
+     *  - 200: The instance started successfully
+     * 
+    * @return [Call]<[HealthCheckResult]>
+     */
+    @GET("fake/health")
     fun fakeHealthGet(): Observable<HealthCheckResult>
 
-    @GET("/fake/http-signature-test")
+    /**
+     * test http signature authentication
+     * 
+     * Responses:
+     *  - 200: The instance started successfully
+     * 
+     * @param pet Pet object that needs to be added to the store 
+     * @param query1 query parameter (optional)
+     * @param header1 header parameter (optional)
+    * @return [Call]<[Unit]>
+     */
+    @GET("fake/http-signature-test")
     fun fakeHttpSignatureTest(@Body pet: Pet, @Query("query_1") query1: kotlin.String, @Header("header_1") header1: kotlin.String): Observable<Unit>
 
-    @POST("/fake/outer/boolean")
-    fun fakeOuterBooleanSerialize(@Body body: kotlin.Boolean): Observable<kotlin.Boolean>
-
-    @POST("/fake/outer/composite")
-    fun fakeOuterCompositeSerialize(@Body outerComposite: OuterComposite): Observable<OuterComposite>
-
-    @POST("/fake/outer/number")
-    fun fakeOuterNumberSerialize(@Body body: java.math.BigDecimal): Observable<java.math.BigDecimal>
-
-    @POST("/fake/outer/string")
-    fun fakeOuterStringSerialize(@Body body: kotlin.String): Observable<kotlin.String>
-
-    @PUT("/fake/body-with-file-schema")
+    /**
+     * 
+     * Test serialization of outer boolean types
+     * Responses:
+     *  - 200: Output boolean
+     * 
+     * @param body Input boolean as post body (optional)
+    * @return [Call]<[kotlin.Boolean]>
+     */
+    @POST("fake/outer/boolean")
+    fun fakeOuterBooleanSerialize(@Body body: kotlin.Boolean? = null): Observable<kotlin.Boolean>
+
+    /**
+     * 
+     * Test serialization of object with outer number type
+     * Responses:
+     *  - 200: Output composite
+     * 
+     * @param outerComposite Input composite as post body (optional)
+    * @return [Call]<[OuterComposite]>
+     */
+    @POST("fake/outer/composite")
+    fun fakeOuterCompositeSerialize(@Body outerComposite: OuterComposite? = null): Observable<OuterComposite>
+
+    /**
+     * 
+     * Test serialization of outer number types
+     * Responses:
+     *  - 200: Output number
+     * 
+     * @param body Input number as post body (optional)
+    * @return [Call]<[java.math.BigDecimal]>
+     */
+    @POST("fake/outer/number")
+    fun fakeOuterNumberSerialize(@Body body: java.math.BigDecimal? = null): Observable<java.math.BigDecimal>
+
+    /**
+     * 
+     * Test serialization of outer string types
+     * Responses:
+     *  - 200: Output string
+     * 
+     * @param body Input string as post body (optional)
+    * @return [Call]<[kotlin.String]>
+     */
+    @POST("fake/outer/string")
+    fun fakeOuterStringSerialize(@Body body: kotlin.String? = null): Observable<kotlin.String>
+
+    /**
+     * 
+     * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+     * Responses:
+     *  - 200: Success
+     * 
+     * @param fileSchemaTestClass  
+    * @return [Call]<[Unit]>
+     */
+    @PUT("fake/body-with-file-schema")
     fun testBodyWithFileSchema(@Body fileSchemaTestClass: FileSchemaTestClass): Observable<Unit>
 
-    @PUT("/fake/body-with-query-params")
+    /**
+     * 
+     * 
+     * Responses:
+     *  - 200: Success
+     * 
+     * @param query  
+     * @param user  
+    * @return [Call]<[Unit]>
+     */
+    @PUT("fake/body-with-query-params")
     fun testBodyWithQueryParams(@Query("query") query: kotlin.String, @Body user: User): Observable<Unit>
 
-    @PATCH("/fake")
+    /**
+     * To test \&quot;client\&quot; model
+     * To test \&quot;client\&quot; model
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param client client model 
+    * @return [Call]<[Client]>
+     */
+    @PATCH("fake")
     fun testClientModel(@Body client: Client): Observable<Client>
 
+    /**
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Responses:
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param number None 
+     * @param double None 
+     * @param patternWithoutDelimiter None 
+     * @param byte None 
+     * @param integer None (optional)
+     * @param int32 None (optional)
+     * @param int64 None (optional)
+     * @param float None (optional)
+     * @param string None (optional)
+     * @param binary None (optional)
+     * @param date None (optional)
+     * @param dateTime None (optional)
+     * @param password None (optional)
+     * @param paramCallback None (optional)
+    * @return [Call]<[Unit]>
+     */
     @FormUrlEncoded
-    @POST("/fake")
+    @POST("fake")
     fun testEndpointParameters(@Field("number") number: java.math.BigDecimal, @Field("double") double: kotlin.Double, @Field("pattern_without_delimiter") patternWithoutDelimiter: kotlin.String, @Field("byte") byte: kotlin.ByteArray, @Field("integer") integer: kotlin.Int, @Field("int32") int32: kotlin.Int, @Field("int64") int64: kotlin.Long, @Field("float") float: kotlin.Float, @Field("string") string: kotlin.String, @Field("binary") binary: MultipartBody.Part, @Field("date") date: java.time.LocalDate, @Field("dateTime") dateTime: java.time.OffsetDateTime, @Field("password") password: kotlin.String, @Field("callback") paramCallback: kotlin.String): Observable<Unit>
 
+    /**
+     * To test enum parameters
+     * To test enum parameters
+     * Responses:
+     *  - 400: Invalid request
+     *  - 404: Not found
+     * 
+     * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
+     * @param enumHeaderString Header parameter enum test (string) (optional, default to "-efg")
+     * @param enumQueryStringArray Query parameter enum test (string array) (optional)
+     * @param enumQueryString Query parameter enum test (string) (optional, default to "-efg")
+     * @param enumQueryInteger Query parameter enum test (double) (optional)
+     * @param enumQueryDouble Query parameter enum test (double) (optional)
+     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to "$")
+     * @param enumFormString Form parameter enum test (string) (optional, default to "-efg")
+    * @return [Call]<[Unit]>
+     */
     @FormUrlEncoded
-    @GET("/fake")
+    @GET("fake")
     fun testEnumParameters(@Header("enum_header_string_array") enumHeaderStringArray: kotlin.Array<kotlin.String>, @Header("enum_header_string") enumHeaderString: kotlin.String, @Query("enum_query_string_array") enumQueryStringArray: kotlin.Array<kotlin.String>, @Query("enum_query_string") enumQueryString: kotlin.String, @Query("enum_query_integer") enumQueryInteger: kotlin.Int, @Query("enum_query_double") enumQueryDouble: kotlin.Double, @Field("enum_form_string_array") enumFormStringArray: kotlin.Array<kotlin.String>, @Field("enum_form_string") enumFormString: kotlin.String): Observable<Unit>
 
-    @DELETE("/fake")
+    /**
+     * Fake endpoint to test group parameters (optional)
+     * Fake endpoint to test group parameters (optional)
+     * Responses:
+     *  - 400: Someting wrong
+     * 
+     * @param requiredStringGroup Required String in group parameters 
+     * @param requiredBooleanGroup Required Boolean in group parameters 
+     * @param requiredInt64Group Required Integer in group parameters 
+     * @param stringGroup String in group parameters (optional)
+     * @param booleanGroup Boolean in group parameters (optional)
+     * @param int64Group Integer in group parameters (optional)
+    * @return [Call]<[Unit]>
+     */
+    @DELETE("fake")
     fun testGroupParameters(@Query("required_string_group") requiredStringGroup: kotlin.Int, @Header("required_boolean_group") requiredBooleanGroup: kotlin.Boolean, @Query("required_int64_group") requiredInt64Group: kotlin.Long, @Query("string_group") stringGroup: kotlin.Int, @Header("boolean_group") booleanGroup: kotlin.Boolean, @Query("int64_group") int64Group: kotlin.Long): Observable<Unit>
 
-    @POST("/fake/inline-additionalProperties")
+    /**
+     * test inline additionalProperties
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param requestBody request body 
+    * @return [Call]<[Unit]>
+     */
+    @POST("fake/inline-additionalProperties")
     fun testInlineAdditionalProperties(@Body requestBody: kotlin.collections.Map<kotlin.String, kotlin.String>): Observable<Unit>
 
+    /**
+     * test json serialization of form data
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param param field1 
+     * @param param2 field2 
+    * @return [Call]<[Unit]>
+     */
     @FormUrlEncoded
-    @GET("/fake/jsonFormData")
+    @GET("fake/jsonFormData")
     fun testJsonFormData(@Field("param") param: kotlin.String, @Field("param2") param2: kotlin.String): Observable<Unit>
 
-    @PUT("/fake/test-query-paramters")
-    fun testQueryParameterCollectionFormat(@Query("pipe") pipe: kotlin.Array<kotlin.String>, @Query("ioutil") ioutil: CSVParams, @Query("http") http: SPACEParams, @Query("url") url: CSVParams, @Query("context") context: kotlin.Array<kotlin.String>): Observable<Unit>
+    /**
+     * 
+     * To test the collection format in query parameters
+     * Responses:
+     *  - 200: Success
+     * 
+     * @param pipe  
+     * @param ioutil  
+     * @param http  
+     * @param url  
+     * @param context  
+    * @return [Call]<[Unit]>
+     */
+    @PUT("fake/test-query-paramters")
+    fun testQueryParameterCollectionFormat(@Query("pipe") pipe: kotlin.Array<kotlin.String>, @Query("ioutil") ioutil: CSVParams, @Query("http") http: SSVParams, @Query("url") url: CSVParams, @Query("context") context: kotlin.Array<kotlin.String>): Observable<Unit>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
index a186587a372c..5c6c95d2db49 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
@@ -3,14 +3,21 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import rx.Observable
 
 import org.openapitools.client.models.Client
 
 interface FakeClassnameTags123Api {
-    @PATCH("/fake_classname_test")
+    /**
+     * To test class name in snake case
+     * To test class name in snake case
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param client client model 
+    * @return [Call]<[Client]>
+     */
+    @PATCH("fake_classname_test")
     fun testClassname(@Body client: Client): Observable<Client>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 3c778776b585..8532622d6390 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -3,43 +3,135 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import rx.Observable
 
 import org.openapitools.client.models.ApiResponse
 import org.openapitools.client.models.Pet
 
 interface PetApi {
-    @POST("/pet")
+    /**
+     * Add a new pet to the store
+     * 
+     * Responses:
+     *  - 405: Invalid input
+     * 
+     * @param pet Pet object that needs to be added to the store 
+    * @return [Call]<[Unit]>
+     */
+    @POST("pet")
     fun addPet(@Body pet: Pet): Observable<Unit>
 
-    @DELETE("/pet/{petId}")
+    /**
+     * Deletes a pet
+     * 
+     * Responses:
+     *  - 400: Invalid pet value
+     * 
+     * @param petId Pet id to delete 
+     * @param apiKey  (optional)
+    * @return [Call]<[Unit]>
+     */
+    @DELETE("pet/{petId}")
     fun deletePet(@Path("petId") petId: kotlin.Long, @Header("api_key") apiKey: kotlin.String): Observable<Unit>
 
-    @GET("/pet/findByStatus")
+    /**
+     * Finds Pets by status
+     * Multiple status values can be provided with comma separated strings
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid status value
+     * 
+     * @param status Status values that need to be considered for filter 
+    * @return [Call]<[kotlin.Array<Pet>]>
+     */
+    @GET("pet/findByStatus")
     fun findPetsByStatus(@Query("status") status: CSVParams): Observable<kotlin.Array<Pet>>
 
+    /**
+     * Finds Pets by tags
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid tag value
+     * 
+     * @param tags Tags to filter by 
+    * @return [Call]<[kotlin.Array<Pet>]>
+     */
     @Deprecated("This api was deprecated")
-    @GET("/pet/findByTags")
+    @GET("pet/findByTags")
     fun findPetsByTags(@Query("tags") tags: CSVParams): Observable<kotlin.Array<Pet>>
 
-    @GET("/pet/{petId}")
+    /**
+     * Find pet by ID
+     * Returns a single pet
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid ID supplied
+     *  - 404: Pet not found
+     * 
+     * @param petId ID of pet to return 
+    * @return [Call]<[Pet]>
+     */
+    @GET("pet/{petId}")
     fun getPetById(@Path("petId") petId: kotlin.Long): Observable<Pet>
 
-    @PUT("/pet")
+    /**
+     * Update an existing pet
+     * 
+     * Responses:
+     *  - 400: Invalid ID supplied
+     *  - 404: Pet not found
+     *  - 405: Validation exception
+     * 
+     * @param pet Pet object that needs to be added to the store 
+    * @return [Call]<[Unit]>
+     */
+    @PUT("pet")
     fun updatePet(@Body pet: Pet): Observable<Unit>
 
+    /**
+     * Updates a pet in the store with form data
+     * 
+     * Responses:
+     *  - 405: Invalid input
+     * 
+     * @param petId ID of pet that needs to be updated 
+     * @param name Updated name of the pet (optional)
+     * @param status Updated status of the pet (optional)
+    * @return [Call]<[Unit]>
+     */
     @FormUrlEncoded
-    @POST("/pet/{petId}")
+    @POST("pet/{petId}")
     fun updatePetWithForm(@Path("petId") petId: kotlin.Long, @Field("name") name: kotlin.String, @Field("status") status: kotlin.String): Observable<Unit>
 
+    /**
+     * uploads an image
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param petId ID of pet to update 
+     * @param additionalMetadata Additional data to pass to server (optional)
+     * @param file file to upload (optional)
+    * @return [Call]<[ApiResponse]>
+     */
     @Multipart
-    @POST("/pet/{petId}/uploadImage")
+    @POST("pet/{petId}/uploadImage")
     fun uploadFile(@Path("petId") petId: kotlin.Long, @Part("additionalMetadata") additionalMetadata: kotlin.String, @Part file: MultipartBody.Part): Observable<ApiResponse>
 
+    /**
+     * uploads an image (required)
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param petId ID of pet to update 
+     * @param requiredFile file to upload 
+     * @param additionalMetadata Additional data to pass to server (optional)
+    * @return [Call]<[ApiResponse]>
+     */
     @Multipart
-    @POST("/fake/{petId}/uploadImageWithRequiredFile")
+    @POST("fake/{petId}/uploadImageWithRequiredFile")
     fun uploadFileWithRequiredFile(@Path("petId") petId: kotlin.Long, @Part requiredFile: MultipartBody.Part, @Part("additionalMetadata") additionalMetadata: kotlin.String): Observable<ApiResponse>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 1bd8adb28d00..fef564f9465f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -3,23 +3,60 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import rx.Observable
 
 import org.openapitools.client.models.Order
 
 interface StoreApi {
-    @DELETE("/store/order/{order_id}")
+    /**
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * Responses:
+     *  - 400: Invalid ID supplied
+     *  - 404: Order not found
+     * 
+     * @param orderId ID of the order that needs to be deleted 
+    * @return [Call]<[Unit]>
+     */
+    @DELETE("store/order/{order_id}")
     fun deleteOrder(@Path("order_id") orderId: kotlin.String): Observable<Unit>
 
-    @GET("/store/inventory")
+    /**
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     * Responses:
+     *  - 200: successful operation
+     * 
+    * @return [Call]<[kotlin.collections.Map<kotlin.String, kotlin.Int>]>
+     */
+    @GET("store/inventory")
     fun getInventory(): Observable<kotlin.collections.Map<kotlin.String, kotlin.Int>>
 
-    @GET("/store/order/{order_id}")
+    /**
+     * Find purchase order by ID
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid ID supplied
+     *  - 404: Order not found
+     * 
+     * @param orderId ID of pet that needs to be fetched 
+    * @return [Call]<[Order]>
+     */
+    @GET("store/order/{order_id}")
     fun getOrderById(@Path("order_id") orderId: kotlin.Long): Observable<Order>
 
-    @POST("/store/order")
+    /**
+     * Place an order for a pet
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid Order
+     * 
+     * @param order order placed for purchasing the pet 
+    * @return [Call]<[Order]>
+     */
+    @POST("store/order")
     fun placeOrder(@Body order: Order): Observable<Order>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index aca47deab128..465705c8ef72 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -3,35 +3,111 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import rx.Observable
 
 import org.openapitools.client.models.User
 
 interface UserApi {
-    @POST("/user")
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param user Created user object 
+    * @return [Call]<[Unit]>
+     */
+    @POST("user")
     fun createUser(@Body user: User): Observable<Unit>
 
-    @POST("/user/createWithArray")
+    /**
+     * Creates list of users with given input array
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param user List of user object 
+    * @return [Call]<[Unit]>
+     */
+    @POST("user/createWithArray")
     fun createUsersWithArrayInput(@Body user: kotlin.Array<User>): Observable<Unit>
 
-    @POST("/user/createWithList")
+    /**
+     * Creates list of users with given input array
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param user List of user object 
+    * @return [Call]<[Unit]>
+     */
+    @POST("user/createWithList")
     fun createUsersWithListInput(@Body user: kotlin.Array<User>): Observable<Unit>
 
-    @DELETE("/user/{username}")
+    /**
+     * Delete user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param username The name that needs to be deleted 
+    * @return [Call]<[Unit]>
+     */
+    @DELETE("user/{username}")
     fun deleteUser(@Path("username") username: kotlin.String): Observable<Unit>
 
-    @GET("/user/{username}")
+    /**
+     * Get user by user name
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return [Call]<[User]>
+     */
+    @GET("user/{username}")
     fun getUserByName(@Path("username") username: kotlin.String): Observable<User>
 
-    @GET("/user/login")
+    /**
+     * Logs user into the system
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid username/password supplied
+     * 
+     * @param username The user name for login 
+     * @param password The password for login in clear text 
+    * @return [Call]<[kotlin.String]>
+     */
+    @GET("user/login")
     fun loginUser(@Query("username") username: kotlin.String, @Query("password") password: kotlin.String): Observable<kotlin.String>
 
-    @GET("/user/logout")
+    /**
+     * Logs out current logged in user session
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+    * @return [Call]<[Unit]>
+     */
+    @GET("user/logout")
     fun logoutUser(): Observable<Unit>
 
-    @PUT("/user/{username}")
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 400: Invalid user supplied
+     *  - 404: User not found
+     * 
+     * @param username name that need to be deleted 
+     * @param user Updated user object 
+    * @return [Call]<[Unit]>
+     */
+    @PUT("user/{username}")
     fun updateUser(@Path("username") username: kotlin.String, @Body user: User): Observable<Unit>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
new file mode 100644
index 000000000000..524d5190ef88
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
@@ -0,0 +1,50 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+import java.net.URI
+import java.net.URISyntaxException
+
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class ApiKeyAuth(
+        private val location: String = "",
+        private val paramName: String = "",
+        private var apiKey: String = ""
+) : Interceptor {
+    
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request = chain.request()
+
+        if ("query" == location) {
+            var newQuery = request.url.toUri().query
+            val paramValue = "$paramName=$apiKey"
+            if (newQuery == null) {
+                newQuery = paramValue
+            } else {
+                newQuery += "&$paramValue"
+            }
+
+            val newUri: URI
+            try {
+                val oldUri = request.url.toUri()
+                newUri = URI(oldUri.scheme, oldUri.authority,
+                    oldUri.path, newQuery, oldUri.fragment)
+            } catch (e: URISyntaxException) {
+                throw IOException(e)
+            }
+
+            request = request.newBuilder().url(newUri.toURL()).build()
+        } else if ("header" == location) {
+            request = request.newBuilder()
+                    .addHeader(paramName, apiKey)
+                    .build()
+        } else if ("cookie" == location) {
+            request = request.newBuilder()
+                    .addHeader("Cookie", "$paramName=$apiKey")
+                    .build()
+        }
+        return chain.proceed(request)
+    }
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
new file mode 100644
index 000000000000..575bea19540d
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
@@ -0,0 +1,33 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+
+import kotlin.jvm.Throws
+import okhttp3.Interceptor
+import okhttp3.Interceptor.Chain
+import okhttp3.Response
+import okhttp3.Credentials
+
+class HttpBasicAuth(
+    private var username: String = "",
+    private var password: String = ""
+) : Interceptor {
+
+    fun setCredentials(username: String, password: String) {
+        this.username = username
+        this.password = password
+    }
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Chain): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") == null && username.isNotBlank() && password.isNotBlank()) {
+            request = request.newBuilder()
+                .addHeader("Authorization", Credentials.basic(username, password))
+                .build()
+        }
+        return chain.proceed(request)
+    }
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/HttpBearerAuth.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/HttpBearerAuth.kt
new file mode 100644
index 000000000000..775ad903c438
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/HttpBearerAuth.kt
@@ -0,0 +1,39 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+
+import okhttp3.Interceptor
+import okhttp3.Interceptor.Chain
+import okhttp3.Response
+
+class HttpBearerAuth(
+    private var schema: String = "",
+    var bearerToken: String = ""
+) : Interceptor {
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Chain): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") == null && bearerToken.isNotBlank()) {
+            request = request.newBuilder()
+                .addHeader("Authorization", headerValue())
+                .build()
+        }
+        return chain.proceed(request)
+    }
+
+    private fun headerValue(): String {
+        return if (schema.isNotBlank()) {
+            "${upperCaseBearer()} $bearerToken"
+        } else {
+            bearerToken
+        }
+    }
+
+    private fun upperCaseBearer(): String {
+        return if (schema.toLowerCase().equals("bearer")) "Bearer" else schema
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/OAuth.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/OAuth.kt
new file mode 100644
index 000000000000..311a8f439794
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/OAuth.kt
@@ -0,0 +1,151 @@
+package org.openapitools.client.auth
+
+import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
+import java.net.HttpURLConnection.HTTP_FORBIDDEN
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.OAuthClient
+import org.apache.oltu.oauth2.client.request.OAuthBearerClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+import org.apache.oltu.oauth2.common.message.types.GrantType
+import org.apache.oltu.oauth2.common.token.BasicOAuthToken
+
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Response
+
+class OAuth(
+        client: OkHttpClient,
+        var tokenRequestBuilder: TokenRequestBuilder
+) : Interceptor {
+
+    interface AccessTokenListener {
+        fun notify(token: BasicOAuthToken)
+    }
+
+    private var oauthClient: OAuthClient = OAuthClient(OAuthOkHttpClient(client))
+
+    @Volatile 
+    private var accessToken: String? = null
+    var authenticationRequestBuilder: AuthenticationRequestBuilder? = null
+    private var accessTokenListener: AccessTokenListener? = null
+
+    constructor(
+            requestBuilder: TokenRequestBuilder
+    ) : this(
+            OkHttpClient(), 
+            requestBuilder
+    )
+
+    constructor(
+            flow: OAuthFlow, 
+            authorizationUrl: String, 
+            tokenUrl: String, 
+            scopes: String
+    ) : this(
+            OAuthClientRequest.tokenLocation(tokenUrl).setScope(scopes)
+    ) {
+        setFlow(flow);
+        authenticationRequestBuilder = OAuthClientRequest.authorizationLocation(authorizationUrl);
+    }
+
+    fun setFlow(flow: OAuthFlow) {
+        when (flow) {
+            OAuthFlow.accessCode, OAuthFlow.implicit ->
+                tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE)
+            OAuthFlow.password ->
+                tokenRequestBuilder.setGrantType(GrantType.PASSWORD)
+            OAuthFlow.application ->
+                tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS)
+        }            
+    }
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        return retryingIntercept(chain, true)
+    }
+
+    @Throws(IOException::class)
+    private fun retryingIntercept(chain: Interceptor.Chain, updateTokenAndRetryOnAuthorizationFailure: Boolean): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") != null) {
+            return chain.proceed(request)
+        }
+
+        // If first time, get the token
+        val oAuthRequest: OAuthClientRequest
+        if (accessToken == null) {
+            updateAccessToken(null)
+        }
+
+        if (accessToken != null) {
+            // Build the request
+            val rb = request.newBuilder()
+
+            val requestAccessToken = accessToken
+            try {
+                oAuthRequest = OAuthBearerClientRequest(request.url.toString())
+                        .setAccessToken(requestAccessToken)
+                        .buildHeaderMessage()
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            }
+
+            oAuthRequest.headers.entries.forEach { header ->
+                rb.addHeader(header.key, header.value)
+            }
+            rb.url(oAuthRequest.locationUri)
+
+            //Execute the request
+            val response = chain.proceed(rb.build())
+
+            // 401/403 most likely indicates that access token has expired. Unless it happens two times in a row.
+            if ((response.code == HTTP_UNAUTHORIZED || response.code == HTTP_FORBIDDEN) && updateTokenAndRetryOnAuthorizationFailure) {
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body?.close()
+                        return retryingIntercept(chain, false)
+                    }
+                } catch (e: Exception) {
+                    response.body?.close()
+                    throw e
+                }
+            }
+            return response
+        } else {
+            return chain.proceed(chain.request())
+        }
+    }
+
+    /**
+     * Returns true if the access token has been updated
+     */
+    @Throws(IOException::class)
+    @Synchronized 
+    fun updateAccessToken(requestAccessToken: String?): Boolean {
+        if (accessToken == null || accessToken.equals(requestAccessToken)) {    
+            return try {
+                val accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage())
+                if (accessTokenResponse != null && accessTokenResponse.accessToken != null) {
+                    accessToken = accessTokenResponse.accessToken
+                    accessTokenListener?.notify(accessTokenResponse.oAuthToken as BasicOAuthToken)
+                    !accessToken.equals(requestAccessToken)
+                } else {
+                    false
+                }
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            } catch (e: OAuthProblemException) {
+                throw IOException(e)
+            }
+        }
+        return true;
+    }
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt
new file mode 100644
index 000000000000..bcada9b7a6a2
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt
@@ -0,0 +1,5 @@
+package org.openapitools.client.auth
+
+enum class OAuthFlow {
+    accessCode, implicit, password, application
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt
new file mode 100644
index 000000000000..93adbda3fc98
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt
@@ -0,0 +1,61 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.HttpClient
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.response.OAuthClientResponse
+import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody
+
+
+class OAuthOkHttpClient(
+        private var client: OkHttpClient
+) : HttpClient {
+
+    constructor() : this(OkHttpClient())
+
+    @Throws(OAuthSystemException::class, OAuthProblemException::class)
+    override fun <T : OAuthClientResponse?> execute(
+            request: OAuthClientRequest, 
+            headers: Map<String, String>?,
+            requestMethod: String, 
+            responseClass: Class<T>?): T {
+
+        var mediaType = "application/json".toMediaTypeOrNull()
+        val requestBuilder = Request.Builder().url(request.locationUri)
+
+        headers?.forEach { entry ->
+            if (entry.key.equals("Content-Type", true)) {
+                mediaType = entry.value.toMediaTypeOrNull()
+            } else {
+                requestBuilder.addHeader(entry.key, entry.value)
+            }
+        }
+
+        val body: RequestBody? = if (request.body != null) RequestBody.create(mediaType, request.body) else null
+        requestBuilder.method(requestMethod, body)
+
+        try {
+            val response = client.newCall(requestBuilder.build()).execute()
+            return OAuthClientResponseFactory.createCustomResponse(
+                    response.body?.string(), 
+                    response.body?.contentType()?.toString(),
+                    response.code,
+                    responseClass)
+        } catch (e: IOException) {
+            throw OAuthSystemException(e)
+        }
+    }
+
+    override fun shutdown() {
+        // Nothing to do here
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
index 5af331818cb6..eaf1cd79b17f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -1,37 +1,232 @@
 package org.openapitools.client.infrastructure
 
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import org.openapitools.client.auth.ApiKeyAuth
+import org.openapitools.client.auth.OAuth
+import org.openapitools.client.auth.OAuth.AccessTokenListener
+import org.openapitools.client.auth.OAuthFlow
+import org.openapitools.client.auth.HttpBearerAuth
+import org.openapitools.client.auth.HttpBasicAuth
+
+import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.converter.scalars.ScalarsConverterFactory
 import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
 import retrofit2.converter.gson.GsonConverterFactory
 
 class ApiClient(
     private var baseUrl: String = defaultBasePath,
-    private var okHttpClient: OkHttpClient
+    private val okHttpClientBuilder: OkHttpClient.Builder? = null,
+    private val serializerBuilder: GsonBuilder = Serializer.gsonBuilder
 ) {
-    companion object {
-        @JvmStatic
-        val defaultBasePath: String by lazy {
-            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io:80/v2")
-        }
+    private val apiAuthorizations = mutableMapOf<String, Interceptor>()
+    var logger: ((String) -> Unit)? = null
+
+    private val retrofitBuilder: Retrofit.Builder by lazy {
+        Retrofit.Builder()
+            .baseUrl(baseUrl)
+            .addConverterFactory(ScalarsConverterFactory.create())
+            .addConverterFactory(GsonConverterFactory.create(serializerBuilder.create()))
+            .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+    }
+
+    private val clientBuilder: OkHttpClient.Builder by lazy {
+        okHttpClientBuilder ?: defaultClientBuilder
+    }
+
+    private val defaultClientBuilder: OkHttpClient.Builder by lazy {
+        OkHttpClient()
+            .newBuilder()
+            .addInterceptor(HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
+                override fun log(message: String) {
+                    logger?.invoke(message)
+                }
+            }).apply {
+                level = HttpLoggingInterceptor.Level.BODY
+            })
     }
 
     init {
         normalizeBaseUrl()
     }
 
-    val retrofitBuilder: Retrofit.Builder by lazy {
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: GsonBuilder = Serializer.gsonBuilder,
+        authNames: Array<String>
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder) {
+        authNames.forEach { authName ->
+            val auth = when (authName) {
+                "api_key" -> ApiKeyAuth("header", "api_key")"api_key_query" -> ApiKeyAuth("query", "api_key_query")"bearer_test" -> HttpBearerAuth("bearer")"http_basic_test" -> HttpBasicAuth()"http_signature_test" -> "petstore_auth" -> OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets")
+                else -> throw RuntimeException("auth name $authName not found in available auth names")
+            }
+            addAuthorization(authName, auth);
+        }
+    }
 
-        Retrofit.Builder()
-        .baseUrl(baseUrl)
-        .addConverterFactory(ScalarsConverterFactory.create())
-        .addConverterFactory(GsonConverterFactory.create(Serializer.gson))
-        .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: GsonBuilder = Serializer.gsonBuilder,
+        authName: String, 
+        bearerToken: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        setBearerToken(bearerToken)
+    }
+
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: GsonBuilder = Serializer.gsonBuilder,
+        authName: String, 
+        username: String, 
+        password: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        setCredentials(username, password)
+    }
+
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: GsonBuilder = Serializer.gsonBuilder,
+        authName: String, 
+        clientId: String, 
+        secret: String, 
+        username: String, 
+        password: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        getTokenEndPoint()
+            ?.setClientId(clientId)
+            ?.setClientSecret(secret)
+            ?.setUsername(username)
+            ?.setPassword(password)
+    }
+
+    fun setCredentials(username: String, password: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder.setUsername(username).setPassword(password)
+        }
+        return this
+    }
+    fun setBearerToken(bearerToken: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, HttpBearerAuth> {
+            this.bearerToken = bearerToken
+        }
+        return this
+    }
+
+    fun setCredentials(username: String, password: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, HttpBasicAuth> {
+            setCredentials(username, password);
+        }
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder.setUsername(username).setPassword(password)
+        }
+        return this
+    }
+
+    fun setCredentials(username: String, password: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder.setUsername(username).setPassword(password)
+        }
+        return this
+    }
+    /**
+    * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Token request builder
+    */
+    fun getTokenEndPoint(): TokenRequestBuilder? {
+        var result: TokenRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = tokenRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Authentication request builder
+    */
+    fun getAuthorizationEndPoint(): AuthenticationRequestBuilder? {
+        var result: AuthenticationRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = authenticationRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
+    * @param accessToken Access token
+    * @return ApiClient
+    */
+    fun setAccessToken(accessToken: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            setAccessToken(accessToken)
+        }
+        return this
+    }
+
+    /**
+    * Helper method to configure the oauth accessCode/implicit flow parameters
+    * @param clientId Client ID
+    * @param clientSecret Client secret
+    * @param redirectURI Redirect URI
+    * @return ApiClient
+    */
+    fun configureAuthorizationFlow(clientId: String, clientSecret: String, redirectURI: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder
+                .setClientId(clientId)
+                .setClientSecret(clientSecret)
+                .setRedirectURI(redirectURI)
+            authenticationRequestBuilder
+                ?.setClientId(clientId)
+                ?.setRedirectURI(redirectURI)
+        }
+        return this;
+    }
+
+    /**
+    * Configures a listener which is notified when a new access token is received.
+    * @param accessTokenListener Access token listener
+    * @return ApiClient
+    */
+    fun registerAccessTokenListener(accessTokenListener: AccessTokenListener): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            registerAccessTokenListener(accessTokenListener)
+        }
+        return this;
+    }
+
+    /**
+     * Adds an authorization to be used by the client
+     * @param authName Authentication name
+     * @param authorization Authorization interceptor
+     * @return ApiClient
+     */
+    fun addAuthorization(authName: String, authorization: Interceptor): ApiClient {
+        if (apiAuthorizations.containsKey(authName)) {
+            throw RuntimeException("auth name $authName already in api authorizations")
+        }
+        apiAuthorizations[authName] = authorization
+        clientBuilder.addInterceptor(authorization)
+        return this
+    }
+
+    fun setLogger(logger: (String) -> Unit): ApiClient {
+        this.logger = logger
+        return this
     }
 
     fun <S> createService(serviceClass: Class<S>): S {
-        return retrofitBuilder.client(okHttpClient).build().create(serviceClass)
+        return retrofitBuilder.client(clientBuilder.build()).build().create(serviceClass)
     }
 
     private fun normalizeBaseUrl() {
@@ -39,4 +234,20 @@ class ApiClient(
             baseUrl += "/"
         }
     }
+
+    private inline fun <T, reified U> Iterable<T>.runOnFirst(callback: U.() -> Unit) {
+        for (element in this) {
+            if (element is U)  {
+                callback.invoke(element)
+                break
+            }
+        }
+    }
+
+    companion object {        
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io:80/v2")
+        }
+    }
 }
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt
new file mode 100644
index 000000000000..3369ea29aa99
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt
@@ -0,0 +1,15 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonParseException
+import retrofit2.Response
+
+@Throws(JsonParseException::class)
+inline fun <reified T> Response<*>.getErrorResponse(serializerBuilder: GsonBuilder = Serializer.gsonBuilder): T? {
+    val serializer = serializerBuilder.create()
+    val reader = errorBody()?.charStream()
+    if(reader != null) {
+        return serializer.fromJson(reader, T::class.java)
+    }
+    return null
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
index 04e474059f25..152cbc0cddf3 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param mapProperty 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Animal.kt
index 59234b2684f5..ab6e55151fc8 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Animal.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Animal.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 4d49a464621a..60f2617cafb2 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param code 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
index 0c88337e9c1e..db44a13b4373 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param arrayArrayNumber 
@@ -21,7 +22,7 @@ import java.io.Serializable
 
 data class ArrayOfArrayOfNumberOnly (
     @SerializedName("ArrayArrayNumber")
-    val arrayArrayNumber: kotlin.Array<kotlin.Array<java.math.BigDecimal>>? = null
+    val arrayArrayNumber: kotlin.collections.List<kotlin.collections.List<java.math.BigDecimal>>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
index 4da5b8e6d5fb..128acc125416 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param arrayNumber 
@@ -21,7 +22,7 @@ import java.io.Serializable
 
 data class ArrayOfNumberOnly (
     @SerializedName("ArrayNumber")
-    val arrayNumber: kotlin.Array<java.math.BigDecimal>? = null
+    val arrayNumber: kotlin.collections.List<java.math.BigDecimal>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
index 855cd60a3274..afb0414957b9 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.ReadOnlyFirst
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param arrayOfString 
@@ -24,11 +25,11 @@ import java.io.Serializable
 
 data class ArrayTest (
     @SerializedName("array_of_string")
-    val arrayOfString: kotlin.Array<kotlin.String>? = null,
+    val arrayOfString: kotlin.collections.List<kotlin.String>? = null,
     @SerializedName("array_array_of_integer")
-    val arrayArrayOfInteger: kotlin.Array<kotlin.Array<kotlin.Long>>? = null,
+    val arrayArrayOfInteger: kotlin.collections.List<kotlin.collections.List<kotlin.Long>>? = null,
     @SerializedName("array_array_of_model")
-    val arrayArrayOfModel: kotlin.Array<kotlin.Array<ReadOnlyFirst>>? = null
+    val arrayArrayOfModel: kotlin.collections.List<kotlin.collections.List<ReadOnlyFirst>>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Capitalization.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
index 24e13278871b..cf876c94035c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param smallCamel 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Cat.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Cat.kt
index 7470f2504322..647155c428fc 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Cat.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Cat.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.CatAllOf
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
index 17d5df7c0db1..b3888433c7bb 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param declawed 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Category.kt
index 6bfa3b0d01fb..befccbefa9ac 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ClassModel.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
index 174d49148f0d..c5222d7169e0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Model for testing model with \"_class\" property
  * @param propertyClass 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Client.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Client.kt
index 31fa6e51bf7b..3debe1d542f7 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Client.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Client.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param client 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Dog.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Dog.kt
index 7965fadd703c..5be6d075450e 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Dog.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Dog.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.DogAllOf
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
index d67d72c09671..be81eda59734 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param breed 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
index d4ffb01a388d..2b97721e7f53 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param justSymbol 
@@ -24,7 +25,7 @@ data class EnumArrays (
     @SerializedName("just_symbol")
     val justSymbol: EnumArrays.JustSymbol? = null,
     @SerializedName("array_enum")
-    val arrayEnum: kotlin.Array<EnumArrays.ArrayEnum>? = null
+    val arrayEnum: kotlin.collections.List<EnumArrays.ArrayEnum>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
index 507fbaa3c059..3aceec7fe933 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
@@ -18,6 +18,7 @@ import org.openapitools.client.models.OuterEnumIntegerDefaultValue
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param enumStringRequired 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
index 1511af5d49b2..b82eddd47ccf 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param file 
@@ -24,7 +25,7 @@ data class FileSchemaTestClass (
     @SerializedName("file")
     val file: java.io.File? = null,
     @SerializedName("files")
-    val files: kotlin.Array<java.io.File>? = null
+    val files: kotlin.collections.List<java.io.File>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Foo.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Foo.kt
index 1ca746f908c3..33952e4b66f1 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Foo.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Foo.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FormatTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
index 5b9be0b89c01..d69683337761 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param number 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
index 7608a258ae5f..3d662d38a504 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
index 9e5a085a2c01..fe3b639cfc39 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
  * @param nullableMessage 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
index d75c0ded4369..24f157d5d750 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param name Updated name of the pet
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
index 1f26364b834e..2382fda34b0f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param additionalMetadata Additional data to pass to server
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
index 57634dd3f5a2..0c85be510de8 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param enumFormStringArray Form parameter enum test (string array)
@@ -23,7 +24,7 @@ import java.io.Serializable
 data class InlineObject2 (
     /* Form parameter enum test (string array) */
     @SerializedName("enum_form_string_array")
-    val enumFormStringArray: kotlin.Array<InlineObject2.EnumFormStringArray>? = null,
+    val enumFormStringArray: kotlin.collections.List<InlineObject2.EnumFormStringArray>? = null,
     /* Form parameter enum test (string) */
     @SerializedName("enum_form_string")
     val enumFormString: InlineObject2.EnumFormString? = null
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
index f70af3efc5a3..37a4dbaeb49d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param number None
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
index 5c38c52ba8d1..06b2d303be85 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param param field1
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
index 6389765702b9..76a04940bbf6 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param requiredFile file to upload
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
index e1d3c615222a..aceb74085fee 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Foo
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param string 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/List.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/List.kt
index 1aa7715f047f..8de0d080cedc 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/List.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/List.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param `123minusList` 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MapTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MapTest.kt
index 9c0bef747fbd..351506589b9a 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MapTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MapTest.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param mapMapOfString 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
index f1dda9dc0efe..39b0152a33f0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Animal
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param uuid 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Model200Response.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
index 1bdb62d1b23b..1360386ee2bb 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Model for testing model name starting with number
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Name.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Name.kt
index 2e30b6b7cd95..e3113d603d4c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Name.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Name.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Model for testing model name same as property name
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NullableClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
index 534bb572e4f1..81366b145ba2 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param integerProp 
@@ -44,11 +45,11 @@ data class NullableClass (
     @SerializedName("datetime_prop")
     val datetimeProp: java.time.OffsetDateTime? = null,
     @SerializedName("array_nullable_prop")
-    val arrayNullableProp: kotlin.Array<kotlin.Any>? = null,
+    val arrayNullableProp: kotlin.collections.List<kotlin.Any>? = null,
     @SerializedName("array_and_items_nullable_prop")
-    val arrayAndItemsNullableProp: kotlin.Array<kotlin.Any>? = null,
+    val arrayAndItemsNullableProp: kotlin.collections.List<kotlin.Any>? = null,
     @SerializedName("array_items_nullable")
-    val arrayItemsNullable: kotlin.Array<kotlin.Any>? = null,
+    val arrayItemsNullable: kotlin.collections.List<kotlin.Any>? = null,
     @SerializedName("object_nullable_prop")
     val objectNullableProp: kotlin.collections.Map<kotlin.String, kotlin.Any>? = null,
     @SerializedName("object_and_items_nullable_prop")
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
index c7138f597e10..31f01f97b083 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param justNumber 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Order.kt
index 2a58f2be7c0d..048659fa99fa 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
index 6303e05739bc..dec8db2d9b8a 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param myNumber 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 5865f9d672cd..0b389b22ba63 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.Tag
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param name 
@@ -30,13 +31,13 @@ data class Pet (
     @SerializedName("name")
     val name: kotlin.String,
     @SerializedName("photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @SerializedName("id")
     val id: kotlin.Long? = null,
     @SerializedName("category")
     val category: Category? = null,
     @SerializedName("tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @SerializedName("status")
     val status: Pet.Status? = null
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
index 81c3bab8745e..ef98374a6955 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Return.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Return.kt
index 166cb5aa391c..19f61d416732 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Return.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Return.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Model for testing reserved words
  * @param `return` 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
index c9585969b251..23cd075e530d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Tag.kt
index e11be325ef39..9e08a3d8ae0e 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/User.kt
index 433872af1e9c..ca2ce7188e52 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/.openapi-generator/FILES b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/.openapi-generator/FILES
index 63cd1381e9d8..106ea4db2ae5 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/.openapi-generator/FILES
@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 build.gradle
 docs/200Response.md
@@ -64,6 +63,12 @@ src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
 src/main/kotlin/org/openapitools/client/apis/PetApi.kt
 src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
 src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
+src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
+src/main/kotlin/org/openapitools/client/auth/HttpBearerAuth.kt
+src/main/kotlin/org/openapitools/client/auth/OAuth.kt
+src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt
+src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt
 src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
 src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/CollectionFormats.kt
@@ -71,6 +76,7 @@ src/main/kotlin/org/openapitools/client/infrastructure/DateAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt
 src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
 src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
 src/main/kotlin/org/openapitools/client/models/Animal.kt
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/README.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/README.md
index b7028d917a24..7d37a6283317 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/README.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
@@ -35,45 +35,45 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
-*DefaultApi* | [**fooGet**](docs/DefaultApi.md#fooget) | **GET** /foo | 
-*FakeApi* | [**fakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint
-*FakeApi* | [**fakeHttpSignatureTest**](docs/FakeApi.md#fakehttpsignaturetest) | **GET** /fake/http-signature-test | test http signature authentication
-*FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
-*FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
-*FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
-*FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
-*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
-*FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
-*FakeApi* | [**testClientModel**](docs/FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-*FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
-*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-*FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-*FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
-*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-paramters | 
-*FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case
-*PetApi* | [**addPet**](docs/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
-*PetApi* | [**deletePet**](docs/PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
-*PetApi* | [**findPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
-*PetApi* | [**findPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
-*PetApi* | [**getPetById**](docs/PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
-*PetApi* | [**updatePet**](docs/PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
-*PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
-*PetApi* | [**uploadFile**](docs/PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
-*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-*StoreApi* | [**getInventory**](docs/StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**getOrderById**](docs/StoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID
-*StoreApi* | [**placeOrder**](docs/StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
-*UserApi* | [**createUser**](docs/UserApi.md#createuser) | **POST** /user | Create user
-*UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
-*UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
-*UserApi* | [**deleteUser**](docs/UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
-*UserApi* | [**getUserByName**](docs/UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
-*UserApi* | [**loginUser**](docs/UserApi.md#loginuser) | **GET** /user/login | Logs user into the system
-*UserApi* | [**logoutUser**](docs/UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
-*UserApi* | [**updateUser**](docs/UserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** another-fake/dummy | To test special tags
+*DefaultApi* | [**fooGet**](docs/DefaultApi.md#fooget) | **GET** foo | 
+*FakeApi* | [**fakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** fake/health | Health check endpoint
+*FakeApi* | [**fakeHttpSignatureTest**](docs/FakeApi.md#fakehttpsignaturetest) | **GET** fake/http-signature-test | test http signature authentication
+*FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** fake/outer/boolean | 
+*FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** fake/outer/composite | 
+*FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **POST** fake/outer/number | 
+*FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeouterstringserialize) | **POST** fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testbodywithfileschema) | **PUT** fake/body-with-file-schema | 
+*FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testbodywithqueryparams) | **PUT** fake/body-with-query-params | 
+*FakeApi* | [**testClientModel**](docs/FakeApi.md#testclientmodel) | **PATCH** fake | To test \"client\" model
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testendpointparameters) | **POST** fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testenumparameters) | **GET** fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testgroupparameters) | **DELETE** fake | Fake endpoint to test group parameters (optional)
+*FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testinlineadditionalproperties) | **POST** fake/inline-additionalProperties | test inline additionalProperties
+*FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testjsonformdata) | **GET** fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testqueryparametercollectionformat) | **PUT** fake/test-query-paramters | 
+*FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testclassname) | **PATCH** fake_classname_test | To test class name in snake case
+*PetApi* | [**addPet**](docs/PetApi.md#addpet) | **POST** pet | Add a new pet to the store
+*PetApi* | [**deletePet**](docs/PetApi.md#deletepet) | **DELETE** pet/{petId} | Deletes a pet
+*PetApi* | [**findPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** pet/findByStatus | Finds Pets by status
+*PetApi* | [**findPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** pet/findByTags | Finds Pets by tags
+*PetApi* | [**getPetById**](docs/PetApi.md#getpetbyid) | **GET** pet/{petId} | Find pet by ID
+*PetApi* | [**updatePet**](docs/PetApi.md#updatepet) | **PUT** pet | Update an existing pet
+*PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**uploadFile**](docs/PetApi.md#uploadfile) | **POST** pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadfilewithrequiredfile) | **POST** fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** store/order/{order_id} | Delete purchase order by ID
+*StoreApi* | [**getInventory**](docs/StoreApi.md#getinventory) | **GET** store/inventory | Returns pet inventories by status
+*StoreApi* | [**getOrderById**](docs/StoreApi.md#getorderbyid) | **GET** store/order/{order_id} | Find purchase order by ID
+*StoreApi* | [**placeOrder**](docs/StoreApi.md#placeorder) | **POST** store/order | Place an order for a pet
+*UserApi* | [**createUser**](docs/UserApi.md#createuser) | **POST** user | Create user
+*UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** user/createWithArray | Creates list of users with given input array
+*UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** user/createWithList | Creates list of users with given input array
+*UserApi* | [**deleteUser**](docs/UserApi.md#deleteuser) | **DELETE** user/{username} | Delete user
+*UserApi* | [**getUserByName**](docs/UserApi.md#getuserbyname) | **GET** user/{username} | Get user by user name
+*UserApi* | [**loginUser**](docs/UserApi.md#loginuser) | **GET** user/login | Logs user into the system
+*UserApi* | [**logoutUser**](docs/UserApi.md#logoutuser) | **GET** user/logout | Logs out current logged in user session
+*UserApi* | [**updateUser**](docs/UserApi.md#updateuser) | **PUT** user/{username} | Updated user
 
 
 <a name="documentation-for-models"></a>
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/build.gradle b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/build.gradle
index 34fcb2feb463..0f07a7da1243 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/build.gradle
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/build.gradle
@@ -31,6 +31,7 @@ test {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.0"
     compile "com.google.code.gson:gson:2.8.6"
     compile "io.reactivex.rxjava2:rxjava:$rxJava2Version"
     compile "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion"
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/AnotherFakeApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/AnotherFakeApi.md
index 55d482238db4..807d93ebe748 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/AnotherFakeApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/AnotherFakeApi.md
@@ -4,12 +4,9 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** another-fake/dummy | To test special tags
 
 
-<a name="call123testSpecialTags"></a>
-# **call123testSpecialTags**
-> Client call123testSpecialTags(client)
 
 To test special tags
 
@@ -18,21 +15,15 @@ To test special tags and operation ID starting with number
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = AnotherFakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(AnotherFakeApi::class.java)
 val client : Client =  // Client | client model
-try {
-    val result : Client = apiInstance.call123testSpecialTags(client)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling AnotherFakeApi#call123testSpecialTags")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling AnotherFakeApi#call123testSpecialTags")
-    e.printStackTrace()
-}
+
+val result : Client = webService.call123testSpecialTags(client)
 ```
 
 ### Parameters
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/ArrayOfArrayOfNumberOnly.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/ArrayOfArrayOfNumberOnly.md
index 23a475664205..bcc306caeb6d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/ArrayOfArrayOfNumberOnly.md
@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayArrayNumber** | **kotlin.Array&lt;kotlin.Array&lt;java.math.BigDecimal&gt;&gt;** |  |  [optional]
+**arrayArrayNumber** | **kotlin.collections.List&lt;kotlin.collections.List&lt;java.math.BigDecimal&gt;&gt;** |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/ArrayOfNumberOnly.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/ArrayOfNumberOnly.md
index b115a5d54c22..00c57a7885e8 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/ArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/ArrayOfNumberOnly.md
@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayNumber** | [**kotlin.Array&lt;java.math.BigDecimal&gt;**](java.math.BigDecimal.md) |  |  [optional]
+**arrayNumber** | [**kotlin.collections.List&lt;java.math.BigDecimal&gt;**](java.math.BigDecimal.md) |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/ArrayTest.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/ArrayTest.md
index aa0bbbe936c1..45e59c8fe77c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/ArrayTest.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/ArrayTest.md
@@ -4,9 +4,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayOfString** | **kotlin.Array&lt;kotlin.String&gt;** |  |  [optional]
-**arrayArrayOfInteger** | **kotlin.Array&lt;kotlin.Array&lt;kotlin.Long&gt;&gt;** |  |  [optional]
-**arrayArrayOfModel** | **kotlin.Array&lt;kotlin.Array&lt;ReadOnlyFirst&gt;&gt;** |  |  [optional]
+**arrayOfString** | **kotlin.collections.List&lt;kotlin.String&gt;** |  |  [optional]
+**arrayArrayOfInteger** | **kotlin.collections.List&lt;kotlin.collections.List&lt;kotlin.Long&gt;&gt;** |  |  [optional]
+**arrayArrayOfModel** | **kotlin.collections.List&lt;kotlin.collections.List&lt;ReadOnlyFirst&gt;&gt;** |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/DefaultApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/DefaultApi.md
index 784be537594d..1b907e27cb65 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/DefaultApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/DefaultApi.md
@@ -4,32 +4,23 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**fooGet**](DefaultApi.md#fooGet) | **GET** /foo | 
+[**fooGet**](DefaultApi.md#fooGet) | **GET** foo | 
 
 
-<a name="fooGet"></a>
-# **fooGet**
-> InlineResponseDefault fooGet()
 
 
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = DefaultApi()
-try {
-    val result : InlineResponseDefault = apiInstance.fooGet()
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling DefaultApi#fooGet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling DefaultApi#fooGet")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(DefaultApi::class.java)
+
+val result : InlineResponseDefault = webService.fooGet()
 ```
 
 ### Parameters
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/EnumArrays.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/EnumArrays.md
index 719084e5f949..c3c5e235bfed 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/EnumArrays.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **justSymbol** | [**inline**](#JustSymbolEnum) |  |  [optional]
-**arrayEnum** | [**inline**](#kotlin.Array&lt;ArrayEnumEnum&gt;) |  |  [optional]
+**arrayEnum** | [**inline**](#kotlin.collections.List&lt;ArrayEnumEnum&gt;) |  |  [optional]
 
 
 <a name="JustSymbolEnum"></a>
@@ -15,7 +15,7 @@ Name | Value
 justSymbol | &gt;&#x3D;, $
 
 
-<a name="kotlin.Array<ArrayEnumEnum>"></a>
+<a name="kotlin.collections.List<ArrayEnumEnum>"></a>
 ## Enum: array_enum
 Name | Value
 ---- | -----
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
index 0a28947aa843..6f5c1cbb479b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
@@ -4,46 +4,37 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**fakeHealthGet**](FakeApi.md#fakeHealthGet) | **GET** /fake/health | Health check endpoint
-[**fakeHttpSignatureTest**](FakeApi.md#fakeHttpSignatureTest) | **GET** /fake/http-signature-test | test http signature authentication
-[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
-[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
-[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
-[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
-[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
-[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
-[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
-[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
-[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
-
-
-<a name="fakeHealthGet"></a>
-# **fakeHealthGet**
-> HealthCheckResult fakeHealthGet()
+[**fakeHealthGet**](FakeApi.md#fakeHealthGet) | **GET** fake/health | Health check endpoint
+[**fakeHttpSignatureTest**](FakeApi.md#fakeHttpSignatureTest) | **GET** fake/http-signature-test | test http signature authentication
+[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** fake/outer/boolean | 
+[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** fake/outer/composite | 
+[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** fake/outer/number | 
+[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** fake/outer/string | 
+[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** fake/body-with-file-schema | 
+[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** fake/body-with-query-params | 
+[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** fake | To test \&quot;client\&quot; model
+[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** fake | To test enum parameters
+[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** fake | Fake endpoint to test group parameters (optional)
+[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** fake/inline-additionalProperties | test inline additionalProperties
+[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** fake/jsonFormData | test json serialization of form data
+[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** fake/test-query-paramters | 
+
+
 
 Health check endpoint
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
-try {
-    val result : HealthCheckResult = apiInstance.fakeHealthGet()
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeHealthGet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeHealthGet")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
+
+val result : HealthCheckResult = webService.fakeHealthGet()
 ```
 
 ### Parameters
@@ -62,31 +53,23 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
-<a name="fakeHttpSignatureTest"></a>
-# **fakeHttpSignatureTest**
-> fakeHttpSignatureTest(pet, query1, header1)
 
 test http signature authentication
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val pet : Pet =  // Pet | Pet object that needs to be added to the store
 val query1 : kotlin.String = query1_example // kotlin.String | query parameter
 val header1 : kotlin.String = header1_example // kotlin.String | header parameter
-try {
-    apiInstance.fakeHttpSignatureTest(pet, query1, header1)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeHttpSignatureTest")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeHttpSignatureTest")
-    e.printStackTrace()
-}
+
+webService.fakeHttpSignatureTest(pet, query1, header1)
 ```
 
 ### Parameters
@@ -110,9 +93,6 @@ null (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
-<a name="fakeOuterBooleanSerialize"></a>
-# **fakeOuterBooleanSerialize**
-> kotlin.Boolean fakeOuterBooleanSerialize(body)
 
 
 
@@ -121,21 +101,15 @@ Test serialization of outer boolean types
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val body : kotlin.Boolean = true // kotlin.Boolean | Input boolean as post body
-try {
-    val result : kotlin.Boolean = apiInstance.fakeOuterBooleanSerialize(body)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeOuterBooleanSerialize")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeOuterBooleanSerialize")
-    e.printStackTrace()
-}
+
+val result : kotlin.Boolean = webService.fakeOuterBooleanSerialize(body)
 ```
 
 ### Parameters
@@ -157,9 +131,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
-<a name="fakeOuterCompositeSerialize"></a>
-# **fakeOuterCompositeSerialize**
-> OuterComposite fakeOuterCompositeSerialize(outerComposite)
 
 
 
@@ -168,21 +139,15 @@ Test serialization of object with outer number type
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val outerComposite : OuterComposite =  // OuterComposite | Input composite as post body
-try {
-    val result : OuterComposite = apiInstance.fakeOuterCompositeSerialize(outerComposite)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeOuterCompositeSerialize")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeOuterCompositeSerialize")
-    e.printStackTrace()
-}
+
+val result : OuterComposite = webService.fakeOuterCompositeSerialize(outerComposite)
 ```
 
 ### Parameters
@@ -204,9 +169,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
-<a name="fakeOuterNumberSerialize"></a>
-# **fakeOuterNumberSerialize**
-> java.math.BigDecimal fakeOuterNumberSerialize(body)
 
 
 
@@ -215,21 +177,15 @@ Test serialization of outer number types
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val body : java.math.BigDecimal = 8.14 // java.math.BigDecimal | Input number as post body
-try {
-    val result : java.math.BigDecimal = apiInstance.fakeOuterNumberSerialize(body)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeOuterNumberSerialize")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeOuterNumberSerialize")
-    e.printStackTrace()
-}
+
+val result : java.math.BigDecimal = webService.fakeOuterNumberSerialize(body)
 ```
 
 ### Parameters
@@ -251,9 +207,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
-<a name="fakeOuterStringSerialize"></a>
-# **fakeOuterStringSerialize**
-> kotlin.String fakeOuterStringSerialize(body)
 
 
 
@@ -262,21 +215,15 @@ Test serialization of outer string types
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val body : kotlin.String = body_example // kotlin.String | Input string as post body
-try {
-    val result : kotlin.String = apiInstance.fakeOuterStringSerialize(body)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#fakeOuterStringSerialize")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#fakeOuterStringSerialize")
-    e.printStackTrace()
-}
+
+val result : kotlin.String = webService.fakeOuterStringSerialize(body)
 ```
 
 ### Parameters
@@ -298,9 +245,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
-<a name="testBodyWithFileSchema"></a>
-# **testBodyWithFileSchema**
-> testBodyWithFileSchema(fileSchemaTestClass)
 
 
 
@@ -309,20 +253,15 @@ For this test, the body for this request much reference a schema named &#x60;Fil
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val fileSchemaTestClass : FileSchemaTestClass =  // FileSchemaTestClass | 
-try {
-    apiInstance.testBodyWithFileSchema(fileSchemaTestClass)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testBodyWithFileSchema")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testBodyWithFileSchema")
-    e.printStackTrace()
-}
+
+webService.testBodyWithFileSchema(fileSchemaTestClass)
 ```
 
 ### Parameters
@@ -344,30 +283,22 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="testBodyWithQueryParams"></a>
-# **testBodyWithQueryParams**
-> testBodyWithQueryParams(query, user)
 
 
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val query : kotlin.String = query_example // kotlin.String | 
 val user : User =  // User | 
-try {
-    apiInstance.testBodyWithQueryParams(query, user)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testBodyWithQueryParams")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testBodyWithQueryParams")
-    e.printStackTrace()
-}
+
+webService.testBodyWithQueryParams(query, user)
 ```
 
 ### Parameters
@@ -390,9 +321,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="testClientModel"></a>
-# **testClientModel**
-> Client testClientModel(client)
 
 To test \&quot;client\&quot; model
 
@@ -401,21 +329,15 @@ To test \&quot;client\&quot; model
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val client : Client =  // Client | client model
-try {
-    val result : Client = apiInstance.testClientModel(client)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testClientModel")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testClientModel")
-    e.printStackTrace()
-}
+
+val result : Client = webService.testClientModel(client)
 ```
 
 ### Parameters
@@ -437,9 +359,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
-<a name="testEndpointParameters"></a>
-# **testEndpointParameters**
-> testEndpointParameters(number, double, patternWithoutDelimiter, byte, integer, int32, int64, float, string, binary, date, dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -448,10 +367,13 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+apiClient.setCredentials("USERNAME", "PASSWORD")
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val number : java.math.BigDecimal = 8.14 // java.math.BigDecimal | None
 val double : kotlin.Double = 1.2 // kotlin.Double | None
 val patternWithoutDelimiter : kotlin.String = patternWithoutDelimiter_example // kotlin.String | None
@@ -466,15 +388,8 @@ val date : java.time.LocalDate = 2013-10-20 // java.time.LocalDate | None
 val dateTime : java.time.OffsetDateTime = 2013-10-20T19:20:30+01:00 // java.time.OffsetDateTime | None
 val password : kotlin.String = password_example // kotlin.String | None
 val paramCallback : kotlin.String = paramCallback_example // kotlin.String | None
-try {
-    apiInstance.testEndpointParameters(number, double, patternWithoutDelimiter, byte, integer, int32, int64, float, string, binary, date, dateTime, password, paramCallback)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testEndpointParameters")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testEndpointParameters")
-    e.printStackTrace()
-}
+
+webService.testEndpointParameters(number, double, patternWithoutDelimiter, byte, integer, int32, int64, float, string, binary, date, dateTime, password, paramCallback)
 ```
 
 ### Parameters
@@ -504,17 +419,13 @@ null (empty response body)
 
 
 Configure http_basic_test:
-    ApiClient.username = ""
-    ApiClient.password = ""
+    ApiClient().setCredentials("USERNAME", "PASSWORD")
 
 ### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
-<a name="testEnumParameters"></a>
-# **testEnumParameters**
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
 
 To test enum parameters
 
@@ -523,10 +434,12 @@ To test enum parameters
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val enumHeaderStringArray : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Header parameter enum test (string array)
 val enumHeaderString : kotlin.String = enumHeaderString_example // kotlin.String | Header parameter enum test (string)
 val enumQueryStringArray : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Query parameter enum test (string array)
@@ -535,15 +448,8 @@ val enumQueryInteger : kotlin.Int = 56 // kotlin.Int | Query parameter enum test
 val enumQueryDouble : kotlin.Double = 1.2 // kotlin.Double | Query parameter enum test (double)
 val enumFormStringArray : kotlin.Array<kotlin.String> = enumFormStringArray_example // kotlin.Array<kotlin.String> | Form parameter enum test (string array)
 val enumFormString : kotlin.String = enumFormString_example // kotlin.String | Form parameter enum test (string)
-try {
-    apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testEnumParameters")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testEnumParameters")
-    e.printStackTrace()
-}
+
+webService.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
 ```
 
 ### Parameters
@@ -572,9 +478,6 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
-<a name="testGroupParameters"></a>
-# **testGroupParameters**
-> testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
 
 Fake endpoint to test group parameters (optional)
 
@@ -583,25 +486,21 @@ Fake endpoint to test group parameters (optional)
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+apiClient.setBearerToken("TOKEN")
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val requiredStringGroup : kotlin.Int = 56 // kotlin.Int | Required String in group parameters
 val requiredBooleanGroup : kotlin.Boolean = true // kotlin.Boolean | Required Boolean in group parameters
 val requiredInt64Group : kotlin.Long = 789 // kotlin.Long | Required Integer in group parameters
 val stringGroup : kotlin.Int = 56 // kotlin.Int | String in group parameters
 val booleanGroup : kotlin.Boolean = true // kotlin.Boolean | Boolean in group parameters
 val int64Group : kotlin.Long = 789 // kotlin.Long | Integer in group parameters
-try {
-    apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testGroupParameters")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testGroupParameters")
-    e.printStackTrace()
-}
+
+webService.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
 ```
 
 ### Parameters
@@ -623,36 +522,28 @@ null (empty response body)
 
 
 Configure bearer_test:
-    ApiClient.accessToken = ""
+    ApiClient().setBearerToken("TOKEN")
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="testInlineAdditionalProperties"></a>
-# **testInlineAdditionalProperties**
-> testInlineAdditionalProperties(requestBody)
 
 test inline additionalProperties
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val requestBody : kotlin.collections.Map<kotlin.String, kotlin.String> =  // kotlin.collections.Map<kotlin.String, kotlin.String> | request body
-try {
-    apiInstance.testInlineAdditionalProperties(requestBody)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testInlineAdditionalProperties")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testInlineAdditionalProperties")
-    e.printStackTrace()
-}
+
+webService.testInlineAdditionalProperties(requestBody)
 ```
 
 ### Parameters
@@ -674,30 +565,22 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="testJsonFormData"></a>
-# **testJsonFormData**
-> testJsonFormData(param, param2)
 
 test json serialization of form data
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val param : kotlin.String = param_example // kotlin.String | field1
 val param2 : kotlin.String = param2_example // kotlin.String | field2
-try {
-    apiInstance.testJsonFormData(param, param2)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testJsonFormData")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testJsonFormData")
-    e.printStackTrace()
-}
+
+webService.testJsonFormData(param, param2)
 ```
 
 ### Parameters
@@ -720,9 +603,6 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
-<a name="testQueryParameterCollectionFormat"></a>
-# **testQueryParameterCollectionFormat**
-> testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
 
 
 
@@ -731,24 +611,19 @@ To test the collection format in query parameters
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeApi::class.java)
 val pipe : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
 val ioutil : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
 val http : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
 val url : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
 val context : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
-try {
-    apiInstance.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
-} catch (e: ClientException) {
-    println("4xx response calling FakeApi#testQueryParameterCollectionFormat")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeApi#testQueryParameterCollectionFormat")
-    e.printStackTrace()
-}
+
+webService.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
 ```
 
 ### Parameters
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeClassnameTags123Api.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeClassnameTags123Api.md
index 962dfd4d2dc2..2f6a955e4876 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeClassnameTags123Api.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeClassnameTags123Api.md
@@ -4,12 +4,9 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
+[**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** fake_classname_test | To test class name in snake case
 
 
-<a name="testClassname"></a>
-# **testClassname**
-> Client testClassname(client)
 
 To test class name in snake case
 
@@ -18,21 +15,15 @@ To test class name in snake case
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = FakeClassnameTags123Api()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(FakeClassnameTags123Api::class.java)
 val client : Client =  // Client | client model
-try {
-    val result : Client = apiInstance.testClassname(client)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling FakeClassnameTags123Api#testClassname")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling FakeClassnameTags123Api#testClassname")
-    e.printStackTrace()
-}
+
+val result : Client = webService.testClassname(client)
 ```
 
 ### Parameters
@@ -48,9 +39,6 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure api_key_query:
-    ApiClient.apiKey["api_key_query"] = ""
-    ApiClient.apiKeyPrefix["api_key_query"] = ""
 
 ### HTTP request headers
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FileSchemaTestClass.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FileSchemaTestClass.md
index 089e61862c2a..e5512f82f6f6 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FileSchemaTestClass.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FileSchemaTestClass.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **file** | [**java.io.File**](java.io.File.md) |  |  [optional]
-**files** | [**kotlin.Array&lt;java.io.File&gt;**](java.io.File.md) |  |  [optional]
+**files** | [**kotlin.collections.List&lt;java.io.File&gt;**](java.io.File.md) |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/InlineObject2.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/InlineObject2.md
index 0720925918bf..a98ffe031b3d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/InlineObject2.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/InlineObject2.md
@@ -4,11 +4,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**enumFormStringArray** | [**inline**](#kotlin.Array&lt;EnumFormStringArrayEnum&gt;) | Form parameter enum test (string array) |  [optional]
+**enumFormStringArray** | [**inline**](#kotlin.collections.List&lt;EnumFormStringArrayEnum&gt;) | Form parameter enum test (string array) |  [optional]
 **enumFormString** | [**inline**](#EnumFormStringEnum) | Form parameter enum test (string) |  [optional]
 
 
-<a name="kotlin.Array<EnumFormStringArrayEnum>"></a>
+<a name="kotlin.collections.List<EnumFormStringArrayEnum>"></a>
 ## Enum: enum_form_string_array
 Name | Value
 ---- | -----
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/NullableClass.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/NullableClass.md
index 9ec43d0b87c6..335943c01eae 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/NullableClass.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/NullableClass.md
@@ -10,9 +10,9 @@ Name | Type | Description | Notes
 **stringProp** | **kotlin.String** |  |  [optional]
 **dateProp** | [**java.time.LocalDate**](java.time.LocalDate.md) |  |  [optional]
 **datetimeProp** | [**java.time.OffsetDateTime**](java.time.OffsetDateTime.md) |  |  [optional]
-**arrayNullableProp** | [**kotlin.Array&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
-**arrayAndItemsNullableProp** | [**kotlin.Array&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
-**arrayItemsNullable** | [**kotlin.Array&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
+**arrayNullableProp** | [**kotlin.collections.List&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
+**arrayAndItemsNullableProp** | [**kotlin.collections.List&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
+**arrayItemsNullable** | [**kotlin.collections.List&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
 **objectNullableProp** | [**kotlin.collections.Map&lt;kotlin.String, kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
 **objectAndItemsNullableProp** | [**kotlin.collections.Map&lt;kotlin.String, kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
 **objectItemsNullable** | [**kotlin.collections.Map&lt;kotlin.String, kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/Pet.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/Pet.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/PetApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/PetApi.md
index 576d2f04ca85..7445920ab036 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/PetApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/PetApi.md
@@ -4,40 +4,32 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
-[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
-[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
-[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
-[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
-[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
-[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
-[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
-[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+[**addPet**](PetApi.md#addPet) | **POST** pet | Add a new pet to the store
+[**deletePet**](PetApi.md#deletePet) | **DELETE** pet/{petId} | Deletes a pet
+[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** pet/findByStatus | Finds Pets by status
+[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** pet/findByTags | Finds Pets by tags
+[**getPetById**](PetApi.md#getPetById) | **GET** pet/{petId} | Find pet by ID
+[**updatePet**](PetApi.md#updatePet) | **PUT** pet | Update an existing pet
+[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** pet/{petId} | Updates a pet in the store with form data
+[**uploadFile**](PetApi.md#uploadFile) | **POST** pet/{petId}/uploadImage | uploads an image
+[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 
 
-<a name="addPet"></a>
-# **addPet**
-> addPet(pet)
 
 Add a new pet to the store
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val pet : Pet =  // Pet | Pet object that needs to be added to the store
-try {
-    apiInstance.addPet(pet)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#addPet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#addPet")
-    e.printStackTrace()
-}
+
+webService.addPet(pet)
 ```
 
 ### Parameters
@@ -53,38 +45,28 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
-<a name="deletePet"></a>
-# **deletePet**
-> deletePet(petId, apiKey)
 
 Deletes a pet
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | Pet id to delete
 val apiKey : kotlin.String = apiKey_example // kotlin.String | 
-try {
-    apiInstance.deletePet(petId, apiKey)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#deletePet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#deletePet")
-    e.printStackTrace()
-}
+
+webService.deletePet(petId, apiKey)
 ```
 
 ### Parameters
@@ -101,17 +83,12 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="findPetsByStatus"></a>
-# **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -120,21 +97,15 @@ Multiple status values can be provided with comma separated strings
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
-try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#findPetsByStatus")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#findPetsByStatus")
-    e.printStackTrace()
-}
+
+val result : kotlin.Array<Pet> = webService.findPetsByStatus(status)
 ```
 
 ### Parameters
@@ -150,17 +121,12 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="findPetsByTags"></a>
-# **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -169,21 +135,15 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
-try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#findPetsByTags")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#findPetsByTags")
-    e.printStackTrace()
-}
+
+val result : kotlin.Array<Pet> = webService.findPetsByTags(tags)
 ```
 
 ### Parameters
@@ -199,17 +159,12 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="getPetById"></a>
-# **getPetById**
-> Pet getPetById(petId)
 
 Find pet by ID
 
@@ -218,21 +173,15 @@ Returns a single pet
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to return
-try {
-    val result : Pet = apiInstance.getPetById(petId)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#getPetById")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#getPetById")
-    e.printStackTrace()
-}
+
+val result : Pet = webService.getPetById(petId)
 ```
 
 ### Parameters
@@ -248,38 +197,27 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure api_key:
-    ApiClient.apiKey["api_key"] = ""
-    ApiClient.apiKeyPrefix["api_key"] = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="updatePet"></a>
-# **updatePet**
-> updatePet(pet)
 
 Update an existing pet
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val pet : Pet =  // Pet | Pet object that needs to be added to the store
-try {
-    apiInstance.updatePet(pet)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#updatePet")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#updatePet")
-    e.printStackTrace()
-}
+
+webService.updatePet(pet)
 ```
 
 ### Parameters
@@ -295,39 +233,29 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
-<a name="updatePetWithForm"></a>
-# **updatePetWithForm**
-> updatePetWithForm(petId, name, status)
 
 Updates a pet in the store with form data
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be updated
 val name : kotlin.String = name_example // kotlin.String | Updated name of the pet
 val status : kotlin.String = status_example // kotlin.String | Updated status of the pet
-try {
-    apiInstance.updatePetWithForm(petId, name, status)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#updatePetWithForm")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#updatePetWithForm")
-    e.printStackTrace()
-}
+
+webService.updatePetWithForm(petId, name, status)
 ```
 
 ### Parameters
@@ -345,40 +273,29 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
-<a name="uploadFile"></a>
-# **uploadFile**
-> ApiResponse uploadFile(petId, additionalMetadata, file)
 
 uploads an image
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to update
 val additionalMetadata : kotlin.String = additionalMetadata_example // kotlin.String | Additional data to pass to server
 val file : java.io.File = BINARY_DATA_HERE // java.io.File | file to upload
-try {
-    val result : ApiResponse = apiInstance.uploadFile(petId, additionalMetadata, file)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#uploadFile")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#uploadFile")
-    e.printStackTrace()
-}
+
+val result : ApiResponse = webService.uploadFile(petId, additionalMetadata, file)
 ```
 
 ### Parameters
@@ -396,40 +313,29 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
-<a name="uploadFileWithRequiredFile"></a>
-# **uploadFileWithRequiredFile**
-> ApiResponse uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
 
 uploads an image (required)
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = PetApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(PetApi::class.java)
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to update
 val requiredFile : java.io.File = BINARY_DATA_HERE // java.io.File | file to upload
 val additionalMetadata : kotlin.String = additionalMetadata_example // kotlin.String | Additional data to pass to server
-try {
-    val result : ApiResponse = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling PetApi#uploadFileWithRequiredFile")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling PetApi#uploadFileWithRequiredFile")
-    e.printStackTrace()
-}
+
+val result : ApiResponse = webService.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
 ```
 
 ### Parameters
@@ -447,8 +353,6 @@ Name | Type | Description  | Notes
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
 
 ### HTTP request headers
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/StoreApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/StoreApi.md
index 55bd8afdbc09..af9cc98c26be 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/StoreApi.md
@@ -4,15 +4,12 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
-[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
-[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
+[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** store/order/{order_id} | Delete purchase order by ID
+[**getInventory**](StoreApi.md#getInventory) | **GET** store/inventory | Returns pet inventories by status
+[**getOrderById**](StoreApi.md#getOrderById) | **GET** store/order/{order_id} | Find purchase order by ID
+[**placeOrder**](StoreApi.md#placeOrder) | **POST** store/order | Place an order for a pet
 
 
-<a name="deleteOrder"></a>
-# **deleteOrder**
-> deleteOrder(orderId)
 
 Delete purchase order by ID
 
@@ -21,20 +18,15 @@ For valid response try integer IDs with value &lt; 1000. Anything above 1000 or
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
 val orderId : kotlin.String = orderId_example // kotlin.String | ID of the order that needs to be deleted
-try {
-    apiInstance.deleteOrder(orderId)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#deleteOrder")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#deleteOrder")
-    e.printStackTrace()
-}
+
+webService.deleteOrder(orderId)
 ```
 
 ### Parameters
@@ -56,9 +48,6 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="getInventory"></a>
-# **getInventory**
-> kotlin.collections.Map&lt;kotlin.String, kotlin.Int&gt; getInventory()
 
 Returns pet inventories by status
 
@@ -67,20 +56,14 @@ Returns a map of status codes to quantities
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
-try {
-    val result : kotlin.collections.Map<kotlin.String, kotlin.Int> = apiInstance.getInventory()
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#getInventory")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#getInventory")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
+
+val result : kotlin.collections.Map<kotlin.String, kotlin.Int> = webService.getInventory()
 ```
 
 ### Parameters
@@ -93,18 +76,12 @@ This endpoint does not need any parameter.
 ### Authorization
 
 
-Configure api_key:
-    ApiClient.apiKey["api_key"] = ""
-    ApiClient.apiKeyPrefix["api_key"] = ""
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
-<a name="getOrderById"></a>
-# **getOrderById**
-> Order getOrderById(orderId)
 
 Find purchase order by ID
 
@@ -113,21 +90,15 @@ For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other val
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
 val orderId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be fetched
-try {
-    val result : Order = apiInstance.getOrderById(orderId)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#getOrderById")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#getOrderById")
-    e.printStackTrace()
-}
+
+val result : Order = webService.getOrderById(orderId)
 ```
 
 ### Parameters
@@ -149,30 +120,21 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="placeOrder"></a>
-# **placeOrder**
-> Order placeOrder(order)
 
 Place an order for a pet
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = StoreApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(StoreApi::class.java)
 val order : Order =  // Order | order placed for purchasing the pet
-try {
-    val result : Order = apiInstance.placeOrder(order)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling StoreApi#placeOrder")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling StoreApi#placeOrder")
-    e.printStackTrace()
-}
+
+val result : Order = webService.placeOrder(order)
 ```
 
 ### Parameters
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/UserApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/UserApi.md
index dbf78e81eb22..b667d3b0a600 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/UserApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/UserApi.md
@@ -4,19 +4,16 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**createUser**](UserApi.md#createUser) | **POST** /user | Create user
-[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
-[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
-[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
-[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
-[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
-[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
-[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
+[**createUser**](UserApi.md#createUser) | **POST** user | Create user
+[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** user/createWithArray | Creates list of users with given input array
+[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** user/createWithList | Creates list of users with given input array
+[**deleteUser**](UserApi.md#deleteUser) | **DELETE** user/{username} | Delete user
+[**getUserByName**](UserApi.md#getUserByName) | **GET** user/{username} | Get user by user name
+[**loginUser**](UserApi.md#loginUser) | **GET** user/login | Logs user into the system
+[**logoutUser**](UserApi.md#logoutUser) | **GET** user/logout | Logs out current logged in user session
+[**updateUser**](UserApi.md#updateUser) | **PUT** user/{username} | Updated user
 
 
-<a name="createUser"></a>
-# **createUser**
-> createUser(user)
 
 Create user
 
@@ -25,20 +22,15 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val user : User =  // User | Created user object
-try {
-    apiInstance.createUser(user)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#createUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#createUser")
-    e.printStackTrace()
-}
+
+webService.createUser(user)
 ```
 
 ### Parameters
@@ -60,29 +52,21 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="createUsersWithArrayInput"></a>
-# **createUsersWithArrayInput**
-> createUsersWithArrayInput(user)
 
 Creates list of users with given input array
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
-try {
-    apiInstance.createUsersWithArrayInput(user)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#createUsersWithArrayInput")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#createUsersWithArrayInput")
-    e.printStackTrace()
-}
+
+webService.createUsersWithArrayInput(user)
 ```
 
 ### Parameters
@@ -104,29 +88,21 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="createUsersWithListInput"></a>
-# **createUsersWithListInput**
-> createUsersWithListInput(user)
 
 Creates list of users with given input array
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
-try {
-    apiInstance.createUsersWithListInput(user)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#createUsersWithListInput")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#createUsersWithListInput")
-    e.printStackTrace()
-}
+
+webService.createUsersWithListInput(user)
 ```
 
 ### Parameters
@@ -148,9 +124,6 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
-<a name="deleteUser"></a>
-# **deleteUser**
-> deleteUser(username)
 
 Delete user
 
@@ -159,20 +132,15 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be deleted
-try {
-    apiInstance.deleteUser(username)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#deleteUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#deleteUser")
-    e.printStackTrace()
-}
+
+webService.deleteUser(username)
 ```
 
 ### Parameters
@@ -194,30 +162,21 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="getUserByName"></a>
-# **getUserByName**
-> User getUserByName(username)
 
 Get user by user name
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be fetched. Use user1 for testing.
-try {
-    val result : User = apiInstance.getUserByName(username)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#getUserByName")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#getUserByName")
-    e.printStackTrace()
-}
+
+val result : User = webService.getUserByName(username)
 ```
 
 ### Parameters
@@ -239,31 +198,22 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="loginUser"></a>
-# **loginUser**
-> kotlin.String loginUser(username, password)
 
 Logs user into the system
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | The user name for login
 val password : kotlin.String = password_example // kotlin.String | The password for login in clear text
-try {
-    val result : kotlin.String = apiInstance.loginUser(username, password)
-    println(result)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#loginUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#loginUser")
-    e.printStackTrace()
-}
+
+val result : kotlin.String = webService.loginUser(username, password)
 ```
 
 ### Parameters
@@ -286,28 +236,20 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
-<a name="logoutUser"></a>
-# **logoutUser**
-> logoutUser()
 
 Logs out current logged in user session
 
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
-try {
-    apiInstance.logoutUser()
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#logoutUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#logoutUser")
-    e.printStackTrace()
-}
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
+
+webService.logoutUser()
 ```
 
 ### Parameters
@@ -326,9 +268,6 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
-<a name="updateUser"></a>
-# **updateUser**
-> updateUser(username, user)
 
 Updated user
 
@@ -337,21 +276,16 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
+//import org.openapitools.client.*
 //import org.openapitools.client.infrastructure.*
 //import org.openapitools.client.models.*
 
-val apiInstance = UserApi()
+val apiClient = ApiClient()
+val webService = apiClient.createWebservice(UserApi::class.java)
 val username : kotlin.String = username_example // kotlin.String | name that need to be deleted
 val user : User =  // User | Updated user object
-try {
-    apiInstance.updateUser(username, user)
-} catch (e: ClientException) {
-    println("4xx response calling UserApi#updateUser")
-    e.printStackTrace()
-} catch (e: ServerException) {
-    println("5xx response calling UserApi#updateUser")
-    e.printStackTrace()
-}
+
+webService.updateUser(username, user)
 ```
 
 ### Parameters
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
index fe39014a4283..21fe5e2e2afb 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
@@ -3,15 +3,22 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import io.reactivex.Single
 import io.reactivex.Completable
 
 import org.openapitools.client.models.Client
 
 interface AnotherFakeApi {
-    @PATCH("/another-fake/dummy")
+    /**
+     * To test special tags
+     * To test special tags and operation ID starting with number
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param client client model 
+    * @return [Call]<[Client]>
+     */
+    @PATCH("another-fake/dummy")
     fun call123testSpecialTags(@Body client: Client): Single<Client>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
index 9fc3353c5c9d..7ccf2391af88 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
@@ -3,15 +3,21 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import io.reactivex.Single
 import io.reactivex.Completable
 
 import org.openapitools.client.models.InlineResponseDefault
 
 interface DefaultApi {
-    @GET("/foo")
+    /**
+     * 
+     * 
+     * Responses:
+     *  - 0: response
+     * 
+    * @return [Call]<[InlineResponseDefault]>
+     */
+    @GET("foo")
     fun fooGet(): Single<InlineResponseDefault>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
index 2bf08fc5918e..079756251046 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
@@ -3,8 +3,6 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import io.reactivex.Single
 import io.reactivex.Completable
 
@@ -16,52 +14,221 @@ import org.openapitools.client.models.Pet
 import org.openapitools.client.models.User
 
 interface FakeApi {
-    @GET("/fake/health")
+    /**
+     * Health check endpoint
+     * 
+     * Responses:
+     *  - 200: The instance started successfully
+     * 
+    * @return [Call]<[HealthCheckResult]>
+     */
+    @GET("fake/health")
     fun fakeHealthGet(): Single<HealthCheckResult>
 
-    @GET("/fake/http-signature-test")
+    /**
+     * test http signature authentication
+     * 
+     * Responses:
+     *  - 200: The instance started successfully
+     * 
+     * @param pet Pet object that needs to be added to the store 
+     * @param query1 query parameter (optional)
+     * @param header1 header parameter (optional)
+    * @return [Call]<[Unit]>
+     */
+    @GET("fake/http-signature-test")
     fun fakeHttpSignatureTest(@Body pet: Pet, @Query("query_1") query1: kotlin.String, @Header("header_1") header1: kotlin.String): Completable
 
-    @POST("/fake/outer/boolean")
-    fun fakeOuterBooleanSerialize(@Body body: kotlin.Boolean): Single<kotlin.Boolean>
-
-    @POST("/fake/outer/composite")
-    fun fakeOuterCompositeSerialize(@Body outerComposite: OuterComposite): Single<OuterComposite>
-
-    @POST("/fake/outer/number")
-    fun fakeOuterNumberSerialize(@Body body: java.math.BigDecimal): Single<java.math.BigDecimal>
-
-    @POST("/fake/outer/string")
-    fun fakeOuterStringSerialize(@Body body: kotlin.String): Single<kotlin.String>
-
-    @PUT("/fake/body-with-file-schema")
+    /**
+     * 
+     * Test serialization of outer boolean types
+     * Responses:
+     *  - 200: Output boolean
+     * 
+     * @param body Input boolean as post body (optional)
+    * @return [Call]<[kotlin.Boolean]>
+     */
+    @POST("fake/outer/boolean")
+    fun fakeOuterBooleanSerialize(@Body body: kotlin.Boolean? = null): Single<kotlin.Boolean>
+
+    /**
+     * 
+     * Test serialization of object with outer number type
+     * Responses:
+     *  - 200: Output composite
+     * 
+     * @param outerComposite Input composite as post body (optional)
+    * @return [Call]<[OuterComposite]>
+     */
+    @POST("fake/outer/composite")
+    fun fakeOuterCompositeSerialize(@Body outerComposite: OuterComposite? = null): Single<OuterComposite>
+
+    /**
+     * 
+     * Test serialization of outer number types
+     * Responses:
+     *  - 200: Output number
+     * 
+     * @param body Input number as post body (optional)
+    * @return [Call]<[java.math.BigDecimal]>
+     */
+    @POST("fake/outer/number")
+    fun fakeOuterNumberSerialize(@Body body: java.math.BigDecimal? = null): Single<java.math.BigDecimal>
+
+    /**
+     * 
+     * Test serialization of outer string types
+     * Responses:
+     *  - 200: Output string
+     * 
+     * @param body Input string as post body (optional)
+    * @return [Call]<[kotlin.String]>
+     */
+    @POST("fake/outer/string")
+    fun fakeOuterStringSerialize(@Body body: kotlin.String? = null): Single<kotlin.String>
+
+    /**
+     * 
+     * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+     * Responses:
+     *  - 200: Success
+     * 
+     * @param fileSchemaTestClass  
+    * @return [Call]<[Unit]>
+     */
+    @PUT("fake/body-with-file-schema")
     fun testBodyWithFileSchema(@Body fileSchemaTestClass: FileSchemaTestClass): Completable
 
-    @PUT("/fake/body-with-query-params")
+    /**
+     * 
+     * 
+     * Responses:
+     *  - 200: Success
+     * 
+     * @param query  
+     * @param user  
+    * @return [Call]<[Unit]>
+     */
+    @PUT("fake/body-with-query-params")
     fun testBodyWithQueryParams(@Query("query") query: kotlin.String, @Body user: User): Completable
 
-    @PATCH("/fake")
+    /**
+     * To test \&quot;client\&quot; model
+     * To test \&quot;client\&quot; model
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param client client model 
+    * @return [Call]<[Client]>
+     */
+    @PATCH("fake")
     fun testClientModel(@Body client: Client): Single<Client>
 
+    /**
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Responses:
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param number None 
+     * @param double None 
+     * @param patternWithoutDelimiter None 
+     * @param byte None 
+     * @param integer None (optional)
+     * @param int32 None (optional)
+     * @param int64 None (optional)
+     * @param float None (optional)
+     * @param string None (optional)
+     * @param binary None (optional)
+     * @param date None (optional)
+     * @param dateTime None (optional)
+     * @param password None (optional)
+     * @param paramCallback None (optional)
+    * @return [Call]<[Unit]>
+     */
     @FormUrlEncoded
-    @POST("/fake")
+    @POST("fake")
     fun testEndpointParameters(@Field("number") number: java.math.BigDecimal, @Field("double") double: kotlin.Double, @Field("pattern_without_delimiter") patternWithoutDelimiter: kotlin.String, @Field("byte") byte: kotlin.ByteArray, @Field("integer") integer: kotlin.Int, @Field("int32") int32: kotlin.Int, @Field("int64") int64: kotlin.Long, @Field("float") float: kotlin.Float, @Field("string") string: kotlin.String, @Field("binary") binary: MultipartBody.Part, @Field("date") date: java.time.LocalDate, @Field("dateTime") dateTime: java.time.OffsetDateTime, @Field("password") password: kotlin.String, @Field("callback") paramCallback: kotlin.String): Completable
 
+    /**
+     * To test enum parameters
+     * To test enum parameters
+     * Responses:
+     *  - 400: Invalid request
+     *  - 404: Not found
+     * 
+     * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
+     * @param enumHeaderString Header parameter enum test (string) (optional, default to "-efg")
+     * @param enumQueryStringArray Query parameter enum test (string array) (optional)
+     * @param enumQueryString Query parameter enum test (string) (optional, default to "-efg")
+     * @param enumQueryInteger Query parameter enum test (double) (optional)
+     * @param enumQueryDouble Query parameter enum test (double) (optional)
+     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to "$")
+     * @param enumFormString Form parameter enum test (string) (optional, default to "-efg")
+    * @return [Call]<[Unit]>
+     */
     @FormUrlEncoded
-    @GET("/fake")
+    @GET("fake")
     fun testEnumParameters(@Header("enum_header_string_array") enumHeaderStringArray: kotlin.Array<kotlin.String>, @Header("enum_header_string") enumHeaderString: kotlin.String, @Query("enum_query_string_array") enumQueryStringArray: kotlin.Array<kotlin.String>, @Query("enum_query_string") enumQueryString: kotlin.String, @Query("enum_query_integer") enumQueryInteger: kotlin.Int, @Query("enum_query_double") enumQueryDouble: kotlin.Double, @Field("enum_form_string_array") enumFormStringArray: kotlin.Array<kotlin.String>, @Field("enum_form_string") enumFormString: kotlin.String): Completable
 
-    @DELETE("/fake")
+    /**
+     * Fake endpoint to test group parameters (optional)
+     * Fake endpoint to test group parameters (optional)
+     * Responses:
+     *  - 400: Someting wrong
+     * 
+     * @param requiredStringGroup Required String in group parameters 
+     * @param requiredBooleanGroup Required Boolean in group parameters 
+     * @param requiredInt64Group Required Integer in group parameters 
+     * @param stringGroup String in group parameters (optional)
+     * @param booleanGroup Boolean in group parameters (optional)
+     * @param int64Group Integer in group parameters (optional)
+    * @return [Call]<[Unit]>
+     */
+    @DELETE("fake")
     fun testGroupParameters(@Query("required_string_group") requiredStringGroup: kotlin.Int, @Header("required_boolean_group") requiredBooleanGroup: kotlin.Boolean, @Query("required_int64_group") requiredInt64Group: kotlin.Long, @Query("string_group") stringGroup: kotlin.Int, @Header("boolean_group") booleanGroup: kotlin.Boolean, @Query("int64_group") int64Group: kotlin.Long): Completable
 
-    @POST("/fake/inline-additionalProperties")
+    /**
+     * test inline additionalProperties
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param requestBody request body 
+    * @return [Call]<[Unit]>
+     */
+    @POST("fake/inline-additionalProperties")
     fun testInlineAdditionalProperties(@Body requestBody: kotlin.collections.Map<kotlin.String, kotlin.String>): Completable
 
+    /**
+     * test json serialization of form data
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param param field1 
+     * @param param2 field2 
+    * @return [Call]<[Unit]>
+     */
     @FormUrlEncoded
-    @GET("/fake/jsonFormData")
+    @GET("fake/jsonFormData")
     fun testJsonFormData(@Field("param") param: kotlin.String, @Field("param2") param2: kotlin.String): Completable
 
-    @PUT("/fake/test-query-paramters")
-    fun testQueryParameterCollectionFormat(@Query("pipe") pipe: kotlin.Array<kotlin.String>, @Query("ioutil") ioutil: CSVParams, @Query("http") http: SPACEParams, @Query("url") url: CSVParams, @Query("context") context: kotlin.Array<kotlin.String>): Completable
+    /**
+     * 
+     * To test the collection format in query parameters
+     * Responses:
+     *  - 200: Success
+     * 
+     * @param pipe  
+     * @param ioutil  
+     * @param http  
+     * @param url  
+     * @param context  
+    * @return [Call]<[Unit]>
+     */
+    @PUT("fake/test-query-paramters")
+    fun testQueryParameterCollectionFormat(@Query("pipe") pipe: kotlin.Array<kotlin.String>, @Query("ioutil") ioutil: CSVParams, @Query("http") http: SSVParams, @Query("url") url: CSVParams, @Query("context") context: kotlin.Array<kotlin.String>): Completable
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
index 1c6fef550666..d55a974eb115 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
@@ -3,15 +3,22 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import io.reactivex.Single
 import io.reactivex.Completable
 
 import org.openapitools.client.models.Client
 
 interface FakeClassnameTags123Api {
-    @PATCH("/fake_classname_test")
+    /**
+     * To test class name in snake case
+     * To test class name in snake case
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param client client model 
+    * @return [Call]<[Client]>
+     */
+    @PATCH("fake_classname_test")
     fun testClassname(@Body client: Client): Single<Client>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 078de4d6c92f..75c7a7051e84 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -3,8 +3,6 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import io.reactivex.Single
 import io.reactivex.Completable
 
@@ -12,35 +10,129 @@ import org.openapitools.client.models.ApiResponse
 import org.openapitools.client.models.Pet
 
 interface PetApi {
-    @POST("/pet")
+    /**
+     * Add a new pet to the store
+     * 
+     * Responses:
+     *  - 405: Invalid input
+     * 
+     * @param pet Pet object that needs to be added to the store 
+    * @return [Call]<[Unit]>
+     */
+    @POST("pet")
     fun addPet(@Body pet: Pet): Completable
 
-    @DELETE("/pet/{petId}")
+    /**
+     * Deletes a pet
+     * 
+     * Responses:
+     *  - 400: Invalid pet value
+     * 
+     * @param petId Pet id to delete 
+     * @param apiKey  (optional)
+    * @return [Call]<[Unit]>
+     */
+    @DELETE("pet/{petId}")
     fun deletePet(@Path("petId") petId: kotlin.Long, @Header("api_key") apiKey: kotlin.String): Completable
 
-    @GET("/pet/findByStatus")
+    /**
+     * Finds Pets by status
+     * Multiple status values can be provided with comma separated strings
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid status value
+     * 
+     * @param status Status values that need to be considered for filter 
+    * @return [Call]<[kotlin.Array<Pet>]>
+     */
+    @GET("pet/findByStatus")
     fun findPetsByStatus(@Query("status") status: CSVParams): Single<kotlin.Array<Pet>>
 
+    /**
+     * Finds Pets by tags
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid tag value
+     * 
+     * @param tags Tags to filter by 
+    * @return [Call]<[kotlin.Array<Pet>]>
+     */
     @Deprecated("This api was deprecated")
-    @GET("/pet/findByTags")
+    @GET("pet/findByTags")
     fun findPetsByTags(@Query("tags") tags: CSVParams): Single<kotlin.Array<Pet>>
 
-    @GET("/pet/{petId}")
+    /**
+     * Find pet by ID
+     * Returns a single pet
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid ID supplied
+     *  - 404: Pet not found
+     * 
+     * @param petId ID of pet to return 
+    * @return [Call]<[Pet]>
+     */
+    @GET("pet/{petId}")
     fun getPetById(@Path("petId") petId: kotlin.Long): Single<Pet>
 
-    @PUT("/pet")
+    /**
+     * Update an existing pet
+     * 
+     * Responses:
+     *  - 400: Invalid ID supplied
+     *  - 404: Pet not found
+     *  - 405: Validation exception
+     * 
+     * @param pet Pet object that needs to be added to the store 
+    * @return [Call]<[Unit]>
+     */
+    @PUT("pet")
     fun updatePet(@Body pet: Pet): Completable
 
+    /**
+     * Updates a pet in the store with form data
+     * 
+     * Responses:
+     *  - 405: Invalid input
+     * 
+     * @param petId ID of pet that needs to be updated 
+     * @param name Updated name of the pet (optional)
+     * @param status Updated status of the pet (optional)
+    * @return [Call]<[Unit]>
+     */
     @FormUrlEncoded
-    @POST("/pet/{petId}")
+    @POST("pet/{petId}")
     fun updatePetWithForm(@Path("petId") petId: kotlin.Long, @Field("name") name: kotlin.String, @Field("status") status: kotlin.String): Completable
 
+    /**
+     * uploads an image
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param petId ID of pet to update 
+     * @param additionalMetadata Additional data to pass to server (optional)
+     * @param file file to upload (optional)
+    * @return [Call]<[ApiResponse]>
+     */
     @Multipart
-    @POST("/pet/{petId}/uploadImage")
+    @POST("pet/{petId}/uploadImage")
     fun uploadFile(@Path("petId") petId: kotlin.Long, @Part("additionalMetadata") additionalMetadata: kotlin.String, @Part file: MultipartBody.Part): Single<ApiResponse>
 
+    /**
+     * uploads an image (required)
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param petId ID of pet to update 
+     * @param requiredFile file to upload 
+     * @param additionalMetadata Additional data to pass to server (optional)
+    * @return [Call]<[ApiResponse]>
+     */
     @Multipart
-    @POST("/fake/{petId}/uploadImageWithRequiredFile")
+    @POST("fake/{petId}/uploadImageWithRequiredFile")
     fun uploadFileWithRequiredFile(@Path("petId") petId: kotlin.Long, @Part requiredFile: MultipartBody.Part, @Part("additionalMetadata") additionalMetadata: kotlin.String): Single<ApiResponse>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 2e877fc382c1..1b55d025d063 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -3,24 +3,61 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import io.reactivex.Single
 import io.reactivex.Completable
 
 import org.openapitools.client.models.Order
 
 interface StoreApi {
-    @DELETE("/store/order/{order_id}")
+    /**
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * Responses:
+     *  - 400: Invalid ID supplied
+     *  - 404: Order not found
+     * 
+     * @param orderId ID of the order that needs to be deleted 
+    * @return [Call]<[Unit]>
+     */
+    @DELETE("store/order/{order_id}")
     fun deleteOrder(@Path("order_id") orderId: kotlin.String): Completable
 
-    @GET("/store/inventory")
+    /**
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     * Responses:
+     *  - 200: successful operation
+     * 
+    * @return [Call]<[kotlin.collections.Map<kotlin.String, kotlin.Int>]>
+     */
+    @GET("store/inventory")
     fun getInventory(): Single<kotlin.collections.Map<kotlin.String, kotlin.Int>>
 
-    @GET("/store/order/{order_id}")
+    /**
+     * Find purchase order by ID
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid ID supplied
+     *  - 404: Order not found
+     * 
+     * @param orderId ID of pet that needs to be fetched 
+    * @return [Call]<[Order]>
+     */
+    @GET("store/order/{order_id}")
     fun getOrderById(@Path("order_id") orderId: kotlin.Long): Single<Order>
 
-    @POST("/store/order")
+    /**
+     * Place an order for a pet
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid Order
+     * 
+     * @param order order placed for purchasing the pet 
+    * @return [Call]<[Order]>
+     */
+    @POST("store/order")
     fun placeOrder(@Body order: Order): Single<Order>
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 2c1d45116e39..0948c0c47a79 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -3,36 +3,112 @@ package org.openapitools.client.apis
 import org.openapitools.client.infrastructure.CollectionFormats.*
 import retrofit2.http.*
 import okhttp3.RequestBody
-import okhttp3.ResponseBody
-import okhttp3.MultipartBody
 import io.reactivex.Single
 import io.reactivex.Completable
 
 import org.openapitools.client.models.User
 
 interface UserApi {
-    @POST("/user")
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param user Created user object 
+    * @return [Call]<[Unit]>
+     */
+    @POST("user")
     fun createUser(@Body user: User): Completable
 
-    @POST("/user/createWithArray")
+    /**
+     * Creates list of users with given input array
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param user List of user object 
+    * @return [Call]<[Unit]>
+     */
+    @POST("user/createWithArray")
     fun createUsersWithArrayInput(@Body user: kotlin.Array<User>): Completable
 
-    @POST("/user/createWithList")
+    /**
+     * Creates list of users with given input array
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param user List of user object 
+    * @return [Call]<[Unit]>
+     */
+    @POST("user/createWithList")
     fun createUsersWithListInput(@Body user: kotlin.Array<User>): Completable
 
-    @DELETE("/user/{username}")
+    /**
+     * Delete user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param username The name that needs to be deleted 
+    * @return [Call]<[Unit]>
+     */
+    @DELETE("user/{username}")
     fun deleteUser(@Path("username") username: kotlin.String): Completable
 
-    @GET("/user/{username}")
+    /**
+     * Get user by user name
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return [Call]<[User]>
+     */
+    @GET("user/{username}")
     fun getUserByName(@Path("username") username: kotlin.String): Single<User>
 
-    @GET("/user/login")
+    /**
+     * Logs user into the system
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid username/password supplied
+     * 
+     * @param username The user name for login 
+     * @param password The password for login in clear text 
+    * @return [Call]<[kotlin.String]>
+     */
+    @GET("user/login")
     fun loginUser(@Query("username") username: kotlin.String, @Query("password") password: kotlin.String): Single<kotlin.String>
 
-    @GET("/user/logout")
+    /**
+     * Logs out current logged in user session
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+    * @return [Call]<[Unit]>
+     */
+    @GET("user/logout")
     fun logoutUser(): Completable
 
-    @PUT("/user/{username}")
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 400: Invalid user supplied
+     *  - 404: User not found
+     * 
+     * @param username name that need to be deleted 
+     * @param user Updated user object 
+    * @return [Call]<[Unit]>
+     */
+    @PUT("user/{username}")
     fun updateUser(@Path("username") username: kotlin.String, @Body user: User): Completable
 
 }
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
new file mode 100644
index 000000000000..524d5190ef88
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
@@ -0,0 +1,50 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+import java.net.URI
+import java.net.URISyntaxException
+
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class ApiKeyAuth(
+        private val location: String = "",
+        private val paramName: String = "",
+        private var apiKey: String = ""
+) : Interceptor {
+    
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request = chain.request()
+
+        if ("query" == location) {
+            var newQuery = request.url.toUri().query
+            val paramValue = "$paramName=$apiKey"
+            if (newQuery == null) {
+                newQuery = paramValue
+            } else {
+                newQuery += "&$paramValue"
+            }
+
+            val newUri: URI
+            try {
+                val oldUri = request.url.toUri()
+                newUri = URI(oldUri.scheme, oldUri.authority,
+                    oldUri.path, newQuery, oldUri.fragment)
+            } catch (e: URISyntaxException) {
+                throw IOException(e)
+            }
+
+            request = request.newBuilder().url(newUri.toURL()).build()
+        } else if ("header" == location) {
+            request = request.newBuilder()
+                    .addHeader(paramName, apiKey)
+                    .build()
+        } else if ("cookie" == location) {
+            request = request.newBuilder()
+                    .addHeader("Cookie", "$paramName=$apiKey")
+                    .build()
+        }
+        return chain.proceed(request)
+    }
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
new file mode 100644
index 000000000000..575bea19540d
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
@@ -0,0 +1,33 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+
+import kotlin.jvm.Throws
+import okhttp3.Interceptor
+import okhttp3.Interceptor.Chain
+import okhttp3.Response
+import okhttp3.Credentials
+
+class HttpBasicAuth(
+    private var username: String = "",
+    private var password: String = ""
+) : Interceptor {
+
+    fun setCredentials(username: String, password: String) {
+        this.username = username
+        this.password = password
+    }
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Chain): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") == null && username.isNotBlank() && password.isNotBlank()) {
+            request = request.newBuilder()
+                .addHeader("Authorization", Credentials.basic(username, password))
+                .build()
+        }
+        return chain.proceed(request)
+    }
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/HttpBearerAuth.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/HttpBearerAuth.kt
new file mode 100644
index 000000000000..775ad903c438
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/HttpBearerAuth.kt
@@ -0,0 +1,39 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+
+import okhttp3.Interceptor
+import okhttp3.Interceptor.Chain
+import okhttp3.Response
+
+class HttpBearerAuth(
+    private var schema: String = "",
+    var bearerToken: String = ""
+) : Interceptor {
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Chain): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") == null && bearerToken.isNotBlank()) {
+            request = request.newBuilder()
+                .addHeader("Authorization", headerValue())
+                .build()
+        }
+        return chain.proceed(request)
+    }
+
+    private fun headerValue(): String {
+        return if (schema.isNotBlank()) {
+            "${upperCaseBearer()} $bearerToken"
+        } else {
+            bearerToken
+        }
+    }
+
+    private fun upperCaseBearer(): String {
+        return if (schema.toLowerCase().equals("bearer")) "Bearer" else schema
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/OAuth.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/OAuth.kt
new file mode 100644
index 000000000000..311a8f439794
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/OAuth.kt
@@ -0,0 +1,151 @@
+package org.openapitools.client.auth
+
+import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
+import java.net.HttpURLConnection.HTTP_FORBIDDEN
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.OAuthClient
+import org.apache.oltu.oauth2.client.request.OAuthBearerClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+import org.apache.oltu.oauth2.common.message.types.GrantType
+import org.apache.oltu.oauth2.common.token.BasicOAuthToken
+
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Response
+
+class OAuth(
+        client: OkHttpClient,
+        var tokenRequestBuilder: TokenRequestBuilder
+) : Interceptor {
+
+    interface AccessTokenListener {
+        fun notify(token: BasicOAuthToken)
+    }
+
+    private var oauthClient: OAuthClient = OAuthClient(OAuthOkHttpClient(client))
+
+    @Volatile 
+    private var accessToken: String? = null
+    var authenticationRequestBuilder: AuthenticationRequestBuilder? = null
+    private var accessTokenListener: AccessTokenListener? = null
+
+    constructor(
+            requestBuilder: TokenRequestBuilder
+    ) : this(
+            OkHttpClient(), 
+            requestBuilder
+    )
+
+    constructor(
+            flow: OAuthFlow, 
+            authorizationUrl: String, 
+            tokenUrl: String, 
+            scopes: String
+    ) : this(
+            OAuthClientRequest.tokenLocation(tokenUrl).setScope(scopes)
+    ) {
+        setFlow(flow);
+        authenticationRequestBuilder = OAuthClientRequest.authorizationLocation(authorizationUrl);
+    }
+
+    fun setFlow(flow: OAuthFlow) {
+        when (flow) {
+            OAuthFlow.accessCode, OAuthFlow.implicit ->
+                tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE)
+            OAuthFlow.password ->
+                tokenRequestBuilder.setGrantType(GrantType.PASSWORD)
+            OAuthFlow.application ->
+                tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS)
+        }            
+    }
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        return retryingIntercept(chain, true)
+    }
+
+    @Throws(IOException::class)
+    private fun retryingIntercept(chain: Interceptor.Chain, updateTokenAndRetryOnAuthorizationFailure: Boolean): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") != null) {
+            return chain.proceed(request)
+        }
+
+        // If first time, get the token
+        val oAuthRequest: OAuthClientRequest
+        if (accessToken == null) {
+            updateAccessToken(null)
+        }
+
+        if (accessToken != null) {
+            // Build the request
+            val rb = request.newBuilder()
+
+            val requestAccessToken = accessToken
+            try {
+                oAuthRequest = OAuthBearerClientRequest(request.url.toString())
+                        .setAccessToken(requestAccessToken)
+                        .buildHeaderMessage()
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            }
+
+            oAuthRequest.headers.entries.forEach { header ->
+                rb.addHeader(header.key, header.value)
+            }
+            rb.url(oAuthRequest.locationUri)
+
+            //Execute the request
+            val response = chain.proceed(rb.build())
+
+            // 401/403 most likely indicates that access token has expired. Unless it happens two times in a row.
+            if ((response.code == HTTP_UNAUTHORIZED || response.code == HTTP_FORBIDDEN) && updateTokenAndRetryOnAuthorizationFailure) {
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body?.close()
+                        return retryingIntercept(chain, false)
+                    }
+                } catch (e: Exception) {
+                    response.body?.close()
+                    throw e
+                }
+            }
+            return response
+        } else {
+            return chain.proceed(chain.request())
+        }
+    }
+
+    /**
+     * Returns true if the access token has been updated
+     */
+    @Throws(IOException::class)
+    @Synchronized 
+    fun updateAccessToken(requestAccessToken: String?): Boolean {
+        if (accessToken == null || accessToken.equals(requestAccessToken)) {    
+            return try {
+                val accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage())
+                if (accessTokenResponse != null && accessTokenResponse.accessToken != null) {
+                    accessToken = accessTokenResponse.accessToken
+                    accessTokenListener?.notify(accessTokenResponse.oAuthToken as BasicOAuthToken)
+                    !accessToken.equals(requestAccessToken)
+                } else {
+                    false
+                }
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            } catch (e: OAuthProblemException) {
+                throw IOException(e)
+            }
+        }
+        return true;
+    }
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt
new file mode 100644
index 000000000000..bcada9b7a6a2
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt
@@ -0,0 +1,5 @@
+package org.openapitools.client.auth
+
+enum class OAuthFlow {
+    accessCode, implicit, password, application
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt
new file mode 100644
index 000000000000..93adbda3fc98
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt
@@ -0,0 +1,61 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.HttpClient
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.response.OAuthClientResponse
+import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody
+
+
+class OAuthOkHttpClient(
+        private var client: OkHttpClient
+) : HttpClient {
+
+    constructor() : this(OkHttpClient())
+
+    @Throws(OAuthSystemException::class, OAuthProblemException::class)
+    override fun <T : OAuthClientResponse?> execute(
+            request: OAuthClientRequest, 
+            headers: Map<String, String>?,
+            requestMethod: String, 
+            responseClass: Class<T>?): T {
+
+        var mediaType = "application/json".toMediaTypeOrNull()
+        val requestBuilder = Request.Builder().url(request.locationUri)
+
+        headers?.forEach { entry ->
+            if (entry.key.equals("Content-Type", true)) {
+                mediaType = entry.value.toMediaTypeOrNull()
+            } else {
+                requestBuilder.addHeader(entry.key, entry.value)
+            }
+        }
+
+        val body: RequestBody? = if (request.body != null) RequestBody.create(mediaType, request.body) else null
+        requestBuilder.method(requestMethod, body)
+
+        try {
+            val response = client.newCall(requestBuilder.build()).execute()
+            return OAuthClientResponseFactory.createCustomResponse(
+                    response.body?.string(), 
+                    response.body?.contentType()?.toString(),
+                    response.code,
+                    responseClass)
+        } catch (e: IOException) {
+            throw OAuthSystemException(e)
+        }
+    }
+
+    override fun shutdown() {
+        // Nothing to do here
+    }
+
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
index 0050437d80a0..1e9f9e39d85d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -1,37 +1,232 @@
 package org.openapitools.client.infrastructure
 
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import org.openapitools.client.auth.ApiKeyAuth
+import org.openapitools.client.auth.OAuth
+import org.openapitools.client.auth.OAuth.AccessTokenListener
+import org.openapitools.client.auth.OAuthFlow
+import org.openapitools.client.auth.HttpBearerAuth
+import org.openapitools.client.auth.HttpBasicAuth
+
+import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.converter.scalars.ScalarsConverterFactory
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
 import retrofit2.converter.gson.GsonConverterFactory
 
 class ApiClient(
     private var baseUrl: String = defaultBasePath,
-    private var okHttpClient: OkHttpClient
+    private val okHttpClientBuilder: OkHttpClient.Builder? = null,
+    private val serializerBuilder: GsonBuilder = Serializer.gsonBuilder
 ) {
-    companion object {
-        @JvmStatic
-        val defaultBasePath: String by lazy {
-            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io:80/v2")
-        }
+    private val apiAuthorizations = mutableMapOf<String, Interceptor>()
+    var logger: ((String) -> Unit)? = null
+
+    private val retrofitBuilder: Retrofit.Builder by lazy {
+        Retrofit.Builder()
+            .baseUrl(baseUrl)
+            .addConverterFactory(ScalarsConverterFactory.create())
+            .addConverterFactory(GsonConverterFactory.create(serializerBuilder.create()))
+            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+    }
+
+    private val clientBuilder: OkHttpClient.Builder by lazy {
+        okHttpClientBuilder ?: defaultClientBuilder
+    }
+
+    private val defaultClientBuilder: OkHttpClient.Builder by lazy {
+        OkHttpClient()
+            .newBuilder()
+            .addInterceptor(HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
+                override fun log(message: String) {
+                    logger?.invoke(message)
+                }
+            }).apply {
+                level = HttpLoggingInterceptor.Level.BODY
+            })
     }
 
     init {
         normalizeBaseUrl()
     }
 
-    val retrofitBuilder: Retrofit.Builder by lazy {
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: GsonBuilder = Serializer.gsonBuilder,
+        authNames: Array<String>
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder) {
+        authNames.forEach { authName ->
+            val auth = when (authName) {
+                "api_key" -> ApiKeyAuth("header", "api_key")"api_key_query" -> ApiKeyAuth("query", "api_key_query")"bearer_test" -> HttpBearerAuth("bearer")"http_basic_test" -> HttpBasicAuth()"http_signature_test" -> "petstore_auth" -> OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets")
+                else -> throw RuntimeException("auth name $authName not found in available auth names")
+            }
+            addAuthorization(authName, auth);
+        }
+    }
 
-        Retrofit.Builder()
-        .baseUrl(baseUrl)
-        .addConverterFactory(ScalarsConverterFactory.create())
-        .addConverterFactory(GsonConverterFactory.create(Serializer.gson))
-        .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: GsonBuilder = Serializer.gsonBuilder,
+        authName: String, 
+        bearerToken: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        setBearerToken(bearerToken)
+    }
+
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: GsonBuilder = Serializer.gsonBuilder,
+        authName: String, 
+        username: String, 
+        password: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        setCredentials(username, password)
+    }
+
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: GsonBuilder = Serializer.gsonBuilder,
+        authName: String, 
+        clientId: String, 
+        secret: String, 
+        username: String, 
+        password: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        getTokenEndPoint()
+            ?.setClientId(clientId)
+            ?.setClientSecret(secret)
+            ?.setUsername(username)
+            ?.setPassword(password)
+    }
+
+    fun setCredentials(username: String, password: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder.setUsername(username).setPassword(password)
+        }
+        return this
+    }
+    fun setBearerToken(bearerToken: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, HttpBearerAuth> {
+            this.bearerToken = bearerToken
+        }
+        return this
+    }
+
+    fun setCredentials(username: String, password: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, HttpBasicAuth> {
+            setCredentials(username, password);
+        }
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder.setUsername(username).setPassword(password)
+        }
+        return this
+    }
+
+    fun setCredentials(username: String, password: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder.setUsername(username).setPassword(password)
+        }
+        return this
+    }
+    /**
+    * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Token request builder
+    */
+    fun getTokenEndPoint(): TokenRequestBuilder? {
+        var result: TokenRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = tokenRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Authentication request builder
+    */
+    fun getAuthorizationEndPoint(): AuthenticationRequestBuilder? {
+        var result: AuthenticationRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = authenticationRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
+    * @param accessToken Access token
+    * @return ApiClient
+    */
+    fun setAccessToken(accessToken: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            setAccessToken(accessToken)
+        }
+        return this
+    }
+
+    /**
+    * Helper method to configure the oauth accessCode/implicit flow parameters
+    * @param clientId Client ID
+    * @param clientSecret Client secret
+    * @param redirectURI Redirect URI
+    * @return ApiClient
+    */
+    fun configureAuthorizationFlow(clientId: String, clientSecret: String, redirectURI: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder
+                .setClientId(clientId)
+                .setClientSecret(clientSecret)
+                .setRedirectURI(redirectURI)
+            authenticationRequestBuilder
+                ?.setClientId(clientId)
+                ?.setRedirectURI(redirectURI)
+        }
+        return this;
+    }
+
+    /**
+    * Configures a listener which is notified when a new access token is received.
+    * @param accessTokenListener Access token listener
+    * @return ApiClient
+    */
+    fun registerAccessTokenListener(accessTokenListener: AccessTokenListener): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            registerAccessTokenListener(accessTokenListener)
+        }
+        return this;
+    }
+
+    /**
+     * Adds an authorization to be used by the client
+     * @param authName Authentication name
+     * @param authorization Authorization interceptor
+     * @return ApiClient
+     */
+    fun addAuthorization(authName: String, authorization: Interceptor): ApiClient {
+        if (apiAuthorizations.containsKey(authName)) {
+            throw RuntimeException("auth name $authName already in api authorizations")
+        }
+        apiAuthorizations[authName] = authorization
+        clientBuilder.addInterceptor(authorization)
+        return this
+    }
+
+    fun setLogger(logger: (String) -> Unit): ApiClient {
+        this.logger = logger
+        return this
     }
 
     fun <S> createService(serviceClass: Class<S>): S {
-        return retrofitBuilder.client(okHttpClient).build().create(serviceClass)
+        return retrofitBuilder.client(clientBuilder.build()).build().create(serviceClass)
     }
 
     private fun normalizeBaseUrl() {
@@ -39,4 +234,20 @@ class ApiClient(
             baseUrl += "/"
         }
     }
+
+    private inline fun <T, reified U> Iterable<T>.runOnFirst(callback: U.() -> Unit) {
+        for (element in this) {
+            if (element is U)  {
+                callback.invoke(element)
+                break
+            }
+        }
+    }
+
+    companion object {        
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io:80/v2")
+        }
+    }
 }
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt
new file mode 100644
index 000000000000..3369ea29aa99
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExt.kt
@@ -0,0 +1,15 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonParseException
+import retrofit2.Response
+
+@Throws(JsonParseException::class)
+inline fun <reified T> Response<*>.getErrorResponse(serializerBuilder: GsonBuilder = Serializer.gsonBuilder): T? {
+    val serializer = serializerBuilder.create()
+    val reader = errorBody()?.charStream()
+    if(reader != null) {
+        return serializer.fromJson(reader, T::class.java)
+    }
+    return null
+}
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
index 04e474059f25..152cbc0cddf3 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param mapProperty 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Animal.kt
index 59234b2684f5..ab6e55151fc8 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Animal.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Animal.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 4d49a464621a..60f2617cafb2 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param code 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
index 0c88337e9c1e..db44a13b4373 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param arrayArrayNumber 
@@ -21,7 +22,7 @@ import java.io.Serializable
 
 data class ArrayOfArrayOfNumberOnly (
     @SerializedName("ArrayArrayNumber")
-    val arrayArrayNumber: kotlin.Array<kotlin.Array<java.math.BigDecimal>>? = null
+    val arrayArrayNumber: kotlin.collections.List<kotlin.collections.List<java.math.BigDecimal>>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
index 4da5b8e6d5fb..128acc125416 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param arrayNumber 
@@ -21,7 +22,7 @@ import java.io.Serializable
 
 data class ArrayOfNumberOnly (
     @SerializedName("ArrayNumber")
-    val arrayNumber: kotlin.Array<java.math.BigDecimal>? = null
+    val arrayNumber: kotlin.collections.List<java.math.BigDecimal>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
index 855cd60a3274..afb0414957b9 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.ReadOnlyFirst
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param arrayOfString 
@@ -24,11 +25,11 @@ import java.io.Serializable
 
 data class ArrayTest (
     @SerializedName("array_of_string")
-    val arrayOfString: kotlin.Array<kotlin.String>? = null,
+    val arrayOfString: kotlin.collections.List<kotlin.String>? = null,
     @SerializedName("array_array_of_integer")
-    val arrayArrayOfInteger: kotlin.Array<kotlin.Array<kotlin.Long>>? = null,
+    val arrayArrayOfInteger: kotlin.collections.List<kotlin.collections.List<kotlin.Long>>? = null,
     @SerializedName("array_array_of_model")
-    val arrayArrayOfModel: kotlin.Array<kotlin.Array<ReadOnlyFirst>>? = null
+    val arrayArrayOfModel: kotlin.collections.List<kotlin.collections.List<ReadOnlyFirst>>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Capitalization.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
index 24e13278871b..cf876c94035c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param smallCamel 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Cat.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Cat.kt
index 7470f2504322..647155c428fc 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Cat.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Cat.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.CatAllOf
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
index 17d5df7c0db1..b3888433c7bb 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param declawed 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Category.kt
index 6bfa3b0d01fb..befccbefa9ac 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ClassModel.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
index 174d49148f0d..c5222d7169e0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Model for testing model with \"_class\" property
  * @param propertyClass 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Client.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Client.kt
index 31fa6e51bf7b..3debe1d542f7 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Client.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Client.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param client 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Dog.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Dog.kt
index 7965fadd703c..5be6d075450e 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Dog.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Dog.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.DogAllOf
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
index d67d72c09671..be81eda59734 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param breed 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
index d4ffb01a388d..2b97721e7f53 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param justSymbol 
@@ -24,7 +25,7 @@ data class EnumArrays (
     @SerializedName("just_symbol")
     val justSymbol: EnumArrays.JustSymbol? = null,
     @SerializedName("array_enum")
-    val arrayEnum: kotlin.Array<EnumArrays.ArrayEnum>? = null
+    val arrayEnum: kotlin.collections.List<EnumArrays.ArrayEnum>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
index 507fbaa3c059..3aceec7fe933 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
@@ -18,6 +18,7 @@ import org.openapitools.client.models.OuterEnumIntegerDefaultValue
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param enumStringRequired 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
index 1511af5d49b2..b82eddd47ccf 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param file 
@@ -24,7 +25,7 @@ data class FileSchemaTestClass (
     @SerializedName("file")
     val file: java.io.File? = null,
     @SerializedName("files")
-    val files: kotlin.Array<java.io.File>? = null
+    val files: kotlin.collections.List<java.io.File>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Foo.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Foo.kt
index 1ca746f908c3..33952e4b66f1 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Foo.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Foo.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FormatTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
index 5b9be0b89c01..d69683337761 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param number 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
index 7608a258ae5f..3d662d38a504 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
index 9e5a085a2c01..fe3b639cfc39 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
  * @param nullableMessage 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
index d75c0ded4369..24f157d5d750 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param name Updated name of the pet
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
index 1f26364b834e..2382fda34b0f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param additionalMetadata Additional data to pass to server
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
index 57634dd3f5a2..0c85be510de8 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param enumFormStringArray Form parameter enum test (string array)
@@ -23,7 +24,7 @@ import java.io.Serializable
 data class InlineObject2 (
     /* Form parameter enum test (string array) */
     @SerializedName("enum_form_string_array")
-    val enumFormStringArray: kotlin.Array<InlineObject2.EnumFormStringArray>? = null,
+    val enumFormStringArray: kotlin.collections.List<InlineObject2.EnumFormStringArray>? = null,
     /* Form parameter enum test (string) */
     @SerializedName("enum_form_string")
     val enumFormString: InlineObject2.EnumFormString? = null
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
index f70af3efc5a3..37a4dbaeb49d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param number None
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
index 5c38c52ba8d1..06b2d303be85 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param param field1
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
index 6389765702b9..76a04940bbf6 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param requiredFile file to upload
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
index e1d3c615222a..aceb74085fee 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Foo
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param string 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/List.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/List.kt
index 1aa7715f047f..8de0d080cedc 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/List.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/List.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param `123minusList` 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MapTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MapTest.kt
index 9c0bef747fbd..351506589b9a 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MapTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MapTest.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param mapMapOfString 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
index f1dda9dc0efe..39b0152a33f0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Animal
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param uuid 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Model200Response.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
index 1bdb62d1b23b..1360386ee2bb 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Model for testing model name starting with number
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Name.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Name.kt
index 2e30b6b7cd95..e3113d603d4c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Name.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Name.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Model for testing model name same as property name
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NullableClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
index 534bb572e4f1..81366b145ba2 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param integerProp 
@@ -44,11 +45,11 @@ data class NullableClass (
     @SerializedName("datetime_prop")
     val datetimeProp: java.time.OffsetDateTime? = null,
     @SerializedName("array_nullable_prop")
-    val arrayNullableProp: kotlin.Array<kotlin.Any>? = null,
+    val arrayNullableProp: kotlin.collections.List<kotlin.Any>? = null,
     @SerializedName("array_and_items_nullable_prop")
-    val arrayAndItemsNullableProp: kotlin.Array<kotlin.Any>? = null,
+    val arrayAndItemsNullableProp: kotlin.collections.List<kotlin.Any>? = null,
     @SerializedName("array_items_nullable")
-    val arrayItemsNullable: kotlin.Array<kotlin.Any>? = null,
+    val arrayItemsNullable: kotlin.collections.List<kotlin.Any>? = null,
     @SerializedName("object_nullable_prop")
     val objectNullableProp: kotlin.collections.Map<kotlin.String, kotlin.Any>? = null,
     @SerializedName("object_and_items_nullable_prop")
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
index c7138f597e10..31f01f97b083 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param justNumber 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Order.kt
index 2a58f2be7c0d..048659fa99fa 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
index 6303e05739bc..dec8db2d9b8a 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param myNumber 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 5865f9d672cd..0b389b22ba63 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.Tag
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param name 
@@ -30,13 +31,13 @@ data class Pet (
     @SerializedName("name")
     val name: kotlin.String,
     @SerializedName("photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @SerializedName("id")
     val id: kotlin.Long? = null,
     @SerializedName("category")
     val category: Category? = null,
     @SerializedName("tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @SerializedName("status")
     val status: Pet.Status? = null
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
index 81c3bab8745e..ef98374a6955 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Return.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Return.kt
index 166cb5aa391c..19f61d416732 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Return.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Return.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * Model for testing reserved words
  * @param `return` 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
index c9585969b251..23cd075e530d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Tag.kt
index e11be325ef39..9e08a3d8ae0e 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/User.kt
index 433872af1e9c..ca2ce7188e52 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/.openapi-generator/FILES b/samples/openapi3/client/petstore/kotlin-multiplatform/.openapi-generator/FILES
index 542bb6338fff..17ac9baa409d 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/.openapi-generator/FILES
@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 build.gradle
 docs/200Response.md
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/ArrayOfArrayOfNumberOnly.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/ArrayOfArrayOfNumberOnly.md
index 7d57b3c840f5..ac1757d00179 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/ArrayOfArrayOfNumberOnly.md
@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayArrayNumber** | **kotlin.Array&lt;kotlin.Array&lt;kotlin.Double&gt;&gt;** |  |  [optional]
+**arrayArrayNumber** | **kotlin.collections.List&lt;kotlin.collections.List&lt;kotlin.Double&gt;&gt;** |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/ArrayOfNumberOnly.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/ArrayOfNumberOnly.md
index e5259bbe3e59..4924080666a7 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/ArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/ArrayOfNumberOnly.md
@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayNumber** | **kotlin.Array&lt;kotlin.Double&gt;** |  |  [optional]
+**arrayNumber** | **kotlin.collections.List&lt;kotlin.Double&gt;** |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/ArrayTest.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/ArrayTest.md
index aa0bbbe936c1..45e59c8fe77c 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/ArrayTest.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/ArrayTest.md
@@ -4,9 +4,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayOfString** | **kotlin.Array&lt;kotlin.String&gt;** |  |  [optional]
-**arrayArrayOfInteger** | **kotlin.Array&lt;kotlin.Array&lt;kotlin.Long&gt;&gt;** |  |  [optional]
-**arrayArrayOfModel** | **kotlin.Array&lt;kotlin.Array&lt;ReadOnlyFirst&gt;&gt;** |  |  [optional]
+**arrayOfString** | **kotlin.collections.List&lt;kotlin.String&gt;** |  |  [optional]
+**arrayArrayOfInteger** | **kotlin.collections.List&lt;kotlin.collections.List&lt;kotlin.Long&gt;&gt;** |  |  [optional]
+**arrayArrayOfModel** | **kotlin.collections.List&lt;kotlin.collections.List&lt;ReadOnlyFirst&gt;&gt;** |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/EnumArrays.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/EnumArrays.md
index 719084e5f949..c3c5e235bfed 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/EnumArrays.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **justSymbol** | [**inline**](#JustSymbolEnum) |  |  [optional]
-**arrayEnum** | [**inline**](#kotlin.Array&lt;ArrayEnumEnum&gt;) |  |  [optional]
+**arrayEnum** | [**inline**](#kotlin.collections.List&lt;ArrayEnumEnum&gt;) |  |  [optional]
 
 
 <a name="JustSymbolEnum"></a>
@@ -15,7 +15,7 @@ Name | Value
 justSymbol | &gt;&#x3D;, $
 
 
-<a name="kotlin.Array<ArrayEnumEnum>"></a>
+<a name="kotlin.collections.List<ArrayEnumEnum>"></a>
 ## Enum: array_enum
 Name | Value
 ---- | -----
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
index 2e4b0f90ffac..851d2f468215 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
@@ -527,13 +527,13 @@ To test enum parameters
 //import org.openapitools.client.models.*
 
 val apiInstance = FakeApi()
-val enumHeaderStringArray : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Header parameter enum test (string array)
+val enumHeaderStringArray : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Header parameter enum test (string array)
 val enumHeaderString : kotlin.String = enumHeaderString_example // kotlin.String | Header parameter enum test (string)
-val enumQueryStringArray : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Query parameter enum test (string array)
+val enumQueryStringArray : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Query parameter enum test (string array)
 val enumQueryString : kotlin.String = enumQueryString_example // kotlin.String | Query parameter enum test (string)
 val enumQueryInteger : kotlin.Int = 56 // kotlin.Int | Query parameter enum test (double)
 val enumQueryDouble : kotlin.Double = 1.2 // kotlin.Double | Query parameter enum test (double)
-val enumFormStringArray : kotlin.Array<kotlin.String> = enumFormStringArray_example // kotlin.Array<kotlin.String> | Form parameter enum test (string array)
+val enumFormStringArray : kotlin.collections.List<kotlin.String> = enumFormStringArray_example // kotlin.collections.List<kotlin.String> | Form parameter enum test (string array)
 val enumFormString : kotlin.String = enumFormString_example // kotlin.String | Form parameter enum test (string)
 try {
     apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
@@ -550,13 +550,13 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **enumHeaderStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
+ **enumHeaderStringArray** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
  **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
- **enumQueryStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
+ **enumQueryStringArray** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
  **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
  **enumQueryInteger** | **kotlin.Int**| Query parameter enum test (double) | [optional] [enum: 1, -2]
  **enumQueryDouble** | **kotlin.Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
- **enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &quot;$&quot;] [enum: >, $]
+ **enumFormStringArray** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &quot;$&quot;] [enum: >, $]
  **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
 
 ### Return type
@@ -735,11 +735,11 @@ To test the collection format in query parameters
 //import org.openapitools.client.models.*
 
 val apiInstance = FakeApi()
-val pipe : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
-val ioutil : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
-val http : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
-val url : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
-val context : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
+val pipe : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | 
+val ioutil : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | 
+val http : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | 
+val url : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | 
+val context : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | 
 try {
     apiInstance.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
 } catch (e: ClientException) {
@@ -755,11 +755,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pipe** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)|  |
- **ioutil** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)|  |
- **http** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)|  |
- **url** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)|  |
- **context** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)|  |
+ **pipe** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)|  |
+ **ioutil** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)|  |
+ **http** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)|  |
+ **url** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)|  |
+ **context** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)|  |
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FileSchemaTestClass.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FileSchemaTestClass.md
index d49a2b6e4457..1382ab8a7781 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FileSchemaTestClass.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FileSchemaTestClass.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **file** | [**org.openapitools.client.infrastructure.OctetByteArray**](org.openapitools.client.infrastructure.OctetByteArray.md) |  |  [optional]
-**files** | [**kotlin.Array&lt;org.openapitools.client.infrastructure.OctetByteArray&gt;**](org.openapitools.client.infrastructure.OctetByteArray.md) |  |  [optional]
+**files** | [**kotlin.collections.List&lt;org.openapitools.client.infrastructure.OctetByteArray&gt;**](org.openapitools.client.infrastructure.OctetByteArray.md) |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/InlineObject2.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/InlineObject2.md
index 0720925918bf..a98ffe031b3d 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/InlineObject2.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/InlineObject2.md
@@ -4,11 +4,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**enumFormStringArray** | [**inline**](#kotlin.Array&lt;EnumFormStringArrayEnum&gt;) | Form parameter enum test (string array) |  [optional]
+**enumFormStringArray** | [**inline**](#kotlin.collections.List&lt;EnumFormStringArrayEnum&gt;) | Form parameter enum test (string array) |  [optional]
 **enumFormString** | [**inline**](#EnumFormStringEnum) | Form parameter enum test (string) |  [optional]
 
 
-<a name="kotlin.Array<EnumFormStringArrayEnum>"></a>
+<a name="kotlin.collections.List<EnumFormStringArrayEnum>"></a>
 ## Enum: enum_form_string_array
 Name | Value
 ---- | -----
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/NullableClass.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/NullableClass.md
index c2813940f147..298b9f8fe8ef 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/NullableClass.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/NullableClass.md
@@ -10,9 +10,9 @@ Name | Type | Description | Notes
 **stringProp** | **kotlin.String** |  |  [optional]
 **dateProp** | **kotlin.String** |  |  [optional]
 **datetimeProp** | **kotlin.String** |  |  [optional]
-**arrayNullableProp** | **kotlin.Array&lt;kotlin.String&gt;** |  |  [optional]
-**arrayAndItemsNullableProp** | **kotlin.Array&lt;kotlin.String&gt;** |  |  [optional]
-**arrayItemsNullable** | **kotlin.Array&lt;kotlin.String&gt;** |  |  [optional]
+**arrayNullableProp** | **kotlin.collections.List&lt;kotlin.String&gt;** |  |  [optional]
+**arrayAndItemsNullableProp** | **kotlin.collections.List&lt;kotlin.String&gt;** |  |  [optional]
+**arrayItemsNullable** | **kotlin.collections.List&lt;kotlin.String&gt;** |  |  [optional]
 **objectNullableProp** | **kotlin.collections.Map&lt;kotlin.String, kotlin.String&gt;** |  |  [optional]
 **objectAndItemsNullableProp** | **kotlin.collections.Map&lt;kotlin.String, kotlin.String&gt;** |  |  [optional]
 **objectItemsNullable** | **kotlin.collections.Map&lt;kotlin.String, kotlin.String&gt;** |  |  [optional]
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/Pet.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/Pet.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/PetApi.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/PetApi.md
index a07ff10e9376..15761ec64f9c 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/PetApi.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/PetApi.md
@@ -111,7 +111,7 @@ Configure petstore_auth:
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
+> kotlin.collections.List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -124,9 +124,9 @@ Multiple status values can be provided with comma separated strings
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByStatus(status)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByStatus")
@@ -141,11 +141,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -160,7 +160,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -173,9 +173,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -190,11 +190,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/UserApi.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/UserApi.md
index dbf78e81eb22..543cbee5a390 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/UserApi.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val user : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(user)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **user** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val user : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(user)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **user** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/gradle/wrapper/gradle-wrapper.jar b/samples/openapi3/client/petstore/kotlin-multiplatform/gradle/wrapper/gradle-wrapper.jar
index 886ca115d4af..2c6137b87896 100644
Binary files a/samples/openapi3/client/petstore/kotlin-multiplatform/gradle/wrapper/gradle-wrapper.jar and b/samples/openapi3/client/petstore/kotlin-multiplatform/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
index 23f6e27e4892..2e6797008b4c 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
@@ -25,26 +25,26 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 class AnotherFakeApi @UseExperimental(UnstableDefault::class) constructor(
-        baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
-        httpClientEngine: HttpClientEngine? = null,
-        serializer: KotlinxSerializer)
-    : ApiClient(baseUrl, httpClientEngine, serializer) {
+    baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
+    httpClientEngine: HttpClientEngine? = null,
+    serializer: KotlinxSerializer
+) : ApiClient(baseUrl, httpClientEngine, serializer) {
 
     @UseExperimental(UnstableDefault::class)
     constructor(
         baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
         httpClientEngine: HttpClientEngine? = null,
-        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default)
-    : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
+        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default
+    ) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
 
     /**
-    * To test special tags
-    * To test special tags and operation ID starting with number
-    * @param client client model 
-    * @return Client
-    */
+     * To test special tags
+     * To test special tags and operation ID starting with number
+     * @param client client model 
+     * @return Client
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun call123testSpecialTags(client: Client) : HttpResponse<Client> {
+    suspend fun call123testSpecialTags(client: Client): HttpResponse<Client> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -68,7 +68,7 @@ class AnotherFakeApi @UseExperimental(UnstableDefault::class) constructor(
         ).wrap()
     }
 
-    
+
 
 
     companion object {
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt
index 6b0bae98cfb7..a9e9658507b7 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt
@@ -25,25 +25,25 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 class DefaultApi @UseExperimental(UnstableDefault::class) constructor(
-        baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
-        httpClientEngine: HttpClientEngine? = null,
-        serializer: KotlinxSerializer)
-    : ApiClient(baseUrl, httpClientEngine, serializer) {
+    baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
+    httpClientEngine: HttpClientEngine? = null,
+    serializer: KotlinxSerializer
+) : ApiClient(baseUrl, httpClientEngine, serializer) {
 
     @UseExperimental(UnstableDefault::class)
     constructor(
         baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
         httpClientEngine: HttpClientEngine? = null,
-        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default)
-    : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
+        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default
+    ) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
 
     /**
-    * 
-    * 
-    * @return InlineResponseDefault
-    */
+     * 
+     * 
+     * @return InlineResponseDefault
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun fooGet() : HttpResponse<InlineResponseDefault> {
+    suspend fun fooGet(): HttpResponse<InlineResponseDefault> {
 
         val localVariableAuthNames = listOf<String>()
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
index 0232be74fe15..d98ccb9adb01 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
@@ -30,25 +30,25 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 class FakeApi @UseExperimental(UnstableDefault::class) constructor(
-        baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
-        httpClientEngine: HttpClientEngine? = null,
-        serializer: KotlinxSerializer)
-    : ApiClient(baseUrl, httpClientEngine, serializer) {
+    baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
+    httpClientEngine: HttpClientEngine? = null,
+    serializer: KotlinxSerializer
+) : ApiClient(baseUrl, httpClientEngine, serializer) {
 
     @UseExperimental(UnstableDefault::class)
     constructor(
         baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
         httpClientEngine: HttpClientEngine? = null,
-        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default)
-    : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
+        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default
+    ) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
 
     /**
-    * Health check endpoint
-    * 
-    * @return HealthCheckResult
-    */
+     * Health check endpoint
+     * 
+     * @return HealthCheckResult
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun fakeHealthGet() : HttpResponse<HealthCheckResult> {
+    suspend fun fakeHealthGet(): HttpResponse<HealthCheckResult> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -75,14 +75,14 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
 
 
     /**
-    * test http signature authentication
-    * 
-    * @param pet Pet object that needs to be added to the store 
-    * @param query1 query parameter (optional)
-    * @param header1 header parameter (optional)
-    * @return void
-    */
-    suspend fun fakeHttpSignatureTest(pet: Pet, query1: kotlin.String?, header1: kotlin.String?) : HttpResponse<Unit> {
+     * test http signature authentication
+     * 
+     * @param pet Pet object that needs to be added to the store 
+     * @param query1 query parameter (optional)
+     * @param header1 header parameter (optional)
+     * @return void
+     */
+    suspend fun fakeHttpSignatureTest(pet: Pet, query1: kotlin.String?, header1: kotlin.String?): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>("http_signature_test")
 
@@ -108,16 +108,16 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
         ).wrap()
     }
 
-    
+
 
     /**
-    * 
-    * Test serialization of outer boolean types
-    * @param body Input boolean as post body (optional)
-    * @return kotlin.Boolean
-    */
+     * 
+     * Test serialization of outer boolean types
+     * @param body Input boolean as post body (optional)
+     * @return kotlin.Boolean
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun fakeOuterBooleanSerialize(body: kotlin.Boolean?) : HttpResponse<kotlin.Boolean> {
+    suspend fun fakeOuterBooleanSerialize(body: kotlin.Boolean?): HttpResponse<kotlin.Boolean> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -141,16 +141,16 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
         ).wrap()
     }
 
-    
+
 
     /**
-    * 
-    * Test serialization of object with outer number type
-    * @param outerComposite Input composite as post body (optional)
-    * @return OuterComposite
-    */
+     * 
+     * Test serialization of object with outer number type
+     * @param outerComposite Input composite as post body (optional)
+     * @return OuterComposite
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun fakeOuterCompositeSerialize(outerComposite: OuterComposite?) : HttpResponse<OuterComposite> {
+    suspend fun fakeOuterCompositeSerialize(outerComposite: OuterComposite?): HttpResponse<OuterComposite> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -174,16 +174,16 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
         ).wrap()
     }
 
-    
+
 
     /**
-    * 
-    * Test serialization of outer number types
-    * @param body Input number as post body (optional)
-    * @return kotlin.Double
-    */
+     * 
+     * Test serialization of outer number types
+     * @param body Input number as post body (optional)
+     * @return kotlin.Double
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun fakeOuterNumberSerialize(body: kotlin.Double?) : HttpResponse<kotlin.Double> {
+    suspend fun fakeOuterNumberSerialize(body: kotlin.Double?): HttpResponse<kotlin.Double> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -207,16 +207,16 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
         ).wrap()
     }
 
-    
+
 
     /**
-    * 
-    * Test serialization of outer string types
-    * @param body Input string as post body (optional)
-    * @return kotlin.String
-    */
+     * 
+     * Test serialization of outer string types
+     * @param body Input string as post body (optional)
+     * @return kotlin.String
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun fakeOuterStringSerialize(body: kotlin.String?) : HttpResponse<kotlin.String> {
+    suspend fun fakeOuterStringSerialize(body: kotlin.String?): HttpResponse<kotlin.String> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -240,15 +240,15 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
         ).wrap()
     }
 
-    
+
 
     /**
-    * 
-    * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-    * @param fileSchemaTestClass  
-    * @return void
-    */
-    suspend fun testBodyWithFileSchema(fileSchemaTestClass: FileSchemaTestClass) : HttpResponse<Unit> {
+     * 
+     * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+     * @param fileSchemaTestClass  
+     * @return void
+     */
+    suspend fun testBodyWithFileSchema(fileSchemaTestClass: FileSchemaTestClass): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -272,16 +272,16 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
         ).wrap()
     }
 
-    
+
 
     /**
-    * 
-    * 
-    * @param query  
-    * @param user  
-    * @return void
-    */
-    suspend fun testBodyWithQueryParams(query: kotlin.String, user: User) : HttpResponse<Unit> {
+     * 
+     * 
+     * @param query  
+     * @param user  
+     * @return void
+     */
+    suspend fun testBodyWithQueryParams(query: kotlin.String, user: User): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -306,16 +306,16 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
         ).wrap()
     }
 
-    
+
 
     /**
-    * To test \&quot;client\&quot; model
-    * To test \&quot;client\&quot; model
-    * @param client client model 
-    * @return Client
-    */
+     * To test \&quot;client\&quot; model
+     * To test \&quot;client\&quot; model
+     * @param client client model 
+     * @return Client
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun testClientModel(client: Client) : HttpResponse<Client> {
+    suspend fun testClientModel(client: Client): HttpResponse<Client> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -339,28 +339,28 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
         ).wrap()
     }
 
-    
+
 
     /**
-    * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    * @param number None 
-    * @param double None 
-    * @param patternWithoutDelimiter None 
-    * @param byte None 
-    * @param integer None (optional)
-    * @param int32 None (optional)
-    * @param int64 None (optional)
-    * @param float None (optional)
-    * @param string None (optional)
-    * @param binary None (optional)
-    * @param date None (optional)
-    * @param dateTime None (optional)
-    * @param password None (optional)
-    * @param paramCallback None (optional)
-    * @return void
-    */
-    suspend fun testEndpointParameters(number: kotlin.Double, double: kotlin.Double, patternWithoutDelimiter: kotlin.String, byte: org.openapitools.client.infrastructure.Base64ByteArray, integer: kotlin.Int?, int32: kotlin.Int?, int64: kotlin.Long?, float: kotlin.Float?, string: kotlin.String?, binary: io.ktor.client.request.forms.InputProvider?, date: kotlin.String?, dateTime: kotlin.String?, password: kotlin.String?, paramCallback: kotlin.String?) : HttpResponse<Unit> {
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * @param number None 
+     * @param double None 
+     * @param patternWithoutDelimiter None 
+     * @param byte None 
+     * @param integer None (optional)
+     * @param int32 None (optional)
+     * @param int64 None (optional)
+     * @param float None (optional)
+     * @param string None (optional)
+     * @param binary None (optional)
+     * @param date None (optional)
+     * @param dateTime None (optional)
+     * @param password None (optional)
+     * @param paramCallback None (optional)
+     * @return void
+     */
+    suspend fun testEndpointParameters(number: kotlin.Double, double: kotlin.Double, patternWithoutDelimiter: kotlin.String, byte: org.openapitools.client.infrastructure.Base64ByteArray, integer: kotlin.Int?, int32: kotlin.Int?, int64: kotlin.Long?, float: kotlin.Float?, string: kotlin.String?, binary: io.ktor.client.request.forms.InputProvider?, date: kotlin.String?, dateTime: kotlin.String?, password: kotlin.String?, paramCallback: kotlin.String?): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>("http_basic_test")
 
@@ -402,19 +402,19 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
 
 
     /**
-    * To test enum parameters
-    * To test enum parameters
-    * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
-    * @param enumHeaderString Header parameter enum test (string) (optional, default to "-efg")
-    * @param enumQueryStringArray Query parameter enum test (string array) (optional)
-    * @param enumQueryString Query parameter enum test (string) (optional, default to "-efg")
-    * @param enumQueryInteger Query parameter enum test (double) (optional)
-    * @param enumQueryDouble Query parameter enum test (double) (optional)
-    * @param enumFormStringArray Form parameter enum test (string array) (optional, default to "$")
-    * @param enumFormString Form parameter enum test (string) (optional, default to "-efg")
-    * @return void
-    */
-    suspend fun testEnumParameters(enumHeaderStringArray: kotlin.Array<kotlin.String>?, enumHeaderString: kotlin.String?, enumQueryStringArray: kotlin.Array<kotlin.String>?, enumQueryString: kotlin.String?, enumQueryInteger: kotlin.Int?, enumQueryDouble: kotlin.Double?, enumFormStringArray: kotlin.Array<kotlin.String>?, enumFormString: kotlin.String?) : HttpResponse<Unit> {
+     * To test enum parameters
+     * To test enum parameters
+     * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
+     * @param enumHeaderString Header parameter enum test (string) (optional, default to "-efg")
+     * @param enumQueryStringArray Query parameter enum test (string array) (optional)
+     * @param enumQueryString Query parameter enum test (string) (optional, default to "-efg")
+     * @param enumQueryInteger Query parameter enum test (double) (optional)
+     * @param enumQueryDouble Query parameter enum test (double) (optional)
+     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to "$")
+     * @param enumFormString Form parameter enum test (string) (optional, default to "-efg")
+     * @return void
+     */
+    suspend fun testEnumParameters(enumHeaderStringArray: kotlin.collections.List<kotlin.String>?, enumHeaderString: kotlin.String?, enumQueryStringArray: kotlin.collections.List<kotlin.String>?, enumQueryString: kotlin.String?, enumQueryInteger: kotlin.Int?, enumQueryDouble: kotlin.Double?, enumFormStringArray: kotlin.collections.List<kotlin.String>?, enumFormString: kotlin.String?): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -450,17 +450,17 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
 
 
     /**
-    * Fake endpoint to test group parameters (optional)
-    * Fake endpoint to test group parameters (optional)
-    * @param requiredStringGroup Required String in group parameters 
-    * @param requiredBooleanGroup Required Boolean in group parameters 
-    * @param requiredInt64Group Required Integer in group parameters 
-    * @param stringGroup String in group parameters (optional)
-    * @param booleanGroup Boolean in group parameters (optional)
-    * @param int64Group Integer in group parameters (optional)
-    * @return void
-    */
-    suspend fun testGroupParameters(requiredStringGroup: kotlin.Int, requiredBooleanGroup: kotlin.Boolean, requiredInt64Group: kotlin.Long, stringGroup: kotlin.Int?, booleanGroup: kotlin.Boolean?, int64Group: kotlin.Long?) : HttpResponse<Unit> {
+     * Fake endpoint to test group parameters (optional)
+     * Fake endpoint to test group parameters (optional)
+     * @param requiredStringGroup Required String in group parameters 
+     * @param requiredBooleanGroup Required Boolean in group parameters 
+     * @param requiredInt64Group Required Integer in group parameters 
+     * @param stringGroup String in group parameters (optional)
+     * @param booleanGroup Boolean in group parameters (optional)
+     * @param int64Group Integer in group parameters (optional)
+     * @return void
+     */
+    suspend fun testGroupParameters(requiredStringGroup: kotlin.Int, requiredBooleanGroup: kotlin.Boolean, requiredInt64Group: kotlin.Long, stringGroup: kotlin.Int?, booleanGroup: kotlin.Boolean?, int64Group: kotlin.Long?): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>("bearer_test")
 
@@ -493,12 +493,12 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
 
 
     /**
-    * test inline additionalProperties
-    * 
-    * @param requestBody request body 
-    * @return void
-    */
-    suspend fun testInlineAdditionalProperties(requestBody: kotlin.collections.Map<kotlin.String, kotlin.String>) : HttpResponse<Unit> {
+     * test inline additionalProperties
+     * 
+     * @param requestBody request body 
+     * @return void
+     */
+    suspend fun testInlineAdditionalProperties(requestBody: kotlin.collections.Map<kotlin.String, kotlin.String>): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -523,24 +523,24 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
     }
 
     @Serializable
-private class TestInlineAdditionalPropertiesRequest(val value: Map<kotlin.String, kotlin.String>) {
-    @Serializer(TestInlineAdditionalPropertiesRequest::class)
-    companion object : KSerializer<TestInlineAdditionalPropertiesRequest> {
-        private val serializer: KSerializer<Map<kotlin.String, kotlin.String>> = (kotlin.String.serializer() to kotlin.String.serializer()).map
-            override val descriptor = StringDescriptor.withName("TestInlineAdditionalPropertiesRequest")
-            override fun serialize(encoder: Encoder, obj: TestInlineAdditionalPropertiesRequest) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = TestInlineAdditionalPropertiesRequest(serializer.deserialize(decoder))
+    private class TestInlineAdditionalPropertiesRequest(val value: Map<kotlin.String, kotlin.String>) {
+        @Serializer(TestInlineAdditionalPropertiesRequest::class)
+        companion object : KSerializer<TestInlineAdditionalPropertiesRequest> {
+            private val serializer: KSerializer<Map<kotlin.String, kotlin.String>> = (kotlin.String.serializer() to kotlin.String.serializer()).map
+                override val descriptor = StringDescriptor.withName("TestInlineAdditionalPropertiesRequest")
+                override fun serialize(encoder: Encoder, obj: TestInlineAdditionalPropertiesRequest) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = TestInlineAdditionalPropertiesRequest(serializer.deserialize(decoder))
+        }
     }
-}
 
     /**
-    * test json serialization of form data
-    * 
-    * @param param field1 
-    * @param param2 field2 
-    * @return void
-    */
-    suspend fun testJsonFormData(param: kotlin.String, param2: kotlin.String) : HttpResponse<Unit> {
+     * test json serialization of form data
+     * 
+     * @param param field1 
+     * @param param2 field2 
+     * @return void
+     */
+    suspend fun testJsonFormData(param: kotlin.String, param2: kotlin.String): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -570,16 +570,16 @@ private class TestInlineAdditionalPropertiesRequest(val value: Map<kotlin.String
 
 
     /**
-    * 
-    * To test the collection format in query parameters
-    * @param pipe  
-    * @param ioutil  
-    * @param http  
-    * @param url  
-    * @param context  
-    * @return void
-    */
-    suspend fun testQueryParameterCollectionFormat(pipe: kotlin.Array<kotlin.String>, ioutil: kotlin.Array<kotlin.String>, http: kotlin.Array<kotlin.String>, url: kotlin.Array<kotlin.String>, context: kotlin.Array<kotlin.String>) : HttpResponse<Unit> {
+     * 
+     * To test the collection format in query parameters
+     * @param pipe  
+     * @param ioutil  
+     * @param http  
+     * @param url  
+     * @param context  
+     * @return void
+     */
+    suspend fun testQueryParameterCollectionFormat(pipe: kotlin.collections.List<kotlin.String>, ioutil: kotlin.collections.List<kotlin.String>, http: kotlin.collections.List<kotlin.String>, url: kotlin.collections.List<kotlin.String>, context: kotlin.collections.List<kotlin.String>): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -589,7 +589,7 @@ private class TestInlineAdditionalPropertiesRequest(val value: Map<kotlin.String
         val localVariableQuery = mutableMapOf<String, List<String>>()
         pipe?.apply { localVariableQuery["pipe"] = toMultiValue(this, "multi") }
         ioutil?.apply { localVariableQuery["ioutil"] = toMultiValue(this, "csv") }
-        http?.apply { localVariableQuery["http"] = toMultiValue(this, "space") }
+        http?.apply { localVariableQuery["http"] = toMultiValue(this, "ssv") }
         url?.apply { localVariableQuery["url"] = toMultiValue(this, "csv") }
         context?.apply { localVariableQuery["context"] = toMultiValue(this, "multi") }
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
index 489ad0faf759..6c49f08b014c 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
@@ -25,26 +25,26 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 class FakeClassnameTags123Api @UseExperimental(UnstableDefault::class) constructor(
-        baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
-        httpClientEngine: HttpClientEngine? = null,
-        serializer: KotlinxSerializer)
-    : ApiClient(baseUrl, httpClientEngine, serializer) {
+    baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
+    httpClientEngine: HttpClientEngine? = null,
+    serializer: KotlinxSerializer
+) : ApiClient(baseUrl, httpClientEngine, serializer) {
 
     @UseExperimental(UnstableDefault::class)
     constructor(
         baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
         httpClientEngine: HttpClientEngine? = null,
-        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default)
-    : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
+        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default
+    ) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
 
     /**
-    * To test class name in snake case
-    * To test class name in snake case
-    * @param client client model 
-    * @return Client
-    */
+     * To test class name in snake case
+     * To test class name in snake case
+     * @param client client model 
+     * @return Client
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun testClassname(client: Client) : HttpResponse<Client> {
+    suspend fun testClassname(client: Client): HttpResponse<Client> {
 
         val localVariableAuthNames = listOf<String>("api_key_query")
 
@@ -68,7 +68,7 @@ class FakeClassnameTags123Api @UseExperimental(UnstableDefault::class) construct
         ).wrap()
     }
 
-    
+
 
 
     companion object {
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
index 19afc14b59ef..f282ca25696d 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -26,25 +26,25 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 class PetApi @UseExperimental(UnstableDefault::class) constructor(
-        baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
-        httpClientEngine: HttpClientEngine? = null,
-        serializer: KotlinxSerializer)
-    : ApiClient(baseUrl, httpClientEngine, serializer) {
+    baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
+    httpClientEngine: HttpClientEngine? = null,
+    serializer: KotlinxSerializer
+) : ApiClient(baseUrl, httpClientEngine, serializer) {
 
     @UseExperimental(UnstableDefault::class)
     constructor(
         baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
         httpClientEngine: HttpClientEngine? = null,
-        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default)
-    : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
+        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default
+    ) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
 
     /**
-    * Add a new pet to the store
-    * 
-    * @param pet Pet object that needs to be added to the store 
-    * @return void
-    */
-    suspend fun addPet(pet: Pet) : HttpResponse<Unit> {
+     * Add a new pet to the store
+     * 
+     * @param pet Pet object that needs to be added to the store 
+     * @return void
+     */
+    suspend fun addPet(pet: Pet): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -68,16 +68,16 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
         ).wrap()
     }
 
-    
+
 
     /**
-    * Deletes a pet
-    * 
-    * @param petId Pet id to delete 
-    * @param apiKey  (optional)
-    * @return void
-    */
-    suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : HttpResponse<Unit> {
+     * Deletes a pet
+     * 
+     * @param petId Pet id to delete 
+     * @param apiKey  (optional)
+     * @return void
+     */
+    suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -91,7 +91,7 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
 
         val localVariableConfig = RequestConfig(
             RequestMethod.DELETE,
-            "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            "/pet/{petId}".replace("{" + "petId" + "}", "$petId"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -105,13 +105,13 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
 
 
     /**
-    * Finds Pets by status
-    * Multiple status values can be provided with comma separated strings
-    * @param status Status values that need to be considered for filter 
-    * @return kotlin.Array<Pet>
-    */
+     * Finds Pets by status
+     * Multiple status values can be provided with comma separated strings
+     * @param status Status values that need to be considered for filter 
+     * @return kotlin.collections.List<Pet>
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun findPetsByStatus(status: kotlin.Array<kotlin.String>) : HttpResponse<kotlin.Array<Pet>> {
+    suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>): HttpResponse<kotlin.collections.List<Pet>> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -134,28 +134,28 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
             localVariableConfig,
             localVariableBody,
             localVariableAuthNames
-        ).wrap<FindPetsByStatusResponse>().map { value.toTypedArray() }
+        ).wrap<FindPetsByStatusResponse>().map { value }
     }
 
     @Serializable
-private class FindPetsByStatusResponse(val value: List<Pet>) {
-    @Serializer(FindPetsByStatusResponse::class)
-    companion object : KSerializer<FindPetsByStatusResponse> {
-        private val serializer: KSerializer<List<Pet>> = Pet.serializer().list
-            override val descriptor = StringDescriptor.withName("FindPetsByStatusResponse")
-            override fun serialize(encoder: Encoder, obj: FindPetsByStatusResponse) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = FindPetsByStatusResponse(serializer.deserialize(decoder))
+    private class FindPetsByStatusResponse(val value: List<Pet>) {
+        @Serializer(FindPetsByStatusResponse::class)
+        companion object : KSerializer<FindPetsByStatusResponse> {
+            private val serializer: KSerializer<List<Pet>> = Pet.serializer().list
+                override val descriptor = StringDescriptor.withName("FindPetsByStatusResponse")
+                override fun serialize(encoder: Encoder, obj: FindPetsByStatusResponse) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = FindPetsByStatusResponse(serializer.deserialize(decoder))
+        }
     }
-}
 
     /**
-    * Finds Pets by tags
-    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-    * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet>
-    */
+     * Finds Pets by tags
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * @param tags Tags to filter by 
+     * @return kotlin.collections.List<Pet>
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : HttpResponse<kotlin.Array<Pet>> {
+    suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>): HttpResponse<kotlin.collections.List<Pet>> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -178,28 +178,28 @@ private class FindPetsByStatusResponse(val value: List<Pet>) {
             localVariableConfig,
             localVariableBody,
             localVariableAuthNames
-        ).wrap<FindPetsByTagsResponse>().map { value.toTypedArray() }
+        ).wrap<FindPetsByTagsResponse>().map { value }
     }
 
     @Serializable
-private class FindPetsByTagsResponse(val value: List<Pet>) {
-    @Serializer(FindPetsByTagsResponse::class)
-    companion object : KSerializer<FindPetsByTagsResponse> {
-        private val serializer: KSerializer<List<Pet>> = Pet.serializer().list
-            override val descriptor = StringDescriptor.withName("FindPetsByTagsResponse")
-            override fun serialize(encoder: Encoder, obj: FindPetsByTagsResponse) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = FindPetsByTagsResponse(serializer.deserialize(decoder))
+    private class FindPetsByTagsResponse(val value: List<Pet>) {
+        @Serializer(FindPetsByTagsResponse::class)
+        companion object : KSerializer<FindPetsByTagsResponse> {
+            private val serializer: KSerializer<List<Pet>> = Pet.serializer().list
+                override val descriptor = StringDescriptor.withName("FindPetsByTagsResponse")
+                override fun serialize(encoder: Encoder, obj: FindPetsByTagsResponse) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = FindPetsByTagsResponse(serializer.deserialize(decoder))
+        }
     }
-}
 
     /**
-    * Find pet by ID
-    * Returns a single pet
-    * @param petId ID of pet to return 
-    * @return Pet
-    */
+     * Find pet by ID
+     * Returns a single pet
+     * @param petId ID of pet to return 
+     * @return Pet
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun getPetById(petId: kotlin.Long) : HttpResponse<Pet> {
+    suspend fun getPetById(petId: kotlin.Long): HttpResponse<Pet> {
 
         val localVariableAuthNames = listOf<String>("api_key")
 
@@ -212,7 +212,7 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.GET,
-            "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            "/pet/{petId}".replace("{" + "petId" + "}", "$petId"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -226,12 +226,12 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
 
 
     /**
-    * Update an existing pet
-    * 
-    * @param pet Pet object that needs to be added to the store 
-    * @return void
-    */
-    suspend fun updatePet(pet: Pet) : HttpResponse<Unit> {
+     * Update an existing pet
+     * 
+     * @param pet Pet object that needs to be added to the store 
+     * @return void
+     */
+    suspend fun updatePet(pet: Pet): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -255,17 +255,17 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
         ).wrap()
     }
 
-    
+
 
     /**
-    * Updates a pet in the store with form data
-    * 
-    * @param petId ID of pet that needs to be updated 
-    * @param name Updated name of the pet (optional)
-    * @param status Updated status of the pet (optional)
-    * @return void
-    */
-    suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : HttpResponse<Unit> {
+     * Updates a pet in the store with form data
+     * 
+     * @param petId ID of pet that needs to be updated 
+     * @param name Updated name of the pet (optional)
+     * @param status Updated status of the pet (optional)
+     * @return void
+     */
+    suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -281,7 +281,7 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.POST,
-            "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            "/pet/{petId}".replace("{" + "petId" + "}", "$petId"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -295,15 +295,15 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
 
 
     /**
-    * uploads an image
-    * 
-    * @param petId ID of pet to update 
-    * @param additionalMetadata Additional data to pass to server (optional)
-    * @param file file to upload (optional)
-    * @return ApiResponse
-    */
+     * uploads an image
+     * 
+     * @param petId ID of pet to update 
+     * @param additionalMetadata Additional data to pass to server (optional)
+     * @param file file to upload (optional)
+     * @return ApiResponse
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: io.ktor.client.request.forms.InputProvider?) : HttpResponse<ApiResponse> {
+    suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: io.ktor.client.request.forms.InputProvider?): HttpResponse<ApiResponse> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -319,7 +319,7 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.POST,
-            "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
+            "/pet/{petId}/uploadImage".replace("{" + "petId" + "}", "$petId"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -333,15 +333,15 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
 
 
     /**
-    * uploads an image (required)
-    * 
-    * @param petId ID of pet to update 
-    * @param requiredFile file to upload 
-    * @param additionalMetadata Additional data to pass to server (optional)
-    * @return ApiResponse
-    */
+     * uploads an image (required)
+     * 
+     * @param petId ID of pet to update 
+     * @param requiredFile file to upload 
+     * @param additionalMetadata Additional data to pass to server (optional)
+     * @return ApiResponse
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun uploadFileWithRequiredFile(petId: kotlin.Long, requiredFile: io.ktor.client.request.forms.InputProvider, additionalMetadata: kotlin.String?) : HttpResponse<ApiResponse> {
+    suspend fun uploadFileWithRequiredFile(petId: kotlin.Long, requiredFile: io.ktor.client.request.forms.InputProvider, additionalMetadata: kotlin.String?): HttpResponse<ApiResponse> {
 
         val localVariableAuthNames = listOf<String>("petstore_auth")
 
@@ -357,7 +357,7 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.POST,
-            "/fake/{petId}/uploadImageWithRequiredFile".replace("{"+"petId"+"}", "$petId"),
+            "/fake/{petId}/uploadImageWithRequiredFile".replace("{" + "petId" + "}", "$petId"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
index 5085e5f42fd5..01211e213d19 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -25,25 +25,25 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 class StoreApi @UseExperimental(UnstableDefault::class) constructor(
-        baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
-        httpClientEngine: HttpClientEngine? = null,
-        serializer: KotlinxSerializer)
-    : ApiClient(baseUrl, httpClientEngine, serializer) {
+    baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
+    httpClientEngine: HttpClientEngine? = null,
+    serializer: KotlinxSerializer
+) : ApiClient(baseUrl, httpClientEngine, serializer) {
 
     @UseExperimental(UnstableDefault::class)
     constructor(
         baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
         httpClientEngine: HttpClientEngine? = null,
-        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default)
-    : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
+        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default
+    ) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
 
     /**
-    * Delete purchase order by ID
-    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-    * @param orderId ID of the order that needs to be deleted 
-    * @return void
-    */
-    suspend fun deleteOrder(orderId: kotlin.String) : HttpResponse<Unit> {
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * @param orderId ID of the order that needs to be deleted 
+     * @return void
+     */
+    suspend fun deleteOrder(orderId: kotlin.String): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -56,7 +56,7 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
 
         val localVariableConfig = RequestConfig(
             RequestMethod.DELETE,
-            "/store/order/{order_id}".replace("{"+"order_id"+"}", "$orderId"),
+            "/store/order/{order_id}".replace("{" + "order_id" + "}", "$orderId"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -70,12 +70,12 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
 
 
     /**
-    * Returns pet inventories by status
-    * Returns a map of status codes to quantities
-    * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
-    */
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun getInventory() : HttpResponse<kotlin.collections.Map<kotlin.String, kotlin.Int>> {
+    suspend fun getInventory(): HttpResponse<kotlin.collections.Map<kotlin.String, kotlin.Int>> {
 
         val localVariableAuthNames = listOf<String>("api_key")
 
@@ -101,24 +101,24 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
     }
 
     @Serializable
-private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
-    @Serializer(GetInventoryResponse::class)
-    companion object : KSerializer<GetInventoryResponse> {
-        private val serializer: KSerializer<Map<kotlin.String, kotlin.Int>> = (kotlin.String.serializer() to kotlin.Int.serializer()).map
-            override val descriptor = StringDescriptor.withName("GetInventoryResponse")
-            override fun serialize(encoder: Encoder, obj: GetInventoryResponse) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = GetInventoryResponse(serializer.deserialize(decoder))
+    private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
+        @Serializer(GetInventoryResponse::class)
+        companion object : KSerializer<GetInventoryResponse> {
+            private val serializer: KSerializer<Map<kotlin.String, kotlin.Int>> = (kotlin.String.serializer() to kotlin.Int.serializer()).map
+                override val descriptor = StringDescriptor.withName("GetInventoryResponse")
+                override fun serialize(encoder: Encoder, obj: GetInventoryResponse) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = GetInventoryResponse(serializer.deserialize(decoder))
+        }
     }
-}
 
     /**
-    * Find purchase order by ID
-    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-    * @param orderId ID of pet that needs to be fetched 
-    * @return Order
-    */
+     * Find purchase order by ID
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * @param orderId ID of pet that needs to be fetched 
+     * @return Order
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun getOrderById(orderId: kotlin.Long) : HttpResponse<Order> {
+    suspend fun getOrderById(orderId: kotlin.Long): HttpResponse<Order> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -131,7 +131,7 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.GET,
-            "/store/order/{order_id}".replace("{"+"order_id"+"}", "$orderId"),
+            "/store/order/{order_id}".replace("{" + "order_id" + "}", "$orderId"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -145,13 +145,13 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
 
 
     /**
-    * Place an order for a pet
-    * 
-    * @param order order placed for purchasing the pet 
-    * @return Order
-    */
+     * Place an order for a pet
+     * 
+     * @param order order placed for purchasing the pet 
+     * @return Order
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun placeOrder(order: Order) : HttpResponse<Order> {
+    suspend fun placeOrder(order: Order): HttpResponse<Order> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -175,7 +175,7 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
         ).wrap()
     }
 
-    
+
 
 
     companion object {
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
index 877dc28b2309..19bfb382876a 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -25,25 +25,25 @@ import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 
 class UserApi @UseExperimental(UnstableDefault::class) constructor(
-        baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
-        httpClientEngine: HttpClientEngine? = null,
-        serializer: KotlinxSerializer)
-    : ApiClient(baseUrl, httpClientEngine, serializer) {
+    baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
+    httpClientEngine: HttpClientEngine? = null,
+    serializer: KotlinxSerializer
+) : ApiClient(baseUrl, httpClientEngine, serializer) {
 
     @UseExperimental(UnstableDefault::class)
     constructor(
         baseUrl: kotlin.String = "http://petstore.swagger.io:80/v2",
         httpClientEngine: HttpClientEngine? = null,
-        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default)
-    : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
+        jsonConfiguration: JsonConfiguration = JsonConfiguration.Default
+    ) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration)))
 
     /**
-    * Create user
-    * This can only be done by the logged in user.
-    * @param user Created user object 
-    * @return void
-    */
-    suspend fun createUser(user: User) : HttpResponse<Unit> {
+     * Create user
+     * This can only be done by the logged in user.
+     * @param user Created user object 
+     * @return void
+     */
+    suspend fun createUser(user: User): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -67,19 +67,19 @@ class UserApi @UseExperimental(UnstableDefault::class) constructor(
         ).wrap()
     }
 
-    
+
 
     /**
-    * Creates list of users with given input array
-    * 
-    * @param user List of user object 
-    * @return void
-    */
-    suspend fun createUsersWithArrayInput(user: kotlin.Array<User>) : HttpResponse<Unit> {
+     * Creates list of users with given input array
+     * 
+     * @param user List of user object 
+     * @return void
+     */
+    suspend fun createUsersWithArrayInput(user: kotlin.collections.List<User>): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
-        val localVariableBody = CreateUsersWithArrayInputRequest(user.asList())
+        val localVariableBody = CreateUsersWithArrayInputRequest(user)
 
         val localVariableQuery = mutableMapOf<String, List<String>>()
 
@@ -100,27 +100,27 @@ class UserApi @UseExperimental(UnstableDefault::class) constructor(
     }
 
     @Serializable
-private class CreateUsersWithArrayInputRequest(val value: List<User>) {
-    @Serializer(CreateUsersWithArrayInputRequest::class)
-    companion object : KSerializer<CreateUsersWithArrayInputRequest> {
-        private val serializer: KSerializer<List<User>> = User.serializer().list
-            override val descriptor = StringDescriptor.withName("CreateUsersWithArrayInputRequest")
-            override fun serialize(encoder: Encoder, obj: CreateUsersWithArrayInputRequest) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = CreateUsersWithArrayInputRequest(serializer.deserialize(decoder))
+    private class CreateUsersWithArrayInputRequest(val value: List<User>) {
+        @Serializer(CreateUsersWithArrayInputRequest::class)
+        companion object : KSerializer<CreateUsersWithArrayInputRequest> {
+            private val serializer: KSerializer<List<User>> = User.serializer().list
+                override val descriptor = StringDescriptor.withName("CreateUsersWithArrayInputRequest")
+                override fun serialize(encoder: Encoder, obj: CreateUsersWithArrayInputRequest) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = CreateUsersWithArrayInputRequest(serializer.deserialize(decoder))
+        }
     }
-}
 
     /**
-    * Creates list of users with given input array
-    * 
-    * @param user List of user object 
-    * @return void
-    */
-    suspend fun createUsersWithListInput(user: kotlin.Array<User>) : HttpResponse<Unit> {
+     * Creates list of users with given input array
+     * 
+     * @param user List of user object 
+     * @return void
+     */
+    suspend fun createUsersWithListInput(user: kotlin.collections.List<User>): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
-        val localVariableBody = CreateUsersWithListInputRequest(user.asList())
+        val localVariableBody = CreateUsersWithListInputRequest(user)
 
         val localVariableQuery = mutableMapOf<String, List<String>>()
 
@@ -141,23 +141,23 @@ private class CreateUsersWithArrayInputRequest(val value: List<User>) {
     }
 
     @Serializable
-private class CreateUsersWithListInputRequest(val value: List<User>) {
-    @Serializer(CreateUsersWithListInputRequest::class)
-    companion object : KSerializer<CreateUsersWithListInputRequest> {
-        private val serializer: KSerializer<List<User>> = User.serializer().list
-            override val descriptor = StringDescriptor.withName("CreateUsersWithListInputRequest")
-            override fun serialize(encoder: Encoder, obj: CreateUsersWithListInputRequest) = serializer.serialize(encoder, obj.value)
-            override fun deserialize(decoder: Decoder) = CreateUsersWithListInputRequest(serializer.deserialize(decoder))
+    private class CreateUsersWithListInputRequest(val value: List<User>) {
+        @Serializer(CreateUsersWithListInputRequest::class)
+        companion object : KSerializer<CreateUsersWithListInputRequest> {
+            private val serializer: KSerializer<List<User>> = User.serializer().list
+                override val descriptor = StringDescriptor.withName("CreateUsersWithListInputRequest")
+                override fun serialize(encoder: Encoder, obj: CreateUsersWithListInputRequest) = serializer.serialize(encoder, obj.value)
+                override fun deserialize(decoder: Decoder) = CreateUsersWithListInputRequest(serializer.deserialize(decoder))
+        }
     }
-}
 
     /**
-    * Delete user
-    * This can only be done by the logged in user.
-    * @param username The name that needs to be deleted 
-    * @return void
-    */
-    suspend fun deleteUser(username: kotlin.String) : HttpResponse<Unit> {
+     * Delete user
+     * This can only be done by the logged in user.
+     * @param username The name that needs to be deleted 
+     * @return void
+     */
+    suspend fun deleteUser(username: kotlin.String): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -170,7 +170,7 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.DELETE,
-            "/user/{username}".replace("{"+"username"+"}", "$username"),
+            "/user/{username}".replace("{" + "username" + "}", "$username"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -184,13 +184,13 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
 
     /**
-    * Get user by user name
-    * 
-    * @param username The name that needs to be fetched. Use user1 for testing. 
-    * @return User
-    */
+     * Get user by user name
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing. 
+     * @return User
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun getUserByName(username: kotlin.String) : HttpResponse<User> {
+    suspend fun getUserByName(username: kotlin.String): HttpResponse<User> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -203,7 +203,7 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.GET,
-            "/user/{username}".replace("{"+"username"+"}", "$username"),
+            "/user/{username}".replace("{" + "username" + "}", "$username"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -217,14 +217,14 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
 
     /**
-    * Logs user into the system
-    * 
-    * @param username The user name for login 
-    * @param password The password for login in clear text 
-    * @return kotlin.String
-    */
+     * Logs user into the system
+     * 
+     * @param username The user name for login 
+     * @param password The password for login in clear text 
+     * @return kotlin.String
+     */
     @Suppress("UNCHECKED_CAST")
-    suspend fun loginUser(username: kotlin.String, password: kotlin.String) : HttpResponse<kotlin.String> {
+    suspend fun loginUser(username: kotlin.String, password: kotlin.String): HttpResponse<kotlin.String> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -253,11 +253,11 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
 
     /**
-    * Logs out current logged in user session
-    * 
-    * @return void
-    */
-    suspend fun logoutUser() : HttpResponse<Unit> {
+     * Logs out current logged in user session
+     * 
+     * @return void
+     */
+    suspend fun logoutUser(): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -284,13 +284,13 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
 
     /**
-    * Updated user
-    * This can only be done by the logged in user.
-    * @param username name that need to be deleted 
-    * @param user Updated user object 
-    * @return void
-    */
-    suspend fun updateUser(username: kotlin.String, user: User) : HttpResponse<Unit> {
+     * Updated user
+     * This can only be done by the logged in user.
+     * @param username name that need to be deleted 
+     * @param user Updated user object 
+     * @return void
+     */
+    suspend fun updateUser(username: kotlin.String, user: User): HttpResponse<Unit> {
 
         val localVariableAuthNames = listOf<String>()
 
@@ -302,7 +302,7 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
 
         val localVariableConfig = RequestConfig(
             RequestMethod.PUT,
-            "/user/{username}".replace("{"+"username"+"}", "$username"),
+            "/user/{username}".replace("{" + "username" + "}", "$username"),
             query = localVariableQuery,
             headers = localVariableHeaders
         )
@@ -314,7 +314,7 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
         ).wrap()
     }
 
-    
+
 
 
     companion object {
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
index ecc2051d2c70..2db48aefd067 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param mapProperty 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Animal.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Animal.kt
index 9fe4ece02dd5..6be77ea17679 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Animal.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Animal.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
index 805244a3762e..bdbd6d53470a 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param code 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
index 587082fae3d0..b21afdde1ef9 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
@@ -14,12 +14,13 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param arrayArrayNumber 
  */
 @Serializable
 data class ArrayOfArrayOfNumberOnly (
-    @SerialName(value = "ArrayArrayNumber") val arrayArrayNumber: kotlin.Array<kotlin.Array<kotlin.Double>>? = null
+    @SerialName(value = "ArrayArrayNumber") val arrayArrayNumber: kotlin.collections.List<kotlin.collections.List<kotlin.Double>>? = null
 )
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
index 205c7e725e26..cee5642e8b30 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
@@ -14,12 +14,13 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param arrayNumber 
  */
 @Serializable
 data class ArrayOfNumberOnly (
-    @SerialName(value = "ArrayNumber") val arrayNumber: kotlin.Array<kotlin.Double>? = null
+    @SerialName(value = "ArrayNumber") val arrayNumber: kotlin.collections.List<kotlin.Double>? = null
 )
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayTest.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayTest.kt
index e4d9e1040627..b5abe733d032 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayTest.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.ReadOnlyFirst
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param arrayOfString 
@@ -23,8 +24,8 @@ import kotlinx.serialization.internal.CommonEnumSerializer
  */
 @Serializable
 data class ArrayTest (
-    @SerialName(value = "array_of_string") val arrayOfString: kotlin.Array<kotlin.String>? = null,
-    @SerialName(value = "array_array_of_integer") val arrayArrayOfInteger: kotlin.Array<kotlin.Array<kotlin.Long>>? = null,
-    @SerialName(value = "array_array_of_model") val arrayArrayOfModel: kotlin.Array<kotlin.Array<ReadOnlyFirst>>? = null
+    @SerialName(value = "array_of_string") val arrayOfString: kotlin.collections.List<kotlin.String>? = null,
+    @SerialName(value = "array_array_of_integer") val arrayArrayOfInteger: kotlin.collections.List<kotlin.collections.List<kotlin.Long>>? = null,
+    @SerialName(value = "array_array_of_model") val arrayArrayOfModel: kotlin.collections.List<kotlin.collections.List<ReadOnlyFirst>>? = null
 )
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Capitalization.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Capitalization.kt
index e960d48879e7..91c96776a83b 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Capitalization.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Capitalization.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param smallCamel 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Cat.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Cat.kt
index 42c192b93028..fc81b666b9ca 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Cat.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Cat.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.CatAllOf
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/CatAllOf.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/CatAllOf.kt
index d7a72badbcdf..0288fffacfad 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/CatAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/CatAllOf.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param declawed 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
index 6fb58ac646ed..bf0ff1dde78d 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ClassModel.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ClassModel.kt
index c4ea808d23a5..04f41b9abc09 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ClassModel.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ClassModel.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * Model for testing model with \"_class\" property
  * @param propertyClass 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Client.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Client.kt
index 30d316bd7064..4d47536b0205 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Client.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Client.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param client 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Dog.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Dog.kt
index 360f985d7553..74600f309afd 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Dog.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Dog.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.DogAllOf
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/DogAllOf.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/DogAllOf.kt
index 6e18a5729e29..5371db58c816 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/DogAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/DogAllOf.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param breed 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumArrays.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumArrays.kt
index b9598fb80a56..aa8cea194b12 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumArrays.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumArrays.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param justSymbol 
@@ -22,7 +23,7 @@ import kotlinx.serialization.internal.CommonEnumSerializer
 @Serializable
 data class EnumArrays (
     @SerialName(value = "just_symbol") val justSymbol: EnumArrays.JustSymbol? = null,
-    @SerialName(value = "array_enum") val arrayEnum: kotlin.Array<EnumArrays.ArrayEnum>? = null
+    @SerialName(value = "array_enum") val arrayEnum: kotlin.collections.List<EnumArrays.ArrayEnum>? = null
 ) {
 
     /**
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumTest.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumTest.kt
index 4f1a77e06b94..71b096a97c12 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumTest.kt
@@ -18,6 +18,7 @@ import org.openapitools.client.models.OuterEnumIntegerDefaultValue
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param enumStringRequired 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
index 4d09277f9537..eb03badda55e 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param file 
@@ -22,6 +23,6 @@ import kotlinx.serialization.internal.CommonEnumSerializer
 @Serializable
 data class FileSchemaTestClass (
     @SerialName(value = "file") val file: org.openapitools.client.infrastructure.OctetByteArray? = null,
-    @SerialName(value = "files") val files: kotlin.Array<org.openapitools.client.infrastructure.OctetByteArray>? = null
+    @SerialName(value = "files") val files: kotlin.collections.List<org.openapitools.client.infrastructure.OctetByteArray>? = null
 )
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Foo.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Foo.kt
index f208e3add1d1..0b74ad63fa12 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Foo.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Foo.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FormatTest.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FormatTest.kt
index 1d87f25126d8..ed2e0e2eec2a 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FormatTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FormatTest.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param number 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
index 617c8a98b847..fc6f88a3ae3c 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HealthCheckResult.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HealthCheckResult.kt
index 6524d535ce07..0c8d7249bfbc 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HealthCheckResult.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
  * @param nullableMessage 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject.kt
index 787f859549fa..989a2484297f 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param name Updated name of the pet
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject1.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject1.kt
index bf299be4274e..dfaee54885f9 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject1.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject1.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param additionalMetadata Additional data to pass to server
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject2.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject2.kt
index 2f9e4da97844..c6f2537a9e5c 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject2.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject2.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param enumFormStringArray Form parameter enum test (string array)
@@ -22,7 +23,7 @@ import kotlinx.serialization.internal.CommonEnumSerializer
 @Serializable
 data class InlineObject2 (
     /* Form parameter enum test (string array) */
-    @SerialName(value = "enum_form_string_array") val enumFormStringArray: kotlin.Array<InlineObject2.EnumFormStringArray>? = null,
+    @SerialName(value = "enum_form_string_array") val enumFormStringArray: kotlin.collections.List<InlineObject2.EnumFormStringArray>? = null,
     /* Form parameter enum test (string) */
     @SerialName(value = "enum_form_string") val enumFormString: InlineObject2.EnumFormString? = null
 ) {
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject3.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject3.kt
index 62e5c16b0900..7cf9dba5f63b 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject3.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject3.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param number None
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject4.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject4.kt
index 4a1f2f2ecc5e..c159a9034213 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject4.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject4.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param param field1
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject5.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject5.kt
index d7a7bd0ecce6..c9bde5554265 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject5.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject5.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param requiredFile file to upload
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineResponseDefault.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
index 425640579467..932be6a35876 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Foo
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param string 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/List.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/List.kt
index 2768b1935d41..f68a4dc3a860 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/List.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/List.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param `123minusList` 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MapTest.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MapTest.kt
index eff239dcfb33..e67dc09a8f61 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MapTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MapTest.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param mapMapOfString 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
index 73b632b52a6a..aa8526964755 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Animal
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param uuid 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Model200Response.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Model200Response.kt
index 719b2bd7d25b..425a26f41204 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Model200Response.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Model200Response.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * Model for testing model name starting with number
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Name.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Name.kt
index e010f6a7028f..906deaf6c1f5 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Name.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Name.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * Model for testing model name same as property name
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NullableClass.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NullableClass.kt
index e535a63ead03..b83807484c34 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NullableClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NullableClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param integerProp 
@@ -37,9 +38,9 @@ data class NullableClass (
     @SerialName(value = "string_prop") val stringProp: kotlin.String? = null,
     @SerialName(value = "date_prop") val dateProp: kotlin.String? = null,
     @SerialName(value = "datetime_prop") val datetimeProp: kotlin.String? = null,
-    @SerialName(value = "array_nullable_prop") val arrayNullableProp: kotlin.Array<kotlin.String>? = null,
-    @SerialName(value = "array_and_items_nullable_prop") val arrayAndItemsNullableProp: kotlin.Array<kotlin.String>? = null,
-    @SerialName(value = "array_items_nullable") val arrayItemsNullable: kotlin.Array<kotlin.String>? = null,
+    @SerialName(value = "array_nullable_prop") val arrayNullableProp: kotlin.collections.List<kotlin.String>? = null,
+    @SerialName(value = "array_and_items_nullable_prop") val arrayAndItemsNullableProp: kotlin.collections.List<kotlin.String>? = null,
+    @SerialName(value = "array_items_nullable") val arrayItemsNullable: kotlin.collections.List<kotlin.String>? = null,
     @SerialName(value = "object_nullable_prop") val objectNullableProp: kotlin.collections.Map<kotlin.String, kotlin.String>? = null,
     @SerialName(value = "object_and_items_nullable_prop") val objectAndItemsNullableProp: kotlin.collections.Map<kotlin.String, kotlin.String>? = null,
     @SerialName(value = "object_items_nullable") val objectItemsNullable: kotlin.collections.Map<kotlin.String, kotlin.String>? = null
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NumberOnly.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NumberOnly.kt
index 28a3ce64289e..0964c45b23a8 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NumberOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param justNumber 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
index 166b38626821..56780551ee23 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterComposite.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterComposite.kt
index ab7d6bf2a6f4..8e99326263c5 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterComposite.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterComposite.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param myNumber 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
index 46c476209ad3..525283182c39 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.Tag
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param name 
@@ -28,10 +29,10 @@ import kotlinx.serialization.internal.CommonEnumSerializer
 @Serializable
 data class Pet (
     @SerialName(value = "name") @Required val name: kotlin.String,
-    @SerialName(value = "photoUrls") @Required val photoUrls: kotlin.Array<kotlin.String>,
+    @SerialName(value = "photoUrls") @Required val photoUrls: kotlin.collections.List<kotlin.String>,
     @SerialName(value = "id") val id: kotlin.Long? = null,
     @SerialName(value = "category") val category: Category? = null,
-    @SerialName(value = "tags") val tags: kotlin.Array<Tag>? = null,
+    @SerialName(value = "tags") val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @SerialName(value = "status") val status: Pet.Status? = null
 ) {
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
index 4d99ea7a9a2c..15564cf9a76d 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Return.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Return.kt
index c4e80831628b..b288affae4c7 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Return.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Return.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * Model for testing reserved words
  * @param `return` 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/SpecialModelname.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/SpecialModelname.kt
index 20dd7ada2799..7a8c1c83c8b8 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/SpecialModelname.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/SpecialModelname.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
index 0b3f202ad517..98d6e611801a 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
index 47ad0a9f2829..d4b6129336ef 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.CommonEnumSerializer
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin/README.md b/samples/openapi3/client/petstore/kotlin/README.md
index b7028d917a24..0039d13c3568 100644
--- a/samples/openapi3/client/petstore/kotlin/README.md
+++ b/samples/openapi3/client/petstore/kotlin/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-* Kotlin 1.3.41
+* Kotlin 1.3.61
 * Gradle 4.9
 
 ## Build
diff --git a/samples/openapi3/client/petstore/kotlin/build.gradle b/samples/openapi3/client/petstore/kotlin/build.gradle
index 56be0bd0dd87..9d6960b77a15 100644
--- a/samples/openapi3/client/petstore/kotlin/build.gradle
+++ b/samples/openapi3/client/petstore/kotlin/build.gradle
@@ -29,9 +29,11 @@ test {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.0"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "com.squareup.moshi:moshi-kotlin:1.9.2"
     compile "com.squareup.moshi:moshi-adapters:1.9.2"
     compile "com.squareup.okhttp3:okhttp:4.2.2"
+    compile "com.squareup.okhttp3:logging-interceptor:4.4.0"
     testCompile "io.kotlintest:kotlintest-runner-junit5:3.1.0"
 }
diff --git a/samples/openapi3/client/petstore/kotlin/docs/ArrayOfArrayOfNumberOnly.md b/samples/openapi3/client/petstore/kotlin/docs/ArrayOfArrayOfNumberOnly.md
index 23a475664205..bcc306caeb6d 100644
--- a/samples/openapi3/client/petstore/kotlin/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/kotlin/docs/ArrayOfArrayOfNumberOnly.md
@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayArrayNumber** | **kotlin.Array&lt;kotlin.Array&lt;java.math.BigDecimal&gt;&gt;** |  |  [optional]
+**arrayArrayNumber** | **kotlin.collections.List&lt;kotlin.collections.List&lt;java.math.BigDecimal&gt;&gt;** |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin/docs/ArrayOfNumberOnly.md b/samples/openapi3/client/petstore/kotlin/docs/ArrayOfNumberOnly.md
index b115a5d54c22..00c57a7885e8 100644
--- a/samples/openapi3/client/petstore/kotlin/docs/ArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/kotlin/docs/ArrayOfNumberOnly.md
@@ -4,7 +4,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayNumber** | [**kotlin.Array&lt;java.math.BigDecimal&gt;**](java.math.BigDecimal.md) |  |  [optional]
+**arrayNumber** | [**kotlin.collections.List&lt;java.math.BigDecimal&gt;**](java.math.BigDecimal.md) |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin/docs/ArrayTest.md b/samples/openapi3/client/petstore/kotlin/docs/ArrayTest.md
index aa0bbbe936c1..45e59c8fe77c 100644
--- a/samples/openapi3/client/petstore/kotlin/docs/ArrayTest.md
+++ b/samples/openapi3/client/petstore/kotlin/docs/ArrayTest.md
@@ -4,9 +4,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**arrayOfString** | **kotlin.Array&lt;kotlin.String&gt;** |  |  [optional]
-**arrayArrayOfInteger** | **kotlin.Array&lt;kotlin.Array&lt;kotlin.Long&gt;&gt;** |  |  [optional]
-**arrayArrayOfModel** | **kotlin.Array&lt;kotlin.Array&lt;ReadOnlyFirst&gt;&gt;** |  |  [optional]
+**arrayOfString** | **kotlin.collections.List&lt;kotlin.String&gt;** |  |  [optional]
+**arrayArrayOfInteger** | **kotlin.collections.List&lt;kotlin.collections.List&lt;kotlin.Long&gt;&gt;** |  |  [optional]
+**arrayArrayOfModel** | **kotlin.collections.List&lt;kotlin.collections.List&lt;ReadOnlyFirst&gt;&gt;** |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin/docs/EnumArrays.md b/samples/openapi3/client/petstore/kotlin/docs/EnumArrays.md
index 719084e5f949..c3c5e235bfed 100644
--- a/samples/openapi3/client/petstore/kotlin/docs/EnumArrays.md
+++ b/samples/openapi3/client/petstore/kotlin/docs/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **justSymbol** | [**inline**](#JustSymbolEnum) |  |  [optional]
-**arrayEnum** | [**inline**](#kotlin.Array&lt;ArrayEnumEnum&gt;) |  |  [optional]
+**arrayEnum** | [**inline**](#kotlin.collections.List&lt;ArrayEnumEnum&gt;) |  |  [optional]
 
 
 <a name="JustSymbolEnum"></a>
@@ -15,7 +15,7 @@ Name | Value
 justSymbol | &gt;&#x3D;, $
 
 
-<a name="kotlin.Array<ArrayEnumEnum>"></a>
+<a name="kotlin.collections.List<ArrayEnumEnum>"></a>
 ## Enum: array_enum
 Name | Value
 ---- | -----
diff --git a/samples/openapi3/client/petstore/kotlin/docs/FakeApi.md b/samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
index 0a28947aa843..40ca579b51b4 100644
--- a/samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
@@ -527,13 +527,13 @@ To test enum parameters
 //import org.openapitools.client.models.*
 
 val apiInstance = FakeApi()
-val enumHeaderStringArray : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Header parameter enum test (string array)
+val enumHeaderStringArray : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Header parameter enum test (string array)
 val enumHeaderString : kotlin.String = enumHeaderString_example // kotlin.String | Header parameter enum test (string)
-val enumQueryStringArray : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Query parameter enum test (string array)
+val enumQueryStringArray : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Query parameter enum test (string array)
 val enumQueryString : kotlin.String = enumQueryString_example // kotlin.String | Query parameter enum test (string)
 val enumQueryInteger : kotlin.Int = 56 // kotlin.Int | Query parameter enum test (double)
 val enumQueryDouble : kotlin.Double = 1.2 // kotlin.Double | Query parameter enum test (double)
-val enumFormStringArray : kotlin.Array<kotlin.String> = enumFormStringArray_example // kotlin.Array<kotlin.String> | Form parameter enum test (string array)
+val enumFormStringArray : kotlin.collections.List<kotlin.String> = enumFormStringArray_example // kotlin.collections.List<kotlin.String> | Form parameter enum test (string array)
 val enumFormString : kotlin.String = enumFormString_example // kotlin.String | Form parameter enum test (string)
 try {
     apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
@@ -550,13 +550,13 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **enumHeaderStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
+ **enumHeaderStringArray** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
  **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
- **enumQueryStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
+ **enumQueryStringArray** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
  **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
  **enumQueryInteger** | **kotlin.Int**| Query parameter enum test (double) | [optional] [enum: 1, -2]
  **enumQueryDouble** | **kotlin.Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
- **enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &quot;$&quot;] [enum: >, $]
+ **enumFormStringArray** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &quot;$&quot;] [enum: >, $]
  **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
 
 ### Return type
@@ -735,11 +735,11 @@ To test the collection format in query parameters
 //import org.openapitools.client.models.*
 
 val apiInstance = FakeApi()
-val pipe : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
-val ioutil : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
-val http : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
-val url : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
-val context : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | 
+val pipe : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | 
+val ioutil : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | 
+val http : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | 
+val url : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | 
+val context : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | 
 try {
     apiInstance.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
 } catch (e: ClientException) {
@@ -755,11 +755,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pipe** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)|  |
- **ioutil** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)|  |
- **http** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)|  |
- **url** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)|  |
- **context** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)|  |
+ **pipe** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)|  |
+ **ioutil** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)|  |
+ **http** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)|  |
+ **url** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)|  |
+ **context** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)|  |
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/kotlin/docs/FileSchemaTestClass.md b/samples/openapi3/client/petstore/kotlin/docs/FileSchemaTestClass.md
index 089e61862c2a..e5512f82f6f6 100644
--- a/samples/openapi3/client/petstore/kotlin/docs/FileSchemaTestClass.md
+++ b/samples/openapi3/client/petstore/kotlin/docs/FileSchemaTestClass.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **file** | [**java.io.File**](java.io.File.md) |  |  [optional]
-**files** | [**kotlin.Array&lt;java.io.File&gt;**](java.io.File.md) |  |  [optional]
+**files** | [**kotlin.collections.List&lt;java.io.File&gt;**](java.io.File.md) |  |  [optional]
 
 
 
diff --git a/samples/openapi3/client/petstore/kotlin/docs/InlineObject2.md b/samples/openapi3/client/petstore/kotlin/docs/InlineObject2.md
index 0720925918bf..a98ffe031b3d 100644
--- a/samples/openapi3/client/petstore/kotlin/docs/InlineObject2.md
+++ b/samples/openapi3/client/petstore/kotlin/docs/InlineObject2.md
@@ -4,11 +4,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**enumFormStringArray** | [**inline**](#kotlin.Array&lt;EnumFormStringArrayEnum&gt;) | Form parameter enum test (string array) |  [optional]
+**enumFormStringArray** | [**inline**](#kotlin.collections.List&lt;EnumFormStringArrayEnum&gt;) | Form parameter enum test (string array) |  [optional]
 **enumFormString** | [**inline**](#EnumFormStringEnum) | Form parameter enum test (string) |  [optional]
 
 
-<a name="kotlin.Array<EnumFormStringArrayEnum>"></a>
+<a name="kotlin.collections.List<EnumFormStringArrayEnum>"></a>
 ## Enum: enum_form_string_array
 Name | Value
 ---- | -----
diff --git a/samples/openapi3/client/petstore/kotlin/docs/NullableClass.md b/samples/openapi3/client/petstore/kotlin/docs/NullableClass.md
index 9ec43d0b87c6..335943c01eae 100644
--- a/samples/openapi3/client/petstore/kotlin/docs/NullableClass.md
+++ b/samples/openapi3/client/petstore/kotlin/docs/NullableClass.md
@@ -10,9 +10,9 @@ Name | Type | Description | Notes
 **stringProp** | **kotlin.String** |  |  [optional]
 **dateProp** | [**java.time.LocalDate**](java.time.LocalDate.md) |  |  [optional]
 **datetimeProp** | [**java.time.OffsetDateTime**](java.time.OffsetDateTime.md) |  |  [optional]
-**arrayNullableProp** | [**kotlin.Array&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
-**arrayAndItemsNullableProp** | [**kotlin.Array&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
-**arrayItemsNullable** | [**kotlin.Array&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
+**arrayNullableProp** | [**kotlin.collections.List&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
+**arrayAndItemsNullableProp** | [**kotlin.collections.List&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
+**arrayItemsNullable** | [**kotlin.collections.List&lt;kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
 **objectNullableProp** | [**kotlin.collections.Map&lt;kotlin.String, kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
 **objectAndItemsNullableProp** | [**kotlin.collections.Map&lt;kotlin.String, kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
 **objectItemsNullable** | [**kotlin.collections.Map&lt;kotlin.String, kotlin.Any&gt;**](kotlin.Any.md) |  |  [optional]
diff --git a/samples/openapi3/client/petstore/kotlin/docs/Pet.md b/samples/openapi3/client/petstore/kotlin/docs/Pet.md
index 70c340005d16..c82844b5ee80 100644
--- a/samples/openapi3/client/petstore/kotlin/docs/Pet.md
+++ b/samples/openapi3/client/petstore/kotlin/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **kotlin.String** |  | 
-**photoUrls** | **kotlin.Array&lt;kotlin.String&gt;** |  | 
+**photoUrls** | **kotlin.collections.List&lt;kotlin.String&gt;** |  | 
 **id** | **kotlin.Long** |  |  [optional]
 **category** | [**Category**](Category.md) |  |  [optional]
-**tags** | [**kotlin.Array&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**tags** | [**kotlin.collections.List&lt;Tag&gt;**](Tag.md) |  |  [optional]
 **status** | [**inline**](#StatusEnum) | pet status in the store |  [optional]
 
 
diff --git a/samples/openapi3/client/petstore/kotlin/docs/PetApi.md b/samples/openapi3/client/petstore/kotlin/docs/PetApi.md
index 576d2f04ca85..9987ca87a857 100644
--- a/samples/openapi3/client/petstore/kotlin/docs/PetApi.md
+++ b/samples/openapi3/client/petstore/kotlin/docs/PetApi.md
@@ -111,7 +111,7 @@ Configure petstore_auth:
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
-> kotlin.Array&lt;Pet&gt; findPetsByStatus(status)
+> kotlin.collections.List&lt;Pet&gt; findPetsByStatus(status)
 
 Finds Pets by status
 
@@ -124,9 +124,9 @@ Multiple status values can be provided with comma separated strings
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
+val status : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Status values that need to be considered for filter
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByStatus(status)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByStatus(status)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByStatus")
@@ -141,11 +141,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+ **status** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
@@ -160,7 +160,7 @@ Configure petstore_auth:
 
 <a name="findPetsByTags"></a>
 # **findPetsByTags**
-> kotlin.Array&lt;Pet&gt; findPetsByTags(tags)
+> kotlin.collections.List&lt;Pet&gt; findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -173,9 +173,9 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 //import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
+val tags : kotlin.collections.List<kotlin.String> =  // kotlin.collections.List<kotlin.String> | Tags to filter by
 try {
-    val result : kotlin.Array<Pet> = apiInstance.findPetsByTags(tags)
+    val result : kotlin.collections.List<Pet> = apiInstance.findPetsByTags(tags)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#findPetsByTags")
@@ -190,11 +190,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
+ **tags** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Tags to filter by |
 
 ### Return type
 
-[**kotlin.Array&lt;Pet&gt;**](Pet.md)
+[**kotlin.collections.List&lt;Pet&gt;**](Pet.md)
 
 ### Authorization
 
diff --git a/samples/openapi3/client/petstore/kotlin/docs/UserApi.md b/samples/openapi3/client/petstore/kotlin/docs/UserApi.md
index dbf78e81eb22..543cbee5a390 100644
--- a/samples/openapi3/client/petstore/kotlin/docs/UserApi.md
+++ b/samples/openapi3/client/petstore/kotlin/docs/UserApi.md
@@ -73,7 +73,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val user : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithArrayInput(user)
 } catch (e: ClientException) {
@@ -89,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **user** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
@@ -117,7 +117,7 @@ Creates list of users with given input array
 //import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val user : kotlin.collections.List<User> =  // kotlin.collections.List<User> | List of user object
 try {
     apiInstance.createUsersWithListInput(user)
 } catch (e: ClientException) {
@@ -133,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **user** | [**kotlin.collections.List&lt;User&gt;**](User.md)| List of user object |
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
index e2847ef4c5f6..647272f7e2b2 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
@@ -484,7 +484,7 @@ class FakeApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun testEnumParameters(enumHeaderStringArray: kotlin.Array<kotlin.String>?, enumHeaderString: kotlin.String?, enumQueryStringArray: kotlin.Array<kotlin.String>?, enumQueryString: kotlin.String?, enumQueryInteger: kotlin.Int?, enumQueryDouble: kotlin.Double?, enumFormStringArray: kotlin.Array<kotlin.String>?, enumFormString: kotlin.String?) : Unit {
+    fun testEnumParameters(enumHeaderStringArray: kotlin.collections.List<kotlin.String>?, enumHeaderString: kotlin.String?, enumQueryStringArray: kotlin.collections.List<kotlin.String>?, enumQueryString: kotlin.String?, enumQueryInteger: kotlin.Int?, enumQueryDouble: kotlin.Double?, enumFormStringArray: kotlin.collections.List<kotlin.String>?, enumFormString: kotlin.String?) : Unit {
         val localVariableBody: kotlin.Any? = mapOf("enum_form_string_array" to enumFormStringArray, "enum_form_string" to enumFormString)
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -678,13 +678,13 @@ class FakeApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun testQueryParameterCollectionFormat(pipe: kotlin.Array<kotlin.String>, ioutil: kotlin.Array<kotlin.String>, http: kotlin.Array<kotlin.String>, url: kotlin.Array<kotlin.String>, context: kotlin.Array<kotlin.String>) : Unit {
+    fun testQueryParameterCollectionFormat(pipe: kotlin.collections.List<kotlin.String>, ioutil: kotlin.collections.List<kotlin.String>, http: kotlin.collections.List<kotlin.String>, url: kotlin.collections.List<kotlin.String>, context: kotlin.collections.List<kotlin.String>) : Unit {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
                 put("pipe", toMultiValue(pipe.toList(), "multi"))
                 put("ioutil", toMultiValue(ioutil.toList(), "csv"))
-                put("http", toMultiValue(http.toList(), "space"))
+                put("http", toMultiValue(http.toList(), "ssv"))
                 put("url", toMultiValue(url.toList(), "csv"))
                 put("context", toMultiValue(context.toList(), "multi"))
             }
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 67d7955bb935..8dd12cf26ab5 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -119,14 +119,14 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by status
     * Multiple status values can be provided with comma separated strings
     * @param status Status values that need to be considered for filter 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
     */
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun findPetsByStatus(status: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -139,13 +139,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -163,7 +163,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * Finds Pets by tags
     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
     * @param tags Tags to filter by 
-    * @return kotlin.Array<Pet>
+    * @return kotlin.collections.List<Pet>
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
     * @throws ServerException If the API returns a server error response
@@ -171,7 +171,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
     @Deprecated(message = "This operation is deprecated.")
-    fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
             .apply {
@@ -184,13 +184,13 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
             query = localVariableQuery,
             headers = localVariableHeaders
         )
-        val localVarResponse = request<kotlin.Array<Pet>>(
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
             localVariableConfig,
             localVariableBody
         )
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Array<Pet>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 6e05b135cd3d..1ed6f6bc16b3 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -83,7 +83,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithArrayInput(user: kotlin.Array<User>) : Unit {
+    fun createUsersWithArrayInput(user: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = user
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -123,7 +123,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * @throws ServerException If the API returns a server error response
     */
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createUsersWithListInput(user: kotlin.Array<User>) : Unit {
+    fun createUsersWithListInput(user: kotlin.collections.List<User>) : Unit {
         val localVariableBody: kotlin.Any? = user
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
index 42e82f668073..e481b1a34243 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param mapProperty 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Animal.kt
index 71c88c15c35f..8ce8fccc6fea 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Animal.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Animal.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index d6922e4d96c1..b6c0603d50e7 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param code 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
index 0b15c44c4cee..7e4228001541 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param arrayArrayNumber 
@@ -21,7 +22,7 @@ import java.io.Serializable
 
 data class ArrayOfArrayOfNumberOnly (
     @Json(name = "ArrayArrayNumber")
-    val arrayArrayNumber: kotlin.Array<kotlin.Array<java.math.BigDecimal>>? = null
+    val arrayArrayNumber: kotlin.collections.List<kotlin.collections.List<java.math.BigDecimal>>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
index 64257ddc92c4..f2da9373e835 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param arrayNumber 
@@ -21,7 +22,7 @@ import java.io.Serializable
 
 data class ArrayOfNumberOnly (
     @Json(name = "ArrayNumber")
-    val arrayNumber: kotlin.Array<java.math.BigDecimal>? = null
+    val arrayNumber: kotlin.collections.List<java.math.BigDecimal>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
index 22441aba388b..a2e6e72c2c7c 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.ReadOnlyFirst
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param arrayOfString 
@@ -24,11 +25,11 @@ import java.io.Serializable
 
 data class ArrayTest (
     @Json(name = "array_of_string")
-    val arrayOfString: kotlin.Array<kotlin.String>? = null,
+    val arrayOfString: kotlin.collections.List<kotlin.String>? = null,
     @Json(name = "array_array_of_integer")
-    val arrayArrayOfInteger: kotlin.Array<kotlin.Array<kotlin.Long>>? = null,
+    val arrayArrayOfInteger: kotlin.collections.List<kotlin.collections.List<kotlin.Long>>? = null,
     @Json(name = "array_array_of_model")
-    val arrayArrayOfModel: kotlin.Array<kotlin.Array<ReadOnlyFirst>>? = null
+    val arrayArrayOfModel: kotlin.collections.List<kotlin.collections.List<ReadOnlyFirst>>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Capitalization.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
index 2e321905c3fd..3a549ed7917a 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param smallCamel 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Cat.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Cat.kt
index 0d3fc6381c9c..2de64da9e1a9 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Cat.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Cat.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.CatAllOf
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
index 7fec650f4bb9..d102b00d5be6 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param declawed 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
index 055ac892492c..b7c8249e3785 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ClassModel.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
index 919da5f0f487..82f273940446 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * Model for testing model with \"_class\" property
  * @param propertyClass 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Client.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Client.kt
index b766f9ba9f23..f6efaab5fe82 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Client.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Client.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param client 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Dog.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Dog.kt
index 2e842529c4fc..58bf1dbfa4b6 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Dog.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Dog.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.DogAllOf
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param className 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
index 7f0059863271..2ae7ee8d6fec 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param breed 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
index f4e145b600bc..53dd0b396ae2 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param justSymbol 
@@ -24,7 +25,7 @@ data class EnumArrays (
     @Json(name = "just_symbol")
     val justSymbol: EnumArrays.JustSymbol? = null,
     @Json(name = "array_enum")
-    val arrayEnum: kotlin.Array<EnumArrays.ArrayEnum>? = null
+    val arrayEnum: kotlin.collections.List<EnumArrays.ArrayEnum>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumTest.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
index 346cc493053b..25dc81a7e7f3 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
@@ -18,6 +18,7 @@ import org.openapitools.client.models.OuterEnumIntegerDefaultValue
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param enumStringRequired 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
index ae3a0c55ac25..b6f4bc5e334a 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param file 
@@ -24,7 +25,7 @@ data class FileSchemaTestClass (
     @Json(name = "file")
     val file: java.io.File? = null,
     @Json(name = "files")
-    val files: kotlin.Array<java.io.File>? = null
+    val files: kotlin.collections.List<java.io.File>? = null
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Foo.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Foo.kt
index d103385d685c..e0870d3f50bf 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Foo.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Foo.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FormatTest.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
index 3ef83ab19cba..5a1fec435b1b 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param number 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
index 807b7c846fb0..b746c64caa41 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
index 4dde950bd728..a9c8db3f0280 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
  * @param nullableMessage 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
index 33175a232f63..24c22839016d 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param name Updated name of the pet
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
index 7fd9544b7819..c951ce2581ea 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param additionalMetadata Additional data to pass to server
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
index d0c9b5b7160e..8ab853cf337d 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param enumFormStringArray Form parameter enum test (string array)
@@ -23,7 +24,7 @@ import java.io.Serializable
 data class InlineObject2 (
     /* Form parameter enum test (string array) */
     @Json(name = "enum_form_string_array")
-    val enumFormStringArray: kotlin.Array<InlineObject2.EnumFormStringArray>? = null,
+    val enumFormStringArray: kotlin.collections.List<InlineObject2.EnumFormStringArray>? = null,
     /* Form parameter enum test (string) */
     @Json(name = "enum_form_string")
     val enumFormString: InlineObject2.EnumFormString? = null
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
index 62bd57318c5c..594c4519bcd8 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param number None
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
index d08e4105f848..88b4644d398a 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param param field1
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
index cd06eb38092c..d1d796b023ab 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param requiredFile file to upload
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
index 2284790d4220..221f9f0641ba 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Foo
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param string 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/List.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/List.kt
index c93bd427bf25..f16cdddc8c7d 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/List.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/List.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param `123minusList` 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MapTest.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MapTest.kt
index 960045349b31..c5eb455d5a10 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MapTest.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MapTest.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param mapMapOfString 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
index 974cc9290412..70e60cd60497 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
@@ -15,6 +15,7 @@ import org.openapitools.client.models.Animal
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param uuid 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Model200Response.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
index c2773adff524..887f220608da 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * Model for testing model name starting with number
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Name.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Name.kt
index 916146269e73..66fef7eefdc4 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Name.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Name.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * Model for testing model name same as property name
  * @param name 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NullableClass.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
index c425afbd0744..eb54c7967e49 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param integerProp 
@@ -44,11 +45,11 @@ data class NullableClass (
     @Json(name = "datetime_prop")
     val datetimeProp: java.time.OffsetDateTime? = null,
     @Json(name = "array_nullable_prop")
-    val arrayNullableProp: kotlin.Array<kotlin.Any>? = null,
+    val arrayNullableProp: kotlin.collections.List<kotlin.Any>? = null,
     @Json(name = "array_and_items_nullable_prop")
-    val arrayAndItemsNullableProp: kotlin.Array<kotlin.Any>? = null,
+    val arrayAndItemsNullableProp: kotlin.collections.List<kotlin.Any>? = null,
     @Json(name = "array_items_nullable")
-    val arrayItemsNullable: kotlin.Array<kotlin.Any>? = null,
+    val arrayItemsNullable: kotlin.collections.List<kotlin.Any>? = null,
     @Json(name = "object_nullable_prop")
     val objectNullableProp: kotlin.collections.Map<kotlin.String, kotlin.Any>? = null,
     @Json(name = "object_and_items_nullable_prop")
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
index bc8a0156c60c..315938760220 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param justNumber 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
index 8d14c5b8d0e8..a312ce70e1ca 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
index 74ddae399302..cda1982e496c 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param myNumber 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
index ea8bbdc4cb44..614bf90a6da4 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -16,6 +16,7 @@ import org.openapitools.client.models.Tag
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param name 
@@ -30,13 +31,13 @@ data class Pet (
     @Json(name = "name")
     val name: kotlin.String,
     @Json(name = "photoUrls")
-    val photoUrls: kotlin.Array<kotlin.String>,
+    val photoUrls: kotlin.collections.List<kotlin.String>,
     @Json(name = "id")
     val id: kotlin.Long? = null,
     @Json(name = "category")
     val category: Category? = null,
     @Json(name = "tags")
-    val tags: kotlin.Array<Tag>? = null,
+    val tags: kotlin.collections.List<Tag>? = null,
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
index 51c3d806dfd9..f513c291b79e 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param bar 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Return.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Return.kt
index ea215b2e44d1..7d6454e5580e 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Return.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Return.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * Model for testing reserved words
  * @param `return` 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
index b5e0c881d3fb..c51eefb1ce41 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 2cc3079a7458..71aa199ee0ca 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
index 63cce33a54e4..c83cff139a83 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -14,6 +14,7 @@ package org.openapitools.client.models
 
 import com.squareup.moshi.Json
 import java.io.Serializable
+
 /**
  * 
  * @param id 
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.gitignore b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.gitignore
deleted file mode 100644
index edcf63f6aee1..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
-
-composer.phar
-/vendor/
-
-# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
-# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
-composer.lock
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES
deleted file mode 100644
index 6c0c0f87b523..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES
+++ /dev/null
@@ -1,124 +0,0 @@
-.gitignore
-.php_cs
-.travis.yml
-README.md
-composer.json
-docs/Api/AnotherFakeApi.md
-docs/Api/DefaultApi.md
-docs/Api/FakeApi.md
-docs/Api/FakeClassnameTags123Api.md
-docs/Api/PetApi.md
-docs/Api/StoreApi.md
-docs/Api/UserApi.md
-docs/Model/AdditionalPropertiesClass.md
-docs/Model/Animal.md
-docs/Model/ApiResponse.md
-docs/Model/ArrayOfArrayOfNumberOnly.md
-docs/Model/ArrayOfNumberOnly.md
-docs/Model/ArrayTest.md
-docs/Model/Capitalization.md
-docs/Model/Cat.md
-docs/Model/CatAllOf.md
-docs/Model/Category.md
-docs/Model/ClassModel.md
-docs/Model/Client.md
-docs/Model/Dog.md
-docs/Model/DogAllOf.md
-docs/Model/EnumArrays.md
-docs/Model/EnumClass.md
-docs/Model/EnumTest.md
-docs/Model/File.md
-docs/Model/FileSchemaTestClass.md
-docs/Model/Foo.md
-docs/Model/FormatTest.md
-docs/Model/HasOnlyReadOnly.md
-docs/Model/HealthCheckResult.md
-docs/Model/InlineObject.md
-docs/Model/InlineObject1.md
-docs/Model/InlineObject2.md
-docs/Model/InlineObject3.md
-docs/Model/InlineObject4.md
-docs/Model/InlineObject5.md
-docs/Model/InlineResponseDefault.md
-docs/Model/MapTest.md
-docs/Model/MixedPropertiesAndAdditionalPropertiesClass.md
-docs/Model/Model200Response.md
-docs/Model/ModelList.md
-docs/Model/ModelReturn.md
-docs/Model/Name.md
-docs/Model/NullableClass.md
-docs/Model/NumberOnly.md
-docs/Model/Order.md
-docs/Model/OuterComposite.md
-docs/Model/OuterEnum.md
-docs/Model/OuterEnumDefaultValue.md
-docs/Model/OuterEnumInteger.md
-docs/Model/OuterEnumIntegerDefaultValue.md
-docs/Model/Pet.md
-docs/Model/ReadOnlyFirst.md
-docs/Model/SpecialModelName.md
-docs/Model/Tag.md
-docs/Model/User.md
-git_push.sh
-lib/Api/AnotherFakeApi.php
-lib/Api/DefaultApi.php
-lib/Api/FakeApi.php
-lib/Api/FakeClassnameTags123Api.php
-lib/Api/PetApi.php
-lib/Api/StoreApi.php
-lib/Api/UserApi.php
-lib/ApiException.php
-lib/Configuration.php
-lib/HeaderSelector.php
-lib/Model/AdditionalPropertiesClass.php
-lib/Model/Animal.php
-lib/Model/ApiResponse.php
-lib/Model/ArrayOfArrayOfNumberOnly.php
-lib/Model/ArrayOfNumberOnly.php
-lib/Model/ArrayTest.php
-lib/Model/Capitalization.php
-lib/Model/Cat.php
-lib/Model/CatAllOf.php
-lib/Model/Category.php
-lib/Model/ClassModel.php
-lib/Model/Client.php
-lib/Model/Dog.php
-lib/Model/DogAllOf.php
-lib/Model/EnumArrays.php
-lib/Model/EnumClass.php
-lib/Model/EnumTest.php
-lib/Model/File.php
-lib/Model/FileSchemaTestClass.php
-lib/Model/Foo.php
-lib/Model/FormatTest.php
-lib/Model/HasOnlyReadOnly.php
-lib/Model/HealthCheckResult.php
-lib/Model/InlineObject.php
-lib/Model/InlineObject1.php
-lib/Model/InlineObject2.php
-lib/Model/InlineObject3.php
-lib/Model/InlineObject4.php
-lib/Model/InlineObject5.php
-lib/Model/InlineResponseDefault.php
-lib/Model/MapTest.php
-lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
-lib/Model/Model200Response.php
-lib/Model/ModelInterface.php
-lib/Model/ModelList.php
-lib/Model/ModelReturn.php
-lib/Model/Name.php
-lib/Model/NullableClass.php
-lib/Model/NumberOnly.php
-lib/Model/Order.php
-lib/Model/OuterComposite.php
-lib/Model/OuterEnum.php
-lib/Model/OuterEnumDefaultValue.php
-lib/Model/OuterEnumInteger.php
-lib/Model/OuterEnumIntegerDefaultValue.php
-lib/Model/Pet.php
-lib/Model/ReadOnlyFirst.php
-lib/Model/SpecialModelName.php
-lib/Model/Tag.php
-lib/Model/User.php
-lib/ObjectSerializer.php
-phpunit.xml.dist
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.php_cs b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.php_cs
deleted file mode 100644
index 4fbe53ec5ff1..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.php_cs
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-return PhpCsFixer\Config::create()
-    ->setUsingCache(true)
-    ->setRules([
-        '@PSR2' => true,
-        'ordered_imports' => true,
-        'phpdoc_order' => true,
-        'array_syntax' => [ 'syntax' => 'short' ],
-        'strict_comparison' => true,
-        'strict_param' => true,
-        'no_trailing_whitespace' => false,
-        'no_trailing_whitespace_in_comment' => false,
-        'braces' => false,
-        'single_blank_line_at_eof' => false,
-        'blank_line_after_namespace' => false,
-    ])
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-        ->exclude('test')
-        ->exclude('tests')
-        ->in(__DIR__)
-    );
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.travis.yml b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.travis.yml
deleted file mode 100644
index cf85d27981a5..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-language: php
-php:
-    - 7.1
-    - 7.2
-before_install: "composer install"
-script: "vendor/bin/phpunit"
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md
deleted file mode 100644
index a64571758a2d..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md
+++ /dev/null
@@ -1,237 +0,0 @@
-# OpenAPIClient-php
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-This PHP package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
-
-- API version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PhpClientCodegen
-
-## Requirements
-
-PHP 7.1 and later
-
-## Installation & Usage
-
-### Composer
-
-To install the bindings via [Composer](http://getcomposer.org/), add the following to `composer.json`:
-
-```json
-{
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/GIT_USER_ID/GIT_REPO_ID.git"
-    }
-  ],
-  "require": {
-    "GIT_USER_ID/GIT_REPO_ID": "*@dev"
-  }
-}
-```
-
-Then run `composer install`
-
-### Manual Installation
-
-Download the files and include `autoload.php`:
-
-```php
-    require_once('/path/to/OpenAPIClient-php/vendor/autoload.php');
-```
-
-## Tests
-
-To run the unit tests:
-
-```bash
-composer install
-./vendor/bin/phpunit
-```
-
-## Getting Started
-
-Please follow the [installation procedure](#installation--usage) and then run the following:
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-
-$apiInstance = new OpenAPI\Client\Api\AnotherFakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$client = new \OpenAPI\Client\Model\Client(); // \OpenAPI\Client\Model\Client | client model
-
-try {
-    $result = $apiInstance->call123TestSpecialTags($client);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling AnotherFakeApi->call123TestSpecialTags: ', $e->getMessage(), PHP_EOL;
-}
-
-?>
-```
-
-## Documentation for API Endpoints
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**call123TestSpecialTags**](docs/Api/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
-*DefaultApi* | [**fooGet**](docs/Api/DefaultApi.md#fooget) | **GET** /foo | 
-*FakeApi* | [**fakeHealthGet**](docs/Api/FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint
-*FakeApi* | [**fakeHttpSignatureTest**](docs/Api/FakeApi.md#fakehttpsignaturetest) | **GET** /fake/http-signature-test | test http signature authentication
-*FakeApi* | [**fakeOuterBooleanSerialize**](docs/Api/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
-*FakeApi* | [**fakeOuterCompositeSerialize**](docs/Api/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
-*FakeApi* | [**fakeOuterNumberSerialize**](docs/Api/FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
-*FakeApi* | [**fakeOuterStringSerialize**](docs/Api/FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
-*FakeApi* | [**testBodyWithFileSchema**](docs/Api/FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
-*FakeApi* | [**testBodyWithQueryParams**](docs/Api/FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
-*FakeApi* | [**testClientModel**](docs/Api/FakeApi.md#testclientmodel) | **PATCH** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**testEndpointParameters**](docs/Api/FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
-*FakeApi* | [**testEnumParameters**](docs/Api/FakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
-*FakeApi* | [**testGroupParameters**](docs/Api/FakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-*FakeApi* | [**testInlineAdditionalProperties**](docs/Api/FakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-*FakeApi* | [**testJsonFormData**](docs/Api/FakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
-*FakeApi* | [**testQueryParameterCollectionFormat**](docs/Api/FakeApi.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-paramters | 
-*FakeClassnameTags123Api* | [**testClassname**](docs/Api/FakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case
-*PetApi* | [**addPet**](docs/Api/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
-*PetApi* | [**deletePet**](docs/Api/PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
-*PetApi* | [**findPetsByStatus**](docs/Api/PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
-*PetApi* | [**findPetsByTags**](docs/Api/PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
-*PetApi* | [**getPetById**](docs/Api/PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
-*PetApi* | [**updatePet**](docs/Api/PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
-*PetApi* | [**updatePetWithForm**](docs/Api/PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
-*PetApi* | [**uploadFile**](docs/Api/PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
-*PetApi* | [**uploadFileWithRequiredFile**](docs/Api/PetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-*StoreApi* | [**deleteOrder**](docs/Api/StoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-*StoreApi* | [**getInventory**](docs/Api/StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**getOrderById**](docs/Api/StoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID
-*StoreApi* | [**placeOrder**](docs/Api/StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
-*UserApi* | [**createUser**](docs/Api/UserApi.md#createuser) | **POST** /user | Create user
-*UserApi* | [**createUsersWithArrayInput**](docs/Api/UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
-*UserApi* | [**createUsersWithListInput**](docs/Api/UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
-*UserApi* | [**deleteUser**](docs/Api/UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
-*UserApi* | [**getUserByName**](docs/Api/UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
-*UserApi* | [**loginUser**](docs/Api/UserApi.md#loginuser) | **GET** /user/login | Logs user into the system
-*UserApi* | [**logoutUser**](docs/Api/UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
-*UserApi* | [**updateUser**](docs/Api/UserApi.md#updateuser) | **PUT** /user/{username} | Updated user
-
-
-## Documentation For Models
-
- - [AdditionalPropertiesClass](docs/Model/AdditionalPropertiesClass.md)
- - [Animal](docs/Model/Animal.md)
- - [ApiResponse](docs/Model/ApiResponse.md)
- - [ArrayOfArrayOfNumberOnly](docs/Model/ArrayOfArrayOfNumberOnly.md)
- - [ArrayOfNumberOnly](docs/Model/ArrayOfNumberOnly.md)
- - [ArrayTest](docs/Model/ArrayTest.md)
- - [Capitalization](docs/Model/Capitalization.md)
- - [Cat](docs/Model/Cat.md)
- - [CatAllOf](docs/Model/CatAllOf.md)
- - [Category](docs/Model/Category.md)
- - [ClassModel](docs/Model/ClassModel.md)
- - [Client](docs/Model/Client.md)
- - [Dog](docs/Model/Dog.md)
- - [DogAllOf](docs/Model/DogAllOf.md)
- - [EnumArrays](docs/Model/EnumArrays.md)
- - [EnumClass](docs/Model/EnumClass.md)
- - [EnumTest](docs/Model/EnumTest.md)
- - [File](docs/Model/File.md)
- - [FileSchemaTestClass](docs/Model/FileSchemaTestClass.md)
- - [Foo](docs/Model/Foo.md)
- - [FormatTest](docs/Model/FormatTest.md)
- - [HasOnlyReadOnly](docs/Model/HasOnlyReadOnly.md)
- - [HealthCheckResult](docs/Model/HealthCheckResult.md)
- - [InlineObject](docs/Model/InlineObject.md)
- - [InlineObject1](docs/Model/InlineObject1.md)
- - [InlineObject2](docs/Model/InlineObject2.md)
- - [InlineObject3](docs/Model/InlineObject3.md)
- - [InlineObject4](docs/Model/InlineObject4.md)
- - [InlineObject5](docs/Model/InlineObject5.md)
- - [InlineResponseDefault](docs/Model/InlineResponseDefault.md)
- - [MapTest](docs/Model/MapTest.md)
- - [MixedPropertiesAndAdditionalPropertiesClass](docs/Model/MixedPropertiesAndAdditionalPropertiesClass.md)
- - [Model200Response](docs/Model/Model200Response.md)
- - [ModelList](docs/Model/ModelList.md)
- - [ModelReturn](docs/Model/ModelReturn.md)
- - [Name](docs/Model/Name.md)
- - [NullableClass](docs/Model/NullableClass.md)
- - [NumberOnly](docs/Model/NumberOnly.md)
- - [Order](docs/Model/Order.md)
- - [OuterComposite](docs/Model/OuterComposite.md)
- - [OuterEnum](docs/Model/OuterEnum.md)
- - [OuterEnumDefaultValue](docs/Model/OuterEnumDefaultValue.md)
- - [OuterEnumInteger](docs/Model/OuterEnumInteger.md)
- - [OuterEnumIntegerDefaultValue](docs/Model/OuterEnumIntegerDefaultValue.md)
- - [Pet](docs/Model/Pet.md)
- - [ReadOnlyFirst](docs/Model/ReadOnlyFirst.md)
- - [SpecialModelName](docs/Model/SpecialModelName.md)
- - [Tag](docs/Model/Tag.md)
- - [User](docs/Model/User.md)
-
-
-## Documentation For Authorization
-
-
-
-## api_key
-
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
-
-
-
-## api_key_query
-
-
-- **Type**: API key
-- **API key parameter name**: api_key_query
-- **Location**: URL query string
-
-
-
-
-## bearer_test
-
-
-- **Type**: Bearer authentication (JWT)
-
-
-
-## http_basic_test
-
-
-- **Type**: HTTP basic authentication
-
-
-
-## http_signature_test
-
-
-
-
-## petstore_auth
-
-
-- **Type**: OAuth
-- **Flow**: implicit
-- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
-- **Scopes**: 
-- **write:pets**: modify pets in your account
-- **read:pets**: read your pets
-
-
-## Author
-
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/composer.json b/samples/openapi3/client/petstore/php/OpenAPIClient-php/composer.json
deleted file mode 100644
index 4ca57f24d544..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "GIT_USER_ID/GIT_REPO_ID",
-    "description": "This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\",
-    "keywords": [
-        "openapitools",
-        "openapi-generator",
-        "openapi",
-        "php",
-        "sdk",
-        "rest",
-        "api"
-    ],
-    "homepage": "https://openapi-generator.tech",
-    "license": "unlicense",
-    "authors": [
-        {
-            "name": "OpenAPI-Generator contributors",
-            "homepage": "https://openapi-generator.tech"
-        }
-    ],
-    "require": {
-        "php": ">=7.1",
-        "ext-curl": "*",
-        "ext-json": "*",
-        "ext-mbstring": "*",
-        "guzzlehttp/guzzle": "^6.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^7.4",
-        "friendsofphp/php-cs-fixer": "^2.12"
-    },
-    "autoload": {
-        "psr-4": { "OpenAPI\\Client\\" : "lib/" }
-    },
-    "autoload-dev": {
-        "psr-4": { "OpenAPI\\Client\\" : "test/" }
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/AnotherFakeApi.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/AnotherFakeApi.md
deleted file mode 100644
index 1ff76b69457c..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/AnotherFakeApi.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# OpenAPI\Client\AnotherFakeApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**call123TestSpecialTags**](AnotherFakeApi.md#call123TestSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
-
-
-
-## call123TestSpecialTags
-
-> \OpenAPI\Client\Model\Client call123TestSpecialTags($client)
-
-To test special tags
-
-To test special tags and operation ID starting with number
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\AnotherFakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$client = new \OpenAPI\Client\Model\Client(); // \OpenAPI\Client\Model\Client | client model
-
-try {
-    $result = $apiInstance->call123TestSpecialTags($client);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling AnotherFakeApi->call123TestSpecialTags: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **client** | [**\OpenAPI\Client\Model\Client**](../Model/Client.md)| client model |
-
-### Return type
-
-[**\OpenAPI\Client\Model\Client**](../Model/Client.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/DefaultApi.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/DefaultApi.md
deleted file mode 100644
index eff99ef159d0..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/DefaultApi.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# OpenAPI\Client\DefaultApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**fooGet**](DefaultApi.md#fooGet) | **GET** /foo | 
-
-
-
-## fooGet
-
-> \OpenAPI\Client\Model\InlineResponseDefault fooGet()
-
-
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\DefaultApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-
-try {
-    $result = $apiInstance->fooGet();
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling DefaultApi->fooGet: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-This endpoint does not need any parameter.
-
-### Return type
-
-[**\OpenAPI\Client\Model\InlineResponseDefault**](../Model/InlineResponseDefault.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md
deleted file mode 100644
index 5046a502e194..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md
+++ /dev/null
@@ -1,923 +0,0 @@
-# OpenAPI\Client\FakeApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**fakeHealthGet**](FakeApi.md#fakeHealthGet) | **GET** /fake/health | Health check endpoint
-[**fakeHttpSignatureTest**](FakeApi.md#fakeHttpSignatureTest) | **GET** /fake/http-signature-test | test http signature authentication
-[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
-[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
-[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
-[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
-[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
-[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
-[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
-[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
-[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
-[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
-[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters | 
-
-
-
-## fakeHealthGet
-
-> \OpenAPI\Client\Model\HealthCheckResult fakeHealthGet()
-
-Health check endpoint
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-
-try {
-    $result = $apiInstance->fakeHealthGet();
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->fakeHealthGet: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-This endpoint does not need any parameter.
-
-### Return type
-
-[**\OpenAPI\Client\Model\HealthCheckResult**](../Model/HealthCheckResult.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## fakeHttpSignatureTest
-
-> fakeHttpSignatureTest($pet, $query_1, $header_1)
-
-test http signature authentication
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-$pet = new \OpenAPI\Client\Model\Pet(); // \OpenAPI\Client\Model\Pet | Pet object that needs to be added to the store
-$query_1 = 'query_1_example'; // string | query parameter
-$header_1 = 'header_1_example'; // string | header parameter
-
-try {
-    $apiInstance->fakeHttpSignatureTest($pet, $query_1, $header_1);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->fakeHttpSignatureTest: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet** | [**\OpenAPI\Client\Model\Pet**](../Model/Pet.md)| Pet object that needs to be added to the store |
- **query_1** | **string**| query parameter | [optional]
- **header_1** | **string**| header parameter | [optional]
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[http_signature_test](../../README.md#http_signature_test)
-
-### HTTP request headers
-
-- **Content-Type**: application/json, application/xml
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## fakeOuterBooleanSerialize
-
-> bool fakeOuterBooleanSerialize($body)
-
-
-
-Test serialization of outer boolean types
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$body = True; // bool | Input boolean as post body
-
-try {
-    $result = $apiInstance->fakeOuterBooleanSerialize($body);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->fakeOuterBooleanSerialize: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | **bool**| Input boolean as post body | [optional]
-
-### Return type
-
-**bool**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: */*
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## fakeOuterCompositeSerialize
-
-> \OpenAPI\Client\Model\OuterComposite fakeOuterCompositeSerialize($outer_composite)
-
-
-
-Test serialization of object with outer number type
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$outer_composite = new \OpenAPI\Client\Model\OuterComposite(); // \OpenAPI\Client\Model\OuterComposite | Input composite as post body
-
-try {
-    $result = $apiInstance->fakeOuterCompositeSerialize($outer_composite);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->fakeOuterCompositeSerialize: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **outer_composite** | [**\OpenAPI\Client\Model\OuterComposite**](../Model/OuterComposite.md)| Input composite as post body | [optional]
-
-### Return type
-
-[**\OpenAPI\Client\Model\OuterComposite**](../Model/OuterComposite.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: */*
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## fakeOuterNumberSerialize
-
-> float fakeOuterNumberSerialize($body)
-
-
-
-Test serialization of outer number types
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$body = 3.4; // float | Input number as post body
-
-try {
-    $result = $apiInstance->fakeOuterNumberSerialize($body);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->fakeOuterNumberSerialize: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | **float**| Input number as post body | [optional]
-
-### Return type
-
-**float**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: */*
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## fakeOuterStringSerialize
-
-> string fakeOuterStringSerialize($body)
-
-
-
-Test serialization of outer string types
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$body = 'body_example'; // string | Input string as post body
-
-try {
-    $result = $apiInstance->fakeOuterStringSerialize($body);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->fakeOuterStringSerialize: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | **string**| Input string as post body | [optional]
-
-### Return type
-
-**string**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: */*
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## testBodyWithFileSchema
-
-> testBodyWithFileSchema($file_schema_test_class)
-
-
-
-For this test, the body for this request much reference a schema named `File`.
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$file_schema_test_class = new \OpenAPI\Client\Model\FileSchemaTestClass(); // \OpenAPI\Client\Model\FileSchemaTestClass | 
-
-try {
-    $apiInstance->testBodyWithFileSchema($file_schema_test_class);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->testBodyWithFileSchema: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **file_schema_test_class** | [**\OpenAPI\Client\Model\FileSchemaTestClass**](../Model/FileSchemaTestClass.md)|  |
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## testBodyWithQueryParams
-
-> testBodyWithQueryParams($query, $user)
-
-
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$query = 'query_example'; // string | 
-$user = new \OpenAPI\Client\Model\User(); // \OpenAPI\Client\Model\User | 
-
-try {
-    $apiInstance->testBodyWithQueryParams($query, $user);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->testBodyWithQueryParams: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **query** | **string**|  |
- **user** | [**\OpenAPI\Client\Model\User**](../Model/User.md)|  |
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## testClientModel
-
-> \OpenAPI\Client\Model\Client testClientModel($client)
-
-To test \"client\" model
-
-To test \"client\" model
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$client = new \OpenAPI\Client\Model\Client(); // \OpenAPI\Client\Model\Client | client model
-
-try {
-    $result = $apiInstance->testClientModel($client);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->testClientModel: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **client** | [**\OpenAPI\Client\Model\Client**](../Model/Client.md)| client model |
-
-### Return type
-
-[**\OpenAPI\Client\Model\Client**](../Model/Client.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## testEndpointParameters
-
-> testEndpointParameters($number, $double, $pattern_without_delimiter, $byte, $integer, $int32, $int64, $float, $string, $binary, $date, $date_time, $password, $callback)
-
-Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
-
-Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-// Configure HTTP basic authorization: http_basic_test
-$config = OpenAPI\Client\Configuration::getDefaultConfiguration()
-              ->setUsername('YOUR_USERNAME')
-              ->setPassword('YOUR_PASSWORD');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-$number = 3.4; // float | None
-$double = 3.4; // double | None
-$pattern_without_delimiter = 'pattern_without_delimiter_example'; // string | None
-$byte = 'byte_example'; // string | None
-$integer = 56; // int | None
-$int32 = 56; // int | None
-$int64 = 56; // int | None
-$float = 3.4; // float | None
-$string = 'string_example'; // string | None
-$binary = "/path/to/file.txt"; // \SplFileObject | None
-$date = new \DateTime("2013-10-20T19:20:30+01:00"); // \DateTime | None
-$date_time = new \DateTime("2013-10-20T19:20:30+01:00"); // \DateTime | None
-$password = 'password_example'; // string | None
-$callback = 'callback_example'; // string | None
-
-try {
-    $apiInstance->testEndpointParameters($number, $double, $pattern_without_delimiter, $byte, $integer, $int32, $int64, $float, $string, $binary, $date, $date_time, $password, $callback);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->testEndpointParameters: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **number** | **float**| None |
- **double** | **double**| None |
- **pattern_without_delimiter** | **string**| None |
- **byte** | **string**| None |
- **integer** | **int**| None | [optional]
- **int32** | **int**| None | [optional]
- **int64** | **int**| None | [optional]
- **float** | **float**| None | [optional]
- **string** | **string**| None | [optional]
- **binary** | **\SplFileObject****\SplFileObject**| None | [optional]
- **date** | **\DateTime**| None | [optional]
- **date_time** | **\DateTime**| None | [optional]
- **password** | **string**| None | [optional]
- **callback** | **string**| None | [optional]
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[http_basic_test](../../README.md#http_basic_test)
-
-### HTTP request headers
-
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## testEnumParameters
-
-> testEnumParameters($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string)
-
-To test enum parameters
-
-To test enum parameters
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$enum_header_string_array = array('enum_header_string_array_example'); // string[] | Header parameter enum test (string array)
-$enum_header_string = '-efg'; // string | Header parameter enum test (string)
-$enum_query_string_array = array('enum_query_string_array_example'); // string[] | Query parameter enum test (string array)
-$enum_query_string = '-efg'; // string | Query parameter enum test (string)
-$enum_query_integer = 56; // int | Query parameter enum test (double)
-$enum_query_double = 3.4; // double | Query parameter enum test (double)
-$enum_form_string_array = '$'; // string[] | Form parameter enum test (string array)
-$enum_form_string = '-efg'; // string | Form parameter enum test (string)
-
-try {
-    $apiInstance->testEnumParameters($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->testEnumParameters: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **enum_header_string_array** | [**string[]**](../Model/string.md)| Header parameter enum test (string array) | [optional]
- **enum_header_string** | **string**| Header parameter enum test (string) | [optional] [default to &#39;-efg&#39;]
- **enum_query_string_array** | [**string[]**](../Model/string.md)| Query parameter enum test (string array) | [optional]
- **enum_query_string** | **string**| Query parameter enum test (string) | [optional] [default to &#39;-efg&#39;]
- **enum_query_integer** | **int**| Query parameter enum test (double) | [optional]
- **enum_query_double** | **double**| Query parameter enum test (double) | [optional]
- **enum_form_string_array** | [**string[]**](../Model/string.md)| Form parameter enum test (string array) | [optional] [default to &#39;$&#39;]
- **enum_form_string** | **string**| Form parameter enum test (string) | [optional] [default to &#39;-efg&#39;]
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## testGroupParameters
-
-> testGroupParameters($required_string_group, $required_boolean_group, $required_int64_group, $string_group, $boolean_group, $int64_group)
-
-Fake endpoint to test group parameters (optional)
-
-Fake endpoint to test group parameters (optional)
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-// Configure Bearer (JWT) authorization: bearer_test
-$config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-$associate_array['required_string_group'] = 56; // int | Required String in group parameters
-$associate_array['required_boolean_group'] = True; // bool | Required Boolean in group parameters
-$associate_array['required_int64_group'] = 56; // int | Required Integer in group parameters
-$associate_array['string_group'] = 56; // int | String in group parameters
-$associate_array['boolean_group'] = True; // bool | Boolean in group parameters
-$associate_array['int64_group'] = 56; // int | Integer in group parameters
-
-try {
-    $apiInstance->testGroupParameters($associate_array);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->testGroupParameters: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-Note: the input parameter is an associative array with the keys listed as the parameter name below.
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **required_string_group** | **int**| Required String in group parameters |
- **required_boolean_group** | **bool**| Required Boolean in group parameters |
- **required_int64_group** | **int**| Required Integer in group parameters |
- **string_group** | **int**| String in group parameters | [optional]
- **boolean_group** | **bool**| Boolean in group parameters | [optional]
- **int64_group** | **int**| Integer in group parameters | [optional]
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[bearer_test](../../README.md#bearer_test)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## testInlineAdditionalProperties
-
-> testInlineAdditionalProperties($request_body)
-
-test inline additionalProperties
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$request_body = array('key' => 'request_body_example'); // map[string,string] | request body
-
-try {
-    $apiInstance->testInlineAdditionalProperties($request_body);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->testInlineAdditionalProperties: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **request_body** | [**map[string,string]**](../Model/string.md)| request body |
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## testJsonFormData
-
-> testJsonFormData($param, $param2)
-
-test json serialization of form data
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$param = 'param_example'; // string | field1
-$param2 = 'param2_example'; // string | field2
-
-try {
-    $apiInstance->testJsonFormData($param, $param2);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->testJsonFormData: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **param** | **string**| field1 |
- **param2** | **string**| field2 |
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## testQueryParameterCollectionFormat
-
-> testQueryParameterCollectionFormat($pipe, $ioutil, $http, $url, $context)
-
-
-
-To test the collection format in query parameters
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$pipe = array('pipe_example'); // string[] | 
-$ioutil = array('ioutil_example'); // string[] | 
-$http = array('http_example'); // string[] | 
-$url = array('url_example'); // string[] | 
-$context = array('context_example'); // string[] | 
-
-try {
-    $apiInstance->testQueryParameterCollectionFormat($pipe, $ioutil, $http, $url, $context);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeApi->testQueryParameterCollectionFormat: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pipe** | [**string[]**](../Model/string.md)|  |
- **ioutil** | [**string[]**](../Model/string.md)|  |
- **http** | [**string[]**](../Model/string.md)|  |
- **url** | [**string[]**](../Model/string.md)|  |
- **context** | [**string[]**](../Model/string.md)|  |
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeClassnameTags123Api.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeClassnameTags123Api.md
deleted file mode 100644
index 3faeaf3043ae..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeClassnameTags123Api.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# OpenAPI\Client\FakeClassnameTags123Api
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
-
-
-
-## testClassname
-
-> \OpenAPI\Client\Model\Client testClassname($client)
-
-To test class name in snake case
-
-To test class name in snake case
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-// Configure API key authorization: api_key_query
-$config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setApiKey('api_key_query', 'YOUR_API_KEY');
-// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-// $config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('api_key_query', 'Bearer');
-
-
-$apiInstance = new OpenAPI\Client\Api\FakeClassnameTags123Api(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-$client = new \OpenAPI\Client\Model\Client(); // \OpenAPI\Client\Model\Client | client model
-
-try {
-    $result = $apiInstance->testClassname($client);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling FakeClassnameTags123Api->testClassname: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **client** | [**\OpenAPI\Client\Model\Client**](../Model/Client.md)| client model |
-
-### Return type
-
-[**\OpenAPI\Client\Model\Client**](../Model/Client.md)
-
-### Authorization
-
-[api_key_query](../../README.md#api_key_query)
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/PetApi.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/PetApi.md
deleted file mode 100644
index d96e2f2fb9b0..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/PetApi.md
+++ /dev/null
@@ -1,566 +0,0 @@
-# OpenAPI\Client\PetApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
-[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
-[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
-[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
-[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
-[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
-[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
-[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
-[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-
-
-
-## addPet
-
-> addPet($pet)
-
-Add a new pet to the store
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-// Configure OAuth2 access token for authorization: petstore_auth
-$config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-
-$apiInstance = new OpenAPI\Client\Api\PetApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-$pet = new \OpenAPI\Client\Model\Pet(); // \OpenAPI\Client\Model\Pet | Pet object that needs to be added to the store
-
-try {
-    $apiInstance->addPet($pet);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->addPet: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet** | [**\OpenAPI\Client\Model\Pet**](../Model/Pet.md)| Pet object that needs to be added to the store |
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[petstore_auth](../../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: application/json, application/xml
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## deletePet
-
-> deletePet($pet_id, $api_key)
-
-Deletes a pet
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-// Configure OAuth2 access token for authorization: petstore_auth
-$config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-
-$apiInstance = new OpenAPI\Client\Api\PetApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-$pet_id = 56; // int | Pet id to delete
-$api_key = 'api_key_example'; // string | 
-
-try {
-    $apiInstance->deletePet($pet_id, $api_key);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->deletePet: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet_id** | **int**| Pet id to delete |
- **api_key** | **string**|  | [optional]
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[petstore_auth](../../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## findPetsByStatus
-
-> \OpenAPI\Client\Model\Pet[] findPetsByStatus($status)
-
-Finds Pets by status
-
-Multiple status values can be provided with comma separated strings
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-// Configure OAuth2 access token for authorization: petstore_auth
-$config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-
-$apiInstance = new OpenAPI\Client\Api\PetApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-$status = array('status_example'); // string[] | Status values that need to be considered for filter
-
-try {
-    $result = $apiInstance->findPetsByStatus($status);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->findPetsByStatus: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **status** | [**string[]**](../Model/string.md)| Status values that need to be considered for filter |
-
-### Return type
-
-[**\OpenAPI\Client\Model\Pet[]**](../Model/Pet.md)
-
-### Authorization
-
-[petstore_auth](../../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## findPetsByTags
-
-> \OpenAPI\Client\Model\Pet[] findPetsByTags($tags)
-
-Finds Pets by tags
-
-Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-// Configure OAuth2 access token for authorization: petstore_auth
-$config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-
-$apiInstance = new OpenAPI\Client\Api\PetApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-$tags = array('tags_example'); // string[] | Tags to filter by
-
-try {
-    $result = $apiInstance->findPetsByTags($tags);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->findPetsByTags: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **tags** | [**string[]**](../Model/string.md)| Tags to filter by |
-
-### Return type
-
-[**\OpenAPI\Client\Model\Pet[]**](../Model/Pet.md)
-
-### Authorization
-
-[petstore_auth](../../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## getPetById
-
-> \OpenAPI\Client\Model\Pet getPetById($pet_id)
-
-Find pet by ID
-
-Returns a single pet
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-// Configure API key authorization: api_key
-$config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setApiKey('api_key', 'YOUR_API_KEY');
-// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-// $config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('api_key', 'Bearer');
-
-
-$apiInstance = new OpenAPI\Client\Api\PetApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-$pet_id = 56; // int | ID of pet to return
-
-try {
-    $result = $apiInstance->getPetById($pet_id);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->getPetById: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet_id** | **int**| ID of pet to return |
-
-### Return type
-
-[**\OpenAPI\Client\Model\Pet**](../Model/Pet.md)
-
-### Authorization
-
-[api_key](../../README.md#api_key)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## updatePet
-
-> updatePet($pet)
-
-Update an existing pet
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-// Configure OAuth2 access token for authorization: petstore_auth
-$config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-
-$apiInstance = new OpenAPI\Client\Api\PetApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-$pet = new \OpenAPI\Client\Model\Pet(); // \OpenAPI\Client\Model\Pet | Pet object that needs to be added to the store
-
-try {
-    $apiInstance->updatePet($pet);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->updatePet: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet** | [**\OpenAPI\Client\Model\Pet**](../Model/Pet.md)| Pet object that needs to be added to the store |
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[petstore_auth](../../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: application/json, application/xml
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## updatePetWithForm
-
-> updatePetWithForm($pet_id, $name, $status)
-
-Updates a pet in the store with form data
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-// Configure OAuth2 access token for authorization: petstore_auth
-$config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-
-$apiInstance = new OpenAPI\Client\Api\PetApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-$pet_id = 56; // int | ID of pet that needs to be updated
-$name = 'name_example'; // string | Updated name of the pet
-$status = 'status_example'; // string | Updated status of the pet
-
-try {
-    $apiInstance->updatePetWithForm($pet_id, $name, $status);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->updatePetWithForm: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet_id** | **int**| ID of pet that needs to be updated |
- **name** | **string**| Updated name of the pet | [optional]
- **status** | **string**| Updated status of the pet | [optional]
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[petstore_auth](../../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: application/x-www-form-urlencoded
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## uploadFile
-
-> \OpenAPI\Client\Model\ApiResponse uploadFile($pet_id, $additional_metadata, $file)
-
-uploads an image
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-// Configure OAuth2 access token for authorization: petstore_auth
-$config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-
-$apiInstance = new OpenAPI\Client\Api\PetApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-$pet_id = 56; // int | ID of pet to update
-$additional_metadata = 'additional_metadata_example'; // string | Additional data to pass to server
-$file = "/path/to/file.txt"; // \SplFileObject | file to upload
-
-try {
-    $result = $apiInstance->uploadFile($pet_id, $additional_metadata, $file);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->uploadFile: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet_id** | **int**| ID of pet to update |
- **additional_metadata** | **string**| Additional data to pass to server | [optional]
- **file** | **\SplFileObject****\SplFileObject**| file to upload | [optional]
-
-### Return type
-
-[**\OpenAPI\Client\Model\ApiResponse**](../Model/ApiResponse.md)
-
-### Authorization
-
-[petstore_auth](../../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: multipart/form-data
-- **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## uploadFileWithRequiredFile
-
-> \OpenAPI\Client\Model\ApiResponse uploadFileWithRequiredFile($pet_id, $required_file, $additional_metadata)
-
-uploads an image (required)
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-// Configure OAuth2 access token for authorization: petstore_auth
-$config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-
-$apiInstance = new OpenAPI\Client\Api\PetApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-$pet_id = 56; // int | ID of pet to update
-$required_file = "/path/to/file.txt"; // \SplFileObject | file to upload
-$additional_metadata = 'additional_metadata_example'; // string | Additional data to pass to server
-
-try {
-    $result = $apiInstance->uploadFileWithRequiredFile($pet_id, $required_file, $additional_metadata);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->uploadFileWithRequiredFile: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet_id** | **int**| ID of pet to update |
- **required_file** | **\SplFileObject****\SplFileObject**| file to upload |
- **additional_metadata** | **string**| Additional data to pass to server | [optional]
-
-### Return type
-
-[**\OpenAPI\Client\Model\ApiResponse**](../Model/ApiResponse.md)
-
-### Authorization
-
-[petstore_auth](../../README.md#petstore_auth)
-
-### HTTP request headers
-
-- **Content-Type**: multipart/form-data
-- **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/StoreApi.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/StoreApi.md
deleted file mode 100644
index 318f68c2c6a0..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/StoreApi.md
+++ /dev/null
@@ -1,236 +0,0 @@
-# OpenAPI\Client\StoreApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
-[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
-[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
-
-
-
-## deleteOrder
-
-> deleteOrder($order_id)
-
-Delete purchase order by ID
-
-For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\StoreApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$order_id = 'order_id_example'; // string | ID of the order that needs to be deleted
-
-try {
-    $apiInstance->deleteOrder($order_id);
-} catch (Exception $e) {
-    echo 'Exception when calling StoreApi->deleteOrder: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **order_id** | **string**| ID of the order that needs to be deleted |
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## getInventory
-
-> map[string,int] getInventory()
-
-Returns pet inventories by status
-
-Returns a map of status codes to quantities
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-// Configure API key authorization: api_key
-$config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setApiKey('api_key', 'YOUR_API_KEY');
-// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-// $config = OpenAPI\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('api_key', 'Bearer');
-
-
-$apiInstance = new OpenAPI\Client\Api\StoreApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client(),
-    $config
-);
-
-try {
-    $result = $apiInstance->getInventory();
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling StoreApi->getInventory: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-This endpoint does not need any parameter.
-
-### Return type
-
-**map[string,int]**
-
-### Authorization
-
-[api_key](../../README.md#api_key)
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## getOrderById
-
-> \OpenAPI\Client\Model\Order getOrderById($order_id)
-
-Find purchase order by ID
-
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\StoreApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$order_id = 56; // int | ID of pet that needs to be fetched
-
-try {
-    $result = $apiInstance->getOrderById($order_id);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling StoreApi->getOrderById: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **order_id** | **int**| ID of pet that needs to be fetched |
-
-### Return type
-
-[**\OpenAPI\Client\Model\Order**](../Model/Order.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## placeOrder
-
-> \OpenAPI\Client\Model\Order placeOrder($order)
-
-Place an order for a pet
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\StoreApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$order = new \OpenAPI\Client\Model\Order(); // \OpenAPI\Client\Model\Order | order placed for purchasing the pet
-
-try {
-    $result = $apiInstance->placeOrder($order);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling StoreApi->placeOrder: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **order** | [**\OpenAPI\Client\Model\Order**](../Model/Order.md)| order placed for purchasing the pet |
-
-### Return type
-
-[**\OpenAPI\Client\Model\Order**](../Model/Order.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: application/xml, application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/UserApi.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/UserApi.md
deleted file mode 100644
index 0784a1645181..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/UserApi.md
+++ /dev/null
@@ -1,448 +0,0 @@
-# OpenAPI\Client\UserApi
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**createUser**](UserApi.md#createUser) | **POST** /user | Create user
-[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
-[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
-[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
-[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
-[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
-[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
-[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
-
-
-
-## createUser
-
-> createUser($user)
-
-Create user
-
-This can only be done by the logged in user.
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\UserApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$user = new \OpenAPI\Client\Model\User(); // \OpenAPI\Client\Model\User | Created user object
-
-try {
-    $apiInstance->createUser($user);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->createUser: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **user** | [**\OpenAPI\Client\Model\User**](../Model/User.md)| Created user object |
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## createUsersWithArrayInput
-
-> createUsersWithArrayInput($user)
-
-Creates list of users with given input array
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\UserApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$user = array(new \OpenAPI\Client\Model\User()); // \OpenAPI\Client\Model\User[] | List of user object
-
-try {
-    $apiInstance->createUsersWithArrayInput($user);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->createUsersWithArrayInput: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **user** | [**\OpenAPI\Client\Model\User[]**](../Model/User.md)| List of user object |
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## createUsersWithListInput
-
-> createUsersWithListInput($user)
-
-Creates list of users with given input array
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\UserApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$user = array(new \OpenAPI\Client\Model\User()); // \OpenAPI\Client\Model\User[] | List of user object
-
-try {
-    $apiInstance->createUsersWithListInput($user);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->createUsersWithListInput: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **user** | [**\OpenAPI\Client\Model\User[]**](../Model/User.md)| List of user object |
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## deleteUser
-
-> deleteUser($username)
-
-Delete user
-
-This can only be done by the logged in user.
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\UserApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$username = 'username_example'; // string | The name that needs to be deleted
-
-try {
-    $apiInstance->deleteUser($username);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->deleteUser: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **username** | **string**| The name that needs to be deleted |
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## getUserByName
-
-> \OpenAPI\Client\Model\User getUserByName($username)
-
-Get user by user name
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\UserApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$username = 'username_example'; // string | The name that needs to be fetched. Use user1 for testing.
-
-try {
-    $result = $apiInstance->getUserByName($username);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->getUserByName: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **username** | **string**| The name that needs to be fetched. Use user1 for testing. |
-
-### Return type
-
-[**\OpenAPI\Client\Model\User**](../Model/User.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## loginUser
-
-> string loginUser($username, $password)
-
-Logs user into the system
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\UserApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$username = 'username_example'; // string | The user name for login
-$password = 'password_example'; // string | The password for login in clear text
-
-try {
-    $result = $apiInstance->loginUser($username, $password);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->loginUser: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **username** | **string**| The user name for login |
- **password** | **string**| The password for login in clear text |
-
-### Return type
-
-**string**
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: application/xml, application/json
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## logoutUser
-
-> logoutUser()
-
-Logs out current logged in user session
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\UserApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-
-try {
-    $apiInstance->logoutUser();
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->logoutUser: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-This endpoint does not need any parameter.
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: Not defined
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
-
-## updateUser
-
-> updateUser($username, $user)
-
-Updated user
-
-This can only be done by the logged in user.
-
-### Example
-
-```php
-<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-
-$apiInstance = new OpenAPI\Client\Api\UserApi(
-    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
-    // This is optional, `GuzzleHttp\Client` will be used as default.
-    new GuzzleHttp\Client()
-);
-$username = 'username_example'; // string | name that need to be deleted
-$user = new \OpenAPI\Client\Model\User(); // \OpenAPI\Client\Model\User | Updated user object
-
-try {
-    $apiInstance->updateUser($username, $user);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->updateUser: ', $e->getMessage(), PHP_EOL;
-}
-?>
-```
-
-### Parameters
-
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **username** | **string**| name that need to be deleted |
- **user** | [**\OpenAPI\Client\Model\User**](../Model/User.md)| Updated user object |
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
-- **Content-Type**: application/json
-- **Accept**: Not defined
-
-[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints)
-[[Back to Model list]](../../README.md#documentation-for-models)
-[[Back to README]](../../README.md)
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/AdditionalPropertiesClass.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/AdditionalPropertiesClass.md
deleted file mode 100644
index 8c2be69f6945..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/AdditionalPropertiesClass.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # AdditionalPropertiesClass
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**map_property** | **map[string,string]** |  | [optional] 
-**map_of_map_property** | [**map[string,map[string,string]]**](map.md) |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Animal.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Animal.md
deleted file mode 100644
index 026fdd6a1d37..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Animal.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # Animal
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**class_name** | **string** |  | 
-**color** | **string** |  | [optional] [default to 'red']
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ApiResponse.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ApiResponse.md
deleted file mode 100644
index ad7e93b6f0a6..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ApiResponse.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# # ApiResponse
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**code** | **int** |  | [optional] 
-**type** | **string** |  | [optional] 
-**message** | **string** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayOfArrayOfNumberOnly.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayOfArrayOfNumberOnly.md
deleted file mode 100644
index 1b76031a82aa..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayOfArrayOfNumberOnly.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # ArrayOfArrayOfNumberOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**array_array_number** | [**float[][]**](array.md) |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayOfNumberOnly.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayOfNumberOnly.md
deleted file mode 100644
index 294930cb2b6b..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayOfNumberOnly.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # ArrayOfNumberOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**array_number** | **float[]** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayTest.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayTest.md
deleted file mode 100644
index a150d9cea0d4..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ArrayTest.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# # ArrayTest
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**array_of_string** | **string[]** |  | [optional] 
-**array_array_of_integer** | [**int[][]**](array.md) |  | [optional] 
-**array_array_of_model** | [**\OpenAPI\Client\Model\ReadOnlyFirst[][]**](array.md) |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Capitalization.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Capitalization.md
deleted file mode 100644
index 4166caadef96..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Capitalization.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# # Capitalization
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**small_camel** | **string** |  | [optional] 
-**capital_camel** | **string** |  | [optional] 
-**small_snake** | **string** |  | [optional] 
-**capital_snake** | **string** |  | [optional] 
-**sca_eth_flow_points** | **string** |  | [optional] 
-**att_name** | **string** | Name of the pet | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Cat.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Cat.md
deleted file mode 100644
index f9652f72ae15..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Cat.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # Cat
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**declawed** | **bool** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/CatAllOf.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/CatAllOf.md
deleted file mode 100644
index 0c5312a61449..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/CatAllOf.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # CatAllOf
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**declawed** | **bool** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Category.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Category.md
deleted file mode 100644
index eb71223a787c..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Category.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # Category
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **int** |  | [optional] 
-**name** | **string** |  | [default to 'default-name']
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ClassModel.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ClassModel.md
deleted file mode 100644
index b56b2fa26f6c..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ClassModel.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # ClassModel
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**_class** | **string** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Client.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Client.md
deleted file mode 100644
index c0f76ca86f2c..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Client.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # Client
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**client** | **string** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Dog.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Dog.md
deleted file mode 100644
index d3a9f50ef638..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Dog.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # Dog
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**breed** | **string** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/DogAllOf.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/DogAllOf.md
deleted file mode 100644
index 82f34a6e6c83..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/DogAllOf.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # DogAllOf
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**breed** | **string** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/EnumArrays.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/EnumArrays.md
deleted file mode 100644
index 231f4afc15f7..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/EnumArrays.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # EnumArrays
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**just_symbol** | **string** |  | [optional] 
-**array_enum** | **string[]** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/EnumClass.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/EnumClass.md
deleted file mode 100644
index dd38a0f0837e..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/EnumClass.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# # EnumClass
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/EnumTest.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/EnumTest.md
deleted file mode 100644
index 9a1ffa8a7e38..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/EnumTest.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# # EnumTest
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**enum_string** | **string** |  | [optional] 
-**enum_string_required** | **string** |  | 
-**enum_integer** | **int** |  | [optional] 
-**enum_number** | **double** |  | [optional] 
-**outer_enum** | [**\OpenAPI\Client\Model\OuterEnum**](OuterEnum.md) |  | [optional] 
-**outer_enum_integer** | [**\OpenAPI\Client\Model\OuterEnumInteger**](OuterEnumInteger.md) |  | [optional] 
-**outer_enum_default_value** | [**\OpenAPI\Client\Model\OuterEnumDefaultValue**](OuterEnumDefaultValue.md) |  | [optional] 
-**outer_enum_integer_default_value** | [**\OpenAPI\Client\Model\OuterEnumIntegerDefaultValue**](OuterEnumIntegerDefaultValue.md) |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/File.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/File.md
deleted file mode 100644
index 77c48da80316..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/File.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # File
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**source_uri** | **string** | Test capitalization | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/FileSchemaTestClass.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/FileSchemaTestClass.md
deleted file mode 100644
index b8c5ea236b0b..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/FileSchemaTestClass.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # FileSchemaTestClass
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**file** | [**\OpenAPI\Client\Model\File**](File.md) |  | [optional] 
-**files** | [**\OpenAPI\Client\Model\File[]**](File.md) |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Foo.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Foo.md
deleted file mode 100644
index 9acc83cb6fa6..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Foo.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # Foo
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**bar** | **string** |  | [optional] [default to 'bar']
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/FormatTest.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/FormatTest.md
deleted file mode 100644
index b0b8785234a1..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/FormatTest.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# # FormatTest
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**integer** | **int** |  | [optional] 
-**int32** | **int** |  | [optional] 
-**int64** | **int** |  | [optional] 
-**number** | **float** |  | 
-**float** | **float** |  | [optional] 
-**double** | **double** |  | [optional] 
-**string** | **string** |  | [optional] 
-**byte** | **string** |  | 
-**binary** | [**\SplFileObject**](\SplFileObject.md) |  | [optional] 
-**date** | [**\DateTime**](\DateTime.md) |  | 
-**date_time** | [**\DateTime**](\DateTime.md) |  | [optional] 
-**uuid** | **string** |  | [optional] 
-**password** | **string** |  | 
-**pattern_with_digits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] 
-**pattern_with_digits_and_delimiter** | **string** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/HasOnlyReadOnly.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/HasOnlyReadOnly.md
deleted file mode 100644
index 3f4d729d5624..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/HasOnlyReadOnly.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # HasOnlyReadOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**bar** | **string** |  | [optional] [readonly] 
-**foo** | **string** |  | [optional] [readonly] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject.md
deleted file mode 100644
index b21b3c6d8877..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # InlineObject
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **string** | Updated name of the pet | [optional] 
-**status** | **string** | Updated status of the pet | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject1.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject1.md
deleted file mode 100644
index 25eb866417bc..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject1.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # InlineObject1
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**additional_metadata** | **string** | Additional data to pass to server | [optional] 
-**file** | [**\SplFileObject**](\SplFileObject.md) | file to upload | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject2.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject2.md
deleted file mode 100644
index a862611a011c..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject2.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # InlineObject2
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**enum_form_string_array** | **string[]** | Form parameter enum test (string array) | [optional] 
-**enum_form_string** | **string** | Form parameter enum test (string) | [optional] [default to '-efg']
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject3.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject3.md
deleted file mode 100644
index 8cd0a80c044c..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject3.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# # InlineObject3
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**integer** | **int** | None | [optional] 
-**int32** | **int** | None | [optional] 
-**int64** | **int** | None | [optional] 
-**number** | **float** | None | 
-**float** | **float** | None | [optional] 
-**double** | **double** | None | 
-**string** | **string** | None | [optional] 
-**pattern_without_delimiter** | **string** | None | 
-**byte** | **string** | None | 
-**binary** | [**\SplFileObject**](\SplFileObject.md) | None | [optional] 
-**date** | [**\DateTime**](\DateTime.md) | None | [optional] 
-**date_time** | [**\DateTime**](\DateTime.md) | None | [optional] 
-**password** | **string** | None | [optional] 
-**callback** | **string** | None | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject4.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject4.md
deleted file mode 100644
index 6a940e80aca1..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject4.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # InlineObject4
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**param** | **string** | field1 | 
-**param2** | **string** | field2 | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject5.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject5.md
deleted file mode 100644
index 240eb36860c6..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineObject5.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # InlineObject5
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**additional_metadata** | **string** | Additional data to pass to server | [optional] 
-**required_file** | [**\SplFileObject**](\SplFileObject.md) | file to upload | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineResponseDefault.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineResponseDefault.md
deleted file mode 100644
index a00c32479623..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/InlineResponseDefault.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # InlineResponseDefault
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**string** | [**\OpenAPI\Client\Model\Foo**](Foo.md) |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/MapTest.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/MapTest.md
deleted file mode 100644
index 221e7ce7139b..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/MapTest.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# # MapTest
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**map_map_of_string** | [**map[string,map[string,string]]**](map.md) |  | [optional] 
-**map_of_enum_string** | **map[string,string]** |  | [optional] 
-**direct_map** | **map[string,bool]** |  | [optional] 
-**indirect_map** | **map[string,bool]** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/MixedPropertiesAndAdditionalPropertiesClass.md
deleted file mode 100644
index a8ea4f7a193e..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/MixedPropertiesAndAdditionalPropertiesClass.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# # MixedPropertiesAndAdditionalPropertiesClass
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**uuid** | **string** |  | [optional] 
-**date_time** | [**\DateTime**](\DateTime.md) |  | [optional] 
-**map** | [**map[string,\OpenAPI\Client\Model\Animal]**](Animal.md) |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Model200Response.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Model200Response.md
deleted file mode 100644
index 7e2a475f327f..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Model200Response.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # Model200Response
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **int** |  | [optional] 
-**class** | **string** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ModelList.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ModelList.md
deleted file mode 100644
index 5c8d3be7d080..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ModelList.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # ModelList
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**_123_list** | **string** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ModelReturn.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ModelReturn.md
deleted file mode 100644
index a1b0105d3a95..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ModelReturn.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # ModelReturn
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**return** | **int** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Name.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Name.md
deleted file mode 100644
index a501f9bb0d51..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Name.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# # Name
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **int** |  | 
-**snake_case** | **int** |  | [optional] [readonly] 
-**property** | **string** |  | [optional] 
-**_123_number** | **int** |  | [optional] [readonly] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/NumberOnly.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/NumberOnly.md
deleted file mode 100644
index 9495c7bafb86..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/NumberOnly.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # NumberOnly
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**just_number** | **float** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Order.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Order.md
deleted file mode 100644
index 78509578e216..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Order.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# # Order
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **int** |  | [optional] 
-**pet_id** | **int** |  | [optional] 
-**quantity** | **int** |  | [optional] 
-**ship_date** | [**\DateTime**](\DateTime.md) |  | [optional] 
-**status** | **string** | Order Status | [optional] 
-**complete** | **bool** |  | [optional] [default to false]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterComposite.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterComposite.md
deleted file mode 100644
index e17e22f1c5c3..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterComposite.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# # OuterComposite
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**my_number** | **float** |  | [optional] 
-**my_string** | **string** |  | [optional] 
-**my_boolean** | **bool** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnum.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnum.md
deleted file mode 100644
index 8e65cbf70bb0..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnum.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# # OuterEnum
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Pet.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Pet.md
deleted file mode 100644
index bb2421ea9d6c..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Pet.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# # Pet
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **int** |  | [optional] 
-**category** | [**\OpenAPI\Client\Model\Category**](Category.md) |  | [optional] 
-**name** | **string** |  | 
-**photo_urls** | **string[]** |  | 
-**tags** | [**\OpenAPI\Client\Model\Tag[]**](Tag.md) |  | [optional] 
-**status** | **string** | pet status in the store | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ReadOnlyFirst.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ReadOnlyFirst.md
deleted file mode 100644
index 40bf46c3ed8c..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/ReadOnlyFirst.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # ReadOnlyFirst
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**bar** | **string** |  | [optional] [readonly] 
-**baz** | **string** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/SpecialModelName.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/SpecialModelName.md
deleted file mode 100644
index 55e145b79f00..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/SpecialModelName.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# # SpecialModelName
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**special_property_name** | **int** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Tag.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Tag.md
deleted file mode 100644
index b564d27f7486..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Tag.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# # Tag
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **int** |  | [optional] 
-**name** | **string** |  | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/User.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/User.md
deleted file mode 100644
index 22ca738723be..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/User.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# # User
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**id** | **int** |  | [optional] 
-**username** | **string** |  | [optional] 
-**first_name** | **string** |  | [optional] 
-**last_name** | **string** |  | [optional] 
-**email** | **string** |  | [optional] 
-**password** | **string** |  | [optional] 
-**phone** | **string** |  | [optional] 
-**user_status** | **int** | User Status | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
deleted file mode 100644
index e315235789e3..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
+++ /dev/null
@@ -1,404 +0,0 @@
-<?php
-/**
- * AnotherFakeApi
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Api;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Psr7\MultipartStream;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\RequestOptions;
-use OpenAPI\Client\ApiException;
-use OpenAPI\Client\Configuration;
-use OpenAPI\Client\HeaderSelector;
-use OpenAPI\Client\ObjectSerializer;
-
-/**
- * AnotherFakeApi Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class AnotherFakeApi
-{
-    /**
-     * @var ClientInterface
-     */
-    protected $client;
-
-    /**
-     * @var Configuration
-     */
-    protected $config;
-
-    /**
-     * @var HeaderSelector
-     */
-    protected $headerSelector;
-
-    /**
-     * @var int Host index
-     */
-    protected $hostIndex;
-
-    /**
-     * @param ClientInterface $client
-     * @param Configuration   $config
-     * @param HeaderSelector  $selector
-     * @param int             $host_index (Optional) host index to select the list of hosts if defined in the OpenAPI spec
-     */
-    public function __construct(
-        ClientInterface $client = null,
-        Configuration $config = null,
-        HeaderSelector $selector = null,
-        $host_index = 0
-    ) {
-        $this->client = $client ?: new Client();
-        $this->config = $config ?: new Configuration();
-        $this->headerSelector = $selector ?: new HeaderSelector();
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Set the host index
-     *
-     * @param  int Host index (required)
-     */
-    public function setHostIndex($host_index)
-    {
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Get the host index
-     *
-     * @return Host index
-     */
-    public function getHostIndex()
-    {
-        return $this->hostIndex;
-    }
-
-    /**
-     * @return Configuration
-     */
-    public function getConfig()
-    {
-        return $this->config;
-    }
-
-    /**
-     * Operation call123TestSpecialTags
-     *
-     * To test special tags
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\Client
-     */
-    public function call123TestSpecialTags($client)
-    {
-        list($response) = $this->call123TestSpecialTagsWithHttpInfo($client);
-        return $response;
-    }
-
-    /**
-     * Operation call123TestSpecialTagsWithHttpInfo
-     *
-     * To test special tags
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\Client, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function call123TestSpecialTagsWithHttpInfo($client)
-    {
-        $request = $this->call123TestSpecialTagsRequest($client);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('\OpenAPI\Client\Model\Client' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\Client', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\Client';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\Client',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation call123TestSpecialTagsAsync
-     *
-     * To test special tags
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function call123TestSpecialTagsAsync($client)
-    {
-        return $this->call123TestSpecialTagsAsyncWithHttpInfo($client)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation call123TestSpecialTagsAsyncWithHttpInfo
-     *
-     * To test special tags
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function call123TestSpecialTagsAsyncWithHttpInfo($client)
-    {
-        $returnType = '\OpenAPI\Client\Model\Client';
-        $request = $this->call123TestSpecialTagsRequest($client);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'call123TestSpecialTags'
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function call123TestSpecialTagsRequest($client)
-    {
-        // verify the required parameter 'client' is set
-        if ($client === null || (is_array($client) && count($client) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $client when calling call123TestSpecialTags'
-            );
-        }
-
-        $resourcePath = '/another-fake/dummy';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($client)) {
-            $_tempBody = $client;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/json'],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'PATCH',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Create http client option
-     *
-     * @throws \RuntimeException on file opening failure
-     * @return array of http client options
-     */
-    protected function createHttpClientOption()
-    {
-        $options = [];
-        if ($this->config->getDebug()) {
-            $options[RequestOptions::DEBUG] = fopen($this->config->getDebugFile(), 'a');
-            if (!$options[RequestOptions::DEBUG]) {
-                throw new \RuntimeException('Failed to open the debug file: ' . $this->config->getDebugFile());
-            }
-        }
-
-        return $options;
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
deleted file mode 100644
index 8df52da4e9ba..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
+++ /dev/null
@@ -1,386 +0,0 @@
-<?php
-/**
- * DefaultApi
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Api;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Psr7\MultipartStream;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\RequestOptions;
-use OpenAPI\Client\ApiException;
-use OpenAPI\Client\Configuration;
-use OpenAPI\Client\HeaderSelector;
-use OpenAPI\Client\ObjectSerializer;
-
-/**
- * DefaultApi Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class DefaultApi
-{
-    /**
-     * @var ClientInterface
-     */
-    protected $client;
-
-    /**
-     * @var Configuration
-     */
-    protected $config;
-
-    /**
-     * @var HeaderSelector
-     */
-    protected $headerSelector;
-
-    /**
-     * @var int Host index
-     */
-    protected $hostIndex;
-
-    /**
-     * @param ClientInterface $client
-     * @param Configuration   $config
-     * @param HeaderSelector  $selector
-     * @param int             $host_index (Optional) host index to select the list of hosts if defined in the OpenAPI spec
-     */
-    public function __construct(
-        ClientInterface $client = null,
-        Configuration $config = null,
-        HeaderSelector $selector = null,
-        $host_index = 0
-    ) {
-        $this->client = $client ?: new Client();
-        $this->config = $config ?: new Configuration();
-        $this->headerSelector = $selector ?: new HeaderSelector();
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Set the host index
-     *
-     * @param  int Host index (required)
-     */
-    public function setHostIndex($host_index)
-    {
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Get the host index
-     *
-     * @return Host index
-     */
-    public function getHostIndex()
-    {
-        return $this->hostIndex;
-    }
-
-    /**
-     * @return Configuration
-     */
-    public function getConfig()
-    {
-        return $this->config;
-    }
-
-    /**
-     * Operation fooGet
-     *
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\InlineResponseDefault
-     */
-    public function fooGet()
-    {
-        list($response) = $this->fooGetWithHttpInfo();
-        return $response;
-    }
-
-    /**
-     * Operation fooGetWithHttpInfo
-     *
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\InlineResponseDefault, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function fooGetWithHttpInfo()
-    {
-        $request = $this->fooGetRequest();
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                default:
-                    if ('\OpenAPI\Client\Model\InlineResponseDefault' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\InlineResponseDefault', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\InlineResponseDefault';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                default:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\InlineResponseDefault',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation fooGetAsync
-     *
-     * 
-     *
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fooGetAsync()
-    {
-        return $this->fooGetAsyncWithHttpInfo()
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation fooGetAsyncWithHttpInfo
-     *
-     * 
-     *
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fooGetAsyncWithHttpInfo()
-    {
-        $returnType = '\OpenAPI\Client\Model\InlineResponseDefault';
-        $request = $this->fooGetRequest();
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'fooGet'
-     *
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function fooGetRequest()
-    {
-
-        $resourcePath = '/foo';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/json'],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'GET',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Create http client option
-     *
-     * @throws \RuntimeException on file opening failure
-     * @return array of http client options
-     */
-    protected function createHttpClientOption()
-    {
-        $options = [];
-        if ($this->config->getDebug()) {
-            $options[RequestOptions::DEBUG] = fopen($this->config->getDebugFile(), 'a');
-            if (!$options[RequestOptions::DEBUG]) {
-                throw new \RuntimeException('Failed to open the debug file: ' . $this->config->getDebugFile());
-            }
-        }
-
-        return $options;
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
deleted file mode 100644
index 124b9bc6e884..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
+++ /dev/null
@@ -1,4190 +0,0 @@
-<?php
-/**
- * FakeApi
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Api;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Psr7\MultipartStream;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\RequestOptions;
-use OpenAPI\Client\ApiException;
-use OpenAPI\Client\Configuration;
-use OpenAPI\Client\HeaderSelector;
-use OpenAPI\Client\ObjectSerializer;
-
-/**
- * FakeApi Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class FakeApi
-{
-    /**
-     * @var ClientInterface
-     */
-    protected $client;
-
-    /**
-     * @var Configuration
-     */
-    protected $config;
-
-    /**
-     * @var HeaderSelector
-     */
-    protected $headerSelector;
-
-    /**
-     * @var int Host index
-     */
-    protected $hostIndex;
-
-    /**
-     * @param ClientInterface $client
-     * @param Configuration   $config
-     * @param HeaderSelector  $selector
-     * @param int             $host_index (Optional) host index to select the list of hosts if defined in the OpenAPI spec
-     */
-    public function __construct(
-        ClientInterface $client = null,
-        Configuration $config = null,
-        HeaderSelector $selector = null,
-        $host_index = 0
-    ) {
-        $this->client = $client ?: new Client();
-        $this->config = $config ?: new Configuration();
-        $this->headerSelector = $selector ?: new HeaderSelector();
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Set the host index
-     *
-     * @param  int Host index (required)
-     */
-    public function setHostIndex($host_index)
-    {
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Get the host index
-     *
-     * @return Host index
-     */
-    public function getHostIndex()
-    {
-        return $this->hostIndex;
-    }
-
-    /**
-     * @return Configuration
-     */
-    public function getConfig()
-    {
-        return $this->config;
-    }
-
-    /**
-     * Operation fakeHealthGet
-     *
-     * Health check endpoint
-     *
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\HealthCheckResult
-     */
-    public function fakeHealthGet()
-    {
-        list($response) = $this->fakeHealthGetWithHttpInfo();
-        return $response;
-    }
-
-    /**
-     * Operation fakeHealthGetWithHttpInfo
-     *
-     * Health check endpoint
-     *
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\HealthCheckResult, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function fakeHealthGetWithHttpInfo()
-    {
-        $request = $this->fakeHealthGetRequest();
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('\OpenAPI\Client\Model\HealthCheckResult' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\HealthCheckResult', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\HealthCheckResult';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\HealthCheckResult',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation fakeHealthGetAsync
-     *
-     * Health check endpoint
-     *
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fakeHealthGetAsync()
-    {
-        return $this->fakeHealthGetAsyncWithHttpInfo()
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation fakeHealthGetAsyncWithHttpInfo
-     *
-     * Health check endpoint
-     *
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fakeHealthGetAsyncWithHttpInfo()
-    {
-        $returnType = '\OpenAPI\Client\Model\HealthCheckResult';
-        $request = $this->fakeHealthGetRequest();
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'fakeHealthGet'
-     *
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function fakeHealthGetRequest()
-    {
-
-        $resourcePath = '/fake/health';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/json'],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'GET',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation fakeHttpSignatureTest
-     *
-     * test http signature authentication
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     * @param  string $query_1 query parameter (optional)
-     * @param  string $header_1 header parameter (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function fakeHttpSignatureTest($pet, $query_1 = null, $header_1 = null)
-    {
-        $this->fakeHttpSignatureTestWithHttpInfo($pet, $query_1, $header_1);
-    }
-
-    /**
-     * Operation fakeHttpSignatureTestWithHttpInfo
-     *
-     * test http signature authentication
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     * @param  string $query_1 query parameter (optional)
-     * @param  string $header_1 header parameter (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function fakeHttpSignatureTestWithHttpInfo($pet, $query_1 = null, $header_1 = null)
-    {
-        $request = $this->fakeHttpSignatureTestRequest($pet, $query_1, $header_1);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation fakeHttpSignatureTestAsync
-     *
-     * test http signature authentication
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     * @param  string $query_1 query parameter (optional)
-     * @param  string $header_1 header parameter (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fakeHttpSignatureTestAsync($pet, $query_1 = null, $header_1 = null)
-    {
-        return $this->fakeHttpSignatureTestAsyncWithHttpInfo($pet, $query_1, $header_1)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation fakeHttpSignatureTestAsyncWithHttpInfo
-     *
-     * test http signature authentication
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     * @param  string $query_1 query parameter (optional)
-     * @param  string $header_1 header parameter (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fakeHttpSignatureTestAsyncWithHttpInfo($pet, $query_1 = null, $header_1 = null)
-    {
-        $returnType = '';
-        $request = $this->fakeHttpSignatureTestRequest($pet, $query_1, $header_1);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'fakeHttpSignatureTest'
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     * @param  string $query_1 query parameter (optional)
-     * @param  string $header_1 header parameter (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function fakeHttpSignatureTestRequest($pet, $query_1 = null, $header_1 = null)
-    {
-        // verify the required parameter 'pet' is set
-        if ($pet === null || (is_array($pet) && count($pet) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $pet when calling fakeHttpSignatureTest'
-            );
-        }
-
-        $resourcePath = '/fake/http-signature-test';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-        // query params
-        if ($query_1 !== null) {
-            if('form' === 'form' && is_array($query_1)) {
-                foreach($query_1 as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['query_1'] = $query_1;
-            }
-        }
-
-        // header params
-        if ($header_1 !== null) {
-            $headerParams['header_1'] = ObjectSerializer::toHeaderValue($header_1);
-        }
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($pet)) {
-            $_tempBody = $pet;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/json', 'application/xml']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'GET',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation fakeOuterBooleanSerialize
-     *
-     * @param  bool $body Input boolean as post body (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return bool
-     */
-    public function fakeOuterBooleanSerialize($body = null)
-    {
-        list($response) = $this->fakeOuterBooleanSerializeWithHttpInfo($body);
-        return $response;
-    }
-
-    /**
-     * Operation fakeOuterBooleanSerializeWithHttpInfo
-     *
-     * @param  bool $body Input boolean as post body (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of bool, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function fakeOuterBooleanSerializeWithHttpInfo($body = null)
-    {
-        $request = $this->fakeOuterBooleanSerializeRequest($body);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('bool' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, 'bool', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = 'bool';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        'bool',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation fakeOuterBooleanSerializeAsync
-     *
-     * 
-     *
-     * @param  bool $body Input boolean as post body (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fakeOuterBooleanSerializeAsync($body = null)
-    {
-        return $this->fakeOuterBooleanSerializeAsyncWithHttpInfo($body)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation fakeOuterBooleanSerializeAsyncWithHttpInfo
-     *
-     * 
-     *
-     * @param  bool $body Input boolean as post body (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fakeOuterBooleanSerializeAsyncWithHttpInfo($body = null)
-    {
-        $returnType = 'bool';
-        $request = $this->fakeOuterBooleanSerializeRequest($body);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'fakeOuterBooleanSerialize'
-     *
-     * @param  bool $body Input boolean as post body (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function fakeOuterBooleanSerializeRequest($body = null)
-    {
-
-        $resourcePath = '/fake/outer/boolean';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['*/*']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['*/*'],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation fakeOuterCompositeSerialize
-     *
-     * @param  \OpenAPI\Client\Model\OuterComposite $outer_composite Input composite as post body (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\OuterComposite
-     */
-    public function fakeOuterCompositeSerialize($outer_composite = null)
-    {
-        list($response) = $this->fakeOuterCompositeSerializeWithHttpInfo($outer_composite);
-        return $response;
-    }
-
-    /**
-     * Operation fakeOuterCompositeSerializeWithHttpInfo
-     *
-     * @param  \OpenAPI\Client\Model\OuterComposite $outer_composite Input composite as post body (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\OuterComposite, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function fakeOuterCompositeSerializeWithHttpInfo($outer_composite = null)
-    {
-        $request = $this->fakeOuterCompositeSerializeRequest($outer_composite);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('\OpenAPI\Client\Model\OuterComposite' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\OuterComposite', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\OuterComposite';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\OuterComposite',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation fakeOuterCompositeSerializeAsync
-     *
-     * 
-     *
-     * @param  \OpenAPI\Client\Model\OuterComposite $outer_composite Input composite as post body (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fakeOuterCompositeSerializeAsync($outer_composite = null)
-    {
-        return $this->fakeOuterCompositeSerializeAsyncWithHttpInfo($outer_composite)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation fakeOuterCompositeSerializeAsyncWithHttpInfo
-     *
-     * 
-     *
-     * @param  \OpenAPI\Client\Model\OuterComposite $outer_composite Input composite as post body (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fakeOuterCompositeSerializeAsyncWithHttpInfo($outer_composite = null)
-    {
-        $returnType = '\OpenAPI\Client\Model\OuterComposite';
-        $request = $this->fakeOuterCompositeSerializeRequest($outer_composite);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'fakeOuterCompositeSerialize'
-     *
-     * @param  \OpenAPI\Client\Model\OuterComposite $outer_composite Input composite as post body (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function fakeOuterCompositeSerializeRequest($outer_composite = null)
-    {
-
-        $resourcePath = '/fake/outer/composite';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($outer_composite)) {
-            $_tempBody = $outer_composite;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['*/*']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['*/*'],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation fakeOuterNumberSerialize
-     *
-     * @param  float $body Input number as post body (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return float
-     */
-    public function fakeOuterNumberSerialize($body = null)
-    {
-        list($response) = $this->fakeOuterNumberSerializeWithHttpInfo($body);
-        return $response;
-    }
-
-    /**
-     * Operation fakeOuterNumberSerializeWithHttpInfo
-     *
-     * @param  float $body Input number as post body (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of float, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function fakeOuterNumberSerializeWithHttpInfo($body = null)
-    {
-        $request = $this->fakeOuterNumberSerializeRequest($body);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('float' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, 'float', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = 'float';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        'float',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation fakeOuterNumberSerializeAsync
-     *
-     * 
-     *
-     * @param  float $body Input number as post body (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fakeOuterNumberSerializeAsync($body = null)
-    {
-        return $this->fakeOuterNumberSerializeAsyncWithHttpInfo($body)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation fakeOuterNumberSerializeAsyncWithHttpInfo
-     *
-     * 
-     *
-     * @param  float $body Input number as post body (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fakeOuterNumberSerializeAsyncWithHttpInfo($body = null)
-    {
-        $returnType = 'float';
-        $request = $this->fakeOuterNumberSerializeRequest($body);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'fakeOuterNumberSerialize'
-     *
-     * @param  float $body Input number as post body (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function fakeOuterNumberSerializeRequest($body = null)
-    {
-
-        $resourcePath = '/fake/outer/number';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['*/*']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['*/*'],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation fakeOuterStringSerialize
-     *
-     * @param  string $body Input string as post body (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return string
-     */
-    public function fakeOuterStringSerialize($body = null)
-    {
-        list($response) = $this->fakeOuterStringSerializeWithHttpInfo($body);
-        return $response;
-    }
-
-    /**
-     * Operation fakeOuterStringSerializeWithHttpInfo
-     *
-     * @param  string $body Input string as post body (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of string, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function fakeOuterStringSerializeWithHttpInfo($body = null)
-    {
-        $request = $this->fakeOuterStringSerializeRequest($body);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('string' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, 'string', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = 'string';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        'string',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation fakeOuterStringSerializeAsync
-     *
-     * 
-     *
-     * @param  string $body Input string as post body (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fakeOuterStringSerializeAsync($body = null)
-    {
-        return $this->fakeOuterStringSerializeAsyncWithHttpInfo($body)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation fakeOuterStringSerializeAsyncWithHttpInfo
-     *
-     * 
-     *
-     * @param  string $body Input string as post body (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function fakeOuterStringSerializeAsyncWithHttpInfo($body = null)
-    {
-        $returnType = 'string';
-        $request = $this->fakeOuterStringSerializeRequest($body);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'fakeOuterStringSerialize'
-     *
-     * @param  string $body Input string as post body (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function fakeOuterStringSerializeRequest($body = null)
-    {
-
-        $resourcePath = '/fake/outer/string';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['*/*']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['*/*'],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation testBodyWithFileSchema
-     *
-     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $file_schema_test_class file_schema_test_class (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function testBodyWithFileSchema($file_schema_test_class)
-    {
-        $this->testBodyWithFileSchemaWithHttpInfo($file_schema_test_class);
-    }
-
-    /**
-     * Operation testBodyWithFileSchemaWithHttpInfo
-     *
-     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $file_schema_test_class (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function testBodyWithFileSchemaWithHttpInfo($file_schema_test_class)
-    {
-        $request = $this->testBodyWithFileSchemaRequest($file_schema_test_class);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation testBodyWithFileSchemaAsync
-     *
-     * 
-     *
-     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $file_schema_test_class (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testBodyWithFileSchemaAsync($file_schema_test_class)
-    {
-        return $this->testBodyWithFileSchemaAsyncWithHttpInfo($file_schema_test_class)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation testBodyWithFileSchemaAsyncWithHttpInfo
-     *
-     * 
-     *
-     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $file_schema_test_class (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testBodyWithFileSchemaAsyncWithHttpInfo($file_schema_test_class)
-    {
-        $returnType = '';
-        $request = $this->testBodyWithFileSchemaRequest($file_schema_test_class);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'testBodyWithFileSchema'
-     *
-     * @param  \OpenAPI\Client\Model\FileSchemaTestClass $file_schema_test_class (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function testBodyWithFileSchemaRequest($file_schema_test_class)
-    {
-        // verify the required parameter 'file_schema_test_class' is set
-        if ($file_schema_test_class === null || (is_array($file_schema_test_class) && count($file_schema_test_class) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $file_schema_test_class when calling testBodyWithFileSchema'
-            );
-        }
-
-        $resourcePath = '/fake/body-with-file-schema';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($file_schema_test_class)) {
-            $_tempBody = $file_schema_test_class;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'PUT',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation testBodyWithQueryParams
-     *
-     * @param  string $query query (required)
-     * @param  \OpenAPI\Client\Model\User $user user (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function testBodyWithQueryParams($query, $user)
-    {
-        $this->testBodyWithQueryParamsWithHttpInfo($query, $user);
-    }
-
-    /**
-     * Operation testBodyWithQueryParamsWithHttpInfo
-     *
-     * @param  string $query (required)
-     * @param  \OpenAPI\Client\Model\User $user (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function testBodyWithQueryParamsWithHttpInfo($query, $user)
-    {
-        $request = $this->testBodyWithQueryParamsRequest($query, $user);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation testBodyWithQueryParamsAsync
-     *
-     * 
-     *
-     * @param  string $query (required)
-     * @param  \OpenAPI\Client\Model\User $user (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testBodyWithQueryParamsAsync($query, $user)
-    {
-        return $this->testBodyWithQueryParamsAsyncWithHttpInfo($query, $user)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation testBodyWithQueryParamsAsyncWithHttpInfo
-     *
-     * 
-     *
-     * @param  string $query (required)
-     * @param  \OpenAPI\Client\Model\User $user (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testBodyWithQueryParamsAsyncWithHttpInfo($query, $user)
-    {
-        $returnType = '';
-        $request = $this->testBodyWithQueryParamsRequest($query, $user);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'testBodyWithQueryParams'
-     *
-     * @param  string $query (required)
-     * @param  \OpenAPI\Client\Model\User $user (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function testBodyWithQueryParamsRequest($query, $user)
-    {
-        // verify the required parameter 'query' is set
-        if ($query === null || (is_array($query) && count($query) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $query when calling testBodyWithQueryParams'
-            );
-        }
-        // verify the required parameter 'user' is set
-        if ($user === null || (is_array($user) && count($user) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $user when calling testBodyWithQueryParams'
-            );
-        }
-
-        $resourcePath = '/fake/body-with-query-params';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-        // query params
-        if ($query !== null) {
-            if('form' === 'form' && is_array($query)) {
-                foreach($query as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['query'] = $query;
-            }
-        }
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($user)) {
-            $_tempBody = $user;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'PUT',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation testClientModel
-     *
-     * To test \"client\" model
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\Client
-     */
-    public function testClientModel($client)
-    {
-        list($response) = $this->testClientModelWithHttpInfo($client);
-        return $response;
-    }
-
-    /**
-     * Operation testClientModelWithHttpInfo
-     *
-     * To test \"client\" model
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\Client, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function testClientModelWithHttpInfo($client)
-    {
-        $request = $this->testClientModelRequest($client);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('\OpenAPI\Client\Model\Client' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\Client', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\Client';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\Client',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation testClientModelAsync
-     *
-     * To test \"client\" model
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testClientModelAsync($client)
-    {
-        return $this->testClientModelAsyncWithHttpInfo($client)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation testClientModelAsyncWithHttpInfo
-     *
-     * To test \"client\" model
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testClientModelAsyncWithHttpInfo($client)
-    {
-        $returnType = '\OpenAPI\Client\Model\Client';
-        $request = $this->testClientModelRequest($client);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'testClientModel'
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function testClientModelRequest($client)
-    {
-        // verify the required parameter 'client' is set
-        if ($client === null || (is_array($client) && count($client) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $client when calling testClientModel'
-            );
-        }
-
-        $resourcePath = '/fake';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($client)) {
-            $_tempBody = $client;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/json'],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'PATCH',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation testEndpointParameters
-     *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
-     *
-     * @param  float $number None (required)
-     * @param  double $double None (required)
-     * @param  string $pattern_without_delimiter None (required)
-     * @param  string $byte None (required)
-     * @param  int $integer None (optional)
-     * @param  int $int32 None (optional)
-     * @param  int $int64 None (optional)
-     * @param  float $float None (optional)
-     * @param  string $string None (optional)
-     * @param  \SplFileObject $binary None (optional)
-     * @param  \DateTime $date None (optional)
-     * @param  \DateTime $date_time None (optional)
-     * @param  string $password None (optional)
-     * @param  string $callback None (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function testEndpointParameters($number, $double, $pattern_without_delimiter, $byte, $integer = null, $int32 = null, $int64 = null, $float = null, $string = null, $binary = null, $date = null, $date_time = null, $password = null, $callback = null)
-    {
-        $this->testEndpointParametersWithHttpInfo($number, $double, $pattern_without_delimiter, $byte, $integer, $int32, $int64, $float, $string, $binary, $date, $date_time, $password, $callback);
-    }
-
-    /**
-     * Operation testEndpointParametersWithHttpInfo
-     *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
-     *
-     * @param  float $number None (required)
-     * @param  double $double None (required)
-     * @param  string $pattern_without_delimiter None (required)
-     * @param  string $byte None (required)
-     * @param  int $integer None (optional)
-     * @param  int $int32 None (optional)
-     * @param  int $int64 None (optional)
-     * @param  float $float None (optional)
-     * @param  string $string None (optional)
-     * @param  \SplFileObject $binary None (optional)
-     * @param  \DateTime $date None (optional)
-     * @param  \DateTime $date_time None (optional)
-     * @param  string $password None (optional)
-     * @param  string $callback None (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function testEndpointParametersWithHttpInfo($number, $double, $pattern_without_delimiter, $byte, $integer = null, $int32 = null, $int64 = null, $float = null, $string = null, $binary = null, $date = null, $date_time = null, $password = null, $callback = null)
-    {
-        $request = $this->testEndpointParametersRequest($number, $double, $pattern_without_delimiter, $byte, $integer, $int32, $int64, $float, $string, $binary, $date, $date_time, $password, $callback);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation testEndpointParametersAsync
-     *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
-     *
-     * @param  float $number None (required)
-     * @param  double $double None (required)
-     * @param  string $pattern_without_delimiter None (required)
-     * @param  string $byte None (required)
-     * @param  int $integer None (optional)
-     * @param  int $int32 None (optional)
-     * @param  int $int64 None (optional)
-     * @param  float $float None (optional)
-     * @param  string $string None (optional)
-     * @param  \SplFileObject $binary None (optional)
-     * @param  \DateTime $date None (optional)
-     * @param  \DateTime $date_time None (optional)
-     * @param  string $password None (optional)
-     * @param  string $callback None (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testEndpointParametersAsync($number, $double, $pattern_without_delimiter, $byte, $integer = null, $int32 = null, $int64 = null, $float = null, $string = null, $binary = null, $date = null, $date_time = null, $password = null, $callback = null)
-    {
-        return $this->testEndpointParametersAsyncWithHttpInfo($number, $double, $pattern_without_delimiter, $byte, $integer, $int32, $int64, $float, $string, $binary, $date, $date_time, $password, $callback)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation testEndpointParametersAsyncWithHttpInfo
-     *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
-     *
-     * @param  float $number None (required)
-     * @param  double $double None (required)
-     * @param  string $pattern_without_delimiter None (required)
-     * @param  string $byte None (required)
-     * @param  int $integer None (optional)
-     * @param  int $int32 None (optional)
-     * @param  int $int64 None (optional)
-     * @param  float $float None (optional)
-     * @param  string $string None (optional)
-     * @param  \SplFileObject $binary None (optional)
-     * @param  \DateTime $date None (optional)
-     * @param  \DateTime $date_time None (optional)
-     * @param  string $password None (optional)
-     * @param  string $callback None (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testEndpointParametersAsyncWithHttpInfo($number, $double, $pattern_without_delimiter, $byte, $integer = null, $int32 = null, $int64 = null, $float = null, $string = null, $binary = null, $date = null, $date_time = null, $password = null, $callback = null)
-    {
-        $returnType = '';
-        $request = $this->testEndpointParametersRequest($number, $double, $pattern_without_delimiter, $byte, $integer, $int32, $int64, $float, $string, $binary, $date, $date_time, $password, $callback);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'testEndpointParameters'
-     *
-     * @param  float $number None (required)
-     * @param  double $double None (required)
-     * @param  string $pattern_without_delimiter None (required)
-     * @param  string $byte None (required)
-     * @param  int $integer None (optional)
-     * @param  int $int32 None (optional)
-     * @param  int $int64 None (optional)
-     * @param  float $float None (optional)
-     * @param  string $string None (optional)
-     * @param  \SplFileObject $binary None (optional)
-     * @param  \DateTime $date None (optional)
-     * @param  \DateTime $date_time None (optional)
-     * @param  string $password None (optional)
-     * @param  string $callback None (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function testEndpointParametersRequest($number, $double, $pattern_without_delimiter, $byte, $integer = null, $int32 = null, $int64 = null, $float = null, $string = null, $binary = null, $date = null, $date_time = null, $password = null, $callback = null)
-    {
-        // verify the required parameter 'number' is set
-        if ($number === null || (is_array($number) && count($number) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $number when calling testEndpointParameters'
-            );
-        }
-        if ($number > 543.2) {
-            throw new \InvalidArgumentException('invalid value for "$number" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 543.2.');
-        }
-        if ($number < 32.1) {
-            throw new \InvalidArgumentException('invalid value for "$number" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 32.1.');
-        }
-
-        // verify the required parameter 'double' is set
-        if ($double === null || (is_array($double) && count($double) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $double when calling testEndpointParameters'
-            );
-        }
-        if ($double > 123.4) {
-            throw new \InvalidArgumentException('invalid value for "$double" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 123.4.');
-        }
-        if ($double < 67.8) {
-            throw new \InvalidArgumentException('invalid value for "$double" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 67.8.');
-        }
-
-        // verify the required parameter 'pattern_without_delimiter' is set
-        if ($pattern_without_delimiter === null || (is_array($pattern_without_delimiter) && count($pattern_without_delimiter) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $pattern_without_delimiter when calling testEndpointParameters'
-            );
-        }
-        if (!preg_match("/^[A-Z].*/", $pattern_without_delimiter)) {
-            throw new \InvalidArgumentException("invalid value for \"pattern_without_delimiter\" when calling FakeApi.testEndpointParameters, must conform to the pattern /^[A-Z].*/.");
-        }
-
-        // verify the required parameter 'byte' is set
-        if ($byte === null || (is_array($byte) && count($byte) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $byte when calling testEndpointParameters'
-            );
-        }
-        if ($integer !== null && $integer > 100) {
-            throw new \InvalidArgumentException('invalid value for "$integer" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 100.');
-        }
-        if ($integer !== null && $integer < 10) {
-            throw new \InvalidArgumentException('invalid value for "$integer" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 10.');
-        }
-
-        if ($int32 !== null && $int32 > 200) {
-            throw new \InvalidArgumentException('invalid value for "$int32" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 200.');
-        }
-        if ($int32 !== null && $int32 < 20) {
-            throw new \InvalidArgumentException('invalid value for "$int32" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 20.');
-        }
-
-        if ($float !== null && $float > 987.6) {
-            throw new \InvalidArgumentException('invalid value for "$float" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 987.6.');
-        }
-
-        if ($string !== null && !preg_match("/[a-z]/i", $string)) {
-            throw new \InvalidArgumentException("invalid value for \"string\" when calling FakeApi.testEndpointParameters, must conform to the pattern /[a-z]/i.");
-        }
-
-        if ($password !== null && strlen($password) > 64) {
-            throw new \InvalidArgumentException('invalid length for "$password" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 64.');
-        }
-        if ($password !== null && strlen($password) < 10) {
-            throw new \InvalidArgumentException('invalid length for "$password" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 10.');
-        }
-
-
-        $resourcePath = '/fake';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // form params
-        if ($integer !== null) {
-            $formParams['integer'] = ObjectSerializer::toFormValue($integer);
-        }
-        // form params
-        if ($int32 !== null) {
-            $formParams['int32'] = ObjectSerializer::toFormValue($int32);
-        }
-        // form params
-        if ($int64 !== null) {
-            $formParams['int64'] = ObjectSerializer::toFormValue($int64);
-        }
-        // form params
-        if ($number !== null) {
-            $formParams['number'] = ObjectSerializer::toFormValue($number);
-        }
-        // form params
-        if ($float !== null) {
-            $formParams['float'] = ObjectSerializer::toFormValue($float);
-        }
-        // form params
-        if ($double !== null) {
-            $formParams['double'] = ObjectSerializer::toFormValue($double);
-        }
-        // form params
-        if ($string !== null) {
-            $formParams['string'] = ObjectSerializer::toFormValue($string);
-        }
-        // form params
-        if ($pattern_without_delimiter !== null) {
-            $formParams['pattern_without_delimiter'] = ObjectSerializer::toFormValue($pattern_without_delimiter);
-        }
-        // form params
-        if ($byte !== null) {
-            $formParams['byte'] = ObjectSerializer::toFormValue($byte);
-        }
-        // form params
-        if ($binary !== null) {
-            $multipart = true;
-            $formParams['binary'] = \GuzzleHttp\Psr7\try_fopen(ObjectSerializer::toFormValue($binary), 'rb');
-        }
-        // form params
-        if ($date !== null) {
-            $formParams['date'] = ObjectSerializer::toFormValue($date);
-        }
-        // form params
-        if ($date_time !== null) {
-            $formParams['dateTime'] = ObjectSerializer::toFormValue($date_time);
-        }
-        // form params
-        if ($password !== null) {
-            $formParams['password'] = ObjectSerializer::toFormValue($password);
-        }
-        // form params
-        if ($callback !== null) {
-            $formParams['callback'] = ObjectSerializer::toFormValue($callback);
-        }
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/x-www-form-urlencoded']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-        // this endpoint requires HTTP basic authentication
-        if (!empty($this->config->getUsername()) || !(empty($this->config->getPassword()))) {
-            $headers['Authorization'] = 'Basic ' . base64_encode($this->config->getUsername() . ":" . $this->config->getPassword());
-        }
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation testEnumParameters
-     *
-     * To test enum parameters
-     *
-     * @param  string[] $enum_header_string_array Header parameter enum test (string array) (optional)
-     * @param  string $enum_header_string Header parameter enum test (string) (optional, default to '-efg')
-     * @param  string[] $enum_query_string_array Query parameter enum test (string array) (optional)
-     * @param  string $enum_query_string Query parameter enum test (string) (optional, default to '-efg')
-     * @param  int $enum_query_integer Query parameter enum test (double) (optional)
-     * @param  double $enum_query_double Query parameter enum test (double) (optional)
-     * @param  string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$')
-     * @param  string $enum_form_string Form parameter enum test (string) (optional, default to '-efg')
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function testEnumParameters($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg')
-    {
-        $this->testEnumParametersWithHttpInfo($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string);
-    }
-
-    /**
-     * Operation testEnumParametersWithHttpInfo
-     *
-     * To test enum parameters
-     *
-     * @param  string[] $enum_header_string_array Header parameter enum test (string array) (optional)
-     * @param  string $enum_header_string Header parameter enum test (string) (optional, default to '-efg')
-     * @param  string[] $enum_query_string_array Query parameter enum test (string array) (optional)
-     * @param  string $enum_query_string Query parameter enum test (string) (optional, default to '-efg')
-     * @param  int $enum_query_integer Query parameter enum test (double) (optional)
-     * @param  double $enum_query_double Query parameter enum test (double) (optional)
-     * @param  string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$')
-     * @param  string $enum_form_string Form parameter enum test (string) (optional, default to '-efg')
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function testEnumParametersWithHttpInfo($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg')
-    {
-        $request = $this->testEnumParametersRequest($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation testEnumParametersAsync
-     *
-     * To test enum parameters
-     *
-     * @param  string[] $enum_header_string_array Header parameter enum test (string array) (optional)
-     * @param  string $enum_header_string Header parameter enum test (string) (optional, default to '-efg')
-     * @param  string[] $enum_query_string_array Query parameter enum test (string array) (optional)
-     * @param  string $enum_query_string Query parameter enum test (string) (optional, default to '-efg')
-     * @param  int $enum_query_integer Query parameter enum test (double) (optional)
-     * @param  double $enum_query_double Query parameter enum test (double) (optional)
-     * @param  string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$')
-     * @param  string $enum_form_string Form parameter enum test (string) (optional, default to '-efg')
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testEnumParametersAsync($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg')
-    {
-        return $this->testEnumParametersAsyncWithHttpInfo($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation testEnumParametersAsyncWithHttpInfo
-     *
-     * To test enum parameters
-     *
-     * @param  string[] $enum_header_string_array Header parameter enum test (string array) (optional)
-     * @param  string $enum_header_string Header parameter enum test (string) (optional, default to '-efg')
-     * @param  string[] $enum_query_string_array Query parameter enum test (string array) (optional)
-     * @param  string $enum_query_string Query parameter enum test (string) (optional, default to '-efg')
-     * @param  int $enum_query_integer Query parameter enum test (double) (optional)
-     * @param  double $enum_query_double Query parameter enum test (double) (optional)
-     * @param  string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$')
-     * @param  string $enum_form_string Form parameter enum test (string) (optional, default to '-efg')
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testEnumParametersAsyncWithHttpInfo($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg')
-    {
-        $returnType = '';
-        $request = $this->testEnumParametersRequest($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'testEnumParameters'
-     *
-     * @param  string[] $enum_header_string_array Header parameter enum test (string array) (optional)
-     * @param  string $enum_header_string Header parameter enum test (string) (optional, default to '-efg')
-     * @param  string[] $enum_query_string_array Query parameter enum test (string array) (optional)
-     * @param  string $enum_query_string Query parameter enum test (string) (optional, default to '-efg')
-     * @param  int $enum_query_integer Query parameter enum test (double) (optional)
-     * @param  double $enum_query_double Query parameter enum test (double) (optional)
-     * @param  string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$')
-     * @param  string $enum_form_string Form parameter enum test (string) (optional, default to '-efg')
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function testEnumParametersRequest($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg')
-    {
-
-        $resourcePath = '/fake';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-        // query params
-        if ($enum_query_string_array !== null) {
-            if('form' === 'form' && is_array($enum_query_string_array)) {
-                foreach($enum_query_string_array as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['enum_query_string_array'] = $enum_query_string_array;
-            }
-        }
-        // query params
-        if ($enum_query_string !== null) {
-            if('form' === 'form' && is_array($enum_query_string)) {
-                foreach($enum_query_string as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['enum_query_string'] = $enum_query_string;
-            }
-        }
-        // query params
-        if ($enum_query_integer !== null) {
-            if('form' === 'form' && is_array($enum_query_integer)) {
-                foreach($enum_query_integer as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['enum_query_integer'] = $enum_query_integer;
-            }
-        }
-        // query params
-        if ($enum_query_double !== null) {
-            if('form' === 'form' && is_array($enum_query_double)) {
-                foreach($enum_query_double as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['enum_query_double'] = $enum_query_double;
-            }
-        }
-
-        // header params
-        if (is_array($enum_header_string_array)) {
-            $enum_header_string_array = ObjectSerializer::serializeCollection($enum_header_string_array, 'csv');
-        }
-        if ($enum_header_string_array !== null) {
-            $headerParams['enum_header_string_array'] = ObjectSerializer::toHeaderValue($enum_header_string_array);
-        }
-        // header params
-        if ($enum_header_string !== null) {
-            $headerParams['enum_header_string'] = ObjectSerializer::toHeaderValue($enum_header_string);
-        }
-
-
-        // form params
-        if ($enum_form_string_array !== null) {
-            $formParams['enum_form_string_array'] = ObjectSerializer::toFormValue($enum_form_string_array);
-        }
-        // form params
-        if ($enum_form_string !== null) {
-            $formParams['enum_form_string'] = ObjectSerializer::toFormValue($enum_form_string);
-        }
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/x-www-form-urlencoded']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'GET',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation testGroupParameters
-     *
-     * Fake endpoint to test group parameters (optional)
-     *
-     * Note: the input parameter is an associative array with the keys listed as the parameter name below
-     *
-     * @param  int $required_string_group Required String in group parameters (required)
-     * @param  bool $required_boolean_group Required Boolean in group parameters (required)
-     * @param  int $required_int64_group Required Integer in group parameters (required)
-     * @param  int $string_group String in group parameters (optional)
-     * @param  bool $boolean_group Boolean in group parameters (optional)
-     * @param  int $int64_group Integer in group parameters (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function testGroupParameters($associative_array)
-    {
-        $this->testGroupParametersWithHttpInfo($associative_array);
-    }
-
-    /**
-     * Operation testGroupParametersWithHttpInfo
-     *
-     * Fake endpoint to test group parameters (optional)
-     *
-     * Note: the input parameter is an associative array with the keys listed as the parameter name below
-     *
-     * @param  int $required_string_group Required String in group parameters (required)
-     * @param  bool $required_boolean_group Required Boolean in group parameters (required)
-     * @param  int $required_int64_group Required Integer in group parameters (required)
-     * @param  int $string_group String in group parameters (optional)
-     * @param  bool $boolean_group Boolean in group parameters (optional)
-     * @param  int $int64_group Integer in group parameters (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function testGroupParametersWithHttpInfo($associative_array)
-    {
-        $request = $this->testGroupParametersRequest($associative_array);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation testGroupParametersAsync
-     *
-     * Fake endpoint to test group parameters (optional)
-     *
-     * Note: the input parameter is an associative array with the keys listed as the parameter name below
-     *
-     * @param  int $required_string_group Required String in group parameters (required)
-     * @param  bool $required_boolean_group Required Boolean in group parameters (required)
-     * @param  int $required_int64_group Required Integer in group parameters (required)
-     * @param  int $string_group String in group parameters (optional)
-     * @param  bool $boolean_group Boolean in group parameters (optional)
-     * @param  int $int64_group Integer in group parameters (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testGroupParametersAsync($associative_array)
-    {
-        return $this->testGroupParametersAsyncWithHttpInfo($associative_array)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation testGroupParametersAsyncWithHttpInfo
-     *
-     * Fake endpoint to test group parameters (optional)
-     *
-     * Note: the input parameter is an associative array with the keys listed as the parameter name below
-     *
-     * @param  int $required_string_group Required String in group parameters (required)
-     * @param  bool $required_boolean_group Required Boolean in group parameters (required)
-     * @param  int $required_int64_group Required Integer in group parameters (required)
-     * @param  int $string_group String in group parameters (optional)
-     * @param  bool $boolean_group Boolean in group parameters (optional)
-     * @param  int $int64_group Integer in group parameters (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testGroupParametersAsyncWithHttpInfo($associative_array)
-    {
-        $returnType = '';
-        $request = $this->testGroupParametersRequest($associative_array);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'testGroupParameters'
-     *
-     * Note: the input parameter is an associative array with the keys listed as the parameter name below
-     *
-     * @param  int $required_string_group Required String in group parameters (required)
-     * @param  bool $required_boolean_group Required Boolean in group parameters (required)
-     * @param  int $required_int64_group Required Integer in group parameters (required)
-     * @param  int $string_group String in group parameters (optional)
-     * @param  bool $boolean_group Boolean in group parameters (optional)
-     * @param  int $int64_group Integer in group parameters (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function testGroupParametersRequest($associative_array)
-    {
-        // unbox the parameters from the associative array
-        $required_string_group = array_key_exists('required_string_group', $associative_array) ? $associative_array['required_string_group'] : null;
-        $required_boolean_group = array_key_exists('required_boolean_group', $associative_array) ? $associative_array['required_boolean_group'] : null;
-        $required_int64_group = array_key_exists('required_int64_group', $associative_array) ? $associative_array['required_int64_group'] : null;
-        $string_group = array_key_exists('string_group', $associative_array) ? $associative_array['string_group'] : null;
-        $boolean_group = array_key_exists('boolean_group', $associative_array) ? $associative_array['boolean_group'] : null;
-        $int64_group = array_key_exists('int64_group', $associative_array) ? $associative_array['int64_group'] : null;
-
-        // verify the required parameter 'required_string_group' is set
-        if ($required_string_group === null || (is_array($required_string_group) && count($required_string_group) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $required_string_group when calling testGroupParameters'
-            );
-        }
-        // verify the required parameter 'required_boolean_group' is set
-        if ($required_boolean_group === null || (is_array($required_boolean_group) && count($required_boolean_group) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $required_boolean_group when calling testGroupParameters'
-            );
-        }
-        // verify the required parameter 'required_int64_group' is set
-        if ($required_int64_group === null || (is_array($required_int64_group) && count($required_int64_group) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $required_int64_group when calling testGroupParameters'
-            );
-        }
-
-        $resourcePath = '/fake';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-        // query params
-        if ($required_string_group !== null) {
-            if('form' === 'form' && is_array($required_string_group)) {
-                foreach($required_string_group as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['required_string_group'] = $required_string_group;
-            }
-        }
-        // query params
-        if ($required_int64_group !== null) {
-            if('form' === 'form' && is_array($required_int64_group)) {
-                foreach($required_int64_group as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['required_int64_group'] = $required_int64_group;
-            }
-        }
-        // query params
-        if ($string_group !== null) {
-            if('form' === 'form' && is_array($string_group)) {
-                foreach($string_group as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['string_group'] = $string_group;
-            }
-        }
-        // query params
-        if ($int64_group !== null) {
-            if('form' === 'form' && is_array($int64_group)) {
-                foreach($int64_group as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['int64_group'] = $int64_group;
-            }
-        }
-
-        // header params
-        if ($required_boolean_group !== null) {
-            $headerParams['required_boolean_group'] = ObjectSerializer::toHeaderValue($required_boolean_group);
-        }
-        // header params
-        if ($boolean_group !== null) {
-            $headerParams['boolean_group'] = ObjectSerializer::toHeaderValue($boolean_group);
-        }
-
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-        // this endpoint requires Bearer (JWT) authentication (access token)
-        if ($this->config->getAccessToken() !== null) {
-            $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken();
-        }
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'DELETE',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation testInlineAdditionalProperties
-     *
-     * test inline additionalProperties
-     *
-     * @param  map[string,string] $request_body request body (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function testInlineAdditionalProperties($request_body)
-    {
-        $this->testInlineAdditionalPropertiesWithHttpInfo($request_body);
-    }
-
-    /**
-     * Operation testInlineAdditionalPropertiesWithHttpInfo
-     *
-     * test inline additionalProperties
-     *
-     * @param  map[string,string] $request_body request body (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function testInlineAdditionalPropertiesWithHttpInfo($request_body)
-    {
-        $request = $this->testInlineAdditionalPropertiesRequest($request_body);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation testInlineAdditionalPropertiesAsync
-     *
-     * test inline additionalProperties
-     *
-     * @param  map[string,string] $request_body request body (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testInlineAdditionalPropertiesAsync($request_body)
-    {
-        return $this->testInlineAdditionalPropertiesAsyncWithHttpInfo($request_body)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation testInlineAdditionalPropertiesAsyncWithHttpInfo
-     *
-     * test inline additionalProperties
-     *
-     * @param  map[string,string] $request_body request body (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testInlineAdditionalPropertiesAsyncWithHttpInfo($request_body)
-    {
-        $returnType = '';
-        $request = $this->testInlineAdditionalPropertiesRequest($request_body);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'testInlineAdditionalProperties'
-     *
-     * @param  map[string,string] $request_body request body (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function testInlineAdditionalPropertiesRequest($request_body)
-    {
-        // verify the required parameter 'request_body' is set
-        if ($request_body === null || (is_array($request_body) && count($request_body) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $request_body when calling testInlineAdditionalProperties'
-            );
-        }
-
-        $resourcePath = '/fake/inline-additionalProperties';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($request_body)) {
-            $_tempBody = $request_body;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation testJsonFormData
-     *
-     * test json serialization of form data
-     *
-     * @param  string $param field1 (required)
-     * @param  string $param2 field2 (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function testJsonFormData($param, $param2)
-    {
-        $this->testJsonFormDataWithHttpInfo($param, $param2);
-    }
-
-    /**
-     * Operation testJsonFormDataWithHttpInfo
-     *
-     * test json serialization of form data
-     *
-     * @param  string $param field1 (required)
-     * @param  string $param2 field2 (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function testJsonFormDataWithHttpInfo($param, $param2)
-    {
-        $request = $this->testJsonFormDataRequest($param, $param2);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation testJsonFormDataAsync
-     *
-     * test json serialization of form data
-     *
-     * @param  string $param field1 (required)
-     * @param  string $param2 field2 (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testJsonFormDataAsync($param, $param2)
-    {
-        return $this->testJsonFormDataAsyncWithHttpInfo($param, $param2)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation testJsonFormDataAsyncWithHttpInfo
-     *
-     * test json serialization of form data
-     *
-     * @param  string $param field1 (required)
-     * @param  string $param2 field2 (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testJsonFormDataAsyncWithHttpInfo($param, $param2)
-    {
-        $returnType = '';
-        $request = $this->testJsonFormDataRequest($param, $param2);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'testJsonFormData'
-     *
-     * @param  string $param field1 (required)
-     * @param  string $param2 field2 (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function testJsonFormDataRequest($param, $param2)
-    {
-        // verify the required parameter 'param' is set
-        if ($param === null || (is_array($param) && count($param) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $param when calling testJsonFormData'
-            );
-        }
-        // verify the required parameter 'param2' is set
-        if ($param2 === null || (is_array($param2) && count($param2) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $param2 when calling testJsonFormData'
-            );
-        }
-
-        $resourcePath = '/fake/jsonFormData';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // form params
-        if ($param !== null) {
-            $formParams['param'] = ObjectSerializer::toFormValue($param);
-        }
-        // form params
-        if ($param2 !== null) {
-            $formParams['param2'] = ObjectSerializer::toFormValue($param2);
-        }
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/x-www-form-urlencoded']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'GET',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation testQueryParameterCollectionFormat
-     *
-     * @param  string[] $pipe pipe (required)
-     * @param  string[] $ioutil ioutil (required)
-     * @param  string[] $http http (required)
-     * @param  string[] $url url (required)
-     * @param  string[] $context context (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function testQueryParameterCollectionFormat($pipe, $ioutil, $http, $url, $context)
-    {
-        $this->testQueryParameterCollectionFormatWithHttpInfo($pipe, $ioutil, $http, $url, $context);
-    }
-
-    /**
-     * Operation testQueryParameterCollectionFormatWithHttpInfo
-     *
-     * @param  string[] $pipe (required)
-     * @param  string[] $ioutil (required)
-     * @param  string[] $http (required)
-     * @param  string[] $url (required)
-     * @param  string[] $context (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function testQueryParameterCollectionFormatWithHttpInfo($pipe, $ioutil, $http, $url, $context)
-    {
-        $request = $this->testQueryParameterCollectionFormatRequest($pipe, $ioutil, $http, $url, $context);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation testQueryParameterCollectionFormatAsync
-     *
-     * 
-     *
-     * @param  string[] $pipe (required)
-     * @param  string[] $ioutil (required)
-     * @param  string[] $http (required)
-     * @param  string[] $url (required)
-     * @param  string[] $context (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testQueryParameterCollectionFormatAsync($pipe, $ioutil, $http, $url, $context)
-    {
-        return $this->testQueryParameterCollectionFormatAsyncWithHttpInfo($pipe, $ioutil, $http, $url, $context)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation testQueryParameterCollectionFormatAsyncWithHttpInfo
-     *
-     * 
-     *
-     * @param  string[] $pipe (required)
-     * @param  string[] $ioutil (required)
-     * @param  string[] $http (required)
-     * @param  string[] $url (required)
-     * @param  string[] $context (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testQueryParameterCollectionFormatAsyncWithHttpInfo($pipe, $ioutil, $http, $url, $context)
-    {
-        $returnType = '';
-        $request = $this->testQueryParameterCollectionFormatRequest($pipe, $ioutil, $http, $url, $context);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'testQueryParameterCollectionFormat'
-     *
-     * @param  string[] $pipe (required)
-     * @param  string[] $ioutil (required)
-     * @param  string[] $http (required)
-     * @param  string[] $url (required)
-     * @param  string[] $context (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function testQueryParameterCollectionFormatRequest($pipe, $ioutil, $http, $url, $context)
-    {
-        // verify the required parameter 'pipe' is set
-        if ($pipe === null || (is_array($pipe) && count($pipe) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $pipe when calling testQueryParameterCollectionFormat'
-            );
-        }
-        // verify the required parameter 'ioutil' is set
-        if ($ioutil === null || (is_array($ioutil) && count($ioutil) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $ioutil when calling testQueryParameterCollectionFormat'
-            );
-        }
-        // verify the required parameter 'http' is set
-        if ($http === null || (is_array($http) && count($http) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $http when calling testQueryParameterCollectionFormat'
-            );
-        }
-        // verify the required parameter 'url' is set
-        if ($url === null || (is_array($url) && count($url) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $url when calling testQueryParameterCollectionFormat'
-            );
-        }
-        // verify the required parameter 'context' is set
-        if ($context === null || (is_array($context) && count($context) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $context when calling testQueryParameterCollectionFormat'
-            );
-        }
-
-        $resourcePath = '/fake/test-query-paramters';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-        // query params
-        if ($pipe !== null) {
-            if('form' === 'form' && is_array($pipe)) {
-                foreach($pipe as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['pipe'] = $pipe;
-            }
-        }
-        // query params
-        if (is_array($ioutil)) {
-            $ioutil = ObjectSerializer::serializeCollection($ioutil, 'form', true);
-        }
-        if ($ioutil !== null) {
-            $queryParams['ioutil'] = $ioutil;
-        }
-        // query params
-        if (is_array($http)) {
-            $http = ObjectSerializer::serializeCollection($http, 'spaceDelimited', true);
-        }
-        if ($http !== null) {
-            $queryParams['http'] = $http;
-        }
-        // query params
-        if (is_array($url)) {
-            $url = ObjectSerializer::serializeCollection($url, 'form', true);
-        }
-        if ($url !== null) {
-            $queryParams['url'] = $url;
-        }
-        // query params
-        if ($context !== null) {
-            if('form' === 'form' && is_array($context)) {
-                foreach($context as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['context'] = $context;
-            }
-        }
-
-
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'PUT',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Create http client option
-     *
-     * @throws \RuntimeException on file opening failure
-     * @return array of http client options
-     */
-    protected function createHttpClientOption()
-    {
-        $options = [];
-        if ($this->config->getDebug()) {
-            $options[RequestOptions::DEBUG] = fopen($this->config->getDebugFile(), 'a');
-            if (!$options[RequestOptions::DEBUG]) {
-                throw new \RuntimeException('Failed to open the debug file: ' . $this->config->getDebugFile());
-            }
-        }
-
-        return $options;
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
deleted file mode 100644
index 647fd4c64917..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
+++ /dev/null
@@ -1,409 +0,0 @@
-<?php
-/**
- * FakeClassnameTags123Api
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Api;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Psr7\MultipartStream;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\RequestOptions;
-use OpenAPI\Client\ApiException;
-use OpenAPI\Client\Configuration;
-use OpenAPI\Client\HeaderSelector;
-use OpenAPI\Client\ObjectSerializer;
-
-/**
- * FakeClassnameTags123Api Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class FakeClassnameTags123Api
-{
-    /**
-     * @var ClientInterface
-     */
-    protected $client;
-
-    /**
-     * @var Configuration
-     */
-    protected $config;
-
-    /**
-     * @var HeaderSelector
-     */
-    protected $headerSelector;
-
-    /**
-     * @var int Host index
-     */
-    protected $hostIndex;
-
-    /**
-     * @param ClientInterface $client
-     * @param Configuration   $config
-     * @param HeaderSelector  $selector
-     * @param int             $host_index (Optional) host index to select the list of hosts if defined in the OpenAPI spec
-     */
-    public function __construct(
-        ClientInterface $client = null,
-        Configuration $config = null,
-        HeaderSelector $selector = null,
-        $host_index = 0
-    ) {
-        $this->client = $client ?: new Client();
-        $this->config = $config ?: new Configuration();
-        $this->headerSelector = $selector ?: new HeaderSelector();
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Set the host index
-     *
-     * @param  int Host index (required)
-     */
-    public function setHostIndex($host_index)
-    {
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Get the host index
-     *
-     * @return Host index
-     */
-    public function getHostIndex()
-    {
-        return $this->hostIndex;
-    }
-
-    /**
-     * @return Configuration
-     */
-    public function getConfig()
-    {
-        return $this->config;
-    }
-
-    /**
-     * Operation testClassname
-     *
-     * To test class name in snake case
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\Client
-     */
-    public function testClassname($client)
-    {
-        list($response) = $this->testClassnameWithHttpInfo($client);
-        return $response;
-    }
-
-    /**
-     * Operation testClassnameWithHttpInfo
-     *
-     * To test class name in snake case
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\Client, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function testClassnameWithHttpInfo($client)
-    {
-        $request = $this->testClassnameRequest($client);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('\OpenAPI\Client\Model\Client' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\Client', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\Client';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\Client',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation testClassnameAsync
-     *
-     * To test class name in snake case
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testClassnameAsync($client)
-    {
-        return $this->testClassnameAsyncWithHttpInfo($client)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation testClassnameAsyncWithHttpInfo
-     *
-     * To test class name in snake case
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function testClassnameAsyncWithHttpInfo($client)
-    {
-        $returnType = '\OpenAPI\Client\Model\Client';
-        $request = $this->testClassnameRequest($client);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'testClassname'
-     *
-     * @param  \OpenAPI\Client\Model\Client $client client model (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function testClassnameRequest($client)
-    {
-        // verify the required parameter 'client' is set
-        if ($client === null || (is_array($client) && count($client) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $client when calling testClassname'
-            );
-        }
-
-        $resourcePath = '/fake_classname_test';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($client)) {
-            $_tempBody = $client;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/json'],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-        // this endpoint requires API key authentication
-        $apiKey = $this->config->getApiKeyWithPrefix('api_key_query');
-        if ($apiKey !== null) {
-            $queryParams['api_key_query'] = $apiKey;
-        }
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'PATCH',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Create http client option
-     *
-     * @throws \RuntimeException on file opening failure
-     * @return array of http client options
-     */
-    protected function createHttpClientOption()
-    {
-        $options = [];
-        if ($this->config->getDebug()) {
-            $options[RequestOptions::DEBUG] = fopen($this->config->getDebugFile(), 'a');
-            if (!$options[RequestOptions::DEBUG]) {
-                throw new \RuntimeException('Failed to open the debug file: ' . $this->config->getDebugFile());
-            }
-        }
-
-        return $options;
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
deleted file mode 100644
index 8e7e6a2b43f9..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
+++ /dev/null
@@ -1,2549 +0,0 @@
-<?php
-/**
- * PetApi
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Api;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Psr7\MultipartStream;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\RequestOptions;
-use OpenAPI\Client\ApiException;
-use OpenAPI\Client\Configuration;
-use OpenAPI\Client\HeaderSelector;
-use OpenAPI\Client\ObjectSerializer;
-
-/**
- * PetApi Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class PetApi
-{
-    /**
-     * @var ClientInterface
-     */
-    protected $client;
-
-    /**
-     * @var Configuration
-     */
-    protected $config;
-
-    /**
-     * @var HeaderSelector
-     */
-    protected $headerSelector;
-
-    /**
-     * @var int Host index
-     */
-    protected $hostIndex;
-
-    /**
-     * @param ClientInterface $client
-     * @param Configuration   $config
-     * @param HeaderSelector  $selector
-     * @param int             $host_index (Optional) host index to select the list of hosts if defined in the OpenAPI spec
-     */
-    public function __construct(
-        ClientInterface $client = null,
-        Configuration $config = null,
-        HeaderSelector $selector = null,
-        $host_index = 0
-    ) {
-        $this->client = $client ?: new Client();
-        $this->config = $config ?: new Configuration();
-        $this->headerSelector = $selector ?: new HeaderSelector();
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Set the host index
-     *
-     * @param  int Host index (required)
-     */
-    public function setHostIndex($host_index)
-    {
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Get the host index
-     *
-     * @return Host index
-     */
-    public function getHostIndex()
-    {
-        return $this->hostIndex;
-    }
-
-    /**
-     * @return Configuration
-     */
-    public function getConfig()
-    {
-        return $this->config;
-    }
-
-    /**
-     * Operation addPet
-     *
-     * Add a new pet to the store
-     *
-     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
-     * URL: http://petstore.swagger.io/v2
-     * URL: http://path-server-test.petstore.local/v2
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function addPet($pet)
-    {
-        $this->addPetWithHttpInfo($pet);
-    }
-
-    /**
-     * Operation addPetWithHttpInfo
-     *
-     * Add a new pet to the store
-     *
-     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
-     * URL: http://petstore.swagger.io/v2
-     * URL: http://path-server-test.petstore.local/v2
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function addPetWithHttpInfo($pet)
-    {
-        $request = $this->addPetRequest($pet);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation addPetAsync
-     *
-     * Add a new pet to the store
-     *
-     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
-     * URL: http://petstore.swagger.io/v2
-     * URL: http://path-server-test.petstore.local/v2
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function addPetAsync($pet)
-    {
-        return $this->addPetAsyncWithHttpInfo($pet)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation addPetAsyncWithHttpInfo
-     *
-     * Add a new pet to the store
-     *
-     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
-     * URL: http://petstore.swagger.io/v2
-     * URL: http://path-server-test.petstore.local/v2
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function addPetAsyncWithHttpInfo($pet)
-    {
-        $returnType = '';
-        $request = $this->addPetRequest($pet);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'addPet'
-     *
-     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
-     * URL: http://petstore.swagger.io/v2
-     * URL: http://path-server-test.petstore.local/v2
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function addPetRequest($pet)
-    {
-        // verify the required parameter 'pet' is set
-        if ($pet === null || (is_array($pet) && count($pet) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $pet when calling addPet'
-            );
-        }
-
-        $resourcePath = '/pet';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($pet)) {
-            $_tempBody = $pet;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/json', 'application/xml']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-        // this endpoint requires OAuth (access token)
-        if ($this->config->getAccessToken() !== null) {
-            $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken();
-        }
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $operationHosts = ["http://petstore.swagger.io/v2", "http://path-server-test.petstore.local/v2"];
-        if ($this->hostIndex < 0 || $this->hostIndex >= sizeof($operationHosts)) {
-            throw new \InvalidArgumentException("Invalid index {$this->hostIndex} when selecting the host. Must be less than ".sizeof($operationHosts));
-        }
-        $operationHost = $operationHosts[$this->hostIndex];
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $operationHost . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation deletePet
-     *
-     * Deletes a pet
-     *
-     * @param  int $pet_id Pet id to delete (required)
-     * @param  string $api_key api_key (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function deletePet($pet_id, $api_key = null)
-    {
-        $this->deletePetWithHttpInfo($pet_id, $api_key);
-    }
-
-    /**
-     * Operation deletePetWithHttpInfo
-     *
-     * Deletes a pet
-     *
-     * @param  int $pet_id Pet id to delete (required)
-     * @param  string $api_key (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function deletePetWithHttpInfo($pet_id, $api_key = null)
-    {
-        $request = $this->deletePetRequest($pet_id, $api_key);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation deletePetAsync
-     *
-     * Deletes a pet
-     *
-     * @param  int $pet_id Pet id to delete (required)
-     * @param  string $api_key (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function deletePetAsync($pet_id, $api_key = null)
-    {
-        return $this->deletePetAsyncWithHttpInfo($pet_id, $api_key)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation deletePetAsyncWithHttpInfo
-     *
-     * Deletes a pet
-     *
-     * @param  int $pet_id Pet id to delete (required)
-     * @param  string $api_key (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function deletePetAsyncWithHttpInfo($pet_id, $api_key = null)
-    {
-        $returnType = '';
-        $request = $this->deletePetRequest($pet_id, $api_key);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'deletePet'
-     *
-     * @param  int $pet_id Pet id to delete (required)
-     * @param  string $api_key (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function deletePetRequest($pet_id, $api_key = null)
-    {
-        // verify the required parameter 'pet_id' is set
-        if ($pet_id === null || (is_array($pet_id) && count($pet_id) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $pet_id when calling deletePet'
-            );
-        }
-
-        $resourcePath = '/pet/{petId}';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-        // header params
-        if ($api_key !== null) {
-            $headerParams['api_key'] = ObjectSerializer::toHeaderValue($api_key);
-        }
-
-        // path params
-        if ($pet_id !== null) {
-            $resourcePath = str_replace(
-                '{' . 'petId' . '}',
-                ObjectSerializer::toPathValue($pet_id),
-                $resourcePath
-            );
-        }
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-        // this endpoint requires OAuth (access token)
-        if ($this->config->getAccessToken() !== null) {
-            $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken();
-        }
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'DELETE',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation findPetsByStatus
-     *
-     * Finds Pets by status
-     *
-     * @param  string[] $status Status values that need to be considered for filter (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\Pet[]
-     */
-    public function findPetsByStatus($status)
-    {
-        list($response) = $this->findPetsByStatusWithHttpInfo($status);
-        return $response;
-    }
-
-    /**
-     * Operation findPetsByStatusWithHttpInfo
-     *
-     * Finds Pets by status
-     *
-     * @param  string[] $status Status values that need to be considered for filter (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\Pet[], HTTP status code, HTTP response headers (array of strings)
-     */
-    public function findPetsByStatusWithHttpInfo($status)
-    {
-        $request = $this->findPetsByStatusRequest($status);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('\OpenAPI\Client\Model\Pet[]' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\Pet[]', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\Pet[]';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\Pet[]',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation findPetsByStatusAsync
-     *
-     * Finds Pets by status
-     *
-     * @param  string[] $status Status values that need to be considered for filter (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function findPetsByStatusAsync($status)
-    {
-        return $this->findPetsByStatusAsyncWithHttpInfo($status)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation findPetsByStatusAsyncWithHttpInfo
-     *
-     * Finds Pets by status
-     *
-     * @param  string[] $status Status values that need to be considered for filter (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function findPetsByStatusAsyncWithHttpInfo($status)
-    {
-        $returnType = '\OpenAPI\Client\Model\Pet[]';
-        $request = $this->findPetsByStatusRequest($status);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'findPetsByStatus'
-     *
-     * @param  string[] $status Status values that need to be considered for filter (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function findPetsByStatusRequest($status)
-    {
-        // verify the required parameter 'status' is set
-        if ($status === null || (is_array($status) && count($status) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $status when calling findPetsByStatus'
-            );
-        }
-
-        $resourcePath = '/pet/findByStatus';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-        // query params
-        if (is_array($status)) {
-            $status = ObjectSerializer::serializeCollection($status, 'form', true);
-        }
-        if ($status !== null) {
-            $queryParams['status'] = $status;
-        }
-
-
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/xml', 'application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/xml', 'application/json'],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-        // this endpoint requires OAuth (access token)
-        if ($this->config->getAccessToken() !== null) {
-            $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken();
-        }
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'GET',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation findPetsByTags
-     *
-     * Finds Pets by tags
-     *
-     * @param  string[] $tags Tags to filter by (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\Pet[]
-     */
-    public function findPetsByTags($tags)
-    {
-        list($response) = $this->findPetsByTagsWithHttpInfo($tags);
-        return $response;
-    }
-
-    /**
-     * Operation findPetsByTagsWithHttpInfo
-     *
-     * Finds Pets by tags
-     *
-     * @param  string[] $tags Tags to filter by (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\Pet[], HTTP status code, HTTP response headers (array of strings)
-     */
-    public function findPetsByTagsWithHttpInfo($tags)
-    {
-        $request = $this->findPetsByTagsRequest($tags);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('\OpenAPI\Client\Model\Pet[]' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\Pet[]', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\Pet[]';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\Pet[]',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation findPetsByTagsAsync
-     *
-     * Finds Pets by tags
-     *
-     * @param  string[] $tags Tags to filter by (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function findPetsByTagsAsync($tags)
-    {
-        return $this->findPetsByTagsAsyncWithHttpInfo($tags)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation findPetsByTagsAsyncWithHttpInfo
-     *
-     * Finds Pets by tags
-     *
-     * @param  string[] $tags Tags to filter by (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function findPetsByTagsAsyncWithHttpInfo($tags)
-    {
-        $returnType = '\OpenAPI\Client\Model\Pet[]';
-        $request = $this->findPetsByTagsRequest($tags);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'findPetsByTags'
-     *
-     * @param  string[] $tags Tags to filter by (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function findPetsByTagsRequest($tags)
-    {
-        // verify the required parameter 'tags' is set
-        if ($tags === null || (is_array($tags) && count($tags) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $tags when calling findPetsByTags'
-            );
-        }
-
-        $resourcePath = '/pet/findByTags';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-        // query params
-        if (is_array($tags)) {
-            $tags = ObjectSerializer::serializeCollection($tags, 'form', true);
-        }
-        if ($tags !== null) {
-            $queryParams['tags'] = $tags;
-        }
-
-
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/xml', 'application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/xml', 'application/json'],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-        // this endpoint requires OAuth (access token)
-        if ($this->config->getAccessToken() !== null) {
-            $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken();
-        }
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'GET',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation getPetById
-     *
-     * Find pet by ID
-     *
-     * @param  int $pet_id ID of pet to return (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\Pet
-     */
-    public function getPetById($pet_id)
-    {
-        list($response) = $this->getPetByIdWithHttpInfo($pet_id);
-        return $response;
-    }
-
-    /**
-     * Operation getPetByIdWithHttpInfo
-     *
-     * Find pet by ID
-     *
-     * @param  int $pet_id ID of pet to return (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\Pet, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function getPetByIdWithHttpInfo($pet_id)
-    {
-        $request = $this->getPetByIdRequest($pet_id);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('\OpenAPI\Client\Model\Pet' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\Pet', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\Pet';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\Pet',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation getPetByIdAsync
-     *
-     * Find pet by ID
-     *
-     * @param  int $pet_id ID of pet to return (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function getPetByIdAsync($pet_id)
-    {
-        return $this->getPetByIdAsyncWithHttpInfo($pet_id)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation getPetByIdAsyncWithHttpInfo
-     *
-     * Find pet by ID
-     *
-     * @param  int $pet_id ID of pet to return (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function getPetByIdAsyncWithHttpInfo($pet_id)
-    {
-        $returnType = '\OpenAPI\Client\Model\Pet';
-        $request = $this->getPetByIdRequest($pet_id);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'getPetById'
-     *
-     * @param  int $pet_id ID of pet to return (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function getPetByIdRequest($pet_id)
-    {
-        // verify the required parameter 'pet_id' is set
-        if ($pet_id === null || (is_array($pet_id) && count($pet_id) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $pet_id when calling getPetById'
-            );
-        }
-
-        $resourcePath = '/pet/{petId}';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-        // path params
-        if ($pet_id !== null) {
-            $resourcePath = str_replace(
-                '{' . 'petId' . '}',
-                ObjectSerializer::toPathValue($pet_id),
-                $resourcePath
-            );
-        }
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/xml', 'application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/xml', 'application/json'],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-        // this endpoint requires API key authentication
-        $apiKey = $this->config->getApiKeyWithPrefix('api_key');
-        if ($apiKey !== null) {
-            $headers['api_key'] = $apiKey;
-        }
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'GET',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation updatePet
-     *
-     * Update an existing pet
-     *
-     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
-     * URL: http://petstore.swagger.io/v2
-     * URL: http://path-server-test.petstore.local/v2
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function updatePet($pet)
-    {
-        $this->updatePetWithHttpInfo($pet);
-    }
-
-    /**
-     * Operation updatePetWithHttpInfo
-     *
-     * Update an existing pet
-     *
-     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
-     * URL: http://petstore.swagger.io/v2
-     * URL: http://path-server-test.petstore.local/v2
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function updatePetWithHttpInfo($pet)
-    {
-        $request = $this->updatePetRequest($pet);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation updatePetAsync
-     *
-     * Update an existing pet
-     *
-     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
-     * URL: http://petstore.swagger.io/v2
-     * URL: http://path-server-test.petstore.local/v2
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function updatePetAsync($pet)
-    {
-        return $this->updatePetAsyncWithHttpInfo($pet)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation updatePetAsyncWithHttpInfo
-     *
-     * Update an existing pet
-     *
-     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
-     * URL: http://petstore.swagger.io/v2
-     * URL: http://path-server-test.petstore.local/v2
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function updatePetAsyncWithHttpInfo($pet)
-    {
-        $returnType = '';
-        $request = $this->updatePetRequest($pet);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'updatePet'
-     *
-     * This oepration contains host(s) defined in the OpenAP spec. Use 'hostIndex' to select the host.
-     * URL: http://petstore.swagger.io/v2
-     * URL: http://path-server-test.petstore.local/v2
-     *
-     * @param  \OpenAPI\Client\Model\Pet $pet Pet object that needs to be added to the store (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function updatePetRequest($pet)
-    {
-        // verify the required parameter 'pet' is set
-        if ($pet === null || (is_array($pet) && count($pet) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $pet when calling updatePet'
-            );
-        }
-
-        $resourcePath = '/pet';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($pet)) {
-            $_tempBody = $pet;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/json', 'application/xml']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-        // this endpoint requires OAuth (access token)
-        if ($this->config->getAccessToken() !== null) {
-            $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken();
-        }
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $operationHosts = ["http://petstore.swagger.io/v2", "http://path-server-test.petstore.local/v2"];
-        if ($this->hostIndex < 0 || $this->hostIndex >= sizeof($operationHosts)) {
-            throw new \InvalidArgumentException("Invalid index {$this->hostIndex} when selecting the host. Must be less than ".sizeof($operationHosts));
-        }
-        $operationHost = $operationHosts[$this->hostIndex];
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'PUT',
-            $operationHost . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation updatePetWithForm
-     *
-     * Updates a pet in the store with form data
-     *
-     * @param  int $pet_id ID of pet that needs to be updated (required)
-     * @param  string $name Updated name of the pet (optional)
-     * @param  string $status Updated status of the pet (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function updatePetWithForm($pet_id, $name = null, $status = null)
-    {
-        $this->updatePetWithFormWithHttpInfo($pet_id, $name, $status);
-    }
-
-    /**
-     * Operation updatePetWithFormWithHttpInfo
-     *
-     * Updates a pet in the store with form data
-     *
-     * @param  int $pet_id ID of pet that needs to be updated (required)
-     * @param  string $name Updated name of the pet (optional)
-     * @param  string $status Updated status of the pet (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function updatePetWithFormWithHttpInfo($pet_id, $name = null, $status = null)
-    {
-        $request = $this->updatePetWithFormRequest($pet_id, $name, $status);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation updatePetWithFormAsync
-     *
-     * Updates a pet in the store with form data
-     *
-     * @param  int $pet_id ID of pet that needs to be updated (required)
-     * @param  string $name Updated name of the pet (optional)
-     * @param  string $status Updated status of the pet (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function updatePetWithFormAsync($pet_id, $name = null, $status = null)
-    {
-        return $this->updatePetWithFormAsyncWithHttpInfo($pet_id, $name, $status)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation updatePetWithFormAsyncWithHttpInfo
-     *
-     * Updates a pet in the store with form data
-     *
-     * @param  int $pet_id ID of pet that needs to be updated (required)
-     * @param  string $name Updated name of the pet (optional)
-     * @param  string $status Updated status of the pet (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function updatePetWithFormAsyncWithHttpInfo($pet_id, $name = null, $status = null)
-    {
-        $returnType = '';
-        $request = $this->updatePetWithFormRequest($pet_id, $name, $status);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'updatePetWithForm'
-     *
-     * @param  int $pet_id ID of pet that needs to be updated (required)
-     * @param  string $name Updated name of the pet (optional)
-     * @param  string $status Updated status of the pet (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function updatePetWithFormRequest($pet_id, $name = null, $status = null)
-    {
-        // verify the required parameter 'pet_id' is set
-        if ($pet_id === null || (is_array($pet_id) && count($pet_id) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $pet_id when calling updatePetWithForm'
-            );
-        }
-
-        $resourcePath = '/pet/{petId}';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-        // path params
-        if ($pet_id !== null) {
-            $resourcePath = str_replace(
-                '{' . 'petId' . '}',
-                ObjectSerializer::toPathValue($pet_id),
-                $resourcePath
-            );
-        }
-
-        // form params
-        if ($name !== null) {
-            $formParams['name'] = ObjectSerializer::toFormValue($name);
-        }
-        // form params
-        if ($status !== null) {
-            $formParams['status'] = ObjectSerializer::toFormValue($status);
-        }
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/x-www-form-urlencoded']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-        // this endpoint requires OAuth (access token)
-        if ($this->config->getAccessToken() !== null) {
-            $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken();
-        }
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation uploadFile
-     *
-     * uploads an image
-     *
-     * @param  int $pet_id ID of pet to update (required)
-     * @param  string $additional_metadata Additional data to pass to server (optional)
-     * @param  \SplFileObject $file file to upload (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\ApiResponse
-     */
-    public function uploadFile($pet_id, $additional_metadata = null, $file = null)
-    {
-        list($response) = $this->uploadFileWithHttpInfo($pet_id, $additional_metadata, $file);
-        return $response;
-    }
-
-    /**
-     * Operation uploadFileWithHttpInfo
-     *
-     * uploads an image
-     *
-     * @param  int $pet_id ID of pet to update (required)
-     * @param  string $additional_metadata Additional data to pass to server (optional)
-     * @param  \SplFileObject $file file to upload (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\ApiResponse, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function uploadFileWithHttpInfo($pet_id, $additional_metadata = null, $file = null)
-    {
-        $request = $this->uploadFileRequest($pet_id, $additional_metadata, $file);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('\OpenAPI\Client\Model\ApiResponse' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\ApiResponse', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\ApiResponse';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\ApiResponse',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation uploadFileAsync
-     *
-     * uploads an image
-     *
-     * @param  int $pet_id ID of pet to update (required)
-     * @param  string $additional_metadata Additional data to pass to server (optional)
-     * @param  \SplFileObject $file file to upload (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function uploadFileAsync($pet_id, $additional_metadata = null, $file = null)
-    {
-        return $this->uploadFileAsyncWithHttpInfo($pet_id, $additional_metadata, $file)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation uploadFileAsyncWithHttpInfo
-     *
-     * uploads an image
-     *
-     * @param  int $pet_id ID of pet to update (required)
-     * @param  string $additional_metadata Additional data to pass to server (optional)
-     * @param  \SplFileObject $file file to upload (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function uploadFileAsyncWithHttpInfo($pet_id, $additional_metadata = null, $file = null)
-    {
-        $returnType = '\OpenAPI\Client\Model\ApiResponse';
-        $request = $this->uploadFileRequest($pet_id, $additional_metadata, $file);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'uploadFile'
-     *
-     * @param  int $pet_id ID of pet to update (required)
-     * @param  string $additional_metadata Additional data to pass to server (optional)
-     * @param  \SplFileObject $file file to upload (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function uploadFileRequest($pet_id, $additional_metadata = null, $file = null)
-    {
-        // verify the required parameter 'pet_id' is set
-        if ($pet_id === null || (is_array($pet_id) && count($pet_id) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $pet_id when calling uploadFile'
-            );
-        }
-
-        $resourcePath = '/pet/{petId}/uploadImage';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-        // path params
-        if ($pet_id !== null) {
-            $resourcePath = str_replace(
-                '{' . 'petId' . '}',
-                ObjectSerializer::toPathValue($pet_id),
-                $resourcePath
-            );
-        }
-
-        // form params
-        if ($additional_metadata !== null) {
-            $formParams['additionalMetadata'] = ObjectSerializer::toFormValue($additional_metadata);
-        }
-        // form params
-        if ($file !== null) {
-            $multipart = true;
-            $formParams['file'] = \GuzzleHttp\Psr7\try_fopen(ObjectSerializer::toFormValue($file), 'rb');
-        }
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/json'],
-                ['multipart/form-data']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-        // this endpoint requires OAuth (access token)
-        if ($this->config->getAccessToken() !== null) {
-            $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken();
-        }
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation uploadFileWithRequiredFile
-     *
-     * uploads an image (required)
-     *
-     * @param  int $pet_id ID of pet to update (required)
-     * @param  \SplFileObject $required_file file to upload (required)
-     * @param  string $additional_metadata Additional data to pass to server (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\ApiResponse
-     */
-    public function uploadFileWithRequiredFile($pet_id, $required_file, $additional_metadata = null)
-    {
-        list($response) = $this->uploadFileWithRequiredFileWithHttpInfo($pet_id, $required_file, $additional_metadata);
-        return $response;
-    }
-
-    /**
-     * Operation uploadFileWithRequiredFileWithHttpInfo
-     *
-     * uploads an image (required)
-     *
-     * @param  int $pet_id ID of pet to update (required)
-     * @param  \SplFileObject $required_file file to upload (required)
-     * @param  string $additional_metadata Additional data to pass to server (optional)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\ApiResponse, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function uploadFileWithRequiredFileWithHttpInfo($pet_id, $required_file, $additional_metadata = null)
-    {
-        $request = $this->uploadFileWithRequiredFileRequest($pet_id, $required_file, $additional_metadata);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('\OpenAPI\Client\Model\ApiResponse' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\ApiResponse', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\ApiResponse';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\ApiResponse',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation uploadFileWithRequiredFileAsync
-     *
-     * uploads an image (required)
-     *
-     * @param  int $pet_id ID of pet to update (required)
-     * @param  \SplFileObject $required_file file to upload (required)
-     * @param  string $additional_metadata Additional data to pass to server (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function uploadFileWithRequiredFileAsync($pet_id, $required_file, $additional_metadata = null)
-    {
-        return $this->uploadFileWithRequiredFileAsyncWithHttpInfo($pet_id, $required_file, $additional_metadata)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation uploadFileWithRequiredFileAsyncWithHttpInfo
-     *
-     * uploads an image (required)
-     *
-     * @param  int $pet_id ID of pet to update (required)
-     * @param  \SplFileObject $required_file file to upload (required)
-     * @param  string $additional_metadata Additional data to pass to server (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function uploadFileWithRequiredFileAsyncWithHttpInfo($pet_id, $required_file, $additional_metadata = null)
-    {
-        $returnType = '\OpenAPI\Client\Model\ApiResponse';
-        $request = $this->uploadFileWithRequiredFileRequest($pet_id, $required_file, $additional_metadata);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'uploadFileWithRequiredFile'
-     *
-     * @param  int $pet_id ID of pet to update (required)
-     * @param  \SplFileObject $required_file file to upload (required)
-     * @param  string $additional_metadata Additional data to pass to server (optional)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function uploadFileWithRequiredFileRequest($pet_id, $required_file, $additional_metadata = null)
-    {
-        // verify the required parameter 'pet_id' is set
-        if ($pet_id === null || (is_array($pet_id) && count($pet_id) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $pet_id when calling uploadFileWithRequiredFile'
-            );
-        }
-        // verify the required parameter 'required_file' is set
-        if ($required_file === null || (is_array($required_file) && count($required_file) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $required_file when calling uploadFileWithRequiredFile'
-            );
-        }
-
-        $resourcePath = '/fake/{petId}/uploadImageWithRequiredFile';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-        // path params
-        if ($pet_id !== null) {
-            $resourcePath = str_replace(
-                '{' . 'petId' . '}',
-                ObjectSerializer::toPathValue($pet_id),
-                $resourcePath
-            );
-        }
-
-        // form params
-        if ($additional_metadata !== null) {
-            $formParams['additionalMetadata'] = ObjectSerializer::toFormValue($additional_metadata);
-        }
-        // form params
-        if ($required_file !== null) {
-            $multipart = true;
-            $formParams['requiredFile'] = \GuzzleHttp\Psr7\try_fopen(ObjectSerializer::toFormValue($required_file), 'rb');
-        }
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/json'],
-                ['multipart/form-data']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-        // this endpoint requires OAuth (access token)
-        if ($this->config->getAccessToken() !== null) {
-            $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken();
-        }
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Create http client option
-     *
-     * @throws \RuntimeException on file opening failure
-     * @return array of http client options
-     */
-    protected function createHttpClientOption()
-    {
-        $options = [];
-        if ($this->config->getDebug()) {
-            $options[RequestOptions::DEBUG] = fopen($this->config->getDebugFile(), 'a');
-            if (!$options[RequestOptions::DEBUG]) {
-                throw new \RuntimeException('Failed to open the debug file: ' . $this->config->getDebugFile());
-            }
-        }
-
-        return $options;
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
deleted file mode 100644
index 3b62336d5a3e..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
+++ /dev/null
@@ -1,1168 +0,0 @@
-<?php
-/**
- * StoreApi
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Api;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Psr7\MultipartStream;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\RequestOptions;
-use OpenAPI\Client\ApiException;
-use OpenAPI\Client\Configuration;
-use OpenAPI\Client\HeaderSelector;
-use OpenAPI\Client\ObjectSerializer;
-
-/**
- * StoreApi Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class StoreApi
-{
-    /**
-     * @var ClientInterface
-     */
-    protected $client;
-
-    /**
-     * @var Configuration
-     */
-    protected $config;
-
-    /**
-     * @var HeaderSelector
-     */
-    protected $headerSelector;
-
-    /**
-     * @var int Host index
-     */
-    protected $hostIndex;
-
-    /**
-     * @param ClientInterface $client
-     * @param Configuration   $config
-     * @param HeaderSelector  $selector
-     * @param int             $host_index (Optional) host index to select the list of hosts if defined in the OpenAPI spec
-     */
-    public function __construct(
-        ClientInterface $client = null,
-        Configuration $config = null,
-        HeaderSelector $selector = null,
-        $host_index = 0
-    ) {
-        $this->client = $client ?: new Client();
-        $this->config = $config ?: new Configuration();
-        $this->headerSelector = $selector ?: new HeaderSelector();
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Set the host index
-     *
-     * @param  int Host index (required)
-     */
-    public function setHostIndex($host_index)
-    {
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Get the host index
-     *
-     * @return Host index
-     */
-    public function getHostIndex()
-    {
-        return $this->hostIndex;
-    }
-
-    /**
-     * @return Configuration
-     */
-    public function getConfig()
-    {
-        return $this->config;
-    }
-
-    /**
-     * Operation deleteOrder
-     *
-     * Delete purchase order by ID
-     *
-     * @param  string $order_id ID of the order that needs to be deleted (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function deleteOrder($order_id)
-    {
-        $this->deleteOrderWithHttpInfo($order_id);
-    }
-
-    /**
-     * Operation deleteOrderWithHttpInfo
-     *
-     * Delete purchase order by ID
-     *
-     * @param  string $order_id ID of the order that needs to be deleted (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function deleteOrderWithHttpInfo($order_id)
-    {
-        $request = $this->deleteOrderRequest($order_id);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation deleteOrderAsync
-     *
-     * Delete purchase order by ID
-     *
-     * @param  string $order_id ID of the order that needs to be deleted (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function deleteOrderAsync($order_id)
-    {
-        return $this->deleteOrderAsyncWithHttpInfo($order_id)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation deleteOrderAsyncWithHttpInfo
-     *
-     * Delete purchase order by ID
-     *
-     * @param  string $order_id ID of the order that needs to be deleted (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function deleteOrderAsyncWithHttpInfo($order_id)
-    {
-        $returnType = '';
-        $request = $this->deleteOrderRequest($order_id);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'deleteOrder'
-     *
-     * @param  string $order_id ID of the order that needs to be deleted (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function deleteOrderRequest($order_id)
-    {
-        // verify the required parameter 'order_id' is set
-        if ($order_id === null || (is_array($order_id) && count($order_id) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $order_id when calling deleteOrder'
-            );
-        }
-
-        $resourcePath = '/store/order/{order_id}';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-        // path params
-        if ($order_id !== null) {
-            $resourcePath = str_replace(
-                '{' . 'order_id' . '}',
-                ObjectSerializer::toPathValue($order_id),
-                $resourcePath
-            );
-        }
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'DELETE',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation getInventory
-     *
-     * Returns pet inventories by status
-     *
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return map[string,int]
-     */
-    public function getInventory()
-    {
-        list($response) = $this->getInventoryWithHttpInfo();
-        return $response;
-    }
-
-    /**
-     * Operation getInventoryWithHttpInfo
-     *
-     * Returns pet inventories by status
-     *
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of map[string,int], HTTP status code, HTTP response headers (array of strings)
-     */
-    public function getInventoryWithHttpInfo()
-    {
-        $request = $this->getInventoryRequest();
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('map[string,int]' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, 'map[string,int]', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = 'map[string,int]';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        'map[string,int]',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation getInventoryAsync
-     *
-     * Returns pet inventories by status
-     *
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function getInventoryAsync()
-    {
-        return $this->getInventoryAsyncWithHttpInfo()
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation getInventoryAsyncWithHttpInfo
-     *
-     * Returns pet inventories by status
-     *
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function getInventoryAsyncWithHttpInfo()
-    {
-        $returnType = 'map[string,int]';
-        $request = $this->getInventoryRequest();
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'getInventory'
-     *
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function getInventoryRequest()
-    {
-
-        $resourcePath = '/store/inventory';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/json'],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-        // this endpoint requires API key authentication
-        $apiKey = $this->config->getApiKeyWithPrefix('api_key');
-        if ($apiKey !== null) {
-            $headers['api_key'] = $apiKey;
-        }
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'GET',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation getOrderById
-     *
-     * Find purchase order by ID
-     *
-     * @param  int $order_id ID of pet that needs to be fetched (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\Order
-     */
-    public function getOrderById($order_id)
-    {
-        list($response) = $this->getOrderByIdWithHttpInfo($order_id);
-        return $response;
-    }
-
-    /**
-     * Operation getOrderByIdWithHttpInfo
-     *
-     * Find purchase order by ID
-     *
-     * @param  int $order_id ID of pet that needs to be fetched (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\Order, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function getOrderByIdWithHttpInfo($order_id)
-    {
-        $request = $this->getOrderByIdRequest($order_id);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('\OpenAPI\Client\Model\Order' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\Order', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\Order';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\Order',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation getOrderByIdAsync
-     *
-     * Find purchase order by ID
-     *
-     * @param  int $order_id ID of pet that needs to be fetched (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function getOrderByIdAsync($order_id)
-    {
-        return $this->getOrderByIdAsyncWithHttpInfo($order_id)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation getOrderByIdAsyncWithHttpInfo
-     *
-     * Find purchase order by ID
-     *
-     * @param  int $order_id ID of pet that needs to be fetched (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function getOrderByIdAsyncWithHttpInfo($order_id)
-    {
-        $returnType = '\OpenAPI\Client\Model\Order';
-        $request = $this->getOrderByIdRequest($order_id);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'getOrderById'
-     *
-     * @param  int $order_id ID of pet that needs to be fetched (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function getOrderByIdRequest($order_id)
-    {
-        // verify the required parameter 'order_id' is set
-        if ($order_id === null || (is_array($order_id) && count($order_id) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $order_id when calling getOrderById'
-            );
-        }
-        if ($order_id > 5) {
-            throw new \InvalidArgumentException('invalid value for "$order_id" when calling StoreApi.getOrderById, must be smaller than or equal to 5.');
-        }
-        if ($order_id < 1) {
-            throw new \InvalidArgumentException('invalid value for "$order_id" when calling StoreApi.getOrderById, must be bigger than or equal to 1.');
-        }
-
-
-        $resourcePath = '/store/order/{order_id}';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-        // path params
-        if ($order_id !== null) {
-            $resourcePath = str_replace(
-                '{' . 'order_id' . '}',
-                ObjectSerializer::toPathValue($order_id),
-                $resourcePath
-            );
-        }
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/xml', 'application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/xml', 'application/json'],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'GET',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation placeOrder
-     *
-     * Place an order for a pet
-     *
-     * @param  \OpenAPI\Client\Model\Order $order order placed for purchasing the pet (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\Order
-     */
-    public function placeOrder($order)
-    {
-        list($response) = $this->placeOrderWithHttpInfo($order);
-        return $response;
-    }
-
-    /**
-     * Operation placeOrderWithHttpInfo
-     *
-     * Place an order for a pet
-     *
-     * @param  \OpenAPI\Client\Model\Order $order order placed for purchasing the pet (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\Order, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function placeOrderWithHttpInfo($order)
-    {
-        $request = $this->placeOrderRequest($order);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('\OpenAPI\Client\Model\Order' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\Order', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\Order';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\Order',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation placeOrderAsync
-     *
-     * Place an order for a pet
-     *
-     * @param  \OpenAPI\Client\Model\Order $order order placed for purchasing the pet (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function placeOrderAsync($order)
-    {
-        return $this->placeOrderAsyncWithHttpInfo($order)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation placeOrderAsyncWithHttpInfo
-     *
-     * Place an order for a pet
-     *
-     * @param  \OpenAPI\Client\Model\Order $order order placed for purchasing the pet (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function placeOrderAsyncWithHttpInfo($order)
-    {
-        $returnType = '\OpenAPI\Client\Model\Order';
-        $request = $this->placeOrderRequest($order);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'placeOrder'
-     *
-     * @param  \OpenAPI\Client\Model\Order $order order placed for purchasing the pet (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function placeOrderRequest($order)
-    {
-        // verify the required parameter 'order' is set
-        if ($order === null || (is_array($order) && count($order) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $order when calling placeOrder'
-            );
-        }
-
-        $resourcePath = '/store/order';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($order)) {
-            $_tempBody = $order;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/xml', 'application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/xml', 'application/json'],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Create http client option
-     *
-     * @throws \RuntimeException on file opening failure
-     * @return array of http client options
-     */
-    protected function createHttpClientOption()
-    {
-        $options = [];
-        if ($this->config->getDebug()) {
-            $options[RequestOptions::DEBUG] = fopen($this->config->getDebugFile(), 'a');
-            if (!$options[RequestOptions::DEBUG]) {
-                throw new \RuntimeException('Failed to open the debug file: ' . $this->config->getDebugFile());
-            }
-        }
-
-        return $options;
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
deleted file mode 100644
index 06b23fe78fb1..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
+++ /dev/null
@@ -1,2037 +0,0 @@
-<?php
-/**
- * UserApi
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Api;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Psr7\MultipartStream;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\RequestOptions;
-use OpenAPI\Client\ApiException;
-use OpenAPI\Client\Configuration;
-use OpenAPI\Client\HeaderSelector;
-use OpenAPI\Client\ObjectSerializer;
-
-/**
- * UserApi Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class UserApi
-{
-    /**
-     * @var ClientInterface
-     */
-    protected $client;
-
-    /**
-     * @var Configuration
-     */
-    protected $config;
-
-    /**
-     * @var HeaderSelector
-     */
-    protected $headerSelector;
-
-    /**
-     * @var int Host index
-     */
-    protected $hostIndex;
-
-    /**
-     * @param ClientInterface $client
-     * @param Configuration   $config
-     * @param HeaderSelector  $selector
-     * @param int             $host_index (Optional) host index to select the list of hosts if defined in the OpenAPI spec
-     */
-    public function __construct(
-        ClientInterface $client = null,
-        Configuration $config = null,
-        HeaderSelector $selector = null,
-        $host_index = 0
-    ) {
-        $this->client = $client ?: new Client();
-        $this->config = $config ?: new Configuration();
-        $this->headerSelector = $selector ?: new HeaderSelector();
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Set the host index
-     *
-     * @param  int Host index (required)
-     */
-    public function setHostIndex($host_index)
-    {
-        $this->hostIndex = $host_index;
-    }
-
-    /**
-     * Get the host index
-     *
-     * @return Host index
-     */
-    public function getHostIndex()
-    {
-        return $this->hostIndex;
-    }
-
-    /**
-     * @return Configuration
-     */
-    public function getConfig()
-    {
-        return $this->config;
-    }
-
-    /**
-     * Operation createUser
-     *
-     * Create user
-     *
-     * @param  \OpenAPI\Client\Model\User $user Created user object (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function createUser($user)
-    {
-        $this->createUserWithHttpInfo($user);
-    }
-
-    /**
-     * Operation createUserWithHttpInfo
-     *
-     * Create user
-     *
-     * @param  \OpenAPI\Client\Model\User $user Created user object (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function createUserWithHttpInfo($user)
-    {
-        $request = $this->createUserRequest($user);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation createUserAsync
-     *
-     * Create user
-     *
-     * @param  \OpenAPI\Client\Model\User $user Created user object (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function createUserAsync($user)
-    {
-        return $this->createUserAsyncWithHttpInfo($user)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation createUserAsyncWithHttpInfo
-     *
-     * Create user
-     *
-     * @param  \OpenAPI\Client\Model\User $user Created user object (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function createUserAsyncWithHttpInfo($user)
-    {
-        $returnType = '';
-        $request = $this->createUserRequest($user);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'createUser'
-     *
-     * @param  \OpenAPI\Client\Model\User $user Created user object (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function createUserRequest($user)
-    {
-        // verify the required parameter 'user' is set
-        if ($user === null || (is_array($user) && count($user) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $user when calling createUser'
-            );
-        }
-
-        $resourcePath = '/user';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($user)) {
-            $_tempBody = $user;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation createUsersWithArrayInput
-     *
-     * Creates list of users with given input array
-     *
-     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function createUsersWithArrayInput($user)
-    {
-        $this->createUsersWithArrayInputWithHttpInfo($user);
-    }
-
-    /**
-     * Operation createUsersWithArrayInputWithHttpInfo
-     *
-     * Creates list of users with given input array
-     *
-     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function createUsersWithArrayInputWithHttpInfo($user)
-    {
-        $request = $this->createUsersWithArrayInputRequest($user);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation createUsersWithArrayInputAsync
-     *
-     * Creates list of users with given input array
-     *
-     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function createUsersWithArrayInputAsync($user)
-    {
-        return $this->createUsersWithArrayInputAsyncWithHttpInfo($user)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation createUsersWithArrayInputAsyncWithHttpInfo
-     *
-     * Creates list of users with given input array
-     *
-     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function createUsersWithArrayInputAsyncWithHttpInfo($user)
-    {
-        $returnType = '';
-        $request = $this->createUsersWithArrayInputRequest($user);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'createUsersWithArrayInput'
-     *
-     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function createUsersWithArrayInputRequest($user)
-    {
-        // verify the required parameter 'user' is set
-        if ($user === null || (is_array($user) && count($user) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $user when calling createUsersWithArrayInput'
-            );
-        }
-
-        $resourcePath = '/user/createWithArray';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($user)) {
-            $_tempBody = $user;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation createUsersWithListInput
-     *
-     * Creates list of users with given input array
-     *
-     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function createUsersWithListInput($user)
-    {
-        $this->createUsersWithListInputWithHttpInfo($user);
-    }
-
-    /**
-     * Operation createUsersWithListInputWithHttpInfo
-     *
-     * Creates list of users with given input array
-     *
-     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function createUsersWithListInputWithHttpInfo($user)
-    {
-        $request = $this->createUsersWithListInputRequest($user);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation createUsersWithListInputAsync
-     *
-     * Creates list of users with given input array
-     *
-     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function createUsersWithListInputAsync($user)
-    {
-        return $this->createUsersWithListInputAsyncWithHttpInfo($user)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation createUsersWithListInputAsyncWithHttpInfo
-     *
-     * Creates list of users with given input array
-     *
-     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function createUsersWithListInputAsyncWithHttpInfo($user)
-    {
-        $returnType = '';
-        $request = $this->createUsersWithListInputRequest($user);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'createUsersWithListInput'
-     *
-     * @param  \OpenAPI\Client\Model\User[] $user List of user object (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function createUsersWithListInputRequest($user)
-    {
-        // verify the required parameter 'user' is set
-        if ($user === null || (is_array($user) && count($user) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $user when calling createUsersWithListInput'
-            );
-        }
-
-        $resourcePath = '/user/createWithList';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-        if (isset($user)) {
-            $_tempBody = $user;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'POST',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation deleteUser
-     *
-     * Delete user
-     *
-     * @param  string $username The name that needs to be deleted (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function deleteUser($username)
-    {
-        $this->deleteUserWithHttpInfo($username);
-    }
-
-    /**
-     * Operation deleteUserWithHttpInfo
-     *
-     * Delete user
-     *
-     * @param  string $username The name that needs to be deleted (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function deleteUserWithHttpInfo($username)
-    {
-        $request = $this->deleteUserRequest($username);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation deleteUserAsync
-     *
-     * Delete user
-     *
-     * @param  string $username The name that needs to be deleted (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function deleteUserAsync($username)
-    {
-        return $this->deleteUserAsyncWithHttpInfo($username)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation deleteUserAsyncWithHttpInfo
-     *
-     * Delete user
-     *
-     * @param  string $username The name that needs to be deleted (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function deleteUserAsyncWithHttpInfo($username)
-    {
-        $returnType = '';
-        $request = $this->deleteUserRequest($username);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'deleteUser'
-     *
-     * @param  string $username The name that needs to be deleted (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function deleteUserRequest($username)
-    {
-        // verify the required parameter 'username' is set
-        if ($username === null || (is_array($username) && count($username) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $username when calling deleteUser'
-            );
-        }
-
-        $resourcePath = '/user/{username}';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-        // path params
-        if ($username !== null) {
-            $resourcePath = str_replace(
-                '{' . 'username' . '}',
-                ObjectSerializer::toPathValue($username),
-                $resourcePath
-            );
-        }
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'DELETE',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation getUserByName
-     *
-     * Get user by user name
-     *
-     * @param  string $username The name that needs to be fetched. Use user1 for testing. (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return \OpenAPI\Client\Model\User
-     */
-    public function getUserByName($username)
-    {
-        list($response) = $this->getUserByNameWithHttpInfo($username);
-        return $response;
-    }
-
-    /**
-     * Operation getUserByNameWithHttpInfo
-     *
-     * Get user by user name
-     *
-     * @param  string $username The name that needs to be fetched. Use user1 for testing. (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of \OpenAPI\Client\Model\User, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function getUserByNameWithHttpInfo($username)
-    {
-        $request = $this->getUserByNameRequest($username);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('\OpenAPI\Client\Model\User' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\User', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = '\OpenAPI\Client\Model\User';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        '\OpenAPI\Client\Model\User',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation getUserByNameAsync
-     *
-     * Get user by user name
-     *
-     * @param  string $username The name that needs to be fetched. Use user1 for testing. (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function getUserByNameAsync($username)
-    {
-        return $this->getUserByNameAsyncWithHttpInfo($username)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation getUserByNameAsyncWithHttpInfo
-     *
-     * Get user by user name
-     *
-     * @param  string $username The name that needs to be fetched. Use user1 for testing. (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function getUserByNameAsyncWithHttpInfo($username)
-    {
-        $returnType = '\OpenAPI\Client\Model\User';
-        $request = $this->getUserByNameRequest($username);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'getUserByName'
-     *
-     * @param  string $username The name that needs to be fetched. Use user1 for testing. (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function getUserByNameRequest($username)
-    {
-        // verify the required parameter 'username' is set
-        if ($username === null || (is_array($username) && count($username) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $username when calling getUserByName'
-            );
-        }
-
-        $resourcePath = '/user/{username}';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-        // path params
-        if ($username !== null) {
-            $resourcePath = str_replace(
-                '{' . 'username' . '}',
-                ObjectSerializer::toPathValue($username),
-                $resourcePath
-            );
-        }
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/xml', 'application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/xml', 'application/json'],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'GET',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation loginUser
-     *
-     * Logs user into the system
-     *
-     * @param  string $username The user name for login (required)
-     * @param  string $password The password for login in clear text (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return string
-     */
-    public function loginUser($username, $password)
-    {
-        list($response) = $this->loginUserWithHttpInfo($username, $password);
-        return $response;
-    }
-
-    /**
-     * Operation loginUserWithHttpInfo
-     *
-     * Logs user into the system
-     *
-     * @param  string $username The user name for login (required)
-     * @param  string $password The password for login in clear text (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of string, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function loginUserWithHttpInfo($username, $password)
-    {
-        $request = $this->loginUserRequest($username, $password);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            $responseBody = $response->getBody();
-            switch($statusCode) {
-                case 200:
-                    if ('string' === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, 'string', []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-            }
-
-            $returnType = 'string';
-            $responseBody = $response->getBody();
-            if ($returnType === '\SplFileObject') {
-                $content = $responseBody; //stream goes to serializer
-            } else {
-                $content = (string) $responseBody;
-            }
-
-            return [
-                ObjectSerializer::deserialize($content, $returnType, []),
-                $response->getStatusCode(),
-                $response->getHeaders()
-            ];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-                case 200:
-                    $data = ObjectSerializer::deserialize(
-                        $e->getResponseBody(),
-                        'string',
-                        $e->getResponseHeaders()
-                    );
-                    $e->setResponseObject($data);
-                    break;
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation loginUserAsync
-     *
-     * Logs user into the system
-     *
-     * @param  string $username The user name for login (required)
-     * @param  string $password The password for login in clear text (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function loginUserAsync($username, $password)
-    {
-        return $this->loginUserAsyncWithHttpInfo($username, $password)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation loginUserAsyncWithHttpInfo
-     *
-     * Logs user into the system
-     *
-     * @param  string $username The user name for login (required)
-     * @param  string $password The password for login in clear text (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function loginUserAsyncWithHttpInfo($username, $password)
-    {
-        $returnType = 'string';
-        $request = $this->loginUserRequest($username, $password);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    $responseBody = $response->getBody();
-                    if ($returnType === '\SplFileObject') {
-                        $content = $responseBody; //stream goes to serializer
-                    } else {
-                        $content = (string) $responseBody;
-                    }
-
-                    return [
-                        ObjectSerializer::deserialize($content, $returnType, []),
-                        $response->getStatusCode(),
-                        $response->getHeaders()
-                    ];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'loginUser'
-     *
-     * @param  string $username The user name for login (required)
-     * @param  string $password The password for login in clear text (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function loginUserRequest($username, $password)
-    {
-        // verify the required parameter 'username' is set
-        if ($username === null || (is_array($username) && count($username) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $username when calling loginUser'
-            );
-        }
-        // verify the required parameter 'password' is set
-        if ($password === null || (is_array($password) && count($password) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $password when calling loginUser'
-            );
-        }
-
-        $resourcePath = '/user/login';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-        // query params
-        if ($username !== null) {
-            if('form' === 'form' && is_array($username)) {
-                foreach($username as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['username'] = $username;
-            }
-        }
-        // query params
-        if ($password !== null) {
-            if('form' === 'form' && is_array($password)) {
-                foreach($password as $key => $value) {
-                    $queryParams[$key] = $value;
-                }
-            }
-            else {
-                $queryParams['password'] = $password;
-            }
-        }
-
-
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                ['application/xml', 'application/json']
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                ['application/xml', 'application/json'],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'GET',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation logoutUser
-     *
-     * Logs out current logged in user session
-     *
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function logoutUser()
-    {
-        $this->logoutUserWithHttpInfo();
-    }
-
-    /**
-     * Operation logoutUserWithHttpInfo
-     *
-     * Logs out current logged in user session
-     *
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function logoutUserWithHttpInfo()
-    {
-        $request = $this->logoutUserRequest();
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation logoutUserAsync
-     *
-     * Logs out current logged in user session
-     *
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function logoutUserAsync()
-    {
-        return $this->logoutUserAsyncWithHttpInfo()
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation logoutUserAsyncWithHttpInfo
-     *
-     * Logs out current logged in user session
-     *
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function logoutUserAsyncWithHttpInfo()
-    {
-        $returnType = '';
-        $request = $this->logoutUserRequest();
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'logoutUser'
-     *
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function logoutUserRequest()
-    {
-
-        $resourcePath = '/user/logout';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-
-        // body params
-        $_tempBody = null;
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                []
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'GET',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Operation updateUser
-     *
-     * Updated user
-     *
-     * @param  string $username name that need to be deleted (required)
-     * @param  \OpenAPI\Client\Model\User $user Updated user object (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return void
-     */
-    public function updateUser($username, $user)
-    {
-        $this->updateUserWithHttpInfo($username, $user);
-    }
-
-    /**
-     * Operation updateUserWithHttpInfo
-     *
-     * Updated user
-     *
-     * @param  string $username name that need to be deleted (required)
-     * @param  \OpenAPI\Client\Model\User $user Updated user object (required)
-     *
-     * @throws \OpenAPI\Client\ApiException on non-2xx response
-     * @throws \InvalidArgumentException
-     * @return array of null, HTTP status code, HTTP response headers (array of strings)
-     */
-    public function updateUserWithHttpInfo($username, $user)
-    {
-        $request = $this->updateUserRequest($username, $user);
-
-        try {
-            $options = $this->createHttpClientOption();
-            try {
-                $response = $this->client->send($request, $options);
-            } catch (RequestException $e) {
-                throw new ApiException(
-                    "[{$e->getCode()}] {$e->getMessage()}",
-                    $e->getCode(),
-                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
-                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
-                );
-            }
-
-            $statusCode = $response->getStatusCode();
-
-            if ($statusCode < 200 || $statusCode > 299) {
-                throw new ApiException(
-                    sprintf(
-                        '[%d] Error connecting to the API (%s)',
-                        $statusCode,
-                        $request->getUri()
-                    ),
-                    $statusCode,
-                    $response->getHeaders(),
-                    $response->getBody()
-                );
-            }
-
-            return [null, $statusCode, $response->getHeaders()];
-
-        } catch (ApiException $e) {
-            switch ($e->getCode()) {
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Operation updateUserAsync
-     *
-     * Updated user
-     *
-     * @param  string $username name that need to be deleted (required)
-     * @param  \OpenAPI\Client\Model\User $user Updated user object (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function updateUserAsync($username, $user)
-    {
-        return $this->updateUserAsyncWithHttpInfo($username, $user)
-            ->then(
-                function ($response) {
-                    return $response[0];
-                }
-            );
-    }
-
-    /**
-     * Operation updateUserAsyncWithHttpInfo
-     *
-     * Updated user
-     *
-     * @param  string $username name that need to be deleted (required)
-     * @param  \OpenAPI\Client\Model\User $user Updated user object (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public function updateUserAsyncWithHttpInfo($username, $user)
-    {
-        $returnType = '';
-        $request = $this->updateUserRequest($username, $user);
-
-        return $this->client
-            ->sendAsync($request, $this->createHttpClientOption())
-            ->then(
-                function ($response) use ($returnType) {
-                    return [null, $response->getStatusCode(), $response->getHeaders()];
-                },
-                function ($exception) {
-                    $response = $exception->getResponse();
-                    $statusCode = $response->getStatusCode();
-                    throw new ApiException(
-                        sprintf(
-                            '[%d] Error connecting to the API (%s)',
-                            $statusCode,
-                            $exception->getRequest()->getUri()
-                        ),
-                        $statusCode,
-                        $response->getHeaders(),
-                        $response->getBody()
-                    );
-                }
-            );
-    }
-
-    /**
-     * Create request for operation 'updateUser'
-     *
-     * @param  string $username name that need to be deleted (required)
-     * @param  \OpenAPI\Client\Model\User $user Updated user object (required)
-     *
-     * @throws \InvalidArgumentException
-     * @return \GuzzleHttp\Psr7\Request
-     */
-    protected function updateUserRequest($username, $user)
-    {
-        // verify the required parameter 'username' is set
-        if ($username === null || (is_array($username) && count($username) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $username when calling updateUser'
-            );
-        }
-        // verify the required parameter 'user' is set
-        if ($user === null || (is_array($user) && count($user) === 0)) {
-            throw new \InvalidArgumentException(
-                'Missing the required parameter $user when calling updateUser'
-            );
-        }
-
-        $resourcePath = '/user/{username}';
-        $formParams = [];
-        $queryParams = [];
-        $headerParams = [];
-        $httpBody = '';
-        $multipart = false;
-
-
-
-        // path params
-        if ($username !== null) {
-            $resourcePath = str_replace(
-                '{' . 'username' . '}',
-                ObjectSerializer::toPathValue($username),
-                $resourcePath
-            );
-        }
-
-        // body params
-        $_tempBody = null;
-        if (isset($user)) {
-            $_tempBody = $user;
-        }
-
-        if ($multipart) {
-            $headers = $this->headerSelector->selectHeadersForMultipart(
-                []
-            );
-        } else {
-            $headers = $this->headerSelector->selectHeaders(
-                [],
-                ['application/json']
-            );
-        }
-
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            // $_tempBody is the method argument, if present
-            if ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
-            } else {
-                $httpBody = $_tempBody;
-            }
-        } elseif (count($formParams) > 0) {
-            if ($multipart) {
-                $multipartContents = [];
-                foreach ($formParams as $formParamName => $formParamValue) {
-                    $multipartContents[] = [
-                        'name' => $formParamName,
-                        'contents' => $formParamValue
-                    ];
-                }
-                // for HTTP post (form)
-                $httpBody = new MultipartStream($multipartContents);
-
-            } elseif ($headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($formParams);
-
-            } else {
-                // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
-            }
-        }
-
-
-        $defaultHeaders = [];
-        if ($this->config->getUserAgent()) {
-            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
-        }
-
-        $headers = array_merge(
-            $defaultHeaders,
-            $headerParams,
-            $headers
-        );
-
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
-        return new Request(
-            'PUT',
-            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
-            $headers,
-            $httpBody
-        );
-    }
-
-    /**
-     * Create http client option
-     *
-     * @throws \RuntimeException on file opening failure
-     * @return array of http client options
-     */
-    protected function createHttpClientOption()
-    {
-        $options = [];
-        if ($this->config->getDebug()) {
-            $options[RequestOptions::DEBUG] = fopen($this->config->getDebugFile(), 'a');
-            if (!$options[RequestOptions::DEBUG]) {
-                throw new \RuntimeException('Failed to open the debug file: ' . $this->config->getDebugFile());
-            }
-        }
-
-        return $options;
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
deleted file mode 100644
index e5ce75f4b3d2..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * ApiException
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client;
-
-use \Exception;
-
-/**
- * ApiException Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class ApiException extends Exception
-{
-
-    /**
-     * The HTTP body of the server response either as Json or string.
-     *
-     * @var mixed
-     */
-    protected $responseBody;
-
-    /**
-     * The HTTP header of the server response.
-     *
-     * @var string[]|null
-     */
-    protected $responseHeaders;
-
-    /**
-     * The deserialized response object
-     *
-     * @var $responseObject;
-     */
-    protected $responseObject;
-
-    /**
-     * Constructor
-     *
-     * @param string        $message         Error message
-     * @param int           $code            HTTP status code
-     * @param string[]|null $responseHeaders HTTP response header
-     * @param mixed         $responseBody    HTTP decoded body of the server response either as \stdClass or string
-     */
-    public function __construct($message = "", $code = 0, $responseHeaders = [], $responseBody = null)
-    {
-        parent::__construct($message, $code);
-        $this->responseHeaders = $responseHeaders;
-        $this->responseBody = $responseBody;
-    }
-
-    /**
-     * Gets the HTTP response header
-     *
-     * @return string[]|null HTTP response header
-     */
-    public function getResponseHeaders()
-    {
-        return $this->responseHeaders;
-    }
-
-    /**
-     * Gets the HTTP body of the server response either as Json or string
-     *
-     * @return mixed HTTP body of the server response either as \stdClass or string
-     */
-    public function getResponseBody()
-    {
-        return $this->responseBody;
-    }
-
-    /**
-     * Sets the deseralized response object (during deserialization)
-     *
-     * @param mixed $obj Deserialized response object
-     *
-     * @return void
-     */
-    public function setResponseObject($obj)
-    {
-        $this->responseObject = $obj;
-    }
-
-    /**
-     * Gets the deseralized response object (during deserialization)
-     *
-     * @return mixed the deserialized response object
-     */
-    public function getResponseObject()
-    {
-        return $this->responseObject;
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
deleted file mode 100644
index 343cf8f7e189..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-/**
- * Configuration
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client;
-
-/**
- * Configuration Class Doc Comment
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class Configuration
-{
-    private static $defaultConfiguration;
-
-    /**
-     * Associate array to store API key(s)
-     *
-     * @var string[]
-     */
-    protected $apiKeys = [];
-
-    /**
-     * Associate array to store API prefix (e.g. Bearer)
-     *
-     * @var string[]
-     */
-    protected $apiKeyPrefixes = [];
-
-    /**
-     * Access token for OAuth/Bearer authentication
-     *
-     * @var string
-     */
-    protected $accessToken = '';
-
-    /**
-     * Username for HTTP basic authentication
-     *
-     * @var string
-     */
-    protected $username = '';
-
-    /**
-     * Password for HTTP basic authentication
-     *
-     * @var string
-     */
-    protected $password = '';
-
-    /**
-     * The host
-     *
-     * @var string
-     */
-    protected $host = 'http://petstore.swagger.io:80/v2';
-
-    /**
-     * User agent of the HTTP request, set to "OpenAPI-Generator/{version}/PHP" by default
-     *
-     * @var string
-     */
-    protected $userAgent = 'OpenAPI-Generator/1.0.0/PHP';
-
-    /**
-     * Debug switch (default set to false)
-     *
-     * @var bool
-     */
-    protected $debug = false;
-
-    /**
-     * Debug file location (log to STDOUT by default)
-     *
-     * @var string
-     */
-    protected $debugFile = 'php://output';
-
-    /**
-     * Debug file location (log to STDOUT by default)
-     *
-     * @var string
-     */
-    protected $tempFolderPath;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->tempFolderPath = sys_get_temp_dir();
-    }
-
-    /**
-     * Sets API key
-     *
-     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
-     * @param string $key              API key or token
-     *
-     * @return $this
-     */
-    public function setApiKey($apiKeyIdentifier, $key)
-    {
-        $this->apiKeys[$apiKeyIdentifier] = $key;
-        return $this;
-    }
-
-    /**
-     * Gets API key
-     *
-     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
-     *
-     * @return string API key or token
-     */
-    public function getApiKey($apiKeyIdentifier)
-    {
-        return isset($this->apiKeys[$apiKeyIdentifier]) ? $this->apiKeys[$apiKeyIdentifier] : null;
-    }
-
-    /**
-     * Sets the prefix for API key (e.g. Bearer)
-     *
-     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
-     * @param string $prefix           API key prefix, e.g. Bearer
-     *
-     * @return $this
-     */
-    public function setApiKeyPrefix($apiKeyIdentifier, $prefix)
-    {
-        $this->apiKeyPrefixes[$apiKeyIdentifier] = $prefix;
-        return $this;
-    }
-
-    /**
-     * Gets API key prefix
-     *
-     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
-     *
-     * @return string
-     */
-    public function getApiKeyPrefix($apiKeyIdentifier)
-    {
-        return isset($this->apiKeyPrefixes[$apiKeyIdentifier]) ? $this->apiKeyPrefixes[$apiKeyIdentifier] : null;
-    }
-
-    /**
-     * Sets the access token for OAuth
-     *
-     * @param string $accessToken Token for OAuth
-     *
-     * @return $this
-     */
-    public function setAccessToken($accessToken)
-    {
-        $this->accessToken = $accessToken;
-        return $this;
-    }
-
-    /**
-     * Gets the access token for OAuth
-     *
-     * @return string Access token for OAuth
-     */
-    public function getAccessToken()
-    {
-        return $this->accessToken;
-    }
-
-    /**
-     * Sets the username for HTTP basic authentication
-     *
-     * @param string $username Username for HTTP basic authentication
-     *
-     * @return $this
-     */
-    public function setUsername($username)
-    {
-        $this->username = $username;
-        return $this;
-    }
-
-    /**
-     * Gets the username for HTTP basic authentication
-     *
-     * @return string Username for HTTP basic authentication
-     */
-    public function getUsername()
-    {
-        return $this->username;
-    }
-
-    /**
-     * Sets the password for HTTP basic authentication
-     *
-     * @param string $password Password for HTTP basic authentication
-     *
-     * @return $this
-     */
-    public function setPassword($password)
-    {
-        $this->password = $password;
-        return $this;
-    }
-
-    /**
-     * Gets the password for HTTP basic authentication
-     *
-     * @return string Password for HTTP basic authentication
-     */
-    public function getPassword()
-    {
-        return $this->password;
-    }
-
-    /**
-     * Sets the host
-     *
-     * @param string $host Host
-     *
-     * @return $this
-     */
-    public function setHost($host)
-    {
-        $this->host = $host;
-        return $this;
-    }
-
-    /**
-     * Gets the host
-     *
-     * @return string Host
-     */
-    public function getHost()
-    {
-        return $this->host;
-    }
-
-    /**
-     * Sets the user agent of the api client
-     *
-     * @param string $userAgent the user agent of the api client
-     *
-     * @throws \InvalidArgumentException
-     * @return $this
-     */
-    public function setUserAgent($userAgent)
-    {
-        if (!is_string($userAgent)) {
-            throw new \InvalidArgumentException('User-agent must be a string.');
-        }
-
-        $this->userAgent = $userAgent;
-        return $this;
-    }
-
-    /**
-     * Gets the user agent of the api client
-     *
-     * @return string user agent
-     */
-    public function getUserAgent()
-    {
-        return $this->userAgent;
-    }
-
-    /**
-     * Sets debug flag
-     *
-     * @param bool $debug Debug flag
-     *
-     * @return $this
-     */
-    public function setDebug($debug)
-    {
-        $this->debug = $debug;
-        return $this;
-    }
-
-    /**
-     * Gets the debug flag
-     *
-     * @return bool
-     */
-    public function getDebug()
-    {
-        return $this->debug;
-    }
-
-    /**
-     * Sets the debug file
-     *
-     * @param string $debugFile Debug file
-     *
-     * @return $this
-     */
-    public function setDebugFile($debugFile)
-    {
-        $this->debugFile = $debugFile;
-        return $this;
-    }
-
-    /**
-     * Gets the debug file
-     *
-     * @return string
-     */
-    public function getDebugFile()
-    {
-        return $this->debugFile;
-    }
-
-    /**
-     * Sets the temp folder path
-     *
-     * @param string $tempFolderPath Temp folder path
-     *
-     * @return $this
-     */
-    public function setTempFolderPath($tempFolderPath)
-    {
-        $this->tempFolderPath = $tempFolderPath;
-        return $this;
-    }
-
-    /**
-     * Gets the temp folder path
-     *
-     * @return string Temp folder path
-     */
-    public function getTempFolderPath()
-    {
-        return $this->tempFolderPath;
-    }
-
-    /**
-     * Gets the default configuration instance
-     *
-     * @return Configuration
-     */
-    public static function getDefaultConfiguration()
-    {
-        if (self::$defaultConfiguration === null) {
-            self::$defaultConfiguration = new Configuration();
-        }
-
-        return self::$defaultConfiguration;
-    }
-
-    /**
-     * Sets the detault configuration instance
-     *
-     * @param Configuration $config An instance of the Configuration Object
-     *
-     * @return void
-     */
-    public static function setDefaultConfiguration(Configuration $config)
-    {
-        self::$defaultConfiguration = $config;
-    }
-
-    /**
-     * Gets the essential information for debugging
-     *
-     * @return string The report for debugging
-     */
-    public static function toDebugReport()
-    {
-        $report  = 'PHP SDK (OpenAPI\Client) Debug Report:' . PHP_EOL;
-        $report .= '    OS: ' . php_uname() . PHP_EOL;
-        $report .= '    PHP Version: ' . PHP_VERSION . PHP_EOL;
-        $report .= '    The version of the OpenAPI document: 1.0.0' . PHP_EOL;
-        $report .= '    Temp Folder Path: ' . self::getDefaultConfiguration()->getTempFolderPath() . PHP_EOL;
-
-        return $report;
-    }
-
-    /**
-     * Get API key (with prefix if set)
-     *
-     * @param  string $apiKeyIdentifier name of apikey
-     *
-     * @return string API key with the prefix
-     */
-    public function getApiKeyWithPrefix($apiKeyIdentifier)
-    {
-        $prefix = $this->getApiKeyPrefix($apiKeyIdentifier);
-        $apiKey = $this->getApiKey($apiKeyIdentifier);
-
-        if ($apiKey === null) {
-            return null;
-        }
-
-        if ($prefix === null) {
-            $keyWithPrefix = $apiKey;
-        } else {
-            $keyWithPrefix = $prefix . ' ' . $apiKey;
-        }
-
-        return $keyWithPrefix;
-    }
-
-    /**
-     * Returns an array of host settings
-     *
-     * @return an array of host settings
-     */
-    public function getHostSettings()
-    {
-        return array(
-          array(
-            "url" => "http://{server}.swagger.io:{port}/v2",
-            "description" => "petstore server",
-            "variables" => array(
-              "server" => array(
-                  "description" => "No description provided",
-                  "default_value" => "petstore",
-                  "enum_values" => array(
-                    "petstore",
-                    "qa-petstore",
-                    "dev-petstore"
-                  )
-                ),
-              "port" => array(
-                  "description" => "No description provided",
-                  "default_value" => "80",
-                  "enum_values" => array(
-                    "80",
-                    "8080"
-                  )
-                )
-              )
-          ),
-          array(
-            "url" => "https://localhost:8080/{version}",
-            "description" => "The local server",
-            "variables" => array(
-              "version" => array(
-                  "description" => "No description provided",
-                  "default_value" => "v2",
-                  "enum_values" => array(
-                    "v1",
-                    "v2"
-                  )
-                )
-              )
-          )
-        );
-    }
-
-    /**
-     * Returns URL based on the index and variables
-     *
-     * @param index array index of the host settings
-     * @param variables hash of variable and the corresponding value (optional)
-     * @return URL based on host settings
-     */
-    public function getHostFromSettings($index, $variables = null)
-    {
-        if (null === $variables) {
-            $variables = array();
-        }
-
-        $hosts = $this->getHostSettings();
-
-        // check array index out of bound
-        if ($index < 0 || $index >= sizeof($hosts)) {
-            throw new \InvalidArgumentException("Invalid index $index when selecting the host. Must be less than ".sizeof($hosts));
-        }
-
-        $host = $hosts[$index];
-        $url = $host["url"];
-
-        // go through variable and assign a value
-        foreach ($host["variables"] as $name => $variable) {
-            if (array_key_exists($name, $variables)) { // check to see if it's in the variables provided by the user
-                if (in_array($variables[$name], $variable["enum_values"])) { // check to see if the value is in the enum
-                    $url = str_replace("{".$name."}", $variables[$name], $url);
-                } else {
-                    throw new \InvalidArgumentException("The variable `$name` in the host URL has invalid value ".$variables[$name].". Must be ".join(',', $variable["enum_values"]).".");
-                }
-            } else {
-                // use default value
-                $url = str_replace("{".$name."}", $variable["default_value"], $url);
-            }
-        }
-
-        return $url;
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
deleted file mode 100644
index d5fec659084a..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * ApiException
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client;
-
-use \Exception;
-
-/**
- * ApiException Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class HeaderSelector
-{
-
-    /**
-     * @param string[] $accept
-     * @param string[] $contentTypes
-     * @return array
-     */
-    public function selectHeaders($accept, $contentTypes)
-    {
-        $headers = [];
-
-        $accept = $this->selectAcceptHeader($accept);
-        if ($accept !== null) {
-            $headers['Accept'] = $accept;
-        }
-
-        $headers['Content-Type'] = $this->selectContentTypeHeader($contentTypes);
-        return $headers;
-    }
-
-    /**
-     * @param string[] $accept
-     * @return array
-     */
-    public function selectHeadersForMultipart($accept)
-    {
-        $headers = $this->selectHeaders($accept, []);
-
-        unset($headers['Content-Type']);
-        return $headers;
-    }
-
-    /**
-     * Return the header 'Accept' based on an array of Accept provided
-     *
-     * @param string[] $accept Array of header
-     *
-     * @return string Accept (e.g. application/json)
-     */
-    private function selectAcceptHeader($accept)
-    {
-        if (count($accept) === 0 || (count($accept) === 1 && $accept[0] === '')) {
-            return null;
-        } elseif ($jsonAccept = preg_grep('~(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$~', $accept)) {
-            return implode(',', $jsonAccept);
-        } else {
-            return implode(',', $accept);
-        }
-    }
-
-    /**
-     * Return the content type based on an array of content-type provided
-     *
-     * @param string[] $contentType Array fo content-type
-     *
-     * @return string Content-Type (e.g. application/json)
-     */
-    private function selectContentTypeHeader($contentType)
-    {
-        if (count($contentType) === 0 || (count($contentType) === 1 && $contentType[0] === '')) {
-            return 'application/json';
-        } elseif (preg_grep("/application\/json/i", $contentType)) {
-            return 'application/json';
-        } else {
-            return implode(',', $contentType);
-        }
-    }
-}
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
deleted file mode 100644
index 5289929d4298..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesClass
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * AdditionalPropertiesClass Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class AdditionalPropertiesClass implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'AdditionalPropertiesClass';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'map_property' => 'map[string,string]',
-        'map_of_map_property' => 'map[string,map[string,string]]'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'map_property' => null,
-        'map_of_map_property' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'map_property' => 'map_property',
-        'map_of_map_property' => 'map_of_map_property'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'map_property' => 'setMapProperty',
-        'map_of_map_property' => 'setMapOfMapProperty'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'map_property' => 'getMapProperty',
-        'map_of_map_property' => 'getMapOfMapProperty'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['map_property'] = isset($data['map_property']) ? $data['map_property'] : null;
-        $this->container['map_of_map_property'] = isset($data['map_of_map_property']) ? $data['map_of_map_property'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets map_property
-     *
-     * @return map[string,string]|null
-     */
-    public function getMapProperty()
-    {
-        return $this->container['map_property'];
-    }
-
-    /**
-     * Sets map_property
-     *
-     * @param map[string,string]|null $map_property map_property
-     *
-     * @return $this
-     */
-    public function setMapProperty($map_property)
-    {
-        $this->container['map_property'] = $map_property;
-
-        return $this;
-    }
-
-    /**
-     * Gets map_of_map_property
-     *
-     * @return map[string,map[string,string]]|null
-     */
-    public function getMapOfMapProperty()
-    {
-        return $this->container['map_of_map_property'];
-    }
-
-    /**
-     * Sets map_of_map_property
-     *
-     * @param map[string,map[string,string]]|null $map_of_map_property map_of_map_property
-     *
-     * @return $this
-     */
-    public function setMapOfMapProperty($map_of_map_property)
-    {
-        $this->container['map_of_map_property'] = $map_of_map_property;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
deleted file mode 100644
index 3d0b6ec089b2..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-/**
- * Animal
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * Animal Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class Animal implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = 'class_name';
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Animal';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'class_name' => 'string',
-        'color' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'class_name' => null,
-        'color' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'class_name' => 'className',
-        'color' => 'color'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'class_name' => 'setClassName',
-        'color' => 'setColor'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'class_name' => 'getClassName',
-        'color' => 'getColor'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['class_name'] = isset($data['class_name']) ? $data['class_name'] : null;
-        $this->container['color'] = isset($data['color']) ? $data['color'] : 'red';
-
-        // Initialize discriminator property with the model name.
-        $this->container['class_name'] = static::$openAPIModelName;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        if ($this->container['class_name'] === null) {
-            $invalidProperties[] = "'class_name' can't be null";
-        }
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets class_name
-     *
-     * @return string
-     */
-    public function getClassName()
-    {
-        return $this->container['class_name'];
-    }
-
-    /**
-     * Sets class_name
-     *
-     * @param string $class_name class_name
-     *
-     * @return $this
-     */
-    public function setClassName($class_name)
-    {
-        $this->container['class_name'] = $class_name;
-
-        return $this;
-    }
-
-    /**
-     * Gets color
-     *
-     * @return string|null
-     */
-    public function getColor()
-    {
-        return $this->container['color'];
-    }
-
-    /**
-     * Sets color
-     *
-     * @param string|null $color color
-     *
-     * @return $this
-     */
-    public function setColor($color)
-    {
-        $this->container['color'] = $color;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
deleted file mode 100644
index b621b9b85468..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
+++ /dev/null
@@ -1,367 +0,0 @@
-<?php
-/**
- * ApiResponse
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * ApiResponse Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class ApiResponse implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'ApiResponse';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'code' => 'int',
-        'type' => 'string',
-        'message' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'code' => 'int32',
-        'type' => null,
-        'message' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'code' => 'code',
-        'type' => 'type',
-        'message' => 'message'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'code' => 'setCode',
-        'type' => 'setType',
-        'message' => 'setMessage'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'code' => 'getCode',
-        'type' => 'getType',
-        'message' => 'getMessage'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['code'] = isset($data['code']) ? $data['code'] : null;
-        $this->container['type'] = isset($data['type']) ? $data['type'] : null;
-        $this->container['message'] = isset($data['message']) ? $data['message'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets code
-     *
-     * @return int|null
-     */
-    public function getCode()
-    {
-        return $this->container['code'];
-    }
-
-    /**
-     * Sets code
-     *
-     * @param int|null $code code
-     *
-     * @return $this
-     */
-    public function setCode($code)
-    {
-        $this->container['code'] = $code;
-
-        return $this;
-    }
-
-    /**
-     * Gets type
-     *
-     * @return string|null
-     */
-    public function getType()
-    {
-        return $this->container['type'];
-    }
-
-    /**
-     * Sets type
-     *
-     * @param string|null $type type
-     *
-     * @return $this
-     */
-    public function setType($type)
-    {
-        $this->container['type'] = $type;
-
-        return $this;
-    }
-
-    /**
-     * Gets message
-     *
-     * @return string|null
-     */
-    public function getMessage()
-    {
-        return $this->container['message'];
-    }
-
-    /**
-     * Sets message
-     *
-     * @param string|null $message message
-     *
-     * @return $this
-     */
-    public function setMessage($message)
-    {
-        $this->container['message'] = $message;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
deleted file mode 100644
index 6427d34c821d..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * ArrayOfArrayOfNumberOnly
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * ArrayOfArrayOfNumberOnly Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class ArrayOfArrayOfNumberOnly implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'ArrayOfArrayOfNumberOnly';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'array_array_number' => 'float[][]'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'array_array_number' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'array_array_number' => 'ArrayArrayNumber'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'array_array_number' => 'setArrayArrayNumber'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'array_array_number' => 'getArrayArrayNumber'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['array_array_number'] = isset($data['array_array_number']) ? $data['array_array_number'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets array_array_number
-     *
-     * @return float[][]|null
-     */
-    public function getArrayArrayNumber()
-    {
-        return $this->container['array_array_number'];
-    }
-
-    /**
-     * Sets array_array_number
-     *
-     * @param float[][]|null $array_array_number array_array_number
-     *
-     * @return $this
-     */
-    public function setArrayArrayNumber($array_array_number)
-    {
-        $this->container['array_array_number'] = $array_array_number;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
deleted file mode 100644
index 5bbb390a9bf3..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * ArrayOfNumberOnly
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * ArrayOfNumberOnly Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class ArrayOfNumberOnly implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'ArrayOfNumberOnly';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'array_number' => 'float[]'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'array_number' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'array_number' => 'ArrayNumber'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'array_number' => 'setArrayNumber'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'array_number' => 'getArrayNumber'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['array_number'] = isset($data['array_number']) ? $data['array_number'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets array_number
-     *
-     * @return float[]|null
-     */
-    public function getArrayNumber()
-    {
-        return $this->container['array_number'];
-    }
-
-    /**
-     * Sets array_number
-     *
-     * @param float[]|null $array_number array_number
-     *
-     * @return $this
-     */
-    public function setArrayNumber($array_number)
-    {
-        $this->container['array_number'] = $array_number;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
deleted file mode 100644
index 8bf78347cb43..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
+++ /dev/null
@@ -1,367 +0,0 @@
-<?php
-/**
- * ArrayTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * ArrayTest Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class ArrayTest implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'ArrayTest';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'array_of_string' => 'string[]',
-        'array_array_of_integer' => 'int[][]',
-        'array_array_of_model' => '\OpenAPI\Client\Model\ReadOnlyFirst[][]'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'array_of_string' => null,
-        'array_array_of_integer' => 'int64',
-        'array_array_of_model' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'array_of_string' => 'array_of_string',
-        'array_array_of_integer' => 'array_array_of_integer',
-        'array_array_of_model' => 'array_array_of_model'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'array_of_string' => 'setArrayOfString',
-        'array_array_of_integer' => 'setArrayArrayOfInteger',
-        'array_array_of_model' => 'setArrayArrayOfModel'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'array_of_string' => 'getArrayOfString',
-        'array_array_of_integer' => 'getArrayArrayOfInteger',
-        'array_array_of_model' => 'getArrayArrayOfModel'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['array_of_string'] = isset($data['array_of_string']) ? $data['array_of_string'] : null;
-        $this->container['array_array_of_integer'] = isset($data['array_array_of_integer']) ? $data['array_array_of_integer'] : null;
-        $this->container['array_array_of_model'] = isset($data['array_array_of_model']) ? $data['array_array_of_model'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets array_of_string
-     *
-     * @return string[]|null
-     */
-    public function getArrayOfString()
-    {
-        return $this->container['array_of_string'];
-    }
-
-    /**
-     * Sets array_of_string
-     *
-     * @param string[]|null $array_of_string array_of_string
-     *
-     * @return $this
-     */
-    public function setArrayOfString($array_of_string)
-    {
-        $this->container['array_of_string'] = $array_of_string;
-
-        return $this;
-    }
-
-    /**
-     * Gets array_array_of_integer
-     *
-     * @return int[][]|null
-     */
-    public function getArrayArrayOfInteger()
-    {
-        return $this->container['array_array_of_integer'];
-    }
-
-    /**
-     * Sets array_array_of_integer
-     *
-     * @param int[][]|null $array_array_of_integer array_array_of_integer
-     *
-     * @return $this
-     */
-    public function setArrayArrayOfInteger($array_array_of_integer)
-    {
-        $this->container['array_array_of_integer'] = $array_array_of_integer;
-
-        return $this;
-    }
-
-    /**
-     * Gets array_array_of_model
-     *
-     * @return \OpenAPI\Client\Model\ReadOnlyFirst[][]|null
-     */
-    public function getArrayArrayOfModel()
-    {
-        return $this->container['array_array_of_model'];
-    }
-
-    /**
-     * Sets array_array_of_model
-     *
-     * @param \OpenAPI\Client\Model\ReadOnlyFirst[][]|null $array_array_of_model array_array_of_model
-     *
-     * @return $this
-     */
-    public function setArrayArrayOfModel($array_array_of_model)
-    {
-        $this->container['array_array_of_model'] = $array_array_of_model;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
deleted file mode 100644
index 87d9797bbd5d..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
+++ /dev/null
@@ -1,457 +0,0 @@
-<?php
-/**
- * Capitalization
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * Capitalization Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class Capitalization implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Capitalization';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'small_camel' => 'string',
-        'capital_camel' => 'string',
-        'small_snake' => 'string',
-        'capital_snake' => 'string',
-        'sca_eth_flow_points' => 'string',
-        'att_name' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'small_camel' => null,
-        'capital_camel' => null,
-        'small_snake' => null,
-        'capital_snake' => null,
-        'sca_eth_flow_points' => null,
-        'att_name' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'small_camel' => 'smallCamel',
-        'capital_camel' => 'CapitalCamel',
-        'small_snake' => 'small_Snake',
-        'capital_snake' => 'Capital_Snake',
-        'sca_eth_flow_points' => 'SCA_ETH_Flow_Points',
-        'att_name' => 'ATT_NAME'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'small_camel' => 'setSmallCamel',
-        'capital_camel' => 'setCapitalCamel',
-        'small_snake' => 'setSmallSnake',
-        'capital_snake' => 'setCapitalSnake',
-        'sca_eth_flow_points' => 'setScaEthFlowPoints',
-        'att_name' => 'setAttName'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'small_camel' => 'getSmallCamel',
-        'capital_camel' => 'getCapitalCamel',
-        'small_snake' => 'getSmallSnake',
-        'capital_snake' => 'getCapitalSnake',
-        'sca_eth_flow_points' => 'getScaEthFlowPoints',
-        'att_name' => 'getAttName'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['small_camel'] = isset($data['small_camel']) ? $data['small_camel'] : null;
-        $this->container['capital_camel'] = isset($data['capital_camel']) ? $data['capital_camel'] : null;
-        $this->container['small_snake'] = isset($data['small_snake']) ? $data['small_snake'] : null;
-        $this->container['capital_snake'] = isset($data['capital_snake']) ? $data['capital_snake'] : null;
-        $this->container['sca_eth_flow_points'] = isset($data['sca_eth_flow_points']) ? $data['sca_eth_flow_points'] : null;
-        $this->container['att_name'] = isset($data['att_name']) ? $data['att_name'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets small_camel
-     *
-     * @return string|null
-     */
-    public function getSmallCamel()
-    {
-        return $this->container['small_camel'];
-    }
-
-    /**
-     * Sets small_camel
-     *
-     * @param string|null $small_camel small_camel
-     *
-     * @return $this
-     */
-    public function setSmallCamel($small_camel)
-    {
-        $this->container['small_camel'] = $small_camel;
-
-        return $this;
-    }
-
-    /**
-     * Gets capital_camel
-     *
-     * @return string|null
-     */
-    public function getCapitalCamel()
-    {
-        return $this->container['capital_camel'];
-    }
-
-    /**
-     * Sets capital_camel
-     *
-     * @param string|null $capital_camel capital_camel
-     *
-     * @return $this
-     */
-    public function setCapitalCamel($capital_camel)
-    {
-        $this->container['capital_camel'] = $capital_camel;
-
-        return $this;
-    }
-
-    /**
-     * Gets small_snake
-     *
-     * @return string|null
-     */
-    public function getSmallSnake()
-    {
-        return $this->container['small_snake'];
-    }
-
-    /**
-     * Sets small_snake
-     *
-     * @param string|null $small_snake small_snake
-     *
-     * @return $this
-     */
-    public function setSmallSnake($small_snake)
-    {
-        $this->container['small_snake'] = $small_snake;
-
-        return $this;
-    }
-
-    /**
-     * Gets capital_snake
-     *
-     * @return string|null
-     */
-    public function getCapitalSnake()
-    {
-        return $this->container['capital_snake'];
-    }
-
-    /**
-     * Sets capital_snake
-     *
-     * @param string|null $capital_snake capital_snake
-     *
-     * @return $this
-     */
-    public function setCapitalSnake($capital_snake)
-    {
-        $this->container['capital_snake'] = $capital_snake;
-
-        return $this;
-    }
-
-    /**
-     * Gets sca_eth_flow_points
-     *
-     * @return string|null
-     */
-    public function getScaEthFlowPoints()
-    {
-        return $this->container['sca_eth_flow_points'];
-    }
-
-    /**
-     * Sets sca_eth_flow_points
-     *
-     * @param string|null $sca_eth_flow_points sca_eth_flow_points
-     *
-     * @return $this
-     */
-    public function setScaEthFlowPoints($sca_eth_flow_points)
-    {
-        $this->container['sca_eth_flow_points'] = $sca_eth_flow_points;
-
-        return $this;
-    }
-
-    /**
-     * Gets att_name
-     *
-     * @return string|null
-     */
-    public function getAttName()
-    {
-        return $this->container['att_name'];
-    }
-
-    /**
-     * Sets att_name
-     *
-     * @param string|null $att_name Name of the pet
-     *
-     * @return $this
-     */
-    public function setAttName($att_name)
-    {
-        $this->container['att_name'] = $att_name;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
deleted file mode 100644
index 3f401bf92576..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-/**
- * Cat
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * Cat Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class Cat extends Animal 
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Cat';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'declawed' => 'bool'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'declawed' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes + parent::openAPITypes();
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats + parent::openAPIFormats();
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'declawed' => 'declawed'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'declawed' => 'setDeclawed'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'declawed' => 'getDeclawed'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return parent::attributeMap() + self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return parent::setters() + self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return parent::getters() + self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        parent::__construct($data);
-
-        $this->container['declawed'] = isset($data['declawed']) ? $data['declawed'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = parent::listInvalidProperties();
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets declawed
-     *
-     * @return bool|null
-     */
-    public function getDeclawed()
-    {
-        return $this->container['declawed'];
-    }
-
-    /**
-     * Sets declawed
-     *
-     * @param bool|null $declawed declawed
-     *
-     * @return $this
-     */
-    public function setDeclawed($declawed)
-    {
-        $this->container['declawed'] = $declawed;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
deleted file mode 100644
index c7bf3b6a899c..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * CatAllOf
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * CatAllOf Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class CatAllOf implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Cat_allOf';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'declawed' => 'bool'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'declawed' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'declawed' => 'declawed'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'declawed' => 'setDeclawed'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'declawed' => 'getDeclawed'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['declawed'] = isset($data['declawed']) ? $data['declawed'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets declawed
-     *
-     * @return bool|null
-     */
-    public function getDeclawed()
-    {
-        return $this->container['declawed'];
-    }
-
-    /**
-     * Sets declawed
-     *
-     * @param bool|null $declawed declawed
-     *
-     * @return $this
-     */
-    public function setDeclawed($declawed)
-    {
-        $this->container['declawed'] = $declawed;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
deleted file mode 100644
index 9a5650889032..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-/**
- * Category
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * Category Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class Category implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Category';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'id' => 'int',
-        'name' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'id' => 'int64',
-        'name' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'id' => 'id',
-        'name' => 'name'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'id' => 'setId',
-        'name' => 'setName'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'id' => 'getId',
-        'name' => 'getName'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['id'] = isset($data['id']) ? $data['id'] : null;
-        $this->container['name'] = isset($data['name']) ? $data['name'] : 'default-name';
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        if ($this->container['name'] === null) {
-            $invalidProperties[] = "'name' can't be null";
-        }
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets id
-     *
-     * @return int|null
-     */
-    public function getId()
-    {
-        return $this->container['id'];
-    }
-
-    /**
-     * Sets id
-     *
-     * @param int|null $id id
-     *
-     * @return $this
-     */
-    public function setId($id)
-    {
-        $this->container['id'] = $id;
-
-        return $this;
-    }
-
-    /**
-     * Gets name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->container['name'];
-    }
-
-    /**
-     * Sets name
-     *
-     * @param string $name name
-     *
-     * @return $this
-     */
-    public function setName($name)
-    {
-        $this->container['name'] = $name;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
deleted file mode 100644
index 8b97176b5c47..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-/**
- * ClassModel
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * ClassModel Class Doc Comment
- *
- * @category Class
- * @description Model for testing model with \&quot;_class\&quot; property
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class ClassModel implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'ClassModel';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        '_class' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        '_class' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        '_class' => '_class'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        '_class' => 'setClass'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        '_class' => 'getClass'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['_class'] = isset($data['_class']) ? $data['_class'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets _class
-     *
-     * @return string|null
-     */
-    public function getClass()
-    {
-        return $this->container['_class'];
-    }
-
-    /**
-     * Sets _class
-     *
-     * @param string|null $_class _class
-     *
-     * @return $this
-     */
-    public function setClass($_class)
-    {
-        $this->container['_class'] = $_class;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
deleted file mode 100644
index 3213c427076f..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * Client
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * Client Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class Client implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Client';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'client' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'client' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'client' => 'client'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'client' => 'setClient'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'client' => 'getClient'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['client'] = isset($data['client']) ? $data['client'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets client
-     *
-     * @return string|null
-     */
-    public function getClient()
-    {
-        return $this->container['client'];
-    }
-
-    /**
-     * Sets client
-     *
-     * @param string|null $client client
-     *
-     * @return $this
-     */
-    public function setClient($client)
-    {
-        $this->container['client'] = $client;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
deleted file mode 100644
index 30fc3fd6f8ed..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-/**
- * Dog
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * Dog Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class Dog extends Animal 
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Dog';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'breed' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'breed' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes + parent::openAPITypes();
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats + parent::openAPIFormats();
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'breed' => 'breed'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'breed' => 'setBreed'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'breed' => 'getBreed'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return parent::attributeMap() + self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return parent::setters() + self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return parent::getters() + self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        parent::__construct($data);
-
-        $this->container['breed'] = isset($data['breed']) ? $data['breed'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = parent::listInvalidProperties();
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets breed
-     *
-     * @return string|null
-     */
-    public function getBreed()
-    {
-        return $this->container['breed'];
-    }
-
-    /**
-     * Sets breed
-     *
-     * @param string|null $breed breed
-     *
-     * @return $this
-     */
-    public function setBreed($breed)
-    {
-        $this->container['breed'] = $breed;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
deleted file mode 100644
index dbb1eaf631a3..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * DogAllOf
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * DogAllOf Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class DogAllOf implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Dog_allOf';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'breed' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'breed' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'breed' => 'breed'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'breed' => 'setBreed'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'breed' => 'getBreed'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['breed'] = isset($data['breed']) ? $data['breed'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets breed
-     *
-     * @return string|null
-     */
-    public function getBreed()
-    {
-        return $this->container['breed'];
-    }
-
-    /**
-     * Sets breed
-     *
-     * @param string|null $breed breed
-     *
-     * @return $this
-     */
-    public function setBreed($breed)
-    {
-        $this->container['breed'] = $breed;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
deleted file mode 100644
index b8f8ca180d98..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
+++ /dev/null
@@ -1,393 +0,0 @@
-<?php
-/**
- * EnumArrays
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * EnumArrays Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class EnumArrays implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'EnumArrays';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'just_symbol' => 'string',
-        'array_enum' => 'string[]'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'just_symbol' => null,
-        'array_enum' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'just_symbol' => 'just_symbol',
-        'array_enum' => 'array_enum'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'just_symbol' => 'setJustSymbol',
-        'array_enum' => 'setArrayEnum'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'just_symbol' => 'getJustSymbol',
-        'array_enum' => 'getArrayEnum'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    const JUST_SYMBOL_GREATER_THAN_OR_EQUAL_TO = '>=';
-    const JUST_SYMBOL_DOLLAR = '$';
-    const ARRAY_ENUM_FISH = 'fish';
-    const ARRAY_ENUM_CRAB = 'crab';
-    
-
-    
-    /**
-     * Gets allowable values of the enum
-     *
-     * @return string[]
-     */
-    public function getJustSymbolAllowableValues()
-    {
-        return [
-            self::JUST_SYMBOL_GREATER_THAN_OR_EQUAL_TO,
-            self::JUST_SYMBOL_DOLLAR,
-        ];
-    }
-    
-    /**
-     * Gets allowable values of the enum
-     *
-     * @return string[]
-     */
-    public function getArrayEnumAllowableValues()
-    {
-        return [
-            self::ARRAY_ENUM_FISH,
-            self::ARRAY_ENUM_CRAB,
-        ];
-    }
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['just_symbol'] = isset($data['just_symbol']) ? $data['just_symbol'] : null;
-        $this->container['array_enum'] = isset($data['array_enum']) ? $data['array_enum'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        $allowedValues = $this->getJustSymbolAllowableValues();
-        if (!is_null($this->container['just_symbol']) && !in_array($this->container['just_symbol'], $allowedValues, true)) {
-            $invalidProperties[] = sprintf(
-                "invalid value for 'just_symbol', must be one of '%s'",
-                implode("', '", $allowedValues)
-            );
-        }
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets just_symbol
-     *
-     * @return string|null
-     */
-    public function getJustSymbol()
-    {
-        return $this->container['just_symbol'];
-    }
-
-    /**
-     * Sets just_symbol
-     *
-     * @param string|null $just_symbol just_symbol
-     *
-     * @return $this
-     */
-    public function setJustSymbol($just_symbol)
-    {
-        $allowedValues = $this->getJustSymbolAllowableValues();
-        if (!is_null($just_symbol) && !in_array($just_symbol, $allowedValues, true)) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    "Invalid value for 'just_symbol', must be one of '%s'",
-                    implode("', '", $allowedValues)
-                )
-            );
-        }
-        $this->container['just_symbol'] = $just_symbol;
-
-        return $this;
-    }
-
-    /**
-     * Gets array_enum
-     *
-     * @return string[]|null
-     */
-    public function getArrayEnum()
-    {
-        return $this->container['array_enum'];
-    }
-
-    /**
-     * Sets array_enum
-     *
-     * @param string[]|null $array_enum array_enum
-     *
-     * @return $this
-     */
-    public function setArrayEnum($array_enum)
-    {
-        $allowedValues = $this->getArrayEnumAllowableValues();
-        if (!is_null($array_enum) && array_diff($array_enum, $allowedValues)) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    "Invalid value for 'array_enum', must be one of '%s'",
-                    implode("', '", $allowedValues)
-                )
-            );
-        }
-        $this->container['array_enum'] = $array_enum;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
deleted file mode 100644
index bdde07b3bc49..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * EnumClass
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * EnumClass Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class EnumClass
-{
-    /**
-     * Possible values of this enum
-     */
-    const ABC = '_abc';
-    const EFG = '-efg';
-    const XYZ = '(xyz)';
-    
-    /**
-     * Gets allowable values of the enum
-     * @return string[]
-     */
-    public static function getAllowableEnumValues()
-    {
-        return [
-            self::ABC,
-            self::EFG,
-            self::XYZ,
-        ];
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
deleted file mode 100644
index e8163d619d83..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
+++ /dev/null
@@ -1,652 +0,0 @@
-<?php
-/**
- * EnumTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * EnumTest Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class EnumTest implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Enum_Test';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'enum_string' => 'string',
-        'enum_string_required' => 'string',
-        'enum_integer' => 'int',
-        'enum_number' => 'double',
-        'outer_enum' => '\OpenAPI\Client\Model\OuterEnum',
-        'outer_enum_integer' => '\OpenAPI\Client\Model\OuterEnumInteger',
-        'outer_enum_default_value' => '\OpenAPI\Client\Model\OuterEnumDefaultValue',
-        'outer_enum_integer_default_value' => '\OpenAPI\Client\Model\OuterEnumIntegerDefaultValue'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'enum_string' => null,
-        'enum_string_required' => null,
-        'enum_integer' => 'int32',
-        'enum_number' => 'double',
-        'outer_enum' => null,
-        'outer_enum_integer' => null,
-        'outer_enum_default_value' => null,
-        'outer_enum_integer_default_value' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'enum_string' => 'enum_string',
-        'enum_string_required' => 'enum_string_required',
-        'enum_integer' => 'enum_integer',
-        'enum_number' => 'enum_number',
-        'outer_enum' => 'outerEnum',
-        'outer_enum_integer' => 'outerEnumInteger',
-        'outer_enum_default_value' => 'outerEnumDefaultValue',
-        'outer_enum_integer_default_value' => 'outerEnumIntegerDefaultValue'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'enum_string' => 'setEnumString',
-        'enum_string_required' => 'setEnumStringRequired',
-        'enum_integer' => 'setEnumInteger',
-        'enum_number' => 'setEnumNumber',
-        'outer_enum' => 'setOuterEnum',
-        'outer_enum_integer' => 'setOuterEnumInteger',
-        'outer_enum_default_value' => 'setOuterEnumDefaultValue',
-        'outer_enum_integer_default_value' => 'setOuterEnumIntegerDefaultValue'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'enum_string' => 'getEnumString',
-        'enum_string_required' => 'getEnumStringRequired',
-        'enum_integer' => 'getEnumInteger',
-        'enum_number' => 'getEnumNumber',
-        'outer_enum' => 'getOuterEnum',
-        'outer_enum_integer' => 'getOuterEnumInteger',
-        'outer_enum_default_value' => 'getOuterEnumDefaultValue',
-        'outer_enum_integer_default_value' => 'getOuterEnumIntegerDefaultValue'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    const ENUM_STRING_UPPER = 'UPPER';
-    const ENUM_STRING_LOWER = 'lower';
-    const ENUM_STRING_EMPTY = '';
-    const ENUM_STRING_REQUIRED_UPPER = 'UPPER';
-    const ENUM_STRING_REQUIRED_LOWER = 'lower';
-    const ENUM_STRING_REQUIRED_EMPTY = '';
-    const ENUM_INTEGER_1 = 1;
-    const ENUM_INTEGER_MINUS_1 = -1;
-    const ENUM_NUMBER_1_DOT_1 = 1.1;
-    const ENUM_NUMBER_MINUS_1_DOT_2 = -1.2;
-    
-
-    
-    /**
-     * Gets allowable values of the enum
-     *
-     * @return string[]
-     */
-    public function getEnumStringAllowableValues()
-    {
-        return [
-            self::ENUM_STRING_UPPER,
-            self::ENUM_STRING_LOWER,
-            self::ENUM_STRING_EMPTY,
-        ];
-    }
-    
-    /**
-     * Gets allowable values of the enum
-     *
-     * @return string[]
-     */
-    public function getEnumStringRequiredAllowableValues()
-    {
-        return [
-            self::ENUM_STRING_REQUIRED_UPPER,
-            self::ENUM_STRING_REQUIRED_LOWER,
-            self::ENUM_STRING_REQUIRED_EMPTY,
-        ];
-    }
-    
-    /**
-     * Gets allowable values of the enum
-     *
-     * @return string[]
-     */
-    public function getEnumIntegerAllowableValues()
-    {
-        return [
-            self::ENUM_INTEGER_1,
-            self::ENUM_INTEGER_MINUS_1,
-        ];
-    }
-    
-    /**
-     * Gets allowable values of the enum
-     *
-     * @return string[]
-     */
-    public function getEnumNumberAllowableValues()
-    {
-        return [
-            self::ENUM_NUMBER_1_DOT_1,
-            self::ENUM_NUMBER_MINUS_1_DOT_2,
-        ];
-    }
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['enum_string'] = isset($data['enum_string']) ? $data['enum_string'] : null;
-        $this->container['enum_string_required'] = isset($data['enum_string_required']) ? $data['enum_string_required'] : null;
-        $this->container['enum_integer'] = isset($data['enum_integer']) ? $data['enum_integer'] : null;
-        $this->container['enum_number'] = isset($data['enum_number']) ? $data['enum_number'] : null;
-        $this->container['outer_enum'] = isset($data['outer_enum']) ? $data['outer_enum'] : null;
-        $this->container['outer_enum_integer'] = isset($data['outer_enum_integer']) ? $data['outer_enum_integer'] : null;
-        $this->container['outer_enum_default_value'] = isset($data['outer_enum_default_value']) ? $data['outer_enum_default_value'] : null;
-        $this->container['outer_enum_integer_default_value'] = isset($data['outer_enum_integer_default_value']) ? $data['outer_enum_integer_default_value'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        $allowedValues = $this->getEnumStringAllowableValues();
-        if (!is_null($this->container['enum_string']) && !in_array($this->container['enum_string'], $allowedValues, true)) {
-            $invalidProperties[] = sprintf(
-                "invalid value for 'enum_string', must be one of '%s'",
-                implode("', '", $allowedValues)
-            );
-        }
-
-        if ($this->container['enum_string_required'] === null) {
-            $invalidProperties[] = "'enum_string_required' can't be null";
-        }
-        $allowedValues = $this->getEnumStringRequiredAllowableValues();
-        if (!is_null($this->container['enum_string_required']) && !in_array($this->container['enum_string_required'], $allowedValues, true)) {
-            $invalidProperties[] = sprintf(
-                "invalid value for 'enum_string_required', must be one of '%s'",
-                implode("', '", $allowedValues)
-            );
-        }
-
-        $allowedValues = $this->getEnumIntegerAllowableValues();
-        if (!is_null($this->container['enum_integer']) && !in_array($this->container['enum_integer'], $allowedValues, true)) {
-            $invalidProperties[] = sprintf(
-                "invalid value for 'enum_integer', must be one of '%s'",
-                implode("', '", $allowedValues)
-            );
-        }
-
-        $allowedValues = $this->getEnumNumberAllowableValues();
-        if (!is_null($this->container['enum_number']) && !in_array($this->container['enum_number'], $allowedValues, true)) {
-            $invalidProperties[] = sprintf(
-                "invalid value for 'enum_number', must be one of '%s'",
-                implode("', '", $allowedValues)
-            );
-        }
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets enum_string
-     *
-     * @return string|null
-     */
-    public function getEnumString()
-    {
-        return $this->container['enum_string'];
-    }
-
-    /**
-     * Sets enum_string
-     *
-     * @param string|null $enum_string enum_string
-     *
-     * @return $this
-     */
-    public function setEnumString($enum_string)
-    {
-        $allowedValues = $this->getEnumStringAllowableValues();
-        if (!is_null($enum_string) && !in_array($enum_string, $allowedValues, true)) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    "Invalid value for 'enum_string', must be one of '%s'",
-                    implode("', '", $allowedValues)
-                )
-            );
-        }
-        $this->container['enum_string'] = $enum_string;
-
-        return $this;
-    }
-
-    /**
-     * Gets enum_string_required
-     *
-     * @return string
-     */
-    public function getEnumStringRequired()
-    {
-        return $this->container['enum_string_required'];
-    }
-
-    /**
-     * Sets enum_string_required
-     *
-     * @param string $enum_string_required enum_string_required
-     *
-     * @return $this
-     */
-    public function setEnumStringRequired($enum_string_required)
-    {
-        $allowedValues = $this->getEnumStringRequiredAllowableValues();
-        if (!in_array($enum_string_required, $allowedValues, true)) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    "Invalid value for 'enum_string_required', must be one of '%s'",
-                    implode("', '", $allowedValues)
-                )
-            );
-        }
-        $this->container['enum_string_required'] = $enum_string_required;
-
-        return $this;
-    }
-
-    /**
-     * Gets enum_integer
-     *
-     * @return int|null
-     */
-    public function getEnumInteger()
-    {
-        return $this->container['enum_integer'];
-    }
-
-    /**
-     * Sets enum_integer
-     *
-     * @param int|null $enum_integer enum_integer
-     *
-     * @return $this
-     */
-    public function setEnumInteger($enum_integer)
-    {
-        $allowedValues = $this->getEnumIntegerAllowableValues();
-        if (!is_null($enum_integer) && !in_array($enum_integer, $allowedValues, true)) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    "Invalid value for 'enum_integer', must be one of '%s'",
-                    implode("', '", $allowedValues)
-                )
-            );
-        }
-        $this->container['enum_integer'] = $enum_integer;
-
-        return $this;
-    }
-
-    /**
-     * Gets enum_number
-     *
-     * @return double|null
-     */
-    public function getEnumNumber()
-    {
-        return $this->container['enum_number'];
-    }
-
-    /**
-     * Sets enum_number
-     *
-     * @param double|null $enum_number enum_number
-     *
-     * @return $this
-     */
-    public function setEnumNumber($enum_number)
-    {
-        $allowedValues = $this->getEnumNumberAllowableValues();
-        if (!is_null($enum_number) && !in_array($enum_number, $allowedValues, true)) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    "Invalid value for 'enum_number', must be one of '%s'",
-                    implode("', '", $allowedValues)
-                )
-            );
-        }
-        $this->container['enum_number'] = $enum_number;
-
-        return $this;
-    }
-
-    /**
-     * Gets outer_enum
-     *
-     * @return \OpenAPI\Client\Model\OuterEnum|null
-     */
-    public function getOuterEnum()
-    {
-        return $this->container['outer_enum'];
-    }
-
-    /**
-     * Sets outer_enum
-     *
-     * @param \OpenAPI\Client\Model\OuterEnum|null $outer_enum outer_enum
-     *
-     * @return $this
-     */
-    public function setOuterEnum($outer_enum)
-    {
-        $this->container['outer_enum'] = $outer_enum;
-
-        return $this;
-    }
-
-    /**
-     * Gets outer_enum_integer
-     *
-     * @return \OpenAPI\Client\Model\OuterEnumInteger|null
-     */
-    public function getOuterEnumInteger()
-    {
-        return $this->container['outer_enum_integer'];
-    }
-
-    /**
-     * Sets outer_enum_integer
-     *
-     * @param \OpenAPI\Client\Model\OuterEnumInteger|null $outer_enum_integer outer_enum_integer
-     *
-     * @return $this
-     */
-    public function setOuterEnumInteger($outer_enum_integer)
-    {
-        $this->container['outer_enum_integer'] = $outer_enum_integer;
-
-        return $this;
-    }
-
-    /**
-     * Gets outer_enum_default_value
-     *
-     * @return \OpenAPI\Client\Model\OuterEnumDefaultValue|null
-     */
-    public function getOuterEnumDefaultValue()
-    {
-        return $this->container['outer_enum_default_value'];
-    }
-
-    /**
-     * Sets outer_enum_default_value
-     *
-     * @param \OpenAPI\Client\Model\OuterEnumDefaultValue|null $outer_enum_default_value outer_enum_default_value
-     *
-     * @return $this
-     */
-    public function setOuterEnumDefaultValue($outer_enum_default_value)
-    {
-        $this->container['outer_enum_default_value'] = $outer_enum_default_value;
-
-        return $this;
-    }
-
-    /**
-     * Gets outer_enum_integer_default_value
-     *
-     * @return \OpenAPI\Client\Model\OuterEnumIntegerDefaultValue|null
-     */
-    public function getOuterEnumIntegerDefaultValue()
-    {
-        return $this->container['outer_enum_integer_default_value'];
-    }
-
-    /**
-     * Sets outer_enum_integer_default_value
-     *
-     * @param \OpenAPI\Client\Model\OuterEnumIntegerDefaultValue|null $outer_enum_integer_default_value outer_enum_integer_default_value
-     *
-     * @return $this
-     */
-    public function setOuterEnumIntegerDefaultValue($outer_enum_integer_default_value)
-    {
-        $this->container['outer_enum_integer_default_value'] = $outer_enum_integer_default_value;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
deleted file mode 100644
index bdfe4c716b7b..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-/**
- * File
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * File Class Doc Comment
- *
- * @category Class
- * @description Must be named &#x60;File&#x60; for test.
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class File implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'File';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'source_uri' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'source_uri' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'source_uri' => 'sourceURI'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'source_uri' => 'setSourceUri'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'source_uri' => 'getSourceUri'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['source_uri'] = isset($data['source_uri']) ? $data['source_uri'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets source_uri
-     *
-     * @return string|null
-     */
-    public function getSourceUri()
-    {
-        return $this->container['source_uri'];
-    }
-
-    /**
-     * Sets source_uri
-     *
-     * @param string|null $source_uri Test capitalization
-     *
-     * @return $this
-     */
-    public function setSourceUri($source_uri)
-    {
-        $this->container['source_uri'] = $source_uri;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
deleted file mode 100644
index 53c02bb4e908..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-/**
- * FileSchemaTestClass
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * FileSchemaTestClass Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class FileSchemaTestClass implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'FileSchemaTestClass';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'file' => '\OpenAPI\Client\Model\File',
-        'files' => '\OpenAPI\Client\Model\File[]'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'file' => null,
-        'files' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'file' => 'file',
-        'files' => 'files'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'file' => 'setFile',
-        'files' => 'setFiles'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'file' => 'getFile',
-        'files' => 'getFiles'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['file'] = isset($data['file']) ? $data['file'] : null;
-        $this->container['files'] = isset($data['files']) ? $data['files'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets file
-     *
-     * @return \OpenAPI\Client\Model\File|null
-     */
-    public function getFile()
-    {
-        return $this->container['file'];
-    }
-
-    /**
-     * Sets file
-     *
-     * @param \OpenAPI\Client\Model\File|null $file file
-     *
-     * @return $this
-     */
-    public function setFile($file)
-    {
-        $this->container['file'] = $file;
-
-        return $this;
-    }
-
-    /**
-     * Gets files
-     *
-     * @return \OpenAPI\Client\Model\File[]|null
-     */
-    public function getFiles()
-    {
-        return $this->container['files'];
-    }
-
-    /**
-     * Sets files
-     *
-     * @param \OpenAPI\Client\Model\File[]|null $files files
-     *
-     * @return $this
-     */
-    public function setFiles($files)
-    {
-        $this->container['files'] = $files;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
deleted file mode 100644
index 1beddae6a871..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * Foo
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * Foo Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class Foo implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Foo';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'bar' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'bar' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'bar' => 'bar'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'bar' => 'setBar'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'bar' => 'getBar'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['bar'] = isset($data['bar']) ? $data['bar'] : 'bar';
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets bar
-     *
-     * @return string|null
-     */
-    public function getBar()
-    {
-        return $this->container['bar'];
-    }
-
-    /**
-     * Sets bar
-     *
-     * @param string|null $bar bar
-     *
-     * @return $this
-     */
-    public function setBar($bar)
-    {
-        $this->container['bar'] = $bar;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
deleted file mode 100644
index 7c2a3d6dc191..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
+++ /dev/null
@@ -1,861 +0,0 @@
-<?php
-/**
- * FormatTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * FormatTest Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class FormatTest implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'format_test';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'integer' => 'int',
-        'int32' => 'int',
-        'int64' => 'int',
-        'number' => 'float',
-        'float' => 'float',
-        'double' => 'double',
-        'string' => 'string',
-        'byte' => 'string',
-        'binary' => '\SplFileObject',
-        'date' => '\DateTime',
-        'date_time' => '\DateTime',
-        'uuid' => 'string',
-        'password' => 'string',
-        'pattern_with_digits' => 'string',
-        'pattern_with_digits_and_delimiter' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'integer' => null,
-        'int32' => 'int32',
-        'int64' => 'int64',
-        'number' => null,
-        'float' => 'float',
-        'double' => 'double',
-        'string' => null,
-        'byte' => 'byte',
-        'binary' => 'binary',
-        'date' => 'date',
-        'date_time' => 'date-time',
-        'uuid' => 'uuid',
-        'password' => 'password',
-        'pattern_with_digits' => null,
-        'pattern_with_digits_and_delimiter' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'integer' => 'integer',
-        'int32' => 'int32',
-        'int64' => 'int64',
-        'number' => 'number',
-        'float' => 'float',
-        'double' => 'double',
-        'string' => 'string',
-        'byte' => 'byte',
-        'binary' => 'binary',
-        'date' => 'date',
-        'date_time' => 'dateTime',
-        'uuid' => 'uuid',
-        'password' => 'password',
-        'pattern_with_digits' => 'pattern_with_digits',
-        'pattern_with_digits_and_delimiter' => 'pattern_with_digits_and_delimiter'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'integer' => 'setInteger',
-        'int32' => 'setInt32',
-        'int64' => 'setInt64',
-        'number' => 'setNumber',
-        'float' => 'setFloat',
-        'double' => 'setDouble',
-        'string' => 'setString',
-        'byte' => 'setByte',
-        'binary' => 'setBinary',
-        'date' => 'setDate',
-        'date_time' => 'setDateTime',
-        'uuid' => 'setUuid',
-        'password' => 'setPassword',
-        'pattern_with_digits' => 'setPatternWithDigits',
-        'pattern_with_digits_and_delimiter' => 'setPatternWithDigitsAndDelimiter'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'integer' => 'getInteger',
-        'int32' => 'getInt32',
-        'int64' => 'getInt64',
-        'number' => 'getNumber',
-        'float' => 'getFloat',
-        'double' => 'getDouble',
-        'string' => 'getString',
-        'byte' => 'getByte',
-        'binary' => 'getBinary',
-        'date' => 'getDate',
-        'date_time' => 'getDateTime',
-        'uuid' => 'getUuid',
-        'password' => 'getPassword',
-        'pattern_with_digits' => 'getPatternWithDigits',
-        'pattern_with_digits_and_delimiter' => 'getPatternWithDigitsAndDelimiter'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['integer'] = isset($data['integer']) ? $data['integer'] : null;
-        $this->container['int32'] = isset($data['int32']) ? $data['int32'] : null;
-        $this->container['int64'] = isset($data['int64']) ? $data['int64'] : null;
-        $this->container['number'] = isset($data['number']) ? $data['number'] : null;
-        $this->container['float'] = isset($data['float']) ? $data['float'] : null;
-        $this->container['double'] = isset($data['double']) ? $data['double'] : null;
-        $this->container['string'] = isset($data['string']) ? $data['string'] : null;
-        $this->container['byte'] = isset($data['byte']) ? $data['byte'] : null;
-        $this->container['binary'] = isset($data['binary']) ? $data['binary'] : null;
-        $this->container['date'] = isset($data['date']) ? $data['date'] : null;
-        $this->container['date_time'] = isset($data['date_time']) ? $data['date_time'] : null;
-        $this->container['uuid'] = isset($data['uuid']) ? $data['uuid'] : null;
-        $this->container['password'] = isset($data['password']) ? $data['password'] : null;
-        $this->container['pattern_with_digits'] = isset($data['pattern_with_digits']) ? $data['pattern_with_digits'] : null;
-        $this->container['pattern_with_digits_and_delimiter'] = isset($data['pattern_with_digits_and_delimiter']) ? $data['pattern_with_digits_and_delimiter'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        if (!is_null($this->container['integer']) && ($this->container['integer'] > 100)) {
-            $invalidProperties[] = "invalid value for 'integer', must be smaller than or equal to 100.";
-        }
-
-        if (!is_null($this->container['integer']) && ($this->container['integer'] < 10)) {
-            $invalidProperties[] = "invalid value for 'integer', must be bigger than or equal to 10.";
-        }
-
-        if (!is_null($this->container['int32']) && ($this->container['int32'] > 200)) {
-            $invalidProperties[] = "invalid value for 'int32', must be smaller than or equal to 200.";
-        }
-
-        if (!is_null($this->container['int32']) && ($this->container['int32'] < 20)) {
-            $invalidProperties[] = "invalid value for 'int32', must be bigger than or equal to 20.";
-        }
-
-        if ($this->container['number'] === null) {
-            $invalidProperties[] = "'number' can't be null";
-        }
-        if (($this->container['number'] > 543.2)) {
-            $invalidProperties[] = "invalid value for 'number', must be smaller than or equal to 543.2.";
-        }
-
-        if (($this->container['number'] < 32.1)) {
-            $invalidProperties[] = "invalid value for 'number', must be bigger than or equal to 32.1.";
-        }
-
-        if (!is_null($this->container['float']) && ($this->container['float'] > 987.6)) {
-            $invalidProperties[] = "invalid value for 'float', must be smaller than or equal to 987.6.";
-        }
-
-        if (!is_null($this->container['float']) && ($this->container['float'] < 54.3)) {
-            $invalidProperties[] = "invalid value for 'float', must be bigger than or equal to 54.3.";
-        }
-
-        if (!is_null($this->container['double']) && ($this->container['double'] > 123.4)) {
-            $invalidProperties[] = "invalid value for 'double', must be smaller than or equal to 123.4.";
-        }
-
-        if (!is_null($this->container['double']) && ($this->container['double'] < 67.8)) {
-            $invalidProperties[] = "invalid value for 'double', must be bigger than or equal to 67.8.";
-        }
-
-        if (!is_null($this->container['string']) && !preg_match("/[a-z]/i", $this->container['string'])) {
-            $invalidProperties[] = "invalid value for 'string', must be conform to the pattern /[a-z]/i.";
-        }
-
-        if ($this->container['byte'] === null) {
-            $invalidProperties[] = "'byte' can't be null";
-        }
-        if ($this->container['date'] === null) {
-            $invalidProperties[] = "'date' can't be null";
-        }
-        if ($this->container['password'] === null) {
-            $invalidProperties[] = "'password' can't be null";
-        }
-        if ((mb_strlen($this->container['password']) > 64)) {
-            $invalidProperties[] = "invalid value for 'password', the character length must be smaller than or equal to 64.";
-        }
-
-        if ((mb_strlen($this->container['password']) < 10)) {
-            $invalidProperties[] = "invalid value for 'password', the character length must be bigger than or equal to 10.";
-        }
-
-        if (!is_null($this->container['pattern_with_digits']) && !preg_match("/^\\d{10}$/", $this->container['pattern_with_digits'])) {
-            $invalidProperties[] = "invalid value for 'pattern_with_digits', must be conform to the pattern /^\\d{10}$/.";
-        }
-
-        if (!is_null($this->container['pattern_with_digits_and_delimiter']) && !preg_match("/^image_\\d{1,3}$/i", $this->container['pattern_with_digits_and_delimiter'])) {
-            $invalidProperties[] = "invalid value for 'pattern_with_digits_and_delimiter', must be conform to the pattern /^image_\\d{1,3}$/i.";
-        }
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets integer
-     *
-     * @return int|null
-     */
-    public function getInteger()
-    {
-        return $this->container['integer'];
-    }
-
-    /**
-     * Sets integer
-     *
-     * @param int|null $integer integer
-     *
-     * @return $this
-     */
-    public function setInteger($integer)
-    {
-
-        if (!is_null($integer) && ($integer > 100)) {
-            throw new \InvalidArgumentException('invalid value for $integer when calling FormatTest., must be smaller than or equal to 100.');
-        }
-        if (!is_null($integer) && ($integer < 10)) {
-            throw new \InvalidArgumentException('invalid value for $integer when calling FormatTest., must be bigger than or equal to 10.');
-        }
-
-        $this->container['integer'] = $integer;
-
-        return $this;
-    }
-
-    /**
-     * Gets int32
-     *
-     * @return int|null
-     */
-    public function getInt32()
-    {
-        return $this->container['int32'];
-    }
-
-    /**
-     * Sets int32
-     *
-     * @param int|null $int32 int32
-     *
-     * @return $this
-     */
-    public function setInt32($int32)
-    {
-
-        if (!is_null($int32) && ($int32 > 200)) {
-            throw new \InvalidArgumentException('invalid value for $int32 when calling FormatTest., must be smaller than or equal to 200.');
-        }
-        if (!is_null($int32) && ($int32 < 20)) {
-            throw new \InvalidArgumentException('invalid value for $int32 when calling FormatTest., must be bigger than or equal to 20.');
-        }
-
-        $this->container['int32'] = $int32;
-
-        return $this;
-    }
-
-    /**
-     * Gets int64
-     *
-     * @return int|null
-     */
-    public function getInt64()
-    {
-        return $this->container['int64'];
-    }
-
-    /**
-     * Sets int64
-     *
-     * @param int|null $int64 int64
-     *
-     * @return $this
-     */
-    public function setInt64($int64)
-    {
-        $this->container['int64'] = $int64;
-
-        return $this;
-    }
-
-    /**
-     * Gets number
-     *
-     * @return float
-     */
-    public function getNumber()
-    {
-        return $this->container['number'];
-    }
-
-    /**
-     * Sets number
-     *
-     * @param float $number number
-     *
-     * @return $this
-     */
-    public function setNumber($number)
-    {
-
-        if (($number > 543.2)) {
-            throw new \InvalidArgumentException('invalid value for $number when calling FormatTest., must be smaller than or equal to 543.2.');
-        }
-        if (($number < 32.1)) {
-            throw new \InvalidArgumentException('invalid value for $number when calling FormatTest., must be bigger than or equal to 32.1.');
-        }
-
-        $this->container['number'] = $number;
-
-        return $this;
-    }
-
-    /**
-     * Gets float
-     *
-     * @return float|null
-     */
-    public function getFloat()
-    {
-        return $this->container['float'];
-    }
-
-    /**
-     * Sets float
-     *
-     * @param float|null $float float
-     *
-     * @return $this
-     */
-    public function setFloat($float)
-    {
-
-        if (!is_null($float) && ($float > 987.6)) {
-            throw new \InvalidArgumentException('invalid value for $float when calling FormatTest., must be smaller than or equal to 987.6.');
-        }
-        if (!is_null($float) && ($float < 54.3)) {
-            throw new \InvalidArgumentException('invalid value for $float when calling FormatTest., must be bigger than or equal to 54.3.');
-        }
-
-        $this->container['float'] = $float;
-
-        return $this;
-    }
-
-    /**
-     * Gets double
-     *
-     * @return double|null
-     */
-    public function getDouble()
-    {
-        return $this->container['double'];
-    }
-
-    /**
-     * Sets double
-     *
-     * @param double|null $double double
-     *
-     * @return $this
-     */
-    public function setDouble($double)
-    {
-
-        if (!is_null($double) && ($double > 123.4)) {
-            throw new \InvalidArgumentException('invalid value for $double when calling FormatTest., must be smaller than or equal to 123.4.');
-        }
-        if (!is_null($double) && ($double < 67.8)) {
-            throw new \InvalidArgumentException('invalid value for $double when calling FormatTest., must be bigger than or equal to 67.8.');
-        }
-
-        $this->container['double'] = $double;
-
-        return $this;
-    }
-
-    /**
-     * Gets string
-     *
-     * @return string|null
-     */
-    public function getString()
-    {
-        return $this->container['string'];
-    }
-
-    /**
-     * Sets string
-     *
-     * @param string|null $string string
-     *
-     * @return $this
-     */
-    public function setString($string)
-    {
-
-        if (!is_null($string) && (!preg_match("/[a-z]/i", $string))) {
-            throw new \InvalidArgumentException("invalid value for $string when calling FormatTest., must conform to the pattern /[a-z]/i.");
-        }
-
-        $this->container['string'] = $string;
-
-        return $this;
-    }
-
-    /**
-     * Gets byte
-     *
-     * @return string
-     */
-    public function getByte()
-    {
-        return $this->container['byte'];
-    }
-
-    /**
-     * Sets byte
-     *
-     * @param string $byte byte
-     *
-     * @return $this
-     */
-    public function setByte($byte)
-    {
-        $this->container['byte'] = $byte;
-
-        return $this;
-    }
-
-    /**
-     * Gets binary
-     *
-     * @return \SplFileObject|null
-     */
-    public function getBinary()
-    {
-        return $this->container['binary'];
-    }
-
-    /**
-     * Sets binary
-     *
-     * @param \SplFileObject|null $binary binary
-     *
-     * @return $this
-     */
-    public function setBinary($binary)
-    {
-        $this->container['binary'] = $binary;
-
-        return $this;
-    }
-
-    /**
-     * Gets date
-     *
-     * @return \DateTime
-     */
-    public function getDate()
-    {
-        return $this->container['date'];
-    }
-
-    /**
-     * Sets date
-     *
-     * @param \DateTime $date date
-     *
-     * @return $this
-     */
-    public function setDate($date)
-    {
-        $this->container['date'] = $date;
-
-        return $this;
-    }
-
-    /**
-     * Gets date_time
-     *
-     * @return \DateTime|null
-     */
-    public function getDateTime()
-    {
-        return $this->container['date_time'];
-    }
-
-    /**
-     * Sets date_time
-     *
-     * @param \DateTime|null $date_time date_time
-     *
-     * @return $this
-     */
-    public function setDateTime($date_time)
-    {
-        $this->container['date_time'] = $date_time;
-
-        return $this;
-    }
-
-    /**
-     * Gets uuid
-     *
-     * @return string|null
-     */
-    public function getUuid()
-    {
-        return $this->container['uuid'];
-    }
-
-    /**
-     * Sets uuid
-     *
-     * @param string|null $uuid uuid
-     *
-     * @return $this
-     */
-    public function setUuid($uuid)
-    {
-        $this->container['uuid'] = $uuid;
-
-        return $this;
-    }
-
-    /**
-     * Gets password
-     *
-     * @return string
-     */
-    public function getPassword()
-    {
-        return $this->container['password'];
-    }
-
-    /**
-     * Sets password
-     *
-     * @param string $password password
-     *
-     * @return $this
-     */
-    public function setPassword($password)
-    {
-        if ((mb_strlen($password) > 64)) {
-            throw new \InvalidArgumentException('invalid length for $password when calling FormatTest., must be smaller than or equal to 64.');
-        }
-        if ((mb_strlen($password) < 10)) {
-            throw new \InvalidArgumentException('invalid length for $password when calling FormatTest., must be bigger than or equal to 10.');
-        }
-
-        $this->container['password'] = $password;
-
-        return $this;
-    }
-
-    /**
-     * Gets pattern_with_digits
-     *
-     * @return string|null
-     */
-    public function getPatternWithDigits()
-    {
-        return $this->container['pattern_with_digits'];
-    }
-
-    /**
-     * Sets pattern_with_digits
-     *
-     * @param string|null $pattern_with_digits A string that is a 10 digit number. Can have leading zeros.
-     *
-     * @return $this
-     */
-    public function setPatternWithDigits($pattern_with_digits)
-    {
-
-        if (!is_null($pattern_with_digits) && (!preg_match("/^\\d{10}$/", $pattern_with_digits))) {
-            throw new \InvalidArgumentException("invalid value for $pattern_with_digits when calling FormatTest., must conform to the pattern /^\\d{10}$/.");
-        }
-
-        $this->container['pattern_with_digits'] = $pattern_with_digits;
-
-        return $this;
-    }
-
-    /**
-     * Gets pattern_with_digits_and_delimiter
-     *
-     * @return string|null
-     */
-    public function getPatternWithDigitsAndDelimiter()
-    {
-        return $this->container['pattern_with_digits_and_delimiter'];
-    }
-
-    /**
-     * Sets pattern_with_digits_and_delimiter
-     *
-     * @param string|null $pattern_with_digits_and_delimiter A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.
-     *
-     * @return $this
-     */
-    public function setPatternWithDigitsAndDelimiter($pattern_with_digits_and_delimiter)
-    {
-
-        if (!is_null($pattern_with_digits_and_delimiter) && (!preg_match("/^image_\\d{1,3}$/i", $pattern_with_digits_and_delimiter))) {
-            throw new \InvalidArgumentException("invalid value for $pattern_with_digits_and_delimiter when calling FormatTest., must conform to the pattern /^image_\\d{1,3}$/i.");
-        }
-
-        $this->container['pattern_with_digits_and_delimiter'] = $pattern_with_digits_and_delimiter;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
deleted file mode 100644
index 6c7bf0aed692..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-/**
- * HasOnlyReadOnly
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * HasOnlyReadOnly Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class HasOnlyReadOnly implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'hasOnlyReadOnly';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'bar' => 'string',
-        'foo' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'bar' => null,
-        'foo' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'bar' => 'bar',
-        'foo' => 'foo'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'bar' => 'setBar',
-        'foo' => 'setFoo'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'bar' => 'getBar',
-        'foo' => 'getFoo'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['bar'] = isset($data['bar']) ? $data['bar'] : null;
-        $this->container['foo'] = isset($data['foo']) ? $data['foo'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets bar
-     *
-     * @return string|null
-     */
-    public function getBar()
-    {
-        return $this->container['bar'];
-    }
-
-    /**
-     * Sets bar
-     *
-     * @param string|null $bar bar
-     *
-     * @return $this
-     */
-    public function setBar($bar)
-    {
-        $this->container['bar'] = $bar;
-
-        return $this;
-    }
-
-    /**
-     * Gets foo
-     *
-     * @return string|null
-     */
-    public function getFoo()
-    {
-        return $this->container['foo'];
-    }
-
-    /**
-     * Sets foo
-     *
-     * @param string|null $foo foo
-     *
-     * @return $this
-     */
-    public function setFoo($foo)
-    {
-        $this->container['foo'] = $foo;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php
deleted file mode 100644
index eff63cf8d365..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-/**
- * HealthCheckResult
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * HealthCheckResult Class Doc Comment
- *
- * @category Class
- * @description Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class HealthCheckResult implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'HealthCheckResult';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'nullable_message' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'nullable_message' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'nullable_message' => 'NullableMessage'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'nullable_message' => 'setNullableMessage'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'nullable_message' => 'getNullableMessage'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['nullable_message'] = isset($data['nullable_message']) ? $data['nullable_message'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets nullable_message
-     *
-     * @return string|null
-     */
-    public function getNullableMessage()
-    {
-        return $this->container['nullable_message'];
-    }
-
-    /**
-     * Sets nullable_message
-     *
-     * @param string|null $nullable_message nullable_message
-     *
-     * @return $this
-     */
-    public function setNullableMessage($nullable_message)
-    {
-        $this->container['nullable_message'] = $nullable_message;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
deleted file mode 100644
index 440b298bea7a..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-/**
- * InlineObject
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * InlineObject Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class InlineObject implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'inline_object';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'name' => 'string',
-        'status' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'name' => null,
-        'status' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'name' => 'name',
-        'status' => 'status'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'name' => 'setName',
-        'status' => 'setStatus'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'name' => 'getName',
-        'status' => 'getStatus'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['name'] = isset($data['name']) ? $data['name'] : null;
-        $this->container['status'] = isset($data['status']) ? $data['status'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets name
-     *
-     * @return string|null
-     */
-    public function getName()
-    {
-        return $this->container['name'];
-    }
-
-    /**
-     * Sets name
-     *
-     * @param string|null $name Updated name of the pet
-     *
-     * @return $this
-     */
-    public function setName($name)
-    {
-        $this->container['name'] = $name;
-
-        return $this;
-    }
-
-    /**
-     * Gets status
-     *
-     * @return string|null
-     */
-    public function getStatus()
-    {
-        return $this->container['status'];
-    }
-
-    /**
-     * Sets status
-     *
-     * @param string|null $status Updated status of the pet
-     *
-     * @return $this
-     */
-    public function setStatus($status)
-    {
-        $this->container['status'] = $status;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
deleted file mode 100644
index 94ba245ee5d7..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-/**
- * InlineObject1
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * InlineObject1 Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class InlineObject1 implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'inline_object_1';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'additional_metadata' => 'string',
-        'file' => '\SplFileObject'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'additional_metadata' => null,
-        'file' => 'binary'
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'additional_metadata' => 'additionalMetadata',
-        'file' => 'file'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'additional_metadata' => 'setAdditionalMetadata',
-        'file' => 'setFile'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'additional_metadata' => 'getAdditionalMetadata',
-        'file' => 'getFile'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['additional_metadata'] = isset($data['additional_metadata']) ? $data['additional_metadata'] : null;
-        $this->container['file'] = isset($data['file']) ? $data['file'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets additional_metadata
-     *
-     * @return string|null
-     */
-    public function getAdditionalMetadata()
-    {
-        return $this->container['additional_metadata'];
-    }
-
-    /**
-     * Sets additional_metadata
-     *
-     * @param string|null $additional_metadata Additional data to pass to server
-     *
-     * @return $this
-     */
-    public function setAdditionalMetadata($additional_metadata)
-    {
-        $this->container['additional_metadata'] = $additional_metadata;
-
-        return $this;
-    }
-
-    /**
-     * Gets file
-     *
-     * @return \SplFileObject|null
-     */
-    public function getFile()
-    {
-        return $this->container['file'];
-    }
-
-    /**
-     * Sets file
-     *
-     * @param \SplFileObject|null $file file to upload
-     *
-     * @return $this
-     */
-    public function setFile($file)
-    {
-        $this->container['file'] = $file;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
deleted file mode 100644
index de56f94fb935..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
+++ /dev/null
@@ -1,395 +0,0 @@
-<?php
-/**
- * InlineObject2
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * InlineObject2 Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class InlineObject2 implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'inline_object_2';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'enum_form_string_array' => 'string[]',
-        'enum_form_string' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'enum_form_string_array' => null,
-        'enum_form_string' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'enum_form_string_array' => 'enum_form_string_array',
-        'enum_form_string' => 'enum_form_string'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'enum_form_string_array' => 'setEnumFormStringArray',
-        'enum_form_string' => 'setEnumFormString'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'enum_form_string_array' => 'getEnumFormStringArray',
-        'enum_form_string' => 'getEnumFormString'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    const ENUM_FORM_STRING_ARRAY_GREATER_THAN = '>';
-    const ENUM_FORM_STRING_ARRAY_DOLLAR = '$';
-    const ENUM_FORM_STRING_ABC = '_abc';
-    const ENUM_FORM_STRING_EFG = '-efg';
-    const ENUM_FORM_STRING_XYZ = '(xyz)';
-    
-
-    
-    /**
-     * Gets allowable values of the enum
-     *
-     * @return string[]
-     */
-    public function getEnumFormStringArrayAllowableValues()
-    {
-        return [
-            self::ENUM_FORM_STRING_ARRAY_GREATER_THAN,
-            self::ENUM_FORM_STRING_ARRAY_DOLLAR,
-        ];
-    }
-    
-    /**
-     * Gets allowable values of the enum
-     *
-     * @return string[]
-     */
-    public function getEnumFormStringAllowableValues()
-    {
-        return [
-            self::ENUM_FORM_STRING_ABC,
-            self::ENUM_FORM_STRING_EFG,
-            self::ENUM_FORM_STRING_XYZ,
-        ];
-    }
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['enum_form_string_array'] = isset($data['enum_form_string_array']) ? $data['enum_form_string_array'] : null;
-        $this->container['enum_form_string'] = isset($data['enum_form_string']) ? $data['enum_form_string'] : '-efg';
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        $allowedValues = $this->getEnumFormStringAllowableValues();
-        if (!is_null($this->container['enum_form_string']) && !in_array($this->container['enum_form_string'], $allowedValues, true)) {
-            $invalidProperties[] = sprintf(
-                "invalid value for 'enum_form_string', must be one of '%s'",
-                implode("', '", $allowedValues)
-            );
-        }
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets enum_form_string_array
-     *
-     * @return string[]|null
-     */
-    public function getEnumFormStringArray()
-    {
-        return $this->container['enum_form_string_array'];
-    }
-
-    /**
-     * Sets enum_form_string_array
-     *
-     * @param string[]|null $enum_form_string_array Form parameter enum test (string array)
-     *
-     * @return $this
-     */
-    public function setEnumFormStringArray($enum_form_string_array)
-    {
-        $allowedValues = $this->getEnumFormStringArrayAllowableValues();
-        if (!is_null($enum_form_string_array) && array_diff($enum_form_string_array, $allowedValues)) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    "Invalid value for 'enum_form_string_array', must be one of '%s'",
-                    implode("', '", $allowedValues)
-                )
-            );
-        }
-        $this->container['enum_form_string_array'] = $enum_form_string_array;
-
-        return $this;
-    }
-
-    /**
-     * Gets enum_form_string
-     *
-     * @return string|null
-     */
-    public function getEnumFormString()
-    {
-        return $this->container['enum_form_string'];
-    }
-
-    /**
-     * Sets enum_form_string
-     *
-     * @param string|null $enum_form_string Form parameter enum test (string)
-     *
-     * @return $this
-     */
-    public function setEnumFormString($enum_form_string)
-    {
-        $allowedValues = $this->getEnumFormStringAllowableValues();
-        if (!is_null($enum_form_string) && !in_array($enum_form_string, $allowedValues, true)) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    "Invalid value for 'enum_form_string', must be one of '%s'",
-                    implode("', '", $allowedValues)
-                )
-            );
-        }
-        $this->container['enum_form_string'] = $enum_form_string;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
deleted file mode 100644
index 8bd306daf167..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
+++ /dev/null
@@ -1,815 +0,0 @@
-<?php
-/**
- * InlineObject3
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * InlineObject3 Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class InlineObject3 implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'inline_object_3';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'integer' => 'int',
-        'int32' => 'int',
-        'int64' => 'int',
-        'number' => 'float',
-        'float' => 'float',
-        'double' => 'double',
-        'string' => 'string',
-        'pattern_without_delimiter' => 'string',
-        'byte' => 'string',
-        'binary' => '\SplFileObject',
-        'date' => '\DateTime',
-        'date_time' => '\DateTime',
-        'password' => 'string',
-        'callback' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'integer' => null,
-        'int32' => 'int32',
-        'int64' => 'int64',
-        'number' => null,
-        'float' => 'float',
-        'double' => 'double',
-        'string' => null,
-        'pattern_without_delimiter' => null,
-        'byte' => 'byte',
-        'binary' => 'binary',
-        'date' => 'date',
-        'date_time' => 'date-time',
-        'password' => 'password',
-        'callback' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'integer' => 'integer',
-        'int32' => 'int32',
-        'int64' => 'int64',
-        'number' => 'number',
-        'float' => 'float',
-        'double' => 'double',
-        'string' => 'string',
-        'pattern_without_delimiter' => 'pattern_without_delimiter',
-        'byte' => 'byte',
-        'binary' => 'binary',
-        'date' => 'date',
-        'date_time' => 'dateTime',
-        'password' => 'password',
-        'callback' => 'callback'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'integer' => 'setInteger',
-        'int32' => 'setInt32',
-        'int64' => 'setInt64',
-        'number' => 'setNumber',
-        'float' => 'setFloat',
-        'double' => 'setDouble',
-        'string' => 'setString',
-        'pattern_without_delimiter' => 'setPatternWithoutDelimiter',
-        'byte' => 'setByte',
-        'binary' => 'setBinary',
-        'date' => 'setDate',
-        'date_time' => 'setDateTime',
-        'password' => 'setPassword',
-        'callback' => 'setCallback'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'integer' => 'getInteger',
-        'int32' => 'getInt32',
-        'int64' => 'getInt64',
-        'number' => 'getNumber',
-        'float' => 'getFloat',
-        'double' => 'getDouble',
-        'string' => 'getString',
-        'pattern_without_delimiter' => 'getPatternWithoutDelimiter',
-        'byte' => 'getByte',
-        'binary' => 'getBinary',
-        'date' => 'getDate',
-        'date_time' => 'getDateTime',
-        'password' => 'getPassword',
-        'callback' => 'getCallback'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['integer'] = isset($data['integer']) ? $data['integer'] : null;
-        $this->container['int32'] = isset($data['int32']) ? $data['int32'] : null;
-        $this->container['int64'] = isset($data['int64']) ? $data['int64'] : null;
-        $this->container['number'] = isset($data['number']) ? $data['number'] : null;
-        $this->container['float'] = isset($data['float']) ? $data['float'] : null;
-        $this->container['double'] = isset($data['double']) ? $data['double'] : null;
-        $this->container['string'] = isset($data['string']) ? $data['string'] : null;
-        $this->container['pattern_without_delimiter'] = isset($data['pattern_without_delimiter']) ? $data['pattern_without_delimiter'] : null;
-        $this->container['byte'] = isset($data['byte']) ? $data['byte'] : null;
-        $this->container['binary'] = isset($data['binary']) ? $data['binary'] : null;
-        $this->container['date'] = isset($data['date']) ? $data['date'] : null;
-        $this->container['date_time'] = isset($data['date_time']) ? $data['date_time'] : null;
-        $this->container['password'] = isset($data['password']) ? $data['password'] : null;
-        $this->container['callback'] = isset($data['callback']) ? $data['callback'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        if (!is_null($this->container['integer']) && ($this->container['integer'] > 100)) {
-            $invalidProperties[] = "invalid value for 'integer', must be smaller than or equal to 100.";
-        }
-
-        if (!is_null($this->container['integer']) && ($this->container['integer'] < 10)) {
-            $invalidProperties[] = "invalid value for 'integer', must be bigger than or equal to 10.";
-        }
-
-        if (!is_null($this->container['int32']) && ($this->container['int32'] > 200)) {
-            $invalidProperties[] = "invalid value for 'int32', must be smaller than or equal to 200.";
-        }
-
-        if (!is_null($this->container['int32']) && ($this->container['int32'] < 20)) {
-            $invalidProperties[] = "invalid value for 'int32', must be bigger than or equal to 20.";
-        }
-
-        if ($this->container['number'] === null) {
-            $invalidProperties[] = "'number' can't be null";
-        }
-        if (($this->container['number'] > 543.2)) {
-            $invalidProperties[] = "invalid value for 'number', must be smaller than or equal to 543.2.";
-        }
-
-        if (($this->container['number'] < 32.1)) {
-            $invalidProperties[] = "invalid value for 'number', must be bigger than or equal to 32.1.";
-        }
-
-        if (!is_null($this->container['float']) && ($this->container['float'] > 987.6)) {
-            $invalidProperties[] = "invalid value for 'float', must be smaller than or equal to 987.6.";
-        }
-
-        if ($this->container['double'] === null) {
-            $invalidProperties[] = "'double' can't be null";
-        }
-        if (($this->container['double'] > 123.4)) {
-            $invalidProperties[] = "invalid value for 'double', must be smaller than or equal to 123.4.";
-        }
-
-        if (($this->container['double'] < 67.8)) {
-            $invalidProperties[] = "invalid value for 'double', must be bigger than or equal to 67.8.";
-        }
-
-        if (!is_null($this->container['string']) && !preg_match("/[a-z]/i", $this->container['string'])) {
-            $invalidProperties[] = "invalid value for 'string', must be conform to the pattern /[a-z]/i.";
-        }
-
-        if ($this->container['pattern_without_delimiter'] === null) {
-            $invalidProperties[] = "'pattern_without_delimiter' can't be null";
-        }
-        if (!preg_match("/^[A-Z].*/", $this->container['pattern_without_delimiter'])) {
-            $invalidProperties[] = "invalid value for 'pattern_without_delimiter', must be conform to the pattern /^[A-Z].*/.";
-        }
-
-        if ($this->container['byte'] === null) {
-            $invalidProperties[] = "'byte' can't be null";
-        }
-        if (!is_null($this->container['password']) && (mb_strlen($this->container['password']) > 64)) {
-            $invalidProperties[] = "invalid value for 'password', the character length must be smaller than or equal to 64.";
-        }
-
-        if (!is_null($this->container['password']) && (mb_strlen($this->container['password']) < 10)) {
-            $invalidProperties[] = "invalid value for 'password', the character length must be bigger than or equal to 10.";
-        }
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets integer
-     *
-     * @return int|null
-     */
-    public function getInteger()
-    {
-        return $this->container['integer'];
-    }
-
-    /**
-     * Sets integer
-     *
-     * @param int|null $integer None
-     *
-     * @return $this
-     */
-    public function setInteger($integer)
-    {
-
-        if (!is_null($integer) && ($integer > 100)) {
-            throw new \InvalidArgumentException('invalid value for $integer when calling InlineObject3., must be smaller than or equal to 100.');
-        }
-        if (!is_null($integer) && ($integer < 10)) {
-            throw new \InvalidArgumentException('invalid value for $integer when calling InlineObject3., must be bigger than or equal to 10.');
-        }
-
-        $this->container['integer'] = $integer;
-
-        return $this;
-    }
-
-    /**
-     * Gets int32
-     *
-     * @return int|null
-     */
-    public function getInt32()
-    {
-        return $this->container['int32'];
-    }
-
-    /**
-     * Sets int32
-     *
-     * @param int|null $int32 None
-     *
-     * @return $this
-     */
-    public function setInt32($int32)
-    {
-
-        if (!is_null($int32) && ($int32 > 200)) {
-            throw new \InvalidArgumentException('invalid value for $int32 when calling InlineObject3., must be smaller than or equal to 200.');
-        }
-        if (!is_null($int32) && ($int32 < 20)) {
-            throw new \InvalidArgumentException('invalid value for $int32 when calling InlineObject3., must be bigger than or equal to 20.');
-        }
-
-        $this->container['int32'] = $int32;
-
-        return $this;
-    }
-
-    /**
-     * Gets int64
-     *
-     * @return int|null
-     */
-    public function getInt64()
-    {
-        return $this->container['int64'];
-    }
-
-    /**
-     * Sets int64
-     *
-     * @param int|null $int64 None
-     *
-     * @return $this
-     */
-    public function setInt64($int64)
-    {
-        $this->container['int64'] = $int64;
-
-        return $this;
-    }
-
-    /**
-     * Gets number
-     *
-     * @return float
-     */
-    public function getNumber()
-    {
-        return $this->container['number'];
-    }
-
-    /**
-     * Sets number
-     *
-     * @param float $number None
-     *
-     * @return $this
-     */
-    public function setNumber($number)
-    {
-
-        if (($number > 543.2)) {
-            throw new \InvalidArgumentException('invalid value for $number when calling InlineObject3., must be smaller than or equal to 543.2.');
-        }
-        if (($number < 32.1)) {
-            throw new \InvalidArgumentException('invalid value for $number when calling InlineObject3., must be bigger than or equal to 32.1.');
-        }
-
-        $this->container['number'] = $number;
-
-        return $this;
-    }
-
-    /**
-     * Gets float
-     *
-     * @return float|null
-     */
-    public function getFloat()
-    {
-        return $this->container['float'];
-    }
-
-    /**
-     * Sets float
-     *
-     * @param float|null $float None
-     *
-     * @return $this
-     */
-    public function setFloat($float)
-    {
-
-        if (!is_null($float) && ($float > 987.6)) {
-            throw new \InvalidArgumentException('invalid value for $float when calling InlineObject3., must be smaller than or equal to 987.6.');
-        }
-
-        $this->container['float'] = $float;
-
-        return $this;
-    }
-
-    /**
-     * Gets double
-     *
-     * @return double
-     */
-    public function getDouble()
-    {
-        return $this->container['double'];
-    }
-
-    /**
-     * Sets double
-     *
-     * @param double $double None
-     *
-     * @return $this
-     */
-    public function setDouble($double)
-    {
-
-        if (($double > 123.4)) {
-            throw new \InvalidArgumentException('invalid value for $double when calling InlineObject3., must be smaller than or equal to 123.4.');
-        }
-        if (($double < 67.8)) {
-            throw new \InvalidArgumentException('invalid value for $double when calling InlineObject3., must be bigger than or equal to 67.8.');
-        }
-
-        $this->container['double'] = $double;
-
-        return $this;
-    }
-
-    /**
-     * Gets string
-     *
-     * @return string|null
-     */
-    public function getString()
-    {
-        return $this->container['string'];
-    }
-
-    /**
-     * Sets string
-     *
-     * @param string|null $string None
-     *
-     * @return $this
-     */
-    public function setString($string)
-    {
-
-        if (!is_null($string) && (!preg_match("/[a-z]/i", $string))) {
-            throw new \InvalidArgumentException("invalid value for $string when calling InlineObject3., must conform to the pattern /[a-z]/i.");
-        }
-
-        $this->container['string'] = $string;
-
-        return $this;
-    }
-
-    /**
-     * Gets pattern_without_delimiter
-     *
-     * @return string
-     */
-    public function getPatternWithoutDelimiter()
-    {
-        return $this->container['pattern_without_delimiter'];
-    }
-
-    /**
-     * Sets pattern_without_delimiter
-     *
-     * @param string $pattern_without_delimiter None
-     *
-     * @return $this
-     */
-    public function setPatternWithoutDelimiter($pattern_without_delimiter)
-    {
-
-        if ((!preg_match("/^[A-Z].*/", $pattern_without_delimiter))) {
-            throw new \InvalidArgumentException("invalid value for $pattern_without_delimiter when calling InlineObject3., must conform to the pattern /^[A-Z].*/.");
-        }
-
-        $this->container['pattern_without_delimiter'] = $pattern_without_delimiter;
-
-        return $this;
-    }
-
-    /**
-     * Gets byte
-     *
-     * @return string
-     */
-    public function getByte()
-    {
-        return $this->container['byte'];
-    }
-
-    /**
-     * Sets byte
-     *
-     * @param string $byte None
-     *
-     * @return $this
-     */
-    public function setByte($byte)
-    {
-        $this->container['byte'] = $byte;
-
-        return $this;
-    }
-
-    /**
-     * Gets binary
-     *
-     * @return \SplFileObject|null
-     */
-    public function getBinary()
-    {
-        return $this->container['binary'];
-    }
-
-    /**
-     * Sets binary
-     *
-     * @param \SplFileObject|null $binary None
-     *
-     * @return $this
-     */
-    public function setBinary($binary)
-    {
-        $this->container['binary'] = $binary;
-
-        return $this;
-    }
-
-    /**
-     * Gets date
-     *
-     * @return \DateTime|null
-     */
-    public function getDate()
-    {
-        return $this->container['date'];
-    }
-
-    /**
-     * Sets date
-     *
-     * @param \DateTime|null $date None
-     *
-     * @return $this
-     */
-    public function setDate($date)
-    {
-        $this->container['date'] = $date;
-
-        return $this;
-    }
-
-    /**
-     * Gets date_time
-     *
-     * @return \DateTime|null
-     */
-    public function getDateTime()
-    {
-        return $this->container['date_time'];
-    }
-
-    /**
-     * Sets date_time
-     *
-     * @param \DateTime|null $date_time None
-     *
-     * @return $this
-     */
-    public function setDateTime($date_time)
-    {
-        $this->container['date_time'] = $date_time;
-
-        return $this;
-    }
-
-    /**
-     * Gets password
-     *
-     * @return string|null
-     */
-    public function getPassword()
-    {
-        return $this->container['password'];
-    }
-
-    /**
-     * Sets password
-     *
-     * @param string|null $password None
-     *
-     * @return $this
-     */
-    public function setPassword($password)
-    {
-        if (!is_null($password) && (mb_strlen($password) > 64)) {
-            throw new \InvalidArgumentException('invalid length for $password when calling InlineObject3., must be smaller than or equal to 64.');
-        }
-        if (!is_null($password) && (mb_strlen($password) < 10)) {
-            throw new \InvalidArgumentException('invalid length for $password when calling InlineObject3., must be bigger than or equal to 10.');
-        }
-
-        $this->container['password'] = $password;
-
-        return $this;
-    }
-
-    /**
-     * Gets callback
-     *
-     * @return string|null
-     */
-    public function getCallback()
-    {
-        return $this->container['callback'];
-    }
-
-    /**
-     * Sets callback
-     *
-     * @param string|null $callback None
-     *
-     * @return $this
-     */
-    public function setCallback($callback)
-    {
-        $this->container['callback'] = $callback;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
deleted file mode 100644
index 022715f6ef53..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-/**
- * InlineObject4
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * InlineObject4 Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class InlineObject4 implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'inline_object_4';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'param' => 'string',
-        'param2' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'param' => null,
-        'param2' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'param' => 'param',
-        'param2' => 'param2'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'param' => 'setParam',
-        'param2' => 'setParam2'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'param' => 'getParam',
-        'param2' => 'getParam2'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['param'] = isset($data['param']) ? $data['param'] : null;
-        $this->container['param2'] = isset($data['param2']) ? $data['param2'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        if ($this->container['param'] === null) {
-            $invalidProperties[] = "'param' can't be null";
-        }
-        if ($this->container['param2'] === null) {
-            $invalidProperties[] = "'param2' can't be null";
-        }
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets param
-     *
-     * @return string
-     */
-    public function getParam()
-    {
-        return $this->container['param'];
-    }
-
-    /**
-     * Sets param
-     *
-     * @param string $param field1
-     *
-     * @return $this
-     */
-    public function setParam($param)
-    {
-        $this->container['param'] = $param;
-
-        return $this;
-    }
-
-    /**
-     * Gets param2
-     *
-     * @return string
-     */
-    public function getParam2()
-    {
-        return $this->container['param2'];
-    }
-
-    /**
-     * Sets param2
-     *
-     * @param string $param2 field2
-     *
-     * @return $this
-     */
-    public function setParam2($param2)
-    {
-        $this->container['param2'] = $param2;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
deleted file mode 100644
index d8430f08da65..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-/**
- * InlineObject5
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * InlineObject5 Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class InlineObject5 implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'inline_object_5';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'additional_metadata' => 'string',
-        'required_file' => '\SplFileObject'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'additional_metadata' => null,
-        'required_file' => 'binary'
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'additional_metadata' => 'additionalMetadata',
-        'required_file' => 'requiredFile'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'additional_metadata' => 'setAdditionalMetadata',
-        'required_file' => 'setRequiredFile'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'additional_metadata' => 'getAdditionalMetadata',
-        'required_file' => 'getRequiredFile'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['additional_metadata'] = isset($data['additional_metadata']) ? $data['additional_metadata'] : null;
-        $this->container['required_file'] = isset($data['required_file']) ? $data['required_file'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        if ($this->container['required_file'] === null) {
-            $invalidProperties[] = "'required_file' can't be null";
-        }
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets additional_metadata
-     *
-     * @return string|null
-     */
-    public function getAdditionalMetadata()
-    {
-        return $this->container['additional_metadata'];
-    }
-
-    /**
-     * Sets additional_metadata
-     *
-     * @param string|null $additional_metadata Additional data to pass to server
-     *
-     * @return $this
-     */
-    public function setAdditionalMetadata($additional_metadata)
-    {
-        $this->container['additional_metadata'] = $additional_metadata;
-
-        return $this;
-    }
-
-    /**
-     * Gets required_file
-     *
-     * @return \SplFileObject
-     */
-    public function getRequiredFile()
-    {
-        return $this->container['required_file'];
-    }
-
-    /**
-     * Sets required_file
-     *
-     * @param \SplFileObject $required_file file to upload
-     *
-     * @return $this
-     */
-    public function setRequiredFile($required_file)
-    {
-        $this->container['required_file'] = $required_file;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
deleted file mode 100644
index 0440be54accc..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * InlineResponseDefault
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * InlineResponseDefault Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class InlineResponseDefault implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'inline_response_default';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'string' => '\OpenAPI\Client\Model\Foo'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'string' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'string' => 'string'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'string' => 'setString'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'string' => 'getString'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['string'] = isset($data['string']) ? $data['string'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets string
-     *
-     * @return \OpenAPI\Client\Model\Foo|null
-     */
-    public function getString()
-    {
-        return $this->container['string'];
-    }
-
-    /**
-     * Sets string
-     *
-     * @param \OpenAPI\Client\Model\Foo|null $string string
-     *
-     * @return $this
-     */
-    public function setString($string)
-    {
-        $this->container['string'] = $string;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
deleted file mode 100644
index 56d11e0d64ca..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
+++ /dev/null
@@ -1,421 +0,0 @@
-<?php
-/**
- * MapTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * MapTest Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class MapTest implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'MapTest';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'map_map_of_string' => 'map[string,map[string,string]]',
-        'map_of_enum_string' => 'map[string,string]',
-        'direct_map' => 'map[string,bool]',
-        'indirect_map' => 'map[string,bool]'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'map_map_of_string' => null,
-        'map_of_enum_string' => null,
-        'direct_map' => null,
-        'indirect_map' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'map_map_of_string' => 'map_map_of_string',
-        'map_of_enum_string' => 'map_of_enum_string',
-        'direct_map' => 'direct_map',
-        'indirect_map' => 'indirect_map'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'map_map_of_string' => 'setMapMapOfString',
-        'map_of_enum_string' => 'setMapOfEnumString',
-        'direct_map' => 'setDirectMap',
-        'indirect_map' => 'setIndirectMap'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'map_map_of_string' => 'getMapMapOfString',
-        'map_of_enum_string' => 'getMapOfEnumString',
-        'direct_map' => 'getDirectMap',
-        'indirect_map' => 'getIndirectMap'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    const MAP_OF_ENUM_STRING_UPPER = 'UPPER';
-    const MAP_OF_ENUM_STRING_LOWER = 'lower';
-    
-
-    
-    /**
-     * Gets allowable values of the enum
-     *
-     * @return string[]
-     */
-    public function getMapOfEnumStringAllowableValues()
-    {
-        return [
-            self::MAP_OF_ENUM_STRING_UPPER,
-            self::MAP_OF_ENUM_STRING_LOWER,
-        ];
-    }
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['map_map_of_string'] = isset($data['map_map_of_string']) ? $data['map_map_of_string'] : null;
-        $this->container['map_of_enum_string'] = isset($data['map_of_enum_string']) ? $data['map_of_enum_string'] : null;
-        $this->container['direct_map'] = isset($data['direct_map']) ? $data['direct_map'] : null;
-        $this->container['indirect_map'] = isset($data['indirect_map']) ? $data['indirect_map'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets map_map_of_string
-     *
-     * @return map[string,map[string,string]]|null
-     */
-    public function getMapMapOfString()
-    {
-        return $this->container['map_map_of_string'];
-    }
-
-    /**
-     * Sets map_map_of_string
-     *
-     * @param map[string,map[string,string]]|null $map_map_of_string map_map_of_string
-     *
-     * @return $this
-     */
-    public function setMapMapOfString($map_map_of_string)
-    {
-        $this->container['map_map_of_string'] = $map_map_of_string;
-
-        return $this;
-    }
-
-    /**
-     * Gets map_of_enum_string
-     *
-     * @return map[string,string]|null
-     */
-    public function getMapOfEnumString()
-    {
-        return $this->container['map_of_enum_string'];
-    }
-
-    /**
-     * Sets map_of_enum_string
-     *
-     * @param map[string,string]|null $map_of_enum_string map_of_enum_string
-     *
-     * @return $this
-     */
-    public function setMapOfEnumString($map_of_enum_string)
-    {
-        $allowedValues = $this->getMapOfEnumStringAllowableValues();
-        if (!is_null($map_of_enum_string) && array_diff($map_of_enum_string, $allowedValues)) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    "Invalid value for 'map_of_enum_string', must be one of '%s'",
-                    implode("', '", $allowedValues)
-                )
-            );
-        }
-        $this->container['map_of_enum_string'] = $map_of_enum_string;
-
-        return $this;
-    }
-
-    /**
-     * Gets direct_map
-     *
-     * @return map[string,bool]|null
-     */
-    public function getDirectMap()
-    {
-        return $this->container['direct_map'];
-    }
-
-    /**
-     * Sets direct_map
-     *
-     * @param map[string,bool]|null $direct_map direct_map
-     *
-     * @return $this
-     */
-    public function setDirectMap($direct_map)
-    {
-        $this->container['direct_map'] = $direct_map;
-
-        return $this;
-    }
-
-    /**
-     * Gets indirect_map
-     *
-     * @return map[string,bool]|null
-     */
-    public function getIndirectMap()
-    {
-        return $this->container['indirect_map'];
-    }
-
-    /**
-     * Sets indirect_map
-     *
-     * @param map[string,bool]|null $indirect_map indirect_map
-     *
-     * @return $this
-     */
-    public function setIndirectMap($indirect_map)
-    {
-        $this->container['indirect_map'] = $indirect_map;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
deleted file mode 100644
index 315fb8920670..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ /dev/null
@@ -1,367 +0,0 @@
-<?php
-/**
- * MixedPropertiesAndAdditionalPropertiesClass
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * MixedPropertiesAndAdditionalPropertiesClass Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class MixedPropertiesAndAdditionalPropertiesClass implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'MixedPropertiesAndAdditionalPropertiesClass';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'uuid' => 'string',
-        'date_time' => '\DateTime',
-        'map' => 'map[string,\OpenAPI\Client\Model\Animal]'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'uuid' => 'uuid',
-        'date_time' => 'date-time',
-        'map' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'uuid' => 'uuid',
-        'date_time' => 'dateTime',
-        'map' => 'map'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'uuid' => 'setUuid',
-        'date_time' => 'setDateTime',
-        'map' => 'setMap'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'uuid' => 'getUuid',
-        'date_time' => 'getDateTime',
-        'map' => 'getMap'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['uuid'] = isset($data['uuid']) ? $data['uuid'] : null;
-        $this->container['date_time'] = isset($data['date_time']) ? $data['date_time'] : null;
-        $this->container['map'] = isset($data['map']) ? $data['map'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets uuid
-     *
-     * @return string|null
-     */
-    public function getUuid()
-    {
-        return $this->container['uuid'];
-    }
-
-    /**
-     * Sets uuid
-     *
-     * @param string|null $uuid uuid
-     *
-     * @return $this
-     */
-    public function setUuid($uuid)
-    {
-        $this->container['uuid'] = $uuid;
-
-        return $this;
-    }
-
-    /**
-     * Gets date_time
-     *
-     * @return \DateTime|null
-     */
-    public function getDateTime()
-    {
-        return $this->container['date_time'];
-    }
-
-    /**
-     * Sets date_time
-     *
-     * @param \DateTime|null $date_time date_time
-     *
-     * @return $this
-     */
-    public function setDateTime($date_time)
-    {
-        $this->container['date_time'] = $date_time;
-
-        return $this;
-    }
-
-    /**
-     * Gets map
-     *
-     * @return map[string,\OpenAPI\Client\Model\Animal]|null
-     */
-    public function getMap()
-    {
-        return $this->container['map'];
-    }
-
-    /**
-     * Sets map
-     *
-     * @param map[string,\OpenAPI\Client\Model\Animal]|null $map map
-     *
-     * @return $this
-     */
-    public function setMap($map)
-    {
-        $this->container['map'] = $map;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
deleted file mode 100644
index 548396b393d3..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
+++ /dev/null
@@ -1,338 +0,0 @@
-<?php
-/**
- * Model200Response
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * Model200Response Class Doc Comment
- *
- * @category Class
- * @description Model for testing model name starting with number
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class Model200Response implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = '200_response';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'name' => 'int',
-        'class' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'name' => 'int32',
-        'class' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'name' => 'name',
-        'class' => 'class'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'name' => 'setName',
-        'class' => 'setClass'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'name' => 'getName',
-        'class' => 'getClass'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['name'] = isset($data['name']) ? $data['name'] : null;
-        $this->container['class'] = isset($data['class']) ? $data['class'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets name
-     *
-     * @return int|null
-     */
-    public function getName()
-    {
-        return $this->container['name'];
-    }
-
-    /**
-     * Sets name
-     *
-     * @param int|null $name name
-     *
-     * @return $this
-     */
-    public function setName($name)
-    {
-        $this->container['name'] = $name;
-
-        return $this;
-    }
-
-    /**
-     * Gets class
-     *
-     * @return string|null
-     */
-    public function getClass()
-    {
-        return $this->container['class'];
-    }
-
-    /**
-     * Sets class
-     *
-     * @param string|null $class class
-     *
-     * @return $this
-     */
-    public function setClass($class)
-    {
-        $this->container['class'] = $class;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
deleted file mode 100644
index 65d496f8591d..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * ModelInterface
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client\Model
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-/**
- * Interface abstracting model access.
- *
- * @package OpenAPI\Client\Model
- * @author  OpenAPI Generator team
- */
-interface ModelInterface
-{
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName();
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes();
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats();
-
-    /**
-     * Array of attributes where the key is the local name, and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap();
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters();
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters();
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array
-     */
-    public function listInvalidProperties();
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool
-     */
-    public function valid();
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
deleted file mode 100644
index 3797ba6eef39..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * ModelList
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * ModelList Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class ModelList implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'List';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        '_123_list' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        '_123_list' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        '_123_list' => '123-list'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        '_123_list' => 'set123List'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        '_123_list' => 'get123List'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['_123_list'] = isset($data['_123_list']) ? $data['_123_list'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets _123_list
-     *
-     * @return string|null
-     */
-    public function get123List()
-    {
-        return $this->container['_123_list'];
-    }
-
-    /**
-     * Sets _123_list
-     *
-     * @param string|null $_123_list _123_list
-     *
-     * @return $this
-     */
-    public function set123List($_123_list)
-    {
-        $this->container['_123_list'] = $_123_list;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
deleted file mode 100644
index f9bf057b4d6d..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-/**
- * ModelReturn
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * ModelReturn Class Doc Comment
- *
- * @category Class
- * @description Model for testing reserved words
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class ModelReturn implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Return';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'return' => 'int'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'return' => 'int32'
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'return' => 'return'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'return' => 'setReturn'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'return' => 'getReturn'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['return'] = isset($data['return']) ? $data['return'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets return
-     *
-     * @return int|null
-     */
-    public function getReturn()
-    {
-        return $this->container['return'];
-    }
-
-    /**
-     * Sets return
-     *
-     * @param int|null $return return
-     *
-     * @return $this
-     */
-    public function setReturn($return)
-    {
-        $this->container['return'] = $return;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
deleted file mode 100644
index 31d94ac67b27..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
+++ /dev/null
@@ -1,401 +0,0 @@
-<?php
-/**
- * Name
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * Name Class Doc Comment
- *
- * @category Class
- * @description Model for testing model name same as property name
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class Name implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Name';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'name' => 'int',
-        'snake_case' => 'int',
-        'property' => 'string',
-        '_123_number' => 'int'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'name' => 'int32',
-        'snake_case' => 'int32',
-        'property' => null,
-        '_123_number' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'name' => 'name',
-        'snake_case' => 'snake_case',
-        'property' => 'property',
-        '_123_number' => '123Number'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'name' => 'setName',
-        'snake_case' => 'setSnakeCase',
-        'property' => 'setProperty',
-        '_123_number' => 'set123Number'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'name' => 'getName',
-        'snake_case' => 'getSnakeCase',
-        'property' => 'getProperty',
-        '_123_number' => 'get123Number'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['name'] = isset($data['name']) ? $data['name'] : null;
-        $this->container['snake_case'] = isset($data['snake_case']) ? $data['snake_case'] : null;
-        $this->container['property'] = isset($data['property']) ? $data['property'] : null;
-        $this->container['_123_number'] = isset($data['_123_number']) ? $data['_123_number'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        if ($this->container['name'] === null) {
-            $invalidProperties[] = "'name' can't be null";
-        }
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets name
-     *
-     * @return int
-     */
-    public function getName()
-    {
-        return $this->container['name'];
-    }
-
-    /**
-     * Sets name
-     *
-     * @param int $name name
-     *
-     * @return $this
-     */
-    public function setName($name)
-    {
-        $this->container['name'] = $name;
-
-        return $this;
-    }
-
-    /**
-     * Gets snake_case
-     *
-     * @return int|null
-     */
-    public function getSnakeCase()
-    {
-        return $this->container['snake_case'];
-    }
-
-    /**
-     * Sets snake_case
-     *
-     * @param int|null $snake_case snake_case
-     *
-     * @return $this
-     */
-    public function setSnakeCase($snake_case)
-    {
-        $this->container['snake_case'] = $snake_case;
-
-        return $this;
-    }
-
-    /**
-     * Gets property
-     *
-     * @return string|null
-     */
-    public function getProperty()
-    {
-        return $this->container['property'];
-    }
-
-    /**
-     * Sets property
-     *
-     * @param string|null $property property
-     *
-     * @return $this
-     */
-    public function setProperty($property)
-    {
-        $this->container['property'] = $property;
-
-        return $this;
-    }
-
-    /**
-     * Gets _123_number
-     *
-     * @return int|null
-     */
-    public function get123Number()
-    {
-        return $this->container['_123_number'];
-    }
-
-    /**
-     * Sets _123_number
-     *
-     * @param int|null $_123_number _123_number
-     *
-     * @return $this
-     */
-    public function set123Number($_123_number)
-    {
-        $this->container['_123_number'] = $_123_number;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php
deleted file mode 100644
index bb4f3889d80e..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php
+++ /dev/null
@@ -1,637 +0,0 @@
-<?php
-/**
- * NullableClass
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * NullableClass Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class NullableClass implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'NullableClass';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'integer_prop' => 'int',
-        'number_prop' => 'float',
-        'boolean_prop' => 'bool',
-        'string_prop' => 'string',
-        'date_prop' => '\DateTime',
-        'datetime_prop' => '\DateTime',
-        'array_nullable_prop' => 'object[]',
-        'array_and_items_nullable_prop' => 'object[]',
-        'array_items_nullable' => 'object[]',
-        'object_nullable_prop' => 'map[string,object]',
-        'object_and_items_nullable_prop' => 'map[string,object]',
-        'object_items_nullable' => 'map[string,object]'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'integer_prop' => null,
-        'number_prop' => null,
-        'boolean_prop' => null,
-        'string_prop' => null,
-        'date_prop' => 'date',
-        'datetime_prop' => 'date-time',
-        'array_nullable_prop' => null,
-        'array_and_items_nullable_prop' => null,
-        'array_items_nullable' => null,
-        'object_nullable_prop' => null,
-        'object_and_items_nullable_prop' => null,
-        'object_items_nullable' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'integer_prop' => 'integer_prop',
-        'number_prop' => 'number_prop',
-        'boolean_prop' => 'boolean_prop',
-        'string_prop' => 'string_prop',
-        'date_prop' => 'date_prop',
-        'datetime_prop' => 'datetime_prop',
-        'array_nullable_prop' => 'array_nullable_prop',
-        'array_and_items_nullable_prop' => 'array_and_items_nullable_prop',
-        'array_items_nullable' => 'array_items_nullable',
-        'object_nullable_prop' => 'object_nullable_prop',
-        'object_and_items_nullable_prop' => 'object_and_items_nullable_prop',
-        'object_items_nullable' => 'object_items_nullable'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'integer_prop' => 'setIntegerProp',
-        'number_prop' => 'setNumberProp',
-        'boolean_prop' => 'setBooleanProp',
-        'string_prop' => 'setStringProp',
-        'date_prop' => 'setDateProp',
-        'datetime_prop' => 'setDatetimeProp',
-        'array_nullable_prop' => 'setArrayNullableProp',
-        'array_and_items_nullable_prop' => 'setArrayAndItemsNullableProp',
-        'array_items_nullable' => 'setArrayItemsNullable',
-        'object_nullable_prop' => 'setObjectNullableProp',
-        'object_and_items_nullable_prop' => 'setObjectAndItemsNullableProp',
-        'object_items_nullable' => 'setObjectItemsNullable'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'integer_prop' => 'getIntegerProp',
-        'number_prop' => 'getNumberProp',
-        'boolean_prop' => 'getBooleanProp',
-        'string_prop' => 'getStringProp',
-        'date_prop' => 'getDateProp',
-        'datetime_prop' => 'getDatetimeProp',
-        'array_nullable_prop' => 'getArrayNullableProp',
-        'array_and_items_nullable_prop' => 'getArrayAndItemsNullableProp',
-        'array_items_nullable' => 'getArrayItemsNullable',
-        'object_nullable_prop' => 'getObjectNullableProp',
-        'object_and_items_nullable_prop' => 'getObjectAndItemsNullableProp',
-        'object_items_nullable' => 'getObjectItemsNullable'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['integer_prop'] = isset($data['integer_prop']) ? $data['integer_prop'] : null;
-        $this->container['number_prop'] = isset($data['number_prop']) ? $data['number_prop'] : null;
-        $this->container['boolean_prop'] = isset($data['boolean_prop']) ? $data['boolean_prop'] : null;
-        $this->container['string_prop'] = isset($data['string_prop']) ? $data['string_prop'] : null;
-        $this->container['date_prop'] = isset($data['date_prop']) ? $data['date_prop'] : null;
-        $this->container['datetime_prop'] = isset($data['datetime_prop']) ? $data['datetime_prop'] : null;
-        $this->container['array_nullable_prop'] = isset($data['array_nullable_prop']) ? $data['array_nullable_prop'] : null;
-        $this->container['array_and_items_nullable_prop'] = isset($data['array_and_items_nullable_prop']) ? $data['array_and_items_nullable_prop'] : null;
-        $this->container['array_items_nullable'] = isset($data['array_items_nullable']) ? $data['array_items_nullable'] : null;
-        $this->container['object_nullable_prop'] = isset($data['object_nullable_prop']) ? $data['object_nullable_prop'] : null;
-        $this->container['object_and_items_nullable_prop'] = isset($data['object_and_items_nullable_prop']) ? $data['object_and_items_nullable_prop'] : null;
-        $this->container['object_items_nullable'] = isset($data['object_items_nullable']) ? $data['object_items_nullable'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = parent::listInvalidProperties();
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets integer_prop
-     *
-     * @return int|null
-     */
-    public function getIntegerProp()
-    {
-        return $this->container['integer_prop'];
-    }
-
-    /**
-     * Sets integer_prop
-     *
-     * @param int|null $integer_prop integer_prop
-     *
-     * @return $this
-     */
-    public function setIntegerProp($integer_prop)
-    {
-        $this->container['integer_prop'] = $integer_prop;
-
-        return $this;
-    }
-
-    /**
-     * Gets number_prop
-     *
-     * @return float|null
-     */
-    public function getNumberProp()
-    {
-        return $this->container['number_prop'];
-    }
-
-    /**
-     * Sets number_prop
-     *
-     * @param float|null $number_prop number_prop
-     *
-     * @return $this
-     */
-    public function setNumberProp($number_prop)
-    {
-        $this->container['number_prop'] = $number_prop;
-
-        return $this;
-    }
-
-    /**
-     * Gets boolean_prop
-     *
-     * @return bool|null
-     */
-    public function getBooleanProp()
-    {
-        return $this->container['boolean_prop'];
-    }
-
-    /**
-     * Sets boolean_prop
-     *
-     * @param bool|null $boolean_prop boolean_prop
-     *
-     * @return $this
-     */
-    public function setBooleanProp($boolean_prop)
-    {
-        $this->container['boolean_prop'] = $boolean_prop;
-
-        return $this;
-    }
-
-    /**
-     * Gets string_prop
-     *
-     * @return string|null
-     */
-    public function getStringProp()
-    {
-        return $this->container['string_prop'];
-    }
-
-    /**
-     * Sets string_prop
-     *
-     * @param string|null $string_prop string_prop
-     *
-     * @return $this
-     */
-    public function setStringProp($string_prop)
-    {
-        $this->container['string_prop'] = $string_prop;
-
-        return $this;
-    }
-
-    /**
-     * Gets date_prop
-     *
-     * @return \DateTime|null
-     */
-    public function getDateProp()
-    {
-        return $this->container['date_prop'];
-    }
-
-    /**
-     * Sets date_prop
-     *
-     * @param \DateTime|null $date_prop date_prop
-     *
-     * @return $this
-     */
-    public function setDateProp($date_prop)
-    {
-        $this->container['date_prop'] = $date_prop;
-
-        return $this;
-    }
-
-    /**
-     * Gets datetime_prop
-     *
-     * @return \DateTime|null
-     */
-    public function getDatetimeProp()
-    {
-        return $this->container['datetime_prop'];
-    }
-
-    /**
-     * Sets datetime_prop
-     *
-     * @param \DateTime|null $datetime_prop datetime_prop
-     *
-     * @return $this
-     */
-    public function setDatetimeProp($datetime_prop)
-    {
-        $this->container['datetime_prop'] = $datetime_prop;
-
-        return $this;
-    }
-
-    /**
-     * Gets array_nullable_prop
-     *
-     * @return object[]|null
-     */
-    public function getArrayNullableProp()
-    {
-        return $this->container['array_nullable_prop'];
-    }
-
-    /**
-     * Sets array_nullable_prop
-     *
-     * @param object[]|null $array_nullable_prop array_nullable_prop
-     *
-     * @return $this
-     */
-    public function setArrayNullableProp($array_nullable_prop)
-    {
-        $this->container['array_nullable_prop'] = $array_nullable_prop;
-
-        return $this;
-    }
-
-    /**
-     * Gets array_and_items_nullable_prop
-     *
-     * @return object[]|null
-     */
-    public function getArrayAndItemsNullableProp()
-    {
-        return $this->container['array_and_items_nullable_prop'];
-    }
-
-    /**
-     * Sets array_and_items_nullable_prop
-     *
-     * @param object[]|null $array_and_items_nullable_prop array_and_items_nullable_prop
-     *
-     * @return $this
-     */
-    public function setArrayAndItemsNullableProp($array_and_items_nullable_prop)
-    {
-        $this->container['array_and_items_nullable_prop'] = $array_and_items_nullable_prop;
-
-        return $this;
-    }
-
-    /**
-     * Gets array_items_nullable
-     *
-     * @return object[]|null
-     */
-    public function getArrayItemsNullable()
-    {
-        return $this->container['array_items_nullable'];
-    }
-
-    /**
-     * Sets array_items_nullable
-     *
-     * @param object[]|null $array_items_nullable array_items_nullable
-     *
-     * @return $this
-     */
-    public function setArrayItemsNullable($array_items_nullable)
-    {
-        $this->container['array_items_nullable'] = $array_items_nullable;
-
-        return $this;
-    }
-
-    /**
-     * Gets object_nullable_prop
-     *
-     * @return map[string,object]|null
-     */
-    public function getObjectNullableProp()
-    {
-        return $this->container['object_nullable_prop'];
-    }
-
-    /**
-     * Sets object_nullable_prop
-     *
-     * @param map[string,object]|null $object_nullable_prop object_nullable_prop
-     *
-     * @return $this
-     */
-    public function setObjectNullableProp($object_nullable_prop)
-    {
-        $this->container['object_nullable_prop'] = $object_nullable_prop;
-
-        return $this;
-    }
-
-    /**
-     * Gets object_and_items_nullable_prop
-     *
-     * @return map[string,object]|null
-     */
-    public function getObjectAndItemsNullableProp()
-    {
-        return $this->container['object_and_items_nullable_prop'];
-    }
-
-    /**
-     * Sets object_and_items_nullable_prop
-     *
-     * @param map[string,object]|null $object_and_items_nullable_prop object_and_items_nullable_prop
-     *
-     * @return $this
-     */
-    public function setObjectAndItemsNullableProp($object_and_items_nullable_prop)
-    {
-        $this->container['object_and_items_nullable_prop'] = $object_and_items_nullable_prop;
-
-        return $this;
-    }
-
-    /**
-     * Gets object_items_nullable
-     *
-     * @return map[string,object]|null
-     */
-    public function getObjectItemsNullable()
-    {
-        return $this->container['object_items_nullable'];
-    }
-
-    /**
-     * Sets object_items_nullable
-     *
-     * @param map[string,object]|null $object_items_nullable object_items_nullable
-     *
-     * @return $this
-     */
-    public function setObjectItemsNullable($object_items_nullable)
-    {
-        $this->container['object_items_nullable'] = $object_items_nullable;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
deleted file mode 100644
index 0e6fab77fa00..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * NumberOnly
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * NumberOnly Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class NumberOnly implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'NumberOnly';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'just_number' => 'float'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'just_number' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'just_number' => 'JustNumber'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'just_number' => 'setJustNumber'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'just_number' => 'getJustNumber'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['just_number'] = isset($data['just_number']) ? $data['just_number'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets just_number
-     *
-     * @return float|null
-     */
-    public function getJustNumber()
-    {
-        return $this->container['just_number'];
-    }
-
-    /**
-     * Sets just_number
-     *
-     * @param float|null $just_number just_number
-     *
-     * @return $this
-     */
-    public function setJustNumber($just_number)
-    {
-        $this->container['just_number'] = $just_number;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
deleted file mode 100644
index d038fd963eab..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
+++ /dev/null
@@ -1,491 +0,0 @@
-<?php
-/**
- * Order
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * Order Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class Order implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Order';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'id' => 'int',
-        'pet_id' => 'int',
-        'quantity' => 'int',
-        'ship_date' => '\DateTime',
-        'status' => 'string',
-        'complete' => 'bool'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'id' => 'int64',
-        'pet_id' => 'int64',
-        'quantity' => 'int32',
-        'ship_date' => 'date-time',
-        'status' => null,
-        'complete' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'id' => 'id',
-        'pet_id' => 'petId',
-        'quantity' => 'quantity',
-        'ship_date' => 'shipDate',
-        'status' => 'status',
-        'complete' => 'complete'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'id' => 'setId',
-        'pet_id' => 'setPetId',
-        'quantity' => 'setQuantity',
-        'ship_date' => 'setShipDate',
-        'status' => 'setStatus',
-        'complete' => 'setComplete'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'id' => 'getId',
-        'pet_id' => 'getPetId',
-        'quantity' => 'getQuantity',
-        'ship_date' => 'getShipDate',
-        'status' => 'getStatus',
-        'complete' => 'getComplete'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    const STATUS_PLACED = 'placed';
-    const STATUS_APPROVED = 'approved';
-    const STATUS_DELIVERED = 'delivered';
-    
-
-    
-    /**
-     * Gets allowable values of the enum
-     *
-     * @return string[]
-     */
-    public function getStatusAllowableValues()
-    {
-        return [
-            self::STATUS_PLACED,
-            self::STATUS_APPROVED,
-            self::STATUS_DELIVERED,
-        ];
-    }
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['id'] = isset($data['id']) ? $data['id'] : null;
-        $this->container['pet_id'] = isset($data['pet_id']) ? $data['pet_id'] : null;
-        $this->container['quantity'] = isset($data['quantity']) ? $data['quantity'] : null;
-        $this->container['ship_date'] = isset($data['ship_date']) ? $data['ship_date'] : null;
-        $this->container['status'] = isset($data['status']) ? $data['status'] : null;
-        $this->container['complete'] = isset($data['complete']) ? $data['complete'] : false;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        $allowedValues = $this->getStatusAllowableValues();
-        if (!is_null($this->container['status']) && !in_array($this->container['status'], $allowedValues, true)) {
-            $invalidProperties[] = sprintf(
-                "invalid value for 'status', must be one of '%s'",
-                implode("', '", $allowedValues)
-            );
-        }
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets id
-     *
-     * @return int|null
-     */
-    public function getId()
-    {
-        return $this->container['id'];
-    }
-
-    /**
-     * Sets id
-     *
-     * @param int|null $id id
-     *
-     * @return $this
-     */
-    public function setId($id)
-    {
-        $this->container['id'] = $id;
-
-        return $this;
-    }
-
-    /**
-     * Gets pet_id
-     *
-     * @return int|null
-     */
-    public function getPetId()
-    {
-        return $this->container['pet_id'];
-    }
-
-    /**
-     * Sets pet_id
-     *
-     * @param int|null $pet_id pet_id
-     *
-     * @return $this
-     */
-    public function setPetId($pet_id)
-    {
-        $this->container['pet_id'] = $pet_id;
-
-        return $this;
-    }
-
-    /**
-     * Gets quantity
-     *
-     * @return int|null
-     */
-    public function getQuantity()
-    {
-        return $this->container['quantity'];
-    }
-
-    /**
-     * Sets quantity
-     *
-     * @param int|null $quantity quantity
-     *
-     * @return $this
-     */
-    public function setQuantity($quantity)
-    {
-        $this->container['quantity'] = $quantity;
-
-        return $this;
-    }
-
-    /**
-     * Gets ship_date
-     *
-     * @return \DateTime|null
-     */
-    public function getShipDate()
-    {
-        return $this->container['ship_date'];
-    }
-
-    /**
-     * Sets ship_date
-     *
-     * @param \DateTime|null $ship_date ship_date
-     *
-     * @return $this
-     */
-    public function setShipDate($ship_date)
-    {
-        $this->container['ship_date'] = $ship_date;
-
-        return $this;
-    }
-
-    /**
-     * Gets status
-     *
-     * @return string|null
-     */
-    public function getStatus()
-    {
-        return $this->container['status'];
-    }
-
-    /**
-     * Sets status
-     *
-     * @param string|null $status Order Status
-     *
-     * @return $this
-     */
-    public function setStatus($status)
-    {
-        $allowedValues = $this->getStatusAllowableValues();
-        if (!is_null($status) && !in_array($status, $allowedValues, true)) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    "Invalid value for 'status', must be one of '%s'",
-                    implode("', '", $allowedValues)
-                )
-            );
-        }
-        $this->container['status'] = $status;
-
-        return $this;
-    }
-
-    /**
-     * Gets complete
-     *
-     * @return bool|null
-     */
-    public function getComplete()
-    {
-        return $this->container['complete'];
-    }
-
-    /**
-     * Sets complete
-     *
-     * @param bool|null $complete complete
-     *
-     * @return $this
-     */
-    public function setComplete($complete)
-    {
-        $this->container['complete'] = $complete;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
deleted file mode 100644
index 045913dd7d43..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
+++ /dev/null
@@ -1,367 +0,0 @@
-<?php
-/**
- * OuterComposite
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * OuterComposite Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class OuterComposite implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'OuterComposite';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'my_number' => 'float',
-        'my_string' => 'string',
-        'my_boolean' => 'bool'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'my_number' => null,
-        'my_string' => null,
-        'my_boolean' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'my_number' => 'my_number',
-        'my_string' => 'my_string',
-        'my_boolean' => 'my_boolean'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'my_number' => 'setMyNumber',
-        'my_string' => 'setMyString',
-        'my_boolean' => 'setMyBoolean'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'my_number' => 'getMyNumber',
-        'my_string' => 'getMyString',
-        'my_boolean' => 'getMyBoolean'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['my_number'] = isset($data['my_number']) ? $data['my_number'] : null;
-        $this->container['my_string'] = isset($data['my_string']) ? $data['my_string'] : null;
-        $this->container['my_boolean'] = isset($data['my_boolean']) ? $data['my_boolean'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets my_number
-     *
-     * @return float|null
-     */
-    public function getMyNumber()
-    {
-        return $this->container['my_number'];
-    }
-
-    /**
-     * Sets my_number
-     *
-     * @param float|null $my_number my_number
-     *
-     * @return $this
-     */
-    public function setMyNumber($my_number)
-    {
-        $this->container['my_number'] = $my_number;
-
-        return $this;
-    }
-
-    /**
-     * Gets my_string
-     *
-     * @return string|null
-     */
-    public function getMyString()
-    {
-        return $this->container['my_string'];
-    }
-
-    /**
-     * Sets my_string
-     *
-     * @param string|null $my_string my_string
-     *
-     * @return $this
-     */
-    public function setMyString($my_string)
-    {
-        $this->container['my_string'] = $my_string;
-
-        return $this;
-    }
-
-    /**
-     * Gets my_boolean
-     *
-     * @return bool|null
-     */
-    public function getMyBoolean()
-    {
-        return $this->container['my_boolean'];
-    }
-
-    /**
-     * Sets my_boolean
-     *
-     * @param bool|null $my_boolean my_boolean
-     *
-     * @return $this
-     */
-    public function setMyBoolean($my_boolean)
-    {
-        $this->container['my_boolean'] = $my_boolean;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
deleted file mode 100644
index f76eb48cb8e9..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * OuterEnum
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * OuterEnum Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class OuterEnum
-{
-    /**
-     * Possible values of this enum
-     */
-    const PLACED = 'placed';
-    const APPROVED = 'approved';
-    const DELIVERED = 'delivered';
-    
-    /**
-     * Gets allowable values of the enum
-     * @return string[]
-     */
-    public static function getAllowableEnumValues()
-    {
-        return [
-            self::PLACED,
-            self::APPROVED,
-            self::DELIVERED,
-        ];
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php
deleted file mode 100644
index fcf6ce7bc20e..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * OuterEnumDefaultValue
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * OuterEnumDefaultValue Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class OuterEnumDefaultValue
-{
-    /**
-     * Possible values of this enum
-     */
-    const PLACED = 'placed';
-    const APPROVED = 'approved';
-    const DELIVERED = 'delivered';
-    
-    /**
-     * Gets allowable values of the enum
-     * @return string[]
-     */
-    public static function getAllowableEnumValues()
-    {
-        return [
-            self::PLACED,
-            self::APPROVED,
-            self::DELIVERED,
-        ];
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php
deleted file mode 100644
index 2199911d5547..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * OuterEnumInteger
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * OuterEnumInteger Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class OuterEnumInteger
-{
-    /**
-     * Possible values of this enum
-     */
-    const 0 = 0;
-    const 1 = 1;
-    const 2 = 2;
-    
-    /**
-     * Gets allowable values of the enum
-     * @return string[]
-     */
-    public static function getAllowableEnumValues()
-    {
-        return [
-            self::0,
-            self::1,
-            self::2,
-        ];
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php
deleted file mode 100644
index acd17eb7264d..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * OuterEnumIntegerDefaultValue
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * OuterEnumIntegerDefaultValue Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class OuterEnumIntegerDefaultValue
-{
-    /**
-     * Possible values of this enum
-     */
-    const 0 = 0;
-    const 1 = 1;
-    const 2 = 2;
-    
-    /**
-     * Gets allowable values of the enum
-     * @return string[]
-     */
-    public static function getAllowableEnumValues()
-    {
-        return [
-            self::0,
-            self::1,
-            self::2,
-        ];
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
deleted file mode 100644
index e5e3097a0744..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
+++ /dev/null
@@ -1,497 +0,0 @@
-<?php
-/**
- * Pet
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * Pet Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class Pet implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Pet';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'id' => 'int',
-        'category' => '\OpenAPI\Client\Model\Category',
-        'name' => 'string',
-        'photo_urls' => 'string[]',
-        'tags' => '\OpenAPI\Client\Model\Tag[]',
-        'status' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'id' => 'int64',
-        'category' => null,
-        'name' => null,
-        'photo_urls' => null,
-        'tags' => null,
-        'status' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'id' => 'id',
-        'category' => 'category',
-        'name' => 'name',
-        'photo_urls' => 'photoUrls',
-        'tags' => 'tags',
-        'status' => 'status'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'id' => 'setId',
-        'category' => 'setCategory',
-        'name' => 'setName',
-        'photo_urls' => 'setPhotoUrls',
-        'tags' => 'setTags',
-        'status' => 'setStatus'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'id' => 'getId',
-        'category' => 'getCategory',
-        'name' => 'getName',
-        'photo_urls' => 'getPhotoUrls',
-        'tags' => 'getTags',
-        'status' => 'getStatus'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    const STATUS_AVAILABLE = 'available';
-    const STATUS_PENDING = 'pending';
-    const STATUS_SOLD = 'sold';
-    
-
-    
-    /**
-     * Gets allowable values of the enum
-     *
-     * @return string[]
-     */
-    public function getStatusAllowableValues()
-    {
-        return [
-            self::STATUS_AVAILABLE,
-            self::STATUS_PENDING,
-            self::STATUS_SOLD,
-        ];
-    }
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['id'] = isset($data['id']) ? $data['id'] : null;
-        $this->container['category'] = isset($data['category']) ? $data['category'] : null;
-        $this->container['name'] = isset($data['name']) ? $data['name'] : null;
-        $this->container['photo_urls'] = isset($data['photo_urls']) ? $data['photo_urls'] : null;
-        $this->container['tags'] = isset($data['tags']) ? $data['tags'] : null;
-        $this->container['status'] = isset($data['status']) ? $data['status'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        if ($this->container['name'] === null) {
-            $invalidProperties[] = "'name' can't be null";
-        }
-        if ($this->container['photo_urls'] === null) {
-            $invalidProperties[] = "'photo_urls' can't be null";
-        }
-        $allowedValues = $this->getStatusAllowableValues();
-        if (!is_null($this->container['status']) && !in_array($this->container['status'], $allowedValues, true)) {
-            $invalidProperties[] = sprintf(
-                "invalid value for 'status', must be one of '%s'",
-                implode("', '", $allowedValues)
-            );
-        }
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets id
-     *
-     * @return int|null
-     */
-    public function getId()
-    {
-        return $this->container['id'];
-    }
-
-    /**
-     * Sets id
-     *
-     * @param int|null $id id
-     *
-     * @return $this
-     */
-    public function setId($id)
-    {
-        $this->container['id'] = $id;
-
-        return $this;
-    }
-
-    /**
-     * Gets category
-     *
-     * @return \OpenAPI\Client\Model\Category|null
-     */
-    public function getCategory()
-    {
-        return $this->container['category'];
-    }
-
-    /**
-     * Sets category
-     *
-     * @param \OpenAPI\Client\Model\Category|null $category category
-     *
-     * @return $this
-     */
-    public function setCategory($category)
-    {
-        $this->container['category'] = $category;
-
-        return $this;
-    }
-
-    /**
-     * Gets name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->container['name'];
-    }
-
-    /**
-     * Sets name
-     *
-     * @param string $name name
-     *
-     * @return $this
-     */
-    public function setName($name)
-    {
-        $this->container['name'] = $name;
-
-        return $this;
-    }
-
-    /**
-     * Gets photo_urls
-     *
-     * @return string[]
-     */
-    public function getPhotoUrls()
-    {
-        return $this->container['photo_urls'];
-    }
-
-    /**
-     * Sets photo_urls
-     *
-     * @param string[] $photo_urls photo_urls
-     *
-     * @return $this
-     */
-    public function setPhotoUrls($photo_urls)
-    {
-        $this->container['photo_urls'] = $photo_urls;
-
-        return $this;
-    }
-
-    /**
-     * Gets tags
-     *
-     * @return \OpenAPI\Client\Model\Tag[]|null
-     */
-    public function getTags()
-    {
-        return $this->container['tags'];
-    }
-
-    /**
-     * Sets tags
-     *
-     * @param \OpenAPI\Client\Model\Tag[]|null $tags tags
-     *
-     * @return $this
-     */
-    public function setTags($tags)
-    {
-        $this->container['tags'] = $tags;
-
-        return $this;
-    }
-
-    /**
-     * Gets status
-     *
-     * @return string|null
-     */
-    public function getStatus()
-    {
-        return $this->container['status'];
-    }
-
-    /**
-     * Sets status
-     *
-     * @param string|null $status pet status in the store
-     *
-     * @return $this
-     */
-    public function setStatus($status)
-    {
-        $allowedValues = $this->getStatusAllowableValues();
-        if (!is_null($status) && !in_array($status, $allowedValues, true)) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    "Invalid value for 'status', must be one of '%s'",
-                    implode("', '", $allowedValues)
-                )
-            );
-        }
-        $this->container['status'] = $status;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
deleted file mode 100644
index 51cd0d372e70..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-/**
- * ReadOnlyFirst
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * ReadOnlyFirst Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class ReadOnlyFirst implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'ReadOnlyFirst';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'bar' => 'string',
-        'baz' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'bar' => null,
-        'baz' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'bar' => 'bar',
-        'baz' => 'baz'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'bar' => 'setBar',
-        'baz' => 'setBaz'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'bar' => 'getBar',
-        'baz' => 'getBaz'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['bar'] = isset($data['bar']) ? $data['bar'] : null;
-        $this->container['baz'] = isset($data['baz']) ? $data['baz'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets bar
-     *
-     * @return string|null
-     */
-    public function getBar()
-    {
-        return $this->container['bar'];
-    }
-
-    /**
-     * Sets bar
-     *
-     * @param string|null $bar bar
-     *
-     * @return $this
-     */
-    public function setBar($bar)
-    {
-        $this->container['bar'] = $bar;
-
-        return $this;
-    }
-
-    /**
-     * Gets baz
-     *
-     * @return string|null
-     */
-    public function getBaz()
-    {
-        return $this->container['baz'];
-    }
-
-    /**
-     * Sets baz
-     *
-     * @param string|null $baz baz
-     *
-     * @return $this
-     */
-    public function setBaz($baz)
-    {
-        $this->container['baz'] = $baz;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
deleted file mode 100644
index 3e56cb532982..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * SpecialModelName
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * SpecialModelName Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class SpecialModelName implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = '_special_model.name_';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'special_property_name' => 'int'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'special_property_name' => 'int64'
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'special_property_name' => '$special[property.name]'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'special_property_name' => 'setSpecialPropertyName'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'special_property_name' => 'getSpecialPropertyName'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['special_property_name'] = isset($data['special_property_name']) ? $data['special_property_name'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets special_property_name
-     *
-     * @return int|null
-     */
-    public function getSpecialPropertyName()
-    {
-        return $this->container['special_property_name'];
-    }
-
-    /**
-     * Sets special_property_name
-     *
-     * @param int|null $special_property_name special_property_name
-     *
-     * @return $this
-     */
-    public function setSpecialPropertyName($special_property_name)
-    {
-        $this->container['special_property_name'] = $special_property_name;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
deleted file mode 100644
index 9b6ac589a474..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-/**
- * Tag
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * Tag Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class Tag implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'Tag';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'id' => 'int',
-        'name' => 'string'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'id' => 'int64',
-        'name' => null
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'id' => 'id',
-        'name' => 'name'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'id' => 'setId',
-        'name' => 'setName'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'id' => 'getId',
-        'name' => 'getName'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['id'] = isset($data['id']) ? $data['id'] : null;
-        $this->container['name'] = isset($data['name']) ? $data['name'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets id
-     *
-     * @return int|null
-     */
-    public function getId()
-    {
-        return $this->container['id'];
-    }
-
-    /**
-     * Sets id
-     *
-     * @param int|null $id id
-     *
-     * @return $this
-     */
-    public function setId($id)
-    {
-        $this->container['id'] = $id;
-
-        return $this;
-    }
-
-    /**
-     * Gets name
-     *
-     * @return string|null
-     */
-    public function getName()
-    {
-        return $this->container['name'];
-    }
-
-    /**
-     * Sets name
-     *
-     * @param string|null $name name
-     *
-     * @return $this
-     */
-    public function setName($name)
-    {
-        $this->container['name'] = $name;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
deleted file mode 100644
index af14d63c68e9..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-/**
- * User
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client\Model;
-
-use \ArrayAccess;
-use \OpenAPI\Client\ObjectSerializer;
-
-/**
- * User Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class User implements ModelInterface, ArrayAccess
-{
-    const DISCRIMINATOR = null;
-
-    /**
-      * The original name of the model.
-      *
-      * @var string
-      */
-    protected static $openAPIModelName = 'User';
-
-    /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPITypes = [
-        'id' => 'int',
-        'username' => 'string',
-        'first_name' => 'string',
-        'last_name' => 'string',
-        'email' => 'string',
-        'password' => 'string',
-        'phone' => 'string',
-        'user_status' => 'int'
-    ];
-
-    /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var string[]
-      */
-    protected static $openAPIFormats = [
-        'id' => 'int64',
-        'username' => null,
-        'first_name' => null,
-        'last_name' => null,
-        'email' => null,
-        'password' => null,
-        'phone' => null,
-        'user_status' => 'int32'
-    ];
-
-    /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPITypes()
-    {
-        return self::$openAPITypes;
-    }
-
-    /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array
-     */
-    public static function openAPIFormats()
-    {
-        return self::$openAPIFormats;
-    }
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @var string[]
-     */
-    protected static $attributeMap = [
-        'id' => 'id',
-        'username' => 'username',
-        'first_name' => 'firstName',
-        'last_name' => 'lastName',
-        'email' => 'email',
-        'password' => 'password',
-        'phone' => 'phone',
-        'user_status' => 'userStatus'
-    ];
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @var string[]
-     */
-    protected static $setters = [
-        'id' => 'setId',
-        'username' => 'setUsername',
-        'first_name' => 'setFirstName',
-        'last_name' => 'setLastName',
-        'email' => 'setEmail',
-        'password' => 'setPassword',
-        'phone' => 'setPhone',
-        'user_status' => 'setUserStatus'
-    ];
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @var string[]
-     */
-    protected static $getters = [
-        'id' => 'getId',
-        'username' => 'getUsername',
-        'first_name' => 'getFirstName',
-        'last_name' => 'getLastName',
-        'email' => 'getEmail',
-        'password' => 'getPassword',
-        'phone' => 'getPhone',
-        'user_status' => 'getUserStatus'
-    ];
-
-    /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array
-     */
-    public static function attributeMap()
-    {
-        return self::$attributeMap;
-    }
-
-    /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array
-     */
-    public static function setters()
-    {
-        return self::$setters;
-    }
-
-    /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array
-     */
-    public static function getters()
-    {
-        return self::$getters;
-    }
-
-    /**
-     * The original name of the model.
-     *
-     * @return string
-     */
-    public function getModelName()
-    {
-        return self::$openAPIModelName;
-    }
-
-    
-
-    
-
-    /**
-     * Associative array for storing property values
-     *
-     * @var mixed[]
-     */
-    protected $container = [];
-
-    /**
-     * Constructor
-     *
-     * @param mixed[] $data Associated array of property values
-     *                      initializing the model
-     */
-    public function __construct(array $data = null)
-    {
-        $this->container['id'] = isset($data['id']) ? $data['id'] : null;
-        $this->container['username'] = isset($data['username']) ? $data['username'] : null;
-        $this->container['first_name'] = isset($data['first_name']) ? $data['first_name'] : null;
-        $this->container['last_name'] = isset($data['last_name']) ? $data['last_name'] : null;
-        $this->container['email'] = isset($data['email']) ? $data['email'] : null;
-        $this->container['password'] = isset($data['password']) ? $data['password'] : null;
-        $this->container['phone'] = isset($data['phone']) ? $data['phone'] : null;
-        $this->container['user_status'] = isset($data['user_status']) ? $data['user_status'] : null;
-    }
-
-    /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return array invalid properties with reasons
-     */
-    public function listInvalidProperties()
-    {
-        $invalidProperties = [];
-
-        return $invalidProperties;
-    }
-
-    /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
-     */
-    public function valid()
-    {
-        return count($this->listInvalidProperties()) === 0;
-    }
-
-
-    /**
-     * Gets id
-     *
-     * @return int|null
-     */
-    public function getId()
-    {
-        return $this->container['id'];
-    }
-
-    /**
-     * Sets id
-     *
-     * @param int|null $id id
-     *
-     * @return $this
-     */
-    public function setId($id)
-    {
-        $this->container['id'] = $id;
-
-        return $this;
-    }
-
-    /**
-     * Gets username
-     *
-     * @return string|null
-     */
-    public function getUsername()
-    {
-        return $this->container['username'];
-    }
-
-    /**
-     * Sets username
-     *
-     * @param string|null $username username
-     *
-     * @return $this
-     */
-    public function setUsername($username)
-    {
-        $this->container['username'] = $username;
-
-        return $this;
-    }
-
-    /**
-     * Gets first_name
-     *
-     * @return string|null
-     */
-    public function getFirstName()
-    {
-        return $this->container['first_name'];
-    }
-
-    /**
-     * Sets first_name
-     *
-     * @param string|null $first_name first_name
-     *
-     * @return $this
-     */
-    public function setFirstName($first_name)
-    {
-        $this->container['first_name'] = $first_name;
-
-        return $this;
-    }
-
-    /**
-     * Gets last_name
-     *
-     * @return string|null
-     */
-    public function getLastName()
-    {
-        return $this->container['last_name'];
-    }
-
-    /**
-     * Sets last_name
-     *
-     * @param string|null $last_name last_name
-     *
-     * @return $this
-     */
-    public function setLastName($last_name)
-    {
-        $this->container['last_name'] = $last_name;
-
-        return $this;
-    }
-
-    /**
-     * Gets email
-     *
-     * @return string|null
-     */
-    public function getEmail()
-    {
-        return $this->container['email'];
-    }
-
-    /**
-     * Sets email
-     *
-     * @param string|null $email email
-     *
-     * @return $this
-     */
-    public function setEmail($email)
-    {
-        $this->container['email'] = $email;
-
-        return $this;
-    }
-
-    /**
-     * Gets password
-     *
-     * @return string|null
-     */
-    public function getPassword()
-    {
-        return $this->container['password'];
-    }
-
-    /**
-     * Sets password
-     *
-     * @param string|null $password password
-     *
-     * @return $this
-     */
-    public function setPassword($password)
-    {
-        $this->container['password'] = $password;
-
-        return $this;
-    }
-
-    /**
-     * Gets phone
-     *
-     * @return string|null
-     */
-    public function getPhone()
-    {
-        return $this->container['phone'];
-    }
-
-    /**
-     * Sets phone
-     *
-     * @param string|null $phone phone
-     *
-     * @return $this
-     */
-    public function setPhone($phone)
-    {
-        $this->container['phone'] = $phone;
-
-        return $this;
-    }
-
-    /**
-     * Gets user_status
-     *
-     * @return int|null
-     */
-    public function getUserStatus()
-    {
-        return $this->container['user_status'];
-    }
-
-    /**
-     * Sets user_status
-     *
-     * @param int|null $user_status User Status
-     *
-     * @return $this
-     */
-    public function setUserStatus($user_status)
-    {
-        $this->container['user_status'] = $user_status;
-
-        return $this;
-    }
-    /**
-     * Returns true if offset exists. False otherwise.
-     *
-     * @param integer $offset Offset
-     *
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * Gets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset]) ? $this->container[$offset] : null;
-    }
-
-    /**
-     * Sets value based on offset.
-     *
-     * @param integer $offset Offset
-     * @param mixed   $value  Value to be set
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Unsets offset.
-     *
-     * @param integer $offset Offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * Gets the string presentation of the object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return json_encode(
-            ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
-        );
-    }
-
-    /**
-     * Gets a header-safe presentation of the object
-     *
-     * @return string
-     */
-    public function toHeaderValue()
-    {
-        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
-    }
-}
-
-
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
deleted file mode 100644
index cfc13fe19b0f..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
+++ /dev/null
@@ -1,352 +0,0 @@
-<?php
-/**
- * ObjectSerializer
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Model\ModelInterface;
-
-/**
- * ObjectSerializer Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class ObjectSerializer
-{
-    /** @var string */
-    private static $dateTimeFormat = \DateTime::ATOM;
-
-    /**
-     * Change the date format
-     *
-     * @param string $format   the new date format to use
-     */
-    public static function setDateTimeFormat($format)
-    {
-        self::$dateTimeFormat = $format;
-    }
-
-    /**
-     * Serialize data
-     *
-     * @param mixed  $data   the data to serialize
-     * @param string $type   the OpenAPIToolsType of the data
-     * @param string $format the format of the OpenAPITools type of the data
-     *
-     * @return string|object serialized form of $data
-     */
-    public static function sanitizeForSerialization($data, $type = null, $format = null)
-    {
-        if (is_scalar($data) || null === $data) {
-            return $data;
-        } elseif ($data instanceof \DateTime) {
-            return ($format === 'date') ? $data->format('Y-m-d') : $data->format(self::$dateTimeFormat);
-        } elseif (is_array($data)) {
-            foreach ($data as $property => $value) {
-                $data[$property] = self::sanitizeForSerialization($value);
-            }
-            return $data;
-        } elseif (is_object($data)) {
-            $values = [];
-            if ($data instanceof ModelInterface) {
-                $formats = $data::openAPIFormats();
-                foreach ($data::openAPITypes() as $property => $openAPIType) {
-                    $getter = $data::getters()[$property];
-                    $value = $data->$getter();
-                    if ($value !== null
-                        && !in_array($openAPIType, ['DateTime', 'bool', 'boolean', 'byte', 'double', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)
-                        && method_exists($openAPIType, 'getAllowableEnumValues')
-                        && !in_array($value, $openAPIType::getAllowableEnumValues(), true)) {
-                        $imploded = implode("', '", $openAPIType::getAllowableEnumValues());
-                        throw new \InvalidArgumentException("Invalid value for enum '$openAPIType', must be one of: '$imploded'");
-                    }
-                    if ($value !== null) {
-                        $values[$data::attributeMap()[$property]] = self::sanitizeForSerialization($value, $openAPIType, $formats[$property]);
-                    }
-                }
-            } else {
-                foreach($data as $property => $value) {
-                    $values[$property] = self::sanitizeForSerialization($value);
-                }
-            }
-            return (object)$values;
-        } else {
-            return (string)$data;
-        }
-    }
-
-    /**
-     * Sanitize filename by removing path.
-     * e.g. ../../sun.gif becomes sun.gif
-     *
-     * @param string $filename filename to be sanitized
-     *
-     * @return string the sanitized filename
-     */
-    public static function sanitizeFilename($filename)
-    {
-        if (preg_match("/.*[\/\\\\](.*)$/", $filename, $match)) {
-            return $match[1];
-        } else {
-            return $filename;
-        }
-    }
-
-    /**
-     * Take value and turn it into a string suitable for inclusion in
-     * the path, by url-encoding.
-     *
-     * @param string $value a string which will be part of the path
-     *
-     * @return string the serialized object
-     */
-    public static function toPathValue($value)
-    {
-        return rawurlencode(self::toString($value));
-    }
-
-    /**
-     * Take value and turn it into a string suitable for inclusion in
-     * the query, by imploding comma-separated if it's an object.
-     * If it's a string, pass through unchanged. It will be url-encoded
-     * later.
-     *
-     * @param string[]|string|\DateTime $object an object to be serialized to a string
-     *
-     * @return string the serialized object
-     */
-    public static function toQueryValue($object)
-    {
-        if (is_array($object)) {
-            return implode(',', $object);
-        } else {
-            return self::toString($object);
-        }
-    }
-
-    /**
-     * Take value and turn it into a string suitable for inclusion in
-     * the header. If it's a string, pass through unchanged
-     * If it's a datetime object, format it in ISO8601
-     *
-     * @param string $value a string which will be part of the header
-     *
-     * @return string the header string
-     */
-    public static function toHeaderValue($value)
-    {
-        if (method_exists($value, 'toHeaderValue')) {
-            return $value->toHeaderValue();
-        }
-
-        return self::toString($value);
-    }
-
-    /**
-     * Take value and turn it into a string suitable for inclusion in
-     * the http body (form parameter). If it's a string, pass through unchanged
-     * If it's a datetime object, format it in ISO8601
-     *
-     * @param string|\SplFileObject $value the value of the form parameter
-     *
-     * @return string the form string
-     */
-    public static function toFormValue($value)
-    {
-        if ($value instanceof \SplFileObject) {
-            return $value->getRealPath();
-        } else {
-            return self::toString($value);
-        }
-    }
-
-    /**
-     * Take value and turn it into a string suitable for inclusion in
-     * the parameter. If it's a string, pass through unchanged
-     * If it's a datetime object, format it in ISO8601
-     * If it's a boolean, convert it to "true" or "false".
-     *
-     * @param string|bool|\DateTime $value the value of the parameter
-     *
-     * @return string the header string
-     */
-    public static function toString($value)
-    {
-        if ($value instanceof \DateTime) { // datetime in ISO8601 format
-            return $value->format(self::$dateTimeFormat);
-        } else if (is_bool($value)) {
-            return $value ? 'true' : 'false';
-        } else {
-            return $value;
-        }
-    }
-
-    /**
-     * Serialize an array to a string.
-     *
-     * @param array  $collection                 collection to serialize to a string
-     * @param string $style                      the format use for serialization (csv,
-     * ssv, tsv, pipes, multi)
-     * @param bool   $allowCollectionFormatMulti allow collection format to be a multidimensional array
-     *
-     * @return string
-     */
-    public static function serializeCollection(array $collection, $style, $allowCollectionFormatMulti = false)
-    {
-        if ($allowCollectionFormatMulti && ('multi' === $style)) {
-            // http_build_query() almost does the job for us. We just
-            // need to fix the result of multidimensional arrays.
-            return preg_replace('/%5B[0-9]+%5D=/', '=', http_build_query($collection, '', '&'));
-        }
-        switch ($style) {
-            case 'pipeDelimited':
-            case 'pipes':
-                return implode('|', $collection);
-
-            case 'tsv':
-                return implode("\t", $collection);
-
-            case 'spaceDelimited':
-            case 'ssv':
-                return implode(' ', $collection);
-
-            case 'simple':
-            case 'csv':
-                // Deliberate fall through. CSV is default format.
-            default:
-                return implode(',', $collection);
-        }
-    }
-
-    /**
-     * Deserialize a JSON string into an object
-     *
-     * @param mixed    $data          object or primitive to be deserialized
-     * @param string   $class         class name is passed as a string
-     * @param string[] $httpHeaders   HTTP headers
-     * @param string   $discriminator discriminator if polymorphism is used
-     *
-     * @return object|array|null a single or an array of $class instances
-     */
-    public static function deserialize($data, $class, $httpHeaders = null)
-    {
-        if (null === $data) {
-            return null;
-        } elseif (strcasecmp(substr($class, -2), '[]') === 0) {
-            $data = is_string($data) ? json_decode($data) : $data;
-            $subClass = substr($class, 0, -2);
-            $values = [];
-            foreach ($data as $key => $value) {
-                $values[] = self::deserialize($value, $subClass, null);
-            }
-            return $values;
-        } elseif (substr($class, 0, 4) === 'map[') { // for associative array e.g. map[string,int]
-            $data = is_string($data) ? json_decode($data) : $data;
-            settype($data, 'array');
-            $inner = substr($class, 4, -1);
-            $deserialized = [];
-            if (strrpos($inner, ",") !== false) {
-                $subClass_array = explode(',', $inner, 2);
-                $subClass = $subClass_array[1];
-                foreach ($data as $key => $value) {
-                    $deserialized[$key] = self::deserialize($value, $subClass, null);
-                }
-            }
-            return $deserialized;
-        } elseif ($class === 'object') {
-            settype($data, 'array');
-            return $data;
-        } elseif ($class === '\DateTime') {
-            // Some API's return an invalid, empty string as a
-            // date-time property. DateTime::__construct() will return
-            // the current time for empty input which is probably not
-            // what is meant. The invalid empty string is probably to
-            // be interpreted as a missing field/value. Let's handle
-            // this graceful.
-            if (!empty($data)) {
-                return new \DateTime($data);
-            } else {
-                return null;
-            }
-        } elseif (in_array($class, ['DateTime', 'bool', 'boolean', 'byte', 'double', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) {
-            settype($data, $class);
-            return $data;
-        } elseif ($class === '\SplFileObject') {
-            /** @var \Psr\Http\Message\StreamInterface $data */
-
-            // determine file name
-            if (array_key_exists('Content-Disposition', $httpHeaders) &&
-                preg_match('/inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeaders['Content-Disposition'], $match)) {
-                $filename = Configuration::getDefaultConfiguration()->getTempFolderPath() . DIRECTORY_SEPARATOR . self::sanitizeFilename($match[1]);
-            } else {
-                $filename = tempnam(Configuration::getDefaultConfiguration()->getTempFolderPath(), '');
-            }
-
-            $file = fopen($filename, 'w');
-            while ($chunk = $data->read(200)) {
-                fwrite($file, $chunk);
-            }
-            fclose($file);
-
-            return new \SplFileObject($filename, 'r');
-        } elseif (method_exists($class, 'getAllowableEnumValues')) {
-            if (!in_array($data, $class::getAllowableEnumValues(), true)) {
-                $imploded = implode("', '", $class::getAllowableEnumValues());
-                throw new \InvalidArgumentException("Invalid value for enum '$class', must be one of: '$imploded'");
-            }
-            return $data;
-        } else {
-            $data = is_string($data) ? json_decode($data) : $data;
-            // If a discriminator is defined and points to a valid subclass, use it.
-            $discriminator = $class::DISCRIMINATOR;
-            if (!empty($discriminator) && isset($data->{$discriminator}) && is_string($data->{$discriminator})) {
-                $subclass = '\OpenAPI\Client\Model\\' . $data->{$discriminator};
-                if (is_subclass_of($subclass, $class)) {
-                    $class = $subclass;
-                }
-            }
-            $instance = new $class();
-            foreach ($instance::openAPITypes() as $property => $type) {
-                $propertySetter = $instance::setters()[$property];
-
-                if (!isset($propertySetter) || !isset($data->{$instance::attributeMap()[$property]})) {
-                    continue;
-                }
-
-                $propertyValue = $data->{$instance::attributeMap()[$property]};
-                if (isset($propertyValue)) {
-                    $instance->$propertySetter(self::deserialize($propertyValue, $type, null));
-                }
-            }
-            return $instance;
-        }
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/phpunit.xml.dist b/samples/openapi3/client/petstore/php/OpenAPIClient-php/phpunit.xml.dist
deleted file mode 100644
index 3dd90bbe32c9..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/phpunit.xml.dist
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="tests">
-            <directory>./test/Api</directory>
-            <directory>./test/Model</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./lib/Api</directory>
-            <directory suffix=".php">./lib/Model</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <ini name="error_reporting" value="E_ALL" />
-    </php>
-</phpunit>
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/pom.xml b/samples/openapi3/client/petstore/php/OpenAPIClient-php/pom.xml
deleted file mode 100644
index d5d32c3bd1bf..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>PhpPetstoreOAS3Tests</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>PHP OpenAPI OAS3 Client</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <id>bundle-install</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>composer</executable>
-                            <arguments>
-                                <argument>install</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>bundle-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>vendor/bin/phpunit</executable>
-                            <arguments>
-                                <argument>tests</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
deleted file mode 100644
index d6f116e518d1..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * AnotherFakeApiTest
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the endpoint.
- */
-
-namespace OpenAPI\Client;
-
-use \OpenAPI\Client\Configuration;
-use \OpenAPI\Client\ApiException;
-use \OpenAPI\Client\ObjectSerializer;
-use PHPUnit\Framework\TestCase;
-
-/**
- * AnotherFakeApiTest Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class AnotherFakeApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for call123TestSpecialTags
-     *
-     * To test special tags.
-     *
-     */
-    public function testCall123TestSpecialTags()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
deleted file mode 100644
index 1700a879c9ff..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * FakeApiTest
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the endpoint.
- */
-
-namespace OpenAPI\Client;
-
-use \OpenAPI\Client\Configuration;
-use \OpenAPI\Client\ApiException;
-use \OpenAPI\Client\ObjectSerializer;
-use PHPUnit\Framework\TestCase;
-
-/**
- * FakeApiTest Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class FakeApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for fakeHealthGet
-     *
-     * Health check endpoint.
-     *
-     */
-    public function testFakeHealthGet()
-    {
-    }
-
-    /**
-     * Test case for fakeHttpSignatureTest
-     *
-     * test http signature authentication.
-     *
-     */
-    public function testFakeHttpSignatureTest()
-    {
-    }
-
-    /**
-     * Test case for fakeOuterBooleanSerialize
-     *
-     * .
-     *
-     */
-    public function testFakeOuterBooleanSerialize()
-    {
-    }
-
-    /**
-     * Test case for fakeOuterCompositeSerialize
-     *
-     * .
-     *
-     */
-    public function testFakeOuterCompositeSerialize()
-    {
-    }
-
-    /**
-     * Test case for fakeOuterNumberSerialize
-     *
-     * .
-     *
-     */
-    public function testFakeOuterNumberSerialize()
-    {
-    }
-
-    /**
-     * Test case for fakeOuterStringSerialize
-     *
-     * .
-     *
-     */
-    public function testFakeOuterStringSerialize()
-    {
-    }
-
-    /**
-     * Test case for testBodyWithFileSchema
-     *
-     * .
-     *
-     */
-    public function testTestBodyWithFileSchema()
-    {
-    }
-
-    /**
-     * Test case for testBodyWithQueryParams
-     *
-     * .
-     *
-     */
-    public function testTestBodyWithQueryParams()
-    {
-    }
-
-    /**
-     * Test case for testClientModel
-     *
-     * To test \"client\" model.
-     *
-     */
-    public function testTestClientModel()
-    {
-    }
-
-    /**
-     * Test case for testEndpointParameters
-     *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트.
-     *
-     */
-    public function testTestEndpointParameters()
-    {
-    }
-
-    /**
-     * Test case for testEnumParameters
-     *
-     * To test enum parameters.
-     *
-     */
-    public function testTestEnumParameters()
-    {
-    }
-
-    /**
-     * Test case for testGroupParameters
-     *
-     * Fake endpoint to test group parameters (optional).
-     *
-     */
-    public function testTestGroupParameters()
-    {
-    }
-
-    /**
-     * Test case for testInlineAdditionalProperties
-     *
-     * test inline additionalProperties.
-     *
-     */
-    public function testTestInlineAdditionalProperties()
-    {
-    }
-
-    /**
-     * Test case for testJsonFormData
-     *
-     * test json serialization of form data.
-     *
-     */
-    public function testTestJsonFormData()
-    {
-    }
-
-    /**
-     * Test case for testQueryParameterCollectionFormat
-     *
-     * .
-     *
-     */
-    public function testTestQueryParameterCollectionFormat()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
deleted file mode 100644
index 8a077e3ab77e..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * FakeClassnameTags123ApiTest
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the endpoint.
- */
-
-namespace OpenAPI\Client;
-
-use \OpenAPI\Client\Configuration;
-use \OpenAPI\Client\ApiException;
-use \OpenAPI\Client\ObjectSerializer;
-use PHPUnit\Framework\TestCase;
-
-/**
- * FakeClassnameTags123ApiTest Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class FakeClassnameTags123ApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for testClassname
-     *
-     * To test class name in snake case.
-     *
-     */
-    public function testTestClassname()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
deleted file mode 100644
index b952ce93e59e..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * PetApiTest
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the endpoint.
- */
-
-namespace OpenAPI\Client;
-
-use \OpenAPI\Client\Configuration;
-use \OpenAPI\Client\ApiException;
-use \OpenAPI\Client\ObjectSerializer;
-use PHPUnit\Framework\TestCase;
-
-/**
- * PetApiTest Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class PetApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for addPet
-     *
-     * Add a new pet to the store.
-     *
-     */
-    public function testAddPet()
-    {
-    }
-
-    /**
-     * Test case for deletePet
-     *
-     * Deletes a pet.
-     *
-     */
-    public function testDeletePet()
-    {
-    }
-
-    /**
-     * Test case for findPetsByStatus
-     *
-     * Finds Pets by status.
-     *
-     */
-    public function testFindPetsByStatus()
-    {
-    }
-
-    /**
-     * Test case for findPetsByTags
-     *
-     * Finds Pets by tags.
-     *
-     */
-    public function testFindPetsByTags()
-    {
-    }
-
-    /**
-     * Test case for getPetById
-     *
-     * Find pet by ID.
-     *
-     */
-    public function testGetPetById()
-    {
-    }
-
-    /**
-     * Test case for updatePet
-     *
-     * Update an existing pet.
-     *
-     */
-    public function testUpdatePet()
-    {
-    }
-
-    /**
-     * Test case for updatePetWithForm
-     *
-     * Updates a pet in the store with form data.
-     *
-     */
-    public function testUpdatePetWithForm()
-    {
-    }
-
-    /**
-     * Test case for uploadFile
-     *
-     * uploads an image.
-     *
-     */
-    public function testUploadFile()
-    {
-    }
-
-    /**
-     * Test case for uploadFileWithRequiredFile
-     *
-     * uploads an image (required).
-     *
-     */
-    public function testUploadFileWithRequiredFile()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
deleted file mode 100644
index cf5bca60d7f6..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * StoreApiTest
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the endpoint.
- */
-
-namespace OpenAPI\Client;
-
-use \OpenAPI\Client\Configuration;
-use \OpenAPI\Client\ApiException;
-use \OpenAPI\Client\ObjectSerializer;
-use PHPUnit\Framework\TestCase;
-
-/**
- * StoreApiTest Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class StoreApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for deleteOrder
-     *
-     * Delete purchase order by ID.
-     *
-     */
-    public function testDeleteOrder()
-    {
-    }
-
-    /**
-     * Test case for getInventory
-     *
-     * Returns pet inventories by status.
-     *
-     */
-    public function testGetInventory()
-    {
-    }
-
-    /**
-     * Test case for getOrderById
-     *
-     * Find purchase order by ID.
-     *
-     */
-    public function testGetOrderById()
-    {
-    }
-
-    /**
-     * Test case for placeOrder
-     *
-     * Place an order for a pet.
-     *
-     */
-    public function testPlaceOrder()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
deleted file mode 100644
index 3802a30ca9e0..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * UserApiTest
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the endpoint.
- */
-
-namespace OpenAPI\Client;
-
-use \OpenAPI\Client\Configuration;
-use \OpenAPI\Client\ApiException;
-use \OpenAPI\Client\ObjectSerializer;
-use PHPUnit\Framework\TestCase;
-
-/**
- * UserApiTest Class Doc Comment
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-class UserApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for createUser
-     *
-     * Create user.
-     *
-     */
-    public function testCreateUser()
-    {
-    }
-
-    /**
-     * Test case for createUsersWithArrayInput
-     *
-     * Creates list of users with given input array.
-     *
-     */
-    public function testCreateUsersWithArrayInput()
-    {
-    }
-
-    /**
-     * Test case for createUsersWithListInput
-     *
-     * Creates list of users with given input array.
-     *
-     */
-    public function testCreateUsersWithListInput()
-    {
-    }
-
-    /**
-     * Test case for deleteUser
-     *
-     * Delete user.
-     *
-     */
-    public function testDeleteUser()
-    {
-    }
-
-    /**
-     * Test case for getUserByName
-     *
-     * Get user by user name.
-     *
-     */
-    public function testGetUserByName()
-    {
-    }
-
-    /**
-     * Test case for loginUser
-     *
-     * Logs user into the system.
-     *
-     */
-    public function testLoginUser()
-    {
-    }
-
-    /**
-     * Test case for logoutUser
-     *
-     * Logs out current logged in user session.
-     *
-     */
-    public function testLogoutUser()
-    {
-    }
-
-    /**
-     * Test case for updateUser
-     *
-     * Updated user.
-     *
-     */
-    public function testUpdateUser()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
deleted file mode 100644
index 6d96d8638335..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesClassTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * AdditionalPropertiesClassTest Class Doc Comment
- *
- * @category    Class
- * @description AdditionalPropertiesClass
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class AdditionalPropertiesClassTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesClass"
-     */
-    public function testAdditionalPropertiesClass()
-    {
-    }
-
-    /**
-     * Test attribute "map_property"
-     */
-    public function testPropertyMapProperty()
-    {
-    }
-
-    /**
-     * Test attribute "map_of_map_property"
-     */
-    public function testPropertyMapOfMapProperty()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
deleted file mode 100644
index 28fa6fbb6425..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * AnimalTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * AnimalTest Class Doc Comment
- *
- * @category    Class
- * @description Animal
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class AnimalTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Animal"
-     */
-    public function testAnimal()
-    {
-    }
-
-    /**
-     * Test attribute "class_name"
-     */
-    public function testPropertyClassName()
-    {
-    }
-
-    /**
-     * Test attribute "color"
-     */
-    public function testPropertyColor()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
deleted file mode 100644
index 66611c070701..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * ApiResponseTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * ApiResponseTest Class Doc Comment
- *
- * @category    Class
- * @description ApiResponse
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class ApiResponseTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ApiResponse"
-     */
-    public function testApiResponse()
-    {
-    }
-
-    /**
-     * Test attribute "code"
-     */
-    public function testPropertyCode()
-    {
-    }
-
-    /**
-     * Test attribute "type"
-     */
-    public function testPropertyType()
-    {
-    }
-
-    /**
-     * Test attribute "message"
-     */
-    public function testPropertyMessage()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
deleted file mode 100644
index 12a2fda635a3..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * ArrayOfArrayOfNumberOnlyTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * ArrayOfArrayOfNumberOnlyTest Class Doc Comment
- *
- * @category    Class
- * @description ArrayOfArrayOfNumberOnly
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class ArrayOfArrayOfNumberOnlyTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ArrayOfArrayOfNumberOnly"
-     */
-    public function testArrayOfArrayOfNumberOnly()
-    {
-    }
-
-    /**
-     * Test attribute "array_array_number"
-     */
-    public function testPropertyArrayArrayNumber()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
deleted file mode 100644
index 41f5db74ea07..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * ArrayOfNumberOnlyTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * ArrayOfNumberOnlyTest Class Doc Comment
- *
- * @category    Class
- * @description ArrayOfNumberOnly
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class ArrayOfNumberOnlyTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ArrayOfNumberOnly"
-     */
-    public function testArrayOfNumberOnly()
-    {
-    }
-
-    /**
-     * Test attribute "array_number"
-     */
-    public function testPropertyArrayNumber()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
deleted file mode 100644
index 6b1d05798038..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * ArrayTestTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * ArrayTestTest Class Doc Comment
- *
- * @category    Class
- * @description ArrayTest
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class ArrayTestTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ArrayTest"
-     */
-    public function testArrayTest()
-    {
-    }
-
-    /**
-     * Test attribute "array_of_string"
-     */
-    public function testPropertyArrayOfString()
-    {
-    }
-
-    /**
-     * Test attribute "array_array_of_integer"
-     */
-    public function testPropertyArrayArrayOfInteger()
-    {
-    }
-
-    /**
-     * Test attribute "array_array_of_model"
-     */
-    public function testPropertyArrayArrayOfModel()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
deleted file mode 100644
index 75af321abab9..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * CapitalizationTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * CapitalizationTest Class Doc Comment
- *
- * @category    Class
- * @description Capitalization
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class CapitalizationTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Capitalization"
-     */
-    public function testCapitalization()
-    {
-    }
-
-    /**
-     * Test attribute "small_camel"
-     */
-    public function testPropertySmallCamel()
-    {
-    }
-
-    /**
-     * Test attribute "capital_camel"
-     */
-    public function testPropertyCapitalCamel()
-    {
-    }
-
-    /**
-     * Test attribute "small_snake"
-     */
-    public function testPropertySmallSnake()
-    {
-    }
-
-    /**
-     * Test attribute "capital_snake"
-     */
-    public function testPropertyCapitalSnake()
-    {
-    }
-
-    /**
-     * Test attribute "sca_eth_flow_points"
-     */
-    public function testPropertyScaEthFlowPoints()
-    {
-    }
-
-    /**
-     * Test attribute "att_name"
-     */
-    public function testPropertyAttName()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
deleted file mode 100644
index 08dd782cda33..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * CatAllOfTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * CatAllOfTest Class Doc Comment
- *
- * @category    Class
- * @description CatAllOf
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class CatAllOfTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "CatAllOf"
-     */
-    public function testCatAllOf()
-    {
-    }
-
-    /**
-     * Test attribute "declawed"
-     */
-    public function testPropertyDeclawed()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
deleted file mode 100644
index 40859e2966ba..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * CatTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * CatTest Class Doc Comment
- *
- * @category    Class
- * @description Cat
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class CatTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Cat"
-     */
-    public function testCat()
-    {
-    }
-
-    /**
-     * Test attribute "declawed"
-     */
-    public function testPropertyDeclawed()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
deleted file mode 100644
index 0cced07b1e33..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * CategoryTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * CategoryTest Class Doc Comment
- *
- * @category    Class
- * @description Category
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class CategoryTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Category"
-     */
-    public function testCategory()
-    {
-    }
-
-    /**
-     * Test attribute "id"
-     */
-    public function testPropertyId()
-    {
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
deleted file mode 100644
index 5aeb1825b7d4..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * ClassModelTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * ClassModelTest Class Doc Comment
- *
- * @category    Class
- * @description Model for testing model with \&quot;_class\&quot; property
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class ClassModelTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ClassModel"
-     */
-    public function testClassModel()
-    {
-    }
-
-    /**
-     * Test attribute "_class"
-     */
-    public function testPropertyClass()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
deleted file mode 100644
index 83d083aaf7a8..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * ClientTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * ClientTest Class Doc Comment
- *
- * @category    Class
- * @description Client
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class ClientTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Client"
-     */
-    public function testClient()
-    {
-    }
-
-    /**
-     * Test attribute "client"
-     */
-    public function testPropertyClient()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
deleted file mode 100644
index 51b9dd81e5bf..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * DogAllOfTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * DogAllOfTest Class Doc Comment
- *
- * @category    Class
- * @description DogAllOf
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class DogAllOfTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "DogAllOf"
-     */
-    public function testDogAllOf()
-    {
-    }
-
-    /**
-     * Test attribute "breed"
-     */
-    public function testPropertyBreed()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
deleted file mode 100644
index c68af2f92957..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * DogTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * DogTest Class Doc Comment
- *
- * @category    Class
- * @description Dog
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class DogTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Dog"
-     */
-    public function testDog()
-    {
-    }
-
-    /**
-     * Test attribute "breed"
-     */
-    public function testPropertyBreed()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
deleted file mode 100644
index be9eb943f243..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * EnumArraysTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * EnumArraysTest Class Doc Comment
- *
- * @category    Class
- * @description EnumArrays
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class EnumArraysTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "EnumArrays"
-     */
-    public function testEnumArrays()
-    {
-    }
-
-    /**
-     * Test attribute "just_symbol"
-     */
-    public function testPropertyJustSymbol()
-    {
-    }
-
-    /**
-     * Test attribute "array_enum"
-     */
-    public function testPropertyArrayEnum()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
deleted file mode 100644
index 552cc870ca58..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * EnumClassTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * EnumClassTest Class Doc Comment
- *
- * @category    Class
- * @description EnumClass
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class EnumClassTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "EnumClass"
-     */
-    public function testEnumClass()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
deleted file mode 100644
index be5516b46a0b..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * EnumTestTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * EnumTestTest Class Doc Comment
- *
- * @category    Class
- * @description EnumTest
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class EnumTestTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "EnumTest"
-     */
-    public function testEnumTest()
-    {
-    }
-
-    /**
-     * Test attribute "enum_string"
-     */
-    public function testPropertyEnumString()
-    {
-    }
-
-    /**
-     * Test attribute "enum_string_required"
-     */
-    public function testPropertyEnumStringRequired()
-    {
-    }
-
-    /**
-     * Test attribute "enum_integer"
-     */
-    public function testPropertyEnumInteger()
-    {
-    }
-
-    /**
-     * Test attribute "enum_number"
-     */
-    public function testPropertyEnumNumber()
-    {
-    }
-
-    /**
-     * Test attribute "outer_enum"
-     */
-    public function testPropertyOuterEnum()
-    {
-    }
-
-    /**
-     * Test attribute "outer_enum_integer"
-     */
-    public function testPropertyOuterEnumInteger()
-    {
-    }
-
-    /**
-     * Test attribute "outer_enum_default_value"
-     */
-    public function testPropertyOuterEnumDefaultValue()
-    {
-    }
-
-    /**
-     * Test attribute "outer_enum_integer_default_value"
-     */
-    public function testPropertyOuterEnumIntegerDefaultValue()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
deleted file mode 100644
index 7af85f323dd7..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * FileSchemaTestClassTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * FileSchemaTestClassTest Class Doc Comment
- *
- * @category    Class
- * @description FileSchemaTestClass
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class FileSchemaTestClassTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "FileSchemaTestClass"
-     */
-    public function testFileSchemaTestClass()
-    {
-    }
-
-    /**
-     * Test attribute "file"
-     */
-    public function testPropertyFile()
-    {
-    }
-
-    /**
-     * Test attribute "files"
-     */
-    public function testPropertyFiles()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
deleted file mode 100644
index de0a78bd59d0..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * FileTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * FileTest Class Doc Comment
- *
- * @category    Class
- * @description Must be named &#x60;File&#x60; for test.
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class FileTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "File"
-     */
-    public function testFile()
-    {
-    }
-
-    /**
-     * Test attribute "source_uri"
-     */
-    public function testPropertySourceUri()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
deleted file mode 100644
index 155cf4d2d9a7..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/**
- * FormatTestTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * FormatTestTest Class Doc Comment
- *
- * @category    Class
- * @description FormatTest
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class FormatTestTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "FormatTest"
-     */
-    public function testFormatTest()
-    {
-    }
-
-    /**
-     * Test attribute "integer"
-     */
-    public function testPropertyInteger()
-    {
-    }
-
-    /**
-     * Test attribute "int32"
-     */
-    public function testPropertyInt32()
-    {
-    }
-
-    /**
-     * Test attribute "int64"
-     */
-    public function testPropertyInt64()
-    {
-    }
-
-    /**
-     * Test attribute "number"
-     */
-    public function testPropertyNumber()
-    {
-    }
-
-    /**
-     * Test attribute "float"
-     */
-    public function testPropertyFloat()
-    {
-    }
-
-    /**
-     * Test attribute "double"
-     */
-    public function testPropertyDouble()
-    {
-    }
-
-    /**
-     * Test attribute "string"
-     */
-    public function testPropertyString()
-    {
-    }
-
-    /**
-     * Test attribute "byte"
-     */
-    public function testPropertyByte()
-    {
-    }
-
-    /**
-     * Test attribute "binary"
-     */
-    public function testPropertyBinary()
-    {
-    }
-
-    /**
-     * Test attribute "date"
-     */
-    public function testPropertyDate()
-    {
-    }
-
-    /**
-     * Test attribute "date_time"
-     */
-    public function testPropertyDateTime()
-    {
-    }
-
-    /**
-     * Test attribute "uuid"
-     */
-    public function testPropertyUuid()
-    {
-    }
-
-    /**
-     * Test attribute "password"
-     */
-    public function testPropertyPassword()
-    {
-    }
-
-    /**
-     * Test attribute "pattern_with_digits"
-     */
-    public function testPropertyPatternWithDigits()
-    {
-    }
-
-    /**
-     * Test attribute "pattern_with_digits_and_delimiter"
-     */
-    public function testPropertyPatternWithDigitsAndDelimiter()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
deleted file mode 100644
index e7da7dd8b3ce..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * HasOnlyReadOnlyTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * HasOnlyReadOnlyTest Class Doc Comment
- *
- * @category    Class
- * @description HasOnlyReadOnly
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class HasOnlyReadOnlyTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "HasOnlyReadOnly"
-     */
-    public function testHasOnlyReadOnly()
-    {
-    }
-
-    /**
-     * Test attribute "bar"
-     */
-    public function testPropertyBar()
-    {
-    }
-
-    /**
-     * Test attribute "foo"
-     */
-    public function testPropertyFoo()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
deleted file mode 100644
index a21d55a2ff8e..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * MapTestTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * MapTestTest Class Doc Comment
- *
- * @category    Class
- * @description MapTest
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class MapTestTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "MapTest"
-     */
-    public function testMapTest()
-    {
-    }
-
-    /**
-     * Test attribute "map_map_of_string"
-     */
-    public function testPropertyMapMapOfString()
-    {
-    }
-
-    /**
-     * Test attribute "map_of_enum_string"
-     */
-    public function testPropertyMapOfEnumString()
-    {
-    }
-
-    /**
-     * Test attribute "direct_map"
-     */
-    public function testPropertyDirectMap()
-    {
-    }
-
-    /**
-     * Test attribute "indirect_map"
-     */
-    public function testPropertyIndirectMap()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
deleted file mode 100644
index a40bdca44399..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * MixedPropertiesAndAdditionalPropertiesClassTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * MixedPropertiesAndAdditionalPropertiesClassTest Class Doc Comment
- *
- * @category    Class
- * @description MixedPropertiesAndAdditionalPropertiesClass
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "MixedPropertiesAndAdditionalPropertiesClass"
-     */
-    public function testMixedPropertiesAndAdditionalPropertiesClass()
-    {
-    }
-
-    /**
-     * Test attribute "uuid"
-     */
-    public function testPropertyUuid()
-    {
-    }
-
-    /**
-     * Test attribute "date_time"
-     */
-    public function testPropertyDateTime()
-    {
-    }
-
-    /**
-     * Test attribute "map"
-     */
-    public function testPropertyMap()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
deleted file mode 100644
index b762403aa608..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Model200ResponseTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Model200ResponseTest Class Doc Comment
- *
- * @category    Class
- * @description Model for testing model name starting with number
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class Model200ResponseTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Model200Response"
-     */
-    public function testModel200Response()
-    {
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-
-    /**
-     * Test attribute "class"
-     */
-    public function testPropertyClass()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
deleted file mode 100644
index b20e645ff442..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * ModelListTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * ModelListTest Class Doc Comment
- *
- * @category    Class
- * @description ModelList
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class ModelListTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ModelList"
-     */
-    public function testModelList()
-    {
-    }
-
-    /**
-     * Test attribute "_123_list"
-     */
-    public function testProperty123List()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
deleted file mode 100644
index 5b3bb9aa7b3c..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * ModelReturnTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * ModelReturnTest Class Doc Comment
- *
- * @category    Class
- * @description Model for testing reserved words
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class ModelReturnTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ModelReturn"
-     */
-    public function testModelReturn()
-    {
-    }
-
-    /**
-     * Test attribute "return"
-     */
-    public function testPropertyReturn()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
deleted file mode 100644
index 48ff19bb10a3..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * NameTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * NameTest Class Doc Comment
- *
- * @category    Class
- * @description Model for testing model name same as property name
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class NameTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Name"
-     */
-    public function testName()
-    {
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-
-    /**
-     * Test attribute "snake_case"
-     */
-    public function testPropertySnakeCase()
-    {
-    }
-
-    /**
-     * Test attribute "property"
-     */
-    public function testPropertyProperty()
-    {
-    }
-
-    /**
-     * Test attribute "_123_number"
-     */
-    public function testProperty123Number()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
deleted file mode 100644
index 1300f264ba08..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * NumberOnlyTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * NumberOnlyTest Class Doc Comment
- *
- * @category    Class
- * @description NumberOnly
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class NumberOnlyTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "NumberOnly"
-     */
-    public function testNumberOnly()
-    {
-    }
-
-    /**
-     * Test attribute "just_number"
-     */
-    public function testPropertyJustNumber()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
deleted file mode 100644
index 1625f8977003..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * OrderTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * OrderTest Class Doc Comment
- *
- * @category    Class
- * @description Order
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class OrderTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Order"
-     */
-    public function testOrder()
-    {
-    }
-
-    /**
-     * Test attribute "id"
-     */
-    public function testPropertyId()
-    {
-    }
-
-    /**
-     * Test attribute "pet_id"
-     */
-    public function testPropertyPetId()
-    {
-    }
-
-    /**
-     * Test attribute "quantity"
-     */
-    public function testPropertyQuantity()
-    {
-    }
-
-    /**
-     * Test attribute "ship_date"
-     */
-    public function testPropertyShipDate()
-    {
-    }
-
-    /**
-     * Test attribute "status"
-     */
-    public function testPropertyStatus()
-    {
-    }
-
-    /**
-     * Test attribute "complete"
-     */
-    public function testPropertyComplete()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
deleted file mode 100644
index 4196e2be12ba..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * OuterCompositeTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * OuterCompositeTest Class Doc Comment
- *
- * @category    Class
- * @description OuterComposite
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class OuterCompositeTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "OuterComposite"
-     */
-    public function testOuterComposite()
-    {
-    }
-
-    /**
-     * Test attribute "my_number"
-     */
-    public function testPropertyMyNumber()
-    {
-    }
-
-    /**
-     * Test attribute "my_string"
-     */
-    public function testPropertyMyString()
-    {
-    }
-
-    /**
-     * Test attribute "my_boolean"
-     */
-    public function testPropertyMyBoolean()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
deleted file mode 100644
index cb5dd327a22d..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * OuterEnumTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * OuterEnumTest Class Doc Comment
- *
- * @category    Class
- * @description OuterEnum
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class OuterEnumTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "OuterEnum"
-     */
-    public function testOuterEnum()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
deleted file mode 100644
index 21d563f7561d..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * PetTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * PetTest Class Doc Comment
- *
- * @category    Class
- * @description Pet
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class PetTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Pet"
-     */
-    public function testPet()
-    {
-    }
-
-    /**
-     * Test attribute "id"
-     */
-    public function testPropertyId()
-    {
-    }
-
-    /**
-     * Test attribute "category"
-     */
-    public function testPropertyCategory()
-    {
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-
-    /**
-     * Test attribute "photo_urls"
-     */
-    public function testPropertyPhotoUrls()
-    {
-    }
-
-    /**
-     * Test attribute "tags"
-     */
-    public function testPropertyTags()
-    {
-    }
-
-    /**
-     * Test attribute "status"
-     */
-    public function testPropertyStatus()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
deleted file mode 100644
index 661099d6215b..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * ReadOnlyFirstTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * ReadOnlyFirstTest Class Doc Comment
- *
- * @category    Class
- * @description ReadOnlyFirst
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class ReadOnlyFirstTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ReadOnlyFirst"
-     */
-    public function testReadOnlyFirst()
-    {
-    }
-
-    /**
-     * Test attribute "bar"
-     */
-    public function testPropertyBar()
-    {
-    }
-
-    /**
-     * Test attribute "baz"
-     */
-    public function testPropertyBaz()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
deleted file mode 100644
index f3d6630afbfc..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * SpecialModelNameTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * SpecialModelNameTest Class Doc Comment
- *
- * @category    Class
- * @description SpecialModelName
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class SpecialModelNameTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "SpecialModelName"
-     */
-    public function testSpecialModelName()
-    {
-    }
-
-    /**
-     * Test attribute "special_property_name"
-     */
-    public function testPropertySpecialPropertyName()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
deleted file mode 100644
index 66c96f1bb9ab..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * TagTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * TagTest Class Doc Comment
- *
- * @category    Class
- * @description Tag
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class TagTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Tag"
-     */
-    public function testTag()
-    {
-    }
-
-    /**
-     * Test attribute "id"
-     */
-    public function testPropertyId()
-    {
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
deleted file mode 100644
index 332ecd0dd1ca..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * UserTest
- *
- * PHP version 7.1
- *
- * @category Class
- * @package  OpenAPI\Client
- * @author   OpenAPI Generator team
- * @link     https://openapi-generator.tech
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 5.0.0-SNAPSHOT
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Please update the test case below to test the model.
- */
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * UserTest Class Doc Comment
- *
- * @category    Class
- * @description User
- * @package     OpenAPI\Client
- * @author      OpenAPI Generator team
- * @link        https://openapi-generator.tech
- */
-class UserTest extends TestCase
-{
-
-    /**
-     * Setup before running any test case
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "User"
-     */
-    public function testUser()
-    {
-    }
-
-    /**
-     * Test attribute "id"
-     */
-    public function testPropertyId()
-    {
-    }
-
-    /**
-     * Test attribute "username"
-     */
-    public function testPropertyUsername()
-    {
-    }
-
-    /**
-     * Test attribute "first_name"
-     */
-    public function testPropertyFirstName()
-    {
-    }
-
-    /**
-     * Test attribute "last_name"
-     */
-    public function testPropertyLastName()
-    {
-    }
-
-    /**
-     * Test attribute "email"
-     */
-    public function testPropertyEmail()
-    {
-    }
-
-    /**
-     * Test attribute "password"
-     */
-    public function testPropertyPassword()
-    {
-    }
-
-    /**
-     * Test attribute "phone"
-     */
-    public function testPropertyPhone()
-    {
-    }
-
-    /**
-     * Test attribute "user_status"
-     */
-    public function testPropertyUserStatus()
-    {
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/AsyncTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/AsyncTest.php
deleted file mode 100644
index a1af7b1238b8..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/AsyncTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Api\PetApi;
-use OpenAPI\Client\Model\Pet;
-use PHPUnit\Framework\TestCase;
-
-class AsyncTest extends TestCase
-{
-    /** @var PetApi */
-    private $api;
-
-    /** @var  int */
-    private $petId;
-
-    public function setUp()
-    {
-        $this->api = new Api\PetApi();
-
-        $this->petId = 10005;
-        $pet = new Model\Pet;
-        $pet->setId($this->petId);
-        $pet->setName("PHP Unit Test");
-        $pet->setPhotoUrls(array("http://test_php_unit_test.com"));
-        // new tag
-        $tag= new Model\Tag;
-        $tag->setId($this->petId); // use the same id as pet
-        $tag->setName("test php tag");
-        // new category
-        $category = new Model\Category;
-        $category->setId($this->petId); // use the same id as pet
-        $category->setName("test php category");
-
-        $pet->setTags(array($tag));
-        $pet->setCategory($category);
-
-        $pet_api = new Api\PetApi();
-        // add a new pet (model)
-        $add_response = $pet_api->addPet($pet);
-    }
-
-    public function testAsyncRequest()
-    {
-        $promise = $this->api->getPetByIdAsync(10005);
-
-        $promise2 = $this->api->getPetByIdAsync(10005);
-
-        $pet = $promise->wait();
-        $pet2 = $promise2->wait();
-        $this->assertInstanceOf(Pet::class, $pet);
-        $this->assertInstanceOf(Pet::class, $pet2);
-    }
-
-    public function testAsyncRequestWithHttpInfo()
-    {
-        $promise = $this->api->getPetByIdAsyncWithHttpInfo($this->petId);
-
-        list($pet, $status, $headers) = $promise->wait();
-        $this->assertEquals(200, $status);
-        $this->assertInternalType('array', $headers);
-        $this->assertInstanceOf(Pet::class, $pet);
-    }
-
-    /**
-     * @expectedException \OpenAPI\Client\ApiException
-     */
-    public function testAsyncThrowingException()
-    {
-        $promise = $this->api->getPetByIdAsync(0);
-        $promise->wait();
-    }
-
-    /**
-     * @doesNotPerformAssertions
-     */
-    public function testAsyncApiExceptionWithoutWaitIsNotThrown()
-    {
-        $promise = $this->api->getPetByIdAsync(0);
-        sleep(1);
-    }
-
-    /**
-     * @expectedException \OpenAPI\Client\ApiException
-     */
-    public function testAsyncHttpInfoThrowingException()
-    {
-        $promise = $this->api->getPetByIdAsyncWithHttpInfo(0);
-        $promise->wait();
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/AuthTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/AuthTest.php
deleted file mode 100644
index daafb50ede7c..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/AuthTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Api\FakeApi;
-use OpenAPI\Client\Api\PetApi;
-use OpenAPI\Client\Model\Pet;
-use PHPUnit\Framework\TestCase;
-
-require_once __DIR__ . '/FakeHttpClient.php';
-
-class AuthTest extends TestCase
-{
-    public function testCustomApiKeyHeader()
-    {
-        $authConfig = new Configuration();
-        $authConfig->setApiKey('api_key', '123qwe');
-
-        $fakeHttpClient = new FakeHttpClient();
-        $api = new PetApi($fakeHttpClient, $authConfig);
-        $api->getPetById(123);
-
-        $headers = $fakeHttpClient->getLastRequest()->getHeaders();
-
-        $this->assertArrayHasKey('api_key', $headers);
-        $this->assertEquals(['123qwe'], $headers['api_key']);
-    }
-
-    public function testApiToken()
-    {
-        $authConfig = new Configuration();
-        $authConfig->setAccessToken('asd123');
-
-        $fakeHttpClient = new FakeHttpClient();
-        $api = new PetApi($fakeHttpClient, $authConfig);
-        $api->addPet(new Pet());
-
-        $headers = $fakeHttpClient->getLastRequest()->getHeaders();
-
-        $this->assertArrayHasKey('Authorization', $headers);
-        $this->assertEquals(['Bearer asd123'], $headers['Authorization']);
-    }
-
-    public function testBasicAuth()
-    {
-        $username = 'user';
-        $password = 'password';
-
-        $authConfig = new Configuration();
-        $authConfig->setUsername($username);
-        $authConfig->setPassword($password);
-
-        $fakeHttpClient = new FakeHttpClient();
-        $api = new FakeApi($fakeHttpClient, $authConfig);
-        $api->testEndpointParameters(123, 100.1, 'ASD_', 'ASD');
-
-        $headers = $fakeHttpClient->getLastRequest()->getHeaders();
-
-        $this->assertArrayHasKey('Authorization', $headers);
-        $encodedCredentials = base64_encode("$username:$password");
-        $this->assertEquals(["Basic $encodedCredentials"], $headers['Authorization']);
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/DateTimeSerializerTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/DateTimeSerializerTest.php
deleted file mode 100644
index ca0fc505d6d0..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/DateTimeSerializerTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Model\FormatTest;
-use PHPUnit\Framework\TestCase;
-
-class DateTimeSerializerTest extends TestCase
-{
-    public function testDateTimeSanitazion()
-    {
-        $dateTime = new \DateTime('April 30, 1973 17:05 CEST');
-
-        $input = new FormatTest([
-            'date_time' => $dateTime,
-        ]);
-
-        $data = ObjectSerializer::sanitizeForSerialization($input);
-
-        $this->assertEquals($data->dateTime, '1973-04-30T17:05:00+02:00');
-
-        ObjectSerializer::setDateTimeFormat(\DateTime::RFC3339_EXTENDED);
-        $dataFraction = ObjectSerializer::sanitizeForSerialization($input);
-        $this->assertEquals($dataFraction->dateTime, '1973-04-30T17:05:00.000+02:00');
-        ObjectSerializer::setDateTimeFormat(\DateTime::ATOM);
-    }
-
-    public function testDateSanitazion()
-    {
-        $dateTime = new \DateTime('April 30, 1973 17:05 CEST');
-
-        $input = new FormatTest([
-            'date' => $dateTime,
-        ]);
-
-        $data = ObjectSerializer::sanitizeForSerialization($input);
-
-        $this->assertEquals($data->date, '1973-04-30');
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/DebugTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/DebugTest.php
deleted file mode 100644
index 4cf198f66038..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/DebugTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-class DebugTest extends TestCase
-{
-
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-        $newPet = new Model\Pet;
-        $newPet->setId(1);
-        $newPet->setName("PHP Unit Test");
-        (new Api\PetApi())->addPetWithHttpInfo($newPet);
-    }
-
-    public function testEnableDebugOutput()
-    {
-        $this->expectOutputRegex('#GET /v2/pet/1 HTTP/1.1#');
-
-        $config = new Configuration();
-        $config->setDebug(true);
-        $api = new Api\PetApi(null, $config);
-        $api->getPetById(1);
-    }
-
-    public function testEnableDebugOutputAsync()
-    {
-        $this->expectOutputRegex('#GET /v2/pet/1 HTTP/1.1#');
-
-        $config = new Configuration();
-        $config->setDebug(true);
-        $api = new Api\PetApi(null, $config);
-        $promise = $api->getPetByIdAsync(1);
-        $promise->wait();
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/EnumClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/EnumClassTest.php
deleted file mode 100644
index fbc089c7f187..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/EnumClassTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Model\EnumClass;
-use PHPUnit\Framework\TestCase;
-
-class EnumClassTest extends TestCase
-{
-    public function testPossibleValues()
-    {
-        $this->assertSame(EnumClass::ABC, '_abc');
-        $this->assertSame(EnumClass::EFG, '-efg');
-        $this->assertSame(EnumClass::XYZ, '(xyz)');
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/EnumTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/EnumTestTest.php
deleted file mode 100644
index 1ce05cf4106e..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/EnumTestTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Model\EnumTest;
-use PHPUnit\Framework\TestCase;
-
-class EnumTestTest extends TestCase
-{
-    public function testPossibleValues()
-    {
-        $this->assertSame(EnumTest::ENUM_STRING_UPPER, "UPPER");
-        $this->assertSame(EnumTest::ENUM_STRING_LOWER, "lower");
-        $this->assertSame(EnumTest::ENUM_INTEGER_1, 1);
-        $this->assertSame(EnumTest::ENUM_INTEGER_MINUS_1, -1);
-        $this->assertSame(EnumTest::ENUM_NUMBER_1_DOT_1, 1.1);
-        $this->assertSame(EnumTest::ENUM_NUMBER_MINUS_1_DOT_2, -1.2);
-    }
-
-    public function testNonRequiredPropertyIsOptional()
-    {
-        $enum = new EnumTest([
-            'enum_string_required' => 'UPPER',
-        ]);
-        $this->assertSame([], $enum->listInvalidProperties());
-        $this->assertTrue($enum->valid());
-    }
-
-    public function testRequiredProperty()
-    {
-        $enum = new EnumTest();
-        $this->assertSame(["'enum_string_required' can't be null"], $enum->listInvalidProperties());
-        $this->assertFalse($enum->valid());
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ExceptionTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ExceptionTest.php
deleted file mode 100644
index ac69620fa2fc..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ExceptionTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use GuzzleHttp\Client;
-use PHPUnit\Framework\TestCase;
-
-class ExceptionTest extends TestCase
-{
-    /**
-     * @expectedException \OpenAPI\Client\ApiException
-     * @expectedExceptionCode 404
-     * @expectedExceptionMessage http://petstore.swagger.io/INVALID_URL/store/inventory
-     */
-    public function testNotFound()
-    {
-        $config = new Configuration();
-        $config->setHost('http://petstore.swagger.io/INVALID_URL');
-
-        $api = new Api\StoreApi(
-            new Client(),
-            $config
-        );
-        $api->getInventory();
-    }
-
-    /**
-     * @expectedException \OpenAPI\Client\ApiException
-     * @expectedExceptionMessage Could not resolve host
-     */
-    public function testWrongHost()
-    {
-        $config = new Configuration();
-        $config->setHost('http://wrong_host.zxc');
-
-        $api = new Api\StoreApi(
-            new Client(),
-            $config
-        );
-        $api->getInventory();
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/FakeHttpClient.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/FakeHttpClient.php
deleted file mode 100644
index d93b8f8b0b36..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/FakeHttpClient.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Psr7\Response;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
-class FakeHttpClient implements ClientInterface
-{
-    /** @var  RequestInterface|null */
-    private $request;
-    /** @var  ResponseInterface|null */
-    private $response;
-
-    /**
-     * @return null|RequestInterface
-     */
-    public function getLastRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * @param null|ResponseInterface $response
-     */
-    public function setResponse(ResponseInterface $response = null)
-    {
-        $this->response = $response;
-    }
-
-    /**
-     * Send an HTTP request.
-     *
-     * @param RequestInterface $request Request to send
-     * @param array $options Request options to apply to the given
-     *                                  request and to the transfer.
-     *
-     * @return ResponseInterface
-     * @throws GuzzleException
-     */
-    public function send(RequestInterface $request, array $options = [])
-    {
-        $this->request = $request;
-        return $this->response ?: new Response(200);
-    }
-
-    public function sendAsync(RequestInterface $request, array $options = [])
-    {
-        throw new \RuntimeException('not implemented');
-    }
-
-    public function request($method, $uri, array $options = [])
-    {
-        throw new \RuntimeException('not implemented');
-    }
-
-    public function requestAsync($method, $uri, array $options = [])
-    {
-        throw new \RuntimeException('not implemented');
-    }
-
-    public function getConfig($option = null)
-    {
-        throw new \RuntimeException('not implemented');
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/HeaderSelectorTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/HeaderSelectorTest.php
deleted file mode 100644
index 6dd19a675f6a..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/HeaderSelectorTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-class HeaderSelectorTest extends TestCase
-{
-    public function testSelectingHeaders()
-    {
-        $selector = new HeaderSelector();
-        $headers = $selector->selectHeaders([
-            'application/xml',
-            'application/json'
-        ], []);
-        $this->assertSame('application/json', $headers['Accept']);
-
-        $headers = $selector->selectHeaders([], []);
-        $this->assertArrayNotHasKey('Accept', $headers);
-
-        $header = $selector->selectHeaders([
-            'application/yaml',
-            'application/xml'
-        ], []);
-        $this->assertSame('application/yaml,application/xml', $header['Accept']);
-
-        // test selectHeaderContentType
-        $headers = $selector->selectHeaders([], [
-            'application/xml',
-            'application/json'
-        ]);
-        $this->assertSame('application/json', $headers['Content-Type']);
-
-        $headers = $selector->selectHeaders([], []);
-        $this->assertSame('application/json', $headers['Content-Type']);
-        $headers = $selector->selectHeaders([], [
-            'application/yaml',
-            'application/xml'
-        ]);
-        $this->assertSame('application/yaml,application/xml', $headers['Content-Type']);
-    }
-
-    public function testSelectingHeadersForMultipartBody()
-    {
-        // test selectHeaderAccept
-        $selector = new HeaderSelector();
-        $headers = $selector->selectHeadersForMultipart([
-            'application/xml',
-            'application/json'
-        ]);
-        $this->assertSame('application/json', $headers['Accept']);
-        $this->assertArrayNotHasKey('Content-Type', $headers);
-
-        $headers = $selector->selectHeadersForMultipart([]);
-        $this->assertArrayNotHasKey('Accept', $headers);
-        $this->assertArrayNotHasKey('Content-Type', $headers);
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/HeadersTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/HeadersTest.php
deleted file mode 100644
index 4054876ee0e1..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/HeadersTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-require_once __DIR__ . '/FakeHttpClient.php';
-
-class HeadersTest extends TestCase
-{
-    /** @var  FakeHttpClient */
-    private $fakeHttpClient;
-
-    public function setUp()
-    {
-        $this->fakeHttpClient = new FakeHttpClient();
-    }
-
-    public function testUserAgent()
-    {
-        $config = new Configuration();
-        $config->setUserAgent('value');
-        $api = new Api\PetApi($this->fakeHttpClient, $config);
-
-        $api->getPetById(3);
-
-        $request = $this->fakeHttpClient->getLastRequest();
-        $headers = $request->getHeaders();
-
-        $this->assertArrayHasKey('User-Agent', $headers);
-        $this->assertEquals(['value'], $headers['User-Agent']);
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ModelInheritanceTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ModelInheritanceTest.php
deleted file mode 100644
index 333b88bbedaa..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ModelInheritanceTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Model\Animal;
-use OpenAPI\Client\Model\Cat;
-use OpenAPI\Client\Model\Dog;
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test that Dog properly inherit Animal
- *
- * @package OpenAPI\Client
- */
-class ModelInheritanceTest extends TestCase
-{
-    /**
-     * test if default values works
-     */
-    public function testDefaultValues()
-    {
-        // add some animals to the farm to make sure the ArrayAccess
-        // interface works
-        $dog = new Dog();
-        $animal = new Animal();
-
-        // assert we can look up the animals in the farm by array
-        // indices (let's try a random order)
-        $this->assertSame('red', $dog->getColor());
-        $this->assertSame('red', $animal->getColor());
-    }
-
-    /**
-     * test inheritance in the model
-     */
-    public function testInheritance()
-    {
-        $newDog = new Dog;
-        // the object should be an instance of the derived class
-        $this->assertInstanceOf(Dog::class, $newDog);
-        // the object should also be an instance of the parent class
-        $this->assertInstanceOf(Animal::class, $newDog);
-    }
-
-    /**
-     * test inheritance constructor is working with data initialization
-     */
-    public function testInheritanceConstructorDataInitialization()
-    {
-        // initialize the object with data in the constructor
-        $data = [
-            'class_name' => 'Dog',
-            'breed' => 'Great Dane',
-        ];
-        $newDog = new Dog($data);
-
-        // the property on the derived class should be set
-        $this->assertSame('Great Dane', $newDog->getBreed());
-        // the property on the parent class should be set
-        $this->assertSame('Dog', $newDog->getClassName());
-    }
-
-    /**
-     * test if discriminator is initialized automatically
-     */
-    public function testDiscriminatorInitialization()
-    {
-        $newDog = new Dog();
-        $this->assertSame('Dog', $newDog->getClassName());
-    }
-
-    /**
-     * test if ArrayAccess interface works
-     */
-    public function testArrayStuff()
-    {
-        // create an array of Animal
-        $farm = array();
-
-        // add some animals to the farm to make sure the ArrayAccess interface works
-        $farm[] = new Dog();
-        $farm[] = new Cat();
-        $farm[] = new Animal();
-
-        // assert we can look up the animals in the farm by array indices (let's try a random order)
-        $this->assertInstanceOf(Cat::class, $farm[1]);
-        $this->assertInstanceOf(Dog::class, $farm[0]);
-        $this->assertInstanceOf(Animal::class, $farm[2]);
-
-        // let's try to `foreach` the animals in the farm and let's try to use the objects we loop through
-        foreach ($farm as $animal) {
-            $this->assertContains($animal->getClassName(), ['Dog', 'Cat', 'Animal']);
-            $this->assertInstanceOf('OpenAPI\Client\Model\Animal', $animal);
-        }
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ObjectSerializerTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ObjectSerializerTest.php
deleted file mode 100644
index 818568873aa1..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ObjectSerializerTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-// test object serializer
-class ObjectSerializerTest extends TestCase
-{
-    // test sanitizeFilename
-    public function testSanitizeFilename()
-    {
-        // initialize the API client
-        $s = new ObjectSerializer();
-
-        $this->assertSame("sun.gif", $s->sanitizeFilename("sun.gif"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename("../sun.gif"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename("/var/tmp/sun.gif"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename("./sun.gif"));
-        
-        $this->assertSame("sun", $s->sanitizeFilename("sun"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename("..\sun.gif"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename("\var\tmp\sun.gif"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename("c:\var\tmp\sun.gif"));
-        $this->assertSame("sun.gif", $s->sanitizeFilename(".\sun.gif"));
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/OrderApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/OrderApiTest.php
deleted file mode 100644
index 60c1fc6f47ed..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/OrderApiTest.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use PHPUnit\Framework\TestCase;
-
-class OrderApiTest extends TestCase
-{
-
-    // add a new pet (id 10005) to ensure the pet object is available for all the tests
-    public static function setUpBeforeClass()
-    {
-        // for error reporting (need to run with php5.3 to get no warning)
-        //ini_set('display_errors', 1);
-        //error_reporting(~0);
-    }
-  
-    // test get inventory
-    public function testOrderEnum()
-    {
-        $this->assertSame(Model\Order::STATUS_PLACED, "placed");
-        $this->assertSame(Model\Order::STATUS_APPROVED, "approved");
-    }
-
-    // test get inventory
-    public function testOrder()
-    {
-        // initialize the API client
-        $order = new Model\Order();
-  
-        $order->setStatus("placed");
-        $this->assertSame("placed", $order->getStatus());
-    }
- 
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testOrderException()
-    {
-        // initialize the API client
-        $order = new Model\Order();
-        $order->setStatus("invalid_value");
-    }
-
-    // test deseralization of order
-    public function testDeserializationOfOrder()
-    {
-        $order_json = <<<ORDER
-{
-  "id": 10,
-  "petId": 20,
-  "quantity": 30,
-  "shipDate": "2015-08-22T07:13:36.613Z",
-  "status": "placed",
-  "complete": false
-}
-ORDER;
-        $order = ObjectSerializer::deserialize(
-            json_decode($order_json),
-            'OpenAPI\Client\Model\Order'
-        );
-        
-        $this->assertInstanceOf('OpenAPI\Client\Model\Order', $order);
-        $this->assertSame(10, $order->getId());
-        $this->assertSame(20, $order->getPetId());
-        $this->assertSame(30, $order->getQuantity());
-        $this->assertTrue(new \DateTime("2015-08-22T07:13:36.613Z") == $order->getShipDate());
-        $this->assertSame("placed", $order->getStatus());
-        $this->assertSame(false, $order->getComplete());
-    }
-  
-    // test deseralization of array of array of order
-    public function testDeserializationOfArrayOfArrayOfOrder()
-    {
-        $order_json = <<<ORDER
-[[{
-  "id": 10,
-  "petId": 20,
-  "quantity": 30,
-  "shipDate": "2015-08-22T07:13:36.613Z",
-  "status": "placed",
-  "complete": false
-}]]
-ORDER;
-        $order = ObjectSerializer::deserialize(
-            json_decode($order_json),
-            'OpenAPI\Client\Model\Order[][]'
-        );
-
-        $this->assertArrayHasKey(0, $order);
-        $this->assertArrayHasKey(0, $order[0]);
-        $_order = $order[0][0];
-        $this->assertInstanceOf('OpenAPI\Client\Model\Order', $_order);
-        $this->assertSame(10, $_order->getId());
-        $this->assertSame(20, $_order->getPetId());
-        $this->assertSame(30, $_order->getQuantity());
-        $this->assertTrue(new \DateTime("2015-08-22T07:13:36.613Z") == $_order->getShipDate());
-        $this->assertSame("placed", $_order->getStatus());
-        $this->assertSame(false, $_order->getComplete());
-    }
-
-    // test deseralization of map of map of order
-    public function testDeserializationOfMapOfMapOfOrder()
-    {
-        $order_json = <<<ORDER
-{
-  "test": {
-    "test2": {
-      "id": 10,
-      "petId": 20,
-      "quantity": 30,
-      "shipDate": "2015-08-22T07:13:36.613Z",
-      "status": "placed",
-      "complete": false
-    }
-  }
-}
-ORDER;
-        $order = ObjectSerializer::deserialize(
-            json_decode($order_json),
-            'map[string,map[string,\OpenAPI\Client\Model\Order]]'
-        );
-
-        $this->assertArrayHasKey('test', $order);
-        $this->assertArrayHasKey('test2', $order['test']);
-        $_order = $order['test']['test2'];
-        $this->assertInstanceOf('OpenAPI\Client\Model\Order', $_order);
-        $this->assertSame(10, $_order->getId());
-        $this->assertSame(20, $_order->getPetId());
-        $this->assertSame(30, $_order->getQuantity());
-        $this->assertTrue(new \DateTime("2015-08-22T07:13:36.613Z") == $_order->getShipDate());
-        $this->assertSame("placed", $_order->getStatus());
-        $this->assertSame(false, $_order->getComplete());
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/OuterEnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/OuterEnumTest.php
deleted file mode 100644
index 71a28e466ce9..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/OuterEnumTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Model\EnumTest;
-use OpenAPI\Client\Model\OuterEnum;
-use PHPUnit\Framework\TestCase;
-
-class OuterEnumTest extends TestCase
-{
-    public function testDeserialize()
-    {
-        $result = ObjectSerializer::deserialize(
-            "placed",
-            OuterEnum::class
-        );
-
-        $this->assertInternalType('string', $result);
-        $this->assertEquals('placed', $result);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Invalid value for enum
-     */
-    public function testDeserializeInvalidValue()
-    {
-        ObjectSerializer::deserialize(
-            "lkjfalgkdfjg",
-            OuterEnum::class
-        );
-    }
-
-    public function testDeserializeNested()
-    {
-        $json = '{
-            "enum_string": "UPPER",
-            "enum_integer": -1,
-            "enum_number": -1.2, 
-            "outerEnum": "approved"
-        }';
-
-        /** * @var EnumTest $result */
-        $result = ObjectSerializer::deserialize(
-            json_decode($json),
-            EnumTest::class
-        );
-
-        $this->assertInstanceOf(EnumTest::class, $result);
-        $this->assertEquals('approved', $result->getOuterEnum());
-    }
-
-    public function testSanitize()
-    {
-        $json = "placed";
-
-        $result = ObjectSerializer::sanitizeForSerialization(
-            $json
-        );
-
-        $this->assertInternalType('string', $result);
-    }
-
-    public function testSanitizeNested()
-    {
-        $input = new EnumTest([
-            'enum_string' => 'UPPER',
-            'enum_integer' => -1,
-            'enum_number' => -1.2,
-            'outer_enum' => 'approved'
-        ]);
-
-        $result = ObjectSerializer::sanitizeForSerialization(
-            $input
-        );
-
-        $this->assertInternalType('object', $result);
-        $this->assertInstanceOf(\stdClass::class, $result);
-
-        $this->assertInternalType('string', $result->outerEnum);
-        $this->assertEquals('approved', $result->outerEnum);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Invalid value for enum
-     */
-    public function testSanitizeNestedInvalidValue()
-    {
-        $input = new EnumTest([
-            'enum_string' => 'UPPER',
-            'enum_integer' => -1,
-            'enum_number' => -1.2,
-            'outer_enum' => 'invalid_value'
-        ]);
-
-        ObjectSerializer::sanitizeForSerialization($input);
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ParametersTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ParametersTest.php
deleted file mode 100644
index c70a5c60e471..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ParametersTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Api\FakeApi;
-use OpenAPI\Client\Api\UserApi;
-use PHPUnit\Framework\TestCase;
-
-require_once __DIR__ . '/FakeHttpClient.php';
-
-class ParametersTest extends TestCase
-{
-    /** @var  FakeHttpClient */
-    private $fakeHttpClient;
-    /** @var  FakeApi */
-    private $fakeApi;
-    /** @var  UserApi */
-    private $userApi;
-
-    public function setUp()
-    {
-        $this->fakeHttpClient = new FakeHttpClient();
-        $this->fakeApi = new Api\FakeApi($this->fakeHttpClient);
-        $this->userApi = new Api\UserApi($this->fakeHttpClient);
-    }
-
-    public function testHeaderParam()
-    {
-        $this->fakeApi->testEnumParameters([], 'something');
-
-        $request = $this->fakeHttpClient->getLastRequest();
-        $headers = $request->getHeaders();
-
-        $this->assertArrayHasKey('enum_header_string', $headers);
-        $this->assertEquals(['something'], $headers['enum_header_string']);
-    }
-
-    public function testHeaderParamCollection()
-    {
-        $this->fakeApi->testEnumParameters(['string1', 'string2']);
-
-        $request = $this->fakeHttpClient->getLastRequest();
-        $headers = $request->getHeaders();
-
-        $this->assertArrayHasKey('enum_header_string_array', $headers);
-        $this->assertEquals(['string1,string2'], $headers['enum_header_string_array']);
-    }
-
-    public function testInlineAdditionalProperties()
-    {
-        $param = new \stdClass();
-        $param->foo = 'bar';
-        $this->fakeApi->testInlineAdditionalProperties($param);
-
-        $request = $this->fakeHttpClient->getLastRequest();
-        $this->assertSame('{"foo":"bar"}', $request->getBody()->getContents());
-    }
-
-//    missing example for collection path param in config
-//    public function testPathParamCollection()
-//    {
-//        $this->userApi->getUserByNameWithHttpInfo(['aa', 'bb']);
-//        $request = $this->fakeHttpClient->getLastRequest();
-//        $this->assertEquals('user/aa,bb', urldecode($request->getUri()->getPath()));
-//    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/PetApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/PetApiTest.php
deleted file mode 100644
index 45b3072db4e0..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/PetApiTest.php
+++ /dev/null
@@ -1,391 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Api\PetApi;
-use OpenAPI\Client\Model\ApiResponse;
-use OpenAPI\Client\Model\Pet;
-use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\Assert;
-
-class PetApiTest extends TestCase
-{
-
-    /** @var  PetApi */
-    private $api;
-
-    // add a new pet (id 10005) to ensure the pet object is available for all the tests
-    public static function setUpBeforeClass()
-    {
-        // increase memory limit to avoid fatal error due to findPetByStatus
-        // returning a lot of data
-        ini_set('memory_limit', '256M');
-
-        // enable debugging
-        //Configuration::$debug = true;
-
-        // new pet
-        $newPetId = 10005;
-        $newPet = new Model\Pet;
-        $newPet->setId($newPetId);
-        $newPet->setName("PHP Unit Test");
-        $newPet->setPhotoUrls(["http://test_php_unit_test.com"]);
-        // new tag
-        $tag = new Model\Tag;
-        $tag->setId($newPetId); // use the same id as pet
-        $tag->setName("test php tag");
-        // new category
-        $category = new Model\Category;
-        $category->setId($newPetId); // use the same id as pet
-        $category->setName("test php category");
-
-        $newPet->setTags(array($tag));
-        $newPet->setCategory($category);
-
-        $config = new Configuration();
-        $petApi = new Api\PetApi(null, $config);
-
-        // add a new pet (model)
-        list(, $status) = $petApi->addPetWithHttpInfo($newPet);
-        Assert::assertEquals(200, $status);
-    }
-
-    public function setUp()
-    {
-        $this->api = new Api\PetApi();
-    }
-
-    public function testGetPetById()
-    {
-        $petId = 10005;
-
-        $pet = $this->api->getPetById($petId);
-        $this->assertSame($pet->getId(), $petId);
-        $this->assertSame($pet->getName(), 'PHP Unit Test');
-        $this->assertSame($pet->getPhotoUrls()[0], 'http://test_php_unit_test.com');
-        $this->assertSame($pet->getCategory()->getId(), $petId);
-        $this->assertSame($pet->getCategory()->getName(), 'test php category');
-        $this->assertSame($pet->getTags()[0]->getId(), $petId);
-        $this->assertSame($pet->getTags()[0]->getName(), 'test php tag');
-    }
-
-    /**
-     * comment out as we've removed invalid endpoints from the spec, we'll introduce something
-     * similar in the future when we've time to update the petstore server
-     *
-     * // test getPetById with a Pet object (id 10005)
-     * public function testGetPetByIdInObject()
-     * {
-     * // initialize the API client without host
-     * $pet_id = 10005;  // ID of pet that needs to be fetched
-     * $pet_api = new Api\PetApi();
-     * $pet_api->getApiClient()->getConfig()->setApiKey('api_key', '111222333444555');
-     * // return Pet (inline model)
-     * $response = $pet_api->getPetByIdInObject($pet_id);
-     * $this->assertInstanceOf('OpenAPI\Client\Model\InlineResponse200', $response);
-     * $this->assertSame($response->getId(), $pet_id);
-     * $this->assertSame($response->getName(), 'PHP Unit Test');
-     * $this->assertSame($response->getPhotoUrls()[0], 'http://test_php_unit_test.com');
-     *
-     * // category is type "object"
-     * $this->assertInternalType('array', $response->getCategory());
-     * $this->assertSame($response->getCategory()['id'], $pet_id);
-     * $this->assertSame($response->getCategory()['name'], 'test php category');
-     *
-     * $this->assertSame($response->getTags()[0]->getId(), $pet_id);
-     * $this->assertSame($response->getTags()[0]->getName(), 'test php tag');
-     * }
-     */
-
-    // test getPetByIdWithHttpInfo with a Pet object (id 10005)
-    public function testGetPetByIdWithHttpInfo()
-    {
-        // initialize the API client without host
-        $petId = 10005;  // ID of pet that needs to be fetched
-
-        /** @var $pet Pet */
-        list($pet, $status_code, $response_headers) = $this->api->getPetByIdWithHttpInfo($petId);
-        $this->assertSame($pet->getId(), $petId);
-        $this->assertSame($pet->getName(), 'PHP Unit Test');
-        $this->assertSame($pet->getCategory()->getId(), $petId);
-        $this->assertSame($pet->getCategory()->getName(), 'test php category');
-        $this->assertSame($pet->getTags()[0]->getId(), $petId);
-        $this->assertSame($pet->getTags()[0]->getName(), 'test php tag');
-        $this->assertSame($status_code, 200);
-        $this->assertSame($response_headers['Content-Type'], ['application/json']);
-    }
-
-    public function testFindPetByStatus()
-    {
-        $response = $this->api->findPetsByStatus('available');
-        $this->assertGreaterThan(0, count($response)); // at least one object returned
-
-        $this->assertSame(get_class($response[0]), Pet::class); // verify the object is Pet
-        foreach ($response as $pet) {
-            $this->assertSame($pet['status'], 'available');
-        }
-
-        $response = $this->api->findPetsByStatus('unknown_and_incorrect_status');
-        $this->assertCount(0, $response);
-    }
-
-    public function testUpdatePet()
-    {
-        $petId = 10001;
-        $updatedPet = new Model\Pet;
-        $updatedPet->setId($petId);
-        $updatedPet->setName('updatePet');
-        $updatedPet->setStatus('pending');
-        $result = $this->api->updatePet($updatedPet);
-        $this->assertNull($result);
-
-        // verify updated Pet
-        $result = $this->api->getPetById($petId);
-        $this->assertSame($result->getId(), $petId);
-        $this->assertSame($result->getStatus(), 'pending');
-        $this->assertSame($result->getName(), 'updatePet');
-    }
-
-    // test updatePetWithFormWithHttpInfo and verify by the "name" of the response
-    public function testUpdatePetWithFormWithHttpInfo()
-    {
-        $petId = 10001;  // ID of pet that needs to be fetched
-
-        // update Pet (form)
-        list($update_response, $status_code, $http_headers) = $this->api->updatePetWithFormWithHttpInfo(
-            $petId,
-            'update pet with form with http info'
-        );
-        // return nothing (void)
-        $this->assertNull($update_response);
-        $this->assertSame($status_code, 200);
-        $this->assertSame($http_headers['Content-Type'], ['application/json']);
-        $response = $this->api->getPetById($petId);
-        $this->assertSame($response->getId(), $petId);
-        $this->assertSame($response->getName(), 'update pet with form with http info');
-    }
-
-    // test updatePetWithForm and verify by the "name" and "status" of the response
-    public function testUpdatePetWithForm()
-    {
-        $pet_id = 10001;  // ID of pet that needs to be fetched
-        $result = $this->api->updatePetWithForm($pet_id, 'update pet with form', 'sold');
-        // return nothing (void)
-        $this->assertNull($result);
-
-        $response = $this->api->getPetById($pet_id);
-        $this->assertSame($response->getId(), $pet_id);
-        $this->assertSame($response->getName(), 'update pet with form');
-        $this->assertSame($response->getStatus(), 'sold');
-    }
-
-    // test addPet and verify by the "id" and "name" of the response
-    public function testAddPet()
-    {
-        $new_pet_id = 10005;
-        $newPet = new Model\Pet;
-        $newPet->setId($new_pet_id);
-        $newPet->setName("PHP Unit Test 2");
-
-        // add a new pet (model)
-        $add_response = $this->api->addPet($newPet);
-        // return nothing (void)
-        $this->assertNull($add_response);
-
-        // verify added Pet
-        $response = $this->api->getPetById($new_pet_id);
-        $this->assertSame($response->getId(), $new_pet_id);
-        $this->assertSame($response->getName(), 'PHP Unit Test 2');
-    }
-
-    /*
-     * comment out as we've removed invalid endpoints from the spec, we'll introduce something
-     * similar in the future when we've time to update the petstore server
-     *
-    // test addPetUsingByteArray and verify by the "id" and "name" of the response
-    public function testAddPetUsingByteArray()
-    {
-        // initialize the API client
-        $config = (new Configuration())->setHost('http://petstore.swagger.io/v2');
-        $api_client = new ApiClient($config);
-
-        $new_pet_id = 10005;
-        $new_pet = new Model\Pet;
-        $new_pet->setId($new_pet_id);
-        $new_pet->setName("PHP Unit Test 3");
-        // new tag
-        $tag= new Model\Tag;
-        $tag->setId($new_pet_id); // use the same id as pet
-        $tag->setName("test php tag");
-        // new category
-        $category = new Model\Category;
-        $category->setId($new_pet_id); // use the same id as pet
-        $category->setName("test php category");
-  
-        $new_pet->setTags(array($tag));
-        $new_pet->setCategory($category);
-
-        $pet_api = new Api\PetApi($api_client);
-        // add a new pet (model)
-        $object_serializer = new ObjectSerializer();
-        $pet_json_string = json_encode($object_serializer->sanitizeForSerialization($new_pet));
-        $add_response = $pet_api->addPetUsingByteArray($pet_json_string);
-        // return nothing (void)
-        $this->assertSame($add_response, NULL);
-        // verify added Pet
-        $response = $pet_api->getPetById($new_pet_id);
-        $this->assertSame($response->getId(), $new_pet_id);
-        $this->assertSame($response->getName(), 'PHP Unit Test 3');
-    }
-     */
-
-    // test upload file
-    public function testUploadFile()
-    {
-        // upload file
-        $pet_id = 10001;
-        $response = $this->api->uploadFile($pet_id, 'test meta', __DIR__ . '/../composer.json');
-        // return ApiResponse
-        $this->assertInstanceOf(ApiResponse::class, $response);
-    }
-
-    /*
-     * comment out as we've removed invalid endpoints from the spec, we'll introduce something
-     * similar in the future when we've time to update the petstore server
-     *
-    // test byte array response
-    public function testGetPetByIdWithByteArray()
-    {
-        // initialize the API client
-        $config = new Configuration();
-        $config->setHost('http://petstore.swagger.io/v2');
-        $api_client = new APIClient($config);
-        $pet_api = new Api\PetApi($api_client);
-        // test getPetByIdWithByteArray 
-        $pet_id = 10005;
-        $bytes = $pet_api->petPetIdtestingByteArraytrueGet($pet_id);
-        $json = json_decode($bytes, true);
-
-        $this->assertInternalType("string", $bytes);
-
-        $this->assertSame($json['id'], $pet_id);
-        // not testing name as it's tested by addPetUsingByteArray
-        //$this->assertSame($json['name'], 'PHP Unit Test');
-        $this->assertSame($json['category']['id'], $pet_id);
-        $this->assertSame($json['category']['name'], 'test php category');
-        $this->assertSame($json['tags'][0]['id'], $pet_id);
-        $this->assertSame($json['tags'][0]['name'], 'test php tag');
-    }
-     */
-
-    // test empty object serialization
-    public function testEmptyPetSerialization()
-    {
-        $new_pet = new Model\Pet;
-        // the empty object should be serialised to {}
-        $this->assertSame("{}", "$new_pet");
-    }
-
-    // test inheritance in the model
-    public function testInheritance()
-    {
-        $new_dog = new Model\Dog;
-        // the object should be an instance of the derived class
-        $this->assertInstanceOf('OpenAPI\Client\Model\Dog', $new_dog);
-        // the object should also be an instance of the parent class
-        $this->assertInstanceOf('OpenAPI\Client\Model\Animal', $new_dog);
-    }
-
-    // test inheritance constructor is working with data
-    // initialization
-    public function testInheritanceConstructorDataInitialization()
-    {
-        // initialize the object with data in the constructor
-        $data = array(
-            'class_name' => 'Dog',
-            'breed' => 'Great Dane'
-        );
-        $new_dog = new Model\Dog($data);
-
-        // the property on the derived class should be set
-        $this->assertSame('Great Dane', $new_dog->getBreed());
-        // the property on the parent class should be set
-        $this->assertSame('Dog', $new_dog->getClassName());
-    }
-
-    // test if discriminator is initialized automatically
-    public function testDiscriminatorInitialization()
-    {
-        $new_dog = new Model\Dog();
-        $this->assertSame('Dog', $new_dog->getClassName());
-    }
-
-    // test if ArrayAccess interface works
-    public function testArrayStuff()
-    {
-        // create an array of Animal
-        $farm = array();
-
-        // add some animals to the farm to make sure the ArrayAccess
-        // interface works
-        $farm[] = new Model\Dog();
-        $farm[] = new Model\Cat();
-        $farm[] = new Model\Animal();
-
-        // assert we can look up the animals in the farm by array
-        // indices (let's try a random order)
-        $this->assertInstanceOf('OpenAPI\Client\Model\Cat', $farm[1]);
-        $this->assertInstanceOf('OpenAPI\Client\Model\Dog', $farm[0]);
-        $this->assertInstanceOf('OpenAPI\Client\Model\Animal', $farm[2]);
-
-        // let's try to `foreach` the animals in the farm and let's
-        // try to use the objects we loop through
-        foreach ($farm as $animal) {
-            $this->assertContains($animal->getClassName(), array('Dog', 'Cat', 'Animal'));
-            $this->assertInstanceOf('OpenAPI\Client\Model\Animal', $animal);
-        }
-    }
-
-    // test if default values works
-    public function testDefaultValues()
-    {
-        // add some animals to the farm to make sure the ArrayAccess
-        // interface works
-        $dog = new Model\Dog();
-        $animal = new Model\Animal();
-
-        // assert we can look up the animals in the farm by array
-        // indices (let's try a random order)
-        $this->assertSame('red', $dog->getColor());
-        $this->assertSame('red', $animal->getColor());
-    }
-
-    /**
-     * test invalid argument
-     *
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Missing the required parameter $status when calling findPetsByStatus
-     */
-    public function testInvalidArgument()
-    {
-        // the argument is required, and we must specify one or some from 'available', 'pending', 'sold'
-        $this->api->findPetsByStatus([]);
-    }
-
-//    Disabled as currently we don't have any endpoint that would return file
-//    For testing I just replaced url and return type in Api method.
-//    public function testDownloadingLargeFile()
-//    {
-//        $petId = 10005;
-//        $config = new Configuration();
-//        $config->setHost('https://getcomposer.org');
-//        $api = new PetApi(new Client(), $config);
-//        $result = $api->getPetById($petId);
-//        $this->assertInstanceOf(\SplFileObject::class, $result);
-//        var_dump([
-//            'peak mem (MiB)' => memory_get_peak_usage(true)/1024/1024,
-//            'file size (MiB)' => $result->getSize()/1024/1024,
-//            'path' => sys_get_temp_dir() . '/' . $result->getFilename()
-//        ]);
-//    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/PetTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/PetTest.php
deleted file mode 100644
index c3c4ee8950e3..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/PetTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Model\Pet;
-use PHPUnit\Framework\TestCase;
-
-class PetTest extends TestCase
-{
-    /**
-     * test empty object serialization
-     */
-    public function testEmptyPetSerialization()
-    {
-        $new_pet = new Pet;
-        // the empty object should be serialised to {}
-        $this->assertSame("{}", "$new_pet");
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/RequestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/RequestTest.php
deleted file mode 100644
index 26d431bc03e7..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/RequestTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Api\FakeApi;
-use PHPUnit\Framework\TestCase;
-
-require_once __DIR__ . '/FakeHttpClient.php';
-
-class RequestTest extends TestCase
-{
-    /** @var FakeApi */
-    private $api;
-    /** @var  FakeHttpClient */
-    private $fakeClient;
-
-    public function setUp()
-    {
-        $this->fakeClient = new FakeHttpClient();
-        $this->api = new Api\FakeApi($this->fakeClient);
-    }
-
-    public function testFormDataEncodingToJson()
-    {
-        $this->api->testJsonFormData('value', 'value2');
-
-        $request = $this->fakeClient->getLastRequest();
-        $contentType = $request->getHeader('Content-Type');
-        $this->assertEquals(['application/x-www-form-urlencoded'], $contentType);
-
-        $requestContent = $request->getBody()->getContents();
-
-        // JSON serialization of form data is not supported
-        $this->assertEquals('param=value&param2=value2', $requestContent);
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ResponseTypesTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ResponseTypesTest.php
deleted file mode 100644
index 499007fa03e0..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/ResponseTypesTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use GuzzleHttp\Psr7\Response;
-use OpenAPI\Client\Api\PetApi;
-use OpenAPI\Client\Model\Pet;
-use PHPUnit\Framework\TestCase;
-
-require_once __DIR__ . '/FakeHttpClient.php';
-
-class ResponseTypesTest extends TestCase
-{
-    /** @var PetApi */
-    private $api;
-    /** @var  FakeHttpClient */
-    private $fakeHttpClient;
-
-    public function setUp()
-    {
-        $this->fakeHttpClient = new FakeHttpClient();
-        $this->api = new PetApi($this->fakeHttpClient);
-    }
-
-    public function testDefined200ReturnType()
-    {
-        $this->fakeHttpClient->setResponse(new Response(200, [], json_encode([])));
-        $result = $this->api->getPetById(123);
-
-        $this->assertInstanceOf(Pet::class, $result);
-    }
-
-    public function testDefault2xxReturnType()
-    {
-        $this->fakeHttpClient->setResponse(new Response(255, [], json_encode([])));
-        $result = $this->api->getPetById(123);
-
-        $this->assertInstanceOf(Pet::class, $result);
-    }
-
-    /**
-     * @expectedException \OpenAPI\Client\ApiException
-     * @expectedExceptionCode 400
-     */
-    public function testDefinedErrorException()
-    {
-        $statusCode = 400;
-
-        $this->fakeHttpClient->setResponse(new Response($statusCode, [], '{}'));
-        $this->api->getPetById(123);
-    }
-
-//    missing case in spec:
-//    responses:
-//        '400':
-//        description: failure
-//        schema:
-//            $ref: '#/definitions/Error'
-//    public function testDefinedErrorResponseObject()
-//    {
-//        $result = null;
-//        try {
-//            $this->fakeHttpClient->setResponse(new Response(400, [], '{}'));
-//            $this->api->getPetById(123);
-//        } catch (ApiException $e) {
-//            $result = $e->getResponseObject();
-//        }
-//
-//        $this->assertInstanceOf(Error::class, $result);
-//    }
-
-    /**
-     * @expectedException \OpenAPI\Client\ApiException
-     * @expectedExceptionCode 404
-     */
-    public function testDefaultErrorException()
-    {
-        $statusCode = 404;
-
-        $this->fakeHttpClient->setResponse(new Response($statusCode, [], '{}'));
-        $this->api->getPetById(123);
-    }
-
-    public function testDefaultErrorResponseObject()
-    {
-        $result = null;
-        try {
-            $this->fakeHttpClient->setResponse(new Response(404, [], '{}'));
-            $this->api->getPetById(123);
-        } catch (ApiException $e) {
-            $result = $e->getResponseObject();
-        }
-
-        $this->assertNull($result);
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/StoreApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/StoreApiTest.php
deleted file mode 100644
index f18f3ce66cae..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/StoreApiTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Api\PetApi;
-use OpenAPI\Client\Api\StoreApi;
-use OpenAPI\Client\Model\Category;
-use OpenAPI\Client\Model\Pet;
-use OpenAPI\Client\Model\Tag;
-use PHPUnit\Framework\TestCase;
-
-class StoreApiTest extends TestCase
-{
-    /** @var  StoreApi */
-    private $api;
-
-    public function setUp()
-    {
-        $this->api = new StoreApi();
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public static function setUpBeforeClass()
-    {
-        // add a new pet (id 10005) to ensure the pet object is available for all the tests
-        // new pet
-        $id = 10005;
-        $pet = new Pet();
-        $pet->setId($id);
-        $pet->setName('PHP Unit Test');
-        $pet->setStatus('available');
-        // new tag
-        $tag = new Tag();
-        $tag->setId($id); // use the same id as pet
-        $tag->setName('test php tag');
-        // new category
-        $category = new Category();
-        $category->setId($id); // use the same id as pet
-        $category->setName('test php category');
-
-        $pet->setTags([$tag]);
-        $pet->setCategory($category);
-
-        $api = new PetApi();
-        $api->addPet($pet);
-    }
-
-    public function testGetInventory()
-    {
-        $result = $this->api->getInventory();
-
-        $this->assertInternalType('array', $result);
-        $this->assertInternalType('int', $result['available']);
-    }
-}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/UserApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/UserApiTest.php
deleted file mode 100644
index 756fa58f177b..000000000000
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/UserApiTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace OpenAPI\Client;
-
-use OpenAPI\Client\Api\UserApi;
-use PHPUnit\Framework\TestCase;
-
-class UserApiTest extends TestCase
-{
-
-    /** @var UserApi*/
-    private $api;
-
-    public function setUp()
-    {
-        $this->api = new Api\UserApi();
-    }
-
-    // test login use
-    public function testLoginUser()
-    {
-        // initialize the API client
-        // login
-        $response = $this->api->loginUser('xxxxx', 'yyyyyyyy');
-        
-        $this->assertInternalType('string', $response);
-        $this->assertRegExp(
-            '/logged in user session/',
-            $response,
-            "response string starts with 'logged in user session'"
-        );
-    }
-}
diff --git a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/FILES
index 0d022fe2bdef..c66cd6a9744a 100644
--- a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/FILES
@@ -3,6 +3,7 @@
 .travis.yml
 README.md
 docs/AdditionalPropertiesClass.md
+docs/AdditionalPropertiesWithArrayOfEnums.md
 docs/Address.md
 docs/Animal.md
 docs/AnimalFarm.md
@@ -109,6 +110,7 @@ petstore_api/configuration.py
 petstore_api/exceptions.py
 petstore_api/model/__init__.py
 petstore_api/model/additional_properties_class.py
+petstore_api/model/additional_properties_with_array_of_enums.py
 petstore_api/model/address.py
 petstore_api/model/animal.py
 petstore_api/model/animal_farm.py
diff --git a/samples/openapi3/client/petstore/python-experimental/README.md b/samples/openapi3/client/petstore/python-experimental/README.md
index 3c16a26ddc63..867771e629f3 100644
--- a/samples/openapi3/client/petstore/python-experimental/README.md
+++ b/samples/openapi3/client/petstore/python-experimental/README.md
@@ -87,6 +87,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**fake_outer_composite_serialize**](docs/FakeApi.md#fake_outer_composite_serialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fake_outer_number_serialize**](docs/FakeApi.md#fake_outer_number_serialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fake_outer_string_serialize**](docs/FakeApi.md#fake_outer_string_serialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**get_additional_properties_with_array_of_enums**](docs/FakeApi.md#get_additional_properties_with_array_of_enums) | **GET** /fake/additional-properties-with-array-of-enums | Additional Properties with Array of Enums
 *FakeApi* | [**get_array_of_enums**](docs/FakeApi.md#get_array_of_enums) | **GET** /fake/array-of-enums | Array of Enums
 *FakeApi* | [**test_body_with_file_schema**](docs/FakeApi.md#test_body_with_file_schema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**test_body_with_query_params**](docs/FakeApi.md#test_body_with_query_params) | **PUT** /fake/body-with-query-params | 
@@ -124,6 +125,7 @@ Class | Method | HTTP request | Description
 ## Documentation For Models
 
  - [additional_properties_class.AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums](docs/AdditionalPropertiesWithArrayOfEnums.md)
  - [address.Address](docs/Address.md)
  - [animal.Animal](docs/Animal.md)
  - [animal_farm.AnimalFarm](docs/AnimalFarm.md)
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/AdditionalPropertiesWithArrayOfEnums.md b/samples/openapi3/client/petstore/python-experimental/docs/AdditionalPropertiesWithArrayOfEnums.md
new file mode 100644
index 000000000000..10ab1cf5b344
--- /dev/null
+++ b/samples/openapi3/client/petstore/python-experimental/docs/AdditionalPropertiesWithArrayOfEnums.md
@@ -0,0 +1,10 @@
+# additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**any string name** | **[enum_class.EnumClass]** | any string name can be used but the value must be the correct type | [optional]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md b/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md
index 6a79ea1c772b..44c53b45962a 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md
@@ -9,6 +9,7 @@ Method | HTTP request | Description
 [**fake_outer_composite_serialize**](FakeApi.md#fake_outer_composite_serialize) | **POST** /fake/outer/composite | 
 [**fake_outer_number_serialize**](FakeApi.md#fake_outer_number_serialize) | **POST** /fake/outer/number | 
 [**fake_outer_string_serialize**](FakeApi.md#fake_outer_string_serialize) | **POST** /fake/outer/string | 
+[**get_additional_properties_with_array_of_enums**](FakeApi.md#get_additional_properties_with_array_of_enums) | **GET** /fake/additional-properties-with-array-of-enums | Additional Properties with Array of Enums
 [**get_array_of_enums**](FakeApi.md#get_array_of_enums) | **GET** /fake/array-of-enums | Array of Enums
 [**test_body_with_file_schema**](FakeApi.md#test_body_with_file_schema) | **PUT** /fake/body-with-file-schema | 
 [**test_body_with_query_params**](FakeApi.md#test_body_with_query_params) | **PUT** /fake/body-with-query-params | 
@@ -332,6 +333,64 @@ No authorization required
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_additional_properties_with_array_of_enums**
+> additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums get_additional_properties_with_array_of_enums()
+
+Additional Properties with Array of Enums
+
+### Example
+
+```python
+from __future__ import print_function
+import time
+import petstore_api
+from petstore_api.api import fake_api
+from petstore_api.model import additional_properties_with_array_of_enums
+from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+
+# Enter a context with an instance of the API client
+with petstore_api.ApiClient() as api_client:
+    # Create an instance of the API class
+    api_instance = fake_api.FakeApi(api_client)
+    
+    # example, this endpoint has no required or optional parameters
+    try:
+        # Additional Properties with Array of Enums
+        api_response = api_instance.get_additional_properties_with_array_of_enums()
+        pprint(api_response)
+    except petstore_api.ApiException as e:
+        print("Exception when calling FakeApi->get_additional_properties_with_array_of_enums: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums**](AdditionalPropertiesWithArrayOfEnums.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | Got object with additional properties with array of enums |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **get_array_of_enums**
 > array_of_enums.ArrayOfEnums get_array_of_enums()
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
index 7aebc264b071..c723d80c54f0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
@@ -18,11 +18,7 @@
 # python 2 and python 3 compatibility library
 import six
 
-from petstore_api.api_client import ApiClient
-from petstore_api.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from petstore_api.api_client import ApiClient, Endpoint
 from petstore_api.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -82,9 +78,9 @@ def __call_123_test_special_tags(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -110,7 +106,7 @@ def __call_123_test_special_tags(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['client_client'] = \
                 client_client
             return self.call_with_http_info(**kwargs)
@@ -122,7 +118,7 @@ def __call_123_test_special_tags(
                 'endpoint_path': '/another-fake/dummy',
                 'operation_id': 'call_123_test_special_tags',
                 'http_method': 'PATCH',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -166,223 +162,3 @@ def __call_123_test_special_tags(
             api_client=api_client,
             callable=__call_123_test_special_tags
         )
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api.py
index 65d9c2178a80..c3fcc91e777b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api.py
@@ -18,11 +18,7 @@
 # python 2 and python 3 compatibility library
 import six
 
-from petstore_api.api_client import ApiClient
-from petstore_api.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from petstore_api.api_client import ApiClient, Endpoint
 from petstore_api.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -78,9 +74,9 @@ def __foo_get(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -106,7 +102,7 @@ def __foo_get(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.foo_get = Endpoint(
@@ -116,7 +112,7 @@ def __foo_get(
                 'endpoint_path': '/foo',
                 'operation_id': 'foo_get',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -152,223 +148,3 @@ def __foo_get(
             api_client=api_client,
             callable=__foo_get
         )
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py
index 6580f2f2c52a..26d8620c808a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py
@@ -18,11 +18,7 @@
 # python 2 and python 3 compatibility library
 import six
 
-from petstore_api.api_client import ApiClient
-from petstore_api.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from petstore_api.api_client import ApiClient, Endpoint
 from petstore_api.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -36,6 +32,7 @@
 )
 from petstore_api.model import health_check_result
 from petstore_api.model import outer_composite
+from petstore_api.model import additional_properties_with_array_of_enums
 from petstore_api.model import array_of_enums
 from petstore_api.model import file_schema_test_class
 from petstore_api.model import user
@@ -83,9 +80,9 @@ def __fake_health_get(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -111,7 +108,7 @@ def __fake_health_get(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.fake_health_get = Endpoint(
@@ -121,7 +118,7 @@ def __fake_health_get(
                 'endpoint_path': '/fake/health',
                 'operation_id': 'fake_health_get',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -189,9 +186,9 @@ def __fake_outer_boolean_serialize(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -217,7 +214,7 @@ def __fake_outer_boolean_serialize(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.fake_outer_boolean_serialize = Endpoint(
@@ -227,7 +224,7 @@ def __fake_outer_boolean_serialize(
                 'endpoint_path': '/fake/outer/boolean',
                 'operation_id': 'fake_outer_boolean_serialize',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -301,9 +298,9 @@ def __fake_outer_composite_serialize(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -329,7 +326,7 @@ def __fake_outer_composite_serialize(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.fake_outer_composite_serialize = Endpoint(
@@ -339,7 +336,7 @@ def __fake_outer_composite_serialize(
                 'endpoint_path': '/fake/outer/composite',
                 'operation_id': 'fake_outer_composite_serialize',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -413,9 +410,9 @@ def __fake_outer_number_serialize(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -441,7 +438,7 @@ def __fake_outer_number_serialize(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.fake_outer_number_serialize = Endpoint(
@@ -451,7 +448,7 @@ def __fake_outer_number_serialize(
                 'endpoint_path': '/fake/outer/number',
                 'operation_id': 'fake_outer_number_serialize',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -525,9 +522,9 @@ def __fake_outer_string_serialize(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -553,7 +550,7 @@ def __fake_outer_string_serialize(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.fake_outer_string_serialize = Endpoint(
@@ -563,7 +560,7 @@ def __fake_outer_string_serialize(
                 'endpoint_path': '/fake/outer/string',
                 'operation_id': 'fake_outer_string_serialize',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -606,6 +603,110 @@ def __fake_outer_string_serialize(
             callable=__fake_outer_string_serialize
         )
 
+        def __get_additional_properties_with_array_of_enums(
+            self,
+            **kwargs
+        ):
+            """Additional Properties with Array of Enums  # noqa: E501
+
+            This method makes a synchronous HTTP request by default. To make an
+            asynchronous HTTP request, please pass async_req=True
+
+            >>> thread = api.get_additional_properties_with_array_of_enums(async_req=True)
+            >>> result = thread.get()
+
+
+            Keyword Args:
+                _return_http_data_only (bool): response data without head status
+                    code and headers. Default is True.
+                _preload_content (bool): if False, the urllib3.HTTPResponse object
+                    will be returned without reading/decoding response data.
+                    Default is True.
+                _request_timeout (float/tuple): timeout setting for this request. If one
+                    number provided, it will be total request timeout. It can also
+                    be a pair (tuple) of (connection, read) timeouts.
+                    Default is None.
+                _check_input_type (bool): specifies if type checking
+                    should be done one the data sent to the server.
+                    Default is True.
+                _check_return_type (bool): specifies if type checking
+                    should be done one the data received from the server.
+                    Default is True.
+                _host_index (int/None): specifies the index of the server
+                    that we want to use.
+                    Default is read from the configuration.
+                async_req (bool): execute request asynchronously
+
+            Returns:
+                additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums
+                    If the method is called asynchronously, returns the request
+                    thread.
+            """
+            kwargs['async_req'] = kwargs.get(
+                'async_req', False
+            )
+            kwargs['_return_http_data_only'] = kwargs.get(
+                '_return_http_data_only', True
+            )
+            kwargs['_preload_content'] = kwargs.get(
+                '_preload_content', True
+            )
+            kwargs['_request_timeout'] = kwargs.get(
+                '_request_timeout', None
+            )
+            kwargs['_check_input_type'] = kwargs.get(
+                '_check_input_type', True
+            )
+            kwargs['_check_return_type'] = kwargs.get(
+                '_check_return_type', True
+            )
+            kwargs['_host_index'] = kwargs.get('_host_index')
+            return self.call_with_http_info(**kwargs)
+
+        self.get_additional_properties_with_array_of_enums = Endpoint(
+            settings={
+                'response_type': (additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums,),
+                'auth': [],
+                'endpoint_path': '/fake/additional-properties-with-array-of-enums',
+                'operation_id': 'get_additional_properties_with_array_of_enums',
+                'http_method': 'GET',
+                'servers': None,
+            },
+            params_map={
+                'all': [
+                ],
+                'required': [],
+                'nullable': [
+                ],
+                'enum': [
+                ],
+                'validation': [
+                ]
+            },
+            root_map={
+                'validations': {
+                },
+                'allowed_values': {
+                },
+                'openapi_types': {
+                },
+                'attribute_map': {
+                },
+                'location_map': {
+                },
+                'collection_format_map': {
+                }
+            },
+            headers_map={
+                'accept': [
+                    'application/json'
+                ],
+                'content_type': [],
+            },
+            api_client=api_client,
+            callable=__get_additional_properties_with_array_of_enums
+        )
+
         def __get_array_of_enums(
             self,
             **kwargs
@@ -635,9 +736,9 @@ def __get_array_of_enums(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -663,7 +764,7 @@ def __get_array_of_enums(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.get_array_of_enums = Endpoint(
@@ -673,7 +774,7 @@ def __get_array_of_enums(
                 'endpoint_path': '/fake/array-of-enums',
                 'operation_id': 'get_array_of_enums',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -743,9 +844,9 @@ def __test_body_with_file_schema(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -771,7 +872,7 @@ def __test_body_with_file_schema(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['file_schema_test_class_file_schema_test_class'] = \
                 file_schema_test_class_file_schema_test_class
             return self.call_with_http_info(**kwargs)
@@ -783,7 +884,7 @@ def __test_body_with_file_schema(
                 'endpoint_path': '/fake/body-with-file-schema',
                 'operation_id': 'test_body_with_file_schema',
                 'http_method': 'PUT',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -860,9 +961,9 @@ def __test_body_with_query_params(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -888,7 +989,7 @@ def __test_body_with_query_params(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['query'] = \
                 query
             kwargs['user_user'] = \
@@ -902,7 +1003,7 @@ def __test_body_with_query_params(
                 'endpoint_path': '/fake/body-with-query-params',
                 'operation_id': 'test_body_with_query_params',
                 'http_method': 'PUT',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -984,9 +1085,9 @@ def __test_client_model(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1012,7 +1113,7 @@ def __test_client_model(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['client_client'] = \
                 client_client
             return self.call_with_http_info(**kwargs)
@@ -1024,7 +1125,7 @@ def __test_client_model(
                 'endpoint_path': '/fake',
                 'operation_id': 'test_client_model',
                 'http_method': 'PATCH',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1118,9 +1219,9 @@ def __test_endpoint_parameters(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1146,7 +1247,7 @@ def __test_endpoint_parameters(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['number'] = \
                 number
             kwargs['double'] = \
@@ -1166,7 +1267,7 @@ def __test_endpoint_parameters(
                 'endpoint_path': '/fake',
                 'operation_id': 'test_endpoint_parameters',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1365,9 +1466,9 @@ def __test_enum_parameters(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1393,7 +1494,7 @@ def __test_enum_parameters(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.test_enum_parameters = Endpoint(
@@ -1403,7 +1504,7 @@ def __test_enum_parameters(
                 'endpoint_path': '/fake',
                 'operation_id': 'test_enum_parameters',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1574,9 +1675,9 @@ def __test_group_parameters(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1602,7 +1703,7 @@ def __test_group_parameters(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['required_string_group'] = \
                 required_string_group
             kwargs['required_boolean_group'] = \
@@ -1620,7 +1721,7 @@ def __test_group_parameters(
                 'endpoint_path': '/fake',
                 'operation_id': 'test_group_parameters',
                 'http_method': 'DELETE',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1721,9 +1822,9 @@ def __test_inline_additional_properties(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1749,7 +1850,7 @@ def __test_inline_additional_properties(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['request_body'] = \
                 request_body
             return self.call_with_http_info(**kwargs)
@@ -1761,7 +1862,7 @@ def __test_inline_additional_properties(
                 'endpoint_path': '/fake/inline-additionalProperties',
                 'operation_id': 'test_inline_additional_properties',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1838,9 +1939,9 @@ def __test_json_form_data(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1866,7 +1967,7 @@ def __test_json_form_data(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['param'] = \
                 param
             kwargs['param2'] = \
@@ -1880,7 +1981,7 @@ def __test_json_form_data(
                 'endpoint_path': '/fake/jsonFormData',
                 'operation_id': 'test_json_form_data',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1971,9 +2072,9 @@ def __test_query_parameter_collection_format(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1999,7 +2100,7 @@ def __test_query_parameter_collection_format(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['pipe'] = \
                 pipe
             kwargs['ioutil'] = \
@@ -2019,7 +2120,7 @@ def __test_query_parameter_collection_format(
                 'endpoint_path': '/fake/test-query-paramters',
                 'operation_id': 'test_query_parameter_collection_format',
                 'http_method': 'PUT',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -2089,223 +2190,3 @@ def __test_query_parameter_collection_format(
             api_client=api_client,
             callable=__test_query_parameter_collection_format
         )
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py
index e22f47b416c0..4e6e9b4f0f4d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py
@@ -18,11 +18,7 @@
 # python 2 and python 3 compatibility library
 import six
 
-from petstore_api.api_client import ApiClient
-from petstore_api.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from petstore_api.api_client import ApiClient, Endpoint
 from petstore_api.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -82,9 +78,9 @@ def __test_classname(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -110,7 +106,7 @@ def __test_classname(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['client_client'] = \
                 client_client
             return self.call_with_http_info(**kwargs)
@@ -124,7 +120,7 @@ def __test_classname(
                 'endpoint_path': '/fake_classname_test',
                 'operation_id': 'test_classname',
                 'http_method': 'PATCH',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -168,223 +164,3 @@ def __test_classname(
             api_client=api_client,
             callable=__test_classname
         )
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api.py
index 9ca9a64f8e2d..1c13ec171a2d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api.py
@@ -18,11 +18,7 @@
 # python 2 and python 3 compatibility library
 import six
 
-from petstore_api.api_client import ApiClient
-from petstore_api.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from petstore_api.api_client import ApiClient, Endpoint
 from petstore_api.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -82,9 +78,9 @@ def __add_pet(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -110,7 +106,7 @@ def __add_pet(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['pet_pet'] = \
                 pet_pet
             return self.call_with_http_info(**kwargs)
@@ -126,8 +122,14 @@ def __add_pet(
                 'operation_id': 'add_pet',
                 'http_method': 'POST',
                 'servers': [
-                    'http://petstore.swagger.io/v2',
-                    'http://path-server-test.petstore.local/v2'
+                    {
+                        'url': "http://petstore.swagger.io/v2",
+                        'description': "No description provided",
+                    },
+                    {
+                        'url': "http://path-server-test.petstore.local/v2",
+                        'description': "No description provided",
+                    },
                 ]
             },
             params_map={
@@ -205,9 +207,9 @@ def __delete_pet(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -233,7 +235,7 @@ def __delete_pet(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['pet_id'] = \
                 pet_id
             return self.call_with_http_info(**kwargs)
@@ -247,7 +249,7 @@ def __delete_pet(
                 'endpoint_path': '/pet/{petId}',
                 'operation_id': 'delete_pet',
                 'http_method': 'DELETE',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -327,9 +329,9 @@ def __find_pets_by_status(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -355,7 +357,7 @@ def __find_pets_by_status(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['status'] = \
                 status
             return self.call_with_http_info(**kwargs)
@@ -370,7 +372,7 @@ def __find_pets_by_status(
                 'endpoint_path': '/pet/findByStatus',
                 'operation_id': 'find_pets_by_status',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -456,9 +458,9 @@ def __find_pets_by_tags(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -484,7 +486,7 @@ def __find_pets_by_tags(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['tags'] = \
                 tags
             return self.call_with_http_info(**kwargs)
@@ -499,7 +501,7 @@ def __find_pets_by_tags(
                 'endpoint_path': '/pet/findByTags',
                 'operation_id': 'find_pets_by_tags',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -578,9 +580,9 @@ def __get_pet_by_id(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -606,7 +608,7 @@ def __get_pet_by_id(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['pet_id'] = \
                 pet_id
             return self.call_with_http_info(**kwargs)
@@ -620,7 +622,7 @@ def __get_pet_by_id(
                 'endpoint_path': '/pet/{petId}',
                 'operation_id': 'get_pet_by_id',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -697,9 +699,9 @@ def __update_pet(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -725,7 +727,7 @@ def __update_pet(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['pet_pet'] = \
                 pet_pet
             return self.call_with_http_info(**kwargs)
@@ -741,8 +743,14 @@ def __update_pet(
                 'operation_id': 'update_pet',
                 'http_method': 'PUT',
                 'servers': [
-                    'http://petstore.swagger.io/v2',
-                    'http://path-server-test.petstore.local/v2'
+                    {
+                        'url': "http://petstore.swagger.io/v2",
+                        'description': "No description provided",
+                    },
+                    {
+                        'url': "http://path-server-test.petstore.local/v2",
+                        'description': "No description provided",
+                    },
                 ]
             },
             params_map={
@@ -821,9 +829,9 @@ def __update_pet_with_form(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -849,7 +857,7 @@ def __update_pet_with_form(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['pet_id'] = \
                 pet_id
             return self.call_with_http_info(**kwargs)
@@ -863,7 +871,7 @@ def __update_pet_with_form(
                 'endpoint_path': '/pet/{petId}',
                 'operation_id': 'update_pet_with_form',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -951,9 +959,9 @@ def __upload_file(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -979,7 +987,7 @@ def __upload_file(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['pet_id'] = \
                 pet_id
             return self.call_with_http_info(**kwargs)
@@ -993,7 +1001,7 @@ def __upload_file(
                 'endpoint_path': '/pet/{petId}/uploadImage',
                 'operation_id': 'upload_file',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1084,9 +1092,9 @@ def __upload_file_with_required_file(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -1112,7 +1120,7 @@ def __upload_file_with_required_file(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['pet_id'] = \
                 pet_id
             kwargs['required_file'] = \
@@ -1128,7 +1136,7 @@ def __upload_file_with_required_file(
                 'endpoint_path': '/fake/{petId}/uploadImageWithRequiredFile',
                 'operation_id': 'upload_file_with_required_file',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -1184,223 +1192,3 @@ def __upload_file_with_required_file(
             api_client=api_client,
             callable=__upload_file_with_required_file
         )
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api.py
index 5bd88ecdca16..075a17d46411 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api.py
@@ -18,11 +18,7 @@
 # python 2 and python 3 compatibility library
 import six
 
-from petstore_api.api_client import ApiClient
-from petstore_api.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from petstore_api.api_client import ApiClient, Endpoint
 from petstore_api.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -82,9 +78,9 @@ def __delete_order(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -110,7 +106,7 @@ def __delete_order(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['order_id'] = \
                 order_id
             return self.call_with_http_info(**kwargs)
@@ -122,7 +118,7 @@ def __delete_order(
                 'endpoint_path': '/store/order/{order_id}',
                 'operation_id': 'delete_order',
                 'http_method': 'DELETE',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -194,9 +190,9 @@ def __get_inventory(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -222,7 +218,7 @@ def __get_inventory(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.get_inventory = Endpoint(
@@ -234,7 +230,7 @@ def __get_inventory(
                 'endpoint_path': '/store/inventory',
                 'operation_id': 'get_inventory',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -304,9 +300,9 @@ def __get_order_by_id(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -332,7 +328,7 @@ def __get_order_by_id(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['order_id'] = \
                 order_id
             return self.call_with_http_info(**kwargs)
@@ -344,7 +340,7 @@ def __get_order_by_id(
                 'endpoint_path': '/store/order/{order_id}',
                 'operation_id': 'get_order_by_id',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -427,9 +423,9 @@ def __place_order(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -455,7 +451,7 @@ def __place_order(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['order_order'] = \
                 order_order
             return self.call_with_http_info(**kwargs)
@@ -467,7 +463,7 @@ def __place_order(
                 'endpoint_path': '/store/order',
                 'operation_id': 'place_order',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -512,223 +508,3 @@ def __place_order(
             api_client=api_client,
             callable=__place_order
         )
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api.py
index 46f1fdf79cae..96540433aef9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api.py
@@ -18,11 +18,7 @@
 # python 2 and python 3 compatibility library
 import six
 
-from petstore_api.api_client import ApiClient
-from petstore_api.exceptions import (
-    ApiTypeError,
-    ApiValueError
-)
+from petstore_api.api_client import ApiClient, Endpoint
 from petstore_api.model_utils import (  # noqa: F401
     check_allowed_values,
     check_validations,
@@ -82,9 +78,9 @@ def __create_user(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -110,7 +106,7 @@ def __create_user(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['user_user'] = \
                 user_user
             return self.call_with_http_info(**kwargs)
@@ -122,7 +118,7 @@ def __create_user(
                 'endpoint_path': '/user',
                 'operation_id': 'create_user',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -197,9 +193,9 @@ def __create_users_with_array_input(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -225,7 +221,7 @@ def __create_users_with_array_input(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['user_user'] = \
                 user_user
             return self.call_with_http_info(**kwargs)
@@ -237,7 +233,7 @@ def __create_users_with_array_input(
                 'endpoint_path': '/user/createWithArray',
                 'operation_id': 'create_users_with_array_input',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -312,9 +308,9 @@ def __create_users_with_list_input(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -340,7 +336,7 @@ def __create_users_with_list_input(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['user_user'] = \
                 user_user
             return self.call_with_http_info(**kwargs)
@@ -352,7 +348,7 @@ def __create_users_with_list_input(
                 'endpoint_path': '/user/createWithList',
                 'operation_id': 'create_users_with_list_input',
                 'http_method': 'POST',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -428,9 +424,9 @@ def __delete_user(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -456,7 +452,7 @@ def __delete_user(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['username'] = \
                 username
             return self.call_with_http_info(**kwargs)
@@ -468,7 +464,7 @@ def __delete_user(
                 'endpoint_path': '/user/{username}',
                 'operation_id': 'delete_user',
                 'http_method': 'DELETE',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -542,9 +538,9 @@ def __get_user_by_name(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -570,7 +566,7 @@ def __get_user_by_name(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['username'] = \
                 username
             return self.call_with_http_info(**kwargs)
@@ -582,7 +578,7 @@ def __get_user_by_name(
                 'endpoint_path': '/user/{username}',
                 'operation_id': 'get_user_by_name',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -661,9 +657,9 @@ def __login_user(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -689,7 +685,7 @@ def __login_user(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['username'] = \
                 username
             kwargs['password'] = \
@@ -703,7 +699,7 @@ def __login_user(
                 'endpoint_path': '/user/login',
                 'operation_id': 'login_user',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -783,9 +779,9 @@ def __logout_user(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -811,7 +807,7 @@ def __logout_user(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             return self.call_with_http_info(**kwargs)
 
         self.logout_user = Endpoint(
@@ -821,7 +817,7 @@ def __logout_user(
                 'endpoint_path': '/user/logout',
                 'operation_id': 'logout_user',
                 'http_method': 'GET',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -891,9 +887,9 @@ def __update_user(
                 _check_return_type (bool): specifies if type checking
                     should be done one the data received from the server.
                     Default is True.
-                _host_index (int): specifies the index of the server
+                _host_index (int/None): specifies the index of the server
                     that we want to use.
-                    Default is 0.
+                    Default is read from the configuration.
                 async_req (bool): execute request asynchronously
 
             Returns:
@@ -919,7 +915,7 @@ def __update_user(
             kwargs['_check_return_type'] = kwargs.get(
                 '_check_return_type', True
             )
-            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            kwargs['_host_index'] = kwargs.get('_host_index')
             kwargs['username'] = \
                 username
             kwargs['user_user'] = \
@@ -933,7 +929,7 @@ def __update_user(
                 'endpoint_path': '/user/{username}',
                 'operation_id': 'update_user',
                 'http_method': 'PUT',
-                'servers': [],
+                'servers': None,
             },
             params_map={
                 'all': [
@@ -981,223 +977,3 @@ def __update_user(
             api_client=api_client,
             callable=__update_user
         )
-
-
-class Endpoint(object):
-    def __init__(self, settings=None, params_map=None, root_map=None,
-                 headers_map=None, api_client=None, callable=None):
-        """Creates an endpoint
-
-        Args:
-            settings (dict): see below key value pairs
-                'response_type' (tuple/None): response type
-                'auth' (list): a list of auth type keys
-                'endpoint_path' (str): the endpoint path
-                'operation_id' (str): endpoint string identifier
-                'http_method' (str): POST/PUT/PATCH/GET etc
-                'servers' (list): list of str servers that this endpoint is at
-            params_map (dict): see below key value pairs
-                'all' (list): list of str endpoint parameter names
-                'required' (list): list of required parameter names
-                'nullable' (list): list of nullable parameter names
-                'enum' (list): list of parameters with enum values
-                'validation' (list): list of parameters with validations
-            root_map
-                'validations' (dict): the dict mapping endpoint parameter tuple
-                    paths to their validation dictionaries
-                'allowed_values' (dict): the dict mapping endpoint parameter
-                    tuple paths to their allowed_values (enum) dictionaries
-                'openapi_types' (dict): param_name to openapi type
-                'attribute_map' (dict): param_name to camelCase name
-                'location_map' (dict): param_name to  'body', 'file', 'form',
-                    'header', 'path', 'query'
-                collection_format_map (dict): param_name to `csv` etc.
-            headers_map (dict): see below key value pairs
-                'accept' (list): list of Accept header strings
-                'content_type' (list): list of Content-Type header strings
-            api_client (ApiClient) api client instance
-            callable (function): the function which is invoked when the
-                Endpoint is called
-        """
-        self.settings = settings
-        self.params_map = params_map
-        self.params_map['all'].extend([
-            'async_req',
-            '_host_index',
-            '_preload_content',
-            '_request_timeout',
-            '_return_http_data_only',
-            '_check_input_type',
-            '_check_return_type'
-        ])
-        self.params_map['nullable'].extend(['_request_timeout'])
-        self.validations = root_map['validations']
-        self.allowed_values = root_map['allowed_values']
-        self.openapi_types = root_map['openapi_types']
-        extra_types = {
-            'async_req': (bool,),
-            '_host_index': (int,),
-            '_preload_content': (bool,),
-            '_request_timeout': (none_type, int, (int,), [int]),
-            '_return_http_data_only': (bool,),
-            '_check_input_type': (bool,),
-            '_check_return_type': (bool,)
-        }
-        self.openapi_types.update(extra_types)
-        self.attribute_map = root_map['attribute_map']
-        self.location_map = root_map['location_map']
-        self.collection_format_map = root_map['collection_format_map']
-        self.headers_map = headers_map
-        self.api_client = api_client
-        self.callable = callable
-
-    def __validate_inputs(self, kwargs):
-        for param in self.params_map['enum']:
-            if param in kwargs:
-                check_allowed_values(
-                    self.allowed_values,
-                    (param,),
-                    kwargs[param]
-                )
-
-        for param in self.params_map['validation']:
-            if param in kwargs:
-                check_validations(
-                    self.validations,
-                    (param,),
-                    kwargs[param],
-                    configuration=self.api_client.configuration
-                )
-
-        if kwargs['_check_input_type'] is False:
-            return
-
-        for key, value in six.iteritems(kwargs):
-            fixed_val = validate_and_convert_types(
-                value,
-                self.openapi_types[key],
-                [key],
-                False,
-                kwargs['_check_input_type'],
-                configuration=self.api_client.configuration
-            )
-            kwargs[key] = fixed_val
-
-    def __gather_params(self, kwargs):
-        params = {
-            'body': None,
-            'collection_format': {},
-            'file': {},
-            'form': [],
-            'header': {},
-            'path': {},
-            'query': []
-        }
-
-        for param_name, param_value in six.iteritems(kwargs):
-            param_location = self.location_map.get(param_name)
-            if param_location is None:
-                continue
-            if param_location:
-                if param_location == 'body':
-                    params['body'] = param_value
-                    continue
-                base_name = self.attribute_map[param_name]
-                if (param_location == 'form' and
-                        self.openapi_types[param_name] == (file_type,)):
-                    params['file'][param_name] = [param_value]
-                elif (param_location == 'form' and
-                        self.openapi_types[param_name] == ([file_type],)):
-                    # param_value is already a list
-                    params['file'][param_name] = param_value
-                elif param_location in {'form', 'query'}:
-                    param_value_full = (base_name, param_value)
-                    params[param_location].append(param_value_full)
-                if param_location not in {'form', 'query'}:
-                    params[param_location][base_name] = param_value
-                collection_format = self.collection_format_map.get(param_name)
-                if collection_format:
-                    params['collection_format'][base_name] = collection_format
-
-        return params
-
-    def __call__(self, *args, **kwargs):
-        """ This method is invoked when endpoints are called
-        Example:
-        pet_api = PetApi()
-        pet_api.add_pet  # this is an instance of the class Endpoint
-        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
-        which then invokes the callable functions stored in that endpoint at
-        pet_api.add_pet.callable or self.callable in this class
-        """
-        return self.callable(self, *args, **kwargs)
-
-    def call_with_http_info(self, **kwargs):
-
-        try:
-            _host = self.settings['servers'][kwargs['_host_index']]
-        except IndexError:
-            if self.settings['servers']:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(self.settings['servers'])
-                )
-            _host = None
-
-        for key, value in six.iteritems(kwargs):
-            if key not in self.params_map['all']:
-                raise ApiTypeError(
-                    "Got an unexpected parameter '%s'"
-                    " to method `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-            # only throw this nullable ApiValueError if _check_input_type
-            # is False, if _check_input_type==True we catch this case
-            # in self.__validate_inputs
-            if (key not in self.params_map['nullable'] and value is None
-                    and kwargs['_check_input_type'] is False):
-                raise ApiValueError(
-                    "Value may not be None for non-nullable parameter `%s`"
-                    " when calling `%s`" %
-                    (key, self.settings['operation_id'])
-                )
-
-        for key in self.params_map['required']:
-            if key not in kwargs.keys():
-                raise ApiValueError(
-                    "Missing the required parameter `%s` when calling "
-                    "`%s`" % (key, self.settings['operation_id'])
-                )
-
-        self.__validate_inputs(kwargs)
-
-        params = self.__gather_params(kwargs)
-
-        accept_headers_list = self.headers_map['accept']
-        if accept_headers_list:
-            params['header']['Accept'] = self.api_client.select_header_accept(
-                accept_headers_list)
-
-        content_type_headers_list = self.headers_map['content_type']
-        if content_type_headers_list:
-            header_list = self.api_client.select_header_content_type(
-                content_type_headers_list)
-            params['header']['Content-Type'] = header_list
-
-        return self.api_client.call_api(
-            self.settings['endpoint_path'], self.settings['http_method'],
-            params['path'],
-            params['query'],
-            params['header'],
-            body=params['body'],
-            post_params=params['form'],
-            files=params['file'],
-            response_type=self.settings['response_type'],
-            auth_settings=self.settings['auth'],
-            async_req=kwargs['async_req'],
-            _check_type=kwargs['_check_return_type'],
-            _return_http_data_only=kwargs['_return_http_data_only'],
-            _preload_content=kwargs['_preload_content'],
-            _request_timeout=kwargs['_request_timeout'],
-            _host=_host,
-            collection_formats=params['collection_format'])
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
index 7a7158d2c0b8..9f3a16a6691f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
@@ -23,16 +23,20 @@
 
 from petstore_api import rest
 from petstore_api.configuration import Configuration
-from petstore_api.exceptions import ApiValueError, ApiException
+from petstore_api.exceptions import ApiTypeError, ApiValueError, ApiException
 from petstore_api.model_utils import (
     ModelNormal,
     ModelSimple,
     ModelComposed,
+    check_allowed_values,
+    check_validations,
     date,
     datetime,
     deserialize_file,
     file_type,
+    int,
     model_to_dict,
+    none_type,
     str,
     validate_and_convert_types
 )
@@ -583,3 +587,231 @@ def update_params_for_auth(self, headers, querys, auth_settings,
                     raise ApiValueError(
                         'Authentication token must be in `query` or `header`'
                     )
+
+
+class Endpoint(object):
+    def __init__(self, settings=None, params_map=None, root_map=None,
+                 headers_map=None, api_client=None, callable=None):
+        """Creates an endpoint
+
+        Args:
+            settings (dict): see below key value pairs
+                'response_type' (tuple/None): response type
+                'auth' (list): a list of auth type keys
+                'endpoint_path' (str): the endpoint path
+                'operation_id' (str): endpoint string identifier
+                'http_method' (str): POST/PUT/PATCH/GET etc
+                'servers' (list): list of str servers that this endpoint is at
+            params_map (dict): see below key value pairs
+                'all' (list): list of str endpoint parameter names
+                'required' (list): list of required parameter names
+                'nullable' (list): list of nullable parameter names
+                'enum' (list): list of parameters with enum values
+                'validation' (list): list of parameters with validations
+            root_map
+                'validations' (dict): the dict mapping endpoint parameter tuple
+                    paths to their validation dictionaries
+                'allowed_values' (dict): the dict mapping endpoint parameter
+                    tuple paths to their allowed_values (enum) dictionaries
+                'openapi_types' (dict): param_name to openapi type
+                'attribute_map' (dict): param_name to camelCase name
+                'location_map' (dict): param_name to  'body', 'file', 'form',
+                    'header', 'path', 'query'
+                collection_format_map (dict): param_name to `csv` etc.
+            headers_map (dict): see below key value pairs
+                'accept' (list): list of Accept header strings
+                'content_type' (list): list of Content-Type header strings
+            api_client (ApiClient) api client instance
+            callable (function): the function which is invoked when the
+                Endpoint is called
+        """
+        self.settings = settings
+        self.params_map = params_map
+        self.params_map['all'].extend([
+            'async_req',
+            '_host_index',
+            '_preload_content',
+            '_request_timeout',
+            '_return_http_data_only',
+            '_check_input_type',
+            '_check_return_type'
+        ])
+        self.params_map['nullable'].extend(['_request_timeout'])
+        self.validations = root_map['validations']
+        self.allowed_values = root_map['allowed_values']
+        self.openapi_types = root_map['openapi_types']
+        extra_types = {
+            'async_req': (bool,),
+            '_host_index': (none_type, int),
+            '_preload_content': (bool,),
+            '_request_timeout': (none_type, int, (int,), [int]),
+            '_return_http_data_only': (bool,),
+            '_check_input_type': (bool,),
+            '_check_return_type': (bool,)
+        }
+        self.openapi_types.update(extra_types)
+        self.attribute_map = root_map['attribute_map']
+        self.location_map = root_map['location_map']
+        self.collection_format_map = root_map['collection_format_map']
+        self.headers_map = headers_map
+        self.api_client = api_client
+        self.callable = callable
+
+    def __validate_inputs(self, kwargs):
+        for param in self.params_map['enum']:
+            if param in kwargs:
+                check_allowed_values(
+                    self.allowed_values,
+                    (param,),
+                    kwargs[param]
+                )
+
+        for param in self.params_map['validation']:
+            if param in kwargs:
+                check_validations(
+                    self.validations,
+                    (param,),
+                    kwargs[param],
+                    configuration=self.api_client.configuration
+                )
+
+        if kwargs['_check_input_type'] is False:
+            return
+
+        for key, value in six.iteritems(kwargs):
+            fixed_val = validate_and_convert_types(
+                value,
+                self.openapi_types[key],
+                [key],
+                False,
+                kwargs['_check_input_type'],
+                configuration=self.api_client.configuration
+            )
+            kwargs[key] = fixed_val
+
+    def __gather_params(self, kwargs):
+        params = {
+            'body': None,
+            'collection_format': {},
+            'file': {},
+            'form': [],
+            'header': {},
+            'path': {},
+            'query': []
+        }
+
+        for param_name, param_value in six.iteritems(kwargs):
+            param_location = self.location_map.get(param_name)
+            if param_location is None:
+                continue
+            if param_location:
+                if param_location == 'body':
+                    params['body'] = param_value
+                    continue
+                base_name = self.attribute_map[param_name]
+                if (param_location == 'form' and
+                        self.openapi_types[param_name] == (file_type,)):
+                    params['file'][param_name] = [param_value]
+                elif (param_location == 'form' and
+                        self.openapi_types[param_name] == ([file_type],)):
+                    # param_value is already a list
+                    params['file'][param_name] = param_value
+                elif param_location in {'form', 'query'}:
+                    param_value_full = (base_name, param_value)
+                    params[param_location].append(param_value_full)
+                if param_location not in {'form', 'query'}:
+                    params[param_location][base_name] = param_value
+                collection_format = self.collection_format_map.get(param_name)
+                if collection_format:
+                    params['collection_format'][base_name] = collection_format
+
+        return params
+
+    def __call__(self, *args, **kwargs):
+        """ This method is invoked when endpoints are called
+        Example:
+        pet_api = PetApi()
+        pet_api.add_pet  # this is an instance of the class Endpoint
+        pet_api.add_pet()  # this invokes pet_api.add_pet.__call__()
+        which then invokes the callable functions stored in that endpoint at
+        pet_api.add_pet.callable or self.callable in this class
+        """
+        return self.callable(self, *args, **kwargs)
+
+    def call_with_http_info(self, **kwargs):
+
+        try:
+            index = self.api_client.configuration.server_operation_index.get(
+                self.settings['operation_id'], self.api_client.configuration.server_index
+            ) if kwargs['_host_index'] is None else kwargs['_host_index']
+            server_variables = self.api_client.configuration.server_operation_variables.get(
+                self.settings['operation_id'], self.api_client.configuration.server_variables
+            )
+            _host = self.api_client.configuration.get_host_from_settings(
+                index, variables=server_variables, servers=self.settings['servers']
+            )
+        except IndexError:
+            if self.settings['servers']:
+                raise ApiValueError(
+                    "Invalid host index. Must be 0 <= index < %s" %
+                    len(self.settings['servers'])
+                )
+            _host = None
+
+        for key, value in six.iteritems(kwargs):
+            if key not in self.params_map['all']:
+                raise ApiTypeError(
+                    "Got an unexpected parameter '%s'"
+                    " to method `%s`" %
+                    (key, self.settings['operation_id'])
+                )
+            # only throw this nullable ApiValueError if _check_input_type
+            # is False, if _check_input_type==True we catch this case
+            # in self.__validate_inputs
+            if (key not in self.params_map['nullable'] and value is None
+                    and kwargs['_check_input_type'] is False):
+                raise ApiValueError(
+                    "Value may not be None for non-nullable parameter `%s`"
+                    " when calling `%s`" %
+                    (key, self.settings['operation_id'])
+                )
+
+        for key in self.params_map['required']:
+            if key not in kwargs.keys():
+                raise ApiValueError(
+                    "Missing the required parameter `%s` when calling "
+                    "`%s`" % (key, self.settings['operation_id'])
+                )
+
+        self.__validate_inputs(kwargs)
+
+        params = self.__gather_params(kwargs)
+
+        accept_headers_list = self.headers_map['accept']
+        if accept_headers_list:
+            params['header']['Accept'] = self.api_client.select_header_accept(
+                accept_headers_list)
+
+        content_type_headers_list = self.headers_map['content_type']
+        if content_type_headers_list:
+            header_list = self.api_client.select_header_content_type(
+                content_type_headers_list)
+            params['header']['Content-Type'] = header_list
+
+        return self.api_client.call_api(
+            self.settings['endpoint_path'], self.settings['http_method'],
+            params['path'],
+            params['query'],
+            params['header'],
+            body=params['body'],
+            post_params=params['form'],
+            files=params['file'],
+            response_type=self.settings['response_type'],
+            auth_settings=self.settings['auth'],
+            async_req=kwargs['async_req'],
+            _check_type=kwargs['_check_return_type'],
+            _return_http_data_only=kwargs['_return_http_data_only'],
+            _preload_content=kwargs['_preload_content'],
+            _request_timeout=kwargs['_request_timeout'],
+            _host=_host,
+            collection_formats=params['collection_format'])
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/__init__.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/__init__.py
index 41cbd0aa055e..27522f8152a6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/__init__.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/__init__.py
@@ -2,16 +2,19 @@
 
 # flake8: noqa
 
-# import all apis into this package
-# if you have many ampis here with many many models used in each api this may
-# raise a RecursionError
-# to avoid this, import only the api that you directly need like:
-# from .api.pet_api import PetApi
+# Import all APIs into this package.
+# If you have many APIs here with many many models used in each API this may
+# raise a `RecursionError`.
+# In order to avoid this, import only the API that you directly need like:
+#
+#   from .api.pet_api import PetApi
+#
 # or import this package, but before doing it, use:
-# import sys
-# sys.setrecursionlimit(n)
+#
+#   import sys
+#   sys.setrecursionlimit(n)
 
-# import apis into api package
+# Import APIs into API package:
 from petstore_api.api.another_fake_api import AnotherFakeApi
 from petstore_api.api.default_api import DefaultApi
 from petstore_api.api.fake_api import FakeApi
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/configuration.py
index 850cb907b09f..4aca4242723d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/configuration.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/configuration.py
@@ -71,6 +71,15 @@ class Configuration(object):
       received by the server.
     :param signing_info: Configuration parameters for the HTTP signature security scheme.
         Must be an instance of petstore_api.signing.HttpSigningConfiguration
+    :param server_index: Index to servers configuration.
+    :param server_variables: Mapping with string values to replace variables in
+      templated server configuration. The validation of enums is performed for
+      variables with defined enum values before.
+    :param server_operation_index: Mapping from operation ID to an index to server
+      configuration.
+    :param server_operation_variables: Mapping from operation ID to a mapping with
+      string values to replace variables in templated server configuration.
+      The validation of enums is performed for variables with defined enum values before.
 
     :Example:
 
@@ -151,18 +160,28 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host="http://petstore.swagger.io:80/v2",
+    def __init__(self, host=None,
                  api_key=None, api_key_prefix=None,
                  username=None, password=None,
                  discard_unknown_keys=False,
                  disabled_client_side_validations="",
                  signing_info=None,
+                 server_index=None, server_variables=None,
+                 server_operation_index=None, server_operation_variables=None,
                  ):
         """Constructor
         """
-        self.host = host
+        self._base_path = "http://petstore.swagger.io:80/v2" if host is None else host
         """Default Base url
         """
+        self.server_index = 0 if server_index is None and host is None else server_index
+        self.server_operation_index = server_operation_index or {}
+        """Default server index
+        """
+        self.server_variables = server_variables or {}
+        self.server_operation_variables = server_operation_variables or {}
+        """Default server variables
+        """
         self.temp_folder_path = None
         """Temp file folder for downloading files
         """
@@ -255,7 +274,7 @@ def __init__(self, host="http://petstore.swagger.io:80/v2",
         self.retries = None
         """Adding retries to override urllib3 default value 3
         """
-        # Disable client side validation
+        # Enable client side validation
         self.client_side_validation = True
 
     def __deepcopy__(self, memo):
@@ -396,15 +415,16 @@ def logger_format(self, value):
         self.__logger_format = value
         self.logger_formatter = logging.Formatter(self.__logger_format)
 
-    def get_api_key_with_prefix(self, identifier):
+    def get_api_key_with_prefix(self, identifier, alias=None):
         """Gets API key (with prefix if set).
 
         :param identifier: The identifier of apiKey.
+        :param alias: The alternative identifier of apiKey.
         :return: The token for api key authentication.
         """
         if self.refresh_api_key_hook is not None:
             self.refresh_api_key_hook(self)
-        key = self.api_key.get(identifier)
+        key = self.api_key.get(identifier, self.api_key.get(alias) if alias is not None else None)
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
@@ -438,14 +458,18 @@ def auth_settings(self):
                 'type': 'api_key',
                 'in': 'header',
                 'key': 'api_key',
-                'value': self.get_api_key_with_prefix('api_key')
+                'value': self.get_api_key_with_prefix(
+                    'api_key',
+                ),
             }
         if 'api_key_query' in self.api_key:
             auth['api_key_query'] = {
                 'type': 'api_key',
                 'in': 'query',
                 'key': 'api_key_query',
-                'value': self.get_api_key_with_prefix('api_key_query')
+                'value': self.get_api_key_with_prefix(
+                    'api_key_query',
+                ),
             }
         if self.access_token is not None:
             auth['bearer_test'] = {
@@ -535,14 +559,18 @@ def get_host_settings(self):
             }
         ]
 
-    def get_host_from_settings(self, index, variables=None):
+    def get_host_from_settings(self, index, variables=None, servers=None):
         """Gets host URL based on the index and variables
         :param index: array index of the host settings
         :param variables: hash of variable and the corresponding value
+        :param servers: an array of host settings or None
         :return: URL based on host settings
         """
+        if index is None:
+            return self._base_path
+
         variables = {} if variables is None else variables
-        servers = self.get_host_settings()
+        servers = self.get_host_settings() if servers is None else servers
 
         try:
             server = servers[index]
@@ -554,7 +582,7 @@ def get_host_from_settings(self, index, variables=None):
         url = server['url']
 
         # go through variables and replace placeholders
-        for variable_name, variable in server['variables'].items():
+        for variable_name, variable in server.get('variables', {}).items():
             used_value = variables.get(
                 variable_name, variable['default_value'])
 
@@ -569,3 +597,14 @@ def get_host_from_settings(self, index, variables=None):
             url = url.replace("{" + variable_name + "}", used_value)
 
         return url
+
+    @property
+    def host(self):
+        """Return generated host."""
+        return self.get_host_from_settings(self.server_index, variables=self.server_variables)
+
+    @host.setter
+    def host(self, value):
+        """Fix base path."""
+        self._base_path = value
+        self.server_index = None
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py
new file mode 100644
index 000000000000..09c35b5d0d24
--- /dev/null
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py
@@ -0,0 +1,175 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+import re  # noqa: F401
+import sys  # noqa: F401
+
+import six  # noqa: F401
+import nulltype  # noqa: F401
+
+from petstore_api.model_utils import (  # noqa: F401
+    ApiTypeError,
+    ModelComposed,
+    ModelNormal,
+    ModelSimple,
+    cached_property,
+    change_keys_js_to_python,
+    convert_js_args_to_python_args,
+    date,
+    datetime,
+    file_type,
+    int,
+    none_type,
+    str,
+    validate_get_composed_info,
+)
+try:
+    from petstore_api.model import enum_class
+except ImportError:
+    enum_class = sys.modules[
+        'petstore_api.model.enum_class']
+
+
+class AdditionalPropertiesWithArrayOfEnums(ModelNormal):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+
+    Attributes:
+      allowed_values (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          with a capitalized key describing the allowed value and an allowed
+          value. These dicts store the allowed enum values.
+      attribute_map (dict): The key is attribute name
+          and the value is json key in definition.
+      discriminator_value_class_map (dict): A dict to go from the discriminator
+          variable value to the discriminator class name.
+      validations (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          that stores validations for max_length, min_length, max_items,
+          min_items, exclusive_maximum, inclusive_maximum, exclusive_minimum,
+          inclusive_minimum, and regex.
+      additional_properties_type (tuple): A tuple of classes accepted
+          as additional properties values.
+    """
+
+    allowed_values = {
+    }
+
+    validations = {
+    }
+
+    additional_properties_type = ([enum_class.EnumClass],)  # noqa: E501
+
+    _nullable = False
+
+    @cached_property
+    def openapi_types():
+        """
+        This must be a class method so a model may have properties that are
+        of type self, this ensures that we don't create a cyclic import
+
+        Returns
+            openapi_types (dict): The key is attribute name
+                and the value is attribute type.
+        """
+        return {
+        }
+
+    @cached_property
+    def discriminator():
+        return None
+
+    attribute_map = {
+    }
+
+    _composed_schemas = {}
+
+    required_properties = set([
+        '_data_store',
+        '_check_type',
+        '_spec_property_naming',
+        '_path_to_item',
+        '_configuration',
+        '_visited_composed_classes',
+    ])
+
+    @convert_js_args_to_python_args
+    def __init__(self, *args, **kwargs):  # noqa: E501
+        """additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums - a model defined in OpenAPI
+
+        Keyword Args:
+            _check_type (bool): if True, values for parameters in openapi_types
+                                will be type checked and a TypeError will be
+                                raised if the wrong type is input.
+                                Defaults to True
+            _path_to_item (tuple/list): This is a list of keys or values to
+                                drill down to the model in received_data
+                                when deserializing a response
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
+            _configuration (Configuration): the instance to use when
+                                deserializing a file_type parameter.
+                                If passed, type conversion is attempted
+                                If omitted no type conversion is done.
+            _visited_composed_classes (tuple): This stores a tuple of
+                                classes that we have traveled through so that
+                                if we see that class again we will not use its
+                                discriminator again.
+                                When traveling through a discriminator, the
+                                composed schema that is
+                                is traveled through is added to this set.
+                                For example if Animal has a discriminator
+                                petType and we pass in "Dog", and the class Dog
+                                allOf includes Animal, we move through Animal
+                                once using the discriminator, and pick Dog.
+                                Then in Dog, we will make an instance of the
+                                Animal class but this time we won't travel
+                                through its discriminator because we passed in
+                                _visited_composed_classes = (Animal,)
+        """
+
+        _check_type = kwargs.pop('_check_type', True)
+        _spec_property_naming = kwargs.pop('_spec_property_naming', False)
+        _path_to_item = kwargs.pop('_path_to_item', ())
+        _configuration = kwargs.pop('_configuration', None)
+        _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
+
+        if args:
+            raise ApiTypeError(
+                "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
+                    args,
+                    self.__class__.__name__,
+                ),
+                path_to_item=_path_to_item,
+                valid_classes=(self.__class__,),
+            )
+
+        self._data_store = {}
+        self._check_type = _check_type
+        self._spec_property_naming = _spec_property_naming
+        self._path_to_item = _path_to_item
+        self._configuration = _configuration
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
+
+        for var_name, var_value in six.iteritems(kwargs):
+            if var_name not in self.attribute_map and \
+                        self._configuration is not None and \
+                        self._configuration.discard_unknown_keys and \
+                        self.additional_properties_type is None:
+                # discard variable.
+                continue
+            setattr(self, var_name, var_value)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py
index 3e6d723ff2b2..6f6ea3351a74 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py
@@ -88,6 +88,8 @@ def openapi_types():
     def discriminator():
         return None
 
+    attribute_map = {}
+
     _composed_schemas = None
 
     required_properties = set([
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py
index 0bea865e36ca..302cc30d9798 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py
@@ -88,6 +88,8 @@ def openapi_types():
     def discriminator():
         return None
 
+    attribute_map = {}
+
     _composed_schemas = None
 
     required_properties = set([
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py
index 3fa95b69d0c9..896984fc77c2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py
@@ -88,6 +88,8 @@ def openapi_types():
     def discriminator():
         return None
 
+    attribute_map = {}
+
     _composed_schemas = None
 
     required_properties = set([
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum.py
index 64311e838363..4efdce9d10c5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum.py
@@ -89,6 +89,8 @@ def openapi_types():
     def discriminator():
         return None
 
+    attribute_map = {}
+
     _composed_schemas = None
 
     required_properties = set([
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum_default_value.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum_default_value.py
index b53b330bbaf6..0fddcf33d6ae 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum_default_value.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum_default_value.py
@@ -88,6 +88,8 @@ def openapi_types():
     def discriminator():
         return None
 
+    attribute_map = {}
+
     _composed_schemas = None
 
     required_properties = set([
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum_integer.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum_integer.py
index 71d192b54f1c..ea44f5004428 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum_integer.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum_integer.py
@@ -88,6 +88,8 @@ def openapi_types():
     def discriminator():
         return None
 
+    attribute_map = {}
+
     _composed_schemas = None
 
     required_properties = set([
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum_integer_default_value.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum_integer_default_value.py
index 2deaeae1932a..46d5c61d310b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum_integer_default_value.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/outer_enum_integer_default_value.py
@@ -88,6 +88,8 @@ def openapi_types():
     def discriminator():
         return None
 
+    attribute_map = {}
+
     _composed_schemas = None
 
     required_properties = set([
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py
index 982115862d62..299a61dc1cc0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py
@@ -1218,7 +1218,7 @@ def is_type_nullable(input_type):
     if issubclass(input_type, OpenApiModel) and input_type._nullable:
         return True
     if issubclass(input_type, ModelComposed):
-        # If oneOf/anyOf, check if the 'null' type is one of the allowed types.          
+        # If oneOf/anyOf, check if the 'null' type is one of the allowed types.
         for t in input_type._composed_schemas.get('oneOf', ()):
             if is_type_nullable(t): return True
         for t in input_type._composed_schemas.get('anyOf', ()):
@@ -1242,7 +1242,7 @@ def is_valid_type(input_class_simple, valid_classes):
             input_class_simple is none_type):
         for valid_class in valid_classes:
             if input_class_simple is none_type and is_type_nullable(valid_class):
-                # Schema is oneOf/anyOf and the 'null' type is one of the allowed types.            
+                # Schema is oneOf/anyOf and the 'null' type is one of the allowed types.
                 return True
             if not (issubclass(valid_class, OpenApiModel) and valid_class.discriminator):
                 continue
@@ -1405,6 +1405,8 @@ def model_to_dict(model_instance, serialize=True):
                     if hasattr(item[1], '_data_store') else item,
                     value.items()
                 ))
+            elif isinstance(value, ModelSimple):
+                result[attr] = value.value
             elif hasattr(value, '_data_store'):
                 result[attr] = model_to_dict(value, serialize=serialize)
             else:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/__init__.py
index 7f3b8ea8ed9a..3783cbc42783 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/__init__.py
@@ -12,6 +12,7 @@
 # sys.setrecursionlimit(n)
 
 from petstore_api.model.additional_properties_class import AdditionalPropertiesClass
+from petstore_api.model.additional_properties_with_array_of_enums import AdditionalPropertiesWithArrayOfEnums
 from petstore_api.model.address import Address
 from petstore_api.model.animal import Animal
 from petstore_api.model.animal_farm import AnimalFarm
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_additional_properties_with_array_of_enums.py b/samples/openapi3/client/petstore/python-experimental/test/test_additional_properties_with_array_of_enums.py
new file mode 100644
index 000000000000..549774072109
--- /dev/null
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_additional_properties_with_array_of_enums.py
@@ -0,0 +1,38 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+import sys
+import unittest
+
+import petstore_api
+from petstore_api.model.additional_properties_with_array_of_enums import AdditionalPropertiesWithArrayOfEnums
+
+
+class TestAdditionalPropertiesWithArrayOfEnums(unittest.TestCase):
+    """AdditionalPropertiesWithArrayOfEnums unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAdditionalPropertiesWithArrayOfEnums(self):
+        """Test AdditionalPropertiesWithArrayOfEnums"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = AdditionalPropertiesWithArrayOfEnums()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/samples/openapi3/client/petstore/python-experimental/tests/test_api_validation.py b/samples/openapi3/client/petstore/python-experimental/tests/test_api_validation.py
index e9eb0a70f786..ced6a6c23186 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests/test_api_validation.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests/test_api_validation.py
@@ -13,6 +13,7 @@
 import time
 import atexit
 import datetime
+import functools
 import json
 import sys
 import weakref
@@ -21,6 +22,7 @@
 from collections import namedtuple
 
 import petstore_api
+from petstore_api.api import pet_api
 from petstore_api.model import array_of_enums
 from petstore_api.model import format_test
 from petstore_api.model import outer_enum
@@ -44,6 +46,27 @@ def test_configuration(self):
             config.disabled_client_side_validations = 'foo'
         config.disabled_client_side_validations = ""
 
+    def test_servers(self):
+        config = petstore_api.Configuration(server_index=1, server_variables={'version': 'v1'})
+        api_client = petstore_api.ApiClient(config)
+        api = pet_api.PetApi(api_client)
+
+        def request(expected_url, method, url, **kwargs):
+            assert expected_url == url
+            raise RuntimeError('pass')
+
+        api_client.request = functools.partial(request, 'http://path-server-test.petstore.local/v2/pet')
+        try:
+            api.add_pet({'name': 'pet', 'photo_urls': []})
+        except RuntimeError as e:
+            assert "pass" == str(e)
+
+        api_client.request = functools.partial(request, 'https://localhost:8080/v1/pet/123456789')
+        try:
+            api.delete_pet(123456789)
+        except RuntimeError as e:
+            assert "pass" == str(e)
+
     def test_array_of_enums(self):
         data = [
             "placed", None
diff --git a/samples/openapi3/client/petstore/python-experimental/tests/test_http_signature.py b/samples/openapi3/client/petstore/python-experimental/tests/test_http_signature.py
index e8f0dd186a98..2e3227f70d4f 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests/test_http_signature.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests/test_http_signature.py
@@ -294,7 +294,7 @@ def test_valid_http_signature(self):
         api_client.rest_client.pool_manager = mock_pool
 
         mock_pool.set_signing_config(signing_cfg)
-        mock_pool.expect_request('POST', 'http://petstore.swagger.io/v2/pet',
+        mock_pool.expect_request('POST', HOST + '/pet',
                                  body=json.dumps(api_client.sanitize_for_serialization(self.pet)),
                                  headers={'Content-Type': r'application/json',
                                           'Authorization': r'Signature keyId="my-key-id",algorithm="hs2019",created=[0-9]+,'
@@ -325,7 +325,7 @@ def test_valid_http_signature_with_defaults(self):
         api_client.rest_client.pool_manager = mock_pool
 
         mock_pool.set_signing_config(signing_cfg)
-        mock_pool.expect_request('POST', 'http://petstore.swagger.io/v2/pet',
+        mock_pool.expect_request('POST', HOST + '/pet',
                                  body=json.dumps(api_client.sanitize_for_serialization(self.pet)),
                                  headers={'Content-Type': r'application/json',
                                           'Authorization': r'Signature keyId="my-key-id",algorithm="hs2019",created=[0-9]+,'
@@ -361,7 +361,7 @@ def test_valid_http_signature_rsassa_pkcs1v15(self):
         api_client.rest_client.pool_manager = mock_pool
 
         mock_pool.set_signing_config(signing_cfg)
-        mock_pool.expect_request('POST', 'http://petstore.swagger.io/v2/pet',
+        mock_pool.expect_request('POST', HOST + '/pet',
                                  body=json.dumps(api_client.sanitize_for_serialization(self.pet)),
                                  headers={'Content-Type': r'application/json',
                                           'Authorization': r'Signature keyId="my-key-id",algorithm="hs2019",created=[0-9]+,'
@@ -397,7 +397,7 @@ def test_valid_http_signature_rsassa_pss(self):
         api_client.rest_client.pool_manager = mock_pool
 
         mock_pool.set_signing_config(signing_cfg)
-        mock_pool.expect_request('POST', 'http://petstore.swagger.io/v2/pet',
+        mock_pool.expect_request('POST', HOST + '/pet',
                                  body=json.dumps(api_client.sanitize_for_serialization(self.pet)),
                                  headers={'Content-Type': r'application/json',
                                           'Authorization': r'Signature keyId="my-key-id",algorithm="hs2019",created=[0-9]+,'
@@ -433,7 +433,7 @@ def test_valid_http_signature_ec_p521(self):
         api_client.rest_client.pool_manager = mock_pool
 
         mock_pool.set_signing_config(signing_cfg)
-        mock_pool.expect_request('POST', 'http://petstore.swagger.io/v2/pet',
+        mock_pool.expect_request('POST', HOST + '/pet',
                                  body=json.dumps(api_client.sanitize_for_serialization(self.pet)),
                                  headers={'Content-Type': r'application/json',
                                           'Authorization': r'Signature keyId="my-key-id",algorithm="hs2019",created=[0-9]+,'
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py
index 9421b337d4bf..ffb18035db5e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py
@@ -91,6 +91,10 @@ def call_123_test_special_tags_with_http_info(self, client, **kwargs):  # noqa:
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def call_123_test_special_tags_with_http_info(self, client, **kwargs):  # noqa:
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -163,4 +168,5 @@ def call_123_test_special_tags_with_http_info(self, client, **kwargs):  # noqa:
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py
index a14b43c994ce..73fa98052752 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py
@@ -85,6 +85,10 @@ def foo_get_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -100,7 +104,8 @@ def foo_get_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -146,4 +151,5 @@ def foo_get_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py
index 6fe97f5b5cee..b484f561d5f3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py
@@ -85,6 +85,10 @@ def fake_health_get_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -100,7 +104,8 @@ def fake_health_get_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -146,7 +151,8 @@ def fake_health_get_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_http_signature_test(self, pet, **kwargs):  # noqa: E501
         """test http signature authentication  # noqa: E501
@@ -209,6 +215,10 @@ def fake_http_signature_test_with_http_info(self, pet, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -227,7 +237,8 @@ def fake_http_signature_test_with_http_info(self, pet, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -283,7 +294,8 @@ def fake_http_signature_test_with_http_info(self, pet, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_boolean_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_boolean_serialize  # noqa: E501
@@ -340,6 +352,10 @@ def fake_outer_boolean_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -356,7 +372,8 @@ def fake_outer_boolean_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -408,7 +425,8 @@ def fake_outer_boolean_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_composite_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_composite_serialize  # noqa: E501
@@ -465,6 +483,10 @@ def fake_outer_composite_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -481,7 +503,8 @@ def fake_outer_composite_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -533,7 +556,8 @@ def fake_outer_composite_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_number_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_number_serialize  # noqa: E501
@@ -590,6 +614,10 @@ def fake_outer_number_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -606,7 +634,8 @@ def fake_outer_number_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -658,7 +687,8 @@ def fake_outer_number_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def fake_outer_string_serialize(self, **kwargs):  # noqa: E501
         """fake_outer_string_serialize  # noqa: E501
@@ -715,6 +745,10 @@ def fake_outer_string_serialize_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -731,7 +765,8 @@ def fake_outer_string_serialize_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -783,7 +818,8 @@ def fake_outer_string_serialize_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_body_with_file_schema(self, file_schema_test_class, **kwargs):  # noqa: E501
         """test_body_with_file_schema  # noqa: E501
@@ -840,6 +876,10 @@ def test_body_with_file_schema_with_http_info(self, file_schema_test_class, **kw
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -856,7 +896,8 @@ def test_body_with_file_schema_with_http_info(self, file_schema_test_class, **kw
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -908,7 +949,8 @@ def test_body_with_file_schema_with_http_info(self, file_schema_test_class, **kw
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_body_with_query_params(self, query, user, **kwargs):  # noqa: E501
         """test_body_with_query_params  # noqa: E501
@@ -967,6 +1009,10 @@ def test_body_with_query_params_with_http_info(self, query, user, **kwargs):  #
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -984,7 +1030,8 @@ def test_body_with_query_params_with_http_info(self, query, user, **kwargs):  #
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1042,7 +1089,8 @@ def test_body_with_query_params_with_http_info(self, query, user, **kwargs):  #
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_client_model(self, client, **kwargs):  # noqa: E501
         """To test \"client\" model  # noqa: E501
@@ -1099,6 +1147,10 @@ def test_client_model_with_http_info(self, client, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1115,7 +1167,8 @@ def test_client_model_with_http_info(self, client, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1171,7 +1224,8 @@ def test_client_model_with_http_info(self, client, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_endpoint_parameters(self, number, double, pattern_without_delimiter, byte, **kwargs):  # noqa: E501
         """Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트   # noqa: E501
@@ -1280,6 +1334,10 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1309,7 +1367,8 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1427,7 +1486,8 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_enum_parameters(self, **kwargs):  # noqa: E501
         """To test enum parameters  # noqa: E501
@@ -1512,6 +1572,10 @@ def test_enum_parameters_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1535,7 +1599,8 @@ def test_enum_parameters_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1600,7 +1665,8 @@ def test_enum_parameters_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_group_parameters(self, required_string_group, required_boolean_group, required_int64_group, **kwargs):  # noqa: E501
         """Fake endpoint to test group parameters (optional)  # noqa: E501
@@ -1677,6 +1743,10 @@ def test_group_parameters_with_http_info(self, required_string_group, required_b
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1698,7 +1768,8 @@ def test_group_parameters_with_http_info(self, required_string_group, required_b
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1764,7 +1835,8 @@ def test_group_parameters_with_http_info(self, required_string_group, required_b
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_inline_additional_properties(self, request_body, **kwargs):  # noqa: E501
         """test inline additionalProperties  # noqa: E501
@@ -1819,6 +1891,10 @@ def test_inline_additional_properties_with_http_info(self, request_body, **kwarg
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1835,7 +1911,8 @@ def test_inline_additional_properties_with_http_info(self, request_body, **kwarg
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1887,7 +1964,8 @@ def test_inline_additional_properties_with_http_info(self, request_body, **kwarg
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_json_form_data(self, param, param2, **kwargs):  # noqa: E501
         """test json serialization of form data  # noqa: E501
@@ -1946,6 +2024,10 @@ def test_json_form_data_with_http_info(self, param, param2, **kwargs):  # noqa:
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1963,7 +2045,8 @@ def test_json_form_data_with_http_info(self, param, param2, **kwargs):  # noqa:
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -2021,7 +2104,8 @@ def test_json_form_data_with_http_info(self, param, param2, **kwargs):  # noqa:
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def test_query_parameter_collection_format(self, pipe, ioutil, http, url, context, **kwargs):  # noqa: E501
         """test_query_parameter_collection_format  # noqa: E501
@@ -2094,6 +2178,10 @@ def test_query_parameter_collection_format_with_http_info(self, pipe, ioutil, ht
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2114,7 +2202,8 @@ def test_query_parameter_collection_format_with_http_info(self, pipe, ioutil, ht
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -2191,4 +2280,5 @@ def test_query_parameter_collection_format_with_http_info(self, pipe, ioutil, ht
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
index 19d22cd10d65..9295236c5691 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
@@ -91,6 +91,10 @@ def test_classname_with_http_info(self, client, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def test_classname_with_http_info(self, client, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -163,4 +168,5 @@ def test_classname_with_http_info(self, client, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py
index 8c8f5d936719..468267e78729 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py
@@ -89,6 +89,10 @@ def add_pet_with_http_info(self, pet, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -118,7 +122,8 @@ def add_pet_with_http_info(self, pet, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -171,7 +176,8 @@ def add_pet_with_http_info(self, pet, **kwargs):  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
             _host=local_var_host,
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def delete_pet(self, pet_id, **kwargs):  # noqa: E501
         """Deletes a pet  # noqa: E501
@@ -230,6 +236,10 @@ def delete_pet_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -247,7 +257,8 @@ def delete_pet_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -297,7 +308,8 @@ def delete_pet_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def find_pets_by_status(self, status, **kwargs):  # noqa: E501
         """Finds Pets by status  # noqa: E501
@@ -354,6 +366,10 @@ def find_pets_by_status_with_http_info(self, status, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -370,7 +386,8 @@ def find_pets_by_status_with_http_info(self, status, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -423,7 +440,8 @@ def find_pets_by_status_with_http_info(self, status, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def find_pets_by_tags(self, tags, **kwargs):  # noqa: E501
         """Finds Pets by tags  # noqa: E501
@@ -480,6 +498,10 @@ def find_pets_by_tags_with_http_info(self, tags, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -496,7 +518,8 @@ def find_pets_by_tags_with_http_info(self, tags, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -549,7 +572,8 @@ def find_pets_by_tags_with_http_info(self, tags, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_pet_by_id(self, pet_id, **kwargs):  # noqa: E501
         """Find pet by ID  # noqa: E501
@@ -606,6 +630,10 @@ def get_pet_by_id_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -622,7 +650,8 @@ def get_pet_by_id_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -674,7 +703,8 @@ def get_pet_by_id_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def update_pet(self, pet, **kwargs):  # noqa: E501
         """Update an existing pet  # noqa: E501
@@ -729,6 +759,10 @@ def update_pet_with_http_info(self, pet, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -758,7 +792,8 @@ def update_pet_with_http_info(self, pet, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -811,7 +846,8 @@ def update_pet_with_http_info(self, pet, **kwargs):  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
             _host=local_var_host,
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def update_pet_with_form(self, pet_id, **kwargs):  # noqa: E501
         """Updates a pet in the store with form data  # noqa: E501
@@ -874,6 +910,10 @@ def update_pet_with_form_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -892,7 +932,8 @@ def update_pet_with_form_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -948,7 +989,8 @@ def update_pet_with_form_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def upload_file(self, pet_id, **kwargs):  # noqa: E501
         """uploads an image  # noqa: E501
@@ -1011,6 +1053,10 @@ def upload_file_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1029,7 +1075,8 @@ def upload_file_with_http_info(self, pet_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1089,7 +1136,8 @@ def upload_file_with_http_info(self, pet_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def upload_file_with_required_file(self, pet_id, required_file, **kwargs):  # noqa: E501
         """uploads an image (required)  # noqa: E501
@@ -1152,6 +1200,10 @@ def upload_file_with_required_file_with_http_info(self, pet_id, required_file, *
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1170,7 +1222,8 @@ def upload_file_with_required_file_with_http_info(self, pet_id, required_file, *
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1234,4 +1287,5 @@ def upload_file_with_required_file_with_http_info(self, pet_id, required_file, *
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py
index 2b35556ba815..ea01f1b53ffb 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py
@@ -91,6 +91,10 @@ def delete_order_with_http_info(self, order_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def delete_order_with_http_info(self, order_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -155,7 +160,8 @@ def delete_order_with_http_info(self, order_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_inventory(self, **kwargs):  # noqa: E501
         """Returns pet inventories by status  # noqa: E501
@@ -208,6 +214,10 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -223,7 +233,8 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -269,7 +280,8 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_order_by_id(self, order_id, **kwargs):  # noqa: E501
         """Find purchase order by ID  # noqa: E501
@@ -326,6 +338,10 @@ def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -342,7 +358,8 @@ def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -398,7 +415,8 @@ def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def place_order(self, order, **kwargs):  # noqa: E501
         """Place an order for a pet  # noqa: E501
@@ -453,6 +471,10 @@ def place_order_with_http_info(self, order, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -469,7 +491,8 @@ def place_order_with_http_info(self, order, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -525,4 +548,5 @@ def place_order_with_http_info(self, order, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py
index 38d0b4ee5b9f..d0c057dba195 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py
@@ -91,6 +91,10 @@ def create_user_with_http_info(self, user, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -107,7 +111,8 @@ def create_user_with_http_info(self, user, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -159,7 +164,8 @@ def create_user_with_http_info(self, user, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def create_users_with_array_input(self, user, **kwargs):  # noqa: E501
         """Creates list of users with given input array  # noqa: E501
@@ -214,6 +220,10 @@ def create_users_with_array_input_with_http_info(self, user, **kwargs):  # noqa:
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -230,7 +240,8 @@ def create_users_with_array_input_with_http_info(self, user, **kwargs):  # noqa:
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -282,7 +293,8 @@ def create_users_with_array_input_with_http_info(self, user, **kwargs):  # noqa:
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def create_users_with_list_input(self, user, **kwargs):  # noqa: E501
         """Creates list of users with given input array  # noqa: E501
@@ -337,6 +349,10 @@ def create_users_with_list_input_with_http_info(self, user, **kwargs):  # noqa:
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -353,7 +369,8 @@ def create_users_with_list_input_with_http_info(self, user, **kwargs):  # noqa:
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -405,7 +422,8 @@ def create_users_with_list_input_with_http_info(self, user, **kwargs):  # noqa:
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def delete_user(self, username, **kwargs):  # noqa: E501
         """Delete user  # noqa: E501
@@ -462,6 +480,10 @@ def delete_user_with_http_info(self, username, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -478,7 +500,8 @@ def delete_user_with_http_info(self, username, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -526,7 +549,8 @@ def delete_user_with_http_info(self, username, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def get_user_by_name(self, username, **kwargs):  # noqa: E501
         """Get user by user name  # noqa: E501
@@ -581,6 +605,10 @@ def get_user_by_name_with_http_info(self, username, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -597,7 +625,8 @@ def get_user_by_name_with_http_info(self, username, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -649,7 +678,8 @@ def get_user_by_name_with_http_info(self, username, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def login_user(self, username, password, **kwargs):  # noqa: E501
         """Logs user into the system  # noqa: E501
@@ -708,6 +738,10 @@ def login_user_with_http_info(self, username, password, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -725,7 +759,8 @@ def login_user_with_http_info(self, username, password, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -783,7 +818,8 @@ def login_user_with_http_info(self, username, password, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def logout_user(self, **kwargs):  # noqa: E501
         """Logs out current logged in user session  # noqa: E501
@@ -834,6 +870,10 @@ def logout_user_with_http_info(self, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -849,7 +889,8 @@ def logout_user_with_http_info(self, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -891,7 +932,8 @@ def logout_user_with_http_info(self, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
 
     def update_user(self, username, user, **kwargs):  # noqa: E501
         """Updated user  # noqa: E501
@@ -952,6 +994,10 @@ def update_user_with_http_info(self, username, user, **kwargs):  # noqa: E501
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
         :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
@@ -969,7 +1015,8 @@ def update_user_with_http_info(self, username, user, **kwargs):  # noqa: E501
                 'async_req',
                 '_return_http_data_only',
                 '_preload_content',
-                '_request_timeout'
+                '_request_timeout',
+                '_request_auth'
             ]
         )
 
@@ -1027,4 +1074,5 @@ def update_user_with_http_info(self, username, user, **kwargs):  # noqa: E501
             _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
             _preload_content=local_var_params.get('_preload_content', True),
             _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api_client.py b/samples/openapi3/client/petstore/python/petstore_api/api_client.py
index 7b1b0010a49a..80dbae6b7b8f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api_client.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api_client.py
@@ -122,7 +122,8 @@ def __call_api(
             query_params=None, header_params=None, body=None, post_params=None,
             files=None, response_type=None, auth_settings=None,
             _return_http_data_only=None, collection_formats=None,
-            _preload_content=True, _request_timeout=None, _host=None):
+            _preload_content=True, _request_timeout=None, _host=None,
+            _request_auth=None):
 
         config = self.configuration
 
@@ -163,7 +164,9 @@ def __call_api(
             post_params.extend(self.files_parameters(files))
 
         # auth setting
-        self.update_params_for_auth(header_params, query_params, auth_settings)
+        self.update_params_for_auth(
+            header_params, query_params, auth_settings,
+            request_auth=_request_auth)
 
         # body
         if body:
@@ -323,7 +326,8 @@ def call_api(self, resource_path, method,
                  body=None, post_params=None, files=None,
                  response_type=None, auth_settings=None, async_req=None,
                  _return_http_data_only=None, collection_formats=None,
-                 _preload_content=True, _request_timeout=None, _host=None):
+                 _preload_content=True, _request_timeout=None, _host=None,
+                 _request_auth=None):
         """Makes the HTTP request (synchronous) and returns deserialized data.
 
         To make an async_req request, set the async_req parameter.
@@ -353,6 +357,10 @@ def call_api(self, resource_path, method,
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_token: dict, optional
         :return:
             If async_req parameter is True,
             the request will be called asynchronously.
@@ -366,7 +374,8 @@ def call_api(self, resource_path, method,
                                    body, post_params, files,
                                    response_type, auth_settings,
                                    _return_http_data_only, collection_formats,
-                                   _preload_content, _request_timeout, _host)
+                                   _preload_content, _request_timeout, _host,
+                                   _request_auth)
 
         return self.pool.apply_async(self.__call_api, (resource_path,
                                                        method, path_params,
@@ -379,7 +388,7 @@ def call_api(self, resource_path, method,
                                                        collection_formats,
                                                        _preload_content,
                                                        _request_timeout,
-                                                       _host))
+                                                       _host, _request_auth))
 
     def request(self, method, url, query_params=None, headers=None,
                 post_params=None, body=None, _preload_content=True,
@@ -526,29 +535,45 @@ def select_header_content_type(self, content_types):
         else:
             return content_types[0]
 
-    def update_params_for_auth(self, headers, querys, auth_settings):
+    def update_params_for_auth(self, headers, querys, auth_settings,
+                               request_auth=None):
         """Updates header and query params based on authentication setting.
 
         :param headers: Header parameters dict to be updated.
         :param querys: Query parameters tuple list to be updated.
         :param auth_settings: Authentication setting identifiers list.
+        :param request_auth: if set, the provided settings will
+                             override the token in the configuration.
         """
         if not auth_settings:
             return
 
+        if request_auth:
+            self._apply_auth_params(headers, querys, request_auth)
+            return
+
         for auth in auth_settings:
             auth_setting = self.configuration.auth_settings().get(auth)
             if auth_setting:
-                if auth_setting['in'] == 'cookie':
-                    headers['Cookie'] = auth_setting['value']
-                elif auth_setting['in'] == 'header':
-                    headers[auth_setting['key']] = auth_setting['value']
-                elif auth_setting['in'] == 'query':
-                    querys.append((auth_setting['key'], auth_setting['value']))
-                else:
-                    raise ApiValueError(
-                        'Authentication token must be in `query` or `header`'
-                    )
+                self._apply_auth_params(headers, querys, auth_setting)
+
+    def _apply_auth_params(self, headers, querys, auth_setting):
+        """Updates the request parameters based on a single auth_setting
+
+        :param headers: Header parameters dict to be updated.
+        :param querys: Query parameters tuple list to be updated.
+        :param auth_setting: auth settings for the endpoint
+        """
+        if auth_setting['in'] == 'cookie':
+            headers['Cookie'] = auth_setting['value']
+        elif auth_setting['in'] == 'header':
+            headers[auth_setting['key']] = auth_setting['value']
+        elif auth_setting['in'] == 'query':
+            querys.append((auth_setting['key'], auth_setting['value']))
+        else:
+            raise ApiValueError(
+                'Authentication token must be in `query` or `header`'
+            )
 
     def __deserialize_file(self, response):
         """Deserializes body to file
diff --git a/samples/openapi3/client/petstore/python/petstore_api/configuration.py b/samples/openapi3/client/petstore/python/petstore_api/configuration.py
index 850cb907b09f..4aca4242723d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/configuration.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/configuration.py
@@ -71,6 +71,15 @@ class Configuration(object):
       received by the server.
     :param signing_info: Configuration parameters for the HTTP signature security scheme.
         Must be an instance of petstore_api.signing.HttpSigningConfiguration
+    :param server_index: Index to servers configuration.
+    :param server_variables: Mapping with string values to replace variables in
+      templated server configuration. The validation of enums is performed for
+      variables with defined enum values before.
+    :param server_operation_index: Mapping from operation ID to an index to server
+      configuration.
+    :param server_operation_variables: Mapping from operation ID to a mapping with
+      string values to replace variables in templated server configuration.
+      The validation of enums is performed for variables with defined enum values before.
 
     :Example:
 
@@ -151,18 +160,28 @@ class Configuration(object):
 
     _default = None
 
-    def __init__(self, host="http://petstore.swagger.io:80/v2",
+    def __init__(self, host=None,
                  api_key=None, api_key_prefix=None,
                  username=None, password=None,
                  discard_unknown_keys=False,
                  disabled_client_side_validations="",
                  signing_info=None,
+                 server_index=None, server_variables=None,
+                 server_operation_index=None, server_operation_variables=None,
                  ):
         """Constructor
         """
-        self.host = host
+        self._base_path = "http://petstore.swagger.io:80/v2" if host is None else host
         """Default Base url
         """
+        self.server_index = 0 if server_index is None and host is None else server_index
+        self.server_operation_index = server_operation_index or {}
+        """Default server index
+        """
+        self.server_variables = server_variables or {}
+        self.server_operation_variables = server_operation_variables or {}
+        """Default server variables
+        """
         self.temp_folder_path = None
         """Temp file folder for downloading files
         """
@@ -255,7 +274,7 @@ def __init__(self, host="http://petstore.swagger.io:80/v2",
         self.retries = None
         """Adding retries to override urllib3 default value 3
         """
-        # Disable client side validation
+        # Enable client side validation
         self.client_side_validation = True
 
     def __deepcopy__(self, memo):
@@ -396,15 +415,16 @@ def logger_format(self, value):
         self.__logger_format = value
         self.logger_formatter = logging.Formatter(self.__logger_format)
 
-    def get_api_key_with_prefix(self, identifier):
+    def get_api_key_with_prefix(self, identifier, alias=None):
         """Gets API key (with prefix if set).
 
         :param identifier: The identifier of apiKey.
+        :param alias: The alternative identifier of apiKey.
         :return: The token for api key authentication.
         """
         if self.refresh_api_key_hook is not None:
             self.refresh_api_key_hook(self)
-        key = self.api_key.get(identifier)
+        key = self.api_key.get(identifier, self.api_key.get(alias) if alias is not None else None)
         if key:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
@@ -438,14 +458,18 @@ def auth_settings(self):
                 'type': 'api_key',
                 'in': 'header',
                 'key': 'api_key',
-                'value': self.get_api_key_with_prefix('api_key')
+                'value': self.get_api_key_with_prefix(
+                    'api_key',
+                ),
             }
         if 'api_key_query' in self.api_key:
             auth['api_key_query'] = {
                 'type': 'api_key',
                 'in': 'query',
                 'key': 'api_key_query',
-                'value': self.get_api_key_with_prefix('api_key_query')
+                'value': self.get_api_key_with_prefix(
+                    'api_key_query',
+                ),
             }
         if self.access_token is not None:
             auth['bearer_test'] = {
@@ -535,14 +559,18 @@ def get_host_settings(self):
             }
         ]
 
-    def get_host_from_settings(self, index, variables=None):
+    def get_host_from_settings(self, index, variables=None, servers=None):
         """Gets host URL based on the index and variables
         :param index: array index of the host settings
         :param variables: hash of variable and the corresponding value
+        :param servers: an array of host settings or None
         :return: URL based on host settings
         """
+        if index is None:
+            return self._base_path
+
         variables = {} if variables is None else variables
-        servers = self.get_host_settings()
+        servers = self.get_host_settings() if servers is None else servers
 
         try:
             server = servers[index]
@@ -554,7 +582,7 @@ def get_host_from_settings(self, index, variables=None):
         url = server['url']
 
         # go through variables and replace placeholders
-        for variable_name, variable in server['variables'].items():
+        for variable_name, variable in server.get('variables', {}).items():
             used_value = variables.get(
                 variable_name, variable['default_value'])
 
@@ -569,3 +597,14 @@ def get_host_from_settings(self, index, variables=None):
             url = url.replace("{" + variable_name + "}", used_value)
 
         return url
+
+    @property
+    def host(self):
+        """Return generated host."""
+        return self.get_host_from_settings(self.server_index, variables=self.server_variables)
+
+    @host.setter
+    def host(self, value):
+        """Fix base path."""
+        self._base_path = value
+        self.server_index = None
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/.gitignore b/samples/openapi3/client/petstore/typescript/builds/default/.gitignore
new file mode 100644
index 000000000000..1521c8b7652b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/samples/server/petstore/php-silex/.openapi-generator-ignore b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator-ignore
similarity index 100%
rename from samples/server/petstore/php-silex/.openapi-generator-ignore
rename to samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator-ignore
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/FILES
new file mode 100644
index 000000000000..d21a391e0080
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/FILES
@@ -0,0 +1,32 @@
+.gitignore
+README.md
+apis/PetApi.ts
+apis/StoreApi.ts
+apis/UserApi.ts
+apis/baseapi.ts
+apis/exception.ts
+auth/auth.ts
+configuration.ts
+git_push.sh
+http/http.ts
+http/isomorphic-fetch.ts
+index.ts
+middleware.ts
+models/ApiResponse.ts
+models/Category.ts
+models/InlineObject.ts
+models/InlineObject1.ts
+models/ObjectSerializer.ts
+models/Order.ts
+models/Pet.ts
+models/Tag.ts
+models/User.ts
+models/all.ts
+package.json
+rxjsStub.ts
+servers.ts
+tsconfig.json
+types/ObjectParamAPI.ts
+types/ObservableAPI.ts
+types/PromiseAPI.ts
+util.ts
diff --git a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION
similarity index 100%
rename from samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
rename to samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/README.md b/samples/openapi3/client/petstore/typescript/builds/default/README.md
new file mode 100644
index 000000000000..80b1ac5cc98b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/README.md
@@ -0,0 +1,30 @@
+## ts-petstore-client@1.0.0
+
+This generator creates TypeScript/JavaScript client that utilizes fetch-api. 
+
+### Building
+
+To build and compile the typescript sources to javascript use:
+```
+npm install
+npm run build
+```
+
+### Publishing
+
+First build the package then run ```npm publish```
+
+### Consuming
+
+navigate to the folder of your consuming project and run one of the following commands.
+
+_published:_
+
+```
+npm install ts-petstore-client@1.0.0 --save
+```
+
+_unPublished (not recommended):_
+
+```
+npm install PATH_TO_GENERATED_PACKAGE --save
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts
new file mode 100644
index 000000000000..7041341a7089
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts
@@ -0,0 +1,650 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi';
+import {Configuration} from '../configuration';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
+import * as FormData from "form-data";
+import {ObjectSerializer} from '../models/ObjectSerializer';
+import {ApiException} from './exception';
+import {isCodeInRange} from '../util';
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Pet } from '../models/Pet';
+
+/**
+ * no description
+ */
+export class PetApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public async addPet(pet: Pet, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'pet' is not null or undefined
+        if (pet === null || pet === undefined) {
+            throw new RequiredError('Required parameter pet was null or undefined when calling addPet.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json",
+        
+            "application/xml"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(pet, "Pet", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public async deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling deletePet.');
+        }
+
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+		requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'status' is not null or undefined
+        if (status === null || status === undefined) {
+            throw new RequiredError('Required parameter status was null or undefined when calling findPetsByStatus.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/findByStatus';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (status !== undefined) {
+        	requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public async findPetsByTags(tags: Array<string>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'tags' is not null or undefined
+        if (tags === null || tags === undefined) {
+            throw new RequiredError('Required parameter tags was null or undefined when calling findPetsByTags.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/findByTags';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (tags !== undefined) {
+        	requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public async getPetById(petId: number, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling getPetById.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public async updatePet(pet: Pet, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'pet' is not null or undefined
+        if (pet === null || pet === undefined) {
+            throw new RequiredError('Required parameter pet was null or undefined when calling updatePet.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json",
+        
+            "application/xml"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(pet, "Pet", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public async updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling updatePetWithForm.');
+        }
+
+		
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+		let localVarFormParams = new FormData();
+
+        if (name !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('name', name as any);
+        }
+        if (status !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('status', status as any);
+        }
+		requestContext.setBody(localVarFormParams);
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public async uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling uploadFile.');
+        }
+
+		
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}/uploadImage'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+		let localVarFormParams = new FormData();
+
+        if (additionalMetadata !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('additionalMetadata', additionalMetadata as any);
+        }
+        if (file !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('file', file.data, file.name);
+        }
+		requestContext.setBody(localVarFormParams);
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+}
+
+
+
+export class PetApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to addPet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async addPet(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid input");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deletePet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deletePet(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid pet value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to findPetsByStatus
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async findPetsByStatus(response: ResponseContext): Promise<Array<Pet> > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid status value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to findPetsByTags
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async findPetsByTags(response: ResponseContext): Promise<Array<Pet> > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid tag value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getPetById
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getPetById(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Pet not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updatePet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updatePet(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Pet not found");
+        }
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Validation exception");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updatePetWithForm
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updatePetWithForm(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid input");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to uploadFile
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async uploadFile(response: ResponseContext): Promise<ApiResponse > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: ApiResponse = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "ApiResponse", ""
+            ) as ApiResponse;
+            return body;
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: ApiResponse = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "ApiResponse", ""
+            ) as ApiResponse;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts
new file mode 100644
index 000000000000..09400e99c083
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts
@@ -0,0 +1,295 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi';
+import {Configuration} from '../configuration';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
+import * as FormData from "form-data";
+import {ObjectSerializer} from '../models/ObjectSerializer';
+import {ApiException} from './exception';
+import {isCodeInRange} from '../util';
+
+import { Order } from '../models/Order';
+
+/**
+ * no description
+ */
+export class StoreApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public async deleteOrder(orderId: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new RequiredError('Required parameter orderId was null or undefined when calling deleteOrder.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order/{orderId}'
+            .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public async getInventory(options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+		// Path Params
+    	const localVarPath = '/store/inventory';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public async getOrderById(orderId: number, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new RequiredError('Required parameter orderId was null or undefined when calling getOrderById.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order/{orderId}'
+            .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public async placeOrder(order: Order, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'order' is not null or undefined
+        if (order === null || order === undefined) {
+            throw new RequiredError('Required parameter order was null or undefined when calling placeOrder.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(order, "Order", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+}
+
+
+
+export class StoreApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deleteOrder
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deleteOrder(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Order not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getInventory
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getInventory(response: ResponseContext): Promise<{ [key: string]: number; } > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: { [key: string]: number; } = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "{ [key: string]: number; }", "int32"
+            ) as { [key: string]: number; };
+            return body;
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: { [key: string]: number; } = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "{ [key: string]: number; }", "int32"
+            ) as { [key: string]: number; };
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getOrderById
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getOrderById(response: ResponseContext): Promise<Order > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Order not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to placeOrder
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async placeOrder(response: ResponseContext): Promise<Order > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid Order");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts
new file mode 100644
index 000000000000..1d43ec7a72b4
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts
@@ -0,0 +1,587 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi';
+import {Configuration} from '../configuration';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
+import * as FormData from "form-data";
+import {ObjectSerializer} from '../models/ObjectSerializer';
+import {ApiException} from './exception';
+import {isCodeInRange} from '../util';
+
+import { User } from '../models/User';
+
+/**
+ * no description
+ */
+export class UserApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public async createUser(user: User, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "User", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public async createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithArrayInput.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/createWithArray';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "Array<User>", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public async createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithListInput.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/createWithList';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "Array<User>", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public async deleteUser(username: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling deleteUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public async getUserByName(username: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling getUserByName.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public async loginUser(username: string, password: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling loginUser.');
+        }
+
+		
+        // verify required parameter 'password' is not null or undefined
+        if (password === null || password === undefined) {
+            throw new RequiredError('Required parameter password was null or undefined when calling loginUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/login';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (username !== undefined) {
+        	requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
+        }
+        if (password !== undefined) {
+        	requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Logs out current logged in user session
+     */
+    public async logoutUser(options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+		// Path Params
+    	const localVarPath = '/user/logout';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public async updateUser(username: string, user: User, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling updateUser.');
+        }
+
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling updateUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "User", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+}
+
+
+
+export class UserApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUsersWithArrayInput
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUsersWithArrayInput(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUsersWithListInput
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUsersWithListInput(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deleteUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deleteUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getUserByName
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getUserByName(response: ResponseContext): Promise<User > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: User = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "User", ""
+            ) as User;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: User = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "User", ""
+            ) as User;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to loginUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async loginUser(response: ResponseContext): Promise<string > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: string = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "string", ""
+            ) as string;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username/password supplied");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: string = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "string", ""
+            ) as string;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to logoutUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async logoutUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updateUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updateUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid user supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/baseapi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/baseapi.ts
new file mode 100644
index 000000000000..fe7ee3d15118
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/baseapi.ts
@@ -0,0 +1,37 @@
+import { Configuration } from '../configuration'
+
+/**
+ *
+ * @export
+ */
+export const COLLECTION_FORMATS = {
+    csv: ",",
+    ssv: " ",
+    tsv: "\t",
+    pipes: "|",
+};
+
+
+/**
+ * 
+ * @export
+ * @class BaseAPI
+ */
+export class BaseAPIRequestFactory {
+
+    constructor(protected configuration: Configuration) {
+    }
+};
+
+/**
+ * 
+ * @export
+ * @class RequiredError
+ * @extends {Error}
+ */
+export class RequiredError extends Error {
+    name: "RequiredError" = "RequiredError";
+    constructor(public field: string, msg?: string) {
+        super(msg);
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/exception.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/exception.ts
new file mode 100644
index 000000000000..b76dca5aa4bc
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/exception.ts
@@ -0,0 +1,14 @@
+/**
+ * Represents an error caused by an api call i.e. it has attributes for a HTTP status code 
+ * and the returned body object.
+ *
+ * Example
+ * API returns a ErrorMessageObject whenever HTTP status code is not in [200, 299]
+ * => ApiException(404, someErrorMessageObject)
+ *
+ */
+export class ApiException<T> extends Error {
+	public constructor(public code: number, public body: T) {
+        super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body))  
+	}
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/auth/auth.ts b/samples/openapi3/client/petstore/typescript/builds/default/auth/auth.ts
new file mode 100644
index 000000000000..9d59a0a25580
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/auth/auth.ts
@@ -0,0 +1,102 @@
+// typings for btoa are incorrect
+//@ts-ignore
+import * as btoa from "btoa";
+import { RequestContext } from "../http/http";
+
+/**
+ * Interface authentication schemes.
+ */
+export interface SecurityAuthentication {
+    /*
+     * @return returns the name of the security authentication as specified in OAI
+     */
+    getName(): string;
+
+    /**
+     * Applies the authentication scheme to the request context
+     *
+     * @params context the request context which should use this authentication scheme
+     */
+    applySecurityAuthentication(context: RequestContext): void | Promise<void>;
+}
+
+export interface TokenProvider {
+  getToken(): Promise<string> | string;
+}
+
+/**
+ * Applies apiKey authentication to the request context.
+ */
+export class ApiKeyAuthentication implements SecurityAuthentication {
+    /**
+     * Configures this api key authentication with the necessary properties
+     *
+     * @param apiKey: The api key to be used for every request
+     */
+    public constructor(private apiKey: string) {}
+
+    public getName(): string {
+        return "api_key";
+    }
+
+    public applySecurityAuthentication(context: RequestContext) {
+        context.setHeaderParam("api_key", this.apiKey);
+    }
+}
+
+/**
+ * Applies oauth2 authentication to the request context.
+ */
+export class PetstoreAuthAuthentication implements SecurityAuthentication {
+    // TODO: How to handle oauth2 authentication!
+    public constructor() {}
+
+    public getName(): string {
+        return "petstore_auth";
+    }
+
+    public applySecurityAuthentication(context: RequestContext) {
+        // TODO
+    }
+}
+
+
+export type AuthMethods = {
+    "api_key"?: SecurityAuthentication,
+    "petstore_auth"?: SecurityAuthentication
+}
+
+export type ApiKeyConfiguration = string;
+export type HttpBasicConfiguration = { "username": string, "password": string };
+export type HttpBearerConfiguration = { tokenProvider: TokenProvider };
+export type OAuth2Configuration = string;
+
+export type AuthMethodsConfiguration = {
+    "api_key"?: ApiKeyConfiguration,
+    "petstore_auth"?: OAuth2Configuration
+}
+
+/**
+ * Creates the authentication methods from a swagger description.
+ *
+ */
+export function configureAuthMethods(config: AuthMethodsConfiguration | undefined): AuthMethods {
+    let authMethods: AuthMethods = {}
+
+    if (!config) {
+        return authMethods;
+    }
+
+    if (config["api_key"]) {
+        authMethods["api_key"] = new ApiKeyAuthentication(
+            config["api_key"]
+        );
+    }
+
+    if (config["petstore_auth"]) {
+        authMethods["petstore_auth"] = new PetstoreAuthAuthentication(
+        );
+    }
+
+    return authMethods;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts
new file mode 100644
index 000000000000..b78d85972a4a
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts
@@ -0,0 +1,66 @@
+import { HttpLibrary } from "./http/http";
+import { Middleware, PromiseMiddleware, PromiseMiddlewareWrapper } from "./middleware";
+import { IsomorphicFetchHttpLibrary as DefaultHttpLibrary } from "./http/isomorphic-fetch";
+import { BaseServerConfiguration, server1 } from "./servers";
+import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth";
+
+export interface Configuration {
+    readonly baseServer: BaseServerConfiguration;
+    readonly httpApi: HttpLibrary;
+    readonly middleware: Middleware[];
+    readonly authMethods: AuthMethods;
+}
+
+
+/**
+ * Interface with which a configuration object can be configured.
+ */
+export interface ConfigurationParameters {
+    /**
+     * Default server to use
+     */
+    baseServer?: BaseServerConfiguration;
+    /**
+     * HTTP library to use e.g. IsomorphicFetch
+     */
+    httpApi?: HttpLibrary;
+    /**
+     * The middlewares which will be applied to requests and responses
+     */
+    middleware?: Middleware[];
+    /**
+     * Configures all middlewares using the promise api instead of observables (which Middleware uses)
+     */
+    promiseMiddleware?: PromiseMiddleware[];
+    /**
+     * Configuration for the available authentication methods
+     */
+    authMethods?: AuthMethodsConfiguration
+}
+
+/**
+ * Configuration factory function
+ *
+ * If a property is not included in conf, a default is used:
+ *    - baseServer: server1
+ *    - httpApi: IsomorphicFetchHttpLibrary
+ *    - middleware: []
+ *    - promiseMiddleware: []
+ *    - authMethods: {}
+ *
+ * @param conf partial configuration
+ */
+export function createConfiguration(conf: ConfigurationParameters = {}): Configuration {
+    const configuration: Configuration = {
+        baseServer: conf.baseServer !== undefined ? conf.baseServer : server1,
+        httpApi: conf.httpApi || new DefaultHttpLibrary(),
+        middleware: conf.middleware || [],
+        authMethods: configureAuthMethods(conf.authMethods)
+    };
+    if (conf.promiseMiddleware) {
+        conf.promiseMiddleware.forEach(
+            m => configuration.middleware.push(new PromiseMiddlewareWrapper(m))
+        );
+    }
+    return configuration;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/git_push.sh b/samples/openapi3/client/petstore/typescript/builds/default/git_push.sh
new file mode 100644
index 000000000000..8442b80bb445
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts
new file mode 100644
index 000000000000..4241ca3d329b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts
@@ -0,0 +1,206 @@
+// TODO: evaluate if we can easily get rid of this library
+import * as FormData from "form-data";
+// typings of url-parse are incorrect...
+// @ts-ignore 
+import * as URLParse from "url-parse";
+import { Observable, from } from '../rxjsStub';
+
+export * from './isomorphic-fetch';
+
+/**
+ * Represents an HTTP method.
+ */
+export enum HttpMethod {
+    GET = "GET",
+    HEAD = "HEAD",
+    POST = "POST",
+    PUT = "PUT",
+    DELETE = "DELETE",
+    CONNECT = "CONNECT",
+    OPTIONS = "OPTIONS",
+    TRACE = "TRACE",
+    PATCH = "PATCH"
+}
+
+/**
+ * Represents an HTTP file which will be transferred from or to a server.
+ */
+export type HttpFile = {
+    data: Buffer,
+    name: string
+};
+
+
+export class HttpException extends Error {
+    public constructor(msg: string) {
+        super(msg);
+    }
+}
+
+/**
+ * Represents the body of an outgoing HTTP request.
+ */
+export type RequestBody = undefined | string | FormData;
+
+/**
+ * Represents an HTTP request context
+ */
+export class RequestContext {
+    private headers: { [key: string]: string } = {};
+    private body: RequestBody = undefined;
+    private url: URLParse;
+
+	/**
+	 * Creates the request context using a http method and request resource url
+	 *
+	 * @param url url of the requested resource
+	 * @param httpMethod http method
+	 */
+    public constructor(url: string, private httpMethod: HttpMethod) {
+        this.url = new URLParse(url, true);
+    }
+    
+    /*
+     * Returns the url set in the constructor including the query string
+     *
+     */
+    public getUrl(): string {
+    	return this.url.toString();
+    }
+    
+    /**
+     * Replaces the url set in the constructor with this url.
+     *
+     */
+    public setUrl(url: string) {
+    	this.url = new URLParse(url, true);
+    }
+
+    /**
+     * Sets the body of the http request either as a string or FormData
+     *
+     * Note that setting a body on a HTTP GET, HEAD, DELETE, CONNECT or TRACE
+     * request is discouraged.
+     * https://httpwg.org/http-core/draft-ietf-httpbis-semantics-latest.html#rfc.section.7.3.1
+     *
+     * @param body the body of the request
+     */
+    public setBody(body: RequestBody) {
+        this.body = body;
+    }
+
+    public getHttpMethod(): HttpMethod {
+    	return this.httpMethod;
+    }
+    
+    public getHeaders(): { [key: string]: string } {
+    	return this.headers;
+    }
+
+    public getBody(): RequestBody {
+        return this.body;
+    }
+
+	public setQueryParam(name: string, value: string) {
+        let queryObj = this.url.query;
+        queryObj[name] = value;
+        this.url.set("query", queryObj);
+    }
+
+	/**
+	 *	Sets a cookie with the name and value. NO check  for duplicate cookies is performed
+	 *
+	 */
+    public addCookie(name: string, value: string): void {
+        if (!this.headers["Cookie"]) {
+            this.headers["Cookie"] = "";
+        }
+        this.headers["Cookie"] += name + "=" + value + "; ";
+    }
+
+    public setHeaderParam(key: string, value: string): void  { 
+        this.headers[key] = value;
+    }
+}
+
+export interface ResponseBody {
+    text(): Promise<string>;
+    binary(): Promise<Buffer>;
+}
+
+
+/**
+ * Helper class to generate a `ResponseBody` from binary data
+ */
+export class SelfDecodingBody implements ResponseBody {
+    constructor(private dataSource: Promise<Buffer>) {}
+
+    binary(): Promise<Buffer> {
+        return this.dataSource;
+    }
+
+    async text(): Promise<string> {
+        const data: Buffer = await this.dataSource;
+        return data.toString();
+    }
+}
+
+export class ResponseContext {
+    public constructor(
+        public httpStatusCode: number,
+        public headers: { [key: string]: string },
+        public body: ResponseBody
+    ) {}
+
+    /**
+     * Parse header value in the form `value; param1="value1"`
+     *
+     * E.g. for Content-Type or Content-Disposition
+     * Parameter names are converted to lower case
+     * The first parameter is returned with the key `""`
+     */
+    public getParsedHeader(headerName: string): { [parameter: string]: string } {
+        const result: { [parameter: string]: string } = {};
+        if (!this.headers[headerName]) {
+            return result;
+        }
+
+        const parameters = this.headers[headerName].split(";");
+        for (const parameter of parameters) {
+            let [key, value] = parameter.split("=", 2);
+            key = key.toLowerCase().trim();
+            if (value === undefined) {
+                result[""] = key;
+            } else {
+                value = value.trim();
+                if (value.startsWith('"') && value.endsWith('"')) {
+                    value = value.substring(1, value.length - 1);
+                }
+                result[key] = value;
+            }
+        }
+        return result;
+    }
+
+    public async getBodyAsFile(): Promise<HttpFile> {
+        const data = await this.body.binary();
+        const fileName = this.getParsedHeader("content-disposition")["filename"] || "";
+        return { data, name: fileName };
+    }
+}
+
+export interface HttpLibrary {
+    send(request: RequestContext): Observable<ResponseContext>;
+}
+
+export interface PromiseHttpLibrary {
+    send(request: RequestContext): Promise<ResponseContext>;
+}
+
+export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLibrary {
+  return {
+    send(request: RequestContext): Observable<ResponseContext> {
+      return from(promiseHttpLibrary.send(request));
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/http/isomorphic-fetch.ts b/samples/openapi3/client/petstore/typescript/builds/default/http/isomorphic-fetch.ts
new file mode 100644
index 000000000000..ed390df7ce10
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/http/isomorphic-fetch.ts
@@ -0,0 +1,31 @@
+import {HttpLibrary, RequestContext, ResponseContext} from './http';
+import { from, Observable } from '../rxjsStub';
+import fetch from "node-fetch";
+
+export class IsomorphicFetchHttpLibrary implements HttpLibrary {
+
+    public send(request: RequestContext): Observable<ResponseContext> {
+        let method = request.getHttpMethod().toString();
+        let body = request.getBody();
+
+        const resultPromise = fetch(request.getUrl(), {
+            method: method,
+            body: body as any,
+            headers: request.getHeaders(),
+        }).then((resp: any) => {
+            const headers: { [name: string]: string } = {};
+            resp.headers.forEach((value: string, name: string) => {
+              headers[name] = value;
+            });
+
+            const body = {
+              text: () => resp.text(),
+              binary: () => resp.buffer()
+            };
+            return new ResponseContext(resp.status, headers, body);
+        });
+
+        return from<Promise<ResponseContext>>(resultPromise);
+
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/index.ts b/samples/openapi3/client/petstore/typescript/builds/default/index.ts
new file mode 100644
index 000000000000..fe00e36cbd8a
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/index.ts
@@ -0,0 +1,10 @@
+export * from "./http/http";
+export * from "./auth/auth";
+export * from "./models/all";
+export { createConfiguration, Configuration } from "./configuration"
+export * from "./apis/exception";
+export * from "./servers";
+
+export { PromiseMiddleware as Middleware } from './middleware';
+export { PromisePetApi as PetApi,  PromiseStoreApi as StoreApi,  PromiseUserApi as UserApi } from './types/PromiseAPI';
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/middleware.ts b/samples/openapi3/client/petstore/typescript/builds/default/middleware.ts
new file mode 100644
index 000000000000..46da5d25ef07
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/middleware.ts
@@ -0,0 +1,66 @@
+import {RequestContext, ResponseContext} from './http/http';
+import { Observable, from } from './rxjsStub';
+
+/**
+ * Defines the contract for a middleware intercepting requests before
+ * they are sent (but after the RequestContext was created)
+ * and before the ResponseContext is unwrapped.
+ *
+ */
+export interface Middleware {
+	/**
+	 * Modifies the request before the request is sent. 
+	 *
+	 * @param context RequestContext of a request which is about to be sent to the server
+	 * @returns an observable of the updated request context
+	 *
+	 */
+    pre(context: RequestContext): Observable<RequestContext>;
+    /**
+     * Modifies the returned response before it is deserialized.
+     *
+     * @param context ResponseContext of a sent request
+     * @returns an observable of the modified response context
+     */
+    post(context: ResponseContext): Observable<ResponseContext>;
+}
+
+export class PromiseMiddlewareWrapper implements Middleware {
+
+    public constructor(private middleware: PromiseMiddleware) {
+
+    }
+
+    pre(context: RequestContext): Observable<RequestContext> {
+        return from(this.middleware.pre(context));
+    }
+    
+    post(context: ResponseContext): Observable<ResponseContext> {
+        return from(this.middleware.post(context));
+    }
+
+}
+
+/**
+ * Defines the contract for a middleware intercepting requests before
+ * they are sent (but after the RequestContext was created)
+ * and before the ResponseContext is unwrapped.
+ *
+ */
+export interface PromiseMiddleware {
+	/**
+	 * Modifies the request before the request is sent. 
+	 *
+	 * @param context RequestContext of a request which is about to be sent to the server
+	 * @returns an observable of the updated request context
+	 *
+	 */
+    pre(context: RequestContext): Promise<RequestContext>;
+        /**
+     * Modifies the returned response before it is deserialized.
+     *
+     * @param context ResponseContext of a sent request
+     * @returns an observable of the modified response context
+     */
+    post(context: ResponseContext): Promise<ResponseContext>;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/ApiResponse.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/ApiResponse.ts
new file mode 100644
index 000000000000..300b2de4d9a9
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/ApiResponse.ts
@@ -0,0 +1,52 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* Describes the result of uploading an image resource
+*/
+export class ApiResponse {
+    'code'?: number;
+    'type'?: string;
+    'message'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "code",
+            "baseName": "code",
+            "type": "number",
+            "format": "int32"
+        },
+        {
+            "name": "type",
+            "baseName": "type",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "message",
+            "baseName": "message",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ApiResponse.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/Category.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/Category.ts
new file mode 100644
index 000000000000..9b210d5d501d
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Category.ts
@@ -0,0 +1,45 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* A category for a pet
+*/
+export class Category {
+    'id'?: number;
+    'name'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Category.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/InlineObject.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/InlineObject.ts
new file mode 100644
index 000000000000..54192c1c8356
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/InlineObject.ts
@@ -0,0 +1,48 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+export class InlineObject {
+    /**
+    * Updated name of the pet
+    */
+    'name'?: string;
+    /**
+    * Updated status of the pet
+    */
+    'status'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return InlineObject.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/InlineObject1.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/InlineObject1.ts
new file mode 100644
index 000000000000..02e988674a08
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/InlineObject1.ts
@@ -0,0 +1,48 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+export class InlineObject1 {
+    /**
+    * Additional data to pass to server
+    */
+    'additionalMetadata'?: string;
+    /**
+    * file to upload
+    */
+    'file'?: HttpFile;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "additionalMetadata",
+            "baseName": "additionalMetadata",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "file",
+            "baseName": "file",
+            "type": "HttpFile",
+            "format": "binary"
+        }    ];
+
+    static getAttributeTypeMap() {
+        return InlineObject1.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
new file mode 100644
index 000000000000..f485b39e42b3
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
@@ -0,0 +1,240 @@
+export * from './ApiResponse';
+export * from './Category';
+export * from './InlineObject';
+export * from './InlineObject1';
+export * from './Order';
+export * from './Pet';
+export * from './Tag';
+export * from './User';
+
+import { ApiResponse } from './ApiResponse';
+import { Category } from './Category';
+import { InlineObject } from './InlineObject';
+import { InlineObject1 } from './InlineObject1';
+import { Order    , OrderStatusEnum    } from './Order';
+import { Pet     , PetStatusEnum   } from './Pet';
+import { Tag } from './Tag';
+import { User } from './User';
+
+/* tslint:disable:no-unused-variable */
+let primitives = [
+                    "string",
+                    "boolean",
+                    "double",
+                    "integer",
+                    "long",
+                    "float",
+                    "number",
+                    "any"
+                 ];
+
+const supportedMediaTypes: { [mediaType: string]: number } = {
+  "application/json": Infinity,
+  "application/octet-stream": 0
+}
+
+                 
+let enumsMap: Set<string> = new Set<string>([
+					"OrderStatusEnum",
+					"PetStatusEnum",
+]);
+
+let typeMap: {[index: string]: any} = {
+    "ApiResponse": ApiResponse,
+    "Category": Category,
+    "InlineObject": InlineObject,
+    "InlineObject1": InlineObject1,
+    "Order": Order,
+    "Pet": Pet,
+    "Tag": Tag,
+    "User": User,
+}
+
+export class ObjectSerializer {
+    public static findCorrectType(data: any, expectedType: string) {
+        if (data == undefined) {
+            return expectedType;
+        } else if (primitives.indexOf(expectedType.toLowerCase()) !== -1) {
+            return expectedType;
+        } else if (expectedType === "Date") {
+            return expectedType;
+        } else {
+            if (enumsMap.has(expectedType)) {
+                return expectedType;
+            }
+
+            if (!typeMap[expectedType]) {
+                return expectedType; // w/e we don't know the type
+            }
+
+            // Check the discriminator
+            let discriminatorProperty = typeMap[expectedType].discriminator;
+            if (discriminatorProperty == null) {
+                return expectedType; // the type does not have a discriminator. use it.
+            } else {
+                if (data[discriminatorProperty]) {
+                    var discriminatorType = data[discriminatorProperty];
+                    if(typeMap[discriminatorType]){
+                        return discriminatorType; // use the type given in the discriminator
+                    } else {
+                        return expectedType; // discriminator did not map to a type
+                    }
+                } else {
+                    return expectedType; // discriminator was not present (or an empty string)
+                }
+            }
+        }
+    }
+
+    public static serialize(data: any, type: string, format: string) {
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.serialize(date, subType, format));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            if (format == "date") {
+                let month = data.getMonth()+1
+                month = month < 10 ? "0" + month.toString() : month.toString()
+                let day = data.getDate();
+                day = day < 10 ? "0" + day.toString() : day.toString();
+
+                return data.getFullYear() + "-" + month + "-" + day;
+            } else {
+                return data.toISOString();
+            }
+        } else {
+            if (enumsMap.has(type)) {
+                return data;
+            }
+            if (!typeMap[type]) { // in case we dont know the type
+                return data;
+            }
+            
+            // Get the actual type of this object
+            type = this.findCorrectType(data, type);
+
+            // get the map for the correct type.
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            let instance: {[index: string]: any} = {};
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type, attributeType.format);
+            }
+            return instance;
+        }
+    }
+
+    public static deserialize(data: any, type: string, format: string) {
+        // polymorphism may change the actual type.
+        type = ObjectSerializer.findCorrectType(data, type);
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.deserialize(date, subType, format));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            return new Date(data);
+        } else {
+            if (enumsMap.has(type)) {// is Enum
+                return data;
+            }
+
+            if (!typeMap[type]) { // dont know the type
+                return data;
+            }
+            let instance = new typeMap[type]();
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.name] = ObjectSerializer.deserialize(data[attributeType.baseName], attributeType.type, attributeType.format);
+            }
+            return instance;
+        }
+    }
+
+
+    /**
+     * Normalize media type
+     *
+     * We currently do not handle any media types attributes, i.e. anything
+     * after a semicolon. All content is assumed to be UTF-8 compatible.
+     */
+    public static normalizeMediaType(mediaType: string | undefined): string | undefined {
+        if (mediaType === undefined) {
+            return undefined;
+        }
+        return mediaType.split(";")[0].trim().toLowerCase();
+    }
+
+    /**
+     * From a list of possible media types, choose the one we can handle best.
+     *
+     * The order of the given media types does not have any impact on the choice
+     * made.
+     */
+    public static getPreferredMediaType(mediaTypes: Array<string>): string {
+        /** According to OAS 3 we should default to json */
+        if (!mediaTypes) {
+            return "application/json";
+        }
+
+        const normalMediaTypes = mediaTypes.map(this.normalizeMediaType);
+        let selectedMediaType: string | undefined = undefined;
+        let selectedRank: number = -Infinity;
+        for (const mediaType of normalMediaTypes) {
+            if (supportedMediaTypes[mediaType!] > selectedRank) {
+                selectedMediaType = mediaType;
+                selectedRank = supportedMediaTypes[mediaType!];
+            }
+        }
+
+        if (selectedMediaType === undefined) {
+            throw new Error("None of the given media types are supported: " + mediaTypes.join(", "));
+        }
+
+        return selectedMediaType!;
+    }
+
+    /**
+     * Convert data to a string according the given media type
+     */
+    public static stringify(data: any, mediaType: string): string {
+        if (mediaType === "application/json") {
+            return JSON.stringify(data);
+        }
+
+        throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.stringify.");
+    }
+
+    /**
+     * Parse data from a string according to the given media type
+     */
+    public static parse(rawData: string, mediaType: string | undefined) {
+        if (mediaType === undefined) {
+            throw new Error("Cannot parse content. No Content-Type defined.");
+        }
+
+        if (mediaType === "application/json") {
+            return JSON.parse(rawData);
+        }
+
+        throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.parse.");
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts
new file mode 100644
index 000000000000..291018b9e065
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts
@@ -0,0 +1,79 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* An order for a pets from the pet store
+*/
+export class Order {
+    'id'?: number;
+    'petId'?: number;
+    'quantity'?: number;
+    'shipDate'?: Date;
+    /**
+    * Order Status
+    */
+    'status'?: OrderStatusEnum;
+    'complete'?: boolean;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "petId",
+            "baseName": "petId",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "quantity",
+            "baseName": "quantity",
+            "type": "number",
+            "format": "int32"
+        },
+        {
+            "name": "shipDate",
+            "baseName": "shipDate",
+            "type": "Date",
+            "format": "date-time"
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "OrderStatusEnum",
+            "format": ""
+        },
+        {
+            "name": "complete",
+            "baseName": "complete",
+            "type": "boolean",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Order.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
+
+export type OrderStatusEnum = "placed" | "approved" | "delivered" ;
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts
new file mode 100644
index 000000000000..77a3490297db
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts
@@ -0,0 +1,81 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { Category } from './Category';
+import { Tag } from './Tag';
+import { HttpFile } from '../http/http';
+
+/**
+* A pet for sale in the pet store
+*/
+export class Pet {
+    'id'?: number;
+    'category'?: Category;
+    'name': string;
+    'photoUrls': Array<string>;
+    'tags'?: Array<Tag>;
+    /**
+    * pet status in the store
+    */
+    'status'?: PetStatusEnum;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "category",
+            "baseName": "category",
+            "type": "Category",
+            "format": ""
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "photoUrls",
+            "baseName": "photoUrls",
+            "type": "Array<string>",
+            "format": ""
+        },
+        {
+            "name": "tags",
+            "baseName": "tags",
+            "type": "Array<Tag>",
+            "format": ""
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "PetStatusEnum",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Pet.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
+
+export type PetStatusEnum = "available" | "pending" | "sold" ;
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/Tag.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/Tag.ts
new file mode 100644
index 000000000000..ce2a0e6d2a80
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Tag.ts
@@ -0,0 +1,45 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* A tag for a pet
+*/
+export class Tag {
+    'id'?: number;
+    'name'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Tag.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/User.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/User.ts
new file mode 100644
index 000000000000..049af95de370
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/User.ts
@@ -0,0 +1,90 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* A User who is purchasing from the pet store
+*/
+export class User {
+    'id'?: number;
+    'username'?: string;
+    'firstName'?: string;
+    'lastName'?: string;
+    'email'?: string;
+    'password'?: string;
+    'phone'?: string;
+    /**
+    * User Status
+    */
+    'userStatus'?: number;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "username",
+            "baseName": "username",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "firstName",
+            "baseName": "firstName",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "lastName",
+            "baseName": "lastName",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "email",
+            "baseName": "email",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "password",
+            "baseName": "password",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "phone",
+            "baseName": "phone",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "userStatus",
+            "baseName": "userStatus",
+            "type": "number",
+            "format": "int32"
+        }    ];
+
+    static getAttributeTypeMap() {
+        return User.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/all.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/all.ts
new file mode 100644
index 000000000000..d064eba93abd
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/all.ts
@@ -0,0 +1,8 @@
+export * from './ApiResponse'
+export * from './Category'
+export * from './InlineObject'
+export * from './InlineObject1'
+export * from './Order'
+export * from './Pet'
+export * from './Tag'
+export * from './User'
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/package-lock.json b/samples/openapi3/client/petstore/typescript/builds/default/package-lock.json
new file mode 100644
index 000000000000..a21ee9c9e472
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/package-lock.json
@@ -0,0 +1,115 @@
+{
+  "name": "ts-petstore-client",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/node": {
+      "version": "12.12.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.7.tgz",
+      "integrity": "sha512-E6Zn0rffhgd130zbCbAr/JdXfXkoOUFAKNs/rF8qnafSJ8KYaA/j3oz7dcwal+lYjLA7xvdd5J4wdYpCTlP8+w=="
+    },
+    "@types/node-fetch": {
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
+      "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+      "requires": {
+        "@types/node": "*",
+        "form-data": "^3.0.0"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+          "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        }
+      }
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "btoa": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
+      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "es6-promise": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
+      "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg=="
+    },
+    "form-data": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "mime-db": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+    },
+    "mime-types": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "requires": {
+        "mime-db": "1.40.0"
+      }
+    },
+    "node-fetch": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+    },
+    "querystringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
+      "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg=="
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+    },
+    "typescript": {
+      "version": "3.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz",
+      "integrity": "sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==",
+      "dev": true
+    },
+    "url-parse": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz",
+      "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==",
+      "requires": {
+        "querystringify": "^2.0.0",
+        "requires-port": "^1.0.0"
+      }
+    }
+  }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/package.json b/samples/openapi3/client/petstore/typescript/builds/default/package.json
new file mode 100644
index 000000000000..aaebe4e7687e
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "ts-petstore-client",
+  "version": "1.0.0",
+  "description": "OpenAPI client for ts-petstore-client",
+  "author": "OpenAPI-Generator Contributors",
+  "keywords": [
+    "fetch",
+    "typescript",
+    "openapi-client",
+    "openapi-generator"
+  ],
+  "license": "Unlicense",
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
+  "scripts": {
+    "build": "tsc",
+    "prepublishOnly": "npm run build"
+  },
+  "dependencies": {
+    "node-fetch": "^2.6.0",
+    "@types/node-fetch": "^2.5.7",
+    "@types/node": "*",
+    "form-data": "^2.5.0",
+    "btoa": "^1.2.1",
+    "es6-promise": "^4.2.4",
+    "url-parse": "^1.4.3"
+  },
+  "devDependencies": {
+    "typescript": "^3.9.3"
+  }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/pom.xml b/samples/openapi3/client/petstore/typescript/builds/default/pom.xml
new file mode 100644
index 000000000000..c3b2ac33026a
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/pom.xml
@@ -0,0 +1,60 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptBuildDefaultPetstoreClientSample</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Default Petstore Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-build</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>build</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/rxjsStub.ts b/samples/openapi3/client/petstore/typescript/builds/default/rxjsStub.ts
new file mode 100644
index 000000000000..4c73715a2486
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/rxjsStub.ts
@@ -0,0 +1,27 @@
+export class Observable<T> {
+  constructor(private promise: Promise<T>) {}
+
+  toPromise() {
+    return this.promise;
+  }
+
+  pipe<S>(callback: (value: T) => S | Promise<S>): Observable<S> {
+    return new Observable(this.promise.then(callback));
+  }
+}
+
+export function from<T>(promise: Promise<any>) {
+  return new Observable(promise);
+}
+
+export function of<T>(value: T) {
+  return new Observable<T>(Promise.resolve(value));
+}
+
+export function mergeMap<T, S>(callback: (value: T) => Observable<S>) {
+  return (value: T) => callback(value).toPromise();
+}
+
+export function map(callback: any) {
+  return callback;
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/servers.ts b/samples/openapi3/client/petstore/typescript/builds/default/servers.ts
new file mode 100644
index 000000000000..aa5332db7ae9
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/servers.ts
@@ -0,0 +1,53 @@
+import { RequestContext, HttpMethod } from "./http/http";
+
+export interface BaseServerConfiguration {
+    makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext;
+}
+
+/**
+ *
+ * Represents the configuration of a server including its
+ * url template and variable configuration based on the url.
+ *
+ */
+export class ServerConfiguration<T extends { [key: string]: string }> implements BaseServerConfiguration {
+    public constructor(private url: string, private variableConfiguration: T) {}
+
+    /**
+     * Sets the value of the variables of this server.
+     *
+     * @param variableConfiguration a partial variable configuration for the variables contained in the url
+     */
+    public setVariables(variableConfiguration: Partial<T>) {
+        Object.assign(this.variableConfiguration, variableConfiguration);
+    }
+
+	public getConfiguration(): T {
+		return this.variableConfiguration
+	}
+
+	private getUrl() {
+		let replacedUrl = this.url;
+		for (const key in this.variableConfiguration) {
+			var re = new RegExp("{" + key + "}","g");
+			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+		}
+		return replacedUrl
+	}
+
+	/**
+	 * Creates a new request context for this server using the url with variables
+	 * replaced with their respective values and the endpoint of the request appended.
+	 *
+	 * @param endpoint the endpoint to be queried on the server
+	 * @param httpMethod httpMethod to be used
+	 *
+	 */	
+	public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
+		return new RequestContext(this.getUrl() + endpoint, httpMethod);		
+	}
+}
+
+export const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  })
+
+export const servers = [server1];
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/tsconfig.json b/samples/openapi3/client/petstore/typescript/builds/default/tsconfig.json
new file mode 100644
index 000000000000..a542d795677c
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/tsconfig.json
@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "strict": true,
+    /* Basic Options */
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "declaration": true,
+ 
+    /* Additional Checks */
+     "noUnusedLocals": false,                /* Report errors on unused locals. */ // TODO: reenable (unused imports!)
+     "noUnusedParameters": false,            /* Report errors on unused parameters. */ // TODO: set to true again
+     "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+     "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    "removeComments": true,
+    "sourceMap": true,
+    "outDir": "./dist",
+    "noLib": false,
+    "lib": [ "es6" ],
+  },
+  "exclude": [
+  	"dist",
+    "node_modules"
+  ],
+  "filesGlob": [
+    "./**/*.ts",
+  ]
+  
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts
new file mode 100644
index 000000000000..10cebbd77dd2
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts
@@ -0,0 +1,442 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http';
+import * as models from '../models/all';
+import { Configuration} from '../configuration'
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Category } from '../models/Category';
+import { InlineObject } from '../models/InlineObject';
+import { InlineObject1 } from '../models/InlineObject1';
+import { Order } from '../models/Order';
+import { Pet } from '../models/Pet';
+import { Tag } from '../models/Tag';
+import { User } from '../models/User';
+
+import { ObservablePetApi } from "./ObservableAPI";
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
+
+export interface PetApiAddPetRequest {
+    /**
+     * Pet object that needs to be added to the store
+     * @type Pet
+     * @memberof PetApiaddPet
+     */
+    pet: Pet
+}
+
+export interface PetApiDeletePetRequest {
+    /**
+     * Pet id to delete
+     * @type number
+     * @memberof PetApideletePet
+     */
+    petId: number
+    /**
+     * 
+     * @type string
+     * @memberof PetApideletePet
+     */
+    apiKey?: string
+}
+
+export interface PetApiFindPetsByStatusRequest {
+    /**
+     * Status values that need to be considered for filter
+     * @type Array&lt;&#39;available&#39; | &#39;pending&#39; | &#39;sold&#39;&gt;
+     * @memberof PetApifindPetsByStatus
+     */
+    status: Array<'available' | 'pending' | 'sold'>
+}
+
+export interface PetApiFindPetsByTagsRequest {
+    /**
+     * Tags to filter by
+     * @type Array&lt;string&gt;
+     * @memberof PetApifindPetsByTags
+     */
+    tags: Array<string>
+}
+
+export interface PetApiGetPetByIdRequest {
+    /**
+     * ID of pet to return
+     * @type number
+     * @memberof PetApigetPetById
+     */
+    petId: number
+}
+
+export interface PetApiUpdatePetRequest {
+    /**
+     * Pet object that needs to be added to the store
+     * @type Pet
+     * @memberof PetApiupdatePet
+     */
+    pet: Pet
+}
+
+export interface PetApiUpdatePetWithFormRequest {
+    /**
+     * ID of pet that needs to be updated
+     * @type number
+     * @memberof PetApiupdatePetWithForm
+     */
+    petId: number
+    /**
+     * Updated name of the pet
+     * @type string
+     * @memberof PetApiupdatePetWithForm
+     */
+    name?: string
+    /**
+     * Updated status of the pet
+     * @type string
+     * @memberof PetApiupdatePetWithForm
+     */
+    status?: string
+}
+
+export interface PetApiUploadFileRequest {
+    /**
+     * ID of pet to update
+     * @type number
+     * @memberof PetApiuploadFile
+     */
+    petId: number
+    /**
+     * Additional data to pass to server
+     * @type string
+     * @memberof PetApiuploadFile
+     */
+    additionalMetadata?: string
+    /**
+     * file to upload
+     * @type HttpFile
+     * @memberof PetApiuploadFile
+     */
+    file?: HttpFile
+}
+
+
+export class ObjectPetApi {
+    private api: ObservablePetApi
+
+    public constructor(configuration: Configuration, requestFactory?: PetApiRequestFactory, responseProcessor?: PetApiResponseProcessor) {
+        this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * Add a new pet to the store
+     * @param param the request object
+     */
+    public addPet(param: PetApiAddPetRequest, options?: Configuration): Promise<Pet> {
+        return this.api.addPet(param.pet,  options).toPromise();
+    }
+	
+    /**
+     * Deletes a pet
+     * @param param the request object
+     */
+    public deletePet(param: PetApiDeletePetRequest, options?: Configuration): Promise<void> {
+        return this.api.deletePet(param.petId, param.apiKey,  options).toPromise();
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param param the request object
+     */
+    public findPetsByStatus(param: PetApiFindPetsByStatusRequest, options?: Configuration): Promise<Array<Pet>> {
+        return this.api.findPetsByStatus(param.status,  options).toPromise();
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param param the request object
+     */
+    public findPetsByTags(param: PetApiFindPetsByTagsRequest, options?: Configuration): Promise<Array<Pet>> {
+        return this.api.findPetsByTags(param.tags,  options).toPromise();
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param param the request object
+     */
+    public getPetById(param: PetApiGetPetByIdRequest, options?: Configuration): Promise<Pet> {
+        return this.api.getPetById(param.petId,  options).toPromise();
+    }
+	
+    /**
+     * Update an existing pet
+     * @param param the request object
+     */
+    public updatePet(param: PetApiUpdatePetRequest, options?: Configuration): Promise<Pet> {
+        return this.api.updatePet(param.pet,  options).toPromise();
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param param the request object
+     */
+    public updatePetWithForm(param: PetApiUpdatePetWithFormRequest, options?: Configuration): Promise<void> {
+        return this.api.updatePetWithForm(param.petId, param.name, param.status,  options).toPromise();
+    }
+	
+    /**
+     * uploads an image
+     * @param param the request object
+     */
+    public uploadFile(param: PetApiUploadFileRequest, options?: Configuration): Promise<ApiResponse> {
+        return this.api.uploadFile(param.petId, param.additionalMetadata, param.file,  options).toPromise();
+    }
+	
+
+}
+
+
+
+
+import { ObservableStoreApi } from "./ObservableAPI";
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
+
+export interface StoreApiDeleteOrderRequest {
+    /**
+     * ID of the order that needs to be deleted
+     * @type string
+     * @memberof StoreApideleteOrder
+     */
+    orderId: string
+}
+
+export interface StoreApiGetInventoryRequest {
+}
+
+export interface StoreApiGetOrderByIdRequest {
+    /**
+     * ID of pet that needs to be fetched
+     * @type number
+     * @memberof StoreApigetOrderById
+     */
+    orderId: number
+}
+
+export interface StoreApiPlaceOrderRequest {
+    /**
+     * order placed for purchasing the pet
+     * @type Order
+     * @memberof StoreApiplaceOrder
+     */
+    order: Order
+}
+
+
+export class ObjectStoreApi {
+    private api: ObservableStoreApi
+
+    public constructor(configuration: Configuration, requestFactory?: StoreApiRequestFactory, responseProcessor?: StoreApiResponseProcessor) {
+        this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param param the request object
+     */
+    public deleteOrder(param: StoreApiDeleteOrderRequest, options?: Configuration): Promise<void> {
+        return this.api.deleteOrder(param.orderId,  options).toPromise();
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     * @param param the request object
+     */
+    public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> {
+        return this.api.getInventory( options).toPromise();
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param param the request object
+     */
+    public getOrderById(param: StoreApiGetOrderByIdRequest, options?: Configuration): Promise<Order> {
+        return this.api.getOrderById(param.orderId,  options).toPromise();
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param param the request object
+     */
+    public placeOrder(param: StoreApiPlaceOrderRequest, options?: Configuration): Promise<Order> {
+        return this.api.placeOrder(param.order,  options).toPromise();
+    }
+	
+
+}
+
+
+
+
+import { ObservableUserApi } from "./ObservableAPI";
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
+
+export interface UserApiCreateUserRequest {
+    /**
+     * Created user object
+     * @type User
+     * @memberof UserApicreateUser
+     */
+    user: User
+}
+
+export interface UserApiCreateUsersWithArrayInputRequest {
+    /**
+     * List of user object
+     * @type Array&lt;User&gt;
+     * @memberof UserApicreateUsersWithArrayInput
+     */
+    user: Array<User>
+}
+
+export interface UserApiCreateUsersWithListInputRequest {
+    /**
+     * List of user object
+     * @type Array&lt;User&gt;
+     * @memberof UserApicreateUsersWithListInput
+     */
+    user: Array<User>
+}
+
+export interface UserApiDeleteUserRequest {
+    /**
+     * The name that needs to be deleted
+     * @type string
+     * @memberof UserApideleteUser
+     */
+    username: string
+}
+
+export interface UserApiGetUserByNameRequest {
+    /**
+     * The name that needs to be fetched. Use user1 for testing.
+     * @type string
+     * @memberof UserApigetUserByName
+     */
+    username: string
+}
+
+export interface UserApiLoginUserRequest {
+    /**
+     * The user name for login
+     * @type string
+     * @memberof UserApiloginUser
+     */
+    username: string
+    /**
+     * The password for login in clear text
+     * @type string
+     * @memberof UserApiloginUser
+     */
+    password: string
+}
+
+export interface UserApiLogoutUserRequest {
+}
+
+export interface UserApiUpdateUserRequest {
+    /**
+     * name that need to be deleted
+     * @type string
+     * @memberof UserApiupdateUser
+     */
+    username: string
+    /**
+     * Updated user object
+     * @type User
+     * @memberof UserApiupdateUser
+     */
+    user: User
+}
+
+
+export class ObjectUserApi {
+    private api: ObservableUserApi
+
+    public constructor(configuration: Configuration, requestFactory?: UserApiRequestFactory, responseProcessor?: UserApiResponseProcessor) {
+        this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param param the request object
+     */
+    public createUser(param: UserApiCreateUserRequest, options?: Configuration): Promise<void> {
+        return this.api.createUser(param.user,  options).toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param param the request object
+     */
+    public createUsersWithArrayInput(param: UserApiCreateUsersWithArrayInputRequest, options?: Configuration): Promise<void> {
+        return this.api.createUsersWithArrayInput(param.user,  options).toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param param the request object
+     */
+    public createUsersWithListInput(param: UserApiCreateUsersWithListInputRequest, options?: Configuration): Promise<void> {
+        return this.api.createUsersWithListInput(param.user,  options).toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param param the request object
+     */
+    public deleteUser(param: UserApiDeleteUserRequest, options?: Configuration): Promise<void> {
+        return this.api.deleteUser(param.username,  options).toPromise();
+    }
+	
+    /**
+     * Get user by user name
+     * @param param the request object
+     */
+    public getUserByName(param: UserApiGetUserByNameRequest, options?: Configuration): Promise<User> {
+        return this.api.getUserByName(param.username,  options).toPromise();
+    }
+	
+    /**
+     * Logs user into the system
+     * @param param the request object
+     */
+    public loginUser(param: UserApiLoginUserRequest, options?: Configuration): Promise<string> {
+        return this.api.loginUser(param.username, param.password,  options).toPromise();
+    }
+	
+    /**
+     * Logs out current logged in user session
+     * @param param the request object
+     */
+    public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise<void> {
+        return this.api.logoutUser( options).toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param param the request object
+     */
+    public updateUser(param: UserApiUpdateUserRequest, options?: Configuration): Promise<void> {
+        return this.api.updateUser(param.username, param.user,  options).toPromise();
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts
new file mode 100644
index 000000000000..30be6fff1f82
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts
@@ -0,0 +1,554 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http';
+import * as models from '../models/all';
+import { Configuration} from '../configuration'
+import { Observable, of, from } from '../rxjsStub';
+import {mergeMap, map} from  '../rxjsStub';
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Category } from '../models/Category';
+import { InlineObject } from '../models/InlineObject';
+import { InlineObject1 } from '../models/InlineObject1';
+import { Order } from '../models/Order';
+import { Pet } from '../models/Pet';
+import { Tag } from '../models/Tag';
+import { User } from '../models/User';
+
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
+export class ObservablePetApi {
+    private requestFactory: PetApiRequestFactory;
+    private responseProcessor: PetApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: PetApiRequestFactory,
+        responseProcessor?: PetApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new PetApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new PetApiResponseProcessor();
+    }
+
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public addPet(pet: Pet, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.addPet(pet, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public deletePet(petId: number, apiKey?: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Observable<Array<Pet>> {
+    	const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public findPetsByTags(tags: Array<string>, options?: Configuration): Observable<Array<Pet>> {
+    	const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public getPetById(petId: number, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.getPetById(petId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public updatePet(pet: Pet, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.updatePet(pet, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
+	    	}));
+    }
+	
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Observable<ApiResponse> {
+    	const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
+
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
+export class ObservableStoreApi {
+    private requestFactory: StoreApiRequestFactory;
+    private responseProcessor: StoreApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: StoreApiRequestFactory,
+        responseProcessor?: StoreApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new StoreApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new StoreApiResponseProcessor();
+    }
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public deleteOrder(orderId: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public getInventory(options?: Configuration): Observable<{ [key: string]: number; }> {
+    	const requestContextPromise = this.requestFactory.getInventory(options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
+	    	}));
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public getOrderById(orderId: number, options?: Configuration): Observable<Order> {
+    	const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public placeOrder(order: Order, options?: Configuration): Observable<Order> {
+    	const requestContextPromise = this.requestFactory.placeOrder(order, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
+
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
+export class ObservableUserApi {
+    private requestFactory: UserApiRequestFactory;
+    private responseProcessor: UserApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: UserApiRequestFactory,
+        responseProcessor?: UserApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new UserApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new UserApiResponseProcessor();
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public createUser(user: User, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUser(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithListInput(user: Array<User>, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
+	    	}));
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public deleteUser(username: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deleteUser(username, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public getUserByName(username: string, options?: Configuration): Observable<User> {
+    	const requestContextPromise = this.requestFactory.getUserByName(username, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public loginUser(username: string, password: string, options?: Configuration): Observable<string> {
+    	const requestContextPromise = this.requestFactory.loginUser(username, password, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Logs out current logged in user session
+     */
+    public logoutUser(options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.logoutUser(options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public updateUser(username: string, user: User, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.updateUser(username, user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts
new file mode 100644
index 000000000000..44829ca43fa8
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts
@@ -0,0 +1,266 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http';
+import * as models from '../models/all';
+import { Configuration} from '../configuration'
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Category } from '../models/Category';
+import { InlineObject } from '../models/InlineObject';
+import { InlineObject1 } from '../models/InlineObject1';
+import { Order } from '../models/Order';
+import { Pet } from '../models/Pet';
+import { Tag } from '../models/Tag';
+import { User } from '../models/User';
+import { ObservablePetApi } from './ObservableAPI';
+
+
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
+export class PromisePetApi {
+    private api: ObservablePetApi
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: PetApiRequestFactory,
+        responseProcessor?: PetApiResponseProcessor
+    ) {
+        this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public addPet(pet: Pet, options?: Configuration): Promise<Pet> {
+    	const result = this.api.addPet(pet, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deletePet(petId, apiKey, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<Array<Pet>> {
+    	const result = this.api.findPetsByStatus(status, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public findPetsByTags(tags: Array<string>, options?: Configuration): Promise<Array<Pet>> {
+    	const result = this.api.findPetsByTags(tags, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public getPetById(petId: number, options?: Configuration): Promise<Pet> {
+    	const result = this.api.getPetById(petId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public updatePet(pet: Pet, options?: Configuration): Promise<Pet> {
+    	const result = this.api.updatePet(pet, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<void> {
+    	const result = this.api.updatePetWithForm(petId, name, status, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<ApiResponse> {
+    	const result = this.api.uploadFile(petId, additionalMetadata, file, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
+import { ObservableStoreApi } from './ObservableAPI';
+
+
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
+export class PromiseStoreApi {
+    private api: ObservableStoreApi
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: StoreApiRequestFactory,
+        responseProcessor?: StoreApiResponseProcessor
+    ) {
+        this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public deleteOrder(orderId: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deleteOrder(orderId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public getInventory(options?: Configuration): Promise<{ [key: string]: number; }> {
+    	const result = this.api.getInventory(options);
+        return result.toPromise();
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public getOrderById(orderId: number, options?: Configuration): Promise<Order> {
+    	const result = this.api.getOrderById(orderId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public placeOrder(order: Order, options?: Configuration): Promise<Order> {
+    	const result = this.api.placeOrder(order, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
+import { ObservableUserApi } from './ObservableAPI';
+
+
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
+export class PromiseUserApi {
+    private api: ObservableUserApi
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: UserApiRequestFactory,
+        responseProcessor?: UserApiResponseProcessor
+    ) {
+        this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public createUser(user: User, options?: Configuration): Promise<void> {
+    	const result = this.api.createUser(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<void> {
+    	const result = this.api.createUsersWithArrayInput(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<void> {
+    	const result = this.api.createUsersWithListInput(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public deleteUser(username: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deleteUser(username, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public getUserByName(username: string, options?: Configuration): Promise<User> {
+    	const result = this.api.getUserByName(username, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public loginUser(username: string, password: string, options?: Configuration): Promise<string> {
+    	const result = this.api.loginUser(username, password, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Logs out current logged in user session
+     */
+    public logoutUser(options?: Configuration): Promise<void> {
+    	const result = this.api.logoutUser(options);
+        return result.toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public updateUser(username: string, user: User, options?: Configuration): Promise<void> {
+    	const result = this.api.updateUser(username, user, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/util.ts b/samples/openapi3/client/petstore/typescript/builds/default/util.ts
new file mode 100644
index 000000000000..d1888434535c
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/default/util.ts
@@ -0,0 +1,28 @@
+/**
+ * Returns if a specific http code is in a given code range
+ * where the code range is defined as a combination of digits 
+ * and "X" (the letter X) with a length of 3
+ *
+ * @param codeRange string with length 3 consisting of digits and "X" (the letter X)
+ * @param code the http status code to be checked against the code range
+ */
+export function isCodeInRange(codeRange: string, code: number): boolean {
+	// This is how the default value is encoded in OAG
+	if (codeRange === "0") {
+		return true;
+	}
+	if (codeRange == code.toString()) {
+		return true;
+	} else {
+		const codeString = code.toString();
+		if (codeString.length != codeRange.length) {
+			return false;
+		}
+		for (let i = 0; i < codeString.length; i++) {
+			if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/.gitignore b/samples/openapi3/client/petstore/typescript/builds/deno/.gitignore
new file mode 100644
index 000000000000..1521c8b7652b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator-ignore b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator-ignore
similarity index 100%
rename from samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator-ignore
rename to samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator-ignore
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/FILES
new file mode 100644
index 000000000000..b31c76a281f4
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/FILES
@@ -0,0 +1,29 @@
+.gitignore
+apis/PetApi.ts
+apis/StoreApi.ts
+apis/UserApi.ts
+apis/baseapi.ts
+apis/exception.ts
+auth/auth.ts
+configuration.ts
+git_push.sh
+http/http.ts
+http/isomorphic-fetch.ts
+index.ts
+middleware.ts
+models/ApiResponse.ts
+models/Category.ts
+models/InlineObject.ts
+models/InlineObject1.ts
+models/ObjectSerializer.ts
+models/Order.ts
+models/Pet.ts
+models/Tag.ts
+models/User.ts
+models/all.ts
+rxjsStub.ts
+servers.ts
+types/ObjectParamAPI.ts
+types/ObservableAPI.ts
+types/PromiseAPI.ts
+util.ts
diff --git a/samples/server/petstore/php-slim/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION
similarity index 100%
rename from samples/server/petstore/php-slim/.openapi-generator/VERSION
rename to samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts
new file mode 100644
index 000000000000..c12dd49f6c06
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts
@@ -0,0 +1,649 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi.ts';
+import {Configuration} from '../configuration.ts';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http.ts';
+import {ObjectSerializer} from '../models/ObjectSerializer.ts';
+import {ApiException} from './exception.ts';
+import {isCodeInRange} from '../util.ts';
+
+import { ApiResponse } from '../models/ApiResponse.ts';
+import { Pet } from '../models/Pet.ts';
+
+/**
+ * no description
+ */
+export class PetApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public async addPet(pet: Pet, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'pet' is not null or undefined
+        if (pet === null || pet === undefined) {
+            throw new RequiredError('Required parameter pet was null or undefined when calling addPet.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json",
+        
+            "application/xml"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(pet, "Pet", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public async deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling deletePet.');
+        }
+
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+		requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'status' is not null or undefined
+        if (status === null || status === undefined) {
+            throw new RequiredError('Required parameter status was null or undefined when calling findPetsByStatus.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/findByStatus';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (status !== undefined) {
+        	requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public async findPetsByTags(tags: Array<string>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'tags' is not null or undefined
+        if (tags === null || tags === undefined) {
+            throw new RequiredError('Required parameter tags was null or undefined when calling findPetsByTags.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/findByTags';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (tags !== undefined) {
+        	requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public async getPetById(petId: number, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling getPetById.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public async updatePet(pet: Pet, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'pet' is not null or undefined
+        if (pet === null || pet === undefined) {
+            throw new RequiredError('Required parameter pet was null or undefined when calling updatePet.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json",
+        
+            "application/xml"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(pet, "Pet", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public async updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling updatePetWithForm.');
+        }
+
+		
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+		let localVarFormParams = new FormData();
+
+        if (name !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('name', name as any);
+        }
+        if (status !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('status', status as any);
+        }
+		requestContext.setBody(localVarFormParams);
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public async uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling uploadFile.');
+        }
+
+		
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}/uploadImage'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+		let localVarFormParams = new FormData();
+
+        if (additionalMetadata !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('additionalMetadata', additionalMetadata as any);
+        }
+        if (file !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('file', file, file.name);
+        }
+		requestContext.setBody(localVarFormParams);
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+}
+
+
+
+export class PetApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to addPet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async addPet(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid input");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deletePet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deletePet(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid pet value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to findPetsByStatus
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async findPetsByStatus(response: ResponseContext): Promise<Array<Pet> > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid status value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to findPetsByTags
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async findPetsByTags(response: ResponseContext): Promise<Array<Pet> > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid tag value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getPetById
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getPetById(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Pet not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updatePet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updatePet(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Pet not found");
+        }
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Validation exception");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updatePetWithForm
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updatePetWithForm(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid input");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to uploadFile
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async uploadFile(response: ResponseContext): Promise<ApiResponse > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: ApiResponse = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "ApiResponse", ""
+            ) as ApiResponse;
+            return body;
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: ApiResponse = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "ApiResponse", ""
+            ) as ApiResponse;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts
new file mode 100644
index 000000000000..7580325378f3
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts
@@ -0,0 +1,294 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi.ts';
+import {Configuration} from '../configuration.ts';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http.ts';
+import {ObjectSerializer} from '../models/ObjectSerializer.ts';
+import {ApiException} from './exception.ts';
+import {isCodeInRange} from '../util.ts';
+
+import { Order } from '../models/Order.ts';
+
+/**
+ * no description
+ */
+export class StoreApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public async deleteOrder(orderId: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new RequiredError('Required parameter orderId was null or undefined when calling deleteOrder.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order/{orderId}'
+            .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public async getInventory(options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+		// Path Params
+    	const localVarPath = '/store/inventory';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public async getOrderById(orderId: number, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new RequiredError('Required parameter orderId was null or undefined when calling getOrderById.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order/{orderId}'
+            .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public async placeOrder(order: Order, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'order' is not null or undefined
+        if (order === null || order === undefined) {
+            throw new RequiredError('Required parameter order was null or undefined when calling placeOrder.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(order, "Order", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+}
+
+
+
+export class StoreApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deleteOrder
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deleteOrder(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Order not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getInventory
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getInventory(response: ResponseContext): Promise<{ [key: string]: number; } > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: { [key: string]: number; } = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "{ [key: string]: number; }", "int32"
+            ) as { [key: string]: number; };
+            return body;
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: { [key: string]: number; } = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "{ [key: string]: number; }", "int32"
+            ) as { [key: string]: number; };
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getOrderById
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getOrderById(response: ResponseContext): Promise<Order > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Order not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to placeOrder
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async placeOrder(response: ResponseContext): Promise<Order > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid Order");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts
new file mode 100644
index 000000000000..5744990ab8a3
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts
@@ -0,0 +1,586 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi.ts';
+import {Configuration} from '../configuration.ts';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http.ts';
+import {ObjectSerializer} from '../models/ObjectSerializer.ts';
+import {ApiException} from './exception.ts';
+import {isCodeInRange} from '../util.ts';
+
+import { User } from '../models/User.ts';
+
+/**
+ * no description
+ */
+export class UserApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public async createUser(user: User, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "User", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public async createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithArrayInput.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/createWithArray';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "Array<User>", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public async createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithListInput.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/createWithList';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "Array<User>", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public async deleteUser(username: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling deleteUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public async getUserByName(username: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling getUserByName.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public async loginUser(username: string, password: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling loginUser.');
+        }
+
+		
+        // verify required parameter 'password' is not null or undefined
+        if (password === null || password === undefined) {
+            throw new RequiredError('Required parameter password was null or undefined when calling loginUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/login';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (username !== undefined) {
+        	requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
+        }
+        if (password !== undefined) {
+        	requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Logs out current logged in user session
+     */
+    public async logoutUser(options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+		// Path Params
+    	const localVarPath = '/user/logout';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public async updateUser(username: string, user: User, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling updateUser.');
+        }
+
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling updateUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "User", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+}
+
+
+
+export class UserApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUsersWithArrayInput
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUsersWithArrayInput(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUsersWithListInput
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUsersWithListInput(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deleteUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deleteUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getUserByName
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getUserByName(response: ResponseContext): Promise<User > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: User = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "User", ""
+            ) as User;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: User = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "User", ""
+            ) as User;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to loginUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async loginUser(response: ResponseContext): Promise<string > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: string = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "string", ""
+            ) as string;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username/password supplied");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: string = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "string", ""
+            ) as string;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to logoutUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async logoutUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updateUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updateUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid user supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/baseapi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/baseapi.ts
new file mode 100644
index 000000000000..a9f232827dfa
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/baseapi.ts
@@ -0,0 +1,37 @@
+import { Configuration } from '../configuration.ts'
+
+/**
+ *
+ * @export
+ */
+export const COLLECTION_FORMATS = {
+    csv: ",",
+    ssv: " ",
+    tsv: "\t",
+    pipes: "|",
+};
+
+
+/**
+ * 
+ * @export
+ * @class BaseAPI
+ */
+export class BaseAPIRequestFactory {
+
+    constructor(protected configuration: Configuration) {
+    }
+};
+
+/**
+ * 
+ * @export
+ * @class RequiredError
+ * @extends {Error}
+ */
+export class RequiredError extends Error {
+    name: "RequiredError" = "RequiredError";
+    constructor(public field: string, msg?: string) {
+        super(msg);
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/exception.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/exception.ts
new file mode 100644
index 000000000000..b76dca5aa4bc
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/exception.ts
@@ -0,0 +1,14 @@
+/**
+ * Represents an error caused by an api call i.e. it has attributes for a HTTP status code 
+ * and the returned body object.
+ *
+ * Example
+ * API returns a ErrorMessageObject whenever HTTP status code is not in [200, 299]
+ * => ApiException(404, someErrorMessageObject)
+ *
+ */
+export class ApiException<T> extends Error {
+	public constructor(public code: number, public body: T) {
+        super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body))  
+	}
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/auth/auth.ts b/samples/openapi3/client/petstore/typescript/builds/deno/auth/auth.ts
new file mode 100644
index 000000000000..0a02d2e58d2b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/auth/auth.ts
@@ -0,0 +1,100 @@
+// typings for btoa are incorrect
+import { RequestContext } from "../http/http.ts";
+
+/**
+ * Interface authentication schemes.
+ */
+export interface SecurityAuthentication {
+    /*
+     * @return returns the name of the security authentication as specified in OAI
+     */
+    getName(): string;
+
+    /**
+     * Applies the authentication scheme to the request context
+     *
+     * @params context the request context which should use this authentication scheme
+     */
+    applySecurityAuthentication(context: RequestContext): void | Promise<void>;
+}
+
+export interface TokenProvider {
+  getToken(): Promise<string> | string;
+}
+
+/**
+ * Applies apiKey authentication to the request context.
+ */
+export class ApiKeyAuthentication implements SecurityAuthentication {
+    /**
+     * Configures this api key authentication with the necessary properties
+     *
+     * @param apiKey: The api key to be used for every request
+     */
+    public constructor(private apiKey: string) {}
+
+    public getName(): string {
+        return "api_key";
+    }
+
+    public applySecurityAuthentication(context: RequestContext) {
+        context.setHeaderParam("api_key", this.apiKey);
+    }
+}
+
+/**
+ * Applies oauth2 authentication to the request context.
+ */
+export class PetstoreAuthAuthentication implements SecurityAuthentication {
+    // TODO: How to handle oauth2 authentication!
+    public constructor() {}
+
+    public getName(): string {
+        return "petstore_auth";
+    }
+
+    public applySecurityAuthentication(context: RequestContext) {
+        // TODO
+    }
+}
+
+
+export type AuthMethods = {
+    "api_key"?: SecurityAuthentication,
+    "petstore_auth"?: SecurityAuthentication
+}
+
+export type ApiKeyConfiguration = string;
+export type HttpBasicConfiguration = { "username": string, "password": string };
+export type HttpBearerConfiguration = { tokenProvider: TokenProvider };
+export type OAuth2Configuration = string;
+
+export type AuthMethodsConfiguration = {
+    "api_key"?: ApiKeyConfiguration,
+    "petstore_auth"?: OAuth2Configuration
+}
+
+/**
+ * Creates the authentication methods from a swagger description.
+ *
+ */
+export function configureAuthMethods(config: AuthMethodsConfiguration | undefined): AuthMethods {
+    let authMethods: AuthMethods = {}
+
+    if (!config) {
+        return authMethods;
+    }
+
+    if (config["api_key"]) {
+        authMethods["api_key"] = new ApiKeyAuthentication(
+            config["api_key"]
+        );
+    }
+
+    if (config["petstore_auth"]) {
+        authMethods["petstore_auth"] = new PetstoreAuthAuthentication(
+        );
+    }
+
+    return authMethods;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts
new file mode 100644
index 000000000000..27350b5e4674
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts
@@ -0,0 +1,66 @@
+import { HttpLibrary } from "./http/http.ts";
+import { Middleware, PromiseMiddleware, PromiseMiddlewareWrapper } from "./middleware.ts";
+import { IsomorphicFetchHttpLibrary as DefaultHttpLibrary } from "./http/isomorphic-fetch.ts";
+import { BaseServerConfiguration, server1 } from "./servers.ts";
+import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth.ts";
+
+export interface Configuration {
+    readonly baseServer: BaseServerConfiguration;
+    readonly httpApi: HttpLibrary;
+    readonly middleware: Middleware[];
+    readonly authMethods: AuthMethods;
+}
+
+
+/**
+ * Interface with which a configuration object can be configured.
+ */
+export interface ConfigurationParameters {
+    /**
+     * Default server to use
+     */
+    baseServer?: BaseServerConfiguration;
+    /**
+     * HTTP library to use e.g. IsomorphicFetch
+     */
+    httpApi?: HttpLibrary;
+    /**
+     * The middlewares which will be applied to requests and responses
+     */
+    middleware?: Middleware[];
+    /**
+     * Configures all middlewares using the promise api instead of observables (which Middleware uses)
+     */
+    promiseMiddleware?: PromiseMiddleware[];
+    /**
+     * Configuration for the available authentication methods
+     */
+    authMethods?: AuthMethodsConfiguration
+}
+
+/**
+ * Configuration factory function
+ *
+ * If a property is not included in conf, a default is used:
+ *    - baseServer: server1
+ *    - httpApi: IsomorphicFetchHttpLibrary
+ *    - middleware: []
+ *    - promiseMiddleware: []
+ *    - authMethods: {}
+ *
+ * @param conf partial configuration
+ */
+export function createConfiguration(conf: ConfigurationParameters = {}): Configuration {
+    const configuration: Configuration = {
+        baseServer: conf.baseServer !== undefined ? conf.baseServer : server1,
+        httpApi: conf.httpApi || new DefaultHttpLibrary(),
+        middleware: conf.middleware || [],
+        authMethods: configureAuthMethods(conf.authMethods)
+    };
+    if (conf.promiseMiddleware) {
+        conf.promiseMiddleware.forEach(
+            m => configuration.middleware.push(new PromiseMiddlewareWrapper(m))
+        );
+    }
+    return configuration;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/git_push.sh b/samples/openapi3/client/petstore/typescript/builds/deno/git_push.sh
new file mode 100644
index 000000000000..8442b80bb445
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts
new file mode 100644
index 000000000000..7bb54a77ff9c
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts
@@ -0,0 +1,235 @@
+import { Observable, from } from '../rxjsStub.ts';
+
+
+/**
+ * Represents an HTTP method.
+ */
+export enum HttpMethod {
+    GET = "GET",
+    HEAD = "HEAD",
+    POST = "POST",
+    PUT = "PUT",
+    DELETE = "DELETE",
+    CONNECT = "CONNECT",
+    OPTIONS = "OPTIONS",
+    TRACE = "TRACE",
+    PATCH = "PATCH"
+}
+
+/**
+ * Represents an HTTP file which will be transferred from or to a server.
+ */
+export type HttpFile = Blob & { readonly name: string };
+
+/**
+ * URLParse Wrapper for Deno
+ */
+class URLParse {
+    private url: URL;
+    constructor(address: string, _parser: boolean) {
+        this.url = new URL(address);
+    }
+    public set(_part: 'query', obj: {[key: string]: string | undefined}) {
+        for (const key in obj) {
+            const value = obj[key];
+            if (value) {
+              this.url.searchParams.set(key, value);
+            } else {
+              this.url.searchParams.set(key, "");
+            }
+        }
+    }
+    public get query() {
+        const obj: {[key: string]: string} = {};
+        for (const [key, value] of this.url.searchParams.entries()) {
+            obj[key] = value;
+        }
+        return obj;
+    }
+    public toString() {
+        return this.url.toString();
+    }
+}
+
+export class HttpException extends Error {
+    public constructor(msg: string) {
+        super(msg);
+    }
+}
+
+/**
+ * Represents the body of an outgoing HTTP request.
+ */
+export type RequestBody = undefined | string | FormData;
+
+/**
+ * Represents an HTTP request context
+ */
+export class RequestContext {
+    private headers: { [key: string]: string } = {};
+    private body: RequestBody = undefined;
+    private url: URLParse;
+
+	/**
+	 * Creates the request context using a http method and request resource url
+	 *
+	 * @param url url of the requested resource
+	 * @param httpMethod http method
+	 */
+    public constructor(url: string, private httpMethod: HttpMethod) {
+        this.url = new URLParse(url, true);
+    }
+    
+    /*
+     * Returns the url set in the constructor including the query string
+     *
+     */
+    public getUrl(): string {
+    	return this.url.toString();
+    }
+    
+    /**
+     * Replaces the url set in the constructor with this url.
+     *
+     */
+    public setUrl(url: string) {
+    	this.url = new URLParse(url, true);
+    }
+
+    /**
+     * Sets the body of the http request either as a string or FormData
+     *
+     * Note that setting a body on a HTTP GET, HEAD, DELETE, CONNECT or TRACE
+     * request is discouraged.
+     * https://httpwg.org/http-core/draft-ietf-httpbis-semantics-latest.html#rfc.section.7.3.1
+     *
+     * @param body the body of the request
+     */
+    public setBody(body: RequestBody) {
+        this.body = body;
+    }
+
+    public getHttpMethod(): HttpMethod {
+    	return this.httpMethod;
+    }
+    
+    public getHeaders(): { [key: string]: string } {
+    	return this.headers;
+    }
+
+    public getBody(): RequestBody {
+        return this.body;
+    }
+
+	public setQueryParam(name: string, value: string) {
+        let queryObj = this.url.query;
+        queryObj[name] = value;
+        this.url.set("query", queryObj);
+    }
+
+	/**
+	 *	Sets a cookie with the name and value. NO check  for duplicate cookies is performed
+	 *
+	 */
+    public addCookie(name: string, value: string): void {
+        if (!this.headers["Cookie"]) {
+            this.headers["Cookie"] = "";
+        }
+        this.headers["Cookie"] += name + "=" + value + "; ";
+    }
+
+    public setHeaderParam(key: string, value: string): void  { 
+        this.headers[key] = value;
+    }
+}
+
+export interface ResponseBody {
+    text(): Promise<string>;
+    binary(): Promise<Blob>;
+}
+
+
+/**
+ * Helper class to generate a `ResponseBody` from binary data
+ */
+export class SelfDecodingBody implements ResponseBody {
+    constructor(private dataSource: Promise<Blob>) {}
+
+    binary(): Promise<Blob> {
+        return this.dataSource;
+    }
+
+    async text(): Promise<string> {
+        const data: Blob = await this.dataSource;
+        return data.text();
+    }
+}
+
+export class ResponseContext {
+    public constructor(
+        public httpStatusCode: number,
+        public headers: { [key: string]: string },
+        public body: ResponseBody
+    ) {}
+
+    /**
+     * Parse header value in the form `value; param1="value1"`
+     *
+     * E.g. for Content-Type or Content-Disposition
+     * Parameter names are converted to lower case
+     * The first parameter is returned with the key `""`
+     */
+    public getParsedHeader(headerName: string): { [parameter: string]: string } {
+        const result: { [parameter: string]: string } = {};
+        if (!this.headers[headerName]) {
+            return result;
+        }
+
+        const parameters = this.headers[headerName].split(";");
+        for (const parameter of parameters) {
+            let [key, value] = parameter.split("=", 2);
+            key = key.toLowerCase().trim();
+            if (value === undefined) {
+                result[""] = key;
+            } else {
+                value = value.trim();
+                if (value.startsWith('"') && value.endsWith('"')) {
+                    value = value.substring(1, value.length - 1);
+                }
+                result[key] = value;
+            }
+        }
+        return result;
+    }
+
+    public async getBodyAsFile(): Promise<HttpFile> {
+        const data = await this.body.binary();
+        const fileName = this.getParsedHeader("content-disposition")["filename"] || "";
+        const contentType = this.headers["content-type"] || "";
+        try {
+            return new File([data], fileName, { type: contentType });
+        } catch (error) {
+            /** Fallback for when the File constructor is not available */
+            return Object.assign(data, {
+                name: fileName,
+                type: contentType
+            });
+        }
+    }
+}
+
+export interface HttpLibrary {
+    send(request: RequestContext): Observable<ResponseContext>;
+}
+
+export interface PromiseHttpLibrary {
+    send(request: RequestContext): Promise<ResponseContext>;
+}
+
+export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLibrary {
+  return {
+    send(request: RequestContext): Observable<ResponseContext> {
+      return from(promiseHttpLibrary.send(request));
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/http/isomorphic-fetch.ts b/samples/openapi3/client/petstore/typescript/builds/deno/http/isomorphic-fetch.ts
new file mode 100644
index 000000000000..a7521351e065
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/http/isomorphic-fetch.ts
@@ -0,0 +1,30 @@
+import {HttpLibrary, RequestContext, ResponseContext} from './http.ts';
+import { from, Observable } from '../rxjsStub.ts';
+
+export class IsomorphicFetchHttpLibrary implements HttpLibrary {
+
+    public send(request: RequestContext): Observable<ResponseContext> {
+        let method = request.getHttpMethod().toString();
+        let body = request.getBody();
+
+        const resultPromise = fetch(request.getUrl(), {
+            method: method,
+            body: body as any,
+            headers: request.getHeaders(),
+        }).then((resp: any) => {
+            const headers: { [name: string]: string } = {};
+            resp.headers.forEach((value: string, name: string) => {
+              headers[name] = value;
+            });
+
+            const body = {
+              text: () => resp.text(),
+              binary: () => resp.blob()
+            };
+            return new ResponseContext(resp.status, headers, body);
+        });
+
+        return from<Promise<ResponseContext>>(resultPromise);
+
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/index.ts b/samples/openapi3/client/petstore/typescript/builds/deno/index.ts
new file mode 100644
index 000000000000..b0cc9f0f93db
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/index.ts
@@ -0,0 +1,10 @@
+export * from "./http/http.ts";
+export * from "./auth/auth.ts";
+export * from "./models/all.ts";
+export { createConfiguration, Configuration } from "./configuration.ts"
+export * from "./apis/exception.ts";
+export * from "./servers.ts";
+
+export { PromiseMiddleware as Middleware } from './middleware.ts';
+export { PromisePetApi as PetApi,  PromiseStoreApi as StoreApi,  PromiseUserApi as UserApi } from './types/PromiseAPI.ts';
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/middleware.ts b/samples/openapi3/client/petstore/typescript/builds/deno/middleware.ts
new file mode 100644
index 000000000000..8b55bf362b4d
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/middleware.ts
@@ -0,0 +1,66 @@
+import {RequestContext, ResponseContext} from './http/http.ts';
+import { Observable, from } from './rxjsStub.ts';
+
+/**
+ * Defines the contract for a middleware intercepting requests before
+ * they are sent (but after the RequestContext was created)
+ * and before the ResponseContext is unwrapped.
+ *
+ */
+export interface Middleware {
+	/**
+	 * Modifies the request before the request is sent. 
+	 *
+	 * @param context RequestContext of a request which is about to be sent to the server
+	 * @returns an observable of the updated request context
+	 *
+	 */
+    pre(context: RequestContext): Observable<RequestContext>;
+    /**
+     * Modifies the returned response before it is deserialized.
+     *
+     * @param context ResponseContext of a sent request
+     * @returns an observable of the modified response context
+     */
+    post(context: ResponseContext): Observable<ResponseContext>;
+}
+
+export class PromiseMiddlewareWrapper implements Middleware {
+
+    public constructor(private middleware: PromiseMiddleware) {
+
+    }
+
+    pre(context: RequestContext): Observable<RequestContext> {
+        return from(this.middleware.pre(context));
+    }
+    
+    post(context: ResponseContext): Observable<ResponseContext> {
+        return from(this.middleware.post(context));
+    }
+
+}
+
+/**
+ * Defines the contract for a middleware intercepting requests before
+ * they are sent (but after the RequestContext was created)
+ * and before the ResponseContext is unwrapped.
+ *
+ */
+export interface PromiseMiddleware {
+	/**
+	 * Modifies the request before the request is sent. 
+	 *
+	 * @param context RequestContext of a request which is about to be sent to the server
+	 * @returns an observable of the updated request context
+	 *
+	 */
+    pre(context: RequestContext): Promise<RequestContext>;
+        /**
+     * Modifies the returned response before it is deserialized.
+     *
+     * @param context ResponseContext of a sent request
+     * @returns an observable of the modified response context
+     */
+    post(context: ResponseContext): Promise<ResponseContext>;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/ApiResponse.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/ApiResponse.ts
new file mode 100644
index 000000000000..7c0afc4eb547
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/ApiResponse.ts
@@ -0,0 +1,52 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http.ts';
+
+/**
+* Describes the result of uploading an image resource
+*/
+export class ApiResponse {
+    'code'?: number;
+    'type'?: string;
+    'message'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "code",
+            "baseName": "code",
+            "type": "number",
+            "format": "int32"
+        },
+        {
+            "name": "type",
+            "baseName": "type",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "message",
+            "baseName": "message",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ApiResponse.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/Category.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/Category.ts
new file mode 100644
index 000000000000..8257545297b4
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Category.ts
@@ -0,0 +1,45 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http.ts';
+
+/**
+* A category for a pet
+*/
+export class Category {
+    'id'?: number;
+    'name'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Category.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/InlineObject.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/InlineObject.ts
new file mode 100644
index 000000000000..f44159320675
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/InlineObject.ts
@@ -0,0 +1,48 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http.ts';
+
+export class InlineObject {
+    /**
+    * Updated name of the pet
+    */
+    'name'?: string;
+    /**
+    * Updated status of the pet
+    */
+    'status'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return InlineObject.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/InlineObject1.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/InlineObject1.ts
new file mode 100644
index 000000000000..10653046a118
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/InlineObject1.ts
@@ -0,0 +1,48 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http.ts';
+
+export class InlineObject1 {
+    /**
+    * Additional data to pass to server
+    */
+    'additionalMetadata'?: string;
+    /**
+    * file to upload
+    */
+    'file'?: HttpFile;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "additionalMetadata",
+            "baseName": "additionalMetadata",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "file",
+            "baseName": "file",
+            "type": "HttpFile",
+            "format": "binary"
+        }    ];
+
+    static getAttributeTypeMap() {
+        return InlineObject1.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts
new file mode 100644
index 000000000000..2f2d7cb2b694
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts
@@ -0,0 +1,240 @@
+export * from './ApiResponse.ts';
+export * from './Category.ts';
+export * from './InlineObject.ts';
+export * from './InlineObject1.ts';
+export * from './Order.ts';
+export * from './Pet.ts';
+export * from './Tag.ts';
+export * from './User.ts';
+
+import { ApiResponse } from './ApiResponse.ts';
+import { Category } from './Category.ts';
+import { InlineObject } from './InlineObject.ts';
+import { InlineObject1 } from './InlineObject1.ts';
+import { Order    , OrderStatusEnum    } from './Order.ts';
+import { Pet     , PetStatusEnum   } from './Pet.ts';
+import { Tag } from './Tag.ts';
+import { User } from './User.ts';
+
+/* tslint:disable:no-unused-variable */
+let primitives = [
+                    "string",
+                    "boolean",
+                    "double",
+                    "integer",
+                    "long",
+                    "float",
+                    "number",
+                    "any"
+                 ];
+
+const supportedMediaTypes: { [mediaType: string]: number } = {
+  "application/json": Infinity,
+  "application/octet-stream": 0
+}
+
+                 
+let enumsMap: Set<string> = new Set<string>([
+					"OrderStatusEnum",
+					"PetStatusEnum",
+]);
+
+let typeMap: {[index: string]: any} = {
+    "ApiResponse": ApiResponse,
+    "Category": Category,
+    "InlineObject": InlineObject,
+    "InlineObject1": InlineObject1,
+    "Order": Order,
+    "Pet": Pet,
+    "Tag": Tag,
+    "User": User,
+}
+
+export class ObjectSerializer {
+    public static findCorrectType(data: any, expectedType: string) {
+        if (data == undefined) {
+            return expectedType;
+        } else if (primitives.indexOf(expectedType.toLowerCase()) !== -1) {
+            return expectedType;
+        } else if (expectedType === "Date") {
+            return expectedType;
+        } else {
+            if (enumsMap.has(expectedType)) {
+                return expectedType;
+            }
+
+            if (!typeMap[expectedType]) {
+                return expectedType; // w/e we don't know the type
+            }
+
+            // Check the discriminator
+            let discriminatorProperty = typeMap[expectedType].discriminator;
+            if (discriminatorProperty == null) {
+                return expectedType; // the type does not have a discriminator. use it.
+            } else {
+                if (data[discriminatorProperty]) {
+                    var discriminatorType = data[discriminatorProperty];
+                    if(typeMap[discriminatorType]){
+                        return discriminatorType; // use the type given in the discriminator
+                    } else {
+                        return expectedType; // discriminator did not map to a type
+                    }
+                } else {
+                    return expectedType; // discriminator was not present (or an empty string)
+                }
+            }
+        }
+    }
+
+    public static serialize(data: any, type: string, format: string) {
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.serialize(date, subType, format));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            if (format == "date") {
+                let month = data.getMonth()+1
+                month = month < 10 ? "0" + month.toString() : month.toString()
+                let day = data.getDate();
+                day = day < 10 ? "0" + day.toString() : day.toString();
+
+                return data.getFullYear() + "-" + month + "-" + day;
+            } else {
+                return data.toISOString();
+            }
+        } else {
+            if (enumsMap.has(type)) {
+                return data;
+            }
+            if (!typeMap[type]) { // in case we dont know the type
+                return data;
+            }
+            
+            // Get the actual type of this object
+            type = this.findCorrectType(data, type);
+
+            // get the map for the correct type.
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            let instance: {[index: string]: any} = {};
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type, attributeType.format);
+            }
+            return instance;
+        }
+    }
+
+    public static deserialize(data: any, type: string, format: string) {
+        // polymorphism may change the actual type.
+        type = ObjectSerializer.findCorrectType(data, type);
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.deserialize(date, subType, format));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            return new Date(data);
+        } else {
+            if (enumsMap.has(type)) {// is Enum
+                return data;
+            }
+
+            if (!typeMap[type]) { // dont know the type
+                return data;
+            }
+            let instance = new typeMap[type]();
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.name] = ObjectSerializer.deserialize(data[attributeType.baseName], attributeType.type, attributeType.format);
+            }
+            return instance;
+        }
+    }
+
+
+    /**
+     * Normalize media type
+     *
+     * We currently do not handle any media types attributes, i.e. anything
+     * after a semicolon. All content is assumed to be UTF-8 compatible.
+     */
+    public static normalizeMediaType(mediaType: string | undefined): string | undefined {
+        if (mediaType === undefined) {
+            return undefined;
+        }
+        return mediaType.split(";")[0].trim().toLowerCase();
+    }
+
+    /**
+     * From a list of possible media types, choose the one we can handle best.
+     *
+     * The order of the given media types does not have any impact on the choice
+     * made.
+     */
+    public static getPreferredMediaType(mediaTypes: Array<string>): string {
+        /** According to OAS 3 we should default to json */
+        if (!mediaTypes) {
+            return "application/json";
+        }
+
+        const normalMediaTypes = mediaTypes.map(this.normalizeMediaType);
+        let selectedMediaType: string | undefined = undefined;
+        let selectedRank: number = -Infinity;
+        for (const mediaType of normalMediaTypes) {
+            if (supportedMediaTypes[mediaType!] > selectedRank) {
+                selectedMediaType = mediaType;
+                selectedRank = supportedMediaTypes[mediaType!];
+            }
+        }
+
+        if (selectedMediaType === undefined) {
+            throw new Error("None of the given media types are supported: " + mediaTypes.join(", "));
+        }
+
+        return selectedMediaType!;
+    }
+
+    /**
+     * Convert data to a string according the given media type
+     */
+    public static stringify(data: any, mediaType: string): string {
+        if (mediaType === "application/json") {
+            return JSON.stringify(data);
+        }
+
+        throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.stringify.");
+    }
+
+    /**
+     * Parse data from a string according to the given media type
+     */
+    public static parse(rawData: string, mediaType: string | undefined) {
+        if (mediaType === undefined) {
+            throw new Error("Cannot parse content. No Content-Type defined.");
+        }
+
+        if (mediaType === "application/json") {
+            return JSON.parse(rawData);
+        }
+
+        throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.parse.");
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts
new file mode 100644
index 000000000000..704d6950aee9
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts
@@ -0,0 +1,79 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http.ts';
+
+/**
+* An order for a pets from the pet store
+*/
+export class Order {
+    'id'?: number;
+    'petId'?: number;
+    'quantity'?: number;
+    'shipDate'?: Date;
+    /**
+    * Order Status
+    */
+    'status'?: OrderStatusEnum;
+    'complete'?: boolean;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "petId",
+            "baseName": "petId",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "quantity",
+            "baseName": "quantity",
+            "type": "number",
+            "format": "int32"
+        },
+        {
+            "name": "shipDate",
+            "baseName": "shipDate",
+            "type": "Date",
+            "format": "date-time"
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "OrderStatusEnum",
+            "format": ""
+        },
+        {
+            "name": "complete",
+            "baseName": "complete",
+            "type": "boolean",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Order.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
+
+export type OrderStatusEnum = "placed" | "approved" | "delivered" ;
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts
new file mode 100644
index 000000000000..9ff2f9da286a
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts
@@ -0,0 +1,81 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { Category } from './Category.ts';
+import { Tag } from './Tag.ts';
+import { HttpFile } from '../http/http.ts';
+
+/**
+* A pet for sale in the pet store
+*/
+export class Pet {
+    'id'?: number;
+    'category'?: Category;
+    'name': string;
+    'photoUrls': Array<string>;
+    'tags'?: Array<Tag>;
+    /**
+    * pet status in the store
+    */
+    'status'?: PetStatusEnum;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "category",
+            "baseName": "category",
+            "type": "Category",
+            "format": ""
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "photoUrls",
+            "baseName": "photoUrls",
+            "type": "Array<string>",
+            "format": ""
+        },
+        {
+            "name": "tags",
+            "baseName": "tags",
+            "type": "Array<Tag>",
+            "format": ""
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "PetStatusEnum",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Pet.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
+
+export type PetStatusEnum = "available" | "pending" | "sold" ;
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/Tag.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/Tag.ts
new file mode 100644
index 000000000000..da5eec221798
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Tag.ts
@@ -0,0 +1,45 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http.ts';
+
+/**
+* A tag for a pet
+*/
+export class Tag {
+    'id'?: number;
+    'name'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Tag.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/User.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/User.ts
new file mode 100644
index 000000000000..e52f4e4c56b6
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/User.ts
@@ -0,0 +1,90 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http.ts';
+
+/**
+* A User who is purchasing from the pet store
+*/
+export class User {
+    'id'?: number;
+    'username'?: string;
+    'firstName'?: string;
+    'lastName'?: string;
+    'email'?: string;
+    'password'?: string;
+    'phone'?: string;
+    /**
+    * User Status
+    */
+    'userStatus'?: number;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "username",
+            "baseName": "username",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "firstName",
+            "baseName": "firstName",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "lastName",
+            "baseName": "lastName",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "email",
+            "baseName": "email",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "password",
+            "baseName": "password",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "phone",
+            "baseName": "phone",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "userStatus",
+            "baseName": "userStatus",
+            "type": "number",
+            "format": "int32"
+        }    ];
+
+    static getAttributeTypeMap() {
+        return User.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/all.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/all.ts
new file mode 100644
index 000000000000..349080a72085
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/all.ts
@@ -0,0 +1,8 @@
+export * from './ApiResponse.ts'
+export * from './Category.ts'
+export * from './InlineObject.ts'
+export * from './InlineObject1.ts'
+export * from './Order.ts'
+export * from './Pet.ts'
+export * from './Tag.ts'
+export * from './User.ts'
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/rxjsStub.ts b/samples/openapi3/client/petstore/typescript/builds/deno/rxjsStub.ts
new file mode 100644
index 000000000000..4c73715a2486
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/rxjsStub.ts
@@ -0,0 +1,27 @@
+export class Observable<T> {
+  constructor(private promise: Promise<T>) {}
+
+  toPromise() {
+    return this.promise;
+  }
+
+  pipe<S>(callback: (value: T) => S | Promise<S>): Observable<S> {
+    return new Observable(this.promise.then(callback));
+  }
+}
+
+export function from<T>(promise: Promise<any>) {
+  return new Observable(promise);
+}
+
+export function of<T>(value: T) {
+  return new Observable<T>(Promise.resolve(value));
+}
+
+export function mergeMap<T, S>(callback: (value: T) => Observable<S>) {
+  return (value: T) => callback(value).toPromise();
+}
+
+export function map(callback: any) {
+  return callback;
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts b/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts
new file mode 100644
index 000000000000..a5beeda1decc
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/servers.ts
@@ -0,0 +1,53 @@
+import { RequestContext, HttpMethod } from "./http/http.ts";
+
+export interface BaseServerConfiguration {
+    makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext;
+}
+
+/**
+ *
+ * Represents the configuration of a server including its
+ * url template and variable configuration based on the url.
+ *
+ */
+export class ServerConfiguration<T extends { [key: string]: string }> implements BaseServerConfiguration {
+    public constructor(private url: string, private variableConfiguration: T) {}
+
+    /**
+     * Sets the value of the variables of this server.
+     *
+     * @param variableConfiguration a partial variable configuration for the variables contained in the url
+     */
+    public setVariables(variableConfiguration: Partial<T>) {
+        Object.assign(this.variableConfiguration, variableConfiguration);
+    }
+
+	public getConfiguration(): T {
+		return this.variableConfiguration
+	}
+
+	private getUrl() {
+		let replacedUrl = this.url;
+		for (const key in this.variableConfiguration) {
+			var re = new RegExp("{" + key + "}","g");
+			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+		}
+		return replacedUrl
+	}
+
+	/**
+	 * Creates a new request context for this server using the url with variables
+	 * replaced with their respective values and the endpoint of the request appended.
+	 *
+	 * @param endpoint the endpoint to be queried on the server
+	 * @param httpMethod httpMethod to be used
+	 *
+	 */	
+	public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
+		return new RequestContext(this.getUrl() + endpoint, httpMethod);		
+	}
+}
+
+export const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  })
+
+export const servers = [server1];
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts
new file mode 100644
index 000000000000..b67035996143
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts
@@ -0,0 +1,442 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http.ts';
+import * as models from '../models/all.ts';
+import { Configuration} from '../configuration.ts'
+
+import { ApiResponse } from '../models/ApiResponse.ts';
+import { Category } from '../models/Category.ts';
+import { InlineObject } from '../models/InlineObject.ts';
+import { InlineObject1 } from '../models/InlineObject1.ts';
+import { Order } from '../models/Order.ts';
+import { Pet } from '../models/Pet.ts';
+import { Tag } from '../models/Tag.ts';
+import { User } from '../models/User.ts';
+
+import { ObservablePetApi } from "./ObservableAPI.ts";
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi.ts";
+
+export interface PetApiAddPetRequest {
+    /**
+     * Pet object that needs to be added to the store
+     * @type Pet
+     * @memberof PetApiaddPet
+     */
+    pet: Pet
+}
+
+export interface PetApiDeletePetRequest {
+    /**
+     * Pet id to delete
+     * @type number
+     * @memberof PetApideletePet
+     */
+    petId: number
+    /**
+     * 
+     * @type string
+     * @memberof PetApideletePet
+     */
+    apiKey?: string
+}
+
+export interface PetApiFindPetsByStatusRequest {
+    /**
+     * Status values that need to be considered for filter
+     * @type Array&lt;&#39;available&#39; | &#39;pending&#39; | &#39;sold&#39;&gt;
+     * @memberof PetApifindPetsByStatus
+     */
+    status: Array<'available' | 'pending' | 'sold'>
+}
+
+export interface PetApiFindPetsByTagsRequest {
+    /**
+     * Tags to filter by
+     * @type Array&lt;string&gt;
+     * @memberof PetApifindPetsByTags
+     */
+    tags: Array<string>
+}
+
+export interface PetApiGetPetByIdRequest {
+    /**
+     * ID of pet to return
+     * @type number
+     * @memberof PetApigetPetById
+     */
+    petId: number
+}
+
+export interface PetApiUpdatePetRequest {
+    /**
+     * Pet object that needs to be added to the store
+     * @type Pet
+     * @memberof PetApiupdatePet
+     */
+    pet: Pet
+}
+
+export interface PetApiUpdatePetWithFormRequest {
+    /**
+     * ID of pet that needs to be updated
+     * @type number
+     * @memberof PetApiupdatePetWithForm
+     */
+    petId: number
+    /**
+     * Updated name of the pet
+     * @type string
+     * @memberof PetApiupdatePetWithForm
+     */
+    name?: string
+    /**
+     * Updated status of the pet
+     * @type string
+     * @memberof PetApiupdatePetWithForm
+     */
+    status?: string
+}
+
+export interface PetApiUploadFileRequest {
+    /**
+     * ID of pet to update
+     * @type number
+     * @memberof PetApiuploadFile
+     */
+    petId: number
+    /**
+     * Additional data to pass to server
+     * @type string
+     * @memberof PetApiuploadFile
+     */
+    additionalMetadata?: string
+    /**
+     * file to upload
+     * @type HttpFile
+     * @memberof PetApiuploadFile
+     */
+    file?: HttpFile
+}
+
+
+export class ObjectPetApi {
+    private api: ObservablePetApi
+
+    public constructor(configuration: Configuration, requestFactory?: PetApiRequestFactory, responseProcessor?: PetApiResponseProcessor) {
+        this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * Add a new pet to the store
+     * @param param the request object
+     */
+    public addPet(param: PetApiAddPetRequest, options?: Configuration): Promise<Pet> {
+        return this.api.addPet(param.pet,  options).toPromise();
+    }
+	
+    /**
+     * Deletes a pet
+     * @param param the request object
+     */
+    public deletePet(param: PetApiDeletePetRequest, options?: Configuration): Promise<void> {
+        return this.api.deletePet(param.petId, param.apiKey,  options).toPromise();
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param param the request object
+     */
+    public findPetsByStatus(param: PetApiFindPetsByStatusRequest, options?: Configuration): Promise<Array<Pet>> {
+        return this.api.findPetsByStatus(param.status,  options).toPromise();
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param param the request object
+     */
+    public findPetsByTags(param: PetApiFindPetsByTagsRequest, options?: Configuration): Promise<Array<Pet>> {
+        return this.api.findPetsByTags(param.tags,  options).toPromise();
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param param the request object
+     */
+    public getPetById(param: PetApiGetPetByIdRequest, options?: Configuration): Promise<Pet> {
+        return this.api.getPetById(param.petId,  options).toPromise();
+    }
+	
+    /**
+     * Update an existing pet
+     * @param param the request object
+     */
+    public updatePet(param: PetApiUpdatePetRequest, options?: Configuration): Promise<Pet> {
+        return this.api.updatePet(param.pet,  options).toPromise();
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param param the request object
+     */
+    public updatePetWithForm(param: PetApiUpdatePetWithFormRequest, options?: Configuration): Promise<void> {
+        return this.api.updatePetWithForm(param.petId, param.name, param.status,  options).toPromise();
+    }
+	
+    /**
+     * uploads an image
+     * @param param the request object
+     */
+    public uploadFile(param: PetApiUploadFileRequest, options?: Configuration): Promise<ApiResponse> {
+        return this.api.uploadFile(param.petId, param.additionalMetadata, param.file,  options).toPromise();
+    }
+	
+
+}
+
+
+
+
+import { ObservableStoreApi } from "./ObservableAPI.ts";
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi.ts";
+
+export interface StoreApiDeleteOrderRequest {
+    /**
+     * ID of the order that needs to be deleted
+     * @type string
+     * @memberof StoreApideleteOrder
+     */
+    orderId: string
+}
+
+export interface StoreApiGetInventoryRequest {
+}
+
+export interface StoreApiGetOrderByIdRequest {
+    /**
+     * ID of pet that needs to be fetched
+     * @type number
+     * @memberof StoreApigetOrderById
+     */
+    orderId: number
+}
+
+export interface StoreApiPlaceOrderRequest {
+    /**
+     * order placed for purchasing the pet
+     * @type Order
+     * @memberof StoreApiplaceOrder
+     */
+    order: Order
+}
+
+
+export class ObjectStoreApi {
+    private api: ObservableStoreApi
+
+    public constructor(configuration: Configuration, requestFactory?: StoreApiRequestFactory, responseProcessor?: StoreApiResponseProcessor) {
+        this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param param the request object
+     */
+    public deleteOrder(param: StoreApiDeleteOrderRequest, options?: Configuration): Promise<void> {
+        return this.api.deleteOrder(param.orderId,  options).toPromise();
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     * @param param the request object
+     */
+    public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> {
+        return this.api.getInventory( options).toPromise();
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param param the request object
+     */
+    public getOrderById(param: StoreApiGetOrderByIdRequest, options?: Configuration): Promise<Order> {
+        return this.api.getOrderById(param.orderId,  options).toPromise();
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param param the request object
+     */
+    public placeOrder(param: StoreApiPlaceOrderRequest, options?: Configuration): Promise<Order> {
+        return this.api.placeOrder(param.order,  options).toPromise();
+    }
+	
+
+}
+
+
+
+
+import { ObservableUserApi } from "./ObservableAPI.ts";
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi.ts";
+
+export interface UserApiCreateUserRequest {
+    /**
+     * Created user object
+     * @type User
+     * @memberof UserApicreateUser
+     */
+    user: User
+}
+
+export interface UserApiCreateUsersWithArrayInputRequest {
+    /**
+     * List of user object
+     * @type Array&lt;User&gt;
+     * @memberof UserApicreateUsersWithArrayInput
+     */
+    user: Array<User>
+}
+
+export interface UserApiCreateUsersWithListInputRequest {
+    /**
+     * List of user object
+     * @type Array&lt;User&gt;
+     * @memberof UserApicreateUsersWithListInput
+     */
+    user: Array<User>
+}
+
+export interface UserApiDeleteUserRequest {
+    /**
+     * The name that needs to be deleted
+     * @type string
+     * @memberof UserApideleteUser
+     */
+    username: string
+}
+
+export interface UserApiGetUserByNameRequest {
+    /**
+     * The name that needs to be fetched. Use user1 for testing.
+     * @type string
+     * @memberof UserApigetUserByName
+     */
+    username: string
+}
+
+export interface UserApiLoginUserRequest {
+    /**
+     * The user name for login
+     * @type string
+     * @memberof UserApiloginUser
+     */
+    username: string
+    /**
+     * The password for login in clear text
+     * @type string
+     * @memberof UserApiloginUser
+     */
+    password: string
+}
+
+export interface UserApiLogoutUserRequest {
+}
+
+export interface UserApiUpdateUserRequest {
+    /**
+     * name that need to be deleted
+     * @type string
+     * @memberof UserApiupdateUser
+     */
+    username: string
+    /**
+     * Updated user object
+     * @type User
+     * @memberof UserApiupdateUser
+     */
+    user: User
+}
+
+
+export class ObjectUserApi {
+    private api: ObservableUserApi
+
+    public constructor(configuration: Configuration, requestFactory?: UserApiRequestFactory, responseProcessor?: UserApiResponseProcessor) {
+        this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param param the request object
+     */
+    public createUser(param: UserApiCreateUserRequest, options?: Configuration): Promise<void> {
+        return this.api.createUser(param.user,  options).toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param param the request object
+     */
+    public createUsersWithArrayInput(param: UserApiCreateUsersWithArrayInputRequest, options?: Configuration): Promise<void> {
+        return this.api.createUsersWithArrayInput(param.user,  options).toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param param the request object
+     */
+    public createUsersWithListInput(param: UserApiCreateUsersWithListInputRequest, options?: Configuration): Promise<void> {
+        return this.api.createUsersWithListInput(param.user,  options).toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param param the request object
+     */
+    public deleteUser(param: UserApiDeleteUserRequest, options?: Configuration): Promise<void> {
+        return this.api.deleteUser(param.username,  options).toPromise();
+    }
+	
+    /**
+     * Get user by user name
+     * @param param the request object
+     */
+    public getUserByName(param: UserApiGetUserByNameRequest, options?: Configuration): Promise<User> {
+        return this.api.getUserByName(param.username,  options).toPromise();
+    }
+	
+    /**
+     * Logs user into the system
+     * @param param the request object
+     */
+    public loginUser(param: UserApiLoginUserRequest, options?: Configuration): Promise<string> {
+        return this.api.loginUser(param.username, param.password,  options).toPromise();
+    }
+	
+    /**
+     * Logs out current logged in user session
+     * @param param the request object
+     */
+    public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise<void> {
+        return this.api.logoutUser( options).toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param param the request object
+     */
+    public updateUser(param: UserApiUpdateUserRequest, options?: Configuration): Promise<void> {
+        return this.api.updateUser(param.username, param.user,  options).toPromise();
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts
new file mode 100644
index 000000000000..c9c5604992c5
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts
@@ -0,0 +1,554 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http.ts';
+import * as models from '../models/all.ts';
+import { Configuration} from '../configuration.ts'
+import { Observable, of, from } from '../rxjsStub.ts';
+import {mergeMap, map} from  '../rxjsStub.ts';
+
+import { ApiResponse } from '../models/ApiResponse.ts';
+import { Category } from '../models/Category.ts';
+import { InlineObject } from '../models/InlineObject.ts';
+import { InlineObject1 } from '../models/InlineObject1.ts';
+import { Order } from '../models/Order.ts';
+import { Pet } from '../models/Pet.ts';
+import { Tag } from '../models/Tag.ts';
+import { User } from '../models/User.ts';
+
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi.ts";
+export class ObservablePetApi {
+    private requestFactory: PetApiRequestFactory;
+    private responseProcessor: PetApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: PetApiRequestFactory,
+        responseProcessor?: PetApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new PetApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new PetApiResponseProcessor();
+    }
+
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public addPet(pet: Pet, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.addPet(pet, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public deletePet(petId: number, apiKey?: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Observable<Array<Pet>> {
+    	const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public findPetsByTags(tags: Array<string>, options?: Configuration): Observable<Array<Pet>> {
+    	const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public getPetById(petId: number, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.getPetById(petId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public updatePet(pet: Pet, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.updatePet(pet, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
+	    	}));
+    }
+	
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Observable<ApiResponse> {
+    	const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
+
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi.ts";
+export class ObservableStoreApi {
+    private requestFactory: StoreApiRequestFactory;
+    private responseProcessor: StoreApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: StoreApiRequestFactory,
+        responseProcessor?: StoreApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new StoreApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new StoreApiResponseProcessor();
+    }
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public deleteOrder(orderId: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public getInventory(options?: Configuration): Observable<{ [key: string]: number; }> {
+    	const requestContextPromise = this.requestFactory.getInventory(options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
+	    	}));
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public getOrderById(orderId: number, options?: Configuration): Observable<Order> {
+    	const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public placeOrder(order: Order, options?: Configuration): Observable<Order> {
+    	const requestContextPromise = this.requestFactory.placeOrder(order, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
+
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi.ts";
+export class ObservableUserApi {
+    private requestFactory: UserApiRequestFactory;
+    private responseProcessor: UserApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: UserApiRequestFactory,
+        responseProcessor?: UserApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new UserApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new UserApiResponseProcessor();
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public createUser(user: User, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUser(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithListInput(user: Array<User>, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
+	    	}));
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public deleteUser(username: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deleteUser(username, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public getUserByName(username: string, options?: Configuration): Observable<User> {
+    	const requestContextPromise = this.requestFactory.getUserByName(username, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public loginUser(username: string, password: string, options?: Configuration): Observable<string> {
+    	const requestContextPromise = this.requestFactory.loginUser(username, password, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Logs out current logged in user session
+     */
+    public logoutUser(options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.logoutUser(options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public updateUser(username: string, user: User, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.updateUser(username, user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts
new file mode 100644
index 000000000000..ea458404f922
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts
@@ -0,0 +1,266 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http.ts';
+import * as models from '../models/all.ts';
+import { Configuration} from '../configuration.ts'
+
+import { ApiResponse } from '../models/ApiResponse.ts';
+import { Category } from '../models/Category.ts';
+import { InlineObject } from '../models/InlineObject.ts';
+import { InlineObject1 } from '../models/InlineObject1.ts';
+import { Order } from '../models/Order.ts';
+import { Pet } from '../models/Pet.ts';
+import { Tag } from '../models/Tag.ts';
+import { User } from '../models/User.ts';
+import { ObservablePetApi } from './ObservableAPI.ts';
+
+
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi.ts";
+export class PromisePetApi {
+    private api: ObservablePetApi
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: PetApiRequestFactory,
+        responseProcessor?: PetApiResponseProcessor
+    ) {
+        this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public addPet(pet: Pet, options?: Configuration): Promise<Pet> {
+    	const result = this.api.addPet(pet, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deletePet(petId, apiKey, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<Array<Pet>> {
+    	const result = this.api.findPetsByStatus(status, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public findPetsByTags(tags: Array<string>, options?: Configuration): Promise<Array<Pet>> {
+    	const result = this.api.findPetsByTags(tags, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public getPetById(petId: number, options?: Configuration): Promise<Pet> {
+    	const result = this.api.getPetById(petId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public updatePet(pet: Pet, options?: Configuration): Promise<Pet> {
+    	const result = this.api.updatePet(pet, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<void> {
+    	const result = this.api.updatePetWithForm(petId, name, status, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<ApiResponse> {
+    	const result = this.api.uploadFile(petId, additionalMetadata, file, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
+import { ObservableStoreApi } from './ObservableAPI.ts';
+
+
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi.ts";
+export class PromiseStoreApi {
+    private api: ObservableStoreApi
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: StoreApiRequestFactory,
+        responseProcessor?: StoreApiResponseProcessor
+    ) {
+        this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public deleteOrder(orderId: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deleteOrder(orderId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public getInventory(options?: Configuration): Promise<{ [key: string]: number; }> {
+    	const result = this.api.getInventory(options);
+        return result.toPromise();
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public getOrderById(orderId: number, options?: Configuration): Promise<Order> {
+    	const result = this.api.getOrderById(orderId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public placeOrder(order: Order, options?: Configuration): Promise<Order> {
+    	const result = this.api.placeOrder(order, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
+import { ObservableUserApi } from './ObservableAPI.ts';
+
+
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi.ts";
+export class PromiseUserApi {
+    private api: ObservableUserApi
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: UserApiRequestFactory,
+        responseProcessor?: UserApiResponseProcessor
+    ) {
+        this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public createUser(user: User, options?: Configuration): Promise<void> {
+    	const result = this.api.createUser(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<void> {
+    	const result = this.api.createUsersWithArrayInput(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<void> {
+    	const result = this.api.createUsersWithListInput(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public deleteUser(username: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deleteUser(username, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public getUserByName(username: string, options?: Configuration): Promise<User> {
+    	const result = this.api.getUserByName(username, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public loginUser(username: string, password: string, options?: Configuration): Promise<string> {
+    	const result = this.api.loginUser(username, password, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Logs out current logged in user session
+     */
+    public logoutUser(options?: Configuration): Promise<void> {
+    	const result = this.api.logoutUser(options);
+        return result.toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public updateUser(username: string, user: User, options?: Configuration): Promise<void> {
+    	const result = this.api.updateUser(username, user, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/util.ts b/samples/openapi3/client/petstore/typescript/builds/deno/util.ts
new file mode 100644
index 000000000000..d1888434535c
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/util.ts
@@ -0,0 +1,28 @@
+/**
+ * Returns if a specific http code is in a given code range
+ * where the code range is defined as a combination of digits 
+ * and "X" (the letter X) with a length of 3
+ *
+ * @param codeRange string with length 3 consisting of digits and "X" (the letter X)
+ * @param code the http status code to be checked against the code range
+ */
+export function isCodeInRange(codeRange: string, code: number): boolean {
+	// This is how the default value is encoded in OAG
+	if (codeRange === "0") {
+		return true;
+	}
+	if (codeRange == code.toString()) {
+		return true;
+	} else {
+		const codeString = code.toString();
+		if (codeString.length != codeRange.length) {
+			return false;
+		}
+		for (let i = 0; i < codeString.length; i++) {
+			if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/.gitignore b/samples/openapi3/client/petstore/typescript/builds/inversify/.gitignore
new file mode 100644
index 000000000000..1521c8b7652b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/samples/server/petstore/php-slim/.openapi-generator-ignore b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator-ignore
similarity index 100%
rename from samples/server/petstore/php-slim/.openapi-generator-ignore
rename to samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator-ignore
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/FILES
new file mode 100644
index 000000000000..d580da4ce9e9
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/FILES
@@ -0,0 +1,41 @@
+.gitignore
+README.md
+apis/PetApi.service.ts
+apis/PetApi.ts
+apis/StoreApi.service.ts
+apis/StoreApi.ts
+apis/UserApi.service.ts
+apis/UserApi.ts
+apis/baseapi.ts
+apis/exception.ts
+auth/auth.ts
+configuration.ts
+git_push.sh
+http/http.ts
+http/isomorphic-fetch.ts
+index.ts
+middleware.ts
+models/ApiResponse.ts
+models/Category.ts
+models/InlineObject.ts
+models/InlineObject1.ts
+models/ObjectSerializer.ts
+models/Order.ts
+models/Pet.ts
+models/Tag.ts
+models/User.ts
+models/all.ts
+package.json
+rxjsStub.ts
+servers.ts
+services/ObjectParamAPI.ts
+services/ObservableAPI.ts
+services/PromiseAPI.ts
+services/configuration.ts
+services/http.ts
+services/index.ts
+tsconfig.json
+types/ObjectParamAPI.ts
+types/ObservableAPI.ts
+types/PromiseAPI.ts
+util.ts
diff --git a/samples/server/petstore/python-flask-python2/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION
similarity index 100%
rename from samples/server/petstore/python-flask-python2/.openapi-generator/VERSION
rename to samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/README.md b/samples/openapi3/client/petstore/typescript/builds/inversify/README.md
new file mode 100644
index 000000000000..80b1ac5cc98b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/README.md
@@ -0,0 +1,30 @@
+## ts-petstore-client@1.0.0
+
+This generator creates TypeScript/JavaScript client that utilizes fetch-api. 
+
+### Building
+
+To build and compile the typescript sources to javascript use:
+```
+npm install
+npm run build
+```
+
+### Publishing
+
+First build the package then run ```npm publish```
+
+### Consuming
+
+navigate to the folder of your consuming project and run one of the following commands.
+
+_published:_
+
+```
+npm install ts-petstore-client@1.0.0 --save
+```
+
+_unPublished (not recommended):_
+
+```
+npm install PATH_TO_GENERATED_PACKAGE --save
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.service.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.service.ts
new file mode 100644
index 000000000000..e96ab5e14824
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.service.ts
@@ -0,0 +1,44 @@
+import type { Configuration } from "../configuration";
+import type { HttpFile, RequestContext, ResponseContext } from "../http/http";
+
+import { ApiResponse } from "../models/ApiResponse";
+import { Pet } from "../models/Pet";
+
+export abstract class AbstractPetApiRequestFactory {
+    public abstract addPet(pet: Pet, options?: Configuration): Promise<RequestContext>;
+
+    public abstract deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<RequestContext>;
+
+    public abstract findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<RequestContext>;
+
+    public abstract findPetsByTags(tags: Array<string>, options?: Configuration): Promise<RequestContext>;
+
+    public abstract getPetById(petId: number, options?: Configuration): Promise<RequestContext>;
+
+    public abstract updatePet(pet: Pet, options?: Configuration): Promise<RequestContext>;
+
+    public abstract updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<RequestContext>;
+
+    public abstract uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<RequestContext>;
+
+}
+
+
+export abstract class AbstractPetApiResponseProcessor {
+     public abstract addPet(response: ResponseContext): Promise<Pet >;
+
+     public abstract deletePet(response: ResponseContext): Promise< void>;
+
+     public abstract findPetsByStatus(response: ResponseContext): Promise<Array<Pet> >;
+
+     public abstract findPetsByTags(response: ResponseContext): Promise<Array<Pet> >;
+
+     public abstract getPetById(response: ResponseContext): Promise<Pet >;
+
+     public abstract updatePet(response: ResponseContext): Promise<Pet >;
+
+     public abstract updatePetWithForm(response: ResponseContext): Promise< void>;
+
+     public abstract uploadFile(response: ResponseContext): Promise<ApiResponse >;
+
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts
new file mode 100644
index 000000000000..c97b44cf0893
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts
@@ -0,0 +1,653 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi';
+import {Configuration} from '../configuration';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
+import * as FormData from "form-data";
+import {ObjectSerializer} from '../models/ObjectSerializer';
+import {ApiException} from './exception';
+import {isCodeInRange} from '../util';
+import { injectable } from "inversify";
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Pet } from '../models/Pet';
+
+/**
+ * no description
+ */
+@injectable()
+export class PetApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public async addPet(pet: Pet, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'pet' is not null or undefined
+        if (pet === null || pet === undefined) {
+            throw new RequiredError('Required parameter pet was null or undefined when calling addPet.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json",
+        
+            "application/xml"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(pet, "Pet", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public async deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling deletePet.');
+        }
+
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+		requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'status' is not null or undefined
+        if (status === null || status === undefined) {
+            throw new RequiredError('Required parameter status was null or undefined when calling findPetsByStatus.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/findByStatus';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (status !== undefined) {
+        	requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public async findPetsByTags(tags: Array<string>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'tags' is not null or undefined
+        if (tags === null || tags === undefined) {
+            throw new RequiredError('Required parameter tags was null or undefined when calling findPetsByTags.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/findByTags';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (tags !== undefined) {
+        	requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public async getPetById(petId: number, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling getPetById.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public async updatePet(pet: Pet, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'pet' is not null or undefined
+        if (pet === null || pet === undefined) {
+            throw new RequiredError('Required parameter pet was null or undefined when calling updatePet.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json",
+        
+            "application/xml"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(pet, "Pet", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public async updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling updatePetWithForm.');
+        }
+
+		
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+		let localVarFormParams = new FormData();
+
+        if (name !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('name', name as any);
+        }
+        if (status !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('status', status as any);
+        }
+		requestContext.setBody(localVarFormParams);
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public async uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling uploadFile.');
+        }
+
+		
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}/uploadImage'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+		let localVarFormParams = new FormData();
+
+        if (additionalMetadata !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('additionalMetadata', additionalMetadata as any);
+        }
+        if (file !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('file', file.data, file.name);
+        }
+		requestContext.setBody(localVarFormParams);
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+}
+
+
+
+@injectable()
+export class PetApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to addPet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async addPet(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid input");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deletePet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deletePet(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid pet value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to findPetsByStatus
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async findPetsByStatus(response: ResponseContext): Promise<Array<Pet> > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid status value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to findPetsByTags
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async findPetsByTags(response: ResponseContext): Promise<Array<Pet> > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid tag value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getPetById
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getPetById(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Pet not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updatePet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updatePet(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Pet not found");
+        }
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Validation exception");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updatePetWithForm
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updatePetWithForm(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid input");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to uploadFile
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async uploadFile(response: ResponseContext): Promise<ApiResponse > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: ApiResponse = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "ApiResponse", ""
+            ) as ApiResponse;
+            return body;
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: ApiResponse = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "ApiResponse", ""
+            ) as ApiResponse;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.service.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.service.ts
new file mode 100644
index 000000000000..b2e61032a7f6
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.service.ts
@@ -0,0 +1,27 @@
+import type { Configuration } from "../configuration";
+import type { HttpFile, RequestContext, ResponseContext } from "../http/http";
+
+import { Order } from "../models/Order";
+
+export abstract class AbstractStoreApiRequestFactory {
+    public abstract deleteOrder(orderId: string, options?: Configuration): Promise<RequestContext>;
+
+    public abstract getInventory(options?: Configuration): Promise<RequestContext>;
+
+    public abstract getOrderById(orderId: number, options?: Configuration): Promise<RequestContext>;
+
+    public abstract placeOrder(order: Order, options?: Configuration): Promise<RequestContext>;
+
+}
+
+
+export abstract class AbstractStoreApiResponseProcessor {
+     public abstract deleteOrder(response: ResponseContext): Promise< void>;
+
+     public abstract getInventory(response: ResponseContext): Promise<{ [key: string]: number; } >;
+
+     public abstract getOrderById(response: ResponseContext): Promise<Order >;
+
+     public abstract placeOrder(response: ResponseContext): Promise<Order >;
+
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts
new file mode 100644
index 000000000000..ceef209c37db
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts
@@ -0,0 +1,298 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi';
+import {Configuration} from '../configuration';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
+import * as FormData from "form-data";
+import {ObjectSerializer} from '../models/ObjectSerializer';
+import {ApiException} from './exception';
+import {isCodeInRange} from '../util';
+import { injectable } from "inversify";
+
+import { Order } from '../models/Order';
+
+/**
+ * no description
+ */
+@injectable()
+export class StoreApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public async deleteOrder(orderId: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new RequiredError('Required parameter orderId was null or undefined when calling deleteOrder.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order/{orderId}'
+            .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public async getInventory(options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+		// Path Params
+    	const localVarPath = '/store/inventory';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public async getOrderById(orderId: number, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new RequiredError('Required parameter orderId was null or undefined when calling getOrderById.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order/{orderId}'
+            .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public async placeOrder(order: Order, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'order' is not null or undefined
+        if (order === null || order === undefined) {
+            throw new RequiredError('Required parameter order was null or undefined when calling placeOrder.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(order, "Order", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+}
+
+
+
+@injectable()
+export class StoreApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deleteOrder
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deleteOrder(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Order not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getInventory
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getInventory(response: ResponseContext): Promise<{ [key: string]: number; } > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: { [key: string]: number; } = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "{ [key: string]: number; }", "int32"
+            ) as { [key: string]: number; };
+            return body;
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: { [key: string]: number; } = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "{ [key: string]: number; }", "int32"
+            ) as { [key: string]: number; };
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getOrderById
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getOrderById(response: ResponseContext): Promise<Order > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Order not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to placeOrder
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async placeOrder(response: ResponseContext): Promise<Order > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid Order");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.service.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.service.ts
new file mode 100644
index 000000000000..0ea540fef877
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.service.ts
@@ -0,0 +1,43 @@
+import type { Configuration } from "../configuration";
+import type { HttpFile, RequestContext, ResponseContext } from "../http/http";
+
+import { User } from "../models/User";
+
+export abstract class AbstractUserApiRequestFactory {
+    public abstract createUser(user: User, options?: Configuration): Promise<RequestContext>;
+
+    public abstract createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<RequestContext>;
+
+    public abstract createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<RequestContext>;
+
+    public abstract deleteUser(username: string, options?: Configuration): Promise<RequestContext>;
+
+    public abstract getUserByName(username: string, options?: Configuration): Promise<RequestContext>;
+
+    public abstract loginUser(username: string, password: string, options?: Configuration): Promise<RequestContext>;
+
+    public abstract logoutUser(options?: Configuration): Promise<RequestContext>;
+
+    public abstract updateUser(username: string, user: User, options?: Configuration): Promise<RequestContext>;
+
+}
+
+
+export abstract class AbstractUserApiResponseProcessor {
+     public abstract createUser(response: ResponseContext): Promise< void>;
+
+     public abstract createUsersWithArrayInput(response: ResponseContext): Promise< void>;
+
+     public abstract createUsersWithListInput(response: ResponseContext): Promise< void>;
+
+     public abstract deleteUser(response: ResponseContext): Promise< void>;
+
+     public abstract getUserByName(response: ResponseContext): Promise<User >;
+
+     public abstract loginUser(response: ResponseContext): Promise<string >;
+
+     public abstract logoutUser(response: ResponseContext): Promise< void>;
+
+     public abstract updateUser(response: ResponseContext): Promise< void>;
+
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts
new file mode 100644
index 000000000000..353bae433c58
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts
@@ -0,0 +1,590 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi';
+import {Configuration} from '../configuration';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
+import * as FormData from "form-data";
+import {ObjectSerializer} from '../models/ObjectSerializer';
+import {ApiException} from './exception';
+import {isCodeInRange} from '../util';
+import { injectable } from "inversify";
+
+import { User } from '../models/User';
+
+/**
+ * no description
+ */
+@injectable()
+export class UserApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public async createUser(user: User, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "User", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public async createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithArrayInput.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/createWithArray';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "Array<User>", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public async createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithListInput.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/createWithList';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "Array<User>", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public async deleteUser(username: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling deleteUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public async getUserByName(username: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling getUserByName.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public async loginUser(username: string, password: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling loginUser.');
+        }
+
+		
+        // verify required parameter 'password' is not null or undefined
+        if (password === null || password === undefined) {
+            throw new RequiredError('Required parameter password was null or undefined when calling loginUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/login';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (username !== undefined) {
+        	requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
+        }
+        if (password !== undefined) {
+        	requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Logs out current logged in user session
+     */
+    public async logoutUser(options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+		// Path Params
+    	const localVarPath = '/user/logout';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public async updateUser(username: string, user: User, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling updateUser.');
+        }
+
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling updateUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "User", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+}
+
+
+
+@injectable()
+export class UserApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUsersWithArrayInput
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUsersWithArrayInput(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUsersWithListInput
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUsersWithListInput(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deleteUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deleteUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getUserByName
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getUserByName(response: ResponseContext): Promise<User > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: User = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "User", ""
+            ) as User;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: User = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "User", ""
+            ) as User;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to loginUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async loginUser(response: ResponseContext): Promise<string > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: string = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "string", ""
+            ) as string;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username/password supplied");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: string = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "string", ""
+            ) as string;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to logoutUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async logoutUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updateUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updateUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid user supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/baseapi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/baseapi.ts
new file mode 100644
index 000000000000..cf8fec079eb3
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/baseapi.ts
@@ -0,0 +1,40 @@
+import { Configuration } from '../configuration'
+import { injectable, inject } from "inversify";
+import { AbstractConfiguration } from "../services/configuration";
+
+/**
+ *
+ * @export
+ */
+export const COLLECTION_FORMATS = {
+    csv: ",",
+    ssv: " ",
+    tsv: "\t",
+    pipes: "|",
+};
+
+
+/**
+ * 
+ * @export
+ * @class BaseAPI
+ */
+@injectable()
+export class BaseAPIRequestFactory {
+
+    constructor(@inject(AbstractConfiguration) protected configuration: Configuration) {
+    }
+};
+
+/**
+ * 
+ * @export
+ * @class RequiredError
+ * @extends {Error}
+ */
+export class RequiredError extends Error {
+    name: "RequiredError" = "RequiredError";
+    constructor(public field: string, msg?: string) {
+        super(msg);
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/exception.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/exception.ts
new file mode 100644
index 000000000000..b76dca5aa4bc
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/exception.ts
@@ -0,0 +1,14 @@
+/**
+ * Represents an error caused by an api call i.e. it has attributes for a HTTP status code 
+ * and the returned body object.
+ *
+ * Example
+ * API returns a ErrorMessageObject whenever HTTP status code is not in [200, 299]
+ * => ApiException(404, someErrorMessageObject)
+ *
+ */
+export class ApiException<T> extends Error {
+	public constructor(public code: number, public body: T) {
+        super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body))  
+	}
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/auth/auth.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/auth/auth.ts
new file mode 100644
index 000000000000..13e3b17fa825
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/auth/auth.ts
@@ -0,0 +1,115 @@
+// typings for btoa are incorrect
+//@ts-ignore
+import * as btoa from "btoa";
+import { RequestContext } from "../http/http";
+import { injectable, inject, named } from "inversify";
+import { AbstractTokenProvider } from "../services/configuration";
+
+/**
+ * Interface authentication schemes.
+ */
+export interface SecurityAuthentication {
+    /*
+     * @return returns the name of the security authentication as specified in OAI
+     */
+    getName(): string;
+
+    /**
+     * Applies the authentication scheme to the request context
+     *
+     * @params context the request context which should use this authentication scheme
+     */
+    applySecurityAuthentication(context: RequestContext): void | Promise<void>;
+}
+
+export const AuthApiKey = Symbol("auth.api_key");
+export const AuthUsername = Symbol("auth.username");
+export const AuthPassword = Symbol("auth.password");
+
+export interface TokenProvider {
+  getToken(): Promise<string> | string;
+}
+
+/**
+ * Applies apiKey authentication to the request context.
+ */
+@injectable()
+export class ApiKeyAuthentication implements SecurityAuthentication {
+    /**
+     * Configures this api key authentication with the necessary properties
+     *
+     * @param apiKey: The api key to be used for every request
+     */
+    public constructor(@inject(AuthApiKey) @named("api_key") private apiKey: string) {}
+
+    public getName(): string {
+        return "api_key";
+    }
+
+    public applySecurityAuthentication(context: RequestContext) {
+        context.setHeaderParam("api_key", this.apiKey);
+    }
+}
+
+/**
+ * Applies oauth2 authentication to the request context.
+ */
+@injectable()
+export class PetstoreAuthAuthentication implements SecurityAuthentication {
+    // TODO: How to handle oauth2 authentication!
+    public constructor() {}
+
+    public getName(): string {
+        return "petstore_auth";
+    }
+
+    public applySecurityAuthentication(context: RequestContext) {
+        // TODO
+    }
+}
+
+
+export type AuthMethods = {
+    "api_key"?: SecurityAuthentication,
+    "petstore_auth"?: SecurityAuthentication
+}
+
+export const authMethodServices = {
+    "api_key": ApiKeyAuthentication,
+    "petstore_auth": PetstoreAuthAuthentication
+}
+
+export type ApiKeyConfiguration = string;
+export type HttpBasicConfiguration = { "username": string, "password": string };
+export type HttpBearerConfiguration = { tokenProvider: TokenProvider };
+export type OAuth2Configuration = string;
+
+export type AuthMethodsConfiguration = {
+    "api_key"?: ApiKeyConfiguration,
+    "petstore_auth"?: OAuth2Configuration
+}
+
+/**
+ * Creates the authentication methods from a swagger description.
+ *
+ */
+export function configureAuthMethods(config: AuthMethodsConfiguration | undefined): AuthMethods {
+    let authMethods: AuthMethods = {}
+
+    if (!config) {
+        return authMethods;
+    }
+
+    if (config["api_key"]) {
+        authMethods["api_key"] = new ApiKeyAuthentication(
+            config["api_key"]
+        );
+    }
+
+    if (config["petstore_auth"]) {
+        authMethods["petstore_auth"] = new PetstoreAuthAuthentication(
+        );
+    }
+
+    return authMethods;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/configuration.ts
new file mode 100644
index 000000000000..b78d85972a4a
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/configuration.ts
@@ -0,0 +1,66 @@
+import { HttpLibrary } from "./http/http";
+import { Middleware, PromiseMiddleware, PromiseMiddlewareWrapper } from "./middleware";
+import { IsomorphicFetchHttpLibrary as DefaultHttpLibrary } from "./http/isomorphic-fetch";
+import { BaseServerConfiguration, server1 } from "./servers";
+import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth";
+
+export interface Configuration {
+    readonly baseServer: BaseServerConfiguration;
+    readonly httpApi: HttpLibrary;
+    readonly middleware: Middleware[];
+    readonly authMethods: AuthMethods;
+}
+
+
+/**
+ * Interface with which a configuration object can be configured.
+ */
+export interface ConfigurationParameters {
+    /**
+     * Default server to use
+     */
+    baseServer?: BaseServerConfiguration;
+    /**
+     * HTTP library to use e.g. IsomorphicFetch
+     */
+    httpApi?: HttpLibrary;
+    /**
+     * The middlewares which will be applied to requests and responses
+     */
+    middleware?: Middleware[];
+    /**
+     * Configures all middlewares using the promise api instead of observables (which Middleware uses)
+     */
+    promiseMiddleware?: PromiseMiddleware[];
+    /**
+     * Configuration for the available authentication methods
+     */
+    authMethods?: AuthMethodsConfiguration
+}
+
+/**
+ * Configuration factory function
+ *
+ * If a property is not included in conf, a default is used:
+ *    - baseServer: server1
+ *    - httpApi: IsomorphicFetchHttpLibrary
+ *    - middleware: []
+ *    - promiseMiddleware: []
+ *    - authMethods: {}
+ *
+ * @param conf partial configuration
+ */
+export function createConfiguration(conf: ConfigurationParameters = {}): Configuration {
+    const configuration: Configuration = {
+        baseServer: conf.baseServer !== undefined ? conf.baseServer : server1,
+        httpApi: conf.httpApi || new DefaultHttpLibrary(),
+        middleware: conf.middleware || [],
+        authMethods: configureAuthMethods(conf.authMethods)
+    };
+    if (conf.promiseMiddleware) {
+        conf.promiseMiddleware.forEach(
+            m => configuration.middleware.push(new PromiseMiddlewareWrapper(m))
+        );
+    }
+    return configuration;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/git_push.sh b/samples/openapi3/client/petstore/typescript/builds/inversify/git_push.sh
new file mode 100644
index 000000000000..8442b80bb445
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts
new file mode 100644
index 000000000000..4241ca3d329b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts
@@ -0,0 +1,206 @@
+// TODO: evaluate if we can easily get rid of this library
+import * as FormData from "form-data";
+// typings of url-parse are incorrect...
+// @ts-ignore 
+import * as URLParse from "url-parse";
+import { Observable, from } from '../rxjsStub';
+
+export * from './isomorphic-fetch';
+
+/**
+ * Represents an HTTP method.
+ */
+export enum HttpMethod {
+    GET = "GET",
+    HEAD = "HEAD",
+    POST = "POST",
+    PUT = "PUT",
+    DELETE = "DELETE",
+    CONNECT = "CONNECT",
+    OPTIONS = "OPTIONS",
+    TRACE = "TRACE",
+    PATCH = "PATCH"
+}
+
+/**
+ * Represents an HTTP file which will be transferred from or to a server.
+ */
+export type HttpFile = {
+    data: Buffer,
+    name: string
+};
+
+
+export class HttpException extends Error {
+    public constructor(msg: string) {
+        super(msg);
+    }
+}
+
+/**
+ * Represents the body of an outgoing HTTP request.
+ */
+export type RequestBody = undefined | string | FormData;
+
+/**
+ * Represents an HTTP request context
+ */
+export class RequestContext {
+    private headers: { [key: string]: string } = {};
+    private body: RequestBody = undefined;
+    private url: URLParse;
+
+	/**
+	 * Creates the request context using a http method and request resource url
+	 *
+	 * @param url url of the requested resource
+	 * @param httpMethod http method
+	 */
+    public constructor(url: string, private httpMethod: HttpMethod) {
+        this.url = new URLParse(url, true);
+    }
+    
+    /*
+     * Returns the url set in the constructor including the query string
+     *
+     */
+    public getUrl(): string {
+    	return this.url.toString();
+    }
+    
+    /**
+     * Replaces the url set in the constructor with this url.
+     *
+     */
+    public setUrl(url: string) {
+    	this.url = new URLParse(url, true);
+    }
+
+    /**
+     * Sets the body of the http request either as a string or FormData
+     *
+     * Note that setting a body on a HTTP GET, HEAD, DELETE, CONNECT or TRACE
+     * request is discouraged.
+     * https://httpwg.org/http-core/draft-ietf-httpbis-semantics-latest.html#rfc.section.7.3.1
+     *
+     * @param body the body of the request
+     */
+    public setBody(body: RequestBody) {
+        this.body = body;
+    }
+
+    public getHttpMethod(): HttpMethod {
+    	return this.httpMethod;
+    }
+    
+    public getHeaders(): { [key: string]: string } {
+    	return this.headers;
+    }
+
+    public getBody(): RequestBody {
+        return this.body;
+    }
+
+	public setQueryParam(name: string, value: string) {
+        let queryObj = this.url.query;
+        queryObj[name] = value;
+        this.url.set("query", queryObj);
+    }
+
+	/**
+	 *	Sets a cookie with the name and value. NO check  for duplicate cookies is performed
+	 *
+	 */
+    public addCookie(name: string, value: string): void {
+        if (!this.headers["Cookie"]) {
+            this.headers["Cookie"] = "";
+        }
+        this.headers["Cookie"] += name + "=" + value + "; ";
+    }
+
+    public setHeaderParam(key: string, value: string): void  { 
+        this.headers[key] = value;
+    }
+}
+
+export interface ResponseBody {
+    text(): Promise<string>;
+    binary(): Promise<Buffer>;
+}
+
+
+/**
+ * Helper class to generate a `ResponseBody` from binary data
+ */
+export class SelfDecodingBody implements ResponseBody {
+    constructor(private dataSource: Promise<Buffer>) {}
+
+    binary(): Promise<Buffer> {
+        return this.dataSource;
+    }
+
+    async text(): Promise<string> {
+        const data: Buffer = await this.dataSource;
+        return data.toString();
+    }
+}
+
+export class ResponseContext {
+    public constructor(
+        public httpStatusCode: number,
+        public headers: { [key: string]: string },
+        public body: ResponseBody
+    ) {}
+
+    /**
+     * Parse header value in the form `value; param1="value1"`
+     *
+     * E.g. for Content-Type or Content-Disposition
+     * Parameter names are converted to lower case
+     * The first parameter is returned with the key `""`
+     */
+    public getParsedHeader(headerName: string): { [parameter: string]: string } {
+        const result: { [parameter: string]: string } = {};
+        if (!this.headers[headerName]) {
+            return result;
+        }
+
+        const parameters = this.headers[headerName].split(";");
+        for (const parameter of parameters) {
+            let [key, value] = parameter.split("=", 2);
+            key = key.toLowerCase().trim();
+            if (value === undefined) {
+                result[""] = key;
+            } else {
+                value = value.trim();
+                if (value.startsWith('"') && value.endsWith('"')) {
+                    value = value.substring(1, value.length - 1);
+                }
+                result[key] = value;
+            }
+        }
+        return result;
+    }
+
+    public async getBodyAsFile(): Promise<HttpFile> {
+        const data = await this.body.binary();
+        const fileName = this.getParsedHeader("content-disposition")["filename"] || "";
+        return { data, name: fileName };
+    }
+}
+
+export interface HttpLibrary {
+    send(request: RequestContext): Observable<ResponseContext>;
+}
+
+export interface PromiseHttpLibrary {
+    send(request: RequestContext): Promise<ResponseContext>;
+}
+
+export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLibrary {
+  return {
+    send(request: RequestContext): Observable<ResponseContext> {
+      return from(promiseHttpLibrary.send(request));
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/http/isomorphic-fetch.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/http/isomorphic-fetch.ts
new file mode 100644
index 000000000000..ed390df7ce10
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/http/isomorphic-fetch.ts
@@ -0,0 +1,31 @@
+import {HttpLibrary, RequestContext, ResponseContext} from './http';
+import { from, Observable } from '../rxjsStub';
+import fetch from "node-fetch";
+
+export class IsomorphicFetchHttpLibrary implements HttpLibrary {
+
+    public send(request: RequestContext): Observable<ResponseContext> {
+        let method = request.getHttpMethod().toString();
+        let body = request.getBody();
+
+        const resultPromise = fetch(request.getUrl(), {
+            method: method,
+            body: body as any,
+            headers: request.getHeaders(),
+        }).then((resp: any) => {
+            const headers: { [name: string]: string } = {};
+            resp.headers.forEach((value: string, name: string) => {
+              headers[name] = value;
+            });
+
+            const body = {
+              text: () => resp.text(),
+              binary: () => resp.buffer()
+            };
+            return new ResponseContext(resp.status, headers, body);
+        });
+
+        return from<Promise<ResponseContext>>(resultPromise);
+
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/index.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/index.ts
new file mode 100644
index 000000000000..ddf4ed98b1da
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/index.ts
@@ -0,0 +1,12 @@
+export * from "./http/http";
+export * from "./auth/auth";
+export * from "./models/all";
+export { createConfiguration, Configuration } from "./configuration"
+export * from "./apis/exception";
+export * from "./servers";
+
+export { PromiseMiddleware as Middleware } from './middleware';
+export { PromisePetApi as PetApi,  PromiseStoreApi as StoreApi,  PromiseUserApi as UserApi } from './types/PromiseAPI';
+
+export * from "./services/index";
+export { AbstractPromisePetApi as AbstractPetApi,  AbstractPromiseStoreApi as AbstractStoreApi,  AbstractPromiseUserApi as AbstractUserApi } from './services/PromiseAPI';
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/middleware.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/middleware.ts
new file mode 100644
index 000000000000..46da5d25ef07
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/middleware.ts
@@ -0,0 +1,66 @@
+import {RequestContext, ResponseContext} from './http/http';
+import { Observable, from } from './rxjsStub';
+
+/**
+ * Defines the contract for a middleware intercepting requests before
+ * they are sent (but after the RequestContext was created)
+ * and before the ResponseContext is unwrapped.
+ *
+ */
+export interface Middleware {
+	/**
+	 * Modifies the request before the request is sent. 
+	 *
+	 * @param context RequestContext of a request which is about to be sent to the server
+	 * @returns an observable of the updated request context
+	 *
+	 */
+    pre(context: RequestContext): Observable<RequestContext>;
+    /**
+     * Modifies the returned response before it is deserialized.
+     *
+     * @param context ResponseContext of a sent request
+     * @returns an observable of the modified response context
+     */
+    post(context: ResponseContext): Observable<ResponseContext>;
+}
+
+export class PromiseMiddlewareWrapper implements Middleware {
+
+    public constructor(private middleware: PromiseMiddleware) {
+
+    }
+
+    pre(context: RequestContext): Observable<RequestContext> {
+        return from(this.middleware.pre(context));
+    }
+    
+    post(context: ResponseContext): Observable<ResponseContext> {
+        return from(this.middleware.post(context));
+    }
+
+}
+
+/**
+ * Defines the contract for a middleware intercepting requests before
+ * they are sent (but after the RequestContext was created)
+ * and before the ResponseContext is unwrapped.
+ *
+ */
+export interface PromiseMiddleware {
+	/**
+	 * Modifies the request before the request is sent. 
+	 *
+	 * @param context RequestContext of a request which is about to be sent to the server
+	 * @returns an observable of the updated request context
+	 *
+	 */
+    pre(context: RequestContext): Promise<RequestContext>;
+        /**
+     * Modifies the returned response before it is deserialized.
+     *
+     * @param context ResponseContext of a sent request
+     * @returns an observable of the modified response context
+     */
+    post(context: ResponseContext): Promise<ResponseContext>;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/ApiResponse.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/ApiResponse.ts
new file mode 100644
index 000000000000..300b2de4d9a9
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/ApiResponse.ts
@@ -0,0 +1,52 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* Describes the result of uploading an image resource
+*/
+export class ApiResponse {
+    'code'?: number;
+    'type'?: string;
+    'message'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "code",
+            "baseName": "code",
+            "type": "number",
+            "format": "int32"
+        },
+        {
+            "name": "type",
+            "baseName": "type",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "message",
+            "baseName": "message",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ApiResponse.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Category.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Category.ts
new file mode 100644
index 000000000000..9b210d5d501d
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Category.ts
@@ -0,0 +1,45 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* A category for a pet
+*/
+export class Category {
+    'id'?: number;
+    'name'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Category.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/InlineObject.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/InlineObject.ts
new file mode 100644
index 000000000000..54192c1c8356
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/InlineObject.ts
@@ -0,0 +1,48 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+export class InlineObject {
+    /**
+    * Updated name of the pet
+    */
+    'name'?: string;
+    /**
+    * Updated status of the pet
+    */
+    'status'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return InlineObject.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/InlineObject1.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/InlineObject1.ts
new file mode 100644
index 000000000000..02e988674a08
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/InlineObject1.ts
@@ -0,0 +1,48 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+export class InlineObject1 {
+    /**
+    * Additional data to pass to server
+    */
+    'additionalMetadata'?: string;
+    /**
+    * file to upload
+    */
+    'file'?: HttpFile;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "additionalMetadata",
+            "baseName": "additionalMetadata",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "file",
+            "baseName": "file",
+            "type": "HttpFile",
+            "format": "binary"
+        }    ];
+
+    static getAttributeTypeMap() {
+        return InlineObject1.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts
new file mode 100644
index 000000000000..f485b39e42b3
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts
@@ -0,0 +1,240 @@
+export * from './ApiResponse';
+export * from './Category';
+export * from './InlineObject';
+export * from './InlineObject1';
+export * from './Order';
+export * from './Pet';
+export * from './Tag';
+export * from './User';
+
+import { ApiResponse } from './ApiResponse';
+import { Category } from './Category';
+import { InlineObject } from './InlineObject';
+import { InlineObject1 } from './InlineObject1';
+import { Order    , OrderStatusEnum    } from './Order';
+import { Pet     , PetStatusEnum   } from './Pet';
+import { Tag } from './Tag';
+import { User } from './User';
+
+/* tslint:disable:no-unused-variable */
+let primitives = [
+                    "string",
+                    "boolean",
+                    "double",
+                    "integer",
+                    "long",
+                    "float",
+                    "number",
+                    "any"
+                 ];
+
+const supportedMediaTypes: { [mediaType: string]: number } = {
+  "application/json": Infinity,
+  "application/octet-stream": 0
+}
+
+                 
+let enumsMap: Set<string> = new Set<string>([
+					"OrderStatusEnum",
+					"PetStatusEnum",
+]);
+
+let typeMap: {[index: string]: any} = {
+    "ApiResponse": ApiResponse,
+    "Category": Category,
+    "InlineObject": InlineObject,
+    "InlineObject1": InlineObject1,
+    "Order": Order,
+    "Pet": Pet,
+    "Tag": Tag,
+    "User": User,
+}
+
+export class ObjectSerializer {
+    public static findCorrectType(data: any, expectedType: string) {
+        if (data == undefined) {
+            return expectedType;
+        } else if (primitives.indexOf(expectedType.toLowerCase()) !== -1) {
+            return expectedType;
+        } else if (expectedType === "Date") {
+            return expectedType;
+        } else {
+            if (enumsMap.has(expectedType)) {
+                return expectedType;
+            }
+
+            if (!typeMap[expectedType]) {
+                return expectedType; // w/e we don't know the type
+            }
+
+            // Check the discriminator
+            let discriminatorProperty = typeMap[expectedType].discriminator;
+            if (discriminatorProperty == null) {
+                return expectedType; // the type does not have a discriminator. use it.
+            } else {
+                if (data[discriminatorProperty]) {
+                    var discriminatorType = data[discriminatorProperty];
+                    if(typeMap[discriminatorType]){
+                        return discriminatorType; // use the type given in the discriminator
+                    } else {
+                        return expectedType; // discriminator did not map to a type
+                    }
+                } else {
+                    return expectedType; // discriminator was not present (or an empty string)
+                }
+            }
+        }
+    }
+
+    public static serialize(data: any, type: string, format: string) {
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.serialize(date, subType, format));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            if (format == "date") {
+                let month = data.getMonth()+1
+                month = month < 10 ? "0" + month.toString() : month.toString()
+                let day = data.getDate();
+                day = day < 10 ? "0" + day.toString() : day.toString();
+
+                return data.getFullYear() + "-" + month + "-" + day;
+            } else {
+                return data.toISOString();
+            }
+        } else {
+            if (enumsMap.has(type)) {
+                return data;
+            }
+            if (!typeMap[type]) { // in case we dont know the type
+                return data;
+            }
+            
+            // Get the actual type of this object
+            type = this.findCorrectType(data, type);
+
+            // get the map for the correct type.
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            let instance: {[index: string]: any} = {};
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type, attributeType.format);
+            }
+            return instance;
+        }
+    }
+
+    public static deserialize(data: any, type: string, format: string) {
+        // polymorphism may change the actual type.
+        type = ObjectSerializer.findCorrectType(data, type);
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.deserialize(date, subType, format));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            return new Date(data);
+        } else {
+            if (enumsMap.has(type)) {// is Enum
+                return data;
+            }
+
+            if (!typeMap[type]) { // dont know the type
+                return data;
+            }
+            let instance = new typeMap[type]();
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.name] = ObjectSerializer.deserialize(data[attributeType.baseName], attributeType.type, attributeType.format);
+            }
+            return instance;
+        }
+    }
+
+
+    /**
+     * Normalize media type
+     *
+     * We currently do not handle any media types attributes, i.e. anything
+     * after a semicolon. All content is assumed to be UTF-8 compatible.
+     */
+    public static normalizeMediaType(mediaType: string | undefined): string | undefined {
+        if (mediaType === undefined) {
+            return undefined;
+        }
+        return mediaType.split(";")[0].trim().toLowerCase();
+    }
+
+    /**
+     * From a list of possible media types, choose the one we can handle best.
+     *
+     * The order of the given media types does not have any impact on the choice
+     * made.
+     */
+    public static getPreferredMediaType(mediaTypes: Array<string>): string {
+        /** According to OAS 3 we should default to json */
+        if (!mediaTypes) {
+            return "application/json";
+        }
+
+        const normalMediaTypes = mediaTypes.map(this.normalizeMediaType);
+        let selectedMediaType: string | undefined = undefined;
+        let selectedRank: number = -Infinity;
+        for (const mediaType of normalMediaTypes) {
+            if (supportedMediaTypes[mediaType!] > selectedRank) {
+                selectedMediaType = mediaType;
+                selectedRank = supportedMediaTypes[mediaType!];
+            }
+        }
+
+        if (selectedMediaType === undefined) {
+            throw new Error("None of the given media types are supported: " + mediaTypes.join(", "));
+        }
+
+        return selectedMediaType!;
+    }
+
+    /**
+     * Convert data to a string according the given media type
+     */
+    public static stringify(data: any, mediaType: string): string {
+        if (mediaType === "application/json") {
+            return JSON.stringify(data);
+        }
+
+        throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.stringify.");
+    }
+
+    /**
+     * Parse data from a string according to the given media type
+     */
+    public static parse(rawData: string, mediaType: string | undefined) {
+        if (mediaType === undefined) {
+            throw new Error("Cannot parse content. No Content-Type defined.");
+        }
+
+        if (mediaType === "application/json") {
+            return JSON.parse(rawData);
+        }
+
+        throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.parse.");
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts
new file mode 100644
index 000000000000..291018b9e065
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts
@@ -0,0 +1,79 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* An order for a pets from the pet store
+*/
+export class Order {
+    'id'?: number;
+    'petId'?: number;
+    'quantity'?: number;
+    'shipDate'?: Date;
+    /**
+    * Order Status
+    */
+    'status'?: OrderStatusEnum;
+    'complete'?: boolean;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "petId",
+            "baseName": "petId",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "quantity",
+            "baseName": "quantity",
+            "type": "number",
+            "format": "int32"
+        },
+        {
+            "name": "shipDate",
+            "baseName": "shipDate",
+            "type": "Date",
+            "format": "date-time"
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "OrderStatusEnum",
+            "format": ""
+        },
+        {
+            "name": "complete",
+            "baseName": "complete",
+            "type": "boolean",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Order.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
+
+export type OrderStatusEnum = "placed" | "approved" | "delivered" ;
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts
new file mode 100644
index 000000000000..77a3490297db
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts
@@ -0,0 +1,81 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { Category } from './Category';
+import { Tag } from './Tag';
+import { HttpFile } from '../http/http';
+
+/**
+* A pet for sale in the pet store
+*/
+export class Pet {
+    'id'?: number;
+    'category'?: Category;
+    'name': string;
+    'photoUrls': Array<string>;
+    'tags'?: Array<Tag>;
+    /**
+    * pet status in the store
+    */
+    'status'?: PetStatusEnum;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "category",
+            "baseName": "category",
+            "type": "Category",
+            "format": ""
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "photoUrls",
+            "baseName": "photoUrls",
+            "type": "Array<string>",
+            "format": ""
+        },
+        {
+            "name": "tags",
+            "baseName": "tags",
+            "type": "Array<Tag>",
+            "format": ""
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "PetStatusEnum",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Pet.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
+
+export type PetStatusEnum = "available" | "pending" | "sold" ;
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Tag.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Tag.ts
new file mode 100644
index 000000000000..ce2a0e6d2a80
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Tag.ts
@@ -0,0 +1,45 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* A tag for a pet
+*/
+export class Tag {
+    'id'?: number;
+    'name'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Tag.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/User.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/User.ts
new file mode 100644
index 000000000000..049af95de370
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/User.ts
@@ -0,0 +1,90 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* A User who is purchasing from the pet store
+*/
+export class User {
+    'id'?: number;
+    'username'?: string;
+    'firstName'?: string;
+    'lastName'?: string;
+    'email'?: string;
+    'password'?: string;
+    'phone'?: string;
+    /**
+    * User Status
+    */
+    'userStatus'?: number;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "username",
+            "baseName": "username",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "firstName",
+            "baseName": "firstName",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "lastName",
+            "baseName": "lastName",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "email",
+            "baseName": "email",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "password",
+            "baseName": "password",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "phone",
+            "baseName": "phone",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "userStatus",
+            "baseName": "userStatus",
+            "type": "number",
+            "format": "int32"
+        }    ];
+
+    static getAttributeTypeMap() {
+        return User.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/all.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/all.ts
new file mode 100644
index 000000000000..d064eba93abd
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/all.ts
@@ -0,0 +1,8 @@
+export * from './ApiResponse'
+export * from './Category'
+export * from './InlineObject'
+export * from './InlineObject1'
+export * from './Order'
+export * from './Pet'
+export * from './Tag'
+export * from './User'
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/package-lock.json b/samples/openapi3/client/petstore/typescript/builds/inversify/package-lock.json
new file mode 100644
index 000000000000..133d18033983
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/package-lock.json
@@ -0,0 +1,120 @@
+{
+  "name": "ts-petstore-client",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/node": {
+      "version": "14.0.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.11.tgz",
+      "integrity": "sha512-lCvvI24L21ZVeIiyIUHZ5Oflv1hhHQ5E1S25IRlKIXaRkVgmXpJMI3wUJkmym2bTbCe+WoIibQnMVAU3FguaOg=="
+    },
+    "@types/node-fetch": {
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
+      "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+      "requires": {
+        "@types/node": "*",
+        "form-data": "^3.0.0"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+          "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        }
+      }
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "btoa": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
+      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
+    "form-data": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "inversify": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/inversify/-/inversify-5.0.1.tgz",
+      "integrity": "sha512-Ieh06s48WnEYGcqHepdsJUIJUXpwH5o5vodAX+DK2JA/gjy4EbEcQZxw+uFfzysmKjiLXGYwNG3qDZsKVMcINQ=="
+    },
+    "mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+    },
+    "mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "requires": {
+        "mime-db": "1.44.0"
+      }
+    },
+    "node-fetch": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+    },
+    "querystringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+    },
+    "typescript": {
+      "version": "3.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz",
+      "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==",
+      "dev": true
+    },
+    "url-parse": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    }
+  }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/package.json b/samples/openapi3/client/petstore/typescript/builds/inversify/package.json
new file mode 100644
index 000000000000..61af027719c1
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/package.json
@@ -0,0 +1,32 @@
+{
+  "name": "ts-petstore-client",
+  "version": "1.0.0",
+  "description": "OpenAPI client for ts-petstore-client",
+  "author": "OpenAPI-Generator Contributors",
+  "keywords": [
+    "fetch",
+    "typescript",
+    "openapi-client",
+    "openapi-generator"
+  ],
+  "license": "Unlicense",
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
+  "scripts": {
+    "build": "tsc",
+    "prepublishOnly": "npm run build"
+  },
+  "dependencies": {
+    "node-fetch": "^2.6.0",
+    "@types/node-fetch": "^2.5.7",
+    "@types/node": "*",
+    "form-data": "^2.5.0",
+    "btoa": "^1.2.1",
+    "inversify": "^5.0.1",
+    "es6-promise": "^4.2.4",
+    "url-parse": "^1.4.3"
+  },
+  "devDependencies": {
+    "typescript": "^3.9.3"
+  }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/pom.xml b/samples/openapi3/client/petstore/typescript/builds/inversify/pom.xml
new file mode 100644
index 000000000000..9f19515eb5fb
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/pom.xml
@@ -0,0 +1,60 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptBuildInversifyPetstoreClientSample</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Inversify Petstore Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-build</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>build</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/rxjsStub.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/rxjsStub.ts
new file mode 100644
index 000000000000..4c73715a2486
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/rxjsStub.ts
@@ -0,0 +1,27 @@
+export class Observable<T> {
+  constructor(private promise: Promise<T>) {}
+
+  toPromise() {
+    return this.promise;
+  }
+
+  pipe<S>(callback: (value: T) => S | Promise<S>): Observable<S> {
+    return new Observable(this.promise.then(callback));
+  }
+}
+
+export function from<T>(promise: Promise<any>) {
+  return new Observable(promise);
+}
+
+export function of<T>(value: T) {
+  return new Observable<T>(Promise.resolve(value));
+}
+
+export function mergeMap<T, S>(callback: (value: T) => Observable<S>) {
+  return (value: T) => callback(value).toPromise();
+}
+
+export function map(callback: any) {
+  return callback;
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts
new file mode 100644
index 000000000000..aa5332db7ae9
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/servers.ts
@@ -0,0 +1,53 @@
+import { RequestContext, HttpMethod } from "./http/http";
+
+export interface BaseServerConfiguration {
+    makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext;
+}
+
+/**
+ *
+ * Represents the configuration of a server including its
+ * url template and variable configuration based on the url.
+ *
+ */
+export class ServerConfiguration<T extends { [key: string]: string }> implements BaseServerConfiguration {
+    public constructor(private url: string, private variableConfiguration: T) {}
+
+    /**
+     * Sets the value of the variables of this server.
+     *
+     * @param variableConfiguration a partial variable configuration for the variables contained in the url
+     */
+    public setVariables(variableConfiguration: Partial<T>) {
+        Object.assign(this.variableConfiguration, variableConfiguration);
+    }
+
+	public getConfiguration(): T {
+		return this.variableConfiguration
+	}
+
+	private getUrl() {
+		let replacedUrl = this.url;
+		for (const key in this.variableConfiguration) {
+			var re = new RegExp("{" + key + "}","g");
+			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+		}
+		return replacedUrl
+	}
+
+	/**
+	 * Creates a new request context for this server using the url with variables
+	 * replaced with their respective values and the endpoint of the request appended.
+	 *
+	 * @param endpoint the endpoint to be queried on the server
+	 * @param httpMethod httpMethod to be used
+	 *
+	 */	
+	public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
+		return new RequestContext(this.getUrl() + endpoint, httpMethod);		
+	}
+}
+
+export const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  })
+
+export const servers = [server1];
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObjectParamAPI.ts
new file mode 100644
index 000000000000..c3bff4dceeac
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObjectParamAPI.ts
@@ -0,0 +1,153 @@
+import type { HttpFile } from '../http/http';
+import type { Configuration } from '../configuration'
+import type * as req from "../types/ObjectParamAPI";
+
+import type { ApiResponse } from '../models/ApiResponse';
+import type { Category } from '../models/Category';
+import type { InlineObject } from '../models/InlineObject';
+import type { InlineObject1 } from '../models/InlineObject1';
+import type { Order } from '../models/Order';
+import type { Pet } from '../models/Pet';
+import type { Tag } from '../models/Tag';
+import type { User } from '../models/User';
+
+
+export abstract class AbstractObjectPetApi {
+    /**
+     * Add a new pet to the store
+     * @param param the request object
+     */
+    public abstract addPet(param: req.PetApiAddPetRequest, options?: Configuration): Promise<Pet>;
+
+    /**
+     * Deletes a pet
+     * @param param the request object
+     */
+    public abstract deletePet(param: req.PetApiDeletePetRequest, options?: Configuration): Promise<void>;
+
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param param the request object
+     */
+    public abstract findPetsByStatus(param: req.PetApiFindPetsByStatusRequest, options?: Configuration): Promise<Array<Pet>>;
+
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param param the request object
+     */
+    public abstract findPetsByTags(param: req.PetApiFindPetsByTagsRequest, options?: Configuration): Promise<Array<Pet>>;
+
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param param the request object
+     */
+    public abstract getPetById(param: req.PetApiGetPetByIdRequest, options?: Configuration): Promise<Pet>;
+
+    /**
+     * Update an existing pet
+     * @param param the request object
+     */
+    public abstract updatePet(param: req.PetApiUpdatePetRequest, options?: Configuration): Promise<Pet>;
+
+    /**
+     * Updates a pet in the store with form data
+     * @param param the request object
+     */
+    public abstract updatePetWithForm(param: req.PetApiUpdatePetWithFormRequest, options?: Configuration): Promise<void>;
+
+    /**
+     * uploads an image
+     * @param param the request object
+     */
+    public abstract uploadFile(param: req.PetApiUploadFileRequest, options?: Configuration): Promise<ApiResponse>;
+
+}
+
+
+export abstract class AbstractObjectStoreApi {
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param param the request object
+     */
+    public abstract deleteOrder(param: req.StoreApiDeleteOrderRequest, options?: Configuration): Promise<void>;
+
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     * @param param the request object
+     */
+    public abstract getInventory(param: req.StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }>;
+
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param param the request object
+     */
+    public abstract getOrderById(param: req.StoreApiGetOrderByIdRequest, options?: Configuration): Promise<Order>;
+
+    /**
+     * Place an order for a pet
+     * @param param the request object
+     */
+    public abstract placeOrder(param: req.StoreApiPlaceOrderRequest, options?: Configuration): Promise<Order>;
+
+}
+
+
+export abstract class AbstractObjectUserApi {
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param param the request object
+     */
+    public abstract createUser(param: req.UserApiCreateUserRequest, options?: Configuration): Promise<void>;
+
+    /**
+     * Creates list of users with given input array
+     * @param param the request object
+     */
+    public abstract createUsersWithArrayInput(param: req.UserApiCreateUsersWithArrayInputRequest, options?: Configuration): Promise<void>;
+
+    /**
+     * Creates list of users with given input array
+     * @param param the request object
+     */
+    public abstract createUsersWithListInput(param: req.UserApiCreateUsersWithListInputRequest, options?: Configuration): Promise<void>;
+
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param param the request object
+     */
+    public abstract deleteUser(param: req.UserApiDeleteUserRequest, options?: Configuration): Promise<void>;
+
+    /**
+     * Get user by user name
+     * @param param the request object
+     */
+    public abstract getUserByName(param: req.UserApiGetUserByNameRequest, options?: Configuration): Promise<User>;
+
+    /**
+     * Logs user into the system
+     * @param param the request object
+     */
+    public abstract loginUser(param: req.UserApiLoginUserRequest, options?: Configuration): Promise<string>;
+
+    /**
+     * Logs out current logged in user session
+     * @param param the request object
+     */
+    public abstract logoutUser(param: req.UserApiLogoutUserRequest, options?: Configuration): Promise<void>;
+
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param param the request object
+     */
+    public abstract updateUser(param: req.UserApiUpdateUserRequest, options?: Configuration): Promise<void>;
+
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts
new file mode 100644
index 000000000000..346900cc554a
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts
@@ -0,0 +1,64 @@
+import type { HttpFile } from "../http/http";
+import type { Observable } from "../rxjsStub";
+import type { Configuration } from "../configuration";
+
+import { ApiResponse } from "../models/ApiResponse";
+import { Category } from "../models/Category";
+import { InlineObject } from "../models/InlineObject";
+import { InlineObject1 } from "../models/InlineObject1";
+import { Order } from "../models/Order";
+import { Pet } from "../models/Pet";
+import { Tag } from "../models/Tag";
+import { User } from "../models/User";
+
+
+export abstract class AbstractObservablePetApi {
+    public abstract addPet(pet: Pet, options?: Configuration): Observable<Pet>;
+
+    public abstract deletePet(petId: number, apiKey?: string, options?: Configuration): Observable<void>;
+
+    public abstract findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Observable<Array<Pet>>;
+
+    public abstract findPetsByTags(tags: Array<string>, options?: Configuration): Observable<Array<Pet>>;
+
+    public abstract getPetById(petId: number, options?: Configuration): Observable<Pet>;
+
+    public abstract updatePet(pet: Pet, options?: Configuration): Observable<Pet>;
+
+    public abstract updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Observable<void>;
+
+    public abstract uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Observable<ApiResponse>;
+
+}
+
+
+export abstract class AbstractObservableStoreApi {
+    public abstract deleteOrder(orderId: string, options?: Configuration): Observable<void>;
+
+    public abstract getInventory(options?: Configuration): Observable<{ [key: string]: number; }>;
+
+    public abstract getOrderById(orderId: number, options?: Configuration): Observable<Order>;
+
+    public abstract placeOrder(order: Order, options?: Configuration): Observable<Order>;
+
+}
+
+
+export abstract class AbstractObservableUserApi {
+    public abstract createUser(user: User, options?: Configuration): Observable<void>;
+
+    public abstract createUsersWithArrayInput(user: Array<User>, options?: Configuration): Observable<void>;
+
+    public abstract createUsersWithListInput(user: Array<User>, options?: Configuration): Observable<void>;
+
+    public abstract deleteUser(username: string, options?: Configuration): Observable<void>;
+
+    public abstract getUserByName(username: string, options?: Configuration): Observable<User>;
+
+    public abstract loginUser(username: string, password: string, options?: Configuration): Observable<string>;
+
+    public abstract logoutUser(options?: Configuration): Observable<void>;
+
+    public abstract updateUser(username: string, user: User, options?: Configuration): Observable<void>;
+
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts
new file mode 100644
index 000000000000..365741814d38
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts
@@ -0,0 +1,63 @@
+import type { HttpFile } from "../http/http";
+import type { Configuration } from "../configuration";
+
+import { ApiResponse } from "../models/ApiResponse";
+import { Category } from "../models/Category";
+import { InlineObject } from "../models/InlineObject";
+import { InlineObject1 } from "../models/InlineObject1";
+import { Order } from "../models/Order";
+import { Pet } from "../models/Pet";
+import { Tag } from "../models/Tag";
+import { User } from "../models/User";
+
+
+export abstract class AbstractPromisePetApi {
+    public abstract addPet(pet: Pet, options?: Configuration): Promise<Pet>;
+
+    public abstract deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<void>;
+
+    public abstract findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<Array<Pet>>;
+
+    public abstract findPetsByTags(tags: Array<string>, options?: Configuration): Promise<Array<Pet>>;
+
+    public abstract getPetById(petId: number, options?: Configuration): Promise<Pet>;
+
+    public abstract updatePet(pet: Pet, options?: Configuration): Promise<Pet>;
+
+    public abstract updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<void>;
+
+    public abstract uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<ApiResponse>;
+
+}
+
+
+export abstract class AbstractPromiseStoreApi {
+    public abstract deleteOrder(orderId: string, options?: Configuration): Promise<void>;
+
+    public abstract getInventory(options?: Configuration): Promise<{ [key: string]: number; }>;
+
+    public abstract getOrderById(orderId: number, options?: Configuration): Promise<Order>;
+
+    public abstract placeOrder(order: Order, options?: Configuration): Promise<Order>;
+
+}
+
+
+export abstract class AbstractPromiseUserApi {
+    public abstract createUser(user: User, options?: Configuration): Promise<void>;
+
+    public abstract createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<void>;
+
+    public abstract createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<void>;
+
+    public abstract deleteUser(username: string, options?: Configuration): Promise<void>;
+
+    public abstract getUserByName(username: string, options?: Configuration): Promise<User>;
+
+    public abstract loginUser(username: string, password: string, options?: Configuration): Promise<string>;
+
+    public abstract logoutUser(options?: Configuration): Promise<void>;
+
+    public abstract updateUser(username: string, user: User, options?: Configuration): Promise<void>;
+
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/configuration.ts
new file mode 100644
index 000000000000..06e8dc992fcc
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/configuration.ts
@@ -0,0 +1,21 @@
+import type { AbstractServerConfiguration } from "./http";
+import type { HttpLibrary, RequestContext } from "../http/http";
+import type { Middleware } from "../middleware";
+import type { AuthMethods, TokenProvider } from "../auth/auth";
+import type { Configuration } from "../configuration";
+
+export abstract class AbstractConfiguration implements Configuration {
+    abstract get baseServer(): AbstractServerConfiguration;
+    abstract get httpApi(): HttpLibrary;
+    abstract get middleware(): Middleware[];
+    abstract get authMethods(): AuthMethods;
+}
+
+export abstract class AbstractAuthMethod {
+    public abstract getName(): string;
+    public abstract applySecurityAuthentication(context: RequestContext): void | Promise<void>;
+};
+
+export abstract class AbstractTokenProvider implements TokenProvider {
+    public abstract getToken(): string | Promise<string>;
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/http.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/http.ts
new file mode 100644
index 000000000000..a84fc3f5dec1
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/http.ts
@@ -0,0 +1,17 @@
+import type { PromiseHttpLibrary, HttpMethod, RequestContext, ResponseContext } from "../http/http";
+import type { PromiseMiddleware } from "../middleware";
+import type { BaseServerConfiguration } from "../servers";
+
+export abstract class AbstractHttpLibrary implements PromiseHttpLibrary {
+    public abstract send(request: RequestContext): Promise<ResponseContext>;
+};
+
+export abstract class AbstractMiddleware implements PromiseMiddleware {
+    public abstract pre(context: RequestContext): Promise<RequestContext>;
+    public abstract post(context: ResponseContext): Promise<ResponseContext>;
+}
+
+export abstract class AbstractServerConfiguration implements BaseServerConfiguration {
+    public abstract makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext;
+};
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/index.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/index.ts
new file mode 100644
index 000000000000..6d51d98048a3
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/index.ts
@@ -0,0 +1,126 @@
+import { inject, injectable, multiInject, optional, interfaces } from "inversify";
+
+import { Configuration } from "../configuration";
+import { ServerConfiguration, servers } from "../servers";
+import { HttpLibrary, wrapHttpLibrary } from "../http/http";
+import { Middleware, PromiseMiddlewareWrapper } from "../middleware";
+import { authMethodServices, AuthMethods } from "../auth/auth";
+
+import { IsomorphicFetchHttpLibrary as DefaultHttpLibrary } from "../http/isomorphic-fetch";
+
+import { AbstractHttpLibrary, AbstractMiddleware, AbstractServerConfiguration } from "./http";
+import { AbstractConfiguration, AbstractAuthMethod, AbstractTokenProvider } from "./configuration";
+
+export { AbstractHttpLibrary, AbstractMiddleware, AbstractServerConfiguration, AbstractConfiguration, AbstractAuthMethod, AbstractTokenProvider };
+
+import * as apis from "../types/PromiseAPI";
+import * as apiServices from "./PromiseAPI";
+
+@injectable()
+class InjectableConfiguration implements AbstractConfiguration {
+    public httpApi: HttpLibrary = new DefaultHttpLibrary();
+    public middleware: Middleware[] = [];
+    public authMethods: AuthMethods = {};
+
+    constructor(
+        @inject(AbstractServerConfiguration) @optional() public baseServer: AbstractServerConfiguration = servers[0],
+        @inject(AbstractHttpLibrary) @optional() httpApi: AbstractHttpLibrary,
+        @multiInject(AbstractMiddleware) @optional() middleware: AbstractMiddleware[] = [],
+        @multiInject(AbstractAuthMethod) @optional() securityConfiguration: AbstractAuthMethod[] = []
+    ) {
+        this.httpApi = httpApi === undefined ? new DefaultHttpLibrary() : wrapHttpLibrary(httpApi);
+        for (const _middleware of middleware) {
+            this.middleware.push(new PromiseMiddlewareWrapper(_middleware));
+        }
+        for (const authMethod of securityConfiguration) {
+            const authName = authMethod.getName();
+            // @ts-ignore
+            if (authMethodServices[authName] !== undefined) {
+              // @ts-ignore
+              this.authMethods[authName] = authMethod;
+            }
+        }
+    }
+}
+
+/**
+ * Helper class to simplify binding the services
+ */
+export class ApiServiceBinder {
+    constructor(private container: interfaces.Container) {
+        this.container.bind(AbstractConfiguration).to(InjectableConfiguration);
+    }
+
+    /**
+     * Allows you to bind a server configuration without having to import the service identifier.
+     */
+    public get bindServerConfiguration() {
+        return this.container.bind(AbstractServerConfiguration);
+    }
+
+    /**
+     * Use one of the predefined server configurations.
+     *
+     * To customize the server variables you can call `setVariables` on the
+     * return value;
+     */
+    public bindServerConfigurationToPredefined(idx: number) {
+        this.bindServerConfiguration.toConstantValue(servers[idx]);
+        return servers[idx];
+    }
+
+    /**
+     * Explicitly define the service base url
+     */
+    public bindServerConfigurationToURL(url: string) {
+        return this.bindServerConfiguration.toConstantValue(
+            new ServerConfiguration<{}>(url, {})
+        );
+    }
+
+    /**
+     * Allows you to bind a http library without having to import the service identifier.
+     */
+    public get bindHttpLibrary() {
+      return this.container.bind(AbstractHttpLibrary);
+    }
+
+    /**
+     * Allows you to bind a middleware without having to import the service identifier.
+     *
+     * You can bind multiple middlewares by calling this multiple method times.
+     */
+    public get bindMiddleware() {
+        return this.container.bind(AbstractMiddleware);
+    }
+
+    /**
+     * Allows you to bind an auth method without having to import the service identifier.
+     *
+     * Note: The name of the bound auth method needs to be known in the specs,
+     * because the name is used to decide for which endpoints to apply the authentication.
+     */
+    public get bindAuthMethod() {
+        return this.container.bind(AbstractAuthMethod);
+    }
+
+    /**
+     * Use one of the predefined auth methods.
+     *
+     * Make sure that you have injected all dependencies for it.
+     */
+    public bindAuthMethodToPredefined(name: keyof AuthMethods) {
+        return this.bindAuthMethod.to(authMethodServices[name]);
+    }
+
+    /**
+     * Bind all the apis to their respective service identifiers
+     *
+     * If you want to only bind some of the apis, you need to do that manually.
+     */
+    public bindAllApiServices() {
+        this.container.bind(apiServices.AbstractPromisePetApi).to(apis.PromisePetApi).inSingletonScope();
+        this.container.bind(apiServices.AbstractPromiseStoreApi).to(apis.PromiseStoreApi).inSingletonScope();
+        this.container.bind(apiServices.AbstractPromiseUserApi).to(apis.PromiseUserApi).inSingletonScope();
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/tsconfig.json b/samples/openapi3/client/petstore/typescript/builds/inversify/tsconfig.json
new file mode 100644
index 000000000000..b53dce7b41b3
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/tsconfig.json
@@ -0,0 +1,31 @@
+{
+  "compilerOptions": {
+    "strict": true,
+    /* Basic Options */
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "declaration": true,
+ 
+    /* Additional Checks */
+     "noUnusedLocals": false,                /* Report errors on unused locals. */ // TODO: reenable (unused imports!)
+     "noUnusedParameters": false,            /* Report errors on unused parameters. */ // TODO: set to true again
+     "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+     "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    "removeComments": true,
+    "sourceMap": true,
+    "outDir": "./dist",
+    "noLib": false,
+    "lib": [ "es6" ],
+    "experimentalDecorators": true,
+  },
+  "exclude": [
+  	"dist",
+    "node_modules"
+  ],
+  "filesGlob": [
+    "./**/*.ts",
+  ]
+  
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts
new file mode 100644
index 000000000000..10cebbd77dd2
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts
@@ -0,0 +1,442 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http';
+import * as models from '../models/all';
+import { Configuration} from '../configuration'
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Category } from '../models/Category';
+import { InlineObject } from '../models/InlineObject';
+import { InlineObject1 } from '../models/InlineObject1';
+import { Order } from '../models/Order';
+import { Pet } from '../models/Pet';
+import { Tag } from '../models/Tag';
+import { User } from '../models/User';
+
+import { ObservablePetApi } from "./ObservableAPI";
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
+
+export interface PetApiAddPetRequest {
+    /**
+     * Pet object that needs to be added to the store
+     * @type Pet
+     * @memberof PetApiaddPet
+     */
+    pet: Pet
+}
+
+export interface PetApiDeletePetRequest {
+    /**
+     * Pet id to delete
+     * @type number
+     * @memberof PetApideletePet
+     */
+    petId: number
+    /**
+     * 
+     * @type string
+     * @memberof PetApideletePet
+     */
+    apiKey?: string
+}
+
+export interface PetApiFindPetsByStatusRequest {
+    /**
+     * Status values that need to be considered for filter
+     * @type Array&lt;&#39;available&#39; | &#39;pending&#39; | &#39;sold&#39;&gt;
+     * @memberof PetApifindPetsByStatus
+     */
+    status: Array<'available' | 'pending' | 'sold'>
+}
+
+export interface PetApiFindPetsByTagsRequest {
+    /**
+     * Tags to filter by
+     * @type Array&lt;string&gt;
+     * @memberof PetApifindPetsByTags
+     */
+    tags: Array<string>
+}
+
+export interface PetApiGetPetByIdRequest {
+    /**
+     * ID of pet to return
+     * @type number
+     * @memberof PetApigetPetById
+     */
+    petId: number
+}
+
+export interface PetApiUpdatePetRequest {
+    /**
+     * Pet object that needs to be added to the store
+     * @type Pet
+     * @memberof PetApiupdatePet
+     */
+    pet: Pet
+}
+
+export interface PetApiUpdatePetWithFormRequest {
+    /**
+     * ID of pet that needs to be updated
+     * @type number
+     * @memberof PetApiupdatePetWithForm
+     */
+    petId: number
+    /**
+     * Updated name of the pet
+     * @type string
+     * @memberof PetApiupdatePetWithForm
+     */
+    name?: string
+    /**
+     * Updated status of the pet
+     * @type string
+     * @memberof PetApiupdatePetWithForm
+     */
+    status?: string
+}
+
+export interface PetApiUploadFileRequest {
+    /**
+     * ID of pet to update
+     * @type number
+     * @memberof PetApiuploadFile
+     */
+    petId: number
+    /**
+     * Additional data to pass to server
+     * @type string
+     * @memberof PetApiuploadFile
+     */
+    additionalMetadata?: string
+    /**
+     * file to upload
+     * @type HttpFile
+     * @memberof PetApiuploadFile
+     */
+    file?: HttpFile
+}
+
+
+export class ObjectPetApi {
+    private api: ObservablePetApi
+
+    public constructor(configuration: Configuration, requestFactory?: PetApiRequestFactory, responseProcessor?: PetApiResponseProcessor) {
+        this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * Add a new pet to the store
+     * @param param the request object
+     */
+    public addPet(param: PetApiAddPetRequest, options?: Configuration): Promise<Pet> {
+        return this.api.addPet(param.pet,  options).toPromise();
+    }
+	
+    /**
+     * Deletes a pet
+     * @param param the request object
+     */
+    public deletePet(param: PetApiDeletePetRequest, options?: Configuration): Promise<void> {
+        return this.api.deletePet(param.petId, param.apiKey,  options).toPromise();
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param param the request object
+     */
+    public findPetsByStatus(param: PetApiFindPetsByStatusRequest, options?: Configuration): Promise<Array<Pet>> {
+        return this.api.findPetsByStatus(param.status,  options).toPromise();
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param param the request object
+     */
+    public findPetsByTags(param: PetApiFindPetsByTagsRequest, options?: Configuration): Promise<Array<Pet>> {
+        return this.api.findPetsByTags(param.tags,  options).toPromise();
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param param the request object
+     */
+    public getPetById(param: PetApiGetPetByIdRequest, options?: Configuration): Promise<Pet> {
+        return this.api.getPetById(param.petId,  options).toPromise();
+    }
+	
+    /**
+     * Update an existing pet
+     * @param param the request object
+     */
+    public updatePet(param: PetApiUpdatePetRequest, options?: Configuration): Promise<Pet> {
+        return this.api.updatePet(param.pet,  options).toPromise();
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param param the request object
+     */
+    public updatePetWithForm(param: PetApiUpdatePetWithFormRequest, options?: Configuration): Promise<void> {
+        return this.api.updatePetWithForm(param.petId, param.name, param.status,  options).toPromise();
+    }
+	
+    /**
+     * uploads an image
+     * @param param the request object
+     */
+    public uploadFile(param: PetApiUploadFileRequest, options?: Configuration): Promise<ApiResponse> {
+        return this.api.uploadFile(param.petId, param.additionalMetadata, param.file,  options).toPromise();
+    }
+	
+
+}
+
+
+
+
+import { ObservableStoreApi } from "./ObservableAPI";
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
+
+export interface StoreApiDeleteOrderRequest {
+    /**
+     * ID of the order that needs to be deleted
+     * @type string
+     * @memberof StoreApideleteOrder
+     */
+    orderId: string
+}
+
+export interface StoreApiGetInventoryRequest {
+}
+
+export interface StoreApiGetOrderByIdRequest {
+    /**
+     * ID of pet that needs to be fetched
+     * @type number
+     * @memberof StoreApigetOrderById
+     */
+    orderId: number
+}
+
+export interface StoreApiPlaceOrderRequest {
+    /**
+     * order placed for purchasing the pet
+     * @type Order
+     * @memberof StoreApiplaceOrder
+     */
+    order: Order
+}
+
+
+export class ObjectStoreApi {
+    private api: ObservableStoreApi
+
+    public constructor(configuration: Configuration, requestFactory?: StoreApiRequestFactory, responseProcessor?: StoreApiResponseProcessor) {
+        this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param param the request object
+     */
+    public deleteOrder(param: StoreApiDeleteOrderRequest, options?: Configuration): Promise<void> {
+        return this.api.deleteOrder(param.orderId,  options).toPromise();
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     * @param param the request object
+     */
+    public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> {
+        return this.api.getInventory( options).toPromise();
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param param the request object
+     */
+    public getOrderById(param: StoreApiGetOrderByIdRequest, options?: Configuration): Promise<Order> {
+        return this.api.getOrderById(param.orderId,  options).toPromise();
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param param the request object
+     */
+    public placeOrder(param: StoreApiPlaceOrderRequest, options?: Configuration): Promise<Order> {
+        return this.api.placeOrder(param.order,  options).toPromise();
+    }
+	
+
+}
+
+
+
+
+import { ObservableUserApi } from "./ObservableAPI";
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
+
+export interface UserApiCreateUserRequest {
+    /**
+     * Created user object
+     * @type User
+     * @memberof UserApicreateUser
+     */
+    user: User
+}
+
+export interface UserApiCreateUsersWithArrayInputRequest {
+    /**
+     * List of user object
+     * @type Array&lt;User&gt;
+     * @memberof UserApicreateUsersWithArrayInput
+     */
+    user: Array<User>
+}
+
+export interface UserApiCreateUsersWithListInputRequest {
+    /**
+     * List of user object
+     * @type Array&lt;User&gt;
+     * @memberof UserApicreateUsersWithListInput
+     */
+    user: Array<User>
+}
+
+export interface UserApiDeleteUserRequest {
+    /**
+     * The name that needs to be deleted
+     * @type string
+     * @memberof UserApideleteUser
+     */
+    username: string
+}
+
+export interface UserApiGetUserByNameRequest {
+    /**
+     * The name that needs to be fetched. Use user1 for testing.
+     * @type string
+     * @memberof UserApigetUserByName
+     */
+    username: string
+}
+
+export interface UserApiLoginUserRequest {
+    /**
+     * The user name for login
+     * @type string
+     * @memberof UserApiloginUser
+     */
+    username: string
+    /**
+     * The password for login in clear text
+     * @type string
+     * @memberof UserApiloginUser
+     */
+    password: string
+}
+
+export interface UserApiLogoutUserRequest {
+}
+
+export interface UserApiUpdateUserRequest {
+    /**
+     * name that need to be deleted
+     * @type string
+     * @memberof UserApiupdateUser
+     */
+    username: string
+    /**
+     * Updated user object
+     * @type User
+     * @memberof UserApiupdateUser
+     */
+    user: User
+}
+
+
+export class ObjectUserApi {
+    private api: ObservableUserApi
+
+    public constructor(configuration: Configuration, requestFactory?: UserApiRequestFactory, responseProcessor?: UserApiResponseProcessor) {
+        this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param param the request object
+     */
+    public createUser(param: UserApiCreateUserRequest, options?: Configuration): Promise<void> {
+        return this.api.createUser(param.user,  options).toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param param the request object
+     */
+    public createUsersWithArrayInput(param: UserApiCreateUsersWithArrayInputRequest, options?: Configuration): Promise<void> {
+        return this.api.createUsersWithArrayInput(param.user,  options).toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param param the request object
+     */
+    public createUsersWithListInput(param: UserApiCreateUsersWithListInputRequest, options?: Configuration): Promise<void> {
+        return this.api.createUsersWithListInput(param.user,  options).toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param param the request object
+     */
+    public deleteUser(param: UserApiDeleteUserRequest, options?: Configuration): Promise<void> {
+        return this.api.deleteUser(param.username,  options).toPromise();
+    }
+	
+    /**
+     * Get user by user name
+     * @param param the request object
+     */
+    public getUserByName(param: UserApiGetUserByNameRequest, options?: Configuration): Promise<User> {
+        return this.api.getUserByName(param.username,  options).toPromise();
+    }
+	
+    /**
+     * Logs user into the system
+     * @param param the request object
+     */
+    public loginUser(param: UserApiLoginUserRequest, options?: Configuration): Promise<string> {
+        return this.api.loginUser(param.username, param.password,  options).toPromise();
+    }
+	
+    /**
+     * Logs out current logged in user session
+     * @param param the request object
+     */
+    public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise<void> {
+        return this.api.logoutUser( options).toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param param the request object
+     */
+    public updateUser(param: UserApiUpdateUserRequest, options?: Configuration): Promise<void> {
+        return this.api.updateUser(param.username, param.user,  options).toPromise();
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts
new file mode 100644
index 000000000000..58b8d97c3e07
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts
@@ -0,0 +1,565 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http';
+import * as models from '../models/all';
+import { Configuration} from '../configuration'
+import { Observable, of, from } from '../rxjsStub';
+import {mergeMap, map} from  '../rxjsStub';
+import { injectable, inject, optional } from "inversify";
+import { AbstractConfiguration } from "../services/configuration";
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Category } from '../models/Category';
+import { InlineObject } from '../models/InlineObject';
+import { InlineObject1 } from '../models/InlineObject1';
+import { Order } from '../models/Order';
+import { Pet } from '../models/Pet';
+import { Tag } from '../models/Tag';
+import { User } from '../models/User';
+
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
+import { AbstractPetApiRequestFactory, AbstractPetApiResponseProcessor } from "../apis/PetApi.service";
+
+@injectable()
+export class ObservablePetApi {
+    private requestFactory: AbstractPetApiRequestFactory;
+    private responseProcessor: AbstractPetApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        @inject(AbstractConfiguration) configuration: Configuration,
+        @inject(AbstractPetApiRequestFactory) @optional() requestFactory?: AbstractPetApiRequestFactory,
+        @inject(AbstractPetApiResponseProcessor) @optional() responseProcessor?: AbstractPetApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new PetApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new PetApiResponseProcessor();
+    }
+
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public addPet(pet: Pet, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.addPet(pet, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public deletePet(petId: number, apiKey?: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Observable<Array<Pet>> {
+    	const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public findPetsByTags(tags: Array<string>, options?: Configuration): Observable<Array<Pet>> {
+    	const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public getPetById(petId: number, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.getPetById(petId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public updatePet(pet: Pet, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.updatePet(pet, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
+	    	}));
+    }
+	
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Observable<ApiResponse> {
+    	const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
+
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
+import { AbstractStoreApiRequestFactory, AbstractStoreApiResponseProcessor } from "../apis/StoreApi.service";
+
+@injectable()
+export class ObservableStoreApi {
+    private requestFactory: AbstractStoreApiRequestFactory;
+    private responseProcessor: AbstractStoreApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        @inject(AbstractConfiguration) configuration: Configuration,
+        @inject(AbstractStoreApiRequestFactory) @optional() requestFactory?: AbstractStoreApiRequestFactory,
+        @inject(AbstractStoreApiResponseProcessor) @optional() responseProcessor?: AbstractStoreApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new StoreApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new StoreApiResponseProcessor();
+    }
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public deleteOrder(orderId: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public getInventory(options?: Configuration): Observable<{ [key: string]: number; }> {
+    	const requestContextPromise = this.requestFactory.getInventory(options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
+	    	}));
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public getOrderById(orderId: number, options?: Configuration): Observable<Order> {
+    	const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public placeOrder(order: Order, options?: Configuration): Observable<Order> {
+    	const requestContextPromise = this.requestFactory.placeOrder(order, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
+
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
+import { AbstractUserApiRequestFactory, AbstractUserApiResponseProcessor } from "../apis/UserApi.service";
+
+@injectable()
+export class ObservableUserApi {
+    private requestFactory: AbstractUserApiRequestFactory;
+    private responseProcessor: AbstractUserApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        @inject(AbstractConfiguration) configuration: Configuration,
+        @inject(AbstractUserApiRequestFactory) @optional() requestFactory?: AbstractUserApiRequestFactory,
+        @inject(AbstractUserApiResponseProcessor) @optional() responseProcessor?: AbstractUserApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new UserApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new UserApiResponseProcessor();
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public createUser(user: User, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUser(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithListInput(user: Array<User>, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
+	    	}));
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public deleteUser(username: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deleteUser(username, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public getUserByName(username: string, options?: Configuration): Observable<User> {
+    	const requestContextPromise = this.requestFactory.getUserByName(username, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public loginUser(username: string, password: string, options?: Configuration): Observable<string> {
+    	const requestContextPromise = this.requestFactory.loginUser(username, password, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Logs out current logged in user session
+     */
+    public logoutUser(options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.logoutUser(options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public updateUser(username: string, user: User, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.updateUser(username, user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts
new file mode 100644
index 000000000000..7719a5f77b34
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts
@@ -0,0 +1,277 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http';
+import * as models from '../models/all';
+import { Configuration} from '../configuration'
+import { injectable, inject, optional } from "inversify";
+import { AbstractConfiguration } from "../services/configuration";
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Category } from '../models/Category';
+import { InlineObject } from '../models/InlineObject';
+import { InlineObject1 } from '../models/InlineObject1';
+import { Order } from '../models/Order';
+import { Pet } from '../models/Pet';
+import { Tag } from '../models/Tag';
+import { User } from '../models/User';
+import { ObservablePetApi } from './ObservableAPI';
+
+
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
+import { AbstractPetApiRequestFactory, AbstractPetApiResponseProcessor } from "../apis/PetApi.service";
+
+@injectable()
+export class PromisePetApi {
+    private api: ObservablePetApi
+
+    public constructor(
+        @inject(AbstractConfiguration) configuration: Configuration,
+        @inject(AbstractPetApiRequestFactory) @optional() requestFactory?: AbstractPetApiRequestFactory,
+        @inject(AbstractPetApiResponseProcessor) @optional() responseProcessor?: AbstractPetApiResponseProcessor
+    ) {
+        this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public addPet(pet: Pet, options?: Configuration): Promise<Pet> {
+    	const result = this.api.addPet(pet, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deletePet(petId, apiKey, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<Array<Pet>> {
+    	const result = this.api.findPetsByStatus(status, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public findPetsByTags(tags: Array<string>, options?: Configuration): Promise<Array<Pet>> {
+    	const result = this.api.findPetsByTags(tags, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public getPetById(petId: number, options?: Configuration): Promise<Pet> {
+    	const result = this.api.getPetById(petId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public updatePet(pet: Pet, options?: Configuration): Promise<Pet> {
+    	const result = this.api.updatePet(pet, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<void> {
+    	const result = this.api.updatePetWithForm(petId, name, status, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<ApiResponse> {
+    	const result = this.api.uploadFile(petId, additionalMetadata, file, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
+import { ObservableStoreApi } from './ObservableAPI';
+
+
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
+import { AbstractStoreApiRequestFactory, AbstractStoreApiResponseProcessor } from "../apis/StoreApi.service";
+
+@injectable()
+export class PromiseStoreApi {
+    private api: ObservableStoreApi
+
+    public constructor(
+        @inject(AbstractConfiguration) configuration: Configuration,
+        @inject(AbstractStoreApiRequestFactory) @optional() requestFactory?: AbstractStoreApiRequestFactory,
+        @inject(AbstractStoreApiResponseProcessor) @optional() responseProcessor?: AbstractStoreApiResponseProcessor
+    ) {
+        this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public deleteOrder(orderId: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deleteOrder(orderId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public getInventory(options?: Configuration): Promise<{ [key: string]: number; }> {
+    	const result = this.api.getInventory(options);
+        return result.toPromise();
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public getOrderById(orderId: number, options?: Configuration): Promise<Order> {
+    	const result = this.api.getOrderById(orderId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public placeOrder(order: Order, options?: Configuration): Promise<Order> {
+    	const result = this.api.placeOrder(order, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
+import { ObservableUserApi } from './ObservableAPI';
+
+
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
+import { AbstractUserApiRequestFactory, AbstractUserApiResponseProcessor } from "../apis/UserApi.service";
+
+@injectable()
+export class PromiseUserApi {
+    private api: ObservableUserApi
+
+    public constructor(
+        @inject(AbstractConfiguration) configuration: Configuration,
+        @inject(AbstractUserApiRequestFactory) @optional() requestFactory?: AbstractUserApiRequestFactory,
+        @inject(AbstractUserApiResponseProcessor) @optional() responseProcessor?: AbstractUserApiResponseProcessor
+    ) {
+        this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public createUser(user: User, options?: Configuration): Promise<void> {
+    	const result = this.api.createUser(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<void> {
+    	const result = this.api.createUsersWithArrayInput(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<void> {
+    	const result = this.api.createUsersWithListInput(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public deleteUser(username: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deleteUser(username, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public getUserByName(username: string, options?: Configuration): Promise<User> {
+    	const result = this.api.getUserByName(username, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public loginUser(username: string, password: string, options?: Configuration): Promise<string> {
+    	const result = this.api.loginUser(username, password, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Logs out current logged in user session
+     */
+    public logoutUser(options?: Configuration): Promise<void> {
+    	const result = this.api.logoutUser(options);
+        return result.toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public updateUser(username: string, user: User, options?: Configuration): Promise<void> {
+    	const result = this.api.updateUser(username, user, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/util.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/util.ts
new file mode 100644
index 000000000000..d1888434535c
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/util.ts
@@ -0,0 +1,28 @@
+/**
+ * Returns if a specific http code is in a given code range
+ * where the code range is defined as a combination of digits 
+ * and "X" (the letter X) with a length of 3
+ *
+ * @param codeRange string with length 3 consisting of digits and "X" (the letter X)
+ * @param code the http status code to be checked against the code range
+ */
+export function isCodeInRange(codeRange: string, code: number): boolean {
+	// This is how the default value is encoded in OAG
+	if (codeRange === "0") {
+		return true;
+	}
+	if (codeRange == code.toString()) {
+		return true;
+	} else {
+		const codeString = code.toString();
+		if (codeString.length != codeRange.length) {
+			return false;
+		}
+		for (let i = 0; i < codeString.length; i++) {
+			if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/.gitignore b/samples/openapi3/client/petstore/typescript/builds/jquery/.gitignore
new file mode 100644
index 000000000000..1521c8b7652b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/samples/server/petstore/python-flask-python2/.openapi-generator-ignore b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator-ignore
similarity index 100%
rename from samples/server/petstore/python-flask-python2/.openapi-generator-ignore
rename to samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator-ignore
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/FILES
new file mode 100644
index 000000000000..71820af41a4f
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/FILES
@@ -0,0 +1,32 @@
+.gitignore
+README.md
+apis/PetApi.ts
+apis/StoreApi.ts
+apis/UserApi.ts
+apis/baseapi.ts
+apis/exception.ts
+auth/auth.ts
+configuration.ts
+git_push.sh
+http/http.ts
+http/jquery.ts
+index.ts
+middleware.ts
+models/ApiResponse.ts
+models/Category.ts
+models/InlineObject.ts
+models/InlineObject1.ts
+models/ObjectSerializer.ts
+models/Order.ts
+models/Pet.ts
+models/Tag.ts
+models/User.ts
+models/all.ts
+package.json
+rxjsStub.ts
+servers.ts
+tsconfig.json
+types/ObjectParamAPI.ts
+types/ObservableAPI.ts
+types/PromiseAPI.ts
+util.ts
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION
new file mode 100644
index 000000000000..d99e7162d01f
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION
@@ -0,0 +1 @@
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/README.md b/samples/openapi3/client/petstore/typescript/builds/jquery/README.md
new file mode 100644
index 000000000000..9cccd82f8338
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/README.md
@@ -0,0 +1,30 @@
+## ts-petstore-client@1.0.0
+
+This generator creates TypeScript/JavaScript client that utilizes jquery. 
+
+### Building
+
+To build and compile the typescript sources to javascript use:
+```
+npm install
+npm run build
+```
+
+### Publishing
+
+First build the package then run ```npm publish```
+
+### Consuming
+
+navigate to the folder of your consuming project and run one of the following commands.
+
+_published:_
+
+```
+npm install ts-petstore-client@1.0.0 --save
+```
+
+_unPublished (not recommended):_
+
+```
+npm install PATH_TO_GENERATED_PACKAGE --save
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/TODO.md b/samples/openapi3/client/petstore/typescript/builds/jquery/TODO.md
new file mode 100644
index 000000000000..daf371f9e314
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/TODO.md
@@ -0,0 +1,5 @@
+
+Use qunit + https://github.com/ameshkov/node-qunit-puppeteer
+
+to run the tests locally using a headless chromium!
+ADD https://github.com/chenglou/require-polyfill to make require work
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts
new file mode 100644
index 000000000000..3eeb7bd4038e
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts
@@ -0,0 +1,649 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi';
+import {Configuration} from '../configuration';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
+import {ObjectSerializer} from '../models/ObjectSerializer';
+import {ApiException} from './exception';
+import {isCodeInRange} from '../util';
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Pet } from '../models/Pet';
+
+/**
+ * no description
+ */
+export class PetApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public async addPet(pet: Pet, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'pet' is not null or undefined
+        if (pet === null || pet === undefined) {
+            throw new RequiredError('Required parameter pet was null or undefined when calling addPet.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json",
+        
+            "application/xml"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(pet, "Pet", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public async deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling deletePet.');
+        }
+
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+		requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'status' is not null or undefined
+        if (status === null || status === undefined) {
+            throw new RequiredError('Required parameter status was null or undefined when calling findPetsByStatus.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/findByStatus';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (status !== undefined) {
+        	requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public async findPetsByTags(tags: Array<string>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'tags' is not null or undefined
+        if (tags === null || tags === undefined) {
+            throw new RequiredError('Required parameter tags was null or undefined when calling findPetsByTags.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/findByTags';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (tags !== undefined) {
+        	requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public async getPetById(petId: number, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling getPetById.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public async updatePet(pet: Pet, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'pet' is not null or undefined
+        if (pet === null || pet === undefined) {
+            throw new RequiredError('Required parameter pet was null or undefined when calling updatePet.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json",
+        
+            "application/xml"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(pet, "Pet", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public async updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling updatePetWithForm.');
+        }
+
+		
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+		let localVarFormParams = new FormData();
+
+        if (name !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('name', name as any);
+        }
+        if (status !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('status', status as any);
+        }
+		requestContext.setBody(localVarFormParams);
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public async uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling uploadFile.');
+        }
+
+		
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}/uploadImage'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+		let localVarFormParams = new FormData();
+
+        if (additionalMetadata !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('additionalMetadata', additionalMetadata as any);
+        }
+        if (file !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('file', file, file.name);
+        }
+		requestContext.setBody(localVarFormParams);
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+}
+
+
+
+export class PetApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to addPet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async addPet(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid input");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deletePet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deletePet(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid pet value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to findPetsByStatus
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async findPetsByStatus(response: ResponseContext): Promise<Array<Pet> > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid status value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to findPetsByTags
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async findPetsByTags(response: ResponseContext): Promise<Array<Pet> > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid tag value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getPetById
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getPetById(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Pet not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updatePet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updatePet(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Pet not found");
+        }
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Validation exception");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updatePetWithForm
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updatePetWithForm(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid input");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to uploadFile
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async uploadFile(response: ResponseContext): Promise<ApiResponse > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: ApiResponse = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "ApiResponse", ""
+            ) as ApiResponse;
+            return body;
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: ApiResponse = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "ApiResponse", ""
+            ) as ApiResponse;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts
new file mode 100644
index 000000000000..866a211ca323
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts
@@ -0,0 +1,294 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi';
+import {Configuration} from '../configuration';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
+import {ObjectSerializer} from '../models/ObjectSerializer';
+import {ApiException} from './exception';
+import {isCodeInRange} from '../util';
+
+import { Order } from '../models/Order';
+
+/**
+ * no description
+ */
+export class StoreApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public async deleteOrder(orderId: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new RequiredError('Required parameter orderId was null or undefined when calling deleteOrder.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order/{orderId}'
+            .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public async getInventory(options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+		// Path Params
+    	const localVarPath = '/store/inventory';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public async getOrderById(orderId: number, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new RequiredError('Required parameter orderId was null or undefined when calling getOrderById.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order/{orderId}'
+            .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public async placeOrder(order: Order, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'order' is not null or undefined
+        if (order === null || order === undefined) {
+            throw new RequiredError('Required parameter order was null or undefined when calling placeOrder.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(order, "Order", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+}
+
+
+
+export class StoreApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deleteOrder
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deleteOrder(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Order not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getInventory
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getInventory(response: ResponseContext): Promise<{ [key: string]: number; } > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: { [key: string]: number; } = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "{ [key: string]: number; }", "int32"
+            ) as { [key: string]: number; };
+            return body;
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: { [key: string]: number; } = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "{ [key: string]: number; }", "int32"
+            ) as { [key: string]: number; };
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getOrderById
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getOrderById(response: ResponseContext): Promise<Order > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Order not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to placeOrder
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async placeOrder(response: ResponseContext): Promise<Order > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid Order");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts
new file mode 100644
index 000000000000..83aae43a582c
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts
@@ -0,0 +1,586 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi';
+import {Configuration} from '../configuration';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
+import {ObjectSerializer} from '../models/ObjectSerializer';
+import {ApiException} from './exception';
+import {isCodeInRange} from '../util';
+
+import { User } from '../models/User';
+
+/**
+ * no description
+ */
+export class UserApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public async createUser(user: User, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "User", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public async createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithArrayInput.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/createWithArray';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "Array<User>", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public async createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithListInput.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/createWithList';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "Array<User>", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public async deleteUser(username: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling deleteUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public async getUserByName(username: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling getUserByName.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public async loginUser(username: string, password: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling loginUser.');
+        }
+
+		
+        // verify required parameter 'password' is not null or undefined
+        if (password === null || password === undefined) {
+            throw new RequiredError('Required parameter password was null or undefined when calling loginUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/login';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (username !== undefined) {
+        	requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
+        }
+        if (password !== undefined) {
+        	requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Logs out current logged in user session
+     */
+    public async logoutUser(options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+		// Path Params
+    	const localVarPath = '/user/logout';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public async updateUser(username: string, user: User, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling updateUser.');
+        }
+
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling updateUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "User", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+}
+
+
+
+export class UserApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUsersWithArrayInput
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUsersWithArrayInput(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUsersWithListInput
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUsersWithListInput(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deleteUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deleteUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getUserByName
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getUserByName(response: ResponseContext): Promise<User > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: User = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "User", ""
+            ) as User;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: User = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "User", ""
+            ) as User;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to loginUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async loginUser(response: ResponseContext): Promise<string > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: string = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "string", ""
+            ) as string;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username/password supplied");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: string = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "string", ""
+            ) as string;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to logoutUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async logoutUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updateUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updateUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid user supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/baseapi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/baseapi.ts
new file mode 100644
index 000000000000..fe7ee3d15118
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/baseapi.ts
@@ -0,0 +1,37 @@
+import { Configuration } from '../configuration'
+
+/**
+ *
+ * @export
+ */
+export const COLLECTION_FORMATS = {
+    csv: ",",
+    ssv: " ",
+    tsv: "\t",
+    pipes: "|",
+};
+
+
+/**
+ * 
+ * @export
+ * @class BaseAPI
+ */
+export class BaseAPIRequestFactory {
+
+    constructor(protected configuration: Configuration) {
+    }
+};
+
+/**
+ * 
+ * @export
+ * @class RequiredError
+ * @extends {Error}
+ */
+export class RequiredError extends Error {
+    name: "RequiredError" = "RequiredError";
+    constructor(public field: string, msg?: string) {
+        super(msg);
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/exception.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/exception.ts
new file mode 100644
index 000000000000..b76dca5aa4bc
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/exception.ts
@@ -0,0 +1,14 @@
+/**
+ * Represents an error caused by an api call i.e. it has attributes for a HTTP status code 
+ * and the returned body object.
+ *
+ * Example
+ * API returns a ErrorMessageObject whenever HTTP status code is not in [200, 299]
+ * => ApiException(404, someErrorMessageObject)
+ *
+ */
+export class ApiException<T> extends Error {
+	public constructor(public code: number, public body: T) {
+        super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body))  
+	}
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/auth/auth.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/auth/auth.ts
new file mode 100644
index 000000000000..2cdf0800f32a
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/auth/auth.ts
@@ -0,0 +1,100 @@
+// typings for btoa are incorrect
+import { RequestContext } from "../http/http";
+
+/**
+ * Interface authentication schemes.
+ */
+export interface SecurityAuthentication {
+    /*
+     * @return returns the name of the security authentication as specified in OAI
+     */
+    getName(): string;
+
+    /**
+     * Applies the authentication scheme to the request context
+     *
+     * @params context the request context which should use this authentication scheme
+     */
+    applySecurityAuthentication(context: RequestContext): void | Promise<void>;
+}
+
+export interface TokenProvider {
+  getToken(): Promise<string> | string;
+}
+
+/**
+ * Applies apiKey authentication to the request context.
+ */
+export class ApiKeyAuthentication implements SecurityAuthentication {
+    /**
+     * Configures this api key authentication with the necessary properties
+     *
+     * @param apiKey: The api key to be used for every request
+     */
+    public constructor(private apiKey: string) {}
+
+    public getName(): string {
+        return "api_key";
+    }
+
+    public applySecurityAuthentication(context: RequestContext) {
+        context.setHeaderParam("api_key", this.apiKey);
+    }
+}
+
+/**
+ * Applies oauth2 authentication to the request context.
+ */
+export class PetstoreAuthAuthentication implements SecurityAuthentication {
+    // TODO: How to handle oauth2 authentication!
+    public constructor() {}
+
+    public getName(): string {
+        return "petstore_auth";
+    }
+
+    public applySecurityAuthentication(context: RequestContext) {
+        // TODO
+    }
+}
+
+
+export type AuthMethods = {
+    "api_key"?: SecurityAuthentication,
+    "petstore_auth"?: SecurityAuthentication
+}
+
+export type ApiKeyConfiguration = string;
+export type HttpBasicConfiguration = { "username": string, "password": string };
+export type HttpBearerConfiguration = { tokenProvider: TokenProvider };
+export type OAuth2Configuration = string;
+
+export type AuthMethodsConfiguration = {
+    "api_key"?: ApiKeyConfiguration,
+    "petstore_auth"?: OAuth2Configuration
+}
+
+/**
+ * Creates the authentication methods from a swagger description.
+ *
+ */
+export function configureAuthMethods(config: AuthMethodsConfiguration | undefined): AuthMethods {
+    let authMethods: AuthMethods = {}
+
+    if (!config) {
+        return authMethods;
+    }
+
+    if (config["api_key"]) {
+        authMethods["api_key"] = new ApiKeyAuthentication(
+            config["api_key"]
+        );
+    }
+
+    if (config["petstore_auth"]) {
+        authMethods["petstore_auth"] = new PetstoreAuthAuthentication(
+        );
+    }
+
+    return authMethods;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts
new file mode 100644
index 000000000000..1ca7b345bc19
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts
@@ -0,0 +1,66 @@
+import { HttpLibrary } from "./http/http";
+import { Middleware, PromiseMiddleware, PromiseMiddlewareWrapper } from "./middleware";
+import { JQueryHttpLibrary as DefaultHttpLibrary } from "./http/jquery";
+import { BaseServerConfiguration, server1 } from "./servers";
+import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth";
+
+export interface Configuration {
+    readonly baseServer: BaseServerConfiguration;
+    readonly httpApi: HttpLibrary;
+    readonly middleware: Middleware[];
+    readonly authMethods: AuthMethods;
+}
+
+
+/**
+ * Interface with which a configuration object can be configured.
+ */
+export interface ConfigurationParameters {
+    /**
+     * Default server to use
+     */
+    baseServer?: BaseServerConfiguration;
+    /**
+     * HTTP library to use e.g. IsomorphicFetch
+     */
+    httpApi?: HttpLibrary;
+    /**
+     * The middlewares which will be applied to requests and responses
+     */
+    middleware?: Middleware[];
+    /**
+     * Configures all middlewares using the promise api instead of observables (which Middleware uses)
+     */
+    promiseMiddleware?: PromiseMiddleware[];
+    /**
+     * Configuration for the available authentication methods
+     */
+    authMethods?: AuthMethodsConfiguration
+}
+
+/**
+ * Configuration factory function
+ *
+ * If a property is not included in conf, a default is used:
+ *    - baseServer: server1
+ *    - httpApi: IsomorphicFetchHttpLibrary
+ *    - middleware: []
+ *    - promiseMiddleware: []
+ *    - authMethods: {}
+ *
+ * @param conf partial configuration
+ */
+export function createConfiguration(conf: ConfigurationParameters = {}): Configuration {
+    const configuration: Configuration = {
+        baseServer: conf.baseServer !== undefined ? conf.baseServer : server1,
+        httpApi: conf.httpApi || new DefaultHttpLibrary(),
+        middleware: conf.middleware || [],
+        authMethods: configureAuthMethods(conf.authMethods)
+    };
+    if (conf.promiseMiddleware) {
+        conf.promiseMiddleware.forEach(
+            m => configuration.middleware.push(new PromiseMiddlewareWrapper(m))
+        );
+    }
+    return configuration;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/git_push.sh b/samples/openapi3/client/petstore/typescript/builds/jquery/git_push.sh
new file mode 100644
index 000000000000..8442b80bb445
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts
new file mode 100644
index 000000000000..a32073360031
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts
@@ -0,0 +1,221 @@
+// typings of url-parse are incorrect...
+// @ts-ignore 
+import * as URLParse from "url-parse";
+import { Observable, from } from '../rxjsStub';
+
+export * from './jquery';
+
+/**
+ * Represents an HTTP method.
+ */
+export enum HttpMethod {
+    GET = "GET",
+    HEAD = "HEAD",
+    POST = "POST",
+    PUT = "PUT",
+    DELETE = "DELETE",
+    CONNECT = "CONNECT",
+    OPTIONS = "OPTIONS",
+    TRACE = "TRACE",
+    PATCH = "PATCH"
+}
+
+/**
+ * Represents an HTTP file which will be transferred from or to a server.
+ */
+export type HttpFile = Blob & { readonly name: string };
+
+
+export class HttpException extends Error {
+    public constructor(msg: string) {
+        super(msg);
+    }
+}
+
+/**
+ * Represents the body of an outgoing HTTP request.
+ */
+export type RequestBody = undefined | string | FormData;
+
+/**
+ * Represents an HTTP request context
+ */
+export class RequestContext {
+    private headers: { [key: string]: string } = {};
+    private body: RequestBody = undefined;
+    private url: URLParse;
+
+	/**
+	 * Creates the request context using a http method and request resource url
+	 *
+	 * @param url url of the requested resource
+	 * @param httpMethod http method
+	 */
+    public constructor(url: string, private httpMethod: HttpMethod) {
+        this.url = new URLParse(url, true);
+    }
+    
+    /*
+     * Returns the url set in the constructor including the query string
+     *
+     */
+    public getUrl(): string {
+    	return this.url.toString();
+    }
+    
+    /**
+     * Replaces the url set in the constructor with this url.
+     *
+     */
+    public setUrl(url: string) {
+    	this.url = new URLParse(url, true);
+    }
+
+    /**
+     * Sets the body of the http request either as a string or FormData
+     *
+     * Note that setting a body on a HTTP GET, HEAD, DELETE, CONNECT or TRACE
+     * request is discouraged.
+     * https://httpwg.org/http-core/draft-ietf-httpbis-semantics-latest.html#rfc.section.7.3.1
+     *
+     * @param body the body of the request
+     */
+    public setBody(body: RequestBody) {
+        this.body = body;
+    }
+
+    public getHttpMethod(): HttpMethod {
+    	return this.httpMethod;
+    }
+    
+    public getHeaders(): { [key: string]: string } {
+    	return this.headers;
+    }
+
+    public getBody(): RequestBody {
+        return this.body;
+    }
+
+	public setQueryParam(name: string, value: string) {
+        let queryObj = this.url.query;
+        queryObj[name] = value;
+        this.url.set("query", queryObj);
+    }
+
+	/**
+	 *	Sets a cookie with the name and value. NO check  for duplicate cookies is performed
+	 *
+	 */
+    public addCookie(name: string, value: string): void {
+        if (!this.headers["Cookie"]) {
+            this.headers["Cookie"] = "";
+        }
+        this.headers["Cookie"] += name + "=" + value + "; ";
+    }
+
+    public setHeaderParam(key: string, value: string): void  { 
+        this.headers[key] = value;
+    }
+}
+
+export interface ResponseBody {
+    text(): Promise<string>;
+    binary(): Promise<Blob>;
+}
+
+
+/**
+ * Helper class to generate a `ResponseBody` from binary data
+ */
+export class SelfDecodingBody implements ResponseBody {
+    constructor(private dataSource: Promise<Blob>) {}
+
+    binary(): Promise<Blob> {
+        return this.dataSource;
+    }
+
+    async text(): Promise<string> {
+        const data: Blob = await this.dataSource;
+        // @ts-ignore
+        if (data.text) {
+            // @ts-ignore
+            return data.text();
+        }
+
+        return new Promise<string>((resolve, reject) => {
+            const reader = new FileReader();
+            reader.addEventListener("load", () => resolve(reader.result as string));
+            reader.addEventListener("error", () => reject(reader.error));
+            reader.readAsText(data);
+        });
+    }
+}
+
+export class ResponseContext {
+    public constructor(
+        public httpStatusCode: number,
+        public headers: { [key: string]: string },
+        public body: ResponseBody
+    ) {}
+
+    /**
+     * Parse header value in the form `value; param1="value1"`
+     *
+     * E.g. for Content-Type or Content-Disposition
+     * Parameter names are converted to lower case
+     * The first parameter is returned with the key `""`
+     */
+    public getParsedHeader(headerName: string): { [parameter: string]: string } {
+        const result: { [parameter: string]: string } = {};
+        if (!this.headers[headerName]) {
+            return result;
+        }
+
+        const parameters = this.headers[headerName].split(";");
+        for (const parameter of parameters) {
+            let [key, value] = parameter.split("=", 2);
+            key = key.toLowerCase().trim();
+            if (value === undefined) {
+                result[""] = key;
+            } else {
+                value = value.trim();
+                if (value.startsWith('"') && value.endsWith('"')) {
+                    value = value.substring(1, value.length - 1);
+                }
+                result[key] = value;
+            }
+        }
+        return result;
+    }
+
+    public async getBodyAsFile(): Promise<HttpFile> {
+        const data = await this.body.binary();
+        const fileName = this.getParsedHeader("content-disposition")["filename"] || "";
+        const contentType = this.headers["content-type"] || "";
+        try {
+            return new File([data], fileName, { type: contentType });
+        } catch (error) {
+            /** Fallback for when the File constructor is not available */
+            return Object.assign(data, {
+                name: fileName,
+                type: contentType
+            });
+        }
+    }
+}
+
+export interface HttpLibrary {
+    send(request: RequestContext): Observable<ResponseContext>;
+}
+
+export interface PromiseHttpLibrary {
+    send(request: RequestContext): Promise<ResponseContext>;
+}
+
+export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLibrary {
+  return {
+    send(request: RequestContext): Observable<ResponseContext> {
+      return from(promiseHttpLibrary.send(request));
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/http/jquery.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/http/jquery.ts
new file mode 100644
index 000000000000..a0cd53a1996c
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/http/jquery.ts
@@ -0,0 +1,87 @@
+import { HttpLibrary, RequestContext, ResponseContext, HttpException, SelfDecodingBody } from './http';
+import * as e6p from 'es6-promise'
+import { from, Observable } from '../rxjsStub';
+e6p.polyfill();
+import * as $ from 'jquery';
+
+
+export class JQueryHttpLibrary implements HttpLibrary {
+
+    public send(request: RequestContext): Observable<ResponseContext> {
+        let method = request.getHttpMethod().toString();
+        let body = request.getBody();
+        let headerParams = request.getHeaders()
+
+        let requestOptions: any = {
+            url: request.getUrl(),
+            type: method,
+            headers: request.getHeaders(),
+            processData: false,
+            xhrFields: { withCredentials: true },
+            data: body
+        };
+
+		// If we want a blob, we have to set the xhrFields' responseType AND add a 
+		// custom converter to overwrite the default deserialization of JQuery...
+        requestOptions["xhrFields"] = { responseType: 'blob' };
+        requestOptions["converters"] = {} 
+        requestOptions["converters"]["* blob"] = (result:any) => result;
+        requestOptions["dataType"] = "blob";
+
+
+        if (request.getHeaders()['Content-Type']) {
+            requestOptions.contentType = headerParams['Content-Type'];
+        }
+        requestOptions.dataFilter = ((headerParams: { [key:string]: string}) => {
+            return (data: string, type: string) => {
+                if (headerParams["Accept"] == "application/json" && data == "") {
+                    return "{}"
+                } else {
+                    return data
+                }
+            }
+        })(headerParams);
+        
+        if (request.getHeaders()["Cookie"]) {
+            throw new HttpException("Setting the \"Cookie\"-Header field is blocked by every major browser when using jquery.ajax requests. Please switch to another library like fetch to enable this option");
+        }
+
+        if (body && body.constructor.name == "FormData") {
+            requestOptions.contentType = false;
+        }
+        
+        const sentRequest = $.ajax(requestOptions);
+        
+        const resultPromise = new Promise<ResponseContext>((resolve, reject) => {
+            sentRequest.done((data, _, jqXHR) => {
+                const result = new ResponseContext(
+                    jqXHR.status,
+                    this.getResponseHeaders(jqXHR),
+                    new SelfDecodingBody(Promise.resolve(data))
+                );
+                resolve(result);
+            })
+            sentRequest.fail((jqXHR: any) => {
+                const headers = this.getResponseHeaders(jqXHR)
+                const result = new ResponseContext(jqXHR.status, headers, jqXHR.responseText);
+                resolve(result);
+            })    
+        })
+        return from(resultPromise);
+    }
+
+    private getResponseHeaders(jqXHR: any): { [key: string]: string } {
+        const responseHeaders: { [key: string]: string } = {};
+        var headers = jqXHR.getAllResponseHeaders();
+        headers = headers.split("\n");
+        headers.forEach(function (header: any) {
+          header = header.split(": ");
+          var key = header.shift();
+          if (key.length == 0) return
+          // chrome60+ force lowercase, other browsers can be different
+          key = key.toLowerCase(); 
+          responseHeaders[key] = header.join(": ");
+        });
+        return responseHeaders
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/index.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/index.ts
new file mode 100644
index 000000000000..fe00e36cbd8a
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/index.ts
@@ -0,0 +1,10 @@
+export * from "./http/http";
+export * from "./auth/auth";
+export * from "./models/all";
+export { createConfiguration, Configuration } from "./configuration"
+export * from "./apis/exception";
+export * from "./servers";
+
+export { PromiseMiddleware as Middleware } from './middleware';
+export { PromisePetApi as PetApi,  PromiseStoreApi as StoreApi,  PromiseUserApi as UserApi } from './types/PromiseAPI';
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/middleware.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/middleware.ts
new file mode 100644
index 000000000000..46da5d25ef07
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/middleware.ts
@@ -0,0 +1,66 @@
+import {RequestContext, ResponseContext} from './http/http';
+import { Observable, from } from './rxjsStub';
+
+/**
+ * Defines the contract for a middleware intercepting requests before
+ * they are sent (but after the RequestContext was created)
+ * and before the ResponseContext is unwrapped.
+ *
+ */
+export interface Middleware {
+	/**
+	 * Modifies the request before the request is sent. 
+	 *
+	 * @param context RequestContext of a request which is about to be sent to the server
+	 * @returns an observable of the updated request context
+	 *
+	 */
+    pre(context: RequestContext): Observable<RequestContext>;
+    /**
+     * Modifies the returned response before it is deserialized.
+     *
+     * @param context ResponseContext of a sent request
+     * @returns an observable of the modified response context
+     */
+    post(context: ResponseContext): Observable<ResponseContext>;
+}
+
+export class PromiseMiddlewareWrapper implements Middleware {
+
+    public constructor(private middleware: PromiseMiddleware) {
+
+    }
+
+    pre(context: RequestContext): Observable<RequestContext> {
+        return from(this.middleware.pre(context));
+    }
+    
+    post(context: ResponseContext): Observable<ResponseContext> {
+        return from(this.middleware.post(context));
+    }
+
+}
+
+/**
+ * Defines the contract for a middleware intercepting requests before
+ * they are sent (but after the RequestContext was created)
+ * and before the ResponseContext is unwrapped.
+ *
+ */
+export interface PromiseMiddleware {
+	/**
+	 * Modifies the request before the request is sent. 
+	 *
+	 * @param context RequestContext of a request which is about to be sent to the server
+	 * @returns an observable of the updated request context
+	 *
+	 */
+    pre(context: RequestContext): Promise<RequestContext>;
+        /**
+     * Modifies the returned response before it is deserialized.
+     *
+     * @param context ResponseContext of a sent request
+     * @returns an observable of the modified response context
+     */
+    post(context: ResponseContext): Promise<ResponseContext>;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/ApiResponse.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/ApiResponse.ts
new file mode 100644
index 000000000000..300b2de4d9a9
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/ApiResponse.ts
@@ -0,0 +1,52 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* Describes the result of uploading an image resource
+*/
+export class ApiResponse {
+    'code'?: number;
+    'type'?: string;
+    'message'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "code",
+            "baseName": "code",
+            "type": "number",
+            "format": "int32"
+        },
+        {
+            "name": "type",
+            "baseName": "type",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "message",
+            "baseName": "message",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ApiResponse.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Category.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Category.ts
new file mode 100644
index 000000000000..9b210d5d501d
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Category.ts
@@ -0,0 +1,45 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* A category for a pet
+*/
+export class Category {
+    'id'?: number;
+    'name'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Category.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/InlineObject.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/InlineObject.ts
new file mode 100644
index 000000000000..54192c1c8356
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/InlineObject.ts
@@ -0,0 +1,48 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+export class InlineObject {
+    /**
+    * Updated name of the pet
+    */
+    'name'?: string;
+    /**
+    * Updated status of the pet
+    */
+    'status'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return InlineObject.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/InlineObject1.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/InlineObject1.ts
new file mode 100644
index 000000000000..02e988674a08
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/InlineObject1.ts
@@ -0,0 +1,48 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+export class InlineObject1 {
+    /**
+    * Additional data to pass to server
+    */
+    'additionalMetadata'?: string;
+    /**
+    * file to upload
+    */
+    'file'?: HttpFile;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "additionalMetadata",
+            "baseName": "additionalMetadata",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "file",
+            "baseName": "file",
+            "type": "HttpFile",
+            "format": "binary"
+        }    ];
+
+    static getAttributeTypeMap() {
+        return InlineObject1.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts
new file mode 100644
index 000000000000..f485b39e42b3
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts
@@ -0,0 +1,240 @@
+export * from './ApiResponse';
+export * from './Category';
+export * from './InlineObject';
+export * from './InlineObject1';
+export * from './Order';
+export * from './Pet';
+export * from './Tag';
+export * from './User';
+
+import { ApiResponse } from './ApiResponse';
+import { Category } from './Category';
+import { InlineObject } from './InlineObject';
+import { InlineObject1 } from './InlineObject1';
+import { Order    , OrderStatusEnum    } from './Order';
+import { Pet     , PetStatusEnum   } from './Pet';
+import { Tag } from './Tag';
+import { User } from './User';
+
+/* tslint:disable:no-unused-variable */
+let primitives = [
+                    "string",
+                    "boolean",
+                    "double",
+                    "integer",
+                    "long",
+                    "float",
+                    "number",
+                    "any"
+                 ];
+
+const supportedMediaTypes: { [mediaType: string]: number } = {
+  "application/json": Infinity,
+  "application/octet-stream": 0
+}
+
+                 
+let enumsMap: Set<string> = new Set<string>([
+					"OrderStatusEnum",
+					"PetStatusEnum",
+]);
+
+let typeMap: {[index: string]: any} = {
+    "ApiResponse": ApiResponse,
+    "Category": Category,
+    "InlineObject": InlineObject,
+    "InlineObject1": InlineObject1,
+    "Order": Order,
+    "Pet": Pet,
+    "Tag": Tag,
+    "User": User,
+}
+
+export class ObjectSerializer {
+    public static findCorrectType(data: any, expectedType: string) {
+        if (data == undefined) {
+            return expectedType;
+        } else if (primitives.indexOf(expectedType.toLowerCase()) !== -1) {
+            return expectedType;
+        } else if (expectedType === "Date") {
+            return expectedType;
+        } else {
+            if (enumsMap.has(expectedType)) {
+                return expectedType;
+            }
+
+            if (!typeMap[expectedType]) {
+                return expectedType; // w/e we don't know the type
+            }
+
+            // Check the discriminator
+            let discriminatorProperty = typeMap[expectedType].discriminator;
+            if (discriminatorProperty == null) {
+                return expectedType; // the type does not have a discriminator. use it.
+            } else {
+                if (data[discriminatorProperty]) {
+                    var discriminatorType = data[discriminatorProperty];
+                    if(typeMap[discriminatorType]){
+                        return discriminatorType; // use the type given in the discriminator
+                    } else {
+                        return expectedType; // discriminator did not map to a type
+                    }
+                } else {
+                    return expectedType; // discriminator was not present (or an empty string)
+                }
+            }
+        }
+    }
+
+    public static serialize(data: any, type: string, format: string) {
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.serialize(date, subType, format));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            if (format == "date") {
+                let month = data.getMonth()+1
+                month = month < 10 ? "0" + month.toString() : month.toString()
+                let day = data.getDate();
+                day = day < 10 ? "0" + day.toString() : day.toString();
+
+                return data.getFullYear() + "-" + month + "-" + day;
+            } else {
+                return data.toISOString();
+            }
+        } else {
+            if (enumsMap.has(type)) {
+                return data;
+            }
+            if (!typeMap[type]) { // in case we dont know the type
+                return data;
+            }
+            
+            // Get the actual type of this object
+            type = this.findCorrectType(data, type);
+
+            // get the map for the correct type.
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            let instance: {[index: string]: any} = {};
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type, attributeType.format);
+            }
+            return instance;
+        }
+    }
+
+    public static deserialize(data: any, type: string, format: string) {
+        // polymorphism may change the actual type.
+        type = ObjectSerializer.findCorrectType(data, type);
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.deserialize(date, subType, format));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            return new Date(data);
+        } else {
+            if (enumsMap.has(type)) {// is Enum
+                return data;
+            }
+
+            if (!typeMap[type]) { // dont know the type
+                return data;
+            }
+            let instance = new typeMap[type]();
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.name] = ObjectSerializer.deserialize(data[attributeType.baseName], attributeType.type, attributeType.format);
+            }
+            return instance;
+        }
+    }
+
+
+    /**
+     * Normalize media type
+     *
+     * We currently do not handle any media types attributes, i.e. anything
+     * after a semicolon. All content is assumed to be UTF-8 compatible.
+     */
+    public static normalizeMediaType(mediaType: string | undefined): string | undefined {
+        if (mediaType === undefined) {
+            return undefined;
+        }
+        return mediaType.split(";")[0].trim().toLowerCase();
+    }
+
+    /**
+     * From a list of possible media types, choose the one we can handle best.
+     *
+     * The order of the given media types does not have any impact on the choice
+     * made.
+     */
+    public static getPreferredMediaType(mediaTypes: Array<string>): string {
+        /** According to OAS 3 we should default to json */
+        if (!mediaTypes) {
+            return "application/json";
+        }
+
+        const normalMediaTypes = mediaTypes.map(this.normalizeMediaType);
+        let selectedMediaType: string | undefined = undefined;
+        let selectedRank: number = -Infinity;
+        for (const mediaType of normalMediaTypes) {
+            if (supportedMediaTypes[mediaType!] > selectedRank) {
+                selectedMediaType = mediaType;
+                selectedRank = supportedMediaTypes[mediaType!];
+            }
+        }
+
+        if (selectedMediaType === undefined) {
+            throw new Error("None of the given media types are supported: " + mediaTypes.join(", "));
+        }
+
+        return selectedMediaType!;
+    }
+
+    /**
+     * Convert data to a string according the given media type
+     */
+    public static stringify(data: any, mediaType: string): string {
+        if (mediaType === "application/json") {
+            return JSON.stringify(data);
+        }
+
+        throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.stringify.");
+    }
+
+    /**
+     * Parse data from a string according to the given media type
+     */
+    public static parse(rawData: string, mediaType: string | undefined) {
+        if (mediaType === undefined) {
+            throw new Error("Cannot parse content. No Content-Type defined.");
+        }
+
+        if (mediaType === "application/json") {
+            return JSON.parse(rawData);
+        }
+
+        throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.parse.");
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts
new file mode 100644
index 000000000000..291018b9e065
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts
@@ -0,0 +1,79 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* An order for a pets from the pet store
+*/
+export class Order {
+    'id'?: number;
+    'petId'?: number;
+    'quantity'?: number;
+    'shipDate'?: Date;
+    /**
+    * Order Status
+    */
+    'status'?: OrderStatusEnum;
+    'complete'?: boolean;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "petId",
+            "baseName": "petId",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "quantity",
+            "baseName": "quantity",
+            "type": "number",
+            "format": "int32"
+        },
+        {
+            "name": "shipDate",
+            "baseName": "shipDate",
+            "type": "Date",
+            "format": "date-time"
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "OrderStatusEnum",
+            "format": ""
+        },
+        {
+            "name": "complete",
+            "baseName": "complete",
+            "type": "boolean",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Order.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
+
+export type OrderStatusEnum = "placed" | "approved" | "delivered" ;
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts
new file mode 100644
index 000000000000..77a3490297db
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts
@@ -0,0 +1,81 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { Category } from './Category';
+import { Tag } from './Tag';
+import { HttpFile } from '../http/http';
+
+/**
+* A pet for sale in the pet store
+*/
+export class Pet {
+    'id'?: number;
+    'category'?: Category;
+    'name': string;
+    'photoUrls': Array<string>;
+    'tags'?: Array<Tag>;
+    /**
+    * pet status in the store
+    */
+    'status'?: PetStatusEnum;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "category",
+            "baseName": "category",
+            "type": "Category",
+            "format": ""
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "photoUrls",
+            "baseName": "photoUrls",
+            "type": "Array<string>",
+            "format": ""
+        },
+        {
+            "name": "tags",
+            "baseName": "tags",
+            "type": "Array<Tag>",
+            "format": ""
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "PetStatusEnum",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Pet.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
+
+export type PetStatusEnum = "available" | "pending" | "sold" ;
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Tag.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Tag.ts
new file mode 100644
index 000000000000..ce2a0e6d2a80
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Tag.ts
@@ -0,0 +1,45 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* A tag for a pet
+*/
+export class Tag {
+    'id'?: number;
+    'name'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Tag.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/User.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/User.ts
new file mode 100644
index 000000000000..049af95de370
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/User.ts
@@ -0,0 +1,90 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* A User who is purchasing from the pet store
+*/
+export class User {
+    'id'?: number;
+    'username'?: string;
+    'firstName'?: string;
+    'lastName'?: string;
+    'email'?: string;
+    'password'?: string;
+    'phone'?: string;
+    /**
+    * User Status
+    */
+    'userStatus'?: number;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "username",
+            "baseName": "username",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "firstName",
+            "baseName": "firstName",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "lastName",
+            "baseName": "lastName",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "email",
+            "baseName": "email",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "password",
+            "baseName": "password",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "phone",
+            "baseName": "phone",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "userStatus",
+            "baseName": "userStatus",
+            "type": "number",
+            "format": "int32"
+        }    ];
+
+    static getAttributeTypeMap() {
+        return User.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/all.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/all.ts
new file mode 100644
index 000000000000..d064eba93abd
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/all.ts
@@ -0,0 +1,8 @@
+export * from './ApiResponse'
+export * from './Category'
+export * from './InlineObject'
+export * from './InlineObject1'
+export * from './Order'
+export * from './Pet'
+export * from './Tag'
+export * from './User'
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/package-lock.json b/samples/openapi3/client/petstore/typescript/builds/jquery/package-lock.json
new file mode 100644
index 000000000000..31fa281aeedb
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/package-lock.json
@@ -0,0 +1,56 @@
+{
+  "name": "ts-petstore-client",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/jquery": {
+      "version": "3.3.29",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.29.tgz",
+      "integrity": "sha512-FhJvBninYD36v3k6c+bVk1DSZwh7B5Dpb/Pyk3HKVsiohn0nhbefZZ+3JXbWQhFyt0MxSl2jRDdGQPHeOHFXrQ==",
+      "requires": {
+        "@types/sizzle": "*"
+      }
+    },
+    "@types/sizzle": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
+      "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="
+    },
+    "es6-promise": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
+      "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q=="
+    },
+    "jquery": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
+      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
+    },
+    "querystringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+    },
+    "typescript": {
+      "version": "3.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz",
+      "integrity": "sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==",
+      "dev": true
+    },
+    "url-parse": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    }
+  }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/package.json b/samples/openapi3/client/petstore/typescript/builds/jquery/package.json
new file mode 100644
index 000000000000..ccacdf6b7158
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "ts-petstore-client",
+  "version": "1.0.0",
+  "description": "OpenAPI client for ts-petstore-client",
+  "author": "OpenAPI-Generator Contributors",
+  "keywords": [
+    "fetch",
+    "typescript",
+    "openapi-client",
+    "openapi-generator"
+  ],
+  "license": "Unlicense",
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
+  "scripts": {
+    "build": "tsc",
+    "prepublishOnly": "npm run build"
+  },
+  "dependencies": {
+    "@types/jquery": "^3.3.29",
+    "jquery": "^3.4.1",
+    "es6-promise": "^4.2.4",
+    "url-parse": "^1.4.3"
+  },
+  "devDependencies": {
+    "typescript": "^3.9.3"
+  }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/pom.xml b/samples/openapi3/client/petstore/typescript/builds/jquery/pom.xml
new file mode 100644
index 000000000000..9bd07b654f72
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/pom.xml
@@ -0,0 +1,60 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptBuildJQueryPetstoreClientSample</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Default Petstore Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-build</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>build</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/rxjsStub.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/rxjsStub.ts
new file mode 100644
index 000000000000..4c73715a2486
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/rxjsStub.ts
@@ -0,0 +1,27 @@
+export class Observable<T> {
+  constructor(private promise: Promise<T>) {}
+
+  toPromise() {
+    return this.promise;
+  }
+
+  pipe<S>(callback: (value: T) => S | Promise<S>): Observable<S> {
+    return new Observable(this.promise.then(callback));
+  }
+}
+
+export function from<T>(promise: Promise<any>) {
+  return new Observable(promise);
+}
+
+export function of<T>(value: T) {
+  return new Observable<T>(Promise.resolve(value));
+}
+
+export function mergeMap<T, S>(callback: (value: T) => Observable<S>) {
+  return (value: T) => callback(value).toPromise();
+}
+
+export function map(callback: any) {
+  return callback;
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts
new file mode 100644
index 000000000000..aa5332db7ae9
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/servers.ts
@@ -0,0 +1,53 @@
+import { RequestContext, HttpMethod } from "./http/http";
+
+export interface BaseServerConfiguration {
+    makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext;
+}
+
+/**
+ *
+ * Represents the configuration of a server including its
+ * url template and variable configuration based on the url.
+ *
+ */
+export class ServerConfiguration<T extends { [key: string]: string }> implements BaseServerConfiguration {
+    public constructor(private url: string, private variableConfiguration: T) {}
+
+    /**
+     * Sets the value of the variables of this server.
+     *
+     * @param variableConfiguration a partial variable configuration for the variables contained in the url
+     */
+    public setVariables(variableConfiguration: Partial<T>) {
+        Object.assign(this.variableConfiguration, variableConfiguration);
+    }
+
+	public getConfiguration(): T {
+		return this.variableConfiguration
+	}
+
+	private getUrl() {
+		let replacedUrl = this.url;
+		for (const key in this.variableConfiguration) {
+			var re = new RegExp("{" + key + "}","g");
+			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+		}
+		return replacedUrl
+	}
+
+	/**
+	 * Creates a new request context for this server using the url with variables
+	 * replaced with their respective values and the endpoint of the request appended.
+	 *
+	 * @param endpoint the endpoint to be queried on the server
+	 * @param httpMethod httpMethod to be used
+	 *
+	 */	
+	public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
+		return new RequestContext(this.getUrl() + endpoint, httpMethod);		
+	}
+}
+
+export const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  })
+
+export const servers = [server1];
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/tsconfig.json b/samples/openapi3/client/petstore/typescript/builds/jquery/tsconfig.json
new file mode 100644
index 000000000000..ccdcadd55948
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/tsconfig.json
@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "strict": true,
+    /* Basic Options */
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "declaration": true,
+ 
+    /* Additional Checks */
+     "noUnusedLocals": false,                /* Report errors on unused locals. */ // TODO: reenable (unused imports!)
+     "noUnusedParameters": false,            /* Report errors on unused parameters. */ // TODO: set to true again
+     "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+     "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    "removeComments": true,
+    "sourceMap": true,
+    "outDir": "./dist",
+    "noLib": false,
+    "lib": [ "es6", "dom" ],
+  },
+  "exclude": [
+  	"dist",
+    "node_modules"
+  ],
+  "filesGlob": [
+    "./**/*.ts",
+  ]
+  
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/APIInterfaces.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/APIInterfaces.ts
new file mode 100644
index 000000000000..370e025aa041
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/APIInterfaces.ts
@@ -0,0 +1,166 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http';
+import * as models from '../models/all';
+import { Configuration} from '../configuration'
+import { Observable, of, from } from '../rxjsStub';
+import {mergeMap, map} from  '../rxjsStub';
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Category } from '../models/Category';
+import { InlineObject } from '../models/InlineObject';
+import { InlineObject1 } from '../models/InlineObject1';
+import { Order } from '../models/Order';
+import { Pet } from '../models/Pet';
+import { Tag } from '../models/Tag';
+import { User } from '../models/User';
+
+export interface GenericPetApiInterface<T1, T2, T3, T4, T5, T6, T7, T8> {
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    addPet(pet: Pet, options?: Configuration): T1;
+
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    deletePet(petId: number, apiKey?: string, options?: Configuration): T2;
+
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): T3;
+
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    findPetsByTags(tags: Array<string>, options?: Configuration): T4;
+
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    getPetById(petId: number, options?: Configuration): T5;
+
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    updatePet(pet: Pet, options?: Configuration): T6;
+
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): T7;
+
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): T8;
+
+}
+
+
+
+
+export interface GenericStoreApiInterface<T1, T2, T3, T4> {
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    deleteOrder(orderId: string, options?: Configuration): T1;
+
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    getInventory(options?: Configuration): T2;
+
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    getOrderById(orderId: number, options?: Configuration): T3;
+
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    placeOrder(order: Order, options?: Configuration): T4;
+
+}
+
+
+
+
+export interface GenericUserApiInterface<T1, T2, T3, T4, T5, T6, T7, T8> {
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    createUser(user: User, options?: Configuration): T1;
+
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    createUsersWithArrayInput(user: Array<User>, options?: Configuration): T2;
+
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    createUsersWithListInput(user: Array<User>, options?: Configuration): T3;
+
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    deleteUser(username: string, options?: Configuration): T4;
+
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    getUserByName(username: string, options?: Configuration): T5;
+
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    loginUser(username: string, password: string, options?: Configuration): T6;
+
+    /**
+     * Logs out current logged in user session
+     */
+    logoutUser(options?: Configuration): T7;
+
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    updateUser(username: string, user: User, options?: Configuration): T8;
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts
new file mode 100644
index 000000000000..10cebbd77dd2
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts
@@ -0,0 +1,442 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http';
+import * as models from '../models/all';
+import { Configuration} from '../configuration'
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Category } from '../models/Category';
+import { InlineObject } from '../models/InlineObject';
+import { InlineObject1 } from '../models/InlineObject1';
+import { Order } from '../models/Order';
+import { Pet } from '../models/Pet';
+import { Tag } from '../models/Tag';
+import { User } from '../models/User';
+
+import { ObservablePetApi } from "./ObservableAPI";
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
+
+export interface PetApiAddPetRequest {
+    /**
+     * Pet object that needs to be added to the store
+     * @type Pet
+     * @memberof PetApiaddPet
+     */
+    pet: Pet
+}
+
+export interface PetApiDeletePetRequest {
+    /**
+     * Pet id to delete
+     * @type number
+     * @memberof PetApideletePet
+     */
+    petId: number
+    /**
+     * 
+     * @type string
+     * @memberof PetApideletePet
+     */
+    apiKey?: string
+}
+
+export interface PetApiFindPetsByStatusRequest {
+    /**
+     * Status values that need to be considered for filter
+     * @type Array&lt;&#39;available&#39; | &#39;pending&#39; | &#39;sold&#39;&gt;
+     * @memberof PetApifindPetsByStatus
+     */
+    status: Array<'available' | 'pending' | 'sold'>
+}
+
+export interface PetApiFindPetsByTagsRequest {
+    /**
+     * Tags to filter by
+     * @type Array&lt;string&gt;
+     * @memberof PetApifindPetsByTags
+     */
+    tags: Array<string>
+}
+
+export interface PetApiGetPetByIdRequest {
+    /**
+     * ID of pet to return
+     * @type number
+     * @memberof PetApigetPetById
+     */
+    petId: number
+}
+
+export interface PetApiUpdatePetRequest {
+    /**
+     * Pet object that needs to be added to the store
+     * @type Pet
+     * @memberof PetApiupdatePet
+     */
+    pet: Pet
+}
+
+export interface PetApiUpdatePetWithFormRequest {
+    /**
+     * ID of pet that needs to be updated
+     * @type number
+     * @memberof PetApiupdatePetWithForm
+     */
+    petId: number
+    /**
+     * Updated name of the pet
+     * @type string
+     * @memberof PetApiupdatePetWithForm
+     */
+    name?: string
+    /**
+     * Updated status of the pet
+     * @type string
+     * @memberof PetApiupdatePetWithForm
+     */
+    status?: string
+}
+
+export interface PetApiUploadFileRequest {
+    /**
+     * ID of pet to update
+     * @type number
+     * @memberof PetApiuploadFile
+     */
+    petId: number
+    /**
+     * Additional data to pass to server
+     * @type string
+     * @memberof PetApiuploadFile
+     */
+    additionalMetadata?: string
+    /**
+     * file to upload
+     * @type HttpFile
+     * @memberof PetApiuploadFile
+     */
+    file?: HttpFile
+}
+
+
+export class ObjectPetApi {
+    private api: ObservablePetApi
+
+    public constructor(configuration: Configuration, requestFactory?: PetApiRequestFactory, responseProcessor?: PetApiResponseProcessor) {
+        this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * Add a new pet to the store
+     * @param param the request object
+     */
+    public addPet(param: PetApiAddPetRequest, options?: Configuration): Promise<Pet> {
+        return this.api.addPet(param.pet,  options).toPromise();
+    }
+	
+    /**
+     * Deletes a pet
+     * @param param the request object
+     */
+    public deletePet(param: PetApiDeletePetRequest, options?: Configuration): Promise<void> {
+        return this.api.deletePet(param.petId, param.apiKey,  options).toPromise();
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param param the request object
+     */
+    public findPetsByStatus(param: PetApiFindPetsByStatusRequest, options?: Configuration): Promise<Array<Pet>> {
+        return this.api.findPetsByStatus(param.status,  options).toPromise();
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param param the request object
+     */
+    public findPetsByTags(param: PetApiFindPetsByTagsRequest, options?: Configuration): Promise<Array<Pet>> {
+        return this.api.findPetsByTags(param.tags,  options).toPromise();
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param param the request object
+     */
+    public getPetById(param: PetApiGetPetByIdRequest, options?: Configuration): Promise<Pet> {
+        return this.api.getPetById(param.petId,  options).toPromise();
+    }
+	
+    /**
+     * Update an existing pet
+     * @param param the request object
+     */
+    public updatePet(param: PetApiUpdatePetRequest, options?: Configuration): Promise<Pet> {
+        return this.api.updatePet(param.pet,  options).toPromise();
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param param the request object
+     */
+    public updatePetWithForm(param: PetApiUpdatePetWithFormRequest, options?: Configuration): Promise<void> {
+        return this.api.updatePetWithForm(param.petId, param.name, param.status,  options).toPromise();
+    }
+	
+    /**
+     * uploads an image
+     * @param param the request object
+     */
+    public uploadFile(param: PetApiUploadFileRequest, options?: Configuration): Promise<ApiResponse> {
+        return this.api.uploadFile(param.petId, param.additionalMetadata, param.file,  options).toPromise();
+    }
+	
+
+}
+
+
+
+
+import { ObservableStoreApi } from "./ObservableAPI";
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
+
+export interface StoreApiDeleteOrderRequest {
+    /**
+     * ID of the order that needs to be deleted
+     * @type string
+     * @memberof StoreApideleteOrder
+     */
+    orderId: string
+}
+
+export interface StoreApiGetInventoryRequest {
+}
+
+export interface StoreApiGetOrderByIdRequest {
+    /**
+     * ID of pet that needs to be fetched
+     * @type number
+     * @memberof StoreApigetOrderById
+     */
+    orderId: number
+}
+
+export interface StoreApiPlaceOrderRequest {
+    /**
+     * order placed for purchasing the pet
+     * @type Order
+     * @memberof StoreApiplaceOrder
+     */
+    order: Order
+}
+
+
+export class ObjectStoreApi {
+    private api: ObservableStoreApi
+
+    public constructor(configuration: Configuration, requestFactory?: StoreApiRequestFactory, responseProcessor?: StoreApiResponseProcessor) {
+        this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param param the request object
+     */
+    public deleteOrder(param: StoreApiDeleteOrderRequest, options?: Configuration): Promise<void> {
+        return this.api.deleteOrder(param.orderId,  options).toPromise();
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     * @param param the request object
+     */
+    public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> {
+        return this.api.getInventory( options).toPromise();
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param param the request object
+     */
+    public getOrderById(param: StoreApiGetOrderByIdRequest, options?: Configuration): Promise<Order> {
+        return this.api.getOrderById(param.orderId,  options).toPromise();
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param param the request object
+     */
+    public placeOrder(param: StoreApiPlaceOrderRequest, options?: Configuration): Promise<Order> {
+        return this.api.placeOrder(param.order,  options).toPromise();
+    }
+	
+
+}
+
+
+
+
+import { ObservableUserApi } from "./ObservableAPI";
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
+
+export interface UserApiCreateUserRequest {
+    /**
+     * Created user object
+     * @type User
+     * @memberof UserApicreateUser
+     */
+    user: User
+}
+
+export interface UserApiCreateUsersWithArrayInputRequest {
+    /**
+     * List of user object
+     * @type Array&lt;User&gt;
+     * @memberof UserApicreateUsersWithArrayInput
+     */
+    user: Array<User>
+}
+
+export interface UserApiCreateUsersWithListInputRequest {
+    /**
+     * List of user object
+     * @type Array&lt;User&gt;
+     * @memberof UserApicreateUsersWithListInput
+     */
+    user: Array<User>
+}
+
+export interface UserApiDeleteUserRequest {
+    /**
+     * The name that needs to be deleted
+     * @type string
+     * @memberof UserApideleteUser
+     */
+    username: string
+}
+
+export interface UserApiGetUserByNameRequest {
+    /**
+     * The name that needs to be fetched. Use user1 for testing.
+     * @type string
+     * @memberof UserApigetUserByName
+     */
+    username: string
+}
+
+export interface UserApiLoginUserRequest {
+    /**
+     * The user name for login
+     * @type string
+     * @memberof UserApiloginUser
+     */
+    username: string
+    /**
+     * The password for login in clear text
+     * @type string
+     * @memberof UserApiloginUser
+     */
+    password: string
+}
+
+export interface UserApiLogoutUserRequest {
+}
+
+export interface UserApiUpdateUserRequest {
+    /**
+     * name that need to be deleted
+     * @type string
+     * @memberof UserApiupdateUser
+     */
+    username: string
+    /**
+     * Updated user object
+     * @type User
+     * @memberof UserApiupdateUser
+     */
+    user: User
+}
+
+
+export class ObjectUserApi {
+    private api: ObservableUserApi
+
+    public constructor(configuration: Configuration, requestFactory?: UserApiRequestFactory, responseProcessor?: UserApiResponseProcessor) {
+        this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param param the request object
+     */
+    public createUser(param: UserApiCreateUserRequest, options?: Configuration): Promise<void> {
+        return this.api.createUser(param.user,  options).toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param param the request object
+     */
+    public createUsersWithArrayInput(param: UserApiCreateUsersWithArrayInputRequest, options?: Configuration): Promise<void> {
+        return this.api.createUsersWithArrayInput(param.user,  options).toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param param the request object
+     */
+    public createUsersWithListInput(param: UserApiCreateUsersWithListInputRequest, options?: Configuration): Promise<void> {
+        return this.api.createUsersWithListInput(param.user,  options).toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param param the request object
+     */
+    public deleteUser(param: UserApiDeleteUserRequest, options?: Configuration): Promise<void> {
+        return this.api.deleteUser(param.username,  options).toPromise();
+    }
+	
+    /**
+     * Get user by user name
+     * @param param the request object
+     */
+    public getUserByName(param: UserApiGetUserByNameRequest, options?: Configuration): Promise<User> {
+        return this.api.getUserByName(param.username,  options).toPromise();
+    }
+	
+    /**
+     * Logs user into the system
+     * @param param the request object
+     */
+    public loginUser(param: UserApiLoginUserRequest, options?: Configuration): Promise<string> {
+        return this.api.loginUser(param.username, param.password,  options).toPromise();
+    }
+	
+    /**
+     * Logs out current logged in user session
+     * @param param the request object
+     */
+    public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise<void> {
+        return this.api.logoutUser( options).toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param param the request object
+     */
+    public updateUser(param: UserApiUpdateUserRequest, options?: Configuration): Promise<void> {
+        return this.api.updateUser(param.username, param.user,  options).toPromise();
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts
new file mode 100644
index 000000000000..30be6fff1f82
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts
@@ -0,0 +1,554 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http';
+import * as models from '../models/all';
+import { Configuration} from '../configuration'
+import { Observable, of, from } from '../rxjsStub';
+import {mergeMap, map} from  '../rxjsStub';
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Category } from '../models/Category';
+import { InlineObject } from '../models/InlineObject';
+import { InlineObject1 } from '../models/InlineObject1';
+import { Order } from '../models/Order';
+import { Pet } from '../models/Pet';
+import { Tag } from '../models/Tag';
+import { User } from '../models/User';
+
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
+export class ObservablePetApi {
+    private requestFactory: PetApiRequestFactory;
+    private responseProcessor: PetApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: PetApiRequestFactory,
+        responseProcessor?: PetApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new PetApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new PetApiResponseProcessor();
+    }
+
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public addPet(pet: Pet, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.addPet(pet, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public deletePet(petId: number, apiKey?: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Observable<Array<Pet>> {
+    	const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public findPetsByTags(tags: Array<string>, options?: Configuration): Observable<Array<Pet>> {
+    	const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public getPetById(petId: number, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.getPetById(petId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public updatePet(pet: Pet, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.updatePet(pet, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
+	    	}));
+    }
+	
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Observable<ApiResponse> {
+    	const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
+
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
+export class ObservableStoreApi {
+    private requestFactory: StoreApiRequestFactory;
+    private responseProcessor: StoreApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: StoreApiRequestFactory,
+        responseProcessor?: StoreApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new StoreApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new StoreApiResponseProcessor();
+    }
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public deleteOrder(orderId: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public getInventory(options?: Configuration): Observable<{ [key: string]: number; }> {
+    	const requestContextPromise = this.requestFactory.getInventory(options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
+	    	}));
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public getOrderById(orderId: number, options?: Configuration): Observable<Order> {
+    	const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public placeOrder(order: Order, options?: Configuration): Observable<Order> {
+    	const requestContextPromise = this.requestFactory.placeOrder(order, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
+
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
+export class ObservableUserApi {
+    private requestFactory: UserApiRequestFactory;
+    private responseProcessor: UserApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: UserApiRequestFactory,
+        responseProcessor?: UserApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new UserApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new UserApiResponseProcessor();
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public createUser(user: User, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUser(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithListInput(user: Array<User>, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
+	    	}));
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public deleteUser(username: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deleteUser(username, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public getUserByName(username: string, options?: Configuration): Observable<User> {
+    	const requestContextPromise = this.requestFactory.getUserByName(username, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public loginUser(username: string, password: string, options?: Configuration): Observable<string> {
+    	const requestContextPromise = this.requestFactory.loginUser(username, password, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Logs out current logged in user session
+     */
+    public logoutUser(options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.logoutUser(options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public updateUser(username: string, user: User, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.updateUser(username, user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts
new file mode 100644
index 000000000000..44829ca43fa8
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts
@@ -0,0 +1,266 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http';
+import * as models from '../models/all';
+import { Configuration} from '../configuration'
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Category } from '../models/Category';
+import { InlineObject } from '../models/InlineObject';
+import { InlineObject1 } from '../models/InlineObject1';
+import { Order } from '../models/Order';
+import { Pet } from '../models/Pet';
+import { Tag } from '../models/Tag';
+import { User } from '../models/User';
+import { ObservablePetApi } from './ObservableAPI';
+
+
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
+export class PromisePetApi {
+    private api: ObservablePetApi
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: PetApiRequestFactory,
+        responseProcessor?: PetApiResponseProcessor
+    ) {
+        this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public addPet(pet: Pet, options?: Configuration): Promise<Pet> {
+    	const result = this.api.addPet(pet, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deletePet(petId, apiKey, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<Array<Pet>> {
+    	const result = this.api.findPetsByStatus(status, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public findPetsByTags(tags: Array<string>, options?: Configuration): Promise<Array<Pet>> {
+    	const result = this.api.findPetsByTags(tags, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public getPetById(petId: number, options?: Configuration): Promise<Pet> {
+    	const result = this.api.getPetById(petId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public updatePet(pet: Pet, options?: Configuration): Promise<Pet> {
+    	const result = this.api.updatePet(pet, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<void> {
+    	const result = this.api.updatePetWithForm(petId, name, status, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<ApiResponse> {
+    	const result = this.api.uploadFile(petId, additionalMetadata, file, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
+import { ObservableStoreApi } from './ObservableAPI';
+
+
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
+export class PromiseStoreApi {
+    private api: ObservableStoreApi
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: StoreApiRequestFactory,
+        responseProcessor?: StoreApiResponseProcessor
+    ) {
+        this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public deleteOrder(orderId: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deleteOrder(orderId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public getInventory(options?: Configuration): Promise<{ [key: string]: number; }> {
+    	const result = this.api.getInventory(options);
+        return result.toPromise();
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public getOrderById(orderId: number, options?: Configuration): Promise<Order> {
+    	const result = this.api.getOrderById(orderId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public placeOrder(order: Order, options?: Configuration): Promise<Order> {
+    	const result = this.api.placeOrder(order, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
+import { ObservableUserApi } from './ObservableAPI';
+
+
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
+export class PromiseUserApi {
+    private api: ObservableUserApi
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: UserApiRequestFactory,
+        responseProcessor?: UserApiResponseProcessor
+    ) {
+        this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public createUser(user: User, options?: Configuration): Promise<void> {
+    	const result = this.api.createUser(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<void> {
+    	const result = this.api.createUsersWithArrayInput(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<void> {
+    	const result = this.api.createUsersWithListInput(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public deleteUser(username: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deleteUser(username, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public getUserByName(username: string, options?: Configuration): Promise<User> {
+    	const result = this.api.getUserByName(username, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public loginUser(username: string, password: string, options?: Configuration): Promise<string> {
+    	const result = this.api.loginUser(username, password, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Logs out current logged in user session
+     */
+    public logoutUser(options?: Configuration): Promise<void> {
+    	const result = this.api.logoutUser(options);
+        return result.toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public updateUser(username: string, user: User, options?: Configuration): Promise<void> {
+    	const result = this.api.updateUser(username, user, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/util.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/util.ts
new file mode 100644
index 000000000000..d1888434535c
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/util.ts
@@ -0,0 +1,28 @@
+/**
+ * Returns if a specific http code is in a given code range
+ * where the code range is defined as a combination of digits 
+ * and "X" (the letter X) with a length of 3
+ *
+ * @param codeRange string with length 3 consisting of digits and "X" (the letter X)
+ * @param code the http status code to be checked against the code range
+ */
+export function isCodeInRange(codeRange: string, code: number): boolean {
+	// This is how the default value is encoded in OAG
+	if (codeRange === "0") {
+		return true;
+	}
+	if (codeRange == code.toString()) {
+		return true;
+	} else {
+		const codeString = code.toString();
+		if (codeString.length != codeRange.length) {
+			return false;
+		}
+		for (let i = 0; i < codeString.length; i++) {
+			if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/.gitignore b/samples/openapi3/client/petstore/typescript/builds/object_params/.gitignore
new file mode 100644
index 000000000000..1521c8b7652b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator-ignore b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator-ignore
new file mode 100644
index 000000000000..7484ee590a38
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/FILES b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/FILES
new file mode 100644
index 000000000000..d21a391e0080
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/FILES
@@ -0,0 +1,32 @@
+.gitignore
+README.md
+apis/PetApi.ts
+apis/StoreApi.ts
+apis/UserApi.ts
+apis/baseapi.ts
+apis/exception.ts
+auth/auth.ts
+configuration.ts
+git_push.sh
+http/http.ts
+http/isomorphic-fetch.ts
+index.ts
+middleware.ts
+models/ApiResponse.ts
+models/Category.ts
+models/InlineObject.ts
+models/InlineObject1.ts
+models/ObjectSerializer.ts
+models/Order.ts
+models/Pet.ts
+models/Tag.ts
+models/User.ts
+models/all.ts
+package.json
+rxjsStub.ts
+servers.ts
+tsconfig.json
+types/ObjectParamAPI.ts
+types/ObservableAPI.ts
+types/PromiseAPI.ts
+util.ts
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION
new file mode 100644
index 000000000000..d99e7162d01f
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION
@@ -0,0 +1 @@
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/README.md b/samples/openapi3/client/petstore/typescript/builds/object_params/README.md
new file mode 100644
index 000000000000..80b1ac5cc98b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/README.md
@@ -0,0 +1,30 @@
+## ts-petstore-client@1.0.0
+
+This generator creates TypeScript/JavaScript client that utilizes fetch-api. 
+
+### Building
+
+To build and compile the typescript sources to javascript use:
+```
+npm install
+npm run build
+```
+
+### Publishing
+
+First build the package then run ```npm publish```
+
+### Consuming
+
+navigate to the folder of your consuming project and run one of the following commands.
+
+_published:_
+
+```
+npm install ts-petstore-client@1.0.0 --save
+```
+
+_unPublished (not recommended):_
+
+```
+npm install PATH_TO_GENERATED_PACKAGE --save
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts
new file mode 100644
index 000000000000..7041341a7089
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts
@@ -0,0 +1,650 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi';
+import {Configuration} from '../configuration';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
+import * as FormData from "form-data";
+import {ObjectSerializer} from '../models/ObjectSerializer';
+import {ApiException} from './exception';
+import {isCodeInRange} from '../util';
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Pet } from '../models/Pet';
+
+/**
+ * no description
+ */
+export class PetApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public async addPet(pet: Pet, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'pet' is not null or undefined
+        if (pet === null || pet === undefined) {
+            throw new RequiredError('Required parameter pet was null or undefined when calling addPet.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json",
+        
+            "application/xml"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(pet, "Pet", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public async deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling deletePet.');
+        }
+
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+		requestContext.setHeaderParam("api_key", ObjectSerializer.serialize(apiKey, "string", ""));
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'status' is not null or undefined
+        if (status === null || status === undefined) {
+            throw new RequiredError('Required parameter status was null or undefined when calling findPetsByStatus.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/findByStatus';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (status !== undefined) {
+        	requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public async findPetsByTags(tags: Array<string>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'tags' is not null or undefined
+        if (tags === null || tags === undefined) {
+            throw new RequiredError('Required parameter tags was null or undefined when calling findPetsByTags.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/findByTags';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (tags !== undefined) {
+        	requestContext.setQueryParam("tags", ObjectSerializer.serialize(tags, "Array<string>", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public async getPetById(petId: number, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling getPetById.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public async updatePet(pet: Pet, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'pet' is not null or undefined
+        if (pet === null || pet === undefined) {
+            throw new RequiredError('Required parameter pet was null or undefined when calling updatePet.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/pet';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json",
+        
+            "application/xml"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(pet, "Pet", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public async updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling updatePetWithForm.');
+        }
+
+		
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+		let localVarFormParams = new FormData();
+
+        if (name !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('name', name as any);
+        }
+        if (status !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('status', status as any);
+        }
+		requestContext.setBody(localVarFormParams);
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public async uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new RequiredError('Required parameter petId was null or undefined when calling uploadFile.');
+        }
+
+		
+		
+		
+		// Path Params
+    	const localVarPath = '/pet/{petId}/uploadImage'
+            .replace('{' + 'petId' + '}', encodeURIComponent(String(petId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+		let localVarFormParams = new FormData();
+
+        if (additionalMetadata !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('additionalMetadata', additionalMetadata as any);
+        }
+        if (file !== undefined) {
+        // TODO: replace .append with .set
+             localVarFormParams.append('file', file.data, file.name);
+        }
+		requestContext.setBody(localVarFormParams);
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["petstore_auth"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+}
+
+
+
+export class PetApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to addPet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async addPet(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid input");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deletePet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deletePet(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid pet value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to findPetsByStatus
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async findPetsByStatus(response: ResponseContext): Promise<Array<Pet> > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid status value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to findPetsByTags
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async findPetsByTags(response: ResponseContext): Promise<Array<Pet> > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid tag value");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Array<Pet> = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Array<Pet>", ""
+            ) as Array<Pet>;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getPetById
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getPetById(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Pet not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updatePet
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updatePet(response: ResponseContext): Promise<Pet > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Pet not found");
+        }
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Validation exception");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Pet = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Pet", ""
+            ) as Pet;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updatePetWithForm
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updatePetWithForm(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("405", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid input");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to uploadFile
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async uploadFile(response: ResponseContext): Promise<ApiResponse > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: ApiResponse = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "ApiResponse", ""
+            ) as ApiResponse;
+            return body;
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: ApiResponse = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "ApiResponse", ""
+            ) as ApiResponse;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts
new file mode 100644
index 000000000000..09400e99c083
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts
@@ -0,0 +1,295 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi';
+import {Configuration} from '../configuration';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
+import * as FormData from "form-data";
+import {ObjectSerializer} from '../models/ObjectSerializer';
+import {ApiException} from './exception';
+import {isCodeInRange} from '../util';
+
+import { Order } from '../models/Order';
+
+/**
+ * no description
+ */
+export class StoreApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public async deleteOrder(orderId: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new RequiredError('Required parameter orderId was null or undefined when calling deleteOrder.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order/{orderId}'
+            .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public async getInventory(options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+		// Path Params
+    	const localVarPath = '/store/inventory';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public async getOrderById(orderId: number, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new RequiredError('Required parameter orderId was null or undefined when calling getOrderById.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order/{orderId}'
+            .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public async placeOrder(order: Order, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'order' is not null or undefined
+        if (order === null || order === undefined) {
+            throw new RequiredError('Required parameter order was null or undefined when calling placeOrder.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/store/order';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(order, "Order", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+}
+
+
+
+export class StoreApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deleteOrder
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deleteOrder(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Order not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getInventory
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getInventory(response: ResponseContext): Promise<{ [key: string]: number; } > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: { [key: string]: number; } = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "{ [key: string]: number; }", "int32"
+            ) as { [key: string]: number; };
+            return body;
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: { [key: string]: number; } = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "{ [key: string]: number; }", "int32"
+            ) as { [key: string]: number; };
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getOrderById
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getOrderById(response: ResponseContext): Promise<Order > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid ID supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Order not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to placeOrder
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async placeOrder(response: ResponseContext): Promise<Order > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid Order");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: Order = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "Order", ""
+            ) as Order;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts
new file mode 100644
index 000000000000..1d43ec7a72b4
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts
@@ -0,0 +1,587 @@
+// TODO: better import syntax?
+import { BaseAPIRequestFactory, RequiredError } from './baseapi';
+import {Configuration} from '../configuration';
+import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
+import * as FormData from "form-data";
+import {ObjectSerializer} from '../models/ObjectSerializer';
+import {ApiException} from './exception';
+import {isCodeInRange} from '../util';
+
+import { User } from '../models/User';
+
+/**
+ * no description
+ */
+export class UserApiRequestFactory extends BaseAPIRequestFactory {
+	
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public async createUser(user: User, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "User", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public async createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithArrayInput.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/createWithArray';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "Array<User>", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public async createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling createUsersWithListInput.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/createWithList';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "Array<User>", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public async deleteUser(username: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling deleteUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public async getUserByName(username: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling getUserByName.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public async loginUser(username: string, password: string, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling loginUser.');
+        }
+
+		
+        // verify required parameter 'password' is not null or undefined
+        if (password === null || password === undefined) {
+            throw new RequiredError('Required parameter password was null or undefined when calling loginUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/login';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+        if (username !== undefined) {
+        	requestContext.setQueryParam("username", ObjectSerializer.serialize(username, "string", ""));
+        }
+        if (password !== undefined) {
+        	requestContext.setQueryParam("password", ObjectSerializer.serialize(password, "string", ""));
+        }
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        // Apply auth methods
+
+        return requestContext;
+    }
+
+    /**
+     * Logs out current logged in user session
+     */
+    public async logoutUser(options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+		// Path Params
+    	const localVarPath = '/user/logout';
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public async updateUser(username: string, user: User, options?: Configuration): Promise<RequestContext> {
+		let config = options || this.configuration;
+		
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new RequiredError('Required parameter username was null or undefined when calling updateUser.');
+        }
+
+		
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new RequiredError('Required parameter user was null or undefined when calling updateUser.');
+        }
+
+		
+		// Path Params
+    	const localVarPath = '/user/{username}'
+            .replace('{' + 'username' + '}', encodeURIComponent(String(username)));
+
+		// Make Request Context
+    	const requestContext = config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT);
+        requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8")
+
+        // Query Params
+	
+		// Header Params
+	
+		// Form Params
+
+
+		// Body Params
+        const contentType = ObjectSerializer.getPreferredMediaType([
+            "application/json"
+        ]);
+        requestContext.setHeaderParam("Content-Type", contentType);
+        const serializedBody = ObjectSerializer.stringify(
+            ObjectSerializer.serialize(user, "User", ""),
+            contentType
+        );
+        requestContext.setBody(serializedBody);
+
+        let authMethod = null;
+        // Apply auth methods
+        authMethod = config.authMethods["api_key"]
+        if (authMethod) {
+            await authMethod.applySecurityAuthentication(requestContext);
+        }
+
+        return requestContext;
+    }
+
+}
+
+
+
+export class UserApiResponseProcessor {
+
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUsersWithArrayInput
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUsersWithArrayInput(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to createUsersWithListInput
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async createUsersWithListInput(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to deleteUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async deleteUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to getUserByName
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async getUserByName(response: ResponseContext): Promise<User > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: User = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "User", ""
+            ) as User;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: User = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "User", ""
+            ) as User;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to loginUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async loginUser(response: ResponseContext): Promise<string > {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("200", response.httpStatusCode)) {
+            const body: string = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "string", ""
+            ) as string;
+            return body;
+        }
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid username/password supplied");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            const body: string = ObjectSerializer.deserialize(
+                ObjectSerializer.parse(await response.body.text(), contentType),
+                "string", ""
+            ) as string;
+            return body;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to logoutUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async logoutUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("0", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "successful operation");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+    /**
+     * Unwraps the actual response sent by the server from the response context and deserializes the response content
+     * to the expected objects
+     *
+     * @params response Response returned by the server for a request to updateUser
+     * @throws ApiException if the response code was not in [200, 299]
+     */
+     public async updateUser(response: ResponseContext): Promise< void> {
+        const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
+        if (isCodeInRange("400", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "Invalid user supplied");
+        }
+        if (isCodeInRange("404", response.httpStatusCode)) {
+            throw new ApiException<string>(response.httpStatusCode, "User not found");
+        }
+
+        // Work around for missing responses in specification, e.g. for petstore.yaml
+        if (response.httpStatusCode >= 200 && response.httpStatusCode <= 299) {
+            return;
+        }
+
+        let body = response.body || "";
+    	throw new ApiException<string>(response.httpStatusCode, "Unknown API Status Code!\nBody: \"" + body + "\"");
+    }
+			
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/baseapi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/baseapi.ts
new file mode 100644
index 000000000000..fe7ee3d15118
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/baseapi.ts
@@ -0,0 +1,37 @@
+import { Configuration } from '../configuration'
+
+/**
+ *
+ * @export
+ */
+export const COLLECTION_FORMATS = {
+    csv: ",",
+    ssv: " ",
+    tsv: "\t",
+    pipes: "|",
+};
+
+
+/**
+ * 
+ * @export
+ * @class BaseAPI
+ */
+export class BaseAPIRequestFactory {
+
+    constructor(protected configuration: Configuration) {
+    }
+};
+
+/**
+ * 
+ * @export
+ * @class RequiredError
+ * @extends {Error}
+ */
+export class RequiredError extends Error {
+    name: "RequiredError" = "RequiredError";
+    constructor(public field: string, msg?: string) {
+        super(msg);
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/exception.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/exception.ts
new file mode 100644
index 000000000000..b76dca5aa4bc
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/exception.ts
@@ -0,0 +1,14 @@
+/**
+ * Represents an error caused by an api call i.e. it has attributes for a HTTP status code 
+ * and the returned body object.
+ *
+ * Example
+ * API returns a ErrorMessageObject whenever HTTP status code is not in [200, 299]
+ * => ApiException(404, someErrorMessageObject)
+ *
+ */
+export class ApiException<T> extends Error {
+	public constructor(public code: number, public body: T) {
+        super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body))  
+	}
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/auth/auth.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/auth/auth.ts
new file mode 100644
index 000000000000..9d59a0a25580
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/auth/auth.ts
@@ -0,0 +1,102 @@
+// typings for btoa are incorrect
+//@ts-ignore
+import * as btoa from "btoa";
+import { RequestContext } from "../http/http";
+
+/**
+ * Interface authentication schemes.
+ */
+export interface SecurityAuthentication {
+    /*
+     * @return returns the name of the security authentication as specified in OAI
+     */
+    getName(): string;
+
+    /**
+     * Applies the authentication scheme to the request context
+     *
+     * @params context the request context which should use this authentication scheme
+     */
+    applySecurityAuthentication(context: RequestContext): void | Promise<void>;
+}
+
+export interface TokenProvider {
+  getToken(): Promise<string> | string;
+}
+
+/**
+ * Applies apiKey authentication to the request context.
+ */
+export class ApiKeyAuthentication implements SecurityAuthentication {
+    /**
+     * Configures this api key authentication with the necessary properties
+     *
+     * @param apiKey: The api key to be used for every request
+     */
+    public constructor(private apiKey: string) {}
+
+    public getName(): string {
+        return "api_key";
+    }
+
+    public applySecurityAuthentication(context: RequestContext) {
+        context.setHeaderParam("api_key", this.apiKey);
+    }
+}
+
+/**
+ * Applies oauth2 authentication to the request context.
+ */
+export class PetstoreAuthAuthentication implements SecurityAuthentication {
+    // TODO: How to handle oauth2 authentication!
+    public constructor() {}
+
+    public getName(): string {
+        return "petstore_auth";
+    }
+
+    public applySecurityAuthentication(context: RequestContext) {
+        // TODO
+    }
+}
+
+
+export type AuthMethods = {
+    "api_key"?: SecurityAuthentication,
+    "petstore_auth"?: SecurityAuthentication
+}
+
+export type ApiKeyConfiguration = string;
+export type HttpBasicConfiguration = { "username": string, "password": string };
+export type HttpBearerConfiguration = { tokenProvider: TokenProvider };
+export type OAuth2Configuration = string;
+
+export type AuthMethodsConfiguration = {
+    "api_key"?: ApiKeyConfiguration,
+    "petstore_auth"?: OAuth2Configuration
+}
+
+/**
+ * Creates the authentication methods from a swagger description.
+ *
+ */
+export function configureAuthMethods(config: AuthMethodsConfiguration | undefined): AuthMethods {
+    let authMethods: AuthMethods = {}
+
+    if (!config) {
+        return authMethods;
+    }
+
+    if (config["api_key"]) {
+        authMethods["api_key"] = new ApiKeyAuthentication(
+            config["api_key"]
+        );
+    }
+
+    if (config["petstore_auth"]) {
+        authMethods["petstore_auth"] = new PetstoreAuthAuthentication(
+        );
+    }
+
+    return authMethods;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts
new file mode 100644
index 000000000000..b78d85972a4a
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts
@@ -0,0 +1,66 @@
+import { HttpLibrary } from "./http/http";
+import { Middleware, PromiseMiddleware, PromiseMiddlewareWrapper } from "./middleware";
+import { IsomorphicFetchHttpLibrary as DefaultHttpLibrary } from "./http/isomorphic-fetch";
+import { BaseServerConfiguration, server1 } from "./servers";
+import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth";
+
+export interface Configuration {
+    readonly baseServer: BaseServerConfiguration;
+    readonly httpApi: HttpLibrary;
+    readonly middleware: Middleware[];
+    readonly authMethods: AuthMethods;
+}
+
+
+/**
+ * Interface with which a configuration object can be configured.
+ */
+export interface ConfigurationParameters {
+    /**
+     * Default server to use
+     */
+    baseServer?: BaseServerConfiguration;
+    /**
+     * HTTP library to use e.g. IsomorphicFetch
+     */
+    httpApi?: HttpLibrary;
+    /**
+     * The middlewares which will be applied to requests and responses
+     */
+    middleware?: Middleware[];
+    /**
+     * Configures all middlewares using the promise api instead of observables (which Middleware uses)
+     */
+    promiseMiddleware?: PromiseMiddleware[];
+    /**
+     * Configuration for the available authentication methods
+     */
+    authMethods?: AuthMethodsConfiguration
+}
+
+/**
+ * Configuration factory function
+ *
+ * If a property is not included in conf, a default is used:
+ *    - baseServer: server1
+ *    - httpApi: IsomorphicFetchHttpLibrary
+ *    - middleware: []
+ *    - promiseMiddleware: []
+ *    - authMethods: {}
+ *
+ * @param conf partial configuration
+ */
+export function createConfiguration(conf: ConfigurationParameters = {}): Configuration {
+    const configuration: Configuration = {
+        baseServer: conf.baseServer !== undefined ? conf.baseServer : server1,
+        httpApi: conf.httpApi || new DefaultHttpLibrary(),
+        middleware: conf.middleware || [],
+        authMethods: configureAuthMethods(conf.authMethods)
+    };
+    if (conf.promiseMiddleware) {
+        conf.promiseMiddleware.forEach(
+            m => configuration.middleware.push(new PromiseMiddlewareWrapper(m))
+        );
+    }
+    return configuration;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/git_push.sh b/samples/openapi3/client/petstore/typescript/builds/object_params/git_push.sh
new file mode 100644
index 000000000000..8442b80bb445
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts
new file mode 100644
index 000000000000..4241ca3d329b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts
@@ -0,0 +1,206 @@
+// TODO: evaluate if we can easily get rid of this library
+import * as FormData from "form-data";
+// typings of url-parse are incorrect...
+// @ts-ignore 
+import * as URLParse from "url-parse";
+import { Observable, from } from '../rxjsStub';
+
+export * from './isomorphic-fetch';
+
+/**
+ * Represents an HTTP method.
+ */
+export enum HttpMethod {
+    GET = "GET",
+    HEAD = "HEAD",
+    POST = "POST",
+    PUT = "PUT",
+    DELETE = "DELETE",
+    CONNECT = "CONNECT",
+    OPTIONS = "OPTIONS",
+    TRACE = "TRACE",
+    PATCH = "PATCH"
+}
+
+/**
+ * Represents an HTTP file which will be transferred from or to a server.
+ */
+export type HttpFile = {
+    data: Buffer,
+    name: string
+};
+
+
+export class HttpException extends Error {
+    public constructor(msg: string) {
+        super(msg);
+    }
+}
+
+/**
+ * Represents the body of an outgoing HTTP request.
+ */
+export type RequestBody = undefined | string | FormData;
+
+/**
+ * Represents an HTTP request context
+ */
+export class RequestContext {
+    private headers: { [key: string]: string } = {};
+    private body: RequestBody = undefined;
+    private url: URLParse;
+
+	/**
+	 * Creates the request context using a http method and request resource url
+	 *
+	 * @param url url of the requested resource
+	 * @param httpMethod http method
+	 */
+    public constructor(url: string, private httpMethod: HttpMethod) {
+        this.url = new URLParse(url, true);
+    }
+    
+    /*
+     * Returns the url set in the constructor including the query string
+     *
+     */
+    public getUrl(): string {
+    	return this.url.toString();
+    }
+    
+    /**
+     * Replaces the url set in the constructor with this url.
+     *
+     */
+    public setUrl(url: string) {
+    	this.url = new URLParse(url, true);
+    }
+
+    /**
+     * Sets the body of the http request either as a string or FormData
+     *
+     * Note that setting a body on a HTTP GET, HEAD, DELETE, CONNECT or TRACE
+     * request is discouraged.
+     * https://httpwg.org/http-core/draft-ietf-httpbis-semantics-latest.html#rfc.section.7.3.1
+     *
+     * @param body the body of the request
+     */
+    public setBody(body: RequestBody) {
+        this.body = body;
+    }
+
+    public getHttpMethod(): HttpMethod {
+    	return this.httpMethod;
+    }
+    
+    public getHeaders(): { [key: string]: string } {
+    	return this.headers;
+    }
+
+    public getBody(): RequestBody {
+        return this.body;
+    }
+
+	public setQueryParam(name: string, value: string) {
+        let queryObj = this.url.query;
+        queryObj[name] = value;
+        this.url.set("query", queryObj);
+    }
+
+	/**
+	 *	Sets a cookie with the name and value. NO check  for duplicate cookies is performed
+	 *
+	 */
+    public addCookie(name: string, value: string): void {
+        if (!this.headers["Cookie"]) {
+            this.headers["Cookie"] = "";
+        }
+        this.headers["Cookie"] += name + "=" + value + "; ";
+    }
+
+    public setHeaderParam(key: string, value: string): void  { 
+        this.headers[key] = value;
+    }
+}
+
+export interface ResponseBody {
+    text(): Promise<string>;
+    binary(): Promise<Buffer>;
+}
+
+
+/**
+ * Helper class to generate a `ResponseBody` from binary data
+ */
+export class SelfDecodingBody implements ResponseBody {
+    constructor(private dataSource: Promise<Buffer>) {}
+
+    binary(): Promise<Buffer> {
+        return this.dataSource;
+    }
+
+    async text(): Promise<string> {
+        const data: Buffer = await this.dataSource;
+        return data.toString();
+    }
+}
+
+export class ResponseContext {
+    public constructor(
+        public httpStatusCode: number,
+        public headers: { [key: string]: string },
+        public body: ResponseBody
+    ) {}
+
+    /**
+     * Parse header value in the form `value; param1="value1"`
+     *
+     * E.g. for Content-Type or Content-Disposition
+     * Parameter names are converted to lower case
+     * The first parameter is returned with the key `""`
+     */
+    public getParsedHeader(headerName: string): { [parameter: string]: string } {
+        const result: { [parameter: string]: string } = {};
+        if (!this.headers[headerName]) {
+            return result;
+        }
+
+        const parameters = this.headers[headerName].split(";");
+        for (const parameter of parameters) {
+            let [key, value] = parameter.split("=", 2);
+            key = key.toLowerCase().trim();
+            if (value === undefined) {
+                result[""] = key;
+            } else {
+                value = value.trim();
+                if (value.startsWith('"') && value.endsWith('"')) {
+                    value = value.substring(1, value.length - 1);
+                }
+                result[key] = value;
+            }
+        }
+        return result;
+    }
+
+    public async getBodyAsFile(): Promise<HttpFile> {
+        const data = await this.body.binary();
+        const fileName = this.getParsedHeader("content-disposition")["filename"] || "";
+        return { data, name: fileName };
+    }
+}
+
+export interface HttpLibrary {
+    send(request: RequestContext): Observable<ResponseContext>;
+}
+
+export interface PromiseHttpLibrary {
+    send(request: RequestContext): Promise<ResponseContext>;
+}
+
+export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLibrary {
+  return {
+    send(request: RequestContext): Observable<ResponseContext> {
+      return from(promiseHttpLibrary.send(request));
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/http/isomorphic-fetch.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/http/isomorphic-fetch.ts
new file mode 100644
index 000000000000..ed390df7ce10
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/http/isomorphic-fetch.ts
@@ -0,0 +1,31 @@
+import {HttpLibrary, RequestContext, ResponseContext} from './http';
+import { from, Observable } from '../rxjsStub';
+import fetch from "node-fetch";
+
+export class IsomorphicFetchHttpLibrary implements HttpLibrary {
+
+    public send(request: RequestContext): Observable<ResponseContext> {
+        let method = request.getHttpMethod().toString();
+        let body = request.getBody();
+
+        const resultPromise = fetch(request.getUrl(), {
+            method: method,
+            body: body as any,
+            headers: request.getHeaders(),
+        }).then((resp: any) => {
+            const headers: { [name: string]: string } = {};
+            resp.headers.forEach((value: string, name: string) => {
+              headers[name] = value;
+            });
+
+            const body = {
+              text: () => resp.text(),
+              binary: () => resp.buffer()
+            };
+            return new ResponseContext(resp.status, headers, body);
+        });
+
+        return from<Promise<ResponseContext>>(resultPromise);
+
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/index.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/index.ts
new file mode 100644
index 000000000000..e3944796cfea
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/index.ts
@@ -0,0 +1,10 @@
+export * from "./http/http";
+export * from "./auth/auth";
+export * from "./models/all";
+export { createConfiguration, Configuration } from "./configuration"
+export * from "./apis/exception";
+export * from "./servers";
+
+export { PromiseMiddleware as Middleware } from './middleware';
+export { PetApiAddPetRequest, PetApiDeletePetRequest, PetApiFindPetsByStatusRequest, PetApiFindPetsByTagsRequest, PetApiGetPetByIdRequest, PetApiUpdatePetRequest, PetApiUpdatePetWithFormRequest, PetApiUploadFileRequest, ObjectPetApi as PetApi,  StoreApiDeleteOrderRequest, StoreApiGetInventoryRequest, StoreApiGetOrderByIdRequest, StoreApiPlaceOrderRequest, ObjectStoreApi as StoreApi,  UserApiCreateUserRequest, UserApiCreateUsersWithArrayInputRequest, UserApiCreateUsersWithListInputRequest, UserApiDeleteUserRequest, UserApiGetUserByNameRequest, UserApiLoginUserRequest, UserApiLogoutUserRequest, UserApiUpdateUserRequest, ObjectUserApi as UserApi } from './types/ObjectParamAPI';
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/middleware.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/middleware.ts
new file mode 100644
index 000000000000..46da5d25ef07
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/middleware.ts
@@ -0,0 +1,66 @@
+import {RequestContext, ResponseContext} from './http/http';
+import { Observable, from } from './rxjsStub';
+
+/**
+ * Defines the contract for a middleware intercepting requests before
+ * they are sent (but after the RequestContext was created)
+ * and before the ResponseContext is unwrapped.
+ *
+ */
+export interface Middleware {
+	/**
+	 * Modifies the request before the request is sent. 
+	 *
+	 * @param context RequestContext of a request which is about to be sent to the server
+	 * @returns an observable of the updated request context
+	 *
+	 */
+    pre(context: RequestContext): Observable<RequestContext>;
+    /**
+     * Modifies the returned response before it is deserialized.
+     *
+     * @param context ResponseContext of a sent request
+     * @returns an observable of the modified response context
+     */
+    post(context: ResponseContext): Observable<ResponseContext>;
+}
+
+export class PromiseMiddlewareWrapper implements Middleware {
+
+    public constructor(private middleware: PromiseMiddleware) {
+
+    }
+
+    pre(context: RequestContext): Observable<RequestContext> {
+        return from(this.middleware.pre(context));
+    }
+    
+    post(context: ResponseContext): Observable<ResponseContext> {
+        return from(this.middleware.post(context));
+    }
+
+}
+
+/**
+ * Defines the contract for a middleware intercepting requests before
+ * they are sent (but after the RequestContext was created)
+ * and before the ResponseContext is unwrapped.
+ *
+ */
+export interface PromiseMiddleware {
+	/**
+	 * Modifies the request before the request is sent. 
+	 *
+	 * @param context RequestContext of a request which is about to be sent to the server
+	 * @returns an observable of the updated request context
+	 *
+	 */
+    pre(context: RequestContext): Promise<RequestContext>;
+        /**
+     * Modifies the returned response before it is deserialized.
+     *
+     * @param context ResponseContext of a sent request
+     * @returns an observable of the modified response context
+     */
+    post(context: ResponseContext): Promise<ResponseContext>;
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/ApiResponse.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/ApiResponse.ts
new file mode 100644
index 000000000000..300b2de4d9a9
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/ApiResponse.ts
@@ -0,0 +1,52 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* Describes the result of uploading an image resource
+*/
+export class ApiResponse {
+    'code'?: number;
+    'type'?: string;
+    'message'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "code",
+            "baseName": "code",
+            "type": "number",
+            "format": "int32"
+        },
+        {
+            "name": "type",
+            "baseName": "type",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "message",
+            "baseName": "message",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ApiResponse.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Category.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Category.ts
new file mode 100644
index 000000000000..9b210d5d501d
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Category.ts
@@ -0,0 +1,45 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* A category for a pet
+*/
+export class Category {
+    'id'?: number;
+    'name'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Category.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/InlineObject.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/InlineObject.ts
new file mode 100644
index 000000000000..54192c1c8356
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/InlineObject.ts
@@ -0,0 +1,48 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+export class InlineObject {
+    /**
+    * Updated name of the pet
+    */
+    'name'?: string;
+    /**
+    * Updated status of the pet
+    */
+    'status'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return InlineObject.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/InlineObject1.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/InlineObject1.ts
new file mode 100644
index 000000000000..02e988674a08
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/InlineObject1.ts
@@ -0,0 +1,48 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+export class InlineObject1 {
+    /**
+    * Additional data to pass to server
+    */
+    'additionalMetadata'?: string;
+    /**
+    * file to upload
+    */
+    'file'?: HttpFile;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "additionalMetadata",
+            "baseName": "additionalMetadata",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "file",
+            "baseName": "file",
+            "type": "HttpFile",
+            "format": "binary"
+        }    ];
+
+    static getAttributeTypeMap() {
+        return InlineObject1.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts
new file mode 100644
index 000000000000..f485b39e42b3
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts
@@ -0,0 +1,240 @@
+export * from './ApiResponse';
+export * from './Category';
+export * from './InlineObject';
+export * from './InlineObject1';
+export * from './Order';
+export * from './Pet';
+export * from './Tag';
+export * from './User';
+
+import { ApiResponse } from './ApiResponse';
+import { Category } from './Category';
+import { InlineObject } from './InlineObject';
+import { InlineObject1 } from './InlineObject1';
+import { Order    , OrderStatusEnum    } from './Order';
+import { Pet     , PetStatusEnum   } from './Pet';
+import { Tag } from './Tag';
+import { User } from './User';
+
+/* tslint:disable:no-unused-variable */
+let primitives = [
+                    "string",
+                    "boolean",
+                    "double",
+                    "integer",
+                    "long",
+                    "float",
+                    "number",
+                    "any"
+                 ];
+
+const supportedMediaTypes: { [mediaType: string]: number } = {
+  "application/json": Infinity,
+  "application/octet-stream": 0
+}
+
+                 
+let enumsMap: Set<string> = new Set<string>([
+					"OrderStatusEnum",
+					"PetStatusEnum",
+]);
+
+let typeMap: {[index: string]: any} = {
+    "ApiResponse": ApiResponse,
+    "Category": Category,
+    "InlineObject": InlineObject,
+    "InlineObject1": InlineObject1,
+    "Order": Order,
+    "Pet": Pet,
+    "Tag": Tag,
+    "User": User,
+}
+
+export class ObjectSerializer {
+    public static findCorrectType(data: any, expectedType: string) {
+        if (data == undefined) {
+            return expectedType;
+        } else if (primitives.indexOf(expectedType.toLowerCase()) !== -1) {
+            return expectedType;
+        } else if (expectedType === "Date") {
+            return expectedType;
+        } else {
+            if (enumsMap.has(expectedType)) {
+                return expectedType;
+            }
+
+            if (!typeMap[expectedType]) {
+                return expectedType; // w/e we don't know the type
+            }
+
+            // Check the discriminator
+            let discriminatorProperty = typeMap[expectedType].discriminator;
+            if (discriminatorProperty == null) {
+                return expectedType; // the type does not have a discriminator. use it.
+            } else {
+                if (data[discriminatorProperty]) {
+                    var discriminatorType = data[discriminatorProperty];
+                    if(typeMap[discriminatorType]){
+                        return discriminatorType; // use the type given in the discriminator
+                    } else {
+                        return expectedType; // discriminator did not map to a type
+                    }
+                } else {
+                    return expectedType; // discriminator was not present (or an empty string)
+                }
+            }
+        }
+    }
+
+    public static serialize(data: any, type: string, format: string) {
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.serialize(date, subType, format));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            if (format == "date") {
+                let month = data.getMonth()+1
+                month = month < 10 ? "0" + month.toString() : month.toString()
+                let day = data.getDate();
+                day = day < 10 ? "0" + day.toString() : day.toString();
+
+                return data.getFullYear() + "-" + month + "-" + day;
+            } else {
+                return data.toISOString();
+            }
+        } else {
+            if (enumsMap.has(type)) {
+                return data;
+            }
+            if (!typeMap[type]) { // in case we dont know the type
+                return data;
+            }
+            
+            // Get the actual type of this object
+            type = this.findCorrectType(data, type);
+
+            // get the map for the correct type.
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            let instance: {[index: string]: any} = {};
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type, attributeType.format);
+            }
+            return instance;
+        }
+    }
+
+    public static deserialize(data: any, type: string, format: string) {
+        // polymorphism may change the actual type.
+        type = ObjectSerializer.findCorrectType(data, type);
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.deserialize(date, subType, format));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            return new Date(data);
+        } else {
+            if (enumsMap.has(type)) {// is Enum
+                return data;
+            }
+
+            if (!typeMap[type]) { // dont know the type
+                return data;
+            }
+            let instance = new typeMap[type]();
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.name] = ObjectSerializer.deserialize(data[attributeType.baseName], attributeType.type, attributeType.format);
+            }
+            return instance;
+        }
+    }
+
+
+    /**
+     * Normalize media type
+     *
+     * We currently do not handle any media types attributes, i.e. anything
+     * after a semicolon. All content is assumed to be UTF-8 compatible.
+     */
+    public static normalizeMediaType(mediaType: string | undefined): string | undefined {
+        if (mediaType === undefined) {
+            return undefined;
+        }
+        return mediaType.split(";")[0].trim().toLowerCase();
+    }
+
+    /**
+     * From a list of possible media types, choose the one we can handle best.
+     *
+     * The order of the given media types does not have any impact on the choice
+     * made.
+     */
+    public static getPreferredMediaType(mediaTypes: Array<string>): string {
+        /** According to OAS 3 we should default to json */
+        if (!mediaTypes) {
+            return "application/json";
+        }
+
+        const normalMediaTypes = mediaTypes.map(this.normalizeMediaType);
+        let selectedMediaType: string | undefined = undefined;
+        let selectedRank: number = -Infinity;
+        for (const mediaType of normalMediaTypes) {
+            if (supportedMediaTypes[mediaType!] > selectedRank) {
+                selectedMediaType = mediaType;
+                selectedRank = supportedMediaTypes[mediaType!];
+            }
+        }
+
+        if (selectedMediaType === undefined) {
+            throw new Error("None of the given media types are supported: " + mediaTypes.join(", "));
+        }
+
+        return selectedMediaType!;
+    }
+
+    /**
+     * Convert data to a string according the given media type
+     */
+    public static stringify(data: any, mediaType: string): string {
+        if (mediaType === "application/json") {
+            return JSON.stringify(data);
+        }
+
+        throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.stringify.");
+    }
+
+    /**
+     * Parse data from a string according to the given media type
+     */
+    public static parse(rawData: string, mediaType: string | undefined) {
+        if (mediaType === undefined) {
+            throw new Error("Cannot parse content. No Content-Type defined.");
+        }
+
+        if (mediaType === "application/json") {
+            return JSON.parse(rawData);
+        }
+
+        throw new Error("The mediaType " + mediaType + " is not supported by ObjectSerializer.parse.");
+    }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts
new file mode 100644
index 000000000000..291018b9e065
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts
@@ -0,0 +1,79 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* An order for a pets from the pet store
+*/
+export class Order {
+    'id'?: number;
+    'petId'?: number;
+    'quantity'?: number;
+    'shipDate'?: Date;
+    /**
+    * Order Status
+    */
+    'status'?: OrderStatusEnum;
+    'complete'?: boolean;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "petId",
+            "baseName": "petId",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "quantity",
+            "baseName": "quantity",
+            "type": "number",
+            "format": "int32"
+        },
+        {
+            "name": "shipDate",
+            "baseName": "shipDate",
+            "type": "Date",
+            "format": "date-time"
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "OrderStatusEnum",
+            "format": ""
+        },
+        {
+            "name": "complete",
+            "baseName": "complete",
+            "type": "boolean",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Order.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
+
+export type OrderStatusEnum = "placed" | "approved" | "delivered" ;
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts
new file mode 100644
index 000000000000..77a3490297db
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts
@@ -0,0 +1,81 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { Category } from './Category';
+import { Tag } from './Tag';
+import { HttpFile } from '../http/http';
+
+/**
+* A pet for sale in the pet store
+*/
+export class Pet {
+    'id'?: number;
+    'category'?: Category;
+    'name': string;
+    'photoUrls': Array<string>;
+    'tags'?: Array<Tag>;
+    /**
+    * pet status in the store
+    */
+    'status'?: PetStatusEnum;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "category",
+            "baseName": "category",
+            "type": "Category",
+            "format": ""
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "photoUrls",
+            "baseName": "photoUrls",
+            "type": "Array<string>",
+            "format": ""
+        },
+        {
+            "name": "tags",
+            "baseName": "tags",
+            "type": "Array<Tag>",
+            "format": ""
+        },
+        {
+            "name": "status",
+            "baseName": "status",
+            "type": "PetStatusEnum",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Pet.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
+
+export type PetStatusEnum = "available" | "pending" | "sold" ;
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Tag.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Tag.ts
new file mode 100644
index 000000000000..ce2a0e6d2a80
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Tag.ts
@@ -0,0 +1,45 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* A tag for a pet
+*/
+export class Tag {
+    'id'?: number;
+    'name'?: string;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "name",
+            "baseName": "name",
+            "type": "string",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return Tag.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/User.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/User.ts
new file mode 100644
index 000000000000..049af95de370
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/User.ts
@@ -0,0 +1,90 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+/**
+* A User who is purchasing from the pet store
+*/
+export class User {
+    'id'?: number;
+    'username'?: string;
+    'firstName'?: string;
+    'lastName'?: string;
+    'email'?: string;
+    'password'?: string;
+    'phone'?: string;
+    /**
+    * User Status
+    */
+    'userStatus'?: number;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "id",
+            "baseName": "id",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "username",
+            "baseName": "username",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "firstName",
+            "baseName": "firstName",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "lastName",
+            "baseName": "lastName",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "email",
+            "baseName": "email",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "password",
+            "baseName": "password",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "phone",
+            "baseName": "phone",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "userStatus",
+            "baseName": "userStatus",
+            "type": "number",
+            "format": "int32"
+        }    ];
+
+    static getAttributeTypeMap() {
+        return User.attributeTypeMap;
+    }
+    
+    public constructor() {
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/all.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/all.ts
new file mode 100644
index 000000000000..d064eba93abd
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/all.ts
@@ -0,0 +1,8 @@
+export * from './ApiResponse'
+export * from './Category'
+export * from './InlineObject'
+export * from './InlineObject1'
+export * from './Order'
+export * from './Pet'
+export * from './Tag'
+export * from './User'
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/package-lock.json b/samples/openapi3/client/petstore/typescript/builds/object_params/package-lock.json
new file mode 100644
index 000000000000..69c0e90fc35b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/package-lock.json
@@ -0,0 +1,115 @@
+{
+  "name": "ts-petstore-client",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/node": {
+      "version": "14.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.6.tgz",
+      "integrity": "sha512-FbNmu4F67d3oZMWBV6Y4MaPER+0EpE9eIYf2yaHhCWovc1dlXCZkqGX4NLHfVVr6umt20TNBdRzrNJIzIKfdbw=="
+    },
+    "@types/node-fetch": {
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
+      "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+      "requires": {
+        "@types/node": "*",
+        "form-data": "^3.0.0"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+          "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        }
+      }
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "btoa": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
+      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
+    "form-data": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+    },
+    "mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "requires": {
+        "mime-db": "1.44.0"
+      }
+    },
+    "node-fetch": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+    },
+    "querystringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+    },
+    "typescript": {
+      "version": "3.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz",
+      "integrity": "sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==",
+      "dev": true
+    },
+    "url-parse": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    }
+  }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/package.json b/samples/openapi3/client/petstore/typescript/builds/object_params/package.json
new file mode 100644
index 000000000000..aaebe4e7687e
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "ts-petstore-client",
+  "version": "1.0.0",
+  "description": "OpenAPI client for ts-petstore-client",
+  "author": "OpenAPI-Generator Contributors",
+  "keywords": [
+    "fetch",
+    "typescript",
+    "openapi-client",
+    "openapi-generator"
+  ],
+  "license": "Unlicense",
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
+  "scripts": {
+    "build": "tsc",
+    "prepublishOnly": "npm run build"
+  },
+  "dependencies": {
+    "node-fetch": "^2.6.0",
+    "@types/node-fetch": "^2.5.7",
+    "@types/node": "*",
+    "form-data": "^2.5.0",
+    "btoa": "^1.2.1",
+    "es6-promise": "^4.2.4",
+    "url-parse": "^1.4.3"
+  },
+  "devDependencies": {
+    "typescript": "^3.9.3"
+  }
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/pom.xml b/samples/openapi3/client/petstore/typescript/builds/object_params/pom.xml
new file mode 100644
index 000000000000..7eac981b3f45
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/pom.xml
@@ -0,0 +1,60 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptBuildObjectParamsPetstoreClientSample</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Default Petstore Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-build</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>build</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/rxjsStub.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/rxjsStub.ts
new file mode 100644
index 000000000000..4c73715a2486
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/rxjsStub.ts
@@ -0,0 +1,27 @@
+export class Observable<T> {
+  constructor(private promise: Promise<T>) {}
+
+  toPromise() {
+    return this.promise;
+  }
+
+  pipe<S>(callback: (value: T) => S | Promise<S>): Observable<S> {
+    return new Observable(this.promise.then(callback));
+  }
+}
+
+export function from<T>(promise: Promise<any>) {
+  return new Observable(promise);
+}
+
+export function of<T>(value: T) {
+  return new Observable<T>(Promise.resolve(value));
+}
+
+export function mergeMap<T, S>(callback: (value: T) => Observable<S>) {
+  return (value: T) => callback(value).toPromise();
+}
+
+export function map(callback: any) {
+  return callback;
+}
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts
new file mode 100644
index 000000000000..aa5332db7ae9
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/servers.ts
@@ -0,0 +1,53 @@
+import { RequestContext, HttpMethod } from "./http/http";
+
+export interface BaseServerConfiguration {
+    makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext;
+}
+
+/**
+ *
+ * Represents the configuration of a server including its
+ * url template and variable configuration based on the url.
+ *
+ */
+export class ServerConfiguration<T extends { [key: string]: string }> implements BaseServerConfiguration {
+    public constructor(private url: string, private variableConfiguration: T) {}
+
+    /**
+     * Sets the value of the variables of this server.
+     *
+     * @param variableConfiguration a partial variable configuration for the variables contained in the url
+     */
+    public setVariables(variableConfiguration: Partial<T>) {
+        Object.assign(this.variableConfiguration, variableConfiguration);
+    }
+
+	public getConfiguration(): T {
+		return this.variableConfiguration
+	}
+
+	private getUrl() {
+		let replacedUrl = this.url;
+		for (const key in this.variableConfiguration) {
+			var re = new RegExp("{" + key + "}","g");
+			replacedUrl = replacedUrl.replace(re, this.variableConfiguration[key]);
+		}
+		return replacedUrl
+	}
+
+	/**
+	 * Creates a new request context for this server using the url with variables
+	 * replaced with their respective values and the endpoint of the request appended.
+	 *
+	 * @param endpoint the endpoint to be queried on the server
+	 * @param httpMethod httpMethod to be used
+	 *
+	 */	
+	public makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext {
+		return new RequestContext(this.getUrl() + endpoint, httpMethod);		
+	}
+}
+
+export const server1 = new ServerConfiguration<{  }>("http://petstore.swagger.io/v2", {  })
+
+export const servers = [server1];
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/tsconfig.json b/samples/openapi3/client/petstore/typescript/builds/object_params/tsconfig.json
new file mode 100644
index 000000000000..a542d795677c
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/tsconfig.json
@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "strict": true,
+    /* Basic Options */
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "declaration": true,
+ 
+    /* Additional Checks */
+     "noUnusedLocals": false,                /* Report errors on unused locals. */ // TODO: reenable (unused imports!)
+     "noUnusedParameters": false,            /* Report errors on unused parameters. */ // TODO: set to true again
+     "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+     "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    "removeComments": true,
+    "sourceMap": true,
+    "outDir": "./dist",
+    "noLib": false,
+    "lib": [ "es6" ],
+  },
+  "exclude": [
+  	"dist",
+    "node_modules"
+  ],
+  "filesGlob": [
+    "./**/*.ts",
+  ]
+  
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts
new file mode 100644
index 000000000000..10cebbd77dd2
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts
@@ -0,0 +1,442 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http';
+import * as models from '../models/all';
+import { Configuration} from '../configuration'
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Category } from '../models/Category';
+import { InlineObject } from '../models/InlineObject';
+import { InlineObject1 } from '../models/InlineObject1';
+import { Order } from '../models/Order';
+import { Pet } from '../models/Pet';
+import { Tag } from '../models/Tag';
+import { User } from '../models/User';
+
+import { ObservablePetApi } from "./ObservableAPI";
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
+
+export interface PetApiAddPetRequest {
+    /**
+     * Pet object that needs to be added to the store
+     * @type Pet
+     * @memberof PetApiaddPet
+     */
+    pet: Pet
+}
+
+export interface PetApiDeletePetRequest {
+    /**
+     * Pet id to delete
+     * @type number
+     * @memberof PetApideletePet
+     */
+    petId: number
+    /**
+     * 
+     * @type string
+     * @memberof PetApideletePet
+     */
+    apiKey?: string
+}
+
+export interface PetApiFindPetsByStatusRequest {
+    /**
+     * Status values that need to be considered for filter
+     * @type Array&lt;&#39;available&#39; | &#39;pending&#39; | &#39;sold&#39;&gt;
+     * @memberof PetApifindPetsByStatus
+     */
+    status: Array<'available' | 'pending' | 'sold'>
+}
+
+export interface PetApiFindPetsByTagsRequest {
+    /**
+     * Tags to filter by
+     * @type Array&lt;string&gt;
+     * @memberof PetApifindPetsByTags
+     */
+    tags: Array<string>
+}
+
+export interface PetApiGetPetByIdRequest {
+    /**
+     * ID of pet to return
+     * @type number
+     * @memberof PetApigetPetById
+     */
+    petId: number
+}
+
+export interface PetApiUpdatePetRequest {
+    /**
+     * Pet object that needs to be added to the store
+     * @type Pet
+     * @memberof PetApiupdatePet
+     */
+    pet: Pet
+}
+
+export interface PetApiUpdatePetWithFormRequest {
+    /**
+     * ID of pet that needs to be updated
+     * @type number
+     * @memberof PetApiupdatePetWithForm
+     */
+    petId: number
+    /**
+     * Updated name of the pet
+     * @type string
+     * @memberof PetApiupdatePetWithForm
+     */
+    name?: string
+    /**
+     * Updated status of the pet
+     * @type string
+     * @memberof PetApiupdatePetWithForm
+     */
+    status?: string
+}
+
+export interface PetApiUploadFileRequest {
+    /**
+     * ID of pet to update
+     * @type number
+     * @memberof PetApiuploadFile
+     */
+    petId: number
+    /**
+     * Additional data to pass to server
+     * @type string
+     * @memberof PetApiuploadFile
+     */
+    additionalMetadata?: string
+    /**
+     * file to upload
+     * @type HttpFile
+     * @memberof PetApiuploadFile
+     */
+    file?: HttpFile
+}
+
+
+export class ObjectPetApi {
+    private api: ObservablePetApi
+
+    public constructor(configuration: Configuration, requestFactory?: PetApiRequestFactory, responseProcessor?: PetApiResponseProcessor) {
+        this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * Add a new pet to the store
+     * @param param the request object
+     */
+    public addPet(param: PetApiAddPetRequest, options?: Configuration): Promise<Pet> {
+        return this.api.addPet(param.pet,  options).toPromise();
+    }
+	
+    /**
+     * Deletes a pet
+     * @param param the request object
+     */
+    public deletePet(param: PetApiDeletePetRequest, options?: Configuration): Promise<void> {
+        return this.api.deletePet(param.petId, param.apiKey,  options).toPromise();
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param param the request object
+     */
+    public findPetsByStatus(param: PetApiFindPetsByStatusRequest, options?: Configuration): Promise<Array<Pet>> {
+        return this.api.findPetsByStatus(param.status,  options).toPromise();
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param param the request object
+     */
+    public findPetsByTags(param: PetApiFindPetsByTagsRequest, options?: Configuration): Promise<Array<Pet>> {
+        return this.api.findPetsByTags(param.tags,  options).toPromise();
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param param the request object
+     */
+    public getPetById(param: PetApiGetPetByIdRequest, options?: Configuration): Promise<Pet> {
+        return this.api.getPetById(param.petId,  options).toPromise();
+    }
+	
+    /**
+     * Update an existing pet
+     * @param param the request object
+     */
+    public updatePet(param: PetApiUpdatePetRequest, options?: Configuration): Promise<Pet> {
+        return this.api.updatePet(param.pet,  options).toPromise();
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param param the request object
+     */
+    public updatePetWithForm(param: PetApiUpdatePetWithFormRequest, options?: Configuration): Promise<void> {
+        return this.api.updatePetWithForm(param.petId, param.name, param.status,  options).toPromise();
+    }
+	
+    /**
+     * uploads an image
+     * @param param the request object
+     */
+    public uploadFile(param: PetApiUploadFileRequest, options?: Configuration): Promise<ApiResponse> {
+        return this.api.uploadFile(param.petId, param.additionalMetadata, param.file,  options).toPromise();
+    }
+	
+
+}
+
+
+
+
+import { ObservableStoreApi } from "./ObservableAPI";
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
+
+export interface StoreApiDeleteOrderRequest {
+    /**
+     * ID of the order that needs to be deleted
+     * @type string
+     * @memberof StoreApideleteOrder
+     */
+    orderId: string
+}
+
+export interface StoreApiGetInventoryRequest {
+}
+
+export interface StoreApiGetOrderByIdRequest {
+    /**
+     * ID of pet that needs to be fetched
+     * @type number
+     * @memberof StoreApigetOrderById
+     */
+    orderId: number
+}
+
+export interface StoreApiPlaceOrderRequest {
+    /**
+     * order placed for purchasing the pet
+     * @type Order
+     * @memberof StoreApiplaceOrder
+     */
+    order: Order
+}
+
+
+export class ObjectStoreApi {
+    private api: ObservableStoreApi
+
+    public constructor(configuration: Configuration, requestFactory?: StoreApiRequestFactory, responseProcessor?: StoreApiResponseProcessor) {
+        this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param param the request object
+     */
+    public deleteOrder(param: StoreApiDeleteOrderRequest, options?: Configuration): Promise<void> {
+        return this.api.deleteOrder(param.orderId,  options).toPromise();
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     * @param param the request object
+     */
+    public getInventory(param: StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }> {
+        return this.api.getInventory( options).toPromise();
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param param the request object
+     */
+    public getOrderById(param: StoreApiGetOrderByIdRequest, options?: Configuration): Promise<Order> {
+        return this.api.getOrderById(param.orderId,  options).toPromise();
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param param the request object
+     */
+    public placeOrder(param: StoreApiPlaceOrderRequest, options?: Configuration): Promise<Order> {
+        return this.api.placeOrder(param.order,  options).toPromise();
+    }
+	
+
+}
+
+
+
+
+import { ObservableUserApi } from "./ObservableAPI";
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
+
+export interface UserApiCreateUserRequest {
+    /**
+     * Created user object
+     * @type User
+     * @memberof UserApicreateUser
+     */
+    user: User
+}
+
+export interface UserApiCreateUsersWithArrayInputRequest {
+    /**
+     * List of user object
+     * @type Array&lt;User&gt;
+     * @memberof UserApicreateUsersWithArrayInput
+     */
+    user: Array<User>
+}
+
+export interface UserApiCreateUsersWithListInputRequest {
+    /**
+     * List of user object
+     * @type Array&lt;User&gt;
+     * @memberof UserApicreateUsersWithListInput
+     */
+    user: Array<User>
+}
+
+export interface UserApiDeleteUserRequest {
+    /**
+     * The name that needs to be deleted
+     * @type string
+     * @memberof UserApideleteUser
+     */
+    username: string
+}
+
+export interface UserApiGetUserByNameRequest {
+    /**
+     * The name that needs to be fetched. Use user1 for testing.
+     * @type string
+     * @memberof UserApigetUserByName
+     */
+    username: string
+}
+
+export interface UserApiLoginUserRequest {
+    /**
+     * The user name for login
+     * @type string
+     * @memberof UserApiloginUser
+     */
+    username: string
+    /**
+     * The password for login in clear text
+     * @type string
+     * @memberof UserApiloginUser
+     */
+    password: string
+}
+
+export interface UserApiLogoutUserRequest {
+}
+
+export interface UserApiUpdateUserRequest {
+    /**
+     * name that need to be deleted
+     * @type string
+     * @memberof UserApiupdateUser
+     */
+    username: string
+    /**
+     * Updated user object
+     * @type User
+     * @memberof UserApiupdateUser
+     */
+    user: User
+}
+
+
+export class ObjectUserApi {
+    private api: ObservableUserApi
+
+    public constructor(configuration: Configuration, requestFactory?: UserApiRequestFactory, responseProcessor?: UserApiResponseProcessor) {
+        this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
+	}
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param param the request object
+     */
+    public createUser(param: UserApiCreateUserRequest, options?: Configuration): Promise<void> {
+        return this.api.createUser(param.user,  options).toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param param the request object
+     */
+    public createUsersWithArrayInput(param: UserApiCreateUsersWithArrayInputRequest, options?: Configuration): Promise<void> {
+        return this.api.createUsersWithArrayInput(param.user,  options).toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param param the request object
+     */
+    public createUsersWithListInput(param: UserApiCreateUsersWithListInputRequest, options?: Configuration): Promise<void> {
+        return this.api.createUsersWithListInput(param.user,  options).toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param param the request object
+     */
+    public deleteUser(param: UserApiDeleteUserRequest, options?: Configuration): Promise<void> {
+        return this.api.deleteUser(param.username,  options).toPromise();
+    }
+	
+    /**
+     * Get user by user name
+     * @param param the request object
+     */
+    public getUserByName(param: UserApiGetUserByNameRequest, options?: Configuration): Promise<User> {
+        return this.api.getUserByName(param.username,  options).toPromise();
+    }
+	
+    /**
+     * Logs user into the system
+     * @param param the request object
+     */
+    public loginUser(param: UserApiLoginUserRequest, options?: Configuration): Promise<string> {
+        return this.api.loginUser(param.username, param.password,  options).toPromise();
+    }
+	
+    /**
+     * Logs out current logged in user session
+     * @param param the request object
+     */
+    public logoutUser(param: UserApiLogoutUserRequest, options?: Configuration): Promise<void> {
+        return this.api.logoutUser( options).toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param param the request object
+     */
+    public updateUser(param: UserApiUpdateUserRequest, options?: Configuration): Promise<void> {
+        return this.api.updateUser(param.username, param.user,  options).toPromise();
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts
new file mode 100644
index 000000000000..30be6fff1f82
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts
@@ -0,0 +1,554 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http';
+import * as models from '../models/all';
+import { Configuration} from '../configuration'
+import { Observable, of, from } from '../rxjsStub';
+import {mergeMap, map} from  '../rxjsStub';
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Category } from '../models/Category';
+import { InlineObject } from '../models/InlineObject';
+import { InlineObject1 } from '../models/InlineObject1';
+import { Order } from '../models/Order';
+import { Pet } from '../models/Pet';
+import { Tag } from '../models/Tag';
+import { User } from '../models/User';
+
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
+export class ObservablePetApi {
+    private requestFactory: PetApiRequestFactory;
+    private responseProcessor: PetApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: PetApiRequestFactory,
+        responseProcessor?: PetApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new PetApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new PetApiResponseProcessor();
+    }
+
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public addPet(pet: Pet, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.addPet(pet, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.addPet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public deletePet(petId: number, apiKey?: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deletePet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Observable<Array<Pet>> {
+    	const requestContextPromise = this.requestFactory.findPetsByStatus(status, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByStatus(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public findPetsByTags(tags: Array<string>, options?: Configuration): Observable<Array<Pet>> {
+    	const requestContextPromise = this.requestFactory.findPetsByTags(tags, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.findPetsByTags(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public getPetById(petId: number, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.getPetById(petId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getPetById(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public updatePet(pet: Pet, options?: Configuration): Observable<Pet> {
+    	const requestContextPromise = this.requestFactory.updatePet(pet, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePet(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updatePetWithForm(rsp)));
+	    	}));
+    }
+	
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Observable<ApiResponse> {
+    	const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.uploadFile(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
+
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
+export class ObservableStoreApi {
+    private requestFactory: StoreApiRequestFactory;
+    private responseProcessor: StoreApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: StoreApiRequestFactory,
+        responseProcessor?: StoreApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new StoreApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new StoreApiResponseProcessor();
+    }
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public deleteOrder(orderId: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deleteOrder(orderId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteOrder(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public getInventory(options?: Configuration): Observable<{ [key: string]: number; }> {
+    	const requestContextPromise = this.requestFactory.getInventory(options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getInventory(rsp)));
+	    	}));
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public getOrderById(orderId: number, options?: Configuration): Observable<Order> {
+    	const requestContextPromise = this.requestFactory.getOrderById(orderId, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getOrderById(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public placeOrder(order: Order, options?: Configuration): Observable<Order> {
+    	const requestContextPromise = this.requestFactory.placeOrder(order, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.placeOrder(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
+
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
+export class ObservableUserApi {
+    private requestFactory: UserApiRequestFactory;
+    private responseProcessor: UserApiResponseProcessor;
+    private configuration: Configuration;
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: UserApiRequestFactory,
+        responseProcessor?: UserApiResponseProcessor
+    ) {
+        this.configuration = configuration;
+        this.requestFactory = requestFactory || new UserApiRequestFactory(configuration);
+        this.responseProcessor = responseProcessor || new UserApiResponseProcessor();
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public createUser(user: User, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUser(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithArrayInput(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithListInput(user: Array<User>, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.createUsersWithListInput(user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.createUsersWithListInput(rsp)));
+	    	}));
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public deleteUser(username: string, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.deleteUser(username, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.deleteUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public getUserByName(username: string, options?: Configuration): Observable<User> {
+    	const requestContextPromise = this.requestFactory.getUserByName(username, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.getUserByName(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public loginUser(username: string, password: string, options?: Configuration): Observable<string> {
+    	const requestContextPromise = this.requestFactory.loginUser(username, password, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.loginUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * Logs out current logged in user session
+     */
+    public logoutUser(options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.logoutUser(options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.logoutUser(rsp)));
+	    	}));
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public updateUser(username: string, user: User, options?: Configuration): Observable<void> {
+    	const requestContextPromise = this.requestFactory.updateUser(username, user, options);
+
+		// build promise chain
+    let middlewarePreObservable = from<RequestContext>(requestContextPromise);
+    	for (let middleware of this.configuration.middleware) {
+    		middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
+    	}
+
+    	return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))).
+	    	pipe(mergeMap((response: ResponseContext) => {
+	    		let middlewarePostObservable = of(response);
+	    		for (let middleware of this.configuration.middleware) {
+	    			middlewarePostObservable = middlewarePostObservable.pipe(mergeMap((rsp: ResponseContext) => middleware.post(rsp)));
+	    		}
+	    		return middlewarePostObservable.pipe(map((rsp: ResponseContext) => this.responseProcessor.updateUser(rsp)));
+	    	}));
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts
new file mode 100644
index 000000000000..44829ca43fa8
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts
@@ -0,0 +1,266 @@
+import { ResponseContext, RequestContext, HttpFile } from '../http/http';
+import * as models from '../models/all';
+import { Configuration} from '../configuration'
+
+import { ApiResponse } from '../models/ApiResponse';
+import { Category } from '../models/Category';
+import { InlineObject } from '../models/InlineObject';
+import { InlineObject1 } from '../models/InlineObject1';
+import { Order } from '../models/Order';
+import { Pet } from '../models/Pet';
+import { Tag } from '../models/Tag';
+import { User } from '../models/User';
+import { ObservablePetApi } from './ObservableAPI';
+
+
+import { PetApiRequestFactory, PetApiResponseProcessor} from "../apis/PetApi";
+export class PromisePetApi {
+    private api: ObservablePetApi
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: PetApiRequestFactory,
+        responseProcessor?: PetApiResponseProcessor
+    ) {
+        this.api = new ObservablePetApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * Add a new pet to the store
+     * @param pet Pet object that needs to be added to the store
+     */
+    public addPet(pet: Pet, options?: Configuration): Promise<Pet> {
+    	const result = this.api.addPet(pet, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Deletes a pet
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public deletePet(petId: number, apiKey?: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deletePet(petId, apiKey, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     * @param status Status values that need to be considered for filter
+     */
+    public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise<Array<Pet>> {
+    	const result = this.api.findPetsByStatus(status, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     * @param tags Tags to filter by
+     */
+    public findPetsByTags(tags: Array<string>, options?: Configuration): Promise<Array<Pet>> {
+    	const result = this.api.findPetsByTags(tags, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     * @param petId ID of pet to return
+     */
+    public getPetById(petId: number, options?: Configuration): Promise<Pet> {
+    	const result = this.api.getPetById(petId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Update an existing pet
+     * @param pet Pet object that needs to be added to the store
+     */
+    public updatePet(pet: Pet, options?: Configuration): Promise<Pet> {
+    	const result = this.api.updatePet(pet, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Updates a pet in the store with form data
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public updatePetWithForm(petId: number, name?: string, status?: string, options?: Configuration): Promise<void> {
+    	const result = this.api.updatePetWithForm(petId, name, status, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * uploads an image
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public uploadFile(petId: number, additionalMetadata?: string, file?: HttpFile, options?: Configuration): Promise<ApiResponse> {
+    	const result = this.api.uploadFile(petId, additionalMetadata, file, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
+import { ObservableStoreApi } from './ObservableAPI';
+
+
+import { StoreApiRequestFactory, StoreApiResponseProcessor} from "../apis/StoreApi";
+export class PromiseStoreApi {
+    private api: ObservableStoreApi
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: StoreApiRequestFactory,
+        responseProcessor?: StoreApiResponseProcessor
+    ) {
+        this.api = new ObservableStoreApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public deleteOrder(orderId: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deleteOrder(orderId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    public getInventory(options?: Configuration): Promise<{ [key: string]: number; }> {
+    	const result = this.api.getInventory(options);
+        return result.toPromise();
+    }
+	
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public getOrderById(orderId: number, options?: Configuration): Promise<Order> {
+    	const result = this.api.getOrderById(orderId, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Place an order for a pet
+     * @param order order placed for purchasing the pet
+     */
+    public placeOrder(order: Order, options?: Configuration): Promise<Order> {
+    	const result = this.api.placeOrder(order, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
+import { ObservableUserApi } from './ObservableAPI';
+
+
+import { UserApiRequestFactory, UserApiResponseProcessor} from "../apis/UserApi";
+export class PromiseUserApi {
+    private api: ObservableUserApi
+
+    public constructor(
+        configuration: Configuration,
+        requestFactory?: UserApiRequestFactory,
+        responseProcessor?: UserApiResponseProcessor
+    ) {
+        this.api = new ObservableUserApi(configuration, requestFactory, responseProcessor);
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     * @param user Created user object
+     */
+    public createUser(user: User, options?: Configuration): Promise<void> {
+    	const result = this.api.createUser(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithArrayInput(user: Array<User>, options?: Configuration): Promise<void> {
+    	const result = this.api.createUsersWithArrayInput(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Creates list of users with given input array
+     * @param user List of user object
+     */
+    public createUsersWithListInput(user: Array<User>, options?: Configuration): Promise<void> {
+    	const result = this.api.createUsersWithListInput(user, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     * @param username The name that needs to be deleted
+     */
+    public deleteUser(username: string, options?: Configuration): Promise<void> {
+    	const result = this.api.deleteUser(username, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Get user by user name
+     * @param username The name that needs to be fetched. Use user1 for testing.
+     */
+    public getUserByName(username: string, options?: Configuration): Promise<User> {
+    	const result = this.api.getUserByName(username, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Logs user into the system
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public loginUser(username: string, password: string, options?: Configuration): Promise<string> {
+    	const result = this.api.loginUser(username, password, options);
+        return result.toPromise();
+    }
+	
+    /**
+     * Logs out current logged in user session
+     */
+    public logoutUser(options?: Configuration): Promise<void> {
+    	const result = this.api.logoutUser(options);
+        return result.toPromise();
+    }
+	
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     * @param username name that need to be deleted
+     * @param user Updated user object
+     */
+    public updateUser(username: string, user: User, options?: Configuration): Promise<void> {
+    	const result = this.api.updateUser(username, user, options);
+        return result.toPromise();
+    }
+	
+
+}
+
+
+
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/util.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/util.ts
new file mode 100644
index 000000000000..d1888434535c
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/util.ts
@@ -0,0 +1,28 @@
+/**
+ * Returns if a specific http code is in a given code range
+ * where the code range is defined as a combination of digits 
+ * and "X" (the letter X) with a length of 3
+ *
+ * @param codeRange string with length 3 consisting of digits and "X" (the letter X)
+ * @param code the http status code to be checked against the code range
+ */
+export function isCodeInRange(codeRange: string, code: number): boolean {
+	// This is how the default value is encoded in OAG
+	if (codeRange === "0") {
+		return true;
+	}
+	if (codeRange == code.toString()) {
+		return true;
+	} else {
+		const codeString = code.toString();
+		if (codeString.length != codeRange.length) {
+			return false;
+		}
+		for (let i = 0; i < codeString.length; i++) {
+			if (codeRange.charAt(i) != "X" && codeRange.charAt(i) != codeString.charAt(i)) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/.gitignore b/samples/openapi3/client/petstore/typescript/tests/default/.gitignore
new file mode 100644
index 000000000000..1521c8b7652b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/default/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/package-lock.json b/samples/openapi3/client/petstore/typescript/tests/default/package-lock.json
new file mode 100644
index 000000000000..9baade4dc28f
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/default/package-lock.json
@@ -0,0 +1,1445 @@
+{
+  "name": "typescript-test",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/chai": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.6.tgz",
+      "integrity": "sha512-CBk7KTZt3FhPsEkYioG6kuCIpWISw+YI8o+3op4+NXwTpvAPxE1ES8+PY8zfaK2L98b1z5oq03UHa4VYpeUxnw==",
+      "dev": true
+    },
+    "@types/isomorphic-fetch": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.34.tgz",
+      "integrity": "sha1-PDSD5gbAQTeEOOlRRk8A5OYHBtY=",
+      "dev": true
+    },
+    "@types/mocha": {
+      "version": "2.2.48",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.48.tgz",
+      "integrity": "sha512-nlK/iyETgafGli8Zh9zJVCTicvU3iajSkRwOh3Hhiva598CMqNJ4NcVCGMTGKpGpTYj/9R8RLzS9NAykSSCqGw==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "8.10.38",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.38.tgz",
+      "integrity": "sha512-EibsnbJerd0hBFaDjJStFrVbVBAtOy4dgL8zZFw0uOvPqzBAX59Ci8cgjg3+RgJIWhsB5A4c+pi+D4P9tQQh/A==",
+      "dev": true
+    },
+    "@types/rewire": {
+      "version": "2.5.28",
+      "resolved": "https://registry.npmjs.org/@types/rewire/-/rewire-2.5.28.tgz",
+      "integrity": "sha512-uD0j/AQOa5le7afuK+u+woi8jNKF1vf3DN0H7LCJhft/lNNibUr7VcAesdgtWfEKveZol3ZG1CJqwx2Bhrnl8w=="
+    },
+    "acorn": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
+    },
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "resolved": "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "requires": {
+        "acorn": "^3.0.4"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
+        }
+      }
+    },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "requires": {
+        "co": "^4.6.0",
+        "fast-deep-equal": "^1.0.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.3.0"
+      }
+    },
+    "ajv-keywords": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I="
+    },
+    "ansi-escapes": {
+      "version": "3.1.0",
+      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+    },
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        }
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "big.js": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "requires": {
+        "callsites": "^0.2.0"
+      }
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo="
+    },
+    "chai": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
+      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+      "dev": true,
+      "requires": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^3.0.1",
+        "get-func-name": "^2.0.0",
+        "pathval": "^1.1.0",
+        "type-detect": "^4.0.5"
+      }
+    },
+    "chalk": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
+    },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "dev": true
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.15.1",
+      "resolved": "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "deep-eql": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "dev": true,
+      "requires": {
+        "type-detect": "^4.0.0"
+      }
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
+    },
+    "doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
+    "enhanced-resolve": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+      "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "object-assign": "^4.0.1",
+        "tapable": "^0.2.7"
+      }
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "eslint": {
+      "version": "4.19.1",
+      "resolved": "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
+      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
+      "requires": {
+        "ajv": "^5.3.0",
+        "babel-code-frame": "^6.22.0",
+        "chalk": "^2.1.0",
+        "concat-stream": "^1.6.0",
+        "cross-spawn": "^5.1.0",
+        "debug": "^3.1.0",
+        "doctrine": "^2.1.0",
+        "eslint-scope": "^3.7.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^3.5.4",
+        "esquery": "^1.0.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^2.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.0.1",
+        "ignore": "^3.3.3",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^3.0.6",
+        "is-resolvable": "^1.0.0",
+        "js-yaml": "^3.9.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.2",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "pluralize": "^7.0.0",
+        "progress": "^2.0.0",
+        "regexpp": "^1.0.1",
+        "require-uncached": "^1.0.3",
+        "semver": "^5.3.0",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "~2.0.1",
+        "table": "4.0.2",
+        "text-table": "~0.2.0"
+      }
+    },
+    "eslint-scope": {
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="
+    },
+    "espree": {
+      "version": "3.5.4",
+      "resolved": "http://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+      "requires": {
+        "acorn": "^5.5.0",
+        "acorn-jsx": "^3.0.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+    },
+    "external-editor": {
+      "version": "2.2.0",
+      "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "requires": {
+        "chardet": "^0.4.0",
+        "iconv-lite": "^0.4.17",
+        "tmp": "^0.0.33"
+      }
+    },
+    "fast-deep-equal": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "requires": {
+        "flat-cache": "^1.2.1",
+        "object-assign": "^4.0.1"
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
+      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+      "requires": {
+        "circular-json": "^0.3.1",
+        "graceful-fs": "^4.1.2",
+        "rimraf": "~2.6.2",
+        "write": "^0.2.1"
+      }
+    },
+    "form-data": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+    },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "globals": {
+      "version": "11.9.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz",
+      "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg=="
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
+    },
+    "homedir-polyfill": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
+      "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "inquirer": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^2.0.4",
+        "figures": "^2.0.0",
+        "lodash": "^4.3.0",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rx-lite": "^4.0.8",
+        "rx-lite-aggregates": "^4.0.8",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "dev": true
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "loader-utils": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+      "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+      "dev": true,
+      "requires": {
+        "big.js": "^3.1.3",
+        "emojis-list": "^2.0.0",
+        "json5": "^0.5.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "make-error": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
+      "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g=="
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "mime-db": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+    },
+    "mime-types": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "requires": {
+        "mime-db": "1.40.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "mocha": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
+      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
+      "dev": true,
+      "requires": {
+        "browser-stdout": "1.3.1",
+        "commander": "2.15.1",
+        "debug": "3.1.0",
+        "diff": "3.5.0",
+        "escape-string-regexp": "1.0.5",
+        "glob": "7.1.2",
+        "growl": "1.10.5",
+        "he": "1.1.1",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "supports-color": "5.4.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+    },
+    "pathval": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
+      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
+      "dev": true
+    },
+    "pluralize": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+    },
+    "progress": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
+      "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg=="
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "regexpp": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
+      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="
+    },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "requires": {
+        "caller-path": "^0.1.0",
+        "resolve-from": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY="
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "rewire": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/rewire/-/rewire-4.0.1.tgz",
+      "integrity": "sha512-+7RQ/BYwTieHVXetpKhT11UbfF6v1kGhKFrtZN7UDL2PybMsSt/rpLWeEUGF5Ndsl1D5BxiCB14VDJyoX+noYw==",
+      "requires": {
+        "eslint": "^4.19.1"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "requires": {
+        "glob": "^7.0.5"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "rx-lite": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
+    },
+    "rx-lite-aggregates": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
+      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+      "requires": {
+        "rx-lite": "*"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "semver": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+    },
+    "slice-ansi": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+    },
+    "source-map-support": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "requires": {
+        "source-map": "^0.5.6"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "requires": {
+        "ansi-regex": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        }
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "table": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+      "requires": {
+        "ajv": "^5.2.3",
+        "ajv-keywords": "^2.1.0",
+        "chalk": "^2.1.0",
+        "lodash": "^4.17.4",
+        "slice-ansi": "1.0.0",
+        "string-width": "^2.1.1"
+      }
+    },
+    "tapable": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
+      "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
+      "dev": true
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "ts-loader": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.3.7.tgz",
+      "integrity": "sha512-8t3bu2FcEkXb+D4L+Cn8qiK2E2C6Ms4/GQChvz6IMbVurcFHLXrhW4EMtfaol1a1ASQACZGDUGit4NHnX9g7hQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1",
+        "enhanced-resolve": "^3.0.0",
+        "loader-utils": "^1.0.2",
+        "semver": "^5.0.1"
+      }
+    },
+    "ts-node": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-3.3.0.tgz",
+      "integrity": "sha1-wTxqMCTjC+EYDdUwOPwgkonUv2k=",
+      "requires": {
+        "arrify": "^1.0.0",
+        "chalk": "^2.0.0",
+        "diff": "^3.1.0",
+        "make-error": "^1.1.1",
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.0",
+        "tsconfig": "^6.0.0",
+        "v8flags": "^3.0.0",
+        "yn": "^2.0.0"
+      }
+    },
+    "ts-petstore-client": {
+      "version": "file:../../builds/default",
+      "requires": {
+        "@types/node": "*",
+        "@types/node-fetch": "^2.5.7",
+        "btoa": "^1.2.1",
+        "es6-promise": "^4.2.4",
+        "form-data": "^2.5.0",
+        "node-fetch": "^2.6.0",
+        "url-parse": "^1.4.3"
+      },
+      "dependencies": {
+        "@types/isomorphic-fetch": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.34.tgz",
+          "integrity": "sha1-PDSD5gbAQTeEOOlRRk8A5OYHBtY="
+        },
+        "@types/node": {
+          "version": "12.12.7",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.7.tgz",
+          "integrity": "sha512-E6Zn0rffhgd130zbCbAr/JdXfXkoOUFAKNs/rF8qnafSJ8KYaA/j3oz7dcwal+lYjLA7xvdd5J4wdYpCTlP8+w=="
+        },
+        "@types/node-fetch": {
+          "version": "2.5.7",
+          "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
+          "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+          "requires": {
+            "@types/node": "*",
+            "form-data": "^3.0.0"
+          },
+          "dependencies": {
+            "form-data": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+              "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+              "requires": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+              }
+            }
+          }
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+        },
+        "btoa": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
+          "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
+        },
+        "combined-stream": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+          "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+        },
+        "es6-promise": {
+          "version": "4.2.5",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
+          "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg=="
+        },
+        "form-data": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+          "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "isomorphic-fetch": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+          "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+          "requires": {
+            "whatwg-fetch": ">=0.10.0"
+          }
+        },
+        "mime-db": {
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+        },
+        "mime-types": {
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+          "requires": {
+            "mime-db": "1.40.0"
+          }
+        },
+        "node-fetch": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+          "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+        },
+        "querystringify": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
+          "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg=="
+        },
+        "requires-port": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+          "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+        },
+        "typescript": {
+          "version": "2.9.2",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+          "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w=="
+        },
+        "url-parse": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz",
+          "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==",
+          "requires": {
+            "querystringify": "^2.0.0",
+            "requires-port": "^1.0.0"
+          }
+        },
+        "whatwg-fetch": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
+          "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
+        }
+      }
+    },
+    "tsconfig": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-6.0.0.tgz",
+      "integrity": "sha1-aw6DdgA9evGGT434+J3QBZ/80DI=",
+      "requires": {
+        "strip-bom": "^3.0.0",
+        "strip-json-comments": "^2.0.0"
+      }
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
+    "typescript": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+      "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "v8flags": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz",
+      "integrity": "sha512-iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==",
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+    },
+    "yn": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
+      "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo="
+    }
+  }
+}
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/package.json b/samples/openapi3/client/petstore/typescript/tests/default/package.json
new file mode 100644
index 000000000000..9db286f9532c
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/default/package.json
@@ -0,0 +1,32 @@
+{
+  "private": true,
+  "dependencies": {
+    "@types/rewire": "^2.5.28",
+    "form-data": "^2.5.0",
+    "rewire": "^4.0.1",
+    "ts-node": "^3.3.0",
+    "ts-petstore-client": "file:../../builds/default"
+  },
+  "scripts": {
+    "test": "mocha test/**/*.ts -r ts-node/register --timeout 10000",
+    "build": "tsc"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.0.1",
+    "@types/isomorphic-fetch": "0.0.34",
+    "@types/mocha": "^2.2.41",
+    "@types/node": "^8.10.38",
+    "chai": "^4.1.0",
+    "mocha": "^5.2.0",
+    "ts-loader": "^2.3.0",
+    "typescript": "^2.4.1"
+  },
+  "name": "typescript-test",
+  "version": "1.0.0",
+  "directories": {
+    "test": "test"
+  },
+  "author": "",
+  "license": "ISC",
+  "description": ""
+}
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/pom.xml b/samples/openapi3/client/petstore/typescript/tests/default/pom.xml
new file mode 100644
index 000000000000..4152f9e3a921
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/default/pom.xml
@@ -0,0 +1,73 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptDefaultPetstoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Petstore Test Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-build</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>build</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
new file mode 100644
index 000000000000..35f118994ce8
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
@@ -0,0 +1,131 @@
+import * as petstore from 'ts-petstore-client'
+
+import { expect, assert } from "chai";
+import * as fs from 'fs';
+
+const configuration = petstore.createConfiguration()
+const petApi = new petstore.PetApi(configuration)
+
+const tag = new petstore.Tag();
+tag.name = "tag1"
+tag.id = Math.floor(Math.random() * 100000)
+
+const pet = new petstore.Pet()
+pet.id = Math.floor(Math.random() * 100000)
+pet.name = "PetName"
+pet.photoUrls = []
+pet.status = 'available'
+pet.tags = [ tag ]
+pet.category = undefined
+
+describe("PetApi", () =>{ 
+    it("addPet", (done) => {
+        petApi.addPet(pet).then(() => {
+            return petApi.getPetById(pet.id)
+        }).then((createdPet: petstore.Pet) => {
+            expect(createdPet).to.deep.equal(pet);
+            done()
+        }).catch((err: any) => {
+            done(err)
+        })
+    })
+
+    it("deletePet", (done) => {
+        petApi.addPet(pet).then(() => {
+            return petApi.deletePet(pet.id)
+        }).then(() => {
+            return petApi.getPetById(pet.id)
+        }).then((pet: petstore.Pet) => {
+            done("Pet with id " + pet.id + " was not deleted!");
+        }).catch((err: any) => {
+            if (err.code && err.code == 404) {
+                done();                
+            } else {
+                done(err)
+            }
+        })
+    })
+
+    it("findPetsByStatus", (done) => {
+        petApi.addPet(pet).then(() => {
+            return petApi.findPetsByStatus(["available"])
+        }).then((pets: petstore.Pet[]) => {
+            expect(pets.length).to.be.at.least(1);
+            done();
+        }).catch((err: any) => {
+            done(err)
+        })
+    })
+
+    // bugged on server side! Code 500
+/*    it("findPetsByTag", (done) => {
+        petApi.addPet(pet).then(() => {
+            return petApi.findPetsByTags([tag.name])
+        }).then((pets: Pet[]) => {
+            expect(pets.length).to.be.at.least(1);
+            done();
+        }).catch((err: any) => {
+            done(err);
+        })
+    })*/
+
+    it("getPetById", (done) => {
+        petApi.addPet(pet).then(() => {
+            return petApi.getPetById(pet.id)
+        }).then((returnedPet: petstore.Pet) => {
+            expect(returnedPet).to.deep.equal(pet);
+            done();
+        }).catch((err: any) => {
+            done(err);
+        })
+    })
+
+    it("updatePet", (done) => {
+        const oldName = pet.name
+        const updatedName = "updated name";
+        petApi.addPet(pet).then(() => {
+            pet.name = updatedName
+            return petApi.updatePet(pet).then(() => {
+                pet.name = oldName;
+            }).catch((err: any) => {
+                pet.name = oldName
+                throw err;
+            });
+        }).then(() => {
+            return petApi.getPetById(pet.id);
+        }).then((returnedPet: petstore.Pet) => {
+            expect(returnedPet.id).to.equal(pet.id)
+            expect(returnedPet.name).to.equal(updatedName);
+            done();
+        }).catch((err: any) => {
+            done(err)
+        })
+    })
+
+// not supported by online swagger api?
+/*    it("updatePetWithForm", (done) => {
+        const updatedName = "updated name";
+        petApi.addPet(pet).then(() => {
+            return petApi.updatePetWithForm(pet.id, updatedName)
+        }).then(() => {
+            return petApi.getPetById(pet.id)
+        }).then((returnedPet: Pet) => {
+            expect(returnedPet.id).to.equal(pet.id)
+            expect(returnedPet.name).to.equal(updatedName);
+            done()
+        }).catch((err: any) => {
+            done(err)
+        })
+    })*/
+
+    it("uploadFile", (done) => {
+        const image = fs.readFileSync(__dirname + "/pet.png")
+        petApi.uploadFile(pet.id, "Metadata", { name: "pet.png", data: image}).then((response: any) => {
+            expect(response.code).to.be.gte(200).and.lt(300);
+            expect(response.message).to.contain("pet.png");
+            done();
+        }).catch((err: any) => {
+            done(err);
+        })
+    })
+})
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/test/api/pet.png b/samples/openapi3/client/petstore/typescript/tests/default/test/api/pet.png
new file mode 100644
index 000000000000..c9a9c49163db
Binary files /dev/null and b/samples/openapi3/client/petstore/typescript/tests/default/test/api/pet.png differ
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/test/auth/auth.test.ts b/samples/openapi3/client/petstore/typescript/tests/default/test/auth/auth.test.ts
new file mode 100644
index 000000000000..9a70d3e5baf7
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/default/test/auth/auth.test.ts
@@ -0,0 +1,21 @@
+import * as petstore from 'ts-petstore-client';
+import { expect } from "chai";
+
+
+
+describe("Security Authentication", () => {
+    describe("API Key Authentication", () => {
+        // TODO: make all params const variables
+        it("Header API Key", () => {
+            let ctx = new petstore.RequestContext("http://google.com", petstore.HttpMethod.GET);
+            let auth = new petstore.ApiKeyAuthentication("apiKey");
+            auth.applySecurityAuthentication(ctx);
+
+            expect(ctx.getUrl()).to.equal("http://google.com");
+            expect(ctx.getHeaders()).to.have.property("api_key");
+            expect(ctx.getHeaders()["api_key"]).to.equal("apiKey");
+            expect(ctx.getBody()).to.equal(undefined);
+        });
+
+    })
+});
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/test/http/isomorphic-fetch.test.ts b/samples/openapi3/client/petstore/typescript/tests/default/test/http/isomorphic-fetch.test.ts
new file mode 100644
index 000000000000..7c4e142747fd
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/default/test/http/isomorphic-fetch.test.ts
@@ -0,0 +1,70 @@
+import * as petstore from "ts-petstore-client";
+
+import { expect} from "chai";
+import * as FormData from "form-data";
+
+let libs: { [key: string]: petstore.HttpLibrary } = {
+    "isomorphic-fetch": new petstore.IsomorphicFetchHttpLibrary()
+}
+
+
+for (let libName in libs) {
+    let lib = libs[libName];
+
+    describe("Isomorphic Fetch", () => {
+        it("GET-Request", (done) => {
+            let requestContext = new petstore.RequestContext("http://httpbin.org/get", petstore.HttpMethod.GET);
+            requestContext.setHeaderParam("X-Test-Token", "Test-Token");
+            requestContext.addCookie("test-cookie", "cookie-value");
+            lib.send(requestContext).toPromise().then((resp: petstore.ResponseContext) => {
+                    expect(resp.httpStatusCode, "Expected status code to be 200").to.eq(200);
+                    return resp.body.text();
+            }).then((bodyText: string) => {
+                    let body = JSON.parse(bodyText);
+                    expect(body["headers"]).to.exist;
+                    expect(body["headers"]["X-Test-Token"]).to.equal("Test-Token");
+                    expect(body["headers"]["Cookie"]).to.equal("test-cookie=cookie-value;");
+                    done();
+            }).catch(done)
+        });
+
+        it("POST-Request", (done) => {
+            let requestContext = new petstore.RequestContext("http://httpbin.org/post", petstore.HttpMethod.POST);
+            requestContext.setHeaderParam("X-Test-Token", "Test-Token");
+            requestContext.addCookie("test-cookie", "cookie-value");
+            let formData: FormData = new FormData()
+            formData.append("test", "test2");
+            formData.append("testFile", Buffer.from("abc"), "fileName.json");
+
+            requestContext.setBody(formData);
+            lib.send(requestContext).toPromise().then(
+                    (resp: petstore.ResponseContext) => {
+                    expect(resp.httpStatusCode, "Expected status code to be 200").to.eq(200);
+                    return resp.body.text();
+            }).then((bodyText: string) => {
+                    let body = JSON.parse(bodyText);
+                    expect(body["headers"]).to.exist;
+                    expect(body["headers"]["X-Test-Token"]).to.equal("Test-Token");
+                    expect(body["headers"]["Cookie"]).to.equal("test-cookie=cookie-value;");
+                    expect(body["files"]["testFile"]).to.equal("abc");
+                    expect(body["form"]["test"]).to.equal("test2");
+                    done();
+            }).catch(done)
+        });
+
+        it("Cookies-Request", (done) => {
+            let requestContext = new petstore.RequestContext("http://httpbin.org/cookies", petstore.HttpMethod.GET);
+            requestContext.addCookie("test-cookie", "cookie-value");
+
+            lib.send(requestContext).toPromise().then(
+                (resp: petstore.ResponseContext) => {
+                    expect(resp.httpStatusCode, "Expected status code to be 200").to.eq(200);
+                    return resp.body.text();
+            }).then((bodyText: string) => {
+                    let body = JSON.parse(bodyText);
+                    expect(body["cookies"]["test-cookie"]).to.equal("cookie-value");
+                    done();
+            }).catch(done)
+        })
+    })
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/test/models/ObjectSerializer.test.ts b/samples/openapi3/client/petstore/typescript/tests/default/test/models/ObjectSerializer.test.ts
new file mode 100644
index 000000000000..babc4681fb4d
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/default/test/models/ObjectSerializer.test.ts
@@ -0,0 +1,234 @@
+const rewire = require("rewire")
+import { expect} from "chai";
+import * as petstore from "ts-petstore-client"
+
+
+const objectSerializerFile = rewire(__dirname + "/../../node_modules/ts-petstore-client/models/ObjectSerializer.ts")
+
+const ObjectSerializer = objectSerializerFile.__get__("ObjectSerializer")
+
+
+describe("ObjectSerializer", () => {
+    describe("Serialize", () => {
+        it("String", () => {
+            const input = "test string"
+            expect(ObjectSerializer.serialize(input, "string", "")).to.equal("test string")
+        });
+
+        it("Number", () => {
+            const input = 1337
+            expect(ObjectSerializer.serialize(input, "number", "")).to.equal(1337)
+        });
+
+        it("String Array", () => {
+            const input = ["a", "b", "c"]
+            expect(ObjectSerializer.serialize(input, "Array<string>", "")).to.deep.equal(["a", "b", "c"])
+        })
+
+        it("Number Array", () => {
+            const input = [ 1337, 42, 0]
+            expect(ObjectSerializer.serialize(input, "Array<number>", "")).to.deep.equal([1337, 42, 0]) 
+        })
+
+        it("Date-Time", () => {
+            const input = new Date(1543777609696)
+            expect(ObjectSerializer.serialize(input, "Date", "date-time")).to.equal(input.toISOString())
+        })
+
+        it("Date-Time", () => {
+            const input = new Date(1543777609696)
+            expect(ObjectSerializer.serialize(input, "Date", "date")).to.equal("2018-12-02")
+        })
+
+
+        it("Object", () => {
+            const input = {"a": "test", "b": { "test": 5}}
+            expect(ObjectSerializer.serialize(input, "Object", "")).to.deep.equal({ a: "test", "b": { "test": 5}})
+        })
+
+        it("Class", () => {
+            const input = new petstore.Category()
+            input.id = 4
+            input.name = "Test"
+            expect(ObjectSerializer.serialize(input, "Category", "")).to.deep.equal({ "id": input.id, "name": input.name})
+        });
+
+        it ("Enum", () => {
+            const input = "available"
+            expect(ObjectSerializer.serialize(input, "Pet.StatusEnum", "")).to.equal("available")
+        })
+
+        it("Complex Class", () => {
+            const tags = []
+            const tagResult = []
+            for (let i = 0; i < 2; i++) {
+                const tag = new petstore.Tag()
+                tag.id = i
+                tag.name = "Tag" + i    
+                tags.push(tag)
+                tagResult.push({
+                    "id": tag.id,
+                    "name": tag.name
+                })
+            }
+            
+            const category = new petstore.Category()
+            category.id = 4
+            category.name = "TestCat"
+            const pet = new petstore.Pet()
+            pet.id = 145
+            pet.category = category
+            pet.name = "PetName"
+            pet.photoUrls = [ "url", "other url"] 
+            pet.status = "available"
+            pet.tags = tags
+
+            expect(ObjectSerializer.serialize(pet, "Pet", "")).to.deep.equal({
+                "id": pet.id,
+                "name": pet.name,
+                "category": {
+                    "id": category.id,
+                    "name": category.name
+                },
+                "photoUrls": [ "url", "other url"],
+                "status": "available",
+                "tags": tagResult
+            })
+        })
+        it("Array of Class", () => {
+            const categories = []
+            const result = []
+            for (let i = 0; i < 2; i++) {
+                const category = new petstore.Category()
+                category.id = i
+                category.name = "Cat" + i
+                categories.push(category)
+                result.push({
+                    "id": category.id,
+                    "name": category.name
+                })
+            }
+
+            expect(ObjectSerializer.serialize(categories, "Array<Category>", "")).to.deep.equal(result)
+        })
+    })
+
+    describe("Deserialize", () => {
+        it("String", () => {
+            const input = "test string"
+            expect(ObjectSerializer.deserialize(input, "string", "")).to.equal("test string")
+        });
+
+        it("Number", () => {
+            const input = 1337
+            expect(ObjectSerializer.deserialize(input, "number", "")).to.equal(1337)
+        });
+
+        it("String Array", () => {
+            const input = ["a", "b", "c"]
+            expect(ObjectSerializer.deserialize(input, "Array<string>", "")).to.deep.equal(["a", "b", "c"])
+        })
+
+        it("Number Array", () => {
+            const input = [ 1337, 42, 0]
+            expect(ObjectSerializer.deserialize(input, "Array<number>", "")).to.deep.equal([1337, 42, 0]) 
+        })
+
+        it("DateTime", () => {
+            const input = new Date(1543777609696)
+            expect(ObjectSerializer.deserialize(input.toISOString(), "Date", "date-time").getTime()).to.equal(input.getTime())
+        })
+
+        it("Date", () => {
+            let dateString = "2019-02-01"
+            const input = new Date(dateString);
+            expect(ObjectSerializer.deserialize(dateString, "Date", "date").getTime()).to.equal(input.getTime())
+        })
+
+        it("Object", () => {
+            const input = {"a": "test", "b": { "test": 5}}
+            expect(ObjectSerializer.deserialize(input, "Object", "")).to.deep.equal({ a: "test", "b": { "test": 5}})
+        })
+
+        it("Class", () => {
+            const input = new petstore.Category()
+            input.id = 4
+            input.name = "Test"
+            const deserialized = ObjectSerializer.deserialize({ "id": 4, "name": "Test"}, "Category")
+
+            expect(deserialized.constructor.name).to.equal("Category")
+            expect(deserialized).to.deep.equal(input)
+        });
+
+        it ("Enum", () => {
+            const input = "available"
+            expect(ObjectSerializer.deserialize("available", "Pet.StatusEnum", "")).to.equal(input)
+        })
+
+        it("Complex Class", () => {
+            const tags = []
+            const tagResult = []
+            for (let i = 0; i < 2; i++) {
+                const tag = new petstore.Tag()
+                tag.id = i
+                tag.name = "Tag" + i    
+                tags.push(tag)
+                tagResult.push({
+                    "id": tag.id,
+                    "name": tag.name
+                })
+            }
+            
+            const category = new petstore.Category()
+            category.id = 4
+            category.name = "TestCat"
+            const pet = new petstore.Pet()
+            pet.id = 145
+            pet.category = category
+            pet.name = "PetName"
+            pet.photoUrls = [ "url", "other url"] 
+            pet.status = "available"
+            pet.tags = tags
+
+            const deserialized = ObjectSerializer.deserialize({
+                "id": pet.id,
+                "name": pet.name,
+                "category": {
+                    "id": category.id,
+                    "name": category.name
+                },
+                "photoUrls": [ "url", "other url"],
+                "status": "available",
+                "tags": tagResult
+            }, "Pet", "") as petstore.Pet
+
+            expect(deserialized.constructor.name).to.equal("Pet")
+            expect(deserialized.category.constructor.name).to.equal("Category")
+            for (let i = 0; i < deserialized.tags.length; i++){ 
+                expect(deserialized.tags[i].constructor.name).to.equal("Tag")
+            }
+            expect(deserialized).to.deep.equal(pet)
+        })
+
+        it("Array of Class", () => {
+            const categories = []
+            const result = []
+            for (let i = 0; i < 2; i++) {
+                const category = new petstore.Category()
+                category.id = i
+                category.name = "Cat" + i
+                categories.push(category)
+                result.push({
+                    "id": category.id,
+                    "name": category.name
+                })
+            }
+
+            const deserialized = ObjectSerializer.deserialize(result, "Array<Category>", "")
+            for (let i = 0; i < categories.length; i++) {
+                expect(deserialized[i].constructor.name).to.equal("Category")
+            }
+            expect(deserialized).to.deep.equal(categories)
+        })        
+    })
+})
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/tsconfig.json b/samples/openapi3/client/petstore/typescript/tests/default/tsconfig.json
new file mode 100644
index 000000000000..4596f6e40bcf
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/default/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "sourceMap": false,
+        "outDir": "dist",
+        "types": [
+            "mocha",
+            "node"
+        ],
+        "lib": [
+            "es6",
+            "dom"
+        ]
+    },
+    "exclude": [
+        "node_modules"
+    ]
+}
diff --git a/samples/openapi3/client/petstore/typescript/tests/deno/.gitignore b/samples/openapi3/client/petstore/typescript/tests/deno/.gitignore
new file mode 100644
index 000000000000..1521c8b7652b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/deno/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/samples/openapi3/client/petstore/typescript/tests/deno/pom.xml b/samples/openapi3/client/petstore/typescript/tests/deno/pom.xml
new file mode 100644
index 000000000000..bb8cca51a3fd
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/deno/pom.xml
@@ -0,0 +1,49 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptDenoPetstoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Petstore Test Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>deno-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>deno</executable>
+                            <arguments>
+                                <argument>test</argument>
+                                <argument>--allow-net=petstore.swagger.io</argument>
+                                <argument>--allow-read=.</argument>
+                                <argument>test/api/PetApi_test.ts</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts b/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts
new file mode 100644
index 000000000000..9f56de86eab8
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts
@@ -0,0 +1,127 @@
+import {
+  assertEquals,
+  assert,
+  fail,
+} from "https://deno.land/std@0.58.0/testing/asserts.ts";
+import * as petstore from "../../../../builds/deno/index.ts";
+
+const configuration = petstore.createConfiguration();
+const petApi = new petstore.PetApi(configuration);
+
+const tag = new petstore.Tag();
+tag.name = "tag1";
+tag.id = Math.floor(Math.random() * 100000);
+
+const pet = new petstore.Pet();
+const petId = Math.floor(Math.random() * 100000);
+pet.id = petId;
+pet.name = "PetName";
+pet.photoUrls = [];
+pet.status = "available";
+pet.tags = [tag];
+pet.category = undefined;
+
+Deno.test({
+  name: "PetApi addPet getPetById",
+  fn: async () => {
+    await petApi.addPet(pet);
+    const createdPet = await petApi.getPetById(petId);
+    assertEquals(createdPet, pet);
+  },
+});
+
+Deno.test({
+  name: "PetApi deletePet",
+  fn: async () => {
+    try {
+      await petApi.addPet(pet);
+      await petApi.deletePet(petId);
+      await petApi.getPetById(petId);
+      fail("Pet with id " + pet.id + " was not deleted!");
+    } catch (err) {
+      if (!err.code || err.code != 404) {
+        fail(err);
+      }
+    }
+  },
+  sanitizeResources: false,
+});
+
+Deno.test({
+  name: "PetApi findPetsByStatus",
+  fn: async () => {
+    try {
+      await petApi.addPet(pet);
+      const pets = await petApi.findPetsByStatus(["available"]);
+      assert(pets.length > 0);
+    } catch (err) {
+      fail(err);
+    }
+  },
+});
+
+// bugged on server side! Code 500
+/*    it("findPetsByTag", (done) => {
+        petApi.addPet(pet).then(() => {
+            return petApi.findPetsByTags([tag.name])
+        }).then((pets: Pet[]) => {
+            expect(pets.length).to.be.at.least(1);
+            done();
+        }).catch((err: any) => {
+            done(err);
+        })
+    })*/
+
+Deno.test({
+  name: "PetApi updatePet",
+  fn: async () => {
+    const oldName = pet.name;
+    const updatedName = "updated name";
+    try {
+      await petApi.addPet(pet);
+      pet.name = updatedName;
+      await petApi.updatePet(pet);
+      const updatedPet = await petApi.getPetById(petId);
+      assertEquals(updatedPet.id, petId);
+      assertEquals(updatedPet.name, updatedName);
+    } catch (err) {
+      fail(err);
+    } finally {
+      pet.name = oldName;
+    }
+  },
+});
+
+// not supported by online swagger api?
+/*    it("updatePetWithForm", (done) => {
+        const updatedName = "updated name";
+        petApi.addPet(pet).then(() => {
+            return petApi.updatePetWithForm(pet.id, updatedName)
+        }).then(() => {
+            return petApi.getPetById(pet.id)
+        }).then((returnedPet: Pet) => {
+            expect(returnedPet.id).to.equal(pet.id)
+            expect(returnedPet.name).to.equal(updatedName);
+            done()
+        }).catch((err: any) => {
+            done(err)
+        })
+    })*/
+
+Deno.test({
+  name: "PetApi uploadFile",
+  fn: async () => {
+    try {
+      const blob = new Blob(
+        [Deno.readFileSync("./test/api/pet.png")],
+        { type: "application/octet-binary" },
+      );
+      const file = new File([blob], "pet.png");
+      const response = await petApi.uploadFile(petId, "Metadata", file);
+      assert(response.code && response.code >= 200 && response.code < 300);
+      assert(response.message && response.message.indexOf("pet.png") >= 0);
+    } catch (err) {
+      fail(err);
+    }
+  },
+});
diff --git a/samples/openapi3/client/petstore/typescript/tests/deno/test/api/pet.png b/samples/openapi3/client/petstore/typescript/tests/deno/test/api/pet.png
new file mode 100644
index 000000000000..c9a9c49163db
Binary files /dev/null and b/samples/openapi3/client/petstore/typescript/tests/deno/test/api/pet.png differ
diff --git a/samples/openapi3/client/petstore/typescript/tests/inversify/.gitignore b/samples/openapi3/client/petstore/typescript/tests/inversify/.gitignore
new file mode 100644
index 000000000000..1521c8b7652b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/inversify/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/samples/openapi3/client/petstore/typescript/tests/inversify/package-lock.json b/samples/openapi3/client/petstore/typescript/tests/inversify/package-lock.json
new file mode 100644
index 000000000000..4a4443268a07
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/inversify/package-lock.json
@@ -0,0 +1,1490 @@
+{
+  "name": "typescript-test",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/chai": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.6.tgz",
+      "integrity": "sha512-CBk7KTZt3FhPsEkYioG6kuCIpWISw+YI8o+3op4+NXwTpvAPxE1ES8+PY8zfaK2L98b1z5oq03UHa4VYpeUxnw==",
+      "dev": true
+    },
+    "@types/isomorphic-fetch": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.34.tgz",
+      "integrity": "sha1-PDSD5gbAQTeEOOlRRk8A5OYHBtY=",
+      "dev": true
+    },
+    "@types/mocha": {
+      "version": "2.2.48",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.48.tgz",
+      "integrity": "sha512-nlK/iyETgafGli8Zh9zJVCTicvU3iajSkRwOh3Hhiva598CMqNJ4NcVCGMTGKpGpTYj/9R8RLzS9NAykSSCqGw==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "8.10.61",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.61.tgz",
+      "integrity": "sha512-l+zSbvT8TPRaCxL1l9cwHCb0tSqGAGcjPJFItGGYat5oCTiq1uQQKYg5m7AF1mgnEBzFXGLJ2LRmNjtreRX76Q==",
+      "dev": true
+    },
+    "@types/rewire": {
+      "version": "2.5.28",
+      "resolved": "https://registry.npmjs.org/@types/rewire/-/rewire-2.5.28.tgz",
+      "integrity": "sha512-uD0j/AQOa5le7afuK+u+woi8jNKF1vf3DN0H7LCJhft/lNNibUr7VcAesdgtWfEKveZol3ZG1CJqwx2Bhrnl8w=="
+    },
+    "acorn": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
+    },
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "resolved": "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "requires": {
+        "acorn": "^3.0.4"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
+        }
+      }
+    },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "requires": {
+        "co": "^4.6.0",
+        "fast-deep-equal": "^1.0.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.3.0"
+      }
+    },
+    "ajv-keywords": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I="
+    },
+    "ansi-escapes": {
+      "version": "3.1.0",
+      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        }
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "requires": {
+        "callsites": "^0.2.0"
+      }
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo="
+    },
+    "chai": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
+      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+      "dev": true,
+      "requires": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^3.0.1",
+        "get-func-name": "^2.0.0",
+        "pathval": "^1.1.0",
+        "type-detect": "^4.0.5"
+      }
+    },
+    "chalk": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
+    },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "dev": true
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.15.1",
+      "resolved": "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "deep-eql": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "dev": true,
+      "requires": {
+        "type-detect": "^4.0.0"
+      }
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true
+    },
+    "doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true
+    },
+    "enhanced-resolve": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
+      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.5.0",
+        "tapable": "^1.0.0"
+      }
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "eslint": {
+      "version": "4.19.1",
+      "resolved": "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
+      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
+      "requires": {
+        "ajv": "^5.3.0",
+        "babel-code-frame": "^6.22.0",
+        "chalk": "^2.1.0",
+        "concat-stream": "^1.6.0",
+        "cross-spawn": "^5.1.0",
+        "debug": "^3.1.0",
+        "doctrine": "^2.1.0",
+        "eslint-scope": "^3.7.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^3.5.4",
+        "esquery": "^1.0.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^2.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.0.1",
+        "ignore": "^3.3.3",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^3.0.6",
+        "is-resolvable": "^1.0.0",
+        "js-yaml": "^3.9.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.2",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "pluralize": "^7.0.0",
+        "progress": "^2.0.0",
+        "regexpp": "^1.0.1",
+        "require-uncached": "^1.0.3",
+        "semver": "^5.3.0",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "~2.0.1",
+        "table": "4.0.2",
+        "text-table": "~0.2.0"
+      }
+    },
+    "eslint-scope": {
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="
+    },
+    "espree": {
+      "version": "3.5.4",
+      "resolved": "http://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+      "requires": {
+        "acorn": "^5.5.0",
+        "acorn-jsx": "^3.0.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+    },
+    "external-editor": {
+      "version": "2.2.0",
+      "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "requires": {
+        "chardet": "^0.4.0",
+        "iconv-lite": "^0.4.17",
+        "tmp": "^0.0.33"
+      }
+    },
+    "fast-deep-equal": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "requires": {
+        "flat-cache": "^1.2.1",
+        "object-assign": "^4.0.1"
+      }
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
+      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+      "requires": {
+        "circular-json": "^0.3.1",
+        "graceful-fs": "^4.1.2",
+        "rimraf": "~2.6.2",
+        "write": "^0.2.1"
+      }
+    },
+    "form-data": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+    },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "globals": {
+      "version": "11.9.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz",
+      "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg=="
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "inquirer": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^2.0.4",
+        "figures": "^2.0.0",
+        "lodash": "^4.3.0",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rx-lite": "^4.0.8",
+        "rx-lite-aggregates": "^4.0.8",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
+      }
+    },
+    "inversify": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/inversify/-/inversify-5.0.1.tgz",
+      "integrity": "sha512-Ieh06s48WnEYGcqHepdsJUIJUXpwH5o5vodAX+DK2JA/gjy4EbEcQZxw+uFfzysmKjiLXGYwNG3qDZsKVMcINQ=="
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+    },
+    "json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      }
+    },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
+    },
+    "memory-fs": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "micromatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.0.5"
+      }
+    },
+    "mime-db": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+    },
+    "mime-types": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "requires": {
+        "mime-db": "1.40.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "mocha": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
+      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
+      "dev": true,
+      "requires": {
+        "browser-stdout": "1.3.1",
+        "commander": "2.15.1",
+        "debug": "3.1.0",
+        "diff": "3.5.0",
+        "escape-string-regexp": "1.0.5",
+        "glob": "7.1.2",
+        "growl": "1.10.5",
+        "he": "1.1.1",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "supports-color": "5.4.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+    },
+    "pathval": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
+      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
+      "dev": true
+    },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true
+    },
+    "pluralize": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+    },
+    "progress": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
+      "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg=="
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "reflect-metadata": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="
+    },
+    "regexpp": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
+      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="
+    },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "requires": {
+        "caller-path": "^0.1.0",
+        "resolve-from": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY="
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "rewire": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/rewire/-/rewire-4.0.1.tgz",
+      "integrity": "sha512-+7RQ/BYwTieHVXetpKhT11UbfF6v1kGhKFrtZN7UDL2PybMsSt/rpLWeEUGF5Ndsl1D5BxiCB14VDJyoX+noYw==",
+      "requires": {
+        "eslint": "^4.19.1"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "requires": {
+        "glob": "^7.0.5"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "rx-lite": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
+    },
+    "rx-lite-aggregates": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
+      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+      "requires": {
+        "rx-lite": "*"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "semver": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+    },
+    "slice-ansi": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+    },
+    "source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "requires": {
+        "ansi-regex": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        }
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "table": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+      "requires": {
+        "ajv": "^5.2.3",
+        "ajv-keywords": "^2.1.0",
+        "chalk": "^2.1.0",
+        "lodash": "^4.17.4",
+        "slice-ansi": "1.0.0",
+        "string-width": "^2.1.1"
+      }
+    },
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "ts-loader": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-7.0.5.tgz",
+      "integrity": "sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.3.0",
+        "enhanced-resolve": "^4.0.0",
+        "loader-utils": "^1.0.2",
+        "micromatch": "^4.0.0",
+        "semver": "^6.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "ts-node": {
+      "version": "8.10.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz",
+      "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==",
+      "requires": {
+        "arg": "^4.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      },
+      "dependencies": {
+        "diff": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
+        }
+      }
+    },
+    "ts-petstore-client": {
+      "version": "file:../../builds/inversify",
+      "requires": {
+        "@types/node": "*",
+        "@types/node-fetch": "^2.5.7",
+        "btoa": "^1.2.1",
+        "es6-promise": "^4.2.4",
+        "form-data": "^2.5.0",
+        "inversify": "^5.0.1",
+        "node-fetch": "^2.6.0",
+        "url-parse": "^1.4.3"
+      },
+      "dependencies": {
+        "@types/isomorphic-fetch": {
+          "version": "0.0.34",
+          "resolved": "https://registry.npmjs.org/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.34.tgz",
+          "integrity": "sha1-PDSD5gbAQTeEOOlRRk8A5OYHBtY="
+        },
+        "@types/node": {
+          "version": "12.12.7",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.7.tgz",
+          "integrity": "sha512-E6Zn0rffhgd130zbCbAr/JdXfXkoOUFAKNs/rF8qnafSJ8KYaA/j3oz7dcwal+lYjLA7xvdd5J4wdYpCTlP8+w=="
+        },
+        "@types/node-fetch": {
+          "version": "2.5.7",
+          "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
+          "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+          "requires": {
+            "@types/node": "*",
+            "form-data": "^3.0.0"
+          },
+          "dependencies": {
+            "form-data": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+              "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+              "requires": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+              }
+            }
+          }
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+        },
+        "btoa": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
+          "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
+        },
+        "combined-stream": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+          "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+        },
+        "es6-promise": {
+          "version": "4.2.5",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
+          "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg=="
+        },
+        "form-data": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+          "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "inversify": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/inversify/-/inversify-5.0.1.tgz",
+          "integrity": "sha512-Ieh06s48WnEYGcqHepdsJUIJUXpwH5o5vodAX+DK2JA/gjy4EbEcQZxw+uFfzysmKjiLXGYwNG3qDZsKVMcINQ=="
+        },
+        "isomorphic-fetch": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+          "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+          "requires": {
+            "whatwg-fetch": ">=0.10.0"
+          }
+        },
+        "mime-db": {
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+        },
+        "mime-types": {
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+          "requires": {
+            "mime-db": "1.40.0"
+          }
+        },
+        "node-fetch": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+          "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+        },
+        "querystringify": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
+          "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg=="
+        },
+        "requires-port": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+          "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+        },
+        "typescript": {
+          "version": "2.9.2",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+          "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w=="
+        },
+        "url-parse": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz",
+          "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==",
+          "requires": {
+            "querystringify": "^2.0.0",
+            "requires-port": "^1.0.0"
+          }
+        },
+        "whatwg-fetch": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
+          "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
+        }
+      }
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
+    "typescript": {
+      "version": "3.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz",
+      "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+    },
+    "yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="
+    }
+  }
+}
diff --git a/samples/openapi3/client/petstore/typescript/tests/inversify/package.json b/samples/openapi3/client/petstore/typescript/tests/inversify/package.json
new file mode 100644
index 000000000000..544fe42fe745
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/inversify/package.json
@@ -0,0 +1,34 @@
+{
+  "private": true,
+  "dependencies": {
+    "@types/rewire": "^2.5.28",
+    "form-data": "^2.5.0",
+    "inversify": "^5.0.1",
+    "reflect-metadata": "^0.1.13",
+    "rewire": "^4.0.1",
+    "ts-node": "^8.10.2",
+    "ts-petstore-client": "file:../../builds/inversify"
+  },
+  "scripts": {
+    "test": "mocha test/**/*.test.ts test/*.test.ts -r ts-node/register --timeout 10000",
+    "build": "tsc"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.0.1",
+    "@types/isomorphic-fetch": "0.0.34",
+    "@types/mocha": "^2.2.41",
+    "@types/node": "^8.10.38",
+    "chai": "^4.1.0",
+    "mocha": "^5.2.0",
+    "ts-loader": "^7.0.5",
+    "typescript": "^3.9.5"
+  },
+  "name": "typescript-test",
+  "version": "1.0.0",
+  "directories": {
+    "test": "test"
+  },
+  "author": "",
+  "license": "ISC",
+  "description": ""
+}
diff --git a/samples/openapi3/client/petstore/typescript/tests/inversify/pom.xml b/samples/openapi3/client/petstore/typescript/tests/inversify/pom.xml
new file mode 100644
index 000000000000..7ee6deb8c6af
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/inversify/pom.xml
@@ -0,0 +1,73 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptInversifyPetstoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Petstore Test Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-build</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>build</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/openapi3/client/petstore/typescript/tests/inversify/test/services.test.ts b/samples/openapi3/client/petstore/typescript/tests/inversify/test/services.test.ts
new file mode 100644
index 000000000000..264dbad31af8
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/inversify/test/services.test.ts
@@ -0,0 +1,139 @@
+import "reflect-metadata";
+import { Container } from "inversify";
+
+import * as petstore from "ts-petstore-client";
+import * as petstoreInternals from "ts-petstore-client/dist/apis/PetApi";
+
+import { expect, assert } from "chai";
+import * as fs from "fs";
+
+describe("ApiServiceBinder", () => {
+    let container: Container, apiServiceBinder: petstore.ApiServiceBinder;
+    beforeEach("create new container and api service binder", () => {
+        container = new Container();
+        apiServiceBinder = new petstore.ApiServiceBinder(container);
+    });
+
+    it("falls back to defaults", () => {
+        const petApi = container.resolve(petstore.PetApi);
+        expect(petApi).to.be.an.instanceof(petstore.PetApi);
+    });
+
+    it("binds server config", async () => {
+        const url = "foobar";
+        let callCount = 0;
+        const mockServer = {
+            makeRequestContext(endpoint: string, httpMethod: petstore.HttpMethod): petstore.RequestContext {
+                callCount++;
+                return new petstore.RequestContext(url, httpMethod);
+            }
+        };
+        apiServiceBinder.bindServerConfiguration.toConstantValue(mockServer);
+
+        const requestFactory = container.resolve(petstoreInternals.PetApiRequestFactory);
+        const request = await requestFactory.deletePet(42);
+
+        expect(callCount).to.equal(1);
+        expect(request.getUrl()).to.equal(url);
+    });
+
+    it("binds predefined server config", () => {
+        apiServiceBinder.bindServerConfigurationToPredefined(0);
+        const server = container.get(petstore.AbstractServerConfiguration);
+
+        expect(server).to.equal(petstore.server1);
+    });
+
+    it("binds server config to url", async () => {
+        const url = "foobar";
+        const petId = 42;
+        apiServiceBinder.bindServerConfigurationToURL(url);
+
+        const requestFactory = container.resolve(petstoreInternals.PetApiRequestFactory);
+        const request = await requestFactory.deletePet(petId);
+
+        expect(request.getUrl()).to.equal(`${url}/pet/${petId}`);
+    });
+
+    it("binds http library", async () => {
+        const requests: Array<petstore.RequestContext> = [];
+        const mockHttpLibrary = {
+            async send(request: petstore.RequestContext): Promise<petstore.ResponseContext> {
+                requests.push(request);
+                return new petstore.ResponseContext(200, {}, {
+                    async text() { return ""; },
+                    async binary() { return Buffer.from(""); }
+                });
+            }
+        };
+        apiServiceBinder.bindHttpLibrary.toConstantValue(mockHttpLibrary);
+
+        const petApi = container.resolve(petstore.PetApi);
+        await petApi.deletePet(42);
+
+        expect(requests).to.be.of.length(1);
+        expect(requests[0].getUrl()).to.include("/pet/42");
+    });
+
+    it("binds middleware", async () => {
+        let preCallCount = 0, postCallCount = 0;
+        const mockMiddleware = {
+            async pre(context: petstore.RequestContext): Promise<petstore.RequestContext> {
+                preCallCount++;
+                return context;
+            },
+            async post(context: petstore.ResponseContext): Promise<petstore.ResponseContext> {
+                postCallCount++;
+                return context;
+            }
+        };
+        apiServiceBinder.bindMiddleware.toConstantValue(mockMiddleware);
+
+        const petApi = container.resolve(petstore.PetApi);
+        await petApi.addPet({ name: "Foo Bear", photoUrls: [] });
+
+        expect(preCallCount).to.equal(1);
+        expect(postCallCount).to.equal(1);
+    });
+
+    it("binds auth method", async () => {
+        const header = "x-custom-header";
+        const value = "foobar";
+        let callCount = 0;
+        const mockAuthMethod = {
+            getName(): string {
+                return "api_key";
+            },
+            applySecurityAuthentication(context: petstore.RequestContext) {
+                callCount++;
+                context.setHeaderParam(header, value);
+            }
+        };
+        apiServiceBinder.bindAuthMethod.toConstantValue(mockAuthMethod);
+
+        const requestFactory = container.resolve(petstoreInternals.PetApiRequestFactory);
+        const request = await requestFactory.getPetById(42);
+
+        expect(callCount).to.equal(1);
+        expect(request.getHeaders()[header]).to.equal(value);
+    });
+
+    it("binds predefined auth method", async () => {
+        const authName = "api_key";
+        const value = "foobar";
+        container.bind(petstore.AuthApiKey).toConstantValue(value).whenTargetNamed(authName);
+        apiServiceBinder.bindAuthMethodToPredefined(authName);
+
+        const requestFactory = container.resolve(petstoreInternals.PetApiRequestFactory);
+        const request = await requestFactory.getPetById(42);
+
+        expect(request.getHeaders()["api_key"]).to.equal(value);
+    });
+
+    it("binds all api services", () => {
+        apiServiceBinder.bindAllApiServices();
+        const petApi = container.get(petstore.AbstractPetApi);
+
+        expect(petApi).to.be.an.instanceof(petstore.PetApi);
+    });
+})
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/tests/inversify/tsconfig.json b/samples/openapi3/client/petstore/typescript/tests/inversify/tsconfig.json
new file mode 100644
index 000000000000..4596f6e40bcf
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/inversify/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "sourceMap": false,
+        "outDir": "dist",
+        "types": [
+            "mocha",
+            "node"
+        ],
+        "lib": [
+            "es6",
+            "dom"
+        ]
+    },
+    "exclude": [
+        "node_modules"
+    ]
+}
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/.gitignore b/samples/openapi3/client/petstore/typescript/tests/jquery/.gitignore
new file mode 100644
index 000000000000..1521c8b7652b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/index.html b/samples/openapi3/client/petstore/typescript/tests/jquery/index.html
new file mode 100644
index 000000000000..702d5739ce34
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width">
+  <title>QUnit Example</title>
+  <link rel="stylesheet" href="./node_modules/qunit/qunit/qunit.css">
+</head>
+<body>
+  <div id="qunit"></div>
+  <div id="qunit-fixture"></div>
+  <script src="./node_modules/qunit/qunit/qunit.js"></script>
+  <script src="./dist/bundle.js"></script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/node-qunit-puppeteer.d.ts b/samples/openapi3/client/petstore/typescript/tests/jquery/node-qunit-puppeteer.d.ts
new file mode 100644
index 000000000000..083e2057f8c6
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/node-qunit-puppeteer.d.ts
@@ -0,0 +1 @@
+declare module 'node-qunit-puppeteer';
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/package-lock.json b/samples/openapi3/client/petstore/typescript/tests/jquery/package-lock.json
new file mode 100644
index 000000000000..331d8ab1d563
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/package-lock.json
@@ -0,0 +1,5214 @@
+{
+  "name": "typescript-test",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/jsdom": {
+      "version": "12.2.3",
+      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-12.2.3.tgz",
+      "integrity": "sha512-CxYWGFsBs0VZ/lU9zxfWk7zYfOlQQuSs5yzk34KW/vQQJGE8OGOYxJnqj9kGHE1SBZGVJvhXs1TafIpZL8RvXw==",
+      "requires": {
+        "@types/node": "*",
+        "@types/tough-cookie": "*",
+        "parse5": "^4.0.0"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "12.0.0",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.0.tgz",
+          "integrity": "sha512-Jrb/x3HT4PTJp6a4avhmJCDEVrPdqLfl3e8GGMbpkGGdwAV5UGlIs4vVEfsHHfylZVOKZWpOqmqFH8CbfOZ6kg=="
+        }
+      }
+    },
+    "@types/node": {
+      "version": "8.10.48",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.48.tgz",
+      "integrity": "sha512-c35YEBTkL4rzXY2ucpSKy+UYHjUBIIkuJbWYbsGIrKLEWU5dgJMmLkkIb3qeC3O3Tpb1ZQCwecscvJTDjDjkRw==",
+      "dev": true
+    },
+    "@types/qunit": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@types/qunit/-/qunit-2.9.0.tgz",
+      "integrity": "sha512-Hx34HZmTJKRay+x3sFdEK62I8Z8YSWYg+rAlNr4M+AbwvNUJYxTTmWEH4a8B9ZN+Fl61awFrw+oRicWLFVugvQ=="
+    },
+    "@types/rewire": {
+      "version": "2.5.28",
+      "resolved": "https://registry.npmjs.org/@types/rewire/-/rewire-2.5.28.tgz",
+      "integrity": "sha512-uD0j/AQOa5le7afuK+u+woi8jNKF1vf3DN0H7LCJhft/lNNibUr7VcAesdgtWfEKveZol3ZG1CJqwx2Bhrnl8w=="
+    },
+    "@types/tough-cookie": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz",
+      "integrity": "sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg=="
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ=="
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA=="
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q=="
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow=="
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "^0.0.3"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ=="
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw=="
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/helper-wasm-section": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-opt": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-code-frame": "1.8.5",
+        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+    },
+    "abab": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
+      "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w=="
+    },
+    "acorn": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
+    },
+    "acorn-globals": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.2.tgz",
+      "integrity": "sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==",
+      "requires": {
+        "acorn": "^6.0.1",
+        "acorn-walk": "^6.0.1"
+      }
+    },
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "requires": {
+        "acorn": "^3.0.4"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
+        }
+      }
+    },
+    "acorn-walk": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
+      "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw=="
+    },
+    "agent-base": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+      "requires": {
+        "es6-promisify": "^5.0.0"
+      }
+    },
+    "ajv": {
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+      "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+      "requires": {
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="
+    },
+    "ajv-keywords": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I="
+    },
+    "ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+    },
+    "anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "optional": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
+    },
+    "array-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
+    },
+    "async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "optional": true
+    },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
+    },
+    "binary-extensions": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
+      "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+      "optional": true
+    },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+    },
+    "browser-process-hrtime": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
+      "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw=="
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "requires": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
+    },
+    "cacache": {
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "requires": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+        }
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "requires": {
+        "callsites": "^0.2.0"
+      }
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo="
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
+    },
+    "chokidar": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
+      "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
+      "optional": true,
+      "requires": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "fsevents": "~2.1.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.4.0"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "optional": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "optional": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "optional": true
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "optional": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    },
+    "chrome-trace-event": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+    },
+    "cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "requires": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "colors": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+      "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="
+    },
+    "combined-stream": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
+      "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA=="
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
+    },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "cssom": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz",
+      "integrity": "sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A=="
+    },
+    "cssstyle": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.2.tgz",
+      "integrity": "sha512-43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow==",
+      "requires": {
+        "cssom": "0.3.x"
+      }
+    },
+    "cyclist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk="
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "data-urls": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
+      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+      "requires": {
+        "abab": "^2.0.0",
+        "whatwg-mimetype": "^2.2.0",
+        "whatwg-url": "^7.0.0"
+      }
+    },
+    "debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "requires": {
+        "ms": "^2.1.1"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc="
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
+    },
+    "domexception": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
+      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+      "requires": {
+        "webidl-conversions": "^4.0.2"
+      }
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "elliptic": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz",
+      "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==",
+      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
+      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "tapable": "^1.0.0"
+      }
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
+    "es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "requires": {
+        "es6-promise": "^4.0.3"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "escodegen": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz",
+      "integrity": "sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==",
+      "requires": {
+        "esprima": "^3.1.3",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      }
+    },
+    "eslint": {
+      "version": "4.19.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
+      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
+      "requires": {
+        "ajv": "^5.3.0",
+        "babel-code-frame": "^6.22.0",
+        "chalk": "^2.1.0",
+        "concat-stream": "^1.6.0",
+        "cross-spawn": "^5.1.0",
+        "debug": "^3.1.0",
+        "doctrine": "^2.1.0",
+        "eslint-scope": "^3.7.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^3.5.4",
+        "esquery": "^1.0.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^2.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.0.1",
+        "ignore": "^3.3.3",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^3.0.6",
+        "is-resolvable": "^1.0.0",
+        "js-yaml": "^3.9.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.2",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "pluralize": "^7.0.0",
+        "progress": "^2.0.0",
+        "regexpp": "^1.0.1",
+        "require-uncached": "^1.0.3",
+        "semver": "^5.3.0",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "~2.0.1",
+        "table": "4.0.2",
+        "text-table": "~0.2.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        },
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+        },
+        "json-schema-traverse": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+        }
+      }
+    },
+    "eslint-scope": {
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="
+    },
+    "espree": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+      "requires": {
+        "acorn": "^5.5.0",
+        "acorn-jsx": "^3.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.7.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
+        }
+      }
+    },
+    "esprima": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+    },
+    "events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "requires": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        }
+      }
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "external-editor": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "requires": {
+        "chardet": "^0.4.0",
+        "iconv-lite": "^0.4.17",
+        "tmp": "^0.0.33"
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "extract-zip": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
+      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
+      "requires": {
+        "concat-stream": "^1.6.2",
+        "debug": "^2.6.9",
+        "mkdirp": "^0.5.4",
+        "yauzl": "^2.10.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+    },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
+    "figgy-pudding": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "requires": {
+        "flat-cache": "^1.2.1",
+        "object-assign": "^4.0.1"
+      }
+    },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "optional": true
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      }
+    },
+    "find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "requires": {
+        "locate-path": "^3.0.0"
+      }
+    },
+    "findup-sync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "requires": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
+      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+      "requires": {
+        "circular-json": "^0.3.1",
+        "graceful-fs": "^4.1.2",
+        "rimraf": "~2.6.2",
+        "write": "^0.2.1"
+      }
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fsevents": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "optional": true
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+    },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "optional": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "requires": {
+        "global-prefix": "^3.0.0"
+      },
+      "dependencies": {
+        "global-prefix": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+          "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+          "requires": {
+            "ini": "^1.3.5",
+            "kind-of": "^6.0.2",
+            "which": "^1.3.1"
+          }
+        }
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+    },
+    "graceful-fs": {
+      "version": "4.1.15",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
+    "html-encoding-sniffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
+      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+      "requires": {
+        "whatwg-encoding": "^1.0.1"
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
+    },
+    "https-proxy-agent": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+      "requires": {
+        "agent-base": "^4.3.0",
+        "debug": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "requires": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+    },
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+    },
+    "inquirer": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^2.0.4",
+        "figures": "^2.0.0",
+        "lodash": "^4.3.0",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rx-lite": "^4.0.8",
+        "rx-lite-aggregates": "^4.0.8",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
+      }
+    },
+    "interpret": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
+      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="
+    },
+    "invert-kv": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "optional": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+        }
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "js-reporters": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/js-reporters/-/js-reporters-1.2.1.tgz",
+      "integrity": "sha1-+IxgjjJKM3OpW8xFrTBeXJecRZs="
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+        }
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
+    "jsdom": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.0.0.tgz",
+      "integrity": "sha512-rJnHm7CHyIj4tDyz9VaCt0f0P0nEh/wEmMfwp9mMixy+L/r8OW/BNcgmIlfZuBBnVQS3eRBpvd/qM3R7vr7e3A==",
+      "requires": {
+        "abab": "^2.0.0",
+        "acorn": "^6.0.4",
+        "acorn-globals": "^4.3.0",
+        "array-equal": "^1.0.0",
+        "cssom": "^0.3.4",
+        "cssstyle": "^1.1.1",
+        "data-urls": "^1.1.0",
+        "domexception": "^1.0.1",
+        "escodegen": "^1.11.0",
+        "html-encoding-sniffer": "^1.0.2",
+        "nwsapi": "^2.1.3",
+        "parse5": "5.1.0",
+        "pn": "^1.1.0",
+        "request": "^2.88.0",
+        "request-promise-native": "^1.0.5",
+        "saxes": "^3.1.9",
+        "symbol-tree": "^3.2.2",
+        "tough-cookie": "^2.5.0",
+        "w3c-hr-time": "^1.0.1",
+        "w3c-xmlserializer": "^1.1.2",
+        "webidl-conversions": "^4.0.2",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^7.0.0",
+        "ws": "^6.1.2",
+        "xml-name-validator": "^3.0.0"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
+          "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="
+        }
+      }
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "requires": {
+        "minimist": "^1.2.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+        }
+      }
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+    },
+    "lcid": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+      "requires": {
+        "invert-kv": "^2.0.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="
+    },
+    "loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
+      }
+    },
+    "locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "requires": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+    },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "requires": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      }
+    },
+    "make-error": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
+      "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g=="
+    },
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA=="
+    },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "mem": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+      "requires": {
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+        }
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      }
+    },
+    "mime": {
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz",
+      "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w=="
+    },
+    "mime-db": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+    },
+    "mime-types": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "requires": {
+        "mime-db": "1.40.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    },
+    "mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "requires": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "ms": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+    },
+    "nan": {
+      "version": "2.14.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    },
+    "neo-async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
+    "node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+        }
+      }
+    },
+    "node-qunit-puppeteer": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/node-qunit-puppeteer/-/node-qunit-puppeteer-1.0.12.tgz",
+      "integrity": "sha512-3nIXzI11MgTvuY772J6m0XRxkgFj1/dzJ8UUuE+S8AiUhOfz/gzs/IPjmjZaA4Fgm3cRuQZViuudQXZoiNDgvQ==",
+      "requires": {
+        "colors": "^1.3.2",
+        "puppeteer": "^1.9.0"
+      }
+    },
+    "node-watch": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/node-watch/-/node-watch-0.6.0.tgz",
+      "integrity": "sha512-XAgTL05z75ptd7JSVejH1a2Dm1zmXYhuDr9l230Qk6Z7/7GPcnAs/UyJJ4ggsXSvWil8iOzwQLW0zuGUvHpG8g=="
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "optional": true
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "nwsapi": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz",
+      "integrity": "sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw=="
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
+    },
+    "os-locale": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+      "requires": {
+        "execa": "^1.0.0",
+        "lcid": "^2.0.0",
+        "mem": "^4.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
+    "p-is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
+    },
+    "p-limit": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+      "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "requires": {
+        "p-limit": "^2.0.0"
+      }
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+    },
+    "pako": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
+    },
+    "parallel-transform": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "requires": {
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
+      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+      "requires": {
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
+    },
+    "parse5": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
+    },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "optional": true
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+    },
+    "pbkdf2": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "optional": true
+    },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+    },
+    "pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "requires": {
+        "find-up": "^3.0.0"
+      }
+    },
+    "pluralize": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="
+    },
+    "pn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
+      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
+    },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+    },
+    "psl": {
+      "version": "1.1.31",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+    },
+    "puppeteer": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.20.0.tgz",
+      "integrity": "sha512-bt48RDBy2eIwZPrkgbcwHtb51mj2nKvHOPMaSH2IsWiv7lOG9k9zhaRzpDZafrk05ajMc3cu+lSQYYOfH2DkVQ==",
+      "requires": {
+        "debug": "^4.1.0",
+        "extract-zip": "^1.6.6",
+        "https-proxy-agent": "^2.2.1",
+        "mime": "^2.0.3",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.0.0",
+        "rimraf": "^2.6.1",
+        "ws": "^6.1.0"
+      }
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
+    },
+    "qunit": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/qunit/-/qunit-2.9.2.tgz",
+      "integrity": "sha512-wTOYHnioWHcx5wa85Wl15IE7D6zTZe2CQlsodS14yj7s2FZ3MviRnQluspBZsueIDEO7doiuzKlv05yfky1R7w==",
+      "requires": {
+        "commander": "2.12.2",
+        "js-reporters": "1.2.1",
+        "minimatch": "3.0.4",
+        "node-watch": "0.6.0",
+        "resolve": "1.9.0"
+      }
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "raw-loader": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.0.tgz",
+      "integrity": "sha512-iINUOYvl1cGEmfoaLjnZXt4bKfT2LJnZZib5N/LLyAphC+Dd11vNP9CNVb38j+SAJpFI1uo8j9frmih53ASy7Q==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^2.5.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
+          "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "2.6.4",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
+          "integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.10.2",
+            "ajv-keywords": "^3.4.1"
+          }
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+      "optional": true,
+      "requires": {
+        "picomatch": "^2.2.1"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "regexpp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
+      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "optional": true
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+    },
+    "request": {
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+        },
+        "tough-cookie": {
+          "version": "2.4.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+          "requires": {
+            "psl": "^1.1.24",
+            "punycode": "^1.4.1"
+          }
+        }
+      }
+    },
+    "request-promise-core": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz",
+      "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
+      "requires": {
+        "lodash": "^4.17.11"
+      }
+    },
+    "request-promise-native": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz",
+      "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==",
+      "requires": {
+        "request-promise-core": "1.1.2",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+    },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "requires": {
+        "caller-path": "^0.1.0",
+        "resolve-from": "^1.0.0"
+      }
+    },
+    "requirejs": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz",
+      "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg=="
+    },
+    "resolve": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz",
+      "integrity": "sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==",
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "requires": {
+        "resolve-from": "^3.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
+        }
+      }
+    },
+    "resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "requires": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      },
+      "dependencies": {
+        "global-modules": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+          "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+          "requires": {
+            "global-prefix": "^1.0.1",
+            "is-windows": "^1.0.1",
+            "resolve-dir": "^1.0.0"
+          }
+        }
+      }
+    },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY="
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+    },
+    "rewire": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/rewire/-/rewire-4.0.1.tgz",
+      "integrity": "sha512-+7RQ/BYwTieHVXetpKhT11UbfF6v1kGhKFrtZN7UDL2PybMsSt/rpLWeEUGF5Ndsl1D5BxiCB14VDJyoX+noYw==",
+      "requires": {
+        "eslint": "^4.19.1"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "rx-lite": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
+    },
+    "rx-lite-aggregates": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
+      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+      "requires": {
+        "rx-lite": "*"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "saxes": {
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.9.tgz",
+      "integrity": "sha512-FZeKhJglhJHk7eWG5YM0z46VHmI3KJpMBAQm3xa9meDvd+wevB5GuBB0wc0exPInZiBBHqi00DbS8AcvCGCFMw==",
+      "requires": {
+        "xmlchars": "^1.3.1"
+      }
+    },
+    "schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "requires": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      },
+      "dependencies": {
+        "ajv-keywords": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
+        }
+      }
+    },
+    "semver": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+      "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+    },
+    "serialize-javascript": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
+      "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ=="
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+    },
+    "slice-ansi": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "requires": {
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "requires": {
+        "source-map": "^0.5.6"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "requires": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "requires": {
+        "ansi-regex": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        }
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
+    "supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+    },
+    "symbol-tree": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
+      "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY="
+    },
+    "table": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+      "requires": {
+        "ajv": "^5.2.3",
+        "ajv-keywords": "^2.1.0",
+        "chalk": "^2.1.0",
+        "lodash": "^4.17.4",
+        "slice-ansi": "1.0.0",
+        "string-width": "^2.1.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+        },
+        "json-schema-traverse": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+        }
+      }
+    },
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
+    },
+    "terser": {
+      "version": "4.6.13",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.13.tgz",
+      "integrity": "sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==",
+      "requires": {
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+        },
+        "source-map-support": {
+          "version": "0.5.19",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+          "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz",
+      "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==",
+      "requires": {
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^2.1.2",
+        "source-map": "^0.6.1",
+        "terser": "^4.1.2",
+        "webpack-sources": "^1.4.0",
+        "worker-farm": "^1.7.0"
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "timers-browserify": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "requires": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      }
+    },
+    "tr46": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "ts-loader": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-4.5.0.tgz",
+      "integrity": "sha512-ihgVaSmgrX4crGV4n7yuoHPoCHbDzj9aepCZR9TgIx4SgJ9gdnB6xLHgUBb7bsFM/f0K6x9iXa65KY/Fu1Klkw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.3.0",
+        "enhanced-resolve": "^4.0.0",
+        "loader-utils": "^1.0.2",
+        "micromatch": "^3.1.4",
+        "semver": "^5.0.1"
+      }
+    },
+    "ts-node": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-3.3.0.tgz",
+      "integrity": "sha1-wTxqMCTjC+EYDdUwOPwgkonUv2k=",
+      "requires": {
+        "arrify": "^1.0.0",
+        "chalk": "^2.0.0",
+        "diff": "^3.1.0",
+        "make-error": "^1.1.1",
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.0",
+        "tsconfig": "^6.0.0",
+        "v8flags": "^3.0.0",
+        "yn": "^2.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+        }
+      }
+    },
+    "ts-petstore-client": {
+      "version": "file:../../builds/jquery",
+      "requires": {
+        "@types/jquery": "^3.3.29",
+        "es6-promise": "^4.2.4",
+        "jquery": "^3.4.1",
+        "url-parse": "^1.4.3"
+      },
+      "dependencies": {
+        "@types/form-data": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz",
+          "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==",
+          "requires": {
+            "@types/node": "*"
+          }
+        },
+        "@types/jquery": {
+          "version": "3.3.29",
+          "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.29.tgz",
+          "integrity": "sha512-FhJvBninYD36v3k6c+bVk1DSZwh7B5Dpb/Pyk3HKVsiohn0nhbefZZ+3JXbWQhFyt0MxSl2jRDdGQPHeOHFXrQ==",
+          "requires": {
+            "@types/sizzle": "*"
+          }
+        },
+        "@types/node": {
+          "version": "12.0.0",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.0.tgz",
+          "integrity": "sha512-Jrb/x3HT4PTJp6a4avhmJCDEVrPdqLfl3e8GGMbpkGGdwAV5UGlIs4vVEfsHHfylZVOKZWpOqmqFH8CbfOZ6kg=="
+        },
+        "@types/rx": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/@types/rx/-/rx-4.1.1.tgz",
+          "integrity": "sha1-WY/JSla67ZdfGUV04PVy/Y5iekg=",
+          "requires": {
+            "@types/rx-core": "*",
+            "@types/rx-core-binding": "*",
+            "@types/rx-lite": "*",
+            "@types/rx-lite-aggregates": "*",
+            "@types/rx-lite-async": "*",
+            "@types/rx-lite-backpressure": "*",
+            "@types/rx-lite-coincidence": "*",
+            "@types/rx-lite-experimental": "*",
+            "@types/rx-lite-joinpatterns": "*",
+            "@types/rx-lite-testing": "*",
+            "@types/rx-lite-time": "*",
+            "@types/rx-lite-virtualtime": "*"
+          }
+        },
+        "@types/rx-core": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/@types/rx-core/-/rx-core-4.0.3.tgz",
+          "integrity": "sha1-CzNUsSOM7b4rdPYybxOdvHpZHWA="
+        },
+        "@types/rx-core-binding": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/@types/rx-core-binding/-/rx-core-binding-4.0.4.tgz",
+          "integrity": "sha512-5pkfxnC4w810LqBPUwP5bg7SFR/USwhMSaAeZQQbEHeBp57pjKXRlXmqpMrLJB4y1oglR/c2502853uN0I+DAQ==",
+          "requires": {
+            "@types/rx-core": "*"
+          }
+        },
+        "@types/rx-lite": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/@types/rx-lite/-/rx-lite-4.0.6.tgz",
+          "integrity": "sha512-oYiDrFIcor9zDm0VDUca1UbROiMYBxMLMaM6qzz4ADAfOmA9r1dYEcAFH+2fsPI5BCCjPvV9pWC3X3flbrvs7w==",
+          "requires": {
+            "@types/rx-core": "*",
+            "@types/rx-core-binding": "*"
+          }
+        },
+        "@types/rx-lite-aggregates": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/@types/rx-lite-aggregates/-/rx-lite-aggregates-4.0.3.tgz",
+          "integrity": "sha512-MAGDAHy8cRatm94FDduhJF+iNS5//jrZ/PIfm+QYw9OCeDgbymFHChM8YVIvN2zArwsRftKgE33QfRWvQk4DPg==",
+          "requires": {
+            "@types/rx-lite": "*"
+          }
+        },
+        "@types/rx-lite-async": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/@types/rx-lite-async/-/rx-lite-async-4.0.2.tgz",
+          "integrity": "sha512-vTEv5o8l6702ZwfAM5aOeVDfUwBSDOs+ARoGmWAKQ6LOInQ8J4/zjM7ov12fuTpktUKdMQjkeCp07Vd73mPkxw==",
+          "requires": {
+            "@types/rx-lite": "*"
+          }
+        },
+        "@types/rx-lite-backpressure": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/@types/rx-lite-backpressure/-/rx-lite-backpressure-4.0.3.tgz",
+          "integrity": "sha512-Y6aIeQCtNban5XSAF4B8dffhIKu6aAy/TXFlScHzSxh6ivfQBQw6UjxyEJxIOt3IT49YkS+siuayM2H/Q0cmgA==",
+          "requires": {
+            "@types/rx-lite": "*"
+          }
+        },
+        "@types/rx-lite-coincidence": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/@types/rx-lite-coincidence/-/rx-lite-coincidence-4.0.3.tgz",
+          "integrity": "sha512-1VNJqzE9gALUyMGypDXZZXzR0Tt7LC9DdAZQ3Ou/Q0MubNU35agVUNXKGHKpNTba+fr8GdIdkC26bRDqtCQBeQ==",
+          "requires": {
+            "@types/rx-lite": "*"
+          }
+        },
+        "@types/rx-lite-experimental": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/@types/rx-lite-experimental/-/rx-lite-experimental-4.0.1.tgz",
+          "integrity": "sha1-xTL1y98/LBXaFt7Ykw0bKYQCPL0=",
+          "requires": {
+            "@types/rx-lite": "*"
+          }
+        },
+        "@types/rx-lite-joinpatterns": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/@types/rx-lite-joinpatterns/-/rx-lite-joinpatterns-4.0.1.tgz",
+          "integrity": "sha1-9w/jcFGKhDLykVjMkv+1a05K/D4=",
+          "requires": {
+            "@types/rx-lite": "*"
+          }
+        },
+        "@types/rx-lite-testing": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/@types/rx-lite-testing/-/rx-lite-testing-4.0.1.tgz",
+          "integrity": "sha1-IbGdEfTf1v/vWp0WSOnIh5v+Iek=",
+          "requires": {
+            "@types/rx-lite-virtualtime": "*"
+          }
+        },
+        "@types/rx-lite-time": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/@types/rx-lite-time/-/rx-lite-time-4.0.3.tgz",
+          "integrity": "sha512-ukO5sPKDRwCGWRZRqPlaAU0SKVxmWwSjiOrLhoQDoWxZWg6vyB9XLEZViKOzIO6LnTIQBlk4UylYV0rnhJLxQw==",
+          "requires": {
+            "@types/rx-lite": "*"
+          }
+        },
+        "@types/rx-lite-virtualtime": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/@types/rx-lite-virtualtime/-/rx-lite-virtualtime-4.0.3.tgz",
+          "integrity": "sha512-3uC6sGmjpOKatZSVHI2xB1+dedgml669ZRvqxy+WqmGJDVusOdyxcKfyzjW0P3/GrCiN4nmRkLVMhPwHCc5QLg==",
+          "requires": {
+            "@types/rx-lite": "*"
+          }
+        },
+        "@types/sizzle": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
+          "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+        },
+        "btoa": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
+          "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
+        },
+        "combined-stream": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+          "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+        },
+        "es6-promise": {
+          "version": "4.2.6",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
+          "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q=="
+        },
+        "form-data": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+          "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "jquery": {
+          "version": "3.5.1",
+          "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
+          "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
+        },
+        "mime-db": {
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+        },
+        "mime-types": {
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+          "requires": {
+            "mime-db": "1.40.0"
+          }
+        },
+        "querystringify": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+          "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
+        },
+        "requires-port": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+          "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+        },
+        "rxjs": {
+          "version": "6.5.1",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.1.tgz",
+          "integrity": "sha512-y0j31WJc83wPu31vS1VlAFW5JGrnGC+j+TtGAa1fRQphy48+fDYiDmX8tjGloToEsMkxnouOg/1IzXGKkJnZMg==",
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tslib": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+          "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
+        },
+        "typescript": {
+          "version": "2.9.2",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+          "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w=="
+        },
+        "url-parse": {
+          "version": "1.4.7",
+          "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+          "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+          "requires": {
+            "querystringify": "^2.1.1",
+            "requires-port": "^1.0.0"
+          }
+        }
+      }
+    },
+    "tsconfig": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-6.0.0.tgz",
+      "integrity": "sha1-aw6DdgA9evGGT434+J3QBZ/80DI=",
+      "requires": {
+        "strip-bom": "^3.0.0",
+        "strip-json-comments": "^2.0.0"
+      }
+    },
+    "tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
+    "typescript": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+      "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+        }
+      }
+    },
+    "upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "optional": true
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+        }
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+    },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+    },
+    "v8-compile-cache": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
+      "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w=="
+    },
+    "v8flags": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.2.tgz",
+      "integrity": "sha512-MtivA7GF24yMPte9Rp/BWGCYQNaUj86zeYxV/x2RRJMKagImbbv3u8iJC57lNhWLPcGLJmHcHmFWkNsplbbLWw==",
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
+    },
+    "w3c-hr-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
+      "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
+      "requires": {
+        "browser-process-hrtime": "^0.1.2"
+      }
+    },
+    "w3c-xmlserializer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
+      "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
+      "requires": {
+        "domexception": "^1.0.1",
+        "webidl-conversions": "^4.0.2",
+        "xml-name-validator": "^3.0.0"
+      }
+    },
+    "watchpack": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
+      "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
+      "requires": {
+        "chokidar": "^3.4.0",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0",
+        "watchpack-chokidar2": "^2.0.0"
+      }
+    },
+    "watchpack-chokidar2": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "optional": true,
+      "requires": {
+        "chokidar": "^2.1.8"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "optional": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "optional": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "binary-extensions": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+          "optional": true
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "optional": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "fsevents": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "optional": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "optional": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "is-binary-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+          "optional": true,
+          "requires": {
+            "binary-extensions": "^1.0.0"
+          }
+        },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "optional": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        }
+      }
+    },
+    "webidl-conversions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+    },
+    "webpack": {
+      "version": "4.41.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.2.tgz",
+      "integrity": "sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/wasm-edit": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "acorn": "^6.2.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.3",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.1",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.1",
+        "watchpack": "^1.6.0",
+        "webpack-sources": "^1.4.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
+        },
+        "ajv": {
+          "version": "6.10.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
+        },
+        "eslint-scope": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+          "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+          "requires": {
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
+          }
+        }
+      }
+    },
+    "webpack-cli": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.10.tgz",
+      "integrity": "sha512-u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==",
+      "requires": {
+        "chalk": "2.4.2",
+        "cross-spawn": "6.0.5",
+        "enhanced-resolve": "4.1.0",
+        "findup-sync": "3.0.0",
+        "global-modules": "2.0.0",
+        "import-local": "2.0.0",
+        "interpret": "1.2.0",
+        "loader-utils": "1.2.3",
+        "supports-color": "6.1.0",
+        "v8-compile-cache": "2.0.3",
+        "yargs": "13.2.4"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "requires": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
+    },
+    "whatwg-url": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
+      "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
+      "requires": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^1.0.1",
+        "webidl-conversions": "^4.0.2"
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+    },
+    "worker-farm": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
+    "wrap-ansi": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "ws": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "requires": {
+        "async-limiter": "~1.0.0"
+      }
+    },
+    "xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
+    },
+    "xmlchars": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-1.3.1.tgz",
+      "integrity": "sha512-tGkGJkN8XqCod7OT+EvGYK5Z4SfDQGD30zAa58OcnAa0RRWgzUEK72tkXhsX1FZd+rgnhRxFtmO+ihkp8LHSkw=="
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+    },
+    "yargs": {
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
+      "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
+      "requires": {
+        "cliui": "^5.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "os-locale": "^3.1.0",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "requires": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "yn": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
+      "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo="
+    }
+  }
+}
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/package.json b/samples/openapi3/client/petstore/typescript/tests/jquery/package.json
new file mode 100644
index 000000000000..37ac165cdd01
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/package.json
@@ -0,0 +1,36 @@
+{
+  "private": true,
+  "dependencies": {
+    "@types/jsdom": "^12.2.3",
+    "@types/qunit": "^2.9.0",
+    "@types/rewire": "^2.5.28",
+    "form-data": "^2.5.1",
+    "jsdom": "^15.0.0",
+    "node-qunit-puppeteer": "^1.0.12",
+    "qunit": "^2.9.2",
+    "requirejs": "^2.3.6",
+    "rewire": "^4.0.1",
+    "ts-node": "^3.3.0",
+    "ts-petstore-client": "file:../../builds/jquery",
+    "webpack": "^4.41.2",
+    "webpack-cli": "^3.3.10"
+  },
+  "scripts": {
+    "test": "node ./dist/test-runner.js",
+    "build": "tsc && webpack"
+  },
+  "devDependencies": {
+    "@types/node": "^8.10.48",
+    "raw-loader": "^4.0.0",
+    "ts-loader": "^4.3.1",
+    "typescript": "^2.4.1"
+  },
+  "name": "typescript-test",
+  "version": "1.0.0",
+  "directories": {
+    "test": "test"
+  },
+  "author": "",
+  "license": "ISC",
+  "description": ""
+}
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/pom.xml b/samples/openapi3/client/petstore/typescript/tests/jquery/pom.xml
new file mode 100644
index 000000000000..13f65131ba92
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/pom.xml
@@ -0,0 +1,73 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptJQueryPetstoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Petstore Test Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-build</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>build</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/require1k.min.js b/samples/openapi3/client/petstore/typescript/tests/jquery/require1k.min.js
new file mode 100644
index 000000000000..d03349015e12
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/require1k.min.js
@@ -0,0 +1 @@
+R=function(e,n,v1){function t(e,o,u,a){if(e.g)return o(e.e,e);var c=e.g=e.l,f=new XMLHttpRequest;f.onload=function(i,l){function s(){l--||o(n,e)}200==f.status||e.t?(i=[],(e.t=e.t||f.response).replace(/(?:^|[^\w\$_.])require\s*\(\s*["']([^"']*)["']\s*\)/g,function(e,n){i.push(n)}),l=i.length,i.map(function(o){t(r(e.l,o),s,"."!=o[0]?c+"/../":n,o)}),s()):u?t(e.n=r(u+="../",a),o,u,a):(e.e=f,o(f,e))},e.t?f.onload():(f.open("GET",c,!0),f.send())}function r(e,n,t){if(e.e)throw e.e;return n?(f.href=e,i.href="."!=n[0]?"./node_modules/"+n:n,t=i.href+".js",f.href="",u[t]=u[t]||{l:t}):e.n?r(e.n):(e[c]||(e.f||a("(function(require,"+c+",module){"+e.t+"\n})//# sourceURL="+e.l))(function(n){return r(r(e.l,n))},e[c]={},e),e[c])}function o(e,n){t(e.call?{l:"",t:""+e,f:e}:r("",e),function(t,o){try{e=r(o)}catch(u){t=u}n&&n(t,e)})}var u={},a=eval,c="createElement",f=e[c]("base"),i=e[c]("a");return e.head.appendChild(f),c=e.querySelector("script[data-main]"),c&&o(c.dataset.main),c="exports",o}(document);
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/test-runner.ts b/samples/openapi3/client/petstore/typescript/tests/jquery/test-runner.ts
new file mode 100644
index 000000000000..7a08e997835c
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/test-runner.ts
@@ -0,0 +1,29 @@
+import * as path from 'path'
+import * as process from 'process'
+
+import { runQunitPuppeteer, printResultSummary, printFailedTests } from 'node-qunit-puppeteer';
+
+const qunitArgs = {
+  // Path to qunit tests suite
+  targetUrl: `file://${path.join(__dirname, '../index.html')}`,
+  // (optional, 30000 by default) global timeout for the tests suite
+  timeout: 10000,
+  // (optional, false by default) should the browser console be redirected or not
+  redirectConsole: true,
+  puppeteerArgs: [ '--disable-web-security']
+};
+ 
+runQunitPuppeteer(qunitArgs)
+  .then((result: any) => {
+    printResultSummary(result, console);
+ 
+    if (result.stats.failed > 0) {
+      printFailedTests(result, console);
+      // other action(s) on failed tests
+      process.exit(1)
+    }
+  })
+  .catch((ex: any) => {
+    console.error(ex);
+    process.exit(2)
+  });
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts
new file mode 100644
index 000000000000..3bb4a6e8b337
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts
@@ -0,0 +1,124 @@
+declare var QUnit: any;
+
+import * as petstore from 'ts-petstore-client';
+
+// @ts-ignore
+import petImage from "./pet.png";
+
+const configuration = petstore.createConfiguration()
+const petApi = new petstore.PetApi(configuration)
+
+const tag = new petstore.Tag();
+tag.name = "tag1"
+tag.id = Math.floor(Math.random() * 100000)
+
+const pet = new petstore.Pet()
+pet.id = Math.floor(Math.random() * 100000)
+pet.name = "PetName"
+pet.photoUrls = []
+pet.status = 'available'
+pet.tags = [ tag ]
+pet.category = undefined
+
+QUnit.module("PetApi")
+
+QUnit.test("addPet", (assert: any) => {
+    return petApi.addPet(pet).then(() => {
+        return petApi.getPetById(pet.id)
+    }).then((createdPet: petstore.Pet) => {
+        assert.deepEqual(createdPet, pet);
+    })
+})
+
+QUnit.test("deletePet", (assert: any) => {
+    return petApi.addPet(pet).then(() => {
+        return petApi.deletePet(pet.id)
+    }).then(() => {
+        return petApi.getPetById(pet.id)
+    }).then((pet: petstore.Pet) => {
+        throw new Error("Pet with id " + pet.id + " was not deleted!");
+    }).catch((err: any) => {
+        // pet does not exist
+        if (err.code && err.code == 404) {
+            assert.ok(true, "404'd on getPet after deletion - all good.")
+            return;
+        } else {
+            throw err;
+        }
+    })
+})
+
+QUnit.test("findPetsByStatus", (assert: any) => {
+    return petApi.addPet(pet).then(() => {
+        return petApi.findPetsByStatus(["available"])
+    }).then((pets: petstore.Pet[]) => {
+        assert.ok(pets.length >= 1, "Found at least one pet.");
+    })
+})
+
+// bugged on server side! Code 500
+/*    QUnit.test("findPetsByTag", (done) => {
+    petApi.addPet(pet).then(() => {
+        return petApi.findPetsByTags([tag.name])
+    }).then((pets: Pet[]) => {
+        expect(pets.length).to.be.at.least(1);
+        done();
+    }).catch((err) => {
+        done(err);
+    })
+})*/
+
+QUnit.test("getPetById", (assert: any) => {
+    return petApi.addPet(pet).then(() => {
+        return petApi.getPetById(pet.id)
+    }).then((returnedPet: petstore.Pet) => {
+        assert.deepEqual(returnedPet, pet);
+    })
+})
+
+QUnit.test("updatePet", (assert: any) => {
+    const oldName = pet.name
+    const updatedName = "updated name";
+    return petApi.addPet(pet).then(() => {
+        pet.name = updatedName
+        return petApi.updatePet(pet).then(() => {
+            pet.name = oldName;
+        }).catch((err: any) => {
+            pet.name = oldName
+            throw err;
+        });
+    }).then(() => {
+        return petApi.getPetById(pet.id);
+    }).then((returnedPet: petstore.Pet) => {
+        assert.equal(returnedPet.id, pet.id)
+        assert.equal(returnedPet.name, updatedName);
+    })
+})
+
+// not supported by online swagger api?
+/*    QUnit.test("updatePetWithForm", (done) => {
+    const updatedName = "updated name";
+    petApi.addPet(pet).then(() => {
+        return petApi.updatePetWithForm(pet.id, updatedName)
+    }).then(() => {
+        return petApi.getPetById(pet.id)
+    }).then((returnedPet: Pet) => {
+        expect(returnedPet.id).to.equal(pet.id)
+        expect(returnedPet.name).to.equal(updatedName);
+        done()
+    }).catch((err) => {
+        done(err)
+    })
+})*/
+
+QUnit.test("uploadFile", (assert: any) => {
+    const petImageFile: File = new File([petImage], "pet.png")
+    return petApi.uploadFile(pet.id, "Metadata", petImageFile)
+    .then(
+        (response: any) => {
+            assert.ok(response.code >= 200);
+            assert.ok(response.code < 300);
+            assert.ok(response.message.includes("pet.png"));
+        }
+    )
+})
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/pet.png b/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/pet.png
new file mode 100644
index 000000000000..c9a9c49163db
Binary files /dev/null and b/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/pet.png differ
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/test/http/jquery.test.ts b/samples/openapi3/client/petstore/typescript/tests/jquery/test/http/jquery.test.ts
new file mode 100644
index 000000000000..0898ca7f1551
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/test/http/jquery.test.ts
@@ -0,0 +1,87 @@
+declare var QUnit: any;
+
+import * as petstore from "ts-petstore-client";
+
+let libs: { [key: string]: petstore.HttpLibrary } = {
+    "jquery": new petstore.JQueryHttpLibrary()
+}
+
+
+for (let libName in libs) {
+    let lib = libs[libName];
+
+    QUnit.module(libName);
+    QUnit.test("GET-Request", (assert: any) => {
+        let requestContext = new petstore.RequestContext("http://httpbin.org/get", petstore.HttpMethod.GET);
+        requestContext.setHeaderParam("X-Test-Token", "Test-Token");
+        return new Promise((resolve, reject) => {
+            lib.send(requestContext).toPromise().then((resp: petstore.ResponseContext) => {
+                assert.ok(resp.httpStatusCode, 200, "Expected status code to be 200");
+                return resp.body.text();
+            }).then((txtBody: string) => {
+                let body = JSON.parse(txtBody);
+                assert.ok(body["headers"]);
+                assert.equal(body["headers"]["X-Test-Token"],"Test-Token");
+                resolve()    
+            },
+            (e: any) => {
+                console.error(e)
+                assert.ok(false, "Error: " + JSON.stringify(e))
+                reject(e)
+            })
+        });
+    })
+
+    QUnit.test("POST-Request", (assert: any) => {
+        let requestContext = new petstore.RequestContext("http://httpbin.org/post", petstore.HttpMethod.POST);
+        requestContext.setHeaderParam("X-Test-Token", "Test-Token");
+        let formData: FormData = new FormData()
+        formData.append("test", "test2");
+        formData.append("testFile", new Blob(["abc"], {
+            type: 'text/plain'
+        }), "fileName.json");
+
+        requestContext.setBody(formData);
+        return new Promise((resolve, reject) => {
+            lib.send(requestContext).toPromise().then(
+                (resp: petstore.ResponseContext) => {
+                assert.ok(resp.httpStatusCode, 200, "Expected status code to be 200");
+                return resp.body.text();
+            }).then((txtBody: any) => {
+                let body = JSON.parse(txtBody);
+                assert.ok(body["headers"]);
+                assert.equal(body["headers"]["X-Test-Token"], "Test-Token");
+                assert.equal(body["files"]["testFile"], "abc");
+                assert.equal(body["form"]["test"], "test2");
+                resolve();    
+            },
+            (e: any) => {
+                console.error(e)
+                assert.ok(false, "Error: " + JSON.stringify(e))
+                reject(e);
+            })
+        });            
+    });
+
+    QUnit.test("Cookie-Test", (assert: any) => {
+        let requestContext = new petstore.RequestContext("http://httpbin.org/post", petstore.HttpMethod.POST);
+        requestContext.addCookie("test", "test2");
+        return new Promise((resolve, reject) => {
+            try {
+                lib.send(requestContext).toPromise().then(
+                    (resp: petstore.ResponseContext) => {
+                    assert.ok(false, "Expected this request to fail!")
+                    reject("Successful request with Cookie Header!")
+                },
+                (e: any) => {
+                    console.error(e)
+                    assert.ok(false, "Request with cookie header field was sent and failed.")
+                    reject(e);
+                })
+            } catch (e) {
+                assert.equal(e.message, "Setting the \"Cookie\"-Header field is blocked by every major browser when using jquery.ajax requests. Please switch to another library like fetch to enable this option", "Received error when trying to send request containing Cookie Header with jquery");
+                resolve();
+            }
+        });            
+    });
+}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/tests.ts b/samples/openapi3/client/petstore/typescript/tests/jquery/tests.ts
new file mode 100644
index 000000000000..502f8c0dbbfc
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/tests.ts
@@ -0,0 +1,9 @@
+declare var QUnit: any;
+
+QUnit.test( "hello test", function( assert: any ) {
+    let random = Math.random()
+    assert.ok( random.toString() == "" + random, "Passed!" );
+});
+
+import './test/http/jquery.test'
+import './test/api/PetApi.test'
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/tsconfig.json b/samples/openapi3/client/petstore/typescript/tests/jquery/tsconfig.json
new file mode 100644
index 000000000000..a3d61c5ac815
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "sourceMap": false,
+        "outDir": "dist",
+        "types": [
+            "node"
+        ],
+        "lib": [
+            "es6",
+            "dom"
+        ]
+    },
+    "exclude": [
+        "node_modules"
+    ]
+}
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/webpack.config.js b/samples/openapi3/client/petstore/typescript/tests/jquery/webpack.config.js
new file mode 100644
index 000000000000..bea87945ed5b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/webpack.config.js
@@ -0,0 +1,26 @@
+const path = require('path');
+
+module.exports = {
+  entry: './tests.ts',
+  mode: "development",
+  module: {
+    rules: [
+      {
+        test: /\.png$/,
+        use: 'raw-loader'
+      },
+      {
+        test: /\.tsx?$/,
+        use: 'ts-loader',
+        exclude: /node_modules/
+      }
+    ]
+  },
+  resolve: {
+    extensions: [ '.tsx', '.ts', '.js' ]
+  },
+  output: {
+    filename: 'bundle.js',
+    path: path.resolve(__dirname, 'dist')
+  }
+};
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/tests/object_params/.gitignore b/samples/openapi3/client/petstore/typescript/tests/object_params/.gitignore
new file mode 100644
index 000000000000..1521c8b7652b
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/object_params/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/samples/openapi3/client/petstore/typescript/tests/object_params/package-lock.json b/samples/openapi3/client/petstore/typescript/tests/object_params/package-lock.json
new file mode 100644
index 000000000000..e944217a93a9
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/object_params/package-lock.json
@@ -0,0 +1,1432 @@
+{
+  "name": "typescript-test",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/chai": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.6.tgz",
+      "integrity": "sha512-CBk7KTZt3FhPsEkYioG6kuCIpWISw+YI8o+3op4+NXwTpvAPxE1ES8+PY8zfaK2L98b1z5oq03UHa4VYpeUxnw==",
+      "dev": true
+    },
+    "@types/isomorphic-fetch": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.34.tgz",
+      "integrity": "sha1-PDSD5gbAQTeEOOlRRk8A5OYHBtY=",
+      "dev": true
+    },
+    "@types/mocha": {
+      "version": "2.2.48",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.48.tgz",
+      "integrity": "sha512-nlK/iyETgafGli8Zh9zJVCTicvU3iajSkRwOh3Hhiva598CMqNJ4NcVCGMTGKpGpTYj/9R8RLzS9NAykSSCqGw==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "8.10.38",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.38.tgz",
+      "integrity": "sha512-EibsnbJerd0hBFaDjJStFrVbVBAtOy4dgL8zZFw0uOvPqzBAX59Ci8cgjg3+RgJIWhsB5A4c+pi+D4P9tQQh/A==",
+      "dev": true
+    },
+    "@types/rewire": {
+      "version": "2.5.28",
+      "resolved": "https://registry.npmjs.org/@types/rewire/-/rewire-2.5.28.tgz",
+      "integrity": "sha512-uD0j/AQOa5le7afuK+u+woi8jNKF1vf3DN0H7LCJhft/lNNibUr7VcAesdgtWfEKveZol3ZG1CJqwx2Bhrnl8w=="
+    },
+    "acorn": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
+    },
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "resolved": "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "requires": {
+        "acorn": "^3.0.4"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
+        }
+      }
+    },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "requires": {
+        "co": "^4.6.0",
+        "fast-deep-equal": "^1.0.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.3.0"
+      }
+    },
+    "ajv-keywords": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I="
+    },
+    "ansi-escapes": {
+      "version": "3.1.0",
+      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+    },
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        }
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "big.js": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "requires": {
+        "callsites": "^0.2.0"
+      }
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo="
+    },
+    "chai": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
+      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+      "dev": true,
+      "requires": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^3.0.1",
+        "get-func-name": "^2.0.0",
+        "pathval": "^1.1.0",
+        "type-detect": "^4.0.5"
+      }
+    },
+    "chalk": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
+    },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "dev": true
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.15.1",
+      "resolved": "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "deep-eql": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "dev": true,
+      "requires": {
+        "type-detect": "^4.0.0"
+      }
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
+    },
+    "doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
+    "enhanced-resolve": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+      "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "object-assign": "^4.0.1",
+        "tapable": "^0.2.7"
+      }
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "eslint": {
+      "version": "4.19.1",
+      "resolved": "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
+      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
+      "requires": {
+        "ajv": "^5.3.0",
+        "babel-code-frame": "^6.22.0",
+        "chalk": "^2.1.0",
+        "concat-stream": "^1.6.0",
+        "cross-spawn": "^5.1.0",
+        "debug": "^3.1.0",
+        "doctrine": "^2.1.0",
+        "eslint-scope": "^3.7.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^3.5.4",
+        "esquery": "^1.0.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^2.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.0.1",
+        "ignore": "^3.3.3",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^3.0.6",
+        "is-resolvable": "^1.0.0",
+        "js-yaml": "^3.9.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.2",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "pluralize": "^7.0.0",
+        "progress": "^2.0.0",
+        "regexpp": "^1.0.1",
+        "require-uncached": "^1.0.3",
+        "semver": "^5.3.0",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "~2.0.1",
+        "table": "4.0.2",
+        "text-table": "~0.2.0"
+      }
+    },
+    "eslint-scope": {
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="
+    },
+    "espree": {
+      "version": "3.5.4",
+      "resolved": "http://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+      "requires": {
+        "acorn": "^5.5.0",
+        "acorn-jsx": "^3.0.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+    },
+    "external-editor": {
+      "version": "2.2.0",
+      "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "requires": {
+        "chardet": "^0.4.0",
+        "iconv-lite": "^0.4.17",
+        "tmp": "^0.0.33"
+      }
+    },
+    "fast-deep-equal": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "requires": {
+        "flat-cache": "^1.2.1",
+        "object-assign": "^4.0.1"
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
+      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+      "requires": {
+        "circular-json": "^0.3.1",
+        "graceful-fs": "^4.1.2",
+        "rimraf": "~2.6.2",
+        "write": "^0.2.1"
+      }
+    },
+    "form-data": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+    },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "globals": {
+      "version": "11.9.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz",
+      "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg=="
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
+    },
+    "homedir-polyfill": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
+      "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "inquirer": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^2.0.4",
+        "figures": "^2.0.0",
+        "lodash": "^4.3.0",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rx-lite": "^4.0.8",
+        "rx-lite-aggregates": "^4.0.8",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "dev": true
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "loader-utils": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+      "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+      "dev": true,
+      "requires": {
+        "big.js": "^3.1.3",
+        "emojis-list": "^2.0.0",
+        "json5": "^0.5.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "make-error": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
+      "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g=="
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "mime-db": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+    },
+    "mime-types": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "requires": {
+        "mime-db": "1.40.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "mocha": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
+      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
+      "dev": true,
+      "requires": {
+        "browser-stdout": "1.3.1",
+        "commander": "2.15.1",
+        "debug": "3.1.0",
+        "diff": "3.5.0",
+        "escape-string-regexp": "1.0.5",
+        "glob": "7.1.2",
+        "growl": "1.10.5",
+        "he": "1.1.1",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "supports-color": "5.4.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+    },
+    "pathval": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
+      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
+      "dev": true
+    },
+    "pluralize": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+    },
+    "progress": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
+      "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg=="
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "regexpp": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
+      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="
+    },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "requires": {
+        "caller-path": "^0.1.0",
+        "resolve-from": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY="
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "rewire": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/rewire/-/rewire-4.0.1.tgz",
+      "integrity": "sha512-+7RQ/BYwTieHVXetpKhT11UbfF6v1kGhKFrtZN7UDL2PybMsSt/rpLWeEUGF5Ndsl1D5BxiCB14VDJyoX+noYw==",
+      "requires": {
+        "eslint": "^4.19.1"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "requires": {
+        "glob": "^7.0.5"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "rx-lite": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
+    },
+    "rx-lite-aggregates": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
+      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+      "requires": {
+        "rx-lite": "*"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "semver": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+    },
+    "slice-ansi": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+    },
+    "source-map-support": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "requires": {
+        "source-map": "^0.5.6"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "requires": {
+        "ansi-regex": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        }
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "table": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+      "requires": {
+        "ajv": "^5.2.3",
+        "ajv-keywords": "^2.1.0",
+        "chalk": "^2.1.0",
+        "lodash": "^4.17.4",
+        "slice-ansi": "1.0.0",
+        "string-width": "^2.1.1"
+      }
+    },
+    "tapable": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
+      "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
+      "dev": true
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "ts-loader": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.3.7.tgz",
+      "integrity": "sha512-8t3bu2FcEkXb+D4L+Cn8qiK2E2C6Ms4/GQChvz6IMbVurcFHLXrhW4EMtfaol1a1ASQACZGDUGit4NHnX9g7hQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1",
+        "enhanced-resolve": "^3.0.0",
+        "loader-utils": "^1.0.2",
+        "semver": "^5.0.1"
+      }
+    },
+    "ts-node": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-3.3.0.tgz",
+      "integrity": "sha1-wTxqMCTjC+EYDdUwOPwgkonUv2k=",
+      "requires": {
+        "arrify": "^1.0.0",
+        "chalk": "^2.0.0",
+        "diff": "^3.1.0",
+        "make-error": "^1.1.1",
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.0",
+        "tsconfig": "^6.0.0",
+        "v8flags": "^3.0.0",
+        "yn": "^2.0.0"
+      }
+    },
+    "ts-petstore-client": {
+      "version": "file:../../builds/object_params",
+      "requires": {
+        "@types/node": "*",
+        "@types/node-fetch": "^2.5.7",
+        "btoa": "^1.2.1",
+        "es6-promise": "^4.2.4",
+        "form-data": "^2.5.0",
+        "node-fetch": "^2.6.0",
+        "url-parse": "^1.4.3"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "14.0.6",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.6.tgz",
+          "integrity": "sha512-FbNmu4F67d3oZMWBV6Y4MaPER+0EpE9eIYf2yaHhCWovc1dlXCZkqGX4NLHfVVr6umt20TNBdRzrNJIzIKfdbw=="
+        },
+        "@types/node-fetch": {
+          "version": "2.5.7",
+          "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
+          "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+          "requires": {
+            "@types/node": "*",
+            "form-data": "^3.0.0"
+          },
+          "dependencies": {
+            "form-data": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+              "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+              "requires": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+              }
+            }
+          }
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+        },
+        "btoa": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
+          "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
+        },
+        "combined-stream": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+          "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+        },
+        "es6-promise": {
+          "version": "4.2.8",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+          "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+        },
+        "form-data": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+          "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "mime-db": {
+          "version": "1.44.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+          "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+        },
+        "mime-types": {
+          "version": "2.1.27",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+          "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+          "requires": {
+            "mime-db": "1.44.0"
+          }
+        },
+        "node-fetch": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+          "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+        },
+        "querystringify": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+          "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
+        },
+        "requires-port": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+          "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+        },
+        "typescript": {
+          "version": "3.9.3",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz",
+          "integrity": "sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ=="
+        },
+        "url-parse": {
+          "version": "1.4.7",
+          "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+          "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+          "requires": {
+            "querystringify": "^2.1.1",
+            "requires-port": "^1.0.0"
+          }
+        },
+        "whatwg-fetch": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
+          "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
+        }
+      }
+    },
+    "tsconfig": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-6.0.0.tgz",
+      "integrity": "sha1-aw6DdgA9evGGT434+J3QBZ/80DI=",
+      "requires": {
+        "strip-bom": "^3.0.0",
+        "strip-json-comments": "^2.0.0"
+      }
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
+    "typescript": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+      "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "v8flags": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz",
+      "integrity": "sha512-iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==",
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+    },
+    "yn": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
+      "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo="
+    }
+  }
+}
diff --git a/samples/openapi3/client/petstore/typescript/tests/object_params/package.json b/samples/openapi3/client/petstore/typescript/tests/object_params/package.json
new file mode 100644
index 000000000000..c9f65b041ef5
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/object_params/package.json
@@ -0,0 +1,32 @@
+{
+  "private": true,
+  "dependencies": {
+    "@types/rewire": "^2.5.28",
+    "form-data": "^2.5.0",
+    "rewire": "^4.0.1",
+    "ts-node": "^3.3.0",
+    "ts-petstore-client": "file:../../builds/object_params"
+  },
+  "scripts": {
+    "test": "mocha test/**/*.ts -r ts-node/register --timeout 10000",
+    "build": "tsc"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.0.1",
+    "@types/isomorphic-fetch": "0.0.34",
+    "@types/mocha": "^2.2.41",
+    "@types/node": "^8.10.38",
+    "chai": "^4.1.0",
+    "mocha": "^5.2.0",
+    "ts-loader": "^2.3.0",
+    "typescript": "^2.4.1"
+  },
+  "name": "typescript-test",
+  "version": "1.0.0",
+  "directories": {
+    "test": "test"
+  },
+  "author": "",
+  "license": "ISC",
+  "description": ""
+}
diff --git a/samples/openapi3/client/petstore/typescript/tests/object_params/pom.xml b/samples/openapi3/client/petstore/typescript/tests/object_params/pom.xml
new file mode 100644
index 000000000000..fd904b1ce3b8
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/object_params/pom.xml
@@ -0,0 +1,73 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptObjectParamsPetstoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Petstore Test Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-build</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>build</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts
new file mode 100644
index 000000000000..578fab4b0863
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts
@@ -0,0 +1,132 @@
+import * as petstore from 'ts-petstore-client'
+
+import { expect, assert } from "chai";
+import * as fs from 'fs';
+
+const configuration = petstore.createConfiguration()
+const petApi = new petstore.PetApi(configuration)
+
+
+const tag = new petstore.Tag();
+tag.name = "tag1"
+tag.id = Math.floor(Math.random() * 100000)
+
+const pet = new petstore.Pet()
+pet.id = Math.floor(Math.random() * 100000)
+pet.name = "PetName"
+pet.photoUrls = []
+pet.status = 'available'
+pet.tags = [ tag ]
+pet.category = undefined
+
+describe("PetApi", () =>{ 
+    it("addPet", (done) => {
+        petApi.addPet({ pet: pet }).then(() => {
+            return petApi.getPetById({ petId: pet.id })
+        }).then((createdPet: petstore.Pet) => {
+            expect(createdPet).to.deep.equal(pet);
+            done()
+        }).catch((err: any) => {
+            done(err)
+        })
+    })
+
+    it("deletePet", (done) => {
+        petApi.addPet({pet: pet}).then(() => {
+            return petApi.deletePet({ petId: pet.id} )
+        }).then(() => {
+            return petApi.getPetById({ petId: pet.id })
+        }).then((pet: petstore.Pet) => {
+            done("Pet with id " + pet.id + " was not deleted!");
+        }).catch((err: any) => {
+            if (err.code && err.code == 404) {
+                done();                
+            } else {
+                done(err)
+            }
+        })
+    })
+
+    it("findPetsByStatus", (done) => {
+        petApi.addPet({ pet: pet}).then(() => {
+            return petApi.findPetsByStatus({ status: ["available"]})
+        }).then((pets: petstore.Pet[]) => {
+            expect(pets.length).to.be.at.least(1);
+            done();
+        }).catch((err: any) => {
+            done(err)
+        })
+    })
+
+    // bugged on server side! Code 500
+/*    it("findPetsByTag", (done) => {
+        petApi.addPet(pet).then(() => {
+            return petApi.findPetsByTags([tag.name])
+        }).then((pets: Pet[]) => {
+            expect(pets.length).to.be.at.least(1);
+            done();
+        }).catch((err: any) => {
+            done(err);
+        })
+    })*/
+
+    it("getPetById", (done) => {
+        petApi.addPet({pet: pet}).then(() => {
+            return petApi.getPetById({ petId: pet.id})
+        }).then((returnedPet: petstore.Pet) => {
+            expect(returnedPet).to.deep.equal(pet);
+            done();
+        }).catch((err: any) => {
+            done(err);
+        })
+    })
+
+    it("updatePet", (done) => {
+        const oldName = pet.name
+        const updatedName = "updated name";
+        petApi.addPet({pet: pet}).then(() => {
+            pet.name = updatedName
+            return petApi.updatePet({pet: pet}).then(() => {
+                pet.name = oldName;
+            }).catch((err: any) => {
+                pet.name = oldName
+                throw err;
+            });
+        }).then(() => {
+            return petApi.getPetById({ petId: pet.id });
+        }).then((returnedPet: petstore.Pet) => {
+            expect(returnedPet.id).to.equal(pet.id)
+            expect(returnedPet.name).to.equal(updatedName);
+            done();
+        }).catch((err: any) => {
+            done(err)
+        })
+    })
+
+// not supported by online swagger api?
+/*    it("updatePetWithForm", (done) => {
+        const updatedName = "updated name";
+        petApi.addPet(pet).then(() => {
+            return petApi.updatePetWithForm(pet.id, updatedName)
+        }).then(() => {
+            return petApi.getPetById(pet.id)
+        }).then((returnedPet: Pet) => {
+            expect(returnedPet.id).to.equal(pet.id)
+            expect(returnedPet.name).to.equal(updatedName);
+            done()
+        }).catch((err: any) => {
+            done(err)
+        })
+    })*/
+
+    it("uploadFile", (done) => {
+        const image = fs.readFileSync(__dirname + "/pet.png")
+        petApi.uploadFile({ petId: pet.id, additionalMetadata: "Metadata", file: { name: "pet.png", data: image}}).then((response: any) => {
+            expect(response.code).to.be.gte(200).and.lt(300);
+            expect(response.message).to.contain("pet.png");
+            done();
+        }).catch((err: any) => {
+            done(err);
+        })
+    })
+})
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/pet.png b/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/pet.png
new file mode 100644
index 000000000000..c9a9c49163db
Binary files /dev/null and b/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/pet.png differ
diff --git a/samples/openapi3/client/petstore/typescript/tests/object_params/tsconfig.json b/samples/openapi3/client/petstore/typescript/tests/object_params/tsconfig.json
new file mode 100644
index 000000000000..4596f6e40bcf
--- /dev/null
+++ b/samples/openapi3/client/petstore/typescript/tests/object_params/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "sourceMap": false,
+        "outDir": "dist",
+        "types": [
+            "mocha",
+            "node"
+        ],
+        "lib": [
+            "es6",
+            "dom"
+        ]
+    },
+    "exclude": [
+        "node_modules"
+    ]
+}
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/.openapi-generator/FILES b/samples/openapi3/server/petstore/kotlin-springboot-reactive/.openapi-generator/FILES
new file mode 100644
index 000000000000..07fb739ffae5
--- /dev/null
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/.openapi-generator/FILES
@@ -0,0 +1,24 @@
+README.md
+build.gradle.kts
+pom.xml
+settings.gradle
+src/main/kotlin/org/openapitools/Application.kt
+src/main/kotlin/org/openapitools/api/ApiUtil.kt
+src/main/kotlin/org/openapitools/api/PetApi.kt
+src/main/kotlin/org/openapitools/api/PetApiService.kt
+src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt
+src/main/kotlin/org/openapitools/api/StoreApi.kt
+src/main/kotlin/org/openapitools/api/StoreApiService.kt
+src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt
+src/main/kotlin/org/openapitools/api/UserApi.kt
+src/main/kotlin/org/openapitools/api/UserApiService.kt
+src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt
+src/main/kotlin/org/openapitools/model/Category.kt
+src/main/kotlin/org/openapitools/model/InlineObject.kt
+src/main/kotlin/org/openapitools/model/InlineObject1.kt
+src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
+src/main/kotlin/org/openapitools/model/Order.kt
+src/main/kotlin/org/openapitools/model/Pet.kt
+src/main/kotlin/org/openapitools/model/Tag.kt
+src/main/kotlin/org/openapitools/model/User.kt
+src/main/resources/application.yaml
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION b/samples/openapi3/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION
index bfbf77eb7fad..d99e7162d01f 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.0-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/build.gradle.kts b/samples/openapi3/server/petstore/kotlin-springboot-reactive/build.gradle.kts
index f4561be14beb..682bfec8aa13 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/build.gradle.kts
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 buildscript {
     repositories {
         jcenter()
-        mavenCentral()
+        maven { url = uri("https://repo1.maven.org/maven2") }
     }
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:2.2.0.M3")
@@ -15,7 +15,7 @@ version = "1.0.0"
 
 repositories {
     jcenter()
-    mavenCentral()
+    maven { url = uri("https://repo1.maven.org/maven2") }
 }
 
 tasks.withType<KotlinCompile> {
@@ -51,7 +51,7 @@ dependencies {
 }
 
 repositories {
-	mavenCentral()
+	maven { url = uri("https://repo1.maven.org/maven2") }
 	maven { url = uri("https://repo.spring.io/snapshot") }
 	maven { url = uri("https://repo.spring.io/milestone") }
 }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/pom.xml b/samples/openapi3/server/petstore/kotlin-springboot-reactive/pom.xml
index b0a954d47075..cfbc66f6dc92 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/pom.xml
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/pom.xml
@@ -8,6 +8,7 @@
     <properties>
         <kotlin.version>1.3.30</kotlin.version>
 	    <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -123,6 +124,12 @@
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit5</artifactId>
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApi.kt
index c0aeae1a41c2..b77d4eaed655 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApi.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApi.kt
@@ -40,7 +40,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@Api(value = "Pet", description = "The Pet API")
+@Api(value = "pet", description = "The pet API")
 @RequestMapping("\${api.base-path:/v2}")
 class PetApiController(@Autowired(required = true) val service: PetApiService) {
 
@@ -48,16 +48,18 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         value = "Add a new pet to the store",
         nickname = "addPet",
         notes = "",
+        response = Pet::class,
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
-        value = [ApiResponse(code = 405, message = "Invalid input")])
+        value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 405, message = "Invalid input")])
     @RequestMapping(
         value = ["/pet"],
+        produces = ["application/xml", "application/json"], 
         consumes = ["application/json", "application/xml"],
         method = [RequestMethod.POST])
     suspend fun addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @Valid @RequestBody pet: Pet
-): ResponseEntity<Unit> {
-        return ResponseEntity(service.addPet(pet), HttpStatus.valueOf(405))
+): ResponseEntity<Pet> {
+        return ResponseEntity(service.addPet(pet), HttpStatus.valueOf(200))
     }
 
     @ApiOperation(
@@ -133,16 +135,18 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         value = "Update an existing pet",
         nickname = "updatePet",
         notes = "",
+        response = Pet::class,
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
-        value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")])
+        value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")])
     @RequestMapping(
         value = ["/pet"],
+        produces = ["application/xml", "application/json"], 
         consumes = ["application/json", "application/xml"],
         method = [RequestMethod.PUT])
     suspend fun updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @Valid @RequestBody pet: Pet
-): ResponseEntity<Unit> {
-        return ResponseEntity(service.updatePet(pet), HttpStatus.valueOf(400))
+): ResponseEntity<Pet> {
+        return ResponseEntity(service.updatePet(pet), HttpStatus.valueOf(200))
     }
 
     @ApiOperation(
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiService.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiService.kt
index 033bd517c44b..1f02d14a72dc 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiService.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiService.kt
@@ -5,7 +5,7 @@ import org.openapitools.model.Pet
 import kotlinx.coroutines.flow.Flow;
 interface PetApiService {
 
-	suspend fun addPet(pet: Pet): Unit
+	suspend fun addPet(pet: Pet): Pet
 
 	suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit
 
@@ -15,7 +15,7 @@ interface PetApiService {
 
 	suspend fun getPetById(petId: kotlin.Long): Pet
 
-	suspend fun updatePet(pet: Pet): Unit
+	suspend fun updatePet(pet: Pet): Pet
 
 	suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit
 
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt
index e6db20b52c93..8e255eaa8299 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service
 @Service
 class PetApiServiceImpl : PetApiService {
 
-    override suspend fun addPet(pet: Pet): Unit {
+    override suspend fun addPet(pet: Pet): Pet {
         TODO("Implement me")
     }
 
@@ -27,7 +27,7 @@ class PetApiServiceImpl : PetApiService {
         TODO("Implement me")
     }
 
-    override suspend fun updatePet(pet: Pet): Unit {
+    override suspend fun updatePet(pet: Pet): Pet {
         TODO("Implement me")
     }
 
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt
index 9bbe9fa4665f..528129abc42c 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt
@@ -39,7 +39,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@Api(value = "Store", description = "The Store API")
+@Api(value = "store", description = "The store API")
 @RequestMapping("\${api.base-path:/v2}")
 class StoreApiController(@Autowired(required = true) val service: StoreApiService) {
 
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApi.kt
index 0a0c2492d32e..479219327adc 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApi.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApi.kt
@@ -39,7 +39,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@Api(value = "User", description = "The User API")
+@Api(value = "user", description = "The user API")
 @RequestMapping("\${api.base-path:/v2}")
 class UserApiController(@Autowired(required = true) val service: UserApiService) {
 
@@ -47,7 +47,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         value = "Create user",
         nickname = "createUser",
         notes = "This can only be done by the logged in user.",
-        authorizations = [Authorization(value = "auth_cookie")])
+        authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
     @RequestMapping(
@@ -63,7 +63,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         value = "Creates list of users with given input array",
         nickname = "createUsersWithArrayInput",
         notes = "",
-        authorizations = [Authorization(value = "auth_cookie")])
+        authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
     @RequestMapping(
@@ -79,7 +79,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         value = "Creates list of users with given input array",
         nickname = "createUsersWithListInput",
         notes = "",
-        authorizations = [Authorization(value = "auth_cookie")])
+        authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
     @RequestMapping(
@@ -95,7 +95,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         value = "Delete user",
         nickname = "deleteUser",
         notes = "This can only be done by the logged in user.",
-        authorizations = [Authorization(value = "auth_cookie")])
+        authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")])
     @RequestMapping(
@@ -143,7 +143,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         value = "Logs out current logged in user session",
         nickname = "logoutUser",
         notes = "",
-        authorizations = [Authorization(value = "auth_cookie")])
+        authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
     @RequestMapping(
@@ -157,7 +157,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         value = "Updated user",
         nickname = "updateUser",
         notes = "This can only be done by the logged in user.",
-        authorizations = [Authorization(value = "auth_cookie")])
+        authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid user supplied"),ApiResponse(code = 404, message = "User not found")])
     @RequestMapping(
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt
index 54ee92921f28..c62a3ec6c6eb 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt
@@ -19,10 +19,10 @@ import io.swagger.annotations.ApiModelProperty
 data class Category(
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("id") val id: kotlin.Long? = null,
+    @field:JsonProperty("id") val id: kotlin.Long? = null,
 @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("name") val name: kotlin.String? = null
+    @field:JsonProperty("name") val name: kotlin.String? = null
 ) {
 
 }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/InlineObject.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/InlineObject.kt
index 2320d0f393a1..25c53cf08b83 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/InlineObject.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/InlineObject.kt
@@ -19,10 +19,10 @@ import io.swagger.annotations.ApiModelProperty
 data class InlineObject(
 
     @ApiModelProperty(example = "null", value = "Updated name of the pet")
-    @JsonProperty("name") val name: kotlin.String? = null,
+    @field:JsonProperty("name") val name: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "Updated status of the pet")
-    @JsonProperty("status") val status: kotlin.String? = null
+    @field:JsonProperty("status") val status: kotlin.String? = null
 ) {
 
 }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/InlineObject1.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/InlineObject1.kt
index 5443aa323fd5..8dfd458743be 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/InlineObject1.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/InlineObject1.kt
@@ -19,10 +19,10 @@ import io.swagger.annotations.ApiModelProperty
 data class InlineObject1(
 
     @ApiModelProperty(example = "null", value = "Additional data to pass to server")
-    @JsonProperty("additionalMetadata") val additionalMetadata: kotlin.String? = null,
+    @field:JsonProperty("additionalMetadata") val additionalMetadata: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "file to upload")
-    @JsonProperty("file") val file: org.springframework.core.io.Resource? = null
+    @field:JsonProperty("file") val file: org.springframework.core.io.Resource? = null
 ) {
 
 }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
index a49f0aea0687..6ac03ab610eb 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
@@ -20,13 +20,13 @@ import io.swagger.annotations.ApiModelProperty
 data class ModelApiResponse(
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("code") val code: kotlin.Int? = null,
+    @field:JsonProperty("code") val code: kotlin.Int? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("type") val type: kotlin.String? = null,
+    @field:JsonProperty("type") val type: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("message") val message: kotlin.String? = null
+    @field:JsonProperty("message") val message: kotlin.String? = null
 ) {
 
 }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt
index 0e12d03b1f86..83f4ba454214 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt
@@ -24,22 +24,22 @@ import io.swagger.annotations.ApiModelProperty
 data class Order(
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("id") val id: kotlin.Long? = null,
+    @field:JsonProperty("id") val id: kotlin.Long? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("petId") val petId: kotlin.Long? = null,
+    @field:JsonProperty("petId") val petId: kotlin.Long? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("quantity") val quantity: kotlin.Int? = null,
+    @field:JsonProperty("quantity") val quantity: kotlin.Int? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null,
+    @field:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null,
 
     @ApiModelProperty(example = "null", value = "Order Status")
-    @JsonProperty("status") val status: Order.Status? = null,
+    @field:JsonProperty("status") val status: Order.Status? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("complete") val complete: kotlin.Boolean? = null
+    @field:JsonProperty("complete") val complete: kotlin.Boolean? = null
 ) {
 
     /**
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt
index 5d3acb0d2ea9..de74ce560543 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt
@@ -27,23 +27,23 @@ data class Pet(
 
     @get:NotNull 
     @ApiModelProperty(example = "doggie", required = true, value = "")
-    @JsonProperty("name") val name: kotlin.String,
+    @field:JsonProperty("name") val name: kotlin.String,
 
     @get:NotNull 
     @ApiModelProperty(example = "null", required = true, value = "")
-    @JsonProperty("photoUrls") val photoUrls: kotlin.collections.List<kotlin.String>,
+    @field:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List<kotlin.String>,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("id") val id: kotlin.Long? = null,
+    @field:JsonProperty("id") val id: kotlin.Long? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("category") val category: Category? = null,
+    @field:JsonProperty("category") val category: Category? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("tags") val tags: kotlin.collections.List<Tag>? = null,
+    @field:JsonProperty("tags") val tags: kotlin.collections.List<Tag>? = null,
 
     @ApiModelProperty(example = "null", value = "pet status in the store")
-    @JsonProperty("status") val status: Pet.Status? = null
+    @field:JsonProperty("status") val status: Pet.Status? = null
 ) {
 
     /**
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt
index 5c6ec4d29682..7e7d12349842 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt
@@ -19,10 +19,10 @@ import io.swagger.annotations.ApiModelProperty
 data class Tag(
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("id") val id: kotlin.Long? = null,
+    @field:JsonProperty("id") val id: kotlin.Long? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("name") val name: kotlin.String? = null
+    @field:JsonProperty("name") val name: kotlin.String? = null
 ) {
 
 }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt
index 6f2e9f739abe..dc58873346e6 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt
@@ -25,28 +25,28 @@ import io.swagger.annotations.ApiModelProperty
 data class User(
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("id") val id: kotlin.Long? = null,
+    @field:JsonProperty("id") val id: kotlin.Long? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("username") val username: kotlin.String? = null,
+    @field:JsonProperty("username") val username: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("firstName") val firstName: kotlin.String? = null,
+    @field:JsonProperty("firstName") val firstName: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("lastName") val lastName: kotlin.String? = null,
+    @field:JsonProperty("lastName") val lastName: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("email") val email: kotlin.String? = null,
+    @field:JsonProperty("email") val email: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("password") val password: kotlin.String? = null,
+    @field:JsonProperty("password") val password: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("phone") val phone: kotlin.String? = null,
+    @field:JsonProperty("phone") val phone: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "User Status")
-    @JsonProperty("userStatus") val userStatus: kotlin.Int? = null
+    @field:JsonProperty("userStatus") val userStatus: kotlin.Int? = null
 ) {
 
 }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/.openapi-generator/FILES b/samples/openapi3/server/petstore/kotlin-springboot/.openapi-generator/FILES
new file mode 100644
index 000000000000..7a4e308c40d2
--- /dev/null
+++ b/samples/openapi3/server/petstore/kotlin-springboot/.openapi-generator/FILES
@@ -0,0 +1,25 @@
+README.md
+build.gradle.kts
+pom.xml
+settings.gradle
+src/main/kotlin/org/openapitools/Application.kt
+src/main/kotlin/org/openapitools/api/ApiUtil.kt
+src/main/kotlin/org/openapitools/api/Exceptions.kt
+src/main/kotlin/org/openapitools/api/PetApi.kt
+src/main/kotlin/org/openapitools/api/PetApiService.kt
+src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt
+src/main/kotlin/org/openapitools/api/StoreApi.kt
+src/main/kotlin/org/openapitools/api/StoreApiService.kt
+src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt
+src/main/kotlin/org/openapitools/api/UserApi.kt
+src/main/kotlin/org/openapitools/api/UserApiService.kt
+src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt
+src/main/kotlin/org/openapitools/model/Category.kt
+src/main/kotlin/org/openapitools/model/InlineObject.kt
+src/main/kotlin/org/openapitools/model/InlineObject1.kt
+src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
+src/main/kotlin/org/openapitools/model/Order.kt
+src/main/kotlin/org/openapitools/model/Pet.kt
+src/main/kotlin/org/openapitools/model/Tag.kt
+src/main/kotlin/org/openapitools/model/User.kt
+src/main/resources/application.yaml
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/.openapi-generator/VERSION b/samples/openapi3/server/petstore/kotlin-springboot/.openapi-generator/VERSION
index bfbf77eb7fad..d99e7162d01f 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/.openapi-generator/VERSION
+++ b/samples/openapi3/server/petstore/kotlin-springboot/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.0-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/build.gradle.kts b/samples/openapi3/server/petstore/kotlin-springboot/build.gradle.kts
index 26f4601e5705..49fe9400f70d 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/build.gradle.kts
+++ b/samples/openapi3/server/petstore/kotlin-springboot/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 buildscript {
     repositories {
         jcenter()
-        mavenCentral()
+        maven { url = uri("https://repo1.maven.org/maven2") }
     }
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:2.2.0.M3")
@@ -15,7 +15,7 @@ version = "1.0.0"
 
 repositories {
     jcenter()
-    mavenCentral()
+    maven { url = uri("https://repo1.maven.org/maven2") }
 }
 
 tasks.withType<KotlinCompile> {
@@ -48,7 +48,7 @@ dependencies {
 }
 
 repositories {
-	mavenCentral()
+	maven { url = uri("https://repo1.maven.org/maven2") }
 	maven { url = uri("https://repo.spring.io/snapshot") }
 	maven { url = uri("https://repo.spring.io/milestone") }
 }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/pom.xml b/samples/openapi3/server/petstore/kotlin-springboot/pom.xml
index 38491e8939c5..8af5e943b3a1 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/pom.xml
+++ b/samples/openapi3/server/petstore/kotlin-springboot/pom.xml
@@ -8,6 +8,7 @@
     <properties>
         <kotlin.version>1.3.30</kotlin.version>
 	    <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -113,6 +114,12 @@
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit5</artifactId>
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/ApiUtil.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/ApiUtil.kt
index 958a6f3ebfe8..88e892d0f49a 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/ApiUtil.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/ApiUtil.kt
@@ -9,9 +9,9 @@ object ApiUtil {
     fun setExampleResponse(req: NativeWebRequest, contentType: String, example: String) {
         try {
             val res = req.getNativeResponse(HttpServletResponse::class.java)
-            res.setCharacterEncoding("UTF-8")
-            res.addHeader("Content-Type", contentType)
-            res.getWriter().print(example)
+            res?.characterEncoding = "UTF-8"
+            res?.addHeader("Content-Type", contentType)
+            res?.writer?.print(example)
         } catch (e: IOException) {
             throw RuntimeException(e)
         }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApi.kt
index 4a111fdb7f5b..5b5ec9b8faeb 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApi.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApi.kt
@@ -39,7 +39,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@Api(value = "Pet", description = "The Pet API")
+@Api(value = "pet", description = "The pet API")
 @RequestMapping("\${api.base-path:/v2}")
 class PetApiController(@Autowired(required = true) val service: PetApiService) {
 
@@ -47,16 +47,18 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         value = "Add a new pet to the store",
         nickname = "addPet",
         notes = "",
+        response = Pet::class,
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
-        value = [ApiResponse(code = 405, message = "Invalid input")])
+        value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 405, message = "Invalid input")])
     @RequestMapping(
         value = ["/pet"],
+        produces = ["application/xml", "application/json"], 
         consumes = ["application/json", "application/xml"],
         method = [RequestMethod.POST])
     fun addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @Valid @RequestBody pet: Pet
-): ResponseEntity<Unit> {
-        return ResponseEntity(service.addPet(pet), HttpStatus.valueOf(405))
+): ResponseEntity<Pet> {
+        return ResponseEntity(service.addPet(pet), HttpStatus.valueOf(200))
     }
 
     @ApiOperation(
@@ -132,16 +134,18 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) {
         value = "Update an existing pet",
         nickname = "updatePet",
         notes = "",
+        response = Pet::class,
         authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])])
     @ApiResponses(
-        value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")])
+        value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")])
     @RequestMapping(
         value = ["/pet"],
+        produces = ["application/xml", "application/json"], 
         consumes = ["application/json", "application/xml"],
         method = [RequestMethod.PUT])
     fun updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @Valid @RequestBody pet: Pet
-): ResponseEntity<Unit> {
-        return ResponseEntity(service.updatePet(pet), HttpStatus.valueOf(400))
+): ResponseEntity<Pet> {
+        return ResponseEntity(service.updatePet(pet), HttpStatus.valueOf(200))
     }
 
     @ApiOperation(
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiService.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiService.kt
index 364f027cf8b5..723be54c7492 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiService.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiService.kt
@@ -4,7 +4,7 @@ import org.openapitools.model.ModelApiResponse
 import org.openapitools.model.Pet
 interface PetApiService {
 
-	fun addPet(pet: Pet): Unit
+	fun addPet(pet: Pet): Pet
 
 	fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit
 
@@ -14,7 +14,7 @@ interface PetApiService {
 
 	fun getPetById(petId: kotlin.Long): Pet
 
-	fun updatePet(pet: Pet): Unit
+	fun updatePet(pet: Pet): Pet
 
 	fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit
 
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt
index a4e09c0f1586..35dffecfac0f 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Service
 @Service
 class PetApiServiceImpl : PetApiService {
 
-    override fun addPet(pet: Pet): Unit {
+    override fun addPet(pet: Pet): Pet {
         TODO("Implement me")
     }
 
@@ -26,7 +26,7 @@ class PetApiServiceImpl : PetApiService {
         TODO("Implement me")
     }
 
-    override fun updatePet(pet: Pet): Unit {
+    override fun updatePet(pet: Pet): Pet {
         TODO("Implement me")
     }
 
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt
index 435631042e40..1e9e28c7b9db 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt
@@ -38,7 +38,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@Api(value = "Store", description = "The Store API")
+@Api(value = "store", description = "The store API")
 @RequestMapping("\${api.base-path:/v2}")
 class StoreApiController(@Autowired(required = true) val service: StoreApiService) {
 
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApi.kt
index f1f7d6eba455..7a04f660f17f 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApi.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApi.kt
@@ -38,7 +38,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@Api(value = "User", description = "The User API")
+@Api(value = "user", description = "The user API")
 @RequestMapping("\${api.base-path:/v2}")
 class UserApiController(@Autowired(required = true) val service: UserApiService) {
 
@@ -46,7 +46,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         value = "Create user",
         nickname = "createUser",
         notes = "This can only be done by the logged in user.",
-        authorizations = [Authorization(value = "auth_cookie")])
+        authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
     @RequestMapping(
@@ -62,7 +62,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         value = "Creates list of users with given input array",
         nickname = "createUsersWithArrayInput",
         notes = "",
-        authorizations = [Authorization(value = "auth_cookie")])
+        authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
     @RequestMapping(
@@ -78,7 +78,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         value = "Creates list of users with given input array",
         nickname = "createUsersWithListInput",
         notes = "",
-        authorizations = [Authorization(value = "auth_cookie")])
+        authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
     @RequestMapping(
@@ -94,7 +94,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         value = "Delete user",
         nickname = "deleteUser",
         notes = "This can only be done by the logged in user.",
-        authorizations = [Authorization(value = "auth_cookie")])
+        authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")])
     @RequestMapping(
@@ -142,7 +142,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         value = "Logs out current logged in user session",
         nickname = "logoutUser",
         notes = "",
-        authorizations = [Authorization(value = "auth_cookie")])
+        authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation")])
     @RequestMapping(
@@ -156,7 +156,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService)
         value = "Updated user",
         nickname = "updateUser",
         notes = "This can only be done by the logged in user.",
-        authorizations = [Authorization(value = "auth_cookie")])
+        authorizations = [Authorization(value = "api_key")])
     @ApiResponses(
         value = [ApiResponse(code = 400, message = "Invalid user supplied"),ApiResponse(code = 404, message = "User not found")])
     @RequestMapping(
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt
index 54ee92921f28..c62a3ec6c6eb 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt
@@ -19,10 +19,10 @@ import io.swagger.annotations.ApiModelProperty
 data class Category(
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("id") val id: kotlin.Long? = null,
+    @field:JsonProperty("id") val id: kotlin.Long? = null,
 @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("name") val name: kotlin.String? = null
+    @field:JsonProperty("name") val name: kotlin.String? = null
 ) {
 
 }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/InlineObject.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/InlineObject.kt
index 2320d0f393a1..25c53cf08b83 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/InlineObject.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/InlineObject.kt
@@ -19,10 +19,10 @@ import io.swagger.annotations.ApiModelProperty
 data class InlineObject(
 
     @ApiModelProperty(example = "null", value = "Updated name of the pet")
-    @JsonProperty("name") val name: kotlin.String? = null,
+    @field:JsonProperty("name") val name: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "Updated status of the pet")
-    @JsonProperty("status") val status: kotlin.String? = null
+    @field:JsonProperty("status") val status: kotlin.String? = null
 ) {
 
 }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/InlineObject1.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/InlineObject1.kt
index 5443aa323fd5..8dfd458743be 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/InlineObject1.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/InlineObject1.kt
@@ -19,10 +19,10 @@ import io.swagger.annotations.ApiModelProperty
 data class InlineObject1(
 
     @ApiModelProperty(example = "null", value = "Additional data to pass to server")
-    @JsonProperty("additionalMetadata") val additionalMetadata: kotlin.String? = null,
+    @field:JsonProperty("additionalMetadata") val additionalMetadata: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "file to upload")
-    @JsonProperty("file") val file: org.springframework.core.io.Resource? = null
+    @field:JsonProperty("file") val file: org.springframework.core.io.Resource? = null
 ) {
 
 }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
index a49f0aea0687..6ac03ab610eb 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
@@ -20,13 +20,13 @@ import io.swagger.annotations.ApiModelProperty
 data class ModelApiResponse(
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("code") val code: kotlin.Int? = null,
+    @field:JsonProperty("code") val code: kotlin.Int? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("type") val type: kotlin.String? = null,
+    @field:JsonProperty("type") val type: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("message") val message: kotlin.String? = null
+    @field:JsonProperty("message") val message: kotlin.String? = null
 ) {
 
 }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt
index 0e12d03b1f86..83f4ba454214 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt
@@ -24,22 +24,22 @@ import io.swagger.annotations.ApiModelProperty
 data class Order(
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("id") val id: kotlin.Long? = null,
+    @field:JsonProperty("id") val id: kotlin.Long? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("petId") val petId: kotlin.Long? = null,
+    @field:JsonProperty("petId") val petId: kotlin.Long? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("quantity") val quantity: kotlin.Int? = null,
+    @field:JsonProperty("quantity") val quantity: kotlin.Int? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null,
+    @field:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null,
 
     @ApiModelProperty(example = "null", value = "Order Status")
-    @JsonProperty("status") val status: Order.Status? = null,
+    @field:JsonProperty("status") val status: Order.Status? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("complete") val complete: kotlin.Boolean? = null
+    @field:JsonProperty("complete") val complete: kotlin.Boolean? = null
 ) {
 
     /**
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt
index 5d3acb0d2ea9..de74ce560543 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt
@@ -27,23 +27,23 @@ data class Pet(
 
     @get:NotNull 
     @ApiModelProperty(example = "doggie", required = true, value = "")
-    @JsonProperty("name") val name: kotlin.String,
+    @field:JsonProperty("name") val name: kotlin.String,
 
     @get:NotNull 
     @ApiModelProperty(example = "null", required = true, value = "")
-    @JsonProperty("photoUrls") val photoUrls: kotlin.collections.List<kotlin.String>,
+    @field:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List<kotlin.String>,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("id") val id: kotlin.Long? = null,
+    @field:JsonProperty("id") val id: kotlin.Long? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("category") val category: Category? = null,
+    @field:JsonProperty("category") val category: Category? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("tags") val tags: kotlin.collections.List<Tag>? = null,
+    @field:JsonProperty("tags") val tags: kotlin.collections.List<Tag>? = null,
 
     @ApiModelProperty(example = "null", value = "pet status in the store")
-    @JsonProperty("status") val status: Pet.Status? = null
+    @field:JsonProperty("status") val status: Pet.Status? = null
 ) {
 
     /**
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt
index 5c6ec4d29682..7e7d12349842 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt
@@ -19,10 +19,10 @@ import io.swagger.annotations.ApiModelProperty
 data class Tag(
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("id") val id: kotlin.Long? = null,
+    @field:JsonProperty("id") val id: kotlin.Long? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("name") val name: kotlin.String? = null
+    @field:JsonProperty("name") val name: kotlin.String? = null
 ) {
 
 }
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt
index 6f2e9f739abe..dc58873346e6 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt
@@ -25,28 +25,28 @@ import io.swagger.annotations.ApiModelProperty
 data class User(
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("id") val id: kotlin.Long? = null,
+    @field:JsonProperty("id") val id: kotlin.Long? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("username") val username: kotlin.String? = null,
+    @field:JsonProperty("username") val username: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("firstName") val firstName: kotlin.String? = null,
+    @field:JsonProperty("firstName") val firstName: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("lastName") val lastName: kotlin.String? = null,
+    @field:JsonProperty("lastName") val lastName: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("email") val email: kotlin.String? = null,
+    @field:JsonProperty("email") val email: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("password") val password: kotlin.String? = null,
+    @field:JsonProperty("password") val password: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "")
-    @JsonProperty("phone") val phone: kotlin.String? = null,
+    @field:JsonProperty("phone") val phone: kotlin.String? = null,
 
     @ApiModelProperty(example = "null", value = "User Status")
-    @JsonProperty("userStatus") val userStatus: kotlin.Int? = null
+    @field:JsonProperty("userStatus") val userStatus: kotlin.Int? = null
 ) {
 
 }
diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Filters/BasePathFilter.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Filters/BasePathFilter.cs
index 09ab6006a7bd..7b39888d460c 100644
--- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Filters/BasePathFilter.cs
+++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Filters/BasePathFilter.cs
@@ -28,7 +28,7 @@ public BasePathFilter(string basePath)
         /// <summary>
         /// Apply the filter
         /// </summary>
-        /// <param name="swaggerDoc">SwaggerDocument</param>
+        /// <param name="swaggerDoc">OpenApiDocument</param>
         /// <param name="context">FilterContext</param>
         public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
         {
diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 3b50b6a1f90b..ca9ab04cd5bd 100644
--- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -7,7 +7,7 @@
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>Org.OpenAPITools</AssemblyName>
     <PackageId>Org.OpenAPITools</PackageId>
-    <UserSecretsId>610f1c80-586d-488e-ae5d-e10fedfa8e85</UserSecretsId>
+    <UserSecretsId>5437bedb-0880-4b79-b60e-a06e28fd9ff2</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..</DockerfileContext>
   </PropertyGroup>
diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Startup.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Startup.cs
index 3035ce51ea9e..d985c7d38758 100644
--- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Startup.cs
+++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Startup.cs
@@ -34,7 +34,7 @@ public class Startup
         /// <summary>
         /// Constructor
         /// </summary>
-        /// <param name="env"></param>
+        /// <param name="configuration"></param>
         public Startup(IConfiguration configuration)
         {
             Configuration = configuration;
@@ -96,7 +96,6 @@ public void ConfigureServices(IServiceCollection services)
                         Version = "1.0.0",
                     });
                     c.CustomSchemaIds(type => type.FriendlyId(true));
-                    c.DescribeAllEnumsAsStrings();
                     c.IncludeXmlComments($"{AppContext.BaseDirectory}{Path.DirectorySeparatorChar}{Assembly.GetEntryAssembly().GetName().Name}.xml");
                     // Sets the basePath property in the Swagger document generated
                     c.DocumentFilter<BasePathFilter>("/v2");
diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Filters/BasePathFilter.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Filters/BasePathFilter.cs
index 09ab6006a7bd..7b39888d460c 100644
--- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Filters/BasePathFilter.cs
+++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Filters/BasePathFilter.cs
@@ -28,7 +28,7 @@ public BasePathFilter(string basePath)
         /// <summary>
         /// Apply the filter
         /// </summary>
-        /// <param name="swaggerDoc">SwaggerDocument</param>
+        /// <param name="swaggerDoc">OpenApiDocument</param>
         /// <param name="context">FilterContext</param>
         public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
         {
diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 0070a1041d0a..913f389801c2 100644
--- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -7,7 +7,7 @@
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>Org.OpenAPITools</AssemblyName>
     <PackageId>Org.OpenAPITools</PackageId>
-    <UserSecretsId>5e9a7265-7338-4119-b897-49feb129a70a</UserSecretsId>
+    <UserSecretsId>341adb46-9edd-4976-b953-4419c5134443</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..</DockerfileContext>
   </PropertyGroup>
diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Startup.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Startup.cs
index b63ad301ef6a..8ec6617ac151 100644
--- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Startup.cs
+++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Startup.cs
@@ -34,7 +34,7 @@ public class Startup
         /// <summary>
         /// Constructor
         /// </summary>
-        /// <param name="env"></param>
+        /// <param name="configuration"></param>
         public Startup(IConfiguration configuration)
         {
             Configuration = configuration;
@@ -96,7 +96,6 @@ public void ConfigureServices(IServiceCollection services)
                         Version = "1.0.0",
                     });
                     c.CustomSchemaIds(type => type.FriendlyId(true));
-                    c.DescribeAllEnumsAsStrings();
                     c.IncludeXmlComments($"{AppContext.BaseDirectory}{Path.DirectorySeparatorChar}{Assembly.GetEntryAssembly().GetName().Name}.xml");
                     // Sets the basePath property in the Swagger document generated
                     c.DocumentFilter<BasePathFilter>("/v2");
diff --git a/samples/server/petstore/java-inflector/.openapi-generator/FILES b/samples/server/petstore/java-inflector/.openapi-generator/FILES
new file mode 100644
index 000000000000..be2f3fed2fad
--- /dev/null
+++ b/samples/server/petstore/java-inflector/.openapi-generator/FILES
@@ -0,0 +1,58 @@
+README.md
+inflector.yaml
+pom.xml
+src/gen/java/org/openapitools/controllers/StringUtil.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+src/gen/java/org/openapitools/model/Animal.java
+src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+src/gen/java/org/openapitools/model/ArrayTest.java
+src/gen/java/org/openapitools/model/BigCat.java
+src/gen/java/org/openapitools/model/BigCatAllOf.java
+src/gen/java/org/openapitools/model/Capitalization.java
+src/gen/java/org/openapitools/model/Cat.java
+src/gen/java/org/openapitools/model/CatAllOf.java
+src/gen/java/org/openapitools/model/Category.java
+src/gen/java/org/openapitools/model/ClassModel.java
+src/gen/java/org/openapitools/model/Client.java
+src/gen/java/org/openapitools/model/Dog.java
+src/gen/java/org/openapitools/model/DogAllOf.java
+src/gen/java/org/openapitools/model/EnumArrays.java
+src/gen/java/org/openapitools/model/EnumClass.java
+src/gen/java/org/openapitools/model/EnumTest.java
+src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+src/gen/java/org/openapitools/model/FormatTest.java
+src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+src/gen/java/org/openapitools/model/MapTest.java
+src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+src/gen/java/org/openapitools/model/Model200Response.java
+src/gen/java/org/openapitools/model/ModelApiResponse.java
+src/gen/java/org/openapitools/model/ModelReturn.java
+src/gen/java/org/openapitools/model/Name.java
+src/gen/java/org/openapitools/model/NumberOnly.java
+src/gen/java/org/openapitools/model/Order.java
+src/gen/java/org/openapitools/model/OuterComposite.java
+src/gen/java/org/openapitools/model/OuterEnum.java
+src/gen/java/org/openapitools/model/Pet.java
+src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+src/gen/java/org/openapitools/model/SpecialModelName.java
+src/gen/java/org/openapitools/model/Tag.java
+src/gen/java/org/openapitools/model/TypeHolderDefault.java
+src/gen/java/org/openapitools/model/TypeHolderExample.java
+src/gen/java/org/openapitools/model/User.java
+src/gen/java/org/openapitools/model/XmlItem.java
+src/main/java/org/openapitools/controllers/AnotherFakeController.java
+src/main/java/org/openapitools/controllers/FakeClassnameTestController.java
+src/main/java/org/openapitools/controllers/FakeController.java
+src/main/java/org/openapitools/controllers/PetController.java
+src/main/java/org/openapitools/controllers/StoreController.java
+src/main/java/org/openapitools/controllers/UserController.java
+src/main/openapi/openapi.yaml
+src/main/webapp/WEB-INF/web.xml
diff --git a/samples/server/petstore/java-inflector/pom.xml b/samples/server/petstore/java-inflector/pom.xml
index f4388821a61e..6190136fc91b 100644
--- a/samples/server/petstore/java-inflector/pom.xml
+++ b/samples/server/petstore/java-inflector/pom.xml
@@ -126,6 +126,12 @@
             <artifactId>swagger-inflector</artifactId>
             <version>${swagger-inflector-version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -142,6 +148,7 @@
         <swagger-inflector-version>1.0.14</swagger-inflector-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <logback-version>1.0.1</logback-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.8.2</junit-version>
         <slf4j-version>1.6.3</slf4j-version>
     </properties>
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/controllers/StringUtil.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/controllers/StringUtil.java
index 65fe6532f162..c53c2d62b08c 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/controllers/StringUtil.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/controllers/StringUtil.java
@@ -1,6 +1,6 @@
 package org.openapitools.controllers;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 87b408f8664c..6a42ad2917ed 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -12,7 +12,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
index a59423124b27..a4723ad95d7f 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -13,7 +13,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 03d6f1e0ebad..abf085cf377f 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -12,7 +12,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index 5485142beac2..ee9922878a12 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -14,7 +14,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
   private Map<String, String> mapString = null;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 7b2e3d212fbb..eb9124c03e01 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -12,7 +12,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 1a8fd4dc6322..a4e29b96c1d6 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -13,7 +13,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
index e298a87806fb..abc8176245a8 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -12,7 +12,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
index 7d557665eb6f..7c55302d1d3c 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -12,7 +12,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Animal.java
index bfcf5486f248..bec871c6abd2 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Animal.java
@@ -12,7 +12,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class Animal   {
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 6d4e8d4f4e57..42df9fd8b086 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -13,7 +13,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index 5fc4bdeb0d6c..4e8baa75edd6 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -13,7 +13,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayTest.java
index 1209d34dbe82..7258f9fe6b51 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -13,7 +13,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class ArrayTest   {
   @JsonProperty("array_of_string")
   private List<String> arrayOfString = null;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/BigCat.java
index 76012471aeef..60c833781553 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/BigCat.java
@@ -13,7 +13,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/BigCatAllOf.java
index e52cd7567fec..730c5949bad4 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/BigCatAllOf.java
@@ -11,7 +11,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Capitalization.java
index 5ac9b3add792..0abd6a1a65b2 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Capitalization.java
@@ -10,7 +10,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Cat.java
index c8a9293aba98..e8599dfa5b25 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Cat.java
@@ -12,7 +12,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/CatAllOf.java
index 80e67fbfdf7d..241a784c1701 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -10,7 +10,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class CatAllOf   {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Category.java
index fe52381c0934..663a737b5176 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Category.java
@@ -10,7 +10,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ClassModel.java
index ca34fbd20177..0a2d61854834 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,7 @@
  **/
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Client.java
index a1838210b476..cbc47343bb8e 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Client.java
@@ -10,7 +10,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class Client   {
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Dog.java
index 9198fef58d58..47e285324178 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Dog.java
@@ -12,7 +12,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/DogAllOf.java
index 16c0b0451f58..523f44691543 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -10,7 +10,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class DogAllOf   {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumArrays.java
index 56b5ce98e147..29aaac72894f 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -13,7 +13,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumTest.java
index 4c3d4a46380e..e7c62f6d773e 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumTest.java
@@ -12,7 +12,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index 2c58dcd87887..d9618f93c4a0 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -12,7 +12,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class FileSchemaTestClass   {
   @JsonProperty("file")
   private java.io.File file;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FormatTest.java
index c962633574c1..1c4a99fb4695 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FormatTest.java
@@ -14,7 +14,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class FormatTest   {
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index b3c40ffb503e..23e0b3a8e85c 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -10,7 +10,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MapTest.java
index 7f22d852e3c1..79b461abff43 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MapTest.java
@@ -14,7 +14,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class MapTest   {
   @JsonProperty("map_map_of_string")
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 24b4ef0e1e71..e78541f3775f 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -16,7 +16,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Model200Response.java
index d2bb54537374..b8eb8c57b754 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Model200Response.java
@@ -13,7 +13,7 @@
  **/
 
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class Model200Response   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelApiResponse.java
index b711cae39dd0..96621a3d8e42 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -10,7 +10,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelReturn.java
index 990b7b9a36d4..80b38e6801f6 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -13,7 +13,7 @@
  **/
 
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class ModelReturn   {
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Name.java
index e96e805ba3ce..4f4d44d08cf8 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Name.java
@@ -13,7 +13,7 @@
  **/
 
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class Name   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/NumberOnly.java
index 8bb6fd8fe02f..c6ff3e8b74b8 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -11,7 +11,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class NumberOnly   {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Order.java
index ac70304afdaf..fe3a3b10caf8 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Order.java
@@ -12,7 +12,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/OuterComposite.java
index 6d46e00e23c0..2ac534a76fac 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -11,7 +11,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class OuterComposite   {
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Pet.java
index 822ca68e118e..5c76af2dbedc 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Pet.java
@@ -7,7 +7,9 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import org.openapitools.model.Category;
 import org.openapitools.model.Tag;
 
@@ -15,7 +17,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
@@ -27,7 +29,7 @@ public class Pet   {
   private String name;
 
   @JsonProperty("photoUrls")
-  private List<String> photoUrls = new ArrayList<String>();
+  private Set<String> photoUrls = new LinkedHashSet<String>();
 
   @JsonProperty("tags")
   private List<Tag> tags = null;
@@ -121,7 +123,7 @@ public void setName(String name) {
 
   /**
    **/
-  public Pet photoUrls(List<String> photoUrls) {
+  public Pet photoUrls(Set<String> photoUrls) {
     this.photoUrls = photoUrls;
     return this;
   }
@@ -129,10 +131,10 @@ public Pet photoUrls(List<String> photoUrls) {
   
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
-  public List<String> getPhotoUrls() {
+  public Set<String> getPhotoUrls() {
     return photoUrls;
   }
-  public void setPhotoUrls(List<String> photoUrls) {
+  public void setPhotoUrls(Set<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
 
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index 6c2e27d8bc3d..7ee41dd64340 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -10,7 +10,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/SpecialModelName.java
index 6582bf518848..6ecf7b776ab6 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -10,7 +10,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Tag.java
index 24e27ce9b245..afceff25d89c 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Tag.java
@@ -10,7 +10,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderDefault.java
index bef647c19a99..c585c9cc4137 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderDefault.java
@@ -13,7 +13,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderExample.java
index 821a0dc14449..1d7b4a7eb242 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -13,7 +13,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class TypeHolderExample   {
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/User.java
index c1f4956c8e98..36cae36dd47f 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/User.java
@@ -10,7 +10,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/XmlItem.java
index 8a9de640ab6b..366986ab3901 100644
--- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/XmlItem.java
@@ -13,7 +13,7 @@
 
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class XmlItem   {
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/AnotherFakeController.java b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/AnotherFakeController.java
index 6c23f0dfa38d..6ca09b073df4 100644
--- a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/AnotherFakeController.java
+++ b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/AnotherFakeController.java
@@ -12,7 +12,7 @@
 
 import org.openapitools.model.Client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class AnotherFakeController  {
   /** 
    * Uncomment and implement as you see fit.  These operations will map
diff --git a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeClassnameTestController.java b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeClassnameTestController.java
index df32b5442dce..3e0defee0baf 100644
--- a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeClassnameTestController.java
+++ b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeClassnameTestController.java
@@ -12,7 +12,7 @@
 
 import org.openapitools.model.Client;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class FakeClassnameTestController  {
   /** 
    * Uncomment and implement as you see fit.  These operations will map
diff --git a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeController.java b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeController.java
index 30c90ea5c658..4a02b3e5af36 100644
--- a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeController.java
+++ b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeController.java
@@ -21,7 +21,7 @@
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class FakeController  {
   /** 
    * Uncomment and implement as you see fit.  These operations will map
diff --git a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/PetController.java b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/PetController.java
index 4475ca1323a9..67922658ed4d 100644
--- a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/PetController.java
+++ b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/PetController.java
@@ -13,8 +13,9 @@
 import java.io.File;
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.Pet;
+import java.util.Set;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class PetController  {
   /** 
    * Uncomment and implement as you see fit.  These operations will map
@@ -41,7 +42,7 @@ public ResponseContext findPetsByStatus(RequestContext request , List<String> st
   */
 
   /*
-    public ResponseContext findPetsByTags(RequestContext request , List<String> tags) {
+    public ResponseContext findPetsByTags(RequestContext request , Set<String> tags) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
diff --git a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/StoreController.java b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/StoreController.java
index f77cc1110dd1..bf3879199098 100644
--- a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/StoreController.java
+++ b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/StoreController.java
@@ -13,7 +13,7 @@
 import java.util.Map;
 import org.openapitools.model.Order;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class StoreController  {
   /** 
    * Uncomment and implement as you see fit.  These operations will map
diff --git a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/UserController.java b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/UserController.java
index 01fd4b9873ac..96afbf7964ff 100644
--- a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/UserController.java
+++ b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/UserController.java
@@ -13,7 +13,7 @@
 import java.util.List;
 import org.openapitools.model.User;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
 public class UserController  {
   /** 
    * Uncomment and implement as you see fit.  These operations will map
diff --git a/samples/server/petstore/java-inflector/src/main/openapi/openapi.yaml b/samples/server/petstore/java-inflector/src/main/openapi/openapi.yaml
index 0dbcb3868c6d..0516277ce275 100644
--- a/samples/server/petstore/java-inflector/src/main/openapi/openapi.yaml
+++ b/samples/server/petstore/java-inflector/src/main/openapi/openapi.yaml
@@ -144,6 +144,7 @@ paths:
           items:
             type: string
           type: array
+          uniqueItems: true
         style: form
       responses:
         "200":
@@ -153,11 +154,13 @@ paths:
                 items:
                   $ref: '#/components/schemas/Pet'
                 type: array
+                uniqueItems: true
             application/json:
               schema:
                 items:
                   $ref: '#/components/schemas/Pet'
                 type: array
+                uniqueItems: true
           description: successful operation
         "400":
           content: {}
@@ -1384,6 +1387,7 @@ components:
           items:
             type: string
           type: array
+          uniqueItems: true
           xml:
             name: photoUrl
             wrapped: true
diff --git a/samples/server/petstore/java-msf4j/pom.xml b/samples/server/petstore/java-msf4j/pom.xml
index 546019f7ef3f..43c747ad0620 100644
--- a/samples/server/petstore/java-msf4j/pom.xml
+++ b/samples/server/petstore/java-msf4j/pom.xml
@@ -66,6 +66,12 @@
        <artifactId>jackson-jaxrs-json-provider</artifactId>
        <version>${jackson-version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${javax-annotation-version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
@@ -82,6 +88,7 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <servlet-api-version>2.5</servlet-api-version>
     <jackson-version>2.8.9</jackson-version>
+    <javax-annotation-version>1.3.2</javax-annotation-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index ba69f4d26dc7..0e8b0577954b 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -26,7 +26,7 @@
 
 
 @io.swagger.annotations.Api(description = "the another-fake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class AnotherFakeApi  {
    private final AnotherFakeApiService delegate = AnotherFakeApiServiceFactory.getAnotherFakeApi();
 
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index b9dd55abd62f..4469a5fccd26 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public abstract class AnotherFakeApiService {
     public abstract Response call123testSpecialTags(Client body
  ) throws NotFoundException;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/ApiException.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/ApiException.java
index fdbaeee3a29e..469ebd8be8c9 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/ApiException.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/ApiException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class ApiException extends Exception{
     private int code;
     public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/ApiOriginFilter.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/ApiOriginFilter.java
index 7039b5e4d92a..ccba4a66304e 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/ApiOriginFilter.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class ApiOriginFilter implements javax.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/ApiResponseMessage.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/ApiResponseMessage.java
index 9211b2dd7e51..9ffa746454b9 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/ApiResponseMessage.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java
index 5e685103d4d2..1fd809f2be82 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java
@@ -35,7 +35,7 @@
 
 
 @io.swagger.annotations.Api(description = "the fake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class FakeApi  {
    private final FakeApiService delegate = FakeApiServiceFactory.getFakeApi();
 
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java
index 2414c140c2f7..01934c762cbb 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -25,7 +25,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public abstract class FakeApiService {
     public abstract Response createXmlItem(XmlItem xmlItem
  ) throws NotFoundException;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
index e3afde6deb9d..8f10f4003e63 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -26,7 +26,7 @@
 
 
 @io.swagger.annotations.Api(description = "the fake_classname_test API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class FakeClassnameTestApi  {
    private final FakeClassnameTestApiService delegate = FakeClassnameTestApiServiceFactory.getFakeClassnameTestApi();
 
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
index 679338e9ce24..95ea41ddc5c0 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public abstract class FakeClassnameTestApiService {
     public abstract Response testClassname(Client body
  ) throws NotFoundException;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/NotFoundException.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/NotFoundException.java
index 526df6c1c197..9cc4bd8483d8 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/NotFoundException.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java
index 151dcac98ff7..ea62e1388617 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java
@@ -29,7 +29,7 @@
 
 
 @io.swagger.annotations.Api(description = "the pet API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class PetApi  {
    private final PetApiService delegate = PetApiServiceFactory.getPetApi();
 
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java
index 9d78c3935c78..8c72b4fb3755 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java
@@ -19,7 +19,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public abstract class PetApiService {
     public abstract Response addPet(Pet body
  ) throws NotFoundException;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java
index 58abccd28c8a..63dd05bf4d65 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java
@@ -27,7 +27,7 @@
 
 
 @io.swagger.annotations.Api(description = "the store API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class StoreApi  {
    private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi();
 
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java
index 0c35627842fc..0bcd337aa217 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public abstract class StoreApiService {
     public abstract Response deleteOrder(String orderId
  ) throws NotFoundException;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StringUtil.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StringUtil.java
index 367283558974..0e70cbb0defe 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StringUtil.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StringUtil.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/UserApi.java
index c2b730f4a1ff..836abbd19f76 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/UserApi.java
@@ -27,7 +27,7 @@
 
 
 @io.swagger.annotations.Api(description = "the user API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class UserApi  {
    private final UserApiService delegate = UserApiServiceFactory.getUserApi();
 
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/UserApiService.java
index a1f56f610756..14f88b4c31f7 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/UserApiService.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public abstract class UserApiService {
     public abstract Response createUser(User body
  ) throws NotFoundException;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index d3861661fc87..0bcb22594b79 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -11,7 +11,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
index 7ed8cce5803e..7d03498dbf01 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -12,7 +12,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 988818608a18..8d81dd696e38 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -11,7 +11,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index 96555d52a2ca..7b7116733534 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -13,7 +13,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
   private Map<String, String> mapString = null;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 9a1fc256e918..9e15ba3119e6 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -11,7 +11,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 121aff31eab5..f123a36ac5e6 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -12,7 +12,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
index db939089a7e7..758ef233e9dd 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -11,7 +11,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
index 8dff8c2719f4..86fe97600a1e 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -11,7 +11,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Animal.java
index c77f6b917ae5..6a1263917e1f 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Animal.java
@@ -11,7 +11,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class Animal   {
   @JsonProperty("className")
   private String className;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 045e926c78ed..4e5e9122c082 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -12,7 +12,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index 54016459cc93..e2e9f8dafab8 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -12,7 +12,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayTest.java
index 896f7e78cb63..cdb37ecef52e 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -12,7 +12,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class ArrayTest   {
   @JsonProperty("array_of_string")
   private List<String> arrayOfString = null;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/BigCat.java
index 10e898679c91..d2acc5321611 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/BigCat.java
@@ -12,7 +12,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/BigCatAllOf.java
index ca787eb1f21a..128e8090ee1d 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/BigCatAllOf.java
@@ -10,7 +10,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Capitalization.java
index 0e5c9dec0fdf..74658c5f3fc6 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Capitalization.java
@@ -9,7 +9,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Cat.java
index 359a17a349ac..4fad33bb4302 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Cat.java
@@ -11,7 +11,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/CatAllOf.java
index fc43e070b387..62bac2f507db 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -9,7 +9,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class CatAllOf   {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Category.java
index 33dd6dca1ef1..b172ecd9281d 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Category.java
@@ -9,7 +9,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ClassModel.java
index 5a6313ba05f7..3e41b40434a6 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ClassModel.java
@@ -10,7 +10,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Client.java
index 916847350e62..b8adb3a18949 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Client.java
@@ -9,7 +9,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class Client   {
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Dog.java
index 5599c10d77fe..8229fa57b6d4 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Dog.java
@@ -11,7 +11,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/DogAllOf.java
index d22d0a578cbb..10992ae53c8b 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -9,7 +9,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class DogAllOf   {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumArrays.java
index 12f148de787b..babfccdbb977 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -12,7 +12,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumTest.java
index cbc92920845a..91fde1cca859 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumTest.java
@@ -11,7 +11,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index c5c14ad580d1..ca55e0e6826f 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -11,7 +11,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class FileSchemaTestClass   {
   @JsonProperty("file")
   private java.io.File file;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FormatTest.java
index 4c0b990e756a..aa2ef50fb9cc 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FormatTest.java
@@ -13,7 +13,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class FormatTest   {
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index 472684e2a81a..57cd58f1d89e 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -9,7 +9,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MapTest.java
index 11e993aa2402..0db18e951268 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MapTest.java
@@ -13,7 +13,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class MapTest   {
   @JsonProperty("map_map_of_string")
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 255acf3d498f..74050fd6d69b 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -15,7 +15,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Model200Response.java
index dcbec8f4bd70..5f494df4f24f 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Model200Response.java
@@ -10,7 +10,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class Model200Response   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ModelApiResponse.java
index dded02c2d680..c7b94b30b2d6 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -9,7 +9,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ModelReturn.java
index db93c6c4808a..bda5422781df 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -10,7 +10,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class ModelReturn   {
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Name.java
index 93ebab84524a..46aa5b823616 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Name.java
@@ -10,7 +10,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class Name   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/NumberOnly.java
index 9d859d335fb9..da57107bef06 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -10,7 +10,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class NumberOnly   {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Order.java
index 200c30c5e95b..fe1d5eb32b55 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Order.java
@@ -11,7 +11,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/OuterComposite.java
index 633ae73d6efd..c8619144eac1 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -10,7 +10,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class OuterComposite   {
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java
index 1b6018e36586..e5d9b615ab2d 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java
@@ -16,7 +16,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index 772b1ab054ab..5497e02ff2c4 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -9,7 +9,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/SpecialModelName.java
index 056638527bea..51519cb134d4 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -9,7 +9,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Tag.java
index 681a3e45c9e9..390743eed3ab 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Tag.java
@@ -9,7 +9,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/TypeHolderDefault.java
index a2b459df9dfb..ad7c67d5ce6c 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/TypeHolderDefault.java
@@ -12,7 +12,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/TypeHolderExample.java
index 11b068f543a2..803e7712ef58 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -12,7 +12,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class TypeHolderExample   {
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/User.java
index 23c385a5eadf..64f3a7f137e4 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/User.java
@@ -9,7 +9,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/XmlItem.java
index 7ffd97cdab02..48e8926ad2cb 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/XmlItem.java
@@ -12,7 +12,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class XmlItem   {
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index ff40c8c32322..6479b9c71d23 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class AnotherFakeApiServiceImpl extends AnotherFakeApiService {
     @Override
     public Response call123testSpecialTags(Client body
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index bbf37cfaaab9..0e69a9a57318 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -25,7 +25,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class FakeApiServiceImpl extends FakeApiService {
     @Override
     public Response createXmlItem(XmlItem xmlItem
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
index 17af6f391cae..f9133db78b52 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class FakeClassnameTestApiServiceImpl extends FakeClassnameTestApiService {
     @Override
     public Response testClassname(Client body
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index 82f6698c3766..75b9c0aa3c28 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -19,7 +19,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class PetApiServiceImpl extends PetApiService {
     @Override
     public Response addPet(Pet body
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 6812973c3564..7c4535b1f100 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class StoreApiServiceImpl extends StoreApiService {
     @Override
     public Response deleteOrder(String orderId
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index 9d7c9e955acc..9110ccdf44d0 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen")
 public class UserApiServiceImpl extends UserApiService {
     @Override
     public Response createUser(User body
diff --git a/samples/server/petstore/java-pkmst/.openapi-generator/FILES b/samples/server/petstore/java-pkmst/.openapi-generator/FILES
new file mode 100644
index 000000000000..6456b9e376c8
--- /dev/null
+++ b/samples/server/petstore/java-pkmst/.openapi-generator/FILES
@@ -0,0 +1,41 @@
+Dockerfile
+Readme.md
+logstash.conf
+manifest.yml
+pom.xml
+src/main/java/com/prokarma/pkmst/PkmstApplication.java
+src/main/java/com/prokarma/pkmst/config/AppConfig.java
+src/main/java/com/prokarma/pkmst/config/swagger/OpenAPIDocumentationConfig.java
+src/main/java/com/prokarma/pkmst/config/swagger/PkmstProperties.java
+src/main/java/com/prokarma/pkmst/controller/PetApi.java
+src/main/java/com/prokarma/pkmst/controller/PetApiController.java
+src/main/java/com/prokarma/pkmst/controller/StoreApi.java
+src/main/java/com/prokarma/pkmst/controller/StoreApiController.java
+src/main/java/com/prokarma/pkmst/controller/UserApi.java
+src/main/java/com/prokarma/pkmst/controller/UserApiController.java
+src/main/java/com/prokarma/pkmst/logging/HttpLoggingFilter.java
+src/main/java/com/prokarma/pkmst/model/Category.java
+src/main/java/com/prokarma/pkmst/model/ModelApiResponse.java
+src/main/java/com/prokarma/pkmst/model/Order.java
+src/main/java/com/prokarma/pkmst/model/Pet.java
+src/main/java/com/prokarma/pkmst/model/Tag.java
+src/main/java/com/prokarma/pkmst/model/User.java
+src/main/java/com/prokarma/pkmst/security/AuthorizationServerConfiguration.java
+src/main/java/com/prokarma/pkmst/security/OAuth2SecurityConfiguration.java
+src/main/java/com/prokarma/pkmst/security/ResourceServerConfiguration.java
+src/main/resources/application-dev-config.yml
+src/main/resources/application-dev.yml
+src/main/resources/application-local.yml
+src/main/resources/bootstrap.yml
+src/test/java/com/prokarma/pkmst/controller/PkmstIT.java
+src/test/java/com/prokarma/pkmst/cucumber/PkmstSteps.java
+src/test/java/com/prokarma/pkmst/cucumber/PkmstTest.java
+src/test/java/com/prokarma/pkmst/cucumber/Pkmstpackage-info.java
+src/test/java/com/prokarma/pkmst/cucumber/report/ExecuteReport.java
+src/test/resources/application-test.properties
+src/test/resources/application.conf
+src/test/resources/application.properties
+src/test/resources/bootstrap.yml
+src/test/resources/com/prokarma/pkmst/cucumber/Pkmst.feature
+src/test/resources/gatling.conf
+src/test/scala/scalaFiles/testapi.scala
diff --git a/samples/server/petstore/java-pkmst/.openapi-generator/VERSION b/samples/server/petstore/java-pkmst/.openapi-generator/VERSION
index 58592f031f65..d99e7162d01f 100644
--- a/samples/server/petstore/java-pkmst/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-pkmst/.openapi-generator/VERSION
@@ -1 +1 @@
-4.2.3-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-pkmst/pom.xml b/samples/server/petstore/java-pkmst/pom.xml
index b9db9f451a93..56a0ea08d4da 100644
--- a/samples/server/petstore/java-pkmst/pom.xml
+++ b/samples/server/petstore/java-pkmst/pom.xml
@@ -15,6 +15,7 @@
       <cucumber-junit.version>1.2.5</cucumber-junit.version>
       <cucumber-java.version>1.2.5</cucumber-java.version>
       <cucumber-reporting.version>3.10.0</cucumber-reporting.version>
+      <javax-annotation-version>1.3.2</javax-annotation-version>
       <springfox-swagger2>2.6.1-SNAPSHOT</springfox-swagger2>
       <springfox-swagger-ui>2.6.0</springfox-swagger-ui>
       <slf4j-api>1.7.25</slf4j-api>
@@ -145,6 +146,12 @@
           <artifactId>commons-logging</artifactId>
           <version>1.2</version>
       </dependency>
+      <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <version>${javax-annotation-version}</version>
+          <scope>provided</scope>
+      </dependency>
       <!-- cucumber dependencies -->
       <dependency>
          <groupId>info.cukes</groupId>
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApi.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApi.java
index 460fd505765c..532a7a2dbca4 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApi.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.2.3-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -27,7 +27,7 @@
  * @author pkmst
  *
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPKMSTServerCodegen")
 @Api(value = "Pet", description = "the Pet API")
 public interface PetApi {
 
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApiController.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApiController.java
index 34f6667bc601..4e520a049fc7 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApiController.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApiController.java
@@ -25,7 +25,7 @@
  * @author pkmst
  *
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPKMSTServerCodegen")
 @Controller
 public class PetApiController implements PetApi {
     private final ObjectMapper objectMapper;
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java
index d797135e85e8..ff31820b354e 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.2.3-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -26,7 +26,7 @@
  * @author pkmst
  *
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPKMSTServerCodegen")
 @Api(value = "Store", description = "the Store API")
 public interface StoreApi {
 
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApiController.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApiController.java
index 4be18800808e..8583b8b0a562 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApiController.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApiController.java
@@ -24,7 +24,7 @@
  * @author pkmst
  *
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPKMSTServerCodegen")
 @Controller
 public class StoreApiController implements StoreApi {
     private final ObjectMapper objectMapper;
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApi.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApi.java
index 052d1e0ec067..bbabfd7b3866 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApi.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.2.3-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.0.0-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -26,7 +26,7 @@
  * @author pkmst
  *
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPKMSTServerCodegen")
 @Api(value = "User", description = "the User API")
 public interface UserApi {
 
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApiController.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApiController.java
index 8b98548847c7..409941aa9494 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApiController.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApiController.java
@@ -24,7 +24,7 @@
  * @author pkmst
  *
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPKMSTServerCodegen")
 @Controller
 public class UserApiController implements UserApi {
     private final ObjectMapper objectMapper;
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Category.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Category.java
index 712c524c9be2..3717d2585160 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Category.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Category.java
@@ -15,7 +15,7 @@
  */
 @ApiModel(description = "A category for a pet")
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPKMSTServerCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/ModelApiResponse.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/ModelApiResponse.java
index 7eb922bbce96..91387dddc8cd 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/ModelApiResponse.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/ModelApiResponse.java
@@ -15,7 +15,7 @@
  */
 @ApiModel(description = "Describes the result of uploading an image resource")
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPKMSTServerCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Order.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Order.java
index d35dbaf2ace6..30d554a02a91 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Order.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Order.java
@@ -17,7 +17,7 @@
  */
 @ApiModel(description = "An order for a pets from the pet store")
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPKMSTServerCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Pet.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Pet.java
index 2d5e1ef4e1bf..fea3e5ec5e6c 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Pet.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Pet.java
@@ -20,7 +20,7 @@
  */
 @ApiModel(description = "A pet for sale in the pet store")
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPKMSTServerCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Tag.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Tag.java
index 37057f779778..98014353c964 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Tag.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Tag.java
@@ -15,7 +15,7 @@
  */
 @ApiModel(description = "A tag for a pet")
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPKMSTServerCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/User.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/User.java
index c1ca0a29341f..85283919d741 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/User.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/User.java
@@ -15,7 +15,7 @@
  */
 @ApiModel(description = "A User who is purchasing from the pet store")
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPKMSTServerCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Category.java b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Category.java
index 86c8ed0cdefc..f9830c8f8fbd 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Category.java
+++ b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Category.java
@@ -8,7 +8,7 @@
 /**
  * A category for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/ModelApiResponse.java b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/ModelApiResponse.java
index 91638ac8c602..325a993665b7 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/ModelApiResponse.java
+++ b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/ModelApiResponse.java
@@ -8,7 +8,7 @@
 /**
  * Describes the result of uploading an image resource
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Order.java b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Order.java
index 91d6d09e7f7e..39e34680b93e 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Order.java
+++ b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Order.java
@@ -9,7 +9,7 @@
 /**
  * An order for a pets from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Pet.java
index 627f21f8c09b..e8f25ee4d52f 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Pet.java
+++ b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Pet.java
@@ -12,7 +12,7 @@
 /**
  * A pet for sale in the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Tag.java b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Tag.java
index 1a9079ff3456..01ed6be1412d 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Tag.java
+++ b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Tag.java
@@ -8,7 +8,7 @@
 /**
  * A tag for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/User.java b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/User.java
index 8df0a6506702..4f5399f9acb5 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/User.java
+++ b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/User.java
@@ -8,7 +8,7 @@
 /**
  * A User who is purchasing from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java
index 3ae905dcd449..de24a005c34c 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java
+++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java
@@ -23,7 +23,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiController extends Controller {
 
     private final PetApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java
index 45c8a8ddb519..6bc56487bee4 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java
@@ -11,7 +11,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiControllerImp implements PetApiControllerImpInterface {
     @Override
     public void addPet(Pet body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java
index 20019cb4f1f1..4a1e7d140799 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java
+++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java
@@ -22,7 +22,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiController extends Controller {
 
     private final StoreApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java
index aa29cbafda41..956d5f73b3e9 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiControllerImp implements StoreApiControllerImpInterface {
     @Override
     public void deleteOrder(String orderId) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java
index 6b6c7a2664c1..e335fdadf6c9 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java
+++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java
@@ -22,7 +22,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiController extends Controller {
 
     private final UserApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java
index 844b2c295752..9e2aebd99181 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiControllerImp implements UserApiControllerImpInterface {
     @Override
     public void createUser(User body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-async/app/apimodels/Category.java b/samples/server/petstore/java-play-framework-async/app/apimodels/Category.java
index 86c8ed0cdefc..f9830c8f8fbd 100644
--- a/samples/server/petstore/java-play-framework-async/app/apimodels/Category.java
+++ b/samples/server/petstore/java-play-framework-async/app/apimodels/Category.java
@@ -8,7 +8,7 @@
 /**
  * A category for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-async/app/apimodels/ModelApiResponse.java b/samples/server/petstore/java-play-framework-async/app/apimodels/ModelApiResponse.java
index 91638ac8c602..325a993665b7 100644
--- a/samples/server/petstore/java-play-framework-async/app/apimodels/ModelApiResponse.java
+++ b/samples/server/petstore/java-play-framework-async/app/apimodels/ModelApiResponse.java
@@ -8,7 +8,7 @@
 /**
  * Describes the result of uploading an image resource
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/java-play-framework-async/app/apimodels/Order.java b/samples/server/petstore/java-play-framework-async/app/apimodels/Order.java
index 91d6d09e7f7e..39e34680b93e 100644
--- a/samples/server/petstore/java-play-framework-async/app/apimodels/Order.java
+++ b/samples/server/petstore/java-play-framework-async/app/apimodels/Order.java
@@ -9,7 +9,7 @@
 /**
  * An order for a pets from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-async/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-async/app/apimodels/Pet.java
index 627f21f8c09b..e8f25ee4d52f 100644
--- a/samples/server/petstore/java-play-framework-async/app/apimodels/Pet.java
+++ b/samples/server/petstore/java-play-framework-async/app/apimodels/Pet.java
@@ -12,7 +12,7 @@
 /**
  * A pet for sale in the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-async/app/apimodels/Tag.java b/samples/server/petstore/java-play-framework-async/app/apimodels/Tag.java
index 1a9079ff3456..01ed6be1412d 100644
--- a/samples/server/petstore/java-play-framework-async/app/apimodels/Tag.java
+++ b/samples/server/petstore/java-play-framework-async/app/apimodels/Tag.java
@@ -8,7 +8,7 @@
 /**
  * A tag for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-async/app/apimodels/User.java b/samples/server/petstore/java-play-framework-async/app/apimodels/User.java
index 8df0a6506702..4f5399f9acb5 100644
--- a/samples/server/petstore/java-play-framework-async/app/apimodels/User.java
+++ b/samples/server/petstore/java-play-framework-async/app/apimodels/User.java
@@ -8,7 +8,7 @@
 /**
  * A User who is purchasing from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java
index da9485f9966b..3b2126979674 100644
--- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java
+++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java
@@ -26,7 +26,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiController extends Controller {
 
     private final PetApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java
index ef1056ebacca..679dbe248542 100644
--- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java
@@ -11,7 +11,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiControllerImp implements PetApiControllerImpInterface {
     @Override
     public void addPet(Pet body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java
index eae5b3e937a7..a0b75c6524fa 100644
--- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java
+++ b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java
@@ -25,7 +25,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiController extends Controller {
 
     private final StoreApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java
index e3be6aab57bc..322dc5cfe196 100644
--- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiControllerImp implements StoreApiControllerImpInterface {
     @Override
     public void deleteOrder(String orderId) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java
index 7d62582460fb..d84e39fb5860 100644
--- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java
+++ b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java
@@ -25,7 +25,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiController extends Controller {
 
     private final UserApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java
index a32a9ffd7d02..916ed4cc14c4 100644
--- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiControllerImp implements UserApiControllerImpInterface {
     @Override
     public void createUser(User body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Category.java b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Category.java
index 86c8ed0cdefc..f9830c8f8fbd 100644
--- a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Category.java
+++ b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Category.java
@@ -8,7 +8,7 @@
 /**
  * A category for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/ModelApiResponse.java b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/ModelApiResponse.java
index 91638ac8c602..325a993665b7 100644
--- a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/ModelApiResponse.java
+++ b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/ModelApiResponse.java
@@ -8,7 +8,7 @@
 /**
  * Describes the result of uploading an image resource
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Order.java b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Order.java
index 91d6d09e7f7e..39e34680b93e 100644
--- a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Order.java
+++ b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Order.java
@@ -9,7 +9,7 @@
 /**
  * An order for a pets from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Pet.java
index 627f21f8c09b..e8f25ee4d52f 100644
--- a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Pet.java
+++ b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Pet.java
@@ -12,7 +12,7 @@
 /**
  * A pet for sale in the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Tag.java b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Tag.java
index 1a9079ff3456..01ed6be1412d 100644
--- a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Tag.java
+++ b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Tag.java
@@ -8,7 +8,7 @@
 /**
  * A tag for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/User.java b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/User.java
index 8df0a6506702..4f5399f9acb5 100644
--- a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/User.java
+++ b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/User.java
@@ -8,7 +8,7 @@
 /**
  * A User who is purchasing from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java
index 758fe2ddaf43..65c9c93ff75c 100644
--- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java
+++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java
@@ -23,7 +23,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiController extends Controller {
 
     private final ObjectMapper mapper;
diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java
index 007892d9b480..2861687f718a 100644
--- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java
+++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java
@@ -22,7 +22,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiController extends Controller {
 
     private final ObjectMapper mapper;
diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java
index 6ef0d5970fa4..42e6ca4952e2 100644
--- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java
+++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java
@@ -22,7 +22,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiController extends Controller {
 
     private final ObjectMapper mapper;
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesAnyType.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesAnyType.java
index 0d9f1a4dc74c..25df15affae6 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesAnyType.java
@@ -10,7 +10,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesArray.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesArray.java
index 0b169be3610d..abece92a34cf 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesArray.java
@@ -11,7 +11,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesBoolean.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesBoolean.java
index 7658378e516c..502ebed356c4 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesBoolean.java
@@ -10,7 +10,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesClass.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesClass.java
index 5fbc69ab84f0..14156e3aba71 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesClass.java
@@ -12,7 +12,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesInteger.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesInteger.java
index ed3671bfeeb0..66d9b20e3041 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesInteger.java
@@ -10,7 +10,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesNumber.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesNumber.java
index d3590987e618..9badb1050a07 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesNumber.java
@@ -11,7 +11,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesObject.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesObject.java
index 5b27a250f255..89a6f7a2ca62 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesObject.java
@@ -10,7 +10,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesString.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesString.java
index bbd9f6541420..9bfc00750187 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesString.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesString.java
@@ -10,7 +10,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Animal.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Animal.java
index f79d687c4f98..2e50fd7f2e42 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Animal.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Animal.java
@@ -10,7 +10,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Animal   {
   @JsonProperty("className")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfArrayOfNumberOnly.java
index ebeb622cd165..4501c50549a2 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfArrayOfNumberOnly.java
@@ -11,7 +11,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfNumberOnly.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfNumberOnly.java
index 193c2f77177b..96e138fc02e6 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfNumberOnly.java
@@ -11,7 +11,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayTest.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayTest.java
index 80cefa109d66..7a11c2ef5794 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayTest.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayTest.java
@@ -11,7 +11,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ArrayTest   {
   @JsonProperty("array_of_string")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/BigCat.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/BigCat.java
index 0d6ca05971f1..e813a2f67b94 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/BigCat.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/BigCat.java
@@ -10,7 +10,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class BigCat extends Cat  {
   /**
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/BigCatAllOf.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/BigCatAllOf.java
index b0efcc1fc709..216459023efe 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/BigCatAllOf.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/BigCatAllOf.java
@@ -8,7 +8,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class BigCatAllOf   {
   /**
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Capitalization.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Capitalization.java
index cd5031205e81..63254ca1b150 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Capitalization.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Capitalization.java
@@ -8,7 +8,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Capitalization   {
   @JsonProperty("smallCamel")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Cat.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Cat.java
index 0c0aa9fd204a..a8b8b527fb3b 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Cat.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Cat.java
@@ -10,7 +10,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Cat extends Animal  {
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/CatAllOf.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/CatAllOf.java
index 04a1572284c8..c2d3a1bffb28 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/CatAllOf.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/CatAllOf.java
@@ -8,7 +8,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class CatAllOf   {
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Category.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Category.java
index 54b0afb8d7fe..af8760e21ccf 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Category.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Category.java
@@ -8,7 +8,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ClassModel.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ClassModel.java
index 84a3fbddbf83..3bace8236b2a 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ClassModel.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ClassModel.java
@@ -8,7 +8,7 @@
 /**
  * Model for testing model with \&quot;_class\&quot; property
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ClassModel   {
   @JsonProperty("_class")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Client.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Client.java
index 90da55b8e99d..b4898140c14b 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Client.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Client.java
@@ -8,7 +8,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Client   {
   @JsonProperty("client")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Dog.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Dog.java
index 7e4fe30c682a..1d51d083bd16 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Dog.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Dog.java
@@ -10,7 +10,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Dog extends Animal  {
   @JsonProperty("breed")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/DogAllOf.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/DogAllOf.java
index c49367934f97..247c1781c52d 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/DogAllOf.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/DogAllOf.java
@@ -8,7 +8,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class DogAllOf   {
   @JsonProperty("breed")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumArrays.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumArrays.java
index 1c5806205d0e..2f04ec57f30d 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumArrays.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumArrays.java
@@ -10,7 +10,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class EnumArrays   {
   /**
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumTest.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumTest.java
index 9bafde9f409f..494916f5d250 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumTest.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumTest.java
@@ -9,7 +9,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class EnumTest   {
   /**
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FileSchemaTestClass.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FileSchemaTestClass.java
index 839ab49292c6..e37cceb847a0 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FileSchemaTestClass.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FileSchemaTestClass.java
@@ -10,7 +10,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class FileSchemaTestClass   {
   @JsonProperty("file")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FormatTest.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FormatTest.java
index 8528b94b0af8..4f87ca3f5716 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FormatTest.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FormatTest.java
@@ -13,7 +13,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class FormatTest   {
   @JsonProperty("integer")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/HasOnlyReadOnly.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/HasOnlyReadOnly.java
index 20a101fd6b75..caccb004b8a9 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/HasOnlyReadOnly.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/HasOnlyReadOnly.java
@@ -8,7 +8,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MapTest.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MapTest.java
index 3b6a62bf3991..d6f492cc3002 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MapTest.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MapTest.java
@@ -11,7 +11,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class MapTest   {
   @JsonProperty("map_map_of_string")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java
index 461c704af66c..94e0717a2a98 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -14,7 +14,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Model200Response.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Model200Response.java
index 895a9578a350..136186c01d60 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Model200Response.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Model200Response.java
@@ -8,7 +8,7 @@
 /**
  * Model for testing model name starting with number
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Model200Response   {
   @JsonProperty("name")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ModelApiResponse.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ModelApiResponse.java
index 0a884c198159..eb344cbde93f 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ModelApiResponse.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ModelApiResponse.java
@@ -8,7 +8,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ModelReturn.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ModelReturn.java
index f92e2c16411f..74e362f0ea1e 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ModelReturn.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ModelReturn.java
@@ -8,7 +8,7 @@
 /**
  * Model for testing reserved words
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelReturn   {
   @JsonProperty("return")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Name.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Name.java
index 36d4fa5e5453..e82bee88e6ff 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Name.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Name.java
@@ -8,7 +8,7 @@
 /**
  * Model for testing model name same as property name
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Name   {
   @JsonProperty("name")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/NumberOnly.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/NumberOnly.java
index 0d35aae626b9..26d564a67961 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/NumberOnly.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/NumberOnly.java
@@ -9,7 +9,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class NumberOnly   {
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Order.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Order.java
index fa71fb1d7ef7..2ff7e4593a3a 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Order.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Order.java
@@ -9,7 +9,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/OuterComposite.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/OuterComposite.java
index 22c5a23259f9..f6786c3ff527 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/OuterComposite.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/OuterComposite.java
@@ -9,7 +9,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class OuterComposite   {
   @JsonProperty("my_number")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java
index 040f1bbb30b5..e726cb4685e7 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java
@@ -14,7 +14,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ReadOnlyFirst.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ReadOnlyFirst.java
index 4457994d7ae1..8bd2ae22b532 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ReadOnlyFirst.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ReadOnlyFirst.java
@@ -8,7 +8,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/SpecialModelName.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/SpecialModelName.java
index 9b1f8f6ebe3d..dcc2a0d7d691 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/SpecialModelName.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/SpecialModelName.java
@@ -8,7 +8,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Tag.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Tag.java
index ae8f84e74bc8..97bbcc7d832f 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Tag.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Tag.java
@@ -8,7 +8,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderDefault.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderDefault.java
index a12511e94fd2..798f369adb49 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderDefault.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderDefault.java
@@ -11,7 +11,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderExample.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderExample.java
index 4d636ea7fbcc..9938fc143aac 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderExample.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderExample.java
@@ -11,7 +11,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class TypeHolderExample   {
   @JsonProperty("string_item")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/User.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/User.java
index 91739a288c97..1313ff7a85fa 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/User.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/User.java
@@ -8,7 +8,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/XmlItem.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/XmlItem.java
index 6cf480a9e7ec..912a06c2d658 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/XmlItem.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/XmlItem.java
@@ -11,7 +11,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class XmlItem   {
   @JsonProperty("attribute_string")
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java
index 40a495cf697c..e0e6405d0d1d 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java
@@ -21,7 +21,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class AnotherFakeApiController extends Controller {
 
     private final AnotherFakeApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImp.java
index c6219faf1f80..fccc2e5b015c 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImp.java
@@ -9,7 +9,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class AnotherFakeApiControllerImp implements AnotherFakeApiControllerImpInterface {
     @Override
     public Client call123testSpecialTags(Client body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java
index 83d5368ae0e3..9869b1937d4b 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java
@@ -30,7 +30,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class FakeApiController extends Controller {
 
     private final FakeApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java
index eb70b4c105a0..236eaf1956fc 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java
@@ -18,7 +18,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class FakeApiControllerImp implements FakeApiControllerImpInterface {
     @Override
     public void createXmlItem(XmlItem xmlItem) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java
index f562306b210b..fd0a33c0f875 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java
@@ -21,7 +21,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class FakeClassnameTags123ApiController extends Controller {
 
     private final FakeClassnameTags123ApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImp.java
index 0476f1f6fd8c..90adc5ff21c5 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImp.java
@@ -9,7 +9,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class FakeClassnameTags123ApiControllerImp implements FakeClassnameTags123ApiControllerImpInterface {
     @Override
     public Client testClassname(Client body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java
index 8c6b6817ea2a..3f06e26439a0 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java
@@ -24,7 +24,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiController extends Controller {
 
     private final PetApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java
index 7f50baee48a9..42cbef67a5f7 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java
@@ -12,7 +12,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiControllerImp implements PetApiControllerImpInterface {
     @Override
     public void addPet(Pet body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java
index deb55e4b2f0e..fc02da21aa92 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java
@@ -22,7 +22,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiController extends Controller {
 
     private final StoreApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java
index 1e3c4774e970..d0d354a167cc 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiControllerImp implements StoreApiControllerImpInterface {
     @Override
     public void deleteOrder(String orderId) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java
index 45d4dcca32fe..f5ad46830546 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java
@@ -22,7 +22,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiController extends Controller {
 
     private final UserApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java
index cf9ab91ff6e2..573053bb537f 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiControllerImp implements UserApiControllerImpInterface {
     @Override
     public void createUser(User body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Category.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Category.java
index a4c373424f6f..a35ccc3ecf78 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Category.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Category.java
@@ -7,7 +7,7 @@
 /**
  * A category for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/ModelApiResponse.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/ModelApiResponse.java
index 666fa5ac4a15..e70bf678bddd 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/ModelApiResponse.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/ModelApiResponse.java
@@ -7,7 +7,7 @@
 /**
  * Describes the result of uploading an image resource
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Order.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Order.java
index b6b87b743456..45210d88001b 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Order.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Order.java
@@ -8,7 +8,7 @@
 /**
  * An order for a pets from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java
index 50aa303e7aef..94e1817bcdb4 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java
@@ -11,7 +11,7 @@
 /**
  * A pet for sale in the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Tag.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Tag.java
index 7d0207c02586..aac37f59b28e 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Tag.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Tag.java
@@ -7,7 +7,7 @@
 /**
  * A tag for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/User.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/User.java
index 2ef166c28380..5597880c5d7d 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/User.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/User.java
@@ -7,7 +7,7 @@
 /**
  * A User who is purchasing from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java
index 90a6c1e21d0f..9e387633d160 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java
@@ -21,7 +21,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiController extends Controller {
 
     private final PetApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java
index 76098b8df125..abd47c905137 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiControllerImp implements PetApiControllerImpInterface {
     @Override
     public void addPet(Pet body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java
index 0b6e428ab556..14a1bc066621 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java
@@ -20,7 +20,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiController extends Controller {
 
     private final StoreApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java
index 927150ecdc4c..0728571e5e5e 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java
@@ -9,7 +9,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiControllerImp implements StoreApiControllerImpInterface {
     @Override
     public void deleteOrder(String orderId) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java
index e5a73524b613..af9953802765 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java
@@ -20,7 +20,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiController extends Controller {
 
     private final UserApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java
index 95c462d23fc3..2ef2abaaff8a 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java
@@ -9,7 +9,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiControllerImp implements UserApiControllerImpInterface {
     @Override
     public void createUser(User body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Category.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Category.java
index 86c8ed0cdefc..f9830c8f8fbd 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Category.java
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Category.java
@@ -8,7 +8,7 @@
 /**
  * A category for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/ModelApiResponse.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/ModelApiResponse.java
index 91638ac8c602..325a993665b7 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/ModelApiResponse.java
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/ModelApiResponse.java
@@ -8,7 +8,7 @@
 /**
  * Describes the result of uploading an image resource
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Order.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Order.java
index 91d6d09e7f7e..39e34680b93e 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Order.java
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Order.java
@@ -9,7 +9,7 @@
 /**
  * An order for a pets from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java
index 627f21f8c09b..e8f25ee4d52f 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java
@@ -12,7 +12,7 @@
 /**
  * A pet for sale in the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Tag.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Tag.java
index 1a9079ff3456..01ed6be1412d 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Tag.java
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Tag.java
@@ -8,7 +8,7 @@
 /**
  * A tag for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/User.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/User.java
index 8df0a6506702..4f5399f9acb5 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/User.java
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/User.java
@@ -8,7 +8,7 @@
 /**
  * A User who is purchasing from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java
index 2da81d59b238..5e02b35ec983 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java
@@ -24,7 +24,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiController extends Controller {
 
     private final PetApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java
index 0e10dc5b0129..49b9ea1ada7a 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java
@@ -11,7 +11,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiControllerImp implements PetApiControllerImpInterface {
     @Override
     public void addPet(Pet body)  {
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java
index a6b0f9d4012f..c4ef06649928 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java
@@ -23,7 +23,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiController extends Controller {
 
     private final StoreApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java
index 5bb27ec6c59b..477ad09d5d71 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiControllerImp implements StoreApiControllerImpInterface {
     @Override
     public void deleteOrder(String orderId)  {
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java
index a56e39b5d79d..27c3af3e2cdd 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java
@@ -23,7 +23,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiController extends Controller {
 
     private final UserApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java
index f4381eb16ecb..251ffce1f09b 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiControllerImp implements UserApiControllerImpInterface {
     @Override
     public void createUser(User body)  {
diff --git a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Category.java b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Category.java
index 86c8ed0cdefc..f9830c8f8fbd 100644
--- a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Category.java
+++ b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Category.java
@@ -8,7 +8,7 @@
 /**
  * A category for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/ModelApiResponse.java b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/ModelApiResponse.java
index 91638ac8c602..325a993665b7 100644
--- a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/ModelApiResponse.java
+++ b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/ModelApiResponse.java
@@ -8,7 +8,7 @@
 /**
  * Describes the result of uploading an image resource
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Order.java b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Order.java
index 91d6d09e7f7e..39e34680b93e 100644
--- a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Order.java
+++ b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Order.java
@@ -9,7 +9,7 @@
 /**
  * An order for a pets from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Pet.java
index 627f21f8c09b..e8f25ee4d52f 100644
--- a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Pet.java
+++ b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Pet.java
@@ -12,7 +12,7 @@
 /**
  * A pet for sale in the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Tag.java b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Tag.java
index 1a9079ff3456..01ed6be1412d 100644
--- a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Tag.java
+++ b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Tag.java
@@ -8,7 +8,7 @@
 /**
  * A tag for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/User.java b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/User.java
index 8df0a6506702..4f5399f9acb5 100644
--- a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/User.java
+++ b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/User.java
@@ -8,7 +8,7 @@
 /**
  * A User who is purchasing from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java
index 78f2dc15baff..3ffea9428ba3 100644
--- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java
+++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java
@@ -23,7 +23,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiController extends Controller {
 
     private final PetApiControllerImp imp;
diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java
index 72d2e76c4378..0269dfb9877a 100644
--- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java
@@ -11,7 +11,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiControllerImp  {
     
     public void addPet(Pet body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java
index 24548ab65d8b..96d2fc5eab8a 100644
--- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java
+++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java
@@ -22,7 +22,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiController extends Controller {
 
     private final StoreApiControllerImp imp;
diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java
index 2bc751fb4d60..2ac36157699f 100644
--- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiControllerImp  {
     
     public void deleteOrder(String orderId) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java
index 162d47bf6344..bb94da53b956 100644
--- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java
+++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java
@@ -22,7 +22,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiController extends Controller {
 
     private final UserApiControllerImp imp;
diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java
index 03c8290dd60f..d69bd467a77f 100644
--- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiControllerImp  {
     
     public void createUser(User body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Category.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Category.java
index 86c8ed0cdefc..f9830c8f8fbd 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Category.java
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Category.java
@@ -8,7 +8,7 @@
 /**
  * A category for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/ModelApiResponse.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/ModelApiResponse.java
index 91638ac8c602..325a993665b7 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/ModelApiResponse.java
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/ModelApiResponse.java
@@ -8,7 +8,7 @@
 /**
  * Describes the result of uploading an image resource
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Order.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Order.java
index 91d6d09e7f7e..39e34680b93e 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Order.java
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Order.java
@@ -9,7 +9,7 @@
 /**
  * An order for a pets from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Pet.java
index 627f21f8c09b..e8f25ee4d52f 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Pet.java
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Pet.java
@@ -12,7 +12,7 @@
 /**
  * A pet for sale in the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Tag.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Tag.java
index 1a9079ff3456..01ed6be1412d 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Tag.java
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Tag.java
@@ -8,7 +8,7 @@
 /**
  * A tag for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/User.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/User.java
index 8df0a6506702..4f5399f9acb5 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/User.java
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/User.java
@@ -8,7 +8,7 @@
 /**
  * A User who is purchasing from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java
index 99c053d0a8f4..633a23ba5892 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java
@@ -23,7 +23,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiController extends Controller {
 
     private final PetApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java
index b228698b7021..591c99e164a2 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java
@@ -11,7 +11,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiControllerImp implements PetApiControllerImpInterface {
     @Override
     public void addPet(Pet body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java
index deb55e4b2f0e..fc02da21aa92 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java
@@ -22,7 +22,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiController extends Controller {
 
     private final StoreApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java
index 1e3c4774e970..d0d354a167cc 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiControllerImp implements StoreApiControllerImpInterface {
     @Override
     public void deleteOrder(String orderId) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java
index 45d4dcca32fe..f5ad46830546 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java
@@ -22,7 +22,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiController extends Controller {
 
     private final UserApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java
index cf9ab91ff6e2..573053bb537f 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiControllerImp implements UserApiControllerImpInterface {
     @Override
     public void createUser(User body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Category.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Category.java
index 86c8ed0cdefc..f9830c8f8fbd 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Category.java
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Category.java
@@ -8,7 +8,7 @@
 /**
  * A category for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/ModelApiResponse.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/ModelApiResponse.java
index 91638ac8c602..325a993665b7 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/ModelApiResponse.java
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/ModelApiResponse.java
@@ -8,7 +8,7 @@
 /**
  * Describes the result of uploading an image resource
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Order.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Order.java
index 91d6d09e7f7e..39e34680b93e 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Order.java
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Order.java
@@ -9,7 +9,7 @@
 /**
  * An order for a pets from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Pet.java
index 627f21f8c09b..e8f25ee4d52f 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Pet.java
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Pet.java
@@ -12,7 +12,7 @@
 /**
  * A pet for sale in the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Tag.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Tag.java
index 1a9079ff3456..01ed6be1412d 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Tag.java
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Tag.java
@@ -8,7 +8,7 @@
 /**
  * A tag for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/User.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/User.java
index 8df0a6506702..4f5399f9acb5 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/User.java
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/User.java
@@ -8,7 +8,7 @@
 /**
  * A User who is purchasing from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java
index 4a3f756111b9..dbfc7e755040 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java
@@ -22,7 +22,7 @@
 import play.Configuration;
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiController extends Controller {
 
     private final PetApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java
index b228698b7021..591c99e164a2 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java
@@ -11,7 +11,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiControllerImp implements PetApiControllerImpInterface {
     @Override
     public void addPet(Pet body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java
index 84ce1f3ae3ed..07a66bd7f5e4 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java
@@ -21,7 +21,7 @@
 import play.Configuration;
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiController extends Controller {
 
     private final StoreApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java
index 1e3c4774e970..d0d354a167cc 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiControllerImp implements StoreApiControllerImpInterface {
     @Override
     public void deleteOrder(String orderId) throws Exception {
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java
index 65a000b663c9..83aec5cb9257 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java
@@ -21,7 +21,7 @@
 import play.Configuration;
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiController extends Controller {
 
     private final UserApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java
index cf9ab91ff6e2..573053bb537f 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiControllerImp implements UserApiControllerImpInterface {
     @Override
     public void createUser(User body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework/app/apimodels/Category.java b/samples/server/petstore/java-play-framework/app/apimodels/Category.java
index 86c8ed0cdefc..f9830c8f8fbd 100644
--- a/samples/server/petstore/java-play-framework/app/apimodels/Category.java
+++ b/samples/server/petstore/java-play-framework/app/apimodels/Category.java
@@ -8,7 +8,7 @@
 /**
  * A category for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework/app/apimodels/ModelApiResponse.java b/samples/server/petstore/java-play-framework/app/apimodels/ModelApiResponse.java
index 91638ac8c602..325a993665b7 100644
--- a/samples/server/petstore/java-play-framework/app/apimodels/ModelApiResponse.java
+++ b/samples/server/petstore/java-play-framework/app/apimodels/ModelApiResponse.java
@@ -8,7 +8,7 @@
 /**
  * Describes the result of uploading an image resource
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/java-play-framework/app/apimodels/Order.java b/samples/server/petstore/java-play-framework/app/apimodels/Order.java
index 91d6d09e7f7e..39e34680b93e 100644
--- a/samples/server/petstore/java-play-framework/app/apimodels/Order.java
+++ b/samples/server/petstore/java-play-framework/app/apimodels/Order.java
@@ -9,7 +9,7 @@
 /**
  * An order for a pets from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework/app/apimodels/Pet.java
index 627f21f8c09b..e8f25ee4d52f 100644
--- a/samples/server/petstore/java-play-framework/app/apimodels/Pet.java
+++ b/samples/server/petstore/java-play-framework/app/apimodels/Pet.java
@@ -12,7 +12,7 @@
 /**
  * A pet for sale in the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework/app/apimodels/Tag.java b/samples/server/petstore/java-play-framework/app/apimodels/Tag.java
index 1a9079ff3456..01ed6be1412d 100644
--- a/samples/server/petstore/java-play-framework/app/apimodels/Tag.java
+++ b/samples/server/petstore/java-play-framework/app/apimodels/Tag.java
@@ -8,7 +8,7 @@
 /**
  * A tag for a pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework/app/apimodels/User.java b/samples/server/petstore/java-play-framework/app/apimodels/User.java
index 8df0a6506702..4f5399f9acb5 100644
--- a/samples/server/petstore/java-play-framework/app/apimodels/User.java
+++ b/samples/server/petstore/java-play-framework/app/apimodels/User.java
@@ -8,7 +8,7 @@
 /**
  * A User who is purchasing from the pet store
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java
index 99c053d0a8f4..633a23ba5892 100644
--- a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java
+++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java
@@ -23,7 +23,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiController extends Controller {
 
     private final PetApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java
index b228698b7021..591c99e164a2 100644
--- a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java
@@ -11,7 +11,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class PetApiControllerImp implements PetApiControllerImpInterface {
     @Override
     public void addPet(Pet body) throws Exception {
diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java
index deb55e4b2f0e..fc02da21aa92 100644
--- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java
+++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java
@@ -22,7 +22,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiController extends Controller {
 
     private final StoreApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java
index 1e3c4774e970..d0d354a167cc 100644
--- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class StoreApiControllerImp implements StoreApiControllerImpInterface {
     @Override
     public void deleteOrder(String orderId) throws Exception {
diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java
index 45d4dcca32fe..f5ad46830546 100644
--- a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java
+++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java
@@ -22,7 +22,7 @@
 
 import openapitools.OpenAPIUtils.ApiAction;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiController extends Controller {
 
     private final UserApiControllerImpInterface imp;
diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java
index cf9ab91ff6e2..573053bb537f 100644
--- a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java
@@ -10,7 +10,7 @@
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
 public class UserApiControllerImp implements UserApiControllerImpInterface {
     @Override
     public void createUser(User body) throws Exception {
diff --git a/samples/server/petstore/java-undertow/.openapi-generator/FILES b/samples/server/petstore/java-undertow/.openapi-generator/FILES
new file mode 100644
index 000000000000..8857fbfab67c
--- /dev/null
+++ b/samples/server/petstore/java-undertow/.openapi-generator/FILES
@@ -0,0 +1,14 @@
+README.md
+pom.xml
+src/main/java/org/openapitools/handler/PathHandlerProvider.java
+src/main/java/org/openapitools/model/Category.java
+src/main/java/org/openapitools/model/ModelApiResponse.java
+src/main/java/org/openapitools/model/Order.java
+src/main/java/org/openapitools/model/Pet.java
+src/main/java/org/openapitools/model/Tag.java
+src/main/java/org/openapitools/model/User.java
+src/main/resources/META-INF/services/com.networknt.server.HandlerProvider
+src/main/resources/config/oauth/primary.crt
+src/main/resources/config/openapi.json
+src/main/resources/config/security.json
+src/main/resources/config/server.json
diff --git a/samples/server/petstore/java-undertow/.openapi-generator/VERSION b/samples/server/petstore/java-undertow/.openapi-generator/VERSION
index 06b5019af3f4..d99e7162d01f 100644
--- a/samples/server/petstore/java-undertow/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-undertow/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-undertow/pom.xml b/samples/server/petstore/java-undertow/pom.xml
index 02f17355f8b9..d429b06ddd41 100644
--- a/samples/server/petstore/java-undertow/pom.xml
+++ b/samples/server/petstore/java-undertow/pom.xml
@@ -16,7 +16,8 @@
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.framework>0.1.1</version.framework>
-        <version.jackson>2.8.2</version.jackson>
+        <version.jackson>2.9.10</version.jackson>
+        <version.jackson.databind>2.9.10.4</version.jackson.databind>
         <version.slf4j>1.7.21</version.slf4j>
         <version.jose4j>0.5.2</version.jose4j>
         <version.antlr4>4.5.3</version.antlr4>
@@ -80,7 +81,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${version.jackson}</version>
+            <version>${version.jackson.databind}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -107,6 +108,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${version.swagger}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>
diff --git a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Pet.java
index 9d9d4b7f43b0..3b979d4d40a9 100644
--- a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Pet.java
@@ -22,7 +22,7 @@
 public class Pet   {
   
   private Long id;
-  private Category category = null;
+  private Category category;
   private String name;
   private List<String> photoUrls = new ArrayList<String>();
   private List<Tag> tags = new ArrayList<Tag>();
diff --git a/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json b/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json
index 9bf88937dd77..1a863721712a 100644
--- a/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json
+++ b/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json
@@ -1,35 +1,32 @@
 {
   "openapi" : "3.0.1",
   "info" : {
-    "title" : "OpenAPI Petstore",
     "description" : "This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.",
     "license" : {
       "name" : "Apache-2.0",
       "url" : "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
+    "title" : "OpenAPI Petstore",
     "version" : "1.0.0"
   },
   "servers" : [ {
     "url" : "http://petstore.swagger.io/v2"
   } ],
   "tags" : [ {
-    "name" : "pet",
-    "description" : "Everything about your Pets"
+    "description" : "Everything about your Pets",
+    "name" : "pet"
   }, {
-    "name" : "store",
-    "description" : "Access to Petstore orders"
+    "description" : "Access to Petstore orders",
+    "name" : "store"
   }, {
-    "name" : "user",
-    "description" : "Operations about user"
+    "description" : "Operations about user",
+    "name" : "user"
   } ],
   "paths" : {
     "/pet" : {
-      "put" : {
-        "tags" : [ "pet" ],
-        "summary" : "Update an existing pet",
-        "operationId" : "updatePet",
+      "post" : {
+        "operationId" : "addPet",
         "requestBody" : {
-          "description" : "Pet object that needs to be added to the store",
           "content" : {
             "application/json" : {
               "schema" : {
@@ -42,35 +39,27 @@
               }
             }
           },
+          "description" : "Pet object that needs to be added to the store",
           "required" : true
         },
         "responses" : {
-          "400" : {
-            "description" : "Invalid ID supplied",
-            "content" : { }
-          },
-          "404" : {
-            "description" : "Pet not found",
-            "content" : { }
-          },
           "405" : {
-            "description" : "Validation exception",
-            "content" : { }
+            "content" : { },
+            "description" : "Invalid input"
           }
         },
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
+        "summary" : "Add a new pet to the store",
+        "tags" : [ "pet" ],
         "x-codegen-request-body-name" : "body",
         "x-contentType" : "application/json",
         "x-accepts" : "application/json"
       },
-      "post" : {
-        "tags" : [ "pet" ],
-        "summary" : "Add a new pet to the store",
-        "operationId" : "addPet",
+      "put" : {
+        "operationId" : "updatePet",
         "requestBody" : {
-          "description" : "Pet object that needs to be added to the store",
           "content" : {
             "application/json" : {
               "schema" : {
@@ -83,17 +72,28 @@
               }
             }
           },
+          "description" : "Pet object that needs to be added to the store",
           "required" : true
         },
         "responses" : {
+          "400" : {
+            "content" : { },
+            "description" : "Invalid ID supplied"
+          },
+          "404" : {
+            "content" : { },
+            "description" : "Pet not found"
+          },
           "405" : {
-            "description" : "Invalid input",
-            "content" : { }
+            "content" : { },
+            "description" : "Validation exception"
           }
         },
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
+        "summary" : "Update an existing pet",
+        "tags" : [ "pet" ],
         "x-codegen-request-body-name" : "body",
         "x-contentType" : "application/json",
         "x-accepts" : "application/json"
@@ -101,132 +101,160 @@
     },
     "/pet/findByStatus" : {
       "get" : {
-        "tags" : [ "pet" ],
-        "summary" : "Finds Pets by status",
         "description" : "Multiple status values can be provided with comma separated strings",
         "operationId" : "findPetsByStatus",
         "parameters" : [ {
-          "name" : "status",
-          "in" : "query",
           "description" : "Status values that need to be considered for filter",
-          "required" : true,
-          "style" : "form",
           "explode" : false,
+          "in" : "query",
+          "name" : "status",
+          "required" : true,
           "schema" : {
-            "type" : "array",
             "items" : {
-              "type" : "string",
               "default" : "available",
-              "enum" : [ "available", "pending", "sold" ]
-            }
-          }
+              "enum" : [ "available", "pending", "sold" ],
+              "type" : "string"
+            },
+            "type" : "array"
+          },
+          "style" : "form"
         } ],
         "responses" : {
           "200" : {
-            "description" : "successful operation",
             "content" : {
               "application/xml" : {
                 "schema" : {
-                  "type" : "array",
                   "items" : {
                     "$ref" : "#/components/schemas/Pet"
-                  }
+                  },
+                  "type" : "array"
                 }
               },
               "application/json" : {
                 "schema" : {
-                  "type" : "array",
                   "items" : {
                     "$ref" : "#/components/schemas/Pet"
-                  }
+                  },
+                  "type" : "array"
                 }
               }
-            }
+            },
+            "description" : "successful operation"
           },
           "400" : {
-            "description" : "Invalid status value",
-            "content" : { }
+            "content" : { },
+            "description" : "Invalid status value"
           }
         },
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
+        "summary" : "Finds Pets by status",
+        "tags" : [ "pet" ],
         "x-accepts" : "application/json"
       }
     },
     "/pet/findByTags" : {
       "get" : {
-        "tags" : [ "pet" ],
-        "summary" : "Finds Pets by tags",
+        "deprecated" : true,
         "description" : "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.",
         "operationId" : "findPetsByTags",
         "parameters" : [ {
-          "name" : "tags",
-          "in" : "query",
           "description" : "Tags to filter by",
-          "required" : true,
-          "style" : "form",
           "explode" : false,
+          "in" : "query",
+          "name" : "tags",
+          "required" : true,
           "schema" : {
-            "type" : "array",
             "items" : {
               "type" : "string"
-            }
-          }
+            },
+            "type" : "array"
+          },
+          "style" : "form"
         } ],
         "responses" : {
           "200" : {
-            "description" : "successful operation",
             "content" : {
               "application/xml" : {
                 "schema" : {
-                  "type" : "array",
                   "items" : {
                     "$ref" : "#/components/schemas/Pet"
-                  }
+                  },
+                  "type" : "array"
                 }
               },
               "application/json" : {
                 "schema" : {
-                  "type" : "array",
                   "items" : {
                     "$ref" : "#/components/schemas/Pet"
-                  }
+                  },
+                  "type" : "array"
                 }
               }
-            }
+            },
+            "description" : "successful operation"
           },
           "400" : {
-            "description" : "Invalid tag value",
-            "content" : { }
+            "content" : { },
+            "description" : "Invalid tag value"
           }
         },
-        "deprecated" : true,
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
+        "summary" : "Finds Pets by tags",
+        "tags" : [ "pet" ],
         "x-accepts" : "application/json"
       }
     },
     "/pet/{petId}" : {
-      "get" : {
+      "delete" : {
+        "operationId" : "deletePet",
+        "parameters" : [ {
+          "in" : "header",
+          "name" : "api_key",
+          "schema" : {
+            "type" : "string"
+          }
+        }, {
+          "description" : "Pet id to delete",
+          "in" : "path",
+          "name" : "petId",
+          "required" : true,
+          "schema" : {
+            "format" : "int64",
+            "type" : "integer"
+          }
+        } ],
+        "responses" : {
+          "400" : {
+            "content" : { },
+            "description" : "Invalid pet value"
+          }
+        },
+        "security" : [ {
+          "petstore_auth" : [ "write:pets", "read:pets" ]
+        } ],
+        "summary" : "Deletes a pet",
         "tags" : [ "pet" ],
-        "summary" : "Find pet by ID",
+        "x-accepts" : "application/json"
+      },
+      "get" : {
         "description" : "Returns a single pet",
         "operationId" : "getPetById",
         "parameters" : [ {
-          "name" : "petId",
-          "in" : "path",
           "description" : "ID of pet to return",
+          "in" : "path",
+          "name" : "petId",
           "required" : true,
           "schema" : {
-            "type" : "integer",
-            "format" : "int64"
+            "format" : "int64",
+            "type" : "integer"
           }
         } ],
         "responses" : {
           "200" : {
-            "description" : "successful operation",
             "content" : {
               "application/xml" : {
                 "schema" : {
@@ -238,34 +266,35 @@
                   "$ref" : "#/components/schemas/Pet"
                 }
               }
-            }
+            },
+            "description" : "successful operation"
           },
           "400" : {
-            "description" : "Invalid ID supplied",
-            "content" : { }
+            "content" : { },
+            "description" : "Invalid ID supplied"
           },
           "404" : {
-            "description" : "Pet not found",
-            "content" : { }
+            "content" : { },
+            "description" : "Pet not found"
           }
         },
         "security" : [ {
           "api_key" : [ ]
         } ],
+        "summary" : "Find pet by ID",
+        "tags" : [ "pet" ],
         "x-accepts" : "application/json"
       },
       "post" : {
-        "tags" : [ "pet" ],
-        "summary" : "Updates a pet in the store with form data",
         "operationId" : "updatePetWithForm",
         "parameters" : [ {
-          "name" : "petId",
-          "in" : "path",
           "description" : "ID of pet that needs to be updated",
+          "in" : "path",
+          "name" : "petId",
           "required" : true,
           "schema" : {
-            "type" : "integer",
-            "format" : "int64"
+            "format" : "int64",
+            "type" : "integer"
           }
         } ],
         "requestBody" : {
@@ -274,12 +303,12 @@
               "schema" : {
                 "properties" : {
                   "name" : {
-                    "type" : "string",
-                    "description" : "Updated name of the pet"
+                    "description" : "Updated name of the pet",
+                    "type" : "string"
                   },
                   "status" : {
-                    "type" : "string",
-                    "description" : "Updated status of the pet"
+                    "description" : "Updated status of the pet",
+                    "type" : "string"
                   }
                 }
               }
@@ -288,61 +317,30 @@
         },
         "responses" : {
           "405" : {
-            "description" : "Invalid input",
-            "content" : { }
+            "content" : { },
+            "description" : "Invalid input"
           }
         },
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
-        "x-contentType" : "application/x-www-form-urlencoded",
-        "x-accepts" : "application/json"
-      },
-      "delete" : {
+        "summary" : "Updates a pet in the store with form data",
         "tags" : [ "pet" ],
-        "summary" : "Deletes a pet",
-        "operationId" : "deletePet",
-        "parameters" : [ {
-          "name" : "api_key",
-          "in" : "header",
-          "schema" : {
-            "type" : "string"
-          }
-        }, {
-          "name" : "petId",
-          "in" : "path",
-          "description" : "Pet id to delete",
-          "required" : true,
-          "schema" : {
-            "type" : "integer",
-            "format" : "int64"
-          }
-        } ],
-        "responses" : {
-          "400" : {
-            "description" : "Invalid pet value",
-            "content" : { }
-          }
-        },
-        "security" : [ {
-          "petstore_auth" : [ "write:pets", "read:pets" ]
-        } ],
+        "x-contentType" : "application/x-www-form-urlencoded",
         "x-accepts" : "application/json"
       }
     },
     "/pet/{petId}/uploadImage" : {
       "post" : {
-        "tags" : [ "pet" ],
-        "summary" : "uploads an image",
         "operationId" : "uploadFile",
         "parameters" : [ {
-          "name" : "petId",
-          "in" : "path",
           "description" : "ID of pet to update",
+          "in" : "path",
+          "name" : "petId",
           "required" : true,
           "schema" : {
-            "type" : "integer",
-            "format" : "int64"
+            "format" : "int64",
+            "type" : "integer"
           }
         } ],
         "requestBody" : {
@@ -351,13 +349,13 @@
               "schema" : {
                 "properties" : {
                   "additionalMetadata" : {
-                    "type" : "string",
-                    "description" : "Additional data to pass to server"
+                    "description" : "Additional data to pass to server",
+                    "type" : "string"
                   },
                   "file" : {
-                    "type" : "string",
                     "description" : "file to upload",
-                    "format" : "binary"
+                    "format" : "binary",
+                    "type" : "string"
                   }
                 }
               }
@@ -366,58 +364,57 @@
         },
         "responses" : {
           "200" : {
-            "description" : "successful operation",
             "content" : {
               "application/json" : {
                 "schema" : {
                   "$ref" : "#/components/schemas/ApiResponse"
                 }
               }
-            }
+            },
+            "description" : "successful operation"
           }
         },
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
+        "summary" : "uploads an image",
+        "tags" : [ "pet" ],
         "x-contentType" : "multipart/form-data",
         "x-accepts" : "application/json"
       }
     },
     "/store/inventory" : {
       "get" : {
-        "tags" : [ "store" ],
-        "summary" : "Returns pet inventories by status",
         "description" : "Returns a map of status codes to quantities",
         "operationId" : "getInventory",
         "responses" : {
           "200" : {
-            "description" : "successful operation",
             "content" : {
               "application/json" : {
                 "schema" : {
-                  "type" : "object",
                   "additionalProperties" : {
-                    "type" : "integer",
-                    "format" : "int32"
-                  }
+                    "format" : "int32",
+                    "type" : "integer"
+                  },
+                  "type" : "object"
                 }
               }
-            }
+            },
+            "description" : "successful operation"
           }
         },
         "security" : [ {
           "api_key" : [ ]
         } ],
+        "summary" : "Returns pet inventories by status",
+        "tags" : [ "store" ],
         "x-accepts" : "application/json"
       }
     },
     "/store/order" : {
       "post" : {
-        "tags" : [ "store" ],
-        "summary" : "Place an order for a pet",
         "operationId" : "placeOrder",
         "requestBody" : {
-          "description" : "order placed for purchasing the pet",
           "content" : {
             "*/*" : {
               "schema" : {
@@ -425,11 +422,11 @@
               }
             }
           },
+          "description" : "order placed for purchasing the pet",
           "required" : true
         },
         "responses" : {
           "200" : {
-            "description" : "successful operation",
             "content" : {
               "application/xml" : {
                 "schema" : {
@@ -441,39 +438,65 @@
                   "$ref" : "#/components/schemas/Order"
                 }
               }
-            }
+            },
+            "description" : "successful operation"
           },
           "400" : {
-            "description" : "Invalid Order",
-            "content" : { }
+            "content" : { },
+            "description" : "Invalid Order"
           }
         },
+        "summary" : "Place an order for a pet",
+        "tags" : [ "store" ],
         "x-codegen-request-body-name" : "body",
         "x-contentType" : "*/*",
         "x-accepts" : "application/json"
       }
     },
     "/store/order/{orderId}" : {
-      "get" : {
+      "delete" : {
+        "description" : "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors",
+        "operationId" : "deleteOrder",
+        "parameters" : [ {
+          "description" : "ID of the order that needs to be deleted",
+          "in" : "path",
+          "name" : "orderId",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "400" : {
+            "content" : { },
+            "description" : "Invalid ID supplied"
+          },
+          "404" : {
+            "content" : { },
+            "description" : "Order not found"
+          }
+        },
+        "summary" : "Delete purchase order by ID",
         "tags" : [ "store" ],
-        "summary" : "Find purchase order by ID",
+        "x-accepts" : "application/json"
+      },
+      "get" : {
         "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
-          "name" : "orderId",
-          "in" : "path",
           "description" : "ID of pet that needs to be fetched",
+          "in" : "path",
+          "name" : "orderId",
           "required" : true,
           "schema" : {
+            "format" : "int64",
             "maximum" : 5,
             "minimum" : 1,
-            "type" : "integer",
-            "format" : "int64"
+            "type" : "integer"
           }
         } ],
         "responses" : {
           "200" : {
-            "description" : "successful operation",
             "content" : {
               "application/xml" : {
                 "schema" : {
@@ -485,54 +508,28 @@
                   "$ref" : "#/components/schemas/Order"
                 }
               }
-            }
+            },
+            "description" : "successful operation"
           },
           "400" : {
-            "description" : "Invalid ID supplied",
-            "content" : { }
+            "content" : { },
+            "description" : "Invalid ID supplied"
           },
           "404" : {
-            "description" : "Order not found",
-            "content" : { }
+            "content" : { },
+            "description" : "Order not found"
           }
         },
-        "x-accepts" : "application/json"
-      },
-      "delete" : {
+        "summary" : "Find purchase order by ID",
         "tags" : [ "store" ],
-        "summary" : "Delete purchase order by ID",
-        "description" : "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors",
-        "operationId" : "deleteOrder",
-        "parameters" : [ {
-          "name" : "orderId",
-          "in" : "path",
-          "description" : "ID of the order that needs to be deleted",
-          "required" : true,
-          "schema" : {
-            "type" : "string"
-          }
-        } ],
-        "responses" : {
-          "400" : {
-            "description" : "Invalid ID supplied",
-            "content" : { }
-          },
-          "404" : {
-            "description" : "Order not found",
-            "content" : { }
-          }
-        },
         "x-accepts" : "application/json"
       }
     },
     "/user" : {
       "post" : {
-        "tags" : [ "user" ],
-        "summary" : "Create user",
         "description" : "This can only be done by the logged in user.",
         "operationId" : "createUser",
         "requestBody" : {
-          "description" : "Created user object",
           "content" : {
             "*/*" : {
               "schema" : {
@@ -540,14 +537,17 @@
               }
             }
           },
+          "description" : "Created user object",
           "required" : true
         },
         "responses" : {
           "default" : {
-            "description" : "successful operation",
-            "content" : { }
+            "content" : { },
+            "description" : "successful operation"
           }
         },
+        "summary" : "Create user",
+        "tags" : [ "user" ],
         "x-codegen-request-body-name" : "body",
         "x-contentType" : "*/*",
         "x-accepts" : "application/json"
@@ -555,29 +555,29 @@
     },
     "/user/createWithArray" : {
       "post" : {
-        "tags" : [ "user" ],
-        "summary" : "Creates list of users with given input array",
         "operationId" : "createUsersWithArrayInput",
         "requestBody" : {
-          "description" : "List of user object",
           "content" : {
             "*/*" : {
               "schema" : {
-                "type" : "array",
                 "items" : {
                   "$ref" : "#/components/schemas/User"
-                }
+                },
+                "type" : "array"
               }
             }
           },
+          "description" : "List of user object",
           "required" : true
         },
         "responses" : {
           "default" : {
-            "description" : "successful operation",
-            "content" : { }
+            "content" : { },
+            "description" : "successful operation"
           }
         },
+        "summary" : "Creates list of users with given input array",
+        "tags" : [ "user" ],
         "x-codegen-request-body-name" : "body",
         "x-contentType" : "*/*",
         "x-accepts" : "application/json"
@@ -585,29 +585,29 @@
     },
     "/user/createWithList" : {
       "post" : {
-        "tags" : [ "user" ],
-        "summary" : "Creates list of users with given input array",
         "operationId" : "createUsersWithListInput",
         "requestBody" : {
-          "description" : "List of user object",
           "content" : {
             "*/*" : {
               "schema" : {
-                "type" : "array",
                 "items" : {
                   "$ref" : "#/components/schemas/User"
-                }
+                },
+                "type" : "array"
               }
             }
           },
+          "description" : "List of user object",
           "required" : true
         },
         "responses" : {
           "default" : {
-            "description" : "successful operation",
-            "content" : { }
+            "content" : { },
+            "description" : "successful operation"
           }
         },
+        "summary" : "Creates list of users with given input array",
+        "tags" : [ "user" ],
         "x-codegen-request-body-name" : "body",
         "x-contentType" : "*/*",
         "x-accepts" : "application/json"
@@ -615,21 +615,19 @@
     },
     "/user/login" : {
       "get" : {
-        "tags" : [ "user" ],
-        "summary" : "Logs user into the system",
         "operationId" : "loginUser",
         "parameters" : [ {
-          "name" : "username",
-          "in" : "query",
           "description" : "The user name for login",
+          "in" : "query",
+          "name" : "username",
           "required" : true,
           "schema" : {
             "type" : "string"
           }
         }, {
-          "name" : "password",
-          "in" : "query",
           "description" : "The password for login in clear text",
+          "in" : "query",
+          "name" : "password",
           "required" : true,
           "schema" : {
             "type" : "string"
@@ -637,67 +635,93 @@
         } ],
         "responses" : {
           "200" : {
-            "description" : "successful operation",
-            "headers" : {
-              "X-Rate-Limit" : {
-                "description" : "calls per hour allowed by the user",
+            "content" : {
+              "application/xml" : {
                 "schema" : {
-                  "type" : "integer",
-                  "format" : "int32"
+                  "type" : "string"
                 }
               },
-              "X-Expires-After" : {
-                "description" : "date in UTC when toekn expires",
+              "application/json" : {
                 "schema" : {
-                  "type" : "string",
-                  "format" : "date-time"
+                  "type" : "string"
                 }
               }
             },
-            "content" : {
-              "application/xml" : {
+            "description" : "successful operation",
+            "headers" : {
+              "X-Rate-Limit" : {
+                "description" : "calls per hour allowed by the user",
                 "schema" : {
-                  "type" : "string"
+                  "format" : "int32",
+                  "type" : "integer"
                 }
               },
-              "application/json" : {
+              "X-Expires-After" : {
+                "description" : "date in UTC when toekn expires",
                 "schema" : {
+                  "format" : "date-time",
                   "type" : "string"
                 }
               }
             }
           },
           "400" : {
-            "description" : "Invalid username/password supplied",
-            "content" : { }
+            "content" : { },
+            "description" : "Invalid username/password supplied"
           }
         },
+        "summary" : "Logs user into the system",
+        "tags" : [ "user" ],
         "x-accepts" : "application/json"
       }
     },
     "/user/logout" : {
       "get" : {
-        "tags" : [ "user" ],
-        "summary" : "Logs out current logged in user session",
         "operationId" : "logoutUser",
         "responses" : {
           "default" : {
-            "description" : "successful operation",
-            "content" : { }
+            "content" : { },
+            "description" : "successful operation"
           }
         },
+        "summary" : "Logs out current logged in user session",
+        "tags" : [ "user" ],
         "x-accepts" : "application/json"
       }
     },
     "/user/{username}" : {
-      "get" : {
+      "delete" : {
+        "description" : "This can only be done by the logged in user.",
+        "operationId" : "deleteUser",
+        "parameters" : [ {
+          "description" : "The name that needs to be deleted",
+          "in" : "path",
+          "name" : "username",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "400" : {
+            "content" : { },
+            "description" : "Invalid username supplied"
+          },
+          "404" : {
+            "content" : { },
+            "description" : "User not found"
+          }
+        },
+        "summary" : "Delete user",
         "tags" : [ "user" ],
-        "summary" : "Get user by user name",
+        "x-accepts" : "application/json"
+      },
+      "get" : {
         "operationId" : "getUserByName",
         "parameters" : [ {
-          "name" : "username",
-          "in" : "path",
           "description" : "The name that needs to be fetched. Use user1 for testing.",
+          "in" : "path",
+          "name" : "username",
           "required" : true,
           "schema" : {
             "type" : "string"
@@ -705,7 +729,6 @@
         } ],
         "responses" : {
           "200" : {
-            "description" : "successful operation",
             "content" : {
               "application/xml" : {
                 "schema" : {
@@ -717,35 +740,35 @@
                   "$ref" : "#/components/schemas/User"
                 }
               }
-            }
+            },
+            "description" : "successful operation"
           },
           "400" : {
-            "description" : "Invalid username supplied",
-            "content" : { }
+            "content" : { },
+            "description" : "Invalid username supplied"
           },
           "404" : {
-            "description" : "User not found",
-            "content" : { }
+            "content" : { },
+            "description" : "User not found"
           }
         },
+        "summary" : "Get user by user name",
+        "tags" : [ "user" ],
         "x-accepts" : "application/json"
       },
       "put" : {
-        "tags" : [ "user" ],
-        "summary" : "Updated user",
         "description" : "This can only be done by the logged in user.",
         "operationId" : "updateUser",
         "parameters" : [ {
-          "name" : "username",
-          "in" : "path",
           "description" : "name that need to be deleted",
+          "in" : "path",
+          "name" : "username",
           "required" : true,
           "schema" : {
             "type" : "string"
           }
         } ],
         "requestBody" : {
-          "description" : "Updated user object",
           "content" : {
             "*/*" : {
               "schema" : {
@@ -753,123 +776,109 @@
               }
             }
           },
+          "description" : "Updated user object",
           "required" : true
         },
         "responses" : {
           "400" : {
-            "description" : "Invalid user supplied",
-            "content" : { }
+            "content" : { },
+            "description" : "Invalid user supplied"
           },
           "404" : {
-            "description" : "User not found",
-            "content" : { }
+            "content" : { },
+            "description" : "User not found"
           }
         },
+        "summary" : "Updated user",
+        "tags" : [ "user" ],
         "x-codegen-request-body-name" : "body",
         "x-contentType" : "*/*",
         "x-accepts" : "application/json"
-      },
-      "delete" : {
-        "tags" : [ "user" ],
-        "summary" : "Delete user",
-        "description" : "This can only be done by the logged in user.",
-        "operationId" : "deleteUser",
-        "parameters" : [ {
-          "name" : "username",
-          "in" : "path",
-          "description" : "The name that needs to be deleted",
-          "required" : true,
-          "schema" : {
-            "type" : "string"
-          }
-        } ],
-        "responses" : {
-          "400" : {
-            "description" : "Invalid username supplied",
-            "content" : { }
-          },
-          "404" : {
-            "description" : "User not found",
-            "content" : { }
-          }
-        },
-        "x-accepts" : "application/json"
       }
     }
   },
   "components" : {
     "schemas" : {
       "Order" : {
-        "title" : "Pet Order",
-        "type" : "object",
+        "description" : "An order for a pets from the pet store",
+        "example" : {
+          "petId" : 6,
+          "quantity" : 1,
+          "id" : 0,
+          "shipDate" : "2000-01-23T04:56:07.000+00:00",
+          "complete" : false,
+          "status" : "placed"
+        },
         "properties" : {
           "id" : {
-            "type" : "integer",
-            "format" : "int64"
+            "format" : "int64",
+            "type" : "integer"
           },
           "petId" : {
-            "type" : "integer",
-            "format" : "int64"
+            "format" : "int64",
+            "type" : "integer"
           },
           "quantity" : {
-            "type" : "integer",
-            "format" : "int32"
+            "format" : "int32",
+            "type" : "integer"
           },
           "shipDate" : {
-            "type" : "string",
-            "format" : "date-time"
+            "format" : "date-time",
+            "type" : "string"
           },
           "status" : {
-            "type" : "string",
             "description" : "Order Status",
-            "enum" : [ "placed", "approved", "delivered" ]
+            "enum" : [ "placed", "approved", "delivered" ],
+            "type" : "string"
           },
           "complete" : {
-            "type" : "boolean",
-            "default" : false
+            "default" : false,
+            "type" : "boolean"
           }
         },
-        "description" : "An order for a pets from the pet store",
-        "example" : {
-          "petId" : 6,
-          "quantity" : 1,
-          "id" : 0,
-          "shipDate" : "2000-01-23T04:56:07.000+00:00",
-          "complete" : false,
-          "status" : "placed"
-        },
+        "title" : "Pet Order",
+        "type" : "object",
         "xml" : {
           "name" : "Order"
         }
       },
       "Category" : {
-        "title" : "Pet category",
-        "type" : "object",
+        "description" : "A category for a pet",
+        "example" : {
+          "name" : "name",
+          "id" : 6
+        },
         "properties" : {
           "id" : {
-            "type" : "integer",
-            "format" : "int64"
+            "format" : "int64",
+            "type" : "integer"
           },
           "name" : {
             "type" : "string"
           }
         },
-        "description" : "A category for a pet",
-        "example" : {
-          "name" : "name",
-          "id" : 6
-        },
+        "title" : "Pet category",
+        "type" : "object",
         "xml" : {
           "name" : "Category"
         }
       },
       "User" : {
-        "title" : "a User",
-        "type" : "object",
+        "description" : "A User who is purchasing from the pet store",
+        "example" : {
+          "firstName" : "firstName",
+          "lastName" : "lastName",
+          "password" : "password",
+          "userStatus" : 6,
+          "phone" : "phone",
+          "id" : 0,
+          "email" : "email",
+          "username" : "username"
+        },
         "properties" : {
           "id" : {
-            "type" : "integer",
-            "format" : "int64"
+            "format" : "int64",
+            "type" : "integer"
           },
           "username" : {
             "type" : "string"
@@ -890,118 +899,113 @@
             "type" : "string"
           },
           "userStatus" : {
-            "type" : "integer",
             "description" : "User Status",
-            "format" : "int32"
+            "format" : "int32",
+            "type" : "integer"
           }
         },
-        "description" : "A User who is purchasing from the pet store",
-        "example" : {
-          "firstName" : "firstName",
-          "lastName" : "lastName",
-          "password" : "password",
-          "userStatus" : 6,
-          "phone" : "phone",
-          "id" : 0,
-          "email" : "email",
-          "username" : "username"
-        },
+        "title" : "a User",
+        "type" : "object",
         "xml" : {
           "name" : "User"
         }
       },
       "Tag" : {
-        "title" : "Pet Tag",
-        "type" : "object",
+        "description" : "A tag for a pet",
+        "example" : {
+          "name" : "name",
+          "id" : 1
+        },
         "properties" : {
           "id" : {
-            "type" : "integer",
-            "format" : "int64"
+            "format" : "int64",
+            "type" : "integer"
           },
           "name" : {
             "type" : "string"
           }
         },
-        "description" : "A tag for a pet",
-        "example" : {
-          "name" : "name",
-          "id" : 1
-        },
+        "title" : "Pet Tag",
+        "type" : "object",
         "xml" : {
           "name" : "Tag"
         }
       },
       "Pet" : {
-        "title" : "a Pet",
-        "required" : [ "name", "photoUrls" ],
-        "type" : "object",
+        "description" : "A pet for sale in the pet store",
+        "example" : {
+          "photoUrls" : [ "photoUrls", "photoUrls" ],
+          "name" : "doggie",
+          "id" : 0,
+          "category" : {
+            "name" : "name",
+            "id" : 6
+          },
+          "tags" : [ {
+            "name" : "name",
+            "id" : 1
+          }, {
+            "name" : "name",
+            "id" : 1
+          } ],
+          "status" : "available"
+        },
         "properties" : {
           "id" : {
-            "type" : "integer",
-            "format" : "int64"
+            "format" : "int64",
+            "type" : "integer"
           },
           "category" : {
             "$ref" : "#/components/schemas/Category"
           },
           "name" : {
-            "type" : "string",
-            "example" : "doggie"
+            "example" : "doggie",
+            "type" : "string"
           },
           "photoUrls" : {
+            "items" : {
+              "type" : "string"
+            },
             "type" : "array",
             "xml" : {
               "name" : "photoUrl",
               "wrapped" : true
-            },
-            "items" : {
-              "type" : "string"
             }
           },
           "tags" : {
+            "items" : {
+              "$ref" : "#/components/schemas/Tag"
+            },
             "type" : "array",
             "xml" : {
               "name" : "tag",
               "wrapped" : true
-            },
-            "items" : {
-              "$ref" : "#/components/schemas/Tag"
             }
           },
           "status" : {
-            "type" : "string",
             "description" : "pet status in the store",
-            "enum" : [ "available", "pending", "sold" ]
+            "enum" : [ "available", "pending", "sold" ],
+            "type" : "string"
           }
         },
-        "description" : "A pet for sale in the pet store",
-        "example" : {
-          "photoUrls" : [ "photoUrls", "photoUrls" ],
-          "name" : "doggie",
-          "id" : 0,
-          "category" : {
-            "name" : "name",
-            "id" : 6
-          },
-          "tags" : [ {
-            "name" : "name",
-            "id" : 1
-          }, {
-            "name" : "name",
-            "id" : 1
-          } ],
-          "status" : "available"
-        },
+        "required" : [ "name", "photoUrls" ],
+        "title" : "a Pet",
+        "type" : "object",
         "xml" : {
           "name" : "Pet"
         }
       },
       "ApiResponse" : {
-        "title" : "An uploaded response",
-        "type" : "object",
+        "description" : "Describes the result of uploading an image resource",
+        "example" : {
+          "code" : 0,
+          "type" : "type",
+          "message" : "message"
+        },
         "properties" : {
           "code" : {
-            "type" : "integer",
-            "format" : "int32"
+            "format" : "int32",
+            "type" : "integer"
           },
           "type" : {
             "type" : "string"
@@ -1010,17 +1014,12 @@
             "type" : "string"
           }
         },
-        "description" : "Describes the result of uploading an image resource",
-        "example" : {
-          "code" : 0,
-          "type" : "type",
-          "message" : "message"
-        }
+        "title" : "An uploaded response",
+        "type" : "object"
       }
     },
     "securitySchemes" : {
       "petstore_auth" : {
-        "type" : "oauth2",
         "flows" : {
           "implicit" : {
             "authorizationUrl" : "http://petstore.swagger.io/api/oauth/dialog",
@@ -1029,12 +1028,13 @@
               "read:pets" : "read your pets"
             }
           }
-        }
+        },
+        "type" : "oauth2"
       },
       "api_key" : {
-        "type" : "apiKey",
+        "in" : "header",
         "name" : "api_key",
-        "in" : "header"
+        "type" : "apiKey"
       }
     }
   }
diff --git a/samples/server/petstore/java-vertx-web/rx/.openapi-generator/FILES b/samples/server/petstore/java-vertx-web/rx/.openapi-generator/FILES
new file mode 100644
index 000000000000..50ed7df1bb43
--- /dev/null
+++ b/samples/server/petstore/java-vertx-web/rx/.openapi-generator/FILES
@@ -0,0 +1,25 @@
+README.md
+pom.xml
+src/main/java/org/openapitools/vertxweb/server/ApiException.java
+src/main/java/org/openapitools/vertxweb/server/ApiResponse.java
+src/main/java/org/openapitools/vertxweb/server/HttpServerVerticle.java
+src/main/java/org/openapitools/vertxweb/server/MainVerticle.java
+src/main/java/org/openapitools/vertxweb/server/ParameterCast.java
+src/main/java/org/openapitools/vertxweb/server/api/PetApi.java
+src/main/java/org/openapitools/vertxweb/server/api/PetApiHandler.java
+src/main/java/org/openapitools/vertxweb/server/api/PetApiImpl.java
+src/main/java/org/openapitools/vertxweb/server/api/StoreApi.java
+src/main/java/org/openapitools/vertxweb/server/api/StoreApiHandler.java
+src/main/java/org/openapitools/vertxweb/server/api/StoreApiImpl.java
+src/main/java/org/openapitools/vertxweb/server/api/UserApi.java
+src/main/java/org/openapitools/vertxweb/server/api/UserApiHandler.java
+src/main/java/org/openapitools/vertxweb/server/api/UserApiImpl.java
+src/main/java/org/openapitools/vertxweb/server/model/Category.java
+src/main/java/org/openapitools/vertxweb/server/model/InlineObject.java
+src/main/java/org/openapitools/vertxweb/server/model/InlineObject1.java
+src/main/java/org/openapitools/vertxweb/server/model/ModelApiResponse.java
+src/main/java/org/openapitools/vertxweb/server/model/Order.java
+src/main/java/org/openapitools/vertxweb/server/model/Pet.java
+src/main/java/org/openapitools/vertxweb/server/model/Tag.java
+src/main/java/org/openapitools/vertxweb/server/model/User.java
+src/main/resources/openapi.yaml
diff --git a/samples/server/petstore/java-vertx-web/rx/.openapi-generator/VERSION b/samples/server/petstore/java-vertx-web/rx/.openapi-generator/VERSION
index d168f1d8bdaa..d99e7162d01f 100644
--- a/samples/server/petstore/java-vertx-web/rx/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-vertx-web/rx/.openapi-generator/VERSION
@@ -1 +1 @@
-4.2.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/PetApi.java b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/PetApi.java
index e7b397dc8ff3..a54ab62fe113 100644
--- a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/PetApi.java
+++ b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/PetApi.java
@@ -12,12 +12,12 @@
 import java.util.Map;
 
 public interface PetApi  {
-    Single<ApiResponse<Void>> addPet(Pet pet);
+    Single<ApiResponse<Pet>> addPet(Pet pet);
     Single<ApiResponse<Void>> deletePet(Long petId,String apiKey);
     Single<ApiResponse<List<Pet>>> findPetsByStatus(List<String> status);
     Single<ApiResponse<List<Pet>>> findPetsByTags(List<String> tags);
     Single<ApiResponse<Pet>> getPetById(Long petId);
-    Single<ApiResponse<Void>> updatePet(Pet pet);
+    Single<ApiResponse<Pet>> updatePet(Pet pet);
     Single<ApiResponse<Void>> updatePetWithForm(Long petId,String name,String status);
     Single<ApiResponse<ModelApiResponse>> uploadFile(Long petId,String additionalMetadata,FileUpload file);
 }
diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/PetApiImpl.java b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/PetApiImpl.java
index d39237914ce8..113bec1f45ec 100644
--- a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/PetApiImpl.java
+++ b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/PetApiImpl.java
@@ -15,7 +15,7 @@
 // Implement this class
 
 public class PetApiImpl implements PetApi {
-    public Single<ApiResponse<Void>> addPet(Pet pet) {
+    public Single<ApiResponse<Pet>> addPet(Pet pet) {
         return Single.error(new ApiException("Not Implemented").setStatusCode(501));
     }
 
@@ -35,7 +35,7 @@ public Single<ApiResponse<Pet>> getPetById(Long petId) {
         return Single.error(new ApiException("Not Implemented").setStatusCode(501));
     }
 
-    public Single<ApiResponse<Void>> updatePet(Pet pet) {
+    public Single<ApiResponse<Pet>> updatePet(Pet pet) {
         return Single.error(new ApiException("Not Implemented").setStatusCode(501));
     }
 
diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Category.java b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Category.java
index b880122ba95c..992be98373dc 100644
--- a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Category.java
+++ b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Category.java
@@ -7,7 +7,7 @@
 /**
  * A category for a pet
  **/
-@JsonInclude(JsonInclude.Include.NON_NULL) 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Category   {
   
   private Long id;
diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/InlineObject.java b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/InlineObject.java
index c7a35a888b97..3f6b989ec374 100644
--- a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/InlineObject.java
+++ b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/InlineObject.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-@JsonInclude(JsonInclude.Include.NON_NULL) 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class InlineObject   {
   
   private String name;
diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/InlineObject1.java b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/InlineObject1.java
index 14268dda3c53..58d654e083fd 100644
--- a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/InlineObject1.java
+++ b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/InlineObject1.java
@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.vertx.ext.web.FileUpload;
 
-@JsonInclude(JsonInclude.Include.NON_NULL) 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class InlineObject1   {
   
   private String additionalMetadata;
diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/ModelApiResponse.java b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/ModelApiResponse.java
index 0113640b4853..9c7fa0e9af3f 100644
--- a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/ModelApiResponse.java
+++ b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/ModelApiResponse.java
@@ -7,7 +7,7 @@
 /**
  * Describes the result of uploading an image resource
  **/
-@JsonInclude(JsonInclude.Include.NON_NULL) 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ModelApiResponse   {
   
   private Integer code;
diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Order.java b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Order.java
index f9f5906416cf..24c854f5948a 100644
--- a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Order.java
+++ b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Order.java
@@ -9,7 +9,7 @@
 /**
  * An order for a pets from the pet store
  **/
-@JsonInclude(JsonInclude.Include.NON_NULL) 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Order   {
   
   private Long id;
diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Pet.java b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Pet.java
index d4bf37886cd3..f53e6d08e824 100644
--- a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Pet.java
+++ b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Pet.java
@@ -12,7 +12,7 @@
 /**
  * A pet for sale in the pet store
  **/
-@JsonInclude(JsonInclude.Include.NON_NULL) 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Pet   {
   
   private Long id;
diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Tag.java b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Tag.java
index 46ee7f830ad1..bad53e0107e7 100644
--- a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Tag.java
+++ b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/Tag.java
@@ -7,7 +7,7 @@
 /**
  * A tag for a pet
  **/
-@JsonInclude(JsonInclude.Include.NON_NULL) 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Tag   {
   
   private Long id;
diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/User.java b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/User.java
index 0f9fcdfd4e87..989b3bca5568 100644
--- a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/User.java
+++ b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/model/User.java
@@ -7,7 +7,7 @@
 /**
  * A User who is purchasing from the pet store
  **/
-@JsonInclude(JsonInclude.Include.NON_NULL) 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class User   {
   
   private Long id;
diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/resources/openapi.yaml b/samples/server/petstore/java-vertx-web/rx/src/main/resources/openapi.yaml
index c35045135928..12848353afb2 100644
--- a/samples/server/petstore/java-vertx-web/rx/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/java-vertx-web/rx/src/main/resources/openapi.yaml
@@ -26,7 +26,16 @@ paths:
       requestBody:
         $ref: '#/components/requestBodies/Pet'
       responses:
-        405:
+        "200":
+          content:
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/Pet'
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Pet'
+          description: successful operation
+        "405":
           description: Invalid input
       security:
       - petstore_auth:
@@ -42,11 +51,20 @@ paths:
       requestBody:
         $ref: '#/components/requestBodies/Pet'
       responses:
-        400:
+        "200":
+          content:
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/Pet'
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Pet'
+          description: successful operation
+        "400":
           description: Invalid ID supplied
-        404:
+        "404":
           description: Pet not found
-        405:
+        "405":
           description: Validation exception
       security:
       - petstore_auth:
@@ -78,7 +96,7 @@ paths:
           type: array
         style: form
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
@@ -91,7 +109,7 @@ paths:
                   $ref: '#/components/schemas/Pet'
                 type: array
           description: successful operation
-        400:
+        "400":
           description: Invalid status value
       security:
       - petstore_auth:
@@ -118,7 +136,7 @@ paths:
           type: array
         style: form
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
@@ -131,7 +149,7 @@ paths:
                   $ref: '#/components/schemas/Pet'
                 type: array
           description: successful operation
-        400:
+        "400":
           description: Invalid tag value
       security:
       - petstore_auth:
@@ -161,7 +179,7 @@ paths:
           type: integer
         style: simple
       responses:
-        400:
+        "400":
           description: Invalid pet value
       security:
       - petstore_auth:
@@ -185,7 +203,7 @@ paths:
           type: integer
         style: simple
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
@@ -194,9 +212,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/Pet'
           description: successful operation
-        400:
+        "400":
           description: Invalid ID supplied
-        404:
+        "404":
           description: Pet not found
       security:
       - api_key: []
@@ -230,7 +248,7 @@ paths:
                   type: string
               type: object
       responses:
-        405:
+        "405":
           description: Invalid input
       security:
       - petstore_auth:
@@ -269,7 +287,7 @@ paths:
                   type: string
               type: object
       responses:
-        200:
+        "200":
           content:
             application/json:
               schema:
@@ -289,7 +307,7 @@ paths:
       description: Returns a map of status codes to quantities
       operationId: getInventory
       responses:
-        200:
+        "200":
           content:
             application/json:
               schema:
@@ -315,7 +333,7 @@ paths:
         description: order placed for purchasing the pet
         required: true
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
@@ -324,7 +342,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/Order'
           description: successful operation
-        400:
+        "400":
           description: Invalid Order
       summary: Place an order for a pet
       tags:
@@ -346,9 +364,9 @@ paths:
           type: string
         style: simple
       responses:
-        400:
+        "400":
           description: Invalid ID supplied
-        404:
+        "404":
           description: Order not found
       summary: Delete purchase order by ID
       tags:
@@ -371,7 +389,7 @@ paths:
           type: integer
         style: simple
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
@@ -380,9 +398,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/Order'
           description: successful operation
-        400:
+        "400":
           description: Invalid ID supplied
-        404:
+        "404":
           description: Order not found
       summary: Find purchase order by ID
       tags:
@@ -403,7 +421,7 @@ paths:
         default:
           description: successful operation
       security:
-      - auth_cookie: []
+      - api_key: []
       summary: Create user
       tags:
       - user
@@ -418,7 +436,7 @@ paths:
         default:
           description: successful operation
       security:
-      - auth_cookie: []
+      - api_key: []
       summary: Creates list of users with given input array
       tags:
       - user
@@ -433,7 +451,7 @@ paths:
         default:
           description: successful operation
       security:
-      - auth_cookie: []
+      - api_key: []
       summary: Creates list of users with given input array
       tags:
       - user
@@ -461,7 +479,7 @@ paths:
           type: string
         style: form
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
@@ -472,8 +490,8 @@ paths:
           description: successful operation
           headers:
             Set-Cookie:
-              description: Cookie authentication key for use with the `auth_cookie`
-                apiKey authentication.
+              description: Cookie authentication key for use with the `api_key` apiKey
+                authentication.
               explode: false
               schema:
                 example: AUTH_KEY=abcde12345; Path=/; HttpOnly
@@ -493,7 +511,7 @@ paths:
                 format: date-time
                 type: string
               style: simple
-        400:
+        "400":
           description: Invalid username/password supplied
       summary: Logs user into the system
       tags:
@@ -506,7 +524,7 @@ paths:
         default:
           description: successful operation
       security:
-      - auth_cookie: []
+      - api_key: []
       summary: Logs out current logged in user session
       tags:
       - user
@@ -525,12 +543,12 @@ paths:
           type: string
         style: simple
       responses:
-        400:
+        "400":
           description: Invalid username supplied
-        404:
+        "404":
           description: User not found
       security:
-      - auth_cookie: []
+      - api_key: []
       summary: Delete user
       tags:
       - user
@@ -547,7 +565,7 @@ paths:
           type: string
         style: simple
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
@@ -556,9 +574,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/User'
           description: successful operation
-        400:
+        "400":
           description: Invalid username supplied
-        404:
+        "404":
           description: User not found
       summary: Get user by user name
       tags:
@@ -584,12 +602,12 @@ paths:
         description: Updated user object
         required: true
       responses:
-        400:
+        "400":
           description: Invalid user supplied
-        404:
+        "404":
           description: User not found
       security:
-      - auth_cookie: []
+      - api_key: []
       summary: Updated user
       tags:
       - user
@@ -831,7 +849,3 @@ components:
       in: header
       name: api_key
       type: apiKey
-    auth_cookie:
-      in: cookie
-      name: AUTH_KEY
-      type: apiKey
diff --git a/samples/server/petstore/java-vertx/async/.openapi-generator/FILES b/samples/server/petstore/java-vertx/async/.openapi-generator/FILES
new file mode 100644
index 000000000000..d863c5cf45a6
--- /dev/null
+++ b/samples/server/petstore/java-vertx/async/.openapi-generator/FILES
@@ -0,0 +1,21 @@
+README.md
+pom.xml
+src/main/java/org/openapitools/server/api/MainApiException.java
+src/main/java/org/openapitools/server/api/MainApiVerticle.java
+src/main/java/org/openapitools/server/api/model/Category.java
+src/main/java/org/openapitools/server/api/model/ModelApiResponse.java
+src/main/java/org/openapitools/server/api/model/Order.java
+src/main/java/org/openapitools/server/api/model/Pet.java
+src/main/java/org/openapitools/server/api/model/Tag.java
+src/main/java/org/openapitools/server/api/model/User.java
+src/main/java/org/openapitools/server/api/verticle/PetApi.java
+src/main/java/org/openapitools/server/api/verticle/PetApiException.java
+src/main/java/org/openapitools/server/api/verticle/PetApiVerticle.java
+src/main/java/org/openapitools/server/api/verticle/StoreApi.java
+src/main/java/org/openapitools/server/api/verticle/StoreApiException.java
+src/main/java/org/openapitools/server/api/verticle/StoreApiVerticle.java
+src/main/java/org/openapitools/server/api/verticle/UserApi.java
+src/main/java/org/openapitools/server/api/verticle/UserApiException.java
+src/main/java/org/openapitools/server/api/verticle/UserApiVerticle.java
+src/main/resources/openapi.json
+src/main/resources/vertx-default-jul-logging.properties
diff --git a/samples/server/petstore/java-vertx/async/.openapi-generator/VERSION b/samples/server/petstore/java-vertx/async/.openapi-generator/VERSION
index 58592f031f65..d99e7162d01f 100644
--- a/samples/server/petstore/java-vertx/async/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-vertx/async/.openapi-generator/VERSION
@@ -1 +1 @@
-4.2.3-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-vertx/async/pom.xml b/samples/server/petstore/java-vertx/async/pom.xml
index 37949addacc6..045fe15ed667 100644
--- a/samples/server/petstore/java-vertx/async/pom.xml
+++ b/samples/server/petstore/java-vertx/async/pom.xml
@@ -1,32 +1,32 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	
-	<groupId>org.openapitools</groupId>
-	<artifactId>openapi-java-vertx-server</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    
+    <groupId>org.openapitools</groupId>
+    <artifactId>openapi-java-vertx-server</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
   
-  	<name>Swagger Petstore</name>
-  	
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<junit.version>4.13</junit.version>
-		<vertx.version>3.4.1</vertx.version>
-		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-		<vertx-swagger-router.version>1.4.0</vertx-swagger-router.version>
-		<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
-		<jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version>
-	</properties>
+      <name>OpenAPI Petstore</name>
+      
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.8</java.version>
+        <junit.version>4.13</junit.version>
+        <vertx.version>3.4.1</vertx.version>
+        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <vertx-swagger-router.version>1.4.0</vertx-swagger-router.version>
+        <maven-shade-plugin.version>2.3</maven-shade-plugin.version>
+        <jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version>
+    </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>io.vertx</groupId>
@@ -35,7 +35,7 @@
             <scope>test</scope>
         </dependency>
 
-		<dependency>
+        <dependency>
             <groupId>com.github.phiz71</groupId>
             <artifactId>vertx-swagger-router</artifactId>
             <version>${vertx-swagger-router.version}</version>
@@ -47,45 +47,45 @@
           <version>${jackson-datatype-jsr310.version}</version>
         </dependency>
 
-	</dependencies>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
 
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven-compiler-plugin.version}</version>
-				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-				</configuration>
-			</plugin>
-			
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>${maven-shade-plugin.version}</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<transformers>
-								<transformer
-									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<manifestEntries>
-										<Main-Class>io.vertx.core.Starter</Main-Class>
-										<Main-Verticle>org.openapitools.server.api.MainApiVerticle</Main-Verticle>
-									</manifestEntries>
-								</transformer>
-							</transformers>
-							<artifactSet />
-							<outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar</outputFile>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven-shade-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <manifestEntries>
+                                        <Main-Class>io.vertx.core.Starter</Main-Class>
+                                        <Main-Verticle>org.openapitools.server.api.MainApiVerticle</Main-Verticle>
+                                    </manifestEntries>
+                                </transformer>
+                            </transformers>
+                            <artifactSet />
+                            <outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar</outputFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/PetApiException.java b/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/PetApiException.java
index 3374dcfd63a4..d357d90ca1a4 100644
--- a/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/PetApiException.java
+++ b/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/PetApiException.java
@@ -12,14 +12,18 @@ public PetApiException(int statusCode, String statusMessage) {
     
     public static final PetApiException Pet_addPet_405_Exception = new PetApiException(405, "Invalid input");
     public static final PetApiException Pet_deletePet_400_Exception = new PetApiException(400, "Invalid pet value");
+    public static final PetApiException Pet_findPetsByStatus_200_Exception = new PetApiException(200, "successful operation");
     public static final PetApiException Pet_findPetsByStatus_400_Exception = new PetApiException(400, "Invalid status value");
+    public static final PetApiException Pet_findPetsByTags_200_Exception = new PetApiException(200, "successful operation");
     public static final PetApiException Pet_findPetsByTags_400_Exception = new PetApiException(400, "Invalid tag value");
+    public static final PetApiException Pet_getPetById_200_Exception = new PetApiException(200, "successful operation");
     public static final PetApiException Pet_getPetById_400_Exception = new PetApiException(400, "Invalid ID supplied");
     public static final PetApiException Pet_getPetById_404_Exception = new PetApiException(404, "Pet not found");
     public static final PetApiException Pet_updatePet_400_Exception = new PetApiException(400, "Invalid ID supplied");
     public static final PetApiException Pet_updatePet_404_Exception = new PetApiException(404, "Pet not found");
     public static final PetApiException Pet_updatePet_405_Exception = new PetApiException(405, "Validation exception");
     public static final PetApiException Pet_updatePetWithForm_405_Exception = new PetApiException(405, "Invalid input");
+    public static final PetApiException Pet_uploadFile_200_Exception = new PetApiException(200, "successful operation");
     
 
 }
\ No newline at end of file
diff --git a/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/StoreApiException.java b/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/StoreApiException.java
index c8a3b7e5be27..7a7a7ea59fb7 100644
--- a/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/StoreApiException.java
+++ b/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/StoreApiException.java
@@ -10,8 +10,11 @@ public StoreApiException(int statusCode, String statusMessage) {
     
     public static final StoreApiException Store_deleteOrder_400_Exception = new StoreApiException(400, "Invalid ID supplied");
     public static final StoreApiException Store_deleteOrder_404_Exception = new StoreApiException(404, "Order not found");
+    public static final StoreApiException Store_getInventory_200_Exception = new StoreApiException(200, "successful operation");
+    public static final StoreApiException Store_getOrderById_200_Exception = new StoreApiException(200, "successful operation");
     public static final StoreApiException Store_getOrderById_400_Exception = new StoreApiException(400, "Invalid ID supplied");
     public static final StoreApiException Store_getOrderById_404_Exception = new StoreApiException(404, "Order not found");
+    public static final StoreApiException Store_placeOrder_200_Exception = new StoreApiException(200, "successful operation");
     public static final StoreApiException Store_placeOrder_400_Exception = new StoreApiException(400, "Invalid Order");
     
 
diff --git a/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/UserApiException.java b/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/UserApiException.java
index b3714d11aff0..3fdf14a842e4 100644
--- a/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/UserApiException.java
+++ b/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/verticle/UserApiException.java
@@ -10,8 +10,10 @@ public UserApiException(int statusCode, String statusMessage) {
     
     public static final UserApiException User_deleteUser_400_Exception = new UserApiException(400, "Invalid username supplied");
     public static final UserApiException User_deleteUser_404_Exception = new UserApiException(404, "User not found");
+    public static final UserApiException User_getUserByName_200_Exception = new UserApiException(200, "successful operation");
     public static final UserApiException User_getUserByName_400_Exception = new UserApiException(400, "Invalid username supplied");
     public static final UserApiException User_getUserByName_404_Exception = new UserApiException(404, "User not found");
+    public static final UserApiException User_loginUser_200_Exception = new UserApiException(200, "successful operation");
     public static final UserApiException User_loginUser_400_Exception = new UserApiException(400, "Invalid username/password supplied");
     public static final UserApiException User_updateUser_400_Exception = new UserApiException(400, "Invalid user supplied");
     public static final UserApiException User_updateUser_404_Exception = new UserApiException(404, "User not found");
diff --git a/samples/server/petstore/java-vertx/rx/.openapi-generator/FILES b/samples/server/petstore/java-vertx/rx/.openapi-generator/FILES
new file mode 100644
index 000000000000..d863c5cf45a6
--- /dev/null
+++ b/samples/server/petstore/java-vertx/rx/.openapi-generator/FILES
@@ -0,0 +1,21 @@
+README.md
+pom.xml
+src/main/java/org/openapitools/server/api/MainApiException.java
+src/main/java/org/openapitools/server/api/MainApiVerticle.java
+src/main/java/org/openapitools/server/api/model/Category.java
+src/main/java/org/openapitools/server/api/model/ModelApiResponse.java
+src/main/java/org/openapitools/server/api/model/Order.java
+src/main/java/org/openapitools/server/api/model/Pet.java
+src/main/java/org/openapitools/server/api/model/Tag.java
+src/main/java/org/openapitools/server/api/model/User.java
+src/main/java/org/openapitools/server/api/verticle/PetApi.java
+src/main/java/org/openapitools/server/api/verticle/PetApiException.java
+src/main/java/org/openapitools/server/api/verticle/PetApiVerticle.java
+src/main/java/org/openapitools/server/api/verticle/StoreApi.java
+src/main/java/org/openapitools/server/api/verticle/StoreApiException.java
+src/main/java/org/openapitools/server/api/verticle/StoreApiVerticle.java
+src/main/java/org/openapitools/server/api/verticle/UserApi.java
+src/main/java/org/openapitools/server/api/verticle/UserApiException.java
+src/main/java/org/openapitools/server/api/verticle/UserApiVerticle.java
+src/main/resources/openapi.json
+src/main/resources/vertx-default-jul-logging.properties
diff --git a/samples/server/petstore/java-vertx/rx/.openapi-generator/VERSION b/samples/server/petstore/java-vertx/rx/.openapi-generator/VERSION
index 58592f031f65..d99e7162d01f 100644
--- a/samples/server/petstore/java-vertx/rx/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-vertx/rx/.openapi-generator/VERSION
@@ -1 +1 @@
-4.2.3-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-vertx/rx/pom.xml b/samples/server/petstore/java-vertx/rx/pom.xml
index b4ede38a1d6d..945526015110 100644
--- a/samples/server/petstore/java-vertx/rx/pom.xml
+++ b/samples/server/petstore/java-vertx/rx/pom.xml
@@ -1,32 +1,32 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	
-	<groupId>org.openapitools</groupId>
-	<artifactId>java-vertx-rx-server</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    
+    <groupId>org.openapitools</groupId>
+    <artifactId>java-vertx-rx-server</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
   
-  	<name>Swagger Petstore</name>
-  	
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<junit.version>4.13</junit.version>
-		<vertx.version>3.4.1</vertx.version>
-		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-		<vertx-swagger-router.version>1.4.0</vertx-swagger-router.version>
-		<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
-		<jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version>
-	</properties>
+      <name>OpenAPI Petstore</name>
+      
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.8</java.version>
+        <junit.version>4.13</junit.version>
+        <vertx.version>3.4.1</vertx.version>
+        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <vertx-swagger-router.version>1.4.0</vertx-swagger-router.version>
+        <maven-shade-plugin.version>2.3</maven-shade-plugin.version>
+        <jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version>
+    </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>io.vertx</groupId>
@@ -35,7 +35,7 @@
             <scope>test</scope>
         </dependency>
 
-		<dependency>
+        <dependency>
             <groupId>com.github.phiz71</groupId>
             <artifactId>vertx-swagger-router</artifactId>
             <version>${vertx-swagger-router.version}</version>
@@ -47,45 +47,45 @@
           <version>${jackson-datatype-jsr310.version}</version>
         </dependency>
 
-	</dependencies>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
 
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven-compiler-plugin.version}</version>
-				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-				</configuration>
-			</plugin>
-			
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>${maven-shade-plugin.version}</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<transformers>
-								<transformer
-									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<manifestEntries>
-										<Main-Class>io.vertx.core.Starter</Main-Class>
-										<Main-Verticle>org.openapitools.server.api.MainApiVerticle</Main-Verticle>
-									</manifestEntries>
-								</transformer>
-							</transformers>
-							<artifactSet />
-							<outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar</outputFile>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven-shade-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <manifestEntries>
+                                        <Main-Class>io.vertx.core.Starter</Main-Class>
+                                        <Main-Verticle>org.openapitools.server.api.MainApiVerticle</Main-Verticle>
+                                    </manifestEntries>
+                                </transformer>
+                            </transformers>
+                            <artifactSet />
+                            <outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar</outputFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/verticle/PetApiException.java b/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/verticle/PetApiException.java
index 3374dcfd63a4..d357d90ca1a4 100644
--- a/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/verticle/PetApiException.java
+++ b/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/verticle/PetApiException.java
@@ -12,14 +12,18 @@ public PetApiException(int statusCode, String statusMessage) {
     
     public static final PetApiException Pet_addPet_405_Exception = new PetApiException(405, "Invalid input");
     public static final PetApiException Pet_deletePet_400_Exception = new PetApiException(400, "Invalid pet value");
+    public static final PetApiException Pet_findPetsByStatus_200_Exception = new PetApiException(200, "successful operation");
     public static final PetApiException Pet_findPetsByStatus_400_Exception = new PetApiException(400, "Invalid status value");
+    public static final PetApiException Pet_findPetsByTags_200_Exception = new PetApiException(200, "successful operation");
     public static final PetApiException Pet_findPetsByTags_400_Exception = new PetApiException(400, "Invalid tag value");
+    public static final PetApiException Pet_getPetById_200_Exception = new PetApiException(200, "successful operation");
     public static final PetApiException Pet_getPetById_400_Exception = new PetApiException(400, "Invalid ID supplied");
     public static final PetApiException Pet_getPetById_404_Exception = new PetApiException(404, "Pet not found");
     public static final PetApiException Pet_updatePet_400_Exception = new PetApiException(400, "Invalid ID supplied");
     public static final PetApiException Pet_updatePet_404_Exception = new PetApiException(404, "Pet not found");
     public static final PetApiException Pet_updatePet_405_Exception = new PetApiException(405, "Validation exception");
     public static final PetApiException Pet_updatePetWithForm_405_Exception = new PetApiException(405, "Invalid input");
+    public static final PetApiException Pet_uploadFile_200_Exception = new PetApiException(200, "successful operation");
     
 
 }
\ No newline at end of file
diff --git a/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/verticle/StoreApiException.java b/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/verticle/StoreApiException.java
index c8a3b7e5be27..7a7a7ea59fb7 100644
--- a/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/verticle/StoreApiException.java
+++ b/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/verticle/StoreApiException.java
@@ -10,8 +10,11 @@ public StoreApiException(int statusCode, String statusMessage) {
     
     public static final StoreApiException Store_deleteOrder_400_Exception = new StoreApiException(400, "Invalid ID supplied");
     public static final StoreApiException Store_deleteOrder_404_Exception = new StoreApiException(404, "Order not found");
+    public static final StoreApiException Store_getInventory_200_Exception = new StoreApiException(200, "successful operation");
+    public static final StoreApiException Store_getOrderById_200_Exception = new StoreApiException(200, "successful operation");
     public static final StoreApiException Store_getOrderById_400_Exception = new StoreApiException(400, "Invalid ID supplied");
     public static final StoreApiException Store_getOrderById_404_Exception = new StoreApiException(404, "Order not found");
+    public static final StoreApiException Store_placeOrder_200_Exception = new StoreApiException(200, "successful operation");
     public static final StoreApiException Store_placeOrder_400_Exception = new StoreApiException(400, "Invalid Order");
     
 
diff --git a/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/verticle/UserApiException.java b/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/verticle/UserApiException.java
index b3714d11aff0..3fdf14a842e4 100644
--- a/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/verticle/UserApiException.java
+++ b/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/verticle/UserApiException.java
@@ -10,8 +10,10 @@ public UserApiException(int statusCode, String statusMessage) {
     
     public static final UserApiException User_deleteUser_400_Exception = new UserApiException(400, "Invalid username supplied");
     public static final UserApiException User_deleteUser_404_Exception = new UserApiException(404, "User not found");
+    public static final UserApiException User_getUserByName_200_Exception = new UserApiException(200, "successful operation");
     public static final UserApiException User_getUserByName_400_Exception = new UserApiException(400, "Invalid username supplied");
     public static final UserApiException User_getUserByName_404_Exception = new UserApiException(404, "User not found");
+    public static final UserApiException User_loginUser_200_Exception = new UserApiException(200, "successful operation");
     public static final UserApiException User_loginUser_400_Exception = new UserApiException(400, "Invalid username/password supplied");
     public static final UserApiException User_updateUser_400_Exception = new UserApiException(400, "Invalid user supplied");
     public static final UserApiException User_updateUser_404_Exception = new UserApiException(404, "User not found");
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
index 30a988c8963f..7a0ffeda6b46 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
@@ -177,6 +177,12 @@
         <artifactId>jackson-datatype-joda</artifactId>
         <version>${jackson-jaxrs-version}</version>
     </dependency>
+    <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>${javax-annotation-version}</version>
+        <scope>provided</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
@@ -199,6 +205,7 @@
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <cxf-version>3.3.0</cxf-version>
     <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
+    <javax-annotation-version>1.3.2</javax-annotation-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java
index 651784901639..edc0727d90c3 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java
@@ -28,7 +28,7 @@
 @Api(description = "the pet API")
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen")
 
 public class PetApi  {
 
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java
index 3c55b472b686..a6baa2c99775 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen")
 public interface PetApiService {
       public Response addPet(Pet body, SecurityContext securityContext);
       public Response deletePet(Long petId, String apiKey, SecurityContext securityContext);
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java
index c28b879c5f8b..0bfebfdb536e 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java
@@ -27,7 +27,7 @@
 @Api(description = "the store API")
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen")
 
 public class StoreApi  {
 
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java
index bdda2b3f838b..3135d74bb98e 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen")
 public interface StoreApiService {
       public Response deleteOrder(String orderId, SecurityContext securityContext);
       public Response getInventory(SecurityContext securityContext);
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApi.java
index bd34c8ef3fe4..178c16806f41 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApi.java
@@ -27,7 +27,7 @@
 @Api(description = "the user API")
 
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen")
 
 public class UserApi  {
 
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApiService.java
index c70add9c2ee2..b9f3090de813 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApiService.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen")
 public interface UserApiService {
       public Response createUser(User body, SecurityContext securityContext);
       public Response createUsersWithArrayInput(List<User> body, SecurityContext securityContext);
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index 58103eec764d..f841e096bf51 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.SecurityContext;
 
 @RequestScoped
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen")
 public class PetApiServiceImpl implements PetApiService {
       @Override
       public Response addPet(Pet body, SecurityContext securityContext) {
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index a883431a0da7..50ea94a966cc 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.SecurityContext;
 
 @RequestScoped
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen")
 public class StoreApiServiceImpl implements StoreApiService {
       @Override
       public Response deleteOrder(String orderId, SecurityContext securityContext) {
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index a161c7c463ed..3f534768c3e0 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.SecurityContext;
 
 @RequestScoped
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen")
 public class UserApiServiceImpl implements UserApiService {
       @Override
       public Response createUser(User body, SecurityContext securityContext) {
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
index d6cc377e6b32..b969ba62f50a 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
@@ -177,6 +177,12 @@
         <artifactId>jackson-datatype-joda</artifactId>
         <version>${jackson-jaxrs-version}</version>
     </dependency>
+    <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>${javax-annotation-version}</version>
+        <scope>provided</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
@@ -199,6 +205,7 @@
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <cxf-version>3.3.0</cxf-version>
     <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
+    <javax-annotation-version>1.3.2</javax-annotation-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/.openapi-generator/FILES b/samples/server/petstore/jaxrs-cxf-test-data/.openapi-generator/FILES
index b5999c424fd6..0fc7cbf70c70 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/.openapi-generator/FILES
+++ b/samples/server/petstore/jaxrs-cxf-test-data/.openapi-generator/FILES
@@ -16,6 +16,7 @@ src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
 src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
 src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
 src/gen/java/org/openapitools/model/Animal.java
+src/gen/java/org/openapitools/model/AnimalFarm.java
 src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
 src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
 src/gen/java/org/openapitools/model/ArrayTest.java
@@ -48,6 +49,7 @@ src/gen/java/org/openapitools/model/OuterEnum.java
 src/gen/java/org/openapitools/model/Pet.java
 src/gen/java/org/openapitools/model/ReadOnlyFirst.java
 src/gen/java/org/openapitools/model/SpecialModelName.java
+src/gen/java/org/openapitools/model/StringBooleanMap.java
 src/gen/java/org/openapitools/model/Tag.java
 src/gen/java/org/openapitools/model/TypeHolderDefault.java
 src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -60,9 +62,7 @@ src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
 src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
 src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
 src/main/resources/ApplicationContext.xml
-src/main/resources/test-data.json
 src/main/webapp/WEB-INF/context.xml
 src/main/webapp/WEB-INF/web.xml
 src/test/java/org/openapitools/api/SpringBootApplication.java
 src/test/resources/application.properties
-test-data-control.json
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/AnimalFarm.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/AnimalFarm.java
index c418106a5244..019440823ae2 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/AnimalFarm.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/AnimalFarm.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class AnimalFarm extends ArrayList<Animal> {
   
   @Override
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/MapTest.java
index a5fe34ef0158..e97b3da4a870 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/MapTest.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.model.StringBooleanMap;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -63,7 +64,8 @@ public static InnerEnum fromValue(String value) {
   private Map<String, Boolean> directMap = null;
 
   @ApiModelProperty(value = "")
-  private Map<String, Boolean> indirectMap = null;
+  @Valid
+  private StringBooleanMap indirectMap = new StringBooleanMap();
  /**
   * Get mapMapOfString
   * @return mapMapOfString
@@ -165,33 +167,25 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   * @return indirectMap
   */
   @JsonProperty("indirect_map")
-  public Map<String, Boolean> getIndirectMap() {
+  public StringBooleanMap getIndirectMap() {
     return indirectMap;
   }
 
   /**
    * Sets the <code>indirectMap</code> property.
    */
-  public void setIndirectMap(Map<String, Boolean> indirectMap) {
+  public void setIndirectMap(StringBooleanMap indirectMap) {
     this.indirectMap = indirectMap;
   }
 
   /**
    * Sets the <code>indirectMap</code> property.
    */
-  public MapTest indirectMap(Map<String, Boolean> indirectMap) {
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
     this.indirectMap = indirectMap;
     return this;
   }
 
-  /**
-   * Puts a new item into the <code>indirectMap</code> map.
-   */
-  public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
-    this.indirectMap.put(key, indirectMapItem);
-    return this;
-  }
-
 
   @Override
   public String toString() {
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/StringBooleanMap.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/StringBooleanMap.java
index 595b94064d3f..2d07ee91d333 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/StringBooleanMap.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/StringBooleanMap.java
@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class StringBooleanMap extends HashMap<String, Boolean> {
   
   @Override
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index f9d503c40fa0..42c07616cbba 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -35,7 +35,7 @@ public class AnotherFakeApiServiceImpl implements AnotherFakeApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/jim/projects/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/joschi/src/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/AnotherFakeApi");
         } catch (CacheException e) {
             e.printStackTrace();
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 1727da789976..f401b4861018 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -43,7 +43,7 @@ public class FakeApiServiceImpl implements FakeApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/jim/projects/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/joschi/src/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/FakeApi");
         } catch (CacheException e) {
             e.printStackTrace();
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
index d59054f6df56..9e91be612439 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
@@ -35,7 +35,7 @@ public class FakeClassnameTags123ApiServiceImpl implements FakeClassnameTags123A
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/jim/projects/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/joschi/src/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/FakeClassnameTags123Api");
         } catch (CacheException e) {
             e.printStackTrace();
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index eccd2f17f23d..40b35c8f0139 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -39,7 +39,7 @@ public class PetApiServiceImpl implements PetApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/jim/projects/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/joschi/src/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/PetApi");
         } catch (CacheException e) {
             e.printStackTrace();
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index b03f1b76e9b6..d7233cf64fc1 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -35,7 +35,7 @@ public class StoreApiServiceImpl implements StoreApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/jim/projects/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/joschi/src/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/StoreApi");
         } catch (CacheException e) {
             e.printStackTrace();
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index 29a22c8a6449..ecf75bcfeb18 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -35,7 +35,7 @@ public class UserApiServiceImpl implements UserApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/jim/projects/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/joschi/src/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/UserApi");
         } catch (CacheException e) {
             e.printStackTrace();
diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml
index 7dd35b86d73a..a98a3d7b11f5 100644
--- a/samples/server/petstore/jaxrs-cxf/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf/pom.xml
@@ -177,6 +177,12 @@
         <artifactId>jackson-datatype-joda</artifactId>
         <version>${jackson-jaxrs-version}</version>
     </dependency>
+    <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>${javax-annotation-version}</version>
+        <scope>provided</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
@@ -199,6 +205,7 @@
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <cxf-version>3.3.0</cxf-version>
     <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
+    <javax-annotation-version>1.3.2</javax-annotation-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 92a1a7f0ba3c..3dc411b2da74 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the another-fake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApi  {
    private final AnotherFakeApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index 1731e691c492..1096acf12f01 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class AnotherFakeApiService {
     public abstract Response call123testSpecialTags(Client body,SecurityContext securityContext) throws NotFoundException;
 }
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/ApiException.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/ApiException.java
index fdbaeee3a29e..cb188abf49e8 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/ApiException.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/ApiException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiException extends Exception{
     private int code;
     public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/ApiOriginFilter.java
index 7039b5e4d92a..2b84aa455556 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/ApiOriginFilter.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiOriginFilter implements javax.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/ApiResponseMessage.java
index 9211b2dd7e51..a4a4ecf08c5d 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/ApiResponseMessage.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java
index 1ad02e7601df..a9fa5ad0eac3 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java
@@ -40,7 +40,7 @@
 
 
 @io.swagger.annotations.Api(description = "the fake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApi  {
    private final FakeApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java
index 4565d8b002a5..1d56ff1af5c8 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -25,7 +25,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class FakeApiService {
     public abstract Response createXmlItem(XmlItem xmlItem,SecurityContext securityContext) throws NotFoundException;
     public abstract Response fakeOuterBooleanSerialize(Boolean body,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
index 7fad74fd76cd..66be9a4e9633 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the fake_classname_test API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApi  {
    private final FakeClassnameTestApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
index cb998c5ff9de..f81b0a146ee0 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class FakeClassnameTestApiService {
     public abstract Response testClassname(Client body,SecurityContext securityContext) throws NotFoundException;
 }
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/NotFoundException.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/NotFoundException.java
index 526df6c1c197..c369e6aa4315 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/NotFoundException.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java
index 34acf0291b34..f426e3d49b9b 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java
@@ -33,7 +33,7 @@
 
 
 @io.swagger.annotations.Api(description = "the pet API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApi  {
    private final PetApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java
index 23f190664163..1f44eee7c800 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class PetApiService {
     public abstract Response addPet(Pet body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java
index 84ad5abd70df..eb37ae7f4e61 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java
@@ -31,7 +31,7 @@
 
 
 @io.swagger.annotations.Api(description = "the store API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApi  {
    private final StoreApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java
index 06b1f031d1de..885579d9f0f2 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class StoreApiService {
     public abstract Response deleteOrder(String orderId,SecurityContext securityContext) throws NotFoundException;
     public abstract Response getInventory(SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StringUtil.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StringUtil.java
index 367283558974..7dc8e3d4ebf5 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StringUtil.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StringUtil.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java
index 47f5f22b6cf1..748e6cf83b5d 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java
@@ -31,7 +31,7 @@
 
 
 @io.swagger.annotations.Api(description = "the user API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApi  {
    private final UserApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApiService.java
index 9b4fe40612c2..97ec792f0f72 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApiService.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class UserApiService {
     public abstract Response createUser(User body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 29b9b6c3da23..96e39d555bce 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Serializable {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
index fd0557663049..209754aec883 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> implements Serializable {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 2eb789716c6b..3e862abd98d3 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implements Serializable {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index 7927ec401edb..55f7b9b50c60 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -43,7 +43,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesClass  implements Serializable {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   @JsonProperty(JSON_PROPERTY_MAP_STRING)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 9ce92e3d63cd..3dd25542664e 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> implements Serializable {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
index cfebd26c3109..9577085dff5a 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> implements Serializable {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
index 1d4f7d6eb48a..3e0e528de870 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> implements Serializable {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
index 6b42e35df749..5b4365eac533 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> implements Serializable {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Animal.java
index aa2b0ea26b35..3be2eb7d5057 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Animal.java
@@ -32,7 +32,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 7da62dea34f9..e23b5392c072 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayOfArrayOfNumberOnly  implements Serializable {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index 410144097af0..78d65c224369 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayOfNumberOnly  implements Serializable {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java
index 54097f361644..e82396f8035f 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -34,7 +34,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayTest  implements Serializable {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCat.java
index 45a515a2355a..e72fa498d336 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCat.java
@@ -32,7 +32,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class BigCat extends Cat implements Serializable {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCatAllOf.java
index adc84d7897a7..96e0e1b246ba 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCatAllOf.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class BigCatAllOf  implements Serializable {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Capitalization.java
index 6223662a3346..75b7afa03416 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Capitalization.java
@@ -34,7 +34,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Capitalization  implements Serializable {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Cat.java
index f483ecdb4741..63238e2768b6 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Cat.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Cat extends Animal implements Serializable {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/CatAllOf.java
index 3f722c3987c4..24fa4369454c 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class CatAllOf  implements Serializable {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Category.java
index 1bac9ac7a832..b6be6f06620a 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Category.java
@@ -30,7 +30,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Category  implements Serializable {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ClassModel.java
index 650c68f9c5da..4af34a43b833 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ClassModel.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ClassModel  implements Serializable {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Client.java
index 250c3e4c6347..889119b31292 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Client.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Client  implements Serializable {
   public static final String JSON_PROPERTY_CLIENT = "client";
   @JsonProperty(JSON_PROPERTY_CLIENT)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Dog.java
index 5afd89d2233e..13897b15cb4e 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Dog.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Dog extends Animal implements Serializable {
   public static final String JSON_PROPERTY_BREED = "breed";
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/DogAllOf.java
index 5f6b3f06d3d4..1ddb1f19e40e 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class DogAllOf  implements Serializable {
   public static final String JSON_PROPERTY_BREED = "breed";
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java
index 99e0430ef37a..f60714075e88 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -33,7 +33,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class EnumArrays  implements Serializable {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java
index 6369f5d42894..7dcca8375c27 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java
@@ -35,7 +35,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class EnumTest  implements Serializable {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index acbb3d0ff3b0..aa908d33a146 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -32,7 +32,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FileSchemaTestClass  implements Serializable {
   public static final String JSON_PROPERTY_FILE = "file";
   @JsonProperty(JSON_PROPERTY_FILE)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java
index 746a65827415..f6138e3c7d7f 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java
@@ -47,7 +47,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FormatTest  implements Serializable {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   @JsonProperty(JSON_PROPERTY_INTEGER)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index d0cae4f593f2..e033d1e86a9b 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -30,7 +30,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class HasOnlyReadOnly  implements Serializable {
   public static final String JSON_PROPERTY_BAR = "bar";
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java
index a2abdc35bd6d..ed79c4897d26 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java
@@ -36,7 +36,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class MapTest  implements Serializable {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 5103814c4d39..3e59551cdf92 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,7 +37,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Model200Response.java
index 448a3698f58a..8c9e902d5c0d 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Model200Response.java
@@ -31,7 +31,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Model200Response  implements Serializable {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 9a5641ef8e5f..44764aec2615 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -31,7 +31,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ModelApiResponse  implements Serializable {
   public static final String JSON_PROPERTY_CODE = "code";
   @JsonProperty(JSON_PROPERTY_CODE)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ModelReturn.java
index dd530ff2025e..996031740b02 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ModelReturn  implements Serializable {
   public static final String JSON_PROPERTY_RETURN = "return";
   @JsonProperty(JSON_PROPERTY_RETURN)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Name.java
index d4748ab32aaa..78cdf3d45cc9 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Name.java
@@ -33,7 +33,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Name  implements Serializable {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/NumberOnly.java
index 79945cb9d63f..e6ac333fd478 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class NumberOnly  implements Serializable {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Order.java
index 18d5f7198ce6..7cfb038d8b18 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Order.java
@@ -36,7 +36,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Order  implements Serializable {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterComposite.java
index 06f28bfe8d23..bb2f180c6073 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -32,7 +32,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class OuterComposite  implements Serializable {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java
index 7b0c77c9ebcd..40e8c765154e 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java
@@ -41,7 +41,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Pet  implements Serializable {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index c63d00711dfb..47ea23783e64 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -30,7 +30,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ReadOnlyFirst  implements Serializable {
   public static final String JSON_PROPERTY_BAR = "bar";
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/SpecialModelName.java
index 90c282efa49f..bc9f4fb4430a 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class SpecialModelName  implements Serializable {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Tag.java
index a61318af7a46..b8dfeab5d43f 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Tag.java
@@ -30,7 +30,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Tag  implements Serializable {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderDefault.java
index 59df1a2c2efe..9746d3fd8d7c 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderDefault.java
@@ -36,7 +36,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class TypeHolderDefault  implements Serializable {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderExample.java
index e829f9544261..568246ae72fd 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -37,7 +37,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class TypeHolderExample  implements Serializable {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/User.java
index 600f1dd00cbd..57ccb819c09b 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/User.java
@@ -36,7 +36,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class User  implements Serializable {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java
index be17e1d84eff..77dd28614764 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java
@@ -60,7 +60,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class XmlItem  implements Serializable {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
index 21281d8d8a43..ae72e4771a3d 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.AnotherFakeApiService;
 import org.openapitools.api.impl.AnotherFakeApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceFactory {
     private final static AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
index 6b5746c6e8a6..97bf41219fd5 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.FakeApiService;
 import org.openapitools.api.impl.FakeApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceFactory {
     private final static FakeApiService service = new FakeApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
index 3c866f7e478d..4963e03dd259 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.FakeClassnameTestApiService;
 import org.openapitools.api.impl.FakeClassnameTestApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApiServiceFactory {
     private final static FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
index c292d9111ee8..932873718a3b 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.PetApiService;
 import org.openapitools.api.impl.PetApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceFactory {
     private final static PetApiService service = new PetApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
index 0a145377adee..8ffaff0ba970 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.StoreApiService;
 import org.openapitools.api.impl.StoreApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceFactory {
     private final static StoreApiService service = new StoreApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
index 6376e5732cf8..eebfb22f280e 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.UserApiService;
 import org.openapitools.api.impl.UserApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceFactory {
     private final static UserApiService service = new UserApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index a8dc69d4ed95..661940c66dd5 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceImpl extends AnotherFakeApiService {
     @Override
     public Response call123testSpecialTags(Client body, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index ffd3185fe0a1..f5ed05e48d0c 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -25,7 +25,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceImpl extends FakeApiService {
     @Override
     public Response createXmlItem(XmlItem xmlItem, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
index 6cc403a8b402..2204800cb839 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApiServiceImpl extends FakeClassnameTestApiService {
     @Override
     public Response testClassname(Client body, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index 168693768dd5..8e3cf747147a 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceImpl extends PetApiService {
     @Override
     public Response addPet(Pet body, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index e0746cb4f937..1e67037417eb 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceImpl extends StoreApiService {
     @Override
     public Response deleteOrder(String orderId, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index 3149b83c007a..03a2c24f326b 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceImpl extends UserApiService {
     @Override
     public Response createUser(User body, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 576639b67309..89ed39644d4b 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the another-fake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApi  {
    private final AnotherFakeApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index fa614bab5a1c..4e372fb7b55e 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class AnotherFakeApiService {
     public abstract Response call123testSpecialTags(Client client,SecurityContext securityContext) throws NotFoundException;
 }
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiException.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiException.java
index fdbaeee3a29e..cb188abf49e8 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiException.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiException extends Exception{
     private int code;
     public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiOriginFilter.java
index 7039b5e4d92a..2b84aa455556 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiOriginFilter.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiOriginFilter implements javax.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiResponseMessage.java
index 9211b2dd7e51..a4a4ecf08c5d 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiResponseMessage.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
index 76b5c00f7dbf..682b89705896 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
@@ -40,7 +40,7 @@
 
 
 @io.swagger.annotations.Api(description = "the fake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApi  {
    private final FakeApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
index 6c6878f896c5..2c42464c17cb 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -25,7 +25,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class FakeApiService {
     public abstract Response fakeHealthGet(SecurityContext securityContext) throws NotFoundException;
     public abstract Response fakeHttpSignatureTest(Pet pet,String query1,String header1,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
index c7eea20825cd..b8044b9ddcfc 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the fake_classname_test API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApi  {
    private final FakeClassnameTestApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
index d5c2d43a43de..0fc31f0c473d 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class FakeClassnameTestApiService {
     public abstract Response testClassname(Client client,SecurityContext securityContext) throws NotFoundException;
 }
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApi.java
index 38d5e782f081..665a7a3ecb20 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the foo API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FooApi  {
    private final FooApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApiService.java
index f25c9066056e..9ce244a6c1a6 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApiService.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class FooApiService {
     public abstract Response fooGet(SecurityContext securityContext) throws NotFoundException;
 }
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/NotFoundException.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/NotFoundException.java
index 526df6c1c197..c369e6aa4315 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/NotFoundException.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java
index 98f5cdf0407d..2049e604b87d 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java
@@ -32,7 +32,7 @@
 
 
 @io.swagger.annotations.Api(description = "the pet API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApi  {
    private final PetApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java
index ebd89ee5c3a0..9271117c1c77 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class PetApiService {
     public abstract Response addPet(Pet pet,SecurityContext securityContext) throws NotFoundException;
     public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java
index cda2845eccb6..54a5de5fc1c7 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java
@@ -31,7 +31,7 @@
 
 
 @io.swagger.annotations.Api(description = "the store API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApi  {
    private final StoreApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java
index 47440abc132e..db5973e5e18d 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class StoreApiService {
     public abstract Response deleteOrder(String orderId,SecurityContext securityContext) throws NotFoundException;
     public abstract Response getInventory(SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StringUtil.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StringUtil.java
index 367283558974..7dc8e3d4ebf5 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StringUtil.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StringUtil.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java
index 0d3f8936e8b2..985068a9a91e 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java
@@ -31,7 +31,7 @@
 
 
 @io.swagger.annotations.Api(description = "the user API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApi  {
    private final UserApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApiService.java
index ce18fdbf88cf..a25672ffa0df 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApiService.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class UserApiService {
     public abstract Response createUser(User user,SecurityContext securityContext) throws NotFoundException;
     public abstract Response createUsersWithArrayInput(List<User> user,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index e4e94143383a..04def90768c8 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -32,7 +32,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_MAP_PROPERTY,
   AdditionalPropertiesClass.JSON_PROPERTY_MAP_OF_MAP_PROPERTY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_MAP_PROPERTY = "map_property";
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Animal.java
index b92746816fe0..a4dcb88b2db0 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Animal.java
@@ -31,7 +31,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index b61d1fabdc40..d62c0caf5221 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index c2955daa575f..ee84cfbe9aa9 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayOfNumberOnly   {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java
index a8ef31cdb79c..fe5dd36d55b6 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -33,7 +33,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayTest   {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Capitalization.java
index 4db559dc7b31..a807df6b5692 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Capitalization.java
@@ -33,7 +33,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Capitalization   {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Cat.java
index bb3bad972102..3695d5ad727e 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Cat.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Cat extends Animal  {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/CatAllOf.java
index d8bf140b58c5..8dcbc7384156 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class CatAllOf   {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Category.java
index 1a39a7ccaf6b..c3e077e565a3 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Category.java
@@ -29,7 +29,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Category   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ClassModel.java
index 98ba52298ad3..b2303de259c0 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ClassModel.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ClassModel   {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Client.java
index cd1b6b08a63d..8bd24a5ae0c0 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Client.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Client   {
   public static final String JSON_PROPERTY_CLIENT = "client";
   @JsonProperty(JSON_PROPERTY_CLIENT)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Dog.java
index 6d0a7a90f828..2aa32d3cb9a2 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Dog.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Dog extends Animal  {
   public static final String JSON_PROPERTY_BREED = "breed";
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/DogAllOf.java
index 2551f2285c4c..ee6459c1dbdf 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class DogAllOf   {
   public static final String JSON_PROPERTY_BREED = "breed";
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java
index 5e6c640c3ebe..5cd5ec99f41b 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -32,7 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java
index a087fa931b26..afec49e3a591 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java
@@ -40,7 +40,7 @@
   EnumTest.JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE,
   EnumTest.JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index 4e3ec6a2cf81..0cd31260a960 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -31,7 +31,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FileSchemaTestClass   {
   public static final String JSON_PROPERTY_FILE = "file";
   @JsonProperty(JSON_PROPERTY_FILE)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Foo.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Foo.java
index 0aea624b8736..35400548bce8 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Foo.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Foo.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   Foo.JSON_PROPERTY_BAR
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Foo   {
   public static final String JSON_PROPERTY_BAR = "bar";
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java
index e636b8c5a550..13054218645f 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java
@@ -46,7 +46,7 @@
   FormatTest.JSON_PROPERTY_PATTERN_WITH_DIGITS,
   FormatTest.JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FormatTest   {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   @JsonProperty(JSON_PROPERTY_INTEGER)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index 30d9c4fccf93..2f58f76873c7 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -29,7 +29,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class HasOnlyReadOnly   {
   public static final String JSON_PROPERTY_BAR = "bar";
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/HealthCheckResult.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/HealthCheckResult.java
index 1bf90f377271..d6a7e374de9d 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/HealthCheckResult.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/HealthCheckResult.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   HealthCheckResult.JSON_PROPERTY_NULLABLE_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class HealthCheckResult   {
   public static final String JSON_PROPERTY_NULLABLE_MESSAGE = "NullableMessage";
   @JsonProperty(JSON_PROPERTY_NULLABLE_MESSAGE)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject.java
index ab8ba1517504..770bb34bf4e3 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject.java
@@ -29,7 +29,7 @@
   InlineObject.JSON_PROPERTY_NAME,
   InlineObject.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class InlineObject   {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject1.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject1.java
index e2b3f9b5a82c..2c44e17e4e5b 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject1.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject1.java
@@ -30,7 +30,7 @@
   InlineObject1.JSON_PROPERTY_ADDITIONAL_METADATA,
   InlineObject1.JSON_PROPERTY_FILE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class InlineObject1   {
   public static final String JSON_PROPERTY_ADDITIONAL_METADATA = "additionalMetadata";
   @JsonProperty(JSON_PROPERTY_ADDITIONAL_METADATA)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject2.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject2.java
index 0d8faf7fb74b..fe9bc647823e 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject2.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject2.java
@@ -32,7 +32,7 @@
   InlineObject2.JSON_PROPERTY_ENUM_FORM_STRING_ARRAY,
   InlineObject2.JSON_PROPERTY_ENUM_FORM_STRING
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class InlineObject2   {
   /**
    * Gets or Sets enumFormStringArray
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject3.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject3.java
index 89c6511971f6..bdd3f608caab 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject3.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject3.java
@@ -44,7 +44,7 @@
   InlineObject3.JSON_PROPERTY_PASSWORD,
   InlineObject3.JSON_PROPERTY_CALLBACK
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class InlineObject3   {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   @JsonProperty(JSON_PROPERTY_INTEGER)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject4.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject4.java
index 5aa12b96554e..7f311dc84592 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject4.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject4.java
@@ -29,7 +29,7 @@
   InlineObject4.JSON_PROPERTY_PARAM,
   InlineObject4.JSON_PROPERTY_PARAM2
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class InlineObject4   {
   public static final String JSON_PROPERTY_PARAM = "param";
   @JsonProperty(JSON_PROPERTY_PARAM)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject5.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject5.java
index 16cf25fff1ec..8d4b181255bb 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject5.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject5.java
@@ -30,7 +30,7 @@
   InlineObject5.JSON_PROPERTY_ADDITIONAL_METADATA,
   InlineObject5.JSON_PROPERTY_REQUIRED_FILE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class InlineObject5   {
   public static final String JSON_PROPERTY_ADDITIONAL_METADATA = "additionalMetadata";
   @JsonProperty(JSON_PROPERTY_ADDITIONAL_METADATA)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineResponseDefault.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineResponseDefault.java
index 1095d685c6c8..bc427b27d278 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineResponseDefault.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineResponseDefault.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   InlineResponseDefault.JSON_PROPERTY_STRING
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class InlineResponseDefault   {
   public static final String JSON_PROPERTY_STRING = "string";
   @JsonProperty(JSON_PROPERTY_STRING)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java
index 497f98c1fb5f..f9d4db9b2f04 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java
@@ -35,7 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class MapTest   {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e8ff1a269768..fa1e51a3889f 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -36,7 +36,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Model200Response.java
index 00901b890aea..c1cc9a6a7bbb 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Model200Response.java
@@ -30,7 +30,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Model200Response   {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 8355a7526b68..b677a747afc5 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -30,7 +30,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ModelApiResponse   {
   public static final String JSON_PROPERTY_CODE = "code";
   @JsonProperty(JSON_PROPERTY_CODE)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelReturn.java
index a979d5e6fce5..bf06abca486b 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ModelReturn   {
   public static final String JSON_PROPERTY_RETURN = "return";
   @JsonProperty(JSON_PROPERTY_RETURN)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Name.java
index 5d4da98047b2..31c348b35af8 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Name.java
@@ -32,7 +32,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Name   {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java
index 8d921d2cda45..2ca289f9c382 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java
@@ -45,7 +45,7 @@
   NullableClass.JSON_PROPERTY_OBJECT_AND_ITEMS_NULLABLE_PROP,
   NullableClass.JSON_PROPERTY_OBJECT_ITEMS_NULLABLE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class NullableClass extends HashMap<String, Object>  {
   public static final String JSON_PROPERTY_INTEGER_PROP = "integer_prop";
   @JsonProperty(JSON_PROPERTY_INTEGER_PROP)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NumberOnly.java
index 633e2e339ed9..f98544933e15 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class NumberOnly   {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java
index 10fa5da35a9f..0db56b8b6ab1 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java
@@ -35,7 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Order   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterComposite.java
index 448638abd374..33d948c2d982 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -31,7 +31,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class OuterComposite   {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java
index 29963f3d63b4..1a24f95e43ac 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java
@@ -38,7 +38,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Pet   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index 447b43cb5010..493c758bdb6e 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -29,7 +29,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ReadOnlyFirst   {
   public static final String JSON_PROPERTY_BAR = "bar";
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/SpecialModelName.java
index bdac9955e968..0f6ce895850d 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class SpecialModelName   {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Tag.java
index 35305769a2d2..9a44ab76fc9e 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Tag.java
@@ -29,7 +29,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Tag   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/User.java
index 23b9f6e3cee4..ab66f62dfbac 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/User.java
@@ -35,7 +35,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class User   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
index 21281d8d8a43..ae72e4771a3d 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.AnotherFakeApiService;
 import org.openapitools.api.impl.AnotherFakeApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceFactory {
     private final static AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
index 6b5746c6e8a6..97bf41219fd5 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.FakeApiService;
 import org.openapitools.api.impl.FakeApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceFactory {
     private final static FakeApiService service = new FakeApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
index 3c866f7e478d..4963e03dd259 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.FakeClassnameTestApiService;
 import org.openapitools.api.impl.FakeClassnameTestApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApiServiceFactory {
     private final static FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FooApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FooApiServiceFactory.java
index d3740d058d0c..c3252a4a672f 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FooApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/FooApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.FooApiService;
 import org.openapitools.api.impl.FooApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FooApiServiceFactory {
     private final static FooApiService service = new FooApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
index c292d9111ee8..932873718a3b 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.PetApiService;
 import org.openapitools.api.impl.PetApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceFactory {
     private final static PetApiService service = new PetApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
index 0a145377adee..8ffaff0ba970 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.StoreApiService;
 import org.openapitools.api.impl.StoreApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceFactory {
     private final static StoreApiService service = new StoreApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
index 6376e5732cf8..eebfb22f280e 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.UserApiService;
 import org.openapitools.api.impl.UserApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceFactory {
     private final static UserApiService service = new UserApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index 05e890182272..2217a5b8ca48 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceImpl extends AnotherFakeApiService {
     @Override
     public Response call123testSpecialTags(Client client, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 860002084e99..eb5903498e58 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -25,7 +25,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceImpl extends FakeApiService {
     @Override
     public Response fakeHealthGet(SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
index 8e5ee58fd960..690693d4a5ac 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApiServiceImpl extends FakeClassnameTestApiService {
     @Override
     public Response testClassname(Client client, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FooApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FooApiServiceImpl.java
index 7c891c1514f5..8e70dbf3be24 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FooApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FooApiServiceImpl.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FooApiServiceImpl extends FooApiService {
     @Override
     public Response fooGet(SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index 366b2e4e1337..fc29b062439b 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceImpl extends PetApiService {
     @Override
     public Response addPet(Pet pet, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 18c2ec5ecdd3..ea00608349fb 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceImpl extends StoreApiService {
     @Override
     public Response deleteOrder(String orderId, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index ef7366a66268..2591ff605353 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceImpl extends UserApiService {
     @Override
     public Response createUser(User user, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/ApiException.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/ApiException.java
index fdbaeee3a29e..83ba300cd600 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/ApiException.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/ApiException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class ApiException extends Exception{
     private int code;
     public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/ApiOriginFilter.java
index 5cfa35dec84d..ae4ceb1a77c2 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/ApiOriginFilter.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class ApiOriginFilter implements javax.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/ApiResponseMessage.java
index 4a71dd85cab7..35fc693af013 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/ApiResponseMessage.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/NotFoundException.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/NotFoundException.java
index 526df6c1c197..7bba9680d59c 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/NotFoundException.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java
index 33c88efb0b4b..327b00e46c73 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the pet API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class PetApi  {
 
     @Inject PetApiService service;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java
index 9bfaae424d94..5415004bc635 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public interface PetApiService {
       Response addPet(Pet body,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java
index 0bdccffb2c78..a79712327381 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java
@@ -28,7 +28,7 @@
 
 
 @io.swagger.annotations.Api(description = "the store API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class StoreApi  {
 
     @Inject StoreApiService service;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java
index 86ca76cdbeac..ed4c8338a600 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public interface StoreApiService {
       Response deleteOrder(String orderId,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StringUtil.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StringUtil.java
index 367283558974..4bbe3a4447bc 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StringUtil.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StringUtil.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApi.java
index 7347f487864b..d325a05a54f1 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApi.java
@@ -28,7 +28,7 @@
 
 
 @io.swagger.annotations.Api(description = "the user API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class UserApi  {
 
     @Inject UserApiService service;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApiService.java
index 308becc2c3a6..35d72d421127 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApiService.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public interface UserApiService {
       Response createUser(User body,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Category.java
index 32475fb1e948..f9e6b5c8b03e 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Category.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A category for a pet")
+@ApiModel(description="A category for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class Category   {
   
   private Long id;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/ModelApiResponse.java
index bc9b86333446..d54f67bff6f6 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="Describes the result of uploading an image resource")
+@ApiModel(description="Describes the result of uploading an image resource")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class ModelApiResponse   {
   
   private Integer code;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Order.java
index 575ee57c9e96..73a3f58ccca6 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Order.java
@@ -11,7 +11,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="An order for a pets from the pet store")
+@ApiModel(description="An order for a pets from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class Order   {
   
   private Long id;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java
index f2cc2bd04df5..9ef28b46c103 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java
@@ -14,7 +14,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A pet for sale in the pet store")
+@ApiModel(description="A pet for sale in the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class Pet   {
   
   private Long id;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Tag.java
index 7b4baed9f803..78e46f856f6e 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Tag.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A tag for a pet")
+@ApiModel(description="A tag for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class Tag   {
   
   private Long id;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/User.java
index c4339be87fe9..cc3e9c9051ad 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/User.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A User who is purchasing from the pet store")
+@ApiModel(description="A User who is purchasing from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class User   {
   
   private Long id;
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index 2f2b64d8ba7a..0b264cc92ced 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -19,7 +19,7 @@
 import javax.ws.rs.core.SecurityContext;
 
 @RequestScoped
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class PetApiServiceImpl implements PetApiService {
       public Response addPet(Pet body,SecurityContext securityContext)
       throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index fb56f1feceb3..4669635c2590 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.SecurityContext;
 
 @RequestScoped
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class StoreApiServiceImpl implements StoreApiService {
       public Response deleteOrder(String orderId,SecurityContext securityContext)
       throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index eacf8b7e4001..40d14d0be55b 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.SecurityContext;
 
 @RequestScoped
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class UserApiServiceImpl implements UserApiService {
       public Response createUser(User body,SecurityContext securityContext)
       throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java
index e14815f49021..5b44c238acb1 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java
@@ -26,7 +26,7 @@
 
 
 @io.swagger.annotations.Api(description = "the pet API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public interface PetApi  {
    
     @POST
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java
index 868c02a694b3..8408fb1d4c97 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java
@@ -24,7 +24,7 @@
 
 
 @io.swagger.annotations.Api(description = "the store API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public interface StoreApi  {
    
     @DELETE
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/UserApi.java
index addd48d94062..2edd72e2304b 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/UserApi.java
@@ -24,7 +24,7 @@
 
 
 @io.swagger.annotations.Api(description = "the user API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public interface UserApi  {
    
     @POST
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Category.java
index a829907a32a8..47a67a72e502 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Category.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A category for a pet")
+@ApiModel(description="A category for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class Category   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 7ae2ec81cc02..dbade7dfd985 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="Describes the result of uploading an image resource")
+@ApiModel(description="Describes the result of uploading an image resource")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class ModelApiResponse   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Order.java
index 9ec371f400d5..0c2c61043471 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Order.java
@@ -11,7 +11,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="An order for a pets from the pet store")
+@ApiModel(description="An order for a pets from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class Order   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Pet.java
index e83dd5c7d8c9..ba7e8ffbaad1 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Pet.java
@@ -14,7 +14,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A pet for sale in the pet store")
+@ApiModel(description="A pet for sale in the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class Pet   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Tag.java
index 1689a6eb69a1..c734e0e00278 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Tag.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A tag for a pet")
+@ApiModel(description="A tag for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class Tag   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/User.java
index afc1c3cb8d92..f5b3b89a9a07 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/User.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A User who is purchasing from the pet store")
+@ApiModel(description="A User who is purchasing from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class User   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index 3f339c113b10..50a3d2f99c38 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class PetApiServiceImpl implements PetApi {
       public Response addPet(Pet body,SecurityContext securityContext) {
       // do some magic!
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 1185626ed04d..262a0fb0005a 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -14,7 +14,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class StoreApiServiceImpl implements StoreApi {
       public Response deleteOrder(String orderId,SecurityContext securityContext) {
       // do some magic!
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index 951a063491a1..a63f0db78fe7 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -14,7 +14,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class UserApiServiceImpl implements UserApi {
       public Response createUser(User body,SecurityContext securityContext) {
       // do some magic!
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java
index e14815f49021..5b44c238acb1 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java
@@ -26,7 +26,7 @@
 
 
 @io.swagger.annotations.Api(description = "the pet API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public interface PetApi  {
    
     @POST
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java
index 868c02a694b3..8408fb1d4c97 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java
@@ -24,7 +24,7 @@
 
 
 @io.swagger.annotations.Api(description = "the store API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public interface StoreApi  {
    
     @DELETE
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/UserApi.java
index addd48d94062..2edd72e2304b 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/UserApi.java
@@ -24,7 +24,7 @@
 
 
 @io.swagger.annotations.Api(description = "the user API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public interface UserApi  {
    
     @POST
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Category.java
index a829907a32a8..47a67a72e502 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Category.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A category for a pet")
+@ApiModel(description="A category for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class Category   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 7ae2ec81cc02..dbade7dfd985 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="Describes the result of uploading an image resource")
+@ApiModel(description="Describes the result of uploading an image resource")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class ModelApiResponse   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Order.java
index 8cedfeeb6e52..2f31649bcea9 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Order.java
@@ -11,7 +11,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="An order for a pets from the pet store")
+@ApiModel(description="An order for a pets from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class Order   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Pet.java
index 81b8a7ff5a57..57012bf986e0 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Pet.java
@@ -14,7 +14,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A pet for sale in the pet store")
+@ApiModel(description="A pet for sale in the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class Pet   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Tag.java
index 1689a6eb69a1..c734e0e00278 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Tag.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A tag for a pet")
+@ApiModel(description="A tag for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class Tag   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/User.java
index afc1c3cb8d92..f5b3b89a9a07 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/User.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A User who is purchasing from the pet store")
+@ApiModel(description="A User who is purchasing from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class User   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index 3f339c113b10..50a3d2f99c38 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class PetApiServiceImpl implements PetApi {
       public Response addPet(Pet body,SecurityContext securityContext) {
       // do some magic!
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 1185626ed04d..262a0fb0005a 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -14,7 +14,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class StoreApiServiceImpl implements StoreApi {
       public Response deleteOrder(String orderId,SecurityContext securityContext) {
       // do some magic!
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index 951a063491a1..a63f0db78fe7 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -14,7 +14,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class UserApiServiceImpl implements UserApi {
       public Response createUser(User body,SecurityContext securityContext) {
       // do some magic!
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java
index e14815f49021..5b44c238acb1 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java
@@ -26,7 +26,7 @@
 
 
 @io.swagger.annotations.Api(description = "the pet API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public interface PetApi  {
    
     @POST
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java
index 868c02a694b3..8408fb1d4c97 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java
@@ -24,7 +24,7 @@
 
 
 @io.swagger.annotations.Api(description = "the store API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public interface StoreApi  {
    
     @DELETE
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/UserApi.java
index addd48d94062..2edd72e2304b 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/UserApi.java
@@ -24,7 +24,7 @@
 
 
 @io.swagger.annotations.Api(description = "the user API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public interface UserApi  {
    
     @POST
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Category.java
index a829907a32a8..47a67a72e502 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Category.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A category for a pet")
+@ApiModel(description="A category for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class Category   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 7ae2ec81cc02..dbade7dfd985 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="Describes the result of uploading an image resource")
+@ApiModel(description="Describes the result of uploading an image resource")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class ModelApiResponse   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Order.java
index 070e55e4333f..bc0aa26794bd 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Order.java
@@ -11,7 +11,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="An order for a pets from the pet store")
+@ApiModel(description="An order for a pets from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class Order   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Pet.java
index 81b8a7ff5a57..57012bf986e0 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Pet.java
@@ -14,7 +14,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A pet for sale in the pet store")
+@ApiModel(description="A pet for sale in the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class Pet   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Tag.java
index 1689a6eb69a1..c734e0e00278 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Tag.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A tag for a pet")
+@ApiModel(description="A tag for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class Tag   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/User.java
index afc1c3cb8d92..f5b3b89a9a07 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/User.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A User who is purchasing from the pet store")
+@ApiModel(description="A User who is purchasing from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class User   {
   
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index 3f339c113b10..50a3d2f99c38 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class PetApiServiceImpl implements PetApi {
       public Response addPet(Pet body,SecurityContext securityContext) {
       // do some magic!
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 1185626ed04d..262a0fb0005a 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -14,7 +14,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class StoreApiServiceImpl implements StoreApi {
       public Response deleteOrder(String orderId,SecurityContext securityContext) {
       // do some magic!
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index 951a063491a1..a63f0db78fe7 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -14,7 +14,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyEapServerCodegen")
 public class UserApiServiceImpl implements UserApi {
       public Response createUser(User body,SecurityContext securityContext) {
       // do some magic!
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/ApiException.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/ApiException.java
index fdbaeee3a29e..83ba300cd600 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/ApiException.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/ApiException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class ApiException extends Exception{
     private int code;
     public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/ApiOriginFilter.java
index 5cfa35dec84d..ae4ceb1a77c2 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/ApiOriginFilter.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class ApiOriginFilter implements javax.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/ApiResponseMessage.java
index 4a71dd85cab7..35fc693af013 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/ApiResponseMessage.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/NotFoundException.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/NotFoundException.java
index 526df6c1c197..7bba9680d59c 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/NotFoundException.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java
index 33c88efb0b4b..327b00e46c73 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the pet API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class PetApi  {
 
     @Inject PetApiService service;
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java
index 9bfaae424d94..5415004bc635 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public interface PetApiService {
       Response addPet(Pet body,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java
index 0bdccffb2c78..a79712327381 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java
@@ -28,7 +28,7 @@
 
 
 @io.swagger.annotations.Api(description = "the store API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class StoreApi  {
 
     @Inject StoreApiService service;
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java
index 86ca76cdbeac..ed4c8338a600 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public interface StoreApiService {
       Response deleteOrder(String orderId,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StringUtil.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StringUtil.java
index 367283558974..4bbe3a4447bc 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StringUtil.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StringUtil.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApi.java
index 7347f487864b..d325a05a54f1 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApi.java
@@ -28,7 +28,7 @@
 
 
 @io.swagger.annotations.Api(description = "the user API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class UserApi  {
 
     @Inject UserApiService service;
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApiService.java
index 308becc2c3a6..35d72d421127 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApiService.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public interface UserApiService {
       Response createUser(User body,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Category.java
index 32475fb1e948..f9e6b5c8b03e 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Category.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A category for a pet")
+@ApiModel(description="A category for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class Category   {
   
   private Long id;
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/ModelApiResponse.java
index bc9b86333446..d54f67bff6f6 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="Describes the result of uploading an image resource")
+@ApiModel(description="Describes the result of uploading an image resource")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class ModelApiResponse   {
   
   private Integer code;
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Order.java
index d31c8fbd7641..4802c2d62568 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Order.java
@@ -11,7 +11,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="An order for a pets from the pet store")
+@ApiModel(description="An order for a pets from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class Order   {
   
   private Long id;
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java
index f2cc2bd04df5..9ef28b46c103 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java
@@ -14,7 +14,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A pet for sale in the pet store")
+@ApiModel(description="A pet for sale in the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class Pet   {
   
   private Long id;
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Tag.java
index 7b4baed9f803..78e46f856f6e 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Tag.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A tag for a pet")
+@ApiModel(description="A tag for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class Tag   {
   
   private Long id;
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/User.java
index c4339be87fe9..cc3e9c9051ad 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/User.java
@@ -9,7 +9,7 @@
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 
-@ApiModel(description="A User who is purchasing from the pet store")
+@ApiModel(description="A User who is purchasing from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class User   {
   
   private Long id;
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index 2f2b64d8ba7a..0b264cc92ced 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -19,7 +19,7 @@
 import javax.ws.rs.core.SecurityContext;
 
 @RequestScoped
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class PetApiServiceImpl implements PetApiService {
       public Response addPet(Pet body,SecurityContext securityContext)
       throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index fb56f1feceb3..4669635c2590 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.SecurityContext;
 
 @RequestScoped
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class StoreApiServiceImpl implements StoreApiService {
       public Response deleteOrder(String orderId,SecurityContext securityContext)
       throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index eacf8b7e4001..40d14d0be55b 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -17,7 +17,7 @@
 import javax.ws.rs.core.SecurityContext;
 
 @RequestScoped
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen")
 public class UserApiServiceImpl implements UserApiService {
       public Response createUser(User body,SecurityContext securityContext)
       throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES
new file mode 100644
index 000000000000..2ea098090a4f
--- /dev/null
+++ b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES
@@ -0,0 +1,55 @@
+README.md
+pom.xml
+src/gen/java/org/openapitools/api/AnotherFakeApi.java
+src/gen/java/org/openapitools/api/FakeApi.java
+src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+src/gen/java/org/openapitools/api/PetApi.java
+src/gen/java/org/openapitools/api/StoreApi.java
+src/gen/java/org/openapitools/api/UserApi.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+src/gen/java/org/openapitools/model/Animal.java
+src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+src/gen/java/org/openapitools/model/ArrayTest.java
+src/gen/java/org/openapitools/model/BigCat.java
+src/gen/java/org/openapitools/model/BigCatAllOf.java
+src/gen/java/org/openapitools/model/Capitalization.java
+src/gen/java/org/openapitools/model/Cat.java
+src/gen/java/org/openapitools/model/CatAllOf.java
+src/gen/java/org/openapitools/model/Category.java
+src/gen/java/org/openapitools/model/ClassModel.java
+src/gen/java/org/openapitools/model/Client.java
+src/gen/java/org/openapitools/model/Dog.java
+src/gen/java/org/openapitools/model/DogAllOf.java
+src/gen/java/org/openapitools/model/EnumArrays.java
+src/gen/java/org/openapitools/model/EnumClass.java
+src/gen/java/org/openapitools/model/EnumTest.java
+src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+src/gen/java/org/openapitools/model/FormatTest.java
+src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+src/gen/java/org/openapitools/model/MapTest.java
+src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+src/gen/java/org/openapitools/model/Model200Response.java
+src/gen/java/org/openapitools/model/ModelApiResponse.java
+src/gen/java/org/openapitools/model/ModelReturn.java
+src/gen/java/org/openapitools/model/Name.java
+src/gen/java/org/openapitools/model/NumberOnly.java
+src/gen/java/org/openapitools/model/Order.java
+src/gen/java/org/openapitools/model/OuterComposite.java
+src/gen/java/org/openapitools/model/OuterEnum.java
+src/gen/java/org/openapitools/model/Pet.java
+src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+src/gen/java/org/openapitools/model/SpecialModelName.java
+src/gen/java/org/openapitools/model/Tag.java
+src/gen/java/org/openapitools/model/TypeHolderDefault.java
+src/gen/java/org/openapitools/model/TypeHolderExample.java
+src/gen/java/org/openapitools/model/User.java
+src/gen/java/org/openapitools/model/XmlItem.java
+src/main/openapi/openapi.yaml
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION
index 58592f031f65..d99e7162d01f 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION
@@ -1 +1 @@
-4.2.3-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/pom.xml b/samples/server/petstore/jaxrs-spec-interface-response/pom.xml
index 5e7146822539..355d55d58d60 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/pom.xml
+++ b/samples/server/petstore/jaxrs-spec-interface-response/pom.xml
@@ -57,6 +57,12 @@
       <scope>provided</scope>
       <version>1.5.3</version>
     </dependency>
+    <!-- @Nullable annotation -->
+    <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.2</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -72,7 +78,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <jackson-version>2.8.9</jackson-version>
+    <jackson-version>2.9.9</jackson-version>
     <junit-version>4.8.1</junit-version>
   </properties>
 </project>
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index fcef65882ca6..1458784c67c5 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -13,11 +13,12 @@
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
-@Path("/AnotherFake")
-@Api(description = "the AnotherFake API")
-public interface AnotherFakeApi {
+@Path("/another-fake")
+@Api(description = "the another-fake API")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface AnotherFakeApi {
 
     @PATCH
+    @Path("/dummy")
     @Consumes({ "application/json" })
     @Produces({ "application/json" })
     @ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", tags={ "$another-fake?" })
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java
index 0784c79ac806..3b7b4a9af839 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java
@@ -7,6 +7,7 @@
 import org.openapitools.model.FileSchemaTestClass;
 import org.joda.time.LocalDate;
 import java.util.Map;
+import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.OuterComposite;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
@@ -22,11 +23,12 @@
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
-@Path("/Fake")
-@Api(description = "the Fake API")
-public interface FakeApi {
+@Path("/fake")
+@Api(description = "the fake API")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface FakeApi {
 
     @POST
+    @Path("/create_xml_item")
     @Consumes({ "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" })
     @ApiOperation(value = "creates an XmlItem", notes = "this route creates an XmlItem", tags={ "fake",  })
     @ApiResponses(value = { 
@@ -34,6 +36,7 @@ public interface FakeApi {
     Response createXmlItem(@Valid XmlItem xmlItem);
 
     @POST
+    @Path("/outer/boolean")
     @Produces({ "*/*" })
     @ApiOperation(value = "", notes = "Test serialization of outer boolean types", tags={ "fake",  })
     @ApiResponses(value = { 
@@ -41,6 +44,7 @@ public interface FakeApi {
     Response fakeOuterBooleanSerialize(@Valid Boolean body);
 
     @POST
+    @Path("/outer/composite")
     @Produces({ "*/*" })
     @ApiOperation(value = "", notes = "Test serialization of object with outer number type", tags={ "fake",  })
     @ApiResponses(value = { 
@@ -48,6 +52,7 @@ public interface FakeApi {
     Response fakeOuterCompositeSerialize(@Valid OuterComposite body);
 
     @POST
+    @Path("/outer/number")
     @Produces({ "*/*" })
     @ApiOperation(value = "", notes = "Test serialization of outer number types", tags={ "fake",  })
     @ApiResponses(value = { 
@@ -55,6 +60,7 @@ public interface FakeApi {
     Response fakeOuterNumberSerialize(@Valid BigDecimal body);
 
     @POST
+    @Path("/outer/string")
     @Produces({ "*/*" })
     @ApiOperation(value = "", notes = "Test serialization of outer string types", tags={ "fake",  })
     @ApiResponses(value = { 
@@ -62,6 +68,7 @@ public interface FakeApi {
     Response fakeOuterStringSerialize(@Valid String body);
 
     @PUT
+    @Path("/body-with-file-schema")
     @Consumes({ "application/json" })
     @ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake",  })
     @ApiResponses(value = { 
@@ -69,6 +76,7 @@ public interface FakeApi {
     Response testBodyWithFileSchema(@Valid FileSchemaTestClass body);
 
     @PUT
+    @Path("/body-with-query-params")
     @Consumes({ "application/json" })
     @ApiOperation(value = "", notes = "", tags={ "fake",  })
     @ApiResponses(value = { 
@@ -85,7 +93,7 @@ public interface FakeApi {
 
     @POST
     @Consumes({ "application/x-www-form-urlencoded" })
-    @ApiOperation(value = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ", notes = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ", authorizations = {
+    @ApiOperation(value = "Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트", notes = "Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트", authorizations = {
         @Authorization(value = "http_basic_test")
     }, tags={ "fake",  })
     @ApiResponses(value = { 
@@ -108,6 +116,7 @@ public interface FakeApi {
     Response testGroupParameters(@QueryParam("required_string_group") @NotNull   @ApiParam("Required String in group parameters")  Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull    @ApiParam("Required Boolean in group parameters") Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull   @ApiParam("Required Integer in group parameters")  Long requiredInt64Group,@QueryParam("string_group")   @ApiParam("String in group parameters")  Integer stringGroup,@HeaderParam("boolean_group")    @ApiParam("Boolean in group parameters") Boolean booleanGroup,@QueryParam("int64_group")   @ApiParam("Integer in group parameters")  Long int64Group);
 
     @POST
+    @Path("/inline-additionalProperties")
     @Consumes({ "application/json" })
     @ApiOperation(value = "test inline additionalProperties", notes = "", tags={ "fake",  })
     @ApiResponses(value = { 
@@ -115,6 +124,7 @@ public interface FakeApi {
     Response testInlineAdditionalProperties(@Valid Map<String, String> param);
 
     @GET
+    @Path("/jsonFormData")
     @Consumes({ "application/x-www-form-urlencoded" })
     @ApiOperation(value = "test json serialization of form data", notes = "", tags={ "fake",  })
     @ApiResponses(value = { 
@@ -122,8 +132,23 @@ public interface FakeApi {
     Response testJsonFormData(@FormParam(value = "param")  String param,@FormParam(value = "param2")  String param2);
 
     @PUT
-    @ApiOperation(value = "", notes = "To test the collection format in query parameters", tags={ "fake" })
+    @Path("/test-query-paramters")
+    @ApiOperation(value = "", notes = "To test the collection format in query parameters", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success", response = Void.class) })
     Response testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull    List<String> pipe,@QueryParam("ioutil") @NotNull    List<String> ioutil,@QueryParam("http") @NotNull    List<String> http,@QueryParam("url") @NotNull    List<String> url,@QueryParam("context") @NotNull    List<String> context);
+
+    @POST
+    @Path("/{petId}/uploadImageWithRequiredFile")
+    @Consumes({ "multipart/form-data" })
+    @Produces({ "application/json" })
+    @ApiOperation(value = "uploads an image (required)", notes = "", authorizations = {
+        @Authorization(value = "petstore_auth", scopes = {
+            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
+    Response uploadFileWithRequiredFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata")  String additionalMetadata);
 }
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
index 73e623e549e0..58c51e67a785 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -15,7 +15,7 @@
 
 @Path("/fake_classname_test")
 @Api(description = "the fake_classname_test API")
-public interface FakeClassnameTestApi {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface FakeClassnameTestApi {
 
     @PATCH
     @Consumes({ "application/json" })
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java
index 77bc4446e0e7..2154b8d1e8a0 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.Pet;
+import java.util.Set;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
@@ -15,9 +16,9 @@
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
-@Path("/Pet")
-@Api(description = "the Pet API")
-public interface PetApi {
+@Path("/pet")
+@Api(description = "the pet API")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface PetApi {
 
     @POST
     @Consumes({ "application/json", "application/xml" })
@@ -33,6 +34,7 @@ public interface PetApi {
     Response addPet(@Valid Pet body);
 
     @DELETE
+    @Path("/{petId}")
     @ApiOperation(value = "Deletes a pet", notes = "", authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -45,6 +47,7 @@ public interface PetApi {
     Response deletePet(@PathParam("petId") @ApiParam("Pet id to delete") Long petId,@HeaderParam("api_key")    String apiKey);
 
     @GET
+    @Path("/findByStatus")
     @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
@@ -58,6 +61,7 @@ public interface PetApi {
     Response findPetsByStatus(@QueryParam("status") @NotNull   @ApiParam("Status values that need to be considered for filter")  List<String> status);
 
     @GET
+    @Path("/findByTags")
     @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
@@ -66,11 +70,12 @@ public interface PetApi {
         })
     }, tags={ "pet",  })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
-        @ApiResponse(code = 400, message = "Invalid tag value", response = Void.class, responseContainer = "List") })
-    Response findPetsByTags(@QueryParam("tags") @NotNull   @ApiParam("Tags to filter by")  List<String> tags);
+        @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
+        @ApiResponse(code = 400, message = "Invalid tag value", response = Void.class, responseContainer = "Set") })
+    Response findPetsByTags(@QueryParam("tags") @NotNull   @ApiParam("Tags to filter by")  Set<String> tags);
 
     @GET
+    @Path("/{petId}")
     @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", authorizations = {
         @Authorization(value = "api_key")
@@ -97,6 +102,7 @@ public interface PetApi {
     Response updatePet(@Valid Pet body);
 
     @POST
+    @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
     @ApiOperation(value = "Updates a pet in the store with form data", notes = "", authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
@@ -109,6 +115,7 @@ public interface PetApi {
     Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that needs to be updated") Long petId,@FormParam(value = "name")  String name,@FormParam(value = "status")  String status);
 
     @POST
+    @Path("/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
     @ApiOperation(value = "uploads an image", notes = "", authorizations = {
@@ -116,21 +123,8 @@ public interface PetApi {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
             @AuthorizationScope(scope = "read:pets", description = "read your pets")
         })
-    }, tags={ "pet",  })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata")  String additionalMetadata, @FormParam(value = "file") InputStream fileInputStream);
-
-    @POST
-    @Consumes({ "multipart/form-data" })
-    @Produces({ "application/json" })
-    @ApiOperation(value = "uploads an image (required)", notes = "", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-        })
     }, tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    Response uploadFileWithRequiredFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata")  String additionalMetadata);
+    Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata")  String additionalMetadata, @FormParam(value = "file") InputStream fileInputStream);
 }
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java
index 3f8624ca8562..01593fedfecb 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java
@@ -14,11 +14,12 @@
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
-@Path("/Store")
-@Api(description = "the Store API")
-public interface StoreApi {
+@Path("/store")
+@Api(description = "the store API")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface StoreApi {
 
     @DELETE
+    @Path("/order/{order_id}")
     @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", tags={ "store",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@@ -26,6 +27,7 @@ public interface StoreApi {
     Response deleteOrder(@PathParam("order_id") @ApiParam("ID of the order that needs to be deleted") String orderId);
 
     @GET
+    @Path("/inventory")
     @Produces({ "application/json" })
     @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", authorizations = {
         @Authorization(value = "api_key")
@@ -35,6 +37,7 @@ public interface StoreApi {
     Response getInventory();
 
     @GET
+    @Path("/order/{order_id}")
     @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", tags={ "store",  })
     @ApiResponses(value = { 
@@ -44,6 +47,7 @@ public interface StoreApi {
     Response getOrderById(@PathParam("order_id") @Min(1L) @Max(5L) @ApiParam("ID of pet that needs to be fetched") Long orderId);
 
     @POST
+    @Path("/order")
     @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Place an order for a pet", notes = "", tags={ "store" })
     @ApiResponses(value = { 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java
index 0d381050d8d8..7d8218371537 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java
@@ -14,9 +14,9 @@
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
-@Path("/User")
-@Api(description = "the User API")
-public interface UserApi {
+@Path("/user")
+@Api(description = "the user API")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface UserApi {
 
     @POST
     @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", tags={ "user",  })
@@ -25,18 +25,21 @@ public interface UserApi {
     Response createUser(@Valid User body);
 
     @POST
+    @Path("/createWithArray")
     @ApiOperation(value = "Creates list of users with given input array", notes = "", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
     Response createUsersWithArrayInput(@Valid List<User> body);
 
     @POST
+    @Path("/createWithList")
     @ApiOperation(value = "Creates list of users with given input array", notes = "", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
     Response createUsersWithListInput(@Valid List<User> body);
 
     @DELETE
+    @Path("/{username}")
     @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@@ -44,6 +47,7 @@ public interface UserApi {
     Response deleteUser(@PathParam("username") @ApiParam("The name that needs to be deleted") String username);
 
     @GET
+    @Path("/{username}")
     @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Get user by user name", notes = "", tags={ "user",  })
     @ApiResponses(value = { 
@@ -53,6 +57,7 @@ public interface UserApi {
     Response getUserByName(@PathParam("username") @ApiParam("The name that needs to be fetched. Use user1 for testing.") String username);
 
     @GET
+    @Path("/login")
     @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Logs user into the system", notes = "", tags={ "user",  })
     @ApiResponses(value = { 
@@ -61,12 +66,14 @@ public interface UserApi {
     Response loginUser(@QueryParam("username") @NotNull   @ApiParam("The user name for login")  String username,@QueryParam("password") @NotNull   @ApiParam("The password for login in clear text")  String password);
 
     @GET
+    @Path("/logout")
     @ApiOperation(value = "Logs out current logged in user session", notes = "", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
     Response logoutUser();
 
     @PUT
+    @Path("/{username}")
     @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 784bdb2540cc..26ca940b6778 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Serializable {
   
   private @Valid String name;
 
@@ -28,16 +28,18 @@ public AdditionalPropertiesAnyType name(String name) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
   }
+
   public void setName(String name) {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -76,5 +78,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
index 7e3b19874d3f..84b3d81ad92a 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -17,7 +17,7 @@
 
 
 
-public class AdditionalPropertiesArray extends HashMap<String, List> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesArray extends HashMap<String, List> implements Serializable {
   
   private @Valid String name;
 
@@ -29,16 +29,18 @@ public AdditionalPropertiesArray name(String name) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
   }
+
   public void setName(String name) {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -77,5 +79,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 1eb290fe3f21..a69323584818 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implements Serializable {
   
   private @Valid String name;
 
@@ -28,16 +28,18 @@ public AdditionalPropertiesBoolean name(String name) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
   }
+
   public void setName(String name) {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -76,5 +78,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index c70f3d5171d5..6b45e6c28e6b 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 
 
 
-public class AdditionalPropertiesClass  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesClass  implements Serializable {
   
   private @Valid Map<String, String> mapString = new HashMap<String, String>();
   private @Valid Map<String, BigDecimal> mapNumber = new HashMap<String, BigDecimal>();
@@ -40,16 +40,17 @@ public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
+
   public void setMapString(Map<String, String> mapString) {
     this.mapString = mapString;
-  }
-
-  /**
+  }/**
    **/
   public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
     this.mapNumber = mapNumber;
@@ -57,16 +58,17 @@ public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
+
   public void setMapNumber(Map<String, BigDecimal> mapNumber) {
     this.mapNumber = mapNumber;
-  }
-
-  /**
+  }/**
    **/
   public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
     this.mapInteger = mapInteger;
@@ -74,16 +76,17 @@ public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
+
   public void setMapInteger(Map<String, Integer> mapInteger) {
     this.mapInteger = mapInteger;
-  }
-
-  /**
+  }/**
    **/
   public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
     this.mapBoolean = mapBoolean;
@@ -91,16 +94,17 @@ public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
+
   public void setMapBoolean(Map<String, Boolean> mapBoolean) {
     this.mapBoolean = mapBoolean;
-  }
-
-  /**
+  }/**
    **/
   public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
     this.mapArrayInteger = mapArrayInteger;
@@ -108,16 +112,17 @@ public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapA
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
+
   public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
     this.mapArrayInteger = mapArrayInteger;
-  }
-
-  /**
+  }/**
    **/
   public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
     this.mapArrayAnytype = mapArrayAnytype;
@@ -125,16 +130,17 @@ public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapAr
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
+
   public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
     this.mapArrayAnytype = mapArrayAnytype;
-  }
-
-  /**
+  }/**
    **/
   public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> mapMapString) {
     this.mapMapString = mapMapString;
@@ -142,16 +148,17 @@ public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> m
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
+
   public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
     this.mapMapString = mapMapString;
-  }
-
-  /**
+  }/**
    **/
   public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
     this.mapMapAnytype = mapMapAnytype;
@@ -159,16 +166,17 @@ public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>>
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
+
   public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
     this.mapMapAnytype = mapMapAnytype;
-  }
-
-  /**
+  }/**
    **/
   public AdditionalPropertiesClass anytype1(Object anytype1) {
     this.anytype1 = anytype1;
@@ -176,16 +184,17 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
+
   public void setAnytype1(Object anytype1) {
     this.anytype1 = anytype1;
-  }
-
-  /**
+  }/**
    **/
   public AdditionalPropertiesClass anytype2(Object anytype2) {
     this.anytype2 = anytype2;
@@ -193,16 +202,17 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
   public Object getAnytype2() {
     return anytype2;
   }
+
   public void setAnytype2(Object anytype2) {
     this.anytype2 = anytype2;
-  }
-
-  /**
+  }/**
    **/
   public AdditionalPropertiesClass anytype3(Object anytype3) {
     this.anytype3 = anytype3;
@@ -210,16 +220,18 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
+
   public void setAnytype3(Object anytype3) {
     this.anytype3 = anytype3;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -277,5 +289,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
index c2c81ea584e1..6a6851ab2231 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesInteger extends HashMap<String, Integer> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesInteger extends HashMap<String, Integer> implements Serializable {
   
   private @Valid String name;
 
@@ -28,16 +28,18 @@ public AdditionalPropertiesInteger name(String name) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
   }
+
   public void setName(String name) {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -76,5 +78,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
index b4b4fc231978..2ece39a129cb 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -17,7 +17,7 @@
 
 
 
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> implements Serializable {
   
   private @Valid String name;
 
@@ -29,16 +29,18 @@ public AdditionalPropertiesNumber name(String name) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
   }
+
   public void setName(String name) {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -77,5 +79,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
index 90ecd845ef3b..fc28feb6efdd 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesObject extends HashMap<String, Map> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesObject extends HashMap<String, Map> implements Serializable {
   
   private @Valid String name;
 
@@ -28,16 +28,18 @@ public AdditionalPropertiesObject name(String name) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
   }
+
   public void setName(String name) {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -76,5 +78,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
index 1454d0703802..c89e917c2773 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesString extends HashMap<String, String> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesString extends HashMap<String, String> implements Serializable {
   
   private @Valid String name;
 
@@ -28,16 +28,18 @@ public AdditionalPropertiesString name(String name) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
   }
+
   public void setName(String name) {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -76,5 +78,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java
index 43bfbb7fd24d..ec6cc8875a9a 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java
@@ -22,7 +22,7 @@
 })
 
 
-public class Animal  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Animal  implements Serializable {
   
   private @Valid String className;
   private @Valid String color = "red";
@@ -35,17 +35,18 @@ public Animal className(String className) {
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
   @NotNull
   public String getClassName() {
     return className;
   }
+
   public void setClassName(String className) {
     this.className = className;
-  }
-
-  /**
+  }/**
    **/
   public Animal color(String color) {
     this.color = color;
@@ -53,16 +54,18 @@ public Animal color(String color) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("color")
   public String getColor() {
     return color;
   }
+
   public void setColor(String color) {
     this.color = color;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -102,5 +105,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index cc9abca8a2a8..e2fe6804e803 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -17,7 +17,7 @@
 
 
 
-public class ArrayOfArrayOfNumberOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayOfArrayOfNumberOnly  implements Serializable {
   
   private @Valid List<List<BigDecimal>> arrayArrayNumber = new ArrayList<List<BigDecimal>>();
 
@@ -29,16 +29,18 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArr
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
+
   public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
     this.arrayArrayNumber = arrayArrayNumber;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -76,5 +78,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index 40acdceef6a3..c920a7121812 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -17,7 +17,7 @@
 
 
 
-public class ArrayOfNumberOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayOfNumberOnly  implements Serializable {
   
   private @Valid List<BigDecimal> arrayNumber = new ArrayList<BigDecimal>();
 
@@ -29,16 +29,18 @@ public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
+
   public void setArrayNumber(List<BigDecimal> arrayNumber) {
     this.arrayNumber = arrayNumber;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -76,5 +78,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java
index bd3241465564..b95de9c1566c 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -17,7 +17,7 @@
 
 
 
-public class ArrayTest  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayTest  implements Serializable {
   
   private @Valid List<String> arrayOfString = new ArrayList<String>();
   private @Valid List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
@@ -31,16 +31,17 @@ public ArrayTest arrayOfString(List<String> arrayOfString) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
+
   public void setArrayOfString(List<String> arrayOfString) {
     this.arrayOfString = arrayOfString;
-  }
-
-  /**
+  }/**
    **/
   public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
     this.arrayArrayOfInteger = arrayArrayOfInteger;
@@ -48,16 +49,17 @@ public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
+
   public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
     this.arrayArrayOfInteger = arrayArrayOfInteger;
-  }
-
-  /**
+  }/**
    **/
   public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
     this.arrayArrayOfModel = arrayArrayOfModel;
@@ -65,16 +67,18 @@ public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel)
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
+
   public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
     this.arrayArrayOfModel = arrayArrayOfModel;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -116,5 +120,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java
index c3c4bfcfb59f..2473d83564a3 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java
@@ -16,7 +16,7 @@
 
 
 
-public class BigCat extends Cat implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class BigCat extends Cat implements Serializable {
   
 
 public enum KindEnum {
@@ -61,16 +61,18 @@ public BigCat kind(KindEnum kind) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
+
   public void setKind(KindEnum kind) {
     this.kind = kind;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -109,5 +111,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCatAllOf.java
index d3eb97becef2..0937f9c47396 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCatAllOf.java
@@ -14,7 +14,7 @@
 
 
 
-public class BigCatAllOf  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class BigCatAllOf  implements Serializable {
   
 
 public enum KindEnum {
@@ -59,16 +59,18 @@ public BigCatAllOf kind(KindEnum kind) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
+
   public void setKind(KindEnum kind) {
     this.kind = kind;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -106,5 +108,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java
index 9c9d8a8f4255..1161f1b0057f 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java
@@ -14,7 +14,7 @@
 
 
 
-public class Capitalization  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Capitalization  implements Serializable {
   
   private @Valid String smallCamel;
   private @Valid String capitalCamel;
@@ -31,16 +31,17 @@ public Capitalization smallCamel(String smallCamel) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
+
   public void setSmallCamel(String smallCamel) {
     this.smallCamel = smallCamel;
-  }
-
-  /**
+  }/**
    **/
   public Capitalization capitalCamel(String capitalCamel) {
     this.capitalCamel = capitalCamel;
@@ -48,16 +49,17 @@ public Capitalization capitalCamel(String capitalCamel) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
+
   public void setCapitalCamel(String capitalCamel) {
     this.capitalCamel = capitalCamel;
-  }
-
-  /**
+  }/**
    **/
   public Capitalization smallSnake(String smallSnake) {
     this.smallSnake = smallSnake;
@@ -65,16 +67,17 @@ public Capitalization smallSnake(String smallSnake) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
+
   public void setSmallSnake(String smallSnake) {
     this.smallSnake = smallSnake;
-  }
-
-  /**
+  }/**
    **/
   public Capitalization capitalSnake(String capitalSnake) {
     this.capitalSnake = capitalSnake;
@@ -82,16 +85,17 @@ public Capitalization capitalSnake(String capitalSnake) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
+
   public void setCapitalSnake(String capitalSnake) {
     this.capitalSnake = capitalSnake;
-  }
-
-  /**
+  }/**
    **/
   public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     this.scAETHFlowPoints = scAETHFlowPoints;
@@ -99,16 +103,17 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
+
   public void setScAETHFlowPoints(String scAETHFlowPoints) {
     this.scAETHFlowPoints = scAETHFlowPoints;
-  }
-
-  /**
+  }/**
    * Name of the pet 
    **/
   public Capitalization ATT_NAME(String ATT_NAME) {
@@ -117,16 +122,18 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   }
 
   
+
+  
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
+
   public void setATTNAME(String ATT_NAME) {
     this.ATT_NAME = ATT_NAME;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -174,5 +181,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java
index 12cfde8994ab..3697c0a9789e 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java
@@ -16,7 +16,7 @@
 
 
 
-public class Cat extends Animal implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Cat extends Animal implements Serializable {
   
   private @Valid Boolean declawed;
 
@@ -28,16 +28,18 @@ public Cat declawed(Boolean declawed) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
+
   public void setDeclawed(Boolean declawed) {
     this.declawed = declawed;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -76,5 +78,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/CatAllOf.java
index 66bfa279966f..fe321e2dad05 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -14,7 +14,7 @@
 
 
 
-public class CatAllOf  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class CatAllOf  implements Serializable {
   
   private @Valid Boolean declawed;
 
@@ -26,16 +26,18 @@ public CatAllOf declawed(Boolean declawed) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
+
   public void setDeclawed(Boolean declawed) {
     this.declawed = declawed;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -73,5 +75,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java
index fa0c47ddd86d..c539ed1ff0a1 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java
@@ -14,7 +14,7 @@
 
 
 
-public class Category  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Category  implements Serializable {
   
   private @Valid Long id;
   private @Valid String name = "default-name";
@@ -27,16 +27,17 @@ public Category id(Long id) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
   }
+
   public void setId(Long id) {
     this.id = id;
-  }
-
-  /**
+  }/**
    **/
   public Category name(String name) {
     this.name = name;
@@ -44,17 +45,19 @@ public Category name(String name) {
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
   @NotNull
   public String getName() {
     return name;
   }
+
   public void setName(String name) {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -94,5 +97,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java
index 19e12db64933..776d974a189c 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java
@@ -12,12 +12,11 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-
 /**
  * Model for testing model with \&quot;_class\&quot; property
  **/
 @ApiModel(description = "Model for testing model with \"_class\" property")
-public class ClassModel  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ClassModel  implements Serializable {
   
   private @Valid String propertyClass;
 
@@ -29,16 +28,18 @@ public ClassModel propertyClass(String propertyClass) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
+
   public void setPropertyClass(String propertyClass) {
     this.propertyClass = propertyClass;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -76,5 +77,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java
index 9703ba67fc95..f75d9e5f265f 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java
@@ -14,7 +14,7 @@
 
 
 
-public class Client  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Client  implements Serializable {
   
   private @Valid String client;
 
@@ -26,16 +26,18 @@ public Client client(String client) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("client")
   public String getClient() {
     return client;
   }
+
   public void setClient(String client) {
     this.client = client;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -73,5 +75,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java
index 685f46dcdd48..662c97e49d59 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java
@@ -16,7 +16,7 @@
 
 
 
-public class Dog extends Animal implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Dog extends Animal implements Serializable {
   
   private @Valid String breed;
 
@@ -28,16 +28,18 @@ public Dog breed(String breed) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
+
   public void setBreed(String breed) {
     this.breed = breed;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -76,5 +78,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/DogAllOf.java
index dfcbfe7e72ad..443b3201efb5 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -14,7 +14,7 @@
 
 
 
-public class DogAllOf  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class DogAllOf  implements Serializable {
   
   private @Valid String breed;
 
@@ -26,16 +26,18 @@ public DogAllOf breed(String breed) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
+
   public void setBreed(String breed) {
     this.breed = breed;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -73,5 +75,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java
index 9a422c1c5540..2e82ae8fd18b 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -16,7 +16,7 @@
 
 
 
-public class EnumArrays  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class EnumArrays  implements Serializable {
   
 
 public enum JustSymbolEnum {
@@ -95,16 +95,17 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
+
   public void setJustSymbol(JustSymbolEnum justSymbol) {
     this.justSymbol = justSymbol;
-  }
-
-  /**
+  }/**
    **/
   public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
     this.arrayEnum = arrayEnum;
@@ -112,16 +113,18 @@ public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
+
   public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
     this.arrayEnum = arrayEnum;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -161,5 +164,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java
index 7dc8942410a0..b1148724a627 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java
@@ -15,7 +15,7 @@
 
 
 
-public class EnumTest  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class EnumTest  implements Serializable {
   
 
 public enum EnumStringEnum {
@@ -163,16 +163,17 @@ public EnumTest enumString(EnumStringEnum enumString) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
+
   public void setEnumString(EnumStringEnum enumString) {
     this.enumString = enumString;
-  }
-
-  /**
+  }/**
    **/
   public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     this.enumStringRequired = enumStringRequired;
@@ -180,17 +181,18 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
   @NotNull
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
+
   public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     this.enumStringRequired = enumStringRequired;
-  }
-
-  /**
+  }/**
    **/
   public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     this.enumInteger = enumInteger;
@@ -198,16 +200,17 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
+
   public void setEnumInteger(EnumIntegerEnum enumInteger) {
     this.enumInteger = enumInteger;
-  }
-
-  /**
+  }/**
    **/
   public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     this.enumNumber = enumNumber;
@@ -215,16 +218,17 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
+
   public void setEnumNumber(EnumNumberEnum enumNumber) {
     this.enumNumber = enumNumber;
-  }
-
-  /**
+  }/**
    **/
   public EnumTest outerEnum(OuterEnum outerEnum) {
     this.outerEnum = outerEnum;
@@ -232,16 +236,18 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
+
   public void setOuterEnum(OuterEnum outerEnum) {
     this.outerEnum = outerEnum;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -287,5 +293,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index e97c11e0df28..2ad57632ee00 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -16,7 +16,7 @@
 
 
 
-public class FileSchemaTestClass  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class FileSchemaTestClass  implements Serializable {
   
   private @Valid java.io.File file;
   private @Valid List<java.io.File> files = new ArrayList<java.io.File>();
@@ -29,16 +29,17 @@ public FileSchemaTestClass file(java.io.File file) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("file")
   public java.io.File getFile() {
     return file;
   }
+
   public void setFile(java.io.File file) {
     this.file = file;
-  }
-
-  /**
+  }/**
    **/
   public FileSchemaTestClass files(List<java.io.File> files) {
     this.files = files;
@@ -46,16 +47,18 @@ public FileSchemaTestClass files(List<java.io.File> files) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("files")
   public List<java.io.File> getFiles() {
     return files;
   }
+
   public void setFiles(List<java.io.File> files) {
     this.files = files;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -95,5 +98,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java
index 7132d9908d61..fdb4d2f9cd88 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java
@@ -19,7 +19,7 @@
 
 
 
-public class FormatTest  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class FormatTest  implements Serializable {
   
   private @Valid Integer integer;
   private @Valid Integer int32;
@@ -46,16 +46,17 @@ public FormatTest integer(Integer integer) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
  @Min(10) @Max(100)  public Integer getInteger() {
     return integer;
   }
+
   public void setInteger(Integer integer) {
     this.integer = integer;
-  }
-
-  /**
+  }/**
    * minimum: 20
    * maximum: 200
    **/
@@ -65,16 +66,17 @@ public FormatTest int32(Integer int32) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
  @Min(20) @Max(200)  public Integer getInt32() {
     return int32;
   }
+
   public void setInt32(Integer int32) {
     this.int32 = int32;
-  }
-
-  /**
+  }/**
    **/
   public FormatTest int64(Long int64) {
     this.int64 = int64;
@@ -82,16 +84,17 @@ public FormatTest int64(Long int64) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
+
   public void setInt64(Long int64) {
     this.int64 = int64;
-  }
-
-  /**
+  }/**
    * minimum: 32.1
    * maximum: 543.2
    **/
@@ -101,17 +104,18 @@ public FormatTest number(BigDecimal number) {
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
   @NotNull
  @DecimalMin("32.1") @DecimalMax("543.2")  public BigDecimal getNumber() {
     return number;
   }
+
   public void setNumber(BigDecimal number) {
     this.number = number;
-  }
-
-  /**
+  }/**
    * minimum: 54.3
    * maximum: 987.6
    **/
@@ -121,16 +125,17 @@ public FormatTest _float(Float _float) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("float")
  @DecimalMin("54.3") @DecimalMax("987.6")  public Float getFloat() {
     return _float;
   }
+
   public void setFloat(Float _float) {
     this._float = _float;
-  }
-
-  /**
+  }/**
    * minimum: 67.8
    * maximum: 123.4
    **/
@@ -140,16 +145,17 @@ public FormatTest _double(Double _double) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("double")
  @DecimalMin("67.8") @DecimalMax("123.4")  public Double getDouble() {
     return _double;
   }
+
   public void setDouble(Double _double) {
     this._double = _double;
-  }
-
-  /**
+  }/**
    **/
   public FormatTest string(String string) {
     this.string = string;
@@ -157,16 +163,17 @@ public FormatTest string(String string) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("string")
  @Pattern(regexp="/[a-z]/i")  public String getString() {
     return string;
   }
+
   public void setString(String string) {
     this.string = string;
-  }
-
-  /**
+  }/**
    **/
   public FormatTest _byte(byte[] _byte) {
     this._byte = _byte;
@@ -174,17 +181,18 @@ public FormatTest _byte(byte[] _byte) {
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
   @NotNull
  @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")  public byte[] getByte() {
     return _byte;
   }
+
   public void setByte(byte[] _byte) {
     this._byte = _byte;
-  }
-
-  /**
+  }/**
    **/
   public FormatTest binary(File binary) {
     this.binary = binary;
@@ -192,16 +200,17 @@ public FormatTest binary(File binary) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
   public File getBinary() {
     return binary;
   }
+
   public void setBinary(File binary) {
     this.binary = binary;
-  }
-
-  /**
+  }/**
    **/
   public FormatTest date(LocalDate date) {
     this.date = date;
@@ -209,17 +218,18 @@ public FormatTest date(LocalDate date) {
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   @NotNull
   public LocalDate getDate() {
     return date;
   }
+
   public void setDate(LocalDate date) {
     this.date = date;
-  }
-
-  /**
+  }/**
    **/
   public FormatTest dateTime(Date dateTime) {
     this.dateTime = dateTime;
@@ -227,16 +237,17 @@ public FormatTest dateTime(Date dateTime) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public Date getDateTime() {
     return dateTime;
   }
+
   public void setDateTime(Date dateTime) {
     this.dateTime = dateTime;
-  }
-
-  /**
+  }/**
    **/
   public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
@@ -244,16 +255,17 @@ public FormatTest uuid(UUID uuid) {
   }
 
   
+
+  
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
+
   public void setUuid(UUID uuid) {
     this.uuid = uuid;
-  }
-
-  /**
+  }/**
    **/
   public FormatTest password(String password) {
     this.password = password;
@@ -261,17 +273,18 @@ public FormatTest password(String password) {
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
   @NotNull
  @Size(min=10,max=64)  public String getPassword() {
     return password;
   }
+
   public void setPassword(String password) {
     this.password = password;
-  }
-
-  /**
+  }/**
    **/
   public FormatTest bigDecimal(BigDecimal bigDecimal) {
     this.bigDecimal = bigDecimal;
@@ -279,16 +292,18 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
+
   public void setBigDecimal(BigDecimal bigDecimal) {
     this.bigDecimal = bigDecimal;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -352,5 +367,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index 76898a7831bc..05dfb87f0856 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -14,7 +14,7 @@
 
 
 
-public class HasOnlyReadOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class HasOnlyReadOnly  implements Serializable {
   
   private @Valid String bar;
   private @Valid String foo;
@@ -27,16 +27,17 @@ public HasOnlyReadOnly bar(String bar) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
+
   public void setBar(String bar) {
     this.bar = bar;
-  }
-
-  /**
+  }/**
    **/
   public HasOnlyReadOnly foo(String foo) {
     this.foo = foo;
@@ -44,16 +45,18 @@ public HasOnlyReadOnly foo(String foo) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
+
   public void setFoo(String foo) {
     this.foo = foo;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -93,5 +96,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java
index 059f500d097f..4864c6406389 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java
@@ -17,7 +17,7 @@
 
 
 
-public class MapTest  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class MapTest  implements Serializable {
   
   private @Valid Map<String, Map<String, String>> mapMapOfString = new HashMap<String, Map<String, String>>();
  
@@ -65,16 +65,17 @@ public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
+
   public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
-  }
-
-  /**
+  }/**
    **/
   public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
     this.mapOfEnumString = mapOfEnumString;
@@ -82,16 +83,17 @@ public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
+
   public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
     this.mapOfEnumString = mapOfEnumString;
-  }
-
-  /**
+  }/**
    **/
   public MapTest directMap(Map<String, Boolean> directMap) {
     this.directMap = directMap;
@@ -99,16 +101,17 @@ public MapTest directMap(Map<String, Boolean> directMap) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
+
   public void setDirectMap(Map<String, Boolean> directMap) {
     this.directMap = directMap;
-  }
-
-  /**
+  }/**
    **/
   public MapTest indirectMap(Map<String, Boolean> indirectMap) {
     this.indirectMap = indirectMap;
@@ -116,16 +119,18 @@ public MapTest indirectMap(Map<String, Boolean> indirectMap) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
+
   public void setIndirectMap(Map<String, Boolean> indirectMap) {
     this.indirectMap = indirectMap;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -169,5 +174,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 8467e42ead18..53c658bd6556 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -20,7 +20,7 @@
 
 
 
-public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
   
   private @Valid UUID uuid;
   private @Valid Date dateTime;
@@ -34,16 +34,17 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
+
   public void setUuid(UUID uuid) {
     this.uuid = uuid;
-  }
-
-  /**
+  }/**
    **/
   public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
     this.dateTime = dateTime;
@@ -51,16 +52,17 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public Date getDateTime() {
     return dateTime;
   }
+
   public void setDateTime(Date dateTime) {
     this.dateTime = dateTime;
-  }
-
-  /**
+  }/**
    **/
   public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
     this.map = map;
@@ -68,16 +70,18 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map)
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
+
   public void setMap(Map<String, Animal> map) {
     this.map = map;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -119,5 +123,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java
index d330491d413e..b4a633ca436f 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java
@@ -12,12 +12,11 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-
 /**
  * Model for testing model name starting with number
  **/
 @ApiModel(description = "Model for testing model name starting with number")
-public class Model200Response  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Model200Response  implements Serializable {
   
   private @Valid Integer name;
   private @Valid String propertyClass;
@@ -30,16 +29,17 @@ public Model200Response name(Integer name) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("name")
   public Integer getName() {
     return name;
   }
+
   public void setName(Integer name) {
     this.name = name;
-  }
-
-  /**
+  }/**
    **/
   public Model200Response propertyClass(String propertyClass) {
     this.propertyClass = propertyClass;
@@ -47,16 +47,18 @@ public Model200Response propertyClass(String propertyClass) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
+
   public void setPropertyClass(String propertyClass) {
     this.propertyClass = propertyClass;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -96,5 +98,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 3aeaa2e80a83..c8ad2f6920fd 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -14,7 +14,7 @@
 
 
 
-public class ModelApiResponse  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ModelApiResponse  implements Serializable {
   
   private @Valid Integer code;
   private @Valid String type;
@@ -28,16 +28,17 @@ public ModelApiResponse code(Integer code) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
+
   public void setCode(Integer code) {
     this.code = code;
-  }
-
-  /**
+  }/**
    **/
   public ModelApiResponse type(String type) {
     this.type = type;
@@ -45,16 +46,17 @@ public ModelApiResponse type(String type) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("type")
   public String getType() {
     return type;
   }
+
   public void setType(String type) {
     this.type = type;
-  }
-
-  /**
+  }/**
    **/
   public ModelApiResponse message(String message) {
     this.message = message;
@@ -62,16 +64,18 @@ public ModelApiResponse message(String message) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("message")
   public String getMessage() {
     return message;
   }
+
   public void setMessage(String message) {
     this.message = message;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -113,5 +117,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java
index b8ccb56ccd5d..edf8ed25b251 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -12,12 +12,11 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-
 /**
  * Model for testing reserved words
  **/
 @ApiModel(description = "Model for testing reserved words")
-public class ModelReturn  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ModelReturn  implements Serializable {
   
   private @Valid Integer _return;
 
@@ -29,16 +28,18 @@ public ModelReturn _return(Integer _return) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
+
   public void setReturn(Integer _return) {
     this._return = _return;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -76,5 +77,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java
index 30f2f65ac65e..e5e6e3faca90 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java
@@ -12,12 +12,11 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-
 /**
  * Model for testing model name same as property name
  **/
 @ApiModel(description = "Model for testing model name same as property name")
-public class Name  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Name  implements Serializable {
   
   private @Valid Integer name;
   private @Valid Integer snakeCase;
@@ -32,17 +31,18 @@ public Name name(Integer name) {
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
   @NotNull
   public Integer getName() {
     return name;
   }
+
   public void setName(Integer name) {
     this.name = name;
-  }
-
-  /**
+  }/**
    **/
   public Name snakeCase(Integer snakeCase) {
     this.snakeCase = snakeCase;
@@ -50,16 +50,17 @@ public Name snakeCase(Integer snakeCase) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
+
   public void setSnakeCase(Integer snakeCase) {
     this.snakeCase = snakeCase;
-  }
-
-  /**
+  }/**
    **/
   public Name property(String property) {
     this.property = property;
@@ -67,16 +68,17 @@ public Name property(String property) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("property")
   public String getProperty() {
     return property;
   }
+
   public void setProperty(String property) {
     this.property = property;
-  }
-
-  /**
+  }/**
    **/
   public Name _123number(Integer _123number) {
     this._123number = _123number;
@@ -84,16 +86,18 @@ public Name _123number(Integer _123number) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
+
   public void set123number(Integer _123number) {
     this._123number = _123number;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -137,5 +141,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java
index b5ae07a3dfb0..f80409cd5047 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -15,7 +15,7 @@
 
 
 
-public class NumberOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class NumberOnly  implements Serializable {
   
   private @Valid BigDecimal justNumber;
 
@@ -27,16 +27,18 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
+
   public void setJustNumber(BigDecimal justNumber) {
     this.justNumber = justNumber;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -74,5 +76,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java
index 4c88bb4d6ad6..d2401b0cb329 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java
@@ -15,7 +15,7 @@
 
 
 
-public class Order  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Order  implements Serializable {
   
   private @Valid Long id;
   private @Valid Long petId;
@@ -65,16 +65,17 @@ public Order id(Long id) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
   }
+
   public void setId(Long id) {
     this.id = id;
-  }
-
-  /**
+  }/**
    **/
   public Order petId(Long petId) {
     this.petId = petId;
@@ -82,16 +83,17 @@ public Order petId(Long petId) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
+
   public void setPetId(Long petId) {
     this.petId = petId;
-  }
-
-  /**
+  }/**
    **/
   public Order quantity(Integer quantity) {
     this.quantity = quantity;
@@ -99,16 +101,17 @@ public Order quantity(Integer quantity) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
+
   public void setQuantity(Integer quantity) {
     this.quantity = quantity;
-  }
-
-  /**
+  }/**
    **/
   public Order shipDate(Date shipDate) {
     this.shipDate = shipDate;
@@ -116,16 +119,17 @@ public Order shipDate(Date shipDate) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
   public Date getShipDate() {
     return shipDate;
   }
+
   public void setShipDate(Date shipDate) {
     this.shipDate = shipDate;
-  }
-
-  /**
+  }/**
    * Order Status
    **/
   public Order status(StatusEnum status) {
@@ -134,16 +138,17 @@ public Order status(StatusEnum status) {
   }
 
   
+
+  
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
+
   public void setStatus(StatusEnum status) {
     this.status = status;
-  }
-
-  /**
+  }/**
    **/
   public Order complete(Boolean complete) {
     this.complete = complete;
@@ -151,16 +156,18 @@ public Order complete(Boolean complete) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
+
   public void setComplete(Boolean complete) {
     this.complete = complete;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -208,5 +215,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java
index 14e7f71319ad..c89fd7762623 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -15,7 +15,7 @@
 
 
 
-public class OuterComposite  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class OuterComposite  implements Serializable {
   
   private @Valid BigDecimal myNumber;
   private @Valid String myString;
@@ -29,16 +29,17 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
+
   public void setMyNumber(BigDecimal myNumber) {
     this.myNumber = myNumber;
-  }
-
-  /**
+  }/**
    **/
   public OuterComposite myString(String myString) {
     this.myString = myString;
@@ -46,16 +47,17 @@ public OuterComposite myString(String myString) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
+
   public void setMyString(String myString) {
     this.myString = myString;
-  }
-
-  /**
+  }/**
    **/
   public OuterComposite myBoolean(Boolean myBoolean) {
     this.myBoolean = myBoolean;
@@ -63,16 +65,18 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
+
   public void setMyBoolean(Boolean myBoolean) {
     this.myBoolean = myBoolean;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -114,5 +118,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java
index 6718025e6926..06e9c7f94be3 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java
@@ -3,7 +3,9 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import org.openapitools.model.Category;
 import org.openapitools.model.Tag;
 import java.io.Serializable;
@@ -18,12 +20,12 @@
 
 
 
-public class Pet  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Pet  implements Serializable {
   
   private @Valid Long id;
   private @Valid Category category;
   private @Valid String name;
-  private @Valid List<String> photoUrls = new ArrayList<String>();
+  private @Valid Set<String> photoUrls = new LinkedHashSet<String>();
   private @Valid List<Tag> tags = new ArrayList<Tag>();
 
 public enum StatusEnum {
@@ -68,16 +70,17 @@ public Pet id(Long id) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
   }
+
   public void setId(Long id) {
     this.id = id;
-  }
-
-  /**
+  }/**
    **/
   public Pet category(Category category) {
     this.category = category;
@@ -85,16 +88,17 @@ public Pet category(Category category) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
+
   public void setCategory(Category category) {
     this.category = category;
-  }
-
-  /**
+  }/**
    **/
   public Pet name(String name) {
     this.name = name;
@@ -102,35 +106,37 @@ public Pet name(String name) {
   }
 
   
+
+  
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
   @NotNull
   public String getName() {
     return name;
   }
+
   public void setName(String name) {
     this.name = name;
-  }
-
-  /**
+  }/**
    **/
-  public Pet photoUrls(List<String> photoUrls) {
+  public Pet photoUrls(Set<String> photoUrls) {
     this.photoUrls = photoUrls;
     return this;
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
   @NotNull
-  public List<String> getPhotoUrls() {
+  public Set<String> getPhotoUrls() {
     return photoUrls;
   }
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
 
-  /**
+  public void setPhotoUrls(Set<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }/**
    **/
   public Pet tags(List<Tag> tags) {
     this.tags = tags;
@@ -138,16 +144,17 @@ public Pet tags(List<Tag> tags) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
   public List<Tag> getTags() {
     return tags;
   }
+
   public void setTags(List<Tag> tags) {
     this.tags = tags;
-  }
-
-  /**
+  }/**
    * pet status in the store
    **/
   public Pet status(StatusEnum status) {
@@ -156,16 +163,18 @@ public Pet status(StatusEnum status) {
   }
 
   
+
+  
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
+
   public void setStatus(StatusEnum status) {
     this.status = status;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -213,5 +222,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index 27b680b98690..fd1ea386c69d 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -14,7 +14,7 @@
 
 
 
-public class ReadOnlyFirst  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ReadOnlyFirst  implements Serializable {
   
   private @Valid String bar;
   private @Valid String baz;
@@ -27,16 +27,17 @@ public ReadOnlyFirst bar(String bar) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
+
   public void setBar(String bar) {
     this.bar = bar;
-  }
-
-  /**
+  }/**
    **/
   public ReadOnlyFirst baz(String baz) {
     this.baz = baz;
@@ -44,16 +45,18 @@ public ReadOnlyFirst baz(String baz) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
+
   public void setBaz(String baz) {
     this.baz = baz;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -93,5 +96,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java
index 9e1984faaa05..7bf29df3d1fa 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -14,7 +14,7 @@
 
 
 
-public class SpecialModelName  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class SpecialModelName  implements Serializable {
   
   private @Valid Long $specialPropertyName;
 
@@ -26,16 +26,18 @@ public class SpecialModelName  implements Serializable {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
+
   public void set$SpecialPropertyName(Long $specialPropertyName) {
     this.$specialPropertyName = $specialPropertyName;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -73,5 +75,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java
index cec2b713130a..fb24e901a1c2 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java
@@ -14,7 +14,7 @@
 
 
 
-public class Tag  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Tag  implements Serializable {
   
   private @Valid Long id;
   private @Valid String name;
@@ -27,16 +27,17 @@ public Tag id(Long id) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
   }
+
   public void setId(Long id) {
     this.id = id;
-  }
-
-  /**
+  }/**
    **/
   public Tag name(String name) {
     this.name = name;
@@ -44,16 +45,18 @@ public Tag name(String name) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
   }
+
   public void setName(String name) {
     this.name = name;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -93,5 +96,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java
index 957dd7c6cf3a..7264b7518d26 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java
@@ -17,7 +17,7 @@
 
 
 
-public class TypeHolderDefault  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class TypeHolderDefault  implements Serializable {
   
   private @Valid String stringItem = "what";
   private @Valid BigDecimal numberItem;
@@ -33,17 +33,18 @@ public TypeHolderDefault stringItem(String stringItem) {
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
   @NotNull
   public String getStringItem() {
     return stringItem;
   }
+
   public void setStringItem(String stringItem) {
     this.stringItem = stringItem;
-  }
-
-  /**
+  }/**
    **/
   public TypeHolderDefault numberItem(BigDecimal numberItem) {
     this.numberItem = numberItem;
@@ -51,17 +52,18 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
   @NotNull
   public BigDecimal getNumberItem() {
     return numberItem;
   }
+
   public void setNumberItem(BigDecimal numberItem) {
     this.numberItem = numberItem;
-  }
-
-  /**
+  }/**
    **/
   public TypeHolderDefault integerItem(Integer integerItem) {
     this.integerItem = integerItem;
@@ -69,17 +71,18 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
   @NotNull
   public Integer getIntegerItem() {
     return integerItem;
   }
+
   public void setIntegerItem(Integer integerItem) {
     this.integerItem = integerItem;
-  }
-
-  /**
+  }/**
    **/
   public TypeHolderDefault boolItem(Boolean boolItem) {
     this.boolItem = boolItem;
@@ -87,17 +90,18 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
   @NotNull
   public Boolean getBoolItem() {
     return boolItem;
   }
+
   public void setBoolItem(Boolean boolItem) {
     this.boolItem = boolItem;
-  }
-
-  /**
+  }/**
    **/
   public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
     this.arrayItem = arrayItem;
@@ -105,17 +109,19 @@ public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
   }
 
   
+
+  
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
   @NotNull
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
+
   public void setArrayItem(List<Integer> arrayItem) {
     this.arrayItem = arrayItem;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -161,5 +167,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java
index d7c9125b74fa..bd17ddabe287 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -17,7 +17,7 @@
 
 
 
-public class TypeHolderExample  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class TypeHolderExample  implements Serializable {
   
   private @Valid String stringItem;
   private @Valid BigDecimal numberItem;
@@ -34,17 +34,18 @@ public TypeHolderExample stringItem(String stringItem) {
   }
 
   
+
+  
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
   @NotNull
   public String getStringItem() {
     return stringItem;
   }
+
   public void setStringItem(String stringItem) {
     this.stringItem = stringItem;
-  }
-
-  /**
+  }/**
    **/
   public TypeHolderExample numberItem(BigDecimal numberItem) {
     this.numberItem = numberItem;
@@ -52,17 +53,18 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   }
 
   
+
+  
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
   @NotNull
   public BigDecimal getNumberItem() {
     return numberItem;
   }
+
   public void setNumberItem(BigDecimal numberItem) {
     this.numberItem = numberItem;
-  }
-
-  /**
+  }/**
    **/
   public TypeHolderExample floatItem(Float floatItem) {
     this.floatItem = floatItem;
@@ -70,17 +72,18 @@ public TypeHolderExample floatItem(Float floatItem) {
   }
 
   
+
+  
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
   @NotNull
   public Float getFloatItem() {
     return floatItem;
   }
+
   public void setFloatItem(Float floatItem) {
     this.floatItem = floatItem;
-  }
-
-  /**
+  }/**
    **/
   public TypeHolderExample integerItem(Integer integerItem) {
     this.integerItem = integerItem;
@@ -88,17 +91,18 @@ public TypeHolderExample integerItem(Integer integerItem) {
   }
 
   
+
+  
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
   @NotNull
   public Integer getIntegerItem() {
     return integerItem;
   }
+
   public void setIntegerItem(Integer integerItem) {
     this.integerItem = integerItem;
-  }
-
-  /**
+  }/**
    **/
   public TypeHolderExample boolItem(Boolean boolItem) {
     this.boolItem = boolItem;
@@ -106,17 +110,18 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   }
 
   
+
+  
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
   @NotNull
   public Boolean getBoolItem() {
     return boolItem;
   }
+
   public void setBoolItem(Boolean boolItem) {
     this.boolItem = boolItem;
-  }
-
-  /**
+  }/**
    **/
   public TypeHolderExample arrayItem(List<Integer> arrayItem) {
     this.arrayItem = arrayItem;
@@ -124,17 +129,19 @@ public TypeHolderExample arrayItem(List<Integer> arrayItem) {
   }
 
   
+
+  
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   @JsonProperty("array_item")
   @NotNull
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
+
   public void setArrayItem(List<Integer> arrayItem) {
     this.arrayItem = arrayItem;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -182,5 +189,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java
index 2ab19c284a30..c17f7afb2299 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java
@@ -14,7 +14,7 @@
 
 
 
-public class User  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class User  implements Serializable {
   
   private @Valid Long id;
   private @Valid String username;
@@ -33,16 +33,17 @@ public User id(Long id) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
   }
+
   public void setId(Long id) {
     this.id = id;
-  }
-
-  /**
+  }/**
    **/
   public User username(String username) {
     this.username = username;
@@ -50,16 +51,17 @@ public User username(String username) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("username")
   public String getUsername() {
     return username;
   }
+
   public void setUsername(String username) {
     this.username = username;
-  }
-
-  /**
+  }/**
    **/
   public User firstName(String firstName) {
     this.firstName = firstName;
@@ -67,16 +69,17 @@ public User firstName(String firstName) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
+
   public void setFirstName(String firstName) {
     this.firstName = firstName;
-  }
-
-  /**
+  }/**
    **/
   public User lastName(String lastName) {
     this.lastName = lastName;
@@ -84,16 +87,17 @@ public User lastName(String lastName) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
+
   public void setLastName(String lastName) {
     this.lastName = lastName;
-  }
-
-  /**
+  }/**
    **/
   public User email(String email) {
     this.email = email;
@@ -101,16 +105,17 @@ public User email(String email) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("email")
   public String getEmail() {
     return email;
   }
+
   public void setEmail(String email) {
     this.email = email;
-  }
-
-  /**
+  }/**
    **/
   public User password(String password) {
     this.password = password;
@@ -118,16 +123,17 @@ public User password(String password) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("password")
   public String getPassword() {
     return password;
   }
+
   public void setPassword(String password) {
     this.password = password;
-  }
-
-  /**
+  }/**
    **/
   public User phone(String phone) {
     this.phone = phone;
@@ -135,16 +141,17 @@ public User phone(String phone) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
+
   public void setPhone(String phone) {
     this.phone = phone;
-  }
-
-  /**
+  }/**
    * User Status
    **/
   public User userStatus(Integer userStatus) {
@@ -153,16 +160,18 @@ public User userStatus(Integer userStatus) {
   }
 
   
+
+  
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
+
   public void setUserStatus(Integer userStatus) {
     this.userStatus = userStatus;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -214,5 +223,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java
index 8c841c34f110..1677c10bff91 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java
@@ -17,7 +17,7 @@
 
 
 
-public class XmlItem  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class XmlItem  implements Serializable {
   
   private @Valid String attributeString;
   private @Valid BigDecimal attributeNumber;
@@ -57,16 +57,17 @@ public XmlItem attributeString(String attributeString) {
   }
 
   
+
+  
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
+
   public void setAttributeString(String attributeString) {
     this.attributeString = attributeString;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem attributeNumber(BigDecimal attributeNumber) {
     this.attributeNumber = attributeNumber;
@@ -74,16 +75,17 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   }
 
   
+
+  
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
+
   public void setAttributeNumber(BigDecimal attributeNumber) {
     this.attributeNumber = attributeNumber;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem attributeInteger(Integer attributeInteger) {
     this.attributeInteger = attributeInteger;
@@ -91,16 +93,17 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   }
 
   
+
+  
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
+
   public void setAttributeInteger(Integer attributeInteger) {
     this.attributeInteger = attributeInteger;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem attributeBoolean(Boolean attributeBoolean) {
     this.attributeBoolean = attributeBoolean;
@@ -108,16 +111,17 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   }
 
   
+
+  
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
+
   public void setAttributeBoolean(Boolean attributeBoolean) {
     this.attributeBoolean = attributeBoolean;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem wrappedArray(List<Integer> wrappedArray) {
     this.wrappedArray = wrappedArray;
@@ -125,16 +129,17 @@ public XmlItem wrappedArray(List<Integer> wrappedArray) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
+
   public void setWrappedArray(List<Integer> wrappedArray) {
     this.wrappedArray = wrappedArray;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem nameString(String nameString) {
     this.nameString = nameString;
@@ -142,16 +147,17 @@ public XmlItem nameString(String nameString) {
   }
 
   
+
+  
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
+
   public void setNameString(String nameString) {
     this.nameString = nameString;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem nameNumber(BigDecimal nameNumber) {
     this.nameNumber = nameNumber;
@@ -159,16 +165,17 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   }
 
   
+
+  
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
+
   public void setNameNumber(BigDecimal nameNumber) {
     this.nameNumber = nameNumber;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem nameInteger(Integer nameInteger) {
     this.nameInteger = nameInteger;
@@ -176,16 +183,17 @@ public XmlItem nameInteger(Integer nameInteger) {
   }
 
   
+
+  
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
+
   public void setNameInteger(Integer nameInteger) {
     this.nameInteger = nameInteger;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem nameBoolean(Boolean nameBoolean) {
     this.nameBoolean = nameBoolean;
@@ -193,16 +201,17 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   }
 
   
+
+  
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
+
   public void setNameBoolean(Boolean nameBoolean) {
     this.nameBoolean = nameBoolean;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem nameArray(List<Integer> nameArray) {
     this.nameArray = nameArray;
@@ -210,16 +219,17 @@ public XmlItem nameArray(List<Integer> nameArray) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
+
   public void setNameArray(List<Integer> nameArray) {
     this.nameArray = nameArray;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem nameWrappedArray(List<Integer> nameWrappedArray) {
     this.nameWrappedArray = nameWrappedArray;
@@ -227,16 +237,17 @@ public XmlItem nameWrappedArray(List<Integer> nameWrappedArray) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
+
   public void setNameWrappedArray(List<Integer> nameWrappedArray) {
     this.nameWrappedArray = nameWrappedArray;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem prefixString(String prefixString) {
     this.prefixString = prefixString;
@@ -244,16 +255,17 @@ public XmlItem prefixString(String prefixString) {
   }
 
   
+
+  
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
+
   public void setPrefixString(String prefixString) {
     this.prefixString = prefixString;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem prefixNumber(BigDecimal prefixNumber) {
     this.prefixNumber = prefixNumber;
@@ -261,16 +273,17 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   }
 
   
+
+  
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
+
   public void setPrefixNumber(BigDecimal prefixNumber) {
     this.prefixNumber = prefixNumber;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem prefixInteger(Integer prefixInteger) {
     this.prefixInteger = prefixInteger;
@@ -278,16 +291,17 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   }
 
   
+
+  
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
+
   public void setPrefixInteger(Integer prefixInteger) {
     this.prefixInteger = prefixInteger;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem prefixBoolean(Boolean prefixBoolean) {
     this.prefixBoolean = prefixBoolean;
@@ -295,16 +309,17 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   }
 
   
+
+  
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
+
   public void setPrefixBoolean(Boolean prefixBoolean) {
     this.prefixBoolean = prefixBoolean;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem prefixArray(List<Integer> prefixArray) {
     this.prefixArray = prefixArray;
@@ -312,16 +327,17 @@ public XmlItem prefixArray(List<Integer> prefixArray) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
+
   public void setPrefixArray(List<Integer> prefixArray) {
     this.prefixArray = prefixArray;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem prefixWrappedArray(List<Integer> prefixWrappedArray) {
     this.prefixWrappedArray = prefixWrappedArray;
@@ -329,16 +345,17 @@ public XmlItem prefixWrappedArray(List<Integer> prefixWrappedArray) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
+
   public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
     this.prefixWrappedArray = prefixWrappedArray;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem namespaceString(String namespaceString) {
     this.namespaceString = namespaceString;
@@ -346,16 +363,17 @@ public XmlItem namespaceString(String namespaceString) {
   }
 
   
+
+  
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
+
   public void setNamespaceString(String namespaceString) {
     this.namespaceString = namespaceString;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     this.namespaceNumber = namespaceNumber;
@@ -363,16 +381,17 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   }
 
   
+
+  
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
+
   public void setNamespaceNumber(BigDecimal namespaceNumber) {
     this.namespaceNumber = namespaceNumber;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem namespaceInteger(Integer namespaceInteger) {
     this.namespaceInteger = namespaceInteger;
@@ -380,16 +399,17 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   }
 
   
+
+  
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
+
   public void setNamespaceInteger(Integer namespaceInteger) {
     this.namespaceInteger = namespaceInteger;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     this.namespaceBoolean = namespaceBoolean;
@@ -397,16 +417,17 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   }
 
   
+
+  
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
+
   public void setNamespaceBoolean(Boolean namespaceBoolean) {
     this.namespaceBoolean = namespaceBoolean;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem namespaceArray(List<Integer> namespaceArray) {
     this.namespaceArray = namespaceArray;
@@ -414,16 +435,17 @@ public XmlItem namespaceArray(List<Integer> namespaceArray) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
+
   public void setNamespaceArray(List<Integer> namespaceArray) {
     this.namespaceArray = namespaceArray;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem namespaceWrappedArray(List<Integer> namespaceWrappedArray) {
     this.namespaceWrappedArray = namespaceWrappedArray;
@@ -431,16 +453,17 @@ public XmlItem namespaceWrappedArray(List<Integer> namespaceWrappedArray) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
+
   public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
     this.namespaceWrappedArray = namespaceWrappedArray;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem prefixNsString(String prefixNsString) {
     this.prefixNsString = prefixNsString;
@@ -448,16 +471,17 @@ public XmlItem prefixNsString(String prefixNsString) {
   }
 
   
+
+  
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
+
   public void setPrefixNsString(String prefixNsString) {
     this.prefixNsString = prefixNsString;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     this.prefixNsNumber = prefixNsNumber;
@@ -465,16 +489,17 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   }
 
   
+
+  
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
+
   public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
     this.prefixNsNumber = prefixNsNumber;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     this.prefixNsInteger = prefixNsInteger;
@@ -482,16 +507,17 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   }
 
   
+
+  
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
+
   public void setPrefixNsInteger(Integer prefixNsInteger) {
     this.prefixNsInteger = prefixNsInteger;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     this.prefixNsBoolean = prefixNsBoolean;
@@ -499,16 +525,17 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   }
 
   
+
+  
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
+
   public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
     this.prefixNsBoolean = prefixNsBoolean;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem prefixNsArray(List<Integer> prefixNsArray) {
     this.prefixNsArray = prefixNsArray;
@@ -516,16 +543,17 @@ public XmlItem prefixNsArray(List<Integer> prefixNsArray) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
+
   public void setPrefixNsArray(List<Integer> prefixNsArray) {
     this.prefixNsArray = prefixNsArray;
-  }
-
-  /**
+  }/**
    **/
   public XmlItem prefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
     this.prefixNsWrappedArray = prefixNsWrappedArray;
@@ -533,16 +561,18 @@ public XmlItem prefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
   }
 
   
+
+  
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
+
   public void setPrefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
     this.prefixNsWrappedArray = prefixNsWrappedArray;
   }
 
-
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -636,5 +666,7 @@ private String toIndentedString(java.lang.Object o) {
     }
     return o.toString().replace("\n", "\n    ");
   }
+
+
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml
index c6f479baae0f..da95378bbc81 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml
@@ -32,10 +32,10 @@ paths:
         description: Pet object that needs to be added to the store
         required: true
       responses:
-        200:
+        "200":
           content: {}
           description: successful operation
-        405:
+        "405":
           content: {}
           description: Invalid input
       security:
@@ -63,16 +63,16 @@ paths:
         description: Pet object that needs to be added to the store
         required: true
       responses:
-        200:
+        "200":
           content: {}
           description: successful operation
-        400:
+        "400":
           content: {}
           description: Invalid ID supplied
-        404:
+        "404":
           content: {}
           description: Pet not found
-        405:
+        "405":
           content: {}
           description: Validation exception
       security:
@@ -108,7 +108,7 @@ paths:
           type: array
         style: form
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
@@ -121,7 +121,7 @@ paths:
                   $ref: '#/components/schemas/Pet'
                 type: array
           description: successful operation
-        400:
+        "400":
           content: {}
           description: Invalid status value
       security:
@@ -150,22 +150,25 @@ paths:
           items:
             type: string
           type: array
+          uniqueItems: true
         style: form
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
                 items:
                   $ref: '#/components/schemas/Pet'
                 type: array
+                uniqueItems: true
             application/json:
               schema:
                 items:
                   $ref: '#/components/schemas/Pet'
                 type: array
+                uniqueItems: true
           description: successful operation
-        400:
+        "400":
           content: {}
           description: Invalid tag value
       security:
@@ -194,10 +197,10 @@ paths:
           format: int64
           type: integer
       responses:
-        200:
+        "200":
           content: {}
           description: successful operation
-        400:
+        "400":
           content: {}
           description: Invalid pet value
       security:
@@ -222,7 +225,7 @@ paths:
           format: int64
           type: integer
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
@@ -231,10 +234,10 @@ paths:
               schema:
                 $ref: '#/components/schemas/Pet'
           description: successful operation
-        400:
+        "400":
           content: {}
           description: Invalid ID supplied
-        404:
+        "404":
           content: {}
           description: Pet not found
       security:
@@ -267,7 +270,7 @@ paths:
                   description: Updated status of the pet
                   type: string
       responses:
-        405:
+        "405":
           content: {}
           description: Invalid input
       security:
@@ -305,7 +308,7 @@ paths:
                   format: binary
                   type: string
       responses:
-        200:
+        "200":
           content:
             application/json:
               schema:
@@ -327,7 +330,7 @@ paths:
       description: Returns a map of status codes to quantities
       operationId: getInventory
       responses:
-        200:
+        "200":
           content:
             application/json:
               schema:
@@ -355,7 +358,7 @@ paths:
         description: order placed for purchasing the pet
         required: true
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
@@ -364,7 +367,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/Order'
           description: successful operation
-        400:
+        "400":
           content: {}
           description: Invalid Order
       summary: Place an order for a pet
@@ -388,10 +391,10 @@ paths:
         schema:
           type: string
       responses:
-        400:
+        "400":
           content: {}
           description: Invalid ID supplied
-        404:
+        "404":
           content: {}
           description: Order not found
       summary: Delete purchase order by ID
@@ -415,7 +418,7 @@ paths:
           minimum: 1
           type: integer
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
@@ -424,10 +427,10 @@ paths:
               schema:
                 $ref: '#/components/schemas/Order'
           description: successful operation
-        400:
+        "400":
           content: {}
           description: Invalid ID supplied
-        404:
+        "404":
           content: {}
           description: Order not found
       summary: Find purchase order by ID
@@ -524,7 +527,7 @@ paths:
         schema:
           type: string
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
@@ -544,7 +547,7 @@ paths:
               schema:
                 format: date-time
                 type: string
-        400:
+        "400":
           content: {}
           description: Invalid username/password supplied
       summary: Logs user into the system
@@ -578,10 +581,10 @@ paths:
         schema:
           type: string
       responses:
-        400:
+        "400":
           content: {}
           description: Invalid username supplied
-        404:
+        "404":
           content: {}
           description: User not found
       summary: Delete user
@@ -600,7 +603,7 @@ paths:
         schema:
           type: string
       responses:
-        200:
+        "200":
           content:
             application/xml:
               schema:
@@ -609,10 +612,10 @@ paths:
               schema:
                 $ref: '#/components/schemas/User'
           description: successful operation
-        400:
+        "400":
           content: {}
           description: Invalid username supplied
-        404:
+        "404":
           content: {}
           description: User not found
       summary: Get user by user name
@@ -639,10 +642,10 @@ paths:
         description: Updated user object
         required: true
       responses:
-        400:
+        "400":
           content: {}
           description: Invalid user supplied
-        404:
+        "404":
           content: {}
           description: User not found
       summary: Updated user
@@ -665,7 +668,7 @@ paths:
         description: client model
         required: true
       responses:
-        200:
+        "200":
           content:
             application/json:
               schema:
@@ -722,7 +725,7 @@ paths:
           format: int64
           type: integer
       responses:
-        400:
+        "400":
           content: {}
           description: Someting wrong
       summary: Fake endpoint to test group parameters (optional)
@@ -823,10 +826,10 @@ paths:
                   - (xyz)
                   type: string
       responses:
-        400:
+        "400":
           content: {}
           description: Invalid request
-        404:
+        "404":
           content: {}
           description: Not found
       summary: To test enum parameters
@@ -847,7 +850,7 @@ paths:
         description: client model
         required: true
       responses:
-        200:
+        "200":
           content:
             application/json:
               schema:
@@ -862,11 +865,11 @@ paths:
       x-tags:
       - tag: fake
     post:
-      description: |
+      description: |-
         Fake endpoint for testing various parameters
-        假端點
-        偽のエンドポイント
-        가짜 엔드 포인트
+         假端點
+         偽のエンドポイント
+         가짜 엔드 포인트
       operationId: testEndpointParameters
       requestBody:
         content:
@@ -945,19 +948,19 @@ paths:
               - pattern_without_delimiter
         required: true
       responses:
-        400:
+        "400":
           content: {}
           description: Invalid username supplied
-        404:
+        "404":
           content: {}
           description: User not found
       security:
       - http_basic_test: []
-      summary: |
+      summary: |-
         Fake endpoint for testing various parameters
-        假端點
-        偽のエンドポイント
-        가짜 엔드 포인트
+         假端點
+         偽のエンドポイント
+         가짜 엔드 포인트
       tags:
       - fake
       x-contentType: application/x-www-form-urlencoded
@@ -976,7 +979,7 @@ paths:
         description: Input number as post body
         required: false
       responses:
-        200:
+        "200":
           content:
             '*/*':
               schema:
@@ -1001,7 +1004,7 @@ paths:
         description: Input string as post body
         required: false
       responses:
-        200:
+        "200":
           content:
             '*/*':
               schema:
@@ -1026,7 +1029,7 @@ paths:
         description: Input boolean as post body
         required: false
       responses:
-        200:
+        "200":
           content:
             '*/*':
               schema:
@@ -1051,7 +1054,7 @@ paths:
         description: Input composite as post body
         required: false
       responses:
-        200:
+        "200":
           content:
             '*/*':
               schema:
@@ -1083,7 +1086,7 @@ paths:
               - param2
         required: true
       responses:
-        200:
+        "200":
           content: {}
           description: successful operation
       summary: test json serialization of form data
@@ -1106,7 +1109,7 @@ paths:
         description: request body
         required: true
       responses:
-        200:
+        "200":
           content: {}
           description: successful operation
       summary: test inline additionalProperties
@@ -1133,7 +1136,7 @@ paths:
               $ref: '#/components/schemas/User'
         required: true
       responses:
-        200:
+        "200":
           content: {}
           description: Success
       tags:
@@ -1170,7 +1173,7 @@ paths:
         description: XmlItem Body
         required: true
       responses:
-        200:
+        "200":
           content: {}
           description: successful operation
       summary: creates an XmlItem
@@ -1193,7 +1196,7 @@ paths:
         description: client model
         required: true
       responses:
-        200:
+        "200":
           content:
             application/json:
               schema:
@@ -1219,7 +1222,7 @@ paths:
               $ref: '#/components/schemas/FileSchemaTestClass'
         required: true
       responses:
-        200:
+        "200":
           content: {}
           description: Success
       tags:
@@ -1277,7 +1280,7 @@ paths:
           type: array
         style: form
       responses:
-        200:
+        "200":
           content: {}
           description: Success
       tags:
@@ -1312,7 +1315,7 @@ paths:
               - requiredFile
         required: true
       responses:
-        200:
+        "200":
           content:
             application/json:
               schema:
@@ -1458,6 +1461,7 @@ components:
           items:
             type: string
           type: array
+          uniqueItems: true
           xml:
             name: photoUrl
             wrapped: true
@@ -1524,7 +1528,7 @@ components:
           type: integer
         property:
           type: string
-        123Number:
+        "123Number":
           readOnly: true
           type: integer
       required:
@@ -1532,7 +1536,7 @@ components:
       type: object
       xml:
         name: Name
-    200_response:
+    "200_response":
       description: Model for testing model name starting with number
       properties:
         name:
@@ -1801,7 +1805,7 @@ components:
       type: object
     List:
       properties:
-        123-list:
+        "123-list":
           type: string
       type: object
     Client:
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index ab8f42ee708d..4a6f6162ea41 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -15,7 +15,7 @@
 
 @Path("/another-fake")
 @Api(description = "the another-fake API")
-public interface AnotherFakeApi {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface AnotherFakeApi {
 
     @PATCH
     @Path("/dummy")
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java
index 18a18ba882eb..5d3a13c41698 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java
@@ -25,7 +25,7 @@
 
 @Path("/fake")
 @Api(description = "the fake API")
-public interface FakeApi {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface FakeApi {
 
     @POST
     @Path("/create_xml_item")
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
index 15ebbfb9f606..d9f96d12922a 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -15,7 +15,7 @@
 
 @Path("/fake_classname_test")
 @Api(description = "the fake_classname_test API")
-public interface FakeClassnameTestApi {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface FakeClassnameTestApi {
 
     @PATCH
     @Consumes({ "application/json" })
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java
index 72899f7a4feb..f9db4accd552 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java
@@ -18,7 +18,7 @@
 
 @Path("/pet")
 @Api(description = "the pet API")
-public interface PetApi {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface PetApi {
 
     @POST
     @Consumes({ "application/json", "application/xml" })
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java
index 9021462fad7d..b40ba06efdef 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java
@@ -16,7 +16,7 @@
 
 @Path("/store")
 @Api(description = "the store API")
-public interface StoreApi {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface StoreApi {
 
     @DELETE
     @Path("/order/{order_id}")
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/UserApi.java
index 33ed2f6aaeb7..bcdb9837fd23 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/UserApi.java
@@ -16,7 +16,7 @@
 
 @Path("/user")
 @Api(description = "the user API")
-public interface UserApi {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface UserApi {
 
     @POST
     @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", tags={ "user",  })
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index aed0fff6cef2..26ca940b6778 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
index 77a966fc45ba..84b3d81ad92a 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -17,7 +17,7 @@
 
 
 
-public class AdditionalPropertiesArray extends HashMap<String, List> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesArray extends HashMap<String, List> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d9b4e2f1d0e0..a69323584818 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index f2332eb2a607..6b45e6c28e6b 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 
 
 
-public class AdditionalPropertiesClass  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesClass  implements Serializable {
   
   private @Valid Map<String, String> mapString = new HashMap<String, String>();
   private @Valid Map<String, BigDecimal> mapNumber = new HashMap<String, BigDecimal>();
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 88522ac23baf..6a6851ab2231 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesInteger extends HashMap<String, Integer> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesInteger extends HashMap<String, Integer> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 9d0f0d1bdd31..2ece39a129cb 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -17,7 +17,7 @@
 
 
 
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
index af0e2fbc20f7..fc28feb6efdd 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesObject extends HashMap<String, Map> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesObject extends HashMap<String, Map> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
index faf835671e6e..c89e917c2773 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesString extends HashMap<String, String> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesString extends HashMap<String, String> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java
index cda0533c480d..ec6cc8875a9a 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java
@@ -22,7 +22,7 @@
 })
 
 
-public class Animal  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Animal  implements Serializable {
   
   private @Valid String className;
   private @Valid String color = "red";
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 2e0352195dcb..e2fe6804e803 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -17,7 +17,7 @@
 
 
 
-public class ArrayOfArrayOfNumberOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayOfArrayOfNumberOnly  implements Serializable {
   
   private @Valid List<List<BigDecimal>> arrayArrayNumber = new ArrayList<List<BigDecimal>>();
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index 404b220d584e..c920a7121812 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -17,7 +17,7 @@
 
 
 
-public class ArrayOfNumberOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayOfNumberOnly  implements Serializable {
   
   private @Valid List<BigDecimal> arrayNumber = new ArrayList<BigDecimal>();
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java
index a35a833ac3ba..b95de9c1566c 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -17,7 +17,7 @@
 
 
 
-public class ArrayTest  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayTest  implements Serializable {
   
   private @Valid List<String> arrayOfString = new ArrayList<String>();
   private @Valid List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCat.java
index 9e0347ae85b2..2473d83564a3 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCat.java
@@ -16,7 +16,7 @@
 
 
 
-public class BigCat extends Cat implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class BigCat extends Cat implements Serializable {
   
 
 public enum KindEnum {
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCatAllOf.java
index 02804f7c2a5d..0937f9c47396 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCatAllOf.java
@@ -14,7 +14,7 @@
 
 
 
-public class BigCatAllOf  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class BigCatAllOf  implements Serializable {
   
 
 public enum KindEnum {
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java
index 783e1bdb92b8..1161f1b0057f 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java
@@ -14,7 +14,7 @@
 
 
 
-public class Capitalization  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Capitalization  implements Serializable {
   
   private @Valid String smallCamel;
   private @Valid String capitalCamel;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java
index 1a9b33dc7671..3697c0a9789e 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java
@@ -16,7 +16,7 @@
 
 
 
-public class Cat extends Animal implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Cat extends Animal implements Serializable {
   
   private @Valid Boolean declawed;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/CatAllOf.java
index 561dd77d848f..fe321e2dad05 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -14,7 +14,7 @@
 
 
 
-public class CatAllOf  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class CatAllOf  implements Serializable {
   
   private @Valid Boolean declawed;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java
index 38c8fca1c164..c539ed1ff0a1 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java
@@ -14,7 +14,7 @@
 
 
 
-public class Category  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Category  implements Serializable {
   
   private @Valid Long id;
   private @Valid String name = "default-name";
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java
index b84f1b8c63bd..776d974a189c 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java
@@ -16,7 +16,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  **/
 @ApiModel(description = "Model for testing model with \"_class\" property")
-public class ClassModel  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ClassModel  implements Serializable {
   
   private @Valid String propertyClass;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java
index cd6a701335aa..f75d9e5f265f 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java
@@ -14,7 +14,7 @@
 
 
 
-public class Client  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Client  implements Serializable {
   
   private @Valid String client;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java
index 2c526237d2de..662c97e49d59 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java
@@ -16,7 +16,7 @@
 
 
 
-public class Dog extends Animal implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Dog extends Animal implements Serializable {
   
   private @Valid String breed;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/DogAllOf.java
index eb82fd4f766a..443b3201efb5 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -14,7 +14,7 @@
 
 
 
-public class DogAllOf  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class DogAllOf  implements Serializable {
   
   private @Valid String breed;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java
index c6996acd791d..2e82ae8fd18b 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -16,7 +16,7 @@
 
 
 
-public class EnumArrays  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class EnumArrays  implements Serializable {
   
 
 public enum JustSymbolEnum {
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java
index 0000972a8227..b1148724a627 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java
@@ -15,7 +15,7 @@
 
 
 
-public class EnumTest  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class EnumTest  implements Serializable {
   
 
 public enum EnumStringEnum {
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index d8174bd527cb..2ad57632ee00 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -16,7 +16,7 @@
 
 
 
-public class FileSchemaTestClass  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class FileSchemaTestClass  implements Serializable {
   
   private @Valid java.io.File file;
   private @Valid List<java.io.File> files = new ArrayList<java.io.File>();
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java
index 67ba67840f40..fdb4d2f9cd88 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java
@@ -19,7 +19,7 @@
 
 
 
-public class FormatTest  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class FormatTest  implements Serializable {
   
   private @Valid Integer integer;
   private @Valid Integer int32;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index 08dae98e53d2..05dfb87f0856 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -14,7 +14,7 @@
 
 
 
-public class HasOnlyReadOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class HasOnlyReadOnly  implements Serializable {
   
   private @Valid String bar;
   private @Valid String foo;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java
index 74f6354e7c75..4864c6406389 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java
@@ -17,7 +17,7 @@
 
 
 
-public class MapTest  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class MapTest  implements Serializable {
   
   private @Valid Map<String, Map<String, String>> mapMapOfString = new HashMap<String, Map<String, String>>();
  
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9c089fccb058..53c658bd6556 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -20,7 +20,7 @@
 
 
 
-public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
   
   private @Valid UUID uuid;
   private @Valid Date dateTime;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java
index c61356a06788..b4a633ca436f 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java
@@ -16,7 +16,7 @@
  * Model for testing model name starting with number
  **/
 @ApiModel(description = "Model for testing model name starting with number")
-public class Model200Response  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Model200Response  implements Serializable {
   
   private @Valid Integer name;
   private @Valid String propertyClass;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 22e7d470591a..c8ad2f6920fd 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -14,7 +14,7 @@
 
 
 
-public class ModelApiResponse  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ModelApiResponse  implements Serializable {
   
   private @Valid Integer code;
   private @Valid String type;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java
index 44a1581e5b24..edf8ed25b251 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -16,7 +16,7 @@
  * Model for testing reserved words
  **/
 @ApiModel(description = "Model for testing reserved words")
-public class ModelReturn  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ModelReturn  implements Serializable {
   
   private @Valid Integer _return;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java
index b4306edb75cd..e5e6e3faca90 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java
@@ -16,7 +16,7 @@
  * Model for testing model name same as property name
  **/
 @ApiModel(description = "Model for testing model name same as property name")
-public class Name  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Name  implements Serializable {
   
   private @Valid Integer name;
   private @Valid Integer snakeCase;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java
index 35a2322ebeb6..f80409cd5047 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -15,7 +15,7 @@
 
 
 
-public class NumberOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class NumberOnly  implements Serializable {
   
   private @Valid BigDecimal justNumber;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java
index a93e308e31cb..d2401b0cb329 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java
@@ -15,7 +15,7 @@
 
 
 
-public class Order  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Order  implements Serializable {
   
   private @Valid Long id;
   private @Valid Long petId;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java
index f63145136d7e..c89fd7762623 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -15,7 +15,7 @@
 
 
 
-public class OuterComposite  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class OuterComposite  implements Serializable {
   
   private @Valid BigDecimal myNumber;
   private @Valid String myString;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java
index 1e5670cd39d7..06e9c7f94be3 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java
@@ -20,7 +20,7 @@
 
 
 
-public class Pet  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Pet  implements Serializable {
   
   private @Valid Long id;
   private @Valid Category category;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index e1b4fd106dba..fd1ea386c69d 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -14,7 +14,7 @@
 
 
 
-public class ReadOnlyFirst  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ReadOnlyFirst  implements Serializable {
   
   private @Valid String bar;
   private @Valid String baz;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java
index 3c4fb5b8dd19..7bf29df3d1fa 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -14,7 +14,7 @@
 
 
 
-public class SpecialModelName  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class SpecialModelName  implements Serializable {
   
   private @Valid Long $specialPropertyName;
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java
index 399864985ba8..fb24e901a1c2 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java
@@ -14,7 +14,7 @@
 
 
 
-public class Tag  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Tag  implements Serializable {
   
   private @Valid Long id;
   private @Valid String name;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderDefault.java
index a2de274c448e..7264b7518d26 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderDefault.java
@@ -17,7 +17,7 @@
 
 
 
-public class TypeHolderDefault  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class TypeHolderDefault  implements Serializable {
   
   private @Valid String stringItem = "what";
   private @Valid BigDecimal numberItem;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderExample.java
index 31efd619ce51..bd17ddabe287 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -17,7 +17,7 @@
 
 
 
-public class TypeHolderExample  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class TypeHolderExample  implements Serializable {
   
   private @Valid String stringItem;
   private @Valid BigDecimal numberItem;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java
index 55ba561e30c2..c17f7afb2299 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java
@@ -14,7 +14,7 @@
 
 
 
-public class User  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class User  implements Serializable {
   
   private @Valid Long id;
   private @Valid String username;
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java
index 05e86104cf38..1677c10bff91 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java
@@ -17,7 +17,7 @@
 
 
 
-public class XmlItem  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class XmlItem  implements Serializable {
   
   private @Valid String attributeString;
   private @Valid BigDecimal attributeNumber;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 5902d4739480..f562c3da4193 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -15,7 +15,7 @@
 
 @Path("/another-fake")
 @Api(description = "the another-fake API")
-public class AnotherFakeApi {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AnotherFakeApi {
 
     @PATCH
     @Path("/dummy")
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java
index a6ca5412a230..1f3b533006c8 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java
@@ -25,7 +25,7 @@
 
 @Path("/fake")
 @Api(description = "the fake API")
-public class FakeApi {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class FakeApi {
 
     @POST
     @Path("/create_xml_item")
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
index 70341d836a6c..633a0f2200f7 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -15,7 +15,7 @@
 
 @Path("/fake_classname_test")
 @Api(description = "the fake_classname_test API")
-public class FakeClassnameTestApi {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class FakeClassnameTestApi {
 
     @PATCH
     @Consumes({ "application/json" })
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java
index a890a8764b97..ecd628c648ac 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java
@@ -18,7 +18,7 @@
 
 @Path("/pet")
 @Api(description = "the pet API")
-public class PetApi {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class PetApi {
 
     @POST
     @Consumes({ "application/json", "application/xml" })
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java
index de2df3c4c663..c55cdddea894 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java
@@ -16,7 +16,7 @@
 
 @Path("/store")
 @Api(description = "the store API")
-public class StoreApi {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class StoreApi {
 
     @DELETE
     @Path("/order/{order_id}")
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/UserApi.java
index e6e6d5e9a212..0cfea61c0a65 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/UserApi.java
@@ -16,7 +16,7 @@
 
 @Path("/user")
 @Api(description = "the user API")
-public class UserApi {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class UserApi {
 
     @POST
     @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user",  })
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index aed0fff6cef2..26ca940b6778 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
index 77a966fc45ba..84b3d81ad92a 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -17,7 +17,7 @@
 
 
 
-public class AdditionalPropertiesArray extends HashMap<String, List> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesArray extends HashMap<String, List> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d9b4e2f1d0e0..a69323584818 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index f2332eb2a607..6b45e6c28e6b 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 
 
 
-public class AdditionalPropertiesClass  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesClass  implements Serializable {
   
   private @Valid Map<String, String> mapString = new HashMap<String, String>();
   private @Valid Map<String, BigDecimal> mapNumber = new HashMap<String, BigDecimal>();
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 88522ac23baf..6a6851ab2231 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesInteger extends HashMap<String, Integer> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesInteger extends HashMap<String, Integer> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 9d0f0d1bdd31..2ece39a129cb 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -17,7 +17,7 @@
 
 
 
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
index af0e2fbc20f7..fc28feb6efdd 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesObject extends HashMap<String, Map> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesObject extends HashMap<String, Map> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
index faf835671e6e..c89e917c2773 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -16,7 +16,7 @@
 
 
 
-public class AdditionalPropertiesString extends HashMap<String, String> implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesString extends HashMap<String, String> implements Serializable {
   
   private @Valid String name;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java
index cda0533c480d..ec6cc8875a9a 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java
@@ -22,7 +22,7 @@
 })
 
 
-public class Animal  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Animal  implements Serializable {
   
   private @Valid String className;
   private @Valid String color = "red";
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 2e0352195dcb..e2fe6804e803 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -17,7 +17,7 @@
 
 
 
-public class ArrayOfArrayOfNumberOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayOfArrayOfNumberOnly  implements Serializable {
   
   private @Valid List<List<BigDecimal>> arrayArrayNumber = new ArrayList<List<BigDecimal>>();
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index 404b220d584e..c920a7121812 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -17,7 +17,7 @@
 
 
 
-public class ArrayOfNumberOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayOfNumberOnly  implements Serializable {
   
   private @Valid List<BigDecimal> arrayNumber = new ArrayList<BigDecimal>();
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java
index a35a833ac3ba..b95de9c1566c 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -17,7 +17,7 @@
 
 
 
-public class ArrayTest  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayTest  implements Serializable {
   
   private @Valid List<String> arrayOfString = new ArrayList<String>();
   private @Valid List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCat.java
index 9e0347ae85b2..2473d83564a3 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCat.java
@@ -16,7 +16,7 @@
 
 
 
-public class BigCat extends Cat implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class BigCat extends Cat implements Serializable {
   
 
 public enum KindEnum {
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCatAllOf.java
index 02804f7c2a5d..0937f9c47396 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/BigCatAllOf.java
@@ -14,7 +14,7 @@
 
 
 
-public class BigCatAllOf  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class BigCatAllOf  implements Serializable {
   
 
 public enum KindEnum {
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java
index 783e1bdb92b8..1161f1b0057f 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java
@@ -14,7 +14,7 @@
 
 
 
-public class Capitalization  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Capitalization  implements Serializable {
   
   private @Valid String smallCamel;
   private @Valid String capitalCamel;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java
index 1a9b33dc7671..3697c0a9789e 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java
@@ -16,7 +16,7 @@
 
 
 
-public class Cat extends Animal implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Cat extends Animal implements Serializable {
   
   private @Valid Boolean declawed;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/CatAllOf.java
index 561dd77d848f..fe321e2dad05 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -14,7 +14,7 @@
 
 
 
-public class CatAllOf  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class CatAllOf  implements Serializable {
   
   private @Valid Boolean declawed;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java
index 38c8fca1c164..c539ed1ff0a1 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java
@@ -14,7 +14,7 @@
 
 
 
-public class Category  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Category  implements Serializable {
   
   private @Valid Long id;
   private @Valid String name = "default-name";
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java
index b84f1b8c63bd..776d974a189c 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java
@@ -16,7 +16,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  **/
 @ApiModel(description = "Model for testing model with \"_class\" property")
-public class ClassModel  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ClassModel  implements Serializable {
   
   private @Valid String propertyClass;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java
index cd6a701335aa..f75d9e5f265f 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java
@@ -14,7 +14,7 @@
 
 
 
-public class Client  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Client  implements Serializable {
   
   private @Valid String client;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java
index 2c526237d2de..662c97e49d59 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java
@@ -16,7 +16,7 @@
 
 
 
-public class Dog extends Animal implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Dog extends Animal implements Serializable {
   
   private @Valid String breed;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/DogAllOf.java
index eb82fd4f766a..443b3201efb5 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -14,7 +14,7 @@
 
 
 
-public class DogAllOf  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class DogAllOf  implements Serializable {
   
   private @Valid String breed;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java
index c6996acd791d..2e82ae8fd18b 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -16,7 +16,7 @@
 
 
 
-public class EnumArrays  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class EnumArrays  implements Serializable {
   
 
 public enum JustSymbolEnum {
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java
index 0000972a8227..b1148724a627 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java
@@ -15,7 +15,7 @@
 
 
 
-public class EnumTest  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class EnumTest  implements Serializable {
   
 
 public enum EnumStringEnum {
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index d8174bd527cb..2ad57632ee00 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -16,7 +16,7 @@
 
 
 
-public class FileSchemaTestClass  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class FileSchemaTestClass  implements Serializable {
   
   private @Valid java.io.File file;
   private @Valid List<java.io.File> files = new ArrayList<java.io.File>();
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java
index 67ba67840f40..fdb4d2f9cd88 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java
@@ -19,7 +19,7 @@
 
 
 
-public class FormatTest  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class FormatTest  implements Serializable {
   
   private @Valid Integer integer;
   private @Valid Integer int32;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index 08dae98e53d2..05dfb87f0856 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -14,7 +14,7 @@
 
 
 
-public class HasOnlyReadOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class HasOnlyReadOnly  implements Serializable {
   
   private @Valid String bar;
   private @Valid String foo;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java
index 74f6354e7c75..4864c6406389 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java
@@ -17,7 +17,7 @@
 
 
 
-public class MapTest  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class MapTest  implements Serializable {
   
   private @Valid Map<String, Map<String, String>> mapMapOfString = new HashMap<String, Map<String, String>>();
  
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9c089fccb058..53c658bd6556 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -20,7 +20,7 @@
 
 
 
-public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
   
   private @Valid UUID uuid;
   private @Valid Date dateTime;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java
index c61356a06788..b4a633ca436f 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java
@@ -16,7 +16,7 @@
  * Model for testing model name starting with number
  **/
 @ApiModel(description = "Model for testing model name starting with number")
-public class Model200Response  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Model200Response  implements Serializable {
   
   private @Valid Integer name;
   private @Valid String propertyClass;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 22e7d470591a..c8ad2f6920fd 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -14,7 +14,7 @@
 
 
 
-public class ModelApiResponse  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ModelApiResponse  implements Serializable {
   
   private @Valid Integer code;
   private @Valid String type;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java
index 44a1581e5b24..edf8ed25b251 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -16,7 +16,7 @@
  * Model for testing reserved words
  **/
 @ApiModel(description = "Model for testing reserved words")
-public class ModelReturn  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ModelReturn  implements Serializable {
   
   private @Valid Integer _return;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java
index b4306edb75cd..e5e6e3faca90 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java
@@ -16,7 +16,7 @@
  * Model for testing model name same as property name
  **/
 @ApiModel(description = "Model for testing model name same as property name")
-public class Name  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Name  implements Serializable {
   
   private @Valid Integer name;
   private @Valid Integer snakeCase;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java
index 35a2322ebeb6..f80409cd5047 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -15,7 +15,7 @@
 
 
 
-public class NumberOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class NumberOnly  implements Serializable {
   
   private @Valid BigDecimal justNumber;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java
index a93e308e31cb..d2401b0cb329 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java
@@ -15,7 +15,7 @@
 
 
 
-public class Order  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Order  implements Serializable {
   
   private @Valid Long id;
   private @Valid Long petId;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java
index f63145136d7e..c89fd7762623 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -15,7 +15,7 @@
 
 
 
-public class OuterComposite  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class OuterComposite  implements Serializable {
   
   private @Valid BigDecimal myNumber;
   private @Valid String myString;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java
index 1e5670cd39d7..06e9c7f94be3 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java
@@ -20,7 +20,7 @@
 
 
 
-public class Pet  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Pet  implements Serializable {
   
   private @Valid Long id;
   private @Valid Category category;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index e1b4fd106dba..fd1ea386c69d 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -14,7 +14,7 @@
 
 
 
-public class ReadOnlyFirst  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ReadOnlyFirst  implements Serializable {
   
   private @Valid String bar;
   private @Valid String baz;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java
index 3c4fb5b8dd19..7bf29df3d1fa 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -14,7 +14,7 @@
 
 
 
-public class SpecialModelName  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class SpecialModelName  implements Serializable {
   
   private @Valid Long $specialPropertyName;
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java
index 399864985ba8..fb24e901a1c2 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java
@@ -14,7 +14,7 @@
 
 
 
-public class Tag  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Tag  implements Serializable {
   
   private @Valid Long id;
   private @Valid String name;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderDefault.java
index a2de274c448e..7264b7518d26 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderDefault.java
@@ -17,7 +17,7 @@
 
 
 
-public class TypeHolderDefault  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class TypeHolderDefault  implements Serializable {
   
   private @Valid String stringItem = "what";
   private @Valid BigDecimal numberItem;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderExample.java
index 31efd619ce51..bd17ddabe287 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -17,7 +17,7 @@
 
 
 
-public class TypeHolderExample  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class TypeHolderExample  implements Serializable {
   
   private @Valid String stringItem;
   private @Valid BigDecimal numberItem;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java
index 55ba561e30c2..c17f7afb2299 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java
@@ -14,7 +14,7 @@
 
 
 
-public class User  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class User  implements Serializable {
   
   private @Valid Long id;
   private @Valid String username;
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java
index 05e86104cf38..1677c10bff91 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java
@@ -17,7 +17,7 @@
 
 
 
-public class XmlItem  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class XmlItem  implements Serializable {
   
   private @Valid String attributeString;
   private @Valid BigDecimal attributeNumber;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 385acd4edbcc..35ca38c732cb 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -29,7 +29,7 @@
 
 
 @io.swagger.annotations.Api(description = "the AnotherFake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApi  {
    private final AnotherFakeApiService delegate = AnotherFakeApiServiceFactory.getAnotherFakeApi();
 
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index 85a462b46c82..a870fe32fa35 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class AnotherFakeApiService {
       public abstract Response call123testSpecialTags(Client body,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/ApiException.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/ApiException.java
index fdbaeee3a29e..cb188abf49e8 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/ApiException.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/ApiException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiException extends Exception{
     private int code;
     public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/ApiOriginFilter.java
index 7039b5e4d92a..2b84aa455556 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/ApiOriginFilter.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiOriginFilter implements javax.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/ApiResponseMessage.java
index 9211b2dd7e51..a4a4ecf08c5d 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/ApiResponseMessage.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java
index 56aa03322408..61ee91251643 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java
@@ -37,7 +37,7 @@
 
 
 @io.swagger.annotations.Api(description = "the Fake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApi  {
    private final FakeApiService delegate = FakeApiServiceFactory.getFakeApi();
 
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
index 86e8f3040d8e..8e38855afa7d 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -26,7 +26,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class FakeApiService {
       public abstract Response createXmlItem(XmlItem xmlItem,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java
index 89131417c5b9..454b0b214378 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java
@@ -29,7 +29,7 @@
 
 
 @io.swagger.annotations.Api(description = "the FakeClassnameTags123 API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTags123Api  {
    private final FakeClassnameTags123ApiService delegate = FakeClassnameTags123ApiServiceFactory.getFakeClassnameTags123Api();
 
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java
index 3b3d7a7367df..27a9f27ca396 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class FakeClassnameTags123ApiService {
       public abstract Response testClassname(Client body,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/NotFoundException.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/NotFoundException.java
index 526df6c1c197..c369e6aa4315 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/NotFoundException.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java
index 28144817d147..1f3622c7a1d6 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java
@@ -32,7 +32,7 @@
 
 
 @io.swagger.annotations.Api(description = "the Pet API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApi  {
    private final PetApiService delegate = PetApiServiceFactory.getPetApi();
 
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java
index 26ad8543c823..f68ba1ccb376 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java
@@ -21,7 +21,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class PetApiService {
       public abstract Response addPet(Pet body,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java
index ac06e7d70f98..aee703609307 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the Store API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApi  {
    private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi();
 
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java
index 5df2ddbbe30d..ff8059b1df2f 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -19,7 +19,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class StoreApiService {
       public abstract Response deleteOrder(String orderId,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StringUtil.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StringUtil.java
index 367283558974..7dc8e3d4ebf5 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StringUtil.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StringUtil.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApi.java
index 32d1dd4fdf2b..59f1fa4adbd3 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the User API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApi  {
    private final UserApiService delegate = UserApiServiceFactory.getUserApi();
 
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApiService.java
index 74e6c8015266..d8b932aaf911 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApiService.java
@@ -19,7 +19,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class UserApiService {
       public abstract Response createUser(User body,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index d6a652a1114f..633abdebcbab 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
index 64a756fcb61d..8143ea963f7a 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 333a1d0e3508..dd4e07ac1722 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index 239ebd876168..5b621b6334c3 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -42,7 +42,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   @JsonProperty(JSON_PROPERTY_MAP_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 9b850704be77..bd29538de8e2 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 5ed8962462e6..c47f39165234 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
index bff07e2b6ac7..50e9226bae49 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
index f957a853e20c..55879e92e311 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Animal.java
index f06a0e2b1352..0cc86f7b62bb 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Animal.java
@@ -31,7 +31,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index b61d1fabdc40..d62c0caf5221 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index c2955daa575f..ee84cfbe9aa9 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayOfNumberOnly   {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java
index a8ef31cdb79c..fe5dd36d55b6 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -33,7 +33,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayTest   {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/BigCat.java
index 8316a86f8847..f7d5480ab443 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/BigCat.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/BigCatAllOf.java
index e5088ac43df5..872c488590d6 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/BigCatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Capitalization.java
index 4db559dc7b31..a807df6b5692 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Capitalization.java
@@ -33,7 +33,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Capitalization   {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Cat.java
index bb3bad972102..3695d5ad727e 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Cat.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Cat extends Animal  {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/CatAllOf.java
index d8bf140b58c5..8dcbc7384156 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class CatAllOf   {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Category.java
index 1a39a7ccaf6b..c3e077e565a3 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Category.java
@@ -29,7 +29,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Category   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ClassModel.java
index 98ba52298ad3..b2303de259c0 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ClassModel.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ClassModel   {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Client.java
index cd1b6b08a63d..8bd24a5ae0c0 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Client.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Client   {
   public static final String JSON_PROPERTY_CLIENT = "client";
   @JsonProperty(JSON_PROPERTY_CLIENT)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Dog.java
index 6d0a7a90f828..2aa32d3cb9a2 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Dog.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Dog extends Animal  {
   public static final String JSON_PROPERTY_BREED = "breed";
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/DogAllOf.java
index 2551f2285c4c..ee6459c1dbdf 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class DogAllOf   {
   public static final String JSON_PROPERTY_BREED = "breed";
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumArrays.java
index 5e6c640c3ebe..5cd5ec99f41b 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -32,7 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java
index ab576f99ef97..fde7f90b40be 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java
@@ -34,7 +34,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index 4e3ec6a2cf81..0cd31260a960 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -31,7 +31,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FileSchemaTestClass   {
   public static final String JSON_PROPERTY_FILE = "file";
   @JsonProperty(JSON_PROPERTY_FILE)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FormatTest.java
index cdccca96bdd1..5f216ec89a97 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FormatTest.java
@@ -45,7 +45,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FormatTest   {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   @JsonProperty(JSON_PROPERTY_INTEGER)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index 30d9c4fccf93..2f58f76873c7 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -29,7 +29,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class HasOnlyReadOnly   {
   public static final String JSON_PROPERTY_BAR = "bar";
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MapTest.java
index 497f98c1fb5f..f9d4db9b2f04 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MapTest.java
@@ -35,7 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class MapTest   {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e8ff1a269768..fa1e51a3889f 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -36,7 +36,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Model200Response.java
index 00901b890aea..c1cc9a6a7bbb 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Model200Response.java
@@ -30,7 +30,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Model200Response   {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 8355a7526b68..b677a747afc5 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -30,7 +30,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ModelApiResponse   {
   public static final String JSON_PROPERTY_CODE = "code";
   @JsonProperty(JSON_PROPERTY_CODE)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ModelReturn.java
index a979d5e6fce5..bf06abca486b 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ModelReturn   {
   public static final String JSON_PROPERTY_RETURN = "return";
   @JsonProperty(JSON_PROPERTY_RETURN)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Name.java
index 5d4da98047b2..31c348b35af8 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Name.java
@@ -32,7 +32,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Name   {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/NumberOnly.java
index 633e2e339ed9..f98544933e15 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class NumberOnly   {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Order.java
index 10fa5da35a9f..0db56b8b6ab1 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Order.java
@@ -35,7 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Order   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/OuterComposite.java
index 448638abd374..33d948c2d982 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -31,7 +31,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class OuterComposite   {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java
index 3ba558b701b2..25f7e581f8f2 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java
@@ -40,7 +40,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Pet   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index 447b43cb5010..493c758bdb6e 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -29,7 +29,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ReadOnlyFirst   {
   public static final String JSON_PROPERTY_BAR = "bar";
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/SpecialModelName.java
index 4ad8f3205a0a..91fe8aaa13bc 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class SpecialModelName   {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Tag.java
index 35305769a2d2..9a44ab76fc9e 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Tag.java
@@ -29,7 +29,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Tag   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java
index 583a592963a8..f08943a2244b 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java
@@ -35,7 +35,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class TypeHolderDefault   {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java
index 2f29a40a22b7..f7d8cf71e7c8 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -36,7 +36,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class TypeHolderExample   {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/User.java
index 23b9f6e3cee4..ab66f62dfbac 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/User.java
@@ -35,7 +35,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class User   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java
index fa69d67a9e68..025a4fda2de6 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java
@@ -59,7 +59,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class XmlItem   {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
index 21281d8d8a43..ae72e4771a3d 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.AnotherFakeApiService;
 import org.openapitools.api.impl.AnotherFakeApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceFactory {
     private final static AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
index 6b5746c6e8a6..97bf41219fd5 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.FakeApiService;
 import org.openapitools.api.impl.FakeApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceFactory {
     private final static FakeApiService service = new FakeApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java
index f4e83e69ba10..ca6da8cb5386 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.FakeClassnameTags123ApiService;
 import org.openapitools.api.impl.FakeClassnameTags123ApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTags123ApiServiceFactory {
     private final static FakeClassnameTags123ApiService service = new FakeClassnameTags123ApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
index c292d9111ee8..932873718a3b 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.PetApiService;
 import org.openapitools.api.impl.PetApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceFactory {
     private final static PetApiService service = new PetApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
index 0a145377adee..8ffaff0ba970 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.StoreApiService;
 import org.openapitools.api.impl.StoreApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceFactory {
     private final static StoreApiService service = new StoreApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
index 6376e5732cf8..eebfb22f280e 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.UserApiService;
 import org.openapitools.api.impl.UserApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceFactory {
     private final static UserApiService service = new UserApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index bb6e507d2148..e14a221d6130 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceImpl extends AnotherFakeApiService {
     @Override
     public Response call123testSpecialTags(Client body, SecurityContext securityContext)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 69b3c0f3b0b3..64ce9b34b3a5 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -26,7 +26,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceImpl extends FakeApiService {
     @Override
     public Response createXmlItem(XmlItem xmlItem, SecurityContext securityContext)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
index 1595565688e6..9cc4c3830541 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTags123ApiServiceImpl extends FakeClassnameTags123ApiService {
     @Override
     public Response testClassname(Client body, SecurityContext securityContext)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index 609b3420af21..aa93e350cf01 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -21,7 +21,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceImpl extends PetApiService {
     @Override
     public Response addPet(Pet body, SecurityContext securityContext)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 79e17d33fb79..8ec3bc61171e 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -19,7 +19,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceImpl extends StoreApiService {
     @Override
     public Response deleteOrder(String orderId, SecurityContext securityContext)
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index c48b136424ac..f4654e2effec 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -19,7 +19,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceImpl extends UserApiService {
     @Override
     public Response createUser(User body, SecurityContext securityContext)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 9a6e7bc9797a..adfc22d43631 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -29,7 +29,7 @@
 
 
 @io.swagger.annotations.Api(description = "the another-fake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApi  {
    private final AnotherFakeApiService delegate = AnotherFakeApiServiceFactory.getAnotherFakeApi();
 
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index 85a462b46c82..a870fe32fa35 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class AnotherFakeApiService {
       public abstract Response call123testSpecialTags(Client body,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/ApiException.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/ApiException.java
index fdbaeee3a29e..cb188abf49e8 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/ApiException.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/ApiException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiException extends Exception{
     private int code;
     public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/ApiOriginFilter.java
index 7039b5e4d92a..2b84aa455556 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/ApiOriginFilter.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiOriginFilter implements javax.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/ApiResponseMessage.java
index 9211b2dd7e51..a4a4ecf08c5d 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/ApiResponseMessage.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java
index b55cea62bf07..188218d7f8ce 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java
@@ -38,7 +38,7 @@
 
 
 @io.swagger.annotations.Api(description = "the fake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApi  {
    private final FakeApiService delegate = FakeApiServiceFactory.getFakeApi();
 
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java
index 502afbcfccce..a6ac294ff429 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -27,7 +27,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class FakeApiService {
       public abstract Response createXmlItem(XmlItem xmlItem,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
index b25d5cf9c875..afa6ce5872cf 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -29,7 +29,7 @@
 
 
 @io.swagger.annotations.Api(description = "the fake_classname_test API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApi  {
    private final FakeClassnameTestApiService delegate = FakeClassnameTestApiServiceFactory.getFakeClassnameTestApi();
 
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
index f88db59559a8..22cfad90a84d 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class FakeClassnameTestApiService {
       public abstract Response testClassname(Client body,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/NotFoundException.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/NotFoundException.java
index 526df6c1c197..c369e6aa4315 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/NotFoundException.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java
index 883566833475..0b5a6256e57c 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java
@@ -32,7 +32,7 @@
 
 
 @io.swagger.annotations.Api(description = "the pet API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApi  {
    private final PetApiService delegate = PetApiServiceFactory.getPetApi();
 
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java
index bddeca287df3..c1e3d168cce9 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java
@@ -21,7 +21,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class PetApiService {
       public abstract Response addPet(Pet body,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java
index f6f657854fd3..8b264671b46e 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the store API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApi  {
    private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi();
 
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java
index 5df2ddbbe30d..ff8059b1df2f 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -19,7 +19,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class StoreApiService {
       public abstract Response deleteOrder(String orderId,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StringUtil.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StringUtil.java
index 367283558974..7dc8e3d4ebf5 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StringUtil.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StringUtil.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApi.java
index f4559c277906..7242bab60f44 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the user API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApi  {
    private final UserApiService delegate = UserApiServiceFactory.getUserApi();
 
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApiService.java
index 74e6c8015266..d8b932aaf911 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApiService.java
@@ -19,7 +19,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class UserApiService {
       public abstract Response createUser(User body,SecurityContext securityContext)
       throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index d6a652a1114f..633abdebcbab 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
index 64a756fcb61d..8143ea963f7a 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 333a1d0e3508..dd4e07ac1722 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index 239ebd876168..5b621b6334c3 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -42,7 +42,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   @JsonProperty(JSON_PROPERTY_MAP_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 9b850704be77..bd29538de8e2 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 5ed8962462e6..c47f39165234 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
index bff07e2b6ac7..50e9226bae49 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
index f957a853e20c..55879e92e311 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Animal.java
index f06a0e2b1352..0cc86f7b62bb 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Animal.java
@@ -31,7 +31,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index b61d1fabdc40..d62c0caf5221 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index c2955daa575f..ee84cfbe9aa9 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayOfNumberOnly   {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java
index a8ef31cdb79c..fe5dd36d55b6 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -33,7 +33,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayTest   {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/BigCat.java
index 8316a86f8847..f7d5480ab443 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/BigCat.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/BigCatAllOf.java
index e5088ac43df5..872c488590d6 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/BigCatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Capitalization.java
index 4db559dc7b31..a807df6b5692 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Capitalization.java
@@ -33,7 +33,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Capitalization   {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Cat.java
index bb3bad972102..3695d5ad727e 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Cat.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Cat extends Animal  {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/CatAllOf.java
index d8bf140b58c5..8dcbc7384156 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class CatAllOf   {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Category.java
index 1a39a7ccaf6b..c3e077e565a3 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Category.java
@@ -29,7 +29,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Category   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ClassModel.java
index 98ba52298ad3..b2303de259c0 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ClassModel.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ClassModel   {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Client.java
index cd1b6b08a63d..8bd24a5ae0c0 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Client.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Client   {
   public static final String JSON_PROPERTY_CLIENT = "client";
   @JsonProperty(JSON_PROPERTY_CLIENT)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Dog.java
index 6d0a7a90f828..2aa32d3cb9a2 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Dog.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Dog extends Animal  {
   public static final String JSON_PROPERTY_BREED = "breed";
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/DogAllOf.java
index 2551f2285c4c..ee6459c1dbdf 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class DogAllOf   {
   public static final String JSON_PROPERTY_BREED = "breed";
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumArrays.java
index 5e6c640c3ebe..5cd5ec99f41b 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -32,7 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java
index ab576f99ef97..fde7f90b40be 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java
@@ -34,7 +34,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index 4e3ec6a2cf81..0cd31260a960 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -31,7 +31,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FileSchemaTestClass   {
   public static final String JSON_PROPERTY_FILE = "file";
   @JsonProperty(JSON_PROPERTY_FILE)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FormatTest.java
index cdccca96bdd1..5f216ec89a97 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FormatTest.java
@@ -45,7 +45,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FormatTest   {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   @JsonProperty(JSON_PROPERTY_INTEGER)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index 30d9c4fccf93..2f58f76873c7 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -29,7 +29,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class HasOnlyReadOnly   {
   public static final String JSON_PROPERTY_BAR = "bar";
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MapTest.java
index 497f98c1fb5f..f9d4db9b2f04 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MapTest.java
@@ -35,7 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class MapTest   {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e8ff1a269768..fa1e51a3889f 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -36,7 +36,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Model200Response.java
index 00901b890aea..c1cc9a6a7bbb 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Model200Response.java
@@ -30,7 +30,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Model200Response   {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 8355a7526b68..b677a747afc5 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -30,7 +30,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ModelApiResponse   {
   public static final String JSON_PROPERTY_CODE = "code";
   @JsonProperty(JSON_PROPERTY_CODE)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ModelReturn.java
index a979d5e6fce5..bf06abca486b 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ModelReturn   {
   public static final String JSON_PROPERTY_RETURN = "return";
   @JsonProperty(JSON_PROPERTY_RETURN)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Name.java
index 5d4da98047b2..31c348b35af8 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Name.java
@@ -32,7 +32,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Name   {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/NumberOnly.java
index 633e2e339ed9..f98544933e15 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class NumberOnly   {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Order.java
index 10fa5da35a9f..0db56b8b6ab1 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Order.java
@@ -35,7 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Order   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/OuterComposite.java
index 448638abd374..33d948c2d982 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -31,7 +31,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class OuterComposite   {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java
index 3ba558b701b2..25f7e581f8f2 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java
@@ -40,7 +40,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Pet   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index 447b43cb5010..493c758bdb6e 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -29,7 +29,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ReadOnlyFirst   {
   public static final String JSON_PROPERTY_BAR = "bar";
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/SpecialModelName.java
index 4ad8f3205a0a..91fe8aaa13bc 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class SpecialModelName   {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Tag.java
index 35305769a2d2..9a44ab76fc9e 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Tag.java
@@ -29,7 +29,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Tag   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderDefault.java
index 583a592963a8..f08943a2244b 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderDefault.java
@@ -35,7 +35,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class TypeHolderDefault   {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderExample.java
index 2f29a40a22b7..f7d8cf71e7c8 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -36,7 +36,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class TypeHolderExample   {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/User.java
index 23b9f6e3cee4..ab66f62dfbac 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/User.java
@@ -35,7 +35,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class User   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java
index fa69d67a9e68..025a4fda2de6 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java
@@ -59,7 +59,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class XmlItem   {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
index 21281d8d8a43..ae72e4771a3d 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.AnotherFakeApiService;
 import org.openapitools.api.impl.AnotherFakeApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceFactory {
     private final static AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
index 6b5746c6e8a6..97bf41219fd5 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.FakeApiService;
 import org.openapitools.api.impl.FakeApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceFactory {
     private final static FakeApiService service = new FakeApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
index 3c866f7e478d..4963e03dd259 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.FakeClassnameTestApiService;
 import org.openapitools.api.impl.FakeClassnameTestApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApiServiceFactory {
     private final static FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
index c292d9111ee8..932873718a3b 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.PetApiService;
 import org.openapitools.api.impl.PetApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceFactory {
     private final static PetApiService service = new PetApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
index 0a145377adee..8ffaff0ba970 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.StoreApiService;
 import org.openapitools.api.impl.StoreApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceFactory {
     private final static StoreApiService service = new StoreApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
index 6376e5732cf8..eebfb22f280e 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.UserApiService;
 import org.openapitools.api.impl.UserApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceFactory {
     private final static UserApiService service = new UserApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index bb6e507d2148..e14a221d6130 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceImpl extends AnotherFakeApiService {
     @Override
     public Response call123testSpecialTags(Client body, SecurityContext securityContext)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 7215c33e6247..39ad737f4e8a 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -27,7 +27,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceImpl extends FakeApiService {
     @Override
     public Response createXmlItem(XmlItem xmlItem, SecurityContext securityContext)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
index 97e16eac7ac9..db04360f2004 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApiServiceImpl extends FakeClassnameTestApiService {
     @Override
     public Response testClassname(Client body, SecurityContext securityContext)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index f2dc84317542..8c6ed665c94b 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -21,7 +21,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceImpl extends PetApiService {
     @Override
     public Response addPet(Pet body, SecurityContext securityContext)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 79e17d33fb79..8ec3bc61171e 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -19,7 +19,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceImpl extends StoreApiService {
     @Override
     public Response deleteOrder(String orderId, SecurityContext securityContext)
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index c48b136424ac..f4654e2effec 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -19,7 +19,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceImpl extends UserApiService {
     @Override
     public Response createUser(User body, SecurityContext securityContext)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 9e514280fa61..ca7effd8e687 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the AnotherFake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApi  {
    private final AnotherFakeApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index 1731e691c492..1096acf12f01 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class AnotherFakeApiService {
     public abstract Response call123testSpecialTags(Client body,SecurityContext securityContext) throws NotFoundException;
 }
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/ApiException.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/ApiException.java
index fdbaeee3a29e..cb188abf49e8 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/ApiException.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/ApiException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiException extends Exception{
     private int code;
     public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/ApiOriginFilter.java
index 7039b5e4d92a..2b84aa455556 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/ApiOriginFilter.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiOriginFilter implements javax.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/ApiResponseMessage.java
index 9211b2dd7e51..a4a4ecf08c5d 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/ApiResponseMessage.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java
index a290f8b59966..1c33d651b21e 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java
@@ -38,7 +38,7 @@
 
 
 @io.swagger.annotations.Api(description = "the Fake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApi  {
    private final FakeApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
index 561cd7ba2a5a..04525b1f5df3 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -23,7 +23,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class FakeApiService {
     public abstract Response createXmlItem(XmlItem xmlItem,SecurityContext securityContext) throws NotFoundException;
     public abstract Response fakeOuterBooleanSerialize(Boolean body,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java
index 19b1e709aff6..43f11a687277 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the FakeClassnameTags123 API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTags123Api  {
    private final FakeClassnameTags123ApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java
index c5a227f106ef..145d6a558883 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class FakeClassnameTags123ApiService {
     public abstract Response testClassname(Client body,SecurityContext securityContext) throws NotFoundException;
 }
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/NotFoundException.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/NotFoundException.java
index 526df6c1c197..c369e6aa4315 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/NotFoundException.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java
index 82f486dab969..a046d7cfa9e4 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java
@@ -33,7 +33,7 @@
 
 
 @io.swagger.annotations.Api(description = "the Pet API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApi  {
    private final PetApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java
index 76db01fa359f..c1479cf71905 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class PetApiService {
     public abstract Response addPet(Pet body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java
index 1ee425dd10a1..99c5047915d0 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java
@@ -31,7 +31,7 @@
 
 
 @io.swagger.annotations.Api(description = "the Store API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApi  {
    private final StoreApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java
index 06b1f031d1de..885579d9f0f2 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class StoreApiService {
     public abstract Response deleteOrder(String orderId,SecurityContext securityContext) throws NotFoundException;
     public abstract Response getInventory(SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StringUtil.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StringUtil.java
index 367283558974..7dc8e3d4ebf5 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StringUtil.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StringUtil.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java
index fe10e07e502b..e1a98f9cd060 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java
@@ -31,7 +31,7 @@
 
 
 @io.swagger.annotations.Api(description = "the User API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApi  {
    private final UserApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApiService.java
index 9b4fe40612c2..97ec792f0f72 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApiService.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class UserApiService {
     public abstract Response createUser(User body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index d6a652a1114f..633abdebcbab 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
index 64a756fcb61d..8143ea963f7a 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 333a1d0e3508..dd4e07ac1722 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index 239ebd876168..5b621b6334c3 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -42,7 +42,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   @JsonProperty(JSON_PROPERTY_MAP_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 9b850704be77..bd29538de8e2 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 5ed8962462e6..c47f39165234 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
index bff07e2b6ac7..50e9226bae49 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
index f957a853e20c..55879e92e311 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Animal.java
index f06a0e2b1352..0cc86f7b62bb 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Animal.java
@@ -31,7 +31,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index b61d1fabdc40..d62c0caf5221 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index c2955daa575f..ee84cfbe9aa9 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayOfNumberOnly   {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java
index a8ef31cdb79c..fe5dd36d55b6 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -33,7 +33,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayTest   {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/BigCat.java
index 8316a86f8847..f7d5480ab443 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/BigCat.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/BigCatAllOf.java
index e5088ac43df5..872c488590d6 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/BigCatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Capitalization.java
index 4db559dc7b31..a807df6b5692 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Capitalization.java
@@ -33,7 +33,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Capitalization   {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Cat.java
index bb3bad972102..3695d5ad727e 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Cat.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Cat extends Animal  {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/CatAllOf.java
index d8bf140b58c5..8dcbc7384156 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class CatAllOf   {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Category.java
index 1a39a7ccaf6b..c3e077e565a3 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Category.java
@@ -29,7 +29,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Category   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ClassModel.java
index 98ba52298ad3..b2303de259c0 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ClassModel.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ClassModel   {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Client.java
index cd1b6b08a63d..8bd24a5ae0c0 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Client.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Client   {
   public static final String JSON_PROPERTY_CLIENT = "client";
   @JsonProperty(JSON_PROPERTY_CLIENT)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Dog.java
index 6d0a7a90f828..2aa32d3cb9a2 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Dog.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Dog extends Animal  {
   public static final String JSON_PROPERTY_BREED = "breed";
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/DogAllOf.java
index 2551f2285c4c..ee6459c1dbdf 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class DogAllOf   {
   public static final String JSON_PROPERTY_BREED = "breed";
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java
index 5e6c640c3ebe..5cd5ec99f41b 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -32,7 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java
index ab576f99ef97..fde7f90b40be 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java
@@ -34,7 +34,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index 4e3ec6a2cf81..0cd31260a960 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -31,7 +31,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FileSchemaTestClass   {
   public static final String JSON_PROPERTY_FILE = "file";
   @JsonProperty(JSON_PROPERTY_FILE)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java
index cdccca96bdd1..5f216ec89a97 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java
@@ -45,7 +45,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FormatTest   {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   @JsonProperty(JSON_PROPERTY_INTEGER)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index 30d9c4fccf93..2f58f76873c7 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -29,7 +29,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class HasOnlyReadOnly   {
   public static final String JSON_PROPERTY_BAR = "bar";
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java
index 497f98c1fb5f..f9d4db9b2f04 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java
@@ -35,7 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class MapTest   {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e8ff1a269768..fa1e51a3889f 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -36,7 +36,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Model200Response.java
index 00901b890aea..c1cc9a6a7bbb 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Model200Response.java
@@ -30,7 +30,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Model200Response   {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 8355a7526b68..b677a747afc5 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -30,7 +30,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ModelApiResponse   {
   public static final String JSON_PROPERTY_CODE = "code";
   @JsonProperty(JSON_PROPERTY_CODE)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ModelReturn.java
index a979d5e6fce5..bf06abca486b 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ModelReturn   {
   public static final String JSON_PROPERTY_RETURN = "return";
   @JsonProperty(JSON_PROPERTY_RETURN)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Name.java
index 5d4da98047b2..31c348b35af8 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Name.java
@@ -32,7 +32,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Name   {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/NumberOnly.java
index 633e2e339ed9..f98544933e15 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class NumberOnly   {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Order.java
index 10fa5da35a9f..0db56b8b6ab1 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Order.java
@@ -35,7 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Order   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterComposite.java
index 448638abd374..33d948c2d982 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -31,7 +31,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class OuterComposite   {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java
index 3ba558b701b2..25f7e581f8f2 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java
@@ -40,7 +40,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Pet   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index 447b43cb5010..493c758bdb6e 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -29,7 +29,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ReadOnlyFirst   {
   public static final String JSON_PROPERTY_BAR = "bar";
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/SpecialModelName.java
index 4ad8f3205a0a..91fe8aaa13bc 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class SpecialModelName   {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Tag.java
index 35305769a2d2..9a44ab76fc9e 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Tag.java
@@ -29,7 +29,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Tag   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java
index 583a592963a8..f08943a2244b 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java
@@ -35,7 +35,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class TypeHolderDefault   {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java
index 2f29a40a22b7..f7d8cf71e7c8 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -36,7 +36,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class TypeHolderExample   {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/User.java
index 23b9f6e3cee4..ab66f62dfbac 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/User.java
@@ -35,7 +35,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class User   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java
index fa69d67a9e68..025a4fda2de6 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java
@@ -59,7 +59,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class XmlItem   {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
index 21281d8d8a43..ae72e4771a3d 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.AnotherFakeApiService;
 import org.openapitools.api.impl.AnotherFakeApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceFactory {
     private final static AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
index 6b5746c6e8a6..97bf41219fd5 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.FakeApiService;
 import org.openapitools.api.impl.FakeApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceFactory {
     private final static FakeApiService service = new FakeApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java
index f4e83e69ba10..ca6da8cb5386 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/FakeClassnameTags123ApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.FakeClassnameTags123ApiService;
 import org.openapitools.api.impl.FakeClassnameTags123ApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTags123ApiServiceFactory {
     private final static FakeClassnameTags123ApiService service = new FakeClassnameTags123ApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
index c292d9111ee8..932873718a3b 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.PetApiService;
 import org.openapitools.api.impl.PetApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceFactory {
     private final static PetApiService service = new PetApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
index 0a145377adee..8ffaff0ba970 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.StoreApiService;
 import org.openapitools.api.impl.StoreApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceFactory {
     private final static StoreApiService service = new StoreApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
index 6376e5732cf8..eebfb22f280e 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.UserApiService;
 import org.openapitools.api.impl.UserApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceFactory {
     private final static UserApiService service = new UserApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index a8dc69d4ed95..661940c66dd5 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceImpl extends AnotherFakeApiService {
     @Override
     public Response call123testSpecialTags(Client body, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 8dbd3ce48f75..a0aab5f5ddfb 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -23,7 +23,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceImpl extends FakeApiService {
     @Override
     public Response createXmlItem(XmlItem xmlItem, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
index f4171037e144..e1a09f86ecb6 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTags123ApiServiceImpl extends FakeClassnameTags123ApiService {
     @Override
     public Response testClassname(Client body, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index 0e22a5673173..0d819b4333a0 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceImpl extends PetApiService {
     @Override
     public Response addPet(Pet body, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index e0746cb4f937..1e67037417eb 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceImpl extends StoreApiService {
     @Override
     public Response deleteOrder(String orderId, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index 3149b83c007a..03a2c24f326b 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceImpl extends UserApiService {
     @Override
     public Response createUser(User body, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 92a1a7f0ba3c..3dc411b2da74 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the another-fake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApi  {
    private final AnotherFakeApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index 1731e691c492..1096acf12f01 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class AnotherFakeApiService {
     public abstract Response call123testSpecialTags(Client body,SecurityContext securityContext) throws NotFoundException;
 }
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/ApiException.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/ApiException.java
index fdbaeee3a29e..cb188abf49e8 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/ApiException.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/ApiException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiException extends Exception{
     private int code;
     public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/ApiOriginFilter.java
index 7039b5e4d92a..2b84aa455556 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/ApiOriginFilter.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiOriginFilter implements javax.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/ApiResponseMessage.java
index 9211b2dd7e51..a4a4ecf08c5d 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/ApiResponseMessage.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java
index e2b50df52b77..dbac80bce28b 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java
@@ -39,7 +39,7 @@
 
 
 @io.swagger.annotations.Api(description = "the fake API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApi  {
    private final FakeApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java
index 4b9b5aa80e25..ef99e405ede4 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -24,7 +24,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class FakeApiService {
     public abstract Response createXmlItem(XmlItem xmlItem,SecurityContext securityContext) throws NotFoundException;
     public abstract Response fakeOuterBooleanSerialize(Boolean body,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
index 7fad74fd76cd..66be9a4e9633 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -30,7 +30,7 @@
 
 
 @io.swagger.annotations.Api(description = "the fake_classname_test API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApi  {
    private final FakeClassnameTestApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
index cb998c5ff9de..f81b0a146ee0 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class FakeClassnameTestApiService {
     public abstract Response testClassname(Client body,SecurityContext securityContext) throws NotFoundException;
 }
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/NotFoundException.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/NotFoundException.java
index 526df6c1c197..c369e6aa4315 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/NotFoundException.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java
index 34acf0291b34..f426e3d49b9b 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java
@@ -33,7 +33,7 @@
 
 
 @io.swagger.annotations.Api(description = "the pet API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApi  {
    private final PetApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java
index 23f190664163..1f44eee7c800 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class PetApiService {
     public abstract Response addPet(Pet body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java
index 84ad5abd70df..eb37ae7f4e61 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java
@@ -31,7 +31,7 @@
 
 
 @io.swagger.annotations.Api(description = "the store API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApi  {
    private final StoreApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java
index 06b1f031d1de..885579d9f0f2 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class StoreApiService {
     public abstract Response deleteOrder(String orderId,SecurityContext securityContext) throws NotFoundException;
     public abstract Response getInventory(SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StringUtil.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StringUtil.java
index 367283558974..7dc8e3d4ebf5 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StringUtil.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StringUtil.java
@@ -1,6 +1,6 @@
 package org.openapitools.api;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java
index 47f5f22b6cf1..748e6cf83b5d 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java
@@ -31,7 +31,7 @@
 
 
 @io.swagger.annotations.Api(description = "the user API")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApi  {
    private final UserApiService delegate;
 
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApiService.java
index 9b4fe40612c2..97ec792f0f72 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApiService.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public abstract class UserApiService {
     public abstract Response createUser(User body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index d6a652a1114f..633abdebcbab 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
index 64a756fcb61d..8143ea963f7a 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 333a1d0e3508..dd4e07ac1722 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index 239ebd876168..5b621b6334c3 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -42,7 +42,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   @JsonProperty(JSON_PROPERTY_MAP_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 9b850704be77..bd29538de8e2 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 5ed8962462e6..c47f39165234 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
index bff07e2b6ac7..50e9226bae49 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
index f957a853e20c..55879e92e311 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Animal.java
index f06a0e2b1352..0cc86f7b62bb 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Animal.java
@@ -31,7 +31,7 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index b61d1fabdc40..d62c0caf5221 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index c2955daa575f..ee84cfbe9aa9 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayOfNumberOnly   {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java
index a8ef31cdb79c..fe5dd36d55b6 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -33,7 +33,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ArrayTest   {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/BigCat.java
index 8316a86f8847..f7d5480ab443 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/BigCat.java
@@ -31,7 +31,7 @@
 @JsonPropertyOrder({
   BigCat.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/BigCatAllOf.java
index e5088ac43df5..872c488590d6 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/BigCatAllOf.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   BigCatAllOf.JSON_PROPERTY_KIND
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Capitalization.java
index 4db559dc7b31..a807df6b5692 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Capitalization.java
@@ -33,7 +33,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Capitalization   {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Cat.java
index bb3bad972102..3695d5ad727e 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Cat.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Cat extends Animal  {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/CatAllOf.java
index d8bf140b58c5..8dcbc7384156 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class CatAllOf   {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Category.java
index 1a39a7ccaf6b..c3e077e565a3 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Category.java
@@ -29,7 +29,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Category   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ClassModel.java
index 98ba52298ad3..b2303de259c0 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ClassModel.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ClassModel   {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Client.java
index cd1b6b08a63d..8bd24a5ae0c0 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Client.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Client   {
   public static final String JSON_PROPERTY_CLIENT = "client";
   @JsonProperty(JSON_PROPERTY_CLIENT)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Dog.java
index 6d0a7a90f828..2aa32d3cb9a2 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Dog.java
@@ -30,7 +30,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Dog extends Animal  {
   public static final String JSON_PROPERTY_BREED = "breed";
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/DogAllOf.java
index 2551f2285c4c..ee6459c1dbdf 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class DogAllOf   {
   public static final String JSON_PROPERTY_BREED = "breed";
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java
index 5e6c640c3ebe..5cd5ec99f41b 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -32,7 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java
index ab576f99ef97..fde7f90b40be 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java
@@ -34,7 +34,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index 4e3ec6a2cf81..0cd31260a960 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -31,7 +31,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FileSchemaTestClass   {
   public static final String JSON_PROPERTY_FILE = "file";
   @JsonProperty(JSON_PROPERTY_FILE)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java
index cdccca96bdd1..5f216ec89a97 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java
@@ -45,7 +45,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FormatTest   {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   @JsonProperty(JSON_PROPERTY_INTEGER)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index 30d9c4fccf93..2f58f76873c7 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -29,7 +29,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class HasOnlyReadOnly   {
   public static final String JSON_PROPERTY_BAR = "bar";
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java
index 497f98c1fb5f..f9d4db9b2f04 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java
@@ -35,7 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class MapTest   {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e8ff1a269768..fa1e51a3889f 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -36,7 +36,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Model200Response.java
index 00901b890aea..c1cc9a6a7bbb 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Model200Response.java
@@ -30,7 +30,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Model200Response   {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 8355a7526b68..b677a747afc5 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -30,7 +30,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ModelApiResponse   {
   public static final String JSON_PROPERTY_CODE = "code";
   @JsonProperty(JSON_PROPERTY_CODE)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ModelReturn.java
index a979d5e6fce5..bf06abca486b 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ModelReturn   {
   public static final String JSON_PROPERTY_RETURN = "return";
   @JsonProperty(JSON_PROPERTY_RETURN)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Name.java
index 5d4da98047b2..31c348b35af8 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Name.java
@@ -32,7 +32,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Name   {
   public static final String JSON_PROPERTY_NAME = "name";
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/NumberOnly.java
index 633e2e339ed9..f98544933e15 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -29,7 +29,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class NumberOnly   {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Order.java
index 10fa5da35a9f..0db56b8b6ab1 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Order.java
@@ -35,7 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Order   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterComposite.java
index 448638abd374..33d948c2d982 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -31,7 +31,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class OuterComposite   {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java
index 3ba558b701b2..25f7e581f8f2 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java
@@ -40,7 +40,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Pet   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index 447b43cb5010..493c758bdb6e 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -29,7 +29,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class ReadOnlyFirst   {
   public static final String JSON_PROPERTY_BAR = "bar";
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/SpecialModelName.java
index 4ad8f3205a0a..91fe8aaa13bc 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -28,7 +28,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class SpecialModelName   {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Tag.java
index 35305769a2d2..9a44ab76fc9e 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Tag.java
@@ -29,7 +29,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class Tag   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderDefault.java
index 583a592963a8..f08943a2244b 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderDefault.java
@@ -35,7 +35,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class TypeHolderDefault   {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderExample.java
index 2f29a40a22b7..f7d8cf71e7c8 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -36,7 +36,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class TypeHolderExample   {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/User.java
index 23b9f6e3cee4..ab66f62dfbac 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/User.java
@@ -35,7 +35,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class User   {
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java
index fa69d67a9e68..025a4fda2de6 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java
@@ -59,7 +59,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class XmlItem   {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
index 21281d8d8a43..ae72e4771a3d 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/AnotherFakeApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.AnotherFakeApiService;
 import org.openapitools.api.impl.AnotherFakeApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceFactory {
     private final static AnotherFakeApiService service = new AnotherFakeApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
index 6b5746c6e8a6..97bf41219fd5 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.FakeApiService;
 import org.openapitools.api.impl.FakeApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceFactory {
     private final static FakeApiService service = new FakeApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
index 3c866f7e478d..4963e03dd259 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/FakeClassnameTestApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.FakeClassnameTestApiService;
 import org.openapitools.api.impl.FakeClassnameTestApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApiServiceFactory {
     private final static FakeClassnameTestApiService service = new FakeClassnameTestApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
index c292d9111ee8..932873718a3b 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/PetApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.PetApiService;
 import org.openapitools.api.impl.PetApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceFactory {
     private final static PetApiService service = new PetApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
index 0a145377adee..8ffaff0ba970 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/StoreApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.StoreApiService;
 import org.openapitools.api.impl.StoreApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceFactory {
     private final static StoreApiService service = new StoreApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
index 6376e5732cf8..eebfb22f280e 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/factories/UserApiServiceFactory.java
@@ -3,7 +3,7 @@
 import org.openapitools.api.UserApiService;
 import org.openapitools.api.impl.UserApiServiceImpl;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceFactory {
     private final static UserApiService service = new UserApiServiceImpl();
 
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index a8dc69d4ed95..661940c66dd5 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class AnotherFakeApiServiceImpl extends AnotherFakeApiService {
     @Override
     public Response call123testSpecialTags(Client body, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 99af04a85b5b..e7e51e70e841 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -24,7 +24,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeApiServiceImpl extends FakeApiService {
     @Override
     public Response createXmlItem(XmlItem xmlItem, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
index 6cc403a8b402..2204800cb839 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
@@ -15,7 +15,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class FakeClassnameTestApiServiceImpl extends FakeClassnameTestApiService {
     @Override
     public Response testClassname(Client body, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index 168693768dd5..8e3cf747147a 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class PetApiServiceImpl extends PetApiService {
     @Override
     public Response addPet(Pet body, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index e0746cb4f937..1e67037417eb 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class StoreApiServiceImpl extends StoreApiService {
     @Override
     public Response deleteOrder(String orderId, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index 3149b83c007a..03a2c24f326b 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -16,7 +16,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
 public class UserApiServiceImpl extends UserApiService {
     @Override
     public Response createUser(User body, SecurityContext securityContext) throws NotFoundException {
diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/FILES
new file mode 100644
index 000000000000..612ea14bbdb4
--- /dev/null
+++ b/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/FILES
@@ -0,0 +1,23 @@
+README.md
+build.gradle.kts
+pom.xml
+settings.gradle
+src/main/kotlin/org/openapitools/Application.kt
+src/main/kotlin/org/openapitools/api/ApiUtil.kt
+src/main/kotlin/org/openapitools/api/Exceptions.kt
+src/main/kotlin/org/openapitools/api/PetApi.kt
+src/main/kotlin/org/openapitools/api/PetApiService.kt
+src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt
+src/main/kotlin/org/openapitools/api/StoreApi.kt
+src/main/kotlin/org/openapitools/api/StoreApiService.kt
+src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt
+src/main/kotlin/org/openapitools/api/UserApi.kt
+src/main/kotlin/org/openapitools/api/UserApiService.kt
+src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt
+src/main/kotlin/org/openapitools/model/Category.kt
+src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
+src/main/kotlin/org/openapitools/model/Order.kt
+src/main/kotlin/org/openapitools/model/Pet.kt
+src/main/kotlin/org/openapitools/model/Tag.kt
+src/main/kotlin/org/openapitools/model/User.kt
+src/main/resources/application.yaml
diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/VERSION
index 9e9d3e448fb4..d99e7162d01f 100644
--- a/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/VERSION
+++ b/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml b/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml
index 38491e8939c5..8af5e943b3a1 100644
--- a/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml
+++ b/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml
@@ -8,6 +8,7 @@
     <properties>
         <kotlin.version>1.3.30</kotlin.version>
 	    <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -113,6 +114,12 @@
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit5</artifactId>
diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApi.kt
index 612713d99ff6..b500f9155686 100644
--- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApi.kt
+++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApi.kt
@@ -39,7 +39,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@Api(value = "pet", description = "The pet API")
+@Api(value = "Pet", description = "The Pet API")
 @RequestMapping("\${api.base-path:/v2}")
 class PetApiController(@Autowired(required = true) val service: PetApiService) {
 
diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApi.kt
index 99dfad74f4fa..71017e33a506 100644
--- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApi.kt
+++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApi.kt
@@ -38,7 +38,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@Api(value = "store", description = "The store API")
+@Api(value = "Store", description = "The Store API")
 @RequestMapping("\${api.base-path:/v2}")
 class StoreApiController(@Autowired(required = true) val service: StoreApiService) {
 
diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApi.kt
index d10327cd2877..1dbc304d88e4 100644
--- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApi.kt
+++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApi.kt
@@ -38,7 +38,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@Api(value = "user", description = "The user API")
+@Api(value = "User", description = "The User API")
 @RequestMapping("\${api.base-path:/v2}")
 class UserApiController(@Autowired(required = true) val service: UserApiService) {
 
diff --git a/samples/server/petstore/kotlin-springboot-reactive/pom.xml b/samples/server/petstore/kotlin-springboot-reactive/pom.xml
index b0a954d47075..cfbc66f6dc92 100644
--- a/samples/server/petstore/kotlin-springboot-reactive/pom.xml
+++ b/samples/server/petstore/kotlin-springboot-reactive/pom.xml
@@ -8,6 +8,7 @@
     <properties>
         <kotlin.version>1.3.30</kotlin.version>
 	    <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -123,6 +124,12 @@
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit5</artifactId>
diff --git a/samples/server/petstore/kotlin-springboot/pom.xml b/samples/server/petstore/kotlin-springboot/pom.xml
index 38491e8939c5..8af5e943b3a1 100644
--- a/samples/server/petstore/kotlin-springboot/pom.xml
+++ b/samples/server/petstore/kotlin-springboot/pom.xml
@@ -8,6 +8,7 @@
     <properties>
         <kotlin.version>1.3.30</kotlin.version>
 	    <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -113,6 +114,12 @@
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit5</artifactId>
diff --git a/samples/server/petstore/kotlin/vertx/.openapi-generator/FILES b/samples/server/petstore/kotlin/vertx/.openapi-generator/FILES
new file mode 100644
index 000000000000..cf01966a4dda
--- /dev/null
+++ b/samples/server/petstore/kotlin/vertx/.openapi-generator/FILES
@@ -0,0 +1,17 @@
+README.md
+pom.xml
+src/main/kotlin/org/openapitools/server/api/model/ApiResponse.kt
+src/main/kotlin/org/openapitools/server/api/model/Category.kt
+src/main/kotlin/org/openapitools/server/api/model/Order.kt
+src/main/kotlin/org/openapitools/server/api/model/Pet.kt
+src/main/kotlin/org/openapitools/server/api/model/Tag.kt
+src/main/kotlin/org/openapitools/server/api/model/User.kt
+src/main/kotlin/org/openapitools/server/api/verticle/PetApi.kt
+src/main/kotlin/org/openapitools/server/api/verticle/PetApiVerticle.kt
+src/main/kotlin/org/openapitools/server/api/verticle/PetApiVertxProxyHandler.kt
+src/main/kotlin/org/openapitools/server/api/verticle/StoreApi.kt
+src/main/kotlin/org/openapitools/server/api/verticle/StoreApiVerticle.kt
+src/main/kotlin/org/openapitools/server/api/verticle/StoreApiVertxProxyHandler.kt
+src/main/kotlin/org/openapitools/server/api/verticle/UserApi.kt
+src/main/kotlin/org/openapitools/server/api/verticle/UserApiVerticle.kt
+src/main/kotlin/org/openapitools/server/api/verticle/UserApiVertxProxyHandler.kt
diff --git a/samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION b/samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION
index b5d898602c2c..d99e7162d01f 100644
--- a/samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION
+++ b/samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/nodejs-express-server/.openapi-generator/VERSION b/samples/server/petstore/nodejs-express-server/.openapi-generator/VERSION
index d99e7162d01f..71d2eb1c7fcd 100644
--- a/samples/server/petstore/nodejs-express-server/.openapi-generator/VERSION
+++ b/samples/server/petstore/nodejs-express-server/.openapi-generator/VERSION
@@ -1 +1 @@
-5.0.0-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
diff --git a/samples/server/petstore/nodejs-express-server/controllers/Controller.js b/samples/server/petstore/nodejs-express-server/controllers/Controller.js
index 5248666fb7e0..c791a8915876 100644
--- a/samples/server/petstore/nodejs-express-server/controllers/Controller.js
+++ b/samples/server/petstore/nodejs-express-server/controllers/Controller.js
@@ -1,15 +1,16 @@
 const fs = require('fs');
 const path = require('path');
+const camelCase = require('camelcase');
 const config = require('../config');
 const logger = require('../logger');
 
 class Controller {
   static sendResponse(response, payload) {
     /**
-     * The default response-code is 200. We want to allow to change that. in That case,
-     * payload will be an object consisting of a code and a payload. If not customized
-     * send 200 and the payload as received in this method.
-     */
+    * The default response-code is 200. We want to allow to change that. in That case,
+    * payload will be an object consisting of a code and a payload. If not customized
+    * send 200 and the payload as received in this method.
+    */
     response.status(payload.code || 200);
     const responsePayload = payload.payload !== undefined ? payload.payload : payload;
     if (responsePayload instanceof Object) {
@@ -29,16 +30,16 @@ class Controller {
   }
 
   /**
-   * Files have been uploaded to the directory defined by config.js as upload directory
-   * Files have a temporary name, that was saved as 'filename' of the file object that is
-   * referenced in reuquest.files array.
-   * This method finds the file and changes it to the file name that was originally called
-   * when it was uploaded. To prevent files from being overwritten, a timestamp is added between
-   * the filename and its extension
-   * @param request
-   * @param fieldName
-   * @returns {string}
-   */
+  * Files have been uploaded to the directory defined by config.js as upload directory
+  * Files have a temporary name, that was saved as 'filename' of the file object that is
+  * referenced in reuquest.files array.
+  * This method finds the file and changes it to the file name that was originally called
+  * when it was uploaded. To prevent files from being overwritten, a timestamp is added between
+  * the filename and its extension
+  * @param request
+  * @param fieldName
+  * @returns {string}
+  */
   static collectFile(request, fieldName) {
     let uploadedFileName = '';
     if (request.files && request.files.length > 0) {
@@ -55,44 +56,25 @@ class Controller {
     return uploadedFileName;
   }
 
-  // static collectFiles(request) {
-  //   logger.info('Checking if files are expected in schema');
-  //   const requestFiles = {};
-  //   if (request.openapi.schema.requestBody !== undefined) {
-  //     const [contentType] = request.headers['content-type'].split(';');
-  //     if (contentType === 'multipart/form-data') {
-  //       const contentSchema = request.openapi.schema.requestBody.content[contentType].schema;
-  //       Object.entries(contentSchema.properties).forEach(([name, property]) => {
-  //         if (property.type === 'string' && ['binary', 'base64'].indexOf(property.format) > -1) {
-  //           const fileObject = request.files.find(file => file.fieldname === name);
-  //           const fileArray = fileObject.originalname.split('.');
-  //           const extension = fileArray.pop();
-  //           fileArray.push(`_${Date.now()}`);
-  //           const uploadedFileName = `${fileArray.join('')}.${extension}`;
-  //           fs.renameSync(path.join(config.FILE_UPLOAD_PATH, fileObject.filename),
-  //             path.join(config.FILE_UPLOAD_PATH, uploadedFileName));
-  //           requestFiles[name] = uploadedFileName;
-  //         }
-  //       });
-  //     } else if (request.openapi.schema.requestBody.content[contentType] !== undefined
-  //         && request.files !== undefined) {
-  //       [request.body] = request.files;
-  //     }
-  //   }
-  //   return requestFiles;
-  // }
+  static getRequestBodyName(request) {
+    const codeGenDefinedBodyName = request.openapi.schema['x-codegen-request-body-name'];
+    if (codeGenDefinedBodyName !== undefined) {
+      return codeGenDefinedBodyName;
+    }
+    const refObjectPath = request.openapi.schema.requestBody.content['application/json'].schema.$ref;
+    if (refObjectPath !== undefined && refObjectPath.length > 0) {
+      return (refObjectPath.substr(refObjectPath.lastIndexOf('/') + 1));
+    }
+    return 'body';
+  }
 
   static collectRequestParams(request) {
     const requestParams = {};
     if (request.openapi.schema.requestBody !== undefined) {
       const { content } = request.openapi.schema.requestBody;
       if (content['application/json'] !== undefined) {
-        const schema = request.openapi.schema.requestBody.content['application/json'];
-        if (schema.$ref) {
-          requestParams[schema.$ref.substr(schema.$ref.lastIndexOf('.'))] = request.body;
-        } else {
-          requestParams.body = request.body;
-        }
+        const requestBodyName = camelCase(this.getRequestBodyName(request));
+        requestParams[requestBodyName] = request.body;
       } else if (content['multipart/form-data'] !== undefined) {
         Object.keys(content['multipart/form-data'].schema.properties).forEach(
           (property) => {
@@ -106,14 +88,7 @@ class Controller {
         );
       }
     }
-    // if (request.openapi.schema.requestBody.content['application/json'] !== undefined) {
-    //   const schema = request.openapi.schema.requestBody.content['application/json'];
-    //   if (schema.$ref) {
-    //     requestParams[schema.$ref.substr(schema.$ref.lastIndexOf('.'))] = request.body;
-    //   } else {
-    //     requestParams.body = request.body;
-    //   }
-    // }
+
     request.openapi.schema.parameters.forEach((param) => {
       if (param.in === 'path') {
         requestParams[param.name] = request.openapi.pathParams[param.name];
diff --git a/samples/server/petstore/php-laravel/.gitignore b/samples/server/petstore/php-laravel/.gitignore
deleted file mode 100644
index 286a61191980..000000000000
--- a/samples/server/petstore/php-laravel/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-# ref: https://github.com/github/gitignore/blob/master/Laravel.gitignore
-
-vendor/
-node_modules/
-npm-debug.log
-yarn-error.log
-
-# Laravel 4 specific
-bootstrap/compiled.php
-app/storage/
-
-# Laravel 5 & Lumen specific
-public/storage
-public/hot
-storage/*.key
-.env
-Homestead.yaml
-Homestead.json
-/.vagrant
\ No newline at end of file
diff --git a/samples/server/petstore/php-laravel/.openapi-generator/FILES b/samples/server/petstore/php-laravel/.openapi-generator/FILES
index 746b125dd18f..9ef1f60c5630 100644
--- a/samples/server/petstore/php-laravel/.openapi-generator/FILES
+++ b/samples/server/petstore/php-laravel/.openapi-generator/FILES
@@ -1,36 +1,33 @@
-.gitignore
+lib/.editorconfig
 lib/.env.example
+lib/.gitattributes
+lib/.gitignore
+lib/.styleci.yml
 lib/README.md
 lib/app/Console/Kernel.php
 lib/app/Exceptions/Handler.php
 lib/app/Http/Controllers/AnotherFakeController.php
 lib/app/Http/Controllers/Controller.php
+lib/app/Http/Controllers/DefaultController.php
 lib/app/Http/Controllers/FakeClassnameTags123Controller.php
 lib/app/Http/Controllers/FakeController.php
 lib/app/Http/Controllers/PetController.php
 lib/app/Http/Controllers/StoreController.php
 lib/app/Http/Controllers/UserController.php
 lib/app/Http/Kernel.php
+lib/app/Http/Middleware/Authenticate.php
+lib/app/Http/Middleware/CheckForMaintenanceMode.php
 lib/app/Http/Middleware/EncryptCookies.php
 lib/app/Http/Middleware/RedirectIfAuthenticated.php
 lib/app/Http/Middleware/TrimStrings.php
 lib/app/Http/Middleware/TrustProxies.php
 lib/app/Http/Middleware/VerifyCsrfToken.php
-lib/app/Models/AdditionalPropertiesAnyType.php
-lib/app/Models/AdditionalPropertiesArray.php
-lib/app/Models/AdditionalPropertiesBoolean.php
 lib/app/Models/AdditionalPropertiesClass.php
-lib/app/Models/AdditionalPropertiesInteger.php
-lib/app/Models/AdditionalPropertiesNumber.php
-lib/app/Models/AdditionalPropertiesObject.php
-lib/app/Models/AdditionalPropertiesString.php
 lib/app/Models/Animal.php
 lib/app/Models/ApiResponse.php
 lib/app/Models/ArrayOfArrayOfNumberOnly.php
 lib/app/Models/ArrayOfNumberOnly.php
 lib/app/Models/ArrayTest.php
-lib/app/Models/BigCat.php
-lib/app/Models/BigCatAllOf.php
 lib/app/Models/Capitalization.php
 lib/app/Models/Cat.php
 lib/app/Models/CatAllOf.php
@@ -43,39 +40,50 @@ lib/app/Models/EnumArrays.php
 lib/app/Models/EnumClass.php
 lib/app/Models/EnumTest.php
 lib/app/Models/FileSchemaTestClass.php
+lib/app/Models/Foo.php
 lib/app/Models/FormatTest.php
 lib/app/Models/HasOnlyReadOnly.php
+lib/app/Models/HealthCheckResult.php
+lib/app/Models/InlineObject.php
+lib/app/Models/InlineObject1.php
+lib/app/Models/InlineObject2.php
+lib/app/Models/InlineObject3.php
+lib/app/Models/InlineObject4.php
+lib/app/Models/InlineObject5.php
+lib/app/Models/InlineResponseDefault.php
 lib/app/Models/MapTest.php
 lib/app/Models/MixedPropertiesAndAdditionalPropertiesClass.php
 lib/app/Models/Model200Response.php
 lib/app/Models/ModelReturn.php
 lib/app/Models/Name.php
+lib/app/Models/NullableClass.php
 lib/app/Models/NumberOnly.php
 lib/app/Models/Order.php
 lib/app/Models/OuterComposite.php
 lib/app/Models/OuterEnum.php
+lib/app/Models/OuterEnumDefaultValue.php
+lib/app/Models/OuterEnumInteger.php
+lib/app/Models/OuterEnumIntegerDefaultValue.php
 lib/app/Models/Pet.php
 lib/app/Models/ReadOnlyFirst.php
 lib/app/Models/SpecialModelName.php
 lib/app/Models/Tag.php
-lib/app/Models/TypeHolderDefault.php
-lib/app/Models/TypeHolderExample.php
 lib/app/Models/User.php
-lib/app/Models/XmlItem.php
 lib/app/Providers/AppServiceProvider.php
 lib/app/Providers/AuthServiceProvider.php
 lib/app/Providers/BroadcastServiceProvider.php
 lib/app/Providers/EventServiceProvider.php
 lib/app/Providers/RouteServiceProvider.php
+lib/app/RouteServiceProvider.php
 lib/artisan
 lib/bootstrap/app.php
 lib/bootstrap/cache/.gitignore
-lib/bootstrap/testingAutoload.php
 lib/composer.json
 lib/config/app.php
 lib/config/auth.php
 lib/config/broadcasting.php
 lib/config/cache.php
+lib/config/cors.php
 lib/config/database.php
 lib/config/filesystems.php
 lib/config/hashing.php
@@ -88,21 +96,18 @@ lib/config/view.php
 lib/database/.gitignore
 lib/database/factories/UserFactory.php
 lib/database/migrations/2014_10_12_000000_create_users_table.php
-lib/database/migrations/2014_10_12_100000_create_password_resets_table.php
+lib/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
+lib/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
 lib/database/seeds/DatabaseSeeder.php
 lib/package.json
 lib/phpunit.xml
 lib/public/.htaccess
-lib/public/css/app.css
 lib/public/favicon.ico
 lib/public/index.php
-lib/public/js/app.js
 lib/public/robots.txt
 lib/public/web.config
 lib/resources/assets/js/app.js
 lib/resources/assets/js/bootstrap.js
-lib/resources/assets/js/components/ExampleComponent.vue
-lib/resources/assets/sass/_variables.scss
 lib/resources/assets/sass/app.scss
 lib/resources/lang/en/auth.php
 lib/resources/lang/en/pagination.php
@@ -118,6 +123,7 @@ lib/storage/app/.gitignore
 lib/storage/app/public/.gitignore
 lib/storage/framework/.gitignore
 lib/storage/framework/cache/.gitignore
+lib/storage/framework/cache/.gitignore
 lib/storage/framework/sessions/.gitignore
 lib/storage/framework/testing/.gitignore
 lib/storage/framework/views/.gitignore
diff --git a/samples/server/petstore/php-laravel/lib/.editorconfig b/samples/server/petstore/php-laravel/lib/.editorconfig
new file mode 100644
index 000000000000..6537ca4677ee
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
diff --git a/samples/server/petstore/php-laravel/lib/.env b/samples/server/petstore/php-laravel/lib/.env
deleted file mode 100644
index 7aaed2ba7b9c..000000000000
--- a/samples/server/petstore/php-laravel/lib/.env
+++ /dev/null
@@ -1,39 +0,0 @@
-APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=base64:DLKuAaa5bAytB73eQNHV4KBfRzQxh9ix8J3gc0sbfGc=
-APP_DEBUG=true
-APP_URL=http://localhost
-
-LOG_CHANNEL=stack
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-QUEUE_DRIVER=sync
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
diff --git a/samples/server/petstore/php-laravel/lib/.env.example b/samples/server/petstore/php-laravel/lib/.env.example
index ec44a1259f0a..ac748637ae52 100644
--- a/samples/server/petstore/php-laravel/lib/.env.example
+++ b/samples/server/petstore/php-laravel/lib/.env.example
@@ -9,26 +9,33 @@ LOG_CHANNEL=stack
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
+DB_DATABASE=laravel
+DB_USERNAME=root
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
-QUEUE_DRIVER=sync
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=smtp
+MAIL_MAILER=smtp
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
diff --git a/samples/server/petstore/php-laravel/lib/.gitattributes b/samples/server/petstore/php-laravel/lib/.gitattributes
new file mode 100644
index 000000000000..967315dd3d16
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/.gitattributes
@@ -0,0 +1,5 @@
+* text=auto
+*.css linguist-vendored
+*.scss linguist-vendored
+*.js linguist-vendored
+CHANGELOG.md export-ignore
diff --git a/samples/server/petstore/php-laravel/lib/.gitignore b/samples/server/petstore/php-laravel/lib/.gitignore
new file mode 100644
index 000000000000..932493f11246
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/.gitignore
@@ -0,0 +1,16 @@
+/node_modules
+/public/hot
+/public/storage
+/storage/*.key
+/vendor
+.env
+.env.backup
+.phpunit.result.cache
+Homestead.json
+Homestead.yaml
+npm-debug.log
+yarn-error.log
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+composer.lock
diff --git a/samples/server/petstore/php-laravel/lib/.styleci.yml b/samples/server/petstore/php-laravel/lib/.styleci.yml
new file mode 100644
index 000000000000..1db61d96e756
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/.styleci.yml
@@ -0,0 +1,13 @@
+php:
+  preset: laravel
+  disabled:
+    - unused_use
+  finder:
+    not-name:
+      - index.php
+      - server.php
+js:
+  finder:
+    not-name:
+      - webpack.mix.js
+css: true
diff --git a/samples/server/petstore/php-laravel/lib/README.md b/samples/server/petstore/php-laravel/lib/README.md
index 607a00a0ad2a..9e8783ef7387 100644
--- a/samples/server/petstore/php-laravel/lib/README.md
+++ b/samples/server/petstore/php-laravel/lib/README.md
@@ -1,7 +1,7 @@
 # OpenAPI generated server
 
 ## Requirements
-* PHP 7.1.3 or newer
+* PHP 7.2.5 or newer
 
 ## Overview
 This server was generated by the [openapi-generator](https://github.com/openapitools/openapi-generator) project.  By using the
diff --git a/samples/server/petstore/php-laravel/lib/app/Console/Kernel.php b/samples/server/petstore/php-laravel/lib/app/Console/Kernel.php
index a8c51585931f..69914e993783 100644
--- a/samples/server/petstore/php-laravel/lib/app/Console/Kernel.php
+++ b/samples/server/petstore/php-laravel/lib/app/Console/Kernel.php
@@ -24,8 +24,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')
-        //          ->hourly();
+        // $schedule->command('inspire')->hourly();
     }
 
     /**
diff --git a/samples/server/petstore/php-laravel/lib/app/Exceptions/Handler.php b/samples/server/petstore/php-laravel/lib/app/Exceptions/Handler.php
index 043cad6bcccc..59c585dc134c 100644
--- a/samples/server/petstore/php-laravel/lib/app/Exceptions/Handler.php
+++ b/samples/server/petstore/php-laravel/lib/app/Exceptions/Handler.php
@@ -2,8 +2,8 @@
 
 namespace App\Exceptions;
 
-use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -29,10 +29,12 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return void
+     *
+     * @throws \Exception
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -41,10 +43,12 @@ public function report(Exception $exception)
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
+     * @param  \Throwable  $exception
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Throwable
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/AnotherFakeController.php b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/AnotherFakeController.php
index 5c0f1920227c..dffb12e05210 100644
--- a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/AnotherFakeController.php
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/AnotherFakeController.php
@@ -3,7 +3,7 @@
 /**
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * PHP version 7.1.3
+ * PHP version 7.2.5
  *
  * The version of the OpenAPI document: 1.0.0
  * 
@@ -47,10 +47,10 @@ public function call123TestSpecialTags()
 
 
         //not path params validation
-        if (!isset($input['body'])) {
-            throw new \InvalidArgumentException('Missing the required parameter $body when calling call123TestSpecialTags');
+        if (!isset($input['client'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $client when calling call123TestSpecialTags');
         }
-        $body = $input['body'];
+        $client = $input['client'];
 
 
         return response('How about implementing call123TestSpecialTags as a patch method ?');
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/Controller.php b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/Controller.php
index dbaeec7be6ce..a0a2a8a34a62 100644
--- a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/Controller.php
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/Controller.php
@@ -7,20 +7,7 @@
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 
-/**
- * Class Controller
- *
- * @package App\Http\Controllers
- */
 class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
-
-    /**
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function welcome()
-    {
-        return view('welcome');
-    }
 }
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/DefaultController.php b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/DefaultController.php
new file mode 100644
index 000000000000..dd948afa97d0
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/DefaultController.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * PHP version 7.2.5
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI-Generator
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ * Source files are located at:
+ *
+ * > https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/
+ */
+
+
+namespace App\Http\Controllers;
+
+use Illuminate\Support\Facades\Request;
+
+class DefaultController extends Controller
+{
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Operation fooGet
+     *
+     * .
+     *
+     *
+     * @return Http response
+     */
+    public function fooGet()
+    {
+        $input = Request::all();
+
+        //path params validation
+
+
+        //not path params validation
+
+        return response('How about implementing fooGet as a get method ?');
+    }
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeClassnameTags123Controller.php b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeClassnameTags123Controller.php
index b7d0cda25324..9980a1755bb6 100644
--- a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeClassnameTags123Controller.php
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeClassnameTags123Controller.php
@@ -3,7 +3,7 @@
 /**
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * PHP version 7.1.3
+ * PHP version 7.2.5
  *
  * The version of the OpenAPI document: 1.0.0
  * 
@@ -47,10 +47,10 @@ public function testClassname()
 
 
         //not path params validation
-        if (!isset($input['body'])) {
-            throw new \InvalidArgumentException('Missing the required parameter $body when calling testClassname');
+        if (!isset($input['client'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $client when calling testClassname');
         }
-        $body = $input['body'];
+        $client = $input['client'];
 
 
         return response('How about implementing testClassname as a patch method ?');
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeController.php b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeController.php
index d308d6d15730..8029bd4ad98d 100644
--- a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeController.php
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeController.php
@@ -3,7 +3,7 @@
 /**
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * PHP version 7.1.3
+ * PHP version 7.2.5
  *
  * The version of the OpenAPI document: 1.0.0
  * 
@@ -47,10 +47,10 @@ public function testClientModel()
 
 
         //not path params validation
-        if (!isset($input['body'])) {
-            throw new \InvalidArgumentException('Missing the required parameter $body when calling testClientModel');
+        if (!isset($input['client'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $client when calling testClientModel');
         }
-        $body = $input['body'];
+        $client = $input['client'];
 
 
         return response('How about implementing testClientModel as a patch method ?');
@@ -58,7 +58,7 @@ public function testClientModel()
     /**
      * Operation testEndpointParameters
      *
-     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트.
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트.
      *
      *
      * @return Http response
@@ -244,10 +244,10 @@ public function testBodyWithFileSchema()
 
 
         //not path params validation
-        if (!isset($input['body'])) {
-            throw new \InvalidArgumentException('Missing the required parameter $body when calling testBodyWithFileSchema');
+        if (!isset($input['fileSchemaTestClass'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $fileSchemaTestClass when calling testBodyWithFileSchema');
         }
-        $body = $input['body'];
+        $fileSchemaTestClass = $input['fileSchemaTestClass'];
 
 
         return response('How about implementing testBodyWithFileSchema as a put method ?');
@@ -273,23 +273,23 @@ public function testBodyWithQueryParams()
         }
         $query = $input['query'];
 
-        if (!isset($input['body'])) {
-            throw new \InvalidArgumentException('Missing the required parameter $body when calling testBodyWithQueryParams');
+        if (!isset($input['user'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $user when calling testBodyWithQueryParams');
         }
-        $body = $input['body'];
+        $user = $input['user'];
 
 
         return response('How about implementing testBodyWithQueryParams as a put method ?');
     }
     /**
-     * Operation createXmlItem
+     * Operation fakeHealthGet
      *
-     * creates an XmlItem.
+     * Health check endpoint.
      *
      *
      * @return Http response
      */
-    public function createXmlItem()
+    public function fakeHealthGet()
     {
         $input = Request::all();
 
@@ -297,13 +297,36 @@ public function createXmlItem()
 
 
         //not path params validation
-        if (!isset($input['xmlItem'])) {
-            throw new \InvalidArgumentException('Missing the required parameter $xmlItem when calling createXmlItem');
+
+        return response('How about implementing fakeHealthGet as a get method ?');
+    }
+    /**
+     * Operation fakeHttpSignatureTest
+     *
+     * test http signature authentication.
+     *
+     *
+     * @return Http response
+     */
+    public function fakeHttpSignatureTest()
+    {
+        $input = Request::all();
+
+        //path params validation
+
+
+        //not path params validation
+        if (!isset($input['pet'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $pet when calling fakeHttpSignatureTest');
         }
-        $xmlItem = $input['xmlItem'];
+        $pet = $input['pet'];
 
+        $query1 = $input['query1'];
 
-        return response('How about implementing createXmlItem as a post method ?');
+        $header1 = $input['header1'];
+
+
+        return response('How about implementing fakeHttpSignatureTest as a get method ?');
     }
     /**
      * Operation testInlineAdditionalProperties
@@ -321,10 +344,10 @@ public function testInlineAdditionalProperties()
 
 
         //not path params validation
-        if (!isset($input['param'])) {
-            throw new \InvalidArgumentException('Missing the required parameter $param when calling testInlineAdditionalProperties');
+        if (!isset($input['requestBody'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $requestBody when calling testInlineAdditionalProperties');
         }
-        $param = $input['param'];
+        $requestBody = $input['requestBody'];
 
 
         return response('How about implementing testInlineAdditionalProperties as a post method ?');
@@ -395,7 +418,7 @@ public function fakeOuterCompositeSerialize()
 
 
         //not path params validation
-        $body = $input['body'];
+        $outerComposite = $input['outerComposite'];
 
 
         return response('How about implementing fakeOuterCompositeSerialize as a post method ?');
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/PetController.php b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/PetController.php
index 6ce841dc2faa..085cd13ae4e3 100644
--- a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/PetController.php
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/PetController.php
@@ -3,7 +3,7 @@
 /**
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * PHP version 7.1.3
+ * PHP version 7.2.5
  *
  * The version of the OpenAPI document: 1.0.0
  * 
@@ -67,10 +67,10 @@ public function addPet()
 
 
         //not path params validation
-        if (!isset($input['body'])) {
-            throw new \InvalidArgumentException('Missing the required parameter $body when calling addPet');
+        if (!isset($input['pet'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $pet when calling addPet');
         }
-        $body = $input['body'];
+        $pet = $input['pet'];
 
 
         return response('How about implementing addPet as a post method ?');
@@ -91,10 +91,10 @@ public function updatePet()
 
 
         //not path params validation
-        if (!isset($input['body'])) {
-            throw new \InvalidArgumentException('Missing the required parameter $body when calling updatePet');
+        if (!isset($input['pet'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $pet when calling updatePet');
         }
-        $body = $input['body'];
+        $pet = $input['pet'];
 
 
         return response('How about implementing updatePet as a put method ?');
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/StoreController.php b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/StoreController.php
index 4a6f2e18a8d5..9274745f8d65 100644
--- a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/StoreController.php
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/StoreController.php
@@ -3,7 +3,7 @@
 /**
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * PHP version 7.1.3
+ * PHP version 7.2.5
  *
  * The version of the OpenAPI document: 1.0.0
  * 
@@ -66,10 +66,10 @@ public function placeOrder()
 
 
         //not path params validation
-        if (!isset($input['body'])) {
-            throw new \InvalidArgumentException('Missing the required parameter $body when calling placeOrder');
+        if (!isset($input['order'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $order when calling placeOrder');
         }
-        $body = $input['body'];
+        $order = $input['order'];
 
 
         return response('How about implementing placeOrder as a post method ?');
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/UserController.php b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/UserController.php
index 3477a0b5255b..5d8db1751008 100644
--- a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/UserController.php
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/UserController.php
@@ -3,7 +3,7 @@
 /**
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * PHP version 7.1.3
+ * PHP version 7.2.5
  *
  * The version of the OpenAPI document: 1.0.0
  * 
@@ -47,10 +47,10 @@ public function createUser()
 
 
         //not path params validation
-        if (!isset($input['body'])) {
-            throw new \InvalidArgumentException('Missing the required parameter $body when calling createUser');
+        if (!isset($input['user'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $user when calling createUser');
         }
-        $body = $input['body'];
+        $user = $input['user'];
 
 
         return response('How about implementing createUser as a post method ?');
@@ -71,10 +71,10 @@ public function createUsersWithArrayInput()
 
 
         //not path params validation
-        if (!isset($input['body'])) {
-            throw new \InvalidArgumentException('Missing the required parameter $body when calling createUsersWithArrayInput');
+        if (!isset($input['user'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $user when calling createUsersWithArrayInput');
         }
-        $body = $input['body'];
+        $user = $input['user'];
 
 
         return response('How about implementing createUsersWithArrayInput as a post method ?');
@@ -95,10 +95,10 @@ public function createUsersWithListInput()
 
 
         //not path params validation
-        if (!isset($input['body'])) {
-            throw new \InvalidArgumentException('Missing the required parameter $body when calling createUsersWithListInput');
+        if (!isset($input['user'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $user when calling createUsersWithListInput');
         }
-        $body = $input['body'];
+        $user = $input['user'];
 
 
         return response('How about implementing createUsersWithListInput as a post method ?');
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Kernel.php b/samples/server/petstore/php-laravel/lib/app/Http/Kernel.php
index 3439540c908a..c3640f30b87d 100644
--- a/samples/server/petstore/php-laravel/lib/app/Http/Kernel.php
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Kernel.php
@@ -14,11 +14,12 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \App\Http\Middleware\TrustProxies::class,
+        \Fruitcake\Cors\HandleCors::class,
+        \App\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class,
     ];
 
     /**
@@ -39,7 +40,7 @@ class Kernel extends HttpKernel
 
         'api' => [
             'throttle:60,1',
-            'bindings',
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
 
@@ -51,13 +52,15 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
+        'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
     ];
 }
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Middleware/Authenticate.php b/samples/server/petstore/php-laravel/lib/app/Http/Middleware/Authenticate.php
new file mode 100644
index 000000000000..704089a7fe75
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Middleware/Authenticate.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Auth\Middleware\Authenticate as Middleware;
+
+class Authenticate extends Middleware
+{
+    /**
+     * Get the path the user should be redirected to when they are not authenticated.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return string|null
+     */
+    protected function redirectTo($request)
+    {
+        if (! $request->expectsJson()) {
+            return route('login');
+        }
+    }
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Middleware/CheckForMaintenanceMode.php b/samples/server/petstore/php-laravel/lib/app/Http/Middleware/CheckForMaintenanceMode.php
new file mode 100644
index 000000000000..35b9824baefb
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Middleware/CheckForMaintenanceMode.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
+
+class CheckForMaintenanceMode extends Middleware
+{
+    /**
+     * The URIs that should be reachable while maintenance mode is enabled.
+     *
+     * @var array
+     */
+    protected $except = [
+        //
+    ];
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Middleware/RedirectIfAuthenticated.php b/samples/server/petstore/php-laravel/lib/app/Http/Middleware/RedirectIfAuthenticated.php
index e4cec9c8b11b..2395ddccf9e2 100644
--- a/samples/server/petstore/php-laravel/lib/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Providers\RouteServiceProvider;
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
@@ -18,7 +19,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return redirect('/home');
+            return redirect(RouteServiceProvider::HOME);
         }
 
         return $next($request);
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Middleware/TrustProxies.php b/samples/server/petstore/php-laravel/lib/app/Http/Middleware/TrustProxies.php
index 7daf51f1650d..14befceb0061 100644
--- a/samples/server/petstore/php-laravel/lib/app/Http/Middleware/TrustProxies.php
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Middleware/TrustProxies.php
@@ -2,15 +2,15 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Http\Request;
 use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
 {
     /**
      * The trusted proxies for this application.
      *
-     * @var array
+     * @var array|string|null
      */
     protected $proxies;
 
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesAnyType.php b/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesAnyType.php
deleted file mode 100644
index 6cd496f72ada..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesAnyType.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesAnyType
- */
-namespace app\Models;
-
-/**
- * AdditionalPropertiesAnyType
- */
-class AdditionalPropertiesAnyType {
-
-    /** @var string $name */
-    private $name;
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesArray.php b/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesArray.php
deleted file mode 100644
index 62fe898df7a0..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesArray.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesArray
- */
-namespace app\Models;
-
-/**
- * AdditionalPropertiesArray
- */
-class AdditionalPropertiesArray {
-
-    /** @var string $name */
-    private $name;
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesBoolean.php b/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesBoolean.php
deleted file mode 100644
index 22c22d11a282..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesBoolean.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesBoolean
- */
-namespace app\Models;
-
-/**
- * AdditionalPropertiesBoolean
- */
-class AdditionalPropertiesBoolean {
-
-    /** @var string $name */
-    private $name;
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesClass.php b/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesClass.php
index 5e491b69e961..a138c96d1bec 100644
--- a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesClass.php
+++ b/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesClass.php
@@ -9,37 +9,10 @@
  */
 class AdditionalPropertiesClass {
 
-    /** @var map[string,string] $mapString */
-    private $mapString;
+    /** @var map[string,string] $mapProperty */
+    private $mapProperty;
 
-    /** @var map[string,float] $mapNumber */
-    private $mapNumber;
-
-    /** @var map[string,int] $mapInteger */
-    private $mapInteger;
-
-    /** @var map[string,bool] $mapBoolean */
-    private $mapBoolean;
-
-    /** @var map[string,int[]] $mapArrayInteger */
-    private $mapArrayInteger;
-
-    /** @var map[string,object[]] $mapArrayAnytype */
-    private $mapArrayAnytype;
-
-    /** @var map[string,map[string,string]] $mapMapString */
-    private $mapMapString;
-
-    /** @var map[string,map[string,object]] $mapMapAnytype */
-    private $mapMapAnytype;
-
-    /** @var object $anytype1 */
-    private $anytype1;
-
-    /** @var object $anytype2 */
-    private $anytype2;
-
-    /** @var object $anytype3 */
-    private $anytype3;
+    /** @var map[string,map[string,string]] $mapOfMapProperty */
+    private $mapOfMapProperty;
 
 }
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesInteger.php b/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesInteger.php
deleted file mode 100644
index 70b34dc2511d..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesInteger.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesInteger
- */
-namespace app\Models;
-
-/**
- * AdditionalPropertiesInteger
- */
-class AdditionalPropertiesInteger {
-
-    /** @var string $name */
-    private $name;
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesNumber.php b/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesNumber.php
deleted file mode 100644
index 712f91e13433..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesNumber.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesNumber
- */
-namespace app\Models;
-
-/**
- * AdditionalPropertiesNumber
- */
-class AdditionalPropertiesNumber {
-
-    /** @var string $name */
-    private $name;
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesObject.php b/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesObject.php
deleted file mode 100644
index 758c07475115..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesObject.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesObject
- */
-namespace app\Models;
-
-/**
- * AdditionalPropertiesObject
- */
-class AdditionalPropertiesObject {
-
-    /** @var string $name */
-    private $name;
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesString.php b/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesString.php
deleted file mode 100644
index 439a55d43529..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesString.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesString
- */
-namespace app\Models;
-
-/**
- * AdditionalPropertiesString
- */
-class AdditionalPropertiesString {
-
-    /** @var string $name */
-    private $name;
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AnimalFarm.php b/samples/server/petstore/php-laravel/lib/app/Models/AnimalFarm.php
deleted file mode 100644
index a54de088353b..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/AnimalFarm.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * AnimalFarm
- */
-namespace app\Models;
-
-/**
- * AnimalFarm
- */
-class AnimalFarm {
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/BigCat.php b/samples/server/petstore/php-laravel/lib/app/Models/BigCat.php
deleted file mode 100644
index 893a3c5a15bf..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/BigCat.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * BigCat
- */
-namespace app\Models;
-
-/**
- * BigCat
- */
-class BigCat {
-
-    /** @var string $className */
-    private $className;
-
-    /** @var string $color */
-    private $color;
-
-    /** @var bool $declawed */
-    private $declawed;
-
-    /** @var string $kind */
-    private $kind;
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/BigCatAllOf.php b/samples/server/petstore/php-laravel/lib/app/Models/BigCatAllOf.php
deleted file mode 100644
index 7619bc10bb64..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/BigCatAllOf.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * BigCatAllOf
- */
-namespace app\Models;
-
-/**
- * BigCatAllOf
- */
-class BigCatAllOf {
-
-    /** @var string $kind */
-    private $kind;
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/EnumTest.php b/samples/server/petstore/php-laravel/lib/app/Models/EnumTest.php
index 07f5cfe8dd37..ce1eb85dd8dc 100644
--- a/samples/server/petstore/php-laravel/lib/app/Models/EnumTest.php
+++ b/samples/server/petstore/php-laravel/lib/app/Models/EnumTest.php
@@ -24,4 +24,13 @@ class EnumTest {
     /** @var \app\Models\OuterEnum $outerEnum */
     private $outerEnum;
 
+    /** @var \app\Models\OuterEnumInteger $outerEnumInteger */
+    private $outerEnumInteger;
+
+    /** @var \app\Models\OuterEnumDefaultValue $outerEnumDefaultValue */
+    private $outerEnumDefaultValue;
+
+    /** @var \app\Models\OuterEnumIntegerDefaultValue $outerEnumIntegerDefaultValue */
+    private $outerEnumIntegerDefaultValue;
+
 }
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Foo.php b/samples/server/petstore/php-laravel/lib/app/Models/Foo.php
new file mode 100644
index 000000000000..96d9bcf87050
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/Foo.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Foo
+ */
+namespace app\Models;
+
+/**
+ * Foo
+ */
+class Foo {
+
+    /** @var string $bar */
+    private $bar;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/FormatTest.php b/samples/server/petstore/php-laravel/lib/app/Models/FormatTest.php
index e1846df04331..bd21dacc68cc 100644
--- a/samples/server/petstore/php-laravel/lib/app/Models/FormatTest.php
+++ b/samples/server/petstore/php-laravel/lib/app/Models/FormatTest.php
@@ -48,7 +48,10 @@ class FormatTest {
     /** @var string $password */
     private $password;
 
-    /** @var BigDecimal $bigDecimal */
-    private $bigDecimal;
+    /** @var string $patternWithDigits A string that is a 10 digit number. Can have leading zeros.*/
+    private $patternWithDigits;
+
+    /** @var string $patternWithDigitsAndDelimiter A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.*/
+    private $patternWithDigitsAndDelimiter;
 
 }
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/HealthCheckResult.php b/samples/server/petstore/php-laravel/lib/app/Models/HealthCheckResult.php
new file mode 100644
index 000000000000..6117de37ec8f
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/HealthCheckResult.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * HealthCheckResult
+ */
+namespace app\Models;
+
+/**
+ * HealthCheckResult
+ */
+class HealthCheckResult {
+
+    /** @var string $nullableMessage */
+    private $nullableMessage;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/InlineObject.php b/samples/server/petstore/php-laravel/lib/app/Models/InlineObject.php
new file mode 100644
index 000000000000..3bf3488d763e
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/InlineObject.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * InlineObject
+ */
+namespace app\Models;
+
+/**
+ * InlineObject
+ */
+class InlineObject {
+
+    /** @var string $name Updated name of the pet*/
+    private $name;
+
+    /** @var string $status Updated status of the pet*/
+    private $status;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/InlineObject1.php b/samples/server/petstore/php-laravel/lib/app/Models/InlineObject1.php
new file mode 100644
index 000000000000..d5e34919a5c5
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/InlineObject1.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * InlineObject1
+ */
+namespace app\Models;
+
+/**
+ * InlineObject1
+ */
+class InlineObject1 {
+
+    /** @var string $additionalMetadata Additional data to pass to server*/
+    private $additionalMetadata;
+
+    /** @var \SplFileObject $file file to upload*/
+    private $file;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/InlineObject2.php b/samples/server/petstore/php-laravel/lib/app/Models/InlineObject2.php
new file mode 100644
index 000000000000..cb22cb3a9a1f
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/InlineObject2.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * InlineObject2
+ */
+namespace app\Models;
+
+/**
+ * InlineObject2
+ */
+class InlineObject2 {
+
+    /** @var string[] $enumFormStringArray Form parameter enum test (string array)*/
+    private $enumFormStringArray;
+
+    /** @var string $enumFormString Form parameter enum test (string)*/
+    private $enumFormString;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/InlineObject3.php b/samples/server/petstore/php-laravel/lib/app/Models/InlineObject3.php
new file mode 100644
index 000000000000..11c6b022ec6d
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/InlineObject3.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * InlineObject3
+ */
+namespace app\Models;
+
+/**
+ * InlineObject3
+ */
+class InlineObject3 {
+
+    /** @var int $integer None*/
+    private $integer;
+
+    /** @var int $int32 None*/
+    private $int32;
+
+    /** @var int $int64 None*/
+    private $int64;
+
+    /** @var float $number None*/
+    private $number;
+
+    /** @var float $float None*/
+    private $float;
+
+    /** @var double $double None*/
+    private $double;
+
+    /** @var string $string None*/
+    private $string;
+
+    /** @var string $patternWithoutDelimiter None*/
+    private $patternWithoutDelimiter;
+
+    /** @var string $byte None*/
+    private $byte;
+
+    /** @var \SplFileObject $binary None*/
+    private $binary;
+
+    /** @var \DateTime $date None*/
+    private $date;
+
+    /** @var \DateTime $dateTime None*/
+    private $dateTime;
+
+    /** @var string $password None*/
+    private $password;
+
+    /** @var string $callback None*/
+    private $callback;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/InlineObject4.php b/samples/server/petstore/php-laravel/lib/app/Models/InlineObject4.php
new file mode 100644
index 000000000000..c54311935e72
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/InlineObject4.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * InlineObject4
+ */
+namespace app\Models;
+
+/**
+ * InlineObject4
+ */
+class InlineObject4 {
+
+    /** @var string $param field1*/
+    private $param;
+
+    /** @var string $param2 field2*/
+    private $param2;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/InlineObject5.php b/samples/server/petstore/php-laravel/lib/app/Models/InlineObject5.php
new file mode 100644
index 000000000000..a8e99b9aeab1
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/InlineObject5.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * InlineObject5
+ */
+namespace app\Models;
+
+/**
+ * InlineObject5
+ */
+class InlineObject5 {
+
+    /** @var string $additionalMetadata Additional data to pass to server*/
+    private $additionalMetadata;
+
+    /** @var \SplFileObject $requiredFile file to upload*/
+    private $requiredFile;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/InlineResponseDefault.php b/samples/server/petstore/php-laravel/lib/app/Models/InlineResponseDefault.php
new file mode 100644
index 000000000000..492517d312a6
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/InlineResponseDefault.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * InlineResponseDefault
+ */
+namespace app\Models;
+
+/**
+ * InlineResponseDefault
+ */
+class InlineResponseDefault {
+
+    /** @var \app\Models\Foo $string */
+    private $string;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/NullableClass.php b/samples/server/petstore/php-laravel/lib/app/Models/NullableClass.php
new file mode 100644
index 000000000000..8de138656589
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/NullableClass.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * NullableClass
+ */
+namespace app\Models;
+
+/**
+ * NullableClass
+ */
+class NullableClass {
+
+    /** @var int $integerProp */
+    private $integerProp;
+
+    /** @var float $numberProp */
+    private $numberProp;
+
+    /** @var bool $booleanProp */
+    private $booleanProp;
+
+    /** @var string $stringProp */
+    private $stringProp;
+
+    /** @var \DateTime $dateProp */
+    private $dateProp;
+
+    /** @var \DateTime $datetimeProp */
+    private $datetimeProp;
+
+    /** @var object[] $arrayNullableProp */
+    private $arrayNullableProp;
+
+    /** @var object[] $arrayAndItemsNullableProp */
+    private $arrayAndItemsNullableProp;
+
+    /** @var object[] $arrayItemsNullable */
+    private $arrayItemsNullable;
+
+    /** @var map[string,object] $objectNullableProp */
+    private $objectNullableProp;
+
+    /** @var map[string,object] $objectAndItemsNullableProp */
+    private $objectAndItemsNullableProp;
+
+    /** @var map[string,object] $objectItemsNullable */
+    private $objectItemsNullable;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/OuterEnumDefaultValue.php b/samples/server/petstore/php-laravel/lib/app/Models/OuterEnumDefaultValue.php
new file mode 100644
index 000000000000..079fe7847902
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/OuterEnumDefaultValue.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * OuterEnumDefaultValue
+ */
+namespace app\Models;
+
+/**
+ * OuterEnumDefaultValue
+ */
+class OuterEnumDefaultValue {
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/OuterEnumInteger.php b/samples/server/petstore/php-laravel/lib/app/Models/OuterEnumInteger.php
new file mode 100644
index 000000000000..848b9a89f3f2
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/OuterEnumInteger.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * OuterEnumInteger
+ */
+namespace app\Models;
+
+/**
+ * OuterEnumInteger
+ */
+class OuterEnumInteger {
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/OuterEnumIntegerDefaultValue.php b/samples/server/petstore/php-laravel/lib/app/Models/OuterEnumIntegerDefaultValue.php
new file mode 100644
index 000000000000..93c9f08672e4
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/OuterEnumIntegerDefaultValue.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * OuterEnumIntegerDefaultValue
+ */
+namespace app\Models;
+
+/**
+ * OuterEnumIntegerDefaultValue
+ */
+class OuterEnumIntegerDefaultValue {
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/StringBooleanMap.php b/samples/server/petstore/php-laravel/lib/app/Models/StringBooleanMap.php
deleted file mode 100644
index b10016247138..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/StringBooleanMap.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * StringBooleanMap
- */
-namespace app\Models;
-
-/**
- * StringBooleanMap
- */
-class StringBooleanMap {
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/TypeHolderDefault.php b/samples/server/petstore/php-laravel/lib/app/Models/TypeHolderDefault.php
deleted file mode 100644
index cd2a920ca043..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/TypeHolderDefault.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * TypeHolderDefault
- */
-namespace app\Models;
-
-/**
- * TypeHolderDefault
- */
-class TypeHolderDefault {
-
-    /** @var string $stringItem */
-    private $stringItem;
-
-    /** @var float $numberItem */
-    private $numberItem;
-
-    /** @var int $integerItem */
-    private $integerItem;
-
-    /** @var bool $boolItem */
-    private $boolItem;
-
-    /** @var int[] $arrayItem */
-    private $arrayItem;
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/TypeHolderExample.php b/samples/server/petstore/php-laravel/lib/app/Models/TypeHolderExample.php
deleted file mode 100644
index 12967fa2fc46..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/TypeHolderExample.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * TypeHolderExample
- */
-namespace app\Models;
-
-/**
- * TypeHolderExample
- */
-class TypeHolderExample {
-
-    /** @var string $stringItem */
-    private $stringItem;
-
-    /** @var float $numberItem */
-    private $numberItem;
-
-    /** @var float $floatItem */
-    private $floatItem;
-
-    /** @var int $integerItem */
-    private $integerItem;
-
-    /** @var bool $boolItem */
-    private $boolItem;
-
-    /** @var int[] $arrayItem */
-    private $arrayItem;
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/XmlItem.php b/samples/server/petstore/php-laravel/lib/app/Models/XmlItem.php
deleted file mode 100644
index 2a37cf30763f..000000000000
--- a/samples/server/petstore/php-laravel/lib/app/Models/XmlItem.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * XmlItem
- */
-namespace app\Models;
-
-/**
- * XmlItem
- */
-class XmlItem {
-
-    /** @var string $attributeString */
-    private $attributeString;
-
-    /** @var float $attributeNumber */
-    private $attributeNumber;
-
-    /** @var int $attributeInteger */
-    private $attributeInteger;
-
-    /** @var bool $attributeBoolean */
-    private $attributeBoolean;
-
-    /** @var int[] $wrappedArray */
-    private $wrappedArray;
-
-    /** @var string $nameString */
-    private $nameString;
-
-    /** @var float $nameNumber */
-    private $nameNumber;
-
-    /** @var int $nameInteger */
-    private $nameInteger;
-
-    /** @var bool $nameBoolean */
-    private $nameBoolean;
-
-    /** @var int[] $nameArray */
-    private $nameArray;
-
-    /** @var int[] $nameWrappedArray */
-    private $nameWrappedArray;
-
-    /** @var string $prefixString */
-    private $prefixString;
-
-    /** @var float $prefixNumber */
-    private $prefixNumber;
-
-    /** @var int $prefixInteger */
-    private $prefixInteger;
-
-    /** @var bool $prefixBoolean */
-    private $prefixBoolean;
-
-    /** @var int[] $prefixArray */
-    private $prefixArray;
-
-    /** @var int[] $prefixWrappedArray */
-    private $prefixWrappedArray;
-
-    /** @var string $namespaceString */
-    private $namespaceString;
-
-    /** @var float $namespaceNumber */
-    private $namespaceNumber;
-
-    /** @var int $namespaceInteger */
-    private $namespaceInteger;
-
-    /** @var bool $namespaceBoolean */
-    private $namespaceBoolean;
-
-    /** @var int[] $namespaceArray */
-    private $namespaceArray;
-
-    /** @var int[] $namespaceWrappedArray */
-    private $namespaceWrappedArray;
-
-    /** @var string $prefixNsString */
-    private $prefixNsString;
-
-    /** @var float $prefixNsNumber */
-    private $prefixNsNumber;
-
-    /** @var int $prefixNsInteger */
-    private $prefixNsInteger;
-
-    /** @var bool $prefixNsBoolean */
-    private $prefixNsBoolean;
-
-    /** @var int[] $prefixNsArray */
-    private $prefixNsArray;
-
-    /** @var int[] $prefixNsWrappedArray */
-    private $prefixNsWrappedArray;
-
-}
diff --git a/samples/server/petstore/php-laravel/lib/app/Providers/AppServiceProvider.php b/samples/server/petstore/php-laravel/lib/app/Providers/AppServiceProvider.php
index 35471f6ff156..ee8ca5bcd8f7 100644
--- a/samples/server/petstore/php-laravel/lib/app/Providers/AppServiceProvider.php
+++ b/samples/server/petstore/php-laravel/lib/app/Providers/AppServiceProvider.php
@@ -7,21 +7,21 @@
 class AppServiceProvider extends ServiceProvider
 {
     /**
-     * Bootstrap any application services.
+     * Register any application services.
      *
      * @return void
      */
-    public function boot()
+    public function register()
     {
         //
     }
 
     /**
-     * Register any application services.
+     * Bootstrap any application services.
      *
      * @return void
      */
-    public function register()
+    public function boot()
     {
         //
     }
diff --git a/samples/server/petstore/php-laravel/lib/app/Providers/AuthServiceProvider.php b/samples/server/petstore/php-laravel/lib/app/Providers/AuthServiceProvider.php
index 9784b1a3003a..30490683b9eb 100644
--- a/samples/server/petstore/php-laravel/lib/app/Providers/AuthServiceProvider.php
+++ b/samples/server/petstore/php-laravel/lib/app/Providers/AuthServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Gate;
 
 class AuthServiceProvider extends ServiceProvider
 {
@@ -13,7 +13,7 @@ class AuthServiceProvider extends ServiceProvider
      * @var array
      */
     protected $policies = [
-        'App\Model' => 'App\Policies\ModelPolicy',
+        // 'App\Model' => 'App\Policies\ModelPolicy',
     ];
 
     /**
diff --git a/samples/server/petstore/php-laravel/lib/app/Providers/BroadcastServiceProvider.php b/samples/server/petstore/php-laravel/lib/app/Providers/BroadcastServiceProvider.php
index 352cce44a3de..395c518bc47b 100644
--- a/samples/server/petstore/php-laravel/lib/app/Providers/BroadcastServiceProvider.php
+++ b/samples/server/petstore/php-laravel/lib/app/Providers/BroadcastServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Broadcast;
+use Illuminate\Support\ServiceProvider;
 
 class BroadcastServiceProvider extends ServiceProvider
 {
diff --git a/samples/server/petstore/php-laravel/lib/app/Providers/EventServiceProvider.php b/samples/server/petstore/php-laravel/lib/app/Providers/EventServiceProvider.php
index fca6152c3ac4..723a290d57d8 100644
--- a/samples/server/petstore/php-laravel/lib/app/Providers/EventServiceProvider.php
+++ b/samples/server/petstore/php-laravel/lib/app/Providers/EventServiceProvider.php
@@ -2,8 +2,10 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Event;
+use Illuminate\Auth\Events\Registered;
+use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {
@@ -13,8 +15,8 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'App\Events\Event' => [
-            'App\Listeners\EventListener',
+        Registered::class => [
+            SendEmailVerificationNotification::class,
         ],
     ];
 
diff --git a/samples/server/petstore/php-laravel/lib/app/Providers/RouteServiceProvider.php b/samples/server/petstore/php-laravel/lib/app/Providers/RouteServiceProvider.php
index b36415e85f3f..540d17b43083 100644
--- a/samples/server/petstore/php-laravel/lib/app/Providers/RouteServiceProvider.php
+++ b/samples/server/petstore/php-laravel/lib/app/Providers/RouteServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route;
 
 class RouteServiceProvider extends ServiceProvider
 {
@@ -16,6 +16,13 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected $namespace = 'App\Http\Controllers';
 
+    /**
+     * The path to the "home" route for your application.
+     *
+     * @var string
+     */
+    public const HOME = '/home';
+
     /**
      * Define your route model bindings, pattern filters, etc.
      *
@@ -52,8 +59,8 @@ public function map()
     protected function mapWebRoutes()
     {
         Route::middleware('web')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/web.php'));
+            ->namespace($this->namespace)
+            ->group(base_path('routes/web.php'));
     }
 
     /**
@@ -65,8 +72,9 @@ protected function mapWebRoutes()
      */
     protected function mapApiRoutes()
     {
-        Route::middleware('api')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/api.php'));
+        Route::prefix('api')
+            ->middleware('api')
+            ->namespace($this->namespace)
+            ->group(base_path('routes/api.php'));
     }
 }
diff --git a/samples/server/petstore/php-laravel/lib/app/RouteServiceProvider.php b/samples/server/petstore/php-laravel/lib/app/RouteServiceProvider.php
new file mode 100644
index 000000000000..e79dab7fea8f
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/RouteServiceProvider.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App;
+
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
+
+class User extends Authenticatable
+{
+    use Notifiable;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'name', 'email', 'password',
+    ];
+
+    /**
+     * The attributes that should be hidden for arrays.
+     *
+     * @var array
+     */
+    protected $hidden = [
+        'password', 'remember_token',
+    ];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'email_verified_at' => 'datetime',
+    ];
+}
diff --git a/samples/server/petstore/php-laravel/lib/bootstrap/app.php b/samples/server/petstore/php-laravel/lib/bootstrap/app.php
index f2801adf6f14..037e17df03b0 100644
--- a/samples/server/petstore/php-laravel/lib/bootstrap/app.php
+++ b/samples/server/petstore/php-laravel/lib/bootstrap/app.php
@@ -12,7 +12,7 @@
 */
 
 $app = new Illuminate\Foundation\Application(
-    realpath(__DIR__.'/../')
+    $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
 );
 
 /*
diff --git a/samples/server/petstore/php-laravel/lib/bootstrap/cache/.gitignore b/samples/server/petstore/php-laravel/lib/bootstrap/cache/.gitignore
index d6b7ef32c847..01e4a6cda9eb 100644
--- a/samples/server/petstore/php-laravel/lib/bootstrap/cache/.gitignore
+++ b/samples/server/petstore/php-laravel/lib/bootstrap/cache/.gitignore
@@ -1,2 +1,3 @@
 *
+!data/
 !.gitignore
diff --git a/samples/server/petstore/php-laravel/lib/bootstrap/testingAutoload.php b/samples/server/petstore/php-laravel/lib/bootstrap/testingAutoload.php
deleted file mode 100644
index 30a59f187ef0..000000000000
--- a/samples/server/petstore/php-laravel/lib/bootstrap/testingAutoload.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-passthru("php artisan --env='testing' migrate:fresh");
-passthru("php artisan --env='testing' db:seed");
-
-require realpath(__DIR__ . '/../vendor/autoload.php');
diff --git a/samples/server/petstore/php-laravel/lib/composer.json b/samples/server/petstore/php-laravel/lib/composer.json
index db1db324db35..ac7642b6f79d 100644
--- a/samples/server/petstore/php-laravel/lib/composer.json
+++ b/samples/server/petstore/php-laravel/lib/composer.json
@@ -5,59 +5,56 @@
   "license": "MIT",
   "type": "project",
   "require": {
-    "php": "^7.1.3",
-    "fideloper/proxy": "^4.0",
-    "laravel/framework": "5.6.*",
-    "laravel/tinker": "^1.0"
+    "php": "^7.2.5",
+    "fideloper/proxy": "^4.2",
+    "fruitcake/laravel-cors": "^1.0",
+    "guzzlehttp/guzzle": "^6.3",
+    "laravel/framework": "^7.0",
+    "laravel/tinker": "^2.0"
   },
   "require-dev": {
-    "filp/whoops": "^2.0",
-    "fzaninotto/faker": "^1.4",
-    "mockery/mockery": "^1.0",
-    "nunomaduro/collision": "^2.0",
-    "phpunit/phpunit": "^7.0",
-    "phpspec/phpspec": "^4.2",
-    "squizlabs/php_codesniffer": "^3.0"
-  },
-  "autoload": {
-    "classmap": [
-      "database/seeds",
-      "database/migrations",
-      "database/factories"
-    ],
-    "psr-4": {
-      "App\\": "app/",
-      "Tests\\": "tests/"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Tests\\": "tests/"
-    }
-  },
-  "extra": {
-    "laravel": {
-      "dont-discover": [
-      ]
-    }
-  },
-  "scripts": {
-      "post-root-package-install": [
-      "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
-    ],
-      "post-create-project-cmd": [
-      "@php artisan key:generate"
-    ],
-      "post-autoload-dump": [
-      "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-      "@php artisan package:discover"
-    ]
+    "facade/ignition": "^2.0",
+    "fzaninotto/faker": "^1.9.1",
+    "mockery/mockery": "^1.3.1",
+    "nunomaduro/collision": "^4.1",
+    "phpunit/phpunit": "^8.5"
   },
   "config": {
-    "preferred-install": "dist",
-    "sort-packages": true,
-    "optimize-autoloader": true
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
+    "extra": {
+        "laravel": {
+            "dont-discover": []
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "App\\": "app/"
+        },
+        "classmap": [
+            "database/seeds",
+            "database/factories"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "scripts": {
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover --ansi"
+        ],
+        "post-root-package-install": [
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+        ],
+        "post-create-project-cmd": [
+            "@php artisan key:generate --ansi"
+        ]
+    }
 }
diff --git a/samples/server/petstore/php-laravel/lib/config/app.php b/samples/server/petstore/php-laravel/lib/config/app.php
index b16e7f77ee59..8409e00ea9fc 100644
--- a/samples/server/petstore/php-laravel/lib/config/app.php
+++ b/samples/server/petstore/php-laravel/lib/config/app.php
@@ -22,7 +22,7 @@
     |
     | This value determines the "environment" your application is currently
     | running in. This may determine how you prefer to configure various
-    | services your application utilizes. Set this in your ".env" file.
+    | services the application utilizes. Set this in your ".env" file.
     |
     */
 
@@ -39,7 +39,7 @@
     |
     */
 
-    'debug' => env('APP_DEBUG', false),
+    'debug' => (bool) env('APP_DEBUG', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -54,6 +54,8 @@
 
     'url' => env('APP_URL', 'http://localhost'),
 
+    'asset_url' => env('ASSET_URL', null),
+
     /*
     |--------------------------------------------------------------------------
     | Application Timezone
@@ -93,6 +95,19 @@
 
     'fallback_locale' => 'en',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Faker Locale
+    |--------------------------------------------------------------------------
+    |
+    | This locale will be used by the Faker PHP library when generating fake
+    | data for your database seeds. For example, this will be used to get
+    | localized telephone numbers, street address information and more.
+    |
+    */
+
+    'faker_locale' => 'en_US',
+
     /*
     |--------------------------------------------------------------------------
     | Encryption Key
@@ -176,6 +191,7 @@
     'aliases' => [
 
         'App' => Illuminate\Support\Facades\App::class,
+        'Arr' => Illuminate\Support\Arr::class,
         'Artisan' => Illuminate\Support\Facades\Artisan::class,
         'Auth' => Illuminate\Support\Facades\Auth::class,
         'Blade' => Illuminate\Support\Facades\Blade::class,
@@ -191,6 +207,7 @@
         'File' => Illuminate\Support\Facades\File::class,
         'Gate' => Illuminate\Support\Facades\Gate::class,
         'Hash' => Illuminate\Support\Facades\Hash::class,
+        'Http' => Illuminate\Support\Facades\Http::class,
         'Lang' => Illuminate\Support\Facades\Lang::class,
         'Log' => Illuminate\Support\Facades\Log::class,
         'Mail' => Illuminate\Support\Facades\Mail::class,
@@ -205,6 +222,7 @@
         'Schema' => Illuminate\Support\Facades\Schema::class,
         'Session' => Illuminate\Support\Facades\Session::class,
         'Storage' => Illuminate\Support\Facades\Storage::class,
+        'Str' => Illuminate\Support\Str::class,
         'URL' => Illuminate\Support\Facades\URL::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
diff --git a/samples/server/petstore/php-laravel/lib/config/auth.php b/samples/server/petstore/php-laravel/lib/config/auth.php
index 781750102522..aaf982bcdcee 100644
--- a/samples/server/petstore/php-laravel/lib/config/auth.php
+++ b/samples/server/petstore/php-laravel/lib/config/auth.php
@@ -44,6 +44,7 @@
         'api' => [
             'driver' => 'token',
             'provider' => 'users',
+            'hash' => false,
         ],
     ],
 
@@ -96,7 +97,21 @@
             'provider' => 'users',
             'table' => 'password_resets',
             'expire' => 60,
+            'throttle' => 60,
         ],
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Password Confirmation Timeout
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define the amount of seconds before a password confirmation
+    | times out and the user is prompted to re-enter their password via the
+    | confirmation screen. By default, the timeout lasts for three hours.
+    |
+    */
+
+    'password_timeout' => 10800,
+
 ];
diff --git a/samples/server/petstore/php-laravel/lib/config/broadcasting.php b/samples/server/petstore/php-laravel/lib/config/broadcasting.php
index 3ca45eaa8523..3bba1103e602 100644
--- a/samples/server/petstore/php-laravel/lib/config/broadcasting.php
+++ b/samples/server/petstore/php-laravel/lib/config/broadcasting.php
@@ -37,7 +37,7 @@
             'app_id' => env('PUSHER_APP_ID'),
             'options' => [
                 'cluster' => env('PUSHER_APP_CLUSTER'),
-                'encrypted' => true,
+                'useTLS' => true,
             ],
         ],
 
diff --git a/samples/server/petstore/php-laravel/lib/config/cache.php b/samples/server/petstore/php-laravel/lib/config/cache.php
index fa12e5e4f7e2..4f41fdf966b5 100644
--- a/samples/server/petstore/php-laravel/lib/config/cache.php
+++ b/samples/server/petstore/php-laravel/lib/config/cache.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -11,7 +13,8 @@
     | using this caching library. This connection is used when another is
     | not explicitly specified when executing a given caching function.
     |
-    | Supported: "apc", "array", "database", "file", "memcached", "redis"
+    | Supported: "apc", "array", "database", "file",
+    |            "memcached", "redis", "dynamodb"
     |
     */
 
@@ -36,6 +39,7 @@
 
         'array' => [
             'driver' => 'array',
+            'serialize' => false,
         ],
 
         'database' => [
@@ -57,7 +61,7 @@
                 env('MEMCACHED_PASSWORD'),
             ],
             'options' => [
-                // Memcached::OPT_CONNECT_TIMEOUT  => 2000,
+                // Memcached::OPT_CONNECT_TIMEOUT => 2000,
             ],
             'servers' => [
                 [
@@ -70,7 +74,16 @@
 
         'redis' => [
             'driver' => 'redis',
-            'connection' => 'default',
+            'connection' => 'cache',
+        ],
+
+        'dynamodb' => [
+            'driver' => 'dynamodb',
+            'key' => env('AWS_ACCESS_KEY_ID'),
+            'secret' => env('AWS_SECRET_ACCESS_KEY'),
+            'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
+            'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
+            'endpoint' => env('DYNAMODB_ENDPOINT'),
         ],
 
     ],
@@ -86,9 +99,6 @@
     |
     */
 
-    'prefix' => env(
-        'CACHE_PREFIX',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_cache'
-    ),
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
 
 ];
diff --git a/samples/server/petstore/php-laravel/lib/config/cors.php b/samples/server/petstore/php-laravel/lib/config/cors.php
new file mode 100644
index 000000000000..558369dca41b
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/config/cors.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cross-Origin Resource Sharing (CORS) Configuration
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure your settings for cross-origin resource sharing
+    | or "CORS". This determines what cross-origin operations may execute
+    | in web browsers. You are free to adjust these settings as needed.
+    |
+    | To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
+    |
+    */
+
+    'paths' => ['api/*'],
+
+    'allowed_methods' => ['*'],
+
+    'allowed_origins' => ['*'],
+
+    'allowed_origins_patterns' => [],
+
+    'allowed_headers' => ['*'],
+
+    'exposed_headers' => [],
+
+    'max_age' => 0,
+
+    'supports_credentials' => false,
+
+];
diff --git a/samples/server/petstore/php-laravel/lib/config/database.php b/samples/server/petstore/php-laravel/lib/config/database.php
index cab5d068f756..b42d9b30a546 100644
--- a/samples/server/petstore/php-laravel/lib/config/database.php
+++ b/samples/server/petstore/php-laravel/lib/config/database.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -35,12 +37,15 @@
 
         'sqlite' => [
             'driver' => 'sqlite',
+            'url' => env('DATABASE_URL'),
             'database' => env('DB_DATABASE', database_path('database.sqlite')),
             'prefix' => '',
+            'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
         ],
 
         'mysql' => [
             'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '3306'),
             'database' => env('DB_DATABASE', 'forge'),
@@ -50,12 +55,17 @@
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => '',
+            'prefix_indexes' => true,
             'strict' => true,
             'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
         ],
 
         'pgsql' => [
             'driver' => 'pgsql',
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '5432'),
             'database' => env('DB_DATABASE', 'forge'),
@@ -63,12 +73,14 @@
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
             'prefix' => '',
+            'prefix_indexes' => true,
             'schema' => 'public',
             'sslmode' => 'prefer',
         ],
 
         'sqlsrv' => [
             'driver' => 'sqlsrv',
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', 'localhost'),
             'port' => env('DB_PORT', '1433'),
             'database' => env('DB_DATABASE', 'forge'),
@@ -76,6 +88,7 @@
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
             'prefix' => '',
+            'prefix_indexes' => true,
         ],
 
     ],
@@ -99,20 +112,34 @@
     |--------------------------------------------------------------------------
     |
     | Redis is an open source, fast, and advanced key-value store that also
-    | provides a richer set of commands than a typical key-value systems
+    | provides a richer body of commands than a typical key-value system
     | such as APC or Memcached. Laravel makes it easy to dig right in.
     |
     */
 
     'redis' => [
 
-        'client' => 'predis',
+        'client' => env('REDIS_CLIENT', 'phpredis'),
+
+        'options' => [
+            'cluster' => env('REDIS_CLUSTER', 'redis'),
+            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
+        ],
 
         'default' => [
+            'url' => env('REDIS_URL'),
+            'host' => env('REDIS_HOST', '127.0.0.1'),
+            'password' => env('REDIS_PASSWORD', null),
+            'port' => env('REDIS_PORT', '6379'),
+            'database' => env('REDIS_DB', '0'),
+        ],
+
+        'cache' => [
+            'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
-            'port' => env('REDIS_PORT', 6379),
-            'database' => 0,
+            'port' => env('REDIS_PORT', '6379'),
+            'database' => env('REDIS_CACHE_DB', '1'),
         ],
 
     ],
diff --git a/samples/server/petstore/php-laravel/lib/config/filesystems.php b/samples/server/petstore/php-laravel/lib/config/filesystems.php
index 77fa5ded1dec..94c81126b227 100644
--- a/samples/server/petstore/php-laravel/lib/config/filesystems.php
+++ b/samples/server/petstore/php-laravel/lib/config/filesystems.php
@@ -37,7 +37,7 @@
     | may even configure multiple disks of the same driver. Defaults have
     | been setup for each driver as an example of the required options.
     |
-    | Supported Drivers: "local", "ftp", "sftp", "s3", "rackspace"
+    | Supported Drivers: "local", "ftp", "sftp", "s3"
     |
     */
 
@@ -62,8 +62,24 @@
             'region' => env('AWS_DEFAULT_REGION'),
             'bucket' => env('AWS_BUCKET'),
             'url' => env('AWS_URL'),
+            'endpoint' => env('AWS_ENDPOINT'),
         ],
 
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Symbolic Links
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the symbolic links that will be created when the
+    | `storage:link` Artisan command is executed. The array keys should be
+    | the locations of the links and the values should be their targets.
+    |
+    */
+
+    'links' => [
+        public_path('storage') => storage_path('app/public'),
+    ],
+
 ];
diff --git a/samples/server/petstore/php-laravel/lib/config/hashing.php b/samples/server/petstore/php-laravel/lib/config/hashing.php
index d3c8e2fb22a6..842577087c0c 100644
--- a/samples/server/petstore/php-laravel/lib/config/hashing.php
+++ b/samples/server/petstore/php-laravel/lib/config/hashing.php
@@ -11,7 +11,7 @@
     | passwords for your application. By default, the bcrypt algorithm is
     | used; however, you remain free to modify this option if you wish.
     |
-    | Supported: "bcrypt", "argon"
+    | Supported: "bcrypt", "argon", "argon2id"
     |
     */
 
diff --git a/samples/server/petstore/php-laravel/lib/config/logging.php b/samples/server/petstore/php-laravel/lib/config/logging.php
index 400bc7f4640c..088c204e2994 100644
--- a/samples/server/petstore/php-laravel/lib/config/logging.php
+++ b/samples/server/petstore/php-laravel/lib/config/logging.php
@@ -1,6 +1,8 @@
 <?php
 
+use Monolog\Handler\NullHandler;
 use Monolog\Handler\StreamHandler;
+use Monolog\Handler\SyslogUdpHandler;
 
 return [
 
@@ -36,6 +38,7 @@
         'stack' => [
             'driver' => 'stack',
             'channels' => ['single'],
+            'ignore_exceptions' => false,
         ],
 
         'single' => [
@@ -48,7 +51,7 @@
             'driver' => 'daily',
             'path' => storage_path('logs/laravel.log'),
             'level' => 'debug',
-            'days' => 7,
+            'days' => 14,
         ],
 
         'slack' => [
@@ -59,9 +62,20 @@
             'level' => 'critical',
         ],
 
+        'papertrail' => [
+            'driver' => 'monolog',
+            'level' => 'debug',
+            'handler' => SyslogUdpHandler::class,
+            'handler_with' => [
+                'host' => env('PAPERTRAIL_URL'),
+                'port' => env('PAPERTRAIL_PORT'),
+            ],
+        ],
+
         'stderr' => [
             'driver' => 'monolog',
             'handler' => StreamHandler::class,
+            'formatter' => env('LOG_STDERR_FORMATTER'),
             'with' => [
                 'stream' => 'php://stderr',
             ],
@@ -76,6 +90,15 @@
             'driver' => 'errorlog',
             'level' => 'debug',
         ],
+
+        'null' => [
+            'driver' => 'monolog',
+            'handler' => NullHandler::class,
+        ],
+
+        'emergency' => [
+            'path' => storage_path('logs/laravel.log'),
+        ],
     ],
 
 ];
diff --git a/samples/server/petstore/php-laravel/lib/config/mail.php b/samples/server/petstore/php-laravel/lib/config/mail.php
index bb92224c59db..54299aabf8ad 100644
--- a/samples/server/petstore/php-laravel/lib/config/mail.php
+++ b/samples/server/petstore/php-laravel/lib/config/mail.php
@@ -4,45 +4,73 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Mail Driver
+    | Default Mailer
     |--------------------------------------------------------------------------
     |
-    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
-    | sending of e-mail. You may specify which one you're using throughout
-    | your application here. By default, Laravel is setup for SMTP mail.
-    |
-    | Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses",
-    |            "sparkpost", "log", "array"
+    | This option controls the default mailer that is used to send any email
+    | messages sent by your application. Alternative mailers may be setup
+    | and used as needed; however, this mailer will be used by default.
     |
     */
 
-    'driver' => env('MAIL_DRIVER', 'smtp'),
+    'default' => env('MAIL_MAILER', 'smtp'),
 
     /*
     |--------------------------------------------------------------------------
-    | SMTP Host Address
+    | Mailer Configurations
     |--------------------------------------------------------------------------
     |
-    | Here you may provide the host address of the SMTP server used by your
-    | applications. A default option is provided that is compatible with
-    | the Mailgun mail service which will provide reliable deliveries.
+    | Here you may configure all of the mailers used by your application plus
+    | their respective settings. Several examples have been configured for
+    | you and you are free to add your own as your application requires.
     |
-    */
-
-    'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP Host Port
-    |--------------------------------------------------------------------------
+    | Laravel supports a variety of mail "transport" drivers to be used while
+    | sending an e-mail. You will specify which one you are using for your
+    | mailers below. You are free to add additional mailers as required.
     |
-    | This is the SMTP port used by your application to deliver e-mails to
-    | users of the application. Like the host we have set this value to
-    | stay compatible with the Mailgun e-mail application by default.
+    | Supported: "smtp", "sendmail", "mailgun", "ses",
+    |            "postmark", "log", "array"
     |
     */
 
-    'port' => env('MAIL_PORT', 587),
+    'mailers' => [
+        'smtp' => [
+            'transport' => 'smtp',
+            'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+            'port' => env('MAIL_PORT', 587),
+            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
+            'username' => env('MAIL_USERNAME'),
+            'password' => env('MAIL_PASSWORD'),
+            'timeout' => null,
+            'auth_mode' => null,
+        ],
+
+        'ses' => [
+            'transport' => 'ses',
+        ],
+
+        'mailgun' => [
+            'transport' => 'mailgun',
+        ],
+
+        'postmark' => [
+            'transport' => 'postmark',
+        ],
+
+        'sendmail' => [
+            'transport' => 'sendmail',
+            'path' => '/usr/sbin/sendmail -bs',
+        ],
+
+        'log' => [
+            'transport' => 'log',
+            'channel' => env('MAIL_LOG_CHANNEL'),
+        ],
+
+        'array' => [
+            'transport' => 'array',
+        ],
+    ],
 
     /*
     |--------------------------------------------------------------------------
@@ -60,47 +88,6 @@
         'name' => env('MAIL_FROM_NAME', 'Example'),
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | E-Mail Encryption Protocol
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the encryption protocol that should be used when
-    | the application send e-mail messages. A sensible default using the
-    | transport layer security protocol should provide great security.
-    |
-    */
-
-    'encryption' => env('MAIL_ENCRYPTION', 'tls'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP Server Username
-    |--------------------------------------------------------------------------
-    |
-    | If your SMTP server requires a username for authentication, you should
-    | set it here. This will get used to authenticate with your server on
-    | connection. You may also set the "password" value below this one.
-    |
-    */
-
-    'username' => env('MAIL_USERNAME'),
-
-    'password' => env('MAIL_PASSWORD'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Sendmail System Path
-    |--------------------------------------------------------------------------
-    |
-    | When using the "sendmail" driver to send e-mails, we will need to know
-    | the path to where Sendmail lives on this server. A default path has
-    | been provided here, which will work well on most of your systems.
-    |
-    */
-
-    'sendmail' => '/usr/sbin/sendmail -bs',
-
     /*
     |--------------------------------------------------------------------------
     | Markdown Mail Settings
diff --git a/samples/server/petstore/php-laravel/lib/config/queue.php b/samples/server/petstore/php-laravel/lib/config/queue.php
index 391304f36357..00b76d651812 100644
--- a/samples/server/petstore/php-laravel/lib/config/queue.php
+++ b/samples/server/petstore/php-laravel/lib/config/queue.php
@@ -13,7 +13,7 @@
     |
     */
 
-    'default' => env('QUEUE_DRIVER', 'sync'),
+    'default' => env('QUEUE_CONNECTION', 'sync'),
 
     /*
     |--------------------------------------------------------------------------
@@ -46,21 +46,23 @@
             'host' => 'localhost',
             'queue' => 'default',
             'retry_after' => 90,
+            'block_for' => 0,
         ],
 
         'sqs' => [
             'driver' => 'sqs',
-            'key' => env('SQS_KEY', 'your-public-key'),
-            'secret' => env('SQS_SECRET', 'your-secret-key'),
+            'key' => env('AWS_ACCESS_KEY_ID'),
+            'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
             'queue' => env('SQS_QUEUE', 'your-queue-name'),
-            'region' => env('SQS_REGION', 'us-east-1'),
+            'suffix' => env('SQS_SUFFIX'),
+            'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
         ],
 
         'redis' => [
             'driver' => 'redis',
             'connection' => 'default',
-            'queue' => 'default',
+            'queue' => env('REDIS_QUEUE', 'default'),
             'retry_after' => 90,
             'block_for' => null,
         ],
@@ -79,6 +81,7 @@
     */
 
     'failed' => [
+        'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
         'database' => env('DB_CONNECTION', 'mysql'),
         'table' => 'failed_jobs',
     ],
diff --git a/samples/server/petstore/php-laravel/lib/config/services.php b/samples/server/petstore/php-laravel/lib/config/services.php
index aa1f7f82caeb..2a1d616c7746 100644
--- a/samples/server/petstore/php-laravel/lib/config/services.php
+++ b/samples/server/petstore/php-laravel/lib/config/services.php
@@ -8,31 +8,26 @@
     |--------------------------------------------------------------------------
     |
     | This file is for storing the credentials for third party services such
-    | as Stripe, Mailgun, SparkPost and others. This file provides a sane
-    | default location for this type of information, allowing packages
-    | to have a conventional place to find your various credentials.
+    | as Mailgun, Postmark, AWS and more. This file provides the de facto
+    | location for this type of information, allowing packages to have
+    | a conventional file to locate the various service credentials.
     |
     */
 
     'mailgun' => [
         'domain' => env('MAILGUN_DOMAIN'),
         'secret' => env('MAILGUN_SECRET'),
+        'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
     ],
 
-    'ses' => [
-        'key' => env('SES_KEY'),
-        'secret' => env('SES_SECRET'),
-        'region' => env('SES_REGION', 'us-east-1'),
-    ],
-
-    'sparkpost' => [
-        'secret' => env('SPARKPOST_SECRET'),
+    'postmark' => [
+        'token' => env('POSTMARK_TOKEN'),
     ],
 
-    'stripe' => [
-        'model' => App\User::class,
-        'key' => env('STRIPE_KEY'),
-        'secret' => env('STRIPE_SECRET'),
+    'ses' => [
+        'key' => env('AWS_ACCESS_KEY_ID'),
+        'secret' => env('AWS_SECRET_ACCESS_KEY'),
+        'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
     ],
 
 ];
diff --git a/samples/server/petstore/php-laravel/lib/config/session.php b/samples/server/petstore/php-laravel/lib/config/session.php
index 736fb3c79eb2..da692f3b8f79 100644
--- a/samples/server/petstore/php-laravel/lib/config/session.php
+++ b/samples/server/petstore/php-laravel/lib/config/session.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -12,7 +14,7 @@
     | you may specify any of the other wonderful drivers provided here.
     |
     | Supported: "file", "cookie", "database", "apc",
-    |            "memcached", "redis", "array"
+    |            "memcached", "redis", "dynamodb", "array"
     |
     */
 
@@ -70,7 +72,7 @@
     |
     */
 
-    'connection' => null,
+    'connection' => env('SESSION_CONNECTION', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -90,13 +92,13 @@
     | Session Cache Store
     |--------------------------------------------------------------------------
     |
-    | When using the "apc" or "memcached" session drivers, you may specify a
-    | cache store that should be used for these sessions. This value must
-    | correspond with one of the application's configured cache stores.
+    | When using the "apc", "memcached", or "dynamodb" session drivers you may
+    | list a cache store that should be used for these sessions. This value
+    | must match with one of the application's configured cache "stores".
     |
     */
 
-    'store' => null,
+    'store' => env('SESSION_STORE', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -124,7 +126,7 @@
 
     'cookie' => env(
         'SESSION_COOKIE',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_session'
+        Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
     ),
 
     /*
@@ -164,7 +166,7 @@
     |
     */
 
-    'secure' => env('SESSION_SECURE_COOKIE', false),
+    'secure' => env('SESSION_SECURE_COOKIE'),
 
     /*
     |--------------------------------------------------------------------------
@@ -186,12 +188,12 @@
     |
     | This option determines how your cookies behave when cross-site requests
     | take place, and can be used to mitigate CSRF attacks. By default, we
-    | do not enable this as other CSRF protection services are in place.
+    | will set this value to "lax" since this is a secure default value.
     |
-    | Supported: "lax", "strict"
+    | Supported: "lax", "strict", "none", null
     |
     */
 
-    'same_site' => null,
+    'same_site' => 'lax',
 
 ];
diff --git a/samples/server/petstore/php-laravel/lib/config/view.php b/samples/server/petstore/php-laravel/lib/config/view.php
index 2acfd9cc9c44..22b8a18d3258 100644
--- a/samples/server/petstore/php-laravel/lib/config/view.php
+++ b/samples/server/petstore/php-laravel/lib/config/view.php
@@ -28,6 +28,9 @@
     |
     */
 
-    'compiled' => realpath(storage_path('framework/views')),
+    'compiled' => env(
+        'VIEW_COMPILED_PATH',
+        realpath(storage_path('framework/views'))
+    ),
 
 ];
diff --git a/samples/server/petstore/php-laravel/lib/database/.gitignore b/samples/server/petstore/php-laravel/lib/database/.gitignore
index 9b1dffd90fdc..97fc976772ab 100644
--- a/samples/server/petstore/php-laravel/lib/database/.gitignore
+++ b/samples/server/petstore/php-laravel/lib/database/.gitignore
@@ -1 +1,2 @@
 *.sqlite
+*.sqlite-journal
diff --git a/samples/server/petstore/php-laravel/lib/database/factories/UserFactory.php b/samples/server/petstore/php-laravel/lib/database/factories/UserFactory.php
index facf2337b93e..741edead6192 100644
--- a/samples/server/petstore/php-laravel/lib/database/factories/UserFactory.php
+++ b/samples/server/petstore/php-laravel/lib/database/factories/UserFactory.php
@@ -1,6 +1,10 @@
 <?php
 
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\User;
 use Faker\Generator as Faker;
+use Illuminate\Support\Str;
 
 /*
 |--------------------------------------------------------------------------
@@ -13,11 +17,12 @@
 |
 */
 
-$factory->define(App\User::class, function (Faker $faker) {
+$factory->define(User::class, function (Faker $faker) {
     return [
         'name' => $faker->name,
         'email' => $faker->unique()->safeEmail,
-        'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret
-        'remember_token' => str_random(10),
+        'email_verified_at' => now(),
+        'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
+        'remember_token' => Str::random(10),
     ];
 });
diff --git a/samples/server/petstore/php-laravel/lib/database/migrations/2014_10_12_000000_create_users_table.php b/samples/server/petstore/php-laravel/lib/database/migrations/2014_10_12_000000_create_users_table.php
index 689cbeea4717..621a24eb734b 100644
--- a/samples/server/petstore/php-laravel/lib/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/samples/server/petstore/php-laravel/lib/database/migrations/2014_10_12_000000_create_users_table.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateUsersTable extends Migration
 {
@@ -14,9 +14,10 @@ class CreateUsersTable extends Migration
     public function up()
     {
         Schema::create('users', function (Blueprint $table) {
-            $table->increments('id');
+            $table->id();
             $table->string('name');
             $table->string('email')->unique();
+            $table->timestamp('email_verified_at')->nullable();
             $table->string('password');
             $table->rememberToken();
             $table->timestamps();
diff --git a/samples/server/petstore/php-laravel/lib/database/migrations/2014_10_12_100000_create_password_resets_table.php b/samples/server/petstore/php-laravel/lib/database/migrations/2014_10_12_100000_create_password_resets_table.php
deleted file mode 100644
index 0d5cb84502cc..000000000000
--- a/samples/server/petstore/php-laravel/lib/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreatePasswordResetsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('password_resets', function (Blueprint $table) {
-            $table->string('email')->index();
-            $table->string('token');
-            $table->timestamp('created_at')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('password_resets');
-    }
-}
diff --git a/samples/server/petstore/php-laravel/lib/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/samples/server/petstore/php-laravel/lib/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
new file mode 100644
index 000000000000..9bddee36cb3f
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateFailedJobsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('failed_jobs', function (Blueprint $table) {
+            $table->id();
+            $table->text('connection');
+            $table->text('queue');
+            $table->longText('payload');
+            $table->longText('exception');
+            $table->timestamp('failed_at')->useCurrent();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('failed_jobs');
+    }
+}
diff --git a/samples/server/petstore/php-laravel/lib/database/seeds/DatabaseSeeder.php b/samples/server/petstore/php-laravel/lib/database/seeds/DatabaseSeeder.php
index 91cb6d1c2ded..237dfc5d0d82 100644
--- a/samples/server/petstore/php-laravel/lib/database/seeds/DatabaseSeeder.php
+++ b/samples/server/petstore/php-laravel/lib/database/seeds/DatabaseSeeder.php
@@ -11,6 +11,6 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        // $this->call(UsersTableSeeder::class);
+        // $this->call(UserSeeder::class);
     }
 }
diff --git a/samples/server/petstore/php-laravel/lib/package.json b/samples/server/petstore/php-laravel/lib/package.json
index e81ab87fb216..2c35181c9b14 100644
--- a/samples/server/petstore/php-laravel/lib/package.json
+++ b/samples/server/petstore/php-laravel/lib/package.json
@@ -5,18 +5,17 @@
         "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
         "watch": "npm run development -- --watch",
         "watch-poll": "npm run watch -- --watch-poll",
-        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js",
         "prod": "npm run production",
         "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "devDependencies": {
-        "axios": "^0.18",
-        "bootstrap": "^4.0.0",
-        "popper.js": "^1.12",
-        "cross-env": "^5.1",
-        "jquery": "^3.2",
-        "laravel-mix": "^2.0",
-        "lodash": "^4.17.4",
-        "vue": "^2.5.7"
+        "axios": "^0.19",
+        "cross-env": "^7.0",
+        "laravel-mix": "^5.0.1",
+        "lodash": "^4.17.13",
+        "resolve-url-loader": "^3.1.0",
+        "sass": "^1.15.2",
+        "sass-loader": "^8.0.0"
     }
 }
diff --git a/samples/server/petstore/php-laravel/lib/phpunit.xml b/samples/server/petstore/php-laravel/lib/phpunit.xml
index 1037dd6ad088..964ff0c5717e 100644
--- a/samples/server/petstore/php-laravel/lib/phpunit.xml
+++ b/samples/server/petstore/php-laravel/lib/phpunit.xml
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+>
     <testsuites>
-        <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
-        </testsuite>
-
         <testsuite name="Unit">
             <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
+        <testsuite name="Feature">
+            <directory suffix="Test.php">./tests/Feature</directory>
+        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
@@ -23,12 +18,14 @@
         </whitelist>
     </filter>
     <php>
-        <ini name="error_reporting" value="E_ALL" />
-        <env name="APP_ENV" value="testing"/>
-        <env name="BCRYPT_ROUNDS" value="4"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
-        <env name="MAIL_DRIVER" value="array"/>
+        <server name="APP_ENV" value="testing"/>
+        <server name="BCRYPT_ROUNDS" value="4"/>
+        <server name="CACHE_DRIVER" value="array"/>
+        <server name="DB_CONNECTION" value="sqlite"/>
+        <server name="DB_DATABASE" value=":memory:"/>
+        <server name="MAIL_MAILER" value="array"/>
+        <server name="QUEUE_CONNECTION" value="sync"/>
+        <server name="SESSION_DRIVER" value="array"/>
+        <server name="TELESCOPE_ENABLED" value="false"/>
     </php>
 </phpunit>
diff --git a/samples/server/petstore/php-laravel/lib/public/.htaccess b/samples/server/petstore/php-laravel/lib/public/.htaccess
index b75525bedcd8..3aec5e27e5db 100644
--- a/samples/server/petstore/php-laravel/lib/public/.htaccess
+++ b/samples/server/petstore/php-laravel/lib/public/.htaccess
@@ -14,7 +14,7 @@
     RewriteCond %{REQUEST_URI} (.+)/$
     RewriteRule ^ %1 [L,R=301]
 
-    # Handle Front Controller...
+    # Send Requests To Front Controller...
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteRule ^ index.php [L]
diff --git a/samples/server/petstore/php-laravel/lib/public/css/app.css b/samples/server/petstore/php-laravel/lib/public/css/app.css
deleted file mode 100644
index 8b4dc7e9e916..000000000000
--- a/samples/server/petstore/php-laravel/lib/public/css/app.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@import url(https://fonts.googleapis.com/css?family=Raleway:300,400,600);/*!
- * Bootstrap v4.0.0 (https://getbootstrap.com)
- * Copyright 2011-2018 The Bootstrap Authors
- * Copyright 2011-2018 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:"Raleway",sans-serif;--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}*,:after,:before{-webkit-box-sizing:border-box;box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:Raleway,sans-serif;font-size:.9rem;font-weight:400;line-height:1.6;color:#212529;text-align:left;background-color:#f5f8fa}[tabindex="-1"]:focus{outline:0!important}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{font-style:normal;line-height:inherit}address,dl,ol,ul{margin-bottom:1rem}dl,ol,ul{margin-top:0}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]),a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-bottom:.5rem;font-family:inherit;font-weight:500;line-height:1.2;color:inherit}.h1,h1{font-size:2.25rem}.h2,h2{font-size:1.8rem}.h3,h3{font-size:1.575rem}.h4,h4{font-size:1.35rem}.h5,h5{font-size:1.125rem}.h6,h6{font-size:.9rem}.lead{font-size:1.125rem;font-weight:300}.display-1{font-size:6rem}.display-1,.display-2{font-weight:300;line-height:1.2}.display-2{font-size:5.5rem}.display-3{font-size:4.5rem}.display-3,.display-4{font-weight:300;line-height:1.2}.display-4{font-size:3.5rem}hr{margin-top:1rem;margin-bottom:1rem;border:0;border-top:1px solid rgba(0,0,0,.1)}.small,small{font-size:80%;font-weight:400}.mark,mark{padding:.2em;background-color:#fcf8e3}.list-inline,.list-unstyled{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:.5rem}.initialism{font-size:90%;text-transform:uppercase}.blockquote{margin-bottom:1rem;font-size:1.125rem}.blockquote-footer{display:block;font-size:80%;color:#6c757d}.blockquote-footer:before{content:"\2014   \A0"}.img-fluid,.img-thumbnail{max-width:100%;height:auto}.img-thumbnail{padding:.25rem;background-color:#f5f8fa;border:1px solid #dee2e6;border-radius:.25rem}.figure{display:inline-block}.figure-img{margin-bottom:.5rem;line-height:1}.figure-caption{font-size:90%;color:#6c757d}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}code{font-size:87.5%;color:#e83e8c;word-break:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:87.5%;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:100%;font-weight:700}pre{display:block;font-size:87.5%;color:#212529}pre code{font-size:inherit;color:inherit;word-break:normal}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:576px){.container{max-width:540px}}@media (min-width:768px){.container{max-width:720px}}@media (min-width:992px){.container{max-width:960px}}@media (min-width:1200px){.container{max-width:1140px}}.container-fluid{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}.no-gutters{margin-right:0;margin-left:0}.no-gutters>.col,.no-gutters>[class*=col-]{padding-right:0;padding-left:0}.col,.col-1,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-10,.col-11,.col-12,.col-auto,.col-lg,.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-auto,.col-md,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-md-auto,.col-sm,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-auto,.col-xl,.col-xl-1,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-auto{position:relative;width:100%;min-height:1px;padding-right:15px;padding-left:15px}.col{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-1,.col-auto{-webkit-box-flex:0}.col-1{-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-2{-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-2,.col-3{-webkit-box-flex:0}.col-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-4{-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-4,.col-5{-webkit-box-flex:0}.col-5{-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-6,.col-7{-webkit-box-flex:0}.col-7{-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-8{-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-8,.col-9{-webkit-box-flex:0}.col-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-10{-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-10,.col-11{-webkit-box-flex:0}.col-11{-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-1{margin-left:8.33333333%}.offset-2{margin-left:16.66666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.33333333%}.offset-5{margin-left:41.66666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.33333333%}.offset-8{margin-left:66.66666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.33333333%}.offset-11{margin-left:91.66666667%}@media (min-width:576px){.col-sm{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-sm-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-sm-1{-webkit-box-flex:0;-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-sm-2{-webkit-box-flex:0;-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-sm-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-sm-4{-webkit-box-flex:0;-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-sm-5{-webkit-box-flex:0;-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-sm-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-sm-7{-webkit-box-flex:0;-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-sm-8{-webkit-box-flex:0;-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-sm-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-sm-10{-webkit-box-flex:0;-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-sm-11{-webkit-box-flex:0;-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-sm-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-sm-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-sm-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-sm-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-sm-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-sm-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-sm-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-sm-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-sm-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-sm-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-sm-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-sm-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-sm-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-sm-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-sm-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-sm-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.33333333%}.offset-sm-2{margin-left:16.66666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.33333333%}.offset-sm-5{margin-left:41.66666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.33333333%}.offset-sm-8{margin-left:66.66666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.33333333%}.offset-sm-11{margin-left:91.66666667%}}@media (min-width:768px){.col-md{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-md-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-md-1{-webkit-box-flex:0;-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-md-2{-webkit-box-flex:0;-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-md-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-md-4{-webkit-box-flex:0;-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-md-5{-webkit-box-flex:0;-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-md-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-md-7{-webkit-box-flex:0;-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-md-8{-webkit-box-flex:0;-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-md-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-md-10{-webkit-box-flex:0;-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-md-11{-webkit-box-flex:0;-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-md-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-md-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-md-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-md-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-md-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-md-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-md-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-md-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-md-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-md-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-md-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-md-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-md-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-md-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-md-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-md-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.33333333%}.offset-md-2{margin-left:16.66666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.33333333%}.offset-md-5{margin-left:41.66666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.33333333%}.offset-md-8{margin-left:66.66666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.33333333%}.offset-md-11{margin-left:91.66666667%}}@media (min-width:992px){.col-lg{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-lg-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-lg-1{-webkit-box-flex:0;-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-lg-2{-webkit-box-flex:0;-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-lg-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-lg-4{-webkit-box-flex:0;-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-lg-5{-webkit-box-flex:0;-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-lg-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-lg-7{-webkit-box-flex:0;-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-lg-8{-webkit-box-flex:0;-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-lg-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-lg-10{-webkit-box-flex:0;-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-lg-11{-webkit-box-flex:0;-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-lg-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-lg-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-lg-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-lg-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-lg-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-lg-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-lg-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-lg-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-lg-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-lg-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-lg-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-lg-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-lg-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-lg-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-lg-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-lg-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.33333333%}.offset-lg-2{margin-left:16.66666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.33333333%}.offset-lg-5{margin-left:41.66666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.33333333%}.offset-lg-8{margin-left:66.66666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.33333333%}.offset-lg-11{margin-left:91.66666667%}}@media (min-width:1200px){.col-xl{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-xl-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-xl-1{-webkit-box-flex:0;-ms-flex:0 0 8.33333333%;flex:0 0 8.33333333%;max-width:8.33333333%}.col-xl-2{-webkit-box-flex:0;-ms-flex:0 0 16.66666667%;flex:0 0 16.66666667%;max-width:16.66666667%}.col-xl-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-xl-4{-webkit-box-flex:0;-ms-flex:0 0 33.33333333%;flex:0 0 33.33333333%;max-width:33.33333333%}.col-xl-5{-webkit-box-flex:0;-ms-flex:0 0 41.66666667%;flex:0 0 41.66666667%;max-width:41.66666667%}.col-xl-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-xl-7{-webkit-box-flex:0;-ms-flex:0 0 58.33333333%;flex:0 0 58.33333333%;max-width:58.33333333%}.col-xl-8{-webkit-box-flex:0;-ms-flex:0 0 66.66666667%;flex:0 0 66.66666667%;max-width:66.66666667%}.col-xl-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-xl-10{-webkit-box-flex:0;-ms-flex:0 0 83.33333333%;flex:0 0 83.33333333%;max-width:83.33333333%}.col-xl-11{-webkit-box-flex:0;-ms-flex:0 0 91.66666667%;flex:0 0 91.66666667%;max-width:91.66666667%}.col-xl-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-xl-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-xl-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-xl-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-xl-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-xl-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-xl-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-xl-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-xl-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-xl-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-xl-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-xl-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-xl-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-xl-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-xl-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-xl-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.33333333%}.offset-xl-2{margin-left:16.66666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.33333333%}.offset-xl-5{margin-left:41.66666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.33333333%}.offset-xl-8{margin-left:66.66666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.33333333%}.offset-xl-11{margin-left:91.66666667%}}.table{width:100%;max-width:100%;margin-bottom:1rem;background-color:transparent}.table td,.table th{padding:.75rem;vertical-align:top;border-top:1px solid #dee2e6}.table thead th{vertical-align:bottom;border-bottom:2px solid #dee2e6}.table tbody+tbody{border-top:2px solid #dee2e6}.table .table{background-color:#f5f8fa}.table-sm td,.table-sm th{padding:.3rem}.table-bordered,.table-bordered td,.table-bordered th{border:1px solid #dee2e6}.table-bordered thead td,.table-bordered thead th{border-bottom-width:2px}.table-striped tbody tr:nth-of-type(odd){background-color:rgba(0,0,0,.05)}.table-hover tbody tr:hover{background-color:rgba(0,0,0,.075)}.table-primary,.table-primary>td,.table-primary>th{background-color:#b8daff}.table-hover .table-primary:hover,.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#9fcdff}.table-secondary,.table-secondary>td,.table-secondary>th{background-color:#d6d8db}.table-hover .table-secondary:hover,.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#c8cbcf}.table-success,.table-success>td,.table-success>th{background-color:#c3e6cb}.table-hover .table-success:hover,.table-hover .table-success:hover>td,.table-hover .table-success:hover>th{background-color:#b1dfbb}.table-info,.table-info>td,.table-info>th{background-color:#bee5eb}.table-hover .table-info:hover,.table-hover .table-info:hover>td,.table-hover .table-info:hover>th{background-color:#abdde5}.table-warning,.table-warning>td,.table-warning>th{background-color:#ffeeba}.table-hover .table-warning:hover,.table-hover .table-warning:hover>td,.table-hover .table-warning:hover>th{background-color:#ffe8a1}.table-danger,.table-danger>td,.table-danger>th{background-color:#f5c6cb}.table-hover .table-danger:hover,.table-hover .table-danger:hover>td,.table-hover .table-danger:hover>th{background-color:#f1b0b7}.table-light,.table-light>td,.table-light>th{background-color:#fdfdfe}.table-hover .table-light:hover,.table-hover .table-light:hover>td,.table-hover .table-light:hover>th{background-color:#ececf6}.table-dark,.table-dark>td,.table-dark>th{background-color:#c6c8ca}.table-hover .table-dark:hover,.table-hover .table-dark:hover>td,.table-hover .table-dark:hover>th{background-color:#b9bbbe}.table-active,.table-active>td,.table-active>th,.table-hover .table-active:hover,.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(0,0,0,.075)}.table .thead-dark th{color:#f5f8fa;background-color:#212529;border-color:#32383e}.table .thead-light th{color:#495057;background-color:#e9ecef;border-color:#dee2e6}.table-dark{color:#f5f8fa;background-color:#212529}.table-dark td,.table-dark th,.table-dark thead th{border-color:#32383e}.table-dark.table-bordered{border:0}.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:hsla(0,0%,100%,.05)}.table-dark.table-hover tbody tr:hover{background-color:hsla(0,0%,100%,.075)}@media (max-width:575.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-sm>.table-bordered{border:0}}@media (max-width:767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-md>.table-bordered{border:0}}@media (max-width:991.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-lg>.table-bordered{border:0}}@media (max-width:1199.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-xl>.table-bordered{border:0}}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive>.table-bordered{border:0}.form-control{display:block;width:100%;padding:.375rem .75rem;font-size:.9rem;line-height:1.6;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;-webkit-transition:border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-box-shadow .15s ease-in-out}.form-control::-ms-expand{background-color:transparent;border:0}.form-control:focus{color:#495057;background-color:#fff;border-color:#80bdff;outline:0;-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.form-control::-webkit-input-placeholder{color:#6c757d;opacity:1}.form-control:-ms-input-placeholder,.form-control::-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::placeholder{color:#6c757d;opacity:1}.form-control:disabled,.form-control[readonly]{background-color:#e9ecef;opacity:1}select.form-control:not([size]):not([multiple]){height:calc(2.19rem + 2px)}select.form-control:focus::-ms-value{color:#495057;background-color:#fff}.form-control-file,.form-control-range{display:block;width:100%}.col-form-label{padding-top:calc(.375rem + 1px);padding-bottom:calc(.375rem + 1px);margin-bottom:0;font-size:inherit;line-height:1.6}.col-form-label-lg{padding-top:calc(.5rem + 1px);padding-bottom:calc(.5rem + 1px);font-size:1.125rem;line-height:1.5}.col-form-label-sm{padding-top:calc(.25rem + 1px);padding-bottom:calc(.25rem + 1px);font-size:.7875rem;line-height:1.5}.form-control-plaintext{display:block;width:100%;padding-top:.375rem;padding-bottom:.375rem;margin-bottom:0;line-height:1.6;background-color:transparent;border:solid transparent;border-width:1px 0}.form-control-plaintext.form-control-lg,.form-control-plaintext.form-control-sm,.input-group-lg>.form-control-plaintext.form-control,.input-group-lg>.input-group-append>.form-control-plaintext.btn,.input-group-lg>.input-group-append>.form-control-plaintext.input-group-text,.input-group-lg>.input-group-prepend>.form-control-plaintext.btn,.input-group-lg>.input-group-prepend>.form-control-plaintext.input-group-text,.input-group-sm>.form-control-plaintext.form-control,.input-group-sm>.input-group-append>.form-control-plaintext.btn,.input-group-sm>.input-group-append>.form-control-plaintext.input-group-text,.input-group-sm>.input-group-prepend>.form-control-plaintext.btn,.input-group-sm>.input-group-prepend>.form-control-plaintext.input-group-text{padding-right:0;padding-left:0}.form-control-sm,.input-group-sm>.form-control,.input-group-sm>.input-group-append>.btn,.input-group-sm>.input-group-append>.input-group-text,.input-group-sm>.input-group-prepend>.btn,.input-group-sm>.input-group-prepend>.input-group-text{padding:.25rem .5rem;font-size:.7875rem;line-height:1.5;border-radius:.2rem}.input-group-sm>.input-group-append>select.btn:not([size]):not([multiple]),.input-group-sm>.input-group-append>select.input-group-text:not([size]):not([multiple]),.input-group-sm>.input-group-prepend>select.btn:not([size]):not([multiple]),.input-group-sm>.input-group-prepend>select.input-group-text:not([size]):not([multiple]),.input-group-sm>select.form-control:not([size]):not([multiple]),select.form-control-sm:not([size]):not([multiple]){height:calc(1.68125rem + 2px)}.form-control-lg,.input-group-lg>.form-control,.input-group-lg>.input-group-append>.btn,.input-group-lg>.input-group-append>.input-group-text,.input-group-lg>.input-group-prepend>.btn,.input-group-lg>.input-group-prepend>.input-group-text{padding:.5rem 1rem;font-size:1.125rem;line-height:1.5;border-radius:.3rem}.input-group-lg>.input-group-append>select.btn:not([size]):not([multiple]),.input-group-lg>.input-group-append>select.input-group-text:not([size]):not([multiple]),.input-group-lg>.input-group-prepend>select.btn:not([size]):not([multiple]),.input-group-lg>.input-group-prepend>select.input-group-text:not([size]):not([multiple]),.input-group-lg>select.form-control:not([size]):not([multiple]),select.form-control-lg:not([size]):not([multiple]){height:calc(2.6875rem + 2px)}.form-group{margin-bottom:1rem}.form-text{display:block;margin-top:.25rem}.form-row{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-5px;margin-left:-5px}.form-row>.col,.form-row>[class*=col-]{padding-right:5px;padding-left:5px}.form-check{position:relative;display:block;padding-left:1.25rem}.form-check-input{position:absolute;margin-top:.3rem;margin-left:-1.25rem}.form-check-input:disabled~.form-check-label{color:#6c757d}.form-check-label{margin-bottom:0}.form-check-inline{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding-left:0;margin-right:.75rem}.form-check-inline .form-check-input{position:static;margin-top:0;margin-right:.3125rem;margin-left:0}.valid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#28a745}.valid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.5rem;margin-top:.1rem;font-size:.875rem;line-height:1;color:#fff;background-color:rgba(40,167,69,.8);border-radius:.2rem}.custom-select.is-valid,.form-control.is-valid,.was-validated .custom-select:valid,.was-validated .form-control:valid{border-color:#28a745}.custom-select.is-valid:focus,.form-control.is-valid:focus,.was-validated .custom-select:valid:focus,.was-validated .form-control:valid:focus{border-color:#28a745;-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.25);box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.custom-select.is-valid~.valid-feedback,.custom-select.is-valid~.valid-tooltip,.form-control.is-valid~.valid-feedback,.form-control.is-valid~.valid-tooltip,.was-validated .custom-select:valid~.valid-feedback,.was-validated .custom-select:valid~.valid-tooltip,.was-validated .form-control:valid~.valid-feedback,.was-validated .form-control:valid~.valid-tooltip{display:block}.form-check-input.is-valid~.form-check-label,.was-validated .form-check-input:valid~.form-check-label{color:#28a745}.form-check-input.is-valid~.valid-feedback,.form-check-input.is-valid~.valid-tooltip,.was-validated .form-check-input:valid~.valid-feedback,.was-validated .form-check-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid~.custom-control-label,.was-validated .custom-control-input:valid~.custom-control-label{color:#28a745}.custom-control-input.is-valid~.custom-control-label:before,.was-validated .custom-control-input:valid~.custom-control-label:before{background-color:#71dd8a}.custom-control-input.is-valid~.valid-feedback,.custom-control-input.is-valid~.valid-tooltip,.was-validated .custom-control-input:valid~.valid-feedback,.was-validated .custom-control-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid:checked~.custom-control-label:before,.was-validated .custom-control-input:valid:checked~.custom-control-label:before{background-color:#34ce57}.custom-control-input.is-valid:focus~.custom-control-label:before,.was-validated .custom-control-input:valid:focus~.custom-control-label:before{-webkit-box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(40,167,69,.25);box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(40,167,69,.25)}.custom-file-input.is-valid~.custom-file-label,.was-validated .custom-file-input:valid~.custom-file-label{border-color:#28a745}.custom-file-input.is-valid~.custom-file-label:before,.was-validated .custom-file-input:valid~.custom-file-label:before{border-color:inherit}.custom-file-input.is-valid~.valid-feedback,.custom-file-input.is-valid~.valid-tooltip,.was-validated .custom-file-input:valid~.valid-feedback,.was-validated .custom-file-input:valid~.valid-tooltip{display:block}.custom-file-input.is-valid:focus~.custom-file-label,.was-validated .custom-file-input:valid:focus~.custom-file-label{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.25);box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.invalid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#dc3545}.invalid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.5rem;margin-top:.1rem;font-size:.875rem;line-height:1;color:#fff;background-color:rgba(220,53,69,.8);border-radius:.2rem}.custom-select.is-invalid,.form-control.is-invalid,.was-validated .custom-select:invalid,.was-validated .form-control:invalid{border-color:#dc3545}.custom-select.is-invalid:focus,.form-control.is-invalid:focus,.was-validated .custom-select:invalid:focus,.was-validated .form-control:invalid:focus{border-color:#dc3545;-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.25);box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.custom-select.is-invalid~.invalid-feedback,.custom-select.is-invalid~.invalid-tooltip,.form-control.is-invalid~.invalid-feedback,.form-control.is-invalid~.invalid-tooltip,.was-validated .custom-select:invalid~.invalid-feedback,.was-validated .custom-select:invalid~.invalid-tooltip,.was-validated .form-control:invalid~.invalid-feedback,.was-validated .form-control:invalid~.invalid-tooltip{display:block}.form-check-input.is-invalid~.form-check-label,.was-validated .form-check-input:invalid~.form-check-label{color:#dc3545}.form-check-input.is-invalid~.invalid-feedback,.form-check-input.is-invalid~.invalid-tooltip,.was-validated .form-check-input:invalid~.invalid-feedback,.was-validated .form-check-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid~.custom-control-label,.was-validated .custom-control-input:invalid~.custom-control-label{color:#dc3545}.custom-control-input.is-invalid~.custom-control-label:before,.was-validated .custom-control-input:invalid~.custom-control-label:before{background-color:#efa2a9}.custom-control-input.is-invalid~.invalid-feedback,.custom-control-input.is-invalid~.invalid-tooltip,.was-validated .custom-control-input:invalid~.invalid-feedback,.was-validated .custom-control-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid:checked~.custom-control-label:before,.was-validated .custom-control-input:invalid:checked~.custom-control-label:before{background-color:#e4606d}.custom-control-input.is-invalid:focus~.custom-control-label:before,.was-validated .custom-control-input:invalid:focus~.custom-control-label:before{-webkit-box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(220,53,69,.25);box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(220,53,69,.25)}.custom-file-input.is-invalid~.custom-file-label,.was-validated .custom-file-input:invalid~.custom-file-label{border-color:#dc3545}.custom-file-input.is-invalid~.custom-file-label:before,.was-validated .custom-file-input:invalid~.custom-file-label:before{border-color:inherit}.custom-file-input.is-invalid~.invalid-feedback,.custom-file-input.is-invalid~.invalid-tooltip,.was-validated .custom-file-input:invalid~.invalid-feedback,.was-validated .custom-file-input:invalid~.invalid-tooltip{display:block}.custom-file-input.is-invalid:focus~.custom-file-label,.was-validated .custom-file-input:invalid:focus~.custom-file-label{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.25);box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-inline{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.form-inline .form-check{width:100%}@media (min-width:576px){.form-inline label{-ms-flex-align:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.form-inline .form-group,.form-inline label{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;align-items:center;margin-bottom:0}.form-inline .form-group{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-align:center}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-plaintext{display:inline-block}.form-inline .input-group{width:auto}.form-inline .form-check{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:auto;padding-left:0}.form-inline .form-check-input{position:relative;margin-top:0;margin-right:.25rem;margin-left:0}.form-inline .custom-control{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.form-inline .custom-control-label{margin-bottom:0}}.btn{display:inline-block;font-weight:400;text-align:center;white-space:nowrap;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border:1px solid transparent;padding:.375rem .75rem;font-size:.9rem;line-height:1.6;border-radius:.25rem;-webkit-transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,-webkit-box-shadow .15s ease-in-out;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-box-shadow .15s ease-in-out}.btn:focus,.btn:hover{text-decoration:none}.btn.focus,.btn:focus{outline:0;-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.btn.disabled,.btn:disabled{opacity:.65}.btn:not(:disabled):not(.disabled){cursor:pointer}.btn:not(:disabled):not(.disabled).active,.btn:not(:disabled):not(.disabled):active{background-image:none}a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}.btn-primary{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:hover{color:#fff;background-color:#0069d9;border-color:#0062cc}.btn-primary.focus,.btn-primary:focus{-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.5);box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:not(:disabled):not(.disabled).active,.btn-primary:not(:disabled):not(.disabled):active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#0062cc;border-color:#005cbf}.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-primary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.5);box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-secondary{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:hover{color:#fff;background-color:#5a6268;border-color:#545b62}.btn-secondary.focus,.btn-secondary:focus{-webkit-box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5);box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5)}.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:not(:disabled):not(.disabled).active,.btn-secondary:not(:disabled):not(.disabled):active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#545b62;border-color:#4e555b}.btn-secondary:not(:disabled):not(.disabled).active:focus,.btn-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5);box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5)}.btn-success{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:hover{color:#fff;background-color:#218838;border-color:#1e7e34}.btn-success.focus,.btn-success:focus{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.5);box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:not(:disabled):not(.disabled).active,.btn-success:not(:disabled):not(.disabled):active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#1e7e34;border-color:#1c7430}.btn-success:not(:disabled):not(.disabled).active:focus,.btn-success:not(:disabled):not(.disabled):active:focus,.show>.btn-success.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.5);box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-info{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:hover{color:#fff;background-color:#138496;border-color:#117a8b}.btn-info.focus,.btn-info:focus{-webkit-box-shadow:0 0 0 .2rem rgba(23,162,184,.5);box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-info.disabled,.btn-info:disabled{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:not(:disabled):not(.disabled).active,.btn-info:not(:disabled):not(.disabled):active,.show>.btn-info.dropdown-toggle{color:#fff;background-color:#117a8b;border-color:#10707f}.btn-info:not(:disabled):not(.disabled).active:focus,.btn-info:not(:disabled):not(.disabled):active:focus,.show>.btn-info.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(23,162,184,.5);box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-warning{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:hover{color:#212529;background-color:#e0a800;border-color:#d39e00}.btn-warning.focus,.btn-warning:focus{-webkit-box-shadow:0 0 0 .2rem rgba(255,193,7,.5);box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-warning.disabled,.btn-warning:disabled{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:not(:disabled):not(.disabled).active,.btn-warning:not(:disabled):not(.disabled):active,.show>.btn-warning.dropdown-toggle{color:#212529;background-color:#d39e00;border-color:#c69500}.btn-warning:not(:disabled):not(.disabled).active:focus,.btn-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-warning.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(255,193,7,.5);box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-danger{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:hover{color:#fff;background-color:#c82333;border-color:#bd2130}.btn-danger.focus,.btn-danger:focus{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.5);box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-danger.disabled,.btn-danger:disabled{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:not(:disabled):not(.disabled).active,.btn-danger:not(:disabled):not(.disabled):active,.show>.btn-danger.dropdown-toggle{color:#fff;background-color:#bd2130;border-color:#b21f2d}.btn-danger:not(:disabled):not(.disabled).active:focus,.btn-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-danger.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.5);box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-light{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:hover{color:#212529;background-color:#e2e6ea;border-color:#dae0e5}.btn-light.focus,.btn-light:focus{-webkit-box-shadow:0 0 0 .2rem rgba(248,249,250,.5);box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-light.disabled,.btn-light:disabled{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:not(:disabled):not(.disabled).active,.btn-light:not(:disabled):not(.disabled):active,.show>.btn-light.dropdown-toggle{color:#212529;background-color:#dae0e5;border-color:#d3d9df}.btn-light:not(:disabled):not(.disabled).active:focus,.btn-light:not(:disabled):not(.disabled):active:focus,.show>.btn-light.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(248,249,250,.5);box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-dark{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:hover{color:#fff;background-color:#23272b;border-color:#1d2124}.btn-dark.focus,.btn-dark:focus{-webkit-box-shadow:0 0 0 .2rem rgba(52,58,64,.5);box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-dark.disabled,.btn-dark:disabled{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:not(:disabled):not(.disabled).active,.btn-dark:not(:disabled):not(.disabled):active,.show>.btn-dark.dropdown-toggle{color:#fff;background-color:#1d2124;border-color:#171a1d}.btn-dark:not(:disabled):not(.disabled).active:focus,.btn-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-dark.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(52,58,64,.5);box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-primary{color:#007bff;background-color:transparent;background-image:none;border-color:#007bff}.btn-outline-primary:hover{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary.focus,.btn-outline-primary:focus{-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.5);box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#007bff;background-color:transparent}.btn-outline-primary:not(:disabled):not(.disabled).active,.btn-outline-primary:not(:disabled):not(.disabled):active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.5);box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-secondary{color:#6c757d;background-color:transparent;background-image:none;border-color:#6c757d}.btn-outline-secondary:hover{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary.focus,.btn-outline-secondary:focus{-webkit-box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5);box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5)}.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#6c757d;background-color:transparent}.btn-outline-secondary:not(:disabled):not(.disabled).active,.btn-outline-secondary:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5);box-shadow:0 0 0 .2rem hsla(208,7%,46%,.5)}.btn-outline-success{color:#28a745;background-color:transparent;background-image:none;border-color:#28a745}.btn-outline-success:hover{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success.focus,.btn-outline-success:focus{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.5);box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-success.disabled,.btn-outline-success:disabled{color:#28a745;background-color:transparent}.btn-outline-success:not(:disabled):not(.disabled).active,.btn-outline-success:not(:disabled):not(.disabled):active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success:not(:disabled):not(.disabled).active:focus,.btn-outline-success:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-success.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(40,167,69,.5);box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-info{color:#17a2b8;background-color:transparent;background-image:none;border-color:#17a2b8}.btn-outline-info:hover{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info.focus,.btn-outline-info:focus{-webkit-box-shadow:0 0 0 .2rem rgba(23,162,184,.5);box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-info.disabled,.btn-outline-info:disabled{color:#17a2b8;background-color:transparent}.btn-outline-info:not(:disabled):not(.disabled).active,.btn-outline-info:not(:disabled):not(.disabled):active,.show>.btn-outline-info.dropdown-toggle{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info:not(:disabled):not(.disabled).active:focus,.btn-outline-info:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-info.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(23,162,184,.5);box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-warning{color:#ffc107;background-color:transparent;background-image:none;border-color:#ffc107}.btn-outline-warning:hover{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning.focus,.btn-outline-warning:focus{-webkit-box-shadow:0 0 0 .2rem rgba(255,193,7,.5);box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-warning.disabled,.btn-outline-warning:disabled{color:#ffc107;background-color:transparent}.btn-outline-warning:not(:disabled):not(.disabled).active,.btn-outline-warning:not(:disabled):not(.disabled):active,.show>.btn-outline-warning.dropdown-toggle{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning:not(:disabled):not(.disabled).active:focus,.btn-outline-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-warning.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(255,193,7,.5);box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-danger{color:#dc3545;background-color:transparent;background-image:none;border-color:#dc3545}.btn-outline-danger:hover{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger.focus,.btn-outline-danger:focus{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.5);box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-danger.disabled,.btn-outline-danger:disabled{color:#dc3545;background-color:transparent}.btn-outline-danger:not(:disabled):not(.disabled).active,.btn-outline-danger:not(:disabled):not(.disabled):active,.show>.btn-outline-danger.dropdown-toggle{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger:not(:disabled):not(.disabled).active:focus,.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-danger.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(220,53,69,.5);box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-light{color:#f8f9fa;background-color:transparent;background-image:none;border-color:#f8f9fa}.btn-outline-light:hover{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light.focus,.btn-outline-light:focus{-webkit-box-shadow:0 0 0 .2rem rgba(248,249,250,.5);box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-light.disabled,.btn-outline-light:disabled{color:#f8f9fa;background-color:transparent}.btn-outline-light:not(:disabled):not(.disabled).active,.btn-outline-light:not(:disabled):not(.disabled):active,.show>.btn-outline-light.dropdown-toggle{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light:not(:disabled):not(.disabled).active:focus,.btn-outline-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(248,249,250,.5);box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-dark{color:#343a40;background-color:transparent;background-image:none;border-color:#343a40}.btn-outline-dark:hover{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark.focus,.btn-outline-dark:focus{-webkit-box-shadow:0 0 0 .2rem rgba(52,58,64,.5);box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-dark.disabled,.btn-outline-dark:disabled{color:#343a40;background-color:transparent}.btn-outline-dark:not(:disabled):not(.disabled).active,.btn-outline-dark:not(:disabled):not(.disabled):active,.show>.btn-outline-dark.dropdown-toggle{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark:not(:disabled):not(.disabled).active:focus,.btn-outline-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-dark.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 .2rem rgba(52,58,64,.5);box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-link{font-weight:400;color:#007bff;background-color:transparent}.btn-link:hover{color:#0056b3;background-color:transparent}.btn-link.focus,.btn-link:focus,.btn-link:hover{text-decoration:underline;border-color:transparent}.btn-link.focus,.btn-link:focus{-webkit-box-shadow:none;box-shadow:none}.btn-link.disabled,.btn-link:disabled{color:#6c757d}.btn-group-lg>.btn,.btn-lg{padding:.5rem 1rem;font-size:1.125rem;line-height:1.5;border-radius:.3rem}.btn-group-sm>.btn,.btn-sm{padding:.25rem .5rem;font-size:.7875rem;line-height:1.5;border-radius:.2rem}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:.5rem}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.show{opacity:1}.collapse{display:none}.collapse.show{display:block}tr.collapse.show{display:table-row}tbody.collapse.show{display:table-row-group}.collapsing{height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}.collapsing,.dropdown,.dropup{position:relative}.dropdown-toggle:after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}.dropdown-toggle:empty:after{margin-left:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:10rem;padding:.5rem 0;margin:.125rem 0 0;font-size:.9rem;color:#212529;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.15);border-radius:.25rem}.dropup .dropdown-menu{margin-top:0;margin-bottom:.125rem}.dropup .dropdown-toggle:after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:0;border-right:.3em solid transparent;border-bottom:.3em solid;border-left:.3em solid transparent}.dropup .dropdown-toggle:empty:after{margin-left:0}.dropright .dropdown-menu{margin-top:0;margin-left:.125rem}.dropright .dropdown-toggle:after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-bottom:.3em solid transparent;border-left:.3em solid}.dropright .dropdown-toggle:empty:after{margin-left:0}.dropright .dropdown-toggle:after{vertical-align:0}.dropleft .dropdown-menu{margin-top:0;margin-right:.125rem}.dropleft .dropdown-toggle:after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";display:none}.dropleft .dropdown-toggle:before{display:inline-block;width:0;height:0;margin-right:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:.3em solid;border-bottom:.3em solid transparent}.dropleft .dropdown-toggle:empty:after{margin-left:0}.dropleft .dropdown-toggle:before{vertical-align:0}.dropdown-divider{height:0;margin:.5rem 0;overflow:hidden;border-top:1px solid #e9ecef}.dropdown-item{display:block;width:100%;padding:.25rem 1.5rem;clear:both;font-weight:400;color:#212529;text-align:inherit;white-space:nowrap;background-color:transparent;border:0}.dropdown-item:focus,.dropdown-item:hover{color:#16181b;text-decoration:none;background-color:#f8f9fa}.dropdown-item.active,.dropdown-item:active{color:#fff;text-decoration:none;background-color:#007bff}.dropdown-item.disabled,.dropdown-item:disabled{color:#6c757d;background-color:transparent}.dropdown-menu.show{display:block}.dropdown-header{display:block;padding:.5rem 1.5rem;margin-bottom:0;font-size:.7875rem;color:#6c757d;white-space:nowrap}.btn-group,.btn-group-vertical{position:relative;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:1}.btn-group-vertical .btn+.btn,.btn-group-vertical .btn+.btn-group,.btn-group-vertical .btn-group+.btn,.btn-group-vertical .btn-group+.btn-group,.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btn-toolbar .input-group{width:auto}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn-group:not(:last-child)>.btn,.btn-group>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:not(:first-child)>.btn,.btn-group>.btn:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.dropdown-toggle-split{padding-right:.5625rem;padding-left:.5625rem}.dropdown-toggle-split:after{margin-left:0}.btn-group-sm>.btn+.dropdown-toggle-split,.btn-sm+.dropdown-toggle-split{padding-right:.375rem;padding-left:.375rem}.btn-group-lg>.btn+.dropdown-toggle-split,.btn-lg+.dropdown-toggle-split{padding-right:.75rem;padding-left:.75rem}.btn-group-vertical{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.btn-group-vertical .btn,.btn-group-vertical .btn-group{width:100%}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn-group:not(:last-child)>.btn,.btn-group-vertical>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child)>.btn,.btn-group-vertical>.btn:not(:first-child){border-top-left-radius:0;border-top-right-radius:0}.btn-group-toggle>.btn,.btn-group-toggle>.btn-group>.btn{margin-bottom:0}.btn-group-toggle>.btn-group>.btn input[type=checkbox],.btn-group-toggle>.btn-group>.btn input[type=radio],.btn-group-toggle>.btn input[type=checkbox],.btn-group-toggle>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:stretch;-ms-flex-align:stretch;align-items:stretch;width:100%}.input-group>.custom-file,.input-group>.custom-select,.input-group>.form-control{position:relative;-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;width:1%;margin-bottom:0}.input-group>.custom-file:focus,.input-group>.custom-select:focus,.input-group>.form-control:focus{z-index:3}.input-group>.custom-file+.custom-file,.input-group>.custom-file+.custom-select,.input-group>.custom-file+.form-control,.input-group>.custom-select+.custom-file,.input-group>.custom-select+.custom-select,.input-group>.custom-select+.form-control,.input-group>.form-control+.custom-file,.input-group>.form-control+.custom-select,.input-group>.form-control+.form-control{margin-left:-1px}.input-group>.custom-select:not(:last-child),.input-group>.form-control:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-select:not(:first-child),.input-group>.form-control:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.input-group>.custom-file{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.input-group>.custom-file:not(:last-child) .custom-file-label,.input-group>.custom-file:not(:last-child) .custom-file-label:before{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-file:not(:first-child) .custom-file-label,.input-group>.custom-file:not(:first-child) .custom-file-label:before{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-append,.input-group-prepend{display:-webkit-box;display:-ms-flexbox;display:flex}.input-group-append .btn,.input-group-prepend .btn{position:relative;z-index:2}.input-group-append .btn+.btn,.input-group-append .btn+.input-group-text,.input-group-append .input-group-text+.btn,.input-group-append .input-group-text+.input-group-text,.input-group-prepend .btn+.btn,.input-group-prepend .btn+.input-group-text,.input-group-prepend .input-group-text+.btn,.input-group-prepend .input-group-text+.input-group-text{margin-left:-1px}.input-group-prepend{margin-right:-1px}.input-group-append{margin-left:-1px}.input-group-text{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:.375rem .75rem;margin-bottom:0;font-size:.9rem;font-weight:400;line-height:1.6;color:#495057;text-align:center;white-space:nowrap;background-color:#e9ecef;border:1px solid #ced4da;border-radius:.25rem}.input-group-text input[type=checkbox],.input-group-text input[type=radio]{margin-top:0}.input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group>.input-group-append:last-child>.input-group-text:not(:last-child),.input-group>.input-group-append:not(:last-child)>.btn,.input-group>.input-group-append:not(:last-child)>.input-group-text,.input-group>.input-group-prepend>.btn,.input-group>.input-group-prepend>.input-group-text{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0;border-bottom-left-radius:0}.custom-control{position:relative;display:block;min-height:1.6rem;padding-left:1.5rem}.custom-control-inline{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;margin-right:1rem}.custom-control-input{position:absolute;z-index:-1;opacity:0}.custom-control-input:checked~.custom-control-label:before{color:#fff;background-color:#007bff}.custom-control-input:focus~.custom-control-label:before{-webkit-box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 1px #f5f8fa,0 0 0 .2rem rgba(0,123,255,.25)}.custom-control-input:active~.custom-control-label:before{color:#fff;background-color:#b3d7ff}.custom-control-input:disabled~.custom-control-label{color:#6c757d}.custom-control-input:disabled~.custom-control-label:before{background-color:#e9ecef}.custom-control-label{margin-bottom:0}.custom-control-label:before{pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:#dee2e6}.custom-control-label:after,.custom-control-label:before{position:absolute;top:.3rem;left:0;display:block;width:1rem;height:1rem;content:""}.custom-control-label:after{background-repeat:no-repeat;background-position:50%;background-size:50% 50%}.custom-checkbox .custom-control-label:before{border-radius:.25rem}.custom-checkbox .custom-control-input:checked~.custom-control-label:before{background-color:#007bff}.custom-checkbox .custom-control-input:checked~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label:before{background-color:#007bff}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:disabled:checked~.custom-control-label:before{background-color:rgba(0,123,255,.5)}.custom-checkbox .custom-control-input:disabled:indeterminate~.custom-control-label:before{background-color:rgba(0,123,255,.5)}.custom-radio .custom-control-label:before{border-radius:50%}.custom-radio .custom-control-input:checked~.custom-control-label:before{background-color:#007bff}.custom-radio .custom-control-input:checked~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E")}.custom-radio .custom-control-input:disabled:checked~.custom-control-label:before{background-color:rgba(0,123,255,.5)}.custom-select{display:inline-block;width:100%;height:calc(2.19rem + 2px);padding:.375rem 1.75rem .375rem .75rem;line-height:1.6;color:#495057;vertical-align:middle;background:#fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center;background-size:8px 10px;border:1px solid #ced4da;border-radius:.25rem;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-select:focus{border-color:#80bdff;outline:0;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.075),0 0 5px rgba(128,189,255,.5);box-shadow:inset 0 1px 2px rgba(0,0,0,.075),0 0 5px rgba(128,189,255,.5)}.custom-select:focus::-ms-value{color:#495057;background-color:#fff}.custom-select[multiple],.custom-select[size]:not([size="1"]){height:auto;padding-right:.75rem;background-image:none}.custom-select:disabled{color:#6c757d;background-color:#e9ecef}.custom-select::-ms-expand{opacity:0}.custom-select-sm{height:calc(1.68125rem + 2px);font-size:75%}.custom-select-lg,.custom-select-sm{padding-top:.375rem;padding-bottom:.375rem}.custom-select-lg{height:calc(2.6875rem + 2px);font-size:125%}.custom-file{display:inline-block;margin-bottom:0}.custom-file,.custom-file-input{position:relative;width:100%;height:calc(2.19rem + 2px)}.custom-file-input{z-index:2;margin:0;opacity:0}.custom-file-input:focus~.custom-file-control{border-color:#80bdff;-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.custom-file-input:focus~.custom-file-control:before{border-color:#80bdff}.custom-file-input:lang(en)~.custom-file-label:after{content:"Browse"}.custom-file-label{left:0;z-index:1;height:calc(2.19rem + 2px);background-color:#fff;border:1px solid #ced4da;border-radius:.25rem}.custom-file-label,.custom-file-label:after{position:absolute;top:0;right:0;padding:.375rem .75rem;line-height:1.6;color:#495057}.custom-file-label:after{bottom:0;z-index:3;display:block;height:calc((2.19rem + 2px) - 1px * 2);content:"Browse";background-color:#e9ecef;border-left:1px solid #ced4da;border-radius:0 .25rem .25rem 0}.nav{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:.5rem 1rem}.nav-link:focus,.nav-link:hover{text-decoration:none}.nav-link.disabled{color:#6c757d}.nav-tabs{border-bottom:1px solid #dee2e6}.nav-tabs .nav-item{margin-bottom:-1px}.nav-tabs .nav-link{border:1px solid transparent;border-top-left-radius:.25rem;border-top-right-radius:.25rem}.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{border-color:#e9ecef #e9ecef #dee2e6}.nav-tabs .nav-link.disabled{color:#6c757d;background-color:transparent;border-color:transparent}.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:#495057;background-color:#f5f8fa;border-color:#dee2e6 #dee2e6 #f5f8fa}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-pills .nav-link{border-radius:.25rem}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#007bff}.nav-fill .nav-item{-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;text-align:center}.nav-justified .nav-item{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;text-align:center}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{position:relative;padding:.5rem 1rem}.navbar,.navbar>.container,.navbar>.container-fluid{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.navbar-brand{display:inline-block;padding-top:.32rem;padding-bottom:.32rem;margin-right:1rem;font-size:1.125rem;line-height:inherit;white-space:nowrap}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-nav{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-text{display:inline-block;padding-top:.5rem;padding-bottom:.5rem}.navbar-collapse{-ms-flex-preferred-size:100%;flex-basis:100%;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.navbar-toggler{padding:.25rem .75rem;font-size:1.125rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:.25rem}.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}.navbar-toggler:not(:disabled):not(.disabled){cursor:pointer}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat 50%;background-size:100% 100%}@media (max-width:575.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:576px){.navbar-expand-sm{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-sm,.navbar-expand-sm .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal}.navbar-expand-sm .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-sm .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-sm .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}.navbar-expand-sm .dropup .dropdown-menu{top:auto;bottom:100%}}@media (max-width:767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:768px){.navbar-expand-md{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-md,.navbar-expand-md .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal}.navbar-expand-md .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-md .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-md .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}.navbar-expand-md .dropup .dropdown-menu{top:auto;bottom:100%}}@media (max-width:991.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:992px){.navbar-expand-lg{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-lg,.navbar-expand-lg .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal}.navbar-expand-lg .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-lg .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}.navbar-expand-lg .dropup .dropdown-menu{top:auto;bottom:100%}}@media (max-width:1199.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:1200px){.navbar-expand-xl{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-xl,.navbar-expand-xl .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal}.navbar-expand-xl .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-xl .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-xl .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}.navbar-expand-xl .dropup .dropdown-menu{top:auto;bottom:100%}}.navbar-expand{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand>.container,.navbar-expand>.container-fluid{padding-right:0;padding-left:0}.navbar-expand .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand>.container,.navbar-expand>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-expand .dropup .dropdown-menu{top:auto;bottom:100%}.navbar-light .navbar-brand,.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(0,0,0,.9)}.navbar-light .navbar-nav .nav-link{color:rgba(0,0,0,.5)}.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(0,0,0,.7)}.navbar-light .navbar-nav .nav-link.disabled{color:rgba(0,0,0,.3)}.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .show>.nav-link{color:rgba(0,0,0,.9)}.navbar-light .navbar-toggler{color:rgba(0,0,0,.5);border-color:rgba(0,0,0,.1)}.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 0, 0, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-light .navbar-text{color:rgba(0,0,0,.5)}.navbar-light .navbar-text a,.navbar-light .navbar-text a:focus,.navbar-light .navbar-text a:hover{color:rgba(0,0,0,.9)}.navbar-dark .navbar-brand,.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}.navbar-dark .navbar-nav .nav-link{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:hsla(0,0%,100%,.75)}.navbar-dark .navbar-nav .nav-link.disabled{color:hsla(0,0%,100%,.25)}.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .show>.nav-link{color:#fff}.navbar-dark .navbar-toggler{color:hsla(0,0%,100%,.5);border-color:hsla(0,0%,100%,.1)}.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-dark .navbar-text{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-text a,.navbar-dark .navbar-text a:focus,.navbar-dark .navbar-text a:hover{color:#fff}.card{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;min-width:0;word-wrap:break-word;background-color:#fff;background-clip:border-box;border:1px solid rgba(0,0,0,.125);border-radius:.25rem}.card>hr{margin-right:0;margin-left:0}.card>.list-group:first-child .list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card>.list-group:last-child .list-group-item:last-child{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.card-body{-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;padding:1.25rem}.card-title{margin-bottom:.75rem}.card-subtitle{margin-top:-.375rem}.card-subtitle,.card-text:last-child{margin-bottom:0}.card-link:hover{text-decoration:none}.card-link+.card-link{margin-left:1.25rem}.card-header{padding:.75rem 1.25rem;margin-bottom:0;background-color:rgba(0,0,0,.03);border-bottom:1px solid rgba(0,0,0,.125)}.card-header:first-child{border-radius:calc(.25rem - 1px) calc(.25rem - 1px) 0 0}.card-header+.list-group .list-group-item:first-child{border-top:0}.card-footer{padding:.75rem 1.25rem;background-color:rgba(0,0,0,.03);border-top:1px solid rgba(0,0,0,.125)}.card-footer:last-child{border-radius:0 0 calc(.25rem - 1px) calc(.25rem - 1px)}.card-header-tabs{margin-bottom:-.75rem;border-bottom:0}.card-header-pills,.card-header-tabs{margin-right:-.625rem;margin-left:-.625rem}.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:1.25rem}.card-img{width:100%;border-radius:calc(.25rem - 1px)}.card-img-top{width:100%;border-top-left-radius:calc(.25rem - 1px);border-top-right-radius:calc(.25rem - 1px)}.card-img-bottom{width:100%;border-bottom-right-radius:calc(.25rem - 1px);border-bottom-left-radius:calc(.25rem - 1px)}.card-deck{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.card-deck .card{margin-bottom:15px}@media (min-width:576px){.card-deck{-webkit-box-orient:horizontal;-ms-flex-flow:row wrap;flex-flow:row wrap;margin-right:-15px;margin-left:-15px}.card-deck,.card-deck .card{-webkit-box-direction:normal}.card-deck .card{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-ms-flex:1 0 0%;flex:1 0 0%;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;margin-right:15px;margin-bottom:0;margin-left:15px}}.card-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.card-group>.card{margin-bottom:15px}@media (min-width:576px){.card-group{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap}.card-group>.card{-webkit-box-flex:1;-ms-flex:1 0 0%;flex:1 0 0%;margin-bottom:0}.card-group>.card+.card{margin-left:0;border-left:0}.card-group>.card:first-child{border-top-right-radius:0;border-bottom-right-radius:0}.card-group>.card:first-child .card-header,.card-group>.card:first-child .card-img-top{border-top-right-radius:0}.card-group>.card:first-child .card-footer,.card-group>.card:first-child .card-img-bottom{border-bottom-right-radius:0}.card-group>.card:last-child{border-top-left-radius:0;border-bottom-left-radius:0}.card-group>.card:last-child .card-header,.card-group>.card:last-child .card-img-top{border-top-left-radius:0}.card-group>.card:last-child .card-footer,.card-group>.card:last-child .card-img-bottom{border-bottom-left-radius:0}.card-group>.card:only-child{border-radius:.25rem}.card-group>.card:only-child .card-header,.card-group>.card:only-child .card-img-top{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card-group>.card:only-child .card-footer,.card-group>.card:only-child .card-img-bottom{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.card-group>.card:not(:first-child):not(:last-child):not(:only-child),.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-footer,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-header,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-img-top{border-radius:0}}.card-columns .card{margin-bottom:.75rem}@media (min-width:576px){.card-columns{-webkit-column-count:3;column-count:3;-webkit-column-gap:1.25rem;column-gap:1.25rem}.card-columns .card{display:inline-block;width:100%}}.breadcrumb{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#e9ecef;border-radius:.25rem}.breadcrumb-item+.breadcrumb-item:before{display:inline-block;padding-right:.5rem;padding-left:.5rem;color:#6c757d;content:"/"}.breadcrumb-item+.breadcrumb-item:hover:before{text-decoration:underline;text-decoration:none}.breadcrumb-item.active{color:#6c757d}.pagination{display:-webkit-box;display:-ms-flexbox;display:flex;padding-left:0;list-style:none;border-radius:.25rem}.page-link{position:relative;display:block;padding:.5rem .75rem;margin-left:-1px;line-height:1.25;color:#007bff;background-color:#fff;border:1px solid #dee2e6}.page-link:hover{color:#0056b3;text-decoration:none;background-color:#e9ecef;border-color:#dee2e6}.page-link:focus{z-index:2;outline:0;-webkit-box-shadow:0 0 0 .2rem rgba(0,123,255,.25);box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.page-link:not(:disabled):not(.disabled){cursor:pointer}.page-item:first-child .page-link{margin-left:0;border-top-left-radius:.25rem;border-bottom-left-radius:.25rem}.page-item:last-child .page-link{border-top-right-radius:.25rem;border-bottom-right-radius:.25rem}.page-item.active .page-link{z-index:1;color:#fff;background-color:#007bff;border-color:#007bff}.page-item.disabled .page-link{color:#6c757d;pointer-events:none;cursor:auto;background-color:#fff;border-color:#dee2e6}.pagination-lg .page-link{padding:.75rem 1.5rem;font-size:1.125rem;line-height:1.5}.pagination-lg .page-item:first-child .page-link{border-top-left-radius:.3rem;border-bottom-left-radius:.3rem}.pagination-lg .page-item:last-child .page-link{border-top-right-radius:.3rem;border-bottom-right-radius:.3rem}.pagination-sm .page-link{padding:.25rem .5rem;font-size:.7875rem;line-height:1.5}.pagination-sm .page-item:first-child .page-link{border-top-left-radius:.2rem;border-bottom-left-radius:.2rem}.pagination-sm .page-item:last-child .page-link{border-top-right-radius:.2rem;border-bottom-right-radius:.2rem}.badge{display:inline-block;padding:.25em .4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25rem}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.badge-pill{padding-right:.6em;padding-left:.6em;border-radius:10rem}.badge-primary{color:#fff;background-color:#007bff}.badge-primary[href]:focus,.badge-primary[href]:hover{color:#fff;text-decoration:none;background-color:#0062cc}.badge-secondary{color:#fff;background-color:#6c757d}.badge-secondary[href]:focus,.badge-secondary[href]:hover{color:#fff;text-decoration:none;background-color:#545b62}.badge-success{color:#fff;background-color:#28a745}.badge-success[href]:focus,.badge-success[href]:hover{color:#fff;text-decoration:none;background-color:#1e7e34}.badge-info{color:#fff;background-color:#17a2b8}.badge-info[href]:focus,.badge-info[href]:hover{color:#fff;text-decoration:none;background-color:#117a8b}.badge-warning{color:#212529;background-color:#ffc107}.badge-warning[href]:focus,.badge-warning[href]:hover{color:#212529;text-decoration:none;background-color:#d39e00}.badge-danger{color:#fff;background-color:#dc3545}.badge-danger[href]:focus,.badge-danger[href]:hover{color:#fff;text-decoration:none;background-color:#bd2130}.badge-light{color:#212529;background-color:#f8f9fa}.badge-light[href]:focus,.badge-light[href]:hover{color:#212529;text-decoration:none;background-color:#dae0e5}.badge-dark{color:#fff;background-color:#343a40}.badge-dark[href]:focus,.badge-dark[href]:hover{color:#fff;text-decoration:none;background-color:#1d2124}.jumbotron{padding:2rem 1rem;margin-bottom:2rem;background-color:#e9ecef;border-radius:.3rem}@media (min-width:576px){.jumbotron{padding:4rem 2rem}}.jumbotron-fluid{padding-right:0;padding-left:0;border-radius:0}.alert{position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;border:1px solid transparent;border-radius:.25rem}.alert-heading{color:inherit}.alert-link{font-weight:700}.alert-dismissible{padding-right:3.85rem}.alert-dismissible .close{position:absolute;top:0;right:0;padding:.75rem 1.25rem;color:inherit}.alert-primary{color:#004085;background-color:#cce5ff;border-color:#b8daff}.alert-primary hr{border-top-color:#9fcdff}.alert-primary .alert-link{color:#002752}.alert-secondary{color:#383d41;background-color:#e2e3e5;border-color:#d6d8db}.alert-secondary hr{border-top-color:#c8cbcf}.alert-secondary .alert-link{color:#202326}.alert-success{color:#155724;background-color:#d4edda;border-color:#c3e6cb}.alert-success hr{border-top-color:#b1dfbb}.alert-success .alert-link{color:#0b2e13}.alert-info{color:#0c5460;background-color:#d1ecf1;border-color:#bee5eb}.alert-info hr{border-top-color:#abdde5}.alert-info .alert-link{color:#062c33}.alert-warning{color:#856404;background-color:#fff3cd;border-color:#ffeeba}.alert-warning hr{border-top-color:#ffe8a1}.alert-warning .alert-link{color:#533f03}.alert-danger{color:#721c24;background-color:#f8d7da;border-color:#f5c6cb}.alert-danger hr{border-top-color:#f1b0b7}.alert-danger .alert-link{color:#491217}.alert-light{color:#818182;background-color:#fefefe;border-color:#fdfdfe}.alert-light hr{border-top-color:#ececf6}.alert-light .alert-link{color:#686868}.alert-dark{color:#1b1e21;background-color:#d6d8d9;border-color:#c6c8ca}.alert-dark hr{border-top-color:#b9bbbe}.alert-dark .alert-link{color:#040505}@-webkit-keyframes progress-bar-stripes{0%{background-position:1rem 0}to{background-position:0 0}}@keyframes progress-bar-stripes{0%{background-position:1rem 0}to{background-position:0 0}}.progress{height:1rem;overflow:hidden;font-size:.675rem;background-color:#e9ecef;border-radius:.25rem}.progress,.progress-bar{display:-webkit-box;display:-ms-flexbox;display:flex}.progress-bar{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;color:#fff;text-align:center;background-color:#007bff;-webkit-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent);background-size:1rem 1rem}.progress-bar-animated{-webkit-animation:progress-bar-stripes 1s linear infinite;animation:progress-bar-stripes 1s linear infinite}.media{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.media-body{-webkit-box-flex:1;-ms-flex:1;flex:1}.list-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0}.list-group-item-action{width:100%;color:#495057;text-align:inherit}.list-group-item-action:focus,.list-group-item-action:hover{color:#495057;text-decoration:none;background-color:#f8f9fa}.list-group-item-action:active{color:#212529;background-color:#e9ecef}.list-group-item{position:relative;display:block;padding:.75rem 1.25rem;margin-bottom:-1px;background-color:#fff;border:1px solid rgba(0,0,0,.125)}.list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.list-group-item:focus,.list-group-item:hover{z-index:1;text-decoration:none}.list-group-item.disabled,.list-group-item:disabled{color:#6c757d;background-color:#fff}.list-group-item.active{z-index:2;color:#fff;background-color:#007bff;border-color:#007bff}.list-group-flush .list-group-item{border-right:0;border-left:0;border-radius:0}.list-group-flush:first-child .list-group-item:first-child{border-top:0}.list-group-flush:last-child .list-group-item:last-child{border-bottom:0}.list-group-item-primary{color:#004085;background-color:#b8daff}.list-group-item-primary.list-group-item-action:focus,.list-group-item-primary.list-group-item-action:hover{color:#004085;background-color:#9fcdff}.list-group-item-primary.list-group-item-action.active{color:#fff;background-color:#004085;border-color:#004085}.list-group-item-secondary{color:#383d41;background-color:#d6d8db}.list-group-item-secondary.list-group-item-action:focus,.list-group-item-secondary.list-group-item-action:hover{color:#383d41;background-color:#c8cbcf}.list-group-item-secondary.list-group-item-action.active{color:#fff;background-color:#383d41;border-color:#383d41}.list-group-item-success{color:#155724;background-color:#c3e6cb}.list-group-item-success.list-group-item-action:focus,.list-group-item-success.list-group-item-action:hover{color:#155724;background-color:#b1dfbb}.list-group-item-success.list-group-item-action.active{color:#fff;background-color:#155724;border-color:#155724}.list-group-item-info{color:#0c5460;background-color:#bee5eb}.list-group-item-info.list-group-item-action:focus,.list-group-item-info.list-group-item-action:hover{color:#0c5460;background-color:#abdde5}.list-group-item-info.list-group-item-action.active{color:#fff;background-color:#0c5460;border-color:#0c5460}.list-group-item-warning{color:#856404;background-color:#ffeeba}.list-group-item-warning.list-group-item-action:focus,.list-group-item-warning.list-group-item-action:hover{color:#856404;background-color:#ffe8a1}.list-group-item-warning.list-group-item-action.active{color:#fff;background-color:#856404;border-color:#856404}.list-group-item-danger{color:#721c24;background-color:#f5c6cb}.list-group-item-danger.list-group-item-action:focus,.list-group-item-danger.list-group-item-action:hover{color:#721c24;background-color:#f1b0b7}.list-group-item-danger.list-group-item-action.active{color:#fff;background-color:#721c24;border-color:#721c24}.list-group-item-light{color:#818182;background-color:#fdfdfe}.list-group-item-light.list-group-item-action:focus,.list-group-item-light.list-group-item-action:hover{color:#818182;background-color:#ececf6}.list-group-item-light.list-group-item-action.active{color:#fff;background-color:#818182;border-color:#818182}.list-group-item-dark{color:#1b1e21;background-color:#c6c8ca}.list-group-item-dark.list-group-item-action:focus,.list-group-item-dark.list-group-item-action:hover{color:#1b1e21;background-color:#b9bbbe}.list-group-item-dark.list-group-item-action.active{color:#fff;background-color:#1b1e21;border-color:#1b1e21}.close{float:right;font-size:1.35rem;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.5}.close:focus,.close:hover{color:#000;text-decoration:none;opacity:.75}.close:not(:disabled):not(.disabled){cursor:pointer}button.close{padding:0;background-color:transparent;border:0;-webkit-appearance:none}.modal,.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;outline:0}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:.5rem;pointer-events:none}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out;-webkit-transform:translateY(-25%);transform:translateY(-25%)}.modal.show .modal-dialog{-webkit-transform:translate(0);transform:translate(0)}.modal-dialog-centered{-webkit-box-align:center;-ms-flex-align:center;align-items:center;min-height:calc(100% - 1rem)}.modal-content,.modal-dialog-centered{display:-webkit-box;display:-ms-flexbox;display:flex}.modal-content{position:relative;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:100%;pointer-events:auto;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem;outline:0}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop.show{opacity:.5}.modal-header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding:1rem;border-bottom:1px solid #e9ecef;border-top-left-radius:.3rem;border-top-right-radius:.3rem}.modal-header .close{padding:1rem;margin:-1rem -1rem -1rem auto}.modal-title{margin-bottom:0;line-height:1.6}.modal-body{position:relative;-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;padding:1rem}.modal-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;padding:1rem;border-top:1px solid #e9ecef}.modal-footer>:not(:first-child){margin-left:.25rem}.modal-footer>:not(:last-child){margin-right:.25rem}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:576px){.modal-dialog{max-width:500px;margin:1.75rem auto}.modal-dialog-centered{min-height:calc(100% - 3.5rem)}.modal-sm{max-width:300px}}@media (min-width:992px){.modal-lg{max-width:800px}}.tooltip{position:absolute;z-index:1070;display:block;margin:0;font-family:Raleway,sans-serif;font-style:normal;font-weight:400;line-height:1.6;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.7875rem;word-wrap:break-word;opacity:0}.tooltip.show{opacity:.9}.tooltip .arrow{position:absolute;display:block;width:.8rem;height:.4rem}.tooltip .arrow:before{position:absolute;content:"";border-color:transparent;border-style:solid}.bs-tooltip-auto[x-placement^=top],.bs-tooltip-top{padding:.4rem 0}.bs-tooltip-auto[x-placement^=top] .arrow,.bs-tooltip-top .arrow{bottom:0}.bs-tooltip-auto[x-placement^=top] .arrow:before,.bs-tooltip-top .arrow:before{top:0;border-width:.4rem .4rem 0;border-top-color:#000}.bs-tooltip-auto[x-placement^=right],.bs-tooltip-right{padding:0 .4rem}.bs-tooltip-auto[x-placement^=right] .arrow,.bs-tooltip-right .arrow{left:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=right] .arrow:before,.bs-tooltip-right .arrow:before{right:0;border-width:.4rem .4rem .4rem 0;border-right-color:#000}.bs-tooltip-auto[x-placement^=bottom],.bs-tooltip-bottom{padding:.4rem 0}.bs-tooltip-auto[x-placement^=bottom] .arrow,.bs-tooltip-bottom .arrow{top:0}.bs-tooltip-auto[x-placement^=bottom] .arrow:before,.bs-tooltip-bottom .arrow:before{bottom:0;border-width:0 .4rem .4rem;border-bottom-color:#000}.bs-tooltip-auto[x-placement^=left],.bs-tooltip-left{padding:0 .4rem}.bs-tooltip-auto[x-placement^=left] .arrow,.bs-tooltip-left .arrow{right:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=left] .arrow:before,.bs-tooltip-left .arrow:before{left:0;border-width:.4rem 0 .4rem .4rem;border-left-color:#000}.tooltip-inner{max-width:200px;padding:.25rem .5rem;color:#fff;text-align:center;background-color:#000;border-radius:.25rem}.popover{top:0;left:0;z-index:1060;max-width:276px;font-family:Raleway,sans-serif;font-style:normal;font-weight:400;line-height:1.6;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.7875rem;word-wrap:break-word;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem}.popover,.popover .arrow{position:absolute;display:block}.popover .arrow{width:1rem;height:.5rem;margin:0 .3rem}.popover .arrow:after,.popover .arrow:before{position:absolute;display:block;content:"";border-color:transparent;border-style:solid}.bs-popover-auto[x-placement^=top],.bs-popover-top{margin-bottom:.5rem}.bs-popover-auto[x-placement^=top] .arrow,.bs-popover-top .arrow{bottom:calc((.5rem + 1px) * -1)}.bs-popover-auto[x-placement^=top] .arrow:after,.bs-popover-auto[x-placement^=top] .arrow:before,.bs-popover-top .arrow:after,.bs-popover-top .arrow:before{border-width:.5rem .5rem 0}.bs-popover-auto[x-placement^=top] .arrow:before,.bs-popover-top .arrow:before{bottom:0;border-top-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=top] .arrow:after,.bs-popover-top .arrow:after{bottom:1px;border-top-color:#fff}.bs-popover-auto[x-placement^=right],.bs-popover-right{margin-left:.5rem}.bs-popover-auto[x-placement^=right] .arrow,.bs-popover-right .arrow{left:calc((.5rem + 1px) * -1);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=right] .arrow:after,.bs-popover-auto[x-placement^=right] .arrow:before,.bs-popover-right .arrow:after,.bs-popover-right .arrow:before{border-width:.5rem .5rem .5rem 0}.bs-popover-auto[x-placement^=right] .arrow:before,.bs-popover-right .arrow:before{left:0;border-right-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=right] .arrow:after,.bs-popover-right .arrow:after{left:1px;border-right-color:#fff}.bs-popover-auto[x-placement^=bottom],.bs-popover-bottom{margin-top:.5rem}.bs-popover-auto[x-placement^=bottom] .arrow,.bs-popover-bottom .arrow{top:calc((.5rem + 1px) * -1)}.bs-popover-auto[x-placement^=bottom] .arrow:after,.bs-popover-auto[x-placement^=bottom] .arrow:before,.bs-popover-bottom .arrow:after,.bs-popover-bottom .arrow:before{border-width:0 .5rem .5rem}.bs-popover-auto[x-placement^=bottom] .arrow:before,.bs-popover-bottom .arrow:before{top:0;border-bottom-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=bottom] .arrow:after,.bs-popover-bottom .arrow:after{top:1px;border-bottom-color:#fff}.bs-popover-auto[x-placement^=bottom] .popover-header:before,.bs-popover-bottom .popover-header:before{position:absolute;top:0;left:50%;display:block;width:1rem;margin-left:-.5rem;content:"";border-bottom:1px solid #f7f7f7}.bs-popover-auto[x-placement^=left],.bs-popover-left{margin-right:.5rem}.bs-popover-auto[x-placement^=left] .arrow,.bs-popover-left .arrow{right:calc((.5rem + 1px) * -1);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=left] .arrow:after,.bs-popover-auto[x-placement^=left] .arrow:before,.bs-popover-left .arrow:after,.bs-popover-left .arrow:before{border-width:.5rem 0 .5rem .5rem}.bs-popover-auto[x-placement^=left] .arrow:before,.bs-popover-left .arrow:before{right:0;border-left-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=left] .arrow:after,.bs-popover-left .arrow:after{right:1px;border-left-color:#fff}.popover-header{padding:.5rem .75rem;margin-bottom:0;font-size:.9rem;color:inherit;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-top-left-radius:calc(.3rem - 1px);border-top-right-radius:calc(.3rem - 1px)}.popover-header:empty{display:none}.popover-body{padding:.5rem .75rem;color:#212529}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-item{position:relative;display:none;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;-webkit-transition:-webkit-transform .6s ease;transition:-webkit-transform .6s ease;transition:transform .6s ease;transition:transform .6s ease,-webkit-transform .6s ease;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-item-next,.carousel-item-prev,.carousel-item.active{display:block}.carousel-item-next,.carousel-item-prev{position:absolute;top:0}.carousel-item-next.carousel-item-left,.carousel-item-prev.carousel-item-right{-webkit-transform:translateX(0);transform:translateX(0)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.carousel-item-next.carousel-item-left,.carousel-item-prev.carousel-item-right{-webkit-transform:translateZ(0);transform:translateZ(0)}}.active.carousel-item-right,.carousel-item-next{-webkit-transform:translateX(100%);transform:translateX(100%)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.active.carousel-item-right,.carousel-item-next{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}.active.carousel-item-left,.carousel-item-prev{-webkit-transform:translateX(-100%);transform:translateX(-100%)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.active.carousel-item-left,.carousel-item-prev{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}.carousel-control-next,.carousel-control-prev{position:absolute;top:0;bottom:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:15%;color:#fff;text-align:center;opacity:.5}.carousel-control-next:focus,.carousel-control-next:hover,.carousel-control-prev:focus,.carousel-control-prev:hover{color:#fff;text-decoration:none;outline:0;opacity:.9}.carousel-control-prev{left:0}.carousel-control-next{right:0}.carousel-control-next-icon,.carousel-control-prev-icon{display:inline-block;width:20px;height:20px;background:transparent no-repeat 50%;background-size:100% 100%}.carousel-control-prev-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E")}.carousel-control-next-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E")}.carousel-indicators{position:absolute;right:0;bottom:10px;left:0;z-index:15;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding-left:0;margin-right:15%;margin-left:15%;list-style:none}.carousel-indicators li{position:relative;-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto;width:30px;height:3px;margin-right:3px;margin-left:3px;text-indent:-999px;background-color:hsla(0,0%,100%,.5)}.carousel-indicators li:before{top:-10px}.carousel-indicators li:after,.carousel-indicators li:before{position:absolute;left:0;display:inline-block;width:100%;height:10px;content:""}.carousel-indicators li:after{bottom:-10px}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center}.align-baseline{vertical-align:baseline!important}.align-top{vertical-align:top!important}.align-middle{vertical-align:middle!important}.align-bottom{vertical-align:bottom!important}.align-text-bottom{vertical-align:text-bottom!important}.align-text-top{vertical-align:text-top!important}.bg-primary{background-color:#007bff!important}a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary:hover{background-color:#0062cc!important}.bg-secondary{background-color:#6c757d!important}a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover{background-color:#545b62!important}.bg-success{background-color:#28a745!important}a.bg-success:focus,a.bg-success:hover,button.bg-success:focus,button.bg-success:hover{background-color:#1e7e34!important}.bg-info{background-color:#17a2b8!important}a.bg-info:focus,a.bg-info:hover,button.bg-info:focus,button.bg-info:hover{background-color:#117a8b!important}.bg-warning{background-color:#ffc107!important}a.bg-warning:focus,a.bg-warning:hover,button.bg-warning:focus,button.bg-warning:hover{background-color:#d39e00!important}.bg-danger{background-color:#dc3545!important}a.bg-danger:focus,a.bg-danger:hover,button.bg-danger:focus,button.bg-danger:hover{background-color:#bd2130!important}.bg-light{background-color:#f8f9fa!important}a.bg-light:focus,a.bg-light:hover,button.bg-light:focus,button.bg-light:hover{background-color:#dae0e5!important}.bg-dark{background-color:#343a40!important}a.bg-dark:focus,a.bg-dark:hover,button.bg-dark:focus,button.bg-dark:hover{background-color:#1d2124!important}.bg-white{background-color:#fff!important}.bg-transparent{background-color:transparent!important}.border{border:1px solid #dee2e6!important}.border-top{border-top:1px solid #dee2e6!important}.border-right{border-right:1px solid #dee2e6!important}.border-bottom{border-bottom:1px solid #dee2e6!important}.border-left{border-left:1px solid #dee2e6!important}.border-0{border:0!important}.border-top-0{border-top:0!important}.border-right-0{border-right:0!important}.border-bottom-0{border-bottom:0!important}.border-left-0{border-left:0!important}.border-primary{border-color:#007bff!important}.border-secondary{border-color:#6c757d!important}.border-success{border-color:#28a745!important}.border-info{border-color:#17a2b8!important}.border-warning{border-color:#ffc107!important}.border-danger{border-color:#dc3545!important}.border-light{border-color:#f8f9fa!important}.border-dark{border-color:#343a40!important}.border-white{border-color:#fff!important}.rounded{border-radius:.25rem!important}.rounded-top{border-top-left-radius:.25rem!important}.rounded-right,.rounded-top{border-top-right-radius:.25rem!important}.rounded-bottom,.rounded-right{border-bottom-right-radius:.25rem!important}.rounded-bottom,.rounded-left{border-bottom-left-radius:.25rem!important}.rounded-left{border-top-left-radius:.25rem!important}.rounded-circle{border-radius:50%!important}.rounded-0{border-radius:0!important}.clearfix:after{display:block;clear:both;content:""}.d-none{display:none!important}.d-inline{display:inline!important}.d-inline-block{display:inline-block!important}.d-block{display:block!important}.d-table{display:table!important}.d-table-row{display:table-row!important}.d-table-cell{display:table-cell!important}.d-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}@media (min-width:576px){.d-sm-none{display:none!important}.d-sm-inline{display:inline!important}.d-sm-inline-block{display:inline-block!important}.d-sm-block{display:block!important}.d-sm-table{display:table!important}.d-sm-table-row{display:table-row!important}.d-sm-table-cell{display:table-cell!important}.d-sm-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-sm-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:768px){.d-md-none{display:none!important}.d-md-inline{display:inline!important}.d-md-inline-block{display:inline-block!important}.d-md-block{display:block!important}.d-md-table{display:table!important}.d-md-table-row{display:table-row!important}.d-md-table-cell{display:table-cell!important}.d-md-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-md-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:992px){.d-lg-none{display:none!important}.d-lg-inline{display:inline!important}.d-lg-inline-block{display:inline-block!important}.d-lg-block{display:block!important}.d-lg-table{display:table!important}.d-lg-table-row{display:table-row!important}.d-lg-table-cell{display:table-cell!important}.d-lg-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-lg-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:1200px){.d-xl-none{display:none!important}.d-xl-inline{display:inline!important}.d-xl-inline-block{display:inline-block!important}.d-xl-block{display:block!important}.d-xl-table{display:table!important}.d-xl-table-row{display:table-row!important}.d-xl-table-cell{display:table-cell!important}.d-xl-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-xl-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media print{.d-print-none{display:none!important}.d-print-inline{display:inline!important}.d-print-inline-block{display:inline-block!important}.d-print-block{display:block!important}.d-print-table{display:table!important}.d-print-table-row{display:table-row!important}.d-print-table-cell{display:table-cell!important}.d-print-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-print-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}.embed-responsive:before{display:block;content:""}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9:before{padding-top:42.85714286%}.embed-responsive-16by9:before{padding-top:56.25%}.embed-responsive-4by3:before{padding-top:75%}.embed-responsive-1by1:before{padding-top:100%}.flex-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-column,.flex-row{-webkit-box-direction:normal!important}.flex-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-row-reverse{-webkit-box-orient:horizontal!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-column-reverse,.flex-row-reverse{-webkit-box-direction:reverse!important}.flex-column-reverse{-webkit-box-orient:vertical!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}@media (min-width:576px){.flex-sm-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-sm-column,.flex-sm-row{-webkit-box-direction:normal!important}.flex-sm-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-sm-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-sm-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-sm-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-sm-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-sm-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-sm-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-sm-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-sm-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-sm-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-sm-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-sm-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-sm-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-sm-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-sm-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-sm-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-sm-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-sm-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-sm-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-sm-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-sm-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-sm-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-sm-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-sm-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-sm-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-sm-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-sm-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-sm-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:768px){.flex-md-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-md-column,.flex-md-row{-webkit-box-direction:normal!important}.flex-md-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-md-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-md-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-md-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-md-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-md-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-md-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-md-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-md-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-md-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-md-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-md-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-md-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-md-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-md-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-md-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-md-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-md-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-md-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-md-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-md-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-md-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-md-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-md-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-md-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-md-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-md-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-md-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:992px){.flex-lg-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-lg-column,.flex-lg-row{-webkit-box-direction:normal!important}.flex-lg-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-lg-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-lg-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-lg-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-lg-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-lg-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-lg-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-lg-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-lg-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-lg-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-lg-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-lg-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-lg-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-lg-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-lg-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-lg-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-lg-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-lg-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-lg-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-lg-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-lg-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-lg-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-lg-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-lg-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-lg-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-lg-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-lg-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-lg-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:1200px){.flex-xl-row{-webkit-box-orient:horizontal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-xl-column,.flex-xl-row{-webkit-box-direction:normal!important}.flex-xl-column{-webkit-box-orient:vertical!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-xl-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-xl-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-xl-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-xl-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-xl-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-xl-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-xl-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-xl-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-xl-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-xl-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-xl-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-xl-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-xl-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-xl-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-xl-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-xl-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-xl-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-xl-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-xl-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-xl-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-xl-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-xl-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-xl-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-xl-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-xl-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-xl-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-xl-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}.float-left{float:left!important}.float-right{float:right!important}.float-none{float:none!important}@media (min-width:576px){.float-sm-left{float:left!important}.float-sm-right{float:right!important}.float-sm-none{float:none!important}}@media (min-width:768px){.float-md-left{float:left!important}.float-md-right{float:right!important}.float-md-none{float:none!important}}@media (min-width:992px){.float-lg-left{float:left!important}.float-lg-right{float:right!important}.float-lg-none{float:none!important}}@media (min-width:1200px){.float-xl-left{float:left!important}.float-xl-right{float:right!important}.float-xl-none{float:none!important}}.position-static{position:static!important}.position-relative{position:relative!important}.position-absolute{position:absolute!important}.position-fixed{position:fixed!important}.position-sticky{position:-webkit-sticky!important;position:sticky!important}.fixed-top{top:0}.fixed-bottom,.fixed-top{position:fixed;right:0;left:0;z-index:1030}.fixed-bottom{bottom:0}@supports ((position:-webkit-sticky) or (position:sticky)){.sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}}.sr-only{position:absolute;width:1px;height:1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;-webkit-clip-path:inset(50%);clip-path:inset(50%);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal;-webkit-clip-path:none;clip-path:none}.w-25{width:25%!important}.w-50{width:50%!important}.w-75{width:75%!important}.w-100{width:100%!important}.h-25{height:25%!important}.h-50{height:50%!important}.h-75{height:75%!important}.h-100{height:100%!important}.mw-100{max-width:100%!important}.mh-100{max-height:100%!important}.m-0{margin:0!important}.mt-0,.my-0{margin-top:0!important}.mr-0,.mx-0{margin-right:0!important}.mb-0,.my-0{margin-bottom:0!important}.ml-0,.mx-0{margin-left:0!important}.m-1{margin:.25rem!important}.mt-1,.my-1{margin-top:.25rem!important}.mr-1,.mx-1{margin-right:.25rem!important}.mb-1,.my-1{margin-bottom:.25rem!important}.ml-1,.mx-1{margin-left:.25rem!important}.m-2{margin:.5rem!important}.mt-2,.my-2{margin-top:.5rem!important}.mr-2,.mx-2{margin-right:.5rem!important}.mb-2,.my-2{margin-bottom:.5rem!important}.ml-2,.mx-2{margin-left:.5rem!important}.m-3{margin:1rem!important}.mt-3,.my-3{margin-top:1rem!important}.mr-3,.mx-3{margin-right:1rem!important}.mb-3,.my-3{margin-bottom:1rem!important}.ml-3,.mx-3{margin-left:1rem!important}.m-4{margin:1.5rem!important}.mt-4,.my-4{margin-top:1.5rem!important}.mr-4,.mx-4{margin-right:1.5rem!important}.mb-4,.my-4{margin-bottom:1.5rem!important}.ml-4,.mx-4{margin-left:1.5rem!important}.m-5{margin:3rem!important}.mt-5,.my-5{margin-top:3rem!important}.mr-5,.mx-5{margin-right:3rem!important}.mb-5,.my-5{margin-bottom:3rem!important}.ml-5,.mx-5{margin-left:3rem!important}.p-0{padding:0!important}.pt-0,.py-0{padding-top:0!important}.pr-0,.px-0{padding-right:0!important}.pb-0,.py-0{padding-bottom:0!important}.pl-0,.px-0{padding-left:0!important}.p-1{padding:.25rem!important}.pt-1,.py-1{padding-top:.25rem!important}.pr-1,.px-1{padding-right:.25rem!important}.pb-1,.py-1{padding-bottom:.25rem!important}.pl-1,.px-1{padding-left:.25rem!important}.p-2{padding:.5rem!important}.pt-2,.py-2{padding-top:.5rem!important}.pr-2,.px-2{padding-right:.5rem!important}.pb-2,.py-2{padding-bottom:.5rem!important}.pl-2,.px-2{padding-left:.5rem!important}.p-3{padding:1rem!important}.pt-3,.py-3{padding-top:1rem!important}.pr-3,.px-3{padding-right:1rem!important}.pb-3,.py-3{padding-bottom:1rem!important}.pl-3,.px-3{padding-left:1rem!important}.p-4{padding:1.5rem!important}.pt-4,.py-4{padding-top:1.5rem!important}.pr-4,.px-4{padding-right:1.5rem!important}.pb-4,.py-4{padding-bottom:1.5rem!important}.pl-4,.px-4{padding-left:1.5rem!important}.p-5{padding:3rem!important}.pt-5,.py-5{padding-top:3rem!important}.pr-5,.px-5{padding-right:3rem!important}.pb-5,.py-5{padding-bottom:3rem!important}.pl-5,.px-5{padding-left:3rem!important}.m-auto{margin:auto!important}.mt-auto,.my-auto{margin-top:auto!important}.mr-auto,.mx-auto{margin-right:auto!important}.mb-auto,.my-auto{margin-bottom:auto!important}.ml-auto,.mx-auto{margin-left:auto!important}@media (min-width:576px){.m-sm-0{margin:0!important}.mt-sm-0,.my-sm-0{margin-top:0!important}.mr-sm-0,.mx-sm-0{margin-right:0!important}.mb-sm-0,.my-sm-0{margin-bottom:0!important}.ml-sm-0,.mx-sm-0{margin-left:0!important}.m-sm-1{margin:.25rem!important}.mt-sm-1,.my-sm-1{margin-top:.25rem!important}.mr-sm-1,.mx-sm-1{margin-right:.25rem!important}.mb-sm-1,.my-sm-1{margin-bottom:.25rem!important}.ml-sm-1,.mx-sm-1{margin-left:.25rem!important}.m-sm-2{margin:.5rem!important}.mt-sm-2,.my-sm-2{margin-top:.5rem!important}.mr-sm-2,.mx-sm-2{margin-right:.5rem!important}.mb-sm-2,.my-sm-2{margin-bottom:.5rem!important}.ml-sm-2,.mx-sm-2{margin-left:.5rem!important}.m-sm-3{margin:1rem!important}.mt-sm-3,.my-sm-3{margin-top:1rem!important}.mr-sm-3,.mx-sm-3{margin-right:1rem!important}.mb-sm-3,.my-sm-3{margin-bottom:1rem!important}.ml-sm-3,.mx-sm-3{margin-left:1rem!important}.m-sm-4{margin:1.5rem!important}.mt-sm-4,.my-sm-4{margin-top:1.5rem!important}.mr-sm-4,.mx-sm-4{margin-right:1.5rem!important}.mb-sm-4,.my-sm-4{margin-bottom:1.5rem!important}.ml-sm-4,.mx-sm-4{margin-left:1.5rem!important}.m-sm-5{margin:3rem!important}.mt-sm-5,.my-sm-5{margin-top:3rem!important}.mr-sm-5,.mx-sm-5{margin-right:3rem!important}.mb-sm-5,.my-sm-5{margin-bottom:3rem!important}.ml-sm-5,.mx-sm-5{margin-left:3rem!important}.p-sm-0{padding:0!important}.pt-sm-0,.py-sm-0{padding-top:0!important}.pr-sm-0,.px-sm-0{padding-right:0!important}.pb-sm-0,.py-sm-0{padding-bottom:0!important}.pl-sm-0,.px-sm-0{padding-left:0!important}.p-sm-1{padding:.25rem!important}.pt-sm-1,.py-sm-1{padding-top:.25rem!important}.pr-sm-1,.px-sm-1{padding-right:.25rem!important}.pb-sm-1,.py-sm-1{padding-bottom:.25rem!important}.pl-sm-1,.px-sm-1{padding-left:.25rem!important}.p-sm-2{padding:.5rem!important}.pt-sm-2,.py-sm-2{padding-top:.5rem!important}.pr-sm-2,.px-sm-2{padding-right:.5rem!important}.pb-sm-2,.py-sm-2{padding-bottom:.5rem!important}.pl-sm-2,.px-sm-2{padding-left:.5rem!important}.p-sm-3{padding:1rem!important}.pt-sm-3,.py-sm-3{padding-top:1rem!important}.pr-sm-3,.px-sm-3{padding-right:1rem!important}.pb-sm-3,.py-sm-3{padding-bottom:1rem!important}.pl-sm-3,.px-sm-3{padding-left:1rem!important}.p-sm-4{padding:1.5rem!important}.pt-sm-4,.py-sm-4{padding-top:1.5rem!important}.pr-sm-4,.px-sm-4{padding-right:1.5rem!important}.pb-sm-4,.py-sm-4{padding-bottom:1.5rem!important}.pl-sm-4,.px-sm-4{padding-left:1.5rem!important}.p-sm-5{padding:3rem!important}.pt-sm-5,.py-sm-5{padding-top:3rem!important}.pr-sm-5,.px-sm-5{padding-right:3rem!important}.pb-sm-5,.py-sm-5{padding-bottom:3rem!important}.pl-sm-5,.px-sm-5{padding-left:3rem!important}.m-sm-auto{margin:auto!important}.mt-sm-auto,.my-sm-auto{margin-top:auto!important}.mr-sm-auto,.mx-sm-auto{margin-right:auto!important}.mb-sm-auto,.my-sm-auto{margin-bottom:auto!important}.ml-sm-auto,.mx-sm-auto{margin-left:auto!important}}@media (min-width:768px){.m-md-0{margin:0!important}.mt-md-0,.my-md-0{margin-top:0!important}.mr-md-0,.mx-md-0{margin-right:0!important}.mb-md-0,.my-md-0{margin-bottom:0!important}.ml-md-0,.mx-md-0{margin-left:0!important}.m-md-1{margin:.25rem!important}.mt-md-1,.my-md-1{margin-top:.25rem!important}.mr-md-1,.mx-md-1{margin-right:.25rem!important}.mb-md-1,.my-md-1{margin-bottom:.25rem!important}.ml-md-1,.mx-md-1{margin-left:.25rem!important}.m-md-2{margin:.5rem!important}.mt-md-2,.my-md-2{margin-top:.5rem!important}.mr-md-2,.mx-md-2{margin-right:.5rem!important}.mb-md-2,.my-md-2{margin-bottom:.5rem!important}.ml-md-2,.mx-md-2{margin-left:.5rem!important}.m-md-3{margin:1rem!important}.mt-md-3,.my-md-3{margin-top:1rem!important}.mr-md-3,.mx-md-3{margin-right:1rem!important}.mb-md-3,.my-md-3{margin-bottom:1rem!important}.ml-md-3,.mx-md-3{margin-left:1rem!important}.m-md-4{margin:1.5rem!important}.mt-md-4,.my-md-4{margin-top:1.5rem!important}.mr-md-4,.mx-md-4{margin-right:1.5rem!important}.mb-md-4,.my-md-4{margin-bottom:1.5rem!important}.ml-md-4,.mx-md-4{margin-left:1.5rem!important}.m-md-5{margin:3rem!important}.mt-md-5,.my-md-5{margin-top:3rem!important}.mr-md-5,.mx-md-5{margin-right:3rem!important}.mb-md-5,.my-md-5{margin-bottom:3rem!important}.ml-md-5,.mx-md-5{margin-left:3rem!important}.p-md-0{padding:0!important}.pt-md-0,.py-md-0{padding-top:0!important}.pr-md-0,.px-md-0{padding-right:0!important}.pb-md-0,.py-md-0{padding-bottom:0!important}.pl-md-0,.px-md-0{padding-left:0!important}.p-md-1{padding:.25rem!important}.pt-md-1,.py-md-1{padding-top:.25rem!important}.pr-md-1,.px-md-1{padding-right:.25rem!important}.pb-md-1,.py-md-1{padding-bottom:.25rem!important}.pl-md-1,.px-md-1{padding-left:.25rem!important}.p-md-2{padding:.5rem!important}.pt-md-2,.py-md-2{padding-top:.5rem!important}.pr-md-2,.px-md-2{padding-right:.5rem!important}.pb-md-2,.py-md-2{padding-bottom:.5rem!important}.pl-md-2,.px-md-2{padding-left:.5rem!important}.p-md-3{padding:1rem!important}.pt-md-3,.py-md-3{padding-top:1rem!important}.pr-md-3,.px-md-3{padding-right:1rem!important}.pb-md-3,.py-md-3{padding-bottom:1rem!important}.pl-md-3,.px-md-3{padding-left:1rem!important}.p-md-4{padding:1.5rem!important}.pt-md-4,.py-md-4{padding-top:1.5rem!important}.pr-md-4,.px-md-4{padding-right:1.5rem!important}.pb-md-4,.py-md-4{padding-bottom:1.5rem!important}.pl-md-4,.px-md-4{padding-left:1.5rem!important}.p-md-5{padding:3rem!important}.pt-md-5,.py-md-5{padding-top:3rem!important}.pr-md-5,.px-md-5{padding-right:3rem!important}.pb-md-5,.py-md-5{padding-bottom:3rem!important}.pl-md-5,.px-md-5{padding-left:3rem!important}.m-md-auto{margin:auto!important}.mt-md-auto,.my-md-auto{margin-top:auto!important}.mr-md-auto,.mx-md-auto{margin-right:auto!important}.mb-md-auto,.my-md-auto{margin-bottom:auto!important}.ml-md-auto,.mx-md-auto{margin-left:auto!important}}@media (min-width:992px){.m-lg-0{margin:0!important}.mt-lg-0,.my-lg-0{margin-top:0!important}.mr-lg-0,.mx-lg-0{margin-right:0!important}.mb-lg-0,.my-lg-0{margin-bottom:0!important}.ml-lg-0,.mx-lg-0{margin-left:0!important}.m-lg-1{margin:.25rem!important}.mt-lg-1,.my-lg-1{margin-top:.25rem!important}.mr-lg-1,.mx-lg-1{margin-right:.25rem!important}.mb-lg-1,.my-lg-1{margin-bottom:.25rem!important}.ml-lg-1,.mx-lg-1{margin-left:.25rem!important}.m-lg-2{margin:.5rem!important}.mt-lg-2,.my-lg-2{margin-top:.5rem!important}.mr-lg-2,.mx-lg-2{margin-right:.5rem!important}.mb-lg-2,.my-lg-2{margin-bottom:.5rem!important}.ml-lg-2,.mx-lg-2{margin-left:.5rem!important}.m-lg-3{margin:1rem!important}.mt-lg-3,.my-lg-3{margin-top:1rem!important}.mr-lg-3,.mx-lg-3{margin-right:1rem!important}.mb-lg-3,.my-lg-3{margin-bottom:1rem!important}.ml-lg-3,.mx-lg-3{margin-left:1rem!important}.m-lg-4{margin:1.5rem!important}.mt-lg-4,.my-lg-4{margin-top:1.5rem!important}.mr-lg-4,.mx-lg-4{margin-right:1.5rem!important}.mb-lg-4,.my-lg-4{margin-bottom:1.5rem!important}.ml-lg-4,.mx-lg-4{margin-left:1.5rem!important}.m-lg-5{margin:3rem!important}.mt-lg-5,.my-lg-5{margin-top:3rem!important}.mr-lg-5,.mx-lg-5{margin-right:3rem!important}.mb-lg-5,.my-lg-5{margin-bottom:3rem!important}.ml-lg-5,.mx-lg-5{margin-left:3rem!important}.p-lg-0{padding:0!important}.pt-lg-0,.py-lg-0{padding-top:0!important}.pr-lg-0,.px-lg-0{padding-right:0!important}.pb-lg-0,.py-lg-0{padding-bottom:0!important}.pl-lg-0,.px-lg-0{padding-left:0!important}.p-lg-1{padding:.25rem!important}.pt-lg-1,.py-lg-1{padding-top:.25rem!important}.pr-lg-1,.px-lg-1{padding-right:.25rem!important}.pb-lg-1,.py-lg-1{padding-bottom:.25rem!important}.pl-lg-1,.px-lg-1{padding-left:.25rem!important}.p-lg-2{padding:.5rem!important}.pt-lg-2,.py-lg-2{padding-top:.5rem!important}.pr-lg-2,.px-lg-2{padding-right:.5rem!important}.pb-lg-2,.py-lg-2{padding-bottom:.5rem!important}.pl-lg-2,.px-lg-2{padding-left:.5rem!important}.p-lg-3{padding:1rem!important}.pt-lg-3,.py-lg-3{padding-top:1rem!important}.pr-lg-3,.px-lg-3{padding-right:1rem!important}.pb-lg-3,.py-lg-3{padding-bottom:1rem!important}.pl-lg-3,.px-lg-3{padding-left:1rem!important}.p-lg-4{padding:1.5rem!important}.pt-lg-4,.py-lg-4{padding-top:1.5rem!important}.pr-lg-4,.px-lg-4{padding-right:1.5rem!important}.pb-lg-4,.py-lg-4{padding-bottom:1.5rem!important}.pl-lg-4,.px-lg-4{padding-left:1.5rem!important}.p-lg-5{padding:3rem!important}.pt-lg-5,.py-lg-5{padding-top:3rem!important}.pr-lg-5,.px-lg-5{padding-right:3rem!important}.pb-lg-5,.py-lg-5{padding-bottom:3rem!important}.pl-lg-5,.px-lg-5{padding-left:3rem!important}.m-lg-auto{margin:auto!important}.mt-lg-auto,.my-lg-auto{margin-top:auto!important}.mr-lg-auto,.mx-lg-auto{margin-right:auto!important}.mb-lg-auto,.my-lg-auto{margin-bottom:auto!important}.ml-lg-auto,.mx-lg-auto{margin-left:auto!important}}@media (min-width:1200px){.m-xl-0{margin:0!important}.mt-xl-0,.my-xl-0{margin-top:0!important}.mr-xl-0,.mx-xl-0{margin-right:0!important}.mb-xl-0,.my-xl-0{margin-bottom:0!important}.ml-xl-0,.mx-xl-0{margin-left:0!important}.m-xl-1{margin:.25rem!important}.mt-xl-1,.my-xl-1{margin-top:.25rem!important}.mr-xl-1,.mx-xl-1{margin-right:.25rem!important}.mb-xl-1,.my-xl-1{margin-bottom:.25rem!important}.ml-xl-1,.mx-xl-1{margin-left:.25rem!important}.m-xl-2{margin:.5rem!important}.mt-xl-2,.my-xl-2{margin-top:.5rem!important}.mr-xl-2,.mx-xl-2{margin-right:.5rem!important}.mb-xl-2,.my-xl-2{margin-bottom:.5rem!important}.ml-xl-2,.mx-xl-2{margin-left:.5rem!important}.m-xl-3{margin:1rem!important}.mt-xl-3,.my-xl-3{margin-top:1rem!important}.mr-xl-3,.mx-xl-3{margin-right:1rem!important}.mb-xl-3,.my-xl-3{margin-bottom:1rem!important}.ml-xl-3,.mx-xl-3{margin-left:1rem!important}.m-xl-4{margin:1.5rem!important}.mt-xl-4,.my-xl-4{margin-top:1.5rem!important}.mr-xl-4,.mx-xl-4{margin-right:1.5rem!important}.mb-xl-4,.my-xl-4{margin-bottom:1.5rem!important}.ml-xl-4,.mx-xl-4{margin-left:1.5rem!important}.m-xl-5{margin:3rem!important}.mt-xl-5,.my-xl-5{margin-top:3rem!important}.mr-xl-5,.mx-xl-5{margin-right:3rem!important}.mb-xl-5,.my-xl-5{margin-bottom:3rem!important}.ml-xl-5,.mx-xl-5{margin-left:3rem!important}.p-xl-0{padding:0!important}.pt-xl-0,.py-xl-0{padding-top:0!important}.pr-xl-0,.px-xl-0{padding-right:0!important}.pb-xl-0,.py-xl-0{padding-bottom:0!important}.pl-xl-0,.px-xl-0{padding-left:0!important}.p-xl-1{padding:.25rem!important}.pt-xl-1,.py-xl-1{padding-top:.25rem!important}.pr-xl-1,.px-xl-1{padding-right:.25rem!important}.pb-xl-1,.py-xl-1{padding-bottom:.25rem!important}.pl-xl-1,.px-xl-1{padding-left:.25rem!important}.p-xl-2{padding:.5rem!important}.pt-xl-2,.py-xl-2{padding-top:.5rem!important}.pr-xl-2,.px-xl-2{padding-right:.5rem!important}.pb-xl-2,.py-xl-2{padding-bottom:.5rem!important}.pl-xl-2,.px-xl-2{padding-left:.5rem!important}.p-xl-3{padding:1rem!important}.pt-xl-3,.py-xl-3{padding-top:1rem!important}.pr-xl-3,.px-xl-3{padding-right:1rem!important}.pb-xl-3,.py-xl-3{padding-bottom:1rem!important}.pl-xl-3,.px-xl-3{padding-left:1rem!important}.p-xl-4{padding:1.5rem!important}.pt-xl-4,.py-xl-4{padding-top:1.5rem!important}.pr-xl-4,.px-xl-4{padding-right:1.5rem!important}.pb-xl-4,.py-xl-4{padding-bottom:1.5rem!important}.pl-xl-4,.px-xl-4{padding-left:1.5rem!important}.p-xl-5{padding:3rem!important}.pt-xl-5,.py-xl-5{padding-top:3rem!important}.pr-xl-5,.px-xl-5{padding-right:3rem!important}.pb-xl-5,.py-xl-5{padding-bottom:3rem!important}.pl-xl-5,.px-xl-5{padding-left:3rem!important}.m-xl-auto{margin:auto!important}.mt-xl-auto,.my-xl-auto{margin-top:auto!important}.mr-xl-auto,.mx-xl-auto{margin-right:auto!important}.mb-xl-auto,.my-xl-auto{margin-bottom:auto!important}.ml-xl-auto,.mx-xl-auto{margin-left:auto!important}}.text-justify{text-align:justify!important}.text-nowrap{white-space:nowrap!important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}@media (min-width:576px){.text-sm-left{text-align:left!important}.text-sm-right{text-align:right!important}.text-sm-center{text-align:center!important}}@media (min-width:768px){.text-md-left{text-align:left!important}.text-md-right{text-align:right!important}.text-md-center{text-align:center!important}}@media (min-width:992px){.text-lg-left{text-align:left!important}.text-lg-right{text-align:right!important}.text-lg-center{text-align:center!important}}@media (min-width:1200px){.text-xl-left{text-align:left!important}.text-xl-right{text-align:right!important}.text-xl-center{text-align:center!important}}.text-lowercase{text-transform:lowercase!important}.text-uppercase{text-transform:uppercase!important}.text-capitalize{text-transform:capitalize!important}.font-weight-light{font-weight:300!important}.font-weight-normal{font-weight:400!important}.font-weight-bold{font-weight:700!important}.font-italic{font-style:italic!important}.text-white{color:#fff!important}.text-primary{color:#007bff!important}a.text-primary:focus,a.text-primary:hover{color:#0062cc!important}.text-secondary{color:#6c757d!important}a.text-secondary:focus,a.text-secondary:hover{color:#545b62!important}.text-success{color:#28a745!important}a.text-success:focus,a.text-success:hover{color:#1e7e34!important}.text-info{color:#17a2b8!important}a.text-info:focus,a.text-info:hover{color:#117a8b!important}.text-warning{color:#ffc107!important}a.text-warning:focus,a.text-warning:hover{color:#d39e00!important}.text-danger{color:#dc3545!important}a.text-danger:focus,a.text-danger:hover{color:#bd2130!important}.text-light{color:#f8f9fa!important}a.text-light:focus,a.text-light:hover{color:#dae0e5!important}.text-dark{color:#343a40!important}a.text-dark:focus,a.text-dark:hover{color:#1d2124!important}.text-muted{color:#6c757d!important}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.visible{visibility:visible!important}.invisible{visibility:hidden!important}@media print{*,:after,:before{text-shadow:none!important;-webkit-box-shadow:none!important;box-shadow:none!important}a:not(.btn){text-decoration:underline}abbr[title]:after{content:" (" attr(title) ")"}pre{white-space:pre-wrap!important}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}@page{size:a3}.container,body{min-width:992px!important}.navbar{display:none}.badge{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}.navbar-laravel{background-color:#fff;-webkit-box-shadow:0 2px 4px rgba(0,0,0,.04);box-shadow:0 2px 4px rgba(0,0,0,.04)}
\ No newline at end of file
diff --git a/samples/server/petstore/php-laravel/lib/public/js/app.js b/samples/server/petstore/php-laravel/lib/public/js/app.js
deleted file mode 100644
index c5d3189712e5..000000000000
--- a/samples/server/petstore/php-laravel/lib/public/js/app.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{configurable:!1,enumerable:!0,get:r})},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=11)}([function(t,e,n){"use strict";var r=n(5),i=n(19),o=Object.prototype.toString;function a(t){return"[object Array]"===o.call(t)}function s(t){return null!==t&&"object"==typeof t}function u(t){return"[object Function]"===o.call(t)}function c(t,e){if(null!==t&&void 0!==t)if("object"!=typeof t&&(t=[t]),a(t))for(var n=0,r=t.length;n<r;n++)e.call(null,t[n],n,t);else for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&e.call(null,t[i],i,t)}t.exports={isArray:a,isArrayBuffer:function(t){return"[object ArrayBuffer]"===o.call(t)},isBuffer:i,isFormData:function(t){return"undefined"!=typeof FormData&&t instanceof FormData},isArrayBufferView:function(t){return"undefined"!=typeof ArrayBuffer&&ArrayBuffer.isView?ArrayBuffer.isView(t):t&&t.buffer&&t.buffer instanceof ArrayBuffer},isString:function(t){return"string"==typeof t},isNumber:function(t){return"number"==typeof t},isObject:s,isUndefined:function(t){return void 0===t},isDate:function(t){return"[object Date]"===o.call(t)},isFile:function(t){return"[object File]"===o.call(t)},isBlob:function(t){return"[object Blob]"===o.call(t)},isFunction:u,isStream:function(t){return s(t)&&u(t.pipe)},isURLSearchParams:function(t){return"undefined"!=typeof URLSearchParams&&t instanceof URLSearchParams},isStandardBrowserEnv:function(){return("undefined"==typeof navigator||"ReactNative"!==navigator.product)&&"undefined"!=typeof window&&"undefined"!=typeof document},forEach:c,merge:function t(){var e={};function n(n,r){"object"==typeof e[r]&&"object"==typeof n?e[r]=t(e[r],n):e[r]=n}for(var r=0,i=arguments.length;r<i;r++)c(arguments[r],n);return e},extend:function(t,e,n){return c(e,function(e,i){t[i]=n&&"function"==typeof e?r(e,n):e}),t},trim:function(t){return t.replace(/^\s*/,"").replace(/\s*$/,"")}}},function(t,e){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(t){"object"==typeof window&&(n=window)}t.exports=n},function(t,e,n){"use strict";(function(e){var r=n(0),i=n(21),o={"Content-Type":"application/x-www-form-urlencoded"};function a(t,e){!r.isUndefined(t)&&r.isUndefined(t["Content-Type"])&&(t["Content-Type"]=e)}var s,u={adapter:("undefined"!=typeof XMLHttpRequest?s=n(7):void 0!==e&&(s=n(7)),s),transformRequest:[function(t,e){return i(e,"Content-Type"),r.isFormData(t)||r.isArrayBuffer(t)||r.isBuffer(t)||r.isStream(t)||r.isFile(t)||r.isBlob(t)?t:r.isArrayBufferView(t)?t.buffer:r.isURLSearchParams(t)?(a(e,"application/x-www-form-urlencoded;charset=utf-8"),t.toString()):r.isObject(t)?(a(e,"application/json;charset=utf-8"),JSON.stringify(t)):t}],transformResponse:[function(t){if("string"==typeof t)try{t=JSON.parse(t)}catch(t){}return t}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,validateStatus:function(t){return t>=200&&t<300}};u.headers={common:{Accept:"application/json, text/plain, */*"}},r.forEach(["delete","get","head"],function(t){u.headers[t]={}}),r.forEach(["post","put","patch"],function(t){u.headers[t]=r.merge(o)}),t.exports=u}).call(e,n(6))},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),function(t){for(var n="undefined"!=typeof window&&"undefined"!=typeof document,r=["Edge","Trident","Firefox"],i=0,o=0;o<r.length;o+=1)if(n&&navigator.userAgent.indexOf(r[o])>=0){i=1;break}var a=n&&window.Promise?function(t){var e=!1;return function(){e||(e=!0,window.Promise.resolve().then(function(){e=!1,t()}))}}:function(t){var e=!1;return function(){e||(e=!0,setTimeout(function(){e=!1,t()},i))}};function s(t){return t&&"[object Function]"==={}.toString.call(t)}function u(t,e){if(1!==t.nodeType)return[];var n=getComputedStyle(t,null);return e?n[e]:n}function c(t){return"HTML"===t.nodeName?t:t.parentNode||t.host}function l(t){if(!t)return document.body;switch(t.nodeName){case"HTML":case"BODY":return t.ownerDocument.body;case"#document":return t.body}var e=u(t),n=e.overflow,r=e.overflowX,i=e.overflowY;return/(auto|scroll)/.test(n+i+r)?t:l(c(t))}function f(t){var e=t&&t.offsetParent,n=e&&e.nodeName;return n&&"BODY"!==n&&"HTML"!==n?-1!==["TD","TABLE"].indexOf(e.nodeName)&&"static"===u(e,"position")?f(e):e:t?t.ownerDocument.documentElement:document.documentElement}function p(t){return null!==t.parentNode?p(t.parentNode):t}function d(t,e){if(!(t&&t.nodeType&&e&&e.nodeType))return document.documentElement;var n=t.compareDocumentPosition(e)&Node.DOCUMENT_POSITION_FOLLOWING,r=n?t:e,i=n?e:t,o=document.createRange();o.setStart(r,0),o.setEnd(i,0);var a,s,u=o.commonAncestorContainer;if(t!==u&&e!==u||r.contains(i))return"BODY"===(s=(a=u).nodeName)||"HTML"!==s&&f(a.firstElementChild)!==a?f(u):u;var c=p(t);return c.host?d(c.host,e):d(t,p(e).host)}function h(t){var e="top"===(arguments.length>1&&void 0!==arguments[1]?arguments[1]:"top")?"scrollTop":"scrollLeft",n=t.nodeName;if("BODY"===n||"HTML"===n){var r=t.ownerDocument.documentElement;return(t.ownerDocument.scrollingElement||r)[e]}return t[e]}function v(t,e){var n="x"===e?"Left":"Top",r="Left"===n?"Right":"Bottom";return parseFloat(t["border"+n+"Width"],10)+parseFloat(t["border"+r+"Width"],10)}var g=void 0,m=function(){return void 0===g&&(g=-1!==navigator.appVersion.indexOf("MSIE 10")),g};function y(t,e,n,r){return Math.max(e["offset"+t],e["scroll"+t],n["client"+t],n["offset"+t],n["scroll"+t],m()?n["offset"+t]+r["margin"+("Height"===t?"Top":"Left")]+r["margin"+("Height"===t?"Bottom":"Right")]:0)}function _(){var t=document.body,e=document.documentElement,n=m()&&getComputedStyle(e);return{height:y("Height",t,e,n),width:y("Width",t,e,n)}}var b=function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")},w=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),x=function(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t},C=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t};function T(t){return C({},t,{right:t.left+t.width,bottom:t.top+t.height})}function E(t){var e={};if(m())try{e=t.getBoundingClientRect();var n=h(t,"top"),r=h(t,"left");e.top+=n,e.left+=r,e.bottom+=n,e.right+=r}catch(t){}else e=t.getBoundingClientRect();var i={left:e.left,top:e.top,width:e.right-e.left,height:e.bottom-e.top},o="HTML"===t.nodeName?_():{},a=o.width||t.clientWidth||i.right-i.left,s=o.height||t.clientHeight||i.bottom-i.top,c=t.offsetWidth-a,l=t.offsetHeight-s;if(c||l){var f=u(t);c-=v(f,"x"),l-=v(f,"y"),i.width-=c,i.height-=l}return T(i)}function A(t,e){var n=m(),r="HTML"===e.nodeName,i=E(t),o=E(e),a=l(t),s=u(e),c=parseFloat(s.borderTopWidth,10),f=parseFloat(s.borderLeftWidth,10),p=T({top:i.top-o.top-c,left:i.left-o.left-f,width:i.width,height:i.height});if(p.marginTop=0,p.marginLeft=0,!n&&r){var d=parseFloat(s.marginTop,10),v=parseFloat(s.marginLeft,10);p.top-=c-d,p.bottom-=c-d,p.left-=f-v,p.right-=f-v,p.marginTop=d,p.marginLeft=v}return(n?e.contains(a):e===a&&"BODY"!==a.nodeName)&&(p=function(t,e){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],r=h(e,"top"),i=h(e,"left"),o=n?-1:1;return t.top+=r*o,t.bottom+=r*o,t.left+=i*o,t.right+=i*o,t}(p,e)),p}function S(t,e,n,r){var i,o,a,s,f,p,v,g={top:0,left:0},m=d(t,e);if("viewport"===r)o=(i=m).ownerDocument.documentElement,a=A(i,o),s=Math.max(o.clientWidth,window.innerWidth||0),f=Math.max(o.clientHeight,window.innerHeight||0),p=h(o),v=h(o,"left"),g=T({top:p-a.top+a.marginTop,left:v-a.left+a.marginLeft,width:s,height:f});else{var y=void 0;"scrollParent"===r?"BODY"===(y=l(c(e))).nodeName&&(y=t.ownerDocument.documentElement):y="window"===r?t.ownerDocument.documentElement:r;var b=A(y,m);if("HTML"!==y.nodeName||function t(e){var n=e.nodeName;return"BODY"!==n&&"HTML"!==n&&("fixed"===u(e,"position")||t(c(e)))}(m))g=b;else{var w=_(),x=w.height,C=w.width;g.top+=b.top-b.marginTop,g.bottom=x+b.top,g.left+=b.left-b.marginLeft,g.right=C+b.left}}return g.left+=n,g.top+=n,g.right-=n,g.bottom-=n,g}function k(t,e,n,r,i){var o=arguments.length>5&&void 0!==arguments[5]?arguments[5]:0;if(-1===t.indexOf("auto"))return t;var a=S(n,r,o,i),s={top:{width:a.width,height:e.top-a.top},right:{width:a.right-e.right,height:a.height},bottom:{width:a.width,height:a.bottom-e.bottom},left:{width:e.left-a.left,height:a.height}},u=Object.keys(s).map(function(t){return C({key:t},s[t],{area:(e=s[t],e.width*e.height)});var e}).sort(function(t,e){return e.area-t.area}),c=u.filter(function(t){var e=t.width,r=t.height;return e>=n.clientWidth&&r>=n.clientHeight}),l=c.length>0?c[0].key:u[0].key,f=t.split("-")[1];return l+(f?"-"+f:"")}function O(t,e,n){return A(n,d(e,n))}function D(t){var e=getComputedStyle(t),n=parseFloat(e.marginTop)+parseFloat(e.marginBottom),r=parseFloat(e.marginLeft)+parseFloat(e.marginRight);return{width:t.offsetWidth+r,height:t.offsetHeight+n}}function I(t){var e={left:"right",right:"left",bottom:"top",top:"bottom"};return t.replace(/left|right|bottom|top/g,function(t){return e[t]})}function N(t,e,n){n=n.split("-")[0];var r=D(t),i={width:r.width,height:r.height},o=-1!==["right","left"].indexOf(n),a=o?"top":"left",s=o?"left":"top",u=o?"height":"width",c=o?"width":"height";return i[a]=e[a]+e[u]/2-r[u]/2,i[s]=n===s?e[s]-r[c]:e[I(s)],i}function j(t,e){return Array.prototype.find?t.find(e):t.filter(e)[0]}function L(t,e,n){return(void 0===n?t:t.slice(0,function(t,e,n){if(Array.prototype.findIndex)return t.findIndex(function(t){return t[e]===n});var r=j(t,function(t){return t[e]===n});return t.indexOf(r)}(t,"name",n))).forEach(function(t){t.function&&console.warn("`modifier.function` is deprecated, use `modifier.fn`!");var n=t.function||t.fn;t.enabled&&s(n)&&(e.offsets.popper=T(e.offsets.popper),e.offsets.reference=T(e.offsets.reference),e=n(e,t))}),e}function $(t,e){return t.some(function(t){var n=t.name;return t.enabled&&n===e})}function R(t){for(var e=[!1,"ms","Webkit","Moz","O"],n=t.charAt(0).toUpperCase()+t.slice(1),r=0;r<e.length-1;r++){var i=e[r],o=i?""+i+n:t;if(void 0!==document.body.style[o])return o}return null}function P(t){var e=t.ownerDocument;return e?e.defaultView:window}function M(t,e,n,r){n.updateBound=r,P(t).addEventListener("resize",n.updateBound,{passive:!0});var i=l(t);return function t(e,n,r,i){var o="BODY"===e.nodeName,a=o?e.ownerDocument.defaultView:e;a.addEventListener(n,r,{passive:!0}),o||t(l(a.parentNode),n,r,i),i.push(a)}(i,"scroll",n.updateBound,n.scrollParents),n.scrollElement=i,n.eventsEnabled=!0,n}function F(){var t,e;this.state.eventsEnabled&&(cancelAnimationFrame(this.scheduleUpdate),this.state=(t=this.reference,e=this.state,P(t).removeEventListener("resize",e.updateBound),e.scrollParents.forEach(function(t){t.removeEventListener("scroll",e.updateBound)}),e.updateBound=null,e.scrollParents=[],e.scrollElement=null,e.eventsEnabled=!1,e))}function H(t){return""!==t&&!isNaN(parseFloat(t))&&isFinite(t)}function B(t,e){Object.keys(e).forEach(function(n){var r="";-1!==["width","height","top","right","bottom","left"].indexOf(n)&&H(e[n])&&(r="px"),t.style[n]=e[n]+r})}function W(t,e,n){var r=j(t,function(t){return t.name===e}),i=!!r&&t.some(function(t){return t.name===n&&t.enabled&&t.order<r.order});if(!i){var o="`"+e+"`",a="`"+n+"`";console.warn(a+" modifier is required by "+o+" modifier in order to work, be sure to include it before "+o+"!")}return i}var q=["auto-start","auto","auto-end","top-start","top","top-end","right-start","right","right-end","bottom-end","bottom","bottom-start","left-end","left","left-start"],U=q.slice(3);function z(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=U.indexOf(t),r=U.slice(n+1).concat(U.slice(0,n));return e?r.reverse():r}var V={FLIP:"flip",CLOCKWISE:"clockwise",COUNTERCLOCKWISE:"counterclockwise"};function K(t,e,n,r){var i=[0,0],o=-1!==["right","left"].indexOf(r),a=t.split(/(\+|\-)/).map(function(t){return t.trim()}),s=a.indexOf(j(a,function(t){return-1!==t.search(/,|\s/)}));a[s]&&-1===a[s].indexOf(",")&&console.warn("Offsets separated by white space(s) are deprecated, use a comma (,) instead.");var u=/\s*,\s*|\s+/,c=-1!==s?[a.slice(0,s).concat([a[s].split(u)[0]]),[a[s].split(u)[1]].concat(a.slice(s+1))]:[a];return(c=c.map(function(t,r){var i=(1===r?!o:o)?"height":"width",a=!1;return t.reduce(function(t,e){return""===t[t.length-1]&&-1!==["+","-"].indexOf(e)?(t[t.length-1]=e,a=!0,t):a?(t[t.length-1]+=e,a=!1,t):t.concat(e)},[]).map(function(t){return function(t,e,n,r){var i=t.match(/((?:\-|\+)?\d*\.?\d*)(.*)/),o=+i[1],a=i[2];if(!o)return t;if(0===a.indexOf("%")){var s=void 0;switch(a){case"%p":s=n;break;case"%":case"%r":default:s=r}return T(s)[e]/100*o}if("vh"===a||"vw"===a)return("vh"===a?Math.max(document.documentElement.clientHeight,window.innerHeight||0):Math.max(document.documentElement.clientWidth,window.innerWidth||0))/100*o;return o}(t,i,e,n)})})).forEach(function(t,e){t.forEach(function(n,r){H(n)&&(i[e]+=n*("-"===t[r-1]?-1:1))})}),i}var Q={placement:"bottom",eventsEnabled:!0,removeOnDestroy:!1,onCreate:function(){},onUpdate:function(){},modifiers:{shift:{order:100,enabled:!0,fn:function(t){var e=t.placement,n=e.split("-")[0],r=e.split("-")[1];if(r){var i=t.offsets,o=i.reference,a=i.popper,s=-1!==["bottom","top"].indexOf(n),u=s?"left":"top",c=s?"width":"height",l={start:x({},u,o[u]),end:x({},u,o[u]+o[c]-a[c])};t.offsets.popper=C({},a,l[r])}return t}},offset:{order:200,enabled:!0,fn:function(t,e){var n=e.offset,r=t.placement,i=t.offsets,o=i.popper,a=i.reference,s=r.split("-")[0],u=void 0;return u=H(+n)?[+n,0]:K(n,o,a,s),"left"===s?(o.top+=u[0],o.left-=u[1]):"right"===s?(o.top+=u[0],o.left+=u[1]):"top"===s?(o.left+=u[0],o.top-=u[1]):"bottom"===s&&(o.left+=u[0],o.top+=u[1]),t.popper=o,t},offset:0},preventOverflow:{order:300,enabled:!0,fn:function(t,e){var n=e.boundariesElement||f(t.instance.popper);t.instance.reference===n&&(n=f(n));var r=S(t.instance.popper,t.instance.reference,e.padding,n);e.boundaries=r;var i=e.priority,o=t.offsets.popper,a={primary:function(t){var n=o[t];return o[t]<r[t]&&!e.escapeWithReference&&(n=Math.max(o[t],r[t])),x({},t,n)},secondary:function(t){var n="right"===t?"left":"top",i=o[n];return o[t]>r[t]&&!e.escapeWithReference&&(i=Math.min(o[n],r[t]-("right"===t?o.width:o.height))),x({},n,i)}};return i.forEach(function(t){var e=-1!==["left","top"].indexOf(t)?"primary":"secondary";o=C({},o,a[e](t))}),t.offsets.popper=o,t},priority:["left","right","top","bottom"],padding:5,boundariesElement:"scrollParent"},keepTogether:{order:400,enabled:!0,fn:function(t){var e=t.offsets,n=e.popper,r=e.reference,i=t.placement.split("-")[0],o=Math.floor,a=-1!==["top","bottom"].indexOf(i),s=a?"right":"bottom",u=a?"left":"top",c=a?"width":"height";return n[s]<o(r[u])&&(t.offsets.popper[u]=o(r[u])-n[c]),n[u]>o(r[s])&&(t.offsets.popper[u]=o(r[s])),t}},arrow:{order:500,enabled:!0,fn:function(t,e){var n;if(!W(t.instance.modifiers,"arrow","keepTogether"))return t;var r=e.element;if("string"==typeof r){if(!(r=t.instance.popper.querySelector(r)))return t}else if(!t.instance.popper.contains(r))return console.warn("WARNING: `arrow.element` must be child of its popper element!"),t;var i=t.placement.split("-")[0],o=t.offsets,a=o.popper,s=o.reference,c=-1!==["left","right"].indexOf(i),l=c?"height":"width",f=c?"Top":"Left",p=f.toLowerCase(),d=c?"left":"top",h=c?"bottom":"right",v=D(r)[l];s[h]-v<a[p]&&(t.offsets.popper[p]-=a[p]-(s[h]-v)),s[p]+v>a[h]&&(t.offsets.popper[p]+=s[p]+v-a[h]),t.offsets.popper=T(t.offsets.popper);var g=s[p]+s[l]/2-v/2,m=u(t.instance.popper),y=parseFloat(m["margin"+f],10),_=parseFloat(m["border"+f+"Width"],10),b=g-t.offsets.popper[p]-y-_;return b=Math.max(Math.min(a[l]-v,b),0),t.arrowElement=r,t.offsets.arrow=(x(n={},p,Math.round(b)),x(n,d,""),n),t},element:"[x-arrow]"},flip:{order:600,enabled:!0,fn:function(t,e){if($(t.instance.modifiers,"inner"))return t;if(t.flipped&&t.placement===t.originalPlacement)return t;var n=S(t.instance.popper,t.instance.reference,e.padding,e.boundariesElement),r=t.placement.split("-")[0],i=I(r),o=t.placement.split("-")[1]||"",a=[];switch(e.behavior){case V.FLIP:a=[r,i];break;case V.CLOCKWISE:a=z(r);break;case V.COUNTERCLOCKWISE:a=z(r,!0);break;default:a=e.behavior}return a.forEach(function(s,u){if(r!==s||a.length===u+1)return t;r=t.placement.split("-")[0],i=I(r);var c,l=t.offsets.popper,f=t.offsets.reference,p=Math.floor,d="left"===r&&p(l.right)>p(f.left)||"right"===r&&p(l.left)<p(f.right)||"top"===r&&p(l.bottom)>p(f.top)||"bottom"===r&&p(l.top)<p(f.bottom),h=p(l.left)<p(n.left),v=p(l.right)>p(n.right),g=p(l.top)<p(n.top),m=p(l.bottom)>p(n.bottom),y="left"===r&&h||"right"===r&&v||"top"===r&&g||"bottom"===r&&m,_=-1!==["top","bottom"].indexOf(r),b=!!e.flipVariations&&(_&&"start"===o&&h||_&&"end"===o&&v||!_&&"start"===o&&g||!_&&"end"===o&&m);(d||y||b)&&(t.flipped=!0,(d||y)&&(r=a[u+1]),b&&(o="end"===(c=o)?"start":"start"===c?"end":c),t.placement=r+(o?"-"+o:""),t.offsets.popper=C({},t.offsets.popper,N(t.instance.popper,t.offsets.reference,t.placement)),t=L(t.instance.modifiers,t,"flip"))}),t},behavior:"flip",padding:5,boundariesElement:"viewport"},inner:{order:700,enabled:!1,fn:function(t){var e=t.placement,n=e.split("-")[0],r=t.offsets,i=r.popper,o=r.reference,a=-1!==["left","right"].indexOf(n),s=-1===["top","left"].indexOf(n);return i[a?"left":"top"]=o[n]-(s?i[a?"width":"height"]:0),t.placement=I(e),t.offsets.popper=T(i),t}},hide:{order:800,enabled:!0,fn:function(t){if(!W(t.instance.modifiers,"hide","preventOverflow"))return t;var e=t.offsets.reference,n=j(t.instance.modifiers,function(t){return"preventOverflow"===t.name}).boundaries;if(e.bottom<n.top||e.left>n.right||e.top>n.bottom||e.right<n.left){if(!0===t.hide)return t;t.hide=!0,t.attributes["x-out-of-boundaries"]=""}else{if(!1===t.hide)return t;t.hide=!1,t.attributes["x-out-of-boundaries"]=!1}return t}},computeStyle:{order:850,enabled:!0,fn:function(t,e){var n=e.x,r=e.y,i=t.offsets.popper,o=j(t.instance.modifiers,function(t){return"applyStyle"===t.name}).gpuAcceleration;void 0!==o&&console.warn("WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!");var a=void 0!==o?o:e.gpuAcceleration,s=E(f(t.instance.popper)),u={position:i.position},c={left:Math.floor(i.left),top:Math.floor(i.top),bottom:Math.floor(i.bottom),right:Math.floor(i.right)},l="bottom"===n?"top":"bottom",p="right"===r?"left":"right",d=R("transform"),h=void 0,v=void 0;if(v="bottom"===l?-s.height+c.bottom:c.top,h="right"===p?-s.width+c.right:c.left,a&&d)u[d]="translate3d("+h+"px, "+v+"px, 0)",u[l]=0,u[p]=0,u.willChange="transform";else{var g="bottom"===l?-1:1,m="right"===p?-1:1;u[l]=v*g,u[p]=h*m,u.willChange=l+", "+p}var y={"x-placement":t.placement};return t.attributes=C({},y,t.attributes),t.styles=C({},u,t.styles),t.arrowStyles=C({},t.offsets.arrow,t.arrowStyles),t},gpuAcceleration:!0,x:"bottom",y:"right"},applyStyle:{order:900,enabled:!0,fn:function(t){var e,n;return B(t.instance.popper,t.styles),e=t.instance.popper,n=t.attributes,Object.keys(n).forEach(function(t){!1!==n[t]?e.setAttribute(t,n[t]):e.removeAttribute(t)}),t.arrowElement&&Object.keys(t.arrowStyles).length&&B(t.arrowElement,t.arrowStyles),t},onLoad:function(t,e,n,r,i){var o=O(0,e,t),a=k(n.placement,o,e,t,n.modifiers.flip.boundariesElement,n.modifiers.flip.padding);return e.setAttribute("x-placement",a),B(e,{position:"absolute"}),n},gpuAcceleration:void 0}}},G=function(){function t(e,n){var r=this,i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};b(this,t),this.scheduleUpdate=function(){return requestAnimationFrame(r.update)},this.update=a(this.update.bind(this)),this.options=C({},t.Defaults,i),this.state={isDestroyed:!1,isCreated:!1,scrollParents:[]},this.reference=e&&e.jquery?e[0]:e,this.popper=n&&n.jquery?n[0]:n,this.options.modifiers={},Object.keys(C({},t.Defaults.modifiers,i.modifiers)).forEach(function(e){r.options.modifiers[e]=C({},t.Defaults.modifiers[e]||{},i.modifiers?i.modifiers[e]:{})}),this.modifiers=Object.keys(this.options.modifiers).map(function(t){return C({name:t},r.options.modifiers[t])}).sort(function(t,e){return t.order-e.order}),this.modifiers.forEach(function(t){t.enabled&&s(t.onLoad)&&t.onLoad(r.reference,r.popper,r.options,t,r.state)}),this.update();var o=this.options.eventsEnabled;o&&this.enableEventListeners(),this.state.eventsEnabled=o}return w(t,[{key:"update",value:function(){return function(){if(!this.state.isDestroyed){var t={instance:this,styles:{},arrowStyles:{},attributes:{},flipped:!1,offsets:{}};t.offsets.reference=O(this.state,this.popper,this.reference),t.placement=k(this.options.placement,t.offsets.reference,this.popper,this.reference,this.options.modifiers.flip.boundariesElement,this.options.modifiers.flip.padding),t.originalPlacement=t.placement,t.offsets.popper=N(this.popper,t.offsets.reference,t.placement),t.offsets.popper.position="absolute",t=L(this.modifiers,t),this.state.isCreated?this.options.onUpdate(t):(this.state.isCreated=!0,this.options.onCreate(t))}}.call(this)}},{key:"destroy",value:function(){return function(){return this.state.isDestroyed=!0,$(this.modifiers,"applyStyle")&&(this.popper.removeAttribute("x-placement"),this.popper.style.left="",this.popper.style.position="",this.popper.style.top="",this.popper.style[R("transform")]=""),this.disableEventListeners(),this.options.removeOnDestroy&&this.popper.parentNode.removeChild(this.popper),this}.call(this)}},{key:"enableEventListeners",value:function(){return function(){this.state.eventsEnabled||(this.state=M(this.reference,this.options,this.state,this.scheduleUpdate))}.call(this)}},{key:"disableEventListeners",value:function(){return F.call(this)}}]),t}();G.Utils=("undefined"!=typeof window?window:t).PopperUtils,G.placements=q,G.Defaults=Q,e.default=G}.call(e,n(1))},function(t,e,n){var r;!function(e,n){"use strict";"object"==typeof t&&"object"==typeof t.exports?t.exports=e.document?n(e,!0):function(t){if(!t.document)throw new Error("jQuery requires a window with a document");return n(t)}:n(e)}("undefined"!=typeof window?window:this,function(n,i){"use strict";var o=[],a=n.document,s=Object.getPrototypeOf,u=o.slice,c=o.concat,l=o.push,f=o.indexOf,p={},d=p.toString,h=p.hasOwnProperty,v=h.toString,g=v.call(Object),m={};function y(t,e){var n=(e=e||a).createElement("script");n.text=t,e.head.appendChild(n).parentNode.removeChild(n)}var _=function(t,e){return new _.fn.init(t,e)},b=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,w=/^-ms-/,x=/-([a-z])/g,C=function(t,e){return e.toUpperCase()};function T(t){var e=!!t&&"length"in t&&t.length,n=_.type(t);return"function"!==n&&!_.isWindow(t)&&("array"===n||0===e||"number"==typeof e&&e>0&&e-1 in t)}_.fn=_.prototype={jquery:"3.2.1",constructor:_,length:0,toArray:function(){return u.call(this)},get:function(t){return null==t?u.call(this):t<0?this[t+this.length]:this[t]},pushStack:function(t){var e=_.merge(this.constructor(),t);return e.prevObject=this,e},each:function(t){return _.each(this,t)},map:function(t){return this.pushStack(_.map(this,function(e,n){return t.call(e,n,e)}))},slice:function(){return this.pushStack(u.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(t){var e=this.length,n=+t+(t<0?e:0);return this.pushStack(n>=0&&n<e?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:l,sort:o.sort,splice:o.splice},_.extend=_.fn.extend=function(){var t,e,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,c=!1;for("boolean"==typeof a&&(c=a,a=arguments[s]||{},s++),"object"==typeof a||_.isFunction(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(t=arguments[s]))for(e in t)n=a[e],a!==(r=t[e])&&(c&&r&&(_.isPlainObject(r)||(i=Array.isArray(r)))?(i?(i=!1,o=n&&Array.isArray(n)?n:[]):o=n&&_.isPlainObject(n)?n:{},a[e]=_.extend(c,o,r)):void 0!==r&&(a[e]=r));return a},_.extend({expando:"jQuery"+("3.2.1"+Math.random()).replace(/\D/g,""),isReady:!0,error:function(t){throw new Error(t)},noop:function(){},isFunction:function(t){return"function"===_.type(t)},isWindow:function(t){return null!=t&&t===t.window},isNumeric:function(t){var e=_.type(t);return("number"===e||"string"===e)&&!isNaN(t-parseFloat(t))},isPlainObject:function(t){var e,n;return!(!t||"[object Object]"!==d.call(t))&&(!(e=s(t))||"function"==typeof(n=h.call(e,"constructor")&&e.constructor)&&v.call(n)===g)},isEmptyObject:function(t){var e;for(e in t)return!1;return!0},type:function(t){return null==t?t+"":"object"==typeof t||"function"==typeof t?p[d.call(t)]||"object":typeof t},globalEval:function(t){y(t)},camelCase:function(t){return t.replace(w,"ms-").replace(x,C)},each:function(t,e){var n,r=0;if(T(t))for(n=t.length;r<n&&!1!==e.call(t[r],r,t[r]);r++);else for(r in t)if(!1===e.call(t[r],r,t[r]))break;return t},trim:function(t){return null==t?"":(t+"").replace(b,"")},makeArray:function(t,e){var n=e||[];return null!=t&&(T(Object(t))?_.merge(n,"string"==typeof t?[t]:t):l.call(n,t)),n},inArray:function(t,e,n){return null==e?-1:f.call(e,t,n)},merge:function(t,e){for(var n=+e.length,r=0,i=t.length;r<n;r++)t[i++]=e[r];return t.length=i,t},grep:function(t,e,n){for(var r=[],i=0,o=t.length,a=!n;i<o;i++)!e(t[i],i)!==a&&r.push(t[i]);return r},map:function(t,e,n){var r,i,o=0,a=[];if(T(t))for(r=t.length;o<r;o++)null!=(i=e(t[o],o,n))&&a.push(i);else for(o in t)null!=(i=e(t[o],o,n))&&a.push(i);return c.apply([],a)},guid:1,proxy:function(t,e){var n,r,i;if("string"==typeof e&&(n=t[e],e=t,t=n),_.isFunction(t))return r=u.call(arguments,2),(i=function(){return t.apply(e||this,r.concat(u.call(arguments)))}).guid=t.guid=t.guid||_.guid++,i},now:Date.now,support:m}),"function"==typeof Symbol&&(_.fn[Symbol.iterator]=o[Symbol.iterator]),_.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(t,e){p["[object "+e+"]"]=e.toLowerCase()});var E=function(t){var e,n,r,i,o,a,s,u,c,l,f,p,d,h,v,g,m,y,_,b="sizzle"+1*new Date,w=t.document,x=0,C=0,T=at(),E=at(),A=at(),S=function(t,e){return t===e&&(f=!0),0},k={}.hasOwnProperty,O=[],D=O.pop,I=O.push,N=O.push,j=O.slice,L=function(t,e){for(var n=0,r=t.length;n<r;n++)if(t[n]===e)return n;return-1},$="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",R="[\\x20\\t\\r\\n\\f]",P="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+R+"*("+P+")(?:"+R+"*([*^$|!~]?=)"+R+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+P+"))|)"+R+"*\\]",F=":("+P+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",H=new RegExp(R+"+","g"),B=new RegExp("^"+R+"+|((?:^|[^\\\\])(?:\\\\.)*)"+R+"+$","g"),W=new RegExp("^"+R+"*,"+R+"*"),q=new RegExp("^"+R+"*([>+~]|"+R+")"+R+"*"),U=new RegExp("="+R+"*([^\\]'\"]*?)"+R+"*\\]","g"),z=new RegExp(F),V=new RegExp("^"+P+"$"),K={ID:new RegExp("^#("+P+")"),CLASS:new RegExp("^\\.("+P+")"),TAG:new RegExp("^("+P+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+R+"*(even|odd|(([+-]|)(\\d*)n|)"+R+"*(?:([+-]|)"+R+"*(\\d+)|))"+R+"*\\)|)","i"),bool:new RegExp("^(?:"+$+")$","i"),needsContext:new RegExp("^"+R+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+R+"*((?:-\\d)?\\d*)"+R+"*\\)|)(?=[^-]|$)","i")},Q=/^(?:input|select|textarea|button)$/i,G=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,X=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,J=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+R+"?|("+R+")|.)","ig"),tt=function(t,e,n){var r="0x"+e-65536;return r!=r||n?e:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},et=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,nt=function(t,e){return e?"\0"===t?"�":t.slice(0,-1)+"\\"+t.charCodeAt(t.length-1).toString(16)+" ":"\\"+t},rt=function(){p()},it=yt(function(t){return!0===t.disabled&&("form"in t||"label"in t)},{dir:"parentNode",next:"legend"});try{N.apply(O=j.call(w.childNodes),w.childNodes),O[w.childNodes.length].nodeType}catch(t){N={apply:O.length?function(t,e){I.apply(t,j.call(e))}:function(t,e){for(var n=t.length,r=0;t[n++]=e[r++];);t.length=n-1}}}function ot(t,e,r,i){var o,s,c,l,f,h,m,y=e&&e.ownerDocument,x=e?e.nodeType:9;if(r=r||[],"string"!=typeof t||!t||1!==x&&9!==x&&11!==x)return r;if(!i&&((e?e.ownerDocument||e:w)!==d&&p(e),e=e||d,v)){if(11!==x&&(f=X.exec(t)))if(o=f[1]){if(9===x){if(!(c=e.getElementById(o)))return r;if(c.id===o)return r.push(c),r}else if(y&&(c=y.getElementById(o))&&_(e,c)&&c.id===o)return r.push(c),r}else{if(f[2])return N.apply(r,e.getElementsByTagName(t)),r;if((o=f[3])&&n.getElementsByClassName&&e.getElementsByClassName)return N.apply(r,e.getElementsByClassName(o)),r}if(n.qsa&&!A[t+" "]&&(!g||!g.test(t))){if(1!==x)y=e,m=t;else if("object"!==e.nodeName.toLowerCase()){for((l=e.getAttribute("id"))?l=l.replace(et,nt):e.setAttribute("id",l=b),s=(h=a(t)).length;s--;)h[s]="#"+l+" "+mt(h[s]);m=h.join(","),y=J.test(t)&&vt(e.parentNode)||e}if(m)try{return N.apply(r,y.querySelectorAll(m)),r}catch(t){}finally{l===b&&e.removeAttribute("id")}}}return u(t.replace(B,"$1"),e,r,i)}function at(){var t=[];return function e(n,i){return t.push(n+" ")>r.cacheLength&&delete e[t.shift()],e[n+" "]=i}}function st(t){return t[b]=!0,t}function ut(t){var e=d.createElement("fieldset");try{return!!t(e)}catch(t){return!1}finally{e.parentNode&&e.parentNode.removeChild(e),e=null}}function ct(t,e){for(var n=t.split("|"),i=n.length;i--;)r.attrHandle[n[i]]=e}function lt(t,e){var n=e&&t,r=n&&1===t.nodeType&&1===e.nodeType&&t.sourceIndex-e.sourceIndex;if(r)return r;if(n)for(;n=n.nextSibling;)if(n===e)return-1;return t?1:-1}function ft(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function pt(t){return function(e){var n=e.nodeName.toLowerCase();return("input"===n||"button"===n)&&e.type===t}}function dt(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&it(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ht(t){return st(function(e){return e=+e,st(function(n,r){for(var i,o=t([],n.length,e),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function vt(t){return t&&void 0!==t.getElementsByTagName&&t}n=ot.support={},o=ot.isXML=function(t){var e=t&&(t.ownerDocument||t).documentElement;return!!e&&"HTML"!==e.nodeName},p=ot.setDocument=function(t){var e,i,a=t?t.ownerDocument||t:w;return a!==d&&9===a.nodeType&&a.documentElement?(h=(d=a).documentElement,v=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",rt,!1):i.attachEvent&&i.attachEvent("onunload",rt)),n.attributes=ut(function(t){return t.className="i",!t.getAttribute("className")}),n.getElementsByTagName=ut(function(t){return t.appendChild(d.createComment("")),!t.getElementsByTagName("*").length}),n.getElementsByClassName=Y.test(d.getElementsByClassName),n.getById=ut(function(t){return h.appendChild(t).id=b,!d.getElementsByName||!d.getElementsByName(b).length}),n.getById?(r.filter.ID=function(t){var e=t.replace(Z,tt);return function(t){return t.getAttribute("id")===e}},r.find.ID=function(t,e){if(void 0!==e.getElementById&&v){var n=e.getElementById(t);return n?[n]:[]}}):(r.filter.ID=function(t){var e=t.replace(Z,tt);return function(t){var n=void 0!==t.getAttributeNode&&t.getAttributeNode("id");return n&&n.value===e}},r.find.ID=function(t,e){if(void 0!==e.getElementById&&v){var n,r,i,o=e.getElementById(t);if(o){if((n=o.getAttributeNode("id"))&&n.value===t)return[o];for(i=e.getElementsByName(t),r=0;o=i[r++];)if((n=o.getAttributeNode("id"))&&n.value===t)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(t,e){return void 0!==e.getElementsByTagName?e.getElementsByTagName(t):n.qsa?e.querySelectorAll(t):void 0}:function(t,e){var n,r=[],i=0,o=e.getElementsByTagName(t);if("*"===t){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(t,e){if(void 0!==e.getElementsByClassName&&v)return e.getElementsByClassName(t)},m=[],g=[],(n.qsa=Y.test(d.querySelectorAll))&&(ut(function(t){h.appendChild(t).innerHTML="<a id='"+b+"'></a><select id='"+b+"-\r\\' msallowcapture=''><option selected=''></option></select>",t.querySelectorAll("[msallowcapture^='']").length&&g.push("[*^$]="+R+"*(?:''|\"\")"),t.querySelectorAll("[selected]").length||g.push("\\["+R+"*(?:value|"+$+")"),t.querySelectorAll("[id~="+b+"-]").length||g.push("~="),t.querySelectorAll(":checked").length||g.push(":checked"),t.querySelectorAll("a#"+b+"+*").length||g.push(".#.+[+~]")}),ut(function(t){t.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var e=d.createElement("input");e.setAttribute("type","hidden"),t.appendChild(e).setAttribute("name","D"),t.querySelectorAll("[name=d]").length&&g.push("name"+R+"*[*^$|!~]?="),2!==t.querySelectorAll(":enabled").length&&g.push(":enabled",":disabled"),h.appendChild(t).disabled=!0,2!==t.querySelectorAll(":disabled").length&&g.push(":enabled",":disabled"),t.querySelectorAll("*,:x"),g.push(",.*:")})),(n.matchesSelector=Y.test(y=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ut(function(t){n.disconnectedMatch=y.call(t,"*"),y.call(t,"[s!='']:x"),m.push("!=",F)}),g=g.length&&new RegExp(g.join("|")),m=m.length&&new RegExp(m.join("|")),e=Y.test(h.compareDocumentPosition),_=e||Y.test(h.contains)?function(t,e){var n=9===t.nodeType?t.documentElement:t,r=e&&e.parentNode;return t===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):t.compareDocumentPosition&&16&t.compareDocumentPosition(r)))}:function(t,e){if(e)for(;e=e.parentNode;)if(e===t)return!0;return!1},S=e?function(t,e){if(t===e)return f=!0,0;var r=!t.compareDocumentPosition-!e.compareDocumentPosition;return r||(1&(r=(t.ownerDocument||t)===(e.ownerDocument||e)?t.compareDocumentPosition(e):1)||!n.sortDetached&&e.compareDocumentPosition(t)===r?t===d||t.ownerDocument===w&&_(w,t)?-1:e===d||e.ownerDocument===w&&_(w,e)?1:l?L(l,t)-L(l,e):0:4&r?-1:1)}:function(t,e){if(t===e)return f=!0,0;var n,r=0,i=t.parentNode,o=e.parentNode,a=[t],s=[e];if(!i||!o)return t===d?-1:e===d?1:i?-1:o?1:l?L(l,t)-L(l,e):0;if(i===o)return lt(t,e);for(n=t;n=n.parentNode;)a.unshift(n);for(n=e;n=n.parentNode;)s.unshift(n);for(;a[r]===s[r];)r++;return r?lt(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},ot.matches=function(t,e){return ot(t,null,null,e)},ot.matchesSelector=function(t,e){if((t.ownerDocument||t)!==d&&p(t),e=e.replace(U,"='$1']"),n.matchesSelector&&v&&!A[e+" "]&&(!m||!m.test(e))&&(!g||!g.test(e)))try{var r=y.call(t,e);if(r||n.disconnectedMatch||t.document&&11!==t.document.nodeType)return r}catch(t){}return ot(e,d,null,[t]).length>0},ot.contains=function(t,e){return(t.ownerDocument||t)!==d&&p(t),_(t,e)},ot.attr=function(t,e){(t.ownerDocument||t)!==d&&p(t);var i=r.attrHandle[e.toLowerCase()],o=i&&k.call(r.attrHandle,e.toLowerCase())?i(t,e,!v):void 0;return void 0!==o?o:n.attributes||!v?t.getAttribute(e):(o=t.getAttributeNode(e))&&o.specified?o.value:null},ot.escape=function(t){return(t+"").replace(et,nt)},ot.error=function(t){throw new Error("Syntax error, unrecognized expression: "+t)},ot.uniqueSort=function(t){var e,r=[],i=0,o=0;if(f=!n.detectDuplicates,l=!n.sortStable&&t.slice(0),t.sort(S),f){for(;e=t[o++];)e===t[o]&&(i=r.push(o));for(;i--;)t.splice(r[i],1)}return l=null,t},i=ot.getText=function(t){var e,n="",r=0,o=t.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof t.textContent)return t.textContent;for(t=t.firstChild;t;t=t.nextSibling)n+=i(t)}else if(3===o||4===o)return t.nodeValue}else for(;e=t[r++];)n+=i(e);return n},(r=ot.selectors={cacheLength:50,createPseudo:st,match:K,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(t){return t[1]=t[1].replace(Z,tt),t[3]=(t[3]||t[4]||t[5]||"").replace(Z,tt),"~="===t[2]&&(t[3]=" "+t[3]+" "),t.slice(0,4)},CHILD:function(t){return t[1]=t[1].toLowerCase(),"nth"===t[1].slice(0,3)?(t[3]||ot.error(t[0]),t[4]=+(t[4]?t[5]+(t[6]||1):2*("even"===t[3]||"odd"===t[3])),t[5]=+(t[7]+t[8]||"odd"===t[3])):t[3]&&ot.error(t[0]),t},PSEUDO:function(t){var e,n=!t[6]&&t[2];return K.CHILD.test(t[0])?null:(t[3]?t[2]=t[4]||t[5]||"":n&&z.test(n)&&(e=a(n,!0))&&(e=n.indexOf(")",n.length-e)-n.length)&&(t[0]=t[0].slice(0,e),t[2]=n.slice(0,e)),t.slice(0,3))}},filter:{TAG:function(t){var e=t.replace(Z,tt).toLowerCase();return"*"===t?function(){return!0}:function(t){return t.nodeName&&t.nodeName.toLowerCase()===e}},CLASS:function(t){var e=T[t+" "];return e||(e=new RegExp("(^|"+R+")"+t+"("+R+"|$)"))&&T(t,function(t){return e.test("string"==typeof t.className&&t.className||void 0!==t.getAttribute&&t.getAttribute("class")||"")})},ATTR:function(t,e,n){return function(r){var i=ot.attr(r,t);return null==i?"!="===e:!e||(i+="","="===e?i===n:"!="===e?i!==n:"^="===e?n&&0===i.indexOf(n):"*="===e?n&&i.indexOf(n)>-1:"$="===e?n&&i.slice(-n.length)===n:"~="===e?(" "+i.replace(H," ")+" ").indexOf(n)>-1:"|="===e&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(t,e,n,r,i){var o="nth"!==t.slice(0,3),a="last"!==t.slice(-4),s="of-type"===e;return 1===r&&0===i?function(t){return!!t.parentNode}:function(e,n,u){var c,l,f,p,d,h,v=o!==a?"nextSibling":"previousSibling",g=e.parentNode,m=s&&e.nodeName.toLowerCase(),y=!u&&!s,_=!1;if(g){if(o){for(;v;){for(p=e;p=p[v];)if(s?p.nodeName.toLowerCase()===m:1===p.nodeType)return!1;h=v="only"===t&&!h&&"nextSibling"}return!0}if(h=[a?g.firstChild:g.lastChild],a&&y){for(_=(d=(c=(l=(f=(p=g)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[t]||[])[0]===x&&c[1])&&c[2],p=d&&g.childNodes[d];p=++d&&p&&p[v]||(_=d=0)||h.pop();)if(1===p.nodeType&&++_&&p===e){l[t]=[x,d,_];break}}else if(y&&(_=d=(c=(l=(f=(p=e)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[t]||[])[0]===x&&c[1]),!1===_)for(;(p=++d&&p&&p[v]||(_=d=0)||h.pop())&&((s?p.nodeName.toLowerCase()!==m:1!==p.nodeType)||!++_||(y&&((l=(f=p[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[t]=[x,_]),p!==e)););return(_-=i)===r||_%r==0&&_/r>=0}}},PSEUDO:function(t,e){var n,i=r.pseudos[t]||r.setFilters[t.toLowerCase()]||ot.error("unsupported pseudo: "+t);return i[b]?i(e):i.length>1?(n=[t,t,"",e],r.setFilters.hasOwnProperty(t.toLowerCase())?st(function(t,n){for(var r,o=i(t,e),a=o.length;a--;)t[r=L(t,o[a])]=!(n[r]=o[a])}):function(t){return i(t,0,n)}):i}},pseudos:{not:st(function(t){var e=[],n=[],r=s(t.replace(B,"$1"));return r[b]?st(function(t,e,n,i){for(var o,a=r(t,null,i,[]),s=t.length;s--;)(o=a[s])&&(t[s]=!(e[s]=o))}):function(t,i,o){return e[0]=t,r(e,null,o,n),e[0]=null,!n.pop()}}),has:st(function(t){return function(e){return ot(t,e).length>0}}),contains:st(function(t){return t=t.replace(Z,tt),function(e){return(e.textContent||e.innerText||i(e)).indexOf(t)>-1}}),lang:st(function(t){return V.test(t||"")||ot.error("unsupported lang: "+t),t=t.replace(Z,tt).toLowerCase(),function(e){var n;do{if(n=v?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(n=n.toLowerCase())===t||0===n.indexOf(t+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var n=t.location&&t.location.hash;return n&&n.slice(1)===e.id},root:function(t){return t===h},focus:function(t){return t===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(t.type||t.href||~t.tabIndex)},enabled:dt(!1),disabled:dt(!0),checked:function(t){var e=t.nodeName.toLowerCase();return"input"===e&&!!t.checked||"option"===e&&!!t.selected},selected:function(t){return t.parentNode&&t.parentNode.selectedIndex,!0===t.selected},empty:function(t){for(t=t.firstChild;t;t=t.nextSibling)if(t.nodeType<6)return!1;return!0},parent:function(t){return!r.pseudos.empty(t)},header:function(t){return G.test(t.nodeName)},input:function(t){return Q.test(t.nodeName)},button:function(t){var e=t.nodeName.toLowerCase();return"input"===e&&"button"===t.type||"button"===e},text:function(t){var e;return"input"===t.nodeName.toLowerCase()&&"text"===t.type&&(null==(e=t.getAttribute("type"))||"text"===e.toLowerCase())},first:ht(function(){return[0]}),last:ht(function(t,e){return[e-1]}),eq:ht(function(t,e,n){return[n<0?n+e:n]}),even:ht(function(t,e){for(var n=0;n<e;n+=2)t.push(n);return t}),odd:ht(function(t,e){for(var n=1;n<e;n+=2)t.push(n);return t}),lt:ht(function(t,e,n){for(var r=n<0?n+e:n;--r>=0;)t.push(r);return t}),gt:ht(function(t,e,n){for(var r=n<0?n+e:n;++r<e;)t.push(r);return t})}}).pseudos.nth=r.pseudos.eq;for(e in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})r.pseudos[e]=ft(e);for(e in{submit:!0,reset:!0})r.pseudos[e]=pt(e);function gt(){}function mt(t){for(var e=0,n=t.length,r="";e<n;e++)r+=t[e].value;return r}function yt(t,e,n){var r=e.dir,i=e.next,o=i||r,a=n&&"parentNode"===o,s=C++;return e.first?function(e,n,i){for(;e=e[r];)if(1===e.nodeType||a)return t(e,n,i);return!1}:function(e,n,u){var c,l,f,p=[x,s];if(u){for(;e=e[r];)if((1===e.nodeType||a)&&t(e,n,u))return!0}else for(;e=e[r];)if(1===e.nodeType||a)if(l=(f=e[b]||(e[b]={}))[e.uniqueID]||(f[e.uniqueID]={}),i&&i===e.nodeName.toLowerCase())e=e[r]||e;else{if((c=l[o])&&c[0]===x&&c[1]===s)return p[2]=c[2];if(l[o]=p,p[2]=t(e,n,u))return!0}return!1}}function _t(t){return t.length>1?function(e,n,r){for(var i=t.length;i--;)if(!t[i](e,n,r))return!1;return!0}:t[0]}function bt(t,e,n,r,i){for(var o,a=[],s=0,u=t.length,c=null!=e;s<u;s++)(o=t[s])&&(n&&!n(o,r,i)||(a.push(o),c&&e.push(s)));return a}function wt(t,e,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),st(function(o,a,s,u){var c,l,f,p=[],d=[],h=a.length,v=o||function(t,e,n){for(var r=0,i=e.length;r<i;r++)ot(t,e[r],n);return n}(e||"*",s.nodeType?[s]:s,[]),g=!t||!o&&e?v:bt(v,p,t,s,u),m=n?i||(o?t:h||r)?[]:a:g;if(n&&n(g,m,s,u),r)for(c=bt(m,d),r(c,[],s,u),l=c.length;l--;)(f=c[l])&&(m[d[l]]=!(g[d[l]]=f));if(o){if(i||t){if(i){for(c=[],l=m.length;l--;)(f=m[l])&&c.push(g[l]=f);i(null,m=[],c,u)}for(l=m.length;l--;)(f=m[l])&&(c=i?L(o,f):p[l])>-1&&(o[c]=!(a[c]=f))}}else m=bt(m===a?m.splice(h,m.length):m),i?i(null,a,m,u):N.apply(a,m)})}function xt(t){for(var e,n,i,o=t.length,a=r.relative[t[0].type],s=a||r.relative[" "],u=a?1:0,l=yt(function(t){return t===e},s,!0),f=yt(function(t){return L(e,t)>-1},s,!0),p=[function(t,n,r){var i=!a&&(r||n!==c)||((e=n).nodeType?l(t,n,r):f(t,n,r));return e=null,i}];u<o;u++)if(n=r.relative[t[u].type])p=[yt(_t(p),n)];else{if((n=r.filter[t[u].type].apply(null,t[u].matches))[b]){for(i=++u;i<o&&!r.relative[t[i].type];i++);return wt(u>1&&_t(p),u>1&&mt(t.slice(0,u-1).concat({value:" "===t[u-2].type?"*":""})).replace(B,"$1"),n,u<i&&xt(t.slice(u,i)),i<o&&xt(t=t.slice(i)),i<o&&mt(t))}p.push(n)}return _t(p)}return gt.prototype=r.filters=r.pseudos,r.setFilters=new gt,a=ot.tokenize=function(t,e){var n,i,o,a,s,u,c,l=E[t+" "];if(l)return e?0:l.slice(0);for(s=t,u=[],c=r.preFilter;s;){n&&!(i=W.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),n=!1,(i=q.exec(s))&&(n=i.shift(),o.push({value:n,type:i[0].replace(B," ")}),s=s.slice(n.length));for(a in r.filter)!(i=K[a].exec(s))||c[a]&&!(i=c[a](i))||(n=i.shift(),o.push({value:n,type:a,matches:i}),s=s.slice(n.length));if(!n)break}return e?s.length:s?ot.error(t):E(t,u).slice(0)},s=ot.compile=function(t,e){var n,i,o,s,u,l,f=[],h=[],g=A[t+" "];if(!g){for(e||(e=a(t)),n=e.length;n--;)(g=xt(e[n]))[b]?f.push(g):h.push(g);(g=A(t,(i=h,s=(o=f).length>0,u=i.length>0,l=function(t,e,n,a,l){var f,h,g,m=0,y="0",_=t&&[],b=[],w=c,C=t||u&&r.find.TAG("*",l),T=x+=null==w?1:Math.random()||.1,E=C.length;for(l&&(c=e===d||e||l);y!==E&&null!=(f=C[y]);y++){if(u&&f){for(h=0,e||f.ownerDocument===d||(p(f),n=!v);g=i[h++];)if(g(f,e||d,n)){a.push(f);break}l&&(x=T)}s&&((f=!g&&f)&&m--,t&&_.push(f))}if(m+=y,s&&y!==m){for(h=0;g=o[h++];)g(_,b,e,n);if(t){if(m>0)for(;y--;)_[y]||b[y]||(b[y]=D.call(a));b=bt(b)}N.apply(a,b),l&&!t&&b.length>0&&m+o.length>1&&ot.uniqueSort(a)}return l&&(x=T,c=w),_},s?st(l):l))).selector=t}return g},u=ot.select=function(t,e,n,i){var o,u,c,l,f,p="function"==typeof t&&t,d=!i&&a(t=p.selector||t);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(c=u[0]).type&&9===e.nodeType&&v&&r.relative[u[1].type]){if(!(e=(r.find.ID(c.matches[0].replace(Z,tt),e)||[])[0]))return n;p&&(e=e.parentNode),t=t.slice(u.shift().value.length)}for(o=K.needsContext.test(t)?0:u.length;o--&&(c=u[o],!r.relative[l=c.type]);)if((f=r.find[l])&&(i=f(c.matches[0].replace(Z,tt),J.test(u[0].type)&&vt(e.parentNode)||e))){if(u.splice(o,1),!(t=i.length&&mt(u)))return N.apply(n,i),n;break}}return(p||s(t,d))(i,e,!v,n,!e||J.test(t)&&vt(e.parentNode)||e),n},n.sortStable=b.split("").sort(S).join("")===b,n.detectDuplicates=!!f,p(),n.sortDetached=ut(function(t){return 1&t.compareDocumentPosition(d.createElement("fieldset"))}),ut(function(t){return t.innerHTML="<a href='#'></a>","#"===t.firstChild.getAttribute("href")})||ct("type|href|height|width",function(t,e,n){if(!n)return t.getAttribute(e,"type"===e.toLowerCase()?1:2)}),n.attributes&&ut(function(t){return t.innerHTML="<input/>",t.firstChild.setAttribute("value",""),""===t.firstChild.getAttribute("value")})||ct("value",function(t,e,n){if(!n&&"input"===t.nodeName.toLowerCase())return t.defaultValue}),ut(function(t){return null==t.getAttribute("disabled")})||ct($,function(t,e,n){var r;if(!n)return!0===t[e]?e.toLowerCase():(r=t.getAttributeNode(e))&&r.specified?r.value:null}),ot}(n);_.find=E,_.expr=E.selectors,_.expr[":"]=_.expr.pseudos,_.uniqueSort=_.unique=E.uniqueSort,_.text=E.getText,_.isXMLDoc=E.isXML,_.contains=E.contains,_.escapeSelector=E.escape;var A=function(t,e,n){for(var r=[],i=void 0!==n;(t=t[e])&&9!==t.nodeType;)if(1===t.nodeType){if(i&&_(t).is(n))break;r.push(t)}return r},S=function(t,e){for(var n=[];t;t=t.nextSibling)1===t.nodeType&&t!==e&&n.push(t);return n},k=_.expr.match.needsContext;function O(t,e){return t.nodeName&&t.nodeName.toLowerCase()===e.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,I=/^.[^:#\[\.,]*$/;function N(t,e,n){return _.isFunction(e)?_.grep(t,function(t,r){return!!e.call(t,r,t)!==n}):e.nodeType?_.grep(t,function(t){return t===e!==n}):"string"!=typeof e?_.grep(t,function(t){return f.call(e,t)>-1!==n}):I.test(e)?_.filter(e,t,n):(e=_.filter(e,t),_.grep(t,function(t){return f.call(e,t)>-1!==n&&1===t.nodeType}))}_.filter=function(t,e,n){var r=e[0];return n&&(t=":not("+t+")"),1===e.length&&1===r.nodeType?_.find.matchesSelector(r,t)?[r]:[]:_.find.matches(t,_.grep(e,function(t){return 1===t.nodeType}))},_.fn.extend({find:function(t){var e,n,r=this.length,i=this;if("string"!=typeof t)return this.pushStack(_(t).filter(function(){for(e=0;e<r;e++)if(_.contains(i[e],this))return!0}));for(n=this.pushStack([]),e=0;e<r;e++)_.find(t,i[e],n);return r>1?_.uniqueSort(n):n},filter:function(t){return this.pushStack(N(this,t||[],!1))},not:function(t){return this.pushStack(N(this,t||[],!0))},is:function(t){return!!N(this,"string"==typeof t&&k.test(t)?_(t):t||[],!1).length}});var j,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(_.fn.init=function(t,e,n){var r,i;if(!t)return this;if(n=n||j,"string"==typeof t){if(!(r="<"===t[0]&&">"===t[t.length-1]&&t.length>=3?[null,t,null]:L.exec(t))||!r[1]&&e)return!e||e.jquery?(e||n).find(t):this.constructor(e).find(t);if(r[1]){if(e=e instanceof _?e[0]:e,_.merge(this,_.parseHTML(r[1],e&&e.nodeType?e.ownerDocument||e:a,!0)),D.test(r[1])&&_.isPlainObject(e))for(r in e)_.isFunction(this[r])?this[r](e[r]):this.attr(r,e[r]);return this}return(i=a.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return t.nodeType?(this[0]=t,this.length=1,this):_.isFunction(t)?void 0!==n.ready?n.ready(t):t(_):_.makeArray(t,this)}).prototype=_.fn,j=_(a);var $=/^(?:parents|prev(?:Until|All))/,R={children:!0,contents:!0,next:!0,prev:!0};function P(t,e){for(;(t=t[e])&&1!==t.nodeType;);return t}_.fn.extend({has:function(t){var e=_(t,this),n=e.length;return this.filter(function(){for(var t=0;t<n;t++)if(_.contains(this,e[t]))return!0})},closest:function(t,e){var n,r=0,i=this.length,o=[],a="string"!=typeof t&&_(t);if(!k.test(t))for(;r<i;r++)for(n=this[r];n&&n!==e;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&_.find.matchesSelector(n,t))){o.push(n);break}return this.pushStack(o.length>1?_.uniqueSort(o):o)},index:function(t){return t?"string"==typeof t?f.call(_(t),this[0]):f.call(this,t.jquery?t[0]:t):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(t,e){return this.pushStack(_.uniqueSort(_.merge(this.get(),_(t,e))))},addBack:function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}}),_.each({parent:function(t){var e=t.parentNode;return e&&11!==e.nodeType?e:null},parents:function(t){return A(t,"parentNode")},parentsUntil:function(t,e,n){return A(t,"parentNode",n)},next:function(t){return P(t,"nextSibling")},prev:function(t){return P(t,"previousSibling")},nextAll:function(t){return A(t,"nextSibling")},prevAll:function(t){return A(t,"previousSibling")},nextUntil:function(t,e,n){return A(t,"nextSibling",n)},prevUntil:function(t,e,n){return A(t,"previousSibling",n)},siblings:function(t){return S((t.parentNode||{}).firstChild,t)},children:function(t){return S(t.firstChild)},contents:function(t){return O(t,"iframe")?t.contentDocument:(O(t,"template")&&(t=t.content||t),_.merge([],t.childNodes))}},function(t,e){_.fn[t]=function(n,r){var i=_.map(this,e,n);return"Until"!==t.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=_.filter(r,i)),this.length>1&&(R[t]||_.uniqueSort(i),$.test(t)&&i.reverse()),this.pushStack(i)}});var M=/[^\x20\t\r\n\f]+/g;function F(t){return t}function H(t){throw t}function B(t,e,n,r){var i;try{t&&_.isFunction(i=t.promise)?i.call(t).done(e).fail(n):t&&_.isFunction(i=t.then)?i.call(t,e,n):e.apply(void 0,[t].slice(r))}catch(t){n.apply(void 0,[t])}}_.Callbacks=function(t){var e,n;t="string"==typeof t?(e=t,n={},_.each(e.match(M)||[],function(t,e){n[e]=!0}),n):_.extend({},t);var r,i,o,a,s=[],u=[],c=-1,l=function(){for(a=a||t.once,o=r=!0;u.length;c=-1)for(i=u.shift();++c<s.length;)!1===s[c].apply(i[0],i[1])&&t.stopOnFalse&&(c=s.length,i=!1);t.memory||(i=!1),r=!1,a&&(s=i?[]:"")},f={add:function(){return s&&(i&&!r&&(c=s.length-1,u.push(i)),function e(n){_.each(n,function(n,r){_.isFunction(r)?t.unique&&f.has(r)||s.push(r):r&&r.length&&"string"!==_.type(r)&&e(r)})}(arguments),i&&!r&&l()),this},remove:function(){return _.each(arguments,function(t,e){for(var n;(n=_.inArray(e,s,n))>-1;)s.splice(n,1),n<=c&&c--}),this},has:function(t){return t?_.inArray(t,s)>-1:s.length>0},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=i="",this},disabled:function(){return!s},lock:function(){return a=u=[],i||r||(s=i=""),this},locked:function(){return!!a},fireWith:function(t,e){return a||(e=[t,(e=e||[]).slice?e.slice():e],u.push(e),r||l()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},_.extend({Deferred:function(t){var e=[["notify","progress",_.Callbacks("memory"),_.Callbacks("memory"),2],["resolve","done",_.Callbacks("once memory"),_.Callbacks("once memory"),0,"resolved"],["reject","fail",_.Callbacks("once memory"),_.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},catch:function(t){return i.then(null,t)},pipe:function(){var t=arguments;return _.Deferred(function(n){_.each(e,function(e,r){var i=_.isFunction(t[r[4]])&&t[r[4]];o[r[1]](function(){var t=i&&i.apply(this,arguments);t&&_.isFunction(t.promise)?t.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[r[0]+"With"](this,i?[t]:arguments)})}),t=null}).promise()},then:function(t,r,i){var o=0;function a(t,e,r,i){return function(){var s=this,u=arguments,c=function(){var n,c;if(!(t<o)){if((n=r.apply(s,u))===e.promise())throw new TypeError("Thenable self-resolution");c=n&&("object"==typeof n||"function"==typeof n)&&n.then,_.isFunction(c)?i?c.call(n,a(o,e,F,i),a(o,e,H,i)):(o++,c.call(n,a(o,e,F,i),a(o,e,H,i),a(o,e,F,e.notifyWith))):(r!==F&&(s=void 0,u=[n]),(i||e.resolveWith)(s,u))}},l=i?c:function(){try{c()}catch(n){_.Deferred.exceptionHook&&_.Deferred.exceptionHook(n,l.stackTrace),t+1>=o&&(r!==H&&(s=void 0,u=[n]),e.rejectWith(s,u))}};t?l():(_.Deferred.getStackHook&&(l.stackTrace=_.Deferred.getStackHook()),n.setTimeout(l))}}return _.Deferred(function(n){e[0][3].add(a(0,n,_.isFunction(i)?i:F,n.notifyWith)),e[1][3].add(a(0,n,_.isFunction(t)?t:F)),e[2][3].add(a(0,n,_.isFunction(r)?r:H))}).promise()},promise:function(t){return null!=t?_.extend(t,i):i}},o={};return _.each(e,function(t,n){var a=n[2],s=n[5];i[n[1]]=a.add,s&&a.add(function(){r=s},e[3-t][2].disable,e[0][2].lock),a.add(n[3].fire),o[n[0]]=function(){return o[n[0]+"With"](this===o?void 0:this,arguments),this},o[n[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(t){var e=arguments.length,n=e,r=Array(n),i=u.call(arguments),o=_.Deferred(),a=function(t){return function(n){r[t]=this,i[t]=arguments.length>1?u.call(arguments):n,--e||o.resolveWith(r,i)}};if(e<=1&&(B(t,o.done(a(n)).resolve,o.reject,!e),"pending"===o.state()||_.isFunction(i[n]&&i[n].then)))return o.then();for(;n--;)B(i[n],a(n),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;_.Deferred.exceptionHook=function(t,e){n.console&&n.console.warn&&t&&W.test(t.name)&&n.console.warn("jQuery.Deferred exception: "+t.message,t.stack,e)},_.readyException=function(t){n.setTimeout(function(){throw t})};var q=_.Deferred();function U(){a.removeEventListener("DOMContentLoaded",U),n.removeEventListener("load",U),_.ready()}_.fn.ready=function(t){return q.then(t).catch(function(t){_.readyException(t)}),this},_.extend({isReady:!1,readyWait:1,ready:function(t){(!0===t?--_.readyWait:_.isReady)||(_.isReady=!0,!0!==t&&--_.readyWait>0||q.resolveWith(a,[_]))}}),_.ready.then=q.then,"complete"===a.readyState||"loading"!==a.readyState&&!a.documentElement.doScroll?n.setTimeout(_.ready):(a.addEventListener("DOMContentLoaded",U),n.addEventListener("load",U));var z=function(t,e,n,r,i,o,a){var s=0,u=t.length,c=null==n;if("object"===_.type(n)){i=!0;for(s in n)z(t,e,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,_.isFunction(r)||(a=!0),c&&(a?(e.call(t,r),e=null):(c=e,e=function(t,e,n){return c.call(_(t),n)})),e))for(;s<u;s++)e(t[s],n,a?r:r.call(t[s],s,e(t[s],n)));return i?t:c?e.call(t):u?e(t[0],n):o},V=function(t){return 1===t.nodeType||9===t.nodeType||!+t.nodeType};function K(){this.expando=_.expando+K.uid++}K.uid=1,K.prototype={cache:function(t){var e=t[this.expando];return e||(e={},V(t)&&(t.nodeType?t[this.expando]=e:Object.defineProperty(t,this.expando,{value:e,configurable:!0}))),e},set:function(t,e,n){var r,i=this.cache(t);if("string"==typeof e)i[_.camelCase(e)]=n;else for(r in e)i[_.camelCase(r)]=e[r];return i},get:function(t,e){return void 0===e?this.cache(t):t[this.expando]&&t[this.expando][_.camelCase(e)]},access:function(t,e,n){return void 0===e||e&&"string"==typeof e&&void 0===n?this.get(t,e):(this.set(t,e,n),void 0!==n?n:e)},remove:function(t,e){var n,r=t[this.expando];if(void 0!==r){if(void 0!==e){n=(e=Array.isArray(e)?e.map(_.camelCase):(e=_.camelCase(e))in r?[e]:e.match(M)||[]).length;for(;n--;)delete r[e[n]]}(void 0===e||_.isEmptyObject(r))&&(t.nodeType?t[this.expando]=void 0:delete t[this.expando])}},hasData:function(t){var e=t[this.expando];return void 0!==e&&!_.isEmptyObject(e)}};var Q=new K,G=new K,Y=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,X=/[A-Z]/g;function J(t,e,n){var r,i;if(void 0===n&&1===t.nodeType)if(r="data-"+e.replace(X,"-$&").toLowerCase(),"string"==typeof(n=t.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:Y.test(i)?JSON.parse(i):i)}catch(t){}G.set(t,e,n)}else n=void 0;return n}_.extend({hasData:function(t){return G.hasData(t)||Q.hasData(t)},data:function(t,e,n){return G.access(t,e,n)},removeData:function(t,e){G.remove(t,e)},_data:function(t,e,n){return Q.access(t,e,n)},_removeData:function(t,e){Q.remove(t,e)}}),_.fn.extend({data:function(t,e){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===t){if(this.length&&(i=G.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){for(n=a.length;n--;)a[n]&&0===(r=a[n].name).indexOf("data-")&&(r=_.camelCase(r.slice(5)),J(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof t?this.each(function(){G.set(this,t)}):z(this,function(e){var n;if(o&&void 0===e)return void 0!==(n=G.get(o,t))?n:void 0!==(n=J(o,t))?n:void 0;this.each(function(){G.set(this,t,e)})},null,e,arguments.length>1,null,!0)},removeData:function(t){return this.each(function(){G.remove(this,t)})}}),_.extend({queue:function(t,e,n){var r;if(t)return e=(e||"fx")+"queue",r=Q.get(t,e),n&&(!r||Array.isArray(n)?r=Q.access(t,e,_.makeArray(n)):r.push(n)),r||[]},dequeue:function(t,e){e=e||"fx";var n=_.queue(t,e),r=n.length,i=n.shift(),o=_._queueHooks(t,e);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===e&&n.unshift("inprogress"),delete o.stop,i.call(t,function(){_.dequeue(t,e)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(t,e){var n=e+"queueHooks";return Q.get(t,n)||Q.access(t,n,{empty:_.Callbacks("once memory").add(function(){Q.remove(t,[e+"queue",n])})})}}),_.fn.extend({queue:function(t,e){var n=2;return"string"!=typeof t&&(e=t,t="fx",n--),arguments.length<n?_.queue(this[0],t):void 0===e?this:this.each(function(){var n=_.queue(this,t,e);_._queueHooks(this,t),"fx"===t&&"inprogress"!==n[0]&&_.dequeue(this,t)})},dequeue:function(t){return this.each(function(){_.dequeue(this,t)})},clearQueue:function(t){return this.queue(t||"fx",[])},promise:function(t,e){var n,r=1,i=_.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};for("string"!=typeof t&&(e=t,t=void 0),t=t||"fx";a--;)(n=Q.get(o[a],t+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(e)}});var Z=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,tt=new RegExp("^(?:([+-])=|)("+Z+")([a-z%]*)$","i"),et=["Top","Right","Bottom","Left"],nt=function(t,e){return"none"===(t=e||t).style.display||""===t.style.display&&_.contains(t.ownerDocument,t)&&"none"===_.css(t,"display")},rt=function(t,e,n,r){var i,o,a={};for(o in e)a[o]=t.style[o],t.style[o]=e[o];i=n.apply(t,r||[]);for(o in e)t.style[o]=a[o];return i};function it(t,e,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return _.css(t,e,"")},u=s(),c=n&&n[3]||(_.cssNumber[e]?"":"px"),l=(_.cssNumber[e]||"px"!==c&&+u)&&tt.exec(_.css(t,e));if(l&&l[3]!==c){c=c||l[3],n=n||[],l=+u||1;do{l/=o=o||".5",_.style(t,e,l+c)}while(o!==(o=s()/u)&&1!==o&&--a)}return n&&(l=+l||+u||0,i=n[1]?l+(n[1]+1)*n[2]:+n[2],r&&(r.unit=c,r.start=l,r.end=i)),i}var ot={};function at(t,e){for(var n,r,i,o,a,s,u,c=[],l=0,f=t.length;l<f;l++)(r=t[l]).style&&(n=r.style.display,e?("none"===n&&(c[l]=Q.get(r,"display")||null,c[l]||(r.style.display="")),""===r.style.display&&nt(r)&&(c[l]=(o=void 0,a=void 0,void 0,u=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ot[s])||(o=a.body.appendChild(a.createElement(s)),u=_.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ot[s]=u,u)))):"none"!==n&&(c[l]="none",Q.set(r,"display",n)));for(l=0;l<f;l++)null!=c[l]&&(t[l].style.display=c[l]);return t}_.fn.extend({show:function(){return at(this,!0)},hide:function(){return at(this)},toggle:function(t){return"boolean"==typeof t?t?this.show():this.hide():this.each(function(){nt(this)?_(this).show():_(this).hide()})}});var st=/^(?:checkbox|radio)$/i,ut=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,ct=/^$|\/(?:java|ecma)script/i,lt={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ft(t,e){var n;return n=void 0!==t.getElementsByTagName?t.getElementsByTagName(e||"*"):void 0!==t.querySelectorAll?t.querySelectorAll(e||"*"):[],void 0===e||e&&O(t,e)?_.merge([t],n):n}function pt(t,e){for(var n=0,r=t.length;n<r;n++)Q.set(t[n],"globalEval",!e||Q.get(e[n],"globalEval"))}lt.optgroup=lt.option,lt.tbody=lt.tfoot=lt.colgroup=lt.caption=lt.thead,lt.th=lt.td;var dt,ht,vt=/<|&#?\w+;/;function gt(t,e,n,r,i){for(var o,a,s,u,c,l,f=e.createDocumentFragment(),p=[],d=0,h=t.length;d<h;d++)if((o=t[d])||0===o)if("object"===_.type(o))_.merge(p,o.nodeType?[o]:o);else if(vt.test(o)){for(a=a||f.appendChild(e.createElement("div")),s=(ut.exec(o)||["",""])[1].toLowerCase(),u=lt[s]||lt._default,a.innerHTML=u[1]+_.htmlPrefilter(o)+u[2],l=u[0];l--;)a=a.lastChild;_.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(e.createTextNode(o));for(f.textContent="",d=0;o=p[d++];)if(r&&_.inArray(o,r)>-1)i&&i.push(o);else if(c=_.contains(o.ownerDocument,o),a=ft(f.appendChild(o),"script"),c&&pt(a),n)for(l=0;o=a[l++];)ct.test(o.type||"")&&n.push(o);return f}dt=a.createDocumentFragment().appendChild(a.createElement("div")),(ht=a.createElement("input")).setAttribute("type","radio"),ht.setAttribute("checked","checked"),ht.setAttribute("name","t"),dt.appendChild(ht),m.checkClone=dt.cloneNode(!0).cloneNode(!0).lastChild.checked,dt.innerHTML="<textarea>x</textarea>",m.noCloneChecked=!!dt.cloneNode(!0).lastChild.defaultValue;var mt=a.documentElement,yt=/^key/,_t=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,bt=/^([^.]*)(?:\.(.+)|)/;function wt(){return!0}function xt(){return!1}function Ct(){try{return a.activeElement}catch(t){}}function Tt(t,e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=void 0);for(s in e)Tt(t,s,n,r,e[s],o);return t}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=xt;else if(!i)return t;return 1===o&&(a=i,(i=function(t){return _().off(t),a.apply(this,arguments)}).guid=a.guid||(a.guid=_.guid++)),t.each(function(){_.event.add(this,e,i,r,n)})}_.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,c,l,f,p,d,h,v,g=Q.get(t);if(g)for(n.handler&&(n=(o=n).handler,i=o.selector),i&&_.find.matchesSelector(mt,i),n.guid||(n.guid=_.guid++),(u=g.events)||(u=g.events={}),(a=g.handle)||(a=g.handle=function(e){return void 0!==_&&_.event.triggered!==e.type?_.event.dispatch.apply(t,arguments):void 0}),c=(e=(e||"").match(M)||[""]).length;c--;)d=v=(s=bt.exec(e[c])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=_.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=_.event.special[d]||{},l=_.extend({type:d,origType:v,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&_.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,l),l.handler.guid||(l.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,l):p.push(l),_.event.global[d]=!0)},remove:function(t,e,n,r,i){var o,a,s,u,c,l,f,p,d,h,v,g=Q.hasData(t)&&Q.get(t);if(g&&(u=g.events)){for(c=(e=(e||"").match(M)||[""]).length;c--;)if(d=v=(s=bt.exec(e[c])||[])[1],h=(s[2]||"").split(".").sort(),d){for(f=_.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;o--;)l=p[o],!i&&v!==l.origType||n&&n.guid!==l.guid||s&&!s.test(l.namespace)||r&&r!==l.selector&&("**"!==r||!l.selector)||(p.splice(o,1),l.selector&&p.delegateCount--,f.remove&&f.remove.call(t,l));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(t,h,g.handle)||_.removeEvent(t,d,g.handle),delete u[d])}else for(d in u)_.event.remove(t,d+e[c],n,r,!0);_.isEmptyObject(u)&&Q.remove(t,"handle events")}},dispatch:function(t){var e,n,r,i,o,a,s=_.event.fix(t),u=new Array(arguments.length),c=(Q.get(this,"events")||{})[s.type]||[],l=_.event.special[s.type]||{};for(u[0]=s,e=1;e<arguments.length;e++)u[e]=arguments[e];if(s.delegateTarget=this,!l.preDispatch||!1!==l.preDispatch.call(this,s)){for(a=_.event.handlers.call(this,s,c),e=0;(i=a[e++])&&!s.isPropagationStopped();)for(s.currentTarget=i.elem,n=0;(o=i.handlers[n++])&&!s.isImmediatePropagationStopped();)s.rnamespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((_.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,s),s.result}},handlers:function(t,e){var n,r,i,o,a,s=[],u=e.delegateCount,c=t.target;if(u&&c.nodeType&&!("click"===t.type&&t.button>=1))for(;c!==this;c=c.parentNode||this)if(1===c.nodeType&&("click"!==t.type||!0!==c.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=e[n]).selector+" "]&&(a[i]=r.needsContext?_(i,this).index(c)>-1:_.find(i,this,null,[c]).length),a[i]&&o.push(r);o.length&&s.push({elem:c,handlers:o})}return c=this,u<e.length&&s.push({elem:c,handlers:e.slice(u)}),s},addProp:function(t,e){Object.defineProperty(_.Event.prototype,t,{enumerable:!0,configurable:!0,get:_.isFunction(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(t){return t[_.expando]?t:new _.Event(t)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==Ct()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===Ct()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&O(this,"input"))return this.click(),!1},_default:function(t){return O(t.target,"a")}},beforeunload:{postDispatch:function(t){void 0!==t.result&&t.originalEvent&&(t.originalEvent.returnValue=t.result)}}}},_.removeEvent=function(t,e,n){t.removeEventListener&&t.removeEventListener(e,n)},_.Event=function(t,e){if(!(this instanceof _.Event))return new _.Event(t,e);t&&t.type?(this.originalEvent=t,this.type=t.type,this.isDefaultPrevented=t.defaultPrevented||void 0===t.defaultPrevented&&!1===t.returnValue?wt:xt,this.target=t.target&&3===t.target.nodeType?t.target.parentNode:t.target,this.currentTarget=t.currentTarget,this.relatedTarget=t.relatedTarget):this.type=t,e&&_.extend(this,e),this.timeStamp=t&&t.timeStamp||_.now(),this[_.expando]=!0},_.Event.prototype={constructor:_.Event,isDefaultPrevented:xt,isPropagationStopped:xt,isImmediatePropagationStopped:xt,isSimulated:!1,preventDefault:function(){var t=this.originalEvent;this.isDefaultPrevented=wt,t&&!this.isSimulated&&t.preventDefault()},stopPropagation:function(){var t=this.originalEvent;this.isPropagationStopped=wt,t&&!this.isSimulated&&t.stopPropagation()},stopImmediatePropagation:function(){var t=this.originalEvent;this.isImmediatePropagationStopped=wt,t&&!this.isSimulated&&t.stopImmediatePropagation(),this.stopPropagation()}},_.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,char:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(t){var e=t.button;return null==t.which&&yt.test(t.type)?null!=t.charCode?t.charCode:t.keyCode:!t.which&&void 0!==e&&_t.test(t.type)?1&e?1:2&e?3:4&e?2:0:t.which}},_.event.addProp),_.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(t,e){_.event.special[t]={delegateType:e,bindType:e,handle:function(t){var n,r=t.relatedTarget,i=t.handleObj;return r&&(r===this||_.contains(this,r))||(t.type=i.origType,n=i.handler.apply(this,arguments),t.type=e),n}}}),_.fn.extend({on:function(t,e,n,r){return Tt(this,t,e,n,r)},one:function(t,e,n,r){return Tt(this,t,e,n,r,1)},off:function(t,e,n){var r,i;if(t&&t.preventDefault&&t.handleObj)return r=t.handleObj,_(t.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof t){for(i in t)this.off(i,e,t[i]);return this}return!1!==e&&"function"!=typeof e||(n=e,e=void 0),!1===n&&(n=xt),this.each(function(){_.event.remove(this,t,n,e)})}});var Et=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,At=/<script|<style|<link/i,St=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^true\/(.*)/,Ot=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Dt(t,e){return O(t,"table")&&O(11!==e.nodeType?e:e.firstChild,"tr")&&_(">tbody",t)[0]||t}function It(t){return t.type=(null!==t.getAttribute("type"))+"/"+t.type,t}function Nt(t){var e=kt.exec(t.type);return e?t.type=e[1]:t.removeAttribute("type"),t}function jt(t,e){var n,r,i,o,a,s,u,c;if(1===e.nodeType){if(Q.hasData(t)&&(o=Q.access(t),a=Q.set(e,o),c=o.events)){delete a.handle,a.events={};for(i in c)for(n=0,r=c[i].length;n<r;n++)_.event.add(e,i,c[i][n])}G.hasData(t)&&(s=G.access(t),u=_.extend({},s),G.set(e,u))}}function Lt(t,e,n,r){e=c.apply([],e);var i,o,a,s,u,l,f=0,p=t.length,d=p-1,h=e[0],v=_.isFunction(h);if(v||p>1&&"string"==typeof h&&!m.checkClone&&St.test(h))return t.each(function(i){var o=t.eq(i);v&&(e[0]=h.call(this,i,o.html())),Lt(o,e,n,r)});if(p&&(o=(i=gt(e,t[0].ownerDocument,!1,t,r)).firstChild,1===i.childNodes.length&&(i=o),o||r)){for(s=(a=_.map(ft(i,"script"),It)).length;f<p;f++)u=i,f!==d&&(u=_.clone(u,!0,!0),s&&_.merge(a,ft(u,"script"))),n.call(t[f],u,f);if(s)for(l=a[a.length-1].ownerDocument,_.map(a,Nt),f=0;f<s;f++)u=a[f],ct.test(u.type||"")&&!Q.access(u,"globalEval")&&_.contains(l,u)&&(u.src?_._evalUrl&&_._evalUrl(u.src):y(u.textContent.replace(Ot,""),l))}return t}function $t(t,e,n){for(var r,i=e?_.filter(e,t):t,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||_.cleanData(ft(r)),r.parentNode&&(n&&_.contains(r.ownerDocument,r)&&pt(ft(r,"script")),r.parentNode.removeChild(r));return t}_.extend({htmlPrefilter:function(t){return t.replace(Et,"<$1></$2>")},clone:function(t,e,n){var r,i,o,a,s,u,c,l=t.cloneNode(!0),f=_.contains(t.ownerDocument,t);if(!(m.noCloneChecked||1!==t.nodeType&&11!==t.nodeType||_.isXMLDoc(t)))for(a=ft(l),r=0,i=(o=ft(t)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(c=u.nodeName.toLowerCase())&&st.test(s.type)?u.checked=s.checked:"input"!==c&&"textarea"!==c||(u.defaultValue=s.defaultValue);if(e)if(n)for(o=o||ft(t),a=a||ft(l),r=0,i=o.length;r<i;r++)jt(o[r],a[r]);else jt(t,l);return(a=ft(l,"script")).length>0&&pt(a,!f&&ft(t,"script")),l},cleanData:function(t){for(var e,n,r,i=_.event.special,o=0;void 0!==(n=t[o]);o++)if(V(n)){if(e=n[Q.expando]){if(e.events)for(r in e.events)i[r]?_.event.remove(n,r):_.removeEvent(n,r,e.handle);n[Q.expando]=void 0}n[G.expando]&&(n[G.expando]=void 0)}}}),_.fn.extend({detach:function(t){return $t(this,t,!0)},remove:function(t){return $t(this,t)},text:function(t){return z(this,function(t){return void 0===t?_.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=t)})},null,t,arguments.length)},append:function(){return Lt(this,arguments,function(t){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Dt(this,t).appendChild(t)})},prepend:function(){return Lt(this,arguments,function(t){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var e=Dt(this,t);e.insertBefore(t,e.firstChild)}})},before:function(){return Lt(this,arguments,function(t){this.parentNode&&this.parentNode.insertBefore(t,this)})},after:function(){return Lt(this,arguments,function(t){this.parentNode&&this.parentNode.insertBefore(t,this.nextSibling)})},empty:function(){for(var t,e=0;null!=(t=this[e]);e++)1===t.nodeType&&(_.cleanData(ft(t,!1)),t.textContent="");return this},clone:function(t,e){return t=null!=t&&t,e=null==e?t:e,this.map(function(){return _.clone(this,t,e)})},html:function(t){return z(this,function(t){var e=this[0]||{},n=0,r=this.length;if(void 0===t&&1===e.nodeType)return e.innerHTML;if("string"==typeof t&&!At.test(t)&&!lt[(ut.exec(t)||["",""])[1].toLowerCase()]){t=_.htmlPrefilter(t);try{for(;n<r;n++)1===(e=this[n]||{}).nodeType&&(_.cleanData(ft(e,!1)),e.innerHTML=t);e=0}catch(t){}}e&&this.empty().append(t)},null,t,arguments.length)},replaceWith:function(){var t=[];return Lt(this,arguments,function(e){var n=this.parentNode;_.inArray(this,t)<0&&(_.cleanData(ft(this)),n&&n.replaceChild(e,this))},t)}}),_.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(t,e){_.fn[t]=function(t){for(var n,r=[],i=_(t),o=i.length-1,a=0;a<=o;a++)n=a===o?this:this.clone(!0),_(i[a])[e](n),l.apply(r,n.get());return this.pushStack(r)}});var Rt=/^margin/,Pt=new RegExp("^("+Z+")(?!px)[a-z%]+$","i"),Mt=function(t){var e=t.ownerDocument.defaultView;return e&&e.opener||(e=n),e.getComputedStyle(t)};function Ft(t,e,n){var r,i,o,a,s=t.style;return(n=n||Mt(t))&&(""!==(a=n.getPropertyValue(e)||n[e])||_.contains(t.ownerDocument,t)||(a=_.style(t,e)),!m.pixelMarginRight()&&Pt.test(a)&&Rt.test(e)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function Ht(t,e){return{get:function(){if(!t())return(this.get=e).apply(this,arguments);delete this.get}}}!function(){function t(){if(u){u.style.cssText="box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",u.innerHTML="",mt.appendChild(s);var t=n.getComputedStyle(u);e="1%"!==t.top,o="2px"===t.marginLeft,r="4px"===t.width,u.style.marginRight="50%",i="4px"===t.marginRight,mt.removeChild(s),u=null}}var e,r,i,o,s=a.createElement("div"),u=a.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",m.clearCloneStyle="content-box"===u.style.backgroundClip,s.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",s.appendChild(u),_.extend(m,{pixelPosition:function(){return t(),e},boxSizingReliable:function(){return t(),r},pixelMarginRight:function(){return t(),i},reliableMarginLeft:function(){return t(),o}}))}();var Bt=/^(none|table(?!-c[ea]).+)/,Wt=/^--/,qt={position:"absolute",visibility:"hidden",display:"block"},Ut={letterSpacing:"0",fontWeight:"400"},zt=["Webkit","Moz","ms"],Vt=a.createElement("div").style;function Kt(t){var e=_.cssProps[t];return e||(e=_.cssProps[t]=function(t){if(t in Vt)return t;for(var e=t[0].toUpperCase()+t.slice(1),n=zt.length;n--;)if((t=zt[n]+e)in Vt)return t}(t)||t),e}function Qt(t,e,n){var r=tt.exec(e);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):e}function Gt(t,e,n,r,i){var o,a=0;for(o=n===(r?"border":"content")?4:"width"===e?1:0;o<4;o+=2)"margin"===n&&(a+=_.css(t,n+et[o],!0,i)),r?("content"===n&&(a-=_.css(t,"padding"+et[o],!0,i)),"margin"!==n&&(a-=_.css(t,"border"+et[o]+"Width",!0,i))):(a+=_.css(t,"padding"+et[o],!0,i),"padding"!==n&&(a+=_.css(t,"border"+et[o]+"Width",!0,i)));return a}function Yt(t,e,n){var r,i=Mt(t),o=Ft(t,e,i),a="border-box"===_.css(t,"boxSizing",!1,i);return Pt.test(o)?o:(r=a&&(m.boxSizingReliable()||o===t.style[e]),"auto"===o&&(o=t["offset"+e[0].toUpperCase()+e.slice(1)]),(o=parseFloat(o)||0)+Gt(t,e,n||(a?"border":"content"),r,i)+"px")}function Xt(t,e,n,r,i){return new Xt.prototype.init(t,e,n,r,i)}_.extend({cssHooks:{opacity:{get:function(t,e){if(e){var n=Ft(t,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{float:"cssFloat"},style:function(t,e,n,r){if(t&&3!==t.nodeType&&8!==t.nodeType&&t.style){var i,o,a,s=_.camelCase(e),u=Wt.test(e),c=t.style;if(u||(e=Kt(s)),a=_.cssHooks[e]||_.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(t,!1,r))?i:c[e];"string"===(o=typeof n)&&(i=tt.exec(n))&&i[1]&&(n=it(t,e,i),o="number"),null!=n&&n==n&&("number"===o&&(n+=i&&i[3]||(_.cssNumber[s]?"":"px")),m.clearCloneStyle||""!==n||0!==e.indexOf("background")||(c[e]="inherit"),a&&"set"in a&&void 0===(n=a.set(t,n,r))||(u?c.setProperty(e,n):c[e]=n))}},css:function(t,e,n,r){var i,o,a,s=_.camelCase(e);return Wt.test(e)||(e=Kt(s)),(a=_.cssHooks[e]||_.cssHooks[s])&&"get"in a&&(i=a.get(t,!0,n)),void 0===i&&(i=Ft(t,e,r)),"normal"===i&&e in Ut&&(i=Ut[e]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),_.each(["height","width"],function(t,e){_.cssHooks[e]={get:function(t,n,r){if(n)return!Bt.test(_.css(t,"display"))||t.getClientRects().length&&t.getBoundingClientRect().width?Yt(t,e,r):rt(t,qt,function(){return Yt(t,e,r)})},set:function(t,n,r){var i,o=r&&Mt(t),a=r&&Gt(t,e,r,"border-box"===_.css(t,"boxSizing",!1,o),o);return a&&(i=tt.exec(n))&&"px"!==(i[3]||"px")&&(t.style[e]=n,n=_.css(t,e)),Qt(0,n,a)}}}),_.cssHooks.marginLeft=Ht(m.reliableMarginLeft,function(t,e){if(e)return(parseFloat(Ft(t,"marginLeft"))||t.getBoundingClientRect().left-rt(t,{marginLeft:0},function(){return t.getBoundingClientRect().left}))+"px"}),_.each({margin:"",padding:"",border:"Width"},function(t,e){_.cssHooks[t+e]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[t+et[r]+e]=o[r]||o[r-2]||o[0];return i}},Rt.test(t)||(_.cssHooks[t+e].set=Qt)}),_.fn.extend({css:function(t,e){return z(this,function(t,e,n){var r,i,o={},a=0;if(Array.isArray(e)){for(r=Mt(t),i=e.length;a<i;a++)o[e[a]]=_.css(t,e[a],!1,r);return o}return void 0!==n?_.style(t,e,n):_.css(t,e)},t,e,arguments.length>1)}}),_.Tween=Xt,Xt.prototype={constructor:Xt,init:function(t,e,n,r,i,o){this.elem=t,this.prop=n,this.easing=i||_.easing._default,this.options=e,this.start=this.now=this.cur(),this.end=r,this.unit=o||(_.cssNumber[n]?"":"px")},cur:function(){var t=Xt.propHooks[this.prop];return t&&t.get?t.get(this):Xt.propHooks._default.get(this)},run:function(t){var e,n=Xt.propHooks[this.prop];return this.options.duration?this.pos=e=_.easing[this.easing](t,this.options.duration*t,0,1,this.options.duration):this.pos=e=t,this.now=(this.end-this.start)*e+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Xt.propHooks._default.set(this),this}},Xt.prototype.init.prototype=Xt.prototype,Xt.propHooks={_default:{get:function(t){var e;return 1!==t.elem.nodeType||null!=t.elem[t.prop]&&null==t.elem.style[t.prop]?t.elem[t.prop]:(e=_.css(t.elem,t.prop,""))&&"auto"!==e?e:0},set:function(t){_.fx.step[t.prop]?_.fx.step[t.prop](t):1!==t.elem.nodeType||null==t.elem.style[_.cssProps[t.prop]]&&!_.cssHooks[t.prop]?t.elem[t.prop]=t.now:_.style(t.elem,t.prop,t.now+t.unit)}}},Xt.propHooks.scrollTop=Xt.propHooks.scrollLeft={set:function(t){t.elem.nodeType&&t.elem.parentNode&&(t.elem[t.prop]=t.now)}},_.easing={linear:function(t){return t},swing:function(t){return.5-Math.cos(t*Math.PI)/2},_default:"swing"},_.fx=Xt.prototype.init,_.fx.step={};var Jt,Zt,te,ee,ne=/^(?:toggle|show|hide)$/,re=/queueHooks$/;function ie(){Zt&&(!1===a.hidden&&n.requestAnimationFrame?n.requestAnimationFrame(ie):n.setTimeout(ie,_.fx.interval),_.fx.tick())}function oe(){return n.setTimeout(function(){Jt=void 0}),Jt=_.now()}function ae(t,e){var n,r=0,i={height:t};for(e=e?1:0;r<4;r+=2-e)i["margin"+(n=et[r])]=i["padding"+n]=t;return e&&(i.opacity=i.width=t),i}function se(t,e,n){for(var r,i=(ue.tweeners[e]||[]).concat(ue.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,e,t))return r}function ue(t,e,n){var r,i,o=0,a=ue.prefilters.length,s=_.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var e=Jt||oe(),n=Math.max(0,c.startTime+c.duration-e),r=1-(n/c.duration||0),o=0,a=c.tweens.length;o<a;o++)c.tweens[o].run(r);return s.notifyWith(t,[c,r,n]),r<1&&a?n:(a||s.notifyWith(t,[c,1,0]),s.resolveWith(t,[c]),!1)},c=s.promise({elem:t,props:_.extend({},e),opts:_.extend(!0,{specialEasing:{},easing:_.easing._default},n),originalProperties:e,originalOptions:n,startTime:Jt||oe(),duration:n.duration,tweens:[],createTween:function(e,n){var r=_.Tween(t,c.opts,e,n,c.opts.specialEasing[e]||c.opts.easing);return c.tweens.push(r),r},stop:function(e){var n=0,r=e?c.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)c.tweens[n].run(1);return e?(s.notifyWith(t,[c,1,0]),s.resolveWith(t,[c,e])):s.rejectWith(t,[c,e]),this}}),l=c.props;for(!function(t,e){var n,r,i,o,a;for(n in t)if(i=e[r=_.camelCase(n)],o=t[n],Array.isArray(o)&&(i=o[1],o=t[n]=o[0]),n!==r&&(t[r]=o,delete t[n]),(a=_.cssHooks[r])&&"expand"in a){o=a.expand(o),delete t[r];for(n in o)n in t||(t[n]=o[n],e[n]=i)}else e[r]=i}(l,c.opts.specialEasing);o<a;o++)if(r=ue.prefilters[o].call(c,t,l,c.opts))return _.isFunction(r.stop)&&(_._queueHooks(c.elem,c.opts.queue).stop=_.proxy(r.stop,r)),r;return _.map(l,se,c),_.isFunction(c.opts.start)&&c.opts.start.call(t,c),c.progress(c.opts.progress).done(c.opts.done,c.opts.complete).fail(c.opts.fail).always(c.opts.always),_.fx.timer(_.extend(u,{elem:t,anim:c,queue:c.opts.queue})),c}_.Animation=_.extend(ue,{tweeners:{"*":[function(t,e){var n=this.createTween(t,e);return it(n.elem,t,tt.exec(e),n),n}]},tweener:function(t,e){_.isFunction(t)?(e=t,t=["*"]):t=t.match(M);for(var n,r=0,i=t.length;r<i;r++)n=t[r],ue.tweeners[n]=ue.tweeners[n]||[],ue.tweeners[n].unshift(e)},prefilters:[function(t,e,n){var r,i,o,a,s,u,c,l,f="width"in e||"height"in e,p=this,d={},h=t.style,v=t.nodeType&&nt(t),g=Q.get(t,"fxshow");n.queue||(null==(a=_._queueHooks(t,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,_.queue(t,"fx").length||a.empty.fire()})}));for(r in e)if(i=e[r],ne.test(i)){if(delete e[r],o=o||"toggle"===i,i===(v?"hide":"show")){if("show"!==i||!g||void 0===g[r])continue;v=!0}d[r]=g&&g[r]||_.style(t,r)}if((u=!_.isEmptyObject(e))||!_.isEmptyObject(d)){f&&1===t.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(c=g&&g.display)&&(c=Q.get(t,"display")),"none"===(l=_.css(t,"display"))&&(c?l=c:(at([t],!0),c=t.style.display||c,l=_.css(t,"display"),at([t]))),("inline"===l||"inline-block"===l&&null!=c)&&"none"===_.css(t,"float")&&(u||(p.done(function(){h.display=c}),null==c&&(l=h.display,c="none"===l?"":l)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1;for(r in d)u||(g?"hidden"in g&&(v=g.hidden):g=Q.access(t,"fxshow",{display:c}),o&&(g.hidden=!v),v&&at([t],!0),p.done(function(){v||at([t]),Q.remove(t,"fxshow");for(r in d)_.style(t,r,d[r])})),u=se(v?g[r]:0,r,p),r in g||(g[r]=u.start,v&&(u.end=u.start,u.start=0))}}],prefilter:function(t,e){e?ue.prefilters.unshift(t):ue.prefilters.push(t)}}),_.speed=function(t,e,n){var r=t&&"object"==typeof t?_.extend({},t):{complete:n||!n&&e||_.isFunction(t)&&t,duration:t,easing:n&&e||e&&!_.isFunction(e)&&e};return _.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in _.fx.speeds?r.duration=_.fx.speeds[r.duration]:r.duration=_.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){_.isFunction(r.old)&&r.old.call(this),r.queue&&_.dequeue(this,r.queue)},r},_.fn.extend({fadeTo:function(t,e,n,r){return this.filter(nt).css("opacity",0).show().end().animate({opacity:e},t,n,r)},animate:function(t,e,n,r){var i=_.isEmptyObject(t),o=_.speed(e,n,r),a=function(){var e=ue(this,_.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(t,e,n){var r=function(t){var e=t.stop;delete t.stop,e(n)};return"string"!=typeof t&&(n=e,e=t,t=void 0),e&&!1!==t&&this.queue(t||"fx",[]),this.each(function(){var e=!0,i=null!=t&&t+"queueHooks",o=_.timers,a=Q.get(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&re.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=t&&o[i].queue!==t||(o[i].anim.stop(n),e=!1,o.splice(i,1));!e&&n||_.dequeue(this,t)})},finish:function(t){return!1!==t&&(t=t||"fx"),this.each(function(){var e,n=Q.get(this),r=n[t+"queue"],i=n[t+"queueHooks"],o=_.timers,a=r?r.length:0;for(n.finish=!0,_.queue(this,t,[]),i&&i.stop&&i.stop.call(this,!0),e=o.length;e--;)o[e].elem===this&&o[e].queue===t&&(o[e].anim.stop(!0),o.splice(e,1));for(e=0;e<a;e++)r[e]&&r[e].finish&&r[e].finish.call(this);delete n.finish})}}),_.each(["toggle","show","hide"],function(t,e){var n=_.fn[e];_.fn[e]=function(t,r,i){return null==t||"boolean"==typeof t?n.apply(this,arguments):this.animate(ae(e,!0),t,r,i)}}),_.each({slideDown:ae("show"),slideUp:ae("hide"),slideToggle:ae("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(t,e){_.fn[t]=function(t,n,r){return this.animate(e,t,n,r)}}),_.timers=[],_.fx.tick=function(){var t,e=0,n=_.timers;for(Jt=_.now();e<n.length;e++)(t=n[e])()||n[e]!==t||n.splice(e--,1);n.length||_.fx.stop(),Jt=void 0},_.fx.timer=function(t){_.timers.push(t),_.fx.start()},_.fx.interval=13,_.fx.start=function(){Zt||(Zt=!0,ie())},_.fx.stop=function(){Zt=null},_.fx.speeds={slow:600,fast:200,_default:400},_.fn.delay=function(t,e){return t=_.fx&&_.fx.speeds[t]||t,e=e||"fx",this.queue(e,function(e,r){var i=n.setTimeout(e,t);r.stop=function(){n.clearTimeout(i)}})},te=a.createElement("input"),ee=a.createElement("select").appendChild(a.createElement("option")),te.type="checkbox",m.checkOn=""!==te.value,m.optSelected=ee.selected,(te=a.createElement("input")).value="t",te.type="radio",m.radioValue="t"===te.value;var ce,le=_.expr.attrHandle;_.fn.extend({attr:function(t,e){return z(this,_.attr,t,e,arguments.length>1)},removeAttr:function(t){return this.each(function(){_.removeAttr(this,t)})}}),_.extend({attr:function(t,e,n){var r,i,o=t.nodeType;if(3!==o&&8!==o&&2!==o)return void 0===t.getAttribute?_.prop(t,e,n):(1===o&&_.isXMLDoc(t)||(i=_.attrHooks[e.toLowerCase()]||(_.expr.match.bool.test(e)?ce:void 0)),void 0!==n?null===n?void _.removeAttr(t,e):i&&"set"in i&&void 0!==(r=i.set(t,n,e))?r:(t.setAttribute(e,n+""),n):i&&"get"in i&&null!==(r=i.get(t,e))?r:null==(r=_.find.attr(t,e))?void 0:r)},attrHooks:{type:{set:function(t,e){if(!m.radioValue&&"radio"===e&&O(t,"input")){var n=t.value;return t.setAttribute("type",e),n&&(t.value=n),e}}}},removeAttr:function(t,e){var n,r=0,i=e&&e.match(M);if(i&&1===t.nodeType)for(;n=i[r++];)t.removeAttribute(n)}}),ce={set:function(t,e,n){return!1===e?_.removeAttr(t,n):t.setAttribute(n,n),n}},_.each(_.expr.match.bool.source.match(/\w+/g),function(t,e){var n=le[e]||_.find.attr;le[e]=function(t,e,r){var i,o,a=e.toLowerCase();return r||(o=le[a],le[a]=i,i=null!=n(t,e,r)?a:null,le[a]=o),i}});var fe=/^(?:input|select|textarea|button)$/i,pe=/^(?:a|area)$/i;function de(t){return(t.match(M)||[]).join(" ")}function he(t){return t.getAttribute&&t.getAttribute("class")||""}_.fn.extend({prop:function(t,e){return z(this,_.prop,t,e,arguments.length>1)},removeProp:function(t){return this.each(function(){delete this[_.propFix[t]||t]})}}),_.extend({prop:function(t,e,n){var r,i,o=t.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&_.isXMLDoc(t)||(e=_.propFix[e]||e,i=_.propHooks[e]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(t,n,e))?r:t[e]=n:i&&"get"in i&&null!==(r=i.get(t,e))?r:t[e]},propHooks:{tabIndex:{get:function(t){var e=_.find.attr(t,"tabindex");return e?parseInt(e,10):fe.test(t.nodeName)||pe.test(t.nodeName)&&t.href?0:-1}}},propFix:{for:"htmlFor",class:"className"}}),m.optSelected||(_.propHooks.selected={get:function(t){var e=t.parentNode;return e&&e.parentNode&&e.parentNode.selectedIndex,null},set:function(t){var e=t.parentNode;e&&(e.selectedIndex,e.parentNode&&e.parentNode.selectedIndex)}}),_.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){_.propFix[this.toLowerCase()]=this}),_.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(_.isFunction(t))return this.each(function(e){_(this).addClass(t.call(this,e,he(this)))});if("string"==typeof t&&t)for(e=t.match(M)||[];n=this[u++];)if(i=he(n),r=1===n.nodeType&&" "+de(i)+" "){for(a=0;o=e[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=de(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(_.isFunction(t))return this.each(function(e){_(this).removeClass(t.call(this,e,he(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof t&&t)for(e=t.match(M)||[];n=this[u++];)if(i=he(n),r=1===n.nodeType&&" "+de(i)+" "){for(a=0;o=e[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");i!==(s=de(r))&&n.setAttribute("class",s)}return this},toggleClass:function(t,e){var n=typeof t;return"boolean"==typeof e&&"string"===n?e?this.addClass(t):this.removeClass(t):_.isFunction(t)?this.each(function(n){_(this).toggleClass(t.call(this,n,he(this),e),e)}):this.each(function(){var e,r,i,o;if("string"===n)for(r=0,i=_(this),o=t.match(M)||[];e=o[r++];)i.hasClass(e)?i.removeClass(e):i.addClass(e);else void 0!==t&&"boolean"!==n||((e=he(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===t?"":Q.get(this,"__className__")||""))})},hasClass:function(t){var e,n,r=0;for(e=" "+t+" ";n=this[r++];)if(1===n.nodeType&&(" "+de(he(n))+" ").indexOf(e)>-1)return!0;return!1}});var ve=/\r/g;_.fn.extend({val:function(t){var e,n,r,i=this[0];return arguments.length?(r=_.isFunction(t),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?t.call(this,n,_(this).val()):t)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=_.map(i,function(t){return null==t?"":t+""})),(e=_.valHooks[this.type]||_.valHooks[this.nodeName.toLowerCase()])&&"set"in e&&void 0!==e.set(this,i,"value")||(this.value=i))})):i?(e=_.valHooks[i.type]||_.valHooks[i.nodeName.toLowerCase()])&&"get"in e&&void 0!==(n=e.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(ve,""):null==n?"":n:void 0}}),_.extend({valHooks:{option:{get:function(t){var e=_.find.attr(t,"value");return null!=e?e:de(_.text(t))}},select:{get:function(t){var e,n,r,i=t.options,o=t.selectedIndex,a="select-one"===t.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!O(n.parentNode,"optgroup"))){if(e=_(n).val(),a)return e;s.push(e)}return s},set:function(t,e){for(var n,r,i=t.options,o=_.makeArray(e),a=i.length;a--;)((r=i[a]).selected=_.inArray(_.valHooks.option.get(r),o)>-1)&&(n=!0);return n||(t.selectedIndex=-1),o}}}}),_.each(["radio","checkbox"],function(){_.valHooks[this]={set:function(t,e){if(Array.isArray(e))return t.checked=_.inArray(_(t).val(),e)>-1}},m.checkOn||(_.valHooks[this].get=function(t){return null===t.getAttribute("value")?"on":t.value})});var ge=/^(?:focusinfocus|focusoutblur)$/;_.extend(_.event,{trigger:function(t,e,r,i){var o,s,u,c,l,f,p,d=[r||a],v=h.call(t,"type")?t.type:t,g=h.call(t,"namespace")?t.namespace.split("."):[];if(s=u=r=r||a,3!==r.nodeType&&8!==r.nodeType&&!ge.test(v+_.event.triggered)&&(v.indexOf(".")>-1&&(v=(g=v.split(".")).shift(),g.sort()),l=v.indexOf(":")<0&&"on"+v,(t=t[_.expando]?t:new _.Event(v,"object"==typeof t&&t)).isTrigger=i?2:3,t.namespace=g.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),e=null==e?[t]:_.makeArray(e,[t]),p=_.event.special[v]||{},i||!p.trigger||!1!==p.trigger.apply(r,e))){if(!i&&!p.noBubble&&!_.isWindow(r)){for(c=p.delegateType||v,ge.test(c+v)||(s=s.parentNode);s;s=s.parentNode)d.push(s),u=s;u===(r.ownerDocument||a)&&d.push(u.defaultView||u.parentWindow||n)}for(o=0;(s=d[o++])&&!t.isPropagationStopped();)t.type=o>1?c:p.bindType||v,(f=(Q.get(s,"events")||{})[t.type]&&Q.get(s,"handle"))&&f.apply(s,e),(f=l&&s[l])&&f.apply&&V(s)&&(t.result=f.apply(s,e),!1===t.result&&t.preventDefault());return t.type=v,i||t.isDefaultPrevented()||p._default&&!1!==p._default.apply(d.pop(),e)||!V(r)||l&&_.isFunction(r[v])&&!_.isWindow(r)&&((u=r[l])&&(r[l]=null),_.event.triggered=v,r[v](),_.event.triggered=void 0,u&&(r[l]=u)),t.result}},simulate:function(t,e,n){var r=_.extend(new _.Event,n,{type:t,isSimulated:!0});_.event.trigger(r,null,e)}}),_.fn.extend({trigger:function(t,e){return this.each(function(){_.event.trigger(t,e,this)})},triggerHandler:function(t,e){var n=this[0];if(n)return _.event.trigger(t,e,n,!0)}}),_.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(t,e){_.fn[e]=function(t,n){return arguments.length>0?this.on(e,null,t,n):this.trigger(e)}}),_.fn.extend({hover:function(t,e){return this.mouseenter(t).mouseleave(e||t)}}),m.focusin="onfocusin"in n,m.focusin||_.each({focus:"focusin",blur:"focusout"},function(t,e){var n=function(t){_.event.simulate(e,t.target,_.event.fix(t))};_.event.special[e]={setup:function(){var r=this.ownerDocument||this,i=Q.access(r,e);i||r.addEventListener(t,n,!0),Q.access(r,e,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=Q.access(r,e)-1;i?Q.access(r,e,i):(r.removeEventListener(t,n,!0),Q.remove(r,e))}}});var me=n.location,ye=_.now(),_e=/\?/;_.parseXML=function(t){var e;if(!t||"string"!=typeof t)return null;try{e=(new n.DOMParser).parseFromString(t,"text/xml")}catch(t){e=void 0}return e&&!e.getElementsByTagName("parsererror").length||_.error("Invalid XML: "+t),e};var be=/\[\]$/,we=/\r?\n/g,xe=/^(?:submit|button|image|reset|file)$/i,Ce=/^(?:input|select|textarea|keygen)/i;function Te(t,e,n,r){var i;if(Array.isArray(e))_.each(e,function(e,i){n||be.test(t)?r(t,i):Te(t+"["+("object"==typeof i&&null!=i?e:"")+"]",i,n,r)});else if(n||"object"!==_.type(e))r(t,e);else for(i in e)Te(t+"["+i+"]",e[i],n,r)}_.param=function(t,e){var n,r=[],i=function(t,e){var n=_.isFunction(e)?e():e;r[r.length]=encodeURIComponent(t)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(t)||t.jquery&&!_.isPlainObject(t))_.each(t,function(){i(this.name,this.value)});else for(n in t)Te(n,t[n],e,i);return r.join("&")},_.fn.extend({serialize:function(){return _.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var t=_.prop(this,"elements");return t?_.makeArray(t):this}).filter(function(){var t=this.type;return this.name&&!_(this).is(":disabled")&&Ce.test(this.nodeName)&&!xe.test(t)&&(this.checked||!st.test(t))}).map(function(t,e){var n=_(this).val();return null==n?null:Array.isArray(n)?_.map(n,function(t){return{name:e.name,value:t.replace(we,"\r\n")}}):{name:e.name,value:n.replace(we,"\r\n")}}).get()}});var Ee=/%20/g,Ae=/#.*$/,Se=/([?&])_=[^&]*/,ke=/^(.*?):[ \t]*([^\r\n]*)$/gm,Oe=/^(?:GET|HEAD)$/,De=/^\/\//,Ie={},Ne={},je="*/".concat("*"),Le=a.createElement("a");function $e(t){return function(e,n){"string"!=typeof e&&(n=e,e="*");var r,i=0,o=e.toLowerCase().match(M)||[];if(_.isFunction(n))for(;r=o[i++];)"+"===r[0]?(r=r.slice(1)||"*",(t[r]=t[r]||[]).unshift(n)):(t[r]=t[r]||[]).push(n)}}function Re(t,e,n,r){var i={},o=t===Ne;function a(s){var u;return i[s]=!0,_.each(t[s]||[],function(t,s){var c=s(e,n,r);return"string"!=typeof c||o||i[c]?o?!(u=c):void 0:(e.dataTypes.unshift(c),a(c),!1)}),u}return a(e.dataTypes[0])||!i["*"]&&a("*")}function Pe(t,e){var n,r,i=_.ajaxSettings.flatOptions||{};for(n in e)void 0!==e[n]&&((i[n]?t:r||(r={}))[n]=e[n]);return r&&_.extend(!0,t,r),t}Le.href=me.href,_.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:me.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(me.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":je,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":_.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(t,e){return e?Pe(Pe(t,_.ajaxSettings),e):Pe(_.ajaxSettings,t)},ajaxPrefilter:$e(Ie),ajaxTransport:$e(Ne),ajax:function(t,e){"object"==typeof t&&(e=t,t=void 0),e=e||{};var r,i,o,s,u,c,l,f,p,d,h=_.ajaxSetup({},e),v=h.context||h,g=h.context&&(v.nodeType||v.jquery)?_(v):_.event,m=_.Deferred(),y=_.Callbacks("once memory"),b=h.statusCode||{},w={},x={},C="canceled",T={readyState:0,getResponseHeader:function(t){var e;if(l){if(!s)for(s={};e=ke.exec(o);)s[e[1].toLowerCase()]=e[2];e=s[t.toLowerCase()]}return null==e?null:e},getAllResponseHeaders:function(){return l?o:null},setRequestHeader:function(t,e){return null==l&&(t=x[t.toLowerCase()]=x[t.toLowerCase()]||t,w[t]=e),this},overrideMimeType:function(t){return null==l&&(h.mimeType=t),this},statusCode:function(t){var e;if(t)if(l)T.always(t[T.status]);else for(e in t)b[e]=[b[e],t[e]];return this},abort:function(t){var e=t||C;return r&&r.abort(e),E(0,e),this}};if(m.promise(T),h.url=((t||h.url||me.href)+"").replace(De,me.protocol+"//"),h.type=e.method||e.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(M)||[""],null==h.crossDomain){c=a.createElement("a");try{c.href=h.url,c.href=c.href,h.crossDomain=Le.protocol+"//"+Le.host!=c.protocol+"//"+c.host}catch(t){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=_.param(h.data,h.traditional)),Re(Ie,h,e,T),l)return T;(f=_.event&&h.global)&&0==_.active++&&_.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Oe.test(h.type),i=h.url.replace(Ae,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(Ee,"+")):(d=h.url.slice(i.length),h.data&&(i+=(_e.test(i)?"&":"?")+h.data,delete h.data),!1===h.cache&&(i=i.replace(Se,"$1"),d=(_e.test(i)?"&":"?")+"_="+ye+++d),h.url=i+d),h.ifModified&&(_.lastModified[i]&&T.setRequestHeader("If-Modified-Since",_.lastModified[i]),_.etag[i]&&T.setRequestHeader("If-None-Match",_.etag[i])),(h.data&&h.hasContent&&!1!==h.contentType||e.contentType)&&T.setRequestHeader("Content-Type",h.contentType),T.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+je+"; q=0.01":""):h.accepts["*"]);for(p in h.headers)T.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(v,T,h)||l))return T.abort();if(C="abort",y.add(h.complete),T.done(h.success),T.fail(h.error),r=Re(Ne,h,e,T)){if(T.readyState=1,f&&g.trigger("ajaxSend",[T,h]),l)return T;h.async&&h.timeout>0&&(u=n.setTimeout(function(){T.abort("timeout")},h.timeout));try{l=!1,r.send(w,E)}catch(t){if(l)throw t;E(-1,t)}}else E(-1,"No Transport");function E(t,e,a,s){var c,p,d,w,x,C=e;l||(l=!0,u&&n.clearTimeout(u),r=void 0,o=s||"",T.readyState=t>0?4:0,c=t>=200&&t<300||304===t,a&&(w=function(t,e,n){for(var r,i,o,a,s=t.contents,u=t.dataTypes;"*"===u[0];)u.shift(),void 0===r&&(r=t.mimeType||e.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||t.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(h,T,a)),w=function(t,e,n,r){var i,o,a,s,u,c={},l=t.dataTypes.slice();if(l[1])for(a in t.converters)c[a.toLowerCase()]=t.converters[a];for(o=l.shift();o;)if(t.responseFields[o]&&(n[t.responseFields[o]]=e),!u&&r&&t.dataFilter&&(e=t.dataFilter(e,t.dataType)),u=o,o=l.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=c[u+" "+o]||c["* "+o]))for(i in c)if((s=i.split(" "))[1]===o&&(a=c[u+" "+s[0]]||c["* "+s[0]])){!0===a?a=c[i]:!0!==c[i]&&(o=s[0],l.unshift(s[1]));break}if(!0!==a)if(a&&t.throws)e=a(e);else try{e=a(e)}catch(t){return{state:"parsererror",error:a?t:"No conversion from "+u+" to "+o}}}return{state:"success",data:e}}(h,w,T,c),c?(h.ifModified&&((x=T.getResponseHeader("Last-Modified"))&&(_.lastModified[i]=x),(x=T.getResponseHeader("etag"))&&(_.etag[i]=x)),204===t||"HEAD"===h.type?C="nocontent":304===t?C="notmodified":(C=w.state,p=w.data,c=!(d=w.error))):(d=C,!t&&C||(C="error",t<0&&(t=0))),T.status=t,T.statusText=(e||C)+"",c?m.resolveWith(v,[p,C,T]):m.rejectWith(v,[T,C,d]),T.statusCode(b),b=void 0,f&&g.trigger(c?"ajaxSuccess":"ajaxError",[T,h,c?p:d]),y.fireWith(v,[T,C]),f&&(g.trigger("ajaxComplete",[T,h]),--_.active||_.event.trigger("ajaxStop")))}return T},getJSON:function(t,e,n){return _.get(t,e,n,"json")},getScript:function(t,e){return _.get(t,void 0,e,"script")}}),_.each(["get","post"],function(t,e){_[e]=function(t,n,r,i){return _.isFunction(n)&&(i=i||r,r=n,n=void 0),_.ajax(_.extend({url:t,type:e,dataType:i,data:n,success:r},_.isPlainObject(t)&&t))}}),_._evalUrl=function(t){return _.ajax({url:t,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,throws:!0})},_.fn.extend({wrapAll:function(t){var e;return this[0]&&(_.isFunction(t)&&(t=t.call(this[0])),e=_(t,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&e.insertBefore(this[0]),e.map(function(){for(var t=this;t.firstElementChild;)t=t.firstElementChild;return t}).append(this)),this},wrapInner:function(t){return _.isFunction(t)?this.each(function(e){_(this).wrapInner(t.call(this,e))}):this.each(function(){var e=_(this),n=e.contents();n.length?n.wrapAll(t):e.append(t)})},wrap:function(t){var e=_.isFunction(t);return this.each(function(n){_(this).wrapAll(e?t.call(this,n):t)})},unwrap:function(t){return this.parent(t).not("body").each(function(){_(this).replaceWith(this.childNodes)}),this}}),_.expr.pseudos.hidden=function(t){return!_.expr.pseudos.visible(t)},_.expr.pseudos.visible=function(t){return!!(t.offsetWidth||t.offsetHeight||t.getClientRects().length)},_.ajaxSettings.xhr=function(){try{return new n.XMLHttpRequest}catch(t){}};var Me={0:200,1223:204},Fe=_.ajaxSettings.xhr();m.cors=!!Fe&&"withCredentials"in Fe,m.ajax=Fe=!!Fe,_.ajaxTransport(function(t){var e,r;if(m.cors||Fe&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");for(a in i)s.setRequestHeader(a,i[a]);e=function(t){return function(){e&&(e=r=s.onload=s.onerror=s.onabort=s.onreadystatechange=null,"abort"===t?s.abort():"error"===t?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Me[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=e(),r=s.onerror=e("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&n.setTimeout(function(){e&&r()})},e=e("abort");try{s.send(t.hasContent&&t.data||null)}catch(t){if(e)throw t}},abort:function(){e&&e()}}}),_.ajaxPrefilter(function(t){t.crossDomain&&(t.contents.script=!1)}),_.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(t){return _.globalEval(t),t}}}),_.ajaxPrefilter("script",function(t){void 0===t.cache&&(t.cache=!1),t.crossDomain&&(t.type="GET")}),_.ajaxTransport("script",function(t){var e,n;if(t.crossDomain)return{send:function(r,i){e=_("<script>").prop({charset:t.scriptCharset,src:t.url}).on("load error",n=function(t){e.remove(),n=null,t&&i("error"===t.type?404:200,t.type)}),a.head.appendChild(e[0])},abort:function(){n&&n()}}});var He,Be=[],We=/(=)\?(?=&|$)|\?\?/;_.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var t=Be.pop()||_.expando+"_"+ye++;return this[t]=!0,t}}),_.ajaxPrefilter("json jsonp",function(t,e,r){var i,o,a,s=!1!==t.jsonp&&(We.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&We.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=_.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(We,"$1"+i):!1!==t.jsonp&&(t.url+=(_e.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||_.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=n[i],n[i]=function(){a=arguments},r.always(function(){void 0===o?_(n).removeProp(i):n[i]=o,t[i]&&(t.jsonpCallback=e.jsonpCallback,Be.push(i)),a&&_.isFunction(o)&&o(a[0]),a=o=void 0}),"script"}),m.createHTMLDocument=((He=a.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===He.childNodes.length),_.parseHTML=function(t,e,n){return"string"!=typeof t?[]:("boolean"==typeof e&&(n=e,e=!1),e||(m.createHTMLDocument?((r=(e=a.implementation.createHTMLDocument("")).createElement("base")).href=a.location.href,e.head.appendChild(r)):e=a),i=D.exec(t),o=!n&&[],i?[e.createElement(i[1])]:(i=gt([t],e,o),o&&o.length&&_(o).remove(),_.merge([],i.childNodes)));var r,i,o},_.fn.load=function(t,e,n){var r,i,o,a=this,s=t.indexOf(" ");return s>-1&&(r=de(t.slice(s)),t=t.slice(0,s)),_.isFunction(e)?(n=e,e=void 0):e&&"object"==typeof e&&(i="POST"),a.length>0&&_.ajax({url:t,type:i||"GET",dataType:"html",data:e}).done(function(t){o=arguments,a.html(r?_("<div>").append(_.parseHTML(t)).find(r):t)}).always(n&&function(t,e){a.each(function(){n.apply(this,o||[t.responseText,e,t])})}),this},_.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(t,e){_.fn[e]=function(t){return this.on(e,t)}}),_.expr.pseudos.animated=function(t){return _.grep(_.timers,function(e){return t===e.elem}).length},_.offset={setOffset:function(t,e,n){var r,i,o,a,s,u,c=_.css(t,"position"),l=_(t),f={};"static"===c&&(t.style.position="relative"),s=l.offset(),o=_.css(t,"top"),u=_.css(t,"left"),("absolute"===c||"fixed"===c)&&(o+u).indexOf("auto")>-1?(a=(r=l.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),_.isFunction(e)&&(e=e.call(t,n,_.extend({},s))),null!=e.top&&(f.top=e.top-s.top+a),null!=e.left&&(f.left=e.left-s.left+i),"using"in e?e.using.call(t,f):l.css(f)}},_.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){_.offset.setOffset(this,t,e)});var e,n,r,i,o=this[0];return o?o.getClientRects().length?(r=o.getBoundingClientRect(),n=(e=o.ownerDocument).documentElement,i=e.defaultView,{top:r.top+i.pageYOffset-n.clientTop,left:r.left+i.pageXOffset-n.clientLeft}):{top:0,left:0}:void 0},position:function(){if(this[0]){var t,e,n=this[0],r={top:0,left:0};return"fixed"===_.css(n,"position")?e=n.getBoundingClientRect():(t=this.offsetParent(),e=this.offset(),O(t[0],"html")||(r=t.offset()),r={top:r.top+_.css(t[0],"borderTopWidth",!0),left:r.left+_.css(t[0],"borderLeftWidth",!0)}),{top:e.top-r.top-_.css(n,"marginTop",!0),left:e.left-r.left-_.css(n,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){for(var t=this.offsetParent;t&&"static"===_.css(t,"position");)t=t.offsetParent;return t||mt})}}),_.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,e){var n="pageYOffset"===e;_.fn[t]=function(r){return z(this,function(t,r,i){var o;if(_.isWindow(t)?o=t:9===t.nodeType&&(o=t.defaultView),void 0===i)return o?o[e]:t[r];o?o.scrollTo(n?o.pageXOffset:i,n?i:o.pageYOffset):t[r]=i},t,r,arguments.length)}}),_.each(["top","left"],function(t,e){_.cssHooks[e]=Ht(m.pixelPosition,function(t,n){if(n)return n=Ft(t,e),Pt.test(n)?_(t).position()[e]+"px":n})}),_.each({Height:"height",Width:"width"},function(t,e){_.each({padding:"inner"+t,content:e,"":"outer"+t},function(n,r){_.fn[r]=function(i,o){var a=arguments.length&&(n||"boolean"!=typeof i),s=n||(!0===i||!0===o?"margin":"border");return z(this,function(e,n,i){var o;return _.isWindow(e)?0===r.indexOf("outer")?e["inner"+t]:e.document.documentElement["client"+t]:9===e.nodeType?(o=e.documentElement,Math.max(e.body["scroll"+t],o["scroll"+t],e.body["offset"+t],o["offset"+t],o["client"+t])):void 0===i?_.css(e,n,s):_.style(e,n,i,s)},e,a?i:void 0,a)}})}),_.fn.extend({bind:function(t,e,n){return this.on(t,null,e,n)},unbind:function(t,e){return this.off(t,null,e)},delegate:function(t,e,n,r){return this.on(e,t,n,r)},undelegate:function(t,e,n){return 1===arguments.length?this.off(t,"**"):this.off(e,t||"**",n)}}),_.holdReady=function(t){t?_.readyWait++:_.ready(!0)},_.isArray=Array.isArray,_.parseJSON=JSON.parse,_.nodeName=O,void 0===(r=function(){return _}.apply(e,[]))||(t.exports=r);var qe=n.jQuery,Ue=n.$;return _.noConflict=function(t){return n.$===_&&(n.$=Ue),t&&n.jQuery===_&&(n.jQuery=qe),_},i||(n.jQuery=n.$=_),_})},function(t,e,n){"use strict";t.exports=function(t,e){return function(){for(var n=new Array(arguments.length),r=0;r<n.length;r++)n[r]=arguments[r];return t.apply(e,n)}}},function(t,e){var n,r,i=t.exports={};function o(){throw new Error("setTimeout has not been defined")}function a(){throw new Error("clearTimeout has not been defined")}function s(t){if(n===setTimeout)return setTimeout(t,0);if((n===o||!n)&&setTimeout)return n=setTimeout,setTimeout(t,0);try{return n(t,0)}catch(e){try{return n.call(null,t,0)}catch(e){return n.call(this,t,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:o}catch(t){n=o}try{r="function"==typeof clearTimeout?clearTimeout:a}catch(t){r=a}}();var u,c=[],l=!1,f=-1;function p(){l&&u&&(l=!1,u.length?c=u.concat(c):f=-1,c.length&&d())}function d(){if(!l){var t=s(p);l=!0;for(var e=c.length;e;){for(u=c,c=[];++f<e;)u&&u[f].run();f=-1,e=c.length}u=null,l=!1,function(t){if(r===clearTimeout)return clearTimeout(t);if((r===a||!r)&&clearTimeout)return r=clearTimeout,clearTimeout(t);try{r(t)}catch(e){try{return r.call(null,t)}catch(e){return r.call(this,t)}}}(t)}}function h(t,e){this.fun=t,this.array=e}function v(){}i.nextTick=function(t){var e=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)e[n-1]=arguments[n];c.push(new h(t,e)),1!==c.length||l||s(d)},h.prototype.run=function(){this.fun.apply(null,this.array)},i.title="browser",i.browser=!0,i.env={},i.argv=[],i.version="",i.versions={},i.on=v,i.addListener=v,i.once=v,i.off=v,i.removeListener=v,i.removeAllListeners=v,i.emit=v,i.prependListener=v,i.prependOnceListener=v,i.listeners=function(t){return[]},i.binding=function(t){throw new Error("process.binding is not supported")},i.cwd=function(){return"/"},i.chdir=function(t){throw new Error("process.chdir is not supported")},i.umask=function(){return 0}},function(t,e,n){"use strict";var r=n(0),i=n(22),o=n(24),a=n(25),s=n(26),u=n(8),c="undefined"!=typeof window&&window.btoa&&window.btoa.bind(window)||n(27);t.exports=function(t){return new Promise(function(e,l){var f=t.data,p=t.headers;r.isFormData(f)&&delete p["Content-Type"];var d=new XMLHttpRequest,h="onreadystatechange",v=!1;if("undefined"==typeof window||!window.XDomainRequest||"withCredentials"in d||s(t.url)||(d=new window.XDomainRequest,h="onload",v=!0,d.onprogress=function(){},d.ontimeout=function(){}),t.auth){var g=t.auth.username||"",m=t.auth.password||"";p.Authorization="Basic "+c(g+":"+m)}if(d.open(t.method.toUpperCase(),o(t.url,t.params,t.paramsSerializer),!0),d.timeout=t.timeout,d[h]=function(){if(d&&(4===d.readyState||v)&&(0!==d.status||d.responseURL&&0===d.responseURL.indexOf("file:"))){var n="getAllResponseHeaders"in d?a(d.getAllResponseHeaders()):null,r={data:t.responseType&&"text"!==t.responseType?d.response:d.responseText,status:1223===d.status?204:d.status,statusText:1223===d.status?"No Content":d.statusText,headers:n,config:t,request:d};i(e,l,r),d=null}},d.onerror=function(){l(u("Network Error",t,null,d)),d=null},d.ontimeout=function(){l(u("timeout of "+t.timeout+"ms exceeded",t,"ECONNABORTED",d)),d=null},r.isStandardBrowserEnv()){var y=n(28),_=(t.withCredentials||s(t.url))&&t.xsrfCookieName?y.read(t.xsrfCookieName):void 0;_&&(p[t.xsrfHeaderName]=_)}if("setRequestHeader"in d&&r.forEach(p,function(t,e){void 0===f&&"content-type"===e.toLowerCase()?delete p[e]:d.setRequestHeader(e,t)}),t.withCredentials&&(d.withCredentials=!0),t.responseType)try{d.responseType=t.responseType}catch(e){if("json"!==t.responseType)throw e}"function"==typeof t.onDownloadProgress&&d.addEventListener("progress",t.onDownloadProgress),"function"==typeof t.onUploadProgress&&d.upload&&d.upload.addEventListener("progress",t.onUploadProgress),t.cancelToken&&t.cancelToken.promise.then(function(t){d&&(d.abort(),l(t),d=null)}),void 0===f&&(f=null),d.send(f)})}},function(t,e,n){"use strict";var r=n(23);t.exports=function(t,e,n,i,o){var a=new Error(t);return r(a,e,n,i,o)}},function(t,e,n){"use strict";t.exports=function(t){return!(!t||!t.__CANCEL__)}},function(t,e,n){"use strict";function r(t){this.message=t}r.prototype.toString=function(){return"Cancel"+(this.message?": "+this.message:"")},r.prototype.__CANCEL__=!0,t.exports=r},function(t,e,n){n(12),t.exports=n(43)},function(t,e,n){n(13),window.Vue=n(36),Vue.component("example-component",n(39));new Vue({el:"#app"})},function(t,e,n){window._=n(14),window.Popper=n(3).default;try{window.$=window.jQuery=n(4),n(16)}catch(t){}window.axios=n(17),window.axios.defaults.headers.common["X-Requested-With"]="XMLHttpRequest";var r=document.head.querySelector('meta[name="csrf-token"]');r?window.axios.defaults.headers.common["X-CSRF-TOKEN"]=r.content:console.error("CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token")},function(t,e,n){(function(t,r){var i;(function(){var o,a=200,s="Unsupported core-js use. Try https://npms.io/search?q=ponyfill.",u="Expected a function",c="__lodash_hash_undefined__",l=500,f="__lodash_placeholder__",p=1,d=2,h=4,v=1,g=2,m=1,y=2,_=4,b=8,w=16,x=32,C=64,T=128,E=256,A=512,S=30,k="...",O=800,D=16,I=1,N=2,j=1/0,L=9007199254740991,$=1.7976931348623157e308,R=NaN,P=4294967295,M=P-1,F=P>>>1,H=[["ary",T],["bind",m],["bindKey",y],["curry",b],["curryRight",w],["flip",A],["partial",x],["partialRight",C],["rearg",E]],B="[object Arguments]",W="[object Array]",q="[object AsyncFunction]",U="[object Boolean]",z="[object Date]",V="[object DOMException]",K="[object Error]",Q="[object Function]",G="[object GeneratorFunction]",Y="[object Map]",X="[object Number]",J="[object Null]",Z="[object Object]",tt="[object Promise]",et="[object Proxy]",nt="[object RegExp]",rt="[object Set]",it="[object String]",ot="[object Symbol]",at="[object Undefined]",st="[object WeakMap]",ut="[object WeakSet]",ct="[object ArrayBuffer]",lt="[object DataView]",ft="[object Float32Array]",pt="[object Float64Array]",dt="[object Int8Array]",ht="[object Int16Array]",vt="[object Int32Array]",gt="[object Uint8Array]",mt="[object Uint8ClampedArray]",yt="[object Uint16Array]",_t="[object Uint32Array]",bt=/\b__p \+= '';/g,wt=/\b(__p \+=) '' \+/g,xt=/(__e\(.*?\)|\b__t\)) \+\n'';/g,Ct=/&(?:amp|lt|gt|quot|#39);/g,Tt=/[&<>"']/g,Et=RegExp(Ct.source),At=RegExp(Tt.source),St=/<%-([\s\S]+?)%>/g,kt=/<%([\s\S]+?)%>/g,Ot=/<%=([\s\S]+?)%>/g,Dt=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,It=/^\w*$/,Nt=/^\./,jt=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,Lt=/[\\^$.*+?()[\]{}|]/g,$t=RegExp(Lt.source),Rt=/^\s+|\s+$/g,Pt=/^\s+/,Mt=/\s+$/,Ft=/\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,Ht=/\{\n\/\* \[wrapped with (.+)\] \*/,Bt=/,? & /,Wt=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g,qt=/\\(\\)?/g,Ut=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,zt=/\w*$/,Vt=/^[-+]0x[0-9a-f]+$/i,Kt=/^0b[01]+$/i,Qt=/^\[object .+?Constructor\]$/,Gt=/^0o[0-7]+$/i,Yt=/^(?:0|[1-9]\d*)$/,Xt=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,Jt=/($^)/,Zt=/['\n\r\u2028\u2029\\]/g,te="\\ud800-\\udfff",ee="\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff",ne="\\u2700-\\u27bf",re="a-z\\xdf-\\xf6\\xf8-\\xff",ie="A-Z\\xc0-\\xd6\\xd8-\\xde",oe="\\ufe0e\\ufe0f",ae="\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",se="['’]",ue="["+te+"]",ce="["+ae+"]",le="["+ee+"]",fe="\\d+",pe="["+ne+"]",de="["+re+"]",he="[^"+te+ae+fe+ne+re+ie+"]",ve="\\ud83c[\\udffb-\\udfff]",ge="[^"+te+"]",me="(?:\\ud83c[\\udde6-\\uddff]){2}",ye="[\\ud800-\\udbff][\\udc00-\\udfff]",_e="["+ie+"]",be="\\u200d",we="(?:"+de+"|"+he+")",xe="(?:"+_e+"|"+he+")",Ce="(?:['’](?:d|ll|m|re|s|t|ve))?",Te="(?:['’](?:D|LL|M|RE|S|T|VE))?",Ee="(?:"+le+"|"+ve+")"+"?",Ae="["+oe+"]?",Se=Ae+Ee+("(?:"+be+"(?:"+[ge,me,ye].join("|")+")"+Ae+Ee+")*"),ke="(?:"+[pe,me,ye].join("|")+")"+Se,Oe="(?:"+[ge+le+"?",le,me,ye,ue].join("|")+")",De=RegExp(se,"g"),Ie=RegExp(le,"g"),Ne=RegExp(ve+"(?="+ve+")|"+Oe+Se,"g"),je=RegExp([_e+"?"+de+"+"+Ce+"(?="+[ce,_e,"$"].join("|")+")",xe+"+"+Te+"(?="+[ce,_e+we,"$"].join("|")+")",_e+"?"+we+"+"+Ce,_e+"+"+Te,"\\d*(?:(?:1ST|2ND|3RD|(?![123])\\dTH)\\b)","\\d*(?:(?:1st|2nd|3rd|(?![123])\\dth)\\b)",fe,ke].join("|"),"g"),Le=RegExp("["+be+te+ee+oe+"]"),$e=/[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,Re=["Array","Buffer","DataView","Date","Error","Float32Array","Float64Array","Function","Int8Array","Int16Array","Int32Array","Map","Math","Object","Promise","RegExp","Set","String","Symbol","TypeError","Uint8Array","Uint8ClampedArray","Uint16Array","Uint32Array","WeakMap","_","clearTimeout","isFinite","parseInt","setTimeout"],Pe=-1,Me={};Me[ft]=Me[pt]=Me[dt]=Me[ht]=Me[vt]=Me[gt]=Me[mt]=Me[yt]=Me[_t]=!0,Me[B]=Me[W]=Me[ct]=Me[U]=Me[lt]=Me[z]=Me[K]=Me[Q]=Me[Y]=Me[X]=Me[Z]=Me[nt]=Me[rt]=Me[it]=Me[st]=!1;var Fe={};Fe[B]=Fe[W]=Fe[ct]=Fe[lt]=Fe[U]=Fe[z]=Fe[ft]=Fe[pt]=Fe[dt]=Fe[ht]=Fe[vt]=Fe[Y]=Fe[X]=Fe[Z]=Fe[nt]=Fe[rt]=Fe[it]=Fe[ot]=Fe[gt]=Fe[mt]=Fe[yt]=Fe[_t]=!0,Fe[K]=Fe[Q]=Fe[st]=!1;var He={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},Be=parseFloat,We=parseInt,qe="object"==typeof t&&t&&t.Object===Object&&t,Ue="object"==typeof self&&self&&self.Object===Object&&self,ze=qe||Ue||Function("return this")(),Ve="object"==typeof e&&e&&!e.nodeType&&e,Ke=Ve&&"object"==typeof r&&r&&!r.nodeType&&r,Qe=Ke&&Ke.exports===Ve,Ge=Qe&&qe.process,Ye=function(){try{return Ge&&Ge.binding&&Ge.binding("util")}catch(t){}}(),Xe=Ye&&Ye.isArrayBuffer,Je=Ye&&Ye.isDate,Ze=Ye&&Ye.isMap,tn=Ye&&Ye.isRegExp,en=Ye&&Ye.isSet,nn=Ye&&Ye.isTypedArray;function rn(t,e){return t.set(e[0],e[1]),t}function on(t,e){return t.add(e),t}function an(t,e,n){switch(n.length){case 0:return t.call(e);case 1:return t.call(e,n[0]);case 2:return t.call(e,n[0],n[1]);case 3:return t.call(e,n[0],n[1],n[2])}return t.apply(e,n)}function sn(t,e,n,r){for(var i=-1,o=null==t?0:t.length;++i<o;){var a=t[i];e(r,a,n(a),t)}return r}function un(t,e){for(var n=-1,r=null==t?0:t.length;++n<r&&!1!==e(t[n],n,t););return t}function cn(t,e){for(var n=null==t?0:t.length;n--&&!1!==e(t[n],n,t););return t}function ln(t,e){for(var n=-1,r=null==t?0:t.length;++n<r;)if(!e(t[n],n,t))return!1;return!0}function fn(t,e){for(var n=-1,r=null==t?0:t.length,i=0,o=[];++n<r;){var a=t[n];e(a,n,t)&&(o[i++]=a)}return o}function pn(t,e){return!!(null==t?0:t.length)&&xn(t,e,0)>-1}function dn(t,e,n){for(var r=-1,i=null==t?0:t.length;++r<i;)if(n(e,t[r]))return!0;return!1}function hn(t,e){for(var n=-1,r=null==t?0:t.length,i=Array(r);++n<r;)i[n]=e(t[n],n,t);return i}function vn(t,e){for(var n=-1,r=e.length,i=t.length;++n<r;)t[i+n]=e[n];return t}function gn(t,e,n,r){var i=-1,o=null==t?0:t.length;for(r&&o&&(n=t[++i]);++i<o;)n=e(n,t[i],i,t);return n}function mn(t,e,n,r){var i=null==t?0:t.length;for(r&&i&&(n=t[--i]);i--;)n=e(n,t[i],i,t);return n}function yn(t,e){for(var n=-1,r=null==t?0:t.length;++n<r;)if(e(t[n],n,t))return!0;return!1}var _n=An("length");function bn(t,e,n){var r;return n(t,function(t,n,i){if(e(t,n,i))return r=n,!1}),r}function wn(t,e,n,r){for(var i=t.length,o=n+(r?1:-1);r?o--:++o<i;)if(e(t[o],o,t))return o;return-1}function xn(t,e,n){return e==e?function(t,e,n){var r=n-1,i=t.length;for(;++r<i;)if(t[r]===e)return r;return-1}(t,e,n):wn(t,Tn,n)}function Cn(t,e,n,r){for(var i=n-1,o=t.length;++i<o;)if(r(t[i],e))return i;return-1}function Tn(t){return t!=t}function En(t,e){var n=null==t?0:t.length;return n?On(t,e)/n:R}function An(t){return function(e){return null==e?o:e[t]}}function Sn(t){return function(e){return null==t?o:t[e]}}function kn(t,e,n,r,i){return i(t,function(t,i,o){n=r?(r=!1,t):e(n,t,i,o)}),n}function On(t,e){for(var n,r=-1,i=t.length;++r<i;){var a=e(t[r]);a!==o&&(n=n===o?a:n+a)}return n}function Dn(t,e){for(var n=-1,r=Array(t);++n<t;)r[n]=e(n);return r}function In(t){return function(e){return t(e)}}function Nn(t,e){return hn(e,function(e){return t[e]})}function jn(t,e){return t.has(e)}function Ln(t,e){for(var n=-1,r=t.length;++n<r&&xn(e,t[n],0)>-1;);return n}function $n(t,e){for(var n=t.length;n--&&xn(e,t[n],0)>-1;);return n}var Rn=Sn({"À":"A","Á":"A","Â":"A","Ã":"A","Ä":"A","Å":"A","à":"a","á":"a","â":"a","ã":"a","ä":"a","å":"a","Ç":"C","ç":"c","Ð":"D","ð":"d","È":"E","É":"E","Ê":"E","Ë":"E","è":"e","é":"e","ê":"e","ë":"e","Ì":"I","Í":"I","Î":"I","Ï":"I","ì":"i","í":"i","î":"i","ï":"i","Ñ":"N","ñ":"n","Ò":"O","Ó":"O","Ô":"O","Õ":"O","Ö":"O","Ø":"O","ò":"o","ó":"o","ô":"o","õ":"o","ö":"o","ø":"o","Ù":"U","Ú":"U","Û":"U","Ü":"U","ù":"u","ú":"u","û":"u","ü":"u","Ý":"Y","ý":"y","ÿ":"y","Æ":"Ae","æ":"ae","Þ":"Th","þ":"th","ß":"ss","Ā":"A","Ă":"A","Ą":"A","ā":"a","ă":"a","ą":"a","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","ć":"c","ĉ":"c","ċ":"c","č":"c","Ď":"D","Đ":"D","ď":"d","đ":"d","Ē":"E","Ĕ":"E","Ė":"E","Ę":"E","Ě":"E","ē":"e","ĕ":"e","ė":"e","ę":"e","ě":"e","Ĝ":"G","Ğ":"G","Ġ":"G","Ģ":"G","ĝ":"g","ğ":"g","ġ":"g","ģ":"g","Ĥ":"H","Ħ":"H","ĥ":"h","ħ":"h","Ĩ":"I","Ī":"I","Ĭ":"I","Į":"I","İ":"I","ĩ":"i","ī":"i","ĭ":"i","į":"i","ı":"i","Ĵ":"J","ĵ":"j","Ķ":"K","ķ":"k","ĸ":"k","Ĺ":"L","Ļ":"L","Ľ":"L","Ŀ":"L","Ł":"L","ĺ":"l","ļ":"l","ľ":"l","ŀ":"l","ł":"l","Ń":"N","Ņ":"N","Ň":"N","Ŋ":"N","ń":"n","ņ":"n","ň":"n","ŋ":"n","Ō":"O","Ŏ":"O","Ő":"O","ō":"o","ŏ":"o","ő":"o","Ŕ":"R","Ŗ":"R","Ř":"R","ŕ":"r","ŗ":"r","ř":"r","Ś":"S","Ŝ":"S","Ş":"S","Š":"S","ś":"s","ŝ":"s","ş":"s","š":"s","Ţ":"T","Ť":"T","Ŧ":"T","ţ":"t","ť":"t","ŧ":"t","Ũ":"U","Ū":"U","Ŭ":"U","Ů":"U","Ű":"U","Ų":"U","ũ":"u","ū":"u","ŭ":"u","ů":"u","ű":"u","ų":"u","Ŵ":"W","ŵ":"w","Ŷ":"Y","ŷ":"y","Ÿ":"Y","Ź":"Z","Ż":"Z","Ž":"Z","ź":"z","ż":"z","ž":"z","IJ":"IJ","ij":"ij","Œ":"Oe","œ":"oe","ʼn":"'n","ſ":"s"}),Pn=Sn({"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"});function Mn(t){return"\\"+He[t]}function Fn(t){return Le.test(t)}function Hn(t){var e=-1,n=Array(t.size);return t.forEach(function(t,r){n[++e]=[r,t]}),n}function Bn(t,e){return function(n){return t(e(n))}}function Wn(t,e){for(var n=-1,r=t.length,i=0,o=[];++n<r;){var a=t[n];a!==e&&a!==f||(t[n]=f,o[i++]=n)}return o}function qn(t){var e=-1,n=Array(t.size);return t.forEach(function(t){n[++e]=t}),n}function Un(t){return Fn(t)?function(t){var e=Ne.lastIndex=0;for(;Ne.test(t);)++e;return e}(t):_n(t)}function zn(t){return Fn(t)?t.match(Ne)||[]:t.split("")}var Vn=Sn({"&amp;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#39;":"'"});var Kn=function t(e){var n,r=(e=null==e?ze:Kn.defaults(ze.Object(),e,Kn.pick(ze,Re))).Array,i=e.Date,te=e.Error,ee=e.Function,ne=e.Math,re=e.Object,ie=e.RegExp,oe=e.String,ae=e.TypeError,se=r.prototype,ue=ee.prototype,ce=re.prototype,le=e["__core-js_shared__"],fe=ue.toString,pe=ce.hasOwnProperty,de=0,he=(n=/[^.]+$/.exec(le&&le.keys&&le.keys.IE_PROTO||""))?"Symbol(src)_1."+n:"",ve=ce.toString,ge=fe.call(re),me=ze._,ye=ie("^"+fe.call(pe).replace(Lt,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),_e=Qe?e.Buffer:o,be=e.Symbol,we=e.Uint8Array,xe=_e?_e.allocUnsafe:o,Ce=Bn(re.getPrototypeOf,re),Te=re.create,Ee=ce.propertyIsEnumerable,Ae=se.splice,Se=be?be.isConcatSpreadable:o,ke=be?be.iterator:o,Oe=be?be.toStringTag:o,Ne=function(){try{var t=Wo(re,"defineProperty");return t({},"",{}),t}catch(t){}}(),Le=e.clearTimeout!==ze.clearTimeout&&e.clearTimeout,He=i&&i.now!==ze.Date.now&&i.now,qe=e.setTimeout!==ze.setTimeout&&e.setTimeout,Ue=ne.ceil,Ve=ne.floor,Ke=re.getOwnPropertySymbols,Ge=_e?_e.isBuffer:o,Ye=e.isFinite,_n=se.join,Sn=Bn(re.keys,re),Qn=ne.max,Gn=ne.min,Yn=i.now,Xn=e.parseInt,Jn=ne.random,Zn=se.reverse,tr=Wo(e,"DataView"),er=Wo(e,"Map"),nr=Wo(e,"Promise"),rr=Wo(e,"Set"),ir=Wo(e,"WeakMap"),or=Wo(re,"create"),ar=ir&&new ir,sr={},ur=va(tr),cr=va(er),lr=va(nr),fr=va(rr),pr=va(ir),dr=be?be.prototype:o,hr=dr?dr.valueOf:o,vr=dr?dr.toString:o;function gr(t){if(Ns(t)&&!ws(t)&&!(t instanceof br)){if(t instanceof _r)return t;if(pe.call(t,"__wrapped__"))return ga(t)}return new _r(t)}var mr=function(){function t(){}return function(e){if(!Is(e))return{};if(Te)return Te(e);t.prototype=e;var n=new t;return t.prototype=o,n}}();function yr(){}function _r(t,e){this.__wrapped__=t,this.__actions__=[],this.__chain__=!!e,this.__index__=0,this.__values__=o}function br(t){this.__wrapped__=t,this.__actions__=[],this.__dir__=1,this.__filtered__=!1,this.__iteratees__=[],this.__takeCount__=P,this.__views__=[]}function wr(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e<n;){var r=t[e];this.set(r[0],r[1])}}function xr(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e<n;){var r=t[e];this.set(r[0],r[1])}}function Cr(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e<n;){var r=t[e];this.set(r[0],r[1])}}function Tr(t){var e=-1,n=null==t?0:t.length;for(this.__data__=new Cr;++e<n;)this.add(t[e])}function Er(t){var e=this.__data__=new xr(t);this.size=e.size}function Ar(t,e){var n=ws(t),r=!n&&bs(t),i=!n&&!r&&Es(t),o=!n&&!r&&!i&&Hs(t),a=n||r||i||o,s=a?Dn(t.length,oe):[],u=s.length;for(var c in t)!e&&!pe.call(t,c)||a&&("length"==c||i&&("offset"==c||"parent"==c)||o&&("buffer"==c||"byteLength"==c||"byteOffset"==c)||Go(c,u))||s.push(c);return s}function Sr(t){var e=t.length;return e?t[Ti(0,e-1)]:o}function kr(t,e){return la(oo(t),Pr(e,0,t.length))}function Or(t){return la(oo(t))}function Dr(t,e,n){(n===o||ms(t[e],n))&&(n!==o||e in t)||$r(t,e,n)}function Ir(t,e,n){var r=t[e];pe.call(t,e)&&ms(r,n)&&(n!==o||e in t)||$r(t,e,n)}function Nr(t,e){for(var n=t.length;n--;)if(ms(t[n][0],e))return n;return-1}function jr(t,e,n,r){return Wr(t,function(t,i,o){e(r,t,n(t),o)}),r}function Lr(t,e){return t&&ao(e,uu(e),t)}function $r(t,e,n){"__proto__"==e&&Ne?Ne(t,e,{configurable:!0,enumerable:!0,value:n,writable:!0}):t[e]=n}function Rr(t,e){for(var n=-1,i=e.length,a=r(i),s=null==t;++n<i;)a[n]=s?o:ru(t,e[n]);return a}function Pr(t,e,n){return t==t&&(n!==o&&(t=t<=n?t:n),e!==o&&(t=t>=e?t:e)),t}function Mr(t,e,n,r,i,a){var s,u=e&p,c=e&d,l=e&h;if(n&&(s=i?n(t,r,i,a):n(t)),s!==o)return s;if(!Is(t))return t;var f,v,g,m,y,_,b,w,x,C=ws(t);if(C){if(b=t,w=b.length,x=b.constructor(w),w&&"string"==typeof b[0]&&pe.call(b,"index")&&(x.index=b.index,x.input=b.input),s=x,!u)return oo(t,s)}else{var T=zo(t),E=T==Q||T==G;if(Es(t))return Zi(t,u);if(T==Z||T==B||E&&!i){if(s=c||E?{}:Ko(t),!u)return c?(g=t,_=t,m=(y=s)&&ao(_,cu(_),y),ao(g,Uo(g),m)):(f=t,v=Lr(s,t),ao(f,qo(f),v))}else{if(!Fe[T])return i?t:{};s=function(t,e,n,r){var i,o,a,s,u,c,l,f=t.constructor;switch(e){case ct:return to(t);case U:case z:return new f(+t);case lt:return c=t,l=r?to(c.buffer):c.buffer,new c.constructor(l,c.byteOffset,c.byteLength);case ft:case pt:case dt:case ht:case vt:case gt:case mt:case yt:case _t:return eo(t,r);case Y:return u=t,gn(r?n(Hn(u),p):Hn(u),rn,new u.constructor);case X:case it:return new f(t);case nt:return(s=new(a=t).constructor(a.source,zt.exec(a))).lastIndex=a.lastIndex,s;case rt:return o=t,gn(r?n(qn(o),p):qn(o),on,new o.constructor);case ot:return i=t,hr?re(hr.call(i)):{}}}(t,T,Mr,u)}}a||(a=new Er);var A=a.get(t);if(A)return A;a.set(t,s);var S=C?o:(l?c?$o:Lo:c?cu:uu)(t);return un(S||t,function(r,i){S&&(r=t[i=r]),Ir(s,i,Mr(r,e,n,i,t,a))}),s}function Fr(t,e,n){var r=n.length;if(null==t)return!r;for(t=re(t);r--;){var i=n[r],a=e[i],s=t[i];if(s===o&&!(i in t)||!a(s))return!1}return!0}function Hr(t,e,n){if("function"!=typeof t)throw new ae(u);return aa(function(){t.apply(o,n)},e)}function Br(t,e,n,r){var i=-1,o=pn,s=!0,u=t.length,c=[],l=e.length;if(!u)return c;n&&(e=hn(e,In(n))),r?(o=dn,s=!1):e.length>=a&&(o=jn,s=!1,e=new Tr(e));t:for(;++i<u;){var f=t[i],p=null==n?f:n(f);if(f=r||0!==f?f:0,s&&p==p){for(var d=l;d--;)if(e[d]===p)continue t;c.push(f)}else o(e,p,r)||c.push(f)}return c}gr.templateSettings={escape:St,evaluate:kt,interpolate:Ot,variable:"",imports:{_:gr}},gr.prototype=yr.prototype,gr.prototype.constructor=gr,_r.prototype=mr(yr.prototype),_r.prototype.constructor=_r,br.prototype=mr(yr.prototype),br.prototype.constructor=br,wr.prototype.clear=function(){this.__data__=or?or(null):{},this.size=0},wr.prototype.delete=function(t){var e=this.has(t)&&delete this.__data__[t];return this.size-=e?1:0,e},wr.prototype.get=function(t){var e=this.__data__;if(or){var n=e[t];return n===c?o:n}return pe.call(e,t)?e[t]:o},wr.prototype.has=function(t){var e=this.__data__;return or?e[t]!==o:pe.call(e,t)},wr.prototype.set=function(t,e){var n=this.__data__;return this.size+=this.has(t)?0:1,n[t]=or&&e===o?c:e,this},xr.prototype.clear=function(){this.__data__=[],this.size=0},xr.prototype.delete=function(t){var e=this.__data__,n=Nr(e,t);return!(n<0||(n==e.length-1?e.pop():Ae.call(e,n,1),--this.size,0))},xr.prototype.get=function(t){var e=this.__data__,n=Nr(e,t);return n<0?o:e[n][1]},xr.prototype.has=function(t){return Nr(this.__data__,t)>-1},xr.prototype.set=function(t,e){var n=this.__data__,r=Nr(n,t);return r<0?(++this.size,n.push([t,e])):n[r][1]=e,this},Cr.prototype.clear=function(){this.size=0,this.__data__={hash:new wr,map:new(er||xr),string:new wr}},Cr.prototype.delete=function(t){var e=Ho(this,t).delete(t);return this.size-=e?1:0,e},Cr.prototype.get=function(t){return Ho(this,t).get(t)},Cr.prototype.has=function(t){return Ho(this,t).has(t)},Cr.prototype.set=function(t,e){var n=Ho(this,t),r=n.size;return n.set(t,e),this.size+=n.size==r?0:1,this},Tr.prototype.add=Tr.prototype.push=function(t){return this.__data__.set(t,c),this},Tr.prototype.has=function(t){return this.__data__.has(t)},Er.prototype.clear=function(){this.__data__=new xr,this.size=0},Er.prototype.delete=function(t){var e=this.__data__,n=e.delete(t);return this.size=e.size,n},Er.prototype.get=function(t){return this.__data__.get(t)},Er.prototype.has=function(t){return this.__data__.has(t)},Er.prototype.set=function(t,e){var n=this.__data__;if(n instanceof xr){var r=n.__data__;if(!er||r.length<a-1)return r.push([t,e]),this.size=++n.size,this;n=this.__data__=new Cr(r)}return n.set(t,e),this.size=n.size,this};var Wr=co(Yr),qr=co(Xr,!0);function Ur(t,e){var n=!0;return Wr(t,function(t,r,i){return n=!!e(t,r,i)}),n}function zr(t,e,n){for(var r=-1,i=t.length;++r<i;){var a=t[r],s=e(a);if(null!=s&&(u===o?s==s&&!Fs(s):n(s,u)))var u=s,c=a}return c}function Vr(t,e){var n=[];return Wr(t,function(t,r,i){e(t,r,i)&&n.push(t)}),n}function Kr(t,e,n,r,i){var o=-1,a=t.length;for(n||(n=Qo),i||(i=[]);++o<a;){var s=t[o];e>0&&n(s)?e>1?Kr(s,e-1,n,r,i):vn(i,s):r||(i[i.length]=s)}return i}var Qr=lo(),Gr=lo(!0);function Yr(t,e){return t&&Qr(t,e,uu)}function Xr(t,e){return t&&Gr(t,e,uu)}function Jr(t,e){return fn(e,function(e){return ks(t[e])})}function Zr(t,e){for(var n=0,r=(e=Gi(e,t)).length;null!=t&&n<r;)t=t[ha(e[n++])];return n&&n==r?t:o}function ti(t,e,n){var r=e(t);return ws(t)?r:vn(r,n(t))}function ei(t){return null==t?t===o?at:J:Oe&&Oe in re(t)?function(t){var e=pe.call(t,Oe),n=t[Oe];try{t[Oe]=o;var r=!0}catch(t){}var i=ve.call(t);return r&&(e?t[Oe]=n:delete t[Oe]),i}(t):(e=t,ve.call(e));var e}function ni(t,e){return t>e}function ri(t,e){return null!=t&&pe.call(t,e)}function ii(t,e){return null!=t&&e in re(t)}function oi(t,e,n){for(var i=n?dn:pn,a=t[0].length,s=t.length,u=s,c=r(s),l=1/0,f=[];u--;){var p=t[u];u&&e&&(p=hn(p,In(e))),l=Gn(p.length,l),c[u]=!n&&(e||a>=120&&p.length>=120)?new Tr(u&&p):o}p=t[0];var d=-1,h=c[0];t:for(;++d<a&&f.length<l;){var v=p[d],g=e?e(v):v;if(v=n||0!==v?v:0,!(h?jn(h,g):i(f,g,n))){for(u=s;--u;){var m=c[u];if(!(m?jn(m,g):i(t[u],g,n)))continue t}h&&h.push(g),f.push(v)}}return f}function ai(t,e,n){var r=null==(t=ia(t,e=Gi(e,t)))?t:t[ha(Sa(e))];return null==r?o:an(r,t,n)}function si(t){return Ns(t)&&ei(t)==B}function ui(t,e,n,r,i){return t===e||(null==t||null==e||!Ns(t)&&!Ns(e)?t!=t&&e!=e:function(t,e,n,r,i,a){var s=ws(t),u=ws(e),c=s?W:zo(t),l=u?W:zo(e),f=(c=c==B?Z:c)==Z,p=(l=l==B?Z:l)==Z,d=c==l;if(d&&Es(t)){if(!Es(e))return!1;s=!0,f=!1}if(d&&!f)return a||(a=new Er),s||Hs(t)?No(t,e,n,r,i,a):function(t,e,n,r,i,o,a){switch(n){case lt:if(t.byteLength!=e.byteLength||t.byteOffset!=e.byteOffset)return!1;t=t.buffer,e=e.buffer;case ct:return!(t.byteLength!=e.byteLength||!o(new we(t),new we(e)));case U:case z:case X:return ms(+t,+e);case K:return t.name==e.name&&t.message==e.message;case nt:case it:return t==e+"";case Y:var s=Hn;case rt:var u=r&v;if(s||(s=qn),t.size!=e.size&&!u)return!1;var c=a.get(t);if(c)return c==e;r|=g,a.set(t,e);var l=No(s(t),s(e),r,i,o,a);return a.delete(t),l;case ot:if(hr)return hr.call(t)==hr.call(e)}return!1}(t,e,c,n,r,i,a);if(!(n&v)){var h=f&&pe.call(t,"__wrapped__"),m=p&&pe.call(e,"__wrapped__");if(h||m){var y=h?t.value():t,_=m?e.value():e;return a||(a=new Er),i(y,_,n,r,a)}}return!!d&&(a||(a=new Er),function(t,e,n,r,i,a){var s=n&v,u=Lo(t),c=u.length,l=Lo(e).length;if(c!=l&&!s)return!1;for(var f=c;f--;){var p=u[f];if(!(s?p in e:pe.call(e,p)))return!1}var d=a.get(t);if(d&&a.get(e))return d==e;var h=!0;a.set(t,e),a.set(e,t);for(var g=s;++f<c;){p=u[f];var m=t[p],y=e[p];if(r)var _=s?r(y,m,p,e,t,a):r(m,y,p,t,e,a);if(!(_===o?m===y||i(m,y,n,r,a):_)){h=!1;break}g||(g="constructor"==p)}if(h&&!g){var b=t.constructor,w=e.constructor;b!=w&&"constructor"in t&&"constructor"in e&&!("function"==typeof b&&b instanceof b&&"function"==typeof w&&w instanceof w)&&(h=!1)}return a.delete(t),a.delete(e),h}(t,e,n,r,i,a))}(t,e,n,r,ui,i))}function ci(t,e,n,r){var i=n.length,a=i,s=!r;if(null==t)return!a;for(t=re(t);i--;){var u=n[i];if(s&&u[2]?u[1]!==t[u[0]]:!(u[0]in t))return!1}for(;++i<a;){var c=(u=n[i])[0],l=t[c],f=u[1];if(s&&u[2]){if(l===o&&!(c in t))return!1}else{var p=new Er;if(r)var d=r(l,f,c,t,e,p);if(!(d===o?ui(f,l,v|g,r,p):d))return!1}}return!0}function li(t){return!(!Is(t)||he&&he in t)&&(ks(t)?ye:Qt).test(va(t))}function fi(t){return"function"==typeof t?t:null==t?Lu:"object"==typeof t?ws(t)?mi(t[0],t[1]):gi(t):qu(t)}function pi(t){if(!ta(t))return Sn(t);var e=[];for(var n in re(t))pe.call(t,n)&&"constructor"!=n&&e.push(n);return e}function di(t){if(!Is(t))return function(t){var e=[];if(null!=t)for(var n in re(t))e.push(n);return e}(t);var e=ta(t),n=[];for(var r in t)("constructor"!=r||!e&&pe.call(t,r))&&n.push(r);return n}function hi(t,e){return t<e}function vi(t,e){var n=-1,i=Cs(t)?r(t.length):[];return Wr(t,function(t,r,o){i[++n]=e(t,r,o)}),i}function gi(t){var e=Bo(t);return 1==e.length&&e[0][2]?na(e[0][0],e[0][1]):function(n){return n===t||ci(n,t,e)}}function mi(t,e){return Xo(t)&&ea(e)?na(ha(t),e):function(n){var r=ru(n,t);return r===o&&r===e?iu(n,t):ui(e,r,v|g)}}function yi(t,e,n,r,i){t!==e&&Qr(e,function(a,s){if(Is(a))i||(i=new Er),function(t,e,n,r,i,a,s){var u=t[n],c=e[n],l=s.get(c);if(l)Dr(t,n,l);else{var f=a?a(u,c,n+"",t,e,s):o,p=f===o;if(p){var d=ws(c),h=!d&&Es(c),v=!d&&!h&&Hs(c);f=c,d||h||v?ws(u)?f=u:Ts(u)?f=oo(u):h?(p=!1,f=Zi(c,!0)):v?(p=!1,f=eo(c,!0)):f=[]:$s(c)||bs(c)?(f=u,bs(u)?f=Qs(u):(!Is(u)||r&&ks(u))&&(f=Ko(c))):p=!1}p&&(s.set(c,f),i(f,c,r,a,s),s.delete(c)),Dr(t,n,f)}}(t,e,s,n,yi,r,i);else{var u=r?r(t[s],a,s+"",t,e,i):o;u===o&&(u=a),Dr(t,s,u)}},cu)}function _i(t,e){var n=t.length;if(n)return Go(e+=e<0?n:0,n)?t[e]:o}function bi(t,e,n){var r=-1;return e=hn(e.length?e:[Lu],In(Fo())),function(t,e){var n=t.length;for(t.sort(e);n--;)t[n]=t[n].value;return t}(vi(t,function(t,n,i){return{criteria:hn(e,function(e){return e(t)}),index:++r,value:t}}),function(t,e){return function(t,e,n){for(var r=-1,i=t.criteria,o=e.criteria,a=i.length,s=n.length;++r<a;){var u=no(i[r],o[r]);if(u){if(r>=s)return u;var c=n[r];return u*("desc"==c?-1:1)}}return t.index-e.index}(t,e,n)})}function wi(t,e,n){for(var r=-1,i=e.length,o={};++r<i;){var a=e[r],s=Zr(t,a);n(s,a)&&Oi(o,Gi(a,t),s)}return o}function xi(t,e,n,r){var i=r?Cn:xn,o=-1,a=e.length,s=t;for(t===e&&(e=oo(e)),n&&(s=hn(t,In(n)));++o<a;)for(var u=0,c=e[o],l=n?n(c):c;(u=i(s,l,u,r))>-1;)s!==t&&Ae.call(s,u,1),Ae.call(t,u,1);return t}function Ci(t,e){for(var n=t?e.length:0,r=n-1;n--;){var i=e[n];if(n==r||i!==o){var o=i;Go(i)?Ae.call(t,i,1):Bi(t,i)}}return t}function Ti(t,e){return t+Ve(Jn()*(e-t+1))}function Ei(t,e){var n="";if(!t||e<1||e>L)return n;do{e%2&&(n+=t),(e=Ve(e/2))&&(t+=t)}while(e);return n}function Ai(t,e){return sa(ra(t,e,Lu),t+"")}function Si(t){return Sr(mu(t))}function ki(t,e){var n=mu(t);return la(n,Pr(e,0,n.length))}function Oi(t,e,n,r){if(!Is(t))return t;for(var i=-1,a=(e=Gi(e,t)).length,s=a-1,u=t;null!=u&&++i<a;){var c=ha(e[i]),l=n;if(i!=s){var f=u[c];(l=r?r(f,c,u):o)===o&&(l=Is(f)?f:Go(e[i+1])?[]:{})}Ir(u,c,l),u=u[c]}return t}var Di=ar?function(t,e){return ar.set(t,e),t}:Lu,Ii=Ne?function(t,e){return Ne(t,"toString",{configurable:!0,enumerable:!1,value:Iu(e),writable:!0})}:Lu;function Ni(t){return la(mu(t))}function ji(t,e,n){var i=-1,o=t.length;e<0&&(e=-e>o?0:o+e),(n=n>o?o:n)<0&&(n+=o),o=e>n?0:n-e>>>0,e>>>=0;for(var a=r(o);++i<o;)a[i]=t[i+e];return a}function Li(t,e){var n;return Wr(t,function(t,r,i){return!(n=e(t,r,i))}),!!n}function $i(t,e,n){var r=0,i=null==t?r:t.length;if("number"==typeof e&&e==e&&i<=F){for(;r<i;){var o=r+i>>>1,a=t[o];null!==a&&!Fs(a)&&(n?a<=e:a<e)?r=o+1:i=o}return i}return Ri(t,e,Lu,n)}function Ri(t,e,n,r){e=n(e);for(var i=0,a=null==t?0:t.length,s=e!=e,u=null===e,c=Fs(e),l=e===o;i<a;){var f=Ve((i+a)/2),p=n(t[f]),d=p!==o,h=null===p,v=p==p,g=Fs(p);if(s)var m=r||v;else m=l?v&&(r||d):u?v&&d&&(r||!h):c?v&&d&&!h&&(r||!g):!h&&!g&&(r?p<=e:p<e);m?i=f+1:a=f}return Gn(a,M)}function Pi(t,e){for(var n=-1,r=t.length,i=0,o=[];++n<r;){var a=t[n],s=e?e(a):a;if(!n||!ms(s,u)){var u=s;o[i++]=0===a?0:a}}return o}function Mi(t){return"number"==typeof t?t:Fs(t)?R:+t}function Fi(t){if("string"==typeof t)return t;if(ws(t))return hn(t,Fi)+"";if(Fs(t))return vr?vr.call(t):"";var e=t+"";return"0"==e&&1/t==-j?"-0":e}function Hi(t,e,n){var r=-1,i=pn,o=t.length,s=!0,u=[],c=u;if(n)s=!1,i=dn;else if(o>=a){var l=e?null:Ao(t);if(l)return qn(l);s=!1,i=jn,c=new Tr}else c=e?[]:u;t:for(;++r<o;){var f=t[r],p=e?e(f):f;if(f=n||0!==f?f:0,s&&p==p){for(var d=c.length;d--;)if(c[d]===p)continue t;e&&c.push(p),u.push(f)}else i(c,p,n)||(c!==u&&c.push(p),u.push(f))}return u}function Bi(t,e){return null==(t=ia(t,e=Gi(e,t)))||delete t[ha(Sa(e))]}function Wi(t,e,n,r){return Oi(t,e,n(Zr(t,e)),r)}function qi(t,e,n,r){for(var i=t.length,o=r?i:-1;(r?o--:++o<i)&&e(t[o],o,t););return n?ji(t,r?0:o,r?o+1:i):ji(t,r?o+1:0,r?i:o)}function Ui(t,e){var n=t;return n instanceof br&&(n=n.value()),gn(e,function(t,e){return e.func.apply(e.thisArg,vn([t],e.args))},n)}function zi(t,e,n){var i=t.length;if(i<2)return i?Hi(t[0]):[];for(var o=-1,a=r(i);++o<i;)for(var s=t[o],u=-1;++u<i;)u!=o&&(a[o]=Br(a[o]||s,t[u],e,n));return Hi(Kr(a,1),e,n)}function Vi(t,e,n){for(var r=-1,i=t.length,a=e.length,s={};++r<i;){var u=r<a?e[r]:o;n(s,t[r],u)}return s}function Ki(t){return Ts(t)?t:[]}function Qi(t){return"function"==typeof t?t:Lu}function Gi(t,e){return ws(t)?t:Xo(t,e)?[t]:da(Gs(t))}var Yi=Ai;function Xi(t,e,n){var r=t.length;return n=n===o?r:n,!e&&n>=r?t:ji(t,e,n)}var Ji=Le||function(t){return ze.clearTimeout(t)};function Zi(t,e){if(e)return t.slice();var n=t.length,r=xe?xe(n):new t.constructor(n);return t.copy(r),r}function to(t){var e=new t.constructor(t.byteLength);return new we(e).set(new we(t)),e}function eo(t,e){var n=e?to(t.buffer):t.buffer;return new t.constructor(n,t.byteOffset,t.length)}function no(t,e){if(t!==e){var n=t!==o,r=null===t,i=t==t,a=Fs(t),s=e!==o,u=null===e,c=e==e,l=Fs(e);if(!u&&!l&&!a&&t>e||a&&s&&c&&!u&&!l||r&&s&&c||!n&&c||!i)return 1;if(!r&&!a&&!l&&t<e||l&&n&&i&&!r&&!a||u&&n&&i||!s&&i||!c)return-1}return 0}function ro(t,e,n,i){for(var o=-1,a=t.length,s=n.length,u=-1,c=e.length,l=Qn(a-s,0),f=r(c+l),p=!i;++u<c;)f[u]=e[u];for(;++o<s;)(p||o<a)&&(f[n[o]]=t[o]);for(;l--;)f[u++]=t[o++];return f}function io(t,e,n,i){for(var o=-1,a=t.length,s=-1,u=n.length,c=-1,l=e.length,f=Qn(a-u,0),p=r(f+l),d=!i;++o<f;)p[o]=t[o];for(var h=o;++c<l;)p[h+c]=e[c];for(;++s<u;)(d||o<a)&&(p[h+n[s]]=t[o++]);return p}function oo(t,e){var n=-1,i=t.length;for(e||(e=r(i));++n<i;)e[n]=t[n];return e}function ao(t,e,n,r){var i=!n;n||(n={});for(var a=-1,s=e.length;++a<s;){var u=e[a],c=r?r(n[u],t[u],u,n,t):o;c===o&&(c=t[u]),i?$r(n,u,c):Ir(n,u,c)}return n}function so(t,e){return function(n,r){var i=ws(n)?sn:jr,o=e?e():{};return i(n,t,Fo(r,2),o)}}function uo(t){return Ai(function(e,n){var r=-1,i=n.length,a=i>1?n[i-1]:o,s=i>2?n[2]:o;for(a=t.length>3&&"function"==typeof a?(i--,a):o,s&&Yo(n[0],n[1],s)&&(a=i<3?o:a,i=1),e=re(e);++r<i;){var u=n[r];u&&t(e,u,r,a)}return e})}function co(t,e){return function(n,r){if(null==n)return n;if(!Cs(n))return t(n,r);for(var i=n.length,o=e?i:-1,a=re(n);(e?o--:++o<i)&&!1!==r(a[o],o,a););return n}}function lo(t){return function(e,n,r){for(var i=-1,o=re(e),a=r(e),s=a.length;s--;){var u=a[t?s:++i];if(!1===n(o[u],u,o))break}return e}}function fo(t){return function(e){var n=Fn(e=Gs(e))?zn(e):o,r=n?n[0]:e.charAt(0),i=n?Xi(n,1).join(""):e.slice(1);return r[t]()+i}}function po(t){return function(e){return gn(ku(bu(e).replace(De,"")),t,"")}}function ho(t){return function(){var e=arguments;switch(e.length){case 0:return new t;case 1:return new t(e[0]);case 2:return new t(e[0],e[1]);case 3:return new t(e[0],e[1],e[2]);case 4:return new t(e[0],e[1],e[2],e[3]);case 5:return new t(e[0],e[1],e[2],e[3],e[4]);case 6:return new t(e[0],e[1],e[2],e[3],e[4],e[5]);case 7:return new t(e[0],e[1],e[2],e[3],e[4],e[5],e[6])}var n=mr(t.prototype),r=t.apply(n,e);return Is(r)?r:n}}function vo(t){return function(e,n,r){var i=re(e);if(!Cs(e)){var a=Fo(n,3);e=uu(e),n=function(t){return a(i[t],t,i)}}var s=t(e,n,r);return s>-1?i[a?e[s]:s]:o}}function go(t){return jo(function(e){var n=e.length,r=n,i=_r.prototype.thru;for(t&&e.reverse();r--;){var a=e[r];if("function"!=typeof a)throw new ae(u);if(i&&!s&&"wrapper"==Po(a))var s=new _r([],!0)}for(r=s?r:n;++r<n;){var c=Po(a=e[r]),l="wrapper"==c?Ro(a):o;s=l&&Jo(l[0])&&l[1]==(T|b|x|E)&&!l[4].length&&1==l[9]?s[Po(l[0])].apply(s,l[3]):1==a.length&&Jo(a)?s[c]():s.thru(a)}return function(){var t=arguments,r=t[0];if(s&&1==t.length&&ws(r))return s.plant(r).value();for(var i=0,o=n?e[i].apply(this,t):r;++i<n;)o=e[i].call(this,o);return o}})}function mo(t,e,n,i,a,s,u,c,l,f){var p=e&T,d=e&m,h=e&y,v=e&(b|w),g=e&A,_=h?o:ho(t);return function m(){for(var y=arguments.length,b=r(y),w=y;w--;)b[w]=arguments[w];if(v)var x=Mo(m),C=function(t,e){for(var n=t.length,r=0;n--;)t[n]===e&&++r;return r}(b,x);if(i&&(b=ro(b,i,a,v)),s&&(b=io(b,s,u,v)),y-=C,v&&y<f){var T=Wn(b,x);return To(t,e,mo,m.placeholder,n,b,T,c,l,f-y)}var E=d?n:this,A=h?E[t]:t;return y=b.length,c?b=function(t,e){for(var n=t.length,r=Gn(e.length,n),i=oo(t);r--;){var a=e[r];t[r]=Go(a,n)?i[a]:o}return t}(b,c):g&&y>1&&b.reverse(),p&&l<y&&(b.length=l),this&&this!==ze&&this instanceof m&&(A=_||ho(A)),A.apply(E,b)}}function yo(t,e){return function(n,r){return i=n,o=t,a=e(r),s={},Yr(i,function(t,e,n){o(s,a(t),e,n)}),s;var i,o,a,s}}function _o(t,e){return function(n,r){var i;if(n===o&&r===o)return e;if(n!==o&&(i=n),r!==o){if(i===o)return r;"string"==typeof n||"string"==typeof r?(n=Fi(n),r=Fi(r)):(n=Mi(n),r=Mi(r)),i=t(n,r)}return i}}function bo(t){return jo(function(e){return e=hn(e,In(Fo())),Ai(function(n){var r=this;return t(e,function(t){return an(t,r,n)})})})}function wo(t,e){var n=(e=e===o?" ":Fi(e)).length;if(n<2)return n?Ei(e,t):e;var r=Ei(e,Ue(t/Un(e)));return Fn(e)?Xi(zn(r),0,t).join(""):r.slice(0,t)}function xo(t){return function(e,n,i){return i&&"number"!=typeof i&&Yo(e,n,i)&&(n=i=o),e=Us(e),n===o?(n=e,e=0):n=Us(n),function(t,e,n,i){for(var o=-1,a=Qn(Ue((e-t)/(n||1)),0),s=r(a);a--;)s[i?a:++o]=t,t+=n;return s}(e,n,i=i===o?e<n?1:-1:Us(i),t)}}function Co(t){return function(e,n){return"string"==typeof e&&"string"==typeof n||(e=Ks(e),n=Ks(n)),t(e,n)}}function To(t,e,n,r,i,a,s,u,c,l){var f=e&b;e|=f?x:C,(e&=~(f?C:x))&_||(e&=~(m|y));var p=[t,e,i,f?a:o,f?s:o,f?o:a,f?o:s,u,c,l],d=n.apply(o,p);return Jo(t)&&oa(d,p),d.placeholder=r,ua(d,t,e)}function Eo(t){var e=ne[t];return function(t,n){if(t=Ks(t),n=null==n?0:Gn(zs(n),292)){var r=(Gs(t)+"e").split("e");return+((r=(Gs(e(r[0]+"e"+(+r[1]+n)))+"e").split("e"))[0]+"e"+(+r[1]-n))}return e(t)}}var Ao=rr&&1/qn(new rr([,-0]))[1]==j?function(t){return new rr(t)}:Fu;function So(t){return function(e){var n,r,i,o,a=zo(e);return a==Y?Hn(e):a==rt?(n=e,r=-1,i=Array(n.size),n.forEach(function(t){i[++r]=[t,t]}),i):(o=e,hn(t(e),function(t){return[t,o[t]]}))}}function ko(t,e,n,i,a,s,c,l){var p=e&y;if(!p&&"function"!=typeof t)throw new ae(u);var d=i?i.length:0;if(d||(e&=~(x|C),i=a=o),c=c===o?c:Qn(zs(c),0),l=l===o?l:zs(l),d-=a?a.length:0,e&C){var h=i,v=a;i=a=o}var g,A,S,k,O,D,I,N,j,L,$,R,P,M=p?o:Ro(t),F=[t,e,n,i,a,h,v,s,c,l];if(M&&function(t,e){var n=t[1],r=e[1],i=n|r,o=i<(m|y|T),a=r==T&&n==b||r==T&&n==E&&t[7].length<=e[8]||r==(T|E)&&e[7].length<=e[8]&&n==b;if(!o&&!a)return t;r&m&&(t[2]=e[2],i|=n&m?0:_);var s=e[3];if(s){var u=t[3];t[3]=u?ro(u,s,e[4]):s,t[4]=u?Wn(t[3],f):e[4]}(s=e[5])&&(u=t[5],t[5]=u?io(u,s,e[6]):s,t[6]=u?Wn(t[5],f):e[6]),(s=e[7])&&(t[7]=s),r&T&&(t[8]=null==t[8]?e[8]:Gn(t[8],e[8])),null==t[9]&&(t[9]=e[9]),t[0]=e[0],t[1]=i}(F,M),t=F[0],e=F[1],n=F[2],i=F[3],a=F[4],!(l=F[9]=F[9]===o?p?0:t.length:Qn(F[9]-d,0))&&e&(b|w)&&(e&=~(b|w)),e&&e!=m)e==b||e==w?(I=e,N=l,j=ho(D=t),H=function t(){for(var e=arguments.length,n=r(e),i=e,a=Mo(t);i--;)n[i]=arguments[i];var s=e<3&&n[0]!==a&&n[e-1]!==a?[]:Wn(n,a);return(e-=s.length)<N?To(D,I,mo,t.placeholder,o,n,s,o,o,N-e):an(this&&this!==ze&&this instanceof t?j:D,this,n)}):e!=x&&e!=(m|x)||a.length?H=mo.apply(o,F):(A=n,S=i,k=e&m,O=ho(g=t),H=function t(){for(var e=-1,n=arguments.length,i=-1,o=S.length,a=r(o+n),s=this&&this!==ze&&this instanceof t?O:g;++i<o;)a[i]=S[i];for(;n--;)a[i++]=arguments[++e];return an(s,k?A:this,a)});else var H=($=n,R=e&m,P=ho(L=t),function t(){return(this&&this!==ze&&this instanceof t?P:L).apply(R?$:this,arguments)});return ua((M?Di:oa)(H,F),t,e)}function Oo(t,e,n,r){return t===o||ms(t,ce[n])&&!pe.call(r,n)?e:t}function Do(t,e,n,r,i,a){return Is(t)&&Is(e)&&(a.set(e,t),yi(t,e,o,Do,a),a.delete(e)),t}function Io(t){return $s(t)?o:t}function No(t,e,n,r,i,a){var s=n&v,u=t.length,c=e.length;if(u!=c&&!(s&&c>u))return!1;var l=a.get(t);if(l&&a.get(e))return l==e;var f=-1,p=!0,d=n&g?new Tr:o;for(a.set(t,e),a.set(e,t);++f<u;){var h=t[f],m=e[f];if(r)var y=s?r(m,h,f,e,t,a):r(h,m,f,t,e,a);if(y!==o){if(y)continue;p=!1;break}if(d){if(!yn(e,function(t,e){if(!jn(d,e)&&(h===t||i(h,t,n,r,a)))return d.push(e)})){p=!1;break}}else if(h!==m&&!i(h,m,n,r,a)){p=!1;break}}return a.delete(t),a.delete(e),p}function jo(t){return sa(ra(t,o,xa),t+"")}function Lo(t){return ti(t,uu,qo)}function $o(t){return ti(t,cu,Uo)}var Ro=ar?function(t){return ar.get(t)}:Fu;function Po(t){for(var e=t.name+"",n=sr[e],r=pe.call(sr,e)?n.length:0;r--;){var i=n[r],o=i.func;if(null==o||o==t)return i.name}return e}function Mo(t){return(pe.call(gr,"placeholder")?gr:t).placeholder}function Fo(){var t=gr.iteratee||$u;return t=t===$u?fi:t,arguments.length?t(arguments[0],arguments[1]):t}function Ho(t,e){var n,r,i=t.__data__;return("string"==(r=typeof(n=e))||"number"==r||"symbol"==r||"boolean"==r?"__proto__"!==n:null===n)?i["string"==typeof e?"string":"hash"]:i.map}function Bo(t){for(var e=uu(t),n=e.length;n--;){var r=e[n],i=t[r];e[n]=[r,i,ea(i)]}return e}function Wo(t,e){var n,r=null==(n=t)?o:n[e];return li(r)?r:o}var qo=Ke?function(t){return null==t?[]:(t=re(t),fn(Ke(t),function(e){return Ee.call(t,e)}))}:Vu,Uo=Ke?function(t){for(var e=[];t;)vn(e,qo(t)),t=Ce(t);return e}:Vu,zo=ei;function Vo(t,e,n){for(var r=-1,i=(e=Gi(e,t)).length,o=!1;++r<i;){var a=ha(e[r]);if(!(o=null!=t&&n(t,a)))break;t=t[a]}return o||++r!=i?o:!!(i=null==t?0:t.length)&&Ds(i)&&Go(a,i)&&(ws(t)||bs(t))}function Ko(t){return"function"!=typeof t.constructor||ta(t)?{}:mr(Ce(t))}function Qo(t){return ws(t)||bs(t)||!!(Se&&t&&t[Se])}function Go(t,e){return!!(e=null==e?L:e)&&("number"==typeof t||Yt.test(t))&&t>-1&&t%1==0&&t<e}function Yo(t,e,n){if(!Is(n))return!1;var r=typeof e;return!!("number"==r?Cs(n)&&Go(e,n.length):"string"==r&&e in n)&&ms(n[e],t)}function Xo(t,e){if(ws(t))return!1;var n=typeof t;return!("number"!=n&&"symbol"!=n&&"boolean"!=n&&null!=t&&!Fs(t))||It.test(t)||!Dt.test(t)||null!=e&&t in re(e)}function Jo(t){var e=Po(t),n=gr[e];if("function"!=typeof n||!(e in br.prototype))return!1;if(t===n)return!0;var r=Ro(n);return!!r&&t===r[0]}(tr&&zo(new tr(new ArrayBuffer(1)))!=lt||er&&zo(new er)!=Y||nr&&zo(nr.resolve())!=tt||rr&&zo(new rr)!=rt||ir&&zo(new ir)!=st)&&(zo=function(t){var e=ei(t),n=e==Z?t.constructor:o,r=n?va(n):"";if(r)switch(r){case ur:return lt;case cr:return Y;case lr:return tt;case fr:return rt;case pr:return st}return e});var Zo=le?ks:Ku;function ta(t){var e=t&&t.constructor;return t===("function"==typeof e&&e.prototype||ce)}function ea(t){return t==t&&!Is(t)}function na(t,e){return function(n){return null!=n&&n[t]===e&&(e!==o||t in re(n))}}function ra(t,e,n){return e=Qn(e===o?t.length-1:e,0),function(){for(var i=arguments,o=-1,a=Qn(i.length-e,0),s=r(a);++o<a;)s[o]=i[e+o];o=-1;for(var u=r(e+1);++o<e;)u[o]=i[o];return u[e]=n(s),an(t,this,u)}}function ia(t,e){return e.length<2?t:Zr(t,ji(e,0,-1))}var oa=ca(Di),aa=qe||function(t,e){return ze.setTimeout(t,e)},sa=ca(Ii);function ua(t,e,n){var r,i,o,a=e+"";return sa(t,function(t,e){var n=e.length;if(!n)return t;var r=n-1;return e[r]=(n>1?"& ":"")+e[r],e=e.join(n>2?", ":" "),t.replace(Ft,"{\n/* [wrapped with "+e+"] */\n")}(a,(o=a.match(Ht),r=o?o[1].split(Bt):[],i=n,un(H,function(t){var e="_."+t[0];i&t[1]&&!pn(r,e)&&r.push(e)}),r.sort())))}function ca(t){var e=0,n=0;return function(){var r=Yn(),i=D-(r-n);if(n=r,i>0){if(++e>=O)return arguments[0]}else e=0;return t.apply(o,arguments)}}function la(t,e){var n=-1,r=t.length,i=r-1;for(e=e===o?r:e;++n<e;){var a=Ti(n,i),s=t[a];t[a]=t[n],t[n]=s}return t.length=e,t}var fa,pa,da=(fa=fs(function(t){var e=[];return Nt.test(t)&&e.push(""),t.replace(jt,function(t,n,r,i){e.push(r?i.replace(qt,"$1"):n||t)}),e},function(t){return pa.size===l&&pa.clear(),t}),pa=fa.cache,fa);function ha(t){if("string"==typeof t||Fs(t))return t;var e=t+"";return"0"==e&&1/t==-j?"-0":e}function va(t){if(null!=t){try{return fe.call(t)}catch(t){}try{return t+""}catch(t){}}return""}function ga(t){if(t instanceof br)return t.clone();var e=new _r(t.__wrapped__,t.__chain__);return e.__actions__=oo(t.__actions__),e.__index__=t.__index__,e.__values__=t.__values__,e}var ma=Ai(function(t,e){return Ts(t)?Br(t,Kr(e,1,Ts,!0)):[]}),ya=Ai(function(t,e){var n=Sa(e);return Ts(n)&&(n=o),Ts(t)?Br(t,Kr(e,1,Ts,!0),Fo(n,2)):[]}),_a=Ai(function(t,e){var n=Sa(e);return Ts(n)&&(n=o),Ts(t)?Br(t,Kr(e,1,Ts,!0),o,n):[]});function ba(t,e,n){var r=null==t?0:t.length;if(!r)return-1;var i=null==n?0:zs(n);return i<0&&(i=Qn(r+i,0)),wn(t,Fo(e,3),i)}function wa(t,e,n){var r=null==t?0:t.length;if(!r)return-1;var i=r-1;return n!==o&&(i=zs(n),i=n<0?Qn(r+i,0):Gn(i,r-1)),wn(t,Fo(e,3),i,!0)}function xa(t){return null!=t&&t.length?Kr(t,1):[]}function Ca(t){return t&&t.length?t[0]:o}var Ta=Ai(function(t){var e=hn(t,Ki);return e.length&&e[0]===t[0]?oi(e):[]}),Ea=Ai(function(t){var e=Sa(t),n=hn(t,Ki);return e===Sa(n)?e=o:n.pop(),n.length&&n[0]===t[0]?oi(n,Fo(e,2)):[]}),Aa=Ai(function(t){var e=Sa(t),n=hn(t,Ki);return(e="function"==typeof e?e:o)&&n.pop(),n.length&&n[0]===t[0]?oi(n,o,e):[]});function Sa(t){var e=null==t?0:t.length;return e?t[e-1]:o}var ka=Ai(Oa);function Oa(t,e){return t&&t.length&&e&&e.length?xi(t,e):t}var Da=jo(function(t,e){var n=null==t?0:t.length,r=Rr(t,e);return Ci(t,hn(e,function(t){return Go(t,n)?+t:t}).sort(no)),r});function Ia(t){return null==t?t:Zn.call(t)}var Na=Ai(function(t){return Hi(Kr(t,1,Ts,!0))}),ja=Ai(function(t){var e=Sa(t);return Ts(e)&&(e=o),Hi(Kr(t,1,Ts,!0),Fo(e,2))}),La=Ai(function(t){var e=Sa(t);return e="function"==typeof e?e:o,Hi(Kr(t,1,Ts,!0),o,e)});function $a(t){if(!t||!t.length)return[];var e=0;return t=fn(t,function(t){if(Ts(t))return e=Qn(t.length,e),!0}),Dn(e,function(e){return hn(t,An(e))})}function Ra(t,e){if(!t||!t.length)return[];var n=$a(t);return null==e?n:hn(n,function(t){return an(e,o,t)})}var Pa=Ai(function(t,e){return Ts(t)?Br(t,e):[]}),Ma=Ai(function(t){return zi(fn(t,Ts))}),Fa=Ai(function(t){var e=Sa(t);return Ts(e)&&(e=o),zi(fn(t,Ts),Fo(e,2))}),Ha=Ai(function(t){var e=Sa(t);return e="function"==typeof e?e:o,zi(fn(t,Ts),o,e)}),Ba=Ai($a);var Wa=Ai(function(t){var e=t.length,n=e>1?t[e-1]:o;return Ra(t,n="function"==typeof n?(t.pop(),n):o)});function qa(t){var e=gr(t);return e.__chain__=!0,e}function Ua(t,e){return e(t)}var za=jo(function(t){var e=t.length,n=e?t[0]:0,r=this.__wrapped__,i=function(e){return Rr(e,t)};return!(e>1||this.__actions__.length)&&r instanceof br&&Go(n)?((r=r.slice(n,+n+(e?1:0))).__actions__.push({func:Ua,args:[i],thisArg:o}),new _r(r,this.__chain__).thru(function(t){return e&&!t.length&&t.push(o),t})):this.thru(i)});var Va=so(function(t,e,n){pe.call(t,n)?++t[n]:$r(t,n,1)});var Ka=vo(ba),Qa=vo(wa);function Ga(t,e){return(ws(t)?un:Wr)(t,Fo(e,3))}function Ya(t,e){return(ws(t)?cn:qr)(t,Fo(e,3))}var Xa=so(function(t,e,n){pe.call(t,n)?t[n].push(e):$r(t,n,[e])});var Ja=Ai(function(t,e,n){var i=-1,o="function"==typeof e,a=Cs(t)?r(t.length):[];return Wr(t,function(t){a[++i]=o?an(e,t,n):ai(t,e,n)}),a}),Za=so(function(t,e,n){$r(t,n,e)});function ts(t,e){return(ws(t)?hn:vi)(t,Fo(e,3))}var es=so(function(t,e,n){t[n?0:1].push(e)},function(){return[[],[]]});var ns=Ai(function(t,e){if(null==t)return[];var n=e.length;return n>1&&Yo(t,e[0],e[1])?e=[]:n>2&&Yo(e[0],e[1],e[2])&&(e=[e[0]]),bi(t,Kr(e,1),[])}),rs=He||function(){return ze.Date.now()};function is(t,e,n){return e=n?o:e,e=t&&null==e?t.length:e,ko(t,T,o,o,o,o,e)}function os(t,e){var n;if("function"!=typeof e)throw new ae(u);return t=zs(t),function(){return--t>0&&(n=e.apply(this,arguments)),t<=1&&(e=o),n}}var as=Ai(function(t,e,n){var r=m;if(n.length){var i=Wn(n,Mo(as));r|=x}return ko(t,r,e,n,i)}),ss=Ai(function(t,e,n){var r=m|y;if(n.length){var i=Wn(n,Mo(ss));r|=x}return ko(e,r,t,n,i)});function us(t,e,n){var r,i,a,s,c,l,f=0,p=!1,d=!1,h=!0;if("function"!=typeof t)throw new ae(u);function v(e){var n=r,a=i;return r=i=o,f=e,s=t.apply(a,n)}function g(t){var n=t-l;return l===o||n>=e||n<0||d&&t-f>=a}function m(){var t,n,r=rs();if(g(r))return y(r);c=aa(m,(n=e-((t=r)-l),d?Gn(n,a-(t-f)):n))}function y(t){return c=o,h&&r?v(t):(r=i=o,s)}function _(){var t,n=rs(),a=g(n);if(r=arguments,i=this,l=n,a){if(c===o)return f=t=l,c=aa(m,e),p?v(t):s;if(d)return c=aa(m,e),v(l)}return c===o&&(c=aa(m,e)),s}return e=Ks(e)||0,Is(n)&&(p=!!n.leading,a=(d="maxWait"in n)?Qn(Ks(n.maxWait)||0,e):a,h="trailing"in n?!!n.trailing:h),_.cancel=function(){c!==o&&Ji(c),f=0,r=l=i=c=o},_.flush=function(){return c===o?s:y(rs())},_}var cs=Ai(function(t,e){return Hr(t,1,e)}),ls=Ai(function(t,e,n){return Hr(t,Ks(e)||0,n)});function fs(t,e){if("function"!=typeof t||null!=e&&"function"!=typeof e)throw new ae(u);var n=function(){var r=arguments,i=e?e.apply(this,r):r[0],o=n.cache;if(o.has(i))return o.get(i);var a=t.apply(this,r);return n.cache=o.set(i,a)||o,a};return n.cache=new(fs.Cache||Cr),n}function ps(t){if("function"!=typeof t)throw new ae(u);return function(){var e=arguments;switch(e.length){case 0:return!t.call(this);case 1:return!t.call(this,e[0]);case 2:return!t.call(this,e[0],e[1]);case 3:return!t.call(this,e[0],e[1],e[2])}return!t.apply(this,e)}}fs.Cache=Cr;var ds=Yi(function(t,e){var n=(e=1==e.length&&ws(e[0])?hn(e[0],In(Fo())):hn(Kr(e,1),In(Fo()))).length;return Ai(function(r){for(var i=-1,o=Gn(r.length,n);++i<o;)r[i]=e[i].call(this,r[i]);return an(t,this,r)})}),hs=Ai(function(t,e){var n=Wn(e,Mo(hs));return ko(t,x,o,e,n)}),vs=Ai(function(t,e){var n=Wn(e,Mo(vs));return ko(t,C,o,e,n)}),gs=jo(function(t,e){return ko(t,E,o,o,o,e)});function ms(t,e){return t===e||t!=t&&e!=e}var ys=Co(ni),_s=Co(function(t,e){return t>=e}),bs=si(function(){return arguments}())?si:function(t){return Ns(t)&&pe.call(t,"callee")&&!Ee.call(t,"callee")},ws=r.isArray,xs=Xe?In(Xe):function(t){return Ns(t)&&ei(t)==ct};function Cs(t){return null!=t&&Ds(t.length)&&!ks(t)}function Ts(t){return Ns(t)&&Cs(t)}var Es=Ge||Ku,As=Je?In(Je):function(t){return Ns(t)&&ei(t)==z};function Ss(t){if(!Ns(t))return!1;var e=ei(t);return e==K||e==V||"string"==typeof t.message&&"string"==typeof t.name&&!$s(t)}function ks(t){if(!Is(t))return!1;var e=ei(t);return e==Q||e==G||e==q||e==et}function Os(t){return"number"==typeof t&&t==zs(t)}function Ds(t){return"number"==typeof t&&t>-1&&t%1==0&&t<=L}function Is(t){var e=typeof t;return null!=t&&("object"==e||"function"==e)}function Ns(t){return null!=t&&"object"==typeof t}var js=Ze?In(Ze):function(t){return Ns(t)&&zo(t)==Y};function Ls(t){return"number"==typeof t||Ns(t)&&ei(t)==X}function $s(t){if(!Ns(t)||ei(t)!=Z)return!1;var e=Ce(t);if(null===e)return!0;var n=pe.call(e,"constructor")&&e.constructor;return"function"==typeof n&&n instanceof n&&fe.call(n)==ge}var Rs=tn?In(tn):function(t){return Ns(t)&&ei(t)==nt};var Ps=en?In(en):function(t){return Ns(t)&&zo(t)==rt};function Ms(t){return"string"==typeof t||!ws(t)&&Ns(t)&&ei(t)==it}function Fs(t){return"symbol"==typeof t||Ns(t)&&ei(t)==ot}var Hs=nn?In(nn):function(t){return Ns(t)&&Ds(t.length)&&!!Me[ei(t)]};var Bs=Co(hi),Ws=Co(function(t,e){return t<=e});function qs(t){if(!t)return[];if(Cs(t))return Ms(t)?zn(t):oo(t);if(ke&&t[ke])return function(t){for(var e,n=[];!(e=t.next()).done;)n.push(e.value);return n}(t[ke]());var e=zo(t);return(e==Y?Hn:e==rt?qn:mu)(t)}function Us(t){return t?(t=Ks(t))===j||t===-j?(t<0?-1:1)*$:t==t?t:0:0===t?t:0}function zs(t){var e=Us(t),n=e%1;return e==e?n?e-n:e:0}function Vs(t){return t?Pr(zs(t),0,P):0}function Ks(t){if("number"==typeof t)return t;if(Fs(t))return R;if(Is(t)){var e="function"==typeof t.valueOf?t.valueOf():t;t=Is(e)?e+"":e}if("string"!=typeof t)return 0===t?t:+t;t=t.replace(Rt,"");var n=Kt.test(t);return n||Gt.test(t)?We(t.slice(2),n?2:8):Vt.test(t)?R:+t}function Qs(t){return ao(t,cu(t))}function Gs(t){return null==t?"":Fi(t)}var Ys=uo(function(t,e){if(ta(e)||Cs(e))ao(e,uu(e),t);else for(var n in e)pe.call(e,n)&&Ir(t,n,e[n])}),Xs=uo(function(t,e){ao(e,cu(e),t)}),Js=uo(function(t,e,n,r){ao(e,cu(e),t,r)}),Zs=uo(function(t,e,n,r){ao(e,uu(e),t,r)}),tu=jo(Rr);var eu=Ai(function(t){return t.push(o,Oo),an(Js,o,t)}),nu=Ai(function(t){return t.push(o,Do),an(fu,o,t)});function ru(t,e,n){var r=null==t?o:Zr(t,e);return r===o?n:r}function iu(t,e){return null!=t&&Vo(t,e,ii)}var ou=yo(function(t,e,n){t[e]=n},Iu(Lu)),au=yo(function(t,e,n){pe.call(t,e)?t[e].push(n):t[e]=[n]},Fo),su=Ai(ai);function uu(t){return Cs(t)?Ar(t):pi(t)}function cu(t){return Cs(t)?Ar(t,!0):di(t)}var lu=uo(function(t,e,n){yi(t,e,n)}),fu=uo(function(t,e,n,r){yi(t,e,n,r)}),pu=jo(function(t,e){var n={};if(null==t)return n;var r=!1;e=hn(e,function(e){return e=Gi(e,t),r||(r=e.length>1),e}),ao(t,$o(t),n),r&&(n=Mr(n,p|d|h,Io));for(var i=e.length;i--;)Bi(n,e[i]);return n});var du=jo(function(t,e){return null==t?{}:wi(n=t,e,function(t,e){return iu(n,e)});var n});function hu(t,e){if(null==t)return{};var n=hn($o(t),function(t){return[t]});return e=Fo(e),wi(t,n,function(t,n){return e(t,n[0])})}var vu=So(uu),gu=So(cu);function mu(t){return null==t?[]:Nn(t,uu(t))}var yu=po(function(t,e,n){return e=e.toLowerCase(),t+(n?_u(e):e)});function _u(t){return Su(Gs(t).toLowerCase())}function bu(t){return(t=Gs(t))&&t.replace(Xt,Rn).replace(Ie,"")}var wu=po(function(t,e,n){return t+(n?"-":"")+e.toLowerCase()}),xu=po(function(t,e,n){return t+(n?" ":"")+e.toLowerCase()}),Cu=fo("toLowerCase");var Tu=po(function(t,e,n){return t+(n?"_":"")+e.toLowerCase()});var Eu=po(function(t,e,n){return t+(n?" ":"")+Su(e)});var Au=po(function(t,e,n){return t+(n?" ":"")+e.toUpperCase()}),Su=fo("toUpperCase");function ku(t,e,n){return t=Gs(t),(e=n?o:e)===o?(r=t,$e.test(r)?t.match(je)||[]:t.match(Wt)||[]):t.match(e)||[];var r}var Ou=Ai(function(t,e){try{return an(t,o,e)}catch(t){return Ss(t)?t:new te(t)}}),Du=jo(function(t,e){return un(e,function(e){e=ha(e),$r(t,e,as(t[e],t))}),t});function Iu(t){return function(){return t}}var Nu=go(),ju=go(!0);function Lu(t){return t}function $u(t){return fi("function"==typeof t?t:Mr(t,p))}var Ru=Ai(function(t,e){return function(n){return ai(n,t,e)}}),Pu=Ai(function(t,e){return function(n){return ai(t,n,e)}});function Mu(t,e,n){var r=uu(e),i=Jr(e,r);null!=n||Is(e)&&(i.length||!r.length)||(n=e,e=t,t=this,i=Jr(e,uu(e)));var o=!(Is(n)&&"chain"in n&&!n.chain),a=ks(t);return un(i,function(n){var r=e[n];t[n]=r,a&&(t.prototype[n]=function(){var e=this.__chain__;if(o||e){var n=t(this.__wrapped__);return(n.__actions__=oo(this.__actions__)).push({func:r,args:arguments,thisArg:t}),n.__chain__=e,n}return r.apply(t,vn([this.value()],arguments))})}),t}function Fu(){}var Hu=bo(hn),Bu=bo(ln),Wu=bo(yn);function qu(t){return Xo(t)?An(ha(t)):(e=t,function(t){return Zr(t,e)});var e}var Uu=xo(),zu=xo(!0);function Vu(){return[]}function Ku(){return!1}var Qu=_o(function(t,e){return t+e},0),Gu=Eo("ceil"),Yu=_o(function(t,e){return t/e},1),Xu=Eo("floor");var Ju,Zu=_o(function(t,e){return t*e},1),tc=Eo("round"),ec=_o(function(t,e){return t-e},0);return gr.after=function(t,e){if("function"!=typeof e)throw new ae(u);return t=zs(t),function(){if(--t<1)return e.apply(this,arguments)}},gr.ary=is,gr.assign=Ys,gr.assignIn=Xs,gr.assignInWith=Js,gr.assignWith=Zs,gr.at=tu,gr.before=os,gr.bind=as,gr.bindAll=Du,gr.bindKey=ss,gr.castArray=function(){if(!arguments.length)return[];var t=arguments[0];return ws(t)?t:[t]},gr.chain=qa,gr.chunk=function(t,e,n){e=(n?Yo(t,e,n):e===o)?1:Qn(zs(e),0);var i=null==t?0:t.length;if(!i||e<1)return[];for(var a=0,s=0,u=r(Ue(i/e));a<i;)u[s++]=ji(t,a,a+=e);return u},gr.compact=function(t){for(var e=-1,n=null==t?0:t.length,r=0,i=[];++e<n;){var o=t[e];o&&(i[r++]=o)}return i},gr.concat=function(){var t=arguments.length;if(!t)return[];for(var e=r(t-1),n=arguments[0],i=t;i--;)e[i-1]=arguments[i];return vn(ws(n)?oo(n):[n],Kr(e,1))},gr.cond=function(t){var e=null==t?0:t.length,n=Fo();return t=e?hn(t,function(t){if("function"!=typeof t[1])throw new ae(u);return[n(t[0]),t[1]]}):[],Ai(function(n){for(var r=-1;++r<e;){var i=t[r];if(an(i[0],this,n))return an(i[1],this,n)}})},gr.conforms=function(t){return e=Mr(t,p),n=uu(e),function(t){return Fr(t,e,n)};var e,n},gr.constant=Iu,gr.countBy=Va,gr.create=function(t,e){var n=mr(t);return null==e?n:Lr(n,e)},gr.curry=function t(e,n,r){var i=ko(e,b,o,o,o,o,o,n=r?o:n);return i.placeholder=t.placeholder,i},gr.curryRight=function t(e,n,r){var i=ko(e,w,o,o,o,o,o,n=r?o:n);return i.placeholder=t.placeholder,i},gr.debounce=us,gr.defaults=eu,gr.defaultsDeep=nu,gr.defer=cs,gr.delay=ls,gr.difference=ma,gr.differenceBy=ya,gr.differenceWith=_a,gr.drop=function(t,e,n){var r=null==t?0:t.length;return r?ji(t,(e=n||e===o?1:zs(e))<0?0:e,r):[]},gr.dropRight=function(t,e,n){var r=null==t?0:t.length;return r?ji(t,0,(e=r-(e=n||e===o?1:zs(e)))<0?0:e):[]},gr.dropRightWhile=function(t,e){return t&&t.length?qi(t,Fo(e,3),!0,!0):[]},gr.dropWhile=function(t,e){return t&&t.length?qi(t,Fo(e,3),!0):[]},gr.fill=function(t,e,n,r){var i=null==t?0:t.length;return i?(n&&"number"!=typeof n&&Yo(t,e,n)&&(n=0,r=i),function(t,e,n,r){var i=t.length;for((n=zs(n))<0&&(n=-n>i?0:i+n),(r=r===o||r>i?i:zs(r))<0&&(r+=i),r=n>r?0:Vs(r);n<r;)t[n++]=e;return t}(t,e,n,r)):[]},gr.filter=function(t,e){return(ws(t)?fn:Vr)(t,Fo(e,3))},gr.flatMap=function(t,e){return Kr(ts(t,e),1)},gr.flatMapDeep=function(t,e){return Kr(ts(t,e),j)},gr.flatMapDepth=function(t,e,n){return n=n===o?1:zs(n),Kr(ts(t,e),n)},gr.flatten=xa,gr.flattenDeep=function(t){return null!=t&&t.length?Kr(t,j):[]},gr.flattenDepth=function(t,e){return null!=t&&t.length?Kr(t,e=e===o?1:zs(e)):[]},gr.flip=function(t){return ko(t,A)},gr.flow=Nu,gr.flowRight=ju,gr.fromPairs=function(t){for(var e=-1,n=null==t?0:t.length,r={};++e<n;){var i=t[e];r[i[0]]=i[1]}return r},gr.functions=function(t){return null==t?[]:Jr(t,uu(t))},gr.functionsIn=function(t){return null==t?[]:Jr(t,cu(t))},gr.groupBy=Xa,gr.initial=function(t){return null!=t&&t.length?ji(t,0,-1):[]},gr.intersection=Ta,gr.intersectionBy=Ea,gr.intersectionWith=Aa,gr.invert=ou,gr.invertBy=au,gr.invokeMap=Ja,gr.iteratee=$u,gr.keyBy=Za,gr.keys=uu,gr.keysIn=cu,gr.map=ts,gr.mapKeys=function(t,e){var n={};return e=Fo(e,3),Yr(t,function(t,r,i){$r(n,e(t,r,i),t)}),n},gr.mapValues=function(t,e){var n={};return e=Fo(e,3),Yr(t,function(t,r,i){$r(n,r,e(t,r,i))}),n},gr.matches=function(t){return gi(Mr(t,p))},gr.matchesProperty=function(t,e){return mi(t,Mr(e,p))},gr.memoize=fs,gr.merge=lu,gr.mergeWith=fu,gr.method=Ru,gr.methodOf=Pu,gr.mixin=Mu,gr.negate=ps,gr.nthArg=function(t){return t=zs(t),Ai(function(e){return _i(e,t)})},gr.omit=pu,gr.omitBy=function(t,e){return hu(t,ps(Fo(e)))},gr.once=function(t){return os(2,t)},gr.orderBy=function(t,e,n,r){return null==t?[]:(ws(e)||(e=null==e?[]:[e]),ws(n=r?o:n)||(n=null==n?[]:[n]),bi(t,e,n))},gr.over=Hu,gr.overArgs=ds,gr.overEvery=Bu,gr.overSome=Wu,gr.partial=hs,gr.partialRight=vs,gr.partition=es,gr.pick=du,gr.pickBy=hu,gr.property=qu,gr.propertyOf=function(t){return function(e){return null==t?o:Zr(t,e)}},gr.pull=ka,gr.pullAll=Oa,gr.pullAllBy=function(t,e,n){return t&&t.length&&e&&e.length?xi(t,e,Fo(n,2)):t},gr.pullAllWith=function(t,e,n){return t&&t.length&&e&&e.length?xi(t,e,o,n):t},gr.pullAt=Da,gr.range=Uu,gr.rangeRight=zu,gr.rearg=gs,gr.reject=function(t,e){return(ws(t)?fn:Vr)(t,ps(Fo(e,3)))},gr.remove=function(t,e){var n=[];if(!t||!t.length)return n;var r=-1,i=[],o=t.length;for(e=Fo(e,3);++r<o;){var a=t[r];e(a,r,t)&&(n.push(a),i.push(r))}return Ci(t,i),n},gr.rest=function(t,e){if("function"!=typeof t)throw new ae(u);return Ai(t,e=e===o?e:zs(e))},gr.reverse=Ia,gr.sampleSize=function(t,e,n){return e=(n?Yo(t,e,n):e===o)?1:zs(e),(ws(t)?kr:ki)(t,e)},gr.set=function(t,e,n){return null==t?t:Oi(t,e,n)},gr.setWith=function(t,e,n,r){return r="function"==typeof r?r:o,null==t?t:Oi(t,e,n,r)},gr.shuffle=function(t){return(ws(t)?Or:Ni)(t)},gr.slice=function(t,e,n){var r=null==t?0:t.length;return r?(n&&"number"!=typeof n&&Yo(t,e,n)?(e=0,n=r):(e=null==e?0:zs(e),n=n===o?r:zs(n)),ji(t,e,n)):[]},gr.sortBy=ns,gr.sortedUniq=function(t){return t&&t.length?Pi(t):[]},gr.sortedUniqBy=function(t,e){return t&&t.length?Pi(t,Fo(e,2)):[]},gr.split=function(t,e,n){return n&&"number"!=typeof n&&Yo(t,e,n)&&(e=n=o),(n=n===o?P:n>>>0)?(t=Gs(t))&&("string"==typeof e||null!=e&&!Rs(e))&&!(e=Fi(e))&&Fn(t)?Xi(zn(t),0,n):t.split(e,n):[]},gr.spread=function(t,e){if("function"!=typeof t)throw new ae(u);return e=null==e?0:Qn(zs(e),0),Ai(function(n){var r=n[e],i=Xi(n,0,e);return r&&vn(i,r),an(t,this,i)})},gr.tail=function(t){var e=null==t?0:t.length;return e?ji(t,1,e):[]},gr.take=function(t,e,n){return t&&t.length?ji(t,0,(e=n||e===o?1:zs(e))<0?0:e):[]},gr.takeRight=function(t,e,n){var r=null==t?0:t.length;return r?ji(t,(e=r-(e=n||e===o?1:zs(e)))<0?0:e,r):[]},gr.takeRightWhile=function(t,e){return t&&t.length?qi(t,Fo(e,3),!1,!0):[]},gr.takeWhile=function(t,e){return t&&t.length?qi(t,Fo(e,3)):[]},gr.tap=function(t,e){return e(t),t},gr.throttle=function(t,e,n){var r=!0,i=!0;if("function"!=typeof t)throw new ae(u);return Is(n)&&(r="leading"in n?!!n.leading:r,i="trailing"in n?!!n.trailing:i),us(t,e,{leading:r,maxWait:e,trailing:i})},gr.thru=Ua,gr.toArray=qs,gr.toPairs=vu,gr.toPairsIn=gu,gr.toPath=function(t){return ws(t)?hn(t,ha):Fs(t)?[t]:oo(da(Gs(t)))},gr.toPlainObject=Qs,gr.transform=function(t,e,n){var r=ws(t),i=r||Es(t)||Hs(t);if(e=Fo(e,4),null==n){var o=t&&t.constructor;n=i?r?new o:[]:Is(t)&&ks(o)?mr(Ce(t)):{}}return(i?un:Yr)(t,function(t,r,i){return e(n,t,r,i)}),n},gr.unary=function(t){return is(t,1)},gr.union=Na,gr.unionBy=ja,gr.unionWith=La,gr.uniq=function(t){return t&&t.length?Hi(t):[]},gr.uniqBy=function(t,e){return t&&t.length?Hi(t,Fo(e,2)):[]},gr.uniqWith=function(t,e){return e="function"==typeof e?e:o,t&&t.length?Hi(t,o,e):[]},gr.unset=function(t,e){return null==t||Bi(t,e)},gr.unzip=$a,gr.unzipWith=Ra,gr.update=function(t,e,n){return null==t?t:Wi(t,e,Qi(n))},gr.updateWith=function(t,e,n,r){return r="function"==typeof r?r:o,null==t?t:Wi(t,e,Qi(n),r)},gr.values=mu,gr.valuesIn=function(t){return null==t?[]:Nn(t,cu(t))},gr.without=Pa,gr.words=ku,gr.wrap=function(t,e){return hs(Qi(e),t)},gr.xor=Ma,gr.xorBy=Fa,gr.xorWith=Ha,gr.zip=Ba,gr.zipObject=function(t,e){return Vi(t||[],e||[],Ir)},gr.zipObjectDeep=function(t,e){return Vi(t||[],e||[],Oi)},gr.zipWith=Wa,gr.entries=vu,gr.entriesIn=gu,gr.extend=Xs,gr.extendWith=Js,Mu(gr,gr),gr.add=Qu,gr.attempt=Ou,gr.camelCase=yu,gr.capitalize=_u,gr.ceil=Gu,gr.clamp=function(t,e,n){return n===o&&(n=e,e=o),n!==o&&(n=(n=Ks(n))==n?n:0),e!==o&&(e=(e=Ks(e))==e?e:0),Pr(Ks(t),e,n)},gr.clone=function(t){return Mr(t,h)},gr.cloneDeep=function(t){return Mr(t,p|h)},gr.cloneDeepWith=function(t,e){return Mr(t,p|h,e="function"==typeof e?e:o)},gr.cloneWith=function(t,e){return Mr(t,h,e="function"==typeof e?e:o)},gr.conformsTo=function(t,e){return null==e||Fr(t,e,uu(e))},gr.deburr=bu,gr.defaultTo=function(t,e){return null==t||t!=t?e:t},gr.divide=Yu,gr.endsWith=function(t,e,n){t=Gs(t),e=Fi(e);var r=t.length,i=n=n===o?r:Pr(zs(n),0,r);return(n-=e.length)>=0&&t.slice(n,i)==e},gr.eq=ms,gr.escape=function(t){return(t=Gs(t))&&At.test(t)?t.replace(Tt,Pn):t},gr.escapeRegExp=function(t){return(t=Gs(t))&&$t.test(t)?t.replace(Lt,"\\$&"):t},gr.every=function(t,e,n){var r=ws(t)?ln:Ur;return n&&Yo(t,e,n)&&(e=o),r(t,Fo(e,3))},gr.find=Ka,gr.findIndex=ba,gr.findKey=function(t,e){return bn(t,Fo(e,3),Yr)},gr.findLast=Qa,gr.findLastIndex=wa,gr.findLastKey=function(t,e){return bn(t,Fo(e,3),Xr)},gr.floor=Xu,gr.forEach=Ga,gr.forEachRight=Ya,gr.forIn=function(t,e){return null==t?t:Qr(t,Fo(e,3),cu)},gr.forInRight=function(t,e){return null==t?t:Gr(t,Fo(e,3),cu)},gr.forOwn=function(t,e){return t&&Yr(t,Fo(e,3))},gr.forOwnRight=function(t,e){return t&&Xr(t,Fo(e,3))},gr.get=ru,gr.gt=ys,gr.gte=_s,gr.has=function(t,e){return null!=t&&Vo(t,e,ri)},gr.hasIn=iu,gr.head=Ca,gr.identity=Lu,gr.includes=function(t,e,n,r){t=Cs(t)?t:mu(t),n=n&&!r?zs(n):0;var i=t.length;return n<0&&(n=Qn(i+n,0)),Ms(t)?n<=i&&t.indexOf(e,n)>-1:!!i&&xn(t,e,n)>-1},gr.indexOf=function(t,e,n){var r=null==t?0:t.length;if(!r)return-1;var i=null==n?0:zs(n);return i<0&&(i=Qn(r+i,0)),xn(t,e,i)},gr.inRange=function(t,e,n){return e=Us(e),n===o?(n=e,e=0):n=Us(n),t=Ks(t),(r=t)>=Gn(i=e,a=n)&&r<Qn(i,a);var r,i,a},gr.invoke=su,gr.isArguments=bs,gr.isArray=ws,gr.isArrayBuffer=xs,gr.isArrayLike=Cs,gr.isArrayLikeObject=Ts,gr.isBoolean=function(t){return!0===t||!1===t||Ns(t)&&ei(t)==U},gr.isBuffer=Es,gr.isDate=As,gr.isElement=function(t){return Ns(t)&&1===t.nodeType&&!$s(t)},gr.isEmpty=function(t){if(null==t)return!0;if(Cs(t)&&(ws(t)||"string"==typeof t||"function"==typeof t.splice||Es(t)||Hs(t)||bs(t)))return!t.length;var e=zo(t);if(e==Y||e==rt)return!t.size;if(ta(t))return!pi(t).length;for(var n in t)if(pe.call(t,n))return!1;return!0},gr.isEqual=function(t,e){return ui(t,e)},gr.isEqualWith=function(t,e,n){var r=(n="function"==typeof n?n:o)?n(t,e):o;return r===o?ui(t,e,o,n):!!r},gr.isError=Ss,gr.isFinite=function(t){return"number"==typeof t&&Ye(t)},gr.isFunction=ks,gr.isInteger=Os,gr.isLength=Ds,gr.isMap=js,gr.isMatch=function(t,e){return t===e||ci(t,e,Bo(e))},gr.isMatchWith=function(t,e,n){return n="function"==typeof n?n:o,ci(t,e,Bo(e),n)},gr.isNaN=function(t){return Ls(t)&&t!=+t},gr.isNative=function(t){if(Zo(t))throw new te(s);return li(t)},gr.isNil=function(t){return null==t},gr.isNull=function(t){return null===t},gr.isNumber=Ls,gr.isObject=Is,gr.isObjectLike=Ns,gr.isPlainObject=$s,gr.isRegExp=Rs,gr.isSafeInteger=function(t){return Os(t)&&t>=-L&&t<=L},gr.isSet=Ps,gr.isString=Ms,gr.isSymbol=Fs,gr.isTypedArray=Hs,gr.isUndefined=function(t){return t===o},gr.isWeakMap=function(t){return Ns(t)&&zo(t)==st},gr.isWeakSet=function(t){return Ns(t)&&ei(t)==ut},gr.join=function(t,e){return null==t?"":_n.call(t,e)},gr.kebabCase=wu,gr.last=Sa,gr.lastIndexOf=function(t,e,n){var r=null==t?0:t.length;if(!r)return-1;var i=r;return n!==o&&(i=(i=zs(n))<0?Qn(r+i,0):Gn(i,r-1)),e==e?function(t,e,n){for(var r=n+1;r--;)if(t[r]===e)return r;return r}(t,e,i):wn(t,Tn,i,!0)},gr.lowerCase=xu,gr.lowerFirst=Cu,gr.lt=Bs,gr.lte=Ws,gr.max=function(t){return t&&t.length?zr(t,Lu,ni):o},gr.maxBy=function(t,e){return t&&t.length?zr(t,Fo(e,2),ni):o},gr.mean=function(t){return En(t,Lu)},gr.meanBy=function(t,e){return En(t,Fo(e,2))},gr.min=function(t){return t&&t.length?zr(t,Lu,hi):o},gr.minBy=function(t,e){return t&&t.length?zr(t,Fo(e,2),hi):o},gr.stubArray=Vu,gr.stubFalse=Ku,gr.stubObject=function(){return{}},gr.stubString=function(){return""},gr.stubTrue=function(){return!0},gr.multiply=Zu,gr.nth=function(t,e){return t&&t.length?_i(t,zs(e)):o},gr.noConflict=function(){return ze._===this&&(ze._=me),this},gr.noop=Fu,gr.now=rs,gr.pad=function(t,e,n){t=Gs(t);var r=(e=zs(e))?Un(t):0;if(!e||r>=e)return t;var i=(e-r)/2;return wo(Ve(i),n)+t+wo(Ue(i),n)},gr.padEnd=function(t,e,n){t=Gs(t);var r=(e=zs(e))?Un(t):0;return e&&r<e?t+wo(e-r,n):t},gr.padStart=function(t,e,n){t=Gs(t);var r=(e=zs(e))?Un(t):0;return e&&r<e?wo(e-r,n)+t:t},gr.parseInt=function(t,e,n){return n||null==e?e=0:e&&(e=+e),Xn(Gs(t).replace(Pt,""),e||0)},gr.random=function(t,e,n){if(n&&"boolean"!=typeof n&&Yo(t,e,n)&&(e=n=o),n===o&&("boolean"==typeof e?(n=e,e=o):"boolean"==typeof t&&(n=t,t=o)),t===o&&e===o?(t=0,e=1):(t=Us(t),e===o?(e=t,t=0):e=Us(e)),t>e){var r=t;t=e,e=r}if(n||t%1||e%1){var i=Jn();return Gn(t+i*(e-t+Be("1e-"+((i+"").length-1))),e)}return Ti(t,e)},gr.reduce=function(t,e,n){var r=ws(t)?gn:kn,i=arguments.length<3;return r(t,Fo(e,4),n,i,Wr)},gr.reduceRight=function(t,e,n){var r=ws(t)?mn:kn,i=arguments.length<3;return r(t,Fo(e,4),n,i,qr)},gr.repeat=function(t,e,n){return e=(n?Yo(t,e,n):e===o)?1:zs(e),Ei(Gs(t),e)},gr.replace=function(){var t=arguments,e=Gs(t[0]);return t.length<3?e:e.replace(t[1],t[2])},gr.result=function(t,e,n){var r=-1,i=(e=Gi(e,t)).length;for(i||(i=1,t=o);++r<i;){var a=null==t?o:t[ha(e[r])];a===o&&(r=i,a=n),t=ks(a)?a.call(t):a}return t},gr.round=tc,gr.runInContext=t,gr.sample=function(t){return(ws(t)?Sr:Si)(t)},gr.size=function(t){if(null==t)return 0;if(Cs(t))return Ms(t)?Un(t):t.length;var e=zo(t);return e==Y||e==rt?t.size:pi(t).length},gr.snakeCase=Tu,gr.some=function(t,e,n){var r=ws(t)?yn:Li;return n&&Yo(t,e,n)&&(e=o),r(t,Fo(e,3))},gr.sortedIndex=function(t,e){return $i(t,e)},gr.sortedIndexBy=function(t,e,n){return Ri(t,e,Fo(n,2))},gr.sortedIndexOf=function(t,e){var n=null==t?0:t.length;if(n){var r=$i(t,e);if(r<n&&ms(t[r],e))return r}return-1},gr.sortedLastIndex=function(t,e){return $i(t,e,!0)},gr.sortedLastIndexBy=function(t,e,n){return Ri(t,e,Fo(n,2),!0)},gr.sortedLastIndexOf=function(t,e){if(null!=t&&t.length){var n=$i(t,e,!0)-1;if(ms(t[n],e))return n}return-1},gr.startCase=Eu,gr.startsWith=function(t,e,n){return t=Gs(t),n=null==n?0:Pr(zs(n),0,t.length),e=Fi(e),t.slice(n,n+e.length)==e},gr.subtract=ec,gr.sum=function(t){return t&&t.length?On(t,Lu):0},gr.sumBy=function(t,e){return t&&t.length?On(t,Fo(e,2)):0},gr.template=function(t,e,n){var r=gr.templateSettings;n&&Yo(t,e,n)&&(e=o),t=Gs(t),e=Js({},e,r,Oo);var i,a,s=Js({},e.imports,r.imports,Oo),u=uu(s),c=Nn(s,u),l=0,f=e.interpolate||Jt,p="__p += '",d=ie((e.escape||Jt).source+"|"+f.source+"|"+(f===Ot?Ut:Jt).source+"|"+(e.evaluate||Jt).source+"|$","g"),h="//# sourceURL="+("sourceURL"in e?e.sourceURL:"lodash.templateSources["+ ++Pe+"]")+"\n";t.replace(d,function(e,n,r,o,s,u){return r||(r=o),p+=t.slice(l,u).replace(Zt,Mn),n&&(i=!0,p+="' +\n__e("+n+") +\n'"),s&&(a=!0,p+="';\n"+s+";\n__p += '"),r&&(p+="' +\n((__t = ("+r+")) == null ? '' : __t) +\n'"),l=u+e.length,e}),p+="';\n";var v=e.variable;v||(p="with (obj) {\n"+p+"\n}\n"),p=(a?p.replace(bt,""):p).replace(wt,"$1").replace(xt,"$1;"),p="function("+(v||"obj")+") {\n"+(v?"":"obj || (obj = {});\n")+"var __t, __p = ''"+(i?", __e = _.escape":"")+(a?", __j = Array.prototype.join;\nfunction print() { __p += __j.call(arguments, '') }\n":";\n")+p+"return __p\n}";var g=Ou(function(){return ee(u,h+"return "+p).apply(o,c)});if(g.source=p,Ss(g))throw g;return g},gr.times=function(t,e){if((t=zs(t))<1||t>L)return[];var n=P,r=Gn(t,P);e=Fo(e),t-=P;for(var i=Dn(r,e);++n<t;)e(n);return i},gr.toFinite=Us,gr.toInteger=zs,gr.toLength=Vs,gr.toLower=function(t){return Gs(t).toLowerCase()},gr.toNumber=Ks,gr.toSafeInteger=function(t){return t?Pr(zs(t),-L,L):0===t?t:0},gr.toString=Gs,gr.toUpper=function(t){return Gs(t).toUpperCase()},gr.trim=function(t,e,n){if((t=Gs(t))&&(n||e===o))return t.replace(Rt,"");if(!t||!(e=Fi(e)))return t;var r=zn(t),i=zn(e);return Xi(r,Ln(r,i),$n(r,i)+1).join("")},gr.trimEnd=function(t,e,n){if((t=Gs(t))&&(n||e===o))return t.replace(Mt,"");if(!t||!(e=Fi(e)))return t;var r=zn(t);return Xi(r,0,$n(r,zn(e))+1).join("")},gr.trimStart=function(t,e,n){if((t=Gs(t))&&(n||e===o))return t.replace(Pt,"");if(!t||!(e=Fi(e)))return t;var r=zn(t);return Xi(r,Ln(r,zn(e))).join("")},gr.truncate=function(t,e){var n=S,r=k;if(Is(e)){var i="separator"in e?e.separator:i;n="length"in e?zs(e.length):n,r="omission"in e?Fi(e.omission):r}var a=(t=Gs(t)).length;if(Fn(t)){var s=zn(t);a=s.length}if(n>=a)return t;var u=n-Un(r);if(u<1)return r;var c=s?Xi(s,0,u).join(""):t.slice(0,u);if(i===o)return c+r;if(s&&(u+=c.length-u),Rs(i)){if(t.slice(u).search(i)){var l,f=c;for(i.global||(i=ie(i.source,Gs(zt.exec(i))+"g")),i.lastIndex=0;l=i.exec(f);)var p=l.index;c=c.slice(0,p===o?u:p)}}else if(t.indexOf(Fi(i),u)!=u){var d=c.lastIndexOf(i);d>-1&&(c=c.slice(0,d))}return c+r},gr.unescape=function(t){return(t=Gs(t))&&Et.test(t)?t.replace(Ct,Vn):t},gr.uniqueId=function(t){var e=++de;return Gs(t)+e},gr.upperCase=Au,gr.upperFirst=Su,gr.each=Ga,gr.eachRight=Ya,gr.first=Ca,Mu(gr,(Ju={},Yr(gr,function(t,e){pe.call(gr.prototype,e)||(Ju[e]=t)}),Ju),{chain:!1}),gr.VERSION="4.17.4",un(["bind","bindKey","curry","curryRight","partial","partialRight"],function(t){gr[t].placeholder=gr}),un(["drop","take"],function(t,e){br.prototype[t]=function(n){n=n===o?1:Qn(zs(n),0);var r=this.__filtered__&&!e?new br(this):this.clone();return r.__filtered__?r.__takeCount__=Gn(n,r.__takeCount__):r.__views__.push({size:Gn(n,P),type:t+(r.__dir__<0?"Right":"")}),r},br.prototype[t+"Right"]=function(e){return this.reverse()[t](e).reverse()}}),un(["filter","map","takeWhile"],function(t,e){var n=e+1,r=n==I||3==n;br.prototype[t]=function(t){var e=this.clone();return e.__iteratees__.push({iteratee:Fo(t,3),type:n}),e.__filtered__=e.__filtered__||r,e}}),un(["head","last"],function(t,e){var n="take"+(e?"Right":"");br.prototype[t]=function(){return this[n](1).value()[0]}}),un(["initial","tail"],function(t,e){var n="drop"+(e?"":"Right");br.prototype[t]=function(){return this.__filtered__?new br(this):this[n](1)}}),br.prototype.compact=function(){return this.filter(Lu)},br.prototype.find=function(t){return this.filter(t).head()},br.prototype.findLast=function(t){return this.reverse().find(t)},br.prototype.invokeMap=Ai(function(t,e){return"function"==typeof t?new br(this):this.map(function(n){return ai(n,t,e)})}),br.prototype.reject=function(t){return this.filter(ps(Fo(t)))},br.prototype.slice=function(t,e){t=zs(t);var n=this;return n.__filtered__&&(t>0||e<0)?new br(n):(t<0?n=n.takeRight(-t):t&&(n=n.drop(t)),e!==o&&(n=(e=zs(e))<0?n.dropRight(-e):n.take(e-t)),n)},br.prototype.takeRightWhile=function(t){return this.reverse().takeWhile(t).reverse()},br.prototype.toArray=function(){return this.take(P)},Yr(br.prototype,function(t,e){var n=/^(?:filter|find|map|reject)|While$/.test(e),r=/^(?:head|last)$/.test(e),i=gr[r?"take"+("last"==e?"Right":""):e],a=r||/^find/.test(e);i&&(gr.prototype[e]=function(){var e=this.__wrapped__,s=r?[1]:arguments,u=e instanceof br,c=s[0],l=u||ws(e),f=function(t){var e=i.apply(gr,vn([t],s));return r&&p?e[0]:e};l&&n&&"function"==typeof c&&1!=c.length&&(u=l=!1);var p=this.__chain__,d=!!this.__actions__.length,h=a&&!p,v=u&&!d;if(!a&&l){e=v?e:new br(this);var g=t.apply(e,s);return g.__actions__.push({func:Ua,args:[f],thisArg:o}),new _r(g,p)}return h&&v?t.apply(this,s):(g=this.thru(f),h?r?g.value()[0]:g.value():g)})}),un(["pop","push","shift","sort","splice","unshift"],function(t){var e=se[t],n=/^(?:push|sort|unshift)$/.test(t)?"tap":"thru",r=/^(?:pop|shift)$/.test(t);gr.prototype[t]=function(){var t=arguments;if(r&&!this.__chain__){var i=this.value();return e.apply(ws(i)?i:[],t)}return this[n](function(n){return e.apply(ws(n)?n:[],t)})}}),Yr(br.prototype,function(t,e){var n=gr[e];if(n){var r=n.name+"";(sr[r]||(sr[r]=[])).push({name:e,func:n})}}),sr[mo(o,y).name]=[{name:"wrapper",func:o}],br.prototype.clone=function(){var t=new br(this.__wrapped__);return t.__actions__=oo(this.__actions__),t.__dir__=this.__dir__,t.__filtered__=this.__filtered__,t.__iteratees__=oo(this.__iteratees__),t.__takeCount__=this.__takeCount__,t.__views__=oo(this.__views__),t},br.prototype.reverse=function(){if(this.__filtered__){var t=new br(this);t.__dir__=-1,t.__filtered__=!0}else(t=this.clone()).__dir__*=-1;return t},br.prototype.value=function(){var t=this.__wrapped__.value(),e=this.__dir__,n=ws(t),r=e<0,i=n?t.length:0,o=function(t,e,n){for(var r=-1,i=n.length;++r<i;){var o=n[r],a=o.size;switch(o.type){case"drop":t+=a;break;case"dropRight":e-=a;break;case"take":e=Gn(e,t+a);break;case"takeRight":t=Qn(t,e-a)}}return{start:t,end:e}}(0,i,this.__views__),a=o.start,s=o.end,u=s-a,c=r?s:a-1,l=this.__iteratees__,f=l.length,p=0,d=Gn(u,this.__takeCount__);if(!n||!r&&i==u&&d==u)return Ui(t,this.__actions__);var h=[];t:for(;u--&&p<d;){for(var v=-1,g=t[c+=e];++v<f;){var m=l[v],y=m.iteratee,_=m.type,b=y(g);if(_==N)g=b;else if(!b){if(_==I)continue t;break t}}h[p++]=g}return h},gr.prototype.at=za,gr.prototype.chain=function(){return qa(this)},gr.prototype.commit=function(){return new _r(this.value(),this.__chain__)},gr.prototype.next=function(){this.__values__===o&&(this.__values__=qs(this.value()));var t=this.__index__>=this.__values__.length;return{done:t,value:t?o:this.__values__[this.__index__++]}},gr.prototype.plant=function(t){for(var e,n=this;n instanceof yr;){var r=ga(n);r.__index__=0,r.__values__=o,e?i.__wrapped__=r:e=r;var i=r;n=n.__wrapped__}return i.__wrapped__=t,e},gr.prototype.reverse=function(){var t=this.__wrapped__;if(t instanceof br){var e=t;return this.__actions__.length&&(e=new br(this)),(e=e.reverse()).__actions__.push({func:Ua,args:[Ia],thisArg:o}),new _r(e,this.__chain__)}return this.thru(Ia)},gr.prototype.toJSON=gr.prototype.valueOf=gr.prototype.value=function(){return Ui(this.__wrapped__,this.__actions__)},gr.prototype.first=gr.prototype.head,ke&&(gr.prototype[ke]=function(){return this}),gr}();ze._=Kn,(i=function(){return Kn}.call(e,n,e,r))===o||(r.exports=i)}).call(this)}).call(e,n(1),n(15)(t))},function(t,e){t.exports=function(t){return t.webpackPolyfill||(t.deprecate=function(){},t.paths=[],t.children||(t.children=[]),Object.defineProperty(t,"loaded",{enumerable:!0,get:function(){return t.l}}),Object.defineProperty(t,"id",{enumerable:!0,get:function(){return t.i}}),t.webpackPolyfill=1),t}},function(t,e,n){(function(t,e,n){"use strict";function r(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function i(t,e,n){return e&&r(t.prototype,e),n&&r(t,n),t}function o(){return(o=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t}).apply(this,arguments)}e=e&&e.hasOwnProperty("default")?e.default:e,n=n&&n.hasOwnProperty("default")?n.default:n;var a,s,u,c,l,f,p,d,h,v,g,m,y,_,b,w,x,C,T,E,A,S,k,O,D,I,N,j,L,$,R,P,M,F,H,B,W,q,U,z,V,K,Q,G,Y,X,J,Z,tt,et,nt,rt,it,ot,at,st,ut,ct,lt,ft,pt,dt,ht,vt,gt,mt,yt,_t,bt,wt,xt,Ct,Tt,Et,At,St,kt,Ot,Dt,It,Nt,jt,Lt,$t,Rt,Pt,Mt,Ft,Ht,Bt,Wt,qt,Ut,zt,Vt,Kt,Qt,Gt,Yt,Xt,Jt,Zt,te,ee,ne,re,ie,oe,ae,se,ue,ce,le,fe,pe,de,he,ve,ge,me,ye,_e,be,we,xe,Ce,Te,Ee,Ae,Se,ke,Oe,De,Ie,Ne,je,Le,$e,Re,Pe,Me,Fe,He,Be,We,qe,Ue,ze,Ve,Ke,Qe,Ge,Ye,Xe,Je,Ze,tn,en,nn,rn,on,an,sn,un,cn,ln,fn,pn,dn,hn,vn,gn,mn,yn,_n,bn,wn,xn=function(t){var e=!1;function n(e){var n=this,i=!1;return t(this).one(r.TRANSITION_END,function(){i=!0}),setTimeout(function(){i||r.triggerTransitionEnd(n)},e),this}var r={TRANSITION_END:"bsTransitionEnd",getUID:function(t){do{t+=~~(1e6*Math.random())}while(document.getElementById(t));return t},getSelectorFromElement:function(e){var n,r=e.getAttribute("data-target");r&&"#"!==r||(r=e.getAttribute("href")||""),"#"===r.charAt(0)&&(n=r,r=n="function"==typeof t.escapeSelector?t.escapeSelector(n).substr(1):n.replace(/(:|\.|\[|\]|,|=|@)/g,"\\$1"));try{return t(document).find(r).length>0?r:null}catch(t){return null}},reflow:function(t){return t.offsetHeight},triggerTransitionEnd:function(n){t(n).trigger(e.end)},supportsTransitionEnd:function(){return Boolean(e)},isElement:function(t){return(t[0]||t).nodeType},typeCheckConfig:function(t,e,n){for(var i in n)if(Object.prototype.hasOwnProperty.call(n,i)){var o=n[i],a=e[i],s=a&&r.isElement(a)?"element":(u=a,{}.toString.call(u).match(/\s([a-zA-Z]+)/)[1].toLowerCase());if(!new RegExp(o).test(s))throw new Error(t.toUpperCase()+': Option "'+i+'" provided type "'+s+'" but expected type "'+o+'".')}var u}};return e=("undefined"==typeof window||!window.QUnit)&&{end:"transitionend"},t.fn.emulateTransitionEnd=n,r.supportsTransitionEnd()&&(t.event.special[r.TRANSITION_END]={bindType:e.end,delegateType:e.end,handle:function(e){if(t(e.target).is(this))return e.handleObj.handler.apply(this,arguments)}}),r}(e),Cn=(s="alert",c="."+(u="bs.alert"),l=(a=e).fn[s],f={CLOSE:"close"+c,CLOSED:"closed"+c,CLICK_DATA_API:"click"+c+".data-api"},p="alert",d="fade",h="show",v=function(){function t(t){this._element=t}var e=t.prototype;return e.close=function(t){t=t||this._element;var e=this._getRootElement(t);this._triggerCloseEvent(e).isDefaultPrevented()||this._removeElement(e)},e.dispose=function(){a.removeData(this._element,u),this._element=null},e._getRootElement=function(t){var e=xn.getSelectorFromElement(t),n=!1;return e&&(n=a(e)[0]),n||(n=a(t).closest("."+p)[0]),n},e._triggerCloseEvent=function(t){var e=a.Event(f.CLOSE);return a(t).trigger(e),e},e._removeElement=function(t){var e=this;a(t).removeClass(h),xn.supportsTransitionEnd()&&a(t).hasClass(d)?a(t).one(xn.TRANSITION_END,function(n){return e._destroyElement(t,n)}).emulateTransitionEnd(150):this._destroyElement(t)},e._destroyElement=function(t){a(t).detach().trigger(f.CLOSED).remove()},t._jQueryInterface=function(e){return this.each(function(){var n=a(this),r=n.data(u);r||(r=new t(this),n.data(u,r)),"close"===e&&r[e](this)})},t._handleDismiss=function(t){return function(e){e&&e.preventDefault(),t.close(this)}},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}}]),t}(),a(document).on(f.CLICK_DATA_API,'[data-dismiss="alert"]',v._handleDismiss(new v)),a.fn[s]=v._jQueryInterface,a.fn[s].Constructor=v,a.fn[s].noConflict=function(){return a.fn[s]=l,v._jQueryInterface},v),Tn=(m="button",_="."+(y="bs.button"),b=".data-api",w=(g=e).fn[m],x="active",C="btn",T="focus",E='[data-toggle^="button"]',A='[data-toggle="buttons"]',S="input",k=".active",O=".btn",D={CLICK_DATA_API:"click"+_+b,FOCUS_BLUR_DATA_API:"focus"+_+b+" blur"+_+b},I=function(){function t(t){this._element=t}var e=t.prototype;return e.toggle=function(){var t=!0,e=!0,n=g(this._element).closest(A)[0];if(n){var r=g(this._element).find(S)[0];if(r){if("radio"===r.type)if(r.checked&&g(this._element).hasClass(x))t=!1;else{var i=g(n).find(k)[0];i&&g(i).removeClass(x)}if(t){if(r.hasAttribute("disabled")||n.hasAttribute("disabled")||r.classList.contains("disabled")||n.classList.contains("disabled"))return;r.checked=!g(this._element).hasClass(x),g(r).trigger("change")}r.focus(),e=!1}}e&&this._element.setAttribute("aria-pressed",!g(this._element).hasClass(x)),t&&g(this._element).toggleClass(x)},e.dispose=function(){g.removeData(this._element,y),this._element=null},t._jQueryInterface=function(e){return this.each(function(){var n=g(this).data(y);n||(n=new t(this),g(this).data(y,n)),"toggle"===e&&n[e]()})},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}}]),t}(),g(document).on(D.CLICK_DATA_API,E,function(t){t.preventDefault();var e=t.target;g(e).hasClass(C)||(e=g(e).closest(O)),I._jQueryInterface.call(g(e),"toggle")}).on(D.FOCUS_BLUR_DATA_API,E,function(t){var e=g(t.target).closest(O)[0];g(e).toggleClass(T,/^focus(in)?$/.test(t.type))}),g.fn[m]=I._jQueryInterface,g.fn[m].Constructor=I,g.fn[m].noConflict=function(){return g.fn[m]=w,I._jQueryInterface},I),En=(j="carousel",$="."+(L="bs.carousel"),R=(N=e).fn[j],P={interval:5e3,keyboard:!0,slide:!1,pause:"hover",wrap:!0},M={interval:"(number|boolean)",keyboard:"boolean",slide:"(boolean|string)",pause:"(string|boolean)",wrap:"boolean"},F="next",H="prev",B="left",W="right",q={SLIDE:"slide"+$,SLID:"slid"+$,KEYDOWN:"keydown"+$,MOUSEENTER:"mouseenter"+$,MOUSELEAVE:"mouseleave"+$,TOUCHEND:"touchend"+$,LOAD_DATA_API:"load"+$+".data-api",CLICK_DATA_API:"click"+$+".data-api"},U="carousel",z="active",V="slide",K="carousel-item-right",Q="carousel-item-left",G="carousel-item-next",Y="carousel-item-prev",X={ACTIVE:".active",ACTIVE_ITEM:".active.carousel-item",ITEM:".carousel-item",NEXT_PREV:".carousel-item-next, .carousel-item-prev",INDICATORS:".carousel-indicators",DATA_SLIDE:"[data-slide], [data-slide-to]",DATA_RIDE:'[data-ride="carousel"]'},J=function(){function t(t,e){this._items=null,this._interval=null,this._activeElement=null,this._isPaused=!1,this._isSliding=!1,this.touchTimeout=null,this._config=this._getConfig(e),this._element=N(t)[0],this._indicatorsElement=N(this._element).find(X.INDICATORS)[0],this._addEventListeners()}var e=t.prototype;return e.next=function(){this._isSliding||this._slide(F)},e.nextWhenVisible=function(){!document.hidden&&N(this._element).is(":visible")&&"hidden"!==N(this._element).css("visibility")&&this.next()},e.prev=function(){this._isSliding||this._slide(H)},e.pause=function(t){t||(this._isPaused=!0),N(this._element).find(X.NEXT_PREV)[0]&&xn.supportsTransitionEnd()&&(xn.triggerTransitionEnd(this._element),this.cycle(!0)),clearInterval(this._interval),this._interval=null},e.cycle=function(t){t||(this._isPaused=!1),this._interval&&(clearInterval(this._interval),this._interval=null),this._config.interval&&!this._isPaused&&(this._interval=setInterval((document.visibilityState?this.nextWhenVisible:this.next).bind(this),this._config.interval))},e.to=function(t){var e=this;this._activeElement=N(this._element).find(X.ACTIVE_ITEM)[0];var n=this._getItemIndex(this._activeElement);if(!(t>this._items.length-1||t<0))if(this._isSliding)N(this._element).one(q.SLID,function(){return e.to(t)});else{if(n===t)return this.pause(),void this.cycle();var r=t>n?F:H;this._slide(r,this._items[t])}},e.dispose=function(){N(this._element).off($),N.removeData(this._element,L),this._items=null,this._config=null,this._element=null,this._interval=null,this._isPaused=null,this._isSliding=null,this._activeElement=null,this._indicatorsElement=null},e._getConfig=function(t){return t=o({},P,t),xn.typeCheckConfig(j,t,M),t},e._addEventListeners=function(){var t=this;this._config.keyboard&&N(this._element).on(q.KEYDOWN,function(e){return t._keydown(e)}),"hover"===this._config.pause&&(N(this._element).on(q.MOUSEENTER,function(e){return t.pause(e)}).on(q.MOUSELEAVE,function(e){return t.cycle(e)}),"ontouchstart"in document.documentElement&&N(this._element).on(q.TOUCHEND,function(){t.pause(),t.touchTimeout&&clearTimeout(t.touchTimeout),t.touchTimeout=setTimeout(function(e){return t.cycle(e)},500+t._config.interval)}))},e._keydown=function(t){if(!/input|textarea/i.test(t.target.tagName))switch(t.which){case 37:t.preventDefault(),this.prev();break;case 39:t.preventDefault(),this.next()}},e._getItemIndex=function(t){return this._items=N.makeArray(N(t).parent().find(X.ITEM)),this._items.indexOf(t)},e._getItemByDirection=function(t,e){var n=t===F,r=t===H,i=this._getItemIndex(e),o=this._items.length-1;if((r&&0===i||n&&i===o)&&!this._config.wrap)return e;var a=(i+(t===H?-1:1))%this._items.length;return-1===a?this._items[this._items.length-1]:this._items[a]},e._triggerSlideEvent=function(t,e){var n=this._getItemIndex(t),r=this._getItemIndex(N(this._element).find(X.ACTIVE_ITEM)[0]),i=N.Event(q.SLIDE,{relatedTarget:t,direction:e,from:r,to:n});return N(this._element).trigger(i),i},e._setActiveIndicatorElement=function(t){if(this._indicatorsElement){N(this._indicatorsElement).find(X.ACTIVE).removeClass(z);var e=this._indicatorsElement.children[this._getItemIndex(t)];e&&N(e).addClass(z)}},e._slide=function(t,e){var n,r,i,o=this,a=N(this._element).find(X.ACTIVE_ITEM)[0],s=this._getItemIndex(a),u=e||a&&this._getItemByDirection(t,a),c=this._getItemIndex(u),l=Boolean(this._interval);if(t===F?(n=Q,r=G,i=B):(n=K,r=Y,i=W),u&&N(u).hasClass(z))this._isSliding=!1;else if(!this._triggerSlideEvent(u,i).isDefaultPrevented()&&a&&u){this._isSliding=!0,l&&this.pause(),this._setActiveIndicatorElement(u);var f=N.Event(q.SLID,{relatedTarget:u,direction:i,from:s,to:c});xn.supportsTransitionEnd()&&N(this._element).hasClass(V)?(N(u).addClass(r),xn.reflow(u),N(a).addClass(n),N(u).addClass(n),N(a).one(xn.TRANSITION_END,function(){N(u).removeClass(n+" "+r).addClass(z),N(a).removeClass(z+" "+r+" "+n),o._isSliding=!1,setTimeout(function(){return N(o._element).trigger(f)},0)}).emulateTransitionEnd(600)):(N(a).removeClass(z),N(u).addClass(z),this._isSliding=!1,N(this._element).trigger(f)),l&&this.cycle()}},t._jQueryInterface=function(e){return this.each(function(){var n=N(this).data(L),r=o({},P,N(this).data());"object"==typeof e&&(r=o({},r,e));var i="string"==typeof e?e:r.slide;if(n||(n=new t(this,r),N(this).data(L,n)),"number"==typeof e)n.to(e);else if("string"==typeof i){if(void 0===n[i])throw new TypeError('No method named "'+i+'"');n[i]()}else r.interval&&(n.pause(),n.cycle())})},t._dataApiClickHandler=function(e){var n=xn.getSelectorFromElement(this);if(n){var r=N(n)[0];if(r&&N(r).hasClass(U)){var i=o({},N(r).data(),N(this).data()),a=this.getAttribute("data-slide-to");a&&(i.interval=!1),t._jQueryInterface.call(N(r),i),a&&N(r).data(L).to(a),e.preventDefault()}}},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return P}}]),t}(),N(document).on(q.CLICK_DATA_API,X.DATA_SLIDE,J._dataApiClickHandler),N(window).on(q.LOAD_DATA_API,function(){N(X.DATA_RIDE).each(function(){var t=N(this);J._jQueryInterface.call(t,t.data())})}),N.fn[j]=J._jQueryInterface,N.fn[j].Constructor=J,N.fn[j].noConflict=function(){return N.fn[j]=R,J._jQueryInterface},J),An=(tt="collapse",nt="."+(et="bs.collapse"),rt=(Z=e).fn[tt],it={toggle:!0,parent:""},ot={toggle:"boolean",parent:"(string|element)"},at={SHOW:"show"+nt,SHOWN:"shown"+nt,HIDE:"hide"+nt,HIDDEN:"hidden"+nt,CLICK_DATA_API:"click"+nt+".data-api"},st="show",ut="collapse",ct="collapsing",lt="collapsed",ft="width",pt="height",dt={ACTIVES:".show, .collapsing",DATA_TOGGLE:'[data-toggle="collapse"]'},ht=function(){function t(t,e){this._isTransitioning=!1,this._element=t,this._config=this._getConfig(e),this._triggerArray=Z.makeArray(Z('[data-toggle="collapse"][href="#'+t.id+'"],[data-toggle="collapse"][data-target="#'+t.id+'"]'));for(var n=Z(dt.DATA_TOGGLE),r=0;r<n.length;r++){var i=n[r],o=xn.getSelectorFromElement(i);null!==o&&Z(o).filter(t).length>0&&(this._selector=o,this._triggerArray.push(i))}this._parent=this._config.parent?this._getParent():null,this._config.parent||this._addAriaAndCollapsedClass(this._element,this._triggerArray),this._config.toggle&&this.toggle()}var e=t.prototype;return e.toggle=function(){Z(this._element).hasClass(st)?this.hide():this.show()},e.show=function(){var e,n,r=this;if(!this._isTransitioning&&!Z(this._element).hasClass(st)&&(this._parent&&0===(e=Z.makeArray(Z(this._parent).find(dt.ACTIVES).filter('[data-parent="'+this._config.parent+'"]'))).length&&(e=null),!(e&&(n=Z(e).not(this._selector).data(et))&&n._isTransitioning))){var i=Z.Event(at.SHOW);if(Z(this._element).trigger(i),!i.isDefaultPrevented()){e&&(t._jQueryInterface.call(Z(e).not(this._selector),"hide"),n||Z(e).data(et,null));var o=this._getDimension();Z(this._element).removeClass(ut).addClass(ct),this._element.style[o]=0,this._triggerArray.length>0&&Z(this._triggerArray).removeClass(lt).attr("aria-expanded",!0),this.setTransitioning(!0);var a=function(){Z(r._element).removeClass(ct).addClass(ut).addClass(st),r._element.style[o]="",r.setTransitioning(!1),Z(r._element).trigger(at.SHOWN)};if(xn.supportsTransitionEnd()){var s="scroll"+(o[0].toUpperCase()+o.slice(1));Z(this._element).one(xn.TRANSITION_END,a).emulateTransitionEnd(600),this._element.style[o]=this._element[s]+"px"}else a()}}},e.hide=function(){var t=this;if(!this._isTransitioning&&Z(this._element).hasClass(st)){var e=Z.Event(at.HIDE);if(Z(this._element).trigger(e),!e.isDefaultPrevented()){var n=this._getDimension();if(this._element.style[n]=this._element.getBoundingClientRect()[n]+"px",xn.reflow(this._element),Z(this._element).addClass(ct).removeClass(ut).removeClass(st),this._triggerArray.length>0)for(var r=0;r<this._triggerArray.length;r++){var i=this._triggerArray[r],o=xn.getSelectorFromElement(i);if(null!==o)Z(o).hasClass(st)||Z(i).addClass(lt).attr("aria-expanded",!1)}this.setTransitioning(!0);var a=function(){t.setTransitioning(!1),Z(t._element).removeClass(ct).addClass(ut).trigger(at.HIDDEN)};this._element.style[n]="",xn.supportsTransitionEnd()?Z(this._element).one(xn.TRANSITION_END,a).emulateTransitionEnd(600):a()}}},e.setTransitioning=function(t){this._isTransitioning=t},e.dispose=function(){Z.removeData(this._element,et),this._config=null,this._parent=null,this._element=null,this._triggerArray=null,this._isTransitioning=null},e._getConfig=function(t){return(t=o({},it,t)).toggle=Boolean(t.toggle),xn.typeCheckConfig(tt,t,ot),t},e._getDimension=function(){return Z(this._element).hasClass(ft)?ft:pt},e._getParent=function(){var e=this,n=null;xn.isElement(this._config.parent)?(n=this._config.parent,void 0!==this._config.parent.jquery&&(n=this._config.parent[0])):n=Z(this._config.parent)[0];var r='[data-toggle="collapse"][data-parent="'+this._config.parent+'"]';return Z(n).find(r).each(function(n,r){e._addAriaAndCollapsedClass(t._getTargetFromElement(r),[r])}),n},e._addAriaAndCollapsedClass=function(t,e){if(t){var n=Z(t).hasClass(st);e.length>0&&Z(e).toggleClass(lt,!n).attr("aria-expanded",n)}},t._getTargetFromElement=function(t){var e=xn.getSelectorFromElement(t);return e?Z(e)[0]:null},t._jQueryInterface=function(e){return this.each(function(){var n=Z(this),r=n.data(et),i=o({},it,n.data(),"object"==typeof e&&e);if(!r&&i.toggle&&/show|hide/.test(e)&&(i.toggle=!1),r||(r=new t(this,i),n.data(et,r)),"string"==typeof e){if(void 0===r[e])throw new TypeError('No method named "'+e+'"');r[e]()}})},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return it}}]),t}(),Z(document).on(at.CLICK_DATA_API,dt.DATA_TOGGLE,function(t){"A"===t.currentTarget.tagName&&t.preventDefault();var e=Z(this),n=xn.getSelectorFromElement(this);Z(n).each(function(){var t=Z(this),n=t.data(et)?"toggle":e.data();ht._jQueryInterface.call(t,n)})}),Z.fn[tt]=ht._jQueryInterface,Z.fn[tt].Constructor=ht,Z.fn[tt].noConflict=function(){return Z.fn[tt]=rt,ht._jQueryInterface},ht),Sn=(gt="dropdown",yt="."+(mt="bs.dropdown"),_t=".data-api",bt=(vt=e).fn[gt],wt=new RegExp("38|40|27"),xt={HIDE:"hide"+yt,HIDDEN:"hidden"+yt,SHOW:"show"+yt,SHOWN:"shown"+yt,CLICK:"click"+yt,CLICK_DATA_API:"click"+yt+_t,KEYDOWN_DATA_API:"keydown"+yt+_t,KEYUP_DATA_API:"keyup"+yt+_t},Ct="disabled",Tt="show",Et="dropup",At="dropright",St="dropleft",kt="dropdown-menu-right",Ot="dropdown-menu-left",Dt="position-static",It='[data-toggle="dropdown"]',Nt=".dropdown form",jt=".dropdown-menu",Lt=".navbar-nav",$t=".dropdown-menu .dropdown-item:not(.disabled)",Rt="top-start",Pt="top-end",Mt="bottom-start",Ft="bottom-end",Ht="right-start",Bt="left-start",Wt={offset:0,flip:!0,boundary:"scrollParent"},qt={offset:"(number|string|function)",flip:"boolean",boundary:"(string|element)"},Ut=function(){function t(t,e){this._element=t,this._popper=null,this._config=this._getConfig(e),this._menu=this._getMenuElement(),this._inNavbar=this._detectNavbar(),this._addEventListeners()}var e=t.prototype;return e.toggle=function(){if(!this._element.disabled&&!vt(this._element).hasClass(Ct)){var e=t._getParentFromElement(this._element),r=vt(this._menu).hasClass(Tt);if(t._clearMenus(),!r){var i={relatedTarget:this._element},o=vt.Event(xt.SHOW,i);if(vt(e).trigger(o),!o.isDefaultPrevented()){if(!this._inNavbar){if(void 0===n)throw new TypeError("Bootstrap dropdown require Popper.js (https://popper.js.org)");var a=this._element;vt(e).hasClass(Et)&&(vt(this._menu).hasClass(Ot)||vt(this._menu).hasClass(kt))&&(a=e),"scrollParent"!==this._config.boundary&&vt(e).addClass(Dt),this._popper=new n(a,this._menu,this._getPopperConfig())}"ontouchstart"in document.documentElement&&0===vt(e).closest(Lt).length&&vt("body").children().on("mouseover",null,vt.noop),this._element.focus(),this._element.setAttribute("aria-expanded",!0),vt(this._menu).toggleClass(Tt),vt(e).toggleClass(Tt).trigger(vt.Event(xt.SHOWN,i))}}}},e.dispose=function(){vt.removeData(this._element,mt),vt(this._element).off(yt),this._element=null,this._menu=null,null!==this._popper&&(this._popper.destroy(),this._popper=null)},e.update=function(){this._inNavbar=this._detectNavbar(),null!==this._popper&&this._popper.scheduleUpdate()},e._addEventListeners=function(){var t=this;vt(this._element).on(xt.CLICK,function(e){e.preventDefault(),e.stopPropagation(),t.toggle()})},e._getConfig=function(t){return t=o({},this.constructor.Default,vt(this._element).data(),t),xn.typeCheckConfig(gt,t,this.constructor.DefaultType),t},e._getMenuElement=function(){if(!this._menu){var e=t._getParentFromElement(this._element);this._menu=vt(e).find(jt)[0]}return this._menu},e._getPlacement=function(){var t=vt(this._element).parent(),e=Mt;return t.hasClass(Et)?(e=Rt,vt(this._menu).hasClass(kt)&&(e=Pt)):t.hasClass(At)?e=Ht:t.hasClass(St)?e=Bt:vt(this._menu).hasClass(kt)&&(e=Ft),e},e._detectNavbar=function(){return vt(this._element).closest(".navbar").length>0},e._getPopperConfig=function(){var t=this,e={};return"function"==typeof this._config.offset?e.fn=function(e){return e.offsets=o({},e.offsets,t._config.offset(e.offsets)||{}),e}:e.offset=this._config.offset,{placement:this._getPlacement(),modifiers:{offset:e,flip:{enabled:this._config.flip},preventOverflow:{boundariesElement:this._config.boundary}}}},t._jQueryInterface=function(e){return this.each(function(){var n=vt(this).data(mt);if(n||(n=new t(this,"object"==typeof e?e:null),vt(this).data(mt,n)),"string"==typeof e){if(void 0===n[e])throw new TypeError('No method named "'+e+'"');n[e]()}})},t._clearMenus=function(e){if(!e||3!==e.which&&("keyup"!==e.type||9===e.which))for(var n=vt.makeArray(vt(It)),r=0;r<n.length;r++){var i=t._getParentFromElement(n[r]),o=vt(n[r]).data(mt),a={relatedTarget:n[r]};if(o){var s=o._menu;if(vt(i).hasClass(Tt)&&!(e&&("click"===e.type&&/input|textarea/i.test(e.target.tagName)||"keyup"===e.type&&9===e.which)&&vt.contains(i,e.target))){var u=vt.Event(xt.HIDE,a);vt(i).trigger(u),u.isDefaultPrevented()||("ontouchstart"in document.documentElement&&vt("body").children().off("mouseover",null,vt.noop),n[r].setAttribute("aria-expanded","false"),vt(s).removeClass(Tt),vt(i).removeClass(Tt).trigger(vt.Event(xt.HIDDEN,a)))}}}},t._getParentFromElement=function(t){var e,n=xn.getSelectorFromElement(t);return n&&(e=vt(n)[0]),e||t.parentNode},t._dataApiKeydownHandler=function(e){if((/input|textarea/i.test(e.target.tagName)?!(32===e.which||27!==e.which&&(40!==e.which&&38!==e.which||vt(e.target).closest(jt).length)):wt.test(e.which))&&(e.preventDefault(),e.stopPropagation(),!this.disabled&&!vt(this).hasClass(Ct))){var n=t._getParentFromElement(this),r=vt(n).hasClass(Tt);if((r||27===e.which&&32===e.which)&&(!r||27!==e.which&&32!==e.which)){var i=vt(n).find($t).get();if(0!==i.length){var o=i.indexOf(e.target);38===e.which&&o>0&&o--,40===e.which&&o<i.length-1&&o++,o<0&&(o=0),i[o].focus()}}else{if(27===e.which){var a=vt(n).find(It)[0];vt(a).trigger("focus")}vt(this).trigger("click")}}},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return Wt}},{key:"DefaultType",get:function(){return qt}}]),t}(),vt(document).on(xt.KEYDOWN_DATA_API,It,Ut._dataApiKeydownHandler).on(xt.KEYDOWN_DATA_API,jt,Ut._dataApiKeydownHandler).on(xt.CLICK_DATA_API+" "+xt.KEYUP_DATA_API,Ut._clearMenus).on(xt.CLICK_DATA_API,It,function(t){t.preventDefault(),t.stopPropagation(),Ut._jQueryInterface.call(vt(this),"toggle")}).on(xt.CLICK_DATA_API,Nt,function(t){t.stopPropagation()}),vt.fn[gt]=Ut._jQueryInterface,vt.fn[gt].Constructor=Ut,vt.fn[gt].noConflict=function(){return vt.fn[gt]=bt,Ut._jQueryInterface},Ut),kn=(Vt="modal",Qt="."+(Kt="bs.modal"),Gt=(zt=e).fn[Vt],Yt={backdrop:!0,keyboard:!0,focus:!0,show:!0},Xt={backdrop:"(boolean|string)",keyboard:"boolean",focus:"boolean",show:"boolean"},Jt={HIDE:"hide"+Qt,HIDDEN:"hidden"+Qt,SHOW:"show"+Qt,SHOWN:"shown"+Qt,FOCUSIN:"focusin"+Qt,RESIZE:"resize"+Qt,CLICK_DISMISS:"click.dismiss"+Qt,KEYDOWN_DISMISS:"keydown.dismiss"+Qt,MOUSEUP_DISMISS:"mouseup.dismiss"+Qt,MOUSEDOWN_DISMISS:"mousedown.dismiss"+Qt,CLICK_DATA_API:"click"+Qt+".data-api"},Zt="modal-scrollbar-measure",te="modal-backdrop",ee="modal-open",ne="fade",re="show",ie={DIALOG:".modal-dialog",DATA_TOGGLE:'[data-toggle="modal"]',DATA_DISMISS:'[data-dismiss="modal"]',FIXED_CONTENT:".fixed-top, .fixed-bottom, .is-fixed, .sticky-top",STICKY_CONTENT:".sticky-top",NAVBAR_TOGGLER:".navbar-toggler"},oe=function(){function t(t,e){this._config=this._getConfig(e),this._element=t,this._dialog=zt(t).find(ie.DIALOG)[0],this._backdrop=null,this._isShown=!1,this._isBodyOverflowing=!1,this._ignoreBackdropClick=!1,this._originalBodyPadding=0,this._scrollbarWidth=0}var e=t.prototype;return e.toggle=function(t){return this._isShown?this.hide():this.show(t)},e.show=function(t){var e=this;if(!this._isTransitioning&&!this._isShown){xn.supportsTransitionEnd()&&zt(this._element).hasClass(ne)&&(this._isTransitioning=!0);var n=zt.Event(Jt.SHOW,{relatedTarget:t});zt(this._element).trigger(n),this._isShown||n.isDefaultPrevented()||(this._isShown=!0,this._checkScrollbar(),this._setScrollbar(),this._adjustDialog(),zt(document.body).addClass(ee),this._setEscapeEvent(),this._setResizeEvent(),zt(this._element).on(Jt.CLICK_DISMISS,ie.DATA_DISMISS,function(t){return e.hide(t)}),zt(this._dialog).on(Jt.MOUSEDOWN_DISMISS,function(){zt(e._element).one(Jt.MOUSEUP_DISMISS,function(t){zt(t.target).is(e._element)&&(e._ignoreBackdropClick=!0)})}),this._showBackdrop(function(){return e._showElement(t)}))}},e.hide=function(t){var e=this;if(t&&t.preventDefault(),!this._isTransitioning&&this._isShown){var n=zt.Event(Jt.HIDE);if(zt(this._element).trigger(n),this._isShown&&!n.isDefaultPrevented()){this._isShown=!1;var r=xn.supportsTransitionEnd()&&zt(this._element).hasClass(ne);r&&(this._isTransitioning=!0),this._setEscapeEvent(),this._setResizeEvent(),zt(document).off(Jt.FOCUSIN),zt(this._element).removeClass(re),zt(this._element).off(Jt.CLICK_DISMISS),zt(this._dialog).off(Jt.MOUSEDOWN_DISMISS),r?zt(this._element).one(xn.TRANSITION_END,function(t){return e._hideModal(t)}).emulateTransitionEnd(300):this._hideModal()}}},e.dispose=function(){zt.removeData(this._element,Kt),zt(window,document,this._element,this._backdrop).off(Qt),this._config=null,this._element=null,this._dialog=null,this._backdrop=null,this._isShown=null,this._isBodyOverflowing=null,this._ignoreBackdropClick=null,this._scrollbarWidth=null},e.handleUpdate=function(){this._adjustDialog()},e._getConfig=function(t){return t=o({},Yt,t),xn.typeCheckConfig(Vt,t,Xt),t},e._showElement=function(t){var e=this,n=xn.supportsTransitionEnd()&&zt(this._element).hasClass(ne);this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE||document.body.appendChild(this._element),this._element.style.display="block",this._element.removeAttribute("aria-hidden"),this._element.scrollTop=0,n&&xn.reflow(this._element),zt(this._element).addClass(re),this._config.focus&&this._enforceFocus();var r=zt.Event(Jt.SHOWN,{relatedTarget:t}),i=function(){e._config.focus&&e._element.focus(),e._isTransitioning=!1,zt(e._element).trigger(r)};n?zt(this._dialog).one(xn.TRANSITION_END,i).emulateTransitionEnd(300):i()},e._enforceFocus=function(){var t=this;zt(document).off(Jt.FOCUSIN).on(Jt.FOCUSIN,function(e){document!==e.target&&t._element!==e.target&&0===zt(t._element).has(e.target).length&&t._element.focus()})},e._setEscapeEvent=function(){var t=this;this._isShown&&this._config.keyboard?zt(this._element).on(Jt.KEYDOWN_DISMISS,function(e){27===e.which&&(e.preventDefault(),t.hide())}):this._isShown||zt(this._element).off(Jt.KEYDOWN_DISMISS)},e._setResizeEvent=function(){var t=this;this._isShown?zt(window).on(Jt.RESIZE,function(e){return t.handleUpdate(e)}):zt(window).off(Jt.RESIZE)},e._hideModal=function(){var t=this;this._element.style.display="none",this._element.setAttribute("aria-hidden",!0),this._isTransitioning=!1,this._showBackdrop(function(){zt(document.body).removeClass(ee),t._resetAdjustments(),t._resetScrollbar(),zt(t._element).trigger(Jt.HIDDEN)})},e._removeBackdrop=function(){this._backdrop&&(zt(this._backdrop).remove(),this._backdrop=null)},e._showBackdrop=function(t){var e=this,n=zt(this._element).hasClass(ne)?ne:"";if(this._isShown&&this._config.backdrop){var r=xn.supportsTransitionEnd()&&n;if(this._backdrop=document.createElement("div"),this._backdrop.className=te,n&&zt(this._backdrop).addClass(n),zt(this._backdrop).appendTo(document.body),zt(this._element).on(Jt.CLICK_DISMISS,function(t){e._ignoreBackdropClick?e._ignoreBackdropClick=!1:t.target===t.currentTarget&&("static"===e._config.backdrop?e._element.focus():e.hide())}),r&&xn.reflow(this._backdrop),zt(this._backdrop).addClass(re),!t)return;if(!r)return void t();zt(this._backdrop).one(xn.TRANSITION_END,t).emulateTransitionEnd(150)}else if(!this._isShown&&this._backdrop){zt(this._backdrop).removeClass(re);var i=function(){e._removeBackdrop(),t&&t()};xn.supportsTransitionEnd()&&zt(this._element).hasClass(ne)?zt(this._backdrop).one(xn.TRANSITION_END,i).emulateTransitionEnd(150):i()}else t&&t()},e._adjustDialog=function(){var t=this._element.scrollHeight>document.documentElement.clientHeight;!this._isBodyOverflowing&&t&&(this._element.style.paddingLeft=this._scrollbarWidth+"px"),this._isBodyOverflowing&&!t&&(this._element.style.paddingRight=this._scrollbarWidth+"px")},e._resetAdjustments=function(){this._element.style.paddingLeft="",this._element.style.paddingRight=""},e._checkScrollbar=function(){var t=document.body.getBoundingClientRect();this._isBodyOverflowing=t.left+t.right<window.innerWidth,this._scrollbarWidth=this._getScrollbarWidth()},e._setScrollbar=function(){var t=this;if(this._isBodyOverflowing){zt(ie.FIXED_CONTENT).each(function(e,n){var r=zt(n)[0].style.paddingRight,i=zt(n).css("padding-right");zt(n).data("padding-right",r).css("padding-right",parseFloat(i)+t._scrollbarWidth+"px")}),zt(ie.STICKY_CONTENT).each(function(e,n){var r=zt(n)[0].style.marginRight,i=zt(n).css("margin-right");zt(n).data("margin-right",r).css("margin-right",parseFloat(i)-t._scrollbarWidth+"px")}),zt(ie.NAVBAR_TOGGLER).each(function(e,n){var r=zt(n)[0].style.marginRight,i=zt(n).css("margin-right");zt(n).data("margin-right",r).css("margin-right",parseFloat(i)+t._scrollbarWidth+"px")});var e=document.body.style.paddingRight,n=zt("body").css("padding-right");zt("body").data("padding-right",e).css("padding-right",parseFloat(n)+this._scrollbarWidth+"px")}},e._resetScrollbar=function(){zt(ie.FIXED_CONTENT).each(function(t,e){var n=zt(e).data("padding-right");void 0!==n&&zt(e).css("padding-right",n).removeData("padding-right")}),zt(ie.STICKY_CONTENT+", "+ie.NAVBAR_TOGGLER).each(function(t,e){var n=zt(e).data("margin-right");void 0!==n&&zt(e).css("margin-right",n).removeData("margin-right")});var t=zt("body").data("padding-right");void 0!==t&&zt("body").css("padding-right",t).removeData("padding-right")},e._getScrollbarWidth=function(){var t=document.createElement("div");t.className=Zt,document.body.appendChild(t);var e=t.getBoundingClientRect().width-t.clientWidth;return document.body.removeChild(t),e},t._jQueryInterface=function(e,n){return this.each(function(){var r=zt(this).data(Kt),i=o({},t.Default,zt(this).data(),"object"==typeof e&&e);if(r||(r=new t(this,i),zt(this).data(Kt,r)),"string"==typeof e){if(void 0===r[e])throw new TypeError('No method named "'+e+'"');r[e](n)}else i.show&&r.show(n)})},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return Yt}}]),t}(),zt(document).on(Jt.CLICK_DATA_API,ie.DATA_TOGGLE,function(t){var e,n=this,r=xn.getSelectorFromElement(this);r&&(e=zt(r)[0]);var i=zt(e).data(Kt)?"toggle":o({},zt(e).data(),zt(this).data());"A"!==this.tagName&&"AREA"!==this.tagName||t.preventDefault();var a=zt(e).one(Jt.SHOW,function(t){t.isDefaultPrevented()||a.one(Jt.HIDDEN,function(){zt(n).is(":visible")&&n.focus()})});oe._jQueryInterface.call(zt(e),i,this)}),zt.fn[Vt]=oe._jQueryInterface,zt.fn[Vt].Constructor=oe,zt.fn[Vt].noConflict=function(){return zt.fn[Vt]=Gt,oe._jQueryInterface},oe),On=(se="tooltip",ce="."+(ue="bs.tooltip"),le=(ae=e).fn[se],fe="bs-tooltip",pe=new RegExp("(^|\\s)"+fe+"\\S+","g"),de={animation:"boolean",template:"string",title:"(string|element|function)",trigger:"string",delay:"(number|object)",html:"boolean",selector:"(string|boolean)",placement:"(string|function)",offset:"(number|string)",container:"(string|element|boolean)",fallbackPlacement:"(string|array)",boundary:"(string|element)"},he={AUTO:"auto",TOP:"top",RIGHT:"right",BOTTOM:"bottom",LEFT:"left"},ve={animation:!0,template:'<div class="tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,selector:!1,placement:"top",offset:0,container:!1,fallbackPlacement:"flip",boundary:"scrollParent"},ge="show",me="out",ye={HIDE:"hide"+ce,HIDDEN:"hidden"+ce,SHOW:"show"+ce,SHOWN:"shown"+ce,INSERTED:"inserted"+ce,CLICK:"click"+ce,FOCUSIN:"focusin"+ce,FOCUSOUT:"focusout"+ce,MOUSEENTER:"mouseenter"+ce,MOUSELEAVE:"mouseleave"+ce},_e="fade",be="show",we=".tooltip-inner",xe=".arrow",Ce="hover",Te="focus",Ee="click",Ae="manual",Se=function(){function t(t,e){if(void 0===n)throw new TypeError("Bootstrap tooltips require Popper.js (https://popper.js.org)");this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._popper=null,this.element=t,this.config=this._getConfig(e),this.tip=null,this._setListeners()}var e=t.prototype;return e.enable=function(){this._isEnabled=!0},e.disable=function(){this._isEnabled=!1},e.toggleEnabled=function(){this._isEnabled=!this._isEnabled},e.toggle=function(t){if(this._isEnabled)if(t){var e=this.constructor.DATA_KEY,n=ae(t.currentTarget).data(e);n||(n=new this.constructor(t.currentTarget,this._getDelegateConfig()),ae(t.currentTarget).data(e,n)),n._activeTrigger.click=!n._activeTrigger.click,n._isWithActiveTrigger()?n._enter(null,n):n._leave(null,n)}else{if(ae(this.getTipElement()).hasClass(be))return void this._leave(null,this);this._enter(null,this)}},e.dispose=function(){clearTimeout(this._timeout),ae.removeData(this.element,this.constructor.DATA_KEY),ae(this.element).off(this.constructor.EVENT_KEY),ae(this.element).closest(".modal").off("hide.bs.modal"),this.tip&&ae(this.tip).remove(),this._isEnabled=null,this._timeout=null,this._hoverState=null,this._activeTrigger=null,null!==this._popper&&this._popper.destroy(),this._popper=null,this.element=null,this.config=null,this.tip=null},e.show=function(){var e=this;if("none"===ae(this.element).css("display"))throw new Error("Please use show on visible elements");var r=ae.Event(this.constructor.Event.SHOW);if(this.isWithContent()&&this._isEnabled){ae(this.element).trigger(r);var i=ae.contains(this.element.ownerDocument.documentElement,this.element);if(r.isDefaultPrevented()||!i)return;var o=this.getTipElement(),a=xn.getUID(this.constructor.NAME);o.setAttribute("id",a),this.element.setAttribute("aria-describedby",a),this.setContent(),this.config.animation&&ae(o).addClass(_e);var s="function"==typeof this.config.placement?this.config.placement.call(this,o,this.element):this.config.placement,u=this._getAttachment(s);this.addAttachmentClass(u);var c=!1===this.config.container?document.body:ae(this.config.container);ae(o).data(this.constructor.DATA_KEY,this),ae.contains(this.element.ownerDocument.documentElement,this.tip)||ae(o).appendTo(c),ae(this.element).trigger(this.constructor.Event.INSERTED),this._popper=new n(this.element,o,{placement:u,modifiers:{offset:{offset:this.config.offset},flip:{behavior:this.config.fallbackPlacement},arrow:{element:xe},preventOverflow:{boundariesElement:this.config.boundary}},onCreate:function(t){t.originalPlacement!==t.placement&&e._handlePopperPlacementChange(t)},onUpdate:function(t){e._handlePopperPlacementChange(t)}}),ae(o).addClass(be),"ontouchstart"in document.documentElement&&ae("body").children().on("mouseover",null,ae.noop);var l=function(){e.config.animation&&e._fixTransition();var t=e._hoverState;e._hoverState=null,ae(e.element).trigger(e.constructor.Event.SHOWN),t===me&&e._leave(null,e)};xn.supportsTransitionEnd()&&ae(this.tip).hasClass(_e)?ae(this.tip).one(xn.TRANSITION_END,l).emulateTransitionEnd(t._TRANSITION_DURATION):l()}},e.hide=function(t){var e=this,n=this.getTipElement(),r=ae.Event(this.constructor.Event.HIDE),i=function(){e._hoverState!==ge&&n.parentNode&&n.parentNode.removeChild(n),e._cleanTipClass(),e.element.removeAttribute("aria-describedby"),ae(e.element).trigger(e.constructor.Event.HIDDEN),null!==e._popper&&e._popper.destroy(),t&&t()};ae(this.element).trigger(r),r.isDefaultPrevented()||(ae(n).removeClass(be),"ontouchstart"in document.documentElement&&ae("body").children().off("mouseover",null,ae.noop),this._activeTrigger[Ee]=!1,this._activeTrigger[Te]=!1,this._activeTrigger[Ce]=!1,xn.supportsTransitionEnd()&&ae(this.tip).hasClass(_e)?ae(n).one(xn.TRANSITION_END,i).emulateTransitionEnd(150):i(),this._hoverState="")},e.update=function(){null!==this._popper&&this._popper.scheduleUpdate()},e.isWithContent=function(){return Boolean(this.getTitle())},e.addAttachmentClass=function(t){ae(this.getTipElement()).addClass(fe+"-"+t)},e.getTipElement=function(){return this.tip=this.tip||ae(this.config.template)[0],this.tip},e.setContent=function(){var t=ae(this.getTipElement());this.setElementContent(t.find(we),this.getTitle()),t.removeClass(_e+" "+be)},e.setElementContent=function(t,e){var n=this.config.html;"object"==typeof e&&(e.nodeType||e.jquery)?n?ae(e).parent().is(t)||t.empty().append(e):t.text(ae(e).text()):t[n?"html":"text"](e)},e.getTitle=function(){var t=this.element.getAttribute("data-original-title");return t||(t="function"==typeof this.config.title?this.config.title.call(this.element):this.config.title),t},e._getAttachment=function(t){return he[t.toUpperCase()]},e._setListeners=function(){var t=this;this.config.trigger.split(" ").forEach(function(e){if("click"===e)ae(t.element).on(t.constructor.Event.CLICK,t.config.selector,function(e){return t.toggle(e)});else if(e!==Ae){var n=e===Ce?t.constructor.Event.MOUSEENTER:t.constructor.Event.FOCUSIN,r=e===Ce?t.constructor.Event.MOUSELEAVE:t.constructor.Event.FOCUSOUT;ae(t.element).on(n,t.config.selector,function(e){return t._enter(e)}).on(r,t.config.selector,function(e){return t._leave(e)})}ae(t.element).closest(".modal").on("hide.bs.modal",function(){return t.hide()})}),this.config.selector?this.config=o({},this.config,{trigger:"manual",selector:""}):this._fixTitle()},e._fixTitle=function(){var t=typeof this.element.getAttribute("data-original-title");(this.element.getAttribute("title")||"string"!==t)&&(this.element.setAttribute("data-original-title",this.element.getAttribute("title")||""),this.element.setAttribute("title",""))},e._enter=function(t,e){var n=this.constructor.DATA_KEY;(e=e||ae(t.currentTarget).data(n))||(e=new this.constructor(t.currentTarget,this._getDelegateConfig()),ae(t.currentTarget).data(n,e)),t&&(e._activeTrigger["focusin"===t.type?Te:Ce]=!0),ae(e.getTipElement()).hasClass(be)||e._hoverState===ge?e._hoverState=ge:(clearTimeout(e._timeout),e._hoverState=ge,e.config.delay&&e.config.delay.show?e._timeout=setTimeout(function(){e._hoverState===ge&&e.show()},e.config.delay.show):e.show())},e._leave=function(t,e){var n=this.constructor.DATA_KEY;(e=e||ae(t.currentTarget).data(n))||(e=new this.constructor(t.currentTarget,this._getDelegateConfig()),ae(t.currentTarget).data(n,e)),t&&(e._activeTrigger["focusout"===t.type?Te:Ce]=!1),e._isWithActiveTrigger()||(clearTimeout(e._timeout),e._hoverState=me,e.config.delay&&e.config.delay.hide?e._timeout=setTimeout(function(){e._hoverState===me&&e.hide()},e.config.delay.hide):e.hide())},e._isWithActiveTrigger=function(){for(var t in this._activeTrigger)if(this._activeTrigger[t])return!0;return!1},e._getConfig=function(t){return"number"==typeof(t=o({},this.constructor.Default,ae(this.element).data(),t)).delay&&(t.delay={show:t.delay,hide:t.delay}),"number"==typeof t.title&&(t.title=t.title.toString()),"number"==typeof t.content&&(t.content=t.content.toString()),xn.typeCheckConfig(se,t,this.constructor.DefaultType),t},e._getDelegateConfig=function(){var t={};if(this.config)for(var e in this.config)this.constructor.Default[e]!==this.config[e]&&(t[e]=this.config[e]);return t},e._cleanTipClass=function(){var t=ae(this.getTipElement()),e=t.attr("class").match(pe);null!==e&&e.length>0&&t.removeClass(e.join(""))},e._handlePopperPlacementChange=function(t){this._cleanTipClass(),this.addAttachmentClass(this._getAttachment(t.placement))},e._fixTransition=function(){var t=this.getTipElement(),e=this.config.animation;null===t.getAttribute("x-placement")&&(ae(t).removeClass(_e),this.config.animation=!1,this.hide(),this.show(),this.config.animation=e)},t._jQueryInterface=function(e){return this.each(function(){var n=ae(this).data(ue),r="object"==typeof e&&e;if((n||!/dispose|hide/.test(e))&&(n||(n=new t(this,r),ae(this).data(ue,n)),"string"==typeof e)){if(void 0===n[e])throw new TypeError('No method named "'+e+'"');n[e]()}})},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return ve}},{key:"NAME",get:function(){return se}},{key:"DATA_KEY",get:function(){return ue}},{key:"Event",get:function(){return ye}},{key:"EVENT_KEY",get:function(){return ce}},{key:"DefaultType",get:function(){return de}}]),t}(),ae.fn[se]=Se._jQueryInterface,ae.fn[se].Constructor=Se,ae.fn[se].noConflict=function(){return ae.fn[se]=le,Se._jQueryInterface},Se),Dn=(Oe="popover",Ie="."+(De="bs.popover"),Ne=(ke=e).fn[Oe],je="bs-popover",Le=new RegExp("(^|\\s)"+je+"\\S+","g"),$e=o({},On.Default,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'}),Re=o({},On.DefaultType,{content:"(string|element|function)"}),Pe="fade",Me="show",Fe=".popover-header",He=".popover-body",Be={HIDE:"hide"+Ie,HIDDEN:"hidden"+Ie,SHOW:"show"+Ie,SHOWN:"shown"+Ie,INSERTED:"inserted"+Ie,CLICK:"click"+Ie,FOCUSIN:"focusin"+Ie,FOCUSOUT:"focusout"+Ie,MOUSEENTER:"mouseenter"+Ie,MOUSELEAVE:"mouseleave"+Ie},We=function(t){var e,n;function r(){return t.apply(this,arguments)||this}n=t,(e=r).prototype=Object.create(n.prototype),e.prototype.constructor=e,e.__proto__=n;var o=r.prototype;return o.isWithContent=function(){return this.getTitle()||this._getContent()},o.addAttachmentClass=function(t){ke(this.getTipElement()).addClass(je+"-"+t)},o.getTipElement=function(){return this.tip=this.tip||ke(this.config.template)[0],this.tip},o.setContent=function(){var t=ke(this.getTipElement());this.setElementContent(t.find(Fe),this.getTitle());var e=this._getContent();"function"==typeof e&&(e=e.call(this.element)),this.setElementContent(t.find(He),e),t.removeClass(Pe+" "+Me)},o._getContent=function(){return this.element.getAttribute("data-content")||this.config.content},o._cleanTipClass=function(){var t=ke(this.getTipElement()),e=t.attr("class").match(Le);null!==e&&e.length>0&&t.removeClass(e.join(""))},r._jQueryInterface=function(t){return this.each(function(){var e=ke(this).data(De),n="object"==typeof t?t:null;if((e||!/destroy|hide/.test(t))&&(e||(e=new r(this,n),ke(this).data(De,e)),"string"==typeof t)){if(void 0===e[t])throw new TypeError('No method named "'+t+'"');e[t]()}})},i(r,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return $e}},{key:"NAME",get:function(){return Oe}},{key:"DATA_KEY",get:function(){return De}},{key:"Event",get:function(){return Be}},{key:"EVENT_KEY",get:function(){return Ie}},{key:"DefaultType",get:function(){return Re}}]),r}(On),ke.fn[Oe]=We._jQueryInterface,ke.fn[Oe].Constructor=We,ke.fn[Oe].noConflict=function(){return ke.fn[Oe]=Ne,We._jQueryInterface},We),In=(Ue="scrollspy",Ve="."+(ze="bs.scrollspy"),Ke=(qe=e).fn[Ue],Qe={offset:10,method:"auto",target:""},Ge={offset:"number",method:"string",target:"(string|element)"},Ye={ACTIVATE:"activate"+Ve,SCROLL:"scroll"+Ve,LOAD_DATA_API:"load"+Ve+".data-api"},Xe="dropdown-item",Je="active",Ze={DATA_SPY:'[data-spy="scroll"]',ACTIVE:".active",NAV_LIST_GROUP:".nav, .list-group",NAV_LINKS:".nav-link",NAV_ITEMS:".nav-item",LIST_ITEMS:".list-group-item",DROPDOWN:".dropdown",DROPDOWN_ITEMS:".dropdown-item",DROPDOWN_TOGGLE:".dropdown-toggle"},tn="offset",en="position",nn=function(){function t(t,e){var n=this;this._element=t,this._scrollElement="BODY"===t.tagName?window:t,this._config=this._getConfig(e),this._selector=this._config.target+" "+Ze.NAV_LINKS+","+this._config.target+" "+Ze.LIST_ITEMS+","+this._config.target+" "+Ze.DROPDOWN_ITEMS,this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,qe(this._scrollElement).on(Ye.SCROLL,function(t){return n._process(t)}),this.refresh(),this._process()}var e=t.prototype;return e.refresh=function(){var t=this,e=this._scrollElement===this._scrollElement.window?tn:en,n="auto"===this._config.method?e:this._config.method,r=n===en?this._getScrollTop():0;this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight(),qe.makeArray(qe(this._selector)).map(function(t){var e,i=xn.getSelectorFromElement(t);if(i&&(e=qe(i)[0]),e){var o=e.getBoundingClientRect();if(o.width||o.height)return[qe(e)[n]().top+r,i]}return null}).filter(function(t){return t}).sort(function(t,e){return t[0]-e[0]}).forEach(function(e){t._offsets.push(e[0]),t._targets.push(e[1])})},e.dispose=function(){qe.removeData(this._element,ze),qe(this._scrollElement).off(Ve),this._element=null,this._scrollElement=null,this._config=null,this._selector=null,this._offsets=null,this._targets=null,this._activeTarget=null,this._scrollHeight=null},e._getConfig=function(t){if("string"!=typeof(t=o({},Qe,t)).target){var e=qe(t.target).attr("id");e||(e=xn.getUID(Ue),qe(t.target).attr("id",e)),t.target="#"+e}return xn.typeCheckConfig(Ue,t,Ge),t},e._getScrollTop=function(){return this._scrollElement===window?this._scrollElement.pageYOffset:this._scrollElement.scrollTop},e._getScrollHeight=function(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)},e._getOffsetHeight=function(){return this._scrollElement===window?window.innerHeight:this._scrollElement.getBoundingClientRect().height},e._process=function(){var t=this._getScrollTop()+this._config.offset,e=this._getScrollHeight(),n=this._config.offset+e-this._getOffsetHeight();if(this._scrollHeight!==e&&this.refresh(),t>=n){var r=this._targets[this._targets.length-1];this._activeTarget!==r&&this._activate(r)}else{if(this._activeTarget&&t<this._offsets[0]&&this._offsets[0]>0)return this._activeTarget=null,void this._clear();for(var i=this._offsets.length;i--;){this._activeTarget!==this._targets[i]&&t>=this._offsets[i]&&(void 0===this._offsets[i+1]||t<this._offsets[i+1])&&this._activate(this._targets[i])}}},e._activate=function(t){this._activeTarget=t,this._clear();var e=this._selector.split(",");e=e.map(function(e){return e+'[data-target="'+t+'"],'+e+'[href="'+t+'"]'});var n=qe(e.join(","));n.hasClass(Xe)?(n.closest(Ze.DROPDOWN).find(Ze.DROPDOWN_TOGGLE).addClass(Je),n.addClass(Je)):(n.addClass(Je),n.parents(Ze.NAV_LIST_GROUP).prev(Ze.NAV_LINKS+", "+Ze.LIST_ITEMS).addClass(Je),n.parents(Ze.NAV_LIST_GROUP).prev(Ze.NAV_ITEMS).children(Ze.NAV_LINKS).addClass(Je)),qe(this._scrollElement).trigger(Ye.ACTIVATE,{relatedTarget:t})},e._clear=function(){qe(this._selector).filter(Ze.ACTIVE).removeClass(Je)},t._jQueryInterface=function(e){return this.each(function(){var n=qe(this).data(ze);if(n||(n=new t(this,"object"==typeof e&&e),qe(this).data(ze,n)),"string"==typeof e){if(void 0===n[e])throw new TypeError('No method named "'+e+'"');n[e]()}})},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}},{key:"Default",get:function(){return Qe}}]),t}(),qe(window).on(Ye.LOAD_DATA_API,function(){for(var t=qe.makeArray(qe(Ze.DATA_SPY)),e=t.length;e--;){var n=qe(t[e]);nn._jQueryInterface.call(n,n.data())}}),qe.fn[Ue]=nn._jQueryInterface,qe.fn[Ue].Constructor=nn,qe.fn[Ue].noConflict=function(){return qe.fn[Ue]=Ke,nn._jQueryInterface},nn),Nn=(an="."+(on="bs.tab"),sn=(rn=e).fn.tab,un={HIDE:"hide"+an,HIDDEN:"hidden"+an,SHOW:"show"+an,SHOWN:"shown"+an,CLICK_DATA_API:"click.bs.tab.data-api"},cn="dropdown-menu",ln="active",fn="disabled",pn="fade",dn="show",hn=".dropdown",vn=".nav, .list-group",gn=".active",mn="> li > .active",yn='[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',_n=".dropdown-toggle",bn="> .dropdown-menu .active",wn=function(){function t(t){this._element=t}var e=t.prototype;return e.show=function(){var t=this;if(!(this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE&&rn(this._element).hasClass(ln)||rn(this._element).hasClass(fn))){var e,n,r=rn(this._element).closest(vn)[0],i=xn.getSelectorFromElement(this._element);if(r){var o="UL"===r.nodeName?mn:gn;n=(n=rn.makeArray(rn(r).find(o)))[n.length-1]}var a=rn.Event(un.HIDE,{relatedTarget:this._element}),s=rn.Event(un.SHOW,{relatedTarget:n});if(n&&rn(n).trigger(a),rn(this._element).trigger(s),!s.isDefaultPrevented()&&!a.isDefaultPrevented()){i&&(e=rn(i)[0]),this._activate(this._element,r);var u=function(){var e=rn.Event(un.HIDDEN,{relatedTarget:t._element}),r=rn.Event(un.SHOWN,{relatedTarget:n});rn(n).trigger(e),rn(t._element).trigger(r)};e?this._activate(e,e.parentNode,u):u()}}},e.dispose=function(){rn.removeData(this._element,on),this._element=null},e._activate=function(t,e,n){var r=this,i=("UL"===e.nodeName?rn(e).find(mn):rn(e).children(gn))[0],o=n&&xn.supportsTransitionEnd()&&i&&rn(i).hasClass(pn),a=function(){return r._transitionComplete(t,i,n)};i&&o?rn(i).one(xn.TRANSITION_END,a).emulateTransitionEnd(150):a()},e._transitionComplete=function(t,e,n){if(e){rn(e).removeClass(dn+" "+ln);var r=rn(e.parentNode).find(bn)[0];r&&rn(r).removeClass(ln),"tab"===e.getAttribute("role")&&e.setAttribute("aria-selected",!1)}if(rn(t).addClass(ln),"tab"===t.getAttribute("role")&&t.setAttribute("aria-selected",!0),xn.reflow(t),rn(t).addClass(dn),t.parentNode&&rn(t.parentNode).hasClass(cn)){var i=rn(t).closest(hn)[0];i&&rn(i).find(_n).addClass(ln),t.setAttribute("aria-expanded",!0)}n&&n()},t._jQueryInterface=function(e){return this.each(function(){var n=rn(this),r=n.data(on);if(r||(r=new t(this),n.data(on,r)),"string"==typeof e){if(void 0===r[e])throw new TypeError('No method named "'+e+'"');r[e]()}})},i(t,null,[{key:"VERSION",get:function(){return"4.0.0"}}]),t}(),rn(document).on(un.CLICK_DATA_API,yn,function(t){t.preventDefault(),wn._jQueryInterface.call(rn(this),"show")}),rn.fn.tab=wn._jQueryInterface,rn.fn.tab.Constructor=wn,rn.fn.tab.noConflict=function(){return rn.fn.tab=sn,wn._jQueryInterface},wn);!function(t){if(void 0===t)throw new TypeError("Bootstrap's JavaScript requires jQuery. jQuery must be included before Bootstrap's JavaScript.");var e=t.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1===e[0]&&9===e[1]&&e[2]<1||e[0]>=4)throw new Error("Bootstrap's JavaScript requires at least jQuery v1.9.1 but less than v4.0.0")}(e),t.Util=xn,t.Alert=Cn,t.Button=Tn,t.Carousel=En,t.Collapse=An,t.Dropdown=Sn,t.Modal=kn,t.Popover=Dn,t.Scrollspy=In,t.Tab=Nn,t.Tooltip=On,Object.defineProperty(t,"__esModule",{value:!0})})(e,n(4),n(3))},function(t,e,n){t.exports=n(18)},function(t,e,n){"use strict";var r=n(0),i=n(5),o=n(20),a=n(2);function s(t){var e=new o(t),n=i(o.prototype.request,e);return r.extend(n,o.prototype,e),r.extend(n,e),n}var u=s(a);u.Axios=o,u.create=function(t){return s(r.merge(a,t))},u.Cancel=n(10),u.CancelToken=n(34),u.isCancel=n(9),u.all=function(t){return Promise.all(t)},u.spread=n(35),t.exports=u,t.exports.default=u},function(t,e){function n(t){return!!t.constructor&&"function"==typeof t.constructor.isBuffer&&t.constructor.isBuffer(t)}t.exports=function(t){return null!=t&&(n(t)||"function"==typeof(e=t).readFloatLE&&"function"==typeof e.slice&&n(e.slice(0,0))||!!t._isBuffer);var e}},function(t,e,n){"use strict";var r=n(2),i=n(0),o=n(29),a=n(30);function s(t){this.defaults=t,this.interceptors={request:new o,response:new o}}s.prototype.request=function(t){"string"==typeof t&&(t=i.merge({url:arguments[0]},arguments[1])),(t=i.merge(r,this.defaults,{method:"get"},t)).method=t.method.toLowerCase();var e=[a,void 0],n=Promise.resolve(t);for(this.interceptors.request.forEach(function(t){e.unshift(t.fulfilled,t.rejected)}),this.interceptors.response.forEach(function(t){e.push(t.fulfilled,t.rejected)});e.length;)n=n.then(e.shift(),e.shift());return n},i.forEach(["delete","get","head","options"],function(t){s.prototype[t]=function(e,n){return this.request(i.merge(n||{},{method:t,url:e}))}}),i.forEach(["post","put","patch"],function(t){s.prototype[t]=function(e,n,r){return this.request(i.merge(r||{},{method:t,url:e,data:n}))}}),t.exports=s},function(t,e,n){"use strict";var r=n(0);t.exports=function(t,e){r.forEach(t,function(n,r){r!==e&&r.toUpperCase()===e.toUpperCase()&&(t[e]=n,delete t[r])})}},function(t,e,n){"use strict";var r=n(8);t.exports=function(t,e,n){var i=n.config.validateStatus;n.status&&i&&!i(n.status)?e(r("Request failed with status code "+n.status,n.config,null,n.request,n)):t(n)}},function(t,e,n){"use strict";t.exports=function(t,e,n,r,i){return t.config=e,n&&(t.code=n),t.request=r,t.response=i,t}},function(t,e,n){"use strict";var r=n(0);function i(t){return encodeURIComponent(t).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}t.exports=function(t,e,n){if(!e)return t;var o;if(n)o=n(e);else if(r.isURLSearchParams(e))o=e.toString();else{var a=[];r.forEach(e,function(t,e){null!==t&&void 0!==t&&(r.isArray(t)&&(e+="[]"),r.isArray(t)||(t=[t]),r.forEach(t,function(t){r.isDate(t)?t=t.toISOString():r.isObject(t)&&(t=JSON.stringify(t)),a.push(i(e)+"="+i(t))}))}),o=a.join("&")}return o&&(t+=(-1===t.indexOf("?")?"?":"&")+o),t}},function(t,e,n){"use strict";var r=n(0),i=["age","authorization","content-length","content-type","etag","expires","from","host","if-modified-since","if-unmodified-since","last-modified","location","max-forwards","proxy-authorization","referer","retry-after","user-agent"];t.exports=function(t){var e,n,o,a={};return t?(r.forEach(t.split("\n"),function(t){if(o=t.indexOf(":"),e=r.trim(t.substr(0,o)).toLowerCase(),n=r.trim(t.substr(o+1)),e){if(a[e]&&i.indexOf(e)>=0)return;a[e]="set-cookie"===e?(a[e]?a[e]:[]).concat([n]):a[e]?a[e]+", "+n:n}}),a):a}},function(t,e,n){"use strict";var r=n(0);t.exports=r.isStandardBrowserEnv()?function(){var t,e=/(msie|trident)/i.test(navigator.userAgent),n=document.createElement("a");function i(t){var r=t;return e&&(n.setAttribute("href",r),r=n.href),n.setAttribute("href",r),{href:n.href,protocol:n.protocol?n.protocol.replace(/:$/,""):"",host:n.host,search:n.search?n.search.replace(/^\?/,""):"",hash:n.hash?n.hash.replace(/^#/,""):"",hostname:n.hostname,port:n.port,pathname:"/"===n.pathname.charAt(0)?n.pathname:"/"+n.pathname}}return t=i(window.location.href),function(e){var n=r.isString(e)?i(e):e;return n.protocol===t.protocol&&n.host===t.host}}():function(){return!0}},function(t,e,n){"use strict";var r="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";function i(){this.message="String contains an invalid character"}i.prototype=new Error,i.prototype.code=5,i.prototype.name="InvalidCharacterError",t.exports=function(t){for(var e,n,o=String(t),a="",s=0,u=r;o.charAt(0|s)||(u="=",s%1);a+=u.charAt(63&e>>8-s%1*8)){if((n=o.charCodeAt(s+=.75))>255)throw new i;e=e<<8|n}return a}},function(t,e,n){"use strict";var r=n(0);t.exports=r.isStandardBrowserEnv()?{write:function(t,e,n,i,o,a){var s=[];s.push(t+"="+encodeURIComponent(e)),r.isNumber(n)&&s.push("expires="+new Date(n).toGMTString()),r.isString(i)&&s.push("path="+i),r.isString(o)&&s.push("domain="+o),!0===a&&s.push("secure"),document.cookie=s.join("; ")},read:function(t){var e=document.cookie.match(new RegExp("(^|;\\s*)("+t+")=([^;]*)"));return e?decodeURIComponent(e[3]):null},remove:function(t){this.write(t,"",Date.now()-864e5)}}:{write:function(){},read:function(){return null},remove:function(){}}},function(t,e,n){"use strict";var r=n(0);function i(){this.handlers=[]}i.prototype.use=function(t,e){return this.handlers.push({fulfilled:t,rejected:e}),this.handlers.length-1},i.prototype.eject=function(t){this.handlers[t]&&(this.handlers[t]=null)},i.prototype.forEach=function(t){r.forEach(this.handlers,function(e){null!==e&&t(e)})},t.exports=i},function(t,e,n){"use strict";var r=n(0),i=n(31),o=n(9),a=n(2),s=n(32),u=n(33);function c(t){t.cancelToken&&t.cancelToken.throwIfRequested()}t.exports=function(t){return c(t),t.baseURL&&!s(t.url)&&(t.url=u(t.baseURL,t.url)),t.headers=t.headers||{},t.data=i(t.data,t.headers,t.transformRequest),t.headers=r.merge(t.headers.common||{},t.headers[t.method]||{},t.headers||{}),r.forEach(["delete","get","head","post","put","patch","common"],function(e){delete t.headers[e]}),(t.adapter||a.adapter)(t).then(function(e){return c(t),e.data=i(e.data,e.headers,t.transformResponse),e},function(e){return o(e)||(c(t),e&&e.response&&(e.response.data=i(e.response.data,e.response.headers,t.transformResponse))),Promise.reject(e)})}},function(t,e,n){"use strict";var r=n(0);t.exports=function(t,e,n){return r.forEach(n,function(n){t=n(t,e)}),t}},function(t,e,n){"use strict";t.exports=function(t){return/^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(t)}},function(t,e,n){"use strict";t.exports=function(t,e){return e?t.replace(/\/+$/,"")+"/"+e.replace(/^\/+/,""):t}},function(t,e,n){"use strict";var r=n(10);function i(t){if("function"!=typeof t)throw new TypeError("executor must be a function.");var e;this.promise=new Promise(function(t){e=t});var n=this;t(function(t){n.reason||(n.reason=new r(t),e(n.reason))})}i.prototype.throwIfRequested=function(){if(this.reason)throw this.reason},i.source=function(){var t;return{token:new i(function(e){t=e}),cancel:t}},t.exports=i},function(t,e,n){"use strict";t.exports=function(t){return function(e){return t.apply(null,e)}}},function(t,e,n){"use strict";(function(e,n){var r=Object.freeze({});function i(t){return void 0===t||null===t}function o(t){return void 0!==t&&null!==t}function a(t){return!0===t}function s(t){return"string"==typeof t||"number"==typeof t||"symbol"==typeof t||"boolean"==typeof t}function u(t){return null!==t&&"object"==typeof t}var c=Object.prototype.toString;function l(t){return"[object Object]"===c.call(t)}function f(t){return"[object RegExp]"===c.call(t)}function p(t){var e=parseFloat(String(t));return e>=0&&Math.floor(e)===e&&isFinite(t)}function d(t){return null==t?"":"object"==typeof t?JSON.stringify(t,null,2):String(t)}function h(t){var e=parseFloat(t);return isNaN(e)?t:e}function v(t,e){for(var n=Object.create(null),r=t.split(","),i=0;i<r.length;i++)n[r[i]]=!0;return e?function(t){return n[t.toLowerCase()]}:function(t){return n[t]}}var g=v("slot,component",!0),m=v("key,ref,slot,slot-scope,is");function y(t,e){if(t.length){var n=t.indexOf(e);if(n>-1)return t.splice(n,1)}}var _=Object.prototype.hasOwnProperty;function b(t,e){return _.call(t,e)}function w(t){var e=Object.create(null);return function(n){return e[n]||(e[n]=t(n))}}var x=/-(\w)/g,C=w(function(t){return t.replace(x,function(t,e){return e?e.toUpperCase():""})}),T=w(function(t){return t.charAt(0).toUpperCase()+t.slice(1)}),E=/\B([A-Z])/g,A=w(function(t){return t.replace(E,"-$1").toLowerCase()});function S(t,e){function n(n){var r=arguments.length;return r?r>1?t.apply(e,arguments):t.call(e,n):t.call(e)}return n._length=t.length,n}function k(t,e){e=e||0;for(var n=t.length-e,r=new Array(n);n--;)r[n]=t[n+e];return r}function O(t,e){for(var n in e)t[n]=e[n];return t}function D(t){for(var e={},n=0;n<t.length;n++)t[n]&&O(e,t[n]);return e}function I(t,e,n){}var N=function(t,e,n){return!1},j=function(t){return t};function L(t,e){if(t===e)return!0;var n=u(t),r=u(e);if(!n||!r)return!n&&!r&&String(t)===String(e);try{var i=Array.isArray(t),o=Array.isArray(e);if(i&&o)return t.length===e.length&&t.every(function(t,n){return L(t,e[n])});if(i||o)return!1;var a=Object.keys(t),s=Object.keys(e);return a.length===s.length&&a.every(function(n){return L(t[n],e[n])})}catch(t){return!1}}function $(t,e){for(var n=0;n<t.length;n++)if(L(t[n],e))return n;return-1}function R(t){var e=!1;return function(){e||(e=!0,t.apply(this,arguments))}}var P="data-server-rendered",M=["component","directive","filter"],F=["beforeCreate","created","beforeMount","mounted","beforeUpdate","updated","beforeDestroy","destroyed","activated","deactivated","errorCaptured"],H={optionMergeStrategies:Object.create(null),silent:!1,productionTip:!1,devtools:!1,performance:!1,errorHandler:null,warnHandler:null,ignoredElements:[],keyCodes:Object.create(null),isReservedTag:N,isReservedAttr:N,isUnknownElement:N,getTagNamespace:I,parsePlatformTagName:j,mustUseProp:N,_lifecycleHooks:F};function B(t){var e=(t+"").charCodeAt(0);return 36===e||95===e}function W(t,e,n,r){Object.defineProperty(t,e,{value:n,enumerable:!!r,writable:!0,configurable:!0})}var q=/[^\w.$]/;var U,z="__proto__"in{},V="undefined"!=typeof window,K="undefined"!=typeof WXEnvironment&&!!WXEnvironment.platform,Q=K&&WXEnvironment.platform.toLowerCase(),G=V&&window.navigator.userAgent.toLowerCase(),Y=G&&/msie|trident/.test(G),X=G&&G.indexOf("msie 9.0")>0,J=G&&G.indexOf("edge/")>0,Z=G&&G.indexOf("android")>0||"android"===Q,tt=G&&/iphone|ipad|ipod|ios/.test(G)||"ios"===Q,et=(G&&/chrome\/\d+/.test(G),{}.watch),nt=!1;if(V)try{var rt={};Object.defineProperty(rt,"passive",{get:function(){nt=!0}}),window.addEventListener("test-passive",null,rt)}catch(t){}var it=function(){return void 0===U&&(U=!V&&void 0!==e&&"server"===e.process.env.VUE_ENV),U},ot=V&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__;function at(t){return"function"==typeof t&&/native code/.test(t.toString())}var st,ut="undefined"!=typeof Symbol&&at(Symbol)&&"undefined"!=typeof Reflect&&at(Reflect.ownKeys);st="undefined"!=typeof Set&&at(Set)?Set:function(){function t(){this.set=Object.create(null)}return t.prototype.has=function(t){return!0===this.set[t]},t.prototype.add=function(t){this.set[t]=!0},t.prototype.clear=function(){this.set=Object.create(null)},t}();var ct=I,lt=0,ft=function(){this.id=lt++,this.subs=[]};ft.prototype.addSub=function(t){this.subs.push(t)},ft.prototype.removeSub=function(t){y(this.subs,t)},ft.prototype.depend=function(){ft.target&&ft.target.addDep(this)},ft.prototype.notify=function(){for(var t=this.subs.slice(),e=0,n=t.length;e<n;e++)t[e].update()},ft.target=null;var pt=[];var dt=function(t,e,n,r,i,o,a,s){this.tag=t,this.data=e,this.children=n,this.text=r,this.elm=i,this.ns=void 0,this.context=o,this.fnContext=void 0,this.fnOptions=void 0,this.fnScopeId=void 0,this.key=e&&e.key,this.componentOptions=a,this.componentInstance=void 0,this.parent=void 0,this.raw=!1,this.isStatic=!1,this.isRootInsert=!0,this.isComment=!1,this.isCloned=!1,this.isOnce=!1,this.asyncFactory=s,this.asyncMeta=void 0,this.isAsyncPlaceholder=!1},ht={child:{configurable:!0}};ht.child.get=function(){return this.componentInstance},Object.defineProperties(dt.prototype,ht);var vt=function(t){void 0===t&&(t="");var e=new dt;return e.text=t,e.isComment=!0,e};function gt(t){return new dt(void 0,void 0,void 0,String(t))}function mt(t,e){var n=t.componentOptions,r=new dt(t.tag,t.data,t.children,t.text,t.elm,t.context,n,t.asyncFactory);return r.ns=t.ns,r.isStatic=t.isStatic,r.key=t.key,r.isComment=t.isComment,r.fnContext=t.fnContext,r.fnOptions=t.fnOptions,r.fnScopeId=t.fnScopeId,r.isCloned=!0,e&&(t.children&&(r.children=yt(t.children,!0)),n&&n.children&&(n.children=yt(n.children,!0))),r}function yt(t,e){for(var n=t.length,r=new Array(n),i=0;i<n;i++)r[i]=mt(t[i],e);return r}var _t=Array.prototype,bt=Object.create(_t);["push","pop","shift","unshift","splice","sort","reverse"].forEach(function(t){var e=_t[t];W(bt,t,function(){for(var n=[],r=arguments.length;r--;)n[r]=arguments[r];var i,o=e.apply(this,n),a=this.__ob__;switch(t){case"push":case"unshift":i=n;break;case"splice":i=n.slice(2)}return i&&a.observeArray(i),a.dep.notify(),o})});var wt=Object.getOwnPropertyNames(bt),xt={shouldConvert:!0},Ct=function(t){(this.value=t,this.dep=new ft,this.vmCount=0,W(t,"__ob__",this),Array.isArray(t))?((z?Tt:Et)(t,bt,wt),this.observeArray(t)):this.walk(t)};function Tt(t,e,n){t.__proto__=e}function Et(t,e,n){for(var r=0,i=n.length;r<i;r++){var o=n[r];W(t,o,e[o])}}function At(t,e){var n;if(u(t)&&!(t instanceof dt))return b(t,"__ob__")&&t.__ob__ instanceof Ct?n=t.__ob__:xt.shouldConvert&&!it()&&(Array.isArray(t)||l(t))&&Object.isExtensible(t)&&!t._isVue&&(n=new Ct(t)),e&&n&&n.vmCount++,n}function St(t,e,n,r,i){var o=new ft,a=Object.getOwnPropertyDescriptor(t,e);if(!a||!1!==a.configurable){var s=a&&a.get,u=a&&a.set,c=!i&&At(n);Object.defineProperty(t,e,{enumerable:!0,configurable:!0,get:function(){var e=s?s.call(t):n;return ft.target&&(o.depend(),c&&(c.dep.depend(),Array.isArray(e)&&function t(e){for(var n=void 0,r=0,i=e.length;r<i;r++)(n=e[r])&&n.__ob__&&n.__ob__.dep.depend(),Array.isArray(n)&&t(n)}(e))),e},set:function(e){var r=s?s.call(t):n;e===r||e!=e&&r!=r||(u?u.call(t,e):n=e,c=!i&&At(e),o.notify())}})}}function kt(t,e,n){if(Array.isArray(t)&&p(e))return t.length=Math.max(t.length,e),t.splice(e,1,n),n;if(e in t&&!(e in Object.prototype))return t[e]=n,n;var r=t.__ob__;return t._isVue||r&&r.vmCount?n:r?(St(r.value,e,n),r.dep.notify(),n):(t[e]=n,n)}function Ot(t,e){if(Array.isArray(t)&&p(e))t.splice(e,1);else{var n=t.__ob__;t._isVue||n&&n.vmCount||b(t,e)&&(delete t[e],n&&n.dep.notify())}}Ct.prototype.walk=function(t){for(var e=Object.keys(t),n=0;n<e.length;n++)St(t,e[n],t[e[n]])},Ct.prototype.observeArray=function(t){for(var e=0,n=t.length;e<n;e++)At(t[e])};var Dt=H.optionMergeStrategies;function It(t,e){if(!e)return t;for(var n,r,i,o=Object.keys(e),a=0;a<o.length;a++)r=t[n=o[a]],i=e[n],b(t,n)?l(r)&&l(i)&&It(r,i):kt(t,n,i);return t}function Nt(t,e,n){return n?function(){var r="function"==typeof e?e.call(n,n):e,i="function"==typeof t?t.call(n,n):t;return r?It(r,i):i}:e?t?function(){return It("function"==typeof e?e.call(this,this):e,"function"==typeof t?t.call(this,this):t)}:e:t}function jt(t,e){return e?t?t.concat(e):Array.isArray(e)?e:[e]:t}function Lt(t,e,n,r){var i=Object.create(t||null);return e?O(i,e):i}Dt.data=function(t,e,n){return n?Nt(t,e,n):e&&"function"!=typeof e?t:Nt(t,e)},F.forEach(function(t){Dt[t]=jt}),M.forEach(function(t){Dt[t+"s"]=Lt}),Dt.watch=function(t,e,n,r){if(t===et&&(t=void 0),e===et&&(e=void 0),!e)return Object.create(t||null);if(!t)return e;var i={};O(i,t);for(var o in e){var a=i[o],s=e[o];a&&!Array.isArray(a)&&(a=[a]),i[o]=a?a.concat(s):Array.isArray(s)?s:[s]}return i},Dt.props=Dt.methods=Dt.inject=Dt.computed=function(t,e,n,r){if(!t)return e;var i=Object.create(null);return O(i,t),e&&O(i,e),i},Dt.provide=Nt;var $t=function(t,e){return void 0===e?t:e};function Rt(t,e,n){"function"==typeof e&&(e=e.options),function(t,e){var n=t.props;if(n){var r,i,o={};if(Array.isArray(n))for(r=n.length;r--;)"string"==typeof(i=n[r])&&(o[C(i)]={type:null});else if(l(n))for(var a in n)i=n[a],o[C(a)]=l(i)?i:{type:i};t.props=o}}(e),function(t,e){var n=t.inject;if(n){var r=t.inject={};if(Array.isArray(n))for(var i=0;i<n.length;i++)r[n[i]]={from:n[i]};else if(l(n))for(var o in n){var a=n[o];r[o]=l(a)?O({from:o},a):{from:a}}}}(e),function(t){var e=t.directives;if(e)for(var n in e){var r=e[n];"function"==typeof r&&(e[n]={bind:r,update:r})}}(e);var r=e.extends;if(r&&(t=Rt(t,r,n)),e.mixins)for(var i=0,o=e.mixins.length;i<o;i++)t=Rt(t,e.mixins[i],n);var a,s={};for(a in t)u(a);for(a in e)b(t,a)||u(a);function u(r){var i=Dt[r]||$t;s[r]=i(t[r],e[r],n,r)}return s}function Pt(t,e,n,r){if("string"==typeof n){var i=t[e];if(b(i,n))return i[n];var o=C(n);if(b(i,o))return i[o];var a=T(o);return b(i,a)?i[a]:i[n]||i[o]||i[a]}}function Mt(t,e,n,r){var i=e[t],o=!b(n,t),a=n[t];if(Ht(Boolean,i.type)&&(o&&!b(i,"default")?a=!1:Ht(String,i.type)||""!==a&&a!==A(t)||(a=!0)),void 0===a){a=function(t,e,n){if(!b(e,"default"))return;var r=e.default;0;if(t&&t.$options.propsData&&void 0===t.$options.propsData[n]&&void 0!==t._props[n])return t._props[n];return"function"==typeof r&&"Function"!==Ft(e.type)?r.call(t):r}(r,i,t);var s=xt.shouldConvert;xt.shouldConvert=!0,At(a),xt.shouldConvert=s}return a}function Ft(t){var e=t&&t.toString().match(/^\s*function (\w+)/);return e?e[1]:""}function Ht(t,e){if(!Array.isArray(e))return Ft(e)===Ft(t);for(var n=0,r=e.length;n<r;n++)if(Ft(e[n])===Ft(t))return!0;return!1}function Bt(t,e,n){if(e)for(var r=e;r=r.$parent;){var i=r.$options.errorCaptured;if(i)for(var o=0;o<i.length;o++)try{if(!1===i[o].call(r,t,e,n))return}catch(t){Wt(t,r,"errorCaptured hook")}}Wt(t,e,n)}function Wt(t,e,n){if(H.errorHandler)try{return H.errorHandler.call(null,t,e,n)}catch(t){qt(t,null,"config.errorHandler")}qt(t,e,n)}function qt(t,e,n){if(!V&&!K||"undefined"==typeof console)throw t;console.error(t)}var Ut,zt,Vt=[],Kt=!1;function Qt(){Kt=!1;var t=Vt.slice(0);Vt.length=0;for(var e=0;e<t.length;e++)t[e]()}var Gt=!1;if(void 0!==n&&at(n))zt=function(){n(Qt)};else if("undefined"==typeof MessageChannel||!at(MessageChannel)&&"[object MessageChannelConstructor]"!==MessageChannel.toString())zt=function(){setTimeout(Qt,0)};else{var Yt=new MessageChannel,Xt=Yt.port2;Yt.port1.onmessage=Qt,zt=function(){Xt.postMessage(1)}}if("undefined"!=typeof Promise&&at(Promise)){var Jt=Promise.resolve();Ut=function(){Jt.then(Qt),tt&&setTimeout(I)}}else Ut=zt;function Zt(t,e){var n;if(Vt.push(function(){if(t)try{t.call(e)}catch(t){Bt(t,e,"nextTick")}else n&&n(e)}),Kt||(Kt=!0,Gt?zt():Ut()),!t&&"undefined"!=typeof Promise)return new Promise(function(t){n=t})}var te=new st;function ee(t){!function t(e,n){var r,i;var o=Array.isArray(e);if(!o&&!u(e)||Object.isFrozen(e))return;if(e.__ob__){var a=e.__ob__.dep.id;if(n.has(a))return;n.add(a)}if(o)for(r=e.length;r--;)t(e[r],n);else for(i=Object.keys(e),r=i.length;r--;)t(e[i[r]],n)}(t,te),te.clear()}var ne,re=w(function(t){var e="&"===t.charAt(0),n="~"===(t=e?t.slice(1):t).charAt(0),r="!"===(t=n?t.slice(1):t).charAt(0);return{name:t=r?t.slice(1):t,once:n,capture:r,passive:e}});function ie(t){function e(){var t=arguments,n=e.fns;if(!Array.isArray(n))return n.apply(null,arguments);for(var r=n.slice(),i=0;i<r.length;i++)r[i].apply(null,t)}return e.fns=t,e}function oe(t,e,n,r,o){var a,s,u,c;for(a in t)s=t[a],u=e[a],c=re(a),i(s)||(i(u)?(i(s.fns)&&(s=t[a]=ie(s)),n(c.name,s,c.once,c.capture,c.passive,c.params)):s!==u&&(u.fns=s,t[a]=u));for(a in e)i(t[a])&&r((c=re(a)).name,e[a],c.capture)}function ae(t,e,n){var r;t instanceof dt&&(t=t.data.hook||(t.data.hook={}));var s=t[e];function u(){n.apply(this,arguments),y(r.fns,u)}i(s)?r=ie([u]):o(s.fns)&&a(s.merged)?(r=s).fns.push(u):r=ie([s,u]),r.merged=!0,t[e]=r}function se(t,e,n,r,i){if(o(e)){if(b(e,n))return t[n]=e[n],i||delete e[n],!0;if(b(e,r))return t[n]=e[r],i||delete e[r],!0}return!1}function ue(t){return s(t)?[gt(t)]:Array.isArray(t)?function t(e,n){var r=[];var u,c,l,f;for(u=0;u<e.length;u++)i(c=e[u])||"boolean"==typeof c||(l=r.length-1,f=r[l],Array.isArray(c)?c.length>0&&(ce((c=t(c,(n||"")+"_"+u))[0])&&ce(f)&&(r[l]=gt(f.text+c[0].text),c.shift()),r.push.apply(r,c)):s(c)?ce(f)?r[l]=gt(f.text+c):""!==c&&r.push(gt(c)):ce(c)&&ce(f)?r[l]=gt(f.text+c.text):(a(e._isVList)&&o(c.tag)&&i(c.key)&&o(n)&&(c.key="__vlist"+n+"_"+u+"__"),r.push(c)));return r}(t):void 0}function ce(t){return o(t)&&o(t.text)&&!1===t.isComment}function le(t,e){return(t.__esModule||ut&&"Module"===t[Symbol.toStringTag])&&(t=t.default),u(t)?e.extend(t):t}function fe(t){return t.isComment&&t.asyncFactory}function pe(t){if(Array.isArray(t))for(var e=0;e<t.length;e++){var n=t[e];if(o(n)&&(o(n.componentOptions)||fe(n)))return n}}function de(t,e,n){n?ne.$once(t,e):ne.$on(t,e)}function he(t,e){ne.$off(t,e)}function ve(t,e,n){ne=t,oe(e,n||{},de,he),ne=void 0}function ge(t,e){var n={};if(!t)return n;for(var r=0,i=t.length;r<i;r++){var o=t[r],a=o.data;if(a&&a.attrs&&a.attrs.slot&&delete a.attrs.slot,o.context!==e&&o.fnContext!==e||!a||null==a.slot)(n.default||(n.default=[])).push(o);else{var s=a.slot,u=n[s]||(n[s]=[]);"template"===o.tag?u.push.apply(u,o.children||[]):u.push(o)}}for(var c in n)n[c].every(me)&&delete n[c];return n}function me(t){return t.isComment&&!t.asyncFactory||" "===t.text}function ye(t,e){e=e||{};for(var n=0;n<t.length;n++)Array.isArray(t[n])?ye(t[n],e):e[t[n].key]=t[n].fn;return e}var _e=null;function be(t){for(;t&&(t=t.$parent);)if(t._inactive)return!0;return!1}function we(t,e){if(e){if(t._directInactive=!1,be(t))return}else if(t._directInactive)return;if(t._inactive||null===t._inactive){t._inactive=!1;for(var n=0;n<t.$children.length;n++)we(t.$children[n]);xe(t,"activated")}}function xe(t,e){var n=t.$options[e];if(n)for(var r=0,i=n.length;r<i;r++)try{n[r].call(t)}catch(n){Bt(n,t,e+" hook")}t._hasHookEvent&&t.$emit("hook:"+e)}var Ce=[],Te=[],Ee={},Ae=!1,Se=!1,ke=0;function Oe(){var t,e;for(Se=!0,Ce.sort(function(t,e){return t.id-e.id}),ke=0;ke<Ce.length;ke++)e=(t=Ce[ke]).id,Ee[e]=null,t.run();var n=Te.slice(),r=Ce.slice();ke=Ce.length=Te.length=0,Ee={},Ae=Se=!1,function(t){for(var e=0;e<t.length;e++)t[e]._inactive=!0,we(t[e],!0)}(n),function(t){var e=t.length;for(;e--;){var n=t[e],r=n.vm;r._watcher===n&&r._isMounted&&xe(r,"updated")}}(r),ot&&H.devtools&&ot.emit("flush")}var De=0,Ie=function(t,e,n,r,i){this.vm=t,i&&(t._watcher=this),t._watchers.push(this),r?(this.deep=!!r.deep,this.user=!!r.user,this.lazy=!!r.lazy,this.sync=!!r.sync):this.deep=this.user=this.lazy=this.sync=!1,this.cb=n,this.id=++De,this.active=!0,this.dirty=this.lazy,this.deps=[],this.newDeps=[],this.depIds=new st,this.newDepIds=new st,this.expression="","function"==typeof e?this.getter=e:(this.getter=function(t){if(!q.test(t)){var e=t.split(".");return function(t){for(var n=0;n<e.length;n++){if(!t)return;t=t[e[n]]}return t}}}(e),this.getter||(this.getter=function(){})),this.value=this.lazy?void 0:this.get()};Ie.prototype.get=function(){var t,e;t=this,ft.target&&pt.push(ft.target),ft.target=t;var n=this.vm;try{e=this.getter.call(n,n)}catch(t){if(!this.user)throw t;Bt(t,n,'getter for watcher "'+this.expression+'"')}finally{this.deep&&ee(e),ft.target=pt.pop(),this.cleanupDeps()}return e},Ie.prototype.addDep=function(t){var e=t.id;this.newDepIds.has(e)||(this.newDepIds.add(e),this.newDeps.push(t),this.depIds.has(e)||t.addSub(this))},Ie.prototype.cleanupDeps=function(){for(var t=this.deps.length;t--;){var e=this.deps[t];this.newDepIds.has(e.id)||e.removeSub(this)}var n=this.depIds;this.depIds=this.newDepIds,this.newDepIds=n,this.newDepIds.clear(),n=this.deps,this.deps=this.newDeps,this.newDeps=n,this.newDeps.length=0},Ie.prototype.update=function(){this.lazy?this.dirty=!0:this.sync?this.run():function(t){var e=t.id;if(null==Ee[e]){if(Ee[e]=!0,Se){for(var n=Ce.length-1;n>ke&&Ce[n].id>t.id;)n--;Ce.splice(n+1,0,t)}else Ce.push(t);Ae||(Ae=!0,Zt(Oe))}}(this)},Ie.prototype.run=function(){if(this.active){var t=this.get();if(t!==this.value||u(t)||this.deep){var e=this.value;if(this.value=t,this.user)try{this.cb.call(this.vm,t,e)}catch(t){Bt(t,this.vm,'callback for watcher "'+this.expression+'"')}else this.cb.call(this.vm,t,e)}}},Ie.prototype.evaluate=function(){this.value=this.get(),this.dirty=!1},Ie.prototype.depend=function(){for(var t=this.deps.length;t--;)this.deps[t].depend()},Ie.prototype.teardown=function(){if(this.active){this.vm._isBeingDestroyed||y(this.vm._watchers,this);for(var t=this.deps.length;t--;)this.deps[t].removeSub(this);this.active=!1}};var Ne={enumerable:!0,configurable:!0,get:I,set:I};function je(t,e,n){Ne.get=function(){return this[e][n]},Ne.set=function(t){this[e][n]=t},Object.defineProperty(t,n,Ne)}function Le(t){t._watchers=[];var e=t.$options;e.props&&function(t,e){var n=t.$options.propsData||{},r=t._props={},i=t.$options._propKeys=[],o=!t.$parent;xt.shouldConvert=o;var a=function(o){i.push(o);var a=Mt(o,e,n,t);St(r,o,a),o in t||je(t,"_props",o)};for(var s in e)a(s);xt.shouldConvert=!0}(t,e.props),e.methods&&function(t,e){t.$options.props;for(var n in e)t[n]=null==e[n]?I:S(e[n],t)}(t,e.methods),e.data?function(t){var e=t.$options.data;l(e=t._data="function"==typeof e?function(t,e){try{return t.call(e,e)}catch(t){return Bt(t,e,"data()"),{}}}(e,t):e||{})||(e={});var n=Object.keys(e),r=t.$options.props,i=(t.$options.methods,n.length);for(;i--;){var o=n[i];0,r&&b(r,o)||B(o)||je(t,"_data",o)}At(e,!0)}(t):At(t._data={},!0),e.computed&&function(t,e){var n=t._computedWatchers=Object.create(null),r=it();for(var i in e){var o=e[i],a="function"==typeof o?o:o.get;0,r||(n[i]=new Ie(t,a||I,I,$e)),i in t||Re(t,i,o)}}(t,e.computed),e.watch&&e.watch!==et&&function(t,e){for(var n in e){var r=e[n];if(Array.isArray(r))for(var i=0;i<r.length;i++)Me(t,n,r[i]);else Me(t,n,r)}}(t,e.watch)}var $e={lazy:!0};function Re(t,e,n){var r=!it();"function"==typeof n?(Ne.get=r?Pe(e):n,Ne.set=I):(Ne.get=n.get?r&&!1!==n.cache?Pe(e):n.get:I,Ne.set=n.set?n.set:I),Object.defineProperty(t,e,Ne)}function Pe(t){return function(){var e=this._computedWatchers&&this._computedWatchers[t];if(e)return e.dirty&&e.evaluate(),ft.target&&e.depend(),e.value}}function Me(t,e,n,r){return l(n)&&(r=n,n=n.handler),"string"==typeof n&&(n=t[n]),t.$watch(e,n,r)}function Fe(t,e){if(t){for(var n=Object.create(null),r=ut?Reflect.ownKeys(t).filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}):Object.keys(t),i=0;i<r.length;i++){for(var o=r[i],a=t[o].from,s=e;s;){if(s._provided&&a in s._provided){n[o]=s._provided[a];break}s=s.$parent}if(!s)if("default"in t[o]){var u=t[o].default;n[o]="function"==typeof u?u.call(e):u}else 0}return n}}function He(t,e){var n,r,i,a,s;if(Array.isArray(t)||"string"==typeof t)for(n=new Array(t.length),r=0,i=t.length;r<i;r++)n[r]=e(t[r],r);else if("number"==typeof t)for(n=new Array(t),r=0;r<t;r++)n[r]=e(r+1,r);else if(u(t))for(a=Object.keys(t),n=new Array(a.length),r=0,i=a.length;r<i;r++)s=a[r],n[r]=e(t[s],s,r);return o(n)&&(n._isVList=!0),n}function Be(t,e,n,r){var i,o=this.$scopedSlots[t];if(o)n=n||{},r&&(n=O(O({},r),n)),i=o(n)||e;else{var a=this.$slots[t];a&&(a._rendered=!0),i=a||e}var s=n&&n.slot;return s?this.$createElement("template",{slot:s},i):i}function We(t){return Pt(this.$options,"filters",t)||j}function qe(t,e,n,r){var i=H.keyCodes[e]||n;return i?Array.isArray(i)?-1===i.indexOf(t):i!==t:r?A(r)!==e:void 0}function Ue(t,e,n,r,i){if(n)if(u(n)){var o;Array.isArray(n)&&(n=D(n));var a=function(a){if("class"===a||"style"===a||m(a))o=t;else{var s=t.attrs&&t.attrs.type;o=r||H.mustUseProp(e,s,a)?t.domProps||(t.domProps={}):t.attrs||(t.attrs={})}a in o||(o[a]=n[a],i&&((t.on||(t.on={}))["update:"+a]=function(t){n[a]=t}))};for(var s in n)a(s)}else;return t}function ze(t,e){var n=this._staticTrees||(this._staticTrees=[]),r=n[t];return r&&!e?Array.isArray(r)?yt(r):mt(r):(Ke(r=n[t]=this.$options.staticRenderFns[t].call(this._renderProxy,null,this),"__static__"+t,!1),r)}function Ve(t,e,n){return Ke(t,"__once__"+e+(n?"_"+n:""),!0),t}function Ke(t,e,n){if(Array.isArray(t))for(var r=0;r<t.length;r++)t[r]&&"string"!=typeof t[r]&&Qe(t[r],e+"_"+r,n);else Qe(t,e,n)}function Qe(t,e,n){t.isStatic=!0,t.key=e,t.isOnce=n}function Ge(t,e){if(e)if(l(e)){var n=t.on=t.on?O({},t.on):{};for(var r in e){var i=n[r],o=e[r];n[r]=i?[].concat(i,o):o}}else;return t}function Ye(t){t._o=Ve,t._n=h,t._s=d,t._l=He,t._t=Be,t._q=L,t._i=$,t._m=ze,t._f=We,t._k=qe,t._b=Ue,t._v=gt,t._e=vt,t._u=ye,t._g=Ge}function Xe(t,e,n,i,o){var s=o.options;this.data=t,this.props=e,this.children=n,this.parent=i,this.listeners=t.on||r,this.injections=Fe(s.inject,i),this.slots=function(){return ge(n,i)};var u=Object.create(i),c=a(s._compiled),l=!c;c&&(this.$options=s,this.$slots=this.slots(),this.$scopedSlots=t.scopedSlots||r),s._scopeId?this._c=function(t,e,n,r){var o=an(u,t,e,n,r,l);return o&&(o.fnScopeId=s._scopeId,o.fnContext=i),o}:this._c=function(t,e,n,r){return an(u,t,e,n,r,l)}}function Je(t,e){for(var n in e)t[C(n)]=e[n]}Ye(Xe.prototype);var Ze={init:function(t,e,n,r){if(!t.componentInstance||t.componentInstance._isDestroyed)(t.componentInstance=function(t,e,n,r){var i={_isComponent:!0,parent:e,_parentVnode:t,_parentElm:n||null,_refElm:r||null},a=t.data.inlineTemplate;o(a)&&(i.render=a.render,i.staticRenderFns=a.staticRenderFns);return new t.componentOptions.Ctor(i)}(t,_e,n,r)).$mount(e?t.elm:void 0,e);else if(t.data.keepAlive){var i=t;Ze.prepatch(i,i)}},prepatch:function(t,e){var n=e.componentOptions;!function(t,e,n,i,o){var a=!!(o||t.$options._renderChildren||i.data.scopedSlots||t.$scopedSlots!==r);if(t.$options._parentVnode=i,t.$vnode=i,t._vnode&&(t._vnode.parent=i),t.$options._renderChildren=o,t.$attrs=i.data&&i.data.attrs||r,t.$listeners=n||r,e&&t.$options.props){xt.shouldConvert=!1;for(var s=t._props,u=t.$options._propKeys||[],c=0;c<u.length;c++){var l=u[c];s[l]=Mt(l,t.$options.props,e,t)}xt.shouldConvert=!0,t.$options.propsData=e}if(n){var f=t.$options._parentListeners;t.$options._parentListeners=n,ve(t,n,f)}a&&(t.$slots=ge(o,i.context),t.$forceUpdate())}(e.componentInstance=t.componentInstance,n.propsData,n.listeners,e,n.children)},insert:function(t){var e,n=t.context,r=t.componentInstance;r._isMounted||(r._isMounted=!0,xe(r,"mounted")),t.data.keepAlive&&(n._isMounted?((e=r)._inactive=!1,Te.push(e)):we(r,!0))},destroy:function(t){var e=t.componentInstance;e._isDestroyed||(t.data.keepAlive?function t(e,n){if(!(n&&(e._directInactive=!0,be(e))||e._inactive)){e._inactive=!0;for(var r=0;r<e.$children.length;r++)t(e.$children[r]);xe(e,"deactivated")}}(e,!0):e.$destroy())}},tn=Object.keys(Ze);function en(t,e,n,s,c){if(!i(t)){var l=n.$options._base;if(u(t)&&(t=l.extend(t)),"function"==typeof t){var f,p,d,h,v,g,m;if(i(t.cid)&&void 0===(t=function(t,e,n){if(a(t.error)&&o(t.errorComp))return t.errorComp;if(o(t.resolved))return t.resolved;if(a(t.loading)&&o(t.loadingComp))return t.loadingComp;if(!o(t.contexts)){var r=t.contexts=[n],s=!0,c=function(){for(var t=0,e=r.length;t<e;t++)r[t].$forceUpdate()},l=R(function(n){t.resolved=le(n,e),s||c()}),f=R(function(e){o(t.errorComp)&&(t.error=!0,c())}),p=t(l,f);return u(p)&&("function"==typeof p.then?i(t.resolved)&&p.then(l,f):o(p.component)&&"function"==typeof p.component.then&&(p.component.then(l,f),o(p.error)&&(t.errorComp=le(p.error,e)),o(p.loading)&&(t.loadingComp=le(p.loading,e),0===p.delay?t.loading=!0:setTimeout(function(){i(t.resolved)&&i(t.error)&&(t.loading=!0,c())},p.delay||200)),o(p.timeout)&&setTimeout(function(){i(t.resolved)&&f(null)},p.timeout))),s=!1,t.loading?t.loadingComp:t.resolved}t.contexts.push(n)}(f=t,l,n)))return p=f,d=e,h=n,v=s,g=c,(m=vt()).asyncFactory=p,m.asyncMeta={data:d,context:h,children:v,tag:g},m;e=e||{},vn(t),o(e.model)&&function(t,e){var n=t.model&&t.model.prop||"value",r=t.model&&t.model.event||"input";(e.props||(e.props={}))[n]=e.model.value;var i=e.on||(e.on={});o(i[r])?i[r]=[e.model.callback].concat(i[r]):i[r]=e.model.callback}(t.options,e);var y=function(t,e,n){var r=e.options.props;if(!i(r)){var a={},s=t.attrs,u=t.props;if(o(s)||o(u))for(var c in r){var l=A(c);se(a,u,c,l,!0)||se(a,s,c,l,!1)}return a}}(e,t);if(a(t.options.functional))return function(t,e,n,i,a){var s=t.options,u={},c=s.props;if(o(c))for(var l in c)u[l]=Mt(l,c,e||r);else o(n.attrs)&&Je(u,n.attrs),o(n.props)&&Je(u,n.props);var f=new Xe(n,u,a,i,t),p=s.render.call(null,f._c,f);return p instanceof dt&&(p.fnContext=i,p.fnOptions=s,n.slot&&((p.data||(p.data={})).slot=n.slot)),p}(t,y,e,n,s);var _=e.on;if(e.on=e.nativeOn,a(t.options.abstract)){var b=e.slot;e={},b&&(e.slot=b)}!function(t){t.hook||(t.hook={});for(var e=0;e<tn.length;e++){var n=tn[e],r=t.hook[n],i=Ze[n];t.hook[n]=r?nn(i,r):i}}(e);var w=t.options.name||c;return new dt("vue-component-"+t.cid+(w?"-"+w:""),e,void 0,void 0,void 0,n,{Ctor:t,propsData:y,listeners:_,tag:c,children:s},f)}}}function nn(t,e){return function(n,r,i,o){t(n,r,i,o),e(n,r,i,o)}}var rn=1,on=2;function an(t,e,n,r,u,c){return(Array.isArray(n)||s(n))&&(u=r,r=n,n=void 0),a(c)&&(u=on),function(t,e,n,r,s){if(o(n)&&o(n.__ob__))return vt();o(n)&&o(n.is)&&(e=n.is);if(!e)return vt();0;Array.isArray(r)&&"function"==typeof r[0]&&((n=n||{}).scopedSlots={default:r[0]},r.length=0);s===on?r=ue(r):s===rn&&(r=function(t){for(var e=0;e<t.length;e++)if(Array.isArray(t[e]))return Array.prototype.concat.apply([],t);return t}(r));var u,c;if("string"==typeof e){var l;c=t.$vnode&&t.$vnode.ns||H.getTagNamespace(e),u=H.isReservedTag(e)?new dt(H.parsePlatformTagName(e),n,r,void 0,void 0,t):o(l=Pt(t.$options,"components",e))?en(l,n,t,r,e):new dt(e,n,r,void 0,void 0,t)}else u=en(e,n,t,r);return o(u)?(c&&function t(e,n,r){e.ns=n;"foreignObject"===e.tag&&(n=void 0,r=!0);if(o(e.children))for(var s=0,u=e.children.length;s<u;s++){var c=e.children[s];o(c.tag)&&(i(c.ns)||a(r))&&t(c,n,r)}}(u,c),u):vt()}(t,e,n,r,u)}var sn,un,cn,ln,fn,pn,dn,hn=0;function vn(t){var e=t.options;if(t.super){var n=vn(t.super);if(n!==t.superOptions){t.superOptions=n;var r=function(t){var e,n=t.options,r=t.extendOptions,i=t.sealedOptions;for(var o in n)n[o]!==i[o]&&(e||(e={}),e[o]=gn(n[o],r[o],i[o]));return e}(t);r&&O(t.extendOptions,r),(e=t.options=Rt(n,t.extendOptions)).name&&(e.components[e.name]=t)}}return e}function gn(t,e,n){if(Array.isArray(t)){var r=[];n=Array.isArray(n)?n:[n],e=Array.isArray(e)?e:[e];for(var i=0;i<t.length;i++)(e.indexOf(t[i])>=0||n.indexOf(t[i])<0)&&r.push(t[i]);return r}return t}function mn(t){this._init(t)}function yn(t){t.cid=0;var e=1;t.extend=function(t){t=t||{};var n=this,r=n.cid,i=t._Ctor||(t._Ctor={});if(i[r])return i[r];var o=t.name||n.options.name;var a=function(t){this._init(t)};return(a.prototype=Object.create(n.prototype)).constructor=a,a.cid=e++,a.options=Rt(n.options,t),a.super=n,a.options.props&&function(t){var e=t.options.props;for(var n in e)je(t.prototype,"_props",n)}(a),a.options.computed&&function(t){var e=t.options.computed;for(var n in e)Re(t.prototype,n,e[n])}(a),a.extend=n.extend,a.mixin=n.mixin,a.use=n.use,M.forEach(function(t){a[t]=n[t]}),o&&(a.options.components[o]=a),a.superOptions=n.options,a.extendOptions=t,a.sealedOptions=O({},a.options),i[r]=a,a}}function _n(t){return t&&(t.Ctor.options.name||t.tag)}function bn(t,e){return Array.isArray(t)?t.indexOf(e)>-1:"string"==typeof t?t.split(",").indexOf(e)>-1:!!f(t)&&t.test(e)}function wn(t,e){var n=t.cache,r=t.keys,i=t._vnode;for(var o in n){var a=n[o];if(a){var s=_n(a.componentOptions);s&&!e(s)&&xn(n,o,r,i)}}}function xn(t,e,n,r){var i=t[e];!i||r&&i.tag===r.tag||i.componentInstance.$destroy(),t[e]=null,y(n,e)}mn.prototype._init=function(t){var e,n,i,o,a=this;a._uid=hn++,a._isVue=!0,t&&t._isComponent?function(t,e){var n=t.$options=Object.create(t.constructor.options),r=e._parentVnode;n.parent=e.parent,n._parentVnode=r,n._parentElm=e._parentElm,n._refElm=e._refElm;var i=r.componentOptions;n.propsData=i.propsData,n._parentListeners=i.listeners,n._renderChildren=i.children,n._componentTag=i.tag,e.render&&(n.render=e.render,n.staticRenderFns=e.staticRenderFns)}(a,t):a.$options=Rt(vn(a.constructor),t||{},a),a._renderProxy=a,a._self=a,function(t){var e=t.$options,n=e.parent;if(n&&!e.abstract){for(;n.$options.abstract&&n.$parent;)n=n.$parent;n.$children.push(t)}t.$parent=n,t.$root=n?n.$root:t,t.$children=[],t.$refs={},t._watcher=null,t._inactive=null,t._directInactive=!1,t._isMounted=!1,t._isDestroyed=!1,t._isBeingDestroyed=!1}(a),function(t){t._events=Object.create(null),t._hasHookEvent=!1;var e=t.$options._parentListeners;e&&ve(t,e)}(a),function(t){t._vnode=null,t._staticTrees=null;var e=t.$options,n=t.$vnode=e._parentVnode,i=n&&n.context;t.$slots=ge(e._renderChildren,i),t.$scopedSlots=r,t._c=function(e,n,r,i){return an(t,e,n,r,i,!1)},t.$createElement=function(e,n,r,i){return an(t,e,n,r,i,!0)};var o=n&&n.data;St(t,"$attrs",o&&o.attrs||r,0,!0),St(t,"$listeners",e._parentListeners||r,0,!0)}(a),xe(a,"beforeCreate"),(n=Fe((e=a).$options.inject,e))&&(xt.shouldConvert=!1,Object.keys(n).forEach(function(t){St(e,t,n[t])}),xt.shouldConvert=!0),Le(a),(o=(i=a).$options.provide)&&(i._provided="function"==typeof o?o.call(i):o),xe(a,"created"),a.$options.el&&a.$mount(a.$options.el)},sn=mn,un={get:function(){return this._data}},cn={get:function(){return this._props}},Object.defineProperty(sn.prototype,"$data",un),Object.defineProperty(sn.prototype,"$props",cn),sn.prototype.$set=kt,sn.prototype.$delete=Ot,sn.prototype.$watch=function(t,e,n){if(l(e))return Me(this,t,e,n);(n=n||{}).user=!0;var r=new Ie(this,t,e,n);return n.immediate&&e.call(this,r.value),function(){r.teardown()}},fn=/^hook:/,(ln=mn).prototype.$on=function(t,e){if(Array.isArray(t))for(var n=0,r=t.length;n<r;n++)this.$on(t[n],e);else(this._events[t]||(this._events[t]=[])).push(e),fn.test(t)&&(this._hasHookEvent=!0);return this},ln.prototype.$once=function(t,e){var n=this;function r(){n.$off(t,r),e.apply(n,arguments)}return r.fn=e,n.$on(t,r),n},ln.prototype.$off=function(t,e){if(!arguments.length)return this._events=Object.create(null),this;if(Array.isArray(t)){for(var n=0,r=t.length;n<r;n++)this.$off(t[n],e);return this}var i=this._events[t];if(!i)return this;if(!e)return this._events[t]=null,this;if(e)for(var o,a=i.length;a--;)if((o=i[a])===e||o.fn===e){i.splice(a,1);break}return this},ln.prototype.$emit=function(t){var e=this._events[t];if(e){e=e.length>1?k(e):e;for(var n=k(arguments,1),r=0,i=e.length;r<i;r++)try{e[r].apply(this,n)}catch(e){Bt(e,this,'event handler for "'+t+'"')}}return this},(pn=mn).prototype._update=function(t,e){var n=this;n._isMounted&&xe(n,"beforeUpdate");var r=n.$el,i=n._vnode,o=_e;_e=n,n._vnode=t,i?n.$el=n.__patch__(i,t):(n.$el=n.__patch__(n.$el,t,e,!1,n.$options._parentElm,n.$options._refElm),n.$options._parentElm=n.$options._refElm=null),_e=o,r&&(r.__vue__=null),n.$el&&(n.$el.__vue__=n),n.$vnode&&n.$parent&&n.$vnode===n.$parent._vnode&&(n.$parent.$el=n.$el)},pn.prototype.$forceUpdate=function(){this._watcher&&this._watcher.update()},pn.prototype.$destroy=function(){var t=this;if(!t._isBeingDestroyed){xe(t,"beforeDestroy"),t._isBeingDestroyed=!0;var e=t.$parent;!e||e._isBeingDestroyed||t.$options.abstract||y(e.$children,t),t._watcher&&t._watcher.teardown();for(var n=t._watchers.length;n--;)t._watchers[n].teardown();t._data.__ob__&&t._data.__ob__.vmCount--,t._isDestroyed=!0,t.__patch__(t._vnode,null),xe(t,"destroyed"),t.$off(),t.$el&&(t.$el.__vue__=null),t.$vnode&&(t.$vnode.parent=null)}},Ye((dn=mn).prototype),dn.prototype.$nextTick=function(t){return Zt(t,this)},dn.prototype._render=function(){var t,e=this,n=e.$options,i=n.render,o=n._parentVnode;if(e._isMounted)for(var a in e.$slots){var s=e.$slots[a];(s._rendered||s[0]&&s[0].elm)&&(e.$slots[a]=yt(s,!0))}e.$scopedSlots=o&&o.data.scopedSlots||r,e.$vnode=o;try{t=i.call(e._renderProxy,e.$createElement)}catch(n){Bt(n,e,"render"),t=e._vnode}return t instanceof dt||(t=vt()),t.parent=o,t};var Cn,Tn,En,An=[String,RegExp,Array],Sn={KeepAlive:{name:"keep-alive",abstract:!0,props:{include:An,exclude:An,max:[String,Number]},created:function(){this.cache=Object.create(null),this.keys=[]},destroyed:function(){for(var t in this.cache)xn(this.cache,t,this.keys)},watch:{include:function(t){wn(this,function(e){return bn(t,e)})},exclude:function(t){wn(this,function(e){return!bn(t,e)})}},render:function(){var t=this.$slots.default,e=pe(t),n=e&&e.componentOptions;if(n){var r=_n(n),i=this.include,o=this.exclude;if(i&&(!r||!bn(i,r))||o&&r&&bn(o,r))return e;var a=this.cache,s=this.keys,u=null==e.key?n.Ctor.cid+(n.tag?"::"+n.tag:""):e.key;a[u]?(e.componentInstance=a[u].componentInstance,y(s,u),s.push(u)):(a[u]=e,s.push(u),this.max&&s.length>parseInt(this.max)&&xn(a,s[0],s,this._vnode)),e.data.keepAlive=!0}return e||t&&t[0]}}};Cn=mn,En={get:function(){return H}},Object.defineProperty(Cn,"config",En),Cn.util={warn:ct,extend:O,mergeOptions:Rt,defineReactive:St},Cn.set=kt,Cn.delete=Ot,Cn.nextTick=Zt,Cn.options=Object.create(null),M.forEach(function(t){Cn.options[t+"s"]=Object.create(null)}),Cn.options._base=Cn,O(Cn.options.components,Sn),Cn.use=function(t){var e=this._installedPlugins||(this._installedPlugins=[]);if(e.indexOf(t)>-1)return this;var n=k(arguments,1);return n.unshift(this),"function"==typeof t.install?t.install.apply(t,n):"function"==typeof t&&t.apply(null,n),e.push(t),this},Cn.mixin=function(t){return this.options=Rt(this.options,t),this},yn(Cn),Tn=Cn,M.forEach(function(t){Tn[t]=function(e,n){return n?("component"===t&&l(n)&&(n.name=n.name||e,n=this.options._base.extend(n)),"directive"===t&&"function"==typeof n&&(n={bind:n,update:n}),this.options[t+"s"][e]=n,n):this.options[t+"s"][e]}}),Object.defineProperty(mn.prototype,"$isServer",{get:it}),Object.defineProperty(mn.prototype,"$ssrContext",{get:function(){return this.$vnode&&this.$vnode.ssrContext}}),mn.version="2.5.13";var kn=v("style,class"),On=v("input,textarea,option,select,progress"),Dn=function(t,e,n){return"value"===n&&On(t)&&"button"!==e||"selected"===n&&"option"===t||"checked"===n&&"input"===t||"muted"===n&&"video"===t},In=v("contenteditable,draggable,spellcheck"),Nn=v("allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,default,defaultchecked,defaultmuted,defaultselected,defer,disabled,enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,required,reversed,scoped,seamless,selected,sortable,translate,truespeed,typemustmatch,visible"),jn="http://www.w3.org/1999/xlink",Ln=function(t){return":"===t.charAt(5)&&"xlink"===t.slice(0,5)},$n=function(t){return Ln(t)?t.slice(6,t.length):""},Rn=function(t){return null==t||!1===t};function Pn(t){for(var e=t.data,n=t,r=t;o(r.componentInstance);)(r=r.componentInstance._vnode)&&r.data&&(e=Mn(r.data,e));for(;o(n=n.parent);)n&&n.data&&(e=Mn(e,n.data));return function(t,e){if(o(t)||o(e))return Fn(t,Hn(e));return""}(e.staticClass,e.class)}function Mn(t,e){return{staticClass:Fn(t.staticClass,e.staticClass),class:o(t.class)?[t.class,e.class]:e.class}}function Fn(t,e){return t?e?t+" "+e:t:e||""}function Hn(t){return Array.isArray(t)?function(t){for(var e,n="",r=0,i=t.length;r<i;r++)o(e=Hn(t[r]))&&""!==e&&(n&&(n+=" "),n+=e);return n}(t):u(t)?function(t){var e="";for(var n in t)t[n]&&(e&&(e+=" "),e+=n);return e}(t):"string"==typeof t?t:""}var Bn={svg:"http://www.w3.org/2000/svg",math:"http://www.w3.org/1998/Math/MathML"},Wn=v("html,body,base,head,link,meta,style,title,address,article,aside,footer,header,h1,h2,h3,h4,h5,h6,hgroup,nav,section,div,dd,dl,dt,figcaption,figure,picture,hr,img,li,main,ol,p,pre,ul,a,b,abbr,bdi,bdo,br,cite,code,data,dfn,em,i,kbd,mark,q,rp,rt,rtc,ruby,s,samp,small,span,strong,sub,sup,time,u,var,wbr,area,audio,map,track,video,embed,object,param,source,canvas,script,noscript,del,ins,caption,col,colgroup,table,thead,tbody,td,th,tr,button,datalist,fieldset,form,input,label,legend,meter,optgroup,option,output,progress,select,textarea,details,dialog,menu,menuitem,summary,content,element,shadow,template,blockquote,iframe,tfoot"),qn=v("svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font-face,foreignObject,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view",!0),Un=function(t){return Wn(t)||qn(t)};function zn(t){return qn(t)?"svg":"math"===t?"math":void 0}var Vn=Object.create(null);var Kn=v("text,number,password,search,email,tel,url");function Qn(t){if("string"==typeof t){var e=document.querySelector(t);return e||document.createElement("div")}return t}var Gn=Object.freeze({createElement:function(t,e){var n=document.createElement(t);return"select"!==t?n:(e.data&&e.data.attrs&&void 0!==e.data.attrs.multiple&&n.setAttribute("multiple","multiple"),n)},createElementNS:function(t,e){return document.createElementNS(Bn[t],e)},createTextNode:function(t){return document.createTextNode(t)},createComment:function(t){return document.createComment(t)},insertBefore:function(t,e,n){t.insertBefore(e,n)},removeChild:function(t,e){t.removeChild(e)},appendChild:function(t,e){t.appendChild(e)},parentNode:function(t){return t.parentNode},nextSibling:function(t){return t.nextSibling},tagName:function(t){return t.tagName},setTextContent:function(t,e){t.textContent=e},setAttribute:function(t,e,n){t.setAttribute(e,n)}}),Yn={create:function(t,e){Xn(e)},update:function(t,e){t.data.ref!==e.data.ref&&(Xn(t,!0),Xn(e))},destroy:function(t){Xn(t,!0)}};function Xn(t,e){var n=t.data.ref;if(n){var r=t.context,i=t.componentInstance||t.elm,o=r.$refs;e?Array.isArray(o[n])?y(o[n],i):o[n]===i&&(o[n]=void 0):t.data.refInFor?Array.isArray(o[n])?o[n].indexOf(i)<0&&o[n].push(i):o[n]=[i]:o[n]=i}}var Jn=new dt("",{},[]),Zn=["create","activate","update","remove","destroy"];function tr(t,e){return t.key===e.key&&(t.tag===e.tag&&t.isComment===e.isComment&&o(t.data)===o(e.data)&&function(t,e){if("input"!==t.tag)return!0;var n,r=o(n=t.data)&&o(n=n.attrs)&&n.type,i=o(n=e.data)&&o(n=n.attrs)&&n.type;return r===i||Kn(r)&&Kn(i)}(t,e)||a(t.isAsyncPlaceholder)&&t.asyncFactory===e.asyncFactory&&i(e.asyncFactory.error))}function er(t,e,n){var r,i,a={};for(r=e;r<=n;++r)o(i=t[r].key)&&(a[i]=r);return a}var nr={create:rr,update:rr,destroy:function(t){rr(t,Jn)}};function rr(t,e){(t.data.directives||e.data.directives)&&function(t,e){var n,r,i,o=t===Jn,a=e===Jn,s=or(t.data.directives,t.context),u=or(e.data.directives,e.context),c=[],l=[];for(n in u)r=s[n],i=u[n],r?(i.oldValue=r.value,ar(i,"update",e,t),i.def&&i.def.componentUpdated&&l.push(i)):(ar(i,"bind",e,t),i.def&&i.def.inserted&&c.push(i));if(c.length){var f=function(){for(var n=0;n<c.length;n++)ar(c[n],"inserted",e,t)};o?ae(e,"insert",f):f()}l.length&&ae(e,"postpatch",function(){for(var n=0;n<l.length;n++)ar(l[n],"componentUpdated",e,t)});if(!o)for(n in s)u[n]||ar(s[n],"unbind",t,t,a)}(t,e)}var ir=Object.create(null);function or(t,e){var n,r,i,o=Object.create(null);if(!t)return o;for(n=0;n<t.length;n++)(r=t[n]).modifiers||(r.modifiers=ir),o[(i=r,i.rawName||i.name+"."+Object.keys(i.modifiers||{}).join("."))]=r,r.def=Pt(e.$options,"directives",r.name);return o}function ar(t,e,n,r,i){var o=t.def&&t.def[e];if(o)try{o(n.elm,t,n,r,i)}catch(r){Bt(r,n.context,"directive "+t.name+" "+e+" hook")}}var sr=[Yn,nr];function ur(t,e){var n=e.componentOptions;if(!(o(n)&&!1===n.Ctor.options.inheritAttrs||i(t.data.attrs)&&i(e.data.attrs))){var r,a,s=e.elm,u=t.data.attrs||{},c=e.data.attrs||{};o(c.__ob__)&&(c=e.data.attrs=O({},c));for(r in c)a=c[r],u[r]!==a&&cr(s,r,a);(Y||J)&&c.value!==u.value&&cr(s,"value",c.value);for(r in u)i(c[r])&&(Ln(r)?s.removeAttributeNS(jn,$n(r)):In(r)||s.removeAttribute(r))}}function cr(t,e,n){if(Nn(e))Rn(n)?t.removeAttribute(e):(n="allowfullscreen"===e&&"EMBED"===t.tagName?"true":e,t.setAttribute(e,n));else if(In(e))t.setAttribute(e,Rn(n)||"false"===n?"false":"true");else if(Ln(e))Rn(n)?t.removeAttributeNS(jn,$n(e)):t.setAttributeNS(jn,e,n);else if(Rn(n))t.removeAttribute(e);else{if(Y&&!X&&"TEXTAREA"===t.tagName&&"placeholder"===e&&!t.__ieph){var r=function(e){e.stopImmediatePropagation(),t.removeEventListener("input",r)};t.addEventListener("input",r),t.__ieph=!0}t.setAttribute(e,n)}}var lr={create:ur,update:ur};function fr(t,e){var n=e.elm,r=e.data,a=t.data;if(!(i(r.staticClass)&&i(r.class)&&(i(a)||i(a.staticClass)&&i(a.class)))){var s=Pn(e),u=n._transitionClasses;o(u)&&(s=Fn(s,Hn(u))),s!==n._prevClass&&(n.setAttribute("class",s),n._prevClass=s)}}var pr,dr,hr,vr,gr,mr,yr={create:fr,update:fr},_r=/[\w).+\-_$\]]/;function br(t){var e,n,r,i,o,a=!1,s=!1,u=!1,c=!1,l=0,f=0,p=0,d=0;for(r=0;r<t.length;r++)if(n=e,e=t.charCodeAt(r),a)39===e&&92!==n&&(a=!1);else if(s)34===e&&92!==n&&(s=!1);else if(u)96===e&&92!==n&&(u=!1);else if(c)47===e&&92!==n&&(c=!1);else if(124!==e||124===t.charCodeAt(r+1)||124===t.charCodeAt(r-1)||l||f||p){switch(e){case 34:s=!0;break;case 39:a=!0;break;case 96:u=!0;break;case 40:p++;break;case 41:p--;break;case 91:f++;break;case 93:f--;break;case 123:l++;break;case 125:l--}if(47===e){for(var h=r-1,v=void 0;h>=0&&" "===(v=t.charAt(h));h--);v&&_r.test(v)||(c=!0)}}else void 0===i?(d=r+1,i=t.slice(0,r).trim()):g();function g(){(o||(o=[])).push(t.slice(d,r).trim()),d=r+1}if(void 0===i?i=t.slice(0,r).trim():0!==d&&g(),o)for(r=0;r<o.length;r++)i=wr(i,o[r]);return i}function wr(t,e){var n=e.indexOf("(");return n<0?'_f("'+e+'")('+t+")":'_f("'+e.slice(0,n)+'")('+t+","+e.slice(n+1)}function xr(t){console.error("[Vue compiler]: "+t)}function Cr(t,e){return t?t.map(function(t){return t[e]}).filter(function(t){return t}):[]}function Tr(t,e,n){(t.props||(t.props=[])).push({name:e,value:n}),t.plain=!1}function Er(t,e,n){(t.attrs||(t.attrs=[])).push({name:e,value:n}),t.plain=!1}function Ar(t,e,n){t.attrsMap[e]=n,t.attrsList.push({name:e,value:n})}function Sr(t,e,n,i,o,a){var s;(i=i||r).capture&&(delete i.capture,e="!"+e),i.once&&(delete i.once,e="~"+e),i.passive&&(delete i.passive,e="&"+e),"click"===e&&(i.right?(e="contextmenu",delete i.right):i.middle&&(e="mouseup")),i.native?(delete i.native,s=t.nativeEvents||(t.nativeEvents={})):s=t.events||(t.events={});var u={value:n};i!==r&&(u.modifiers=i);var c=s[e];Array.isArray(c)?o?c.unshift(u):c.push(u):s[e]=c?o?[u,c]:[c,u]:u,t.plain=!1}function kr(t,e,n){var r=Or(t,":"+e)||Or(t,"v-bind:"+e);if(null!=r)return br(r);if(!1!==n){var i=Or(t,e);if(null!=i)return JSON.stringify(i)}}function Or(t,e,n){var r;if(null!=(r=t.attrsMap[e]))for(var i=t.attrsList,o=0,a=i.length;o<a;o++)if(i[o].name===e){i.splice(o,1);break}return n&&delete t.attrsMap[e],r}function Dr(t,e,n){var r=n||{},i=r.number,o="$$v";r.trim&&(o="(typeof $$v === 'string'? $$v.trim(): $$v)"),i&&(o="_n("+o+")");var a=Ir(e,o);t.model={value:"("+e+")",expression:'"'+e+'"',callback:"function ($$v) {"+a+"}"}}function Ir(t,e){var n=function(t){if(pr=t.length,t.indexOf("[")<0||t.lastIndexOf("]")<pr-1)return(vr=t.lastIndexOf("."))>-1?{exp:t.slice(0,vr),key:'"'+t.slice(vr+1)+'"'}:{exp:t,key:null};dr=t,vr=gr=mr=0;for(;!jr();)Lr(hr=Nr())?Rr(hr):91===hr&&$r(hr);return{exp:t.slice(0,gr),key:t.slice(gr+1,mr)}}(t);return null===n.key?t+"="+e:"$set("+n.exp+", "+n.key+", "+e+")"}function Nr(){return dr.charCodeAt(++vr)}function jr(){return vr>=pr}function Lr(t){return 34===t||39===t}function $r(t){var e=1;for(gr=vr;!jr();)if(Lr(t=Nr()))Rr(t);else if(91===t&&e++,93===t&&e--,0===e){mr=vr;break}}function Rr(t){for(var e=t;!jr()&&(t=Nr())!==e;);}var Pr,Mr="__r",Fr="__c";function Hr(t,e,n,r,i){var o,a,s,u,c;e=(o=e)._withTask||(o._withTask=function(){Gt=!0;var t=o.apply(null,arguments);return Gt=!1,t}),n&&(a=e,s=t,u=r,c=Pr,e=function t(){null!==a.apply(null,arguments)&&Br(s,t,u,c)}),Pr.addEventListener(t,e,nt?{capture:r,passive:i}:r)}function Br(t,e,n,r){(r||Pr).removeEventListener(t,e._withTask||e,n)}function Wr(t,e){if(!i(t.data.on)||!i(e.data.on)){var n=e.data.on||{},r=t.data.on||{};Pr=e.elm,function(t){if(o(t[Mr])){var e=Y?"change":"input";t[e]=[].concat(t[Mr],t[e]||[]),delete t[Mr]}o(t[Fr])&&(t.change=[].concat(t[Fr],t.change||[]),delete t[Fr])}(n),oe(n,r,Hr,Br,e.context),Pr=void 0}}var qr={create:Wr,update:Wr};function Ur(t,e){if(!i(t.data.domProps)||!i(e.data.domProps)){var n,r,a,s,u=e.elm,c=t.data.domProps||{},l=e.data.domProps||{};o(l.__ob__)&&(l=e.data.domProps=O({},l));for(n in c)i(l[n])&&(u[n]="");for(n in l){if(r=l[n],"textContent"===n||"innerHTML"===n){if(e.children&&(e.children.length=0),r===c[n])continue;1===u.childNodes.length&&u.removeChild(u.childNodes[0])}if("value"===n){u._value=r;var f=i(r)?"":String(r);s=f,(a=u).composing||"OPTION"!==a.tagName&&!function(t,e){var n=!0;try{n=document.activeElement!==t}catch(t){}return n&&t.value!==e}(a,s)&&!function(t,e){var n=t.value,r=t._vModifiers;if(o(r)){if(r.lazy)return!1;if(r.number)return h(n)!==h(e);if(r.trim)return n.trim()!==e.trim()}return n!==e}(a,s)||(u.value=f)}else u[n]=r}}}var zr={create:Ur,update:Ur},Vr=w(function(t){var e={},n=/:(.+)/;return t.split(/;(?![^(]*\))/g).forEach(function(t){if(t){var r=t.split(n);r.length>1&&(e[r[0].trim()]=r[1].trim())}}),e});function Kr(t){var e=Qr(t.style);return t.staticStyle?O(t.staticStyle,e):e}function Qr(t){return Array.isArray(t)?D(t):"string"==typeof t?Vr(t):t}var Gr,Yr=/^--/,Xr=/\s*!important$/,Jr=function(t,e,n){if(Yr.test(e))t.style.setProperty(e,n);else if(Xr.test(n))t.style.setProperty(e,n.replace(Xr,""),"important");else{var r=ti(e);if(Array.isArray(n))for(var i=0,o=n.length;i<o;i++)t.style[r]=n[i];else t.style[r]=n}},Zr=["Webkit","Moz","ms"],ti=w(function(t){if(Gr=Gr||document.createElement("div").style,"filter"!==(t=C(t))&&t in Gr)return t;for(var e=t.charAt(0).toUpperCase()+t.slice(1),n=0;n<Zr.length;n++){var r=Zr[n]+e;if(r in Gr)return r}});function ei(t,e){var n=e.data,r=t.data;if(!(i(n.staticStyle)&&i(n.style)&&i(r.staticStyle)&&i(r.style))){var a,s,u=e.elm,c=r.staticStyle,l=r.normalizedStyle||r.style||{},f=c||l,p=Qr(e.data.style)||{};e.data.normalizedStyle=o(p.__ob__)?O({},p):p;var d=function(t,e){var n,r={};if(e)for(var i=t;i.componentInstance;)(i=i.componentInstance._vnode)&&i.data&&(n=Kr(i.data))&&O(r,n);(n=Kr(t.data))&&O(r,n);for(var o=t;o=o.parent;)o.data&&(n=Kr(o.data))&&O(r,n);return r}(e,!0);for(s in f)i(d[s])&&Jr(u,s,"");for(s in d)(a=d[s])!==f[s]&&Jr(u,s,null==a?"":a)}}var ni={create:ei,update:ei};function ri(t,e){if(e&&(e=e.trim()))if(t.classList)e.indexOf(" ")>-1?e.split(/\s+/).forEach(function(e){return t.classList.add(e)}):t.classList.add(e);else{var n=" "+(t.getAttribute("class")||"")+" ";n.indexOf(" "+e+" ")<0&&t.setAttribute("class",(n+e).trim())}}function ii(t,e){if(e&&(e=e.trim()))if(t.classList)e.indexOf(" ")>-1?e.split(/\s+/).forEach(function(e){return t.classList.remove(e)}):t.classList.remove(e),t.classList.length||t.removeAttribute("class");else{for(var n=" "+(t.getAttribute("class")||"")+" ",r=" "+e+" ";n.indexOf(r)>=0;)n=n.replace(r," ");(n=n.trim())?t.setAttribute("class",n):t.removeAttribute("class")}}function oi(t){if(t){if("object"==typeof t){var e={};return!1!==t.css&&O(e,ai(t.name||"v")),O(e,t),e}return"string"==typeof t?ai(t):void 0}}var ai=w(function(t){return{enterClass:t+"-enter",enterToClass:t+"-enter-to",enterActiveClass:t+"-enter-active",leaveClass:t+"-leave",leaveToClass:t+"-leave-to",leaveActiveClass:t+"-leave-active"}}),si=V&&!X,ui="transition",ci="animation",li="transition",fi="transitionend",pi="animation",di="animationend";si&&(void 0===window.ontransitionend&&void 0!==window.onwebkittransitionend&&(li="WebkitTransition",fi="webkitTransitionEnd"),void 0===window.onanimationend&&void 0!==window.onwebkitanimationend&&(pi="WebkitAnimation",di="webkitAnimationEnd"));var hi=V?window.requestAnimationFrame?window.requestAnimationFrame.bind(window):setTimeout:function(t){return t()};function vi(t){hi(function(){hi(t)})}function gi(t,e){var n=t._transitionClasses||(t._transitionClasses=[]);n.indexOf(e)<0&&(n.push(e),ri(t,e))}function mi(t,e){t._transitionClasses&&y(t._transitionClasses,e),ii(t,e)}function yi(t,e,n){var r=bi(t,e),i=r.type,o=r.timeout,a=r.propCount;if(!i)return n();var s=i===ui?fi:di,u=0,c=function(){t.removeEventListener(s,l),n()},l=function(e){e.target===t&&++u>=a&&c()};setTimeout(function(){u<a&&c()},o+1),t.addEventListener(s,l)}var _i=/\b(transform|all)(,|$)/;function bi(t,e){var n,r=window.getComputedStyle(t),i=r[li+"Delay"].split(", "),o=r[li+"Duration"].split(", "),a=wi(i,o),s=r[pi+"Delay"].split(", "),u=r[pi+"Duration"].split(", "),c=wi(s,u),l=0,f=0;return e===ui?a>0&&(n=ui,l=a,f=o.length):e===ci?c>0&&(n=ci,l=c,f=u.length):f=(n=(l=Math.max(a,c))>0?a>c?ui:ci:null)?n===ui?o.length:u.length:0,{type:n,timeout:l,propCount:f,hasTransform:n===ui&&_i.test(r[li+"Property"])}}function wi(t,e){for(;t.length<e.length;)t=t.concat(t);return Math.max.apply(null,e.map(function(e,n){return xi(e)+xi(t[n])}))}function xi(t){return 1e3*Number(t.slice(0,-1))}function Ci(t,e){var n=t.elm;o(n._leaveCb)&&(n._leaveCb.cancelled=!0,n._leaveCb());var r=oi(t.data.transition);if(!i(r)&&!o(n._enterCb)&&1===n.nodeType){for(var a=r.css,s=r.type,c=r.enterClass,l=r.enterToClass,f=r.enterActiveClass,p=r.appearClass,d=r.appearToClass,v=r.appearActiveClass,g=r.beforeEnter,m=r.enter,y=r.afterEnter,_=r.enterCancelled,b=r.beforeAppear,w=r.appear,x=r.afterAppear,C=r.appearCancelled,T=r.duration,E=_e,A=_e.$vnode;A&&A.parent;)E=(A=A.parent).context;var S=!E._isMounted||!t.isRootInsert;if(!S||w||""===w){var k=S&&p?p:c,O=S&&v?v:f,D=S&&d?d:l,I=S&&b||g,N=S&&"function"==typeof w?w:m,j=S&&x||y,L=S&&C||_,$=h(u(T)?T.enter:T);0;var P=!1!==a&&!X,M=Ai(N),F=n._enterCb=R(function(){P&&(mi(n,D),mi(n,O)),F.cancelled?(P&&mi(n,k),L&&L(n)):j&&j(n),n._enterCb=null});t.data.show||ae(t,"insert",function(){var e=n.parentNode,r=e&&e._pending&&e._pending[t.key];r&&r.tag===t.tag&&r.elm._leaveCb&&r.elm._leaveCb(),N&&N(n,F)}),I&&I(n),P&&(gi(n,k),gi(n,O),vi(function(){gi(n,D),mi(n,k),F.cancelled||M||(Ei($)?setTimeout(F,$):yi(n,s,F))})),t.data.show&&(e&&e(),N&&N(n,F)),P||M||F()}}}function Ti(t,e){var n=t.elm;o(n._enterCb)&&(n._enterCb.cancelled=!0,n._enterCb());var r=oi(t.data.transition);if(i(r)||1!==n.nodeType)return e();if(!o(n._leaveCb)){var a=r.css,s=r.type,c=r.leaveClass,l=r.leaveToClass,f=r.leaveActiveClass,p=r.beforeLeave,d=r.leave,v=r.afterLeave,g=r.leaveCancelled,m=r.delayLeave,y=r.duration,_=!1!==a&&!X,b=Ai(d),w=h(u(y)?y.leave:y);0;var x=n._leaveCb=R(function(){n.parentNode&&n.parentNode._pending&&(n.parentNode._pending[t.key]=null),_&&(mi(n,l),mi(n,f)),x.cancelled?(_&&mi(n,c),g&&g(n)):(e(),v&&v(n)),n._leaveCb=null});m?m(C):C()}function C(){x.cancelled||(t.data.show||((n.parentNode._pending||(n.parentNode._pending={}))[t.key]=t),p&&p(n),_&&(gi(n,c),gi(n,f),vi(function(){gi(n,l),mi(n,c),x.cancelled||b||(Ei(w)?setTimeout(x,w):yi(n,s,x))})),d&&d(n,x),_||b||x())}}function Ei(t){return"number"==typeof t&&!isNaN(t)}function Ai(t){if(i(t))return!1;var e=t.fns;return o(e)?Ai(Array.isArray(e)?e[0]:e):(t._length||t.length)>1}function Si(t,e){!0!==e.data.show&&Ci(e)}var ki=function(t){var e,n,r={},u=t.modules,c=t.nodeOps;for(e=0;e<Zn.length;++e)for(r[Zn[e]]=[],n=0;n<u.length;++n)o(u[n][Zn[e]])&&r[Zn[e]].push(u[n][Zn[e]]);function l(t){var e=c.parentNode(t);o(e)&&c.removeChild(e,t)}function f(t,e,n,i,s){if(t.isRootInsert=!s,!function(t,e,n,i){var s=t.data;if(o(s)){var u=o(t.componentInstance)&&s.keepAlive;if(o(s=s.hook)&&o(s=s.init)&&s(t,!1,n,i),o(t.componentInstance))return p(t,e),a(u)&&function(t,e,n,i){for(var a,s=t;s.componentInstance;)if(s=s.componentInstance._vnode,o(a=s.data)&&o(a=a.transition)){for(a=0;a<r.activate.length;++a)r.activate[a](Jn,s);e.push(s);break}d(n,t.elm,i)}(t,e,n,i),!0}}(t,e,n,i)){var u=t.data,l=t.children,f=t.tag;o(f)?(t.elm=t.ns?c.createElementNS(t.ns,f):c.createElement(f,t),y(t),h(t,l,e),o(u)&&m(t,e),d(n,t.elm,i)):a(t.isComment)?(t.elm=c.createComment(t.text),d(n,t.elm,i)):(t.elm=c.createTextNode(t.text),d(n,t.elm,i))}}function p(t,e){o(t.data.pendingInsert)&&(e.push.apply(e,t.data.pendingInsert),t.data.pendingInsert=null),t.elm=t.componentInstance.$el,g(t)?(m(t,e),y(t)):(Xn(t),e.push(t))}function d(t,e,n){o(t)&&(o(n)?n.parentNode===t&&c.insertBefore(t,e,n):c.appendChild(t,e))}function h(t,e,n){if(Array.isArray(e))for(var r=0;r<e.length;++r)f(e[r],n,t.elm,null,!0);else s(t.text)&&c.appendChild(t.elm,c.createTextNode(String(t.text)))}function g(t){for(;t.componentInstance;)t=t.componentInstance._vnode;return o(t.tag)}function m(t,n){for(var i=0;i<r.create.length;++i)r.create[i](Jn,t);o(e=t.data.hook)&&(o(e.create)&&e.create(Jn,t),o(e.insert)&&n.push(t))}function y(t){var e;if(o(e=t.fnScopeId))c.setAttribute(t.elm,e,"");else for(var n=t;n;)o(e=n.context)&&o(e=e.$options._scopeId)&&c.setAttribute(t.elm,e,""),n=n.parent;o(e=_e)&&e!==t.context&&e!==t.fnContext&&o(e=e.$options._scopeId)&&c.setAttribute(t.elm,e,"")}function _(t,e,n,r,i,o){for(;r<=i;++r)f(n[r],o,t,e)}function b(t){var e,n,i=t.data;if(o(i))for(o(e=i.hook)&&o(e=e.destroy)&&e(t),e=0;e<r.destroy.length;++e)r.destroy[e](t);if(o(e=t.children))for(n=0;n<t.children.length;++n)b(t.children[n])}function w(t,e,n,r){for(;n<=r;++n){var i=e[n];o(i)&&(o(i.tag)?(x(i),b(i)):l(i.elm))}}function x(t,e){if(o(e)||o(t.data)){var n,i=r.remove.length+1;for(o(e)?e.listeners+=i:e=function(t,e){function n(){0==--n.listeners&&l(t)}return n.listeners=e,n}(t.elm,i),o(n=t.componentInstance)&&o(n=n._vnode)&&o(n.data)&&x(n,e),n=0;n<r.remove.length;++n)r.remove[n](t,e);o(n=t.data.hook)&&o(n=n.remove)?n(t,e):e()}else l(t.elm)}function C(t,e,n,r){for(var i=n;i<r;i++){var a=e[i];if(o(a)&&tr(t,a))return i}}function T(t,e,n,s){if(t!==e){var u=e.elm=t.elm;if(a(t.isAsyncPlaceholder))o(e.asyncFactory.resolved)?S(t.elm,e,n):e.isAsyncPlaceholder=!0;else if(a(e.isStatic)&&a(t.isStatic)&&e.key===t.key&&(a(e.isCloned)||a(e.isOnce)))e.componentInstance=t.componentInstance;else{var l,p=e.data;o(p)&&o(l=p.hook)&&o(l=l.prepatch)&&l(t,e);var d=t.children,h=e.children;if(o(p)&&g(e)){for(l=0;l<r.update.length;++l)r.update[l](t,e);o(l=p.hook)&&o(l=l.update)&&l(t,e)}i(e.text)?o(d)&&o(h)?d!==h&&function(t,e,n,r,a){for(var s,u,l,p=0,d=0,h=e.length-1,v=e[0],g=e[h],m=n.length-1,y=n[0],b=n[m],x=!a;p<=h&&d<=m;)i(v)?v=e[++p]:i(g)?g=e[--h]:tr(v,y)?(T(v,y,r),v=e[++p],y=n[++d]):tr(g,b)?(T(g,b,r),g=e[--h],b=n[--m]):tr(v,b)?(T(v,b,r),x&&c.insertBefore(t,v.elm,c.nextSibling(g.elm)),v=e[++p],b=n[--m]):tr(g,y)?(T(g,y,r),x&&c.insertBefore(t,g.elm,v.elm),g=e[--h],y=n[++d]):(i(s)&&(s=er(e,p,h)),i(u=o(y.key)?s[y.key]:C(y,e,p,h))?f(y,r,t,v.elm):tr(l=e[u],y)?(T(l,y,r),e[u]=void 0,x&&c.insertBefore(t,l.elm,v.elm)):f(y,r,t,v.elm),y=n[++d]);p>h?_(t,i(n[m+1])?null:n[m+1].elm,n,d,m,r):d>m&&w(0,e,p,h)}(u,d,h,n,s):o(h)?(o(t.text)&&c.setTextContent(u,""),_(u,null,h,0,h.length-1,n)):o(d)?w(0,d,0,d.length-1):o(t.text)&&c.setTextContent(u,""):t.text!==e.text&&c.setTextContent(u,e.text),o(p)&&o(l=p.hook)&&o(l=l.postpatch)&&l(t,e)}}}function E(t,e,n){if(a(n)&&o(t.parent))t.parent.data.pendingInsert=e;else for(var r=0;r<e.length;++r)e[r].data.hook.insert(e[r])}var A=v("attrs,class,staticClass,staticStyle,key");function S(t,e,n,r){var i,s=e.tag,u=e.data,c=e.children;if(r=r||u&&u.pre,e.elm=t,a(e.isComment)&&o(e.asyncFactory))return e.isAsyncPlaceholder=!0,!0;if(o(u)&&(o(i=u.hook)&&o(i=i.init)&&i(e,!0),o(i=e.componentInstance)))return p(e,n),!0;if(o(s)){if(o(c))if(t.hasChildNodes())if(o(i=u)&&o(i=i.domProps)&&o(i=i.innerHTML)){if(i!==t.innerHTML)return!1}else{for(var l=!0,f=t.firstChild,d=0;d<c.length;d++){if(!f||!S(f,c[d],n,r)){l=!1;break}f=f.nextSibling}if(!l||f)return!1}else h(e,c,n);if(o(u)){var v=!1;for(var g in u)if(!A(g)){v=!0,m(e,n);break}!v&&u.class&&ee(u.class)}}else t.data!==e.text&&(t.data=e.text);return!0}return function(t,e,n,s,u,l){if(!i(e)){var p,d=!1,h=[];if(i(t))d=!0,f(e,h,u,l);else{var v=o(t.nodeType);if(!v&&tr(t,e))T(t,e,h,s);else{if(v){if(1===t.nodeType&&t.hasAttribute(P)&&(t.removeAttribute(P),n=!0),a(n)&&S(t,e,h))return E(e,h,!0),t;p=t,t=new dt(c.tagName(p).toLowerCase(),{},[],void 0,p)}var m=t.elm,y=c.parentNode(m);if(f(e,h,m._leaveCb?null:y,c.nextSibling(m)),o(e.parent))for(var _=e.parent,x=g(e);_;){for(var C=0;C<r.destroy.length;++C)r.destroy[C](_);if(_.elm=e.elm,x){for(var A=0;A<r.create.length;++A)r.create[A](Jn,_);var k=_.data.hook.insert;if(k.merged)for(var O=1;O<k.fns.length;O++)k.fns[O]()}else Xn(_);_=_.parent}o(y)?w(0,[t],0,0):o(t.tag)&&b(t)}}return E(e,h,d),e.elm}o(t)&&b(t)}}({nodeOps:Gn,modules:[lr,yr,qr,zr,ni,V?{create:Si,activate:Si,remove:function(t,e){!0!==t.data.show?Ti(t,e):e()}}:{}].concat(sr)});X&&document.addEventListener("selectionchange",function(){var t=document.activeElement;t&&t.vmodel&&Ri(t,"input")});var Oi={inserted:function(t,e,n,r){"select"===n.tag?(r.elm&&!r.elm._vOptions?ae(n,"postpatch",function(){Oi.componentUpdated(t,e,n)}):Di(t,e,n.context),t._vOptions=[].map.call(t.options,ji)):("textarea"===n.tag||Kn(t.type))&&(t._vModifiers=e.modifiers,e.modifiers.lazy||(t.addEventListener("change",$i),Z||(t.addEventListener("compositionstart",Li),t.addEventListener("compositionend",$i)),X&&(t.vmodel=!0)))},componentUpdated:function(t,e,n){if("select"===n.tag){Di(t,e,n.context);var r=t._vOptions,i=t._vOptions=[].map.call(t.options,ji);if(i.some(function(t,e){return!L(t,r[e])}))(t.multiple?e.value.some(function(t){return Ni(t,i)}):e.value!==e.oldValue&&Ni(e.value,i))&&Ri(t,"change")}}};function Di(t,e,n){Ii(t,e,n),(Y||J)&&setTimeout(function(){Ii(t,e,n)},0)}function Ii(t,e,n){var r=e.value,i=t.multiple;if(!i||Array.isArray(r)){for(var o,a,s=0,u=t.options.length;s<u;s++)if(a=t.options[s],i)o=$(r,ji(a))>-1,a.selected!==o&&(a.selected=o);else if(L(ji(a),r))return void(t.selectedIndex!==s&&(t.selectedIndex=s));i||(t.selectedIndex=-1)}}function Ni(t,e){return e.every(function(e){return!L(e,t)})}function ji(t){return"_value"in t?t._value:t.value}function Li(t){t.target.composing=!0}function $i(t){t.target.composing&&(t.target.composing=!1,Ri(t.target,"input"))}function Ri(t,e){var n=document.createEvent("HTMLEvents");n.initEvent(e,!0,!0),t.dispatchEvent(n)}function Pi(t){return!t.componentInstance||t.data&&t.data.transition?t:Pi(t.componentInstance._vnode)}var Mi={model:Oi,show:{bind:function(t,e,n){var r=e.value,i=(n=Pi(n)).data&&n.data.transition,o=t.__vOriginalDisplay="none"===t.style.display?"":t.style.display;r&&i?(n.data.show=!0,Ci(n,function(){t.style.display=o})):t.style.display=r?o:"none"},update:function(t,e,n){var r=e.value;r!==e.oldValue&&((n=Pi(n)).data&&n.data.transition?(n.data.show=!0,r?Ci(n,function(){t.style.display=t.__vOriginalDisplay}):Ti(n,function(){t.style.display="none"})):t.style.display=r?t.__vOriginalDisplay:"none")},unbind:function(t,e,n,r,i){i||(t.style.display=t.__vOriginalDisplay)}}},Fi={name:String,appear:Boolean,css:Boolean,mode:String,type:String,enterClass:String,leaveClass:String,enterToClass:String,leaveToClass:String,enterActiveClass:String,leaveActiveClass:String,appearClass:String,appearActiveClass:String,appearToClass:String,duration:[Number,String,Object]};function Hi(t){var e=t&&t.componentOptions;return e&&e.Ctor.options.abstract?Hi(pe(e.children)):t}function Bi(t){var e={},n=t.$options;for(var r in n.propsData)e[r]=t[r];var i=n._parentListeners;for(var o in i)e[C(o)]=i[o];return e}function Wi(t,e){if(/\d-keep-alive$/.test(e.tag))return t("keep-alive",{props:e.componentOptions.propsData})}var qi={name:"transition",props:Fi,abstract:!0,render:function(t){var e=this,n=this.$slots.default;if(n&&(n=n.filter(function(t){return t.tag||fe(t)})).length){0;var r=this.mode;0;var i=n[0];if(function(t){for(;t=t.parent;)if(t.data.transition)return!0}(this.$vnode))return i;var o=Hi(i);if(!o)return i;if(this._leaving)return Wi(t,i);var a="__transition-"+this._uid+"-";o.key=null==o.key?o.isComment?a+"comment":a+o.tag:s(o.key)?0===String(o.key).indexOf(a)?o.key:a+o.key:o.key;var u,c,l=(o.data||(o.data={})).transition=Bi(this),f=this._vnode,p=Hi(f);if(o.data.directives&&o.data.directives.some(function(t){return"show"===t.name})&&(o.data.show=!0),p&&p.data&&(u=o,(c=p).key!==u.key||c.tag!==u.tag)&&!fe(p)&&(!p.componentInstance||!p.componentInstance._vnode.isComment)){var d=p.data.transition=O({},l);if("out-in"===r)return this._leaving=!0,ae(d,"afterLeave",function(){e._leaving=!1,e.$forceUpdate()}),Wi(t,i);if("in-out"===r){if(fe(o))return f;var h,v=function(){h()};ae(l,"afterEnter",v),ae(l,"enterCancelled",v),ae(d,"delayLeave",function(t){h=t})}}return i}}},Ui=O({tag:String,moveClass:String},Fi);function zi(t){t.elm._moveCb&&t.elm._moveCb(),t.elm._enterCb&&t.elm._enterCb()}function Vi(t){t.data.newPos=t.elm.getBoundingClientRect()}function Ki(t){var e=t.data.pos,n=t.data.newPos,r=e.left-n.left,i=e.top-n.top;if(r||i){t.data.moved=!0;var o=t.elm.style;o.transform=o.WebkitTransform="translate("+r+"px,"+i+"px)",o.transitionDuration="0s"}}delete Ui.mode;var Qi={Transition:qi,TransitionGroup:{props:Ui,render:function(t){for(var e=this.tag||this.$vnode.data.tag||"span",n=Object.create(null),r=this.prevChildren=this.children,i=this.$slots.default||[],o=this.children=[],a=Bi(this),s=0;s<i.length;s++){var u=i[s];if(u.tag)if(null!=u.key&&0!==String(u.key).indexOf("__vlist"))o.push(u),n[u.key]=u,(u.data||(u.data={})).transition=a;else;}if(r){for(var c=[],l=[],f=0;f<r.length;f++){var p=r[f];p.data.transition=a,p.data.pos=p.elm.getBoundingClientRect(),n[p.key]?c.push(p):l.push(p)}this.kept=t(e,null,c),this.removed=l}return t(e,null,o)},beforeUpdate:function(){this.__patch__(this._vnode,this.kept,!1,!0),this._vnode=this.kept},updated:function(){var t=this.prevChildren,e=this.moveClass||(this.name||"v")+"-move";t.length&&this.hasMove(t[0].elm,e)&&(t.forEach(zi),t.forEach(Vi),t.forEach(Ki),this._reflow=document.body.offsetHeight,t.forEach(function(t){if(t.data.moved){var n=t.elm,r=n.style;gi(n,e),r.transform=r.WebkitTransform=r.transitionDuration="",n.addEventListener(fi,n._moveCb=function t(r){r&&!/transform$/.test(r.propertyName)||(n.removeEventListener(fi,t),n._moveCb=null,mi(n,e))})}}))},methods:{hasMove:function(t,e){if(!si)return!1;if(this._hasMove)return this._hasMove;var n=t.cloneNode();t._transitionClasses&&t._transitionClasses.forEach(function(t){ii(n,t)}),ri(n,e),n.style.display="none",this.$el.appendChild(n);var r=bi(n);return this.$el.removeChild(n),this._hasMove=r.hasTransform}}}};mn.config.mustUseProp=Dn,mn.config.isReservedTag=Un,mn.config.isReservedAttr=kn,mn.config.getTagNamespace=zn,mn.config.isUnknownElement=function(t){if(!V)return!0;if(Un(t))return!1;if(t=t.toLowerCase(),null!=Vn[t])return Vn[t];var e=document.createElement(t);return t.indexOf("-")>-1?Vn[t]=e.constructor===window.HTMLUnknownElement||e.constructor===window.HTMLElement:Vn[t]=/HTMLUnknownElement/.test(e.toString())},O(mn.options.directives,Mi),O(mn.options.components,Qi),mn.prototype.__patch__=V?ki:I,mn.prototype.$mount=function(t,e){return t=t&&V?Qn(t):void 0,r=t,i=e,(n=this).$el=r,n.$options.render||(n.$options.render=vt),xe(n,"beforeMount"),new Ie(n,function(){n._update(n._render(),i)},I,null,!0),i=!1,null==n.$vnode&&(n._isMounted=!0,xe(n,"mounted")),n;var n,r,i},mn.nextTick(function(){H.devtools&&ot&&ot.emit("init",mn)},0);var Gi=/\{\{((?:.|\n)+?)\}\}/g,Yi=/[-.*+?^${}()|[\]\/\\]/g,Xi=w(function(t){var e=t[0].replace(Yi,"\\$&"),n=t[1].replace(Yi,"\\$&");return new RegExp(e+"((?:.|\\n)+?)"+n,"g")});function Ji(t,e){var n=e?Xi(e):Gi;if(n.test(t)){for(var r,i,o,a=[],s=[],u=n.lastIndex=0;r=n.exec(t);){(i=r.index)>u&&(s.push(o=t.slice(u,i)),a.push(JSON.stringify(o)));var c=br(r[1].trim());a.push("_s("+c+")"),s.push({"@binding":c}),u=i+r[0].length}return u<t.length&&(s.push(o=t.slice(u)),a.push(JSON.stringify(o))),{expression:a.join("+"),tokens:s}}}var Zi={staticKeys:["staticClass"],transformNode:function(t,e){e.warn;var n=Or(t,"class");n&&(t.staticClass=JSON.stringify(n));var r=kr(t,"class",!1);r&&(t.classBinding=r)},genData:function(t){var e="";return t.staticClass&&(e+="staticClass:"+t.staticClass+","),t.classBinding&&(e+="class:"+t.classBinding+","),e}};var to,eo={staticKeys:["staticStyle"],transformNode:function(t,e){e.warn;var n=Or(t,"style");n&&(t.staticStyle=JSON.stringify(Vr(n)));var r=kr(t,"style",!1);r&&(t.styleBinding=r)},genData:function(t){var e="";return t.staticStyle&&(e+="staticStyle:"+t.staticStyle+","),t.styleBinding&&(e+="style:("+t.styleBinding+"),"),e}},no=function(t){return(to=to||document.createElement("div")).innerHTML=t,to.textContent},ro=v("area,base,br,col,embed,frame,hr,img,input,isindex,keygen,link,meta,param,source,track,wbr"),io=v("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source"),oo=v("address,article,aside,base,blockquote,body,caption,col,colgroup,dd,details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,title,tr,track"),ao=/^\s*([^\s"'<>\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,so="[a-zA-Z_][\\w\\-\\.]*",uo="((?:"+so+"\\:)?"+so+")",co=new RegExp("^<"+uo),lo=/^\s*(\/?)>/,fo=new RegExp("^<\\/"+uo+"[^>]*>"),po=/^<!DOCTYPE [^>]+>/i,ho=/^<!--/,vo=/^<!\[/,go=!1;"x".replace(/x(.)?/g,function(t,e){go=""===e});var mo=v("script,style,textarea",!0),yo={},_o={"&lt;":"<","&gt;":">","&quot;":'"',"&amp;":"&","&#10;":"\n","&#9;":"\t"},bo=/&(?:lt|gt|quot|amp);/g,wo=/&(?:lt|gt|quot|amp|#10|#9);/g,xo=v("pre,textarea",!0),Co=function(t,e){return t&&xo(t)&&"\n"===e[0]};var To,Eo,Ao,So,ko,Oo,Do,Io,No=/^@|^v-on:/,jo=/^v-|^@|^:/,Lo=/(.*?)\s+(?:in|of)\s+(.*)/,$o=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,Ro=/^\(|\)$/g,Po=/:(.*)$/,Mo=/^:|^v-bind:/,Fo=/\.[^.]+/g,Ho=w(no);function Bo(t,e,n){return{type:1,tag:t,attrsList:e,attrsMap:function(t){for(var e={},n=0,r=t.length;n<r;n++)e[t[n].name]=t[n].value;return e}(e),parent:n,children:[]}}function Wo(t,e){To=e.warn||xr,Oo=e.isPreTag||N,Do=e.mustUseProp||N,Io=e.getTagNamespace||N,Ao=Cr(e.modules,"transformNode"),So=Cr(e.modules,"preTransformNode"),ko=Cr(e.modules,"postTransformNode"),Eo=e.delimiters;var n,r,i=[],o=!1!==e.preserveWhitespace,a=!1,s=!1;function u(t){t.pre&&(a=!1),Oo(t.tag)&&(s=!1);for(var n=0;n<ko.length;n++)ko[n](t,e)}return function(t,e){for(var n,r,i=[],o=e.expectHTML,a=e.isUnaryTag||N,s=e.canBeLeftOpenTag||N,u=0;t;){if(n=t,r&&mo(r)){var c=0,l=r.toLowerCase(),f=yo[l]||(yo[l]=new RegExp("([\\s\\S]*?)(</"+l+"[^>]*>)","i")),p=t.replace(f,function(t,n,r){return c=r.length,mo(l)||"noscript"===l||(n=n.replace(/<!--([\s\S]*?)-->/g,"$1").replace(/<!\[CDATA\[([\s\S]*?)]]>/g,"$1")),Co(l,n)&&(n=n.slice(1)),e.chars&&e.chars(n),""});u+=t.length-p.length,t=p,A(l,u-c,u)}else{var d=t.indexOf("<");if(0===d){if(ho.test(t)){var h=t.indexOf("--\x3e");if(h>=0){e.shouldKeepComment&&e.comment(t.substring(4,h)),C(h+3);continue}}if(vo.test(t)){var v=t.indexOf("]>");if(v>=0){C(v+2);continue}}var g=t.match(po);if(g){C(g[0].length);continue}var m=t.match(fo);if(m){var y=u;C(m[0].length),A(m[1],y,u);continue}var _=T();if(_){E(_),Co(r,t)&&C(1);continue}}var b=void 0,w=void 0,x=void 0;if(d>=0){for(w=t.slice(d);!(fo.test(w)||co.test(w)||ho.test(w)||vo.test(w)||(x=w.indexOf("<",1))<0);)d+=x,w=t.slice(d);b=t.substring(0,d),C(d)}d<0&&(b=t,t=""),e.chars&&b&&e.chars(b)}if(t===n){e.chars&&e.chars(t);break}}function C(e){u+=e,t=t.substring(e)}function T(){var e=t.match(co);if(e){var n,r,i={tagName:e[1],attrs:[],start:u};for(C(e[0].length);!(n=t.match(lo))&&(r=t.match(ao));)C(r[0].length),i.attrs.push(r);if(n)return i.unarySlash=n[1],C(n[0].length),i.end=u,i}}function E(t){var n=t.tagName,u=t.unarySlash;o&&("p"===r&&oo(n)&&A(r),s(n)&&r===n&&A(n));for(var c,l,f,p=a(n)||!!u,d=t.attrs.length,h=new Array(d),v=0;v<d;v++){var g=t.attrs[v];go&&-1===g[0].indexOf('""')&&(""===g[3]&&delete g[3],""===g[4]&&delete g[4],""===g[5]&&delete g[5]);var m=g[3]||g[4]||g[5]||"",y="a"===n&&"href"===g[1]?e.shouldDecodeNewlinesForHref:e.shouldDecodeNewlines;h[v]={name:g[1],value:(c=m,l=y,f=l?wo:bo,c.replace(f,function(t){return _o[t]}))}}p||(i.push({tag:n,lowerCasedTag:n.toLowerCase(),attrs:h}),r=n),e.start&&e.start(n,h,p,t.start,t.end)}function A(t,n,o){var a,s;if(null==n&&(n=u),null==o&&(o=u),t&&(s=t.toLowerCase()),t)for(a=i.length-1;a>=0&&i[a].lowerCasedTag!==s;a--);else a=0;if(a>=0){for(var c=i.length-1;c>=a;c--)e.end&&e.end(i[c].tag,n,o);i.length=a,r=a&&i[a-1].tag}else"br"===s?e.start&&e.start(t,[],!0,n,o):"p"===s&&(e.start&&e.start(t,[],!1,n,o),e.end&&e.end(t,n,o))}A()}(t,{warn:To,expectHTML:e.expectHTML,isUnaryTag:e.isUnaryTag,canBeLeftOpenTag:e.canBeLeftOpenTag,shouldDecodeNewlines:e.shouldDecodeNewlines,shouldDecodeNewlinesForHref:e.shouldDecodeNewlinesForHref,shouldKeepComment:e.comments,start:function(t,o,c){var l=r&&r.ns||Io(t);Y&&"svg"===l&&(o=function(t){for(var e=[],n=0;n<t.length;n++){var r=t[n];Ko.test(r.name)||(r.name=r.name.replace(Qo,""),e.push(r))}return e}(o));var f,p,d,h,v,g=Bo(t,o,r);l&&(g.ns=l),"style"!==(f=g).tag&&("script"!==f.tag||f.attrsMap.type&&"text/javascript"!==f.attrsMap.type)||it()||(g.forbidden=!0);for(var m=0;m<So.length;m++)g=So[m](g,e)||g;function y(t){0}if(a||(null!=Or(p=g,"v-pre")&&(p.pre=!0),g.pre&&(a=!0)),Oo(g.tag)&&(s=!0),a?function(t){var e=t.attrsList.length;if(e)for(var n=t.attrs=new Array(e),r=0;r<e;r++)n[r]={name:t.attrsList[r].name,value:JSON.stringify(t.attrsList[r].value)};else t.pre||(t.plain=!0)}(g):g.processed||(Uo(g),function(t){var e=Or(t,"v-if");if(e)t.if=e,zo(t,{exp:e,block:t});else{null!=Or(t,"v-else")&&(t.else=!0);var n=Or(t,"v-else-if");n&&(t.elseif=n)}}(g),null!=Or(d=g,"v-once")&&(d.once=!0),qo(g,e)),n?i.length||n.if&&(g.elseif||g.else)&&(y(),zo(n,{exp:g.elseif,block:g})):(n=g,y()),r&&!g.forbidden)if(g.elseif||g.else)h=g,(v=function(t){var e=t.length;for(;e--;){if(1===t[e].type)return t[e];t.pop()}}(r.children))&&v.if&&zo(v,{exp:h.elseif,block:h});else if(g.slotScope){r.plain=!1;var _=g.slotTarget||'"default"';(r.scopedSlots||(r.scopedSlots={}))[_]=g}else r.children.push(g),g.parent=r;c?u(g):(r=g,i.push(g))},end:function(){var t=i[i.length-1],e=t.children[t.children.length-1];e&&3===e.type&&" "===e.text&&!s&&t.children.pop(),i.length-=1,r=i[i.length-1],u(t)},chars:function(t){if(r&&(!Y||"textarea"!==r.tag||r.attrsMap.placeholder!==t)){var e,n,i=r.children;if(t=s||t.trim()?"script"===(e=r).tag||"style"===e.tag?t:Ho(t):o&&i.length?" ":"")!a&&" "!==t&&(n=Ji(t,Eo))?i.push({type:2,expression:n.expression,tokens:n.tokens,text:t}):" "===t&&i.length&&" "===i[i.length-1].text||i.push({type:3,text:t})}},comment:function(t){r.children.push({type:3,text:t,isComment:!0})}}),n}function qo(t,e){var n,r,i,o;(r=kr(n=t,"key"))&&(n.key=r),t.plain=!t.key&&!t.attrsList.length,(o=kr(i=t,"ref"))&&(i.ref=o,i.refInFor=function(t){for(var e=t;e;){if(void 0!==e.for)return!0;e=e.parent}return!1}(i)),function(t){if("slot"===t.tag)t.slotName=kr(t,"name");else{var e;"template"===t.tag?(e=Or(t,"scope"),t.slotScope=e||Or(t,"slot-scope")):(e=Or(t,"slot-scope"))&&(t.slotScope=e);var n=kr(t,"slot");n&&(t.slotTarget='""'===n?'"default"':n,"template"===t.tag||t.slotScope||Er(t,"slot",n))}}(t),function(t){var e;(e=kr(t,"is"))&&(t.component=e);null!=Or(t,"inline-template")&&(t.inlineTemplate=!0)}(t);for(var a=0;a<Ao.length;a++)t=Ao[a](t,e)||t;!function(t){var e,n,r,i,o,a,s,u=t.attrsList;for(e=0,n=u.length;e<n;e++){if(r=i=u[e].name,o=u[e].value,jo.test(r))if(t.hasBindings=!0,(a=Vo(r))&&(r=r.replace(Fo,"")),Mo.test(r))r=r.replace(Mo,""),o=br(o),s=!1,a&&(a.prop&&(s=!0,"innerHtml"===(r=C(r))&&(r="innerHTML")),a.camel&&(r=C(r)),a.sync&&Sr(t,"update:"+C(r),Ir(o,"$event"))),s||!t.component&&Do(t.tag,t.attrsMap.type,r)?Tr(t,r,o):Er(t,r,o);else if(No.test(r))r=r.replace(No,""),Sr(t,r,o,a,!1);else{var c=(r=r.replace(jo,"")).match(Po),l=c&&c[1];l&&(r=r.slice(0,-(l.length+1))),p=r,d=i,h=o,v=l,g=a,((f=t).directives||(f.directives=[])).push({name:p,rawName:d,value:h,arg:v,modifiers:g}),f.plain=!1}else Er(t,r,JSON.stringify(o)),!t.component&&"muted"===r&&Do(t.tag,t.attrsMap.type,r)&&Tr(t,r,"true")}var f,p,d,h,v,g}(t)}function Uo(t){var e;if(e=Or(t,"v-for")){var n=function(t){var e=t.match(Lo);if(!e)return;var n={};n.for=e[2].trim();var r=e[1].trim().replace(Ro,""),i=r.match($o);i?(n.alias=r.replace($o,""),n.iterator1=i[1].trim(),i[2]&&(n.iterator2=i[2].trim())):n.alias=r;return n}(e);n&&O(t,n)}}function zo(t,e){t.ifConditions||(t.ifConditions=[]),t.ifConditions.push(e)}function Vo(t){var e=t.match(Fo);if(e){var n={};return e.forEach(function(t){n[t.slice(1)]=!0}),n}}var Ko=/^xmlns:NS\d+/,Qo=/^NS\d+:/;function Go(t){return Bo(t.tag,t.attrsList.slice(),t.parent)}var Yo=[Zi,eo,{preTransformNode:function(t,e){if("input"===t.tag){var n=t.attrsMap;if(n["v-model"]&&(n["v-bind:type"]||n[":type"])){var r=kr(t,"type"),i=Or(t,"v-if",!0),o=i?"&&("+i+")":"",a=null!=Or(t,"v-else",!0),s=Or(t,"v-else-if",!0),u=Go(t);Uo(u),Ar(u,"type","checkbox"),qo(u,e),u.processed=!0,u.if="("+r+")==='checkbox'"+o,zo(u,{exp:u.if,block:u});var c=Go(t);Or(c,"v-for",!0),Ar(c,"type","radio"),qo(c,e),zo(u,{exp:"("+r+")==='radio'"+o,block:c});var l=Go(t);return Or(l,"v-for",!0),Ar(l,":type",r),qo(l,e),zo(u,{exp:i,block:l}),a?u.else=!0:s&&(u.elseif=s),u}}}}];var Xo,Jo,Zo,ta={expectHTML:!0,modules:Yo,directives:{model:function(t,e,n){n;var r,i,o,a,s,u,c,l,f,p,d,h,v,g,m,y,_=e.value,b=e.modifiers,w=t.tag,x=t.attrsMap.type;if(t.component)return Dr(t,_,b),!1;if("select"===w)v=t,g=_,y=(y='var $$selectedVal = Array.prototype.filter.call($event.target.options,function(o){return o.selected}).map(function(o){var val = "_value" in o ? o._value : o.value;return '+((m=b)&&m.number?"_n(val)":"val")+"});")+" "+Ir(g,"$event.target.multiple ? $$selectedVal : $$selectedVal[0]"),Sr(v,"change",y,null,!0);else if("input"===w&&"checkbox"===x)u=t,c=_,f=(l=b)&&l.number,p=kr(u,"value")||"null",d=kr(u,"true-value")||"true",h=kr(u,"false-value")||"false",Tr(u,"checked","Array.isArray("+c+")?_i("+c+","+p+")>-1"+("true"===d?":("+c+")":":_q("+c+","+d+")")),Sr(u,"change","var $$a="+c+",$$el=$event.target,$$c=$$el.checked?("+d+"):("+h+");if(Array.isArray($$a)){var $$v="+(f?"_n("+p+")":p)+",$$i=_i($$a,$$v);if($$el.checked){$$i<0&&("+c+"=$$a.concat([$$v]))}else{$$i>-1&&("+c+"=$$a.slice(0,$$i).concat($$a.slice($$i+1)))}}else{"+Ir(c,"$$c")+"}",null,!0);else if("input"===w&&"radio"===x)r=t,i=_,a=(o=b)&&o.number,s=kr(r,"value")||"null",Tr(r,"checked","_q("+i+","+(s=a?"_n("+s+")":s)+")"),Sr(r,"change",Ir(i,s),null,!0);else if("input"===w||"textarea"===w)!function(t,e,n){var r=t.attrsMap.type,i=n||{},o=i.lazy,a=i.number,s=i.trim,u=!o&&"range"!==r,c=o?"change":"range"===r?Mr:"input",l="$event.target.value";s&&(l="$event.target.value.trim()"),a&&(l="_n("+l+")");var f=Ir(e,l);u&&(f="if($event.target.composing)return;"+f),Tr(t,"value","("+e+")"),Sr(t,c,f,null,!0),(s||a)&&Sr(t,"blur","$forceUpdate()")}(t,_,b);else if(!H.isReservedTag(w))return Dr(t,_,b),!1;return!0},text:function(t,e){e.value&&Tr(t,"textContent","_s("+e.value+")")},html:function(t,e){e.value&&Tr(t,"innerHTML","_s("+e.value+")")}},isPreTag:function(t){return"pre"===t},isUnaryTag:ro,mustUseProp:Dn,canBeLeftOpenTag:io,isReservedTag:Un,getTagNamespace:zn,staticKeys:(Xo=Yo,Xo.reduce(function(t,e){return t.concat(e.staticKeys||[])},[]).join(","))},ea=w(function(t){return v("type,tag,attrsList,attrsMap,plain,parent,children,attrs"+(t?","+t:""))});function na(t,e){t&&(Jo=ea(e.staticKeys||""),Zo=e.isReservedTag||N,function t(e){e.static=function(t){if(2===t.type)return!1;if(3===t.type)return!0;return!(!t.pre&&(t.hasBindings||t.if||t.for||g(t.tag)||!Zo(t.tag)||function(t){for(;t.parent;){if("template"!==(t=t.parent).tag)return!1;if(t.for)return!0}return!1}(t)||!Object.keys(t).every(Jo)))}(e);if(1===e.type){if(!Zo(e.tag)&&"slot"!==e.tag&&null==e.attrsMap["inline-template"])return;for(var n=0,r=e.children.length;n<r;n++){var i=e.children[n];t(i),i.static||(e.static=!1)}if(e.ifConditions)for(var o=1,a=e.ifConditions.length;o<a;o++){var s=e.ifConditions[o].block;t(s),s.static||(e.static=!1)}}}(t),function t(e,n){if(1===e.type){if((e.static||e.once)&&(e.staticInFor=n),e.static&&e.children.length&&(1!==e.children.length||3!==e.children[0].type))return void(e.staticRoot=!0);if(e.staticRoot=!1,e.children)for(var r=0,i=e.children.length;r<i;r++)t(e.children[r],n||!!e.for);if(e.ifConditions)for(var o=1,a=e.ifConditions.length;o<a;o++)t(e.ifConditions[o].block,n)}}(t,!1))}var ra=/^\s*([\w$_]+|\([^)]*?\))\s*=>|^function\s*\(/,ia=/^\s*[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['.*?']|\[".*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*\s*$/,oa={esc:27,tab:9,enter:13,space:32,up:38,left:37,right:39,down:40,delete:[8,46]},aa=function(t){return"if("+t+")return null;"},sa={stop:"$event.stopPropagation();",prevent:"$event.preventDefault();",self:aa("$event.target !== $event.currentTarget"),ctrl:aa("!$event.ctrlKey"),shift:aa("!$event.shiftKey"),alt:aa("!$event.altKey"),meta:aa("!$event.metaKey"),left:aa("'button' in $event && $event.button !== 0"),middle:aa("'button' in $event && $event.button !== 1"),right:aa("'button' in $event && $event.button !== 2")};function ua(t,e,n){var r=e?"nativeOn:{":"on:{";for(var i in t)r+='"'+i+'":'+ca(i,t[i])+",";return r.slice(0,-1)+"}"}function ca(t,e){if(!e)return"function(){}";if(Array.isArray(e))return"["+e.map(function(e){return ca(t,e)}).join(",")+"]";var n=ia.test(e.value),r=ra.test(e.value);if(e.modifiers){var i="",o="",a=[];for(var s in e.modifiers)if(sa[s])o+=sa[s],oa[s]&&a.push(s);else if("exact"===s){var u=e.modifiers;o+=aa(["ctrl","shift","alt","meta"].filter(function(t){return!u[t]}).map(function(t){return"$event."+t+"Key"}).join("||"))}else a.push(s);return a.length&&(i+="if(!('button' in $event)&&"+a.map(la).join("&&")+")return null;"),o&&(i+=o),"function($event){"+i+(n?e.value+"($event)":r?"("+e.value+")($event)":e.value)+"}"}return n||r?e.value:"function($event){"+e.value+"}"}function la(t){var e=parseInt(t,10);if(e)return"$event.keyCode!=="+e;var n=oa[t];return"_k($event.keyCode,"+JSON.stringify(t)+","+JSON.stringify(n)+",$event.key)"}var fa={on:function(t,e){t.wrapListeners=function(t){return"_g("+t+","+e.value+")"}},bind:function(t,e){t.wrapData=function(n){return"_b("+n+",'"+t.tag+"',"+e.value+","+(e.modifiers&&e.modifiers.prop?"true":"false")+(e.modifiers&&e.modifiers.sync?",true":"")+")"}},cloak:I},pa=function(t){this.options=t,this.warn=t.warn||xr,this.transforms=Cr(t.modules,"transformCode"),this.dataGenFns=Cr(t.modules,"genData"),this.directives=O(O({},fa),t.directives);var e=t.isReservedTag||N;this.maybeComponent=function(t){return!e(t.tag)},this.onceId=0,this.staticRenderFns=[]};function da(t,e){var n=new pa(e);return{render:"with(this){return "+(t?ha(t,n):'_c("div")')+"}",staticRenderFns:n.staticRenderFns}}function ha(t,e){if(t.staticRoot&&!t.staticProcessed)return va(t,e);if(t.once&&!t.onceProcessed)return ga(t,e);if(t.for&&!t.forProcessed)return function(t,e,n,r){var i=t.for,o=t.alias,a=t.iterator1?","+t.iterator1:"",s=t.iterator2?","+t.iterator2:"";0;return t.forProcessed=!0,(r||"_l")+"(("+i+"),function("+o+a+s+"){return "+(n||ha)(t,e)+"})"}(t,e);if(t.if&&!t.ifProcessed)return ma(t,e);if("template"!==t.tag||t.slotTarget){if("slot"===t.tag)return function(t,e){var n=t.slotName||'"default"',r=ba(t,e),i="_t("+n+(r?","+r:""),o=t.attrs&&"{"+t.attrs.map(function(t){return C(t.name)+":"+t.value}).join(",")+"}",a=t.attrsMap["v-bind"];!o&&!a||r||(i+=",null");o&&(i+=","+o);a&&(i+=(o?"":",null")+","+a);return i+")"}(t,e);var n;if(t.component)a=t.component,u=e,c=(s=t).inlineTemplate?null:ba(s,u,!0),n="_c("+a+","+ya(s,u)+(c?","+c:"")+")";else{var r=t.plain?void 0:ya(t,e),i=t.inlineTemplate?null:ba(t,e,!0);n="_c('"+t.tag+"'"+(r?","+r:"")+(i?","+i:"")+")"}for(var o=0;o<e.transforms.length;o++)n=e.transforms[o](t,n);return n}return ba(t,e)||"void 0";var a,s,u,c}function va(t,e){return t.staticProcessed=!0,e.staticRenderFns.push("with(this){return "+ha(t,e)+"}"),"_m("+(e.staticRenderFns.length-1)+(t.staticInFor?",true":"")+")"}function ga(t,e){if(t.onceProcessed=!0,t.if&&!t.ifProcessed)return ma(t,e);if(t.staticInFor){for(var n="",r=t.parent;r;){if(r.for){n=r.key;break}r=r.parent}return n?"_o("+ha(t,e)+","+e.onceId+++","+n+")":ha(t,e)}return va(t,e)}function ma(t,e,n,r){return t.ifProcessed=!0,function t(e,n,r,i){if(!e.length)return i||"_e()";var o=e.shift();return o.exp?"("+o.exp+")?"+a(o.block)+":"+t(e,n,r,i):""+a(o.block);function a(t){return r?r(t,n):t.once?ga(t,n):ha(t,n)}}(t.ifConditions.slice(),e,n,r)}function ya(t,e){var n,r,i="{",o=function(t,e){var n=t.directives;if(!n)return;var r,i,o,a,s="directives:[",u=!1;for(r=0,i=n.length;r<i;r++){o=n[r],a=!0;var c=e.directives[o.name];c&&(a=!!c(t,o,e.warn)),a&&(u=!0,s+='{name:"'+o.name+'",rawName:"'+o.rawName+'"'+(o.value?",value:("+o.value+"),expression:"+JSON.stringify(o.value):"")+(o.arg?',arg:"'+o.arg+'"':"")+(o.modifiers?",modifiers:"+JSON.stringify(o.modifiers):"")+"},")}if(u)return s.slice(0,-1)+"]"}(t,e);o&&(i+=o+","),t.key&&(i+="key:"+t.key+","),t.ref&&(i+="ref:"+t.ref+","),t.refInFor&&(i+="refInFor:true,"),t.pre&&(i+="pre:true,"),t.component&&(i+='tag:"'+t.tag+'",');for(var a=0;a<e.dataGenFns.length;a++)i+=e.dataGenFns[a](t);if(t.attrs&&(i+="attrs:{"+Ca(t.attrs)+"},"),t.props&&(i+="domProps:{"+Ca(t.props)+"},"),t.events&&(i+=ua(t.events,!1,e.warn)+","),t.nativeEvents&&(i+=ua(t.nativeEvents,!0,e.warn)+","),t.slotTarget&&!t.slotScope&&(i+="slot:"+t.slotTarget+","),t.scopedSlots&&(i+=(n=t.scopedSlots,r=e,"scopedSlots:_u(["+Object.keys(n).map(function(t){return _a(t,n[t],r)}).join(",")+"]),")),t.model&&(i+="model:{value:"+t.model.value+",callback:"+t.model.callback+",expression:"+t.model.expression+"},"),t.inlineTemplate){var s=function(t,e){var n=t.children[0];0;if(1===n.type){var r=da(n,e.options);return"inlineTemplate:{render:function(){"+r.render+"},staticRenderFns:["+r.staticRenderFns.map(function(t){return"function(){"+t+"}"}).join(",")+"]}"}}(t,e);s&&(i+=s+",")}return i=i.replace(/,$/,"")+"}",t.wrapData&&(i=t.wrapData(i)),t.wrapListeners&&(i=t.wrapListeners(i)),i}function _a(t,e,n){return e.for&&!e.forProcessed?(r=t,o=n,a=(i=e).for,s=i.alias,u=i.iterator1?","+i.iterator1:"",c=i.iterator2?","+i.iterator2:"",i.forProcessed=!0,"_l(("+a+"),function("+s+u+c+"){return "+_a(r,i,o)+"})"):"{key:"+t+",fn:"+("function("+String(e.slotScope)+"){return "+("template"===e.tag?e.if?e.if+"?"+(ba(e,n)||"undefined")+":undefined":ba(e,n)||"undefined":ha(e,n))+"}")+"}";var r,i,o,a,s,u,c}function ba(t,e,n,r,i){var o=t.children;if(o.length){var a=o[0];if(1===o.length&&a.for&&"template"!==a.tag&&"slot"!==a.tag)return(r||ha)(a,e);var s=n?function(t,e){for(var n=0,r=0;r<t.length;r++){var i=t[r];if(1===i.type){if(wa(i)||i.ifConditions&&i.ifConditions.some(function(t){return wa(t.block)})){n=2;break}(e(i)||i.ifConditions&&i.ifConditions.some(function(t){return e(t.block)}))&&(n=1)}}return n}(o,e.maybeComponent):0,u=i||xa;return"["+o.map(function(t){return u(t,e)}).join(",")+"]"+(s?","+s:"")}}function wa(t){return void 0!==t.for||"template"===t.tag||"slot"===t.tag}function xa(t,e){return 1===t.type?ha(t,e):3===t.type&&t.isComment?(r=t,"_e("+JSON.stringify(r.text)+")"):"_v("+(2===(n=t).type?n.expression:Ta(JSON.stringify(n.text)))+")";var n,r}function Ca(t){for(var e="",n=0;n<t.length;n++){var r=t[n];e+='"'+r.name+'":'+Ta(r.value)+","}return e.slice(0,-1)}function Ta(t){return t.replace(/\u2028/g,"\\u2028").replace(/\u2029/g,"\\u2029")}new RegExp("\\b"+"do,if,for,let,new,try,var,case,else,with,await,break,catch,class,const,super,throw,while,yield,delete,export,import,return,switch,default,extends,finally,continue,debugger,function,arguments".split(",").join("\\b|\\b")+"\\b"),new RegExp("\\b"+"delete,typeof,void".split(",").join("\\s*\\([^\\)]*\\)|\\b")+"\\s*\\([^\\)]*\\)");function Ea(t,e){try{return new Function(t)}catch(n){return e.push({err:n,code:t}),I}}var Aa,Sa,ka=(Aa=function(t,e){var n=Wo(t.trim(),e);!1!==e.optimize&&na(n,e);var r=da(n,e);return{ast:n,render:r.render,staticRenderFns:r.staticRenderFns}},function(t){function e(e,n){var r=Object.create(t),i=[],o=[];if(r.warn=function(t,e){(e?o:i).push(t)},n){n.modules&&(r.modules=(t.modules||[]).concat(n.modules)),n.directives&&(r.directives=O(Object.create(t.directives||null),n.directives));for(var a in n)"modules"!==a&&"directives"!==a&&(r[a]=n[a])}var s=Aa(e,r);return s.errors=i,s.tips=o,s}return{compile:e,compileToFunctions:(n=e,r=Object.create(null),function(t,e,i){(e=O({},e)).warn,delete e.warn;var o=e.delimiters?String(e.delimiters)+t:t;if(r[o])return r[o];var a=n(t,e),s={},u=[];return s.render=Ea(a.render,u),s.staticRenderFns=a.staticRenderFns.map(function(t){return Ea(t,u)}),r[o]=s})};var n,r})(ta).compileToFunctions;function Oa(t){return(Sa=Sa||document.createElement("div")).innerHTML=t?'<a href="\n"/>':'<div a="\n"/>',Sa.innerHTML.indexOf("&#10;")>0}var Da=!!V&&Oa(!1),Ia=!!V&&Oa(!0),Na=w(function(t){var e=Qn(t);return e&&e.innerHTML}),ja=mn.prototype.$mount;mn.prototype.$mount=function(t,e){if((t=t&&Qn(t))===document.body||t===document.documentElement)return this;var n=this.$options;if(!n.render){var r=n.template;if(r)if("string"==typeof r)"#"===r.charAt(0)&&(r=Na(r));else{if(!r.nodeType)return this;r=r.innerHTML}else t&&(r=function(t){if(t.outerHTML)return t.outerHTML;var e=document.createElement("div");return e.appendChild(t.cloneNode(!0)),e.innerHTML}(t));if(r){0;var i=ka(r,{shouldDecodeNewlines:Da,shouldDecodeNewlinesForHref:Ia,delimiters:n.delimiters,comments:n.comments},this),o=i.render,a=i.staticRenderFns;n.render=o,n.staticRenderFns=a}}return ja.call(this,t,e)},mn.compile=ka,t.exports=mn}).call(e,n(1),n(37).setImmediate)},function(t,e,n){var r=Function.prototype.apply;function i(t,e){this._id=t,this._clearFn=e}e.setTimeout=function(){return new i(r.call(setTimeout,window,arguments),clearTimeout)},e.setInterval=function(){return new i(r.call(setInterval,window,arguments),clearInterval)},e.clearTimeout=e.clearInterval=function(t){t&&t.close()},i.prototype.unref=i.prototype.ref=function(){},i.prototype.close=function(){this._clearFn.call(window,this._id)},e.enroll=function(t,e){clearTimeout(t._idleTimeoutId),t._idleTimeout=e},e.unenroll=function(t){clearTimeout(t._idleTimeoutId),t._idleTimeout=-1},e._unrefActive=e.active=function(t){clearTimeout(t._idleTimeoutId);var e=t._idleTimeout;e>=0&&(t._idleTimeoutId=setTimeout(function(){t._onTimeout&&t._onTimeout()},e))},n(38),e.setImmediate=setImmediate,e.clearImmediate=clearImmediate},function(t,e,n){(function(t,e){!function(t,n){"use strict";if(!t.setImmediate){var r,i,o,a,s,u=1,c={},l=!1,f=t.document,p=Object.getPrototypeOf&&Object.getPrototypeOf(t);p=p&&p.setTimeout?p:t,"[object process]"==={}.toString.call(t.process)?r=function(t){e.nextTick(function(){h(t)})}:!function(){if(t.postMessage&&!t.importScripts){var e=!0,n=t.onmessage;return t.onmessage=function(){e=!1},t.postMessage("","*"),t.onmessage=n,e}}()?t.MessageChannel?((o=new MessageChannel).port1.onmessage=function(t){h(t.data)},r=function(t){o.port2.postMessage(t)}):f&&"onreadystatechange"in f.createElement("script")?(i=f.documentElement,r=function(t){var e=f.createElement("script");e.onreadystatechange=function(){h(t),e.onreadystatechange=null,i.removeChild(e),e=null},i.appendChild(e)}):r=function(t){setTimeout(h,0,t)}:(a="setImmediate$"+Math.random()+"$",s=function(e){e.source===t&&"string"==typeof e.data&&0===e.data.indexOf(a)&&h(+e.data.slice(a.length))},t.addEventListener?t.addEventListener("message",s,!1):t.attachEvent("onmessage",s),r=function(e){t.postMessage(a+e,"*")}),p.setImmediate=function(t){"function"!=typeof t&&(t=new Function(""+t));for(var e=new Array(arguments.length-1),n=0;n<e.length;n++)e[n]=arguments[n+1];var i={callback:t,args:e};return c[u]=i,r(u),u++},p.clearImmediate=d}function d(t){delete c[t]}function h(t){if(l)setTimeout(h,0,t);else{var e=c[t];if(e){l=!0;try{!function(t){var e=t.callback,r=t.args;switch(r.length){case 0:e();break;case 1:e(r[0]);break;case 2:e(r[0],r[1]);break;case 3:e(r[0],r[1],r[2]);break;default:e.apply(n,r)}}(e)}finally{d(t),l=!1}}}}}("undefined"==typeof self?void 0===t?this:t:self)}).call(e,n(1),n(6))},function(t,e,n){var r=n(40)(n(41),n(42),!1,null,null,null);t.exports=r.exports},function(t,e){t.exports=function(t,e,n,r,i,o){var a,s=t=t||{},u=typeof t.default;"object"!==u&&"function"!==u||(a=t,s=t.default);var c,l="function"==typeof s?s.options:s;if(e&&(l.render=e.render,l.staticRenderFns=e.staticRenderFns,l._compiled=!0),n&&(l.functional=!0),i&&(l._scopeId=i),o?(c=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),r&&r.call(this,t),t&&t._registeredComponents&&t._registeredComponents.add(o)},l._ssrRegister=c):r&&(c=r),c){var f=l.functional,p=f?l.render:l.beforeCreate;f?(l._injectStyles=c,l.render=function(t,e){return c.call(e),p(t,e)}):l.beforeCreate=p?[].concat(p,c):[c]}return{esModule:a,exports:s,options:l}}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default={mounted:function(){console.log("Component mounted.")}}},function(t,e){t.exports={render:function(){this.$createElement;this._self._c;return this._m(0)},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"container"},[e("div",{staticClass:"row"},[e("div",{staticClass:"col-md-8 col-md-offset-2"},[e("div",{staticClass:"panel panel-default"},[e("div",{staticClass:"panel-heading"},[this._v("Example Component")]),this._v(" "),e("div",{staticClass:"panel-body"},[this._v("\n                    I'm an example component!\n                ")])])])])])}]}},function(t,e){}]);
\ No newline at end of file
diff --git a/samples/server/petstore/php-laravel/lib/public/web.config b/samples/server/petstore/php-laravel/lib/public/web.config
index 624c1760fcb2..d3711d7c5b8e 100644
--- a/samples/server/petstore/php-laravel/lib/public/web.config
+++ b/samples/server/petstore/php-laravel/lib/public/web.config
@@ -1,3 +1,8 @@
+<!--
+    Rewrites requires Microsoft URL Rewrite Module for IIS
+    Download: https://www.microsoft.com/en-us/download/details.aspx?id=47337
+    Debug Help: https://docs.microsoft.com/en-us/iis/extensions/url-rewrite-module/using-failed-request-tracing-to-trace-rewrite-rules
+-->
 <configuration>
   <system.webServer>
     <rewrite>
diff --git a/samples/server/petstore/php-laravel/lib/resources/assets/js/app.js b/samples/server/petstore/php-laravel/lib/resources/assets/js/app.js
index 98eca79fdf20..40c55f65c256 100644
--- a/samples/server/petstore/php-laravel/lib/resources/assets/js/app.js
+++ b/samples/server/petstore/php-laravel/lib/resources/assets/js/app.js
@@ -1,22 +1 @@
-
-/**
- * First we will load all of this project's JavaScript dependencies which
- * includes Vue and other libraries. It is a great starting point when
- * building robust, powerful web applications using Vue and Laravel.
- */
-
 require('./bootstrap');
-
-window.Vue = require('vue');
-
-/**
- * Next, we will create a fresh Vue application instance and attach it to
- * the page. Then, you may begin adding components to this application
- * or customize the JavaScript scaffolding to fit your unique needs.
- */
-
-Vue.component('example-component', require('./components/ExampleComponent.vue'));
-
-const app = new Vue({
-    el: '#app'
-});
diff --git a/samples/server/petstore/php-laravel/lib/resources/assets/js/bootstrap.js b/samples/server/petstore/php-laravel/lib/resources/assets/js/bootstrap.js
index fb0f1eded394..6922577695e6 100644
--- a/samples/server/petstore/php-laravel/lib/resources/assets/js/bootstrap.js
+++ b/samples/server/petstore/php-laravel/lib/resources/assets/js/bootstrap.js
@@ -1,18 +1,4 @@
-
 window._ = require('lodash');
-window.Popper = require('popper.js').default;
-
-/**
- * We'll load jQuery and the Bootstrap jQuery plugin which provides support
- * for JavaScript based Bootstrap features such as modals and tabs. This
- * code may be modified to fit the specific needs of your application.
- */
-
-try {
-    window.$ = window.jQuery = require('jquery');
-
-    require('bootstrap');
-} catch (e) {}
 
 /**
  * We'll load the axios HTTP library which allows us to easily issue requests
@@ -24,27 +10,13 @@ window.axios = require('axios');
 
 window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 
-/**
- * Next we will register the CSRF Token as a common header with Axios so that
- * all outgoing HTTP requests automatically have it attached. This is just
- * a simple convenience so we don't have to attach every token manually.
- */
-
-let token = document.head.querySelector('meta[name="csrf-token"]');
-
-if (token) {
-    window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content;
-} else {
-    console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token');
-}
-
 /**
  * Echo exposes an expressive API for subscribing to channels and listening
  * for events that are broadcast by Laravel. Echo and event broadcasting
  * allows your team to easily build robust real-time web applications.
  */
 
-// import Echo from 'laravel-echo'
+// import Echo from 'laravel-echo';
 
 // window.Pusher = require('pusher-js');
 
@@ -52,5 +24,5 @@ if (token) {
 //     broadcaster: 'pusher',
 //     key: process.env.MIX_PUSHER_APP_KEY,
 //     cluster: process.env.MIX_PUSHER_APP_CLUSTER,
-//     encrypted: true
+//     forceTLS: true
 // });
diff --git a/samples/server/petstore/php-laravel/lib/resources/assets/js/components/ExampleComponent.vue b/samples/server/petstore/php-laravel/lib/resources/assets/js/components/ExampleComponent.vue
deleted file mode 100644
index 2805329ab7c6..000000000000
--- a/samples/server/petstore/php-laravel/lib/resources/assets/js/components/ExampleComponent.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-    <div class="container">
-        <div class="row justify-content-center">
-            <div class="col-md-8">
-                <div class="card card-default">
-                    <div class="card-header">Example Component</div>
-
-                    <div class="card-body">
-                        I'm an example component.
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-    export default {
-        mounted() {
-            console.log('Component mounted.')
-        }
-    }
-</script>
diff --git a/samples/server/petstore/php-laravel/lib/resources/assets/sass/_variables.scss b/samples/server/petstore/php-laravel/lib/resources/assets/sass/_variables.scss
deleted file mode 100644
index 70ecfdb39d0d..000000000000
--- a/samples/server/petstore/php-laravel/lib/resources/assets/sass/_variables.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-
-// Body
-$body-bg: #f5f8fa;
-
-// Typography
-$font-family-sans-serif: "Raleway", sans-serif;
-$font-size-base: 0.9rem;
-$line-height-base: 1.6;
diff --git a/samples/server/petstore/php-laravel/lib/resources/assets/sass/app.scss b/samples/server/petstore/php-laravel/lib/resources/assets/sass/app.scss
index 0077cb141b67..8337712ea57f 100644
--- a/samples/server/petstore/php-laravel/lib/resources/assets/sass/app.scss
+++ b/samples/server/petstore/php-laravel/lib/resources/assets/sass/app.scss
@@ -1,14 +1 @@
-
-// Fonts
-@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
-
-// Variables
-@import "variables";
-
-// Bootstrap
-@import '~bootstrap/scss/bootstrap';
-
-.navbar-laravel {
-  background-color: #fff;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
-}
+//
diff --git a/samples/server/petstore/php-laravel/lib/resources/lang/en/passwords.php b/samples/server/petstore/php-laravel/lib/resources/lang/en/passwords.php
index e5544d201665..2345a56b5a69 100644
--- a/samples/server/petstore/php-laravel/lib/resources/lang/en/passwords.php
+++ b/samples/server/petstore/php-laravel/lib/resources/lang/en/passwords.php
@@ -13,10 +13,10 @@
     |
     */
 
-    'password' => 'Passwords must be at least six characters and match the confirmation.',
     'reset' => 'Your password has been reset!',
-    'sent' => 'We have e-mailed your password reset link!',
+    'sent' => 'We have emailed your password reset link!',
+    'throttled' => 'Please wait before retrying.',
     'token' => 'This password reset token is invalid.',
-    'user' => "We can't find a user with that e-mail address.",
+    'user' => "We can't find a user with that email address.",
 
 ];
diff --git a/samples/server/petstore/php-laravel/lib/resources/lang/en/validation.php b/samples/server/petstore/php-laravel/lib/resources/lang/en/validation.php
index 0d47547aa9b8..a65914f9d0f2 100644
--- a/samples/server/petstore/php-laravel/lib/resources/lang/en/validation.php
+++ b/samples/server/petstore/php-laravel/lib/resources/lang/en/validation.php
@@ -13,105 +13,110 @@
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
+    'accepted' => 'The :attribute must be accepted.',
+    'active_url' => 'The :attribute is not a valid URL.',
+    'after' => 'The :attribute must be a date after :date.',
+    'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+    'alpha' => 'The :attribute may only contain letters.',
+    'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.',
+    'alpha_num' => 'The :attribute may only contain letters and numbers.',
+    'array' => 'The :attribute must be an array.',
+    'before' => 'The :attribute must be a date before :date.',
+    'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+    'between' => [
         'numeric' => 'The :attribute must be between :min and :max.',
-        'file'    => 'The :attribute must be between :min and :max kilobytes.',
-        'string'  => 'The :attribute must be between :min and :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+        'file' => 'The :attribute must be between :min and :max kilobytes.',
+        'string' => 'The :attribute must be between :min and :max characters.',
+        'array' => 'The :attribute must have between :min and :max items.',
     ],
-    'boolean'              => 'The :attribute field must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute must be a valid email address.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'gt'                   => [
+    'boolean' => 'The :attribute field must be true or false.',
+    'confirmed' => 'The :attribute confirmation does not match.',
+    'date' => 'The :attribute is not a valid date.',
+    'date_equals' => 'The :attribute must be a date equal to :date.',
+    'date_format' => 'The :attribute does not match the format :format.',
+    'different' => 'The :attribute and :other must be different.',
+    'digits' => 'The :attribute must be :digits digits.',
+    'digits_between' => 'The :attribute must be between :min and :max digits.',
+    'dimensions' => 'The :attribute has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'email' => 'The :attribute must be a valid email address.',
+    'ends_with' => 'The :attribute must end with one of the following: :values.',
+    'exists' => 'The selected :attribute is invalid.',
+    'file' => 'The :attribute must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
         'numeric' => 'The :attribute must be greater than :value.',
-        'file'    => 'The :attribute must be greater than :value kilobytes.',
-        'string'  => 'The :attribute must be greater than :value characters.',
-        'array'   => 'The :attribute must have more than :value items.',
+        'file' => 'The :attribute must be greater than :value kilobytes.',
+        'string' => 'The :attribute must be greater than :value characters.',
+        'array' => 'The :attribute must have more than :value items.',
     ],
-    'gte'                  => [
+    'gte' => [
         'numeric' => 'The :attribute must be greater than or equal :value.',
-        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be greater than or equal :value characters.',
-        'array'   => 'The :attribute must have :value items or more.',
+        'file' => 'The :attribute must be greater than or equal :value kilobytes.',
+        'string' => 'The :attribute must be greater than or equal :value characters.',
+        'array' => 'The :attribute must have :value items or more.',
     ],
-    'image'                => 'The :attribute must be an image.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'lt'                   => [
+    'image' => 'The :attribute must be an image.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field does not exist in :other.',
+    'integer' => 'The :attribute must be an integer.',
+    'ip' => 'The :attribute must be a valid IP address.',
+    'ipv4' => 'The :attribute must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute must be a valid IPv6 address.',
+    'json' => 'The :attribute must be a valid JSON string.',
+    'lt' => [
         'numeric' => 'The :attribute must be less than :value.',
-        'file'    => 'The :attribute must be less than :value kilobytes.',
-        'string'  => 'The :attribute must be less than :value characters.',
-        'array'   => 'The :attribute must have less than :value items.',
+        'file' => 'The :attribute must be less than :value kilobytes.',
+        'string' => 'The :attribute must be less than :value characters.',
+        'array' => 'The :attribute must have less than :value items.',
     ],
-    'lte'                  => [
+    'lte' => [
         'numeric' => 'The :attribute must be less than or equal :value.',
-        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be less than or equal :value characters.',
-        'array'   => 'The :attribute must not have more than :value items.',
+        'file' => 'The :attribute must be less than or equal :value kilobytes.',
+        'string' => 'The :attribute must be less than or equal :value characters.',
+        'array' => 'The :attribute must not have more than :value items.',
     ],
-    'max'                  => [
+    'max' => [
         'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+        'file' => 'The :attribute may not be greater than :max kilobytes.',
+        'string' => 'The :attribute may not be greater than :max characters.',
+        'array' => 'The :attribute may not have more than :max items.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
+    'mimes' => 'The :attribute must be a file of type: :values.',
+    'mimetypes' => 'The :attribute must be a file of type: :values.',
+    'min' => [
         'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+        'file' => 'The :attribute must be at least :min kilobytes.',
+        'string' => 'The :attribute must be at least :min characters.',
+        'array' => 'The :attribute must have at least :min items.',
     ],
-    'not_in'               => 'The selected :attribute is invalid.',
-    'not_regex'            => 'The :attribute format is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute format is invalid.',
+    'numeric' => 'The :attribute must be a number.',
+    'password' => 'The password is incorrect.',
+    'present' => 'The :attribute field must be present.',
+    'regex' => 'The :attribute format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
+    'same' => 'The :attribute and :other must match.',
+    'size' => [
         'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+        'file' => 'The :attribute must be :size kilobytes.',
+        'string' => 'The :attribute must be :size characters.',
+        'array' => 'The :attribute must contain :size items.',
     ],
-    'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
+    'starts_with' => 'The :attribute must start with one of the following: :values.',
+    'string' => 'The :attribute must be a string.',
+    'timezone' => 'The :attribute must be a valid zone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'url' => 'The :attribute format is invalid.',
+    'uuid' => 'The :attribute must be a valid UUID.',
 
     /*
     |--------------------------------------------------------------------------
@@ -135,9 +140,9 @@
     | Custom Validation Attributes
     |--------------------------------------------------------------------------
     |
-    | The following language lines are used to swap attribute place-holders
-    | with something more reader friendly such as E-Mail Address instead
-    | of "email". This simply helps us make messages a little cleaner.
+    | The following language lines are used to swap our attribute placeholder
+    | with something more reader friendly such as "E-Mail Address" instead
+    | of "email". This simply helps us make our message more expressive.
     |
     */
 
diff --git a/samples/server/petstore/php-laravel/lib/resources/views/welcome.blade.php b/samples/server/petstore/php-laravel/lib/resources/views/welcome.blade.php
index 11631cbf1949..974fcc0882bd 100644
--- a/samples/server/petstore/php-laravel/lib/resources/views/welcome.blade.php
+++ b/samples/server/petstore/php-laravel/lib/resources/views/welcome.blade.php
@@ -1,22 +1,21 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="">
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         <title>Laravel</title>
 
         <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
+        <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet">
 
         <!-- Styles -->
         <style>
             html, body {
                 background-color: #fff;
                 color: #636b6f;
-                font-family: 'Raleway', sans-serif;
-                font-weight: 100;
+                font-family: 'Nunito', sans-serif;
+                font-weight: 200;
                 height: 100vh;
                 margin: 0;
             }
@@ -52,7 +51,7 @@
             .links > a {
                 color: #636b6f;
                 padding: 0 25px;
-                font-size: 12px;
+                font-size: 13px;
                 font-weight: 600;
                 letter-spacing: .1rem;
                 text-decoration: none;
@@ -72,7 +71,10 @@
                         <a href="">Home</a>
                     @else
                         <a href="">Login</a>
-                        <a href="">Register</a>
+
+                        @if (Route::has('register'))
+                            <a href="">Register</a>
+                        @endif
                     @endauth
                 </div>
             @endif
@@ -83,10 +85,13 @@
                 </div>
 
                 <div class="links">
-                    <a href="https://laravel.com/docs">Documentation</a>
+                    <a href="https://laravel.com/docs">Docs</a>
                     <a href="https://laracasts.com">Laracasts</a>
                     <a href="https://laravel-news.com">News</a>
+                    <a href="https://blog.laravel.com">Blog</a>
+                    <a href="https://nova.laravel.com">Nova</a>
                     <a href="https://forge.laravel.com">Forge</a>
+                    <a href="https://vapor.laravel.com">Vapor</a>
                     <a href="https://github.com/laravel/laravel">GitHub</a>
                 </div>
             </div>
diff --git a/samples/server/petstore/php-laravel/lib/routes/api.php b/samples/server/petstore/php-laravel/lib/routes/api.php
index b67eb068a078..a0ef076e3f9c 100644
--- a/samples/server/petstore/php-laravel/lib/routes/api.php
+++ b/samples/server/petstore/php-laravel/lib/routes/api.php
@@ -3,7 +3,7 @@
 /**
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * PHP version 7.1.3
+ * PHP version 7.2.5
  *
  * The version of the OpenAPI document: 1.0.0
  * 
@@ -17,6 +17,10 @@
  * > https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/
  */
 
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Route;
+
 /**
  * patch call123TestSpecialTags
  * Summary: To test special tags
@@ -24,6 +28,13 @@
  * Output-Formats: [application/json]
  */
 Route::patch('/v2/another-fake/dummy', 'AnotherFakeController@call123TestSpecialTags');
+/**
+ * get fooGet
+ * Summary: 
+ * Notes: 
+ * Output-Formats: [application/json]
+ */
+Route::get('/v2/foo', 'DefaultController@fooGet');
 /**
  * patch testClientModel
  * Summary: To test \&quot;client\&quot; model
@@ -33,8 +44,8 @@
 Route::patch('/v2/fake', 'FakeController@testClientModel');
 /**
  * post testEndpointParameters
- * Summary: Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
- * Notes: Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+ * Summary: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
+ * Notes: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
 
  */
 Route::post('/v2/fake', 'FakeController@testEndpointParameters');
@@ -67,12 +78,19 @@
  */
 Route::put('/v2/fake/body-with-query-params', 'FakeController@testBodyWithQueryParams');
 /**
- * post createXmlItem
- * Summary: creates an XmlItem
- * Notes: this route creates an XmlItem
+ * get fakeHealthGet
+ * Summary: Health check endpoint
+ * Notes: 
+ * Output-Formats: [application/json]
+ */
+Route::get('/v2/fake/health', 'FakeController@fakeHealthGet');
+/**
+ * get fakeHttpSignatureTest
+ * Summary: test http signature authentication
+ * Notes: 
 
  */
-Route::post('/v2/fake/create_xml_item', 'FakeController@createXmlItem');
+Route::get('/v2/fake/http-signature-test', 'FakeController@fakeHttpSignatureTest');
 /**
  * post testInlineAdditionalProperties
  * Summary: test inline additionalProperties
@@ -277,3 +295,6 @@
  */
 Route::put('/v2/user/{username}', 'UserController@updateUser');
 
+Route::middleware('auth:api')->get('/user', function (Request $request) {
+    return $request->user();
+});
diff --git a/samples/server/petstore/php-laravel/lib/routes/channels.php b/samples/server/petstore/php-laravel/lib/routes/channels.php
index a149aa63f030..e8d267d574a9 100644
--- a/samples/server/petstore/php-laravel/lib/routes/channels.php
+++ b/samples/server/petstore/php-laravel/lib/routes/channels.php
@@ -3,7 +3,7 @@
 /**
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * PHP version 7.1.3
+ * PHP version 7.2.5
  *
  * The version of the OpenAPI document: 1.0.0
  * 
@@ -18,6 +18,8 @@
  */
 
 
+use Illuminate\Support\Facades\Broadcast;
+
 Broadcast::channel('App.User.{id}', function ($user, $id) {
     return (int) $user->id === (int) $id;
 });
diff --git a/samples/server/petstore/php-laravel/lib/routes/console.php b/samples/server/petstore/php-laravel/lib/routes/console.php
index 12e2fa86f31f..1cde06dc2eb3 100644
--- a/samples/server/petstore/php-laravel/lib/routes/console.php
+++ b/samples/server/petstore/php-laravel/lib/routes/console.php
@@ -3,7 +3,7 @@
 /**
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * PHP version 7.1.3
+ * PHP version 7.2.5
  *
  * The version of the OpenAPI document: 1.0.0
  * 
@@ -18,6 +18,9 @@
  */
 
 
+use Illuminate\Foundation\Inspiring;
+use Illuminate\Support\Facades\Artisan;
+
 Artisan::command('inspire', function () {
     $this->comment(Inspiring::quote());
 })->describe('Display an inspiring quote');
\ No newline at end of file
diff --git a/samples/server/petstore/php-laravel/lib/routes/web.php b/samples/server/petstore/php-laravel/lib/routes/web.php
index 0fbf681e45bf..be41cc7fb42b 100644
--- a/samples/server/petstore/php-laravel/lib/routes/web.php
+++ b/samples/server/petstore/php-laravel/lib/routes/web.php
@@ -3,7 +3,7 @@
 /**
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * PHP version 7.1.3
+ * PHP version 7.2.5
  *
  * The version of the OpenAPI document: 1.0.0
  * 
@@ -18,4 +18,8 @@
  */
 
 
-Route::get('/', 'Controller@welcome');
\ No newline at end of file
+use Illuminate\Support\Facades\Route;
+
+Route::get('/', function () {
+    return view('welcome');
+});
\ No newline at end of file
diff --git a/samples/server/petstore/php-laravel/lib/tests/Feature/ExampleTest.php b/samples/server/petstore/php-laravel/lib/tests/Feature/ExampleTest.php
index f31e495ca33f..cdb5111934c5 100644
--- a/samples/server/petstore/php-laravel/lib/tests/Feature/ExampleTest.php
+++ b/samples/server/petstore/php-laravel/lib/tests/Feature/ExampleTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature;
 
-use Tests\TestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class ExampleTest extends TestCase
 {
diff --git a/samples/server/petstore/php-laravel/lib/tests/Unit/ExampleTest.php b/samples/server/petstore/php-laravel/lib/tests/Unit/ExampleTest.php
index e9fe19c664dd..358cfc8834ab 100644
--- a/samples/server/petstore/php-laravel/lib/tests/Unit/ExampleTest.php
+++ b/samples/server/petstore/php-laravel/lib/tests/Unit/ExampleTest.php
@@ -2,8 +2,7 @@
 
 namespace Tests\Unit;
 
-use Tests\TestCase;
-use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\TestCase;
 
 class ExampleTest extends TestCase
 {
diff --git a/samples/server/petstore/php-laravel/lib/webpack.mix.js b/samples/server/petstore/php-laravel/lib/webpack.mix.js
index 72fdbb16d60b..8a923cbb4baf 100644
--- a/samples/server/petstore/php-laravel/lib/webpack.mix.js
+++ b/samples/server/petstore/php-laravel/lib/webpack.mix.js
@@ -1,4 +1,4 @@
-let mix = require('laravel-mix');
+const mix = require('laravel-mix');
 
 /*
  |--------------------------------------------------------------------------
@@ -11,5 +11,5 @@ let mix = require('laravel-mix');
  |
  */
 
-mix.js('resources/assets/js/app.js', 'public/js')
-   .sass('resources/assets/sass/app.scss', 'public/css');
+mix.js('resources/js/app.js', 'public/js')
+    .sass('resources/sass/app.scss', 'public/css');
diff --git a/samples/server/petstore/php-laravel/pom.xml b/samples/server/petstore/php-laravel/pom.xml
new file mode 100644
index 000000000000..545ed9981e05
--- /dev/null
+++ b/samples/server/petstore/php-laravel/pom.xml
@@ -0,0 +1,88 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>LaravelPetstoreServerTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>Laravel Petstore Server</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>bundle-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>composer</executable>
+                            <arguments>
+                                <argument>install</argument>
+                                <argument>--working-dir=lib</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-copy-config</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>cp</executable>
+                            <arguments>
+                                <argument>lib/.env.example</argument>
+                                <argument>lib/.env</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-application-key-set</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>php</executable>
+                            <arguments>
+                                <argument>lib/artisan</argument>
+                                <argument>key:generate</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>lib/vendor/bin/phpunit</executable>
+                            <arguments>
+                                <argument>--configuration=lib/phpunit.xml</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/server/petstore/php-silex/.openapi-generator/VERSION b/samples/server/petstore/php-silex/.openapi-generator/VERSION
deleted file mode 100644
index afa636560641..000000000000
--- a/samples/server/petstore/php-silex/.openapi-generator/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-4.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-silex/OpenAPIServer/.gitignore b/samples/server/petstore/php-silex/OpenAPIServer/.gitignore
deleted file mode 100644
index 390a8878ede4..000000000000
--- a/samples/server/petstore/php-silex/OpenAPIServer/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
-
-composer.phar
-/vendor/
-
-# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
-# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
-# composer.lock
\ No newline at end of file
diff --git a/samples/server/petstore/php-silex/OpenAPIServer/.htaccess b/samples/server/petstore/php-silex/OpenAPIServer/.htaccess
deleted file mode 100644
index e47b5fb8a0c6..000000000000
--- a/samples/server/petstore/php-silex/OpenAPIServer/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-<IfModule mod_rewrite.c>
-    RewriteEngine On
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^(.*)$ index.php?_url=/$1 [QSA,L]
-</IfModule>
\ No newline at end of file
diff --git a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/FILES b/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/FILES
deleted file mode 100644
index 1e24269e178c..000000000000
--- a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/FILES
+++ /dev/null
@@ -1,5 +0,0 @@
-.gitignore
-.htaccess
-README.md
-composer.json
-index.php
diff --git a/samples/server/petstore/php-silex/OpenAPIServer/README.md b/samples/server/petstore/php-silex/OpenAPIServer/README.md
deleted file mode 100644
index 03f2825681da..000000000000
--- a/samples/server/petstore/php-silex/OpenAPIServer/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# OpenAPI generated server
-
-## Overview
-This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the
-[OpenAPI-Spec](https://www.openapis.org/) from a remote server, you can easily generate a server stub. This
-is an example of building a PHP server.
-
-This example uses the [Silex](http://silex.sensiolabs.org/) micro-framework. To see how to make this your own, please take a look at the template here:
-
-[TEMPLATES](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/resources/silex/)
diff --git a/samples/server/petstore/php-silex/OpenAPIServer/composer.json b/samples/server/petstore/php-silex/OpenAPIServer/composer.json
deleted file mode 100644
index 466cd3fbc77c..000000000000
--- a/samples/server/petstore/php-silex/OpenAPIServer/composer.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "require": {
-    "silex/silex": "~1.2"
-  }
-}
\ No newline at end of file
diff --git a/samples/server/petstore/php-silex/OpenAPIServer/index.php b/samples/server/petstore/php-silex/OpenAPIServer/index.php
deleted file mode 100644
index ef5c65d8e739..000000000000
--- a/samples/server/petstore/php-silex/OpenAPIServer/index.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-require_once __DIR__ . '/vendor/autoload.php';
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Silex\Application;
-
-$app = new Silex\Application();
-
-
-$app->POST('/v2/pet', function(Application $app, Request $request) {
-            return new Response('How about implementing addPet as a POST method ?');
-            });
-
-
-$app->DELETE('/v2/pet/{petId}', function(Application $app, Request $request, $petId) {
-            return new Response('How about implementing deletePet as a DELETE method ?');
-            });
-
-
-$app->GET('/v2/pet/findByStatus', function(Application $app, Request $request) {
-            $status = $request->get('status');
-            return new Response('How about implementing findPetsByStatus as a GET method ?');
-            });
-
-
-$app->GET('/v2/pet/findByTags', function(Application $app, Request $request) {
-            $tags = $request->get('tags');
-            return new Response('How about implementing findPetsByTags as a GET method ?');
-            });
-
-
-$app->GET('/v2/pet/{petId}', function(Application $app, Request $request, $petId) {
-            return new Response('How about implementing getPetById as a GET method ?');
-            });
-
-
-$app->PUT('/v2/pet', function(Application $app, Request $request) {
-            return new Response('How about implementing updatePet as a PUT method ?');
-            });
-
-
-$app->POST('/v2/pet/{petId}', function(Application $app, Request $request, $petId) {
-            $name = $request->get('name');
-            $status = $request->get('status');
-            return new Response('How about implementing updatePetWithForm as a POST method ?');
-            });
-
-
-$app->POST('/v2/pet/{petId}/uploadImage', function(Application $app, Request $request, $petId) {
-            $additional_metadata = $request->get('additional_metadata');
-            $file = $request->get('file');
-            return new Response('How about implementing uploadFile as a POST method ?');
-            });
-
-
-$app->DELETE('/v2/store/order/{orderId}', function(Application $app, Request $request, $orderId) {
-            return new Response('How about implementing deleteOrder as a DELETE method ?');
-            });
-
-
-$app->GET('/v2/store/inventory', function(Application $app, Request $request) {
-            return new Response('How about implementing getInventory as a GET method ?');
-            });
-
-
-$app->GET('/v2/store/order/{orderId}', function(Application $app, Request $request, $orderId) {
-            return new Response('How about implementing getOrderById as a GET method ?');
-            });
-
-
-$app->POST('/v2/store/order', function(Application $app, Request $request) {
-            return new Response('How about implementing placeOrder as a POST method ?');
-            });
-
-
-$app->POST('/v2/user', function(Application $app, Request $request) {
-            return new Response('How about implementing createUser as a POST method ?');
-            });
-
-
-$app->POST('/v2/user/createWithArray', function(Application $app, Request $request) {
-            return new Response('How about implementing createUsersWithArrayInput as a POST method ?');
-            });
-
-
-$app->POST('/v2/user/createWithList', function(Application $app, Request $request) {
-            return new Response('How about implementing createUsersWithListInput as a POST method ?');
-            });
-
-
-$app->DELETE('/v2/user/{username}', function(Application $app, Request $request, $username) {
-            return new Response('How about implementing deleteUser as a DELETE method ?');
-            });
-
-
-$app->GET('/v2/user/{username}', function(Application $app, Request $request, $username) {
-            return new Response('How about implementing getUserByName as a GET method ?');
-            });
-
-
-$app->GET('/v2/user/login', function(Application $app, Request $request) {
-            $username = $request->get('username');
-            $password = $request->get('password');
-            return new Response('How about implementing loginUser as a GET method ?');
-            });
-
-
-$app->GET('/v2/user/logout', function(Application $app, Request $request) {
-            return new Response('How about implementing logoutUser as a GET method ?');
-            });
-
-
-$app->PUT('/v2/user/{username}', function(Application $app, Request $request, $username) {
-            return new Response('How about implementing updateUser as a PUT method ?');
-            });
-
-
-$app->run();
diff --git a/samples/server/petstore/php-slim/.gitignore b/samples/server/petstore/php-slim/.gitignore
deleted file mode 100644
index db204792ea34..000000000000
--- a/samples/server/petstore/php-slim/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
-
-composer.phar
-/vendor/
-
-# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
-# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
-# composer.lock
-
-# phplint tool creates cache file which is not necessary in a codebase
-/.phplint-cache
-
-# Do not commit local PHPUnit config
-/phpunit.xml
-
-# Do not commit local PHP_CodeSniffer config
-/phpcs.xml
\ No newline at end of file
diff --git a/samples/server/petstore/php-slim/.htaccess b/samples/server/petstore/php-slim/.htaccess
deleted file mode 100644
index f6a2ceb3952b..000000000000
--- a/samples/server/petstore/php-slim/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-<IfModule mod_rewrite.c>
-    RewriteEngine On
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteRule ^ index.php [QSA,L]
-</IfModule>
\ No newline at end of file
diff --git a/samples/server/petstore/php-slim/.openapi-generator/FILES b/samples/server/petstore/php-slim/.openapi-generator/FILES
deleted file mode 100644
index 12513343c075..000000000000
--- a/samples/server/petstore/php-slim/.openapi-generator/FILES
+++ /dev/null
@@ -1,75 +0,0 @@
-.gitignore
-.htaccess
-README.md
-composer.json
-index.php
-lib/Api/AbstractAnotherFakeApi.php
-lib/Api/AbstractFakeApi.php
-lib/Api/AbstractFakeClassnameTags123Api.php
-lib/Api/AbstractPetApi.php
-lib/Api/AbstractStoreApi.php
-lib/Api/AbstractUserApi.php
-lib/Auth/AbstractAuthenticator.php
-lib/Auth/AbstractAuthenticator.php
-lib/Auth/AbstractAuthenticator.php
-lib/Auth/AbstractAuthenticator.php
-lib/Auth/AbstractAuthenticator.php
-lib/Auth/AbstractAuthenticator.php
-lib/Auth/AbstractAuthenticator.php
-lib/Auth/AbstractAuthenticator.php
-lib/Auth/AbstractAuthenticator.php
-lib/Auth/AbstractAuthenticator.php
-lib/Auth/AbstractAuthenticator.php
-lib/Auth/AbstractAuthenticator.php
-lib/Auth/AbstractAuthenticator.php
-lib/Model/AdditionalPropertiesAnyType.php
-lib/Model/AdditionalPropertiesArray.php
-lib/Model/AdditionalPropertiesBoolean.php
-lib/Model/AdditionalPropertiesClass.php
-lib/Model/AdditionalPropertiesInteger.php
-lib/Model/AdditionalPropertiesNumber.php
-lib/Model/AdditionalPropertiesObject.php
-lib/Model/AdditionalPropertiesString.php
-lib/Model/Animal.php
-lib/Model/ApiResponse.php
-lib/Model/ArrayOfArrayOfNumberOnly.php
-lib/Model/ArrayOfNumberOnly.php
-lib/Model/ArrayTest.php
-lib/Model/BigCat.php
-lib/Model/BigCatAllOf.php
-lib/Model/Capitalization.php
-lib/Model/Cat.php
-lib/Model/CatAllOf.php
-lib/Model/Category.php
-lib/Model/ClassModel.php
-lib/Model/Client.php
-lib/Model/Dog.php
-lib/Model/DogAllOf.php
-lib/Model/EnumArrays.php
-lib/Model/EnumClass.php
-lib/Model/EnumTest.php
-lib/Model/File.php
-lib/Model/FileSchemaTestClass.php
-lib/Model/FormatTest.php
-lib/Model/HasOnlyReadOnly.php
-lib/Model/MapTest.php
-lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
-lib/Model/Model200Response.php
-lib/Model/ModelList.php
-lib/Model/ModelReturn.php
-lib/Model/Name.php
-lib/Model/NumberOnly.php
-lib/Model/Order.php
-lib/Model/OuterComposite.php
-lib/Model/OuterEnum.php
-lib/Model/Pet.php
-lib/Model/ReadOnlyFirst.php
-lib/Model/SpecialModelName.php
-lib/Model/Tag.php
-lib/Model/TypeHolderDefault.php
-lib/Model/TypeHolderExample.php
-lib/Model/User.php
-lib/Model/XmlItem.php
-lib/SlimRouter.php
-phpcs.xml.dist
-phpunit.xml.dist
diff --git a/samples/server/petstore/php-slim/README.md b/samples/server/petstore/php-slim/README.md
deleted file mode 100644
index 6b2f02d44e96..000000000000
--- a/samples/server/petstore/php-slim/README.md
+++ /dev/null
@@ -1,232 +0,0 @@
-# php-base - PHP Slim Server library for OpenAPI Petstore
-
-* [OpenAPI Generator](https://openapi-generator.tech)
-* [Slim Framework Documentation](https://www.slimframework.com/docs/)
-
-## Requirements
-
-* Web server with URL rewriting
-* PHP 7.0 or newer
-
-This package contains `.htaccess` for Apache configuration.
-If you use another server(Nginx, HHVM, IIS, lighttpd) check out [Web Servers](https://www.slimframework.com/docs/v3/start/web-servers.html) doc.
-
-## Installation via [Composer](https://getcomposer.org/)
-
-Navigate into your project's root directory and execute the bash command shown below.
-This command downloads the Slim Framework and its third-party dependencies into your project's `vendor/` directory.
-```bash
-$ composer install
-```
-
-## Start devserver
-
-Run the following command in terminal to start localhost web server, assuming `./php-slim-server/` is public-accessible directory with `index.php` file:
-```bash
-$ php -S localhost:8888 -t php-slim-server
-```
-> **Warning** This web server was designed to aid application development.
-> It may also be useful for testing purposes or for application demonstrations that are run in controlled environments.
-> It is not intended to be a full-featured web server. It should not be used on a public network.
-
-## Tests
-
-### PHPUnit
-
-This package uses PHPUnit 6 or 7(depends from your PHP version) for unit testing.
-[Test folder](test) contains templates which you can fill with real test assertions.
-How to write tests read at [PHPUnit Manual - Chapter 2. Writing Tests for PHPUnit](https://phpunit.de/manual/6.5/en/writing-tests-for-phpunit.html).
-
-#### Run
-
-Command | Target
----- | ----
-`$ composer test` | All tests
-`$ composer test-apis` | Apis tests
-`$ composer test-models` | Models tests
-
-#### Config
-
-Package contains fully functional config `./phpunit.xml.dist` file. Create `./phpunit.xml` in root folder to override it.
-
-Quote from [3. The Command-Line Test Runner — PHPUnit 7.4 Manual](https://phpunit.readthedocs.io/en/7.4/textui.html#command-line-options):
-
-> If phpunit.xml or phpunit.xml.dist (in that order) exist in the current working directory and --configuration is not used, the configuration will be automatically read from that file.
-
-### PHP CodeSniffer
-
-[PHP CodeSniffer Documentation](https://github.com/squizlabs/PHP_CodeSniffer/wiki). This tool helps to follow coding style and avoid common PHP coding mistakes.
-
-#### Run
-
-```bash
-$ composer phpcs
-```
-
-#### Config
-
-Package contains fully functional config `./phpcs.xml.dist` file. It checks source code against PSR-1 and PSR-2 coding standards.
-Create `./phpcs.xml` in root folder to override it. More info at [Using a Default Configuration File](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Advanced-Usage#using-a-default-configuration-file)
-
-### PHPLint
-
-[PHPLint Documentation](https://github.com/overtrue/phplint). Checks PHP syntax only.
-
-#### Run
-
-```bash
-$ composer phplint
-```
-
-## Show errors
-
-Switch on option in `./index.php`:
-```diff
-    /**
-     * When true, additional information about exceptions are displayed by the default
-     * error handler.
-     * Default: false
-     */
---- // 'displayErrorDetails' => false,
-+++ 'displayErrorDetails' => true,
-```
-
-## API Endpoints
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-> Important! Do not modify abstract API controllers directly! Instead extend them by implementation classes like:
-
-```php
-// src/Api/PetApi.php
-
-namespace OpenAPIServer\Api;
-
-use OpenAPIServer\Api\AbstractPetApi;
-
-class PetApi extends AbstractPetApi
-{
-
-    public function addPet($request, $response, $args)
-    {
-        // your implementation of addPet method here
-    }
-}
-```
-
-Place all your implementation classes in `./src` folder accordingly.
-For instance, when abstract class located at `./lib/Api/AbstractPetApi.php` you need to create implementation class at `./src/Api/PetApi.php`.
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*AbstractAnotherFakeApi* | **call123TestSpecialTags** | **PATCH** /another-fake/dummy | To test special tags
-*AbstractFakeApi* | **createXmlItem** | **POST** /fake/create_xml_item | creates an XmlItem
-*AbstractFakeApi* | **fakeOuterBooleanSerialize** | **POST** /fake/outer/boolean | 
-*AbstractFakeApi* | **fakeOuterCompositeSerialize** | **POST** /fake/outer/composite | 
-*AbstractFakeApi* | **fakeOuterNumberSerialize** | **POST** /fake/outer/number | 
-*AbstractFakeApi* | **fakeOuterStringSerialize** | **POST** /fake/outer/string | 
-*AbstractFakeApi* | **testBodyWithFileSchema** | **PUT** /fake/body-with-file-schema | 
-*AbstractFakeApi* | **testBodyWithQueryParams** | **PUT** /fake/body-with-query-params | 
-*AbstractFakeApi* | **testClientModel** | **PATCH** /fake | To test \"client\" model
-*AbstractFakeApi* | **testEndpointParameters** | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-*AbstractFakeApi* | **testEnumParameters** | **GET** /fake | To test enum parameters
-*AbstractFakeApi* | **testGroupParameters** | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-*AbstractFakeApi* | **testInlineAdditionalProperties** | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-*AbstractFakeApi* | **testJsonFormData** | **GET** /fake/jsonFormData | test json serialization of form data
-*AbstractFakeApi* | **testQueryParameterCollectionFormat** | **PUT** /fake/test-query-paramters | 
-*AbstractFakeClassnameTags123Api* | **testClassname** | **PATCH** /fake_classname_test | To test class name in snake case
-*AbstractPetApi* | **addPet** | **POST** /pet | Add a new pet to the store
-*AbstractPetApi* | **findPetsByStatus** | **GET** /pet/findByStatus | Finds Pets by status
-*AbstractPetApi* | **findPetsByTags** | **GET** /pet/findByTags | Finds Pets by tags
-*AbstractPetApi* | **updatePet** | **PUT** /pet | Update an existing pet
-*AbstractPetApi* | **deletePet** | **DELETE** /pet/{petId} | Deletes a pet
-*AbstractPetApi* | **getPetById** | **GET** /pet/{petId} | Find pet by ID
-*AbstractPetApi* | **updatePetWithForm** | **POST** /pet/{petId} | Updates a pet in the store with form data
-*AbstractPetApi* | **uploadFile** | **POST** /pet/{petId}/uploadImage | uploads an image
-*AbstractPetApi* | **uploadFileWithRequiredFile** | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-*AbstractStoreApi* | **getInventory** | **GET** /store/inventory | Returns pet inventories by status
-*AbstractStoreApi* | **placeOrder** | **POST** /store/order | Place an order for a pet
-*AbstractStoreApi* | **deleteOrder** | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-*AbstractStoreApi* | **getOrderById** | **GET** /store/order/{order_id} | Find purchase order by ID
-*AbstractUserApi* | **createUser** | **POST** /user | Create user
-*AbstractUserApi* | **createUsersWithArrayInput** | **POST** /user/createWithArray | Creates list of users with given input array
-*AbstractUserApi* | **createUsersWithListInput** | **POST** /user/createWithList | Creates list of users with given input array
-*AbstractUserApi* | **loginUser** | **GET** /user/login | Logs user into the system
-*AbstractUserApi* | **logoutUser** | **GET** /user/logout | Logs out current logged in user session
-*AbstractUserApi* | **deleteUser** | **DELETE** /user/{username} | Delete user
-*AbstractUserApi* | **getUserByName** | **GET** /user/{username} | Get user by user name
-*AbstractUserApi* | **updateUser** | **PUT** /user/{username} | Updated user
-
-
-## Models
-
-* OpenAPIServer\Model\AdditionalPropertiesAnyType
-* OpenAPIServer\Model\AdditionalPropertiesArray
-* OpenAPIServer\Model\AdditionalPropertiesBoolean
-* OpenAPIServer\Model\AdditionalPropertiesClass
-* OpenAPIServer\Model\AdditionalPropertiesInteger
-* OpenAPIServer\Model\AdditionalPropertiesNumber
-* OpenAPIServer\Model\AdditionalPropertiesObject
-* OpenAPIServer\Model\AdditionalPropertiesString
-* OpenAPIServer\Model\Animal
-* OpenAPIServer\Model\ApiResponse
-* OpenAPIServer\Model\ArrayOfArrayOfNumberOnly
-* OpenAPIServer\Model\ArrayOfNumberOnly
-* OpenAPIServer\Model\ArrayTest
-* OpenAPIServer\Model\BigCat
-* OpenAPIServer\Model\BigCatAllOf
-* OpenAPIServer\Model\Capitalization
-* OpenAPIServer\Model\Cat
-* OpenAPIServer\Model\CatAllOf
-* OpenAPIServer\Model\Category
-* OpenAPIServer\Model\ClassModel
-* OpenAPIServer\Model\Client
-* OpenAPIServer\Model\Dog
-* OpenAPIServer\Model\DogAllOf
-* OpenAPIServer\Model\EnumArrays
-* OpenAPIServer\Model\EnumClass
-* OpenAPIServer\Model\EnumTest
-* OpenAPIServer\Model\File
-* OpenAPIServer\Model\FileSchemaTestClass
-* OpenAPIServer\Model\FormatTest
-* OpenAPIServer\Model\HasOnlyReadOnly
-* OpenAPIServer\Model\MapTest
-* OpenAPIServer\Model\MixedPropertiesAndAdditionalPropertiesClass
-* OpenAPIServer\Model\Model200Response
-* OpenAPIServer\Model\ModelList
-* OpenAPIServer\Model\ModelReturn
-* OpenAPIServer\Model\Name
-* OpenAPIServer\Model\NumberOnly
-* OpenAPIServer\Model\Order
-* OpenAPIServer\Model\OuterComposite
-* OpenAPIServer\Model\OuterEnum
-* OpenAPIServer\Model\Pet
-* OpenAPIServer\Model\ReadOnlyFirst
-* OpenAPIServer\Model\SpecialModelName
-* OpenAPIServer\Model\Tag
-* OpenAPIServer\Model\TypeHolderDefault
-* OpenAPIServer\Model\TypeHolderExample
-* OpenAPIServer\Model\User
-* OpenAPIServer\Model\XmlItem
-
-
-## Authentication
-
-### Security schema `api_key`
-> Important! To make ApiKey authentication work you need to extend [\OpenAPIServer\Auth\AbstractAuthenticator](./lib/Auth/AbstractAuthenticator.php) class by [\OpenAPIServer\Auth\ApiKeyAuthenticator](./src/Auth/ApiKeyAuthenticator.php) class.
-
-### Security schema `api_key_query`
-> Important! To make ApiKey authentication work you need to extend [\OpenAPIServer\Auth\AbstractAuthenticator](./lib/Auth/AbstractAuthenticator.php) class by [\OpenAPIServer\Auth\ApiKeyAuthenticator](./src/Auth/ApiKeyAuthenticator.php) class.
-
-### Security schema `http_basic_test`
-> Important! To make Basic authentication work you need to extend [\OpenAPIServer\Auth\AbstractAuthenticator](./lib/Auth/AbstractAuthenticator.php) class by [\OpenAPIServer\Auth\BasicAuthenticator](./src/Auth/BasicAuthenticator.php) class.
-
-### Security schema `petstore_auth`
-> Important! To make OAuth authentication work you need to extend [\OpenAPIServer\Auth\AbstractAuthenticator](./lib/Auth/AbstractAuthenticator.php) class by [\OpenAPIServer\Auth\OAuthAuthenticator](./src/Auth/OAuthAuthenticator.php) class.
-
-Scope list:
-* `write:pets` - modify pets in your account
-* `read:pets` - read your pets
-
-### Advanced middleware configuration
-Ref to used Slim Token Middleware [dyorg/slim-token-authentication](https://github.com/dyorg/slim-token-authentication/tree/1.x#readme)
diff --git a/samples/server/petstore/php-slim/composer.json b/samples/server/petstore/php-slim/composer.json
deleted file mode 100644
index 91d25bb9cb3e..000000000000
--- a/samples/server/petstore/php-slim/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "minimum-stability": "RC",
-  "repositories": [
-    {
-      "type": "github",
-      "url": "https://github.com/ybelenko/slim-token-authentication"
-    }
-  ],
-  "require": {
-    "php": "^7.0",
-    "slim/slim": "3.*",
-    "dyorg/slim-token-authentication": "dev-per_route_apply"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "^6.0 || ^7.0",
-    "overtrue/phplint": "^1.0",
-    "squizlabs/php_codesniffer": "^3.0"
-  },
-  "autoload": {
-    "psr-4": { "OpenAPIServer\\": [
-      "lib/",
-      "src/"
-    ]}
-  },
-  "autoload-dev": {
-    "psr-4": { "OpenAPIServer\\": "test/" }
-  },
-  "scripts": {
-    "test": [
-      "@test-apis",
-      "@test-models"
-    ],
-    "test-apis": "phpunit --testsuite Apis",
-    "test-models": "phpunit --testsuite Models",
-    "phpcs": "phpcs",
-    "phplint": "phplint ./ --exclude=vendor"
-  }
-}
diff --git a/samples/server/petstore/php-slim/composer.lock b/samples/server/petstore/php-slim/composer.lock
deleted file mode 100644
index d0509f8107f9..000000000000
--- a/samples/server/petstore/php-slim/composer.lock
+++ /dev/null
@@ -1,2494 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "c277335d4b16a38bf6e8c508449533e6",
-    "packages": [
-        {
-            "name": "container-interop/container-interop",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/container-interop/container-interop.git",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "shasum": ""
-            },
-            "require": {
-                "psr/container": "^1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Interop\\Container\\": "src/Interop/Container/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-            "homepage": "https://github.com/container-interop/container-interop",
-            "time": "2017-02-14T19:40:03+00:00"
-        },
-        {
-            "name": "nikic/fast-route",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nikic/FastRoute.git",
-                "reference": "181d480e08d9476e61381e04a71b34dc0432e812"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812",
-                "reference": "181d480e08d9476e61381e04a71b34dc0432e812",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35|~5.7"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "FastRoute\\": "src/"
-                },
-                "files": [
-                    "src/functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Nikita Popov",
-                    "email": "nikic@php.net"
-                }
-            ],
-            "description": "Fast request router for PHP",
-            "keywords": [
-                "router",
-                "routing"
-            ],
-            "time": "2018-02-13T20:26:39+00:00"
-        },
-        {
-            "name": "pimple/pimple",
-            "version": "v3.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/silexphp/Pimple.git",
-                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32",
-                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0",
-                "psr/container": "^1.0"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "^3.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Pimple": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Pimple, a simple Dependency Injection Container",
-            "homepage": "http://pimple.sensiolabs.org",
-            "keywords": [
-                "container",
-                "dependency injection"
-            ],
-            "time": "2018-01-21T07:42:36+00:00"
-        },
-        {
-            "name": "psr/container",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Container\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
-            "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
-            ],
-            "time": "2017-02-14T16:28:37+00:00"
-        },
-        {
-            "name": "psr/http-factory",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "378bfe27931ecc54ff824a20d6f6bfc303bbd04c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/378bfe27931ecc54ff824a20d6f6bfc303bbd04c",
-                "reference": "378bfe27931ecc54ff824a20d6f6bfc303bbd04c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0.0",
-                "psr/http-message": "^1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
-            "keywords": [
-                "factory",
-                "http",
-                "message",
-                "psr",
-                "psr-17",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "time": "2018-07-30T21:54:04+00:00"
-        },
-        {
-            "name": "psr/http-message",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP messages",
-            "homepage": "https://github.com/php-fig/http-message",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "time": "2016-08-06T14:39:51+00:00"
-        },
-        {
-            "name": "psr/http-server-handler",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-server-handler.git",
-                "reference": "439d92054dc06097f2406ec074a2627839955a02"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/439d92054dc06097f2406ec074a2627839955a02",
-                "reference": "439d92054dc06097f2406ec074a2627839955a02",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0",
-                "psr/http-message": "^1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Server\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP server-side request handler",
-            "keywords": [
-                "handler",
-                "http",
-                "http-interop",
-                "psr",
-                "psr-15",
-                "psr-7",
-                "request",
-                "response",
-                "server"
-            ],
-            "time": "2018-01-22T17:04:15+00:00"
-        },
-        {
-            "name": "psr/http-server-middleware",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-server-middleware.git",
-                "reference": "ea17eb1fb2c8df6db919cc578451a8013c6a0ae5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/ea17eb1fb2c8df6db919cc578451a8013c6a0ae5",
-                "reference": "ea17eb1fb2c8df6db919cc578451a8013c6a0ae5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0",
-                "psr/http-message": "^1.0",
-                "psr/http-server-handler": "^1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Server\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP server-side middleware",
-            "keywords": [
-                "http",
-                "http-interop",
-                "middleware",
-                "psr",
-                "psr-15",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "time": "2018-01-22T17:08:31+00:00"
-        },
-        {
-            "name": "slim/slim",
-            "version": "3.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/slimphp/Slim.git",
-                "reference": "d378e70431e78ee92ee32ddde61ecc72edf5dc0a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Slim/zipball/d378e70431e78ee92ee32ddde61ecc72edf5dc0a",
-                "reference": "d378e70431e78ee92ee32ddde61ecc72edf5dc0a",
-                "shasum": ""
-            },
-            "require": {
-                "container-interop/container-interop": "^1.2",
-                "nikic/fast-route": "^1.0",
-                "php": ">=5.5.0",
-                "pimple/pimple": "^3.0",
-                "psr/container": "^1.0",
-                "psr/http-message": "^1.0"
-            },
-            "provide": {
-                "psr/http-message-implementation": "1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0",
-                "squizlabs/php_codesniffer": "^2.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Slim\\": "Slim"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Rob Allen",
-                    "email": "rob@akrabat.com",
-                    "homepage": "http://akrabat.com"
-                },
-                {
-                    "name": "Josh Lockhart",
-                    "email": "hello@joshlockhart.com",
-                    "homepage": "https://joshlockhart.com"
-                },
-                {
-                    "name": "Gabriel Manricks",
-                    "email": "gmanricks@me.com",
-                    "homepage": "http://gabrielmanricks.com"
-                },
-                {
-                    "name": "Andrew Smith",
-                    "email": "a.smith@silentworks.co.uk",
-                    "homepage": "http://silentworks.co.uk"
-                }
-            ],
-            "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
-            "homepage": "https://slimframework.com",
-            "keywords": [
-                "api",
-                "framework",
-                "micro",
-                "router"
-            ],
-            "time": "2018-09-16T10:54:21+00:00"
-        },
-        {
-            "name": "tuupola/callable-handler",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/tuupola/callable-handler.git",
-                "reference": "8b9d87f88056d4234af317d65612d7b6307a747a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/tuupola/callable-handler/zipball/8b9d87f88056d4234af317d65612d7b6307a747a",
-                "reference": "8b9d87f88056d4234af317d65612d7b6307a747a",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1",
-                "psr/http-server-middleware": "^1.0"
-            },
-            "require-dev": {
-                "codedungeon/phpunit-result-printer": "^0.4.4",
-                "overtrue/phplint": "^1.0",
-                "phpunit/phpunit": "^6.5",
-                "squizlabs/php_codesniffer": "^3.2",
-                "tuupola/http-factory": "^0.4.0|^1.0",
-                "zendframework/zend-diactoros": "^1.6.0|^2.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Tuupola\\Middleware\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mika Tuupola",
-                    "email": "tuupola@appelsiini.net",
-                    "homepage": "https://appelsiini.net/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Compatibility layer for PSR-7 double pass and PSR-15 middlewares.",
-            "homepage": "https://github.com/tuupola/callable-handler",
-            "keywords": [
-                "middleware",
-                "psr-15",
-                "psr-7"
-            ],
-            "time": "2018-10-12T09:59:35+00:00"
-        },
-        {
-            "name": "tuupola/http-factory",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/tuupola/http-factory.git",
-                "reference": "dd38c41facebdec20b5b4a120cd6380e30720ce8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/tuupola/http-factory/zipball/dd38c41facebdec20b5b4a120cd6380e30720ce8",
-                "reference": "dd38c41facebdec20b5b4a120cd6380e30720ce8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1",
-                "psr/http-factory": "^1.0"
-            },
-            "conflict": {
-                "nyholm/psr7": "<1.0"
-            },
-            "require-dev": {
-                "http-interop/http-factory-tests": "^0.5.0",
-                "overtrue/phplint": "^1.0",
-                "phpunit/phpunit": "^6.5",
-                "squizlabs/php_codesniffer": "^3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Tuupola\\Http\\Factory\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mika Tuupola",
-                    "email": "tuupola@appelsiini.net",
-                    "homepage": "https://appelsiini.net/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Lightweight autodiscovering PSR-17 HTTP factories",
-            "homepage": "https://github.com/tuupola/http-factory",
-            "keywords": [
-                "http",
-                "psr-17",
-                "psr-7"
-            ],
-            "time": "2018-10-12T09:32:20+00:00"
-        },
-        {
-            "name": "tuupola/slim-basic-auth",
-            "version": "3.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/tuupola/slim-basic-auth.git",
-                "reference": "40f5efe991ac4e2441ee05b830375c02432ff3f8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/tuupola/slim-basic-auth/zipball/40f5efe991ac4e2441ee05b830375c02432ff3f8",
-                "reference": "40f5efe991ac4e2441ee05b830375c02432ff3f8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1",
-                "psr/http-message": "^1.0.1",
-                "psr/http-server-middleware": "^1.0",
-                "tuupola/callable-handler": "^0.3.0|^0.4.0|^1.0",
-                "tuupola/http-factory": "^0.4.0|^1.0"
-            },
-            "require-dev": {
-                "codedungeon/phpunit-result-printer": "^0.19.14",
-                "equip/dispatch": "^2.0",
-                "overtrue/phplint": "^1.1",
-                "phpstan/phpstan": "^0.9.2",
-                "phpunit/phpunit": "^7.0",
-                "squizlabs/php_codesniffer": "^3.2",
-                "zendframework/zend-diactoros": "^1.3|^2.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Tuupola\\Middleware\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mika Tuupola",
-                    "email": "tuupola@appelsiini.net",
-                    "homepage": "https://appelsiini.net/"
-                }
-            ],
-            "description": "PSR-7 and PSR-15 HTTP Basic Authentication Middleware",
-            "homepage": "https://appelsiini.net/projects/slim-basic-auth",
-            "keywords": [
-                "auth",
-                "middleware",
-                "psr-15",
-                "psr-7"
-            ],
-            "time": "2018-10-15T12:48:00+00:00"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "^6.2.3",
-                "squizlabs/php_codesniffer": "^3.0.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2017-07-22T11:58:36+00:00"
-        },
-        {
-            "name": "myclabs/deep-copy",
-            "version": "1.8.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
-                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
-            },
-            "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^7.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
-                "files": [
-                    "src/DeepCopy/deep_copy.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Create deep copies (clones) of your objects",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
-            ],
-            "time": "2018-06-11T23:09:50+00:00"
-        },
-        {
-            "name": "overtrue/phplint",
-            "version": "1.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/overtrue/phplint.git",
-                "reference": "b8822e30b5bd1412471520901ba148c5417656c8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/overtrue/phplint/zipball/b8822e30b5bd1412471520901ba148c5417656c8",
-                "reference": "b8822e30b5bd1412471520901ba148c5417656c8",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "php": ">=5.5.9",
-                "symfony/console": "^3.2|^4.0",
-                "symfony/finder": "^3.0|^4.0",
-                "symfony/process": "^3.0|^4.0",
-                "symfony/yaml": "^3.0|^4.0"
-            },
-            "require-dev": {
-                "jakub-onderka/php-console-highlighter": "^0.3.2"
-            },
-            "bin": [
-                "bin/phplint"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Overtrue\\PHPLint\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "overtrue",
-                    "email": "anzhengchao@gmail.com"
-                }
-            ],
-            "description": "a php syntax check tool.",
-            "keywords": [
-                "check",
-                "lint",
-                "phplint",
-                "syntax"
-            ],
-            "time": "2018-06-19T06:30:45+00:00"
-        },
-        {
-            "name": "phar-io/manifest",
-            "version": "1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/manifest.git",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-phar": "*",
-                "phar-io/version": "^2.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2018-07-08T19:23:20+00:00"
-        },
-        {
-            "name": "phar-io/version",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/version.git",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Library for handling version information and constraints",
-            "time": "2018-07-08T19:19:57+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2017-09-11T18:02:19+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0",
-                "phpdocumentor/type-resolver": "^0.4.0",
-                "webmozart/assert": "^1.0"
-            },
-            "require-dev": {
-                "doctrine/instantiator": "~1.0.5",
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^6.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-30T07:14:17+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "0.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "time": "2017-07-14T14:27:02+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "1.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0|^3.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2018-08-05T17:53:17+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "6.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "0685fb6a43aed1b2e09804d1aaf17144c82861f8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0685fb6a43aed1b2e09804d1aaf17144c82861f8",
-                "reference": "0685fb6a43aed1b2e09804d1aaf17144c82861f8",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.1",
-                "phpunit/php-file-iterator": "^2.0",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^3.1",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
-            },
-            "suggest": {
-                "ext-xdebug": "^2.6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2018-10-16T05:37:37+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "050bedf145a257b1ff02746c31894800e5122946"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
-                "reference": "050bedf145a257b1ff02746c31894800e5122946",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2018-09-13T20:33:42+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21T13:50:34+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f",
-                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2018-02-01T13:07:23+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/21ad88bbba7c3d93530d93994e0a33cd45f02ace",
-                "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2018-02-01T13:16:43+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "7.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f3837fa1e07758057ae06e8ddec6d06ba183f126"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3837fa1e07758057ae06e8ddec6d06ba183f126",
-                "reference": "f3837fa1e07758057ae06e8ddec6d06ba183f126",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.1",
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-xml": "*",
-                "myclabs/deep-copy": "^1.7",
-                "phar-io/manifest": "^1.0.2",
-                "phar-io/version": "^2.0",
-                "php": "^7.1",
-                "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^6.0.7",
-                "phpunit/php-file-iterator": "^2.0.1",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^2.0",
-                "sebastian/comparator": "^3.0",
-                "sebastian/diff": "^3.0",
-                "sebastian/environment": "^3.1",
-                "sebastian/exporter": "^3.1",
-                "sebastian/global-state": "^2.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^2.0",
-                "sebastian/version": "^2.0.1"
-            },
-            "conflict": {
-                "phpunit/phpunit-mock-objects": "*"
-            },
-            "require-dev": {
-                "ext-pdo": "*"
-            },
-            "suggest": {
-                "ext-soap": "*",
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^2.0"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "7.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2018-10-05T04:05:24+00:00"
-        },
-        {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04T06:30:41+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "3.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
-                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1",
-                "sebastian/diff": "^3.0",
-                "sebastian/exporter": "^3.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "https://github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2018-07-12T15:12:46+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "366541b989927187c4ca70490a35615d3fef2dce"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce",
-                "reference": "366541b989927187c4ca70490a35615d3fef2dce",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0",
-                "symfony/process": "^2 || ^3.3 || ^4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff",
-                "udiff",
-                "unidiff",
-                "unified diff"
-            ],
-            "time": "2018-06-10T07:54:39+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2017-07-01T08:51:00+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "sebastian/recursion-context": "^3.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2017-04-03T13:19:02+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2017-04-27T15:39:26+00:00"
-        },
-        {
-            "name": "sebastian/object-enumerator",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-08-03T12:35:26+00:00"
-        },
-        {
-            "name": "sebastian/object-reflector",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2017-03-29T09:07:27+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2017-03-03T06:23:57+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
-                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2018-10-04T04:07:39+00:00"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03T07:35:21+00:00"
-        },
-        {
-            "name": "squizlabs/php_codesniffer",
-            "version": "3.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6ad28354c04b364c3c71a34e4a18b629cc3b231e",
-                "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e",
-                "shasum": ""
-            },
-            "require": {
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
-            },
-            "bin": [
-                "bin/phpcs",
-                "bin/phpcbf"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Sherwood",
-                    "role": "lead"
-                }
-            ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "http://www.squizlabs.com/php-codesniffer",
-            "keywords": [
-                "phpcs",
-                "standards"
-            ],
-            "time": "2018-09-23T23:08:17+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v4.1.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/dc7122fe5f6113cfaba3b3de575d31112c9aa60b",
-                "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<3.4",
-                "symfony/process": "<3.3"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~3.4|~4.0",
-                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/event-dispatcher": "~3.4|~4.0",
-                "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~3.4|~4.0"
-            },
-            "suggest": {
-                "psr/log-implementation": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-10-03T08:15:46+00:00"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v4.1.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "1f17195b44543017a9c9b2d437c670627e96ad06"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/1f17195b44543017a9c9b2d437c670627e96ad06",
-                "reference": "1f17195b44543017a9c9b2d437c670627e96ad06",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Finder Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-10-03T08:47:56+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.9.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                },
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "time": "2018-08-06T14:22:27+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.9.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
-                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2018-08-06T14:22:27+00:00"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v4.1.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "ee33c0322a8fee0855afcc11fff81e6b1011b529"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/ee33c0322a8fee0855afcc11fff81e6b1011b529",
-                "reference": "ee33c0322a8fee0855afcc11fff81e6b1011b529",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Process Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-10-02T12:40:59+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v4.1.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "367e689b2fdc19965be435337b50bc8adf2746c9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/367e689b2fdc19965be435337b50bc8adf2746c9",
-                "reference": "367e689b2fdc19965be435337b50bc8adf2746c9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/console": "<3.4"
-            },
-            "require-dev": {
-                "symfony/console": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-10-02T16:36:10+00:00"
-        },
-        {
-            "name": "theseer/tokenizer",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2017-04-07T12:08:54+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2018-01-29T19:49:41+00:00"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "RC",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": "^7.0"
-    },
-    "platform-dev": []
-}
diff --git a/samples/server/petstore/php-slim/index.php b/samples/server/petstore/php-slim/index.php
deleted file mode 100644
index 35e9a27a6131..000000000000
--- a/samples/server/petstore/php-slim/index.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * OpenAPI Petstore
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @version 1.0.0
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-require_once __DIR__ . '/vendor/autoload.php';
-
-use OpenAPIServer\SlimRouter;
-
-$config = [];
-
-/**
- * Slim Framework Settings
- * Ref: http://www.slimframework.com/docs/v3/objects/application.html#slim-default-settings
- */
-$config['settings'] = [
-    /**
-     * The protocol version used by the Response object. (Default: '1.1')
-     * Default: '1.1'
-     */
-    // 'httpVersion' => '1.1',
-
-    /**
-     * Size of each chunk read from the Response body when sending to the browser.
-     * Default: 4096
-     */
-    // 'responseChunkSize' => 4096,
-
-    /**
-     * If false, then no output buffering is enabled. If 'append' or 'prepend', then
-     * any echo or print statements are captured and are either appended or prepended
-     * to the Response returned from the route callable.
-     * Default: 'append'
-     */
-    // 'outputBuffering' => 'append',
-
-    /**
-     * When true, the route is calculated before any middleware is executed. This
-     * means that you can inspect route parameters in middleware if you need to.
-     * Default: false
-     */
-    // 'determineRouteBeforeAppMiddleware' => false,
-
-    /**
-     * When true, additional information about exceptions are displayed by the default
-     * error handler.
-     * Default: false
-     */
-    // 'displayErrorDetails' => false,
-
-    /**
-     * When true, Slim will add a Content-Length header to the response. If you are using
-     * a runtime analytics tool, such as New Relic, then this should be disabled.
-     * Default: true
-     */
-    // 'addContentLengthHeader' => true,
-
-    /**
-     * Filename for caching the FastRoute routes. Must be set to to a valid filename within
-     * a writeable directory. If the file does not exist, then it is created with the correct
-     * cache information on first run.
-     * Set to false to disable the FastRoute cache system.
-     * Default: false
-     */
-    // 'routerCacheFile' => false,
-];
-
-/**
- * Token Middleware 1.x Options
- * Options `header`, `regex`, `parameter`, `cookie`, `attribute`, `path`, `except`, `authenticator`
- * are handled by SlimRouter class. These options are ignored by app and they omitted from current
- * example.
- * Ref: https://github.com/dyorg/slim-token-authentication/tree/1.x
- */
-$config['tokenAuthenticationOptions'] = [
-    /**
-     * Tokens are essentially passwords. You should treat them as such and you should always
-     * use HTTPS. If the middleware detects insecure usage over HTTP it will return unathorized
-     * with a message Required HTTPS for token authentication. This rule is relaxed for requests
-     * on localhost. To allow insecure usage you must enable it manually by setting secure to
-     * false.
-     * Default: true
-     */
-    // 'secure' => true,
-
-    /**
-     * Alternatively you can list your development host to have relaxed security.
-     * Default: ['localhost', '127.0.0.1']
-     */
-    // 'relaxed' => ['localhost', '127.0.0.1'],
-
-    /**
-     * By default on ocurred a fail on authentication, is sent a response on json format with a
-     * message (`Invalid Token` or `Not found Token`) and with the token (if found), with status
-     * `401 Unauthorized`. You can customize it by setting a callable function on error option.
-     * Default: null
-     */
-    // 'error' => null,
-];
-
-$router = new SlimRouter($config);
-$app = $router->getSlimApp();
-$app->run();
diff --git a/samples/server/petstore/php-slim/lib/Api/AbstractAnotherFakeApi.php b/samples/server/petstore/php-slim/lib/Api/AbstractAnotherFakeApi.php
deleted file mode 100644
index 4768f219eba4..000000000000
--- a/samples/server/petstore/php-slim/lib/Api/AbstractAnotherFakeApi.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * AbstractAnotherFakeApi
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Api;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Exception;
-
-/**
- * AbstractAnotherFakeApi Class Doc Comment
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-abstract class AbstractAnotherFakeApi
-{
-
-    /**
-     * @var ContainerInterface Slim app container instance
-     */
-    protected $container;
-
-    /**
-     * Route Controller constructor receives container
-     *
-     * @param ContainerInterface $container Slim app container instance
-     */
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
-    }
-
-
-    /**
-     * PATCH call123TestSpecialTags
-     * Summary: To test special tags
-     * Notes: To test special tags and operation ID starting with number
-     * Output-Formats: [application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function call123TestSpecialTags(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing call123TestSpecialTags as a PATCH method in OpenAPIServer\Api\AnotherFakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-}
diff --git a/samples/server/petstore/php-slim/lib/Api/AbstractFakeApi.php b/samples/server/petstore/php-slim/lib/Api/AbstractFakeApi.php
deleted file mode 100644
index f6d0e91ec32d..000000000000
--- a/samples/server/petstore/php-slim/lib/Api/AbstractFakeApi.php
+++ /dev/null
@@ -1,383 +0,0 @@
-<?php
-/**
- * AbstractFakeApi
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Api;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Exception;
-
-/**
- * AbstractFakeApi Class Doc Comment
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-abstract class AbstractFakeApi
-{
-
-    /**
-     * @var ContainerInterface Slim app container instance
-     */
-    protected $container;
-
-    /**
-     * Route Controller constructor receives container
-     *
-     * @param ContainerInterface $container Slim app container instance
-     */
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
-    }
-
-
-    /**
-     * POST createXmlItem
-     * Summary: creates an XmlItem
-     * Notes: this route creates an XmlItem
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function createXmlItem(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing createXmlItem as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * POST fakeOuterBooleanSerialize
-     * Notes: Test serialization of outer boolean types
-     * Output-Formats: [*_/_*]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function fakeOuterBooleanSerialize(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing fakeOuterBooleanSerialize as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * POST fakeOuterCompositeSerialize
-     * Notes: Test serialization of object with outer number type
-     * Output-Formats: [*_/_*]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function fakeOuterCompositeSerialize(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing fakeOuterCompositeSerialize as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * POST fakeOuterNumberSerialize
-     * Notes: Test serialization of outer number types
-     * Output-Formats: [*_/_*]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function fakeOuterNumberSerialize(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing fakeOuterNumberSerialize as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * POST fakeOuterStringSerialize
-     * Notes: Test serialization of outer string types
-     * Output-Formats: [*_/_*]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function fakeOuterStringSerialize(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing fakeOuterStringSerialize as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * PUT testBodyWithFileSchema
-     * Notes: For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testBodyWithFileSchema(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing testBodyWithFileSchema as a PUT method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * PUT testBodyWithQueryParams
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testBodyWithQueryParams(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $queryParams = $request->getQueryParams();
-        $query = $request->getQueryParam('query');
-        $body = $request->getParsedBody();
-        $message = "How about implementing testBodyWithQueryParams as a PUT method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * PATCH testClientModel
-     * Summary: To test \&quot;client\&quot; model
-     * Notes: To test \&quot;client\&quot; model
-     * Output-Formats: [application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testClientModel(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing testClientModel as a PATCH method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * POST testEndpointParameters
-     * Summary: Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-     * Notes: Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testEndpointParameters(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $integer = $request->getParsedBodyParam('integer');
-        $int32 = $request->getParsedBodyParam('int32');
-        $int64 = $request->getParsedBodyParam('int64');
-        $number = $request->getParsedBodyParam('number');
-        $float = $request->getParsedBodyParam('float');
-        $double = $request->getParsedBodyParam('double');
-        $string = $request->getParsedBodyParam('string');
-        $patternWithoutDelimiter = $request->getParsedBodyParam('pattern_without_delimiter');
-        $byte = $request->getParsedBodyParam('byte');
-        $binary = (key_exists('binary', $request->getUploadedFiles())) ? $request->getUploadedFiles()['binary'] : null;
-        $date = $request->getParsedBodyParam('date');
-        $dateTime = $request->getParsedBodyParam('dateTime');
-        $password = $request->getParsedBodyParam('password');
-        $callback = $request->getParsedBodyParam('callback');
-        $message = "How about implementing testEndpointParameters as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * GET testEnumParameters
-     * Summary: To test enum parameters
-     * Notes: To test enum parameters
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testEnumParameters(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $headers = $request->getHeaders();
-        $enumHeaderStringArray = $request->hasHeader('enum_header_string_array') ? $headers['enum_header_string_array'] : null;
-        $enumHeaderString = $request->hasHeader('enum_header_string') ? $headers['enum_header_string'] : null;
-        $queryParams = $request->getQueryParams();
-        $enumQueryStringArray = $request->getQueryParam('enum_query_string_array');
-        $enumQueryString = $request->getQueryParam('enum_query_string');
-        $enumQueryInteger = $request->getQueryParam('enum_query_integer');
-        $enumQueryDouble = $request->getQueryParam('enum_query_double');
-        $enumFormStringArray = $request->getParsedBodyParam('enum_form_string_array');
-        $enumFormString = $request->getParsedBodyParam('enum_form_string');
-        $message = "How about implementing testEnumParameters as a GET method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * DELETE testGroupParameters
-     * Summary: Fake endpoint to test group parameters (optional)
-     * Notes: Fake endpoint to test group parameters (optional)
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testGroupParameters(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $headers = $request->getHeaders();
-        $requiredBooleanGroup = $request->hasHeader('required_boolean_group') ? $headers['required_boolean_group'] : null;
-        $booleanGroup = $request->hasHeader('boolean_group') ? $headers['boolean_group'] : null;
-        $queryParams = $request->getQueryParams();
-        $requiredStringGroup = $request->getQueryParam('required_string_group');
-        $requiredInt64Group = $request->getQueryParam('required_int64_group');
-        $stringGroup = $request->getQueryParam('string_group');
-        $int64Group = $request->getQueryParam('int64_group');
-        $message = "How about implementing testGroupParameters as a DELETE method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * POST testInlineAdditionalProperties
-     * Summary: test inline additionalProperties
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testInlineAdditionalProperties(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing testInlineAdditionalProperties as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * GET testJsonFormData
-     * Summary: test json serialization of form data
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testJsonFormData(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $param = $request->getParsedBodyParam('param');
-        $param2 = $request->getParsedBodyParam('param2');
-        $message = "How about implementing testJsonFormData as a GET method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * PUT testQueryParameterCollectionFormat
-     * Notes: To test the collection format in query parameters
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testQueryParameterCollectionFormat(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $queryParams = $request->getQueryParams();
-        $pipe = $request->getQueryParam('pipe');
-        $ioutil = $request->getQueryParam('ioutil');
-        $http = $request->getQueryParam('http');
-        $url = $request->getQueryParam('url');
-        $context = $request->getQueryParam('context');
-        $message = "How about implementing testQueryParameterCollectionFormat as a PUT method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-}
diff --git a/samples/server/petstore/php-slim/lib/Api/AbstractFakeClassnameTags123Api.php b/samples/server/petstore/php-slim/lib/Api/AbstractFakeClassnameTags123Api.php
deleted file mode 100644
index cbe943ed38c3..000000000000
--- a/samples/server/petstore/php-slim/lib/Api/AbstractFakeClassnameTags123Api.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * AbstractFakeClassnameTags123Api
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Api;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Exception;
-
-/**
- * AbstractFakeClassnameTags123Api Class Doc Comment
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-abstract class AbstractFakeClassnameTags123Api
-{
-
-    /**
-     * @var ContainerInterface Slim app container instance
-     */
-    protected $container;
-
-    /**
-     * Route Controller constructor receives container
-     *
-     * @param ContainerInterface $container Slim app container instance
-     */
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
-    }
-
-
-    /**
-     * PATCH testClassname
-     * Summary: To test class name in snake case
-     * Notes: To test class name in snake case
-     * Output-Formats: [application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testClassname(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing testClassname as a PATCH method in OpenAPIServer\Api\FakeClassnameTags123Api class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-}
diff --git a/samples/server/petstore/php-slim/lib/Api/AbstractPetApi.php b/samples/server/petstore/php-slim/lib/Api/AbstractPetApi.php
deleted file mode 100644
index 9ff00017cb5e..000000000000
--- a/samples/server/petstore/php-slim/lib/Api/AbstractPetApi.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-/**
- * AbstractPetApi
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Api;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Exception;
-
-/**
- * AbstractPetApi Class Doc Comment
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-abstract class AbstractPetApi
-{
-
-    /**
-     * @var ContainerInterface Slim app container instance
-     */
-    protected $container;
-
-    /**
-     * Route Controller constructor receives container
-     *
-     * @param ContainerInterface $container Slim app container instance
-     */
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
-    }
-
-
-    /**
-     * POST addPet
-     * Summary: Add a new pet to the store
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function addPet(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing addPet as a POST method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * DELETE deletePet
-     * Summary: Deletes a pet
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function deletePet(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $headers = $request->getHeaders();
-        $apiKey = $request->hasHeader('api_key') ? $headers['api_key'] : null;
-        $petId = $args['petId'];
-        $message = "How about implementing deletePet as a DELETE method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * GET findPetsByStatus
-     * Summary: Finds Pets by status
-     * Notes: Multiple status values can be provided with comma separated strings
-     * Output-Formats: [application/xml, application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function findPetsByStatus(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $queryParams = $request->getQueryParams();
-        $status = $request->getQueryParam('status');
-        $message = "How about implementing findPetsByStatus as a GET method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * GET findPetsByTags
-     * Summary: Finds Pets by tags
-     * Notes: Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * Output-Formats: [application/xml, application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function findPetsByTags(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $queryParams = $request->getQueryParams();
-        $tags = $request->getQueryParam('tags');
-        $message = "How about implementing findPetsByTags as a GET method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * GET getPetById
-     * Summary: Find pet by ID
-     * Notes: Returns a single pet
-     * Output-Formats: [application/xml, application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function getPetById(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $petId = $args['petId'];
-        $message = "How about implementing getPetById as a GET method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * PUT updatePet
-     * Summary: Update an existing pet
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function updatePet(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing updatePet as a PUT method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * POST updatePetWithForm
-     * Summary: Updates a pet in the store with form data
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function updatePetWithForm(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $petId = $args['petId'];
-        $name = $request->getParsedBodyParam('name');
-        $status = $request->getParsedBodyParam('status');
-        $message = "How about implementing updatePetWithForm as a POST method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * POST uploadFile
-     * Summary: uploads an image
-     * Output-Formats: [application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function uploadFile(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $petId = $args['petId'];
-        $additionalMetadata = $request->getParsedBodyParam('additionalMetadata');
-        $file = (key_exists('file', $request->getUploadedFiles())) ? $request->getUploadedFiles()['file'] : null;
-        $message = "How about implementing uploadFile as a POST method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * POST uploadFileWithRequiredFile
-     * Summary: uploads an image (required)
-     * Output-Formats: [application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function uploadFileWithRequiredFile(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $petId = $args['petId'];
-        $additionalMetadata = $request->getParsedBodyParam('additionalMetadata');
-        $requiredFile = (key_exists('requiredFile', $request->getUploadedFiles())) ? $request->getUploadedFiles()['requiredFile'] : null;
-        $message = "How about implementing uploadFileWithRequiredFile as a POST method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-}
diff --git a/samples/server/petstore/php-slim/lib/Api/AbstractStoreApi.php b/samples/server/petstore/php-slim/lib/Api/AbstractStoreApi.php
deleted file mode 100644
index b23947798074..000000000000
--- a/samples/server/petstore/php-slim/lib/Api/AbstractStoreApi.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * AbstractStoreApi
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Api;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Exception;
-
-/**
- * AbstractStoreApi Class Doc Comment
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-abstract class AbstractStoreApi
-{
-
-    /**
-     * @var ContainerInterface Slim app container instance
-     */
-    protected $container;
-
-    /**
-     * Route Controller constructor receives container
-     *
-     * @param ContainerInterface $container Slim app container instance
-     */
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
-    }
-
-
-    /**
-     * DELETE deleteOrder
-     * Summary: Delete purchase order by ID
-     * Notes: For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function deleteOrder(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $orderId = $args['order_id'];
-        $message = "How about implementing deleteOrder as a DELETE method in OpenAPIServer\Api\StoreApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * GET getInventory
-     * Summary: Returns pet inventories by status
-     * Notes: Returns a map of status codes to quantities
-     * Output-Formats: [application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function getInventory(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $message = "How about implementing getInventory as a GET method in OpenAPIServer\Api\StoreApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * GET getOrderById
-     * Summary: Find purchase order by ID
-     * Notes: For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     * Output-Formats: [application/xml, application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function getOrderById(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $orderId = $args['order_id'];
-        $message = "How about implementing getOrderById as a GET method in OpenAPIServer\Api\StoreApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * POST placeOrder
-     * Summary: Place an order for a pet
-     * Output-Formats: [application/xml, application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function placeOrder(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing placeOrder as a POST method in OpenAPIServer\Api\StoreApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-}
diff --git a/samples/server/petstore/php-slim/lib/Api/AbstractUserApi.php b/samples/server/petstore/php-slim/lib/Api/AbstractUserApi.php
deleted file mode 100644
index 0f6e36f54d5e..000000000000
--- a/samples/server/petstore/php-slim/lib/Api/AbstractUserApi.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * AbstractUserApi
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Api;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Exception;
-
-/**
- * AbstractUserApi Class Doc Comment
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-abstract class AbstractUserApi
-{
-
-    /**
-     * @var ContainerInterface Slim app container instance
-     */
-    protected $container;
-
-    /**
-     * Route Controller constructor receives container
-     *
-     * @param ContainerInterface $container Slim app container instance
-     */
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
-    }
-
-
-    /**
-     * POST createUser
-     * Summary: Create user
-     * Notes: This can only be done by the logged in user.
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function createUser(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing createUser as a POST method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * POST createUsersWithArrayInput
-     * Summary: Creates list of users with given input array
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function createUsersWithArrayInput(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing createUsersWithArrayInput as a POST method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * POST createUsersWithListInput
-     * Summary: Creates list of users with given input array
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function createUsersWithListInput(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing createUsersWithListInput as a POST method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * DELETE deleteUser
-     * Summary: Delete user
-     * Notes: This can only be done by the logged in user.
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function deleteUser(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $username = $args['username'];
-        $message = "How about implementing deleteUser as a DELETE method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * GET getUserByName
-     * Summary: Get user by user name
-     * Output-Formats: [application/xml, application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function getUserByName(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $username = $args['username'];
-        $message = "How about implementing getUserByName as a GET method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * GET loginUser
-     * Summary: Logs user into the system
-     * Output-Formats: [application/xml, application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function loginUser(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $queryParams = $request->getQueryParams();
-        $username = $request->getQueryParam('username');
-        $password = $request->getQueryParam('password');
-        $message = "How about implementing loginUser as a GET method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * GET logoutUser
-     * Summary: Logs out current logged in user session
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function logoutUser(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $message = "How about implementing logoutUser as a GET method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-
-    /**
-     * PUT updateUser
-     * Summary: Updated user
-     * Notes: This can only be done by the logged in user.
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function updateUser(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $username = $args['username'];
-        $body = $request->getParsedBody();
-        $message = "How about implementing updateUser as a PUT method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        return $response->write($message)->withStatus(501);
-    }
-}
diff --git a/samples/server/petstore/php-slim/lib/Auth/AbstractAuthenticator.php b/samples/server/petstore/php-slim/lib/Auth/AbstractAuthenticator.php
deleted file mode 100644
index 52f6f7008563..000000000000
--- a/samples/server/petstore/php-slim/lib/Auth/AbstractAuthenticator.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * AbstractAuthenticator
- *
- * PHP version 7
- *
- * @package OpenAPIServer
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Auth;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Dyorg\TokenAuthentication;
-use Dyorg\TokenAuthentication\TokenSearch;
-use Dyorg\TokenAuthentication\Exceptions\UnauthorizedExceptionInterface;
-
-/**
- * AbstractAuthenticator Class Doc Comment
- *
- * @package OpenAPIServer\Auth
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-abstract class AbstractAuthenticator
-{
-
-    /**
-     * @var ContainerInterface Slim app container instance
-     */
-    protected $container;
-
-    /**
-     * @var string[]|null List of required scopes
-     */
-    protected $requiredScope;
-
-    /**
-     * Verify if token is valid on database
-     * If token isn't valid, expired or has insufficient scope must throw an UnauthorizedExceptionInterface
-     *
-     * @param string $token Api Key
-     *
-     * @return array User object or associative array
-     * @throws UnauthorizedExceptionInterface on invalid token
-     */
-    abstract protected function getUserByToken(string $token);
-
-    /**
-     * Authenticator constructor
-     *
-     * @param ContainerInterface $container     Slim app container instance
-     * @param string[]|null      $requiredScope List of required scopes
-     */
-    public function __construct(ContainerInterface $container, $requiredScope = null)
-    {
-        $this->container = $container;
-        $this->requiredScope = $requiredScope;
-    }
-
-    /**
-     * Makes the api key validation of your application
-     *
-     * Just an example of implementation. Override this method to fit your needs
-     *
-     * @param ServerRequestInterface $request     HTTP request
-     * @param TokenSearch            $tokenSearch Middleware instance which contains api key in token
-     *
-     * @return bool Must return either true or false
-     * @throws UnauthorizedExceptionInterface when cannot parse token
-     */
-    public function __invoke(ServerRequestInterface &$request, TokenSearch $tokenSearch)
-    {
-       /**
-        * Try find authorization token via header, parameters, cookie or attribute
-        * If token not found, return response with status 401 (unauthorized)
-        */
-        $token = $tokenSearch->getToken($request);
-
-        /**
-         * Verify if token is valid on database
-         * If token isn't valid, expired or has insufficient scope must throw an UnauthorizedExceptionInterface
-         */
-        $user = $this->getUserByToken($token);
-
-        /**
-         * Set authenticated user at attributes
-         */
-        $request = $request->withAttribute('authenticated_user', $user);
-
-        return true;
-    }
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesAnyType.php b/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesAnyType.php
deleted file mode 100644
index 75656ee435eb..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesAnyType.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesAnyType
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * AdditionalPropertiesAnyType
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesAnyType
-{
-    
-    /** @var string $name */
-    private $name;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesArray.php b/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesArray.php
deleted file mode 100644
index 2b74d9f8ff90..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesArray.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesArray
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * AdditionalPropertiesArray
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesArray
-{
-    
-    /** @var string $name */
-    private $name;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesBoolean.php b/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesBoolean.php
deleted file mode 100644
index 1f57a9e0d7ca..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesBoolean.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesBoolean
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * AdditionalPropertiesBoolean
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesBoolean
-{
-    
-    /** @var string $name */
-    private $name;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesClass.php b/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesClass.php
deleted file mode 100644
index 81ef47753c4c..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesClass.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesClass
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * AdditionalPropertiesClass
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesClass
-{
-    
-    /** @var map[string,string] $mapString */
-    private $mapString;
-    
-    /** @var map[string,float] $mapNumber */
-    private $mapNumber;
-    
-    /** @var map[string,int] $mapInteger */
-    private $mapInteger;
-    
-    /** @var map[string,bool] $mapBoolean */
-    private $mapBoolean;
-    
-    /** @var map[string,int[]] $mapArrayInteger */
-    private $mapArrayInteger;
-    
-    /** @var map[string,object[]] $mapArrayAnytype */
-    private $mapArrayAnytype;
-    
-    /** @var map[string,map[string,string]] $mapMapString */
-    private $mapMapString;
-    
-    /** @var map[string,map[string,object]] $mapMapAnytype */
-    private $mapMapAnytype;
-    
-    /** @var object $anytype1 */
-    private $anytype1;
-    
-    /** @var object $anytype2 */
-    private $anytype2;
-    
-    /** @var object $anytype3 */
-    private $anytype3;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesInteger.php b/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesInteger.php
deleted file mode 100644
index 349cd59641c8..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesInteger.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesInteger
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * AdditionalPropertiesInteger
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesInteger
-{
-    
-    /** @var string $name */
-    private $name;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesNumber.php b/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesNumber.php
deleted file mode 100644
index 64e61206f3f7..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesNumber.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesNumber
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * AdditionalPropertiesNumber
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesNumber
-{
-    
-    /** @var string $name */
-    private $name;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesObject.php b/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesObject.php
deleted file mode 100644
index 5cafd8fa2285..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesObject.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesObject
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * AdditionalPropertiesObject
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesObject
-{
-    
-    /** @var string $name */
-    private $name;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesString.php b/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesString.php
deleted file mode 100644
index 6425c44c737d..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/AdditionalPropertiesString.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesString
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * AdditionalPropertiesString
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesString
-{
-    
-    /** @var string $name */
-    private $name;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/Animal.php b/samples/server/petstore/php-slim/lib/Model/Animal.php
deleted file mode 100644
index 5d56a0803a7c..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/Animal.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Animal
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * Animal
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Animal
-{
-    
-    /** @var string $className */
-    private $className;
-    
-    /** @var string $color */
-    private $color;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/ApiResponse.php b/samples/server/petstore/php-slim/lib/Model/ApiResponse.php
deleted file mode 100644
index b6f330923e1a..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/ApiResponse.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * ApiResponse
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * ApiResponse
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ApiResponse
-{
-    
-    /** @var int $code */
-    private $code;
-    
-    /** @var string $type */
-    private $type;
-    
-    /** @var string $message */
-    private $message;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/server/petstore/php-slim/lib/Model/ArrayOfArrayOfNumberOnly.php
deleted file mode 100644
index 907168e393b2..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * ArrayOfArrayOfNumberOnly
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * ArrayOfArrayOfNumberOnly
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ArrayOfArrayOfNumberOnly
-{
-    
-    /** @var float[][] $arrayArrayNumber */
-    private $arrayArrayNumber;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/ArrayOfNumberOnly.php b/samples/server/petstore/php-slim/lib/Model/ArrayOfNumberOnly.php
deleted file mode 100644
index b49d23e16f53..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/ArrayOfNumberOnly.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * ArrayOfNumberOnly
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * ArrayOfNumberOnly
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ArrayOfNumberOnly
-{
-    
-    /** @var float[] $arrayNumber */
-    private $arrayNumber;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/ArrayTest.php b/samples/server/petstore/php-slim/lib/Model/ArrayTest.php
deleted file mode 100644
index 32cef4918c22..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/ArrayTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * ArrayTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * ArrayTest
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ArrayTest
-{
-    
-    /** @var string[] $arrayOfString */
-    private $arrayOfString;
-    
-    /** @var int[][] $arrayArrayOfInteger */
-    private $arrayArrayOfInteger;
-    
-    /** @var \OpenAPIServer\Model\ReadOnlyFirst[][] $arrayArrayOfModel */
-    private $arrayArrayOfModel;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/BigCat.php b/samples/server/petstore/php-slim/lib/Model/BigCat.php
deleted file mode 100644
index 33cb8342e5aa..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/BigCat.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * BigCat
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * BigCat
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class BigCat
-{
-    
-    /** @var string $className */
-    private $className;
-    
-    /** @var string $color */
-    private $color;
-    
-    /** @var bool $declawed */
-    private $declawed;
-    
-    /** @var string $kind */
-    private $kind;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/BigCatAllOf.php b/samples/server/petstore/php-slim/lib/Model/BigCatAllOf.php
deleted file mode 100644
index 6af1c9c96f08..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/BigCatAllOf.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * BigCatAllOf
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * BigCatAllOf
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class BigCatAllOf
-{
-    
-    /** @var string $kind */
-    private $kind;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/Capitalization.php b/samples/server/petstore/php-slim/lib/Model/Capitalization.php
deleted file mode 100644
index a8756b460420..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/Capitalization.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Capitalization
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * Capitalization
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Capitalization
-{
-    
-    /** @var string $smallCamel */
-    private $smallCamel;
-    
-    /** @var string $capitalCamel */
-    private $capitalCamel;
-    
-    /** @var string $smallSnake */
-    private $smallSnake;
-    
-    /** @var string $capitalSnake */
-    private $capitalSnake;
-    
-    /** @var string $sCAETHFlowPoints */
-    private $sCAETHFlowPoints;
-    
-    /** @var string $aTTNAME Name of the pet*/
-    private $aTTNAME;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/Cat.php b/samples/server/petstore/php-slim/lib/Model/Cat.php
deleted file mode 100644
index 9503e8ef7eff..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/Cat.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Cat
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * Cat
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Cat
-{
-    
-    /** @var string $className */
-    private $className;
-    
-    /** @var string $color */
-    private $color;
-    
-    /** @var bool $declawed */
-    private $declawed;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/CatAllOf.php b/samples/server/petstore/php-slim/lib/Model/CatAllOf.php
deleted file mode 100644
index 78367e06bb4f..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/CatAllOf.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * CatAllOf
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * CatAllOf
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class CatAllOf
-{
-    
-    /** @var bool $declawed */
-    private $declawed;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/Category.php b/samples/server/petstore/php-slim/lib/Model/Category.php
deleted file mode 100644
index 8d4ecc77a09b..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/Category.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Category
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * Category
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Category
-{
-    
-    /** @var int $id */
-    private $id;
-    
-    /** @var string $name */
-    private $name;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/ClassModel.php b/samples/server/petstore/php-slim/lib/Model/ClassModel.php
deleted file mode 100644
index eefeb9e92368..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/ClassModel.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * ClassModel
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * ClassModel
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ClassModel
-{
-    
-    /** @var string $class */
-    private $class;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/Client.php b/samples/server/petstore/php-slim/lib/Model/Client.php
deleted file mode 100644
index 16d2ec768e8c..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/Client.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Client
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * Client
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Client
-{
-    
-    /** @var string $client */
-    private $client;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/Dog.php b/samples/server/petstore/php-slim/lib/Model/Dog.php
deleted file mode 100644
index aa2dee0df827..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/Dog.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Dog
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * Dog
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Dog
-{
-    
-    /** @var string $className */
-    private $className;
-    
-    /** @var string $color */
-    private $color;
-    
-    /** @var string $breed */
-    private $breed;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/DogAllOf.php b/samples/server/petstore/php-slim/lib/Model/DogAllOf.php
deleted file mode 100644
index 2ebf062d6fb6..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/DogAllOf.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * DogAllOf
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * DogAllOf
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class DogAllOf
-{
-    
-    /** @var string $breed */
-    private $breed;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/EnumArrays.php b/samples/server/petstore/php-slim/lib/Model/EnumArrays.php
deleted file mode 100644
index b5caa448c41e..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/EnumArrays.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * EnumArrays
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * EnumArrays
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class EnumArrays
-{
-    
-    /** @var string $justSymbol */
-    private $justSymbol;
-    
-    /** @var string[] $arrayEnum */
-    private $arrayEnum;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/EnumClass.php b/samples/server/petstore/php-slim/lib/Model/EnumClass.php
deleted file mode 100644
index 0d141c63601c..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/EnumClass.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * EnumClass
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * EnumClass
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class EnumClass
-{
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/EnumTest.php b/samples/server/petstore/php-slim/lib/Model/EnumTest.php
deleted file mode 100644
index e78401378014..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/EnumTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * EnumTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * EnumTest
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class EnumTest
-{
-    
-    /** @var string $enumString */
-    private $enumString;
-    
-    /** @var string $enumStringRequired */
-    private $enumStringRequired;
-    
-    /** @var int $enumInteger */
-    private $enumInteger;
-    
-    /** @var double $enumNumber */
-    private $enumNumber;
-    
-    /** @var \OpenAPIServer\Model\OuterEnum $outerEnum */
-    private $outerEnum;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/File.php b/samples/server/petstore/php-slim/lib/Model/File.php
deleted file mode 100644
index be991fe66274..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/File.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * File
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * File
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class File
-{
-    
-    /** @var string $sourceURI Test capitalization*/
-    private $sourceURI;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/FileSchemaTestClass.php b/samples/server/petstore/php-slim/lib/Model/FileSchemaTestClass.php
deleted file mode 100644
index 4cb7eae74ce1..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/FileSchemaTestClass.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * FileSchemaTestClass
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * FileSchemaTestClass
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class FileSchemaTestClass
-{
-    
-    /** @var \OpenAPIServer\Model\File $file */
-    private $file;
-    
-    /** @var \OpenAPIServer\Model\File[] $files */
-    private $files;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/FormatTest.php b/samples/server/petstore/php-slim/lib/Model/FormatTest.php
deleted file mode 100644
index 8e53232118c5..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/FormatTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * FormatTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * FormatTest
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class FormatTest
-{
-    
-    /** @var int $integer */
-    private $integer;
-    
-    /** @var int $int32 */
-    private $int32;
-    
-    /** @var int $int64 */
-    private $int64;
-    
-    /** @var float $number */
-    private $number;
-    
-    /** @var float $float */
-    private $float;
-    
-    /** @var double $double */
-    private $double;
-    
-    /** @var string $string */
-    private $string;
-    
-    /** @var string $byte */
-    private $byte;
-    
-    /** @var \SplFileObject $binary */
-    private $binary;
-    
-    /** @var \DateTime $date */
-    private $date;
-    
-    /** @var \DateTime $dateTime */
-    private $dateTime;
-    
-    /** @var string $uuid */
-    private $uuid;
-    
-    /** @var string $password */
-    private $password;
-    
-    /** @var BigDecimal $bigDecimal */
-    private $bigDecimal;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/HasOnlyReadOnly.php b/samples/server/petstore/php-slim/lib/Model/HasOnlyReadOnly.php
deleted file mode 100644
index b6e6b4341b97..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/HasOnlyReadOnly.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * HasOnlyReadOnly
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * HasOnlyReadOnly
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class HasOnlyReadOnly
-{
-    
-    /** @var string $bar */
-    private $bar;
-    
-    /** @var string $foo */
-    private $foo;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/MapTest.php b/samples/server/petstore/php-slim/lib/Model/MapTest.php
deleted file mode 100644
index b7bbb0d434de..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/MapTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * MapTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * MapTest
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class MapTest
-{
-    
-    /** @var map[string,map[string,string]] $mapMapOfString */
-    private $mapMapOfString;
-    
-    /** @var map[string,string] $mapOfEnumString */
-    private $mapOfEnumString;
-    
-    /** @var map[string,bool] $directMap */
-    private $directMap;
-    
-    /** @var map[string,bool] $indirectMap */
-    private $indirectMap;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/server/petstore/php-slim/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
deleted file mode 100644
index 9b0c1da3ef93..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * MixedPropertiesAndAdditionalPropertiesClass
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * MixedPropertiesAndAdditionalPropertiesClass
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class MixedPropertiesAndAdditionalPropertiesClass
-{
-    
-    /** @var string $uuid */
-    private $uuid;
-    
-    /** @var \DateTime $dateTime */
-    private $dateTime;
-    
-    /** @var map[string,\OpenAPIServer\Model\Animal] $map */
-    private $map;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/Model200Response.php b/samples/server/petstore/php-slim/lib/Model/Model200Response.php
deleted file mode 100644
index f989f417820c..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/Model200Response.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Model200Response
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * Model200Response
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Model200Response
-{
-    
-    /** @var int $name */
-    private $name;
-    
-    /** @var string $class */
-    private $class;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/ModelList.php b/samples/server/petstore/php-slim/lib/Model/ModelList.php
deleted file mode 100644
index 3cad39febf4b..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/ModelList.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * ModelList
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * ModelList
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ModelList
-{
-    
-    /** @var string $_123list */
-    private $_123list;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/ModelReturn.php b/samples/server/petstore/php-slim/lib/Model/ModelReturn.php
deleted file mode 100644
index d4f68a4bf3b6..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/ModelReturn.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * ModelReturn
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * ModelReturn
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ModelReturn
-{
-    
-    /** @var int $return */
-    private $return;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/Name.php b/samples/server/petstore/php-slim/lib/Model/Name.php
deleted file mode 100644
index 002be09e52f4..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/Name.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Name
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * Name
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Name
-{
-    
-    /** @var int $name */
-    private $name;
-    
-    /** @var int $snakeCase */
-    private $snakeCase;
-    
-    /** @var string $property */
-    private $property;
-    
-    /** @var int $_123number */
-    private $_123number;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/NumberOnly.php b/samples/server/petstore/php-slim/lib/Model/NumberOnly.php
deleted file mode 100644
index 53b89c581d0e..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/NumberOnly.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * NumberOnly
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * NumberOnly
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class NumberOnly
-{
-    
-    /** @var float $justNumber */
-    private $justNumber;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/Order.php b/samples/server/petstore/php-slim/lib/Model/Order.php
deleted file mode 100644
index c81879767618..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/Order.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Order
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * Order
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Order
-{
-    
-    /** @var int $id */
-    private $id;
-    
-    /** @var int $petId */
-    private $petId;
-    
-    /** @var int $quantity */
-    private $quantity;
-    
-    /** @var \DateTime $shipDate */
-    private $shipDate;
-    
-    /** @var string $status Order Status*/
-    private $status;
-    
-    /** @var bool $complete */
-    private $complete;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/OuterComposite.php b/samples/server/petstore/php-slim/lib/Model/OuterComposite.php
deleted file mode 100644
index e04661e23885..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/OuterComposite.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * OuterComposite
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * OuterComposite
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class OuterComposite
-{
-    
-    /** @var float $myNumber */
-    private $myNumber;
-    
-    /** @var string $myString */
-    private $myString;
-    
-    /** @var bool $myBoolean */
-    private $myBoolean;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/OuterEnum.php b/samples/server/petstore/php-slim/lib/Model/OuterEnum.php
deleted file mode 100644
index 98f72ddff42e..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/OuterEnum.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * OuterEnum
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * OuterEnum
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class OuterEnum
-{
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/Pet.php b/samples/server/petstore/php-slim/lib/Model/Pet.php
deleted file mode 100644
index 81e9f9a01400..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/Pet.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Pet
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * Pet
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Pet
-{
-    
-    /** @var int $id */
-    private $id;
-    
-    /** @var \OpenAPIServer\Model\Category $category */
-    private $category;
-    
-    /** @var string $name */
-    private $name;
-    
-    /** @var string[] $photoUrls */
-    private $photoUrls;
-    
-    /** @var \OpenAPIServer\Model\Tag[] $tags */
-    private $tags;
-    
-    /** @var string $status pet status in the store*/
-    private $status;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/ReadOnlyFirst.php b/samples/server/petstore/php-slim/lib/Model/ReadOnlyFirst.php
deleted file mode 100644
index 620d4f12d2ae..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/ReadOnlyFirst.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * ReadOnlyFirst
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * ReadOnlyFirst
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ReadOnlyFirst
-{
-    
-    /** @var string $bar */
-    private $bar;
-    
-    /** @var string $baz */
-    private $baz;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/SpecialModelName.php b/samples/server/petstore/php-slim/lib/Model/SpecialModelName.php
deleted file mode 100644
index 27d57fa8cf2a..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/SpecialModelName.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * SpecialModelName
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * SpecialModelName
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class SpecialModelName
-{
-    
-    /** @var int $specialPropertyName */
-    private $specialPropertyName;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/Tag.php b/samples/server/petstore/php-slim/lib/Model/Tag.php
deleted file mode 100644
index c1e08fa4cbbb..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/Tag.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Tag
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * Tag
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Tag
-{
-    
-    /** @var int $id */
-    private $id;
-    
-    /** @var string $name */
-    private $name;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/TypeHolderDefault.php b/samples/server/petstore/php-slim/lib/Model/TypeHolderDefault.php
deleted file mode 100644
index f578733b9da4..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/TypeHolderDefault.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * TypeHolderDefault
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * TypeHolderDefault
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class TypeHolderDefault
-{
-    
-    /** @var string $stringItem */
-    private $stringItem;
-    
-    /** @var float $numberItem */
-    private $numberItem;
-    
-    /** @var int $integerItem */
-    private $integerItem;
-    
-    /** @var bool $boolItem */
-    private $boolItem;
-    
-    /** @var int[] $arrayItem */
-    private $arrayItem;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/TypeHolderExample.php b/samples/server/petstore/php-slim/lib/Model/TypeHolderExample.php
deleted file mode 100644
index cee3f04691da..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/TypeHolderExample.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * TypeHolderExample
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * TypeHolderExample
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class TypeHolderExample
-{
-    
-    /** @var string $stringItem */
-    private $stringItem;
-    
-    /** @var float $numberItem */
-    private $numberItem;
-    
-    /** @var float $floatItem */
-    private $floatItem;
-    
-    /** @var int $integerItem */
-    private $integerItem;
-    
-    /** @var bool $boolItem */
-    private $boolItem;
-    
-    /** @var int[] $arrayItem */
-    private $arrayItem;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/User.php b/samples/server/petstore/php-slim/lib/Model/User.php
deleted file mode 100644
index fea8d471632d..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/User.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * User
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * User
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class User
-{
-    
-    /** @var int $id */
-    private $id;
-    
-    /** @var string $username */
-    private $username;
-    
-    /** @var string $firstName */
-    private $firstName;
-    
-    /** @var string $lastName */
-    private $lastName;
-    
-    /** @var string $email */
-    private $email;
-    
-    /** @var string $password */
-    private $password;
-    
-    /** @var string $phone */
-    private $phone;
-    
-    /** @var int $userStatus User Status*/
-    private $userStatus;
-}
diff --git a/samples/server/petstore/php-slim/lib/Model/XmlItem.php b/samples/server/petstore/php-slim/lib/Model/XmlItem.php
deleted file mode 100644
index 96e3c018e731..000000000000
--- a/samples/server/petstore/php-slim/lib/Model/XmlItem.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * XmlItem
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-/**
- * XmlItem
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class XmlItem
-{
-    
-    /** @var string $attributeString */
-    private $attributeString;
-    
-    /** @var float $attributeNumber */
-    private $attributeNumber;
-    
-    /** @var int $attributeInteger */
-    private $attributeInteger;
-    
-    /** @var bool $attributeBoolean */
-    private $attributeBoolean;
-    
-    /** @var int[] $wrappedArray */
-    private $wrappedArray;
-    
-    /** @var string $nameString */
-    private $nameString;
-    
-    /** @var float $nameNumber */
-    private $nameNumber;
-    
-    /** @var int $nameInteger */
-    private $nameInteger;
-    
-    /** @var bool $nameBoolean */
-    private $nameBoolean;
-    
-    /** @var int[] $nameArray */
-    private $nameArray;
-    
-    /** @var int[] $nameWrappedArray */
-    private $nameWrappedArray;
-    
-    /** @var string $prefixString */
-    private $prefixString;
-    
-    /** @var float $prefixNumber */
-    private $prefixNumber;
-    
-    /** @var int $prefixInteger */
-    private $prefixInteger;
-    
-    /** @var bool $prefixBoolean */
-    private $prefixBoolean;
-    
-    /** @var int[] $prefixArray */
-    private $prefixArray;
-    
-    /** @var int[] $prefixWrappedArray */
-    private $prefixWrappedArray;
-    
-    /** @var string $namespaceString */
-    private $namespaceString;
-    
-    /** @var float $namespaceNumber */
-    private $namespaceNumber;
-    
-    /** @var int $namespaceInteger */
-    private $namespaceInteger;
-    
-    /** @var bool $namespaceBoolean */
-    private $namespaceBoolean;
-    
-    /** @var int[] $namespaceArray */
-    private $namespaceArray;
-    
-    /** @var int[] $namespaceWrappedArray */
-    private $namespaceWrappedArray;
-    
-    /** @var string $prefixNsString */
-    private $prefixNsString;
-    
-    /** @var float $prefixNsNumber */
-    private $prefixNsNumber;
-    
-    /** @var int $prefixNsInteger */
-    private $prefixNsInteger;
-    
-    /** @var bool $prefixNsBoolean */
-    private $prefixNsBoolean;
-    
-    /** @var int[] $prefixNsArray */
-    private $prefixNsArray;
-    
-    /** @var int[] $prefixNsWrappedArray */
-    private $prefixNsWrappedArray;
-}
diff --git a/samples/server/petstore/php-slim/lib/SlimRouter.php b/samples/server/petstore/php-slim/lib/SlimRouter.php
deleted file mode 100644
index 7d084c80b57a..000000000000
--- a/samples/server/petstore/php-slim/lib/SlimRouter.php
+++ /dev/null
@@ -1,748 +0,0 @@
-<?php
-/**
- * SlimRouter
- *
- * PHP version 7
- *
- * @package OpenAPIServer
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer;
-
-use Slim\App;
-use Slim\Interfaces\RouteInterface;
-use Psr\Container\ContainerInterface;
-use InvalidArgumentException;
-use Dyorg\TokenAuthentication;
-use Dyorg\TokenAuthentication\TokenSearch;
-use Psr\Http\Message\ServerRequestInterface;
-use Exception;
-
-/**
- * SlimRouter Class Doc Comment
- *
- * @package OpenAPIServer
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class SlimRouter
-{
-
-    /** @var App instance */
-    private $slimApp;
-
-    /** @var array[] list of all api operations */
-    private $operations = [
-        [
-            'httpMethod' => 'PATCH',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/another-fake/dummy',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractAnotherFakeApi',
-            'userClassname' => 'AnotherFakeApi',
-            'operationId' => 'call123TestSpecialTags',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/create_xml_item',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'createXmlItem',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/outer/boolean',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'fakeOuterBooleanSerialize',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/outer/composite',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'fakeOuterCompositeSerialize',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/outer/number',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'fakeOuterNumberSerialize',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/outer/string',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'fakeOuterStringSerialize',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'PUT',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/body-with-file-schema',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testBodyWithFileSchema',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'PUT',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/body-with-query-params',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testBodyWithQueryParams',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'PATCH',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testClientModel',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testEndpointParameters',
-            'authMethods' => [
-                // http security schema named 'http_basic_test'
-                [
-                    'type' => 'http',
-                    'isBasic' => true,
-                    'isBearer' => false,
-                    'isApiKey' => false,
-                    'isOAuth' => false,
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'GET',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testEnumParameters',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'DELETE',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testGroupParameters',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/inline-additionalProperties',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testInlineAdditionalProperties',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'GET',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/jsonFormData',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testJsonFormData',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'PUT',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/test-query-paramters',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testQueryParameterCollectionFormat',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'PATCH',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake_classname_test',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeClassnameTags123Api',
-            'userClassname' => 'FakeClassnameTags123Api',
-            'operationId' => 'testClassname',
-            'authMethods' => [
-                // apiKey security schema named 'api_key_query'
-                [
-                    'type' => 'apiKey',
-                    'isBasic' => false,
-                    'isBearer' => false,
-                    'isApiKey' => true,
-                    'isOAuth' => false,
-                    'keyParamName' => 'api_key_query',
-                    'isKeyInHeader' => false,
-                    'isKeyInQuery' => true,
-                    'isKeyInCookie' => false,
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/pet',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractPetApi',
-            'userClassname' => 'PetApi',
-            'operationId' => 'addPet',
-            'authMethods' => [
-                // oauth2 security schema named 'petstore_auth'
-                [
-                    'type' => 'oauth2',
-                    'isBasic' => false,
-                    'isBearer' => false,
-                    'isApiKey' => false,
-                    'isOAuth' => true,
-                    'scopes' => [
-                        'write:pets', // modify pets in your account
-                        'read:pets', // read your pets
-                    ],
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'GET',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/pet/findByStatus',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractPetApi',
-            'userClassname' => 'PetApi',
-            'operationId' => 'findPetsByStatus',
-            'authMethods' => [
-                // oauth2 security schema named 'petstore_auth'
-                [
-                    'type' => 'oauth2',
-                    'isBasic' => false,
-                    'isBearer' => false,
-                    'isApiKey' => false,
-                    'isOAuth' => true,
-                    'scopes' => [
-                        'write:pets', // modify pets in your account
-                        'read:pets', // read your pets
-                    ],
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'GET',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/pet/findByTags',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractPetApi',
-            'userClassname' => 'PetApi',
-            'operationId' => 'findPetsByTags',
-            'authMethods' => [
-                // oauth2 security schema named 'petstore_auth'
-                [
-                    'type' => 'oauth2',
-                    'isBasic' => false,
-                    'isBearer' => false,
-                    'isApiKey' => false,
-                    'isOAuth' => true,
-                    'scopes' => [
-                        'write:pets', // modify pets in your account
-                        'read:pets', // read your pets
-                    ],
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'PUT',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/pet',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractPetApi',
-            'userClassname' => 'PetApi',
-            'operationId' => 'updatePet',
-            'authMethods' => [
-                // oauth2 security schema named 'petstore_auth'
-                [
-                    'type' => 'oauth2',
-                    'isBasic' => false,
-                    'isBearer' => false,
-                    'isApiKey' => false,
-                    'isOAuth' => true,
-                    'scopes' => [
-                        'write:pets', // modify pets in your account
-                        'read:pets', // read your pets
-                    ],
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'DELETE',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/pet/{petId}',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractPetApi',
-            'userClassname' => 'PetApi',
-            'operationId' => 'deletePet',
-            'authMethods' => [
-                // oauth2 security schema named 'petstore_auth'
-                [
-                    'type' => 'oauth2',
-                    'isBasic' => false,
-                    'isBearer' => false,
-                    'isApiKey' => false,
-                    'isOAuth' => true,
-                    'scopes' => [
-                        'write:pets', // modify pets in your account
-                        'read:pets', // read your pets
-                    ],
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'GET',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/pet/{petId}',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractPetApi',
-            'userClassname' => 'PetApi',
-            'operationId' => 'getPetById',
-            'authMethods' => [
-                // apiKey security schema named 'api_key'
-                [
-                    'type' => 'apiKey',
-                    'isBasic' => false,
-                    'isBearer' => false,
-                    'isApiKey' => true,
-                    'isOAuth' => false,
-                    'keyParamName' => 'api_key',
-                    'isKeyInHeader' => true,
-                    'isKeyInQuery' => false,
-                    'isKeyInCookie' => false,
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/pet/{petId}',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractPetApi',
-            'userClassname' => 'PetApi',
-            'operationId' => 'updatePetWithForm',
-            'authMethods' => [
-                // oauth2 security schema named 'petstore_auth'
-                [
-                    'type' => 'oauth2',
-                    'isBasic' => false,
-                    'isBearer' => false,
-                    'isApiKey' => false,
-                    'isOAuth' => true,
-                    'scopes' => [
-                        'write:pets', // modify pets in your account
-                        'read:pets', // read your pets
-                    ],
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/pet/{petId}/uploadImage',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractPetApi',
-            'userClassname' => 'PetApi',
-            'operationId' => 'uploadFile',
-            'authMethods' => [
-                // oauth2 security schema named 'petstore_auth'
-                [
-                    'type' => 'oauth2',
-                    'isBasic' => false,
-                    'isBearer' => false,
-                    'isApiKey' => false,
-                    'isOAuth' => true,
-                    'scopes' => [
-                        'write:pets', // modify pets in your account
-                        'read:pets', // read your pets
-                    ],
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/{petId}/uploadImageWithRequiredFile',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractPetApi',
-            'userClassname' => 'PetApi',
-            'operationId' => 'uploadFileWithRequiredFile',
-            'authMethods' => [
-                // oauth2 security schema named 'petstore_auth'
-                [
-                    'type' => 'oauth2',
-                    'isBasic' => false,
-                    'isBearer' => false,
-                    'isApiKey' => false,
-                    'isOAuth' => true,
-                    'scopes' => [
-                        'write:pets', // modify pets in your account
-                        'read:pets', // read your pets
-                    ],
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'GET',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/store/inventory',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractStoreApi',
-            'userClassname' => 'StoreApi',
-            'operationId' => 'getInventory',
-            'authMethods' => [
-                // apiKey security schema named 'api_key'
-                [
-                    'type' => 'apiKey',
-                    'isBasic' => false,
-                    'isBearer' => false,
-                    'isApiKey' => true,
-                    'isOAuth' => false,
-                    'keyParamName' => 'api_key',
-                    'isKeyInHeader' => true,
-                    'isKeyInQuery' => false,
-                    'isKeyInCookie' => false,
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/store/order',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractStoreApi',
-            'userClassname' => 'StoreApi',
-            'operationId' => 'placeOrder',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'DELETE',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/store/order/{order_id}',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractStoreApi',
-            'userClassname' => 'StoreApi',
-            'operationId' => 'deleteOrder',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'GET',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/store/order/{order_id}',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractStoreApi',
-            'userClassname' => 'StoreApi',
-            'operationId' => 'getOrderById',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/user',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractUserApi',
-            'userClassname' => 'UserApi',
-            'operationId' => 'createUser',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/user/createWithArray',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractUserApi',
-            'userClassname' => 'UserApi',
-            'operationId' => 'createUsersWithArrayInput',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/user/createWithList',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractUserApi',
-            'userClassname' => 'UserApi',
-            'operationId' => 'createUsersWithListInput',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'GET',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/user/login',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractUserApi',
-            'userClassname' => 'UserApi',
-            'operationId' => 'loginUser',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'GET',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/user/logout',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractUserApi',
-            'userClassname' => 'UserApi',
-            'operationId' => 'logoutUser',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'DELETE',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/user/{username}',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractUserApi',
-            'userClassname' => 'UserApi',
-            'operationId' => 'deleteUser',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'GET',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/user/{username}',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractUserApi',
-            'userClassname' => 'UserApi',
-            'operationId' => 'getUserByName',
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'PUT',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/user/{username}',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractUserApi',
-            'userClassname' => 'UserApi',
-            'operationId' => 'updateUser',
-            'authMethods' => [
-            ],
-        ],
-    ];
-
-    /**
-     * Class constructor
-     *
-     * @param ContainerInterface|array $settings Either a ContainerInterface or an associative array of app settings
-     *
-     * @throws InvalidArgumentException When no container is provided that implements ContainerInterface
-     * @throws Exception When implementation class doesn't exists
-     */
-    public function __construct($settings = [])
-    {
-        $this->slimApp = new App($settings);
-
-        // middlewares requires Psr\Container\ContainerInterface
-        $container = $this->slimApp->getContainer();
-
-        $authPackage = 'OpenAPIServer\Auth';
-        $basicAuthenticator = function (ServerRequestInterface &$request, TokenSearch $tokenSearch) use ($authPackage) {
-            $message = "How about extending AbstractAuthenticator class by {$authPackage}\BasicAuthenticator?";
-            throw new Exception($message);
-        };
-        $apiKeyAuthenticator = function (ServerRequestInterface &$request, TokenSearch $tokenSearch) use ($authPackage) {
-            $message = "How about extending AbstractAuthenticator class by {$authPackage}\ApiKeyAuthenticator?";
-            throw new Exception($message);
-        };
-        $oAuthAuthenticator = function (ServerRequestInterface &$request, TokenSearch $tokenSearch) use ($authPackage) {
-            $message = "How about extending AbstractAuthenticator class by {$authPackage}\OAuthAuthenticator?";
-            throw new Exception($message);
-        };
-
-        foreach ($this->operations as $operation) {
-            $callback = function ($request, $response, $arguments) use ($operation) {
-                $message = "How about extending {$operation['classname']} by {$operation['apiPackage']}\\{$operation['userClassname']} class implementing {$operation['operationId']} as a {$operation['httpMethod']} method?";
-                throw new Exception($message);
-                return $response->withStatus(501)->write($message);
-            };
-            $middlewares = [];
-
-            if (class_exists("\\{$operation['apiPackage']}\\{$operation['userClassname']}")) {
-                $callback = "\\{$operation['apiPackage']}\\{$operation['userClassname']}:{$operation['operationId']}";
-            }
-
-            foreach ($operation['authMethods'] as $authMethod) {
-                switch ($authMethod['type']) {
-                    case 'http':
-                        $authenticatorClassname = "\\{$authPackage}\\BasicAuthenticator";
-                        if (class_exists($authenticatorClassname)) {
-                            $basicAuthenticator = new $authenticatorClassname($container);
-                        }
-
-                        $middlewares[] = new TokenAuthentication($this->getTokenAuthenticationOptions([
-                            'authenticator' => $basicAuthenticator,
-                            'regex' => $authMethod['isBearer'] ? '/Bearer\s+(.*)$/i' : '/Basic\s+(.*)$/i',
-                            'header' => 'Authorization',
-                            'parameter' => null,
-                            'cookie' => null,
-                            'argument' => null,
-                        ]));
-                        break;
-                    case 'apiKey':
-                        $authenticatorClassname = "\\{$authPackage}\\ApiKeyAuthenticator";
-                        if (class_exists($authenticatorClassname)) {
-                            $apiKeyAuthenticator = new $authenticatorClassname($container);
-                        }
-
-                        $middlewares[] = new TokenAuthentication($this->getTokenAuthenticationOptions([
-                            'authenticator' => $apiKeyAuthenticator,
-                            'regex' => '/^(.*)$/i',
-                            'header' => $authMethod['isKeyInHeader'] ? $authMethod['keyParamName'] : null,
-                            'parameter' => $authMethod['isKeyInQuery'] ? $authMethod['keyParamName'] : null,
-                            'cookie' => $authMethod['isKeyInCookie'] ? $authMethod['keyParamName'] : null,
-                            'argument' => null,
-                        ]));
-                        break;
-                    case 'oauth2':
-                        $authenticatorClassname = "\\{$authPackage}\\OAuthAuthenticator";
-                        if (class_exists($authenticatorClassname)) {
-                            $oAuthAuthenticator = new $authenticatorClassname($container, $authMethod['scopes']);
-                        }
-
-                        $middlewares[] = new TokenAuthentication($this->getTokenAuthenticationOptions([
-                            'authenticator' => $oAuthAuthenticator,
-                            'regex' => '/Bearer\s+(.*)$/i',
-                            'header' => 'Authorization',
-                            'parameter' => null,
-                            'cookie' => null,
-                            'argument' => null,
-                        ]));
-                        break;
-                    default:
-                        throw new Exception('Unknown authorization schema type');
-                }
-            }
-
-            $this->addRoute(
-                [$operation['httpMethod']],
-                "{$operation['basePathWithoutHost']}{$operation['path']}",
-                $callback,
-                $middlewares
-            )->setName($operation['operationId']);
-        }
-    }
-
-    /**
-     * Merges user defined options with dynamic params
-     *
-     * @param array $options Params which need to merge into user options
-     *
-     * @return array Merged array
-     */
-    private function getTokenAuthenticationOptions(array $options)
-    {
-        if (is_array($this->slimApp->getContainer()['tokenAuthenticationOptions']) === false) {
-            return $options;
-        }
-
-        return array_merge($this->slimApp->getContainer()['tokenAuthenticationOptions'], $options);
-    }
-
-    /**
-     * Add route with multiple methods
-     *
-     * @param string[]        $methods     Numeric array of HTTP method names
-     * @param string          $pattern     The route URI pattern
-     * @param callable|string $callable    The route callback routine
-     * @param array|null      $middlewares List of middlewares
-     *
-     * @return RouteInterface
-     *
-     * @throws InvalidArgumentException If the route pattern isn't a string
-     */
-    public function addRoute(array $methods, string $pattern, $callable, $middlewares = [])
-    {
-        $route = $this->slimApp->map($methods, $pattern, $callable);
-        foreach ($middlewares as $middleware) {
-            $route->add($middleware);
-        }
-        return $route;
-    }
-
-    /**
-     * Returns Slim Framework instance
-     *
-     * @return App
-     */
-    public function getSlimApp()
-    {
-        return $this->slimApp;
-    }
-}
diff --git a/samples/server/petstore/php-slim/php_syntax_checker.bash b/samples/server/petstore/php-slim/php_syntax_checker.bash
deleted file mode 100755
index 09c32c89511a..000000000000
--- a/samples/server/petstore/php-slim/php_syntax_checker.bash
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-# a simple script to perform a syntax check on php files using "php -l"
-
-for i in $( find . -name "*.php" ); do
-    result=`php -l $i | grep "No syntax errors detected"`
-    exit_status=$?
-    if [ $exit_status -eq 1 ]; then
-        echo "Syntax errors with $i"
-        exit 1;
-    fi
-done
diff --git a/samples/server/petstore/php-slim/phpcs.xml.dist b/samples/server/petstore/php-slim/phpcs.xml.dist
deleted file mode 100644
index 69f4ddac71c3..000000000000
--- a/samples/server/petstore/php-slim/phpcs.xml.dist
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="OpenAPI Petstore Config" xsi:noNamespaceSchemaLocation="phpcs.xsd">
-    <description>PHP_CodeSniffer config for OpenAPI Petstore</description>
-
-    <!-- Path to inspected files -->
-    <file>./</file>
-
-    <!-- Don't need to inspect installed packages -->
-    <exclude-pattern>./vendor</exclude-pattern>
-
-    <!-- <basepath>     A path to strip from the front of file paths inside reports -->
-    <arg name="basepath" value="."/>
-
-    <!-- colors              Use colors in output -->
-    <arg name="colors"/>
-
-    <!-- Do not print warnings -->
-    <!-- <arg name="warning-severity" value="0"/> -->
-
-    <!-- -p    Show progress of the run -->
-    <!-- -s    Show sniff codes in all reports -->
-    <arg value="ps"/>
-
-    <!-- Include the whole PSR12 standard -->
-    <rule ref="PSR12">
-        <!-- There is no way to wrap generated comments, just disable that rule for now -->
-        <exclude name="Generic.Files.LineLength.TooLong" />
-        <!-- Codegen generates variables with underscore on purpose -->
-        <exclude name="PSR2.Classes.PropertyDeclaration.Underscore" />
-    </rule>
-</ruleset>
\ No newline at end of file
diff --git a/samples/server/petstore/php-slim/phpunit.xml.dist b/samples/server/petstore/php-slim/phpunit.xml.dist
deleted file mode 100644
index 6af1442ee653..000000000000
--- a/samples/server/petstore/php-slim/phpunit.xml.dist
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
-    bootstrap="./vendor/autoload.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    beStrictAboutTestsThatDoNotTestAnything="false"
-    stopOnFailure="false"
->
-    <testsuites>
-        <testsuite name="Apis">
-            <directory>./test/Api</directory>
-        </testsuite>
-        <testsuite name="Models">
-            <directory>./test/Model</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./lib/Api</directory>
-            <directory suffix=".php">./lib/Model</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <ini name="error_reporting" value="E_ALL" />
-    </php>
-</phpunit>
diff --git a/samples/server/petstore/php-slim/pom.xml b/samples/server/petstore/php-slim/pom.xml
deleted file mode 100644
index f9493778f784..000000000000
--- a/samples/server/petstore/php-slim/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opoenapitools</groupId>
-    <artifactId>SlimPetstoreServerTests</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>Slim Petstore Server</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <id>syntax-check</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>./php_syntax_checker.bash</executable>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/samples/server/petstore/php-slim/test/Api/AnotherFakeApiTest.php b/samples/server/petstore/php-slim/test/Api/AnotherFakeApiTest.php
deleted file mode 100644
index 768b017a8670..000000000000
--- a/samples/server/petstore/php-slim/test/Api/AnotherFakeApiTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * AnotherFakeApiTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Api
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the endpoint.
- */
-namespace OpenAPIServer\Api;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Api\AnotherFakeApi;
-
-/**
- * AnotherFakeApiTest Class Doc Comment
- *
- * @category Class
- * @description AnotherFakeApi
- * @package  OpenAPIServer\Api
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Api\AnotherFakeApi
- */
-class AnotherFakeApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for call123TestSpecialTags
-     *
-     * To test special tags.
-     * @covers ::call123TestSpecialTags
-     */
-    public function testCall123TestSpecialTags()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Api/FakeApiTest.php b/samples/server/petstore/php-slim/test/Api/FakeApiTest.php
deleted file mode 100644
index 5b5146ec8536..000000000000
--- a/samples/server/petstore/php-slim/test/Api/FakeApiTest.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
- * FakeApiTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Api
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the endpoint.
- */
-namespace OpenAPIServer\Api;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Api\FakeApi;
-
-/**
- * FakeApiTest Class Doc Comment
- *
- * @category Class
- * @description FakeApi
- * @package  OpenAPIServer\Api
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Api\FakeApi
- */
-class FakeApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for fakeOuterBooleanSerialize
-     *
-     * .
-     * @covers ::fakeOuterBooleanSerialize
-     */
-    public function testFakeOuterBooleanSerialize()
-    {
-    }
-
-    /**
-     * Test case for fakeOuterCompositeSerialize
-     *
-     * .
-     * @covers ::fakeOuterCompositeSerialize
-     */
-    public function testFakeOuterCompositeSerialize()
-    {
-    }
-
-    /**
-     * Test case for fakeOuterNumberSerialize
-     *
-     * .
-     * @covers ::fakeOuterNumberSerialize
-     */
-    public function testFakeOuterNumberSerialize()
-    {
-    }
-
-    /**
-     * Test case for fakeOuterStringSerialize
-     *
-     * .
-     * @covers ::fakeOuterStringSerialize
-     */
-    public function testFakeOuterStringSerialize()
-    {
-    }
-
-    /**
-     * Test case for testBodyWithFileSchema
-     *
-     * .
-     * @covers ::testBodyWithFileSchema
-     */
-    public function testTestBodyWithFileSchema()
-    {
-    }
-
-    /**
-     * Test case for testBodyWithQueryParams
-     *
-     * .
-     * @covers ::testBodyWithQueryParams
-     */
-    public function testTestBodyWithQueryParams()
-    {
-    }
-
-    /**
-     * Test case for testClientModel
-     *
-     * To test \"client\" model.
-     * @covers ::testClientModel
-     */
-    public function testTestClientModel()
-    {
-    }
-
-    /**
-     * Test case for testEndpointParameters
-     *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트.
-     * @covers ::testEndpointParameters
-     */
-    public function testTestEndpointParameters()
-    {
-    }
-
-    /**
-     * Test case for testEnumParameters
-     *
-     * To test enum parameters.
-     * @covers ::testEnumParameters
-     */
-    public function testTestEnumParameters()
-    {
-    }
-
-    /**
-     * Test case for testGroupParameters
-     *
-     * Fake endpoint to test group parameters (optional).
-     * @covers ::testGroupParameters
-     */
-    public function testTestGroupParameters()
-    {
-    }
-
-    /**
-     * Test case for testInlineAdditionalProperties
-     *
-     * test inline additionalProperties.
-     * @covers ::testInlineAdditionalProperties
-     */
-    public function testTestInlineAdditionalProperties()
-    {
-    }
-
-    /**
-     * Test case for testJsonFormData
-     *
-     * test json serialization of form data.
-     * @covers ::testJsonFormData
-     */
-    public function testTestJsonFormData()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Api/FakeClassnameTags123ApiTest.php b/samples/server/petstore/php-slim/test/Api/FakeClassnameTags123ApiTest.php
deleted file mode 100644
index c64a2428151a..000000000000
--- a/samples/server/petstore/php-slim/test/Api/FakeClassnameTags123ApiTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * FakeClassnameTags123ApiTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Api
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the endpoint.
- */
-namespace OpenAPIServer\Api;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Api\FakeClassnameTags123Api;
-
-/**
- * FakeClassnameTags123ApiTest Class Doc Comment
- *
- * @category Class
- * @description FakeClassnameTags123Api
- * @package  OpenAPIServer\Api
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Api\FakeClassnameTags123Api
- */
-class FakeClassnameTags123ApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for testClassname
-     *
-     * To test class name in snake case.
-     * @covers ::testClassname
-     */
-    public function testTestClassname()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Api/PetApiTest.php b/samples/server/petstore/php-slim/test/Api/PetApiTest.php
deleted file mode 100644
index 764761c9d7fe..000000000000
--- a/samples/server/petstore/php-slim/test/Api/PetApiTest.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-/**
- * PetApiTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Api
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the endpoint.
- */
-namespace OpenAPIServer\Api;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Api\PetApi;
-
-/**
- * PetApiTest Class Doc Comment
- *
- * @category Class
- * @description PetApi
- * @package  OpenAPIServer\Api
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Api\PetApi
- */
-class PetApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for addPet
-     *
-     * Add a new pet to the store.
-     * @covers ::addPet
-     */
-    public function testAddPet()
-    {
-    }
-
-    /**
-     * Test case for deletePet
-     *
-     * Deletes a pet.
-     * @covers ::deletePet
-     */
-    public function testDeletePet()
-    {
-    }
-
-    /**
-     * Test case for findPetsByStatus
-     *
-     * Finds Pets by status.
-     * @covers ::findPetsByStatus
-     */
-    public function testFindPetsByStatus()
-    {
-    }
-
-    /**
-     * Test case for findPetsByTags
-     *
-     * Finds Pets by tags.
-     * @covers ::findPetsByTags
-     */
-    public function testFindPetsByTags()
-    {
-    }
-
-    /**
-     * Test case for getPetById
-     *
-     * Find pet by ID.
-     * @covers ::getPetById
-     */
-    public function testGetPetById()
-    {
-    }
-
-    /**
-     * Test case for updatePet
-     *
-     * Update an existing pet.
-     * @covers ::updatePet
-     */
-    public function testUpdatePet()
-    {
-    }
-
-    /**
-     * Test case for updatePetWithForm
-     *
-     * Updates a pet in the store with form data.
-     * @covers ::updatePetWithForm
-     */
-    public function testUpdatePetWithForm()
-    {
-    }
-
-    /**
-     * Test case for uploadFile
-     *
-     * uploads an image.
-     * @covers ::uploadFile
-     */
-    public function testUploadFile()
-    {
-    }
-
-    /**
-     * Test case for uploadFileWithRequiredFile
-     *
-     * uploads an image (required).
-     * @covers ::uploadFileWithRequiredFile
-     */
-    public function testUploadFileWithRequiredFile()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Api/StoreApiTest.php b/samples/server/petstore/php-slim/test/Api/StoreApiTest.php
deleted file mode 100644
index 306e9e7e46b7..000000000000
--- a/samples/server/petstore/php-slim/test/Api/StoreApiTest.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * StoreApiTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Api
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the endpoint.
- */
-namespace OpenAPIServer\Api;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Api\StoreApi;
-
-/**
- * StoreApiTest Class Doc Comment
- *
- * @category Class
- * @description StoreApi
- * @package  OpenAPIServer\Api
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Api\StoreApi
- */
-class StoreApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for deleteOrder
-     *
-     * Delete purchase order by ID.
-     * @covers ::deleteOrder
-     */
-    public function testDeleteOrder()
-    {
-    }
-
-    /**
-     * Test case for getInventory
-     *
-     * Returns pet inventories by status.
-     * @covers ::getInventory
-     */
-    public function testGetInventory()
-    {
-    }
-
-    /**
-     * Test case for getOrderById
-     *
-     * Find purchase order by ID.
-     * @covers ::getOrderById
-     */
-    public function testGetOrderById()
-    {
-    }
-
-    /**
-     * Test case for placeOrder
-     *
-     * Place an order for a pet.
-     * @covers ::placeOrder
-     */
-    public function testPlaceOrder()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Api/UserApiTest.php b/samples/server/petstore/php-slim/test/Api/UserApiTest.php
deleted file mode 100644
index 9dd3247ec8e9..000000000000
--- a/samples/server/petstore/php-slim/test/Api/UserApiTest.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * UserApiTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Api
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the endpoint.
- */
-namespace OpenAPIServer\Api;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Api\UserApi;
-
-/**
- * UserApiTest Class Doc Comment
- *
- * @category Class
- * @description UserApi
- * @package  OpenAPIServer\Api
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Api\UserApi
- */
-class UserApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for createUser
-     *
-     * Create user.
-     * @covers ::createUser
-     */
-    public function testCreateUser()
-    {
-    }
-
-    /**
-     * Test case for createUsersWithArrayInput
-     *
-     * Creates list of users with given input array.
-     * @covers ::createUsersWithArrayInput
-     */
-    public function testCreateUsersWithArrayInput()
-    {
-    }
-
-    /**
-     * Test case for createUsersWithListInput
-     *
-     * Creates list of users with given input array.
-     * @covers ::createUsersWithListInput
-     */
-    public function testCreateUsersWithListInput()
-    {
-    }
-
-    /**
-     * Test case for deleteUser
-     *
-     * Delete user.
-     * @covers ::deleteUser
-     */
-    public function testDeleteUser()
-    {
-    }
-
-    /**
-     * Test case for getUserByName
-     *
-     * Get user by user name.
-     * @covers ::getUserByName
-     */
-    public function testGetUserByName()
-    {
-    }
-
-    /**
-     * Test case for loginUser
-     *
-     * Logs user into the system.
-     * @covers ::loginUser
-     */
-    public function testLoginUser()
-    {
-    }
-
-    /**
-     * Test case for logoutUser
-     *
-     * Logs out current logged in user session.
-     * @covers ::logoutUser
-     */
-    public function testLogoutUser()
-    {
-    }
-
-    /**
-     * Test case for updateUser
-     *
-     * Updated user.
-     * @covers ::updateUser
-     */
-    public function testUpdateUser()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesAnyTypeTest.php b/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesAnyTypeTest.php
deleted file mode 100644
index 5138e2d19d7f..000000000000
--- a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesAnyTypeTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesAnyTypeTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesAnyType;
-
-/**
- * AdditionalPropertiesAnyTypeTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesAnyType
- */
-class AdditionalPropertiesAnyTypeTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesAnyType"
-     */
-    public function testAdditionalPropertiesAnyType()
-    {
-        $testAdditionalPropertiesAnyType = new AdditionalPropertiesAnyType();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesArrayTest.php b/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesArrayTest.php
deleted file mode 100644
index 4e6e001b96a9..000000000000
--- a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesArrayTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesArrayTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesArray;
-
-/**
- * AdditionalPropertiesArrayTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesArray
- */
-class AdditionalPropertiesArrayTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesArray"
-     */
-    public function testAdditionalPropertiesArray()
-    {
-        $testAdditionalPropertiesArray = new AdditionalPropertiesArray();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesBooleanTest.php b/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesBooleanTest.php
deleted file mode 100644
index bb73d909e6e4..000000000000
--- a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesBooleanTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesBooleanTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesBoolean;
-
-/**
- * AdditionalPropertiesBooleanTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesBoolean
- */
-class AdditionalPropertiesBooleanTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesBoolean"
-     */
-    public function testAdditionalPropertiesBoolean()
-    {
-        $testAdditionalPropertiesBoolean = new AdditionalPropertiesBoolean();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesClassTest.php b/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesClassTest.php
deleted file mode 100644
index 1bfd011e58a5..000000000000
--- a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesClassTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesClassTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesClass;
-
-/**
- * AdditionalPropertiesClassTest Class Doc Comment
- *
- * @category Class
- * @description AdditionalPropertiesClass
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesClass
- */
-class AdditionalPropertiesClassTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesClass"
-     */
-    public function testAdditionalPropertiesClass()
-    {
-        $testAdditionalPropertiesClass = new AdditionalPropertiesClass();
-    }
-
-    /**
-     * Test attribute "mapProperty"
-     */
-    public function testPropertyMapProperty()
-    {
-    }
-
-    /**
-     * Test attribute "mapOfMapProperty"
-     */
-    public function testPropertyMapOfMapProperty()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesIntegerTest.php b/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesIntegerTest.php
deleted file mode 100644
index c754abf34d0e..000000000000
--- a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesIntegerTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesIntegerTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesInteger;
-
-/**
- * AdditionalPropertiesIntegerTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesInteger
- */
-class AdditionalPropertiesIntegerTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesInteger"
-     */
-    public function testAdditionalPropertiesInteger()
-    {
-        $testAdditionalPropertiesInteger = new AdditionalPropertiesInteger();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesNumberTest.php b/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesNumberTest.php
deleted file mode 100644
index 0bba05a6d154..000000000000
--- a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesNumberTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesNumberTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesNumber;
-
-/**
- * AdditionalPropertiesNumberTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesNumber
- */
-class AdditionalPropertiesNumberTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesNumber"
-     */
-    public function testAdditionalPropertiesNumber()
-    {
-        $testAdditionalPropertiesNumber = new AdditionalPropertiesNumber();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesObjectTest.php b/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesObjectTest.php
deleted file mode 100644
index 1a628a89f233..000000000000
--- a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesObjectTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesObjectTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesObject;
-
-/**
- * AdditionalPropertiesObjectTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesObject
- */
-class AdditionalPropertiesObjectTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesObject"
-     */
-    public function testAdditionalPropertiesObject()
-    {
-        $testAdditionalPropertiesObject = new AdditionalPropertiesObject();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesStringTest.php b/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesStringTest.php
deleted file mode 100644
index 6344e9044b5b..000000000000
--- a/samples/server/petstore/php-slim/test/Model/AdditionalPropertiesStringTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * AdditionalPropertiesStringTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesString;
-
-/**
- * AdditionalPropertiesStringTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesString
- */
-class AdditionalPropertiesStringTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesString"
-     */
-    public function testAdditionalPropertiesString()
-    {
-        $testAdditionalPropertiesString = new AdditionalPropertiesString();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/AnimalTest.php b/samples/server/petstore/php-slim/test/Model/AnimalTest.php
deleted file mode 100644
index aef196754b3e..000000000000
--- a/samples/server/petstore/php-slim/test/Model/AnimalTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * AnimalTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Animal;
-
-/**
- * AnimalTest Class Doc Comment
- *
- * @category Class
- * @description Animal
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\Animal
- */
-class AnimalTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Animal"
-     */
-    public function testAnimal()
-    {
-        $testAnimal = new Animal();
-    }
-
-    /**
-     * Test attribute "className"
-     */
-    public function testPropertyClassName()
-    {
-    }
-
-    /**
-     * Test attribute "color"
-     */
-    public function testPropertyColor()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/ApiResponseTest.php b/samples/server/petstore/php-slim/test/Model/ApiResponseTest.php
deleted file mode 100644
index 50520e7a894c..000000000000
--- a/samples/server/petstore/php-slim/test/Model/ApiResponseTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * ApiResponseTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ApiResponse;
-
-/**
- * ApiResponseTest Class Doc Comment
- *
- * @category Class
- * @description ApiResponse
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\ApiResponse
- */
-class ApiResponseTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ApiResponse"
-     */
-    public function testApiResponse()
-    {
-        $testApiResponse = new ApiResponse();
-    }
-
-    /**
-     * Test attribute "code"
-     */
-    public function testPropertyCode()
-    {
-    }
-
-    /**
-     * Test attribute "type"
-     */
-    public function testPropertyType()
-    {
-    }
-
-    /**
-     * Test attribute "message"
-     */
-    public function testPropertyMessage()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/server/petstore/php-slim/test/Model/ArrayOfArrayOfNumberOnlyTest.php
deleted file mode 100644
index 5f1d132bd2ae..000000000000
--- a/samples/server/petstore/php-slim/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * ArrayOfArrayOfNumberOnlyTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ArrayOfArrayOfNumberOnly;
-
-/**
- * ArrayOfArrayOfNumberOnlyTest Class Doc Comment
- *
- * @category Class
- * @description ArrayOfArrayOfNumberOnly
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\ArrayOfArrayOfNumberOnly
- */
-class ArrayOfArrayOfNumberOnlyTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ArrayOfArrayOfNumberOnly"
-     */
-    public function testArrayOfArrayOfNumberOnly()
-    {
-        $testArrayOfArrayOfNumberOnly = new ArrayOfArrayOfNumberOnly();
-    }
-
-    /**
-     * Test attribute "arrayArrayNumber"
-     */
-    public function testPropertyArrayArrayNumber()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/ArrayOfNumberOnlyTest.php b/samples/server/petstore/php-slim/test/Model/ArrayOfNumberOnlyTest.php
deleted file mode 100644
index 2326fe8647f4..000000000000
--- a/samples/server/petstore/php-slim/test/Model/ArrayOfNumberOnlyTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * ArrayOfNumberOnlyTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ArrayOfNumberOnly;
-
-/**
- * ArrayOfNumberOnlyTest Class Doc Comment
- *
- * @category Class
- * @description ArrayOfNumberOnly
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\ArrayOfNumberOnly
- */
-class ArrayOfNumberOnlyTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ArrayOfNumberOnly"
-     */
-    public function testArrayOfNumberOnly()
-    {
-        $testArrayOfNumberOnly = new ArrayOfNumberOnly();
-    }
-
-    /**
-     * Test attribute "arrayNumber"
-     */
-    public function testPropertyArrayNumber()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/ArrayTestTest.php b/samples/server/petstore/php-slim/test/Model/ArrayTestTest.php
deleted file mode 100644
index b3d91609e89d..000000000000
--- a/samples/server/petstore/php-slim/test/Model/ArrayTestTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * ArrayTestTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ArrayTest;
-
-/**
- * ArrayTestTest Class Doc Comment
- *
- * @category Class
- * @description ArrayTest
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\ArrayTest
- */
-class ArrayTestTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ArrayTest"
-     */
-    public function testArrayTest()
-    {
-        $testArrayTest = new ArrayTest();
-    }
-
-    /**
-     * Test attribute "arrayOfString"
-     */
-    public function testPropertyArrayOfString()
-    {
-    }
-
-    /**
-     * Test attribute "arrayArrayOfInteger"
-     */
-    public function testPropertyArrayArrayOfInteger()
-    {
-    }
-
-    /**
-     * Test attribute "arrayArrayOfModel"
-     */
-    public function testPropertyArrayArrayOfModel()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/BigCatAllOfTest.php b/samples/server/petstore/php-slim/test/Model/BigCatAllOfTest.php
deleted file mode 100644
index 5107cf92292d..000000000000
--- a/samples/server/petstore/php-slim/test/Model/BigCatAllOfTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * BigCatAllOfTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\BigCatAllOf;
-
-/**
- * BigCatAllOfTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\BigCatAllOf
- */
-class BigCatAllOfTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "BigCatAllOf"
-     */
-    public function testBigCatAllOf()
-    {
-        $testBigCatAllOf = new BigCatAllOf();
-    }
-
-    /**
-     * Test attribute "kind"
-     */
-    public function testPropertyKind()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/BigCatTest.php b/samples/server/petstore/php-slim/test/Model/BigCatTest.php
deleted file mode 100644
index a8ae4c1fb7f3..000000000000
--- a/samples/server/petstore/php-slim/test/Model/BigCatTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * BigCatTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\BigCat;
-
-/**
- * BigCatTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\BigCat
- */
-class BigCatTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "BigCat"
-     */
-    public function testBigCat()
-    {
-        $testBigCat = new BigCat();
-    }
-
-    /**
-     * Test attribute "className"
-     */
-    public function testPropertyClassName()
-    {
-    }
-
-    /**
-     * Test attribute "color"
-     */
-    public function testPropertyColor()
-    {
-    }
-
-    /**
-     * Test attribute "declawed"
-     */
-    public function testPropertyDeclawed()
-    {
-    }
-
-    /**
-     * Test attribute "kind"
-     */
-    public function testPropertyKind()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/CapitalizationTest.php b/samples/server/petstore/php-slim/test/Model/CapitalizationTest.php
deleted file mode 100644
index 8da2965e3d55..000000000000
--- a/samples/server/petstore/php-slim/test/Model/CapitalizationTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * CapitalizationTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Capitalization;
-
-/**
- * CapitalizationTest Class Doc Comment
- *
- * @category Class
- * @description Capitalization
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\Capitalization
- */
-class CapitalizationTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Capitalization"
-     */
-    public function testCapitalization()
-    {
-        $testCapitalization = new Capitalization();
-    }
-
-    /**
-     * Test attribute "smallCamel"
-     */
-    public function testPropertySmallCamel()
-    {
-    }
-
-    /**
-     * Test attribute "capitalCamel"
-     */
-    public function testPropertyCapitalCamel()
-    {
-    }
-
-    /**
-     * Test attribute "smallSnake"
-     */
-    public function testPropertySmallSnake()
-    {
-    }
-
-    /**
-     * Test attribute "capitalSnake"
-     */
-    public function testPropertyCapitalSnake()
-    {
-    }
-
-    /**
-     * Test attribute "sCAETHFlowPoints"
-     */
-    public function testPropertySCAETHFlowPoints()
-    {
-    }
-
-    /**
-     * Test attribute "aTTNAME"
-     */
-    public function testPropertyATTNAME()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/CatAllOfTest.php b/samples/server/petstore/php-slim/test/Model/CatAllOfTest.php
deleted file mode 100644
index 131dbf55988e..000000000000
--- a/samples/server/petstore/php-slim/test/Model/CatAllOfTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * CatAllOfTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\CatAllOf;
-
-/**
- * CatAllOfTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\CatAllOf
- */
-class CatAllOfTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "CatAllOf"
-     */
-    public function testCatAllOf()
-    {
-        $testCatAllOf = new CatAllOf();
-    }
-
-    /**
-     * Test attribute "declawed"
-     */
-    public function testPropertyDeclawed()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/CatTest.php b/samples/server/petstore/php-slim/test/Model/CatTest.php
deleted file mode 100644
index 012bbd85483c..000000000000
--- a/samples/server/petstore/php-slim/test/Model/CatTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * CatTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Cat;
-
-/**
- * CatTest Class Doc Comment
- *
- * @category Class
- * @description Cat
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\Cat
- */
-class CatTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Cat"
-     */
-    public function testCat()
-    {
-        $testCat = new Cat();
-    }
-
-    /**
-     * Test attribute "className"
-     */
-    public function testPropertyClassName()
-    {
-    }
-
-    /**
-     * Test attribute "color"
-     */
-    public function testPropertyColor()
-    {
-    }
-
-    /**
-     * Test attribute "declawed"
-     */
-    public function testPropertyDeclawed()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/CategoryTest.php b/samples/server/petstore/php-slim/test/Model/CategoryTest.php
deleted file mode 100644
index aa98a1a76c0e..000000000000
--- a/samples/server/petstore/php-slim/test/Model/CategoryTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * CategoryTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Category;
-
-/**
- * CategoryTest Class Doc Comment
- *
- * @category Class
- * @description Category
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\Category
- */
-class CategoryTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Category"
-     */
-    public function testCategory()
-    {
-        $testCategory = new Category();
-    }
-
-    /**
-     * Test attribute "id"
-     */
-    public function testPropertyId()
-    {
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/ClassModelTest.php b/samples/server/petstore/php-slim/test/Model/ClassModelTest.php
deleted file mode 100644
index da094de92630..000000000000
--- a/samples/server/petstore/php-slim/test/Model/ClassModelTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * ClassModelTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ClassModel;
-
-/**
- * ClassModelTest Class Doc Comment
- *
- * @category Class
- * @description Model for testing model with \&quot;_class\&quot; property
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\ClassModel
- */
-class ClassModelTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ClassModel"
-     */
-    public function testClassModel()
-    {
-        $testClassModel = new ClassModel();
-    }
-
-    /**
-     * Test attribute "class"
-     */
-    public function testPropertyClass()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/ClientTest.php b/samples/server/petstore/php-slim/test/Model/ClientTest.php
deleted file mode 100644
index e0277948fe25..000000000000
--- a/samples/server/petstore/php-slim/test/Model/ClientTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * ClientTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Client;
-
-/**
- * ClientTest Class Doc Comment
- *
- * @category Class
- * @description Client
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\Client
- */
-class ClientTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Client"
-     */
-    public function testClient()
-    {
-        $testClient = new Client();
-    }
-
-    /**
-     * Test attribute "client"
-     */
-    public function testPropertyClient()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/DogAllOfTest.php b/samples/server/petstore/php-slim/test/Model/DogAllOfTest.php
deleted file mode 100644
index 32e6d8d6ff82..000000000000
--- a/samples/server/petstore/php-slim/test/Model/DogAllOfTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * DogAllOfTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\DogAllOf;
-
-/**
- * DogAllOfTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\DogAllOf
- */
-class DogAllOfTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "DogAllOf"
-     */
-    public function testDogAllOf()
-    {
-        $testDogAllOf = new DogAllOf();
-    }
-
-    /**
-     * Test attribute "breed"
-     */
-    public function testPropertyBreed()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/DogTest.php b/samples/server/petstore/php-slim/test/Model/DogTest.php
deleted file mode 100644
index b0842ad51717..000000000000
--- a/samples/server/petstore/php-slim/test/Model/DogTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * DogTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Dog;
-
-/**
- * DogTest Class Doc Comment
- *
- * @category Class
- * @description Dog
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\Dog
- */
-class DogTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Dog"
-     */
-    public function testDog()
-    {
-        $testDog = new Dog();
-    }
-
-    /**
-     * Test attribute "className"
-     */
-    public function testPropertyClassName()
-    {
-    }
-
-    /**
-     * Test attribute "color"
-     */
-    public function testPropertyColor()
-    {
-    }
-
-    /**
-     * Test attribute "breed"
-     */
-    public function testPropertyBreed()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/EnumArraysTest.php b/samples/server/petstore/php-slim/test/Model/EnumArraysTest.php
deleted file mode 100644
index 270e7173a163..000000000000
--- a/samples/server/petstore/php-slim/test/Model/EnumArraysTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * EnumArraysTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\EnumArrays;
-
-/**
- * EnumArraysTest Class Doc Comment
- *
- * @category Class
- * @description EnumArrays
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\EnumArrays
- */
-class EnumArraysTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "EnumArrays"
-     */
-    public function testEnumArrays()
-    {
-        $testEnumArrays = new EnumArrays();
-    }
-
-    /**
-     * Test attribute "justSymbol"
-     */
-    public function testPropertyJustSymbol()
-    {
-    }
-
-    /**
-     * Test attribute "arrayEnum"
-     */
-    public function testPropertyArrayEnum()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/EnumClassTest.php b/samples/server/petstore/php-slim/test/Model/EnumClassTest.php
deleted file mode 100644
index 29cc1883ec20..000000000000
--- a/samples/server/petstore/php-slim/test/Model/EnumClassTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * EnumClassTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\EnumClass;
-
-/**
- * EnumClassTest Class Doc Comment
- *
- * @category Class
- * @description EnumClass
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\EnumClass
- */
-class EnumClassTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "EnumClass"
-     */
-    public function testEnumClass()
-    {
-        $testEnumClass = new EnumClass();
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/EnumTestTest.php b/samples/server/petstore/php-slim/test/Model/EnumTestTest.php
deleted file mode 100644
index 4ffeb6d34efe..000000000000
--- a/samples/server/petstore/php-slim/test/Model/EnumTestTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * EnumTestTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\EnumTest;
-
-/**
- * EnumTestTest Class Doc Comment
- *
- * @category Class
- * @description EnumTest
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\EnumTest
- */
-class EnumTestTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "EnumTest"
-     */
-    public function testEnumTest()
-    {
-        $testEnumTest = new EnumTest();
-    }
-
-    /**
-     * Test attribute "enumString"
-     */
-    public function testPropertyEnumString()
-    {
-    }
-
-    /**
-     * Test attribute "enumStringRequired"
-     */
-    public function testPropertyEnumStringRequired()
-    {
-    }
-
-    /**
-     * Test attribute "enumInteger"
-     */
-    public function testPropertyEnumInteger()
-    {
-    }
-
-    /**
-     * Test attribute "enumNumber"
-     */
-    public function testPropertyEnumNumber()
-    {
-    }
-
-    /**
-     * Test attribute "outerEnum"
-     */
-    public function testPropertyOuterEnum()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/FileSchemaTestClassTest.php b/samples/server/petstore/php-slim/test/Model/FileSchemaTestClassTest.php
deleted file mode 100644
index d1ea6dccdf8c..000000000000
--- a/samples/server/petstore/php-slim/test/Model/FileSchemaTestClassTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * FileSchemaTestClassTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\FileSchemaTestClass;
-
-/**
- * FileSchemaTestClassTest Class Doc Comment
- *
- * @category Class
- * @description FileSchemaTestClass
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\FileSchemaTestClass
- */
-class FileSchemaTestClassTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "FileSchemaTestClass"
-     */
-    public function testFileSchemaTestClass()
-    {
-        $testFileSchemaTestClass = new FileSchemaTestClass();
-    }
-
-    /**
-     * Test attribute "file"
-     */
-    public function testPropertyFile()
-    {
-    }
-
-    /**
-     * Test attribute "files"
-     */
-    public function testPropertyFiles()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/FileTest.php b/samples/server/petstore/php-slim/test/Model/FileTest.php
deleted file mode 100644
index c30c1f5069e9..000000000000
--- a/samples/server/petstore/php-slim/test/Model/FileTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * FileTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\File;
-
-/**
- * FileTest Class Doc Comment
- *
- * @category Class
- * @description Must be named &#x60;File&#x60; for test.
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\File
- */
-class FileTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "File"
-     */
-    public function testFile()
-    {
-        $testFile = new File();
-    }
-
-    /**
-     * Test attribute "sourceURI"
-     */
-    public function testPropertySourceURI()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/FormatTestTest.php b/samples/server/petstore/php-slim/test/Model/FormatTestTest.php
deleted file mode 100644
index b00d93005562..000000000000
--- a/samples/server/petstore/php-slim/test/Model/FormatTestTest.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/**
- * FormatTestTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\FormatTest;
-
-/**
- * FormatTestTest Class Doc Comment
- *
- * @category Class
- * @description FormatTest
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\FormatTest
- */
-class FormatTestTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "FormatTest"
-     */
-    public function testFormatTest()
-    {
-        $testFormatTest = new FormatTest();
-    }
-
-    /**
-     * Test attribute "integer"
-     */
-    public function testPropertyInteger()
-    {
-    }
-
-    /**
-     * Test attribute "int32"
-     */
-    public function testPropertyInt32()
-    {
-    }
-
-    /**
-     * Test attribute "int64"
-     */
-    public function testPropertyInt64()
-    {
-    }
-
-    /**
-     * Test attribute "number"
-     */
-    public function testPropertyNumber()
-    {
-    }
-
-    /**
-     * Test attribute "float"
-     */
-    public function testPropertyFloat()
-    {
-    }
-
-    /**
-     * Test attribute "double"
-     */
-    public function testPropertyDouble()
-    {
-    }
-
-    /**
-     * Test attribute "string"
-     */
-    public function testPropertyString()
-    {
-    }
-
-    /**
-     * Test attribute "byte"
-     */
-    public function testPropertyByte()
-    {
-    }
-
-    /**
-     * Test attribute "binary"
-     */
-    public function testPropertyBinary()
-    {
-    }
-
-    /**
-     * Test attribute "date"
-     */
-    public function testPropertyDate()
-    {
-    }
-
-    /**
-     * Test attribute "dateTime"
-     */
-    public function testPropertyDateTime()
-    {
-    }
-
-    /**
-     * Test attribute "uuid"
-     */
-    public function testPropertyUuid()
-    {
-    }
-
-    /**
-     * Test attribute "password"
-     */
-    public function testPropertyPassword()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/HasOnlyReadOnlyTest.php b/samples/server/petstore/php-slim/test/Model/HasOnlyReadOnlyTest.php
deleted file mode 100644
index 72ad8c677dce..000000000000
--- a/samples/server/petstore/php-slim/test/Model/HasOnlyReadOnlyTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * HasOnlyReadOnlyTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\HasOnlyReadOnly;
-
-/**
- * HasOnlyReadOnlyTest Class Doc Comment
- *
- * @category Class
- * @description HasOnlyReadOnly
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\HasOnlyReadOnly
- */
-class HasOnlyReadOnlyTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "HasOnlyReadOnly"
-     */
-    public function testHasOnlyReadOnly()
-    {
-        $testHasOnlyReadOnly = new HasOnlyReadOnly();
-    }
-
-    /**
-     * Test attribute "bar"
-     */
-    public function testPropertyBar()
-    {
-    }
-
-    /**
-     * Test attribute "foo"
-     */
-    public function testPropertyFoo()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/MapTestTest.php b/samples/server/petstore/php-slim/test/Model/MapTestTest.php
deleted file mode 100644
index 1ec0b62f1114..000000000000
--- a/samples/server/petstore/php-slim/test/Model/MapTestTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * MapTestTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\MapTest;
-
-/**
- * MapTestTest Class Doc Comment
- *
- * @category Class
- * @description MapTest
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\MapTest
- */
-class MapTestTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "MapTest"
-     */
-    public function testMapTest()
-    {
-        $testMapTest = new MapTest();
-    }
-
-    /**
-     * Test attribute "mapMapOfString"
-     */
-    public function testPropertyMapMapOfString()
-    {
-    }
-
-    /**
-     * Test attribute "mapOfEnumString"
-     */
-    public function testPropertyMapOfEnumString()
-    {
-    }
-
-    /**
-     * Test attribute "directMap"
-     */
-    public function testPropertyDirectMap()
-    {
-    }
-
-    /**
-     * Test attribute "indirectMap"
-     */
-    public function testPropertyIndirectMap()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/server/petstore/php-slim/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
deleted file mode 100644
index ece54524604a..000000000000
--- a/samples/server/petstore/php-slim/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * MixedPropertiesAndAdditionalPropertiesClassTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\MixedPropertiesAndAdditionalPropertiesClass;
-
-/**
- * MixedPropertiesAndAdditionalPropertiesClassTest Class Doc Comment
- *
- * @category Class
- * @description MixedPropertiesAndAdditionalPropertiesClass
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\MixedPropertiesAndAdditionalPropertiesClass
- */
-class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "MixedPropertiesAndAdditionalPropertiesClass"
-     */
-    public function testMixedPropertiesAndAdditionalPropertiesClass()
-    {
-        $testMixedPropertiesAndAdditionalPropertiesClass = new MixedPropertiesAndAdditionalPropertiesClass();
-    }
-
-    /**
-     * Test attribute "uuid"
-     */
-    public function testPropertyUuid()
-    {
-    }
-
-    /**
-     * Test attribute "dateTime"
-     */
-    public function testPropertyDateTime()
-    {
-    }
-
-    /**
-     * Test attribute "map"
-     */
-    public function testPropertyMap()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/Model200ResponseTest.php b/samples/server/petstore/php-slim/test/Model/Model200ResponseTest.php
deleted file mode 100644
index 5e7c8e885041..000000000000
--- a/samples/server/petstore/php-slim/test/Model/Model200ResponseTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Model200ResponseTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Model200Response;
-
-/**
- * Model200ResponseTest Class Doc Comment
- *
- * @category Class
- * @description Model for testing model name starting with number
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\Model200Response
- */
-class Model200ResponseTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Model200Response"
-     */
-    public function testModel200Response()
-    {
-        $testModel200Response = new Model200Response();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-
-    /**
-     * Test attribute "class"
-     */
-    public function testPropertyClass()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/ModelListTest.php b/samples/server/petstore/php-slim/test/Model/ModelListTest.php
deleted file mode 100644
index 853b9fe68b88..000000000000
--- a/samples/server/petstore/php-slim/test/Model/ModelListTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * ModelListTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ModelList;
-
-/**
- * ModelListTest Class Doc Comment
- *
- * @category Class
- * @description ModelList
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\ModelList
- */
-class ModelListTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ModelList"
-     */
-    public function testModelList()
-    {
-        $testModelList = new ModelList();
-    }
-
-    /**
-     * Test attribute "_123list"
-     */
-    public function testProperty123list()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/ModelReturnTest.php b/samples/server/petstore/php-slim/test/Model/ModelReturnTest.php
deleted file mode 100644
index cabd691ad495..000000000000
--- a/samples/server/petstore/php-slim/test/Model/ModelReturnTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * ModelReturnTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ModelReturn;
-
-/**
- * ModelReturnTest Class Doc Comment
- *
- * @category Class
- * @description Model for testing reserved words
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\ModelReturn
- */
-class ModelReturnTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ModelReturn"
-     */
-    public function testModelReturn()
-    {
-        $testModelReturn = new ModelReturn();
-    }
-
-    /**
-     * Test attribute "return"
-     */
-    public function testPropertyReturn()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/NameTest.php b/samples/server/petstore/php-slim/test/Model/NameTest.php
deleted file mode 100644
index 0c5f54955833..000000000000
--- a/samples/server/petstore/php-slim/test/Model/NameTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * NameTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Name;
-
-/**
- * NameTest Class Doc Comment
- *
- * @category Class
- * @description Model for testing model name same as property name
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\Name
- */
-class NameTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Name"
-     */
-    public function testName()
-    {
-        $testName = new Name();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-
-    /**
-     * Test attribute "snakeCase"
-     */
-    public function testPropertySnakeCase()
-    {
-    }
-
-    /**
-     * Test attribute "property"
-     */
-    public function testPropertyProperty()
-    {
-    }
-
-    /**
-     * Test attribute "_123number"
-     */
-    public function testProperty123number()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/NumberOnlyTest.php b/samples/server/petstore/php-slim/test/Model/NumberOnlyTest.php
deleted file mode 100644
index 2f8b34b4c86e..000000000000
--- a/samples/server/petstore/php-slim/test/Model/NumberOnlyTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * NumberOnlyTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\NumberOnly;
-
-/**
- * NumberOnlyTest Class Doc Comment
- *
- * @category Class
- * @description NumberOnly
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\NumberOnly
- */
-class NumberOnlyTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "NumberOnly"
-     */
-    public function testNumberOnly()
-    {
-        $testNumberOnly = new NumberOnly();
-    }
-
-    /**
-     * Test attribute "justNumber"
-     */
-    public function testPropertyJustNumber()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/OrderTest.php b/samples/server/petstore/php-slim/test/Model/OrderTest.php
deleted file mode 100644
index d1dd1fe0eea6..000000000000
--- a/samples/server/petstore/php-slim/test/Model/OrderTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * OrderTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Order;
-
-/**
- * OrderTest Class Doc Comment
- *
- * @category Class
- * @description Order
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\Order
- */
-class OrderTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Order"
-     */
-    public function testOrder()
-    {
-        $testOrder = new Order();
-    }
-
-    /**
-     * Test attribute "id"
-     */
-    public function testPropertyId()
-    {
-    }
-
-    /**
-     * Test attribute "petId"
-     */
-    public function testPropertyPetId()
-    {
-    }
-
-    /**
-     * Test attribute "quantity"
-     */
-    public function testPropertyQuantity()
-    {
-    }
-
-    /**
-     * Test attribute "shipDate"
-     */
-    public function testPropertyShipDate()
-    {
-    }
-
-    /**
-     * Test attribute "status"
-     */
-    public function testPropertyStatus()
-    {
-    }
-
-    /**
-     * Test attribute "complete"
-     */
-    public function testPropertyComplete()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/OuterCompositeTest.php b/samples/server/petstore/php-slim/test/Model/OuterCompositeTest.php
deleted file mode 100644
index 1ff9ac71c5d3..000000000000
--- a/samples/server/petstore/php-slim/test/Model/OuterCompositeTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * OuterCompositeTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\OuterComposite;
-
-/**
- * OuterCompositeTest Class Doc Comment
- *
- * @category Class
- * @description OuterComposite
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\OuterComposite
- */
-class OuterCompositeTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "OuterComposite"
-     */
-    public function testOuterComposite()
-    {
-        $testOuterComposite = new OuterComposite();
-    }
-
-    /**
-     * Test attribute "myNumber"
-     */
-    public function testPropertyMyNumber()
-    {
-    }
-
-    /**
-     * Test attribute "myString"
-     */
-    public function testPropertyMyString()
-    {
-    }
-
-    /**
-     * Test attribute "myBoolean"
-     */
-    public function testPropertyMyBoolean()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/OuterEnumTest.php b/samples/server/petstore/php-slim/test/Model/OuterEnumTest.php
deleted file mode 100644
index 3c06e23399e1..000000000000
--- a/samples/server/petstore/php-slim/test/Model/OuterEnumTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * OuterEnumTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\OuterEnum;
-
-/**
- * OuterEnumTest Class Doc Comment
- *
- * @category Class
- * @description OuterEnum
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\OuterEnum
- */
-class OuterEnumTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "OuterEnum"
-     */
-    public function testOuterEnum()
-    {
-        $testOuterEnum = new OuterEnum();
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/PetTest.php b/samples/server/petstore/php-slim/test/Model/PetTest.php
deleted file mode 100644
index c4781db4ff58..000000000000
--- a/samples/server/petstore/php-slim/test/Model/PetTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * PetTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Pet;
-
-/**
- * PetTest Class Doc Comment
- *
- * @category Class
- * @description Pet
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\Pet
- */
-class PetTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Pet"
-     */
-    public function testPet()
-    {
-        $testPet = new Pet();
-    }
-
-    /**
-     * Test attribute "id"
-     */
-    public function testPropertyId()
-    {
-    }
-
-    /**
-     * Test attribute "category"
-     */
-    public function testPropertyCategory()
-    {
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-
-    /**
-     * Test attribute "photoUrls"
-     */
-    public function testPropertyPhotoUrls()
-    {
-    }
-
-    /**
-     * Test attribute "tags"
-     */
-    public function testPropertyTags()
-    {
-    }
-
-    /**
-     * Test attribute "status"
-     */
-    public function testPropertyStatus()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/ReadOnlyFirstTest.php b/samples/server/petstore/php-slim/test/Model/ReadOnlyFirstTest.php
deleted file mode 100644
index 518f72522096..000000000000
--- a/samples/server/petstore/php-slim/test/Model/ReadOnlyFirstTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * ReadOnlyFirstTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ReadOnlyFirst;
-
-/**
- * ReadOnlyFirstTest Class Doc Comment
- *
- * @category Class
- * @description ReadOnlyFirst
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\ReadOnlyFirst
- */
-class ReadOnlyFirstTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ReadOnlyFirst"
-     */
-    public function testReadOnlyFirst()
-    {
-        $testReadOnlyFirst = new ReadOnlyFirst();
-    }
-
-    /**
-     * Test attribute "bar"
-     */
-    public function testPropertyBar()
-    {
-    }
-
-    /**
-     * Test attribute "baz"
-     */
-    public function testPropertyBaz()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/SpecialModelNameTest.php b/samples/server/petstore/php-slim/test/Model/SpecialModelNameTest.php
deleted file mode 100644
index c56de38fc195..000000000000
--- a/samples/server/petstore/php-slim/test/Model/SpecialModelNameTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * SpecialModelNameTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\SpecialModelName;
-
-/**
- * SpecialModelNameTest Class Doc Comment
- *
- * @category Class
- * @description SpecialModelName
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\SpecialModelName
- */
-class SpecialModelNameTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "SpecialModelName"
-     */
-    public function testSpecialModelName()
-    {
-        $testSpecialModelName = new SpecialModelName();
-    }
-
-    /**
-     * Test attribute "specialPropertyName"
-     */
-    public function testPropertySpecialPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/TagTest.php b/samples/server/petstore/php-slim/test/Model/TagTest.php
deleted file mode 100644
index c52e39468d3e..000000000000
--- a/samples/server/petstore/php-slim/test/Model/TagTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * TagTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Tag;
-
-/**
- * TagTest Class Doc Comment
- *
- * @category Class
- * @description Tag
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\Tag
- */
-class TagTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Tag"
-     */
-    public function testTag()
-    {
-        $testTag = new Tag();
-    }
-
-    /**
-     * Test attribute "id"
-     */
-    public function testPropertyId()
-    {
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/TypeHolderDefaultTest.php b/samples/server/petstore/php-slim/test/Model/TypeHolderDefaultTest.php
deleted file mode 100644
index cd7015af57a7..000000000000
--- a/samples/server/petstore/php-slim/test/Model/TypeHolderDefaultTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * TypeHolderDefaultTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\TypeHolderDefault;
-
-/**
- * TypeHolderDefaultTest Class Doc Comment
- *
- * @category Class
- * @description TypeHolderDefault
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\TypeHolderDefault
- */
-class TypeHolderDefaultTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "TypeHolderDefault"
-     */
-    public function testTypeHolderDefault()
-    {
-        $testTypeHolderDefault = new TypeHolderDefault();
-    }
-
-    /**
-     * Test attribute "stringItem"
-     */
-    public function testPropertyStringItem()
-    {
-    }
-
-    /**
-     * Test attribute "numberItem"
-     */
-    public function testPropertyNumberItem()
-    {
-    }
-
-    /**
-     * Test attribute "integerItem"
-     */
-    public function testPropertyIntegerItem()
-    {
-    }
-
-    /**
-     * Test attribute "boolItem"
-     */
-    public function testPropertyBoolItem()
-    {
-    }
-
-    /**
-     * Test attribute "arrayItem"
-     */
-    public function testPropertyArrayItem()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/TypeHolderExampleTest.php b/samples/server/petstore/php-slim/test/Model/TypeHolderExampleTest.php
deleted file mode 100644
index b5587aaecabf..000000000000
--- a/samples/server/petstore/php-slim/test/Model/TypeHolderExampleTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * TypeHolderExampleTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\TypeHolderExample;
-
-/**
- * TypeHolderExampleTest Class Doc Comment
- *
- * @category Class
- * @description TypeHolderExample
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\TypeHolderExample
- */
-class TypeHolderExampleTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "TypeHolderExample"
-     */
-    public function testTypeHolderExample()
-    {
-        $testTypeHolderExample = new TypeHolderExample();
-    }
-
-    /**
-     * Test attribute "stringItem"
-     */
-    public function testPropertyStringItem()
-    {
-    }
-
-    /**
-     * Test attribute "numberItem"
-     */
-    public function testPropertyNumberItem()
-    {
-    }
-
-    /**
-     * Test attribute "integerItem"
-     */
-    public function testPropertyIntegerItem()
-    {
-    }
-
-    /**
-     * Test attribute "boolItem"
-     */
-    public function testPropertyBoolItem()
-    {
-    }
-
-    /**
-     * Test attribute "arrayItem"
-     */
-    public function testPropertyArrayItem()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/UserTest.php b/samples/server/petstore/php-slim/test/Model/UserTest.php
deleted file mode 100644
index dd89b9008c84..000000000000
--- a/samples/server/petstore/php-slim/test/Model/UserTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * UserTest
- * PHP version 5
- *
- * @category Class
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\User;
-
-/**
- * UserTest Class Doc Comment
- *
- * @category Class
- * @description User
- * @package  OpenAPIServer\Model
- * @author   OpenAPI Generator team
- * @link     https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Model\User
- */
-class UserTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "User"
-     */
-    public function testUser()
-    {
-        $testUser = new User();
-    }
-
-    /**
-     * Test attribute "id"
-     */
-    public function testPropertyId()
-    {
-    }
-
-    /**
-     * Test attribute "username"
-     */
-    public function testPropertyUsername()
-    {
-    }
-
-    /**
-     * Test attribute "firstName"
-     */
-    public function testPropertyFirstName()
-    {
-    }
-
-    /**
-     * Test attribute "lastName"
-     */
-    public function testPropertyLastName()
-    {
-    }
-
-    /**
-     * Test attribute "email"
-     */
-    public function testPropertyEmail()
-    {
-    }
-
-    /**
-     * Test attribute "password"
-     */
-    public function testPropertyPassword()
-    {
-    }
-
-    /**
-     * Test attribute "phone"
-     */
-    public function testPropertyPhone()
-    {
-    }
-
-    /**
-     * Test attribute "userStatus"
-     */
-    public function testPropertyUserStatus()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim/test/Model/XmlItemTest.php b/samples/server/petstore/php-slim/test/Model/XmlItemTest.php
deleted file mode 100644
index 6d4132210d4b..000000000000
--- a/samples/server/petstore/php-slim/test/Model/XmlItemTest.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-/**
- * XmlItemTest
- *
- * PHP version 7
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * OpenAPI spec version: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\XmlItem;
-
-/**
- * XmlItemTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\XmlItem
- */
-class XmlItemTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "XmlItem"
-     */
-    public function testXmlItem()
-    {
-        $testXmlItem = new XmlItem();
-    }
-
-    /**
-     * Test attribute "attributeString"
-     */
-    public function testPropertyAttributeString()
-    {
-    }
-
-    /**
-     * Test attribute "attributeNumber"
-     */
-    public function testPropertyAttributeNumber()
-    {
-    }
-
-    /**
-     * Test attribute "attributeInteger"
-     */
-    public function testPropertyAttributeInteger()
-    {
-    }
-
-    /**
-     * Test attribute "attributeBoolean"
-     */
-    public function testPropertyAttributeBoolean()
-    {
-    }
-
-    /**
-     * Test attribute "wrappedArray"
-     */
-    public function testPropertyWrappedArray()
-    {
-    }
-
-    /**
-     * Test attribute "nameString"
-     */
-    public function testPropertyNameString()
-    {
-    }
-
-    /**
-     * Test attribute "nameNumber"
-     */
-    public function testPropertyNameNumber()
-    {
-    }
-
-    /**
-     * Test attribute "nameInteger"
-     */
-    public function testPropertyNameInteger()
-    {
-    }
-
-    /**
-     * Test attribute "nameBoolean"
-     */
-    public function testPropertyNameBoolean()
-    {
-    }
-
-    /**
-     * Test attribute "nameArray"
-     */
-    public function testPropertyNameArray()
-    {
-    }
-
-    /**
-     * Test attribute "nameWrappedArray"
-     */
-    public function testPropertyNameWrappedArray()
-    {
-    }
-
-    /**
-     * Test attribute "prefixString"
-     */
-    public function testPropertyPrefixString()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNumber"
-     */
-    public function testPropertyPrefixNumber()
-    {
-    }
-
-    /**
-     * Test attribute "prefixInteger"
-     */
-    public function testPropertyPrefixInteger()
-    {
-    }
-
-    /**
-     * Test attribute "prefixBoolean"
-     */
-    public function testPropertyPrefixBoolean()
-    {
-    }
-
-    /**
-     * Test attribute "prefixArray"
-     */
-    public function testPropertyPrefixArray()
-    {
-    }
-
-    /**
-     * Test attribute "prefixWrappedArray"
-     */
-    public function testPropertyPrefixWrappedArray()
-    {
-    }
-
-    /**
-     * Test attribute "namespaceString"
-     */
-    public function testPropertyNamespaceString()
-    {
-    }
-
-    /**
-     * Test attribute "namespaceNumber"
-     */
-    public function testPropertyNamespaceNumber()
-    {
-    }
-
-    /**
-     * Test attribute "namespaceInteger"
-     */
-    public function testPropertyNamespaceInteger()
-    {
-    }
-
-    /**
-     * Test attribute "namespaceBoolean"
-     */
-    public function testPropertyNamespaceBoolean()
-    {
-    }
-
-    /**
-     * Test attribute "namespaceArray"
-     */
-    public function testPropertyNamespaceArray()
-    {
-    }
-
-    /**
-     * Test attribute "namespaceWrappedArray"
-     */
-    public function testPropertyNamespaceWrappedArray()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNamespaceString"
-     */
-    public function testPropertyPrefixNamespaceString()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNamespaceNumber"
-     */
-    public function testPropertyPrefixNamespaceNumber()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNamespaceInteger"
-     */
-    public function testPropertyPrefixNamespaceInteger()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNamespaceBoolean"
-     */
-    public function testPropertyPrefixNamespaceBoolean()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNamespaceArray"
-     */
-    public function testPropertyPrefixNamespaceArray()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNamespaceWrappedArray"
-     */
-    public function testPropertyPrefixNamespaceWrappedArray()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/.gitignore b/samples/server/petstore/php-slim4/.gitignore
index 3203d7d7814e..2424ad0dc928 100644
--- a/samples/server/petstore/php-slim4/.gitignore
+++ b/samples/server/petstore/php-slim4/.gitignore
@@ -12,6 +12,7 @@ composer.lock
 
 # Do not commit local PHPUnit config
 /phpunit.xml
+/.phpunit.result.cache
 
 # Do not commit local PHP_CodeSniffer config
 /phpcs.xml
\ No newline at end of file
diff --git a/samples/server/petstore/php-slim4/.openapi-generator/FILES b/samples/server/petstore/php-slim4/.openapi-generator/FILES
index ba22c031220d..781243bb5264 100644
--- a/samples/server/petstore/php-slim4/.openapi-generator/FILES
+++ b/samples/server/petstore/php-slim4/.openapi-generator/FILES
@@ -2,11 +2,7 @@
 .htaccess
 README.md
 composer.json
-docs/MockServer.md
 index.php
-lib/Api/AbstractAnotherFakeApi.php
-lib/Api/AbstractFakeApi.php
-lib/Api/AbstractFakeClassnameTags123Api.php
 lib/Api/AbstractPetApi.php
 lib/Api/AbstractStoreApi.php
 lib/Api/AbstractUserApi.php
@@ -23,65 +19,20 @@ lib/Auth/AbstractAuthenticator.php
 lib/Auth/AbstractAuthenticator.php
 lib/Auth/AbstractAuthenticator.php
 lib/Auth/AbstractAuthenticator.php
-lib/Interfaces/ModelInterface.php
+lib/Auth/AbstractAuthenticator.php
+lib/Auth/AbstractAuthenticator.php
+lib/Auth/AbstractAuthenticator.php
+lib/BaseModel.php
 lib/Middleware/JsonBodyParserMiddleware.php
-lib/Mock/OpenApiDataMocker.php
-lib/Mock/OpenApiDataMockerInterface.php
-lib/Mock/OpenApiDataMockerMiddleware.php
-lib/Model/AdditionalPropertiesAnyType.php
-lib/Model/AdditionalPropertiesArray.php
-lib/Model/AdditionalPropertiesBoolean.php
-lib/Model/AdditionalPropertiesClass.php
-lib/Model/AdditionalPropertiesInteger.php
-lib/Model/AdditionalPropertiesNumber.php
-lib/Model/AdditionalPropertiesObject.php
-lib/Model/AdditionalPropertiesString.php
-lib/Model/Animal.php
 lib/Model/ApiResponse.php
-lib/Model/ArrayOfArrayOfNumberOnly.php
-lib/Model/ArrayOfNumberOnly.php
-lib/Model/ArrayTest.php
-lib/Model/BigCat.php
-lib/Model/BigCatAllOf.php
-lib/Model/Capitalization.php
-lib/Model/Cat.php
-lib/Model/CatAllOf.php
 lib/Model/Category.php
-lib/Model/ClassModel.php
-lib/Model/Client.php
-lib/Model/Dog.php
-lib/Model/DogAllOf.php
-lib/Model/EnumArrays.php
-lib/Model/EnumClass.php
-lib/Model/EnumTest.php
-lib/Model/File.php
-lib/Model/FileSchemaTestClass.php
-lib/Model/FormatTest.php
-lib/Model/HasOnlyReadOnly.php
-lib/Model/MapTest.php
-lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
-lib/Model/Model200Response.php
-lib/Model/ModelList.php
-lib/Model/ModelReturn.php
-lib/Model/Name.php
-lib/Model/NumberOnly.php
+lib/Model/InlineObject.php
+lib/Model/InlineObject1.php
 lib/Model/Order.php
-lib/Model/OuterComposite.php
-lib/Model/OuterEnum.php
 lib/Model/Pet.php
-lib/Model/ReadOnlyFirst.php
-lib/Model/SpecialModelName.php
 lib/Model/Tag.php
-lib/Model/TypeHolderDefault.php
-lib/Model/TypeHolderExample.php
 lib/Model/User.php
-lib/Model/XmlItem.php
 lib/SlimRouter.php
-lib/Utils/ModelUtilsTrait.php
-lib/Utils/StringUtilsTrait.php
 phpcs.xml.dist
 phpunit.xml.dist
-test/Mock/OpenApiDataMockerMiddlewareTest.php
-test/Mock/OpenApiDataMockerTest.php
-test/Utils/ModelUtilsTraitTest.php
-test/Utils/StringUtilsTraitTest.php
+test/BaseModelTest.php
diff --git a/samples/server/petstore/php-slim4/README.md b/samples/server/petstore/php-slim4/README.md
index 325111aa6243..6a8bd154ccb9 100644
--- a/samples/server/petstore/php-slim4/README.md
+++ b/samples/server/petstore/php-slim4/README.md
@@ -8,7 +8,7 @@ This server has been generated with [Slim PSR-7](https://github.com/slimphp/Slim
 ## Requirements
 
 * Web server with URL rewriting
-* PHP 7.1 or newer
+* PHP 7.2 or newer
 
 This package contains `.htaccess` for Apache configuration.
 If you use another server(Nginx, HHVM, IIS, lighttpd) check out [Web Servers](https://www.slimframework.com/docs/v3/start/web-servers.html) doc.
@@ -35,9 +35,9 @@ $ php -S localhost:8888 -t php-slim-server
 
 ### PHPUnit
 
-This package uses PHPUnit 6 or 7(depends from your PHP version) for unit testing.
+This package uses PHPUnit 8 or 9(depends from your PHP version) for unit testing.
 [Test folder](test) contains templates which you can fill with real test assertions.
-How to write tests read at [PHPUnit Manual - Chapter 2. Writing Tests for PHPUnit](https://phpunit.de/manual/6.5/en/writing-tests-for-phpunit.html).
+How to write tests read at [2. Writing Tests for PHPUnit - PHPUnit 8.5 Manual](https://phpunit.readthedocs.io/en/8.5/writing-tests-for-phpunit.html).
 
 #### Run
 
@@ -46,14 +46,12 @@ Command | Target
 `$ composer test` | All tests
 `$ composer test-apis` | Apis tests
 `$ composer test-models` | Models tests
-`$ composer test-mock` | Mock feature tests
-`$ composer test-utils` | Utils tests
 
 #### Config
 
 Package contains fully functional config `./phpunit.xml.dist` file. Create `./phpunit.xml` in root folder to override it.
 
-Quote from [3. The Command-Line Test Runner — PHPUnit 7.4 Manual](https://phpunit.readthedocs.io/en/7.4/textui.html#command-line-options):
+Quote from [3. The Command-Line Test Runner — PHPUnit 8.5 Manual](https://phpunit.readthedocs.io/en/8.5/textui.html#command-line-options):
 
 > If phpunit.xml or phpunit.xml.dist (in that order) exist in the current working directory and --configuration is not used, the configuration will be automatically read from that file.
 
@@ -101,11 +99,17 @@ Switch on option in `./index.php`:
 +++ $app->addErrorMiddleware(true, true, true);
 ```
 
-## [Mock Server Documentation](./docs/MockServer.md)
+## Mock Server
+For a quick start uncomment [mocker middleware config](index.php#L62-L89).
+
+Used packages:
+* [Openapi Data Mocker](https://github.com/ybelenko/openapi-data-mocker) - first implementation of OAS3 fake data generator.
+* [Openapi Data Mocker Server Middleware](https://github.com/ybelenko/openapi-data-mocker-server-middleware) - PSR-15 HTTP server middleware.
+* [Openapi Data Mocker Interfaces](https://github.com/ybelenko/openapi-data-mocker-interfaces) - package with mocking interfaces.
 
 ## API Endpoints
 
-All URIs are relative to *http://petstore.swagger.io:80/v2*
+All URIs are relative to *http://petstore.swagger.io/v2*
 
 > Important! Do not modify abstract API controllers directly! Instead extend them by implementation classes like:
 
@@ -131,22 +135,6 @@ For instance, when abstract class located at `./lib/Api/AbstractPetApi.php` you
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AbstractAnotherFakeApi* | **call123TestSpecialTags** | **PATCH** /another-fake/dummy | To test special tags
-*AbstractFakeApi* | **createXmlItem** | **POST** /fake/create_xml_item | creates an XmlItem
-*AbstractFakeApi* | **fakeOuterBooleanSerialize** | **POST** /fake/outer/boolean | 
-*AbstractFakeApi* | **fakeOuterCompositeSerialize** | **POST** /fake/outer/composite | 
-*AbstractFakeApi* | **fakeOuterNumberSerialize** | **POST** /fake/outer/number | 
-*AbstractFakeApi* | **fakeOuterStringSerialize** | **POST** /fake/outer/string | 
-*AbstractFakeApi* | **testBodyWithFileSchema** | **PUT** /fake/body-with-file-schema | 
-*AbstractFakeApi* | **testBodyWithQueryParams** | **PUT** /fake/body-with-query-params | 
-*AbstractFakeApi* | **testClientModel** | **PATCH** /fake | To test \"client\" model
-*AbstractFakeApi* | **testEndpointParameters** | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-*AbstractFakeApi* | **testEnumParameters** | **GET** /fake | To test enum parameters
-*AbstractFakeApi* | **testGroupParameters** | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-*AbstractFakeApi* | **testInlineAdditionalProperties** | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-*AbstractFakeApi* | **testJsonFormData** | **GET** /fake/jsonFormData | test json serialization of form data
-*AbstractFakeApi* | **testQueryParameterCollectionFormat** | **PUT** /fake/test-query-paramters | 
-*AbstractFakeClassnameTags123Api* | **testClassname** | **PATCH** /fake_classname_test | To test class name in snake case
 *AbstractPetApi* | **addPet** | **POST** /pet | Add a new pet to the store
 *AbstractPetApi* | **findPetsByStatus** | **GET** /pet/findByStatus | Finds Pets by status
 *AbstractPetApi* | **findPetsByTags** | **GET** /pet/findByTags | Finds Pets by tags
@@ -155,11 +143,10 @@ Class | Method | HTTP request | Description
 *AbstractPetApi* | **getPetById** | **GET** /pet/{petId} | Find pet by ID
 *AbstractPetApi* | **updatePetWithForm** | **POST** /pet/{petId} | Updates a pet in the store with form data
 *AbstractPetApi* | **uploadFile** | **POST** /pet/{petId}/uploadImage | uploads an image
-*AbstractPetApi* | **uploadFileWithRequiredFile** | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *AbstractStoreApi* | **getInventory** | **GET** /store/inventory | Returns pet inventories by status
 *AbstractStoreApi* | **placeOrder** | **POST** /store/order | Place an order for a pet
-*AbstractStoreApi* | **deleteOrder** | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-*AbstractStoreApi* | **getOrderById** | **GET** /store/order/{order_id} | Find purchase order by ID
+*AbstractStoreApi* | **deleteOrder** | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+*AbstractStoreApi* | **getOrderById** | **GET** /store/order/{orderId} | Find purchase order by ID
 *AbstractUserApi* | **createUser** | **POST** /user | Create user
 *AbstractUserApi* | **createUsersWithArrayInput** | **POST** /user/createWithArray | Creates list of users with given input array
 *AbstractUserApi* | **createUsersWithListInput** | **POST** /user/createWithList | Creates list of users with given input array
@@ -172,54 +159,14 @@ Class | Method | HTTP request | Description
 
 ## Models
 
-* OpenAPIServer\Model\AdditionalPropertiesAnyType
-* OpenAPIServer\Model\AdditionalPropertiesArray
-* OpenAPIServer\Model\AdditionalPropertiesBoolean
-* OpenAPIServer\Model\AdditionalPropertiesClass
-* OpenAPIServer\Model\AdditionalPropertiesInteger
-* OpenAPIServer\Model\AdditionalPropertiesNumber
-* OpenAPIServer\Model\AdditionalPropertiesObject
-* OpenAPIServer\Model\AdditionalPropertiesString
-* OpenAPIServer\Model\Animal
 * OpenAPIServer\Model\ApiResponse
-* OpenAPIServer\Model\ArrayOfArrayOfNumberOnly
-* OpenAPIServer\Model\ArrayOfNumberOnly
-* OpenAPIServer\Model\ArrayTest
-* OpenAPIServer\Model\BigCat
-* OpenAPIServer\Model\BigCatAllOf
-* OpenAPIServer\Model\Capitalization
-* OpenAPIServer\Model\Cat
-* OpenAPIServer\Model\CatAllOf
 * OpenAPIServer\Model\Category
-* OpenAPIServer\Model\ClassModel
-* OpenAPIServer\Model\Client
-* OpenAPIServer\Model\Dog
-* OpenAPIServer\Model\DogAllOf
-* OpenAPIServer\Model\EnumArrays
-* OpenAPIServer\Model\EnumClass
-* OpenAPIServer\Model\EnumTest
-* OpenAPIServer\Model\File
-* OpenAPIServer\Model\FileSchemaTestClass
-* OpenAPIServer\Model\FormatTest
-* OpenAPIServer\Model\HasOnlyReadOnly
-* OpenAPIServer\Model\MapTest
-* OpenAPIServer\Model\MixedPropertiesAndAdditionalPropertiesClass
-* OpenAPIServer\Model\Model200Response
-* OpenAPIServer\Model\ModelList
-* OpenAPIServer\Model\ModelReturn
-* OpenAPIServer\Model\Name
-* OpenAPIServer\Model\NumberOnly
+* OpenAPIServer\Model\InlineObject
+* OpenAPIServer\Model\InlineObject1
 * OpenAPIServer\Model\Order
-* OpenAPIServer\Model\OuterComposite
-* OpenAPIServer\Model\OuterEnum
 * OpenAPIServer\Model\Pet
-* OpenAPIServer\Model\ReadOnlyFirst
-* OpenAPIServer\Model\SpecialModelName
 * OpenAPIServer\Model\Tag
-* OpenAPIServer\Model\TypeHolderDefault
-* OpenAPIServer\Model\TypeHolderExample
 * OpenAPIServer\Model\User
-* OpenAPIServer\Model\XmlItem
 
 
 ## Authentication
@@ -227,12 +174,6 @@ Class | Method | HTTP request | Description
 ### Security schema `api_key`
 > Important! To make ApiKey authentication work you need to extend [\OpenAPIServer\Auth\AbstractAuthenticator](./lib/Auth/AbstractAuthenticator.php) class by [\OpenAPIServer\Auth\ApiKeyAuthenticator](./src/Auth/ApiKeyAuthenticator.php) class.
 
-### Security schema `api_key_query`
-> Important! To make ApiKey authentication work you need to extend [\OpenAPIServer\Auth\AbstractAuthenticator](./lib/Auth/AbstractAuthenticator.php) class by [\OpenAPIServer\Auth\ApiKeyAuthenticator](./src/Auth/ApiKeyAuthenticator.php) class.
-
-### Security schema `http_basic_test`
-> Important! To make Basic authentication work you need to extend [\OpenAPIServer\Auth\AbstractAuthenticator](./lib/Auth/AbstractAuthenticator.php) class by [\OpenAPIServer\Auth\BasicAuthenticator](./src/Auth/BasicAuthenticator.php) class.
-
 ### Security schema `petstore_auth`
 > Important! To make OAuth authentication work you need to extend [\OpenAPIServer\Auth\AbstractAuthenticator](./lib/Auth/AbstractAuthenticator.php) class by [\OpenAPIServer\Auth\OAuthAuthenticator](./src/Auth/OAuthAuthenticator.php) class.
 
diff --git a/samples/server/petstore/php-slim4/composer.json b/samples/server/petstore/php-slim4/composer.json
index c1afb518ef1a..8181c11ae832 100644
--- a/samples/server/petstore/php-slim4/composer.json
+++ b/samples/server/petstore/php-slim4/composer.json
@@ -8,14 +8,16 @@
     }
   ],
   "require": {
-    "php": "^7.1",
-    "slim/slim": "^4.0",
+    "php": "^7.2",
+    "slim/slim": "^4.5.0",
     "dyorg/slim-token-authentication": "dev-slim4",
-    "slim/psr7": "^0.4.0"
+    "ybelenko/openapi-data-mocker": "^1.0",
+    "ybelenko/openapi-data-mocker-server-middleware": "^1.0",
+    "slim/psr7": "^1.1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.0 || ^7.0",
-    "overtrue/phplint": "^1.0",
+    "phpunit/phpunit": "^8.0 || ^9.0",
+    "overtrue/phplint": "^2.0.2",
     "squizlabs/php_codesniffer": "^3.5"
   },
   "autoload": {
@@ -33,8 +35,6 @@
     ],
     "test-apis": "phpunit --testsuite Apis",
     "test-models": "phpunit --testsuite Models",
-    "test-mock": "phpunit --testsuite Mock",
-    "test-utils": "phpunit --testsuite Utils",
     "phpcs": "phpcs",
     "phplint": "phplint ./ --exclude=vendor"
   }
diff --git a/samples/server/petstore/php-slim4/docs/MockServer.md b/samples/server/petstore/php-slim4/docs/MockServer.md
deleted file mode 100644
index 76f5668ad51d..000000000000
--- a/samples/server/petstore/php-slim4/docs/MockServer.md
+++ /dev/null
@@ -1,135 +0,0 @@
-# php-base - PHP Slim 4 Server library for OpenAPI Petstore
-
-## Mock Server Documentation
-
-### Mocker Options
-To enable mock server uncomment these lines in `index.php` config file:
-
-```php
-/**
- * Mocker Middleware options.
- */
-$config['mockerOptions'] = [
-    'dataMocker' => new OpenApiDataMocker(),
-
-    'getMockResponseCallback' => function (ServerRequestInterface $request, array $responses) {
-        // check if client clearly asks for mocked response
-        if (
-            $request->hasHeader('X-OpenAPIServer-Mock')
-            && $request->getHeader('X-OpenAPIServer-Mock')[0] === 'ping'
-        ) {
-            if (array_key_exists('default', $responses)) {
-                return $responses['default'];
-            }
-
-            // return first response
-            return $responses[array_key_first($responses)];
-        }
-
-        return false;
-    },
-
-    'afterCallback' => function ($request, $response) {
-        // mark mocked response to distinguish real and fake responses
-        return $response->withHeader('X-OpenAPIServer-Mock', 'pong');
-    },
-];
-```
-
-* `dataMocker` is mocker class instance. To create custom data mocker extend `OpenAPIServer\Mock\OpenApiDataMockerInterface`.
-* `getMockResponseCallback` is callback before mock data generation. Above example shows how to enable mock feature for only requests with `{{X-OpenAPIServer}}-mock: ping` HTTP header. Adjust requests filtering to fit your project requirements. This function must return single response schema from `$responses` array parameter. **Mock feature is disabled when callback returns anything beside array.**
-* `afterCallback` is callback executed after mock data generation. Most obvious use case is append specific HTTP headers to distinguish real and fake responses. **This function must always return response instance.**
-
-### Supported features
-
-All data types supported except specific string formats: `email`, `uuid`, `password` which are poorly implemented.
-
-#### Data Types Support
-
-| Data Type | Data Format |      Supported     |
-|:---------:|:-----------:|:------------------:|
-| `integer` | `int32`     | :white_check_mark: |
-| `integer` | `int64`     | :white_check_mark: |
-| `number`  | `float`     | :white_check_mark: |
-| `number`  | `double`    |                    |
-| `string`  | `byte`      | :white_check_mark: |
-| `string`  | `binary`    | :white_check_mark: |
-| `boolean` |             | :white_check_mark: |
-| `string`  | `date`      | :white_check_mark: |
-| `string`  | `date-time` | :white_check_mark: |
-| `string`  | `password`  | :white_check_mark: |
-| `string`  | `email`     | :white_check_mark: |
-| `string`  | `uuid`      | :white_check_mark: |
-
-#### Data Options Support
-
-| Data Type   |         Option         |      Supported     |
-|:-----------:|:----------------------:|:------------------:|
-| `string`    | `minLength`            | :white_check_mark: |
-| `string`    | `maxLength`            | :white_check_mark: |
-| `string`    | `enum`                 | :white_check_mark: |
-| `string`    | `pattern`              |                    |
-| `integer`   | `minimum`              | :white_check_mark: |
-| `integer`   | `maximum`              | :white_check_mark: |
-| `integer`   | `exclusiveMinimum`     | :white_check_mark: |
-| `integer`   | `exclusiveMaximum`     | :white_check_mark: |
-| `number`    | `minimum`              | :white_check_mark: |
-| `number`    | `maximum`              | :white_check_mark: |
-| `number`    | `exclusiveMinimum`     | :white_check_mark: |
-| `number`    | `exclusiveMaximum`     | :white_check_mark: |
-| `array`     | `items`                | :white_check_mark: |
-| `array`     | `additionalItems`      |                    |
-| `array`     | `minItems`             | :white_check_mark: |
-| `array`     | `maxItems`             | :white_check_mark: |
-| `array`     | `uniqueItems`          |                    |
-| `object`    | `properties`           | :white_check_mark: |
-| `object`    | `maxProperties`        |                    |
-| `object`    | `minProperties`        |                    |
-| `object`    | `patternProperties`    |                    |
-| `object`    | `additionalProperties` |                    |
-| `object`    | `required`             |                    |
-| `*`         | `$ref`                 | :white_check_mark: |
-| `*`         | `allOf`                |                    |
-| `*`         | `anyOf`                |                    |
-| `*`         | `oneOf`                |                    |
-| `*`         | `not`                  |                    |
-
-### Known Limitations
-
-Avoid circular refs in your schema. Schema below can cause infinite loop and `Out of Memory` PHP error:
-```yml
-# ModelA has reference to ModelB while ModelB has reference to ModelA.
-# Mock server will produce huge nested JSON example and ended with `Out of Memory` error.
-definitions:
-  ModelA:
-    type: object
-    properties:
-      model_b:
-        $ref: '#/definitions/ModelB'
-  ModelB:
-    type: array
-    items:
-      $ref: '#/definitions/ModelA'
-```
-
-Don't ref scalar types, because generator will not produce models which mock server can find. So schema below will cause error:
-```yml
-# generated build contains only `OuterComposite` model class which referenced to not existed `OuterNumber`, `OuterString`, `OuterBoolean` classes
-# mock server cannot mock `OuterComposite` model and throws exception
-definitions:
-  OuterComposite:
-    type: object
-    properties:
-      my_number:
-        $ref: '#/definitions/OuterNumber'
-      my_string:
-        $ref: '#/definitions/OuterString'
-      my_boolean:
-        $ref: '#/definitions/OuterBoolean'
-  OuterNumber:
-    type: number
-  OuterString:
-    type: string
-  OuterBoolean:
-    type: boolean
-```
diff --git a/samples/server/petstore/php-slim4/index.php b/samples/server/petstore/php-slim4/index.php
index 8baabc9b1398..f5295cedc9ac 100644
--- a/samples/server/petstore/php-slim4/index.php
+++ b/samples/server/petstore/php-slim4/index.php
@@ -2,15 +2,24 @@
 
 /**
  * OpenAPI Petstore
+ * PHP version 7.2
  *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
- * @version 1.0.0
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+/**
+ * NOTE: This class is auto generated by the openapi generator program.
+ * https://github.com/openapitools/openapi-generator
+ */
+
 require_once __DIR__ . '/vendor/autoload.php';
 
 use OpenAPIServer\SlimRouter;
@@ -56,21 +65,28 @@
 /**
  * Mocker Middleware options.
  */
+$mocker = new OpenApiDataMocker();
+$mocker->setModelsNamespace('OpenAPIServer\Model\\');
 $config['mockerOptions'] = [
-    // 'dataMocker' => new OpenApiDataMocker(),
+    // 'dataMocker' => $mocker,
 
-    // 'getMockResponseCallback' => function (ServerRequestInterface $request, array $responses) {
+    // 'getMockStatusCodeCallback' => function (ServerRequestInterface $request, $responses) {
     //     // check if client clearly asks for mocked response
+    //     $pingHeader = 'X-OpenAPIServer-Mock';
+    //     $pingHeaderCode = 'X-OpenAPIServer-Mock-Code';
     //     if (
-    //         $request->hasHeader('X-OpenAPIServer-Mock')
-    //         && $request->getHeader('X-OpenAPIServer-Mock')[0] === 'ping'
+    //         $request->hasHeader($pingHeader)
+    //         && $request->getHeader($pingHeader)[0] === 'ping'
     //     ) {
-    //         if (array_key_exists('default', $responses)) {
-    //             return $responses['default'];
+    //         $responses = (array) $responses;
+    //         $requestedResponseCode = ($request->hasHeader($pingHeaderCode)) ? $request->getHeader($pingHeaderCode)[0] : 'default';
+    //         if (array_key_exists($requestedResponseCode, $responses)) {
+    //             return $requestedResponseCode;
     //         }
 
-    //         // return first response
-    //         return $responses[array_key_first($responses)];
+    //         // return first response key
+    //         reset($responses);
+    //         return key($responses);
     //     }
 
     //     return false;
diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractAnotherFakeApi.php b/samples/server/petstore/php-slim4/lib/Api/AbstractAnotherFakeApi.php
deleted file mode 100644
index 1473213d01e8..000000000000
--- a/samples/server/petstore/php-slim4/lib/Api/AbstractAnotherFakeApi.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * AbstractAnotherFakeApi
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Api;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Exception;
-
-/**
- * AbstractAnotherFakeApi Class Doc Comment
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-abstract class AbstractAnotherFakeApi
-{
-
-    /**
-     * @var ContainerInterface|null Slim app container instance
-     */
-    protected $container;
-
-    /**
-     * Route Controller constructor receives container
-     *
-     * @param ContainerInterface|null $container Slim app container instance
-     */
-    public function __construct(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
-
-
-    /**
-     * PATCH call123TestSpecialTags
-     * Summary: To test special tags
-     * Notes: To test special tags and operation ID starting with number
-     * Output-Formats: [application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function call123TestSpecialTags(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing call123TestSpecialTags as a PATCH method in OpenAPIServer\Api\AnotherFakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractFakeApi.php b/samples/server/petstore/php-slim4/lib/Api/AbstractFakeApi.php
deleted file mode 100644
index 6b3888966baa..000000000000
--- a/samples/server/petstore/php-slim4/lib/Api/AbstractFakeApi.php
+++ /dev/null
@@ -1,401 +0,0 @@
-<?php
-
-/**
- * AbstractFakeApi
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Api;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Exception;
-
-/**
- * AbstractFakeApi Class Doc Comment
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-abstract class AbstractFakeApi
-{
-
-    /**
-     * @var ContainerInterface|null Slim app container instance
-     */
-    protected $container;
-
-    /**
-     * Route Controller constructor receives container
-     *
-     * @param ContainerInterface|null $container Slim app container instance
-     */
-    public function __construct(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
-
-
-    /**
-     * POST createXmlItem
-     * Summary: creates an XmlItem
-     * Notes: this route creates an XmlItem
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function createXmlItem(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing createXmlItem as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * POST fakeOuterBooleanSerialize
-     * Notes: Test serialization of outer boolean types
-     * Output-Formats: [*_/_*]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function fakeOuterBooleanSerialize(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing fakeOuterBooleanSerialize as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * POST fakeOuterCompositeSerialize
-     * Notes: Test serialization of object with outer number type
-     * Output-Formats: [*_/_*]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function fakeOuterCompositeSerialize(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing fakeOuterCompositeSerialize as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * POST fakeOuterNumberSerialize
-     * Notes: Test serialization of outer number types
-     * Output-Formats: [*_/_*]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function fakeOuterNumberSerialize(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing fakeOuterNumberSerialize as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * POST fakeOuterStringSerialize
-     * Notes: Test serialization of outer string types
-     * Output-Formats: [*_/_*]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function fakeOuterStringSerialize(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing fakeOuterStringSerialize as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * PUT testBodyWithFileSchema
-     * Notes: For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testBodyWithFileSchema(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing testBodyWithFileSchema as a PUT method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * PUT testBodyWithQueryParams
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testBodyWithQueryParams(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $queryParams = $request->getQueryParams();
-        $query = (key_exists('query', $queryParams)) ? $queryParams['query'] : null;
-        $body = $request->getParsedBody();
-        $message = "How about implementing testBodyWithQueryParams as a PUT method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * PATCH testClientModel
-     * Summary: To test \&quot;client\&quot; model
-     * Notes: To test \&quot;client\&quot; model
-     * Output-Formats: [application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testClientModel(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing testClientModel as a PATCH method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * POST testEndpointParameters
-     * Summary: Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-     * Notes: Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testEndpointParameters(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $integer = (isset($body['integer'])) ? $body['integer'] : null;
-        $int32 = (isset($body['int32'])) ? $body['int32'] : null;
-        $int64 = (isset($body['int64'])) ? $body['int64'] : null;
-        $number = (isset($body['number'])) ? $body['number'] : null;
-        $float = (isset($body['float'])) ? $body['float'] : null;
-        $double = (isset($body['double'])) ? $body['double'] : null;
-        $string = (isset($body['string'])) ? $body['string'] : null;
-        $patternWithoutDelimiter = (isset($body['pattern_without_delimiter'])) ? $body['pattern_without_delimiter'] : null;
-        $byte = (isset($body['byte'])) ? $body['byte'] : null;
-        $binary = (isset($body['binary'])) ? $body['binary'] : null;
-        $date = (isset($body['date'])) ? $body['date'] : null;
-        $dateTime = (isset($body['dateTime'])) ? $body['dateTime'] : null;
-        $password = (isset($body['password'])) ? $body['password'] : null;
-        $callback = (isset($body['callback'])) ? $body['callback'] : null;
-        $message = "How about implementing testEndpointParameters as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * GET testEnumParameters
-     * Summary: To test enum parameters
-     * Notes: To test enum parameters
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testEnumParameters(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $headers = $request->getHeaders();
-        $enumHeaderStringArray = $request->hasHeader('enum_header_string_array') ? $headers['enum_header_string_array'] : null;
-        $enumHeaderString = $request->hasHeader('enum_header_string') ? $headers['enum_header_string'] : null;
-        $queryParams = $request->getQueryParams();
-        $enumQueryStringArray = (key_exists('enum_query_string_array', $queryParams)) ? $queryParams['enum_query_string_array'] : null;
-        $enumQueryString = (key_exists('enum_query_string', $queryParams)) ? $queryParams['enum_query_string'] : null;
-        $enumQueryInteger = (key_exists('enum_query_integer', $queryParams)) ? $queryParams['enum_query_integer'] : null;
-        $enumQueryDouble = (key_exists('enum_query_double', $queryParams)) ? $queryParams['enum_query_double'] : null;
-        $body = $request->getParsedBody();
-        $enumFormStringArray = (isset($body['enum_form_string_array'])) ? $body['enum_form_string_array'] : null;
-        $enumFormString = (isset($body['enum_form_string'])) ? $body['enum_form_string'] : null;
-        $message = "How about implementing testEnumParameters as a GET method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * DELETE testGroupParameters
-     * Summary: Fake endpoint to test group parameters (optional)
-     * Notes: Fake endpoint to test group parameters (optional)
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testGroupParameters(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $headers = $request->getHeaders();
-        $requiredBooleanGroup = $request->hasHeader('required_boolean_group') ? $headers['required_boolean_group'] : null;
-        $booleanGroup = $request->hasHeader('boolean_group') ? $headers['boolean_group'] : null;
-        $queryParams = $request->getQueryParams();
-        $requiredStringGroup = (key_exists('required_string_group', $queryParams)) ? $queryParams['required_string_group'] : null;
-        $requiredInt64Group = (key_exists('required_int64_group', $queryParams)) ? $queryParams['required_int64_group'] : null;
-        $stringGroup = (key_exists('string_group', $queryParams)) ? $queryParams['string_group'] : null;
-        $int64Group = (key_exists('int64_group', $queryParams)) ? $queryParams['int64_group'] : null;
-        $message = "How about implementing testGroupParameters as a DELETE method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * POST testInlineAdditionalProperties
-     * Summary: test inline additionalProperties
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testInlineAdditionalProperties(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing testInlineAdditionalProperties as a POST method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * GET testJsonFormData
-     * Summary: test json serialization of form data
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testJsonFormData(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $param = (isset($body['param'])) ? $body['param'] : null;
-        $param2 = (isset($body['param2'])) ? $body['param2'] : null;
-        $message = "How about implementing testJsonFormData as a GET method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * PUT testQueryParameterCollectionFormat
-     * Notes: To test the collection format in query parameters
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testQueryParameterCollectionFormat(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $queryParams = $request->getQueryParams();
-        $pipe = (key_exists('pipe', $queryParams)) ? $queryParams['pipe'] : null;
-        $ioutil = (key_exists('ioutil', $queryParams)) ? $queryParams['ioutil'] : null;
-        $http = (key_exists('http', $queryParams)) ? $queryParams['http'] : null;
-        $url = (key_exists('url', $queryParams)) ? $queryParams['url'] : null;
-        $context = (key_exists('context', $queryParams)) ? $queryParams['context'] : null;
-        $message = "How about implementing testQueryParameterCollectionFormat as a PUT method in OpenAPIServer\Api\FakeApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractFakeClassnameTags123Api.php b/samples/server/petstore/php-slim4/lib/Api/AbstractFakeClassnameTags123Api.php
deleted file mode 100644
index fb8a7b9db353..000000000000
--- a/samples/server/petstore/php-slim4/lib/Api/AbstractFakeClassnameTags123Api.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * AbstractFakeClassnameTags123Api
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Api;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Exception;
-
-/**
- * AbstractFakeClassnameTags123Api Class Doc Comment
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-abstract class AbstractFakeClassnameTags123Api
-{
-
-    /**
-     * @var ContainerInterface|null Slim app container instance
-     */
-    protected $container;
-
-    /**
-     * Route Controller constructor receives container
-     *
-     * @param ContainerInterface|null $container Slim app container instance
-     */
-    public function __construct(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
-
-
-    /**
-     * PATCH testClassname
-     * Summary: To test class name in snake case
-     * Notes: To test class name in snake case
-     * Output-Formats: [application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function testClassname(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $body = $request->getParsedBody();
-        $message = "How about implementing testClassname as a PATCH method in OpenAPIServer\Api\FakeClassnameTags123Api class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractPetApi.php b/samples/server/petstore/php-slim4/lib/Api/AbstractPetApi.php
index 9c3121b5eca2..cffea37cd763 100644
--- a/samples/server/petstore/php-slim4/lib/Api/AbstractPetApi.php
+++ b/samples/server/petstore/php-slim4/lib/Api/AbstractPetApi.php
@@ -1,19 +1,16 @@
 <?php
 
 /**
- * AbstractPetApi
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -28,7 +25,7 @@
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Exception;
+use Slim\Exception\HttpNotImplementedException;
 
 /**
  * AbstractPetApi Class Doc Comment
@@ -59,22 +56,20 @@ public function __construct(ContainerInterface $container = null)
     /**
      * POST addPet
      * Summary: Add a new pet to the store
+     * Output-Formats: [application/xml, application/json]
      *
      * @param ServerRequestInterface $request  Request
      * @param ResponseInterface      $response Response
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function addPet(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $body = $request->getParsedBody();
         $message = "How about implementing addPet as a POST method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -86,7 +81,7 @@ public function addPet(ServerRequestInterface $request, ResponseInterface $respo
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function deletePet(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
@@ -94,10 +89,7 @@ public function deletePet(ServerRequestInterface $request, ResponseInterface $re
         $apiKey = $request->hasHeader('api_key') ? $headers['api_key'] : null;
         $petId = $args['petId'];
         $message = "How about implementing deletePet as a DELETE method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -111,17 +103,14 @@ public function deletePet(ServerRequestInterface $request, ResponseInterface $re
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function findPetsByStatus(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $queryParams = $request->getQueryParams();
         $status = (key_exists('status', $queryParams)) ? $queryParams['status'] : null;
         $message = "How about implementing findPetsByStatus as a GET method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -135,17 +124,14 @@ public function findPetsByStatus(ServerRequestInterface $request, ResponseInterf
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function findPetsByTags(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $queryParams = $request->getQueryParams();
         $tags = (key_exists('tags', $queryParams)) ? $queryParams['tags'] : null;
         $message = "How about implementing findPetsByTags as a GET method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -159,37 +145,32 @@ public function findPetsByTags(ServerRequestInterface $request, ResponseInterfac
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function getPetById(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $petId = $args['petId'];
         $message = "How about implementing getPetById as a GET method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
      * PUT updatePet
      * Summary: Update an existing pet
+     * Output-Formats: [application/xml, application/json]
      *
      * @param ServerRequestInterface $request  Request
      * @param ResponseInterface      $response Response
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function updatePet(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $body = $request->getParsedBody();
         $message = "How about implementing updatePet as a PUT method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -201,7 +182,7 @@ public function updatePet(ServerRequestInterface $request, ResponseInterface $re
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function updatePetWithForm(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
@@ -210,10 +191,7 @@ public function updatePetWithForm(ServerRequestInterface $request, ResponseInter
         $name = (isset($body['name'])) ? $body['name'] : null;
         $status = (isset($body['status'])) ? $body['status'] : null;
         $message = "How about implementing updatePetWithForm as a POST method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -226,7 +204,7 @@ public function updatePetWithForm(ServerRequestInterface $request, ResponseInter
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function uploadFile(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
@@ -235,34 +213,6 @@ public function uploadFile(ServerRequestInterface $request, ResponseInterface $r
         $additionalMetadata = (isset($body['additionalMetadata'])) ? $body['additionalMetadata'] : null;
         $file = (key_exists('file', $request->getUploadedFiles())) ? $request->getUploadedFiles()['file'] : null;
         $message = "How about implementing uploadFile as a POST method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
-    }
-
-    /**
-     * POST uploadFileWithRequiredFile
-     * Summary: uploads an image (required)
-     * Output-Formats: [application/json]
-     *
-     * @param ServerRequestInterface $request  Request
-     * @param ResponseInterface      $response Response
-     * @param array|null             $args     Path arguments
-     *
-     * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
-     */
-    public function uploadFileWithRequiredFile(ServerRequestInterface $request, ResponseInterface $response, array $args)
-    {
-        $petId = $args['petId'];
-        $body = $request->getParsedBody();
-        $additionalMetadata = (isset($body['additionalMetadata'])) ? $body['additionalMetadata'] : null;
-        $requiredFile = (key_exists('requiredFile', $request->getUploadedFiles())) ? $request->getUploadedFiles()['requiredFile'] : null;
-        $message = "How about implementing uploadFileWithRequiredFile as a POST method in OpenAPIServer\Api\PetApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 }
diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractStoreApi.php b/samples/server/petstore/php-slim4/lib/Api/AbstractStoreApi.php
index 48ef2d19da10..00d50340c81b 100644
--- a/samples/server/petstore/php-slim4/lib/Api/AbstractStoreApi.php
+++ b/samples/server/petstore/php-slim4/lib/Api/AbstractStoreApi.php
@@ -1,19 +1,16 @@
 <?php
 
 /**
- * AbstractStoreApi
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -28,7 +25,7 @@
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Exception;
+use Slim\Exception\HttpNotImplementedException;
 
 /**
  * AbstractStoreApi Class Doc Comment
@@ -66,16 +63,13 @@ public function __construct(ContainerInterface $container = null)
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function deleteOrder(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
-        $orderId = $args['order_id'];
+        $orderId = $args['orderId'];
         $message = "How about implementing deleteOrder as a DELETE method in OpenAPIServer\Api\StoreApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -89,15 +83,12 @@ public function deleteOrder(ServerRequestInterface $request, ResponseInterface $
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function getInventory(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $message = "How about implementing getInventory as a GET method in OpenAPIServer\Api\StoreApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -111,16 +102,13 @@ public function getInventory(ServerRequestInterface $request, ResponseInterface
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function getOrderById(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
-        $orderId = $args['order_id'];
+        $orderId = $args['orderId'];
         $message = "How about implementing getOrderById as a GET method in OpenAPIServer\Api\StoreApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -133,15 +121,12 @@ public function getOrderById(ServerRequestInterface $request, ResponseInterface
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function placeOrder(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $body = $request->getParsedBody();
         $message = "How about implementing placeOrder as a POST method in OpenAPIServer\Api\StoreApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 }
diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractUserApi.php b/samples/server/petstore/php-slim4/lib/Api/AbstractUserApi.php
index 4a8e268bf060..7b679c16c6de 100644
--- a/samples/server/petstore/php-slim4/lib/Api/AbstractUserApi.php
+++ b/samples/server/petstore/php-slim4/lib/Api/AbstractUserApi.php
@@ -1,19 +1,16 @@
 <?php
 
 /**
- * AbstractUserApi
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -28,7 +25,7 @@
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Exception;
+use Slim\Exception\HttpNotImplementedException;
 
 /**
  * AbstractUserApi Class Doc Comment
@@ -66,16 +63,13 @@ public function __construct(ContainerInterface $container = null)
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function createUser(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $body = $request->getParsedBody();
         $message = "How about implementing createUser as a POST method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -87,16 +81,13 @@ public function createUser(ServerRequestInterface $request, ResponseInterface $r
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function createUsersWithArrayInput(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $body = $request->getParsedBody();
         $message = "How about implementing createUsersWithArrayInput as a POST method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -108,16 +99,13 @@ public function createUsersWithArrayInput(ServerRequestInterface $request, Respo
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function createUsersWithListInput(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $body = $request->getParsedBody();
         $message = "How about implementing createUsersWithListInput as a POST method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -130,16 +118,13 @@ public function createUsersWithListInput(ServerRequestInterface $request, Respon
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function deleteUser(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $username = $args['username'];
         $message = "How about implementing deleteUser as a DELETE method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -152,16 +137,13 @@ public function deleteUser(ServerRequestInterface $request, ResponseInterface $r
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function getUserByName(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $username = $args['username'];
         $message = "How about implementing getUserByName as a GET method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -174,7 +156,7 @@ public function getUserByName(ServerRequestInterface $request, ResponseInterface
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function loginUser(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
@@ -182,10 +164,7 @@ public function loginUser(ServerRequestInterface $request, ResponseInterface $re
         $username = (key_exists('username', $queryParams)) ? $queryParams['username'] : null;
         $password = (key_exists('password', $queryParams)) ? $queryParams['password'] : null;
         $message = "How about implementing loginUser as a GET method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -197,15 +176,12 @@ public function loginUser(ServerRequestInterface $request, ResponseInterface $re
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function logoutUser(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $message = "How about implementing logoutUser as a GET method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 
     /**
@@ -218,16 +194,13 @@ public function logoutUser(ServerRequestInterface $request, ResponseInterface $r
      * @param array|null             $args     Path arguments
      *
      * @return ResponseInterface
-     * @throws Exception to force implementation class to override this method
+     * @throws HttpNotImplementedException to force implementation class to override this method
      */
     public function updateUser(ServerRequestInterface $request, ResponseInterface $response, array $args)
     {
         $username = $args['username'];
         $body = $request->getParsedBody();
         $message = "How about implementing updateUser as a PUT method in OpenAPIServer\Api\UserApi class?";
-        throw new Exception($message);
-
-        $response->getBody()->write($message);
-        return $response->withStatus(501);
+        throw new HttpNotImplementedException($request, $message);
     }
 }
diff --git a/samples/server/petstore/php-slim4/lib/Auth/AbstractAuthenticator.php b/samples/server/petstore/php-slim4/lib/Auth/AbstractAuthenticator.php
index b45f136f4253..33fbd4dfe44e 100644
--- a/samples/server/petstore/php-slim4/lib/Auth/AbstractAuthenticator.php
+++ b/samples/server/petstore/php-slim4/lib/Auth/AbstractAuthenticator.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * AbstractAuthenticator
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,9 +10,7 @@
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
diff --git a/samples/server/petstore/php-slim4/lib/BaseModel.php b/samples/server/petstore/php-slim4/lib/BaseModel.php
new file mode 100644
index 000000000000..d33e7921de9a
--- /dev/null
+++ b/samples/server/petstore/php-slim4/lib/BaseModel.php
@@ -0,0 +1,332 @@
+<?php
+
+/**
+ * OpenAPI Petstore
+ * PHP version 7.2
+ *
+ * @package OpenAPIServer
+ * @author  OpenAPI Generator team
+ * @link    https://github.com/openapitools/openapi-generator
+ */
+
+/**
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+/**
+ * NOTE: This class is auto generated by the openapi generator program.
+ * https://github.com/openapitools/openapi-generator
+ * Do not edit the class manually.
+ */
+
+declare(strict_types=1);
+
+namespace OpenAPIServer;
+
+use OpenAPIServer\Mock\OpenApiModelInterface;
+use OpenAPIServer\Mock\OpenApiDataMockerInterface as IMocker;
+use InvalidArgumentException;
+use StdClass;
+
+/**
+ * BaseModel.
+ */
+class BaseModel implements OpenApiModelInterface
+{
+    // phpcs:disable Generic.Commenting.DocComment
+
+    /**
+     * @var string Constant with OAS schema of current class.
+     * Should be overwritten by inherited class.
+     */
+    protected const MODEL_SCHEMA =
+    <<<'SCHEMA'
+    {
+        "type" : "object",
+        "properties": {}
+    }
+SCHEMA;
+
+    /** @var string[] Valid OAS data types */
+    protected const VALID_OAS_DATA_TYPES = [
+        IMocker::DATA_TYPE_INTEGER,
+        IMocker::DATA_TYPE_NUMBER,
+        IMocker::DATA_TYPE_STRING,
+        IMocker::DATA_TYPE_BOOLEAN,
+        IMocker::DATA_TYPE_ARRAY,
+        IMocker::DATA_TYPE_OBJECT,
+    ];
+
+    /**
+     * @var string Models namespace.
+     * Can be required for data deserialization when model contains referenced schemas.
+     */
+    protected const MODELS_NAMESPACE = '\OpenAPIServer\Model';
+
+    /**
+     * @var mixed Data container.
+     * PHP has restrictions on variable names, while OAS is much more permissive.
+     * This container helps to store unusual properties like '123_prop' without renaming.
+     */
+    protected $dataContainer;
+    // phpcs:enable
+
+    /**
+     * Model constructor.
+     */
+    public function __construct()
+    {
+        $schema = static::getOpenApiSchema();
+        $modelType = (array_key_exists('type', $schema)) ? $schema['type'] : null;
+        $this->validateModelType($modelType, true);
+
+        // set initial data
+        switch ($modelType) {
+            case IMocker::DATA_TYPE_OBJECT:
+            case IMocker::DATA_TYPE_ARRAY:
+                $this->dataContainer = [];
+                break;
+            case IMocker::DATA_TYPE_INTEGER:
+            case IMocker::DATA_TYPE_NUMBER:
+            case IMocker::DATA_TYPE_STRING:
+            case IMocker::DATA_TYPE_BOOLEAN:
+            default:
+                // scalar type
+                $this->dataContainer = null;
+        }
+    }
+
+    /**
+     * Gets OAS 3.0 schema mapped to current class.
+     *
+     * @return array
+     */
+    public static function getOpenApiSchema(): array
+    {
+        return json_decode(static::MODEL_SCHEMA, true);
+    }
+
+    /**
+     * Creates new instance from provided data.
+     *
+     * @param mixed $data Data with values for new instance.
+     *
+     * @return OpenApiModelInterface
+     */
+    public static function createFromData($data): OpenApiModelInterface
+    {
+        $instance = new static();
+        $instance->setData($data);
+        return $instance;
+    }
+
+    /**
+     * Sets instance data.
+     *
+     * @param mixed $data Data with values for new instance.
+     *
+     * @throws \InvalidArgumentException When value for array type is invalid.
+     *
+     * @return void
+     */
+    public function setData($data): void
+    {
+        $schema = (array) static::getOpenApiSchema();
+        $modelType = (array_key_exists('type', $schema)) ? $schema['type'] : null;
+        switch ($modelType) {
+            case IMocker::DATA_TYPE_ARRAY:
+                // data for array OAS type should be straight indexed array
+                if (is_array($data)) {
+                    $arr = [];
+                    for ($i = 0; $i < count($data); $i++) {
+                        if (isset($data[$i])) {
+                            $arr[$i] = $data[$i];
+                        }
+                    }
+
+                    if (count($arr) === count($data)) {
+                        $this->dataContainer = $arr;
+                        return;
+                    }
+                }
+
+                throw new InvalidArgumentException(
+                    sprintf('Invalid data for %s model because it accepts straight indexed arrays only', static::class)
+                );
+                break;
+            case IMocker::DATA_TYPE_OBJECT:
+                foreach ($data as $key => $value) {
+                    // this action handles __set method
+                    $this->{$key} = $value;
+                }
+                break;
+            case IMocker::DATA_TYPE_INTEGER:
+            case IMocker::DATA_TYPE_NUMBER:
+            case IMocker::DATA_TYPE_STRING:
+            case IMocker::DATA_TYPE_BOOLEAN:
+            default:
+                $this->dataContainer = $data;
+                break;
+        }
+    }
+
+    /**
+     * Returns instance data.
+     *
+     * @return mixed
+     */
+    public function getData()
+    {
+        $data = null;
+        $schema = (array) static::getOpenApiSchema();
+        $modelType = (array_key_exists('type', $schema)) ? $schema['type'] : null;
+        switch ($modelType) {
+            case IMocker::DATA_TYPE_OBJECT:
+                // need to convert data container to object
+                $data = new StdClass();
+                $definedProps = (array_key_exists('properties', $schema)) ? $schema['properties'] : null;
+                if (is_array($definedProps) || is_object($definedProps)) {
+                    foreach ($definedProps as $propName => $propSchema) {
+                        if (array_key_exists($propName, $this->dataContainer)) {
+                            $data->{$propName} = $this->dataContainer[$propName];
+                        } elseif (array_key_exists('required', $schema) && in_array($propName, $schema['required'])) {
+                            // property is required but not set
+                            $data->{$propName} = null;
+                        }
+                    }
+                }
+                break;
+            case IMocker::DATA_TYPE_INTEGER:
+            case IMocker::DATA_TYPE_NUMBER:
+            case IMocker::DATA_TYPE_STRING:
+            case IMocker::DATA_TYPE_BOOLEAN:
+            case IMocker::DATA_TYPE_ARRAY:
+            default:
+                $data = $this->dataContainer;
+        }
+        return $data;
+    }
+
+    /**
+     * Writes data to inaccessible (protected or private) or non-existing properties.
+     * Ref @link https://www.php.net/manual/en/language.oop5.overloading.php#object.set
+     *
+     * @param string $param Property name.
+     * @param mixed  $value Property value.
+     *
+     * @throws \InvalidArgumentException When property doesn't exist in related OAS schema.
+     *
+     * @return void
+     */
+    public function __set(string $param, $value): void
+    {
+        $schema = (array) static::getOpenApiSchema();
+        $modelType = (array_key_exists('type', $schema)) ? $schema['type'] : null;
+        switch ($modelType) {
+            case IMocker::DATA_TYPE_OBJECT:
+                $definedProps = (array_key_exists('properties', $schema)) ? (array) $schema['properties'] : null;
+                if (is_array($definedProps) && !in_array($param, array_keys($definedProps))) {
+                    throw new InvalidArgumentException(
+                        sprintf('Cannot set %s property of %s model because it doesn\'t exist in related OAS schema', $param, static::class)
+                    );
+                }
+                $this->dataContainer[$param] = $value;
+                break;
+            case IMocker::DATA_TYPE_INTEGER:
+            case IMocker::DATA_TYPE_NUMBER:
+            case IMocker::DATA_TYPE_STRING:
+            case IMocker::DATA_TYPE_BOOLEAN:
+            case IMocker::DATA_TYPE_ARRAY:
+            default:
+                // scalar type and array cannot use property assignation
+                throw new InvalidArgumentException(
+                    sprintf('Cannot set %s property of %s model because it\'s %s type. Use setData method instead', $param, static::class, $modelType)
+                );
+        }
+    }
+
+    /**
+     * Reads data from inaccessible (protected or private) or non-existing properties.
+     * Ref @link https://www.php.net/manual/en/language.oop5.overloading.php#object.get
+     *
+     * @param string $param Property name.
+     *
+     * @throws \InvalidArgumentException When property doesn't exist in related OAS schema.
+     *
+     * @return mixed Property value
+     */
+    public function __get(string $param)
+    {
+        $schema = (array) static::getOpenApiSchema();
+        $modelType = (array_key_exists('type', $schema)) ? $schema['type'] : null;
+        $definedProps = (array_key_exists('properties', $schema)) ? (array) $schema['properties'] : null;
+        if (!in_array($modelType, [null, IMocker::DATA_TYPE_OBJECT])) {
+            // scalar type
+            throw new InvalidArgumentException(
+                sprintf('Cannot get %s property of %s model because getter is for object OAS type only', $param, static::class)
+            );
+        }
+
+        if (
+            is_array($definedProps)
+            && in_array($param, array_keys($definedProps))
+        ) {
+            return $this->dataContainer[$param];
+        } elseif ($definedProps === null) {
+            // props are undefined
+            return (isset($this->dataContainer[$param])) ? $this->dataContainer[$param] : null;
+        }
+
+        throw new InvalidArgumentException(
+            sprintf('Cannot get %s property of %s model because it doesn\'t exist in related OAS schema', $param, static::class)
+        );
+    }
+
+    /**
+     * Serializes the object to a value that can be serialized natively by json_encode().
+     * Ref @link https://www.php.net/manual/en/jsonserializable.jsonserialize.php
+     *
+     * @return mixed Returns data which can be serialized by json_encode(), which is a value of any type other than a resource.
+     */
+    public function jsonSerialize()
+    {
+        return $this->getData();
+    }
+
+    /**
+     * Checks if type is valid OAS data type.
+     *
+     * @param string|null $type           Model type.
+     * @param bool        $throwException Throws InvalidArgumentException when set to true and processed type is invalid.
+     *
+     * @throws \InvalidArgumentException When $throwException set to TRUE.
+     *
+     * @return bool
+     */
+    protected function validateModelType(?string $type = null, bool $throwException = true): bool
+    {
+        $isValid = in_array($type, static::VALID_OAS_DATA_TYPES);
+        if ($type !== null && $isValid === false && $throwException) {
+            throw new InvalidArgumentException(
+                sprintf(
+                    'Invalid OAS schema of %s model, "type" must be one of %s',
+                    static::class,
+                    implode(', ', static::VALID_OAS_DATA_TYPES)
+                )
+            );
+        }
+        return $isValid;
+    }
+
+    /**
+     * Returns models namespace.
+     *
+     * @return string
+     */
+    public static function getModelsNamespace(): string
+    {
+        return static::MODELS_NAMESPACE . stripslashes('\\');
+    }
+}
diff --git a/samples/server/petstore/php-slim4/lib/Interfaces/ModelInterface.php b/samples/server/petstore/php-slim4/lib/Interfaces/ModelInterface.php
deleted file mode 100644
index 480eae3d38da..000000000000
--- a/samples/server/petstore/php-slim4/lib/Interfaces/ModelInterface.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * ModelInterface
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Interfaces;
-
-/**
- * ModelInterface Class Doc Comment
- *
- * @package OpenAPIServer\Interfaces
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-interface ModelInterface
-{
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false);
-}
diff --git a/samples/server/petstore/php-slim4/lib/Middleware/JsonBodyParserMiddleware.php b/samples/server/petstore/php-slim4/lib/Middleware/JsonBodyParserMiddleware.php
index 6d03bb9383d6..e2811063d2f8 100644
--- a/samples/server/petstore/php-slim4/lib/Middleware/JsonBodyParserMiddleware.php
+++ b/samples/server/petstore/php-slim4/lib/Middleware/JsonBodyParserMiddleware.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * JsonBodyParserMiddleware
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,9 +10,7 @@
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
diff --git a/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMocker.php b/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMocker.php
deleted file mode 100644
index 662cfcca9d5b..000000000000
--- a/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMocker.php
+++ /dev/null
@@ -1,624 +0,0 @@
-<?php
-
-/**
- * OpenApiDataMocker
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Mock;
-
-use OpenAPIServer\Mock\OpenApiDataMockerInterface as IMocker;
-use OpenAPIServer\Utils\ModelUtilsTrait;
-use StdClass;
-use DateTime;
-use InvalidArgumentException;
-
-/**
- * OpenApiDataMocker Class Doc Comment
- *
- * @package OpenAPIServer\Mock
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-final class OpenApiDataMocker implements IMocker
-{
-    use ModelUtilsTrait;
-
-    /**
-     * Mocks OpenApi Data.
-     * @see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#data-types
-     *
-     * @param $dataType   string     OpenApi data type. Use constants from OpenApiDataMockerInterface class
-     * @param $dataFormat string     (optional) OpenApi data format
-     * @param $options    array|null (optional) OpenApi data options
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return mixed
-     */
-    public function mock($dataType, $dataFormat = null, $options = [])
-    {
-        switch ($dataType) {
-            case IMocker::DATA_TYPE_INTEGER:
-            case IMocker::DATA_TYPE_NUMBER:
-                $minimum = $options['minimum'] ?? null;
-                $maximum = $options['maximum'] ?? null;
-                $exclusiveMinimum = $options['exclusiveMinimum'] ?? false;
-                $exclusiveMaximum = $options['exclusiveMaximum'] ?? false;
-                if ($dataType === IMocker::DATA_TYPE_INTEGER) {
-                    return $this->mockInteger($dataFormat, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-                }
-                return $this->mockNumber($dataFormat, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-            case IMocker::DATA_TYPE_STRING:
-                $minLength = $options['minLength'] ?? 0;
-                $maxLength = $options['maxLength'] ?? null;
-                $enum = $options['enum'] ?? null;
-                return $this->mockString($dataFormat, $minLength, $maxLength, $enum);
-            case IMocker::DATA_TYPE_BOOLEAN:
-                return $this->mockBoolean();
-            case IMocker::DATA_TYPE_ARRAY:
-                $items = $options['items'] ?? null;
-                $minItems = $options['minItems'] ?? 0;
-                $maxItems = $options['maxItems'] ?? null;
-                $uniqueItems = $options['uniqueItems'] ?? false;
-                return $this->mockArray($items, $minItems, $maxItems, $uniqueItems);
-            case IMocker::DATA_TYPE_OBJECT:
-                $properties = $options['properties'] ?? null;
-                $minProperties = $options['minProperties'] ?? 0;
-                $maxProperties = $options['maxProperties'] ?? null;
-                $additionalProperties = $options['additionalProperties'] ?? null;
-                $required = $options['required'] ?? null;
-                return $this->mockObject($properties, $minProperties, $maxProperties, $additionalProperties, $required);
-            default:
-                throw new InvalidArgumentException('"dataType" must be one of ' . implode(', ', [
-                    IMocker::DATA_TYPE_INTEGER,
-                    IMocker::DATA_TYPE_NUMBER,
-                    IMocker::DATA_TYPE_STRING,
-                    IMocker::DATA_TYPE_BOOLEAN,
-                    IMocker::DATA_TYPE_ARRAY,
-                    IMocker::DATA_TYPE_OBJECT,
-                ]));
-        }
-    }
-
-    /**
-     * Shortcut to mock integer type
-     * Equivalent to mockData(DATA_TYPE_INTEGER);
-     *
-     * @param string|null $dataFormat       (optional) int32 or int64
-     * @param number|null $minimum          (optional) Default is 0
-     * @param number|null $maximum          (optional) Default is mt_getrandmax()
-     * @param bool|null   $exclusiveMinimum (optional) Default is false
-     * @param bool|null   $exclusiveMaximum (optional) Default is false
-     *
-     * @throws \InvalidArgumentException when $maximum less than $minimum or invalid arguments provided
-     *
-     * @return int
-     */
-    public function mockInteger(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false
-    ) {
-        $dataFormat = is_string($dataFormat) ? strtolower($dataFormat) : $dataFormat;
-        switch ($dataFormat) {
-            case IMocker::DATA_FORMAT_INT32:
-                // -2147483647..2147483647
-                $minimum = is_numeric($minimum) ? max($minimum, -2147483647) : -2147483647;
-                $maximum = is_numeric($maximum) ? min($maximum, 2147483647) : 2147483647;
-                break;
-            case IMocker::DATA_FORMAT_INT64:
-                // -9223372036854775807..9223372036854775807
-                $minimum = is_numeric($minimum) ? max($minimum, -9223372036854775807) : -9223372036854775807;
-                $maximum = is_numeric($maximum) ? min($maximum, 9223372036854775807) : 9223372036854775807;
-                break;
-            default:
-                // do nothing, unsupported format
-        }
-
-        return $this->getRandomNumber($minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum, 0);
-    }
-
-    /**
-     * Shortcut to mock number type
-     * Equivalent to mockData(DATA_TYPE_NUMBER);
-     *
-     * @param string|null $dataFormat       (optional) float or double
-     * @param number|null $minimum          (optional) Default is 0
-     * @param number|null $maximum          (optional) Default is mt_getrandmax()
-     * @param bool|null   $exclusiveMinimum (optional) Default is false
-     * @param bool|null   $exclusiveMaximum (optional) Default is false
-     *
-     * @throws \InvalidArgumentException when $maximum less than $minimum or invalid arguments provided
-     *
-     * @return float
-     */
-    public function mockNumber(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false
-    ) {
-        return $this->getRandomNumber($minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum, 4);
-    }
-
-    /**
-     * Shortcut to mock string type
-     * Equivalent to mockData(DATA_TYPE_STRING);
-     *
-     * @param string|null $dataFormat (optional) one of byte, binary, date, date-time, password
-     * @param int|null    $minLength  (optional) Default is 0
-     * @param int|null    $maxLength  (optional) Default is 100 chars
-     * @param array       $enum       (optional) This array should have at least one element.
-     * Elements in the array should be unique.
-     * @param string|null $pattern    (optional) This string should be a valid regular expression, according to the ECMA 262 regular expression dialect.
-     * Recall: regular expressions are not implicitly anchored.
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return string
-     */
-    public function mockString(
-        $dataFormat = null,
-        $minLength = 0,
-        $maxLength = null,
-        $enum = null,
-        $pattern = null
-    ) {
-        $str = '';
-        $getLoremIpsum = function ($length) {
-            return str_pad(
-                '',
-                $length,
-                'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ',
-                \STR_PAD_RIGHT
-            );
-        };
-        $truncateOrPad = function ($text, $min = null, $max = null, $glue = '') {
-            if ($max !== null && mb_strlen($text) > $max) {
-                // truncate
-                $text = substr($text, 0, $max);
-            } elseif ($min !== null && mb_strlen($text) < $min) {
-                // pad
-                $text = str_pad('', $min, $text . $glue, \STR_PAD_RIGHT);
-            }
-            return $text;
-        };
-
-        if ($enum !== null) {
-            if (
-                is_array($enum) === false
-                || empty($enum)
-                || count($enum) > count(array_unique($enum))
-            ) {
-                throw new InvalidArgumentException('"enum" must be an array. This array should have at least one element. Elements in the array should be unique.');
-            }
-
-            // return random variant
-            return $enum[mt_rand(0, count($enum) - 1)];
-        }
-
-        if ($minLength !== 0 && $minLength !== null) {
-            if (is_int($minLength) === false) {
-                throw new InvalidArgumentException('"minLength" must be an integer');
-            } elseif ($minLength < 0) {
-                throw new InvalidArgumentException('"minLength" must be greater than, or equal to, 0');
-            }
-        } else {
-            $minLength = 0;
-        }
-
-        if ($maxLength !== null) {
-            if (is_int($maxLength) === false) {
-                throw new InvalidArgumentException('"maxLength" must be an integer');
-            } elseif ($maxLength < 0) {
-                throw new InvalidArgumentException('"maxLength" must be greater than, or equal to, 0');
-            }
-        } else {
-            // since we don't need huge texts by default, lets cut them down to 100 chars
-            $maxLength = 100;
-        }
-
-        if ($maxLength < $minLength) {
-            throw new InvalidArgumentException('"maxLength" value cannot be less than "minLength"');
-        }
-
-        switch ($dataFormat) {
-            case IMocker::DATA_FORMAT_BYTE:
-            case IMocker::DATA_FORMAT_BINARY:
-                // base64 encoded string
-                $inputLength = 1;
-                $str = base64_encode($getLoremIpsum($inputLength));
-                while (mb_strlen($str) < $minLength) {
-                    $inputLength++;
-                    $str = base64_encode($getLoremIpsum($inputLength));
-                }
-
-                // base64 encoding produces strings devided by 4, so resulted string can exceed maxLength parameter
-                // I think truncated(invalid) base64 string is better than oversized, cause this data is fake anyway
-                $str = $truncateOrPad($str, null, $maxLength, '. ');
-                break;
-            case IMocker::DATA_FORMAT_DATE:
-            case IMocker::DATA_FORMAT_DATE_TIME:
-                // min unix timestamp is 0 and max is 2147483647 for 32bit systems which equals 2038-01-19 03:14:07
-                $date = DateTime::createFromFormat('U', mt_rand(0, 2147483647));
-                $str = ($dataFormat === IMocker::DATA_FORMAT_DATE) ? $date->format('Y-m-d') : $date->format('Y-m-d\TH:i:sP');
-
-                // truncate or pad datestring to fit minLength and maxLength
-                $str = $truncateOrPad($str, $minLength, $maxLength, ' ');
-                break;
-            case IMocker::DATA_FORMAT_PASSWORD:
-                // use list of most popular passwords
-                $obviousPassList = [
-                    'qwerty',
-                    'qwerty12345',
-                    'hello',
-                    '12345',
-                    '0000',
-                    'qwerty12345!',
-                    'qwertyuiop[]',
-                ];
-                $str = $obviousPassList[mt_rand(0, count($obviousPassList) - 1)];
-
-                // truncate or pad password to fit minLength and maxLength
-                $str = $truncateOrPad($str, $minLength, $maxLength);
-                break;
-            case IMocker::DATA_FORMAT_UUID:
-                // use php built-in uniqid function
-                $str = uniqid();
-
-                // truncate or pad password to fit minLength and maxLength
-                $str = $truncateOrPad($str, $minLength, $maxLength);
-                break;
-            case IMocker::DATA_FORMAT_EMAIL:
-                // just for visionary purpose, not related to real persons
-                $fakeEmailList = [
-                    'johndoe',
-                    'lhoswald',
-                    'ojsimpson',
-                    'mlking',
-                    'jfkennedy',
-                ];
-                $str = $fakeEmailList[mt_rand(0, count($fakeEmailList) - 1)] . '@example.com';
-
-                // truncate or pad email to fit minLength and maxLength
-                $str = $truncateOrPad($str, $minLength, $maxLength);
-                break;
-            default:
-                $str = $getLoremIpsum(mt_rand($minLength, $maxLength));
-        }
-
-        return $str;
-    }
-
-    /**
-     * Shortcut to mock boolean type
-     * Equivalent to mockData(DATA_TYPE_BOOLEAN);
-     *
-     * @return bool
-     */
-    public function mockBoolean()
-    {
-        return (bool) mt_rand(0, 1);
-    }
-
-    /**
-     * Shortcut to mock array type
-     * Equivalent to mockData(DATA_TYPE_ARRAY);
-     *
-     * @param object|array $items       Object or assoc array of described items
-     * @param int|null     $minItems    (optional) An array instance is valid against "minItems" if its size is greater than, or equal to, the value of this keyword.
-     * @param int|null     $maxItems    (optional) An array instance is valid against "maxItems" if its size is less than, or equal to, the value of this keyword
-     * @param bool|null    $uniqueItems (optional) If it has boolean value true, the instance validates successfully if all of its elements are unique
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return array
-     */
-    public function mockArray(
-        $items,
-        $minItems = 0,
-        $maxItems = null,
-        $uniqueItems = false
-    ) {
-        $arr = [];
-        $minSize = 0;
-        $maxSize = \PHP_INT_MAX;
-
-        if (
-            (is_array($items) === false && is_object($items) === false)
-            || (is_array($items) && array_key_exists('type', $items) === false)
-            || (is_object($items) && isset($items->type) === false)
-        ) {
-            new InvalidArgumentException('"items" must be object or assoc array with "type" key');
-        }
-
-        if ($minItems !== null) {
-            if (is_integer($minItems) === false || $minItems < 0) {
-                throw new InvalidArgumentException('"mitItems" must be an integer. This integer must be greater than, or equal to, 0');
-            }
-            $minSize = $minItems;
-        }
-
-        if ($maxItems !== null) {
-            if (is_integer($maxItems) === false || $maxItems < 0) {
-                throw new InvalidArgumentException('"maxItems" must be an integer. This integer must be greater than, or equal to, 0.');
-            }
-            if ($maxItems < $minItems) {
-                throw new InvalidArgumentException('"maxItems" value cannot be less than "minItems"');
-            }
-            $maxSize = $maxItems;
-        }
-
-        $options = $this->extractSchemaProperties($items);
-        $dataType = $options['type'];
-        $dataFormat = $options['format'] ?? null;
-        $ref = $options['$ref'] ?? null;
-
-        // always generate smallest possible array to avoid huge JSON responses
-        $arrSize = ($maxSize < 1) ? $maxSize : max($minSize, 1);
-        while (count($arr) < $arrSize) {
-            $data = $this->mockFromRef($ref);
-            $arr[] = ($data) ? $data : $this->mock($dataType, $dataFormat, $options);
-        }
-        return $arr;
-    }
-
-    /**
-     * Shortcut to mock object type.
-     * Equivalent to mockData(DATA_TYPE_OBJECT);
-     *
-     * @param object|array           $properties           Object or array of described properties
-     * @param int|null               $minProperties        (optional) An object instance is valid against "minProperties" if its number of properties is greater than, or equal to, the value of this keyword.
-     * @param int|null               $maxProperties        (optional) An object instance is valid against "maxProperties" if its number of properties is less than, or equal to, the value of this keyword.
-     * @param bool|object|array|null $additionalProperties (optional) If "additionalProperties" is true, validation always succeeds.
-     * If "additionalProperties" is false, validation succeeds only if the instance is an object and all properties on the instance were covered by "properties" and/or "patternProperties".
-     * If "additionalProperties" is an object, validate the value as a schema to all of the properties that weren't validated by "properties" nor "patternProperties".
-     * @param array|null             $required             (optional) This array MUST have at least one element.  Elements of this array must be strings, and MUST be unique.
-     * An object instance is valid if its property set contains all elements in this array value.
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return object
-     */
-    public function mockObject(
-        $properties,
-        $minProperties = 0,
-        $maxProperties = null,
-        $additionalProperties = null,
-        $required = null
-    ) {
-        $obj = new StdClass();
-
-        if (is_object($properties) === false && is_array($properties) === false) {
-            throw new InvalidArgumentException('The value of "properties" must be an array or object');
-        }
-
-        foreach ($properties as $propName => $propValue) {
-            if (is_object($propValue) === false && is_array($propValue) === false) {
-                throw new InvalidArgumentException('Each value of "properties" must be an array or object');
-            }
-        }
-
-        if ($minProperties !== null) {
-            if (is_integer($minProperties) === false || $minProperties < 0) {
-                throw new InvalidArgumentException('"minProperties" must be an integer. This integer must be greater than, or equal to, 0');
-            }
-        }
-
-        if ($maxProperties !== null) {
-            if (is_integer($maxProperties) === false || $maxProperties < 0) {
-                throw new InvalidArgumentException('"maxProperties" must be an integer. This integer must be greater than, or equal to, 0.');
-            }
-            if ($maxProperties < $minProperties) {
-                throw new InvalidArgumentException('"maxProperties" value cannot be less than "minProperties"');
-            }
-        }
-
-        if ($additionalProperties !== null) {
-            if (is_bool($additionalProperties) === false && is_object($additionalProperties) === false && is_array($additionalProperties) === false) {
-                throw new InvalidArgumentException('The value of "additionalProperties" must be a boolean or object or array.');
-            }
-        }
-
-        if ($required !== null) {
-            if (
-                is_array($required) === false
-                || count($required) > count(array_unique($required))
-            ) {
-                throw new InvalidArgumentException('The value of "required" must be an array. Elements of this array must be unique.');
-            }
-            foreach ($required as $requiredPropName) {
-                if (is_string($requiredPropName) === false) {
-                    throw new InvalidArgumentException('Elements of "required" array must be strings');
-                }
-            }
-        }
-
-        foreach ($properties as $propName => $propValue) {
-            $options = $this->extractSchemaProperties($propValue);
-            $dataType = $options['type'];
-            $dataFormat = $options['format'] ?? null;
-            $ref = $options['$ref'] ?? null;
-            $data = $this->mockFromRef($ref);
-            $obj->$propName = ($data) ? $data : $this->mock($dataType, $dataFormat, $options);
-        }
-
-        return $obj;
-    }
-
-    /**
-     * Mocks OpenApi Data from schema.
-     *
-     * @param array|object $schema OpenAPI schema
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return mixed
-     */
-    public function mockFromSchema($schema)
-    {
-        $props = $this->extractSchemaProperties($schema);
-        if (array_key_exists('$ref', $props) && !empty($props['$ref'])) {
-            return $this->mockFromRef($props['$ref']);
-        } elseif ($props['type'] === null) {
-            throw new InvalidArgumentException('"schema" must be object or assoc array with "type" property');
-        }
-        return $this->mock($props['type'], $props['format'], $props);
-    }
-
-    /**
-     * Mock data by referenced schema.
-     * TODO: this method will return model instance, not an StdClass
-     *
-     * @param string|null $ref Ref to model, eg. #/components/schemas/User
-     *
-     * @return mixed
-     */
-    public function mockFromRef($ref)
-    {
-        $data = null;
-        if (is_string($ref) && !empty($ref)) {
-            $refName = static::getSimpleRef($ref);
-            $modelName = static::toModelName($refName);
-            $modelClass = 'OpenAPIServer\Model\\' . $modelName;
-            if (!class_exists($modelClass) || !method_exists($modelClass, 'getOpenApiSchema')) {
-                throw new InvalidArgumentException(sprintf(
-                    'Model %s not found or method %s doesn\'t exist',
-                    $modelClass,
-                    $modelClass . '::getOpenApiSchema'
-                ));
-            }
-            $data = $this->mockFromSchema($modelClass::getOpenApiSchema(true));
-        }
-
-        return $data;
-    }
-
-    /**
-     * @internal Extract OAS properties from array or object.
-     * @codeCoverageIgnore
-     *
-     * @param array|object $val Processed array or object
-     *
-     * @return array
-     */
-    private function extractSchemaProperties($val)
-    {
-        $props = [
-            'type' => null,
-            'format' => null,
-        ];
-        foreach (
-            [
-                'type',
-                'format',
-                'minimum',
-                'maximum',
-                'exclusiveMinimum',
-                'exclusiveMaximum',
-                'minLength',
-                'maxLength',
-                'pattern',
-                'enum',
-                'items',
-                'minItems',
-                'maxItems',
-                'uniqueItems',
-                'properties',
-                'minProperties',
-                'maxProperties',
-                'additionalProperties',
-                'required',
-                'example',
-                '$ref',
-            ] as $propName
-        ) {
-            if (is_array($val) && array_key_exists($propName, $val)) {
-                $props[$propName] = $val[$propName];
-            } elseif (is_object($val) && isset($val->$propName)) {
-                $props[$propName] = $val->$propName;
-            }
-        }
-        return $props;
-    }
-
-    /**
-     * @internal
-     * @codeCoverageIgnore
-     *
-     * @return float|int
-     */
-    protected function getRandomNumber(
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false,
-        $maxDecimals = 4
-    ) {
-        $min = 0;
-        $max = mt_getrandmax();
-
-        if ($minimum !== null) {
-            if (is_numeric($minimum) === false) {
-                throw new InvalidArgumentException('"minimum" must be a number');
-            }
-            $min = $minimum;
-        }
-
-        if ($maximum !== null) {
-            if (is_numeric($maximum) === false) {
-                throw new InvalidArgumentException('"maximum" must be a number');
-            }
-            $max = $maximum;
-        }
-
-        if ($exclusiveMinimum !== false) {
-            if (is_bool($exclusiveMinimum) === false) {
-                throw new InvalidArgumentException('"exclusiveMinimum" must be a boolean');
-            } elseif ($minimum === null) {
-                throw new InvalidArgumentException('If "exclusiveMinimum" is present, "minimum" must also be present');
-            }
-            $min += 1;
-        }
-
-        if ($exclusiveMaximum !== false) {
-            if (is_bool($exclusiveMaximum) === false) {
-                throw new InvalidArgumentException('"exclusiveMaximum" must be a boolean');
-            } elseif ($maximum === null) {
-                throw new InvalidArgumentException('If "exclusiveMaximum" is present, "maximum" must also be present');
-            }
-            $max -= 1;
-        }
-
-        if ($max < $min) {
-            throw new InvalidArgumentException('"maximum" value cannot be less than "minimum"');
-        }
-
-        if ($maxDecimals > 0) {
-            return round($min + mt_rand() / mt_getrandmax() * ($max - $min), $maxDecimals);
-        }
-        return mt_rand((int) $min, (int) $max);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerInterface.php b/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerInterface.php
deleted file mode 100644
index 0a2852aaaf98..000000000000
--- a/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerInterface.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-
-/**
- * OpenApiDataMockerInterface
- * @ref https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#data-types
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Mock;
-
-use InvalidArgumentException;
-
-/**
- * OpenApiDataMockerInterface Class Doc Comment
- *
- * @package OpenAPIServer\Mock
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-interface OpenApiDataMockerInterface
-{
-    /** @var string DATA_TYPE_INTEGER  */
-    public const DATA_TYPE_INTEGER = 'integer';
-
-    /** @var string DATA_TYPE_NUMBER  */
-    public const DATA_TYPE_NUMBER = 'number';
-
-    /** @var string DATA_TYPE_STRING */
-    public const DATA_TYPE_STRING = 'string';
-
-    /** @var string DATA_TYPE_BOOLEAN */
-    public const DATA_TYPE_BOOLEAN = 'boolean';
-
-    /** @var string DATA_TYPE_FILE */
-    public const DATA_TYPE_FILE = 'file';
-
-    /** @var string DATA_TYPE_ARRAY */
-    public const DATA_TYPE_ARRAY = 'array';
-
-    /** @var string DATA_TYPE_OBJECT */
-    public const DATA_TYPE_OBJECT = 'object';
-
-    /** @var string DATA_FORMAT_INT32 Signed 32 bits */
-    public const DATA_FORMAT_INT32 = 'int32';
-
-    /** @var string DATA_FORMAT_INT64 Signed 64 bits */
-    public const DATA_FORMAT_INT64 = 'int64';
-
-    /** @var string DATA_FORMAT_FLOAT */
-    public const DATA_FORMAT_FLOAT = 'float';
-
-    /** @var string DATA_FORMAT_DOUBLE */
-    public const DATA_FORMAT_DOUBLE = 'double';
-
-    /** @var string DATA_FORMAT_BYTE base64 encoded characters */
-    public const DATA_FORMAT_BYTE = 'byte';
-
-    /** @var string DATA_FORMAT_BINARY Any sequence of octets */
-    public const DATA_FORMAT_BINARY = 'binary';
-
-    /** @var string DATA_FORMAT_DATE As defined by full-date [RFC3339](http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14) */
-    public const DATA_FORMAT_DATE = 'date';
-
-    /** @var string DATA_FORMAT_DATE_TIME As defined by date-time [RFC3339](http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14) */
-    public const DATA_FORMAT_DATE_TIME = 'date-time';
-
-    /** @var string DATA_FORMAT_PASSWORD Used to hint UIs the input needs to be obscured. */
-    public const DATA_FORMAT_PASSWORD = 'password';
-
-    /** @var string DATA_FORMAT_EMAIL */
-    public const DATA_FORMAT_EMAIL = 'email';
-
-    /** @var string DATA_FORMAT_UUID */
-    public const DATA_FORMAT_UUID = 'uuid';
-
-    /**
-     * Mocks OpenApi Data.
-     * @see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#data-types
-     *
-     * @param $dataType   string     OpenApi data type. Use constants from this class
-     * @param $dataFormat string     (optional) OpenApi data format
-     * @param $options    array|null (optional) OpenApi data options
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return mixed
-     */
-    public function mock(
-        $dataType,
-        $dataFormat = null,
-        $options = []
-    );
-
-    /**
-     * Shortcut to mock integer type
-     * Equivalent to mockData(DATA_TYPE_INTEGER);
-     *
-     * @param string|null $dataFormat       (optional) int32 or int64
-     * @param number|null $minimum          (optional) Default is 0
-     * @param number|null $maximum          (optional) Default is mt_getrandmax()
-     * @param bool|null   $exclusiveMinimum (optional) Default is false
-     * @param bool|null   $exclusiveMaximum (optional) Default is false
-     *
-     * @throws \InvalidArgumentException when $maximum less than $minimum or invalid arguments provided
-     *
-     * @return int
-     */
-    public function mockInteger(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false
-    );
-
-    /**
-     * Shortcut to mock number type
-     * Equivalent to mockData(DATA_TYPE_NUMBER);
-     *
-     * @param string|null $dataFormat       (optional) float or double
-     * @param number|null $minimum          (optional) Default is 0
-     * @param number|null $maximum          (optional) Default is mt_getrandmax()
-     * @param bool|null   $exclusiveMinimum (optional) Default is false
-     * @param bool|null   $exclusiveMaximum (optional) Default is false
-     *
-     * @throws \InvalidArgumentException when $maximum less than $minimum or invalid arguments provided
-     *
-     * @return float
-     */
-    public function mockNumber(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false
-    );
-
-    /**
-     * Shortcut to mock string type
-     * Equivalent to mockData(DATA_TYPE_STRING);
-     *
-     * @param string|null $dataFormat (optional) one of byte, binary, date, date-time, password
-     * @param int|null    $minLength  (optional) Default is 0
-     * @param int|null    $maxLength  (optional) Default is 100 chars
-     * @param array       $enum       (optional) This array should have at least one element.
-     * Elements in the array should be unique.
-     * @param string|null $pattern    (optional) This string should be a valid regular expression, according to the ECMA 262 regular expression dialect.
-     * Recall: regular expressions are not implicitly anchored.
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return string
-     */
-    public function mockString(
-        $dataFormat = null,
-        $minLength = 0,
-        $maxLength = null,
-        $enum = null,
-        $pattern = null
-    );
-
-    /**
-     * Shortcut to mock boolean type
-     * Equivalent to mockData(DATA_TYPE_BOOLEAN);
-     *
-     * @return bool
-     */
-    public function mockBoolean();
-
-    /**
-     * Shortcut to mock array type
-     * Equivalent to mockData(DATA_TYPE_ARRAY);
-     *
-     * @param object|array $items       Object or assoc array of described items
-     * @param int|null     $minItems    (optional) An array instance is valid against "minItems" if its size is greater than, or equal to, the value of this keyword.
-     * @param int|null     $maxItems    (optional) An array instance is valid against "maxItems" if its size is less than, or equal to, the value of this keyword
-     * @param bool|null    $uniqueItems (optional) If it has boolean value true, the instance validates successfully if all of its elements are unique
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return array
-     */
-    public function mockArray(
-        $items,
-        $minItems = 0,
-        $maxItems = null,
-        $uniqueItems = false
-    );
-
-    /**
-     * Shortcut to mock object type.
-     * Equivalent to mockData(DATA_TYPE_OBJECT);
-     *
-     * @param object|array           $properties           Object or array of described properties
-     * @param int|null               $minProperties        (optional) An object instance is valid against "minProperties" if its number of properties is greater than, or equal to, the value of this keyword.
-     * @param int|null               $maxProperties        (optional) An object instance is valid against "maxProperties" if its number of properties is less than, or equal to, the value of this keyword.
-     * @param bool|object|array|null $additionalProperties (optional) If "additionalProperties" is true, validation always succeeds.
-     * If "additionalProperties" is false, validation succeeds only if the instance is an object and all properties on the instance were covered by "properties" and/or "patternProperties".
-     * If "additionalProperties" is an object, validate the value as a schema to all of the properties that weren't validated by "properties" nor "patternProperties".
-     * @param array|null             $required             (optional) This array MUST have at least one element.  Elements of this array must be strings, and MUST be unique.
-     * An object instance is valid if its property set contains all elements in this array value.
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return object
-     */
-    public function mockObject(
-        $properties,
-        $minProperties = 0,
-        $maxProperties = null,
-        $additionalProperties = null,
-        $required = null
-    );
-
-    /**
-     * Mocks OpenApi Data from schema.
-     *
-     * @param array|object $schema OpenAPI schema
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return mixed
-     */
-    public function mockFromSchema($schema);
-
-    /**
-     * Mock data by referenced schema.
-     * TODO: this method will return model instance, not an StdClass
-     *
-     * @param string|null $ref Ref to model, eg. #/components/schemas/User
-     *
-     * @throws \InvalidArgumentException when invalid arguments passed
-     *
-     * @return mixed
-     */
-    public function mockFromRef($ref);
-}
diff --git a/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerMiddleware.php b/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerMiddleware.php
deleted file mode 100644
index 60ba929a403a..000000000000
--- a/samples/server/petstore/php-slim4/lib/Mock/OpenApiDataMockerMiddleware.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-/**
- * OpenApiDataMockerMiddleware
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Mock;
-
-use Slim\Factory\AppFactory;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use OpenAPIServer\Mock\OpenApiDataMockerInterface;
-use InvalidArgumentException;
-
-/**
- * OpenApiDataMockerMiddleware Class Doc Comment
- *
- * @package OpenAPIServer\Mock
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-final class OpenApiDataMockerMiddleware implements MiddlewareInterface
-{
-    /**
-     * @var OpenApiDataMockerInterface DataMocker.
-     */
-    private $mocker;
-
-    /**
-     * @var array Array of responses schemas.
-     */
-    private $responses;
-
-    /**
-     * @var callable|null Custom callback to select mocked response.
-     */
-    private $getMockResponseCallback;
-
-    /**
-     * @var callable|null Custom after callback.
-     */
-    private $afterCallback;
-
-    /**
-     * Class constructor.
-     *
-     * @param OpenApiDataMockerInterface $mocker                  DataMocker.
-     * @param array                      $responses               Array of responses schemas.
-     * @param callable|null              $getMockResponseCallback Custom callback to select mocked response.
-     * Mock feature is disabled when this argument is null.
-     * @example $getMockResponseCallback = function (ServerRequestInterface $request, array $responses) {
-     *     // check if client clearly asks for mocked response
-     *     if (
-     *         $request->hasHeader('X-OpenAPIServer-Mock')
-     *         && $request->header('X-OpenAPIServer-Mock')[0] === 'ping'
-     *     ) {
-     *         return $responses[array_key_first($responses)];
-     *     }
-     *     return false;
-     * };
-     * @param callable|null              $afterCallback           After callback.
-     * Function must return response instance.
-     * @example $afterCallback = function (ServerRequestInterface $request, ResponseInterface $response) {
-     *     // mark mocked response to distinguish real and fake responses
-     *     return $response->withHeader('X-OpenAPIServer-Mock', 'pong');
-     * };
-     */
-    public function __construct(
-        OpenApiDataMockerInterface $mocker,
-        array $responses,
-        $getMockResponseCallback = null,
-        $afterCallback = null
-    ) {
-        $this->mocker = $mocker;
-        $this->responses = $responses;
-        if (is_callable($getMockResponseCallback)) {
-            $this->getMockResponseCallback = $getMockResponseCallback;
-        } elseif ($getMockResponseCallback !== null) {
-            // wrong argument type
-            throw new InvalidArgumentException('\$getMockResponseCallback must be closure or null');
-        }
-
-        if (is_callable($afterCallback)) {
-            $this->afterCallback = $afterCallback;
-        } elseif ($afterCallback !== null) {
-            // wrong argument type
-            throw new InvalidArgumentException('\$afterCallback must be closure or null');
-        }
-    }
-
-    /**
-     * Parse incoming JSON input into a native PHP format
-     *
-     * @param ServerRequestInterface  $request HTTP request
-     * @param RequestHandlerInterface $handler Request handler
-     *
-     * @return ResponseInterface HTTP response
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $customCallback = $this->getMockResponseCallback;
-        $customAfterCallback = $this->afterCallback;
-        $mockedResponse = (is_callable($customCallback)) ? $customCallback($request, $this->responses) : null;
-        if (
-            is_array($mockedResponse)
-            && array_key_exists('code', $mockedResponse)
-            && array_key_exists('jsonSchema', $mockedResponse)
-        ) {
-            // response schema succesfully selected, we can mock it now
-            $statusCode = ($mockedResponse['code'] === 0) ? 200 : $mockedResponse['code'];
-            $contentType = '*/*';
-            $response = AppFactory::determineResponseFactory()->createResponse($statusCode);
-            $responseSchema = json_decode($mockedResponse['jsonSchema'], true);
-
-            if (is_array($responseSchema) && array_key_exists('headers', $responseSchema)) {
-                // response schema contains headers definitions, apply them one by one
-                foreach ($responseSchema['headers'] as $headerName => $headerDefinition) {
-                    $response = $response->withHeader($headerName, $this->mocker->mockFromSchema($headerDefinition['schema']));
-                }
-            }
-
-            if (
-                is_array($responseSchema)
-                && array_key_exists('content', $responseSchema)
-                && !empty($responseSchema['content'])
-            ) {
-                // response schema contains body definition
-                $responseContentSchema = null;
-                foreach ($responseSchema['content'] as $schemaContentType => $schemaDefinition) {
-                    // we can respond in JSON format when any(*/*) content-type allowed
-                    // or JSON(application/json) content-type specifically defined
-                    if (
-                        $schemaContentType === '*/*'
-                        || strtolower(substr($schemaContentType, 0, 16)) === 'application/json'
-                    ) {
-                        $contentType = 'application/json';
-                        $responseContentSchema = $schemaDefinition['schema'];
-                    }
-                }
-
-                if ($contentType === 'application/json') {
-                    $responseBody = $this->mocker->mockFromSchema($responseContentSchema);
-                    $response->getBody()->write(json_encode($responseBody));
-                } else {
-                    // notify developer that only application/json response supported so far
-                    $response->getBody()->write('Mock feature supports only "application/json" content-type!');
-                }
-            }
-
-            // after callback applied only when mocked response schema has been selected
-            if (is_callable($customAfterCallback)) {
-                $response = $customAfterCallback($request, $response);
-            }
-
-            // no reason to execute following middlewares (auth, validation etc.)
-            // return mocked response and end connection
-            return $response
-                ->withHeader('Content-Type', $contentType);
-        }
-
-        // no response selected, mock feature disabled
-        // execute following middlewares
-        return $handler->handle($request);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesAnyType.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesAnyType.php
deleted file mode 100644
index d5bfc975b933..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesAnyType.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesAnyType
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * AdditionalPropertiesAnyType
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesAnyType implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "name" : {
-      "type" : "string"
-    }
-  },
-  "additionalProperties" : {
-    "type" : "object",
-    "properties" : { }
-  }
-}
-SCHEMA;
-
-    /** @var string $name */
-    private $name;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesArray.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesArray.php
deleted file mode 100644
index eec1753f0dfe..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesArray.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesArray
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * AdditionalPropertiesArray
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesArray implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "name" : {
-      "type" : "string"
-    }
-  },
-  "additionalProperties" : {
-    "type" : "array",
-    "items" : {
-      "type" : "object",
-      "properties" : { }
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $name */
-    private $name;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesBoolean.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesBoolean.php
deleted file mode 100644
index f5503fa41bad..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesBoolean.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesBoolean
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * AdditionalPropertiesBoolean
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesBoolean implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "name" : {
-      "type" : "string"
-    }
-  },
-  "additionalProperties" : {
-    "type" : "boolean"
-  }
-}
-SCHEMA;
-
-    /** @var string $name */
-    private $name;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesClass.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesClass.php
deleted file mode 100644
index 7fb8f08834e9..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesClass.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesClass
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * AdditionalPropertiesClass
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesClass implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "map_string" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "string"
-      }
-    },
-    "map_number" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "number"
-      }
-    },
-    "map_integer" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "integer"
-      }
-    },
-    "map_boolean" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "boolean"
-      }
-    },
-    "map_array_integer" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "array",
-        "items" : {
-          "type" : "integer"
-        }
-      }
-    },
-    "map_array_anytype" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "array",
-        "items" : {
-          "type" : "object",
-          "properties" : { }
-        }
-      }
-    },
-    "map_map_string" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "object",
-        "additionalProperties" : {
-          "type" : "string"
-        }
-      }
-    },
-    "map_map_anytype" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "object",
-        "additionalProperties" : {
-          "type" : "object",
-          "properties" : { }
-        }
-      }
-    },
-    "anytype_1" : {
-      "type" : "object",
-      "properties" : { }
-    },
-    "anytype_2" : {
-      "type" : "object"
-    },
-    "anytype_3" : {
-      "type" : "object",
-      "properties" : { }
-    }
-  }
-}
-SCHEMA;
-
-    /** @var map[string,string] $mapString */
-    private $mapString;
-
-    /** @var map[string,float] $mapNumber */
-    private $mapNumber;
-
-    /** @var map[string,int] $mapInteger */
-    private $mapInteger;
-
-    /** @var map[string,bool] $mapBoolean */
-    private $mapBoolean;
-
-    /** @var map[string,int[]] $mapArrayInteger */
-    private $mapArrayInteger;
-
-    /** @var map[string,object[]] $mapArrayAnytype */
-    private $mapArrayAnytype;
-
-    /** @var map[string,map[string,string]] $mapMapString */
-    private $mapMapString;
-
-    /** @var map[string,map[string,object]] $mapMapAnytype */
-    private $mapMapAnytype;
-
-    /** @var object $anytype1 */
-    private $anytype1;
-
-    /** @var object $anytype2 */
-    private $anytype2;
-
-    /** @var object $anytype3 */
-    private $anytype3;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesInteger.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesInteger.php
deleted file mode 100644
index 116ed20c56c5..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesInteger.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesInteger
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * AdditionalPropertiesInteger
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesInteger implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "name" : {
-      "type" : "string"
-    }
-  },
-  "additionalProperties" : {
-    "type" : "integer"
-  }
-}
-SCHEMA;
-
-    /** @var string $name */
-    private $name;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesNumber.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesNumber.php
deleted file mode 100644
index e234140479d5..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesNumber.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesNumber
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * AdditionalPropertiesNumber
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesNumber implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "name" : {
-      "type" : "string"
-    }
-  },
-  "additionalProperties" : {
-    "type" : "number"
-  }
-}
-SCHEMA;
-
-    /** @var string $name */
-    private $name;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesObject.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesObject.php
deleted file mode 100644
index 55ea5bf762c9..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesObject.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesObject
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * AdditionalPropertiesObject
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesObject implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "name" : {
-      "type" : "string"
-    }
-  },
-  "additionalProperties" : {
-    "type" : "object",
-    "additionalProperties" : {
-      "type" : "object",
-      "properties" : { }
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $name */
-    private $name;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesString.php b/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesString.php
deleted file mode 100644
index 56471c9bc8ce..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/AdditionalPropertiesString.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesString
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * AdditionalPropertiesString
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class AdditionalPropertiesString implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "name" : {
-      "type" : "string"
-    }
-  },
-  "additionalProperties" : {
-    "type" : "string"
-  }
-}
-SCHEMA;
-
-    /** @var string $name */
-    private $name;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/Animal.php b/samples/server/petstore/php-slim4/lib/Model/Animal.php
deleted file mode 100644
index b0f3c2384986..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/Animal.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * Animal
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * Animal
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Animal implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "required" : [ "className" ],
-  "type" : "object",
-  "properties" : {
-    "className" : {
-      "type" : "string"
-    },
-    "color" : {
-      "type" : "string",
-      "default" : "red"
-    }
-  },
-  "discriminator" : {
-    "propertyName" : "className"
-  }
-}
-SCHEMA;
-
-    /** @var string $className */
-    private $className;
-
-    /** @var string $color */
-    private $color;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/ApiResponse.php b/samples/server/petstore/php-slim4/lib/Model/ApiResponse.php
index eb00821d0605..eb197fa2dbf2 100644
--- a/samples/server/petstore/php-slim4/lib/Model/ApiResponse.php
+++ b/samples/server/petstore/php-slim4/lib/Model/ApiResponse.php
@@ -1,22 +1,27 @@
 <?php
 
 /**
- * ApiResponse
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  */
 namespace OpenAPIServer\Model;
 
-use OpenAPIServer\Interfaces\ModelInterface;
+use OpenAPIServer\BaseModel;
 
 /**
  * ApiResponse
@@ -25,10 +30,21 @@
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
-class ApiResponse implements ModelInterface
+class ApiResponse extends BaseModel
 {
-    private const MODEL_SCHEMA = <<<'SCHEMA'
+    /**
+     * @var string Models namespace.
+     * Can be required for data deserialization when model contains referenced schemas.
+     */
+    protected const MODELS_NAMESPACE = '\OpenAPIServer\Model';
+
+    /**
+     * @var string Constant with OAS schema of current class.
+     * Should be overwritten by inherited class.
+     */
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
 {
+  "title" : "An uploaded response",
   "type" : "object",
   "properties" : {
     "code" : {
@@ -41,28 +57,8 @@ class ApiResponse implements ModelInterface
     "message" : {
       "type" : "string"
     }
-  }
+  },
+  "description" : "Describes the result of uploading an image resource"
 }
 SCHEMA;
-
-    /** @var int $code */
-    private $code;
-
-    /** @var string $type */
-    private $type;
-
-    /** @var string $message */
-    private $message;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
 }
diff --git a/samples/server/petstore/php-slim4/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/server/petstore/php-slim4/lib/Model/ArrayOfArrayOfNumberOnly.php
deleted file mode 100644
index ea7a72a4f1db..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * ArrayOfArrayOfNumberOnly
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * ArrayOfArrayOfNumberOnly
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ArrayOfArrayOfNumberOnly implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "ArrayArrayNumber" : {
-      "type" : "array",
-      "items" : {
-        "type" : "array",
-        "items" : {
-          "type" : "number"
-        }
-      }
-    }
-  }
-}
-SCHEMA;
-
-    /** @var float[][] $arrayArrayNumber */
-    private $arrayArrayNumber;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/ArrayOfNumberOnly.php b/samples/server/petstore/php-slim4/lib/Model/ArrayOfNumberOnly.php
deleted file mode 100644
index 25b4c97c2a82..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/ArrayOfNumberOnly.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * ArrayOfNumberOnly
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * ArrayOfNumberOnly
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ArrayOfNumberOnly implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "ArrayNumber" : {
-      "type" : "array",
-      "items" : {
-        "type" : "number"
-      }
-    }
-  }
-}
-SCHEMA;
-
-    /** @var float[] $arrayNumber */
-    private $arrayNumber;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/ArrayTest.php b/samples/server/petstore/php-slim4/lib/Model/ArrayTest.php
deleted file mode 100644
index 66aa7e053a41..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/ArrayTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * ArrayTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * ArrayTest
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ArrayTest implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "array_of_string" : {
-      "type" : "array",
-      "items" : {
-        "type" : "string"
-      }
-    },
-    "array_array_of_integer" : {
-      "type" : "array",
-      "items" : {
-        "type" : "array",
-        "items" : {
-          "type" : "integer",
-          "format" : "int64"
-        }
-      }
-    },
-    "array_array_of_model" : {
-      "type" : "array",
-      "items" : {
-        "type" : "array",
-        "items" : {
-          "$ref" : "#/components/schemas/ReadOnlyFirst"
-        }
-      }
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string[] $arrayOfString */
-    private $arrayOfString;
-
-    /** @var int[][] $arrayArrayOfInteger */
-    private $arrayArrayOfInteger;
-
-    /** @var \OpenAPIServer\Model\ReadOnlyFirst[][] $arrayArrayOfModel */
-    private $arrayArrayOfModel;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/BigCat.php b/samples/server/petstore/php-slim4/lib/Model/BigCat.php
deleted file mode 100644
index 4b795da23913..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/BigCat.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * BigCat
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * BigCat
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class BigCat implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "allOf" : [ {
-    "$ref" : "#/components/schemas/Cat"
-  }, {
-    "$ref" : "#/components/schemas/BigCat_allOf"
-  } ]
-}
-SCHEMA;
-
-    /** @var string $className */
-    private $className;
-
-    /** @var string $color */
-    private $color;
-
-    /** @var bool $declawed */
-    private $declawed;
-
-    /** @var string $kind */
-    private $kind;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/BigCatAllOf.php b/samples/server/petstore/php-slim4/lib/Model/BigCatAllOf.php
deleted file mode 100644
index 10433c34b8e4..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/BigCatAllOf.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * BigCatAllOf
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * BigCatAllOf
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class BigCatAllOf implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "properties" : {
-    "kind" : {
-      "type" : "string",
-      "enum" : [ "lions", "tigers", "leopards", "jaguars" ]
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $kind */
-    private $kind;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/Capitalization.php b/samples/server/petstore/php-slim4/lib/Model/Capitalization.php
deleted file mode 100644
index b596ec922704..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/Capitalization.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * Capitalization
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * Capitalization
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Capitalization implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "smallCamel" : {
-      "type" : "string"
-    },
-    "CapitalCamel" : {
-      "type" : "string"
-    },
-    "small_Snake" : {
-      "type" : "string"
-    },
-    "Capital_Snake" : {
-      "type" : "string"
-    },
-    "SCA_ETH_Flow_Points" : {
-      "type" : "string"
-    },
-    "ATT_NAME" : {
-      "type" : "string",
-      "description" : "Name of the pet\n"
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $smallCamel */
-    private $smallCamel;
-
-    /** @var string $capitalCamel */
-    private $capitalCamel;
-
-    /** @var string $smallSnake */
-    private $smallSnake;
-
-    /** @var string $capitalSnake */
-    private $capitalSnake;
-
-    /** @var string $sCAETHFlowPoints */
-    private $sCAETHFlowPoints;
-
-    /** @var string $aTTNAME Name of the pet*/
-    private $aTTNAME;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/Cat.php b/samples/server/petstore/php-slim4/lib/Model/Cat.php
deleted file mode 100644
index 1a6471a23160..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/Cat.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Cat
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * Cat
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Cat implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "allOf" : [ {
-    "$ref" : "#/components/schemas/Animal"
-  }, {
-    "$ref" : "#/components/schemas/Cat_allOf"
-  } ]
-}
-SCHEMA;
-
-    /** @var string $className */
-    private $className;
-
-    /** @var string $color */
-    private $color;
-
-    /** @var bool $declawed */
-    private $declawed;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/CatAllOf.php b/samples/server/petstore/php-slim4/lib/Model/CatAllOf.php
deleted file mode 100644
index 8caa1dc6e579..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/CatAllOf.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * CatAllOf
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * CatAllOf
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class CatAllOf implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "properties" : {
-    "declawed" : {
-      "type" : "boolean"
-    }
-  }
-}
-SCHEMA;
-
-    /** @var bool $declawed */
-    private $declawed;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/Category.php b/samples/server/petstore/php-slim4/lib/Model/Category.php
index f53e2af89093..7ee3e5a7186c 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Category.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Category.php
@@ -1,22 +1,27 @@
 <?php
 
 /**
- * Category
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  */
 namespace OpenAPIServer\Model;
 
-use OpenAPIServer\Interfaces\ModelInterface;
+use OpenAPIServer\BaseModel;
 
 /**
  * Category
@@ -25,11 +30,21 @@
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
-class Category implements ModelInterface
+class Category extends BaseModel
 {
-    private const MODEL_SCHEMA = <<<'SCHEMA'
+    /**
+     * @var string Models namespace.
+     * Can be required for data deserialization when model contains referenced schemas.
+     */
+    protected const MODELS_NAMESPACE = '\OpenAPIServer\Model';
+
+    /**
+     * @var string Constant with OAS schema of current class.
+     * Should be overwritten by inherited class.
+     */
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
 {
-  "required" : [ "name" ],
+  "title" : "Pet category",
   "type" : "object",
   "properties" : {
     "id" : {
@@ -37,31 +52,14 @@ class Category implements ModelInterface
       "format" : "int64"
     },
     "name" : {
-      "type" : "string",
-      "default" : "default-name"
+      "pattern" : "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$",
+      "type" : "string"
     }
   },
+  "description" : "A category for a pet",
   "xml" : {
     "name" : "Category"
   }
 }
 SCHEMA;
-
-    /** @var int $id */
-    private $id;
-
-    /** @var string $name */
-    private $name;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
 }
diff --git a/samples/server/petstore/php-slim4/lib/Model/ClassModel.php b/samples/server/petstore/php-slim4/lib/Model/ClassModel.php
deleted file mode 100644
index 3b3f5c28d940..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/ClassModel.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * ClassModel
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * ClassModel
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ClassModel implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "_class" : {
-      "type" : "string"
-    }
-  },
-  "description" : "Model for testing model with \"_class\" property"
-}
-SCHEMA;
-
-    /** @var string $class */
-    private $class;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/Client.php b/samples/server/petstore/php-slim4/lib/Model/Client.php
deleted file mode 100644
index 12aaff03c01b..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/Client.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * Client
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * Client
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Client implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "client" : {
-      "type" : "string"
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $client */
-    private $client;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/Dog.php b/samples/server/petstore/php-slim4/lib/Model/Dog.php
deleted file mode 100644
index c38c1ea4a669..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/Dog.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Dog
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * Dog
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Dog implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "allOf" : [ {
-    "$ref" : "#/components/schemas/Animal"
-  }, {
-    "$ref" : "#/components/schemas/Dog_allOf"
-  } ]
-}
-SCHEMA;
-
-    /** @var string $className */
-    private $className;
-
-    /** @var string $color */
-    private $color;
-
-    /** @var string $breed */
-    private $breed;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/DogAllOf.php b/samples/server/petstore/php-slim4/lib/Model/DogAllOf.php
deleted file mode 100644
index cf81a5f99b4a..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/DogAllOf.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * DogAllOf
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * DogAllOf
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class DogAllOf implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "properties" : {
-    "breed" : {
-      "type" : "string"
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $breed */
-    private $breed;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/EnumArrays.php b/samples/server/petstore/php-slim4/lib/Model/EnumArrays.php
deleted file mode 100644
index aef61078eb5d..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/EnumArrays.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * EnumArrays
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * EnumArrays
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class EnumArrays implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "just_symbol" : {
-      "type" : "string",
-      "enum" : [ ">=", "$" ]
-    },
-    "array_enum" : {
-      "type" : "array",
-      "items" : {
-        "type" : "string",
-        "enum" : [ "fish", "crab" ]
-      }
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $justSymbol */
-    private $justSymbol;
-
-    /** @var string[] $arrayEnum */
-    private $arrayEnum;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/EnumClass.php b/samples/server/petstore/php-slim4/lib/Model/EnumClass.php
deleted file mode 100644
index 3ddd829b3137..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/EnumClass.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * EnumClass
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * EnumClass
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class EnumClass implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "string",
-  "default" : "-efg",
-  "enum" : [ "_abc", "-efg", "(xyz)" ]
-}
-SCHEMA;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/EnumTest.php b/samples/server/petstore/php-slim4/lib/Model/EnumTest.php
deleted file mode 100644
index e4c4ffc0ee0b..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/EnumTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * EnumTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * EnumTest
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class EnumTest implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "required" : [ "enum_string_required" ],
-  "type" : "object",
-  "properties" : {
-    "enum_string" : {
-      "type" : "string",
-      "enum" : [ "UPPER", "lower", "" ]
-    },
-    "enum_string_required" : {
-      "type" : "string",
-      "enum" : [ "UPPER", "lower", "" ]
-    },
-    "enum_integer" : {
-      "type" : "integer",
-      "format" : "int32",
-      "enum" : [ 1, -1 ]
-    },
-    "enum_number" : {
-      "type" : "number",
-      "format" : "double",
-      "enum" : [ 1.1, -1.2 ]
-    },
-    "outerEnum" : {
-      "$ref" : "#/components/schemas/OuterEnum"
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $enumString */
-    private $enumString;
-
-    /** @var string $enumStringRequired */
-    private $enumStringRequired;
-
-    /** @var int $enumInteger */
-    private $enumInteger;
-
-    /** @var double $enumNumber */
-    private $enumNumber;
-
-    /** @var \OpenAPIServer\Model\OuterEnum $outerEnum */
-    private $outerEnum;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/File.php b/samples/server/petstore/php-slim4/lib/Model/File.php
deleted file mode 100644
index 4237e721443f..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/File.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * File
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * File
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class File implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "sourceURI" : {
-      "type" : "string",
-      "description" : "Test capitalization"
-    }
-  },
-  "description" : "Must be named `File` for test."
-}
-SCHEMA;
-
-    /** @var string $sourceURI Test capitalization*/
-    private $sourceURI;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/FileSchemaTestClass.php b/samples/server/petstore/php-slim4/lib/Model/FileSchemaTestClass.php
deleted file mode 100644
index 3ebabaa367c0..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/FileSchemaTestClass.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * FileSchemaTestClass
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * FileSchemaTestClass
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class FileSchemaTestClass implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "file" : {
-      "$ref" : "#/components/schemas/File"
-    },
-    "files" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/components/schemas/File"
-      }
-    }
-  }
-}
-SCHEMA;
-
-    /** @var \OpenAPIServer\Model\File $file */
-    private $file;
-
-    /** @var \OpenAPIServer\Model\File[] $files */
-    private $files;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/FormatTest.php b/samples/server/petstore/php-slim4/lib/Model/FormatTest.php
deleted file mode 100644
index 751f9607e8a6..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/FormatTest.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-/**
- * FormatTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * FormatTest
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class FormatTest implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "required" : [ "byte", "date", "number", "password" ],
-  "type" : "object",
-  "properties" : {
-    "integer" : {
-      "maximum" : 1E+2,
-      "minimum" : 1E+1,
-      "type" : "integer"
-    },
-    "int32" : {
-      "maximum" : 2E+2,
-      "minimum" : 2E+1,
-      "type" : "integer",
-      "format" : "int32"
-    },
-    "int64" : {
-      "type" : "integer",
-      "format" : "int64"
-    },
-    "number" : {
-      "maximum" : 543.2,
-      "minimum" : 32.1,
-      "type" : "number"
-    },
-    "float" : {
-      "maximum" : 987.6,
-      "minimum" : 54.3,
-      "type" : "number",
-      "format" : "float"
-    },
-    "double" : {
-      "maximum" : 123.4,
-      "minimum" : 67.8,
-      "type" : "number",
-      "format" : "double"
-    },
-    "string" : {
-      "pattern" : "/[a-z]/i",
-      "type" : "string"
-    },
-    "byte" : {
-      "pattern" : "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$",
-      "type" : "string",
-      "format" : "byte"
-    },
-    "binary" : {
-      "type" : "string",
-      "format" : "binary"
-    },
-    "date" : {
-      "type" : "string",
-      "format" : "date"
-    },
-    "dateTime" : {
-      "type" : "string",
-      "format" : "date-time"
-    },
-    "uuid" : {
-      "type" : "string",
-      "format" : "uuid",
-      "example" : "72f98069-206d-4f12-9f12-3d1e525a8e84"
-    },
-    "password" : {
-      "maxLength" : 64,
-      "minLength" : 10,
-      "type" : "string",
-      "format" : "password"
-    },
-    "BigDecimal" : {
-      "type" : "string",
-      "format" : "number"
-    }
-  }
-}
-SCHEMA;
-
-    /** @var int $integer */
-    private $integer;
-
-    /** @var int $int32 */
-    private $int32;
-
-    /** @var int $int64 */
-    private $int64;
-
-    /** @var float $number */
-    private $number;
-
-    /** @var float $float */
-    private $float;
-
-    /** @var double $double */
-    private $double;
-
-    /** @var string $string */
-    private $string;
-
-    /** @var string $byte */
-    private $byte;
-
-    /** @var \SplFileObject $binary */
-    private $binary;
-
-    /** @var \DateTime $date */
-    private $date;
-
-    /** @var \DateTime $dateTime */
-    private $dateTime;
-
-    /** @var string $uuid */
-    private $uuid;
-
-    /** @var string $password */
-    private $password;
-
-    /** @var BigDecimal $bigDecimal */
-    private $bigDecimal;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/HasOnlyReadOnly.php b/samples/server/petstore/php-slim4/lib/Model/HasOnlyReadOnly.php
deleted file mode 100644
index afeb12af3dd0..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/HasOnlyReadOnly.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * HasOnlyReadOnly
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * HasOnlyReadOnly
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class HasOnlyReadOnly implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "bar" : {
-      "type" : "string",
-      "readOnly" : true
-    },
-    "foo" : {
-      "type" : "string",
-      "readOnly" : true
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $bar */
-    private $bar;
-
-    /** @var string $foo */
-    private $foo;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/InlineObject.php b/samples/server/petstore/php-slim4/lib/Model/InlineObject.php
index 723616e8df49..1b106e77d754 100644
--- a/samples/server/petstore/php-slim4/lib/Model/InlineObject.php
+++ b/samples/server/petstore/php-slim4/lib/Model/InlineObject.php
@@ -1,22 +1,27 @@
 <?php
 
 /**
- * InlineObject
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  */
 namespace OpenAPIServer\Model;
 
-use OpenAPIServer\Interfaces\ModelInterface;
+use OpenAPIServer\BaseModel;
 
 /**
  * InlineObject
@@ -25,9 +30,19 @@
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
-class InlineObject implements ModelInterface
+class InlineObject extends BaseModel
 {
-    private const MODEL_SCHEMA = <<<'SCHEMA'
+    /**
+     * @var string Models namespace.
+     * Can be required for data deserialization when model contains referenced schemas.
+     */
+    protected const MODELS_NAMESPACE = '\OpenAPIServer\Model';
+
+    /**
+     * @var string Constant with OAS schema of current class.
+     * Should be overwritten by inherited class.
+     */
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
 {
   "type" : "object",
   "properties" : {
@@ -42,22 +57,4 @@ class InlineObject implements ModelInterface
   }
 }
 SCHEMA;
-
-    /** @var string $name Updated name of the pet*/
-    private $name;
-
-    /** @var string $status Updated status of the pet*/
-    private $status;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
 }
diff --git a/samples/server/petstore/php-slim4/lib/Model/InlineObject1.php b/samples/server/petstore/php-slim4/lib/Model/InlineObject1.php
index 87cb07a3865c..93b4732137c5 100644
--- a/samples/server/petstore/php-slim4/lib/Model/InlineObject1.php
+++ b/samples/server/petstore/php-slim4/lib/Model/InlineObject1.php
@@ -1,22 +1,27 @@
 <?php
 
 /**
- * InlineObject1
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  */
 namespace OpenAPIServer\Model;
 
-use OpenAPIServer\Interfaces\ModelInterface;
+use OpenAPIServer\BaseModel;
 
 /**
  * InlineObject1
@@ -25,9 +30,19 @@
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
-class InlineObject1 implements ModelInterface
+class InlineObject1 extends BaseModel
 {
-    private const MODEL_SCHEMA = <<<'SCHEMA'
+    /**
+     * @var string Models namespace.
+     * Can be required for data deserialization when model contains referenced schemas.
+     */
+    protected const MODELS_NAMESPACE = '\OpenAPIServer\Model';
+
+    /**
+     * @var string Constant with OAS schema of current class.
+     * Should be overwritten by inherited class.
+     */
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
 {
   "type" : "object",
   "properties" : {
@@ -43,22 +58,4 @@ class InlineObject1 implements ModelInterface
   }
 }
 SCHEMA;
-
-    /** @var string $additionalMetadata Additional data to pass to server*/
-    private $additionalMetadata;
-
-    /** @var \SplFileObject $file file to upload*/
-    private $file;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
 }
diff --git a/samples/server/petstore/php-slim4/lib/Model/MapTest.php b/samples/server/petstore/php-slim4/lib/Model/MapTest.php
deleted file mode 100644
index 2cc9edf70188..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/MapTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * MapTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * MapTest
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class MapTest implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "map_map_of_string" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "object",
-        "additionalProperties" : {
-          "type" : "string"
-        }
-      }
-    },
-    "map_of_enum_string" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "string",
-        "enum" : [ "UPPER", "lower" ]
-      }
-    },
-    "direct_map" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "boolean"
-      }
-    },
-    "indirect_map" : {
-      "$ref" : "#/components/schemas/StringBooleanMap"
-    }
-  }
-}
-SCHEMA;
-
-    /** @var map[string,map[string,string]] $mapMapOfString */
-    private $mapMapOfString;
-
-    /** @var map[string,string] $mapOfEnumString */
-    private $mapOfEnumString;
-
-    /** @var map[string,bool] $directMap */
-    private $directMap;
-
-    /** @var map[string,bool] $indirectMap */
-    private $indirectMap;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/server/petstore/php-slim4/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
deleted file mode 100644
index 5d55499c7b0f..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * MixedPropertiesAndAdditionalPropertiesClass
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * MixedPropertiesAndAdditionalPropertiesClass
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class MixedPropertiesAndAdditionalPropertiesClass implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "uuid" : {
-      "type" : "string",
-      "format" : "uuid"
-    },
-    "dateTime" : {
-      "type" : "string",
-      "format" : "date-time"
-    },
-    "map" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "$ref" : "#/components/schemas/Animal"
-      }
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $uuid */
-    private $uuid;
-
-    /** @var \DateTime $dateTime */
-    private $dateTime;
-
-    /** @var map[string,\OpenAPIServer\Model\Animal] $map */
-    private $map;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/Model200Response.php b/samples/server/petstore/php-slim4/lib/Model/Model200Response.php
deleted file mode 100644
index 6af1b357c731..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/Model200Response.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * Model200Response
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * Model200Response
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Model200Response implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "name" : {
-      "type" : "integer",
-      "format" : "int32"
-    },
-    "class" : {
-      "type" : "string"
-    }
-  },
-  "description" : "Model for testing model name starting with number",
-  "xml" : {
-    "name" : "Name"
-  }
-}
-SCHEMA;
-
-    /** @var int $name */
-    private $name;
-
-    /** @var string $class */
-    private $class;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/ModelList.php b/samples/server/petstore/php-slim4/lib/Model/ModelList.php
deleted file mode 100644
index 48c984dad6cf..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/ModelList.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * ModelList
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * ModelList
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ModelList implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "123-list" : {
-      "type" : "string"
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $_123list */
-    private $_123list;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/ModelReturn.php b/samples/server/petstore/php-slim4/lib/Model/ModelReturn.php
deleted file mode 100644
index b56717e60a81..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/ModelReturn.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * ModelReturn
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * ModelReturn
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ModelReturn implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "return" : {
-      "type" : "integer",
-      "format" : "int32"
-    }
-  },
-  "description" : "Model for testing reserved words",
-  "xml" : {
-    "name" : "Return"
-  }
-}
-SCHEMA;
-
-    /** @var int $return */
-    private $return;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/Name.php b/samples/server/petstore/php-slim4/lib/Model/Name.php
deleted file mode 100644
index 4eca6a4b6b0f..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/Name.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * Name
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * Name
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class Name implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "required" : [ "name" ],
-  "type" : "object",
-  "properties" : {
-    "name" : {
-      "type" : "integer",
-      "format" : "int32"
-    },
-    "snake_case" : {
-      "type" : "integer",
-      "format" : "int32",
-      "readOnly" : true
-    },
-    "property" : {
-      "type" : "string"
-    },
-    "123Number" : {
-      "type" : "integer",
-      "readOnly" : true
-    }
-  },
-  "description" : "Model for testing model name same as property name",
-  "xml" : {
-    "name" : "Name"
-  }
-}
-SCHEMA;
-
-    /** @var int $name */
-    private $name;
-
-    /** @var int $snakeCase */
-    private $snakeCase;
-
-    /** @var string $property */
-    private $property;
-
-    /** @var int $_123number */
-    private $_123number;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/NumberOnly.php b/samples/server/petstore/php-slim4/lib/Model/NumberOnly.php
deleted file mode 100644
index 89a47886edc4..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/NumberOnly.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * NumberOnly
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * NumberOnly
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class NumberOnly implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "JustNumber" : {
-      "type" : "number"
-    }
-  }
-}
-SCHEMA;
-
-    /** @var float $justNumber */
-    private $justNumber;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/Order.php b/samples/server/petstore/php-slim4/lib/Model/Order.php
index e8227de89ada..c6a4de073f00 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Order.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Order.php
@@ -1,22 +1,27 @@
 <?php
 
 /**
- * Order
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  */
 namespace OpenAPIServer\Model;
 
-use OpenAPIServer\Interfaces\ModelInterface;
+use OpenAPIServer\BaseModel;
 
 /**
  * Order
@@ -25,10 +30,21 @@
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
-class Order implements ModelInterface
+class Order extends BaseModel
 {
-    private const MODEL_SCHEMA = <<<'SCHEMA'
+    /**
+     * @var string Models namespace.
+     * Can be required for data deserialization when model contains referenced schemas.
+     */
+    protected const MODELS_NAMESPACE = '\OpenAPIServer\Model';
+
+    /**
+     * @var string Constant with OAS schema of current class.
+     * Should be overwritten by inherited class.
+     */
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
 {
+  "title" : "Pet Order",
   "type" : "object",
   "properties" : {
     "id" : {
@@ -57,39 +73,10 @@ class Order implements ModelInterface
       "default" : false
     }
   },
+  "description" : "An order for a pets from the pet store",
   "xml" : {
     "name" : "Order"
   }
 }
 SCHEMA;
-
-    /** @var int $id */
-    private $id;
-
-    /** @var int $petId */
-    private $petId;
-
-    /** @var int $quantity */
-    private $quantity;
-
-    /** @var \DateTime $shipDate */
-    private $shipDate;
-
-    /** @var string $status Order Status*/
-    private $status;
-
-    /** @var bool $complete */
-    private $complete;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
 }
diff --git a/samples/server/petstore/php-slim4/lib/Model/OuterComposite.php b/samples/server/petstore/php-slim4/lib/Model/OuterComposite.php
deleted file mode 100644
index 277df1f035f3..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/OuterComposite.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * OuterComposite
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * OuterComposite
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class OuterComposite implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "my_number" : {
-      "$ref" : "#/components/schemas/OuterNumber"
-    },
-    "my_string" : {
-      "$ref" : "#/components/schemas/OuterString"
-    },
-    "my_boolean" : {
-      "$ref" : "#/components/schemas/OuterBoolean"
-    }
-  }
-}
-SCHEMA;
-
-    /** @var float $myNumber */
-    private $myNumber;
-
-    /** @var string $myString */
-    private $myString;
-
-    /** @var bool $myBoolean */
-    private $myBoolean;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/OuterEnum.php b/samples/server/petstore/php-slim4/lib/Model/OuterEnum.php
deleted file mode 100644
index ac9d21d46068..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/OuterEnum.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * OuterEnum
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * OuterEnum
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class OuterEnum implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "string",
-  "enum" : [ "placed", "approved", "delivered" ]
-}
-SCHEMA;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/Pet.php b/samples/server/petstore/php-slim4/lib/Model/Pet.php
index d81f045abe8f..d657230c8693 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Pet.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Pet.php
@@ -1,22 +1,27 @@
 <?php
 
 /**
- * Pet
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  */
 namespace OpenAPIServer\Model;
 
-use OpenAPIServer\Interfaces\ModelInterface;
+use OpenAPIServer\BaseModel;
 
 /**
  * Pet
@@ -25,17 +30,27 @@
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
-class Pet implements ModelInterface
+class Pet extends BaseModel
 {
-    private const MODEL_SCHEMA = <<<'SCHEMA'
+    /**
+     * @var string Models namespace.
+     * Can be required for data deserialization when model contains referenced schemas.
+     */
+    protected const MODELS_NAMESPACE = '\OpenAPIServer\Model';
+
+    /**
+     * @var string Constant with OAS schema of current class.
+     * Should be overwritten by inherited class.
+     */
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
 {
+  "title" : "a Pet",
   "required" : [ "name", "photoUrls" ],
   "type" : "object",
   "properties" : {
     "id" : {
       "type" : "integer",
-      "format" : "int64",
-      "x-is-unique" : true
+      "format" : "int64"
     },
     "category" : {
       "$ref" : "#/components/schemas/Category"
@@ -45,7 +60,6 @@ class Pet implements ModelInterface
       "example" : "doggie"
     },
     "photoUrls" : {
-      "uniqueItems" : true,
       "type" : "array",
       "xml" : {
         "name" : "photoUrl",
@@ -71,39 +85,10 @@ class Pet implements ModelInterface
       "enum" : [ "available", "pending", "sold" ]
     }
   },
+  "description" : "A pet for sale in the pet store",
   "xml" : {
     "name" : "Pet"
   }
 }
 SCHEMA;
-
-    /** @var int $id */
-    private $id;
-
-    /** @var \OpenAPIServer\Model\Category $category */
-    private $category;
-
-    /** @var string $name */
-    private $name;
-
-    /** @var string[] $photoUrls */
-    private $photoUrls;
-
-    /** @var \OpenAPIServer\Model\Tag[] $tags */
-    private $tags;
-
-    /** @var string $status pet status in the store*/
-    private $status;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
 }
diff --git a/samples/server/petstore/php-slim4/lib/Model/ReadOnlyFirst.php b/samples/server/petstore/php-slim4/lib/Model/ReadOnlyFirst.php
deleted file mode 100644
index 5ab8ee48389c..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/ReadOnlyFirst.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * ReadOnlyFirst
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * ReadOnlyFirst
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class ReadOnlyFirst implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "bar" : {
-      "type" : "string",
-      "readOnly" : true
-    },
-    "baz" : {
-      "type" : "string"
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $bar */
-    private $bar;
-
-    /** @var string $baz */
-    private $baz;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/SpecialModelName.php b/samples/server/petstore/php-slim4/lib/Model/SpecialModelName.php
deleted file mode 100644
index e22f746884b9..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/SpecialModelName.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * SpecialModelName
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * SpecialModelName
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class SpecialModelName implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "$special[property.name]" : {
-      "type" : "integer",
-      "format" : "int64"
-    }
-  },
-  "xml" : {
-    "name" : "$special[model.name]"
-  }
-}
-SCHEMA;
-
-    /** @var int $specialPropertyName */
-    private $specialPropertyName;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/Tag.php b/samples/server/petstore/php-slim4/lib/Model/Tag.php
index 6a7078552ac3..20f9f8f42130 100644
--- a/samples/server/petstore/php-slim4/lib/Model/Tag.php
+++ b/samples/server/petstore/php-slim4/lib/Model/Tag.php
@@ -1,22 +1,27 @@
 <?php
 
 /**
- * Tag
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  */
 namespace OpenAPIServer\Model;
 
-use OpenAPIServer\Interfaces\ModelInterface;
+use OpenAPIServer\BaseModel;
 
 /**
  * Tag
@@ -25,10 +30,21 @@
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
-class Tag implements ModelInterface
+class Tag extends BaseModel
 {
-    private const MODEL_SCHEMA = <<<'SCHEMA'
+    /**
+     * @var string Models namespace.
+     * Can be required for data deserialization when model contains referenced schemas.
+     */
+    protected const MODELS_NAMESPACE = '\OpenAPIServer\Model';
+
+    /**
+     * @var string Constant with OAS schema of current class.
+     * Should be overwritten by inherited class.
+     */
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
 {
+  "title" : "Pet Tag",
   "type" : "object",
   "properties" : {
     "id" : {
@@ -39,27 +55,10 @@ class Tag implements ModelInterface
       "type" : "string"
     }
   },
+  "description" : "A tag for a pet",
   "xml" : {
     "name" : "Tag"
   }
 }
 SCHEMA;
-
-    /** @var int $id */
-    private $id;
-
-    /** @var string $name */
-    private $name;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
 }
diff --git a/samples/server/petstore/php-slim4/lib/Model/TypeHolderDefault.php b/samples/server/petstore/php-slim4/lib/Model/TypeHolderDefault.php
deleted file mode 100644
index 2a4e87d43ef0..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/TypeHolderDefault.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * TypeHolderDefault
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * TypeHolderDefault
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class TypeHolderDefault implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "required" : [ "array_item", "bool_item", "integer_item", "number_item", "string_item" ],
-  "type" : "object",
-  "properties" : {
-    "string_item" : {
-      "type" : "string",
-      "default" : "what"
-    },
-    "number_item" : {
-      "type" : "number"
-    },
-    "integer_item" : {
-      "type" : "integer"
-    },
-    "bool_item" : {
-      "type" : "boolean",
-      "default" : true
-    },
-    "array_item" : {
-      "type" : "array",
-      "items" : {
-        "type" : "integer"
-      }
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $stringItem */
-    private $stringItem;
-
-    /** @var float $numberItem */
-    private $numberItem;
-
-    /** @var int $integerItem */
-    private $integerItem;
-
-    /** @var bool $boolItem */
-    private $boolItem;
-
-    /** @var int[] $arrayItem */
-    private $arrayItem;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/TypeHolderExample.php b/samples/server/petstore/php-slim4/lib/Model/TypeHolderExample.php
deleted file mode 100644
index 958e32607570..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/TypeHolderExample.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * TypeHolderExample
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * TypeHolderExample
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class TypeHolderExample implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "required" : [ "array_item", "bool_item", "float_item", "integer_item", "number_item", "string_item" ],
-  "type" : "object",
-  "properties" : {
-    "string_item" : {
-      "type" : "string",
-      "example" : "what"
-    },
-    "number_item" : {
-      "type" : "number",
-      "example" : 1.234
-    },
-    "float_item" : {
-      "type" : "number",
-      "format" : "float",
-      "example" : 1.234
-    },
-    "integer_item" : {
-      "type" : "integer",
-      "example" : -2
-    },
-    "bool_item" : {
-      "type" : "boolean",
-      "example" : true
-    },
-    "array_item" : {
-      "type" : "array",
-      "example" : [ 0, 1, 2, 3 ],
-      "items" : {
-        "type" : "integer"
-      }
-    }
-  }
-}
-SCHEMA;
-
-    /** @var string $stringItem */
-    private $stringItem;
-
-    /** @var float $numberItem */
-    private $numberItem;
-
-    /** @var float $floatItem */
-    private $floatItem;
-
-    /** @var int $integerItem */
-    private $integerItem;
-
-    /** @var bool $boolItem */
-    private $boolItem;
-
-    /** @var int[] $arrayItem */
-    private $arrayItem;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Model/User.php b/samples/server/petstore/php-slim4/lib/Model/User.php
index ebd8f17ae35c..6cb015b3cd20 100644
--- a/samples/server/petstore/php-slim4/lib/Model/User.php
+++ b/samples/server/petstore/php-slim4/lib/Model/User.php
@@ -1,22 +1,27 @@
 <?php
 
 /**
- * User
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
+/**
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
 /**
  * NOTE: This class is auto generated by the openapi generator program.
  * https://github.com/openapitools/openapi-generator
  */
 namespace OpenAPIServer\Model;
 
-use OpenAPIServer\Interfaces\ModelInterface;
+use OpenAPIServer\BaseModel;
 
 /**
  * User
@@ -25,16 +30,26 @@
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
-class User implements ModelInterface
+class User extends BaseModel
 {
-    private const MODEL_SCHEMA = <<<'SCHEMA'
+    /**
+     * @var string Models namespace.
+     * Can be required for data deserialization when model contains referenced schemas.
+     */
+    protected const MODELS_NAMESPACE = '\OpenAPIServer\Model';
+
+    /**
+     * @var string Constant with OAS schema of current class.
+     * Should be overwritten by inherited class.
+     */
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
 {
+  "title" : "a User",
   "type" : "object",
   "properties" : {
     "id" : {
       "type" : "integer",
-      "format" : "int64",
-      "x-is-unique" : true
+      "format" : "int64"
     },
     "username" : {
       "type" : "string"
@@ -60,45 +75,10 @@ class User implements ModelInterface
       "format" : "int32"
     }
   },
+  "description" : "A User who is purchasing from the pet store",
   "xml" : {
     "name" : "User"
   }
 }
 SCHEMA;
-
-    /** @var int $id */
-    private $id;
-
-    /** @var string $username */
-    private $username;
-
-    /** @var string $firstName */
-    private $firstName;
-
-    /** @var string $lastName */
-    private $lastName;
-
-    /** @var string $email */
-    private $email;
-
-    /** @var string $password */
-    private $password;
-
-    /** @var string $phone */
-    private $phone;
-
-    /** @var int $userStatus User Status*/
-    private $userStatus;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
 }
diff --git a/samples/server/petstore/php-slim4/lib/Model/XmlItem.php b/samples/server/petstore/php-slim4/lib/Model/XmlItem.php
deleted file mode 100644
index a63fc642646a..000000000000
--- a/samples/server/petstore/php-slim4/lib/Model/XmlItem.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<?php
-
-/**
- * XmlItem
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- */
-namespace OpenAPIServer\Model;
-
-use OpenAPIServer\Interfaces\ModelInterface;
-
-/**
- * XmlItem
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-class XmlItem implements ModelInterface
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-  "type" : "object",
-  "properties" : {
-    "attribute_string" : {
-      "type" : "string",
-      "example" : "string",
-      "xml" : {
-        "attribute" : true
-      }
-    },
-    "attribute_number" : {
-      "type" : "number",
-      "example" : 1.234,
-      "xml" : {
-        "attribute" : true
-      }
-    },
-    "attribute_integer" : {
-      "type" : "integer",
-      "example" : -2,
-      "xml" : {
-        "attribute" : true
-      }
-    },
-    "attribute_boolean" : {
-      "type" : "boolean",
-      "example" : true,
-      "xml" : {
-        "attribute" : true
-      }
-    },
-    "wrapped_array" : {
-      "type" : "array",
-      "xml" : {
-        "wrapped" : true
-      },
-      "items" : {
-        "type" : "integer"
-      }
-    },
-    "name_string" : {
-      "type" : "string",
-      "example" : "string",
-      "xml" : {
-        "name" : "xml_name_string"
-      }
-    },
-    "name_number" : {
-      "type" : "number",
-      "example" : 1.234,
-      "xml" : {
-        "name" : "xml_name_number"
-      }
-    },
-    "name_integer" : {
-      "type" : "integer",
-      "example" : -2,
-      "xml" : {
-        "name" : "xml_name_integer"
-      }
-    },
-    "name_boolean" : {
-      "type" : "boolean",
-      "example" : true,
-      "xml" : {
-        "name" : "xml_name_boolean"
-      }
-    },
-    "name_array" : {
-      "type" : "array",
-      "items" : {
-        "type" : "integer",
-        "xml" : {
-          "name" : "xml_name_array_item"
-        }
-      }
-    },
-    "name_wrapped_array" : {
-      "type" : "array",
-      "xml" : {
-        "name" : "xml_name_wrapped_array",
-        "wrapped" : true
-      },
-      "items" : {
-        "type" : "integer",
-        "xml" : {
-          "name" : "xml_name_wrapped_array_item"
-        }
-      }
-    },
-    "prefix_string" : {
-      "type" : "string",
-      "example" : "string",
-      "xml" : {
-        "prefix" : "ab"
-      }
-    },
-    "prefix_number" : {
-      "type" : "number",
-      "example" : 1.234,
-      "xml" : {
-        "prefix" : "cd"
-      }
-    },
-    "prefix_integer" : {
-      "type" : "integer",
-      "example" : -2,
-      "xml" : {
-        "prefix" : "ef"
-      }
-    },
-    "prefix_boolean" : {
-      "type" : "boolean",
-      "example" : true,
-      "xml" : {
-        "prefix" : "gh"
-      }
-    },
-    "prefix_array" : {
-      "type" : "array",
-      "items" : {
-        "type" : "integer",
-        "xml" : {
-          "prefix" : "ij"
-        }
-      }
-    },
-    "prefix_wrapped_array" : {
-      "type" : "array",
-      "xml" : {
-        "prefix" : "kl",
-        "wrapped" : true
-      },
-      "items" : {
-        "type" : "integer",
-        "xml" : {
-          "prefix" : "mn"
-        }
-      }
-    },
-    "namespace_string" : {
-      "type" : "string",
-      "example" : "string",
-      "xml" : {
-        "namespace" : "http://a.com/schema"
-      }
-    },
-    "namespace_number" : {
-      "type" : "number",
-      "example" : 1.234,
-      "xml" : {
-        "namespace" : "http://b.com/schema"
-      }
-    },
-    "namespace_integer" : {
-      "type" : "integer",
-      "example" : -2,
-      "xml" : {
-        "namespace" : "http://c.com/schema"
-      }
-    },
-    "namespace_boolean" : {
-      "type" : "boolean",
-      "example" : true,
-      "xml" : {
-        "namespace" : "http://d.com/schema"
-      }
-    },
-    "namespace_array" : {
-      "type" : "array",
-      "items" : {
-        "type" : "integer",
-        "xml" : {
-          "namespace" : "http://e.com/schema"
-        }
-      }
-    },
-    "namespace_wrapped_array" : {
-      "type" : "array",
-      "xml" : {
-        "namespace" : "http://f.com/schema",
-        "wrapped" : true
-      },
-      "items" : {
-        "type" : "integer",
-        "xml" : {
-          "namespace" : "http://g.com/schema"
-        }
-      }
-    },
-    "prefix_ns_string" : {
-      "type" : "string",
-      "example" : "string",
-      "xml" : {
-        "namespace" : "http://a.com/schema",
-        "prefix" : "a"
-      }
-    },
-    "prefix_ns_number" : {
-      "type" : "number",
-      "example" : 1.234,
-      "xml" : {
-        "namespace" : "http://b.com/schema",
-        "prefix" : "b"
-      }
-    },
-    "prefix_ns_integer" : {
-      "type" : "integer",
-      "example" : -2,
-      "xml" : {
-        "namespace" : "http://c.com/schema",
-        "prefix" : "c"
-      }
-    },
-    "prefix_ns_boolean" : {
-      "type" : "boolean",
-      "example" : true,
-      "xml" : {
-        "namespace" : "http://d.com/schema",
-        "prefix" : "d"
-      }
-    },
-    "prefix_ns_array" : {
-      "type" : "array",
-      "items" : {
-        "type" : "integer",
-        "xml" : {
-          "namespace" : "http://e.com/schema",
-          "prefix" : "e"
-        }
-      }
-    },
-    "prefix_ns_wrapped_array" : {
-      "type" : "array",
-      "xml" : {
-        "namespace" : "http://f.com/schema",
-        "prefix" : "f",
-        "wrapped" : true
-      },
-      "items" : {
-        "type" : "integer",
-        "xml" : {
-          "namespace" : "http://g.com/schema",
-          "prefix" : "g"
-        }
-      }
-    }
-  },
-  "xml" : {
-    "namespace" : "http://a.com/schema",
-    "prefix" : "pre"
-  }
-}
-SCHEMA;
-
-    /** @var string $attributeString */
-    private $attributeString;
-
-    /** @var float $attributeNumber */
-    private $attributeNumber;
-
-    /** @var int $attributeInteger */
-    private $attributeInteger;
-
-    /** @var bool $attributeBoolean */
-    private $attributeBoolean;
-
-    /** @var int[] $wrappedArray */
-    private $wrappedArray;
-
-    /** @var string $nameString */
-    private $nameString;
-
-    /** @var float $nameNumber */
-    private $nameNumber;
-
-    /** @var int $nameInteger */
-    private $nameInteger;
-
-    /** @var bool $nameBoolean */
-    private $nameBoolean;
-
-    /** @var int[] $nameArray */
-    private $nameArray;
-
-    /** @var int[] $nameWrappedArray */
-    private $nameWrappedArray;
-
-    /** @var string $prefixString */
-    private $prefixString;
-
-    /** @var float $prefixNumber */
-    private $prefixNumber;
-
-    /** @var int $prefixInteger */
-    private $prefixInteger;
-
-    /** @var bool $prefixBoolean */
-    private $prefixBoolean;
-
-    /** @var int[] $prefixArray */
-    private $prefixArray;
-
-    /** @var int[] $prefixWrappedArray */
-    private $prefixWrappedArray;
-
-    /** @var string $namespaceString */
-    private $namespaceString;
-
-    /** @var float $namespaceNumber */
-    private $namespaceNumber;
-
-    /** @var int $namespaceInteger */
-    private $namespaceInteger;
-
-    /** @var bool $namespaceBoolean */
-    private $namespaceBoolean;
-
-    /** @var int[] $namespaceArray */
-    private $namespaceArray;
-
-    /** @var int[] $namespaceWrappedArray */
-    private $namespaceWrappedArray;
-
-    /** @var string $prefixNsString */
-    private $prefixNsString;
-
-    /** @var float $prefixNsNumber */
-    private $prefixNsNumber;
-
-    /** @var int $prefixNsInteger */
-    private $prefixNsInteger;
-
-    /** @var bool $prefixNsBoolean */
-    private $prefixNsBoolean;
-
-    /** @var int[] $prefixNsArray */
-    private $prefixNsArray;
-
-    /** @var int[] $prefixNsWrappedArray */
-    private $prefixNsWrappedArray;
-
-    /**
-     * Returns model schema.
-     *
-     * @param bool $assoc When TRUE, returned objects will be converted into associative arrays. Default FALSE.
-     *
-     * @return array
-     */
-    public static function getOpenApiSchema($assoc = false)
-    {
-        return json_decode(static::MODEL_SCHEMA, $assoc);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/SlimRouter.php b/samples/server/petstore/php-slim4/lib/SlimRouter.php
index 4588e17fd56a..0d59a3793e30 100644
--- a/samples/server/petstore/php-slim4/lib/SlimRouter.php
+++ b/samples/server/petstore/php-slim4/lib/SlimRouter.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- * SlimRouter
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
  * @package OpenAPIServer
  * @author  OpenAPI Generator team
@@ -11,9 +10,7 @@
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -27,6 +24,7 @@
 
 use Slim\Factory\AppFactory;
 use Slim\Interfaces\RouteInterface;
+use Slim\Exception\HttpNotImplementedException;
 use Psr\Container\ContainerInterface;
 use InvalidArgumentException;
 use Dyorg\TokenAuthentication;
@@ -34,7 +32,8 @@
 use Psr\Http\Message\ServerRequestInterface;
 use OpenAPIServer\Middleware\JsonBodyParserMiddleware;
 use OpenAPIServer\Mock\OpenApiDataMocker;
-use OpenAPIServer\Mock\OpenApiDataMockerMiddleware;
+use OpenAPIServer\Mock\OpenApiDataMockerRouteMiddleware;
+use Slim\Psr7\Factory\ResponseFactory;
 use Exception;
 
 /**
@@ -52,443 +51,35 @@ class SlimRouter
 
     /** @var array[] list of all api operations */
     private $operations = [
-        [
-            'httpMethod' => 'PATCH',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/another-fake/dummy',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractAnotherFakeApi',
-            'userClassname' => 'AnotherFakeApi',
-            'operationId' => 'call123TestSpecialTags',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
-                    'jsonSchema' => '{
-  "description" : "successful operation",
-  "content" : {
-    "application/json" : {
-      "schema" : {
-        "$ref" : "#/components/schemas/Client"
-      }
-    }
-  }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/create_xml_item',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'createXmlItem',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
-                    'jsonSchema' => '{
-  "description" : "successful operation",
-  "content" : { }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/outer/boolean',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'fakeOuterBooleanSerialize',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'Output boolean',
-                    'jsonSchema' => '{
-  "description" : "Output boolean",
-  "content" : {
-    "*/*" : {
-      "schema" : {
-        "$ref" : "#/components/schemas/OuterBoolean"
-      }
-    }
-  }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
         [
             'httpMethod' => 'POST',
             'basePathWithoutHost' => '/v2',
-            'path' => '/fake/outer/composite',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'fakeOuterCompositeSerialize',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'Output composite',
-                    'jsonSchema' => '{
-  "description" : "Output composite",
-  "content" : {
-    "*/*" : {
-      "schema" : {
-        "$ref" : "#/components/schemas/OuterComposite"
-      }
-    }
-  }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/outer/number',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'fakeOuterNumberSerialize',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'Output number',
-                    'jsonSchema' => '{
-  "description" : "Output number",
-  "content" : {
-    "*/*" : {
-      "schema" : {
-        "$ref" : "#/components/schemas/OuterNumber"
-      }
-    }
-  }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/outer/string',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'fakeOuterStringSerialize',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'Output string',
-                    'jsonSchema' => '{
-  "description" : "Output string",
-  "content" : {
-    "*/*" : {
-      "schema" : {
-        "$ref" : "#/components/schemas/OuterString"
-      }
-    }
-  }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'PUT',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/body-with-file-schema',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testBodyWithFileSchema',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'Success',
-                    'jsonSchema' => '{
-  "description" : "Success",
-  "content" : { }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'PUT',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/body-with-query-params',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testBodyWithQueryParams',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'Success',
-                    'jsonSchema' => '{
-  "description" : "Success",
-  "content" : { }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'PATCH',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake',
+            'path' => '/pet',
             'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testClientModel',
+            'classname' => 'AbstractPetApi',
+            'userClassname' => 'PetApi',
+            'operationId' => 'addPet',
             'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
+                '200' => [
                     'jsonSchema' => '{
   "description" : "successful operation",
   "content" : {
-    "application/json" : {
+    "application/xml" : {
       "schema" : {
-        "$ref" : "#/components/schemas/Client"
+        "$ref" : "#/components/schemas/Pet"
       }
-    }
-  }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testEndpointParameters',
-            'responses' => [
-                '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid username supplied',
-                    'jsonSchema' => '{
-  "description" : "Invalid username supplied",
-  "content" : { }
-}',
-                ],
-                '404' => [
-                    'code' => 404,
-                    'message' => 'User not found',
-                    'jsonSchema' => '{
-  "description" : "User not found",
-  "content" : { }
-}',
-                ],
-            ],
-            'authMethods' => [
-                // http security schema named 'http_basic_test'
-                [
-                    'type' => 'http',
-                    'isBasic' => true,
-                    'isBearer' => false,
-                    'isApiKey' => false,
-                    'isOAuth' => false,
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'GET',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testEnumParameters',
-            'responses' => [
-                '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid request',
-                    'jsonSchema' => '{
-  "description" : "Invalid request",
-  "content" : { }
-}',
-                ],
-                '404' => [
-                    'code' => 404,
-                    'message' => 'Not found',
-                    'jsonSchema' => '{
-  "description" : "Not found",
-  "content" : { }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'DELETE',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testGroupParameters',
-            'responses' => [
-                '400' => [
-                    'code' => 400,
-                    'message' => 'Someting wrong',
-                    'jsonSchema' => '{
-  "description" : "Someting wrong",
-  "content" : { }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/inline-additionalProperties',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testInlineAdditionalProperties',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
-                    'jsonSchema' => '{
-  "description" : "successful operation",
-  "content" : { }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'GET',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/jsonFormData',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testJsonFormData',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
-                    'jsonSchema' => '{
-  "description" : "successful operation",
-  "content" : { }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'PUT',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/test-query-paramters',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeApi',
-            'userClassname' => 'FakeApi',
-            'operationId' => 'testQueryParameterCollectionFormat',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'Success',
-                    'jsonSchema' => '{
-  "description" : "Success",
-  "content" : { }
-}',
-                ],
-            ],
-            'authMethods' => [
-            ],
-        ],
-        [
-            'httpMethod' => 'PATCH',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake_classname_test',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractFakeClassnameTags123Api',
-            'userClassname' => 'FakeClassnameTags123Api',
-            'operationId' => 'testClassname',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
-                    'jsonSchema' => '{
-  "description" : "successful operation",
-  "content" : {
+    },
     "application/json" : {
       "schema" : {
-        "$ref" : "#/components/schemas/Client"
+        "$ref" : "#/components/schemas/Pet"
       }
     }
   }
-}',
-                ],
-            ],
-            'authMethods' => [
-                // apiKey security schema named 'api_key_query'
-                [
-                    'type' => 'apiKey',
-                    'isBasic' => false,
-                    'isBearer' => false,
-                    'isApiKey' => true,
-                    'isOAuth' => false,
-                    'keyParamName' => 'api_key_query',
-                    'isKeyInHeader' => false,
-                    'isKeyInQuery' => true,
-                    'isKeyInCookie' => false,
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/pet',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractPetApi',
-            'userClassname' => 'PetApi',
-            'operationId' => 'addPet',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
-                    'jsonSchema' => '{
-  "description" : "successful operation",
-  "content" : { }
 }',
                 ],
                 '405' => [
-                    'code' => 405,
-                    'message' => 'Invalid input',
                     'jsonSchema' => '{
-  "description" : "Invalid input",
-  "content" : { }
+  "description" : "Invalid input"
 }',
                 ],
             ],
@@ -516,9 +107,7 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'findPetsByStatus',
             'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
+                '200' => [
                     'jsonSchema' => '{
   "description" : "successful operation",
   "content" : {
@@ -542,11 +131,8 @@ class SlimRouter
 }',
                 ],
                 '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid status value',
                     'jsonSchema' => '{
-  "description" : "Invalid status value",
-  "content" : { }
+  "description" : "Invalid status value"
 }',
                 ],
             ],
@@ -559,7 +145,6 @@ class SlimRouter
                     'isApiKey' => false,
                     'isOAuth' => true,
                     'scopes' => [
-                        'write:pets', // modify pets in your account
                         'read:pets', // read your pets
                     ],
                 ],
@@ -574,15 +159,12 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'findPetsByTags',
             'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
+                '200' => [
                     'jsonSchema' => '{
   "description" : "successful operation",
   "content" : {
     "application/xml" : {
       "schema" : {
-        "uniqueItems" : true,
         "type" : "array",
         "items" : {
           "$ref" : "#/components/schemas/Pet"
@@ -591,7 +173,6 @@ class SlimRouter
     },
     "application/json" : {
       "schema" : {
-        "uniqueItems" : true,
         "type" : "array",
         "items" : {
           "$ref" : "#/components/schemas/Pet"
@@ -602,11 +183,8 @@ class SlimRouter
 }',
                 ],
                 '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid tag value',
                     'jsonSchema' => '{
-  "description" : "Invalid tag value",
-  "content" : { }
+  "description" : "Invalid tag value"
 }',
                 ],
             ],
@@ -619,7 +197,6 @@ class SlimRouter
                     'isApiKey' => false,
                     'isOAuth' => true,
                     'scopes' => [
-                        'write:pets', // modify pets in your account
                         'read:pets', // read your pets
                     ],
                 ],
@@ -634,36 +211,36 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'updatePet',
             'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
+                '200' => [
                     'jsonSchema' => '{
   "description" : "successful operation",
-  "content" : { }
+  "content" : {
+    "application/xml" : {
+      "schema" : {
+        "$ref" : "#/components/schemas/Pet"
+      }
+    },
+    "application/json" : {
+      "schema" : {
+        "$ref" : "#/components/schemas/Pet"
+      }
+    }
+  }
 }',
                 ],
                 '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid ID supplied',
                     'jsonSchema' => '{
-  "description" : "Invalid ID supplied",
-  "content" : { }
+  "description" : "Invalid ID supplied"
 }',
                 ],
                 '404' => [
-                    'code' => 404,
-                    'message' => 'Pet not found',
                     'jsonSchema' => '{
-  "description" : "Pet not found",
-  "content" : { }
+  "description" : "Pet not found"
 }',
                 ],
                 '405' => [
-                    'code' => 405,
-                    'message' => 'Validation exception',
                     'jsonSchema' => '{
-  "description" : "Validation exception",
-  "content" : { }
+  "description" : "Validation exception"
 }',
                 ],
             ],
@@ -691,20 +268,9 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'deletePet',
             'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
-                    'jsonSchema' => '{
-  "description" : "successful operation",
-  "content" : { }
-}',
-                ],
                 '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid pet value',
                     'jsonSchema' => '{
-  "description" : "Invalid pet value",
-  "content" : { }
+  "description" : "Invalid pet value"
 }',
                 ],
             ],
@@ -732,9 +298,7 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'getPetById',
             'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
+                '200' => [
                     'jsonSchema' => '{
   "description" : "successful operation",
   "content" : {
@@ -752,19 +316,13 @@ class SlimRouter
 }',
                 ],
                 '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid ID supplied',
                     'jsonSchema' => '{
-  "description" : "Invalid ID supplied",
-  "content" : { }
+  "description" : "Invalid ID supplied"
 }',
                 ],
                 '404' => [
-                    'code' => 404,
-                    'message' => 'Pet not found',
                     'jsonSchema' => '{
-  "description" : "Pet not found",
-  "content" : { }
+  "description" : "Pet not found"
 }',
                 ],
             ],
@@ -793,11 +351,8 @@ class SlimRouter
             'operationId' => 'updatePetWithForm',
             'responses' => [
                 '405' => [
-                    'code' => 405,
-                    'message' => 'Invalid input',
                     'jsonSchema' => '{
-  "description" : "Invalid input",
-  "content" : { }
+  "description" : "Invalid input"
 }',
                 ],
             ],
@@ -825,48 +380,7 @@ class SlimRouter
             'userClassname' => 'PetApi',
             'operationId' => 'uploadFile',
             'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
-                    'jsonSchema' => '{
-  "description" : "successful operation",
-  "content" : {
-    "application/json" : {
-      "schema" : {
-        "$ref" : "#/components/schemas/ApiResponse"
-      }
-    }
-  }
-}',
-                ],
-            ],
-            'authMethods' => [
-                // oauth2 security schema named 'petstore_auth'
-                [
-                    'type' => 'oauth2',
-                    'isBasic' => false,
-                    'isBearer' => false,
-                    'isApiKey' => false,
-                    'isOAuth' => true,
-                    'scopes' => [
-                        'write:pets', // modify pets in your account
-                        'read:pets', // read your pets
-                    ],
-                ],
-            ],
-        ],
-        [
-            'httpMethod' => 'POST',
-            'basePathWithoutHost' => '/v2',
-            'path' => '/fake/{petId}/uploadImageWithRequiredFile',
-            'apiPackage' => 'OpenAPIServer\Api',
-            'classname' => 'AbstractPetApi',
-            'userClassname' => 'PetApi',
-            'operationId' => 'uploadFileWithRequiredFile',
-            'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
+                '200' => [
                     'jsonSchema' => '{
   "description" : "successful operation",
   "content" : {
@@ -903,9 +417,7 @@ class SlimRouter
             'userClassname' => 'StoreApi',
             'operationId' => 'getInventory',
             'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
+                '200' => [
                     'jsonSchema' => '{
   "description" : "successful operation",
   "content" : {
@@ -946,9 +458,7 @@ class SlimRouter
             'userClassname' => 'StoreApi',
             'operationId' => 'placeOrder',
             'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
+                '200' => [
                     'jsonSchema' => '{
   "description" : "successful operation",
   "content" : {
@@ -966,11 +476,8 @@ class SlimRouter
 }',
                 ],
                 '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid Order',
                     'jsonSchema' => '{
-  "description" : "Invalid Order",
-  "content" : { }
+  "description" : "Invalid Order"
 }',
                 ],
             ],
@@ -980,26 +487,20 @@ class SlimRouter
         [
             'httpMethod' => 'DELETE',
             'basePathWithoutHost' => '/v2',
-            'path' => '/store/order/{order_id}',
+            'path' => '/store/order/{orderId}',
             'apiPackage' => 'OpenAPIServer\Api',
             'classname' => 'AbstractStoreApi',
             'userClassname' => 'StoreApi',
             'operationId' => 'deleteOrder',
             'responses' => [
                 '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid ID supplied',
                     'jsonSchema' => '{
-  "description" : "Invalid ID supplied",
-  "content" : { }
+  "description" : "Invalid ID supplied"
 }',
                 ],
                 '404' => [
-                    'code' => 404,
-                    'message' => 'Order not found',
                     'jsonSchema' => '{
-  "description" : "Order not found",
-  "content" : { }
+  "description" : "Order not found"
 }',
                 ],
             ],
@@ -1009,15 +510,13 @@ class SlimRouter
         [
             'httpMethod' => 'GET',
             'basePathWithoutHost' => '/v2',
-            'path' => '/store/order/{order_id}',
+            'path' => '/store/order/{orderId}',
             'apiPackage' => 'OpenAPIServer\Api',
             'classname' => 'AbstractStoreApi',
             'userClassname' => 'StoreApi',
             'operationId' => 'getOrderById',
             'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
+                '200' => [
                     'jsonSchema' => '{
   "description" : "successful operation",
   "content" : {
@@ -1035,19 +534,13 @@ class SlimRouter
 }',
                 ],
                 '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid ID supplied',
                     'jsonSchema' => '{
-  "description" : "Invalid ID supplied",
-  "content" : { }
+  "description" : "Invalid ID supplied"
 }',
                 ],
                 '404' => [
-                    'code' => 404,
-                    'message' => 'Order not found',
                     'jsonSchema' => '{
-  "description" : "Order not found",
-  "content" : { }
+  "description" : "Order not found"
 }',
                 ],
             ],
@@ -1064,15 +557,24 @@ class SlimRouter
             'operationId' => 'createUser',
             'responses' => [
                 'default' => [
-                    'code' => 0,
-                    'message' => 'successful operation',
                     'jsonSchema' => '{
-  "description" : "successful operation",
-  "content" : { }
+  "description" : "successful operation"
 }',
                 ],
             ],
             'authMethods' => [
+                // apiKey security schema named 'api_key'
+                [
+                    'type' => 'apiKey',
+                    'isBasic' => false,
+                    'isBearer' => false,
+                    'isApiKey' => true,
+                    'isOAuth' => false,
+                    'keyParamName' => 'api_key',
+                    'isKeyInHeader' => true,
+                    'isKeyInQuery' => false,
+                    'isKeyInCookie' => false,
+                ],
             ],
         ],
         [
@@ -1085,15 +587,24 @@ class SlimRouter
             'operationId' => 'createUsersWithArrayInput',
             'responses' => [
                 'default' => [
-                    'code' => 0,
-                    'message' => 'successful operation',
                     'jsonSchema' => '{
-  "description" : "successful operation",
-  "content" : { }
+  "description" : "successful operation"
 }',
                 ],
             ],
             'authMethods' => [
+                // apiKey security schema named 'api_key'
+                [
+                    'type' => 'apiKey',
+                    'isBasic' => false,
+                    'isBearer' => false,
+                    'isApiKey' => true,
+                    'isOAuth' => false,
+                    'keyParamName' => 'api_key',
+                    'isKeyInHeader' => true,
+                    'isKeyInQuery' => false,
+                    'isKeyInCookie' => false,
+                ],
             ],
         ],
         [
@@ -1106,15 +617,24 @@ class SlimRouter
             'operationId' => 'createUsersWithListInput',
             'responses' => [
                 'default' => [
-                    'code' => 0,
-                    'message' => 'successful operation',
                     'jsonSchema' => '{
-  "description" : "successful operation",
-  "content" : { }
+  "description" : "successful operation"
 }',
                 ],
             ],
             'authMethods' => [
+                // apiKey security schema named 'api_key'
+                [
+                    'type' => 'apiKey',
+                    'isBasic' => false,
+                    'isBearer' => false,
+                    'isApiKey' => true,
+                    'isOAuth' => false,
+                    'keyParamName' => 'api_key',
+                    'isKeyInHeader' => true,
+                    'isKeyInQuery' => false,
+                    'isKeyInCookie' => false,
+                ],
             ],
         ],
         [
@@ -1126,21 +646,32 @@ class SlimRouter
             'userClassname' => 'UserApi',
             'operationId' => 'loginUser',
             'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
+                '200' => [
                     'jsonSchema' => '{
   "description" : "successful operation",
   "headers" : {
+    "Set-Cookie" : {
+      "description" : "Cookie authentication key for use with the `api_key` apiKey authentication.",
+      "style" : "simple",
+      "explode" : false,
+      "schema" : {
+        "type" : "string",
+        "example" : "AUTH_KEY=abcde12345; Path=/; HttpOnly"
+      }
+    },
     "X-Rate-Limit" : {
       "description" : "calls per hour allowed by the user",
+      "style" : "simple",
+      "explode" : false,
       "schema" : {
         "type" : "integer",
         "format" : "int32"
       }
     },
     "X-Expires-After" : {
-      "description" : "date in UTC when token expires",
+      "description" : "date in UTC when toekn expires",
+      "style" : "simple",
+      "explode" : false,
       "schema" : {
         "type" : "string",
         "format" : "date-time"
@@ -1162,11 +693,8 @@ class SlimRouter
 }',
                 ],
                 '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid username/password supplied',
                     'jsonSchema' => '{
-  "description" : "Invalid username/password supplied",
-  "content" : { }
+  "description" : "Invalid username/password supplied"
 }',
                 ],
             ],
@@ -1183,15 +711,24 @@ class SlimRouter
             'operationId' => 'logoutUser',
             'responses' => [
                 'default' => [
-                    'code' => 0,
-                    'message' => 'successful operation',
                     'jsonSchema' => '{
-  "description" : "successful operation",
-  "content" : { }
+  "description" : "successful operation"
 }',
                 ],
             ],
             'authMethods' => [
+                // apiKey security schema named 'api_key'
+                [
+                    'type' => 'apiKey',
+                    'isBasic' => false,
+                    'isBearer' => false,
+                    'isApiKey' => true,
+                    'isOAuth' => false,
+                    'keyParamName' => 'api_key',
+                    'isKeyInHeader' => true,
+                    'isKeyInQuery' => false,
+                    'isKeyInCookie' => false,
+                ],
             ],
         ],
         [
@@ -1204,23 +741,29 @@ class SlimRouter
             'operationId' => 'deleteUser',
             'responses' => [
                 '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid username supplied',
                     'jsonSchema' => '{
-  "description" : "Invalid username supplied",
-  "content" : { }
+  "description" : "Invalid username supplied"
 }',
                 ],
                 '404' => [
-                    'code' => 404,
-                    'message' => 'User not found',
                     'jsonSchema' => '{
-  "description" : "User not found",
-  "content" : { }
+  "description" : "User not found"
 }',
                 ],
             ],
             'authMethods' => [
+                // apiKey security schema named 'api_key'
+                [
+                    'type' => 'apiKey',
+                    'isBasic' => false,
+                    'isBearer' => false,
+                    'isApiKey' => true,
+                    'isOAuth' => false,
+                    'keyParamName' => 'api_key',
+                    'isKeyInHeader' => true,
+                    'isKeyInQuery' => false,
+                    'isKeyInCookie' => false,
+                ],
             ],
         ],
         [
@@ -1232,9 +775,7 @@ class SlimRouter
             'userClassname' => 'UserApi',
             'operationId' => 'getUserByName',
             'responses' => [
-                'default' => [
-                    'code' => 200,
-                    'message' => 'successful operation',
+                '200' => [
                     'jsonSchema' => '{
   "description" : "successful operation",
   "content" : {
@@ -1252,19 +793,13 @@ class SlimRouter
 }',
                 ],
                 '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid username supplied',
                     'jsonSchema' => '{
-  "description" : "Invalid username supplied",
-  "content" : { }
+  "description" : "Invalid username supplied"
 }',
                 ],
                 '404' => [
-                    'code' => 404,
-                    'message' => 'User not found',
                     'jsonSchema' => '{
-  "description" : "User not found",
-  "content" : { }
+  "description" : "User not found"
 }',
                 ],
             ],
@@ -1281,23 +816,29 @@ class SlimRouter
             'operationId' => 'updateUser',
             'responses' => [
                 '400' => [
-                    'code' => 400,
-                    'message' => 'Invalid user supplied',
                     'jsonSchema' => '{
-  "description" : "Invalid user supplied",
-  "content" : { }
+  "description" : "Invalid user supplied"
 }',
                 ],
                 '404' => [
-                    'code' => 404,
-                    'message' => 'User not found',
                     'jsonSchema' => '{
-  "description" : "User not found",
-  "content" : { }
+  "description" : "User not found"
 }',
                 ],
             ],
             'authMethods' => [
+                // apiKey security schema named 'api_key'
+                [
+                    'type' => 'apiKey',
+                    'isBasic' => false,
+                    'isBearer' => false,
+                    'isApiKey' => true,
+                    'isOAuth' => false,
+                    'keyParamName' => 'api_key',
+                    'isKeyInHeader' => true,
+                    'isKeyInQuery' => false,
+                    'isKeyInCookie' => false,
+                ],
             ],
         ],
     ];
@@ -1307,7 +848,8 @@ class SlimRouter
      *
      * @param ContainerInterface|array $settings Either a ContainerInterface or an associative array of app settings
      *
-     * @throws Exception When implementation class doesn't exists
+     * @throws HttpNotImplementedException When implementation class doesn't exists
+     * @throws Exception when not supported authorization schema type provided
      */
     public function __construct($settings = [])
     {
@@ -1323,15 +865,15 @@ public function __construct($settings = [])
         $authPackage = 'OpenAPIServer\Auth';
         $basicAuthenticator = function (ServerRequestInterface &$request, TokenSearch $tokenSearch) use ($authPackage) {
             $message = "How about extending AbstractAuthenticator class by {$authPackage}\BasicAuthenticator?";
-            throw new Exception($message);
+            throw new HttpNotImplementedException($request, $message);
         };
         $apiKeyAuthenticator = function (ServerRequestInterface &$request, TokenSearch $tokenSearch) use ($authPackage) {
             $message = "How about extending AbstractAuthenticator class by {$authPackage}\ApiKeyAuthenticator?";
-            throw new Exception($message);
+            throw new HttpNotImplementedException($request, $message);
         };
         $oAuthAuthenticator = function (ServerRequestInterface &$request, TokenSearch $tokenSearch) use ($authPackage) {
             $message = "How about extending AbstractAuthenticator class by {$authPackage}\OAuthAuthenticator?";
-            throw new Exception($message);
+            throw new HttpNotImplementedException($request, $message);
         };
 
         $userOptions = $this->getSetting($settings, 'tokenAuthenticationOptions', null);
@@ -1339,15 +881,14 @@ public function __construct($settings = [])
         // mocker options
         $mockerOptions = $this->getSetting($settings, 'mockerOptions', null);
         $dataMocker = $mockerOptions['dataMocker'] ?? new OpenApiDataMocker();
-        $getMockResponseCallback = $mockerOptions['getMockResponseCallback'] ?? null;
+        $responseFactory = new ResponseFactory();
+        $getMockStatusCodeCallback = $mockerOptions['getMockStatusCodeCallback'] ?? null;
         $mockAfterCallback = $mockerOptions['afterCallback'] ?? null;
 
         foreach ($this->operations as $operation) {
             $callback = function ($request, $response, $arguments) use ($operation) {
                 $message = "How about extending {$operation['classname']} by {$operation['apiPackage']}\\{$operation['userClassname']} class implementing {$operation['operationId']} as a {$operation['httpMethod']} method?";
-                throw new Exception($message);
-                $response->getBody()->write($message);
-                return $response->withStatus(501);
+                throw new HttpNotImplementedException($request, $message);
             };
             $middlewares = [new JsonBodyParserMiddleware()];
 
@@ -1407,8 +948,11 @@ public function __construct($settings = [])
                 }
             }
 
-            if (is_callable($getMockResponseCallback)) {
-                $middlewares[] = new OpenApiDataMockerMiddleware($dataMocker, $operation['responses'], $getMockResponseCallback, $mockAfterCallback);
+            if (is_callable($getMockStatusCodeCallback)) {
+                $mockSchemaResponses = array_map(function ($item) {
+                    return json_decode($item['jsonSchema'], true);
+                }, $operation['responses']);
+                $middlewares[] = new OpenApiDataMockerRouteMiddleware($dataMocker, $mockSchemaResponses, $responseFactory, $getMockStatusCodeCallback, $mockAfterCallback);
             }
 
             $this->addRoute(
diff --git a/samples/server/petstore/php-slim4/lib/Utils/ModelUtilsTrait.php b/samples/server/petstore/php-slim4/lib/Utils/ModelUtilsTrait.php
deleted file mode 100644
index 97bb2ae884a7..000000000000
--- a/samples/server/petstore/php-slim4/lib/Utils/ModelUtilsTrait.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * ModelUtilsTrait
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Utils;
-
-use OpenAPIServer\Utils\StringUtilsTrait;
-
-/**
- * ModelUtilsTrait Class Doc Comment
- * This class duplicates functionality of ModelUtils.java and AbstractPhpCodegen.java classes.
- *
- * @package OpenAPIServer\Utils
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-trait ModelUtilsTrait
-{
-    use StringUtilsTrait;
-
-    /**
-     * Parses model class name from provided ref.
-     * @link https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#reference-object
-     * This method doesn't check that class exists and autoloaded.
-     * This is recreated method of @link modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java class.
-     *
-     * @param string $ref Reference, eg. #/components/schemas/Pet
-     *
-     * @return string|null classname or null on fail
-     */
-    public static function getSimpleRef($ref)
-    {
-        $model = null;
-        if (stripos($ref, '#/components/') === 0) {
-            // starts with #/components/
-            $model = substr($ref, strrpos($ref, '/') + 1);
-        } elseif (stripos($ref, '#/definitions/') === 0) {
-            // starts with #/definitions/
-            $model = substr($ref, strrpos($ref, '/') + 1);
-        }
-
-        return $model;
-    }
-
-    /**
-     * Output the proper model name (capitalized).
-     * In case the name belongs to the TypeSystem it won't be renamed.
-     * This is recreated method of @link modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java class.
-     *
-     * @param string      $name            the name of the model
-     * @param string|null $modelNamePrefix modelNamePrefix generator option
-     * @param string|null $modelNameSuffix modelNameSuffix generator option
-     *
-     * @return string capitalized model name
-     */
-    public static function toModelName(
-        $name,
-        $modelNamePrefix = null,
-        $modelNameSuffix = null
-    ) {
-        if (is_string($name) === false  || empty($name)) {
-            return null;
-        }
-
-        // remove [
-        $name = str_replace(']', '', $name);
-
-        // Note: backslash ("\\") is allowed for e.g. "\\DateTime"
-        $name = preg_replace('/[^\w\\\\]+/', '_', $name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
-
-        // remove underscores from start and end
-        $name = trim($name, '_');
-
-        // remove dollar sign
-        $name = str_replace('$', '', $name);
-
-        // model name cannot use reserved keyword
-        if (self::isReservedWord($name)) {
-            $name = 'model_' . $name; // e.g. return => ModelReturn (after camelize)
-        }
-
-        // model name starts with number
-        if (preg_match('/^\d.*/', $name) === 1) {
-            $name = 'model_' . $name; // e.g. 200Response => Model200Response (after camelize)
-        }
-
-        // add prefix and/or suffic only if name does not start wth \ (e.g. \DateTime)
-        if (preg_match('/^\\\\.*/', $name) !== 1) {
-            if (is_string($modelNamePrefix) && !empty($modelNamePrefix)) {
-                $name = $modelNamePrefix . '_' . $name;
-            }
-
-            if (is_string($modelNameSuffix) && !empty($modelNameSuffix)) {
-                $name = $name . '_' . $modelNameSuffix;
-            }
-        }
-
-        // camelize the model name
-        // phone_number => PhoneNumber
-        return self::camelize($name);
-    }
-}
diff --git a/samples/server/petstore/php-slim4/lib/Utils/StringUtilsTrait.php b/samples/server/petstore/php-slim4/lib/Utils/StringUtilsTrait.php
deleted file mode 100644
index bd0464fa598c..000000000000
--- a/samples/server/petstore/php-slim4/lib/Utils/StringUtilsTrait.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * StringUtilsTrait
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Utils;
-
-/**
- * StringUtilsTrait Class Doc Comment
- * This class duplicates functionality of StringUtils.java and AbstractPhpCodegen.java classes.
- *
- * @package OpenAPIServer\Utils
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-trait StringUtilsTrait
-{
-    /**
-     * Camelize name (parameter, property, method, etc)
-     * This is recreated method of @link modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/StringUtils.java class.
-     *
-     * @param string $word                 string to be camelize
-     * @param bool   $lowercaseFirstLetter lower case for first letter if set to true
-     *
-     * @return string camelized string
-     */
-    public static function camelize($word, $lowercaseFirstLetter = false)
-    {
-        // Replace all slashes with dots (package separator)
-        $p = '/\/(.?)/';
-        $word = preg_replace($p, '.$1', $word);
-
-        // case out dots
-        $parts = explode('.', $word);
-        $str = '';
-        foreach ($parts as $z) {
-            if (strlen($z) > 0) {
-                $str .= strtoupper(substr($z, 0, 1)) . substr($z, 1);
-            }
-        }
-        $word = $str;
-
-        // Uppercase the class name.
-        $p = '/(\.?)(\w)([^\.]*)$/';
-        $word = preg_replace_callback($p, function ($matches) {
-            $rep = $matches[1] . strtoupper($matches[2]) . $matches[3];
-            $rep = preg_replace('/\$/', '\\\$', $rep);
-            return $rep;
-        }, $word);
-
-        // Remove all underscores (underscore_case to camelCase)
-        $p = '/(_)(.)/';
-        while (preg_match($p, $word, $matches) === 1) {
-            $original = $matches[2][0];
-            $upperCase = strtoupper($original);
-            if ($original === $upperCase) {
-                $word = preg_replace($p, '$2', $word);
-            } else {
-                $word = preg_replace($p, $upperCase, $word);
-            }
-        }
-
-        // Remove all hyphens (hyphen-case to camelCase)
-        $p = '/(-)(.)/';
-        while (preg_match($p, $word, $matches) === 1) {
-            $upperCase = strtoupper($matches[2][0]);
-            $word = preg_replace($p, $upperCase, $word);
-        }
-
-        if ($lowercaseFirstLetter === true && strlen($word) > 0) {
-            $i = 0;
-            $charAt = substr($word, $i, 1);
-            while (
-                $i + 1 < strlen($word)
-                && !(
-                    ($charAt >= 'a' && $charAt <= 'z')
-                    || ($charAt >= 'A' && $charAt <= 'Z')
-                )
-            ) {
-                $i++;
-                $charAt = substr($word, $i, 1);
-            }
-            $i++;
-            $word = strtolower(substr($word, 0, $i)) . substr($word, $i);
-        }
-
-        // remove all underscore
-        $word = str_replace('_', '', $word);
-
-        return $word;
-    }
-
-    /**
-     * Checks whether string is reserved php keyword.
-     * This is recreated method of @link modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java class.
-     *
-     * @param string $word Checked string
-     *
-     * @return bool
-     */
-    public static function isReservedWord($word)
-    {
-        if (is_string($word) === false) {
-            return false;
-        }
-        // __halt_compiler is ommited because class names with underscores not allowed anyway
-        return in_array(
-            strtolower($word),
-            ['abstract', 'and', 'array', 'as', 'break', 'callable', 'case', 'catch', 'class', 'clone', 'const', 'continue', 'declare', 'default', 'die', 'do', 'echo', 'else', 'elseif', 'empty', 'enddeclare', 'endfor', 'endforeach', 'endif', 'endswitch', 'endwhile', 'eval', 'exit', 'extends', 'final', 'for', 'foreach', 'function', 'global', 'goto', 'if', 'implements', 'include', 'include_once', 'instanceof', 'insteadof', 'interface', 'isset', 'list', 'namespace', 'new', 'or', 'print', 'private', 'protected', 'public', 'require', 'require_once', 'return', 'static', 'switch', 'throw', 'trait', 'try', 'unset', 'use', 'var', 'while', 'xor']
-        );
-    }
-}
diff --git a/samples/server/petstore/php-slim4/phpunit.xml.dist b/samples/server/petstore/php-slim4/phpunit.xml.dist
index d09042687960..3efb4b45f4aa 100644
--- a/samples/server/petstore/php-slim4/phpunit.xml.dist
+++ b/samples/server/petstore/php-slim4/phpunit.xml.dist
@@ -15,21 +15,15 @@
             <directory>./test/Api</directory>
         </testsuite>
         <testsuite name="Models">
+            <file>./test/BaseModelTest.php</file>
             <directory>./test/Model</directory>
         </testsuite>
-        <testsuite name="Mock">
-            <directory>./test/Mock</directory>
-        </testsuite>
-        <testsuite name="Utils">
-            <directory>./test/Utils</directory>
-        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./lib/Api</directory>
+            <file>./lib/BaseModel.php</file>
             <directory suffix=".php">./lib/Model</directory>
-            <directory suffix=".php">./lib/Mock</directory>
-            <directory suffix=".php">./lib/Utils</directory>
         </whitelist>
     </filter>
     <php>
diff --git a/samples/server/petstore/php-slim4/test/Api/AnotherFakeApiTest.php b/samples/server/petstore/php-slim4/test/Api/AnotherFakeApiTest.php
deleted file mode 100644
index bac07ce85cdb..000000000000
--- a/samples/server/petstore/php-slim4/test/Api/AnotherFakeApiTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * AnotherFakeApiTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the endpoint.
- */
-namespace OpenAPIServer\Api;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Api\AnotherFakeApi;
-
-/**
- * AnotherFakeApiTest Class Doc Comment
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Api\AnotherFakeApi
- */
-class AnotherFakeApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for call123TestSpecialTags
-     *
-     * To test special tags.
-     *
-     * @covers ::call123TestSpecialTags
-     */
-    public function testCall123TestSpecialTags()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Api/FakeApiTest.php b/samples/server/petstore/php-slim4/test/Api/FakeApiTest.php
deleted file mode 100644
index eb58e0e63f24..000000000000
--- a/samples/server/petstore/php-slim4/test/Api/FakeApiTest.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-
-/**
- * FakeApiTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the endpoint.
- */
-namespace OpenAPIServer\Api;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Api\FakeApi;
-
-/**
- * FakeApiTest Class Doc Comment
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Api\FakeApi
- */
-class FakeApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for createXmlItem
-     *
-     * creates an XmlItem.
-     *
-     * @covers ::createXmlItem
-     */
-    public function testCreateXmlItem()
-    {
-    }
-
-    /**
-     * Test case for fakeOuterBooleanSerialize
-     *
-     * .
-     *
-     * @covers ::fakeOuterBooleanSerialize
-     */
-    public function testFakeOuterBooleanSerialize()
-    {
-    }
-
-    /**
-     * Test case for fakeOuterCompositeSerialize
-     *
-     * .
-     *
-     * @covers ::fakeOuterCompositeSerialize
-     */
-    public function testFakeOuterCompositeSerialize()
-    {
-    }
-
-    /**
-     * Test case for fakeOuterNumberSerialize
-     *
-     * .
-     *
-     * @covers ::fakeOuterNumberSerialize
-     */
-    public function testFakeOuterNumberSerialize()
-    {
-    }
-
-    /**
-     * Test case for fakeOuterStringSerialize
-     *
-     * .
-     *
-     * @covers ::fakeOuterStringSerialize
-     */
-    public function testFakeOuterStringSerialize()
-    {
-    }
-
-    /**
-     * Test case for testBodyWithFileSchema
-     *
-     * .
-     *
-     * @covers ::testBodyWithFileSchema
-     */
-    public function testTestBodyWithFileSchema()
-    {
-    }
-
-    /**
-     * Test case for testBodyWithQueryParams
-     *
-     * .
-     *
-     * @covers ::testBodyWithQueryParams
-     */
-    public function testTestBodyWithQueryParams()
-    {
-    }
-
-    /**
-     * Test case for testClientModel
-     *
-     * To test \"client\" model.
-     *
-     * @covers ::testClientModel
-     */
-    public function testTestClientModel()
-    {
-    }
-
-    /**
-     * Test case for testEndpointParameters
-     *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트.
-     *
-     * @covers ::testEndpointParameters
-     */
-    public function testTestEndpointParameters()
-    {
-    }
-
-    /**
-     * Test case for testEnumParameters
-     *
-     * To test enum parameters.
-     *
-     * @covers ::testEnumParameters
-     */
-    public function testTestEnumParameters()
-    {
-    }
-
-    /**
-     * Test case for testGroupParameters
-     *
-     * Fake endpoint to test group parameters (optional).
-     *
-     * @covers ::testGroupParameters
-     */
-    public function testTestGroupParameters()
-    {
-    }
-
-    /**
-     * Test case for testInlineAdditionalProperties
-     *
-     * test inline additionalProperties.
-     *
-     * @covers ::testInlineAdditionalProperties
-     */
-    public function testTestInlineAdditionalProperties()
-    {
-    }
-
-    /**
-     * Test case for testJsonFormData
-     *
-     * test json serialization of form data.
-     *
-     * @covers ::testJsonFormData
-     */
-    public function testTestJsonFormData()
-    {
-    }
-
-    /**
-     * Test case for testQueryParameterCollectionFormat
-     *
-     * .
-     *
-     * @covers ::testQueryParameterCollectionFormat
-     */
-    public function testTestQueryParameterCollectionFormat()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Api/FakeClassnameTags123ApiTest.php b/samples/server/petstore/php-slim4/test/Api/FakeClassnameTags123ApiTest.php
deleted file mode 100644
index 0b8bb0215edd..000000000000
--- a/samples/server/petstore/php-slim4/test/Api/FakeClassnameTags123ApiTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * FakeClassnameTags123ApiTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the endpoint.
- */
-namespace OpenAPIServer\Api;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Api\FakeClassnameTags123Api;
-
-/**
- * FakeClassnameTags123ApiTest Class Doc Comment
- *
- * @package OpenAPIServer\Api
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Api\FakeClassnameTags123Api
- */
-class FakeClassnameTags123ApiTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test case for testClassname
-     *
-     * To test class name in snake case.
-     *
-     * @covers ::testClassname
-     */
-    public function testTestClassname()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Api/PetApiTest.php b/samples/server/petstore/php-slim4/test/Api/PetApiTest.php
index 7ce11ac25442..2eaed45a504e 100644
--- a/samples/server/petstore/php-slim4/test/Api/PetApiTest.php
+++ b/samples/server/petstore/php-slim4/test/Api/PetApiTest.php
@@ -1,19 +1,16 @@
 <?php
 
 /**
- * PetApiTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -43,28 +40,28 @@ class PetApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -77,6 +74,9 @@ public static function tearDownAfterClass()
      */
     public function testAddPet()
     {
+        $this->markTestIncomplete(
+            'Test of "addPet" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -88,6 +88,9 @@ public function testAddPet()
      */
     public function testDeletePet()
     {
+        $this->markTestIncomplete(
+            'Test of "deletePet" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -99,6 +102,9 @@ public function testDeletePet()
      */
     public function testFindPetsByStatus()
     {
+        $this->markTestIncomplete(
+            'Test of "findPetsByStatus" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -110,6 +116,9 @@ public function testFindPetsByStatus()
      */
     public function testFindPetsByTags()
     {
+        $this->markTestIncomplete(
+            'Test of "findPetsByTags" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -121,6 +130,9 @@ public function testFindPetsByTags()
      */
     public function testGetPetById()
     {
+        $this->markTestIncomplete(
+            'Test of "getPetById" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -132,6 +144,9 @@ public function testGetPetById()
      */
     public function testUpdatePet()
     {
+        $this->markTestIncomplete(
+            'Test of "updatePet" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -143,6 +158,9 @@ public function testUpdatePet()
      */
     public function testUpdatePetWithForm()
     {
+        $this->markTestIncomplete(
+            'Test of "updatePetWithForm" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -154,16 +172,8 @@ public function testUpdatePetWithForm()
      */
     public function testUploadFile()
     {
-    }
-
-    /**
-     * Test case for uploadFileWithRequiredFile
-     *
-     * uploads an image (required).
-     *
-     * @covers ::uploadFileWithRequiredFile
-     */
-    public function testUploadFileWithRequiredFile()
-    {
+        $this->markTestIncomplete(
+            'Test of "uploadFile" method has not been implemented yet.'
+        );
     }
 }
diff --git a/samples/server/petstore/php-slim4/test/Api/StoreApiTest.php b/samples/server/petstore/php-slim4/test/Api/StoreApiTest.php
index d4e8018a94af..b6d114045d8e 100644
--- a/samples/server/petstore/php-slim4/test/Api/StoreApiTest.php
+++ b/samples/server/petstore/php-slim4/test/Api/StoreApiTest.php
@@ -1,19 +1,16 @@
 <?php
 
 /**
- * StoreApiTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -43,28 +40,28 @@ class StoreApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -77,6 +74,9 @@ public static function tearDownAfterClass()
      */
     public function testDeleteOrder()
     {
+        $this->markTestIncomplete(
+            'Test of "deleteOrder" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -88,6 +88,9 @@ public function testDeleteOrder()
      */
     public function testGetInventory()
     {
+        $this->markTestIncomplete(
+            'Test of "getInventory" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -99,6 +102,9 @@ public function testGetInventory()
      */
     public function testGetOrderById()
     {
+        $this->markTestIncomplete(
+            'Test of "getOrderById" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -110,5 +116,8 @@ public function testGetOrderById()
      */
     public function testPlaceOrder()
     {
+        $this->markTestIncomplete(
+            'Test of "placeOrder" method has not been implemented yet.'
+        );
     }
 }
diff --git a/samples/server/petstore/php-slim4/test/Api/UserApiTest.php b/samples/server/petstore/php-slim4/test/Api/UserApiTest.php
index a1166ee75bc7..cee6da4398f8 100644
--- a/samples/server/petstore/php-slim4/test/Api/UserApiTest.php
+++ b/samples/server/petstore/php-slim4/test/Api/UserApiTest.php
@@ -1,19 +1,16 @@
 <?php
 
 /**
- * UserApiTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Api
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -43,28 +40,28 @@ class UserApiTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -77,6 +74,9 @@ public static function tearDownAfterClass()
      */
     public function testCreateUser()
     {
+        $this->markTestIncomplete(
+            'Test of "createUser" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -88,6 +88,9 @@ public function testCreateUser()
      */
     public function testCreateUsersWithArrayInput()
     {
+        $this->markTestIncomplete(
+            'Test of "createUsersWithArrayInput" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -99,6 +102,9 @@ public function testCreateUsersWithArrayInput()
      */
     public function testCreateUsersWithListInput()
     {
+        $this->markTestIncomplete(
+            'Test of "createUsersWithListInput" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -110,6 +116,9 @@ public function testCreateUsersWithListInput()
      */
     public function testDeleteUser()
     {
+        $this->markTestIncomplete(
+            'Test of "deleteUser" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -121,6 +130,9 @@ public function testDeleteUser()
      */
     public function testGetUserByName()
     {
+        $this->markTestIncomplete(
+            'Test of "getUserByName" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -132,6 +144,9 @@ public function testGetUserByName()
      */
     public function testLoginUser()
     {
+        $this->markTestIncomplete(
+            'Test of "loginUser" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -143,6 +158,9 @@ public function testLoginUser()
      */
     public function testLogoutUser()
     {
+        $this->markTestIncomplete(
+            'Test of "logoutUser" method has not been implemented yet.'
+        );
     }
 
     /**
@@ -154,5 +172,8 @@ public function testLogoutUser()
      */
     public function testUpdateUser()
     {
+        $this->markTestIncomplete(
+            'Test of "updateUser" method has not been implemented yet.'
+        );
     }
 }
diff --git a/samples/server/petstore/php-slim4/test/BaseModelTest.php b/samples/server/petstore/php-slim4/test/BaseModelTest.php
new file mode 100644
index 000000000000..935b758b03c4
--- /dev/null
+++ b/samples/server/petstore/php-slim4/test/BaseModelTest.php
@@ -0,0 +1,599 @@
+<?php
+
+/**
+ * OpenAPI Petstore
+ * PHP version 7.2
+ *
+ * @package OpenAPIServer
+ * @author  OpenAPI Generator team
+ * @link    https://github.com/openapitools/openapi-generator
+ */
+
+/**
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+/**
+ * NOTE: This class is auto generated by the openapi generator program.
+ * https://github.com/openapitools/openapi-generator
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPIServer;
+
+use PHPUnit\Framework\TestCase;
+use OpenAPIServer\BaseModel;
+use OpenAPIServer\Mock\OpenApiModelInterface;
+use InvalidArgumentException;
+use StdClass;
+
+/**
+ * BaseModelTest
+ *
+ * phpcs:disable Squiz.Commenting,Generic.Commenting,PEAR.Commenting
+ * @coversDefaultClass \OpenAPIServer\BaseModel
+ */
+class BaseModelTest extends TestCase
+{
+
+    /**
+     * @covers ::__construct
+     * @covers ::validateModelType
+     * @dataProvider provideClassesAndDefaultData
+     */
+    public function testConstructorAndDefaultData($className, $expectedJson)
+    {
+        $item = new $className();
+        $this->assertEquals($expectedJson, json_encode($item->getData()));
+    }
+
+    public function provideClassesAndDefaultData()
+    {
+        return [
+            'boolean model' => [BasicBooleanTestClass::class, json_encode(null)],
+            'integer model' => [BasicIntegerTestClass::class, json_encode(null)],
+            'number model' => [BasicNumberTestClass::class, json_encode(null)],
+            'string model' => [BasicStringTestClass::class, json_encode(null)],
+            'array model' => [BasicArrayTestClass::class, json_encode([])],
+            'object model' => [BasicObjectTestClass::class, json_encode(new StdClass())],
+            'missing type model' => [MissingTypeTestClass::class, json_encode(null)],
+        ];
+    }
+
+    /**
+     * @covers ::__construct
+     * @covers ::validateModelType
+     * @dataProvider provideInvalidClasses
+     */
+    public function testConstructorWithInvalidTypes($className)
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $item = new $className();
+    }
+
+    public function provideInvalidClasses()
+    {
+        return [
+            'unknown type model' => [UnknownTypeTestClass::class],
+        ];
+    }
+
+    /**
+     * @covers ::getOpenApiSchema
+     */
+    public function testGetOpenApiSchema()
+    {
+        foreach (
+            [
+                BaseModel::getOpenApiSchema(),
+                CatRefTestClass::getOpenApiSchema(),
+                DogRefTestClass::getOpenApiSchema(),
+                BasicArrayTestClass::getOpenApiSchema(),
+                BasicBooleanTestClass::getOpenApiSchema(),
+                BasicIntegerTestClass::getOpenApiSchema(),
+                BasicNumberTestClass::getOpenApiSchema(),
+                BasicObjectTestClass::getOpenApiSchema(),
+                BasicStringTestClass::getOpenApiSchema(),
+            ] as $schema
+        ) {
+            $this->assertTrue(is_array($schema) || is_object($schema));
+        }
+    }
+
+    /**
+     * @covers ::createFromData
+     * @covers ::__set
+     * @covers ::__get
+     * @dataProvider provideCreateFromDataArguments
+     */
+    public function testCreateFromData($modelClass, $data)
+    {
+        $item = $modelClass::createFromData($data);
+        $this->assertInstanceOf($modelClass, $item);
+        $this->assertInstanceOf(OpenApiModelInterface::class, $item);
+        foreach ($data as $propName => $propValue) {
+            $this->assertSame($propValue, $item->{$propName});
+        }
+    }
+
+    public function provideCreateFromDataArguments()
+    {
+        return [
+            'CatRefTestClass' => [
+                CatRefTestClass::class,
+                [
+                    'className' => 'cheshire',
+                    'color' => 'gray',
+                    'declawed' => true,
+                ],
+            ],
+            'DogRefTestClass' => [
+                DogRefTestClass::class,
+                [
+                    'className' => 'bulldog',
+                    'color' => 'black',
+                    'declawed' => false,
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @covers ::setData
+     * @covers ::getData
+     * @dataProvider provideScalarModels
+     */
+    public function testSetDataScalar($className, array $setDataValues, array $expectedDataValues)
+    {
+        $item = new $className();
+        for ($i = 0; $i < count($setDataValues); $i++) {
+            if ($i > 0) {
+                // value should be previous
+                $this->assertSame($expectedDataValues[$i - 1], $item->getData());
+            } else {
+                // initial value should be null
+                $this->assertNull($item->getData());
+            }
+            $item->setData($setDataValues[$i]);
+            // values should be overwritten
+            $this->assertSame($expectedDataValues[$i], $item->getData());
+        }
+    }
+
+    public function provideScalarModels()
+    {
+        return [
+            'boolean model' => [
+                BasicBooleanTestClass::class,
+                [false, true, false],
+                [false, true, false],
+            ],
+            'integer model' => [
+                BasicIntegerTestClass::class,
+                [-50, 322, 100500, -1000, 0],
+                [-50, 322, 100500, -1000, 0],
+            ],
+            'number model' => [
+                BasicNumberTestClass::class,
+                [-50.324, 322.756, 100500.09, -1000.43, 0],
+                [-50.324, 322.756, 100500.09, -1000.43, 0],
+            ],
+            'string model' => [
+                BasicStringTestClass::class,
+                ['foobar', 'hello world', '100', '-56', 'true', 'null', 'false'],
+                ['foobar', 'hello world', '100', '-56', 'true', 'null', 'false'],
+            ],
+        ];
+    }
+
+    /**
+     * @covers ::setData
+     * @covers ::getData
+     */
+    public function testSetDataOfArray()
+    {
+        $basic = new BasicArrayTestClass();
+        $data = ['foo', 'bar', 'baz'];
+        $basic->setData($data);
+        $this->assertEquals($data, $basic->getData());
+    }
+
+    /**
+     * @covers ::setData
+     * @dataProvider provideInvalidDataForArrayModel
+     */
+    public function testSetDataOfArrayWithInvalidData($className, $data)
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $item = new $className();
+        $item->setData($data);
+    }
+
+    public function provideInvalidDataForArrayModel()
+    {
+        $obj = new StdClass();
+        $obj->foo = 'bar';
+        $obj->baz = 'baf';
+        $arr = [];
+        $arr[5] = 'foo';
+        $arr[6] = 'bar';
+        return [
+            'array with spaced indexes data' => [
+                BasicArrayTestClass::class,
+                $arr,
+            ],
+            'assoc array data' => [
+                BasicArrayTestClass::class,
+                ['foo' => 'bar', 'baz' => 'baf'],
+            ],
+            'object data' => [
+                BasicArrayTestClass::class,
+                $obj,
+            ],
+        ];
+    }
+
+    /**
+     * @covers ::setData
+     * @covers ::getData
+     */
+    public function testSetDataOfObject()
+    {
+        $basic = new BasicObjectTestClass();
+        $data = ['foo' => 'bar'];
+        $basic->setData($data);
+        $this->assertSame('bar', $basic->foo);
+    }
+
+    /**
+     * @covers ::getData
+     */
+    public function testGetDataOfObject()
+    {
+        $catItem = new CatRefTestClass();
+        $catItem->setData([
+            'color' => 'grey',
+            'declawed' => false,
+        ]);
+        $data = $catItem->getData();
+        $this->assertInstanceOf(StdClass::class, $data);
+        $this->assertSame('grey', $data->color);
+        $this->assertSame(false, $data->declawed);
+    }
+
+    /**
+     * @covers ::__set
+     * @covers ::__get
+     */
+    public function testSetter()
+    {
+        $item = new CatRefTestClass();
+        $item->className = 'cheshire';
+        $item->color = 'black';
+        $item->declawed = false;
+        $this->assertSame('cheshire', $item->className);
+        $this->assertSame('black', $item->color);
+        $this->assertSame(false, $item->declawed);
+    }
+
+    /**
+     * @covers ::__set
+     * @dataProvider provideScalarsAndArray
+     */
+    public function testSetterOfScalarAndArray($className)
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $item = new $className();
+        $item->foo = 'bar';
+    }
+
+    public function provideScalarsAndArray()
+    {
+        return [
+            'boolean model' => [BasicBooleanTestClass::class],
+            'integer model' => [BasicIntegerTestClass::class],
+            'number model' => [BasicNumberTestClass::class],
+            'string model' => [BasicStringTestClass::class],
+            'array model' => [BasicArrayTestClass::class],
+        ];
+    }
+
+    /**
+     * @covers ::__set
+     */
+    public function testSetterWithUnknownProp()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(
+            sprintf(
+                'Cannot set unknownProp property of %s model because it doesn\'t exist in related OAS schema',
+                CatRefTestClass::class
+            )
+        );
+        $item = new CatRefTestClass();
+        $item->unknownProp = 'foobar';
+    }
+
+    /**
+     * @covers ::__get
+     */
+    public function testGetterWithUnknownProp()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(
+            sprintf(
+                'Cannot get unknownProp property of %s model because it doesn\'t exist in related OAS schema',
+                CatRefTestClass::class
+            )
+        );
+        $item = new CatRefTestClass();
+        $unknownProp = $item->unknownProp;
+    }
+
+    /**
+     * @covers ::__get
+     * @dataProvider provideScalarsAndArray
+     */
+    public function testGetterOfScalarAndArray($className)
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $item = new $className();
+        $bar = $item->foo;
+    }
+
+    /**
+     * @covers ::__set
+     * @covers ::__get
+     */
+    public function testSetterAndGetterOfBasicObject()
+    {
+        $item = new BasicObjectTestClass();
+        $item->unknown = 'foo';
+        $this->assertEquals('foo', $item->unknown);
+    }
+
+    /**
+     * @covers ::jsonSerialize
+     * @dataProvider provideJsonSerializeArguments
+     */
+    public function testJsonSerialize($className, $data, $expectedJson)
+    {
+        $item = $className::createFromData($data);
+        $this->assertEquals($expectedJson, json_encode($item));
+    }
+
+    public function provideJsonSerializeArguments()
+    {
+        return [
+            'model with all props' => [
+                CatRefTestClass::class,
+                [
+                    'className' => 'cheshire',
+                    'color' => 'black',
+                    'declawed' => false,
+                ],
+                json_encode([
+                    'className' => 'cheshire',
+                    'color' => 'black',
+                    'declawed' => false,
+                ]),
+            ],
+            'model with required props' => [
+                CatRefTestClass::class,
+                [
+                    'className' => 'cheshire',
+                ],
+                json_encode([
+                    'className' => 'cheshire',
+                ]),
+            ],
+            'model with missed required prop' => [
+                CatRefTestClass::class,
+                [
+                    'color' => 'black',
+                ],
+                json_encode([
+                    'className' => null,
+                    'color' => 'black',
+                ]),
+            ],
+            'model with schema serialized as assoc array' => [
+                DogRefTestClass::class,
+                [
+                    'className' => 'bulldog',
+                    'color' => 'gray',
+                    'declawed' => false,
+                ],
+                json_encode([
+                    'className' => 'bulldog',
+                    'color' => 'gray',
+                    'declawed' => false,
+                ]),
+            ],
+            'model of basic array' => [
+                BasicArrayTestClass::class,
+                ['hello', 'world'],
+                json_encode(['hello', 'world']),
+            ],
+            'model of basic boolean' => [
+                BasicBooleanTestClass::class,
+                false,
+                json_encode(false),
+            ],
+            'model of basic integer' => [
+                BasicIntegerTestClass::class,
+                -500,
+                json_encode(-500),
+            ],
+            'model of basic number' => [
+                BasicNumberTestClass::class,
+                -3.1434,
+                json_encode(-3.1434),
+            ],
+            'model of basic object' => [
+                BasicObjectTestClass::class,
+                new \StdClass(),
+                json_encode(new \StdClass()),
+            ],
+            'model of basic string' => [
+                BasicStringTestClass::class,
+                'foobar',
+                json_encode('foobar'),
+            ],
+        ];
+    }
+
+    /**
+     * @covers ::getModelsNamespace
+     * @dataProvider provideTestClasses
+     */
+    public function testGetModelsNamespace($classname)
+    {
+        $this->assertTrue(method_exists($classname, 'getModelsNamespace'));
+        $getModelsNamespace = $classname . '::getModelsNamespace';
+        $namespace = $getModelsNamespace();
+        $this->assertIsString($namespace);
+    }
+
+    public function provideTestClasses()
+    {
+        return [
+            [BasicArrayTestClass::class],
+            [BasicBooleanTestClass::class],
+            [BasicIntegerTestClass::class],
+            [BasicNumberTestClass::class],
+            [BasicObjectTestClass::class],
+            [BasicStringTestClass::class],
+            [CatRefTestClass::class],
+            [DogRefTestClass::class],
+        ];
+    }
+}
+
+// phpcs:disable PSR1.Classes.ClassDeclaration.MultipleClasses
+class BasicArrayTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "array"
+}
+SCHEMA;
+}
+
+class BasicBooleanTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "boolean"
+}
+SCHEMA;
+}
+
+class BasicIntegerTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "integer"
+}
+SCHEMA;
+}
+
+class BasicNumberTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "number"
+}
+SCHEMA;
+}
+
+class BasicObjectTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "object"
+}
+SCHEMA;
+}
+
+class BasicStringTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "string"
+}
+SCHEMA;
+}
+
+class CatRefTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "required" : [ "className" ],
+    "type" : "object",
+    "properties" : {
+        "className" : {
+            "type" : "string"
+        },
+        "color" : {
+            "type" : "string",
+            "default" : "red"
+        },
+        "declawed" : {
+            "type" : "boolean"
+        }
+    },
+    "discriminator" : {
+        "propertyName" : "className"
+    }
+}
+SCHEMA;
+}
+
+class ClassWithoutGetSchemaMethod
+{
+
+}
+
+class DogRefTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "required" : [ "className" ],
+    "type" : "object",
+    "properties" : {
+        "className" : {
+            "type" : "string"
+        },
+        "color" : {
+            "type" : "string",
+            "default" : "black"
+        },
+        "declawed" : {
+            "type" : "boolean"
+        }
+    },
+    "discriminator" : {
+        "propertyName" : "className"
+    }
+}
+SCHEMA;
+}
+
+class MissingTypeTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{}
+SCHEMA;
+}
+
+class UnknownTypeTestClass extends BaseModel
+{
+    protected const MODEL_SCHEMA = <<<'SCHEMA'
+{
+    "type" : "foobar"
+}
+SCHEMA;
+}
diff --git a/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerMiddlewareTest.php b/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerMiddlewareTest.php
deleted file mode 100644
index 67dbc36fd327..000000000000
--- a/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerMiddlewareTest.php
+++ /dev/null
@@ -1,273 +0,0 @@
-<?php
-
-/**
- * OpenApiDataMockerMiddlewareTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPIServer
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Mock;
-
-use OpenAPIServer\Mock\OpenApiDataMockerMiddleware;
-use OpenAPIServer\Mock\OpenApiDataMocker;
-use Slim\Factory\AppFactory;
-use Slim\Factory\ServerRequestCreatorFactory;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use PHPUnit\Framework\TestCase;
-use StdClass;
-
-/**
- * OpenApiDataMockerMiddlewareTest Class Doc Comment
- *
- * @package OpenAPIServer\Mock
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Mock\OpenApiDataMockerMiddleware
- */
-class OpenApiDataMockerMiddlewareTest extends TestCase
-{
-    /**
-     * @covers ::__construct
-     * @dataProvider provideConstructCorrectArguments
-     */
-    public function testConstructor(
-        $mocker,
-        $responses,
-        $getMockResponseCallback,
-        $afterCallback
-    ) {
-        $middleware = new OpenApiDataMockerMiddleware($mocker, $responses, $getMockResponseCallback, $afterCallback);
-        $this->assertInstanceOf(OpenApiDataMockerMiddleware::class, $middleware);
-        $this->assertNotNull($middleware);
-    }
-
-    public function provideConstructCorrectArguments()
-    {
-        $getMockResponseCallback = function () {
-            return false;
-        };
-        $afterCallback = function () {
-            return false;
-        };
-        return [
-            [new OpenApiDataMocker(), [], null, null],
-            [new OpenApiDataMocker(), [], $getMockResponseCallback, $afterCallback],
-        ];
-    }
-
-    /**
-     * @covers ::__construct
-     * @dataProvider provideConstructInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @expectedException \TypeError
-     */
-    public function testConstructorWithInvalidArguments(
-        $mocker,
-        $responses,
-        $getMockResponseCallback,
-        $afterCallback
-    ) {
-        $middleware = new OpenApiDataMockerMiddleware($mocker, $responses, $getMockResponseCallback, $afterCallback);
-    }
-
-    public function provideConstructInvalidArguments()
-    {
-        return [
-            'getMockResponseCallback not callable' => [
-                new OpenApiDataMocker(), [], 'foobar', null,
-            ],
-            'afterCallback not callable' => [
-                new OpenApiDataMocker(), [], null, 'foobar',
-            ],
-        ];
-    }
-
-    /**
-     * @covers ::process
-     * @dataProvider provideProcessArguments
-     */
-    public function testProcess(
-        $mocker,
-        $responses,
-        $getMockResponseCallback,
-        $afterCallback,
-        $request,
-        $expectedStatusCode,
-        $expectedHeaders,
-        $notExpectedHeaders,
-        $expectedBody
-    ) {
-
-        // Create a stub for the RequestHandlerInterface interface.
-        $handler = $this->createMock(RequestHandlerInterface::class);
-        $handler->method('handle')
-             ->willReturn(AppFactory::determineResponseFactory()->createResponse());
-
-        $middleware = new OpenApiDataMockerMiddleware(
-            $mocker,
-            $responses,
-            $getMockResponseCallback,
-            $afterCallback
-        );
-        $response = $middleware->process($request, $handler);
-
-        // check status code
-        $this->assertSame($expectedStatusCode, $response->getStatusCode());
-
-        // check http headers in request
-        foreach ($expectedHeaders as $expectedHeader => $expectedHeaderValue) {
-            $this->assertTrue($response->hasHeader($expectedHeader));
-            if ($expectedHeaderValue !== '*') {
-                $this->assertSame($expectedHeaderValue, $response->getHeader($expectedHeader)[0]);
-            }
-        }
-        foreach ($notExpectedHeaders as $notExpectedHeader) {
-            $this->assertFalse($response->hasHeader($notExpectedHeader));
-        }
-
-        // check body
-        if (is_array($expectedBody)) {
-            // random values, check keys only
-            foreach ($expectedBody as $attribute => $value) {
-                $this->assertObjectHasAttribute($attribute, json_decode((string) $response->getBody(), false));
-            }
-        } else {
-            $this->assertEquals($expectedBody, (string) $response->getBody());
-        }
-    }
-
-    public function provideProcessArguments()
-    {
-        $mocker = new OpenApiDataMocker();
-        $isMockResponseRequired = function (ServerRequestInterface $request) {
-            $mockHttpHeader = 'X-OpenAPIServer-Mock';
-            return $request->hasHeader($mockHttpHeader)
-                && $request->getHeader($mockHttpHeader)[0] === 'ping';
-        };
-
-        $getMockResponseCallback = function (ServerRequestInterface $request, array $responses) use ($isMockResponseRequired) {
-            if ($isMockResponseRequired($request)) {
-                if (array_key_exists('default', $responses)) {
-                    return $responses['default'];
-                }
-
-                // return first response
-                return $responses[array_key_first($responses)];
-            }
-
-            return false;
-        };
-
-        $afterCallback = function ($request, $response) use ($isMockResponseRequired) {
-            if ($isMockResponseRequired($request)) {
-                $response = $response->withHeader('X-OpenAPIServer-Mock', 'pong');
-            }
-
-            return $response;
-        };
-
-        $responses = [
-            '400' => [
-                'code' => 400,
-                'jsonSchema' => json_encode([
-                    'description' => 'Bad Request Response',
-                    'content' => new StdClass(),
-                ]),
-            ],
-            'default' => [
-                'code' => 201,
-                'jsonSchema' => json_encode([
-                    'description' => 'Success Response',
-                    'headers' => [
-                        'X-Location' => ['schema' => ['type' => 'string']],
-                        'X-Created-Id' => ['schema' => ['type' => 'integer']],
-                    ],
-                    'content' => [
-                        'application/json;encoding=utf-8' => ['schema' => ['type' => 'object', 'properties' => ['id' => ['type' => 'integer'], 'className' => ['type' => 'string'], 'declawed' => ['type' => 'boolean']]]],
-                    ],
-                ]),
-            ],
-        ];
-
-        $responsesXmlOnly = [
-            'default' => [
-                'code' => 201,
-                'jsonSchema' => json_encode([
-                    'description' => 'Success Response',
-                    'content' => [
-                        'application/xml' => [
-                            'schema' => [
-                                'type' => 'string',
-                            ],
-                        ],
-                    ],
-                ]),
-            ],
-        ];
-
-        $requestFactory = ServerRequestCreatorFactory::create();
-
-        return [
-            'callbacks null' => [
-                $mocker,
-                $responses,
-                null,
-                null,
-                $requestFactory->createServerRequestFromGlobals(),
-                200,
-                [],
-                ['X-OpenAPIServer-Mock', 'x-location', 'x-created-id'],
-                '',
-            ],
-            'xml not supported' => [
-                $mocker,
-                $responsesXmlOnly,
-                $getMockResponseCallback,
-                $afterCallback,
-                $requestFactory
-                    ->createServerRequestFromGlobals()
-                    ->withHeader('X-OpenAPIServer-Mock', 'ping'),
-                201,
-                ['X-OpenAPIServer-Mock' => 'pong', 'content-type' => '*/*'],
-                ['x-location', 'x-created-id'],
-                'Mock feature supports only "application/json" content-type!',
-            ],
-            'mock response default schema' => [
-                $mocker,
-                $responses,
-                $getMockResponseCallback,
-                $afterCallback,
-                $requestFactory
-                    ->createServerRequestFromGlobals()
-                    ->withHeader('X-OpenAPIServer-Mock', 'ping'),
-                201,
-                ['X-OpenAPIServer-Mock' => 'pong', 'content-type' => 'application/json', 'x-location' => '*', 'x-created-id' => '*'],
-                [],
-                [
-                    'id' => 1,
-                    'className' => 'cat',
-                    'declawed' => false,
-                ],
-            ],
-        ];
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerTest.php b/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerTest.php
deleted file mode 100644
index eeb95d67d6e2..000000000000
--- a/samples/server/petstore/php-slim4/test/Mock/OpenApiDataMockerTest.php
+++ /dev/null
@@ -1,1248 +0,0 @@
-<?php
-
-/**
- * OpenApiDataMockerTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Mock;
-
-use OpenAPIServer\Mock\OpenApiDataMocker;
-use OpenAPIServer\Mock\OpenApiDataMockerInterface as IMocker;
-use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\Constraint\IsType;
-use StdClass;
-use DateTime;
-
-/**
- * OpenApiDataMockerTest Class Doc Comment
- *
- * @package OpenAPIServer\Mock
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Mock\OpenApiDataMocker
- */
-class OpenApiDataMockerTest extends TestCase
-{
-    /**
-     * @covers ::mock
-     * @dataProvider provideMockCorrectArguments
-     */
-    public function testMockCorrectArguments($dataType, $dataFormat, $options, $expectedType)
-    {
-        $mocker = new OpenApiDataMocker();
-        $data = $mocker->mock($dataType, $dataFormat, $options);
-        $this->assertInternalType($expectedType, $data);
-    }
-
-    public function provideMockCorrectArguments()
-    {
-        return [
-            [IMocker::DATA_TYPE_INTEGER, null, null, IsType::TYPE_INT],
-            [IMocker::DATA_TYPE_NUMBER, null, null, IsType::TYPE_FLOAT],
-            [IMocker::DATA_TYPE_STRING, null, null, IsType::TYPE_STRING],
-            [IMocker::DATA_TYPE_BOOLEAN, null, null, IsType::TYPE_BOOL],
-            [IMocker::DATA_TYPE_ARRAY, null, [
-                'items' => [
-                    'type' => IMocker::DATA_TYPE_INTEGER,
-                ],
-            ], IsType::TYPE_ARRAY],
-            [IMocker::DATA_TYPE_OBJECT, null, [
-                'properties' => [
-                    'username' => [
-                        'type' => IMocker::DATA_TYPE_INTEGER,
-                    ],
-                ],
-            ], IsType::TYPE_OBJECT],
-        ];
-    }
-
-    /**
-     * @covers ::mock
-     * @dataProvider provideMockInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage "dataType" must be one of integer, number, string, boolean, array, object
-     */
-    public function testMockInvalidArguments($dataType, $dataFormat, $options)
-    {
-        $mocker = new OpenApiDataMocker();
-        $data = $mocker->mock($dataType, $dataFormat, $options);
-    }
-
-    public function provideMockInvalidArguments()
-    {
-        return [
-            ['foobar', null, null],
-            [3.14, null, null],
-            [null, null, null],
-        ];
-    }
-
-    /**
-     * @covers ::mock
-     */
-    public function testMockWithStringEnumOptions()
-    {
-        $mocker = new OpenApiDataMocker();
-        $string = $mocker->mock(IMocker::DATA_TYPE_STRING, null, [
-            'enum' => ['foobar', 'foobaz', 'helloworld'],
-        ]);
-        $this->assertContains($string, ['foobar', 'foobaz', 'helloworld']);
-    }
-
-    /**
-     * @dataProvider provideMockIntegerCorrectArguments
-     * @covers ::mockInteger
-     */
-    public function testMockIntegerWithCorrectArguments(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false,
-        $matchingInternalTypes = [],
-        $notMatchingInternalTypes = []
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $integer = $mocker->mockInteger($dataFormat, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-
-        $this->internalAssertNumber(
-            $integer,
-            $minimum,
-            $maximum,
-            $exclusiveMinimum,
-            $exclusiveMaximum,
-            $matchingInternalTypes,
-            $notMatchingInternalTypes
-        );
-    }
-
-    public function provideMockIntegerCorrectArguments()
-    {
-        $types = [
-            IsType::TYPE_INT,
-            IsType::TYPE_NUMERIC,
-            IsType::TYPE_SCALAR,
-        ];
-        $notTypes = [
-            IsType::TYPE_ARRAY,
-            IsType::TYPE_BOOL,
-            IsType::TYPE_FLOAT,
-            IsType::TYPE_NULL,
-            IsType::TYPE_OBJECT,
-            IsType::TYPE_RESOURCE,
-            IsType::TYPE_STRING,
-            IsType::TYPE_CALLABLE,
-        ];
-
-        return [
-            [null, -100, 100, false, false, $types, $notTypes],
-            [null, -100, null, false, false, $types, $notTypes],
-            [null, null, 100, false, false, $types, $notTypes],
-            [null, -99.5, null, true, false, $types, $notTypes],
-            [null, null, 99.5, false, true, $types, $notTypes],
-            [null, -99.5, 99.5, true, true, $types, $notTypes],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockIntegerInvalidArguments
-     * @covers ::mockInteger
-     * @expectedException \InvalidArgumentException
-     */
-    public function testMockIntegerWithInvalidArguments(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $integer = $mocker->mockInteger($dataFormat, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-    }
-
-    public function provideMockIntegerInvalidArguments()
-    {
-        return [
-            [null, 'foo', null, false, false],
-            [null, null, false, false, false],
-            [null, null, null, true, false],
-            [null, null, null, false, true],
-            [null, 100, -100, false, false],
-        ];
-    }
-
-    /**
-     * @covers ::mockInteger
-     * @dataProvider provideMockIntegerFormats
-     */
-    public function testMockIntegerWithFormats(
-        $dataFormat,
-        $minimum,
-        $maximum,
-        $expectedMin,
-        $expectedMax
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $integer = $mocker->mockInteger($dataFormat, $minimum, $maximum);
-        $this->assertGreaterThanOrEqual($expectedMin, $integer);
-        $this->assertLessThanOrEqual($expectedMax, $integer);
-    }
-
-    public function provideMockIntegerFormats()
-    {
-        return [
-            [IMocker::DATA_FORMAT_INT32, -2147483648, 2147483648, -2147483647, 2147483647],
-            [IMocker::DATA_FORMAT_INT64, '-9223372036854775808', '9223372036854775808', -9223372036854775807, 9223372036854775807],
-            [IMocker::DATA_FORMAT_INT32, -10, 10, -10, 10],
-            [IMocker::DATA_FORMAT_INT64, -10, 10, -10, 10],
-            [IMocker::DATA_FORMAT_INT32, -9223372036854775807, 9223372036854775807, -2147483647, 2147483647],
-            [strtoupper(IMocker::DATA_FORMAT_INT32), -2147483648, 2147483648, -2147483647, 2147483647],
-            [strtoupper(IMocker::DATA_FORMAT_INT64), '-9223372036854775808', '9223372036854775808', -9223372036854775807, 9223372036854775807],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockNumberCorrectArguments
-     * @covers ::mockNumber
-     */
-    public function testMockNumberWithCorrectArguments(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false,
-        $matchingInternalTypes = [],
-        $notMatchingInternalTypes = []
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $number = $mocker->mockNumber($dataFormat, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-
-        $this->internalAssertNumber(
-            $number,
-            $minimum,
-            $maximum,
-            $exclusiveMinimum,
-            $exclusiveMaximum,
-            $matchingInternalTypes,
-            $notMatchingInternalTypes
-        );
-    }
-
-    public function provideMockNumberCorrectArguments()
-    {
-        $types = [
-            IsType::TYPE_SCALAR,
-            IsType::TYPE_NUMERIC,
-            IsType::TYPE_FLOAT,
-        ];
-        $notTypes = [
-            IsType::TYPE_INT,
-            IsType::TYPE_ARRAY,
-            IsType::TYPE_BOOL,
-            IsType::TYPE_NULL,
-            IsType::TYPE_OBJECT,
-            IsType::TYPE_RESOURCE,
-            IsType::TYPE_STRING,
-            IsType::TYPE_CALLABLE,
-        ];
-
-        return [
-            [null, -100, 100, false, false, $types, $notTypes],
-            [null, -100, null, false, false, $types, $notTypes],
-            [null, null, 100, false, false, $types, $notTypes],
-            [null, -99.5, null, true, false, $types, $notTypes],
-            [null, null, 99.5, false, true, $types, $notTypes],
-            [null, -99.5, 99.5, true, true, $types, $notTypes],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockNumberInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @covers ::mockNumber
-     */
-    public function testMockNumberWithInvalidArguments(
-        $dataFormat = null,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $number = $mocker->mockNumber($dataFormat, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-    }
-
-    public function provideMockNumberInvalidArguments()
-    {
-        return [
-            [null, 'foo', null, false, false],
-            [null, null, false, false, false],
-            [null, null, null, true, false],
-            [null, null, null, false, true],
-            [null, 100, -100, false, false],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockStringCorrectArguments
-     * @covers ::mockString
-     */
-    public function testMockStringWithCorrectArguments(
-        $dataFormat = null,
-        $minLength = 0,
-        $maxLength = null,
-        $enum = null,
-        $matchingInternalTypes = [],
-        $notMatchingInternalTypes = []
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $str = $mocker->mockString($dataFormat, $minLength, $maxLength, $enum);
-
-        $this->internalAssertString(
-            $str,
-            $minLength,
-            $maxLength,
-            $enum,
-            $matchingInternalTypes,
-            $notMatchingInternalTypes
-        );
-    }
-
-    public function provideMockStringCorrectArguments()
-    {
-        $types = [
-            IsType::TYPE_SCALAR,
-            IsType::TYPE_STRING,
-        ];
-        $notTypes = [
-            IsType::TYPE_FLOAT,
-            IsType::TYPE_INT,
-            IsType::TYPE_ARRAY,
-            IsType::TYPE_BOOL,
-            IsType::TYPE_NULL,
-            IsType::TYPE_OBJECT,
-            IsType::TYPE_RESOURCE,
-            IsType::TYPE_CALLABLE,
-        ];
-
-        return [
-            [null, 0, null, null, $types, $notTypes],
-            [null, 10, null, null, $types, $notTypes],
-            [null, 0, 100, null, $types, $notTypes],
-            [null, 10, 50, null, $types, $notTypes],
-            [null, 10, 10, null, $types, $notTypes],
-            [null, 0, 0, null, $types, $notTypes],
-            [null, null, null, null, $types, $notTypes],
-            [null, null, null, ['foobar', 'foobaz', 'hello world'], $types, $notTypes],
-            [null, null, null, ['foobar'], $types, $notTypes],
-            [IMocker::DATA_FORMAT_PASSWORD, 0, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_PASSWORD, 10, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_PASSWORD, 0, 100, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_PASSWORD, 10, 50, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_PASSWORD, 10, 10, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_PASSWORD, 0, 0, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, null, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 10, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 10, 10, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, null, 8, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 16, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 25, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 25, 25, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, null, 20, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 30, null, null, $types, $notTypes],
-            [IMocker::DATA_FORMAT_EMAIL, 1, 1, null, $types, $notTypes],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockStringInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @covers ::mockString
-     */
-    public function testMockStringWithInvalidArguments(
-        $dataFormat = null,
-        $minLength = 0,
-        $maxLength = null,
-        $enum = null
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $str = $mocker->mockString($dataFormat, $minLength, $maxLength, $enum);
-    }
-
-    public function provideMockStringInvalidArguments()
-    {
-        return [
-            'negative minLength' => [null, -10, null],
-            'negative maxLength' => [null, 0, -10],
-            'both minLength maxLength negative' => [null, -10, -10],
-            'decimal minLength and maxLength' => [null, 0.5, 0.5],
-            'string minLength' => [null, '10', null],
-            'string maxLength' => [null, 0, '50'],
-            'string minLength and maxLength' => [null, '10', '50'],
-            'maxLength less than minLength' => [null, 50, 10],
-            'enum is string' => [null, null, null, 'foobar'],
-            'enum is empty array' => [null, null, null, []],
-            'enum array is not unique' => [null, null, null, ['foobar', 'foobaz', 'foobar']],
-        ];
-    }
-
-    /**
-     * @covers ::mock
-     * @covers ::mockString
-     * @dataProvider provideMockStringByteFormatArguments
-     */
-    public function testMockStringWithByteFormat(
-        $dataFormat,
-        $minLength,
-        $maxLength
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $str = $mocker->mockString($dataFormat, $minLength, $maxLength);
-        $str2 = $mocker->mock(IMocker::DATA_TYPE_STRING, $dataFormat, ['minLength' => $minLength, 'maxLength' => $maxLength]);
-        $base64pattern = '/^[\w\+\/\=]*$/';
-        $this->assertRegExp($base64pattern, $str);
-        $this->assertRegExp($base64pattern, $str2);
-        if ($minLength !== null) {
-            $this->assertGreaterThanOrEqual($minLength, mb_strlen($str));
-            $this->assertGreaterThanOrEqual($minLength, mb_strlen($str2));
-        }
-        if ($maxLength !== null) {
-            $this->assertLessThanOrEqual($maxLength, mb_strlen($str));
-            $this->assertLessThanOrEqual($maxLength, mb_strlen($str2));
-        }
-    }
-
-    public function provideMockStringByteFormatArguments()
-    {
-        return [
-            [IMocker::DATA_FORMAT_BYTE, null, null],
-            [IMocker::DATA_FORMAT_BYTE, 10, null],
-            [IMocker::DATA_FORMAT_BYTE, 10, 10],
-            [IMocker::DATA_FORMAT_BYTE, null, 12],
-        ];
-    }
-
-    /**
-     * @covers ::mock
-     * @covers ::mockString
-     * @dataProvider provideMockStringBinaryFormatArguments
-     */
-    public function testMockStringWithBinaryFormat(
-        $dataFormat,
-        $minLength,
-        $maxLength
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $str = $mocker->mockString($dataFormat, $minLength, $maxLength);
-        $str2 = $mocker->mock(IMocker::DATA_TYPE_STRING, $dataFormat, ['minLength' => $minLength, 'maxLength' => $maxLength]);
-        if ($minLength !== null) {
-            $this->assertGreaterThanOrEqual($minLength, strlen($str));
-            $this->assertGreaterThanOrEqual($minLength, strlen($str2));
-        }
-        if ($maxLength !== null) {
-            $this->assertLessThanOrEqual($maxLength, strlen($str));
-            $this->assertLessThanOrEqual($maxLength, strlen($str2));
-        }
-    }
-
-    public function provideMockStringBinaryFormatArguments()
-    {
-        return [
-            [IMocker::DATA_FORMAT_BINARY, 0, null],
-            [IMocker::DATA_FORMAT_BINARY, 10, null],
-            [IMocker::DATA_FORMAT_BINARY, 0, 100],
-            [IMocker::DATA_FORMAT_BINARY, 10, 50],
-            [IMocker::DATA_FORMAT_BINARY, 10, 10],
-            [IMocker::DATA_FORMAT_BINARY, 0, 0],
-        ];
-    }
-
-    /**
-     * @covers ::mock
-     * @covers ::mockString
-     * @dataProvider provideMockStringDateFormatArguments
-     */
-    public function testMockStringWithDateAndDateTimeFormat(
-        $dataFormat,
-        $minLength,
-        $maxLength,
-        $dtFormat
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $str = $mocker->mockString($dataFormat, $minLength, $maxLength);
-        $str2 = $mocker->mock(IMocker::DATA_TYPE_STRING, $dataFormat, ['minLength' => $minLength, 'maxLength' => $maxLength]);
-
-        if ($dtFormat !== null) {
-            $date = DateTime::createFromFormat($dtFormat, $str);
-            $date2 = DateTime::createFromFormat($dtFormat, $str2);
-            $this->assertInstanceOf(DateTime::class, $date);
-            $this->assertInstanceOf(DateTime::class, $date2);
-        }
-        if ($minLength !== null) {
-            $this->assertGreaterThanOrEqual($minLength, mb_strlen($str));
-            $this->assertGreaterThanOrEqual($minLength, mb_strlen($str2));
-        }
-        if ($maxLength !== null) {
-            $this->assertLessThanOrEqual($maxLength, mb_strlen($str));
-            $this->assertLessThanOrEqual($maxLength, mb_strlen($str2));
-        }
-    }
-
-    public function provideMockStringDateFormatArguments()
-    {
-        return [
-            [IMocker::DATA_FORMAT_DATE, null, null, 'Y-m-d'],
-            [IMocker::DATA_FORMAT_DATE, 10, null, 'Y-m-d'],
-            [IMocker::DATA_FORMAT_DATE, 10, 10, 'Y-m-d'],
-            [IMocker::DATA_FORMAT_DATE, null, 8, null],
-            [IMocker::DATA_FORMAT_DATE, 16, null, null],
-            [IMocker::DATA_FORMAT_DATE_TIME, null, null, 'Y-m-d\TH:i:sP'],
-            [IMocker::DATA_FORMAT_DATE_TIME, 25, null, 'Y-m-d\TH:i:sP'],
-            [IMocker::DATA_FORMAT_DATE_TIME, 25, 25, 'Y-m-d\TH:i:sP'],
-            [IMocker::DATA_FORMAT_DATE_TIME, null, 20, null],
-            [IMocker::DATA_FORMAT_DATE_TIME, 30, null, null],
-        ];
-    }
-
-    /**
-     * @covers ::mock
-     * @covers ::mockString
-     * @dataProvider provideMockStringUuidFormatArguments
-     */
-    public function testMockStringWithUuidFormat(
-        $minLength,
-        $maxLength
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $arr = [];
-        $arr2 = [];
-        $hexPattern = '/^[a-f0-9]*$/';
-
-        while (count($arr) < 100 && count($arr2) < 100) {
-            $str = $mocker->mockString(IMocker::DATA_FORMAT_UUID, $minLength, $maxLength);
-            $str2 = $mocker->mock(IMocker::DATA_TYPE_STRING, IMocker::DATA_FORMAT_UUID, ['minLength' => $minLength, 'maxLength' => $maxLength]);
-            $arr[] = $str;
-            $arr2[] = $str2;
-
-            $this->assertRegExp($hexPattern, $str);
-            $this->assertRegExp($hexPattern, $str2);
-
-            if ($minLength !== null) {
-                $this->assertGreaterThanOrEqual($minLength, mb_strlen($str));
-                $this->assertGreaterThanOrEqual($minLength, mb_strlen($str2));
-            }
-            if ($maxLength !== null) {
-                $this->assertLessThanOrEqual($maxLength, mb_strlen($str));
-                $this->assertLessThanOrEqual($maxLength, mb_strlen($str2));
-            }
-        }
-    }
-
-    public function provideMockStringUuidFormatArguments()
-    {
-        return [
-            [null, null],
-            [10, null],
-            [10, 10],
-            [null, 8],
-            [16, null],
-            [null, null],
-            [25, null],
-            [25, 25],
-            [null, 20],
-            [30, null],
-            [1, 1],
-        ];
-    }
-
-    /**
-     * @covers ::mockBoolean
-     */
-    public function testMockBoolean()
-    {
-        $mocker = new OpenApiDataMocker();
-        $bool = $mocker->mockBoolean();
-
-        $matchingInternalTypes = [
-            IsType::TYPE_SCALAR,
-            IsType::TYPE_BOOL,
-        ];
-
-        foreach ($matchingInternalTypes as $matchType) {
-            $this->assertInternalType($matchType, $bool);
-        }
-
-        $notMatchingInternalTypes = [
-            IsType::TYPE_NUMERIC,
-            IsType::TYPE_FLOAT,
-            IsType::TYPE_INT,
-            IsType::TYPE_ARRAY,
-            IsType::TYPE_STRING,
-            IsType::TYPE_NULL,
-            IsType::TYPE_OBJECT,
-            IsType::TYPE_RESOURCE,
-            IsType::TYPE_CALLABLE,
-        ];
-
-        foreach ($notMatchingInternalTypes as $notMatchType) {
-            $this->assertNotInternalType($notMatchType, $bool);
-        }
-    }
-
-    private function internalAssertNumber(
-        $number,
-        $minimum = null,
-        $maximum = null,
-        $exclusiveMinimum = false,
-        $exclusiveMaximum = false,
-        $matchingInternalTypes = [],
-        $notMatchingInternalTypes = []
-    ) {
-        foreach ($matchingInternalTypes as $matchType) {
-            $this->assertInternalType($matchType, $number);
-        }
-
-        foreach ($notMatchingInternalTypes as $notMatchType) {
-            $this->assertNotInternalType($notMatchType, $number);
-        }
-
-        if ($minimum !== null) {
-            if ($exclusiveMinimum) {
-                $this->assertGreaterThan($minimum, $number);
-            } else {
-                $this->assertGreaterThanOrEqual($minimum, $number);
-            }
-        }
-
-        if ($maximum !== null) {
-            if ($exclusiveMaximum) {
-                $this->assertLessThan($maximum, $number);
-            } else {
-                $this->assertLessThanOrEqual($maximum, $number);
-            }
-        }
-    }
-
-    private function internalAssertString(
-        $str,
-        $minLength = null,
-        $maxLength = null,
-        $enum = null,
-        $matchingInternalTypes = [],
-        $notMatchingInternalTypes = []
-    ) {
-        foreach ($matchingInternalTypes as $matchType) {
-            $this->assertInternalType($matchType, $str);
-        }
-
-        foreach ($notMatchingInternalTypes as $notMatchType) {
-            $this->assertNotInternalType($notMatchType, $str);
-        }
-
-        if ($minLength !== null) {
-            $this->assertGreaterThanOrEqual($minLength, mb_strlen($str, 'UTF-8'));
-        }
-
-        if ($maxLength !== null) {
-            $this->assertLessThanOrEqual($maxLength, mb_strlen($str, 'UTF-8'));
-        }
-
-        if (is_array($enum) && !empty($enum)) {
-            $this->assertContains($str, $enum);
-        }
-    }
-
-    /**
-     * @dataProvider provideMockArrayCorrectArguments
-     * @covers ::mockArray
-     */
-    public function testMockArrayFlattenWithCorrectArguments(
-        $items,
-        $minItems,
-        $maxItems,
-        $uniqueItems,
-        $expectedItemsType = null,
-        $expectedArraySize = null
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $arr = $mocker->mockArray($items, $minItems, $maxItems, $uniqueItems);
-
-        $this->assertIsArray($arr);
-        if ($expectedArraySize !== null) {
-            $this->assertCount($expectedArraySize, $arr);
-        }
-        if ($expectedItemsType && $expectedArraySize > 0) {
-            $this->assertContainsOnly($expectedItemsType, $arr, true);
-        }
-
-        if (is_array($items)) {
-            $dataType = $items['type'];
-            $dataFormat = $items['dataFormat'] ?? null;
-
-            // items field numeric properties
-            $minimum = $items['minimum'] ?? null;
-            $maximum = $items['maximum'] ?? null;
-            $exclusiveMinimum = $items['exclusiveMinimum'] ?? null;
-            $exclusiveMaximum = $items['exclusiveMaximum'] ?? null;
-
-            // items field string properties
-            $minLength = $items['minLength'] ?? null;
-            $maxLength = $items['maxLength'] ?? null;
-            $enum = $items['enum'] ?? null;
-            $pattern = $items['pattern'] ?? null;
-
-            // items field array properties
-            $subItems = $items['items'] ?? null;
-            $subMinItems = $items['minItems'] ?? null;
-            $subMaxItems = $items['maxItems'] ?? null;
-            $subUniqueItems = $items['uniqueItems'] ?? null;
-        } else {
-            // is object
-            $dataType = $items->type;
-            $dataFormat = $items->dataFormat ?? null;
-
-            // items field numeric properties
-            $minimum = $items->minimum ?? null;
-            $maximum = $items->maximum ?? null;
-            $exclusiveMinimum = $items->exclusiveMinimum ?? null;
-            $exclusiveMaximum = $items->exclusiveMaximum ?? null;
-
-            // items field string properties
-            $minLength = $items->minLength ?? null;
-            $maxLength = $items->maxLength ?? null;
-            $enum = $items->enum ?? null;
-            $pattern = $items->pattern ?? null;
-
-            // items field array properties
-            $subItems = $items->items ?? null;
-            $subMinItems = $items->minItems ?? null;
-            $subMaxItems = $items->maxItems ?? null;
-            $subUniqueItems = $items->uniqueItems ?? null;
-        }
-
-
-        foreach ($arr as $item) {
-            switch ($dataType) {
-                case IMocker::DATA_TYPE_INTEGER:
-                    $this->internalAssertNumber($item, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-                    break;
-                case IMocker::DATA_TYPE_NUMBER:
-                    $this->internalAssertNumber($item, $minimum, $maximum, $exclusiveMinimum, $exclusiveMaximum);
-                    break;
-                case IMocker::DATA_TYPE_STRING:
-                    $this->internalAssertString($item, $minLength, $maxLength);
-                    break;
-                case IMocker::DATA_TYPE_BOOLEAN:
-                    $this->assertInternalType(IsType::TYPE_BOOL, $item);
-                    break;
-                case IMocker::DATA_TYPE_ARRAY:
-                    $this->testMockArrayFlattenWithCorrectArguments($subItems, $subMinItems, $subMaxItems, $subUniqueItems);
-                    break;
-            }
-        }
-    }
-
-    public function provideMockArrayCorrectArguments()
-    {
-        $intItems = ['type' => IMocker::DATA_TYPE_INTEGER, 'minimum' => 5, 'maximum' => 10];
-        $floatItems = ['type' => IMocker::DATA_TYPE_NUMBER, 'minimum' => -32.4, 'maximum' => 88.6, 'exclusiveMinimum' => true, 'exclusiveMaximum' => true];
-        $strItems = ['type' => IMocker::DATA_TYPE_STRING, 'minLength' => 20, 'maxLength' => 50];
-        $boolItems = (object) ['type' => IMocker::DATA_TYPE_BOOLEAN];
-        $arrayItems = (object) ['type' => IMocker::DATA_TYPE_ARRAY, 'items' => ['type' => IMocker::DATA_TYPE_STRING, 'minItems' => 3, 'maxItems' => 10]];
-        $objectItems = (object) ['type' => IMocker::DATA_TYPE_OBJECT, 'properties' => (object)['username' => ['type' => IMocker::DATA_TYPE_STRING]]];
-        $expectedInt = IsType::TYPE_INT;
-        $expectedFloat = IsType::TYPE_FLOAT;
-        $expectedStr = IsType::TYPE_STRING;
-        $expectedBool = IsType::TYPE_BOOL;
-        $expectedArray = IsType::TYPE_ARRAY;
-        $expectedObject = IsType::TYPE_OBJECT;
-
-        return [
-            'empty array' => [
-                $strItems, null, 0, false, null, 0,
-            ],
-            'empty array, limit zero' => [
-                $strItems, 0, 0, false, null, 0,
-            ],
-            'array of one string as default size' => [
-                $strItems, null, null, false, $expectedStr, 1,
-            ],
-            'array of one string, limit one' => [
-                $strItems, 1, 1, false, $expectedStr, 1,
-            ],
-            'array of two strings' => [
-                $strItems, 2, null, false, $expectedStr, 2,
-            ],
-            'array of five strings, limit ten' => [
-                $strItems, 5, 10, false, $expectedStr, 5,
-            ],
-            'array of five strings, limit five' => [
-                $strItems, 5, 5, false, $expectedStr, 5,
-            ],
-            'array of one string, limit five' => [
-                $strItems, null, 5, false, $expectedStr, 1,
-            ],
-            'array of one integer' => [
-                $intItems, null, null, false, $expectedInt, 1,
-            ],
-            'array of one float' => [
-                $floatItems, null, null, false, $expectedFloat, 1,
-            ],
-            'array of one boolean' => [
-                $boolItems, null, null, false, $expectedBool, 1,
-            ],
-            'array of one array of strings' => [
-                $arrayItems, null, null, false, $expectedArray, 1,
-            ],
-            'array of one object' => [
-                $objectItems, null, null, false, $expectedObject, 1
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockArrayInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @covers ::mockArray
-     */
-    public function testMockArrayWithInvalidArguments(
-        $items,
-        $minItems,
-        $maxItems,
-        $uniqueItems
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $arr = $mocker->mockArray($items, $minItems, $maxItems, $uniqueItems);
-    }
-
-    public function provideMockArrayInvalidArguments()
-    {
-        $intItems = ['type' => IMocker::DATA_TYPE_INTEGER];
-
-        return [
-            'items is nor array' => [
-                'foobar', null, null, false,
-            ],
-            'items doesnt have "type" key' => [
-                ['foobar' => 'foobaz'], null, null, false,
-            ],
-            'minItems is not integer' => [
-                $intItems, 3.12, null, false,
-            ],
-            'minItems is negative' => [
-                $intItems, -10, null, false,
-            ],
-            'minItems is not number' => [
-                $intItems, '1', null, false,
-            ],
-            'maxItems is not integer' => [
-                $intItems, null, 3.12, false,
-            ],
-            'maxItems is negative' => [
-                $intItems, null, -10, false,
-            ],
-            'maxItems is not number' => [
-                $intItems, null, 'foobaz', false,
-            ],
-            'maxItems less than minItems' => [
-                $intItems, 5, 2, false,
-            ],
-            'items with ref to unknown class' => [
-                ['$ref' => '#/components/schemas/UnknownClass'], null, null, false,
-            ],
-            'items with ref to class without getOpenApiSchema method' => [
-                ['$ref' => '#/components/schemas/ClassWithoutGetSchemaMethod'], null, null, false,
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockArrayWithRefArguments
-     * @covers ::mockArray
-     */
-    public function testMockArrayWithRef($items, $expectedStructure)
-    {
-        $mocker = new OpenApiDataMocker();
-        $arr = $mocker->mockArray($items);
-        $this->assertIsArray($arr);
-        $this->assertCount(1, $arr);
-        foreach ($arr as $item) {
-            // TODO: replace with assertInstanceOf assertion
-            $this->assertInternalType(IsType::TYPE_OBJECT, $item);
-            foreach ($expectedStructure as $expectedProp => $expectedType) {
-                $this->assertInternalType($expectedType, $item->$expectedProp);
-            }
-        }
-    }
-
-    public function provideMockArrayWithRefArguments()
-    {
-        return [
-            'items with ref to CatRefTestClass' => [
-                ['$ref' => '#/components/schemas/CatRefTestClass'],
-                [
-                    'className' => IsType::TYPE_STRING,
-                    'color' => IsType::TYPE_STRING,
-                    'declawed' => IsType::TYPE_BOOL,
-                ],
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockObjectCorrectArguments
-     * @covers ::mockObject
-     */
-    public function testMockObjectWithCorrectArguments(
-        $properties,
-        $minProperties,
-        $maxProperties,
-        $additionalProperties,
-        $required,
-        $expectedKeys
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $obj = $mocker->mockObject(
-            $properties,
-            $minProperties,
-            $maxProperties,
-            $additionalProperties,
-            $required
-        );
-
-        $this->assertInternalType(IsType::TYPE_OBJECT, $obj);
-        $this->assertSame($expectedKeys, array_keys(get_object_vars($obj)));
-    }
-
-    public function provideMockObjectCorrectArguments()
-    {
-        $additionProps = [
-            'extra' => [
-                'type' => IMocker::DATA_TYPE_STRING,
-            ],
-        ];
-        return [
-            'empty object' => [
-                [], 1, 10, true, null, [],
-            ],
-            'empty object from StdClass' => [
-                new StdClass(), 1, 5, false, null, [],
-            ],
-            'object with username property' => [
-                [
-                    'username' => [
-                        'type' => IMocker::DATA_TYPE_STRING,
-                    ],
-                ], 0, 5, $additionProps, null, ['username'],
-            ],
-            'object with foobar property' => [
-                (object) [
-                    'foobar' => [
-                        'type' => IMocker::DATA_TYPE_INTEGER,
-                    ],
-                ], 1, 1, (object) $additionProps, null, ['foobar'],
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockObjectInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @covers ::mockObject
-     */
-    public function testMockObjectWithInvalidArguments(
-        $properties,
-        $minProperties,
-        $maxProperties,
-        $additionalProperties,
-        $required
-    ) {
-        $mocker = new OpenApiDataMocker();
-        $obj = $mocker->mockObject($properties, $minProperties, $maxProperties, $additionalProperties, $required);
-    }
-
-    public function provideMockObjectInvalidArguments()
-    {
-        return [
-            'properties cannot be null' => [
-                null, 0, 10, false, null,
-            ],
-            'properties cannot be a string' => [
-                'foobar', 0, 10, false, null,
-            ],
-            'property value cannot be a string' => [
-                ['username' => 'foobar'], 0, 10, false, null,
-            ],
-            'minProperties is not integer' => [
-                [], 3.12, null, false, null,
-            ],
-            'minProperties is negative' => [
-                [], -10, null, false, null,
-            ],
-            'minProperties is not number' => [
-                [], '1', null, false, null,
-            ],
-            'maxProperties is not integer' => [
-                [], null, 3.12, false, null,
-            ],
-            'maxProperties is negative' => [
-                [], null, -10, false, null,
-            ],
-            'maxProperties is not number' => [
-                [], null, 'foobaz', false, null,
-            ],
-            'maxProperties less than minProperties' => [
-                [], 5, 2, false, null,
-            ],
-            'additionalProperties is not object|array|boolean' => [
-                [], null, null, 'foobar', null,
-            ],
-            'required is object, not array' => [
-                [], null, null, null, new StdClass(),
-            ],
-            'required is not array' => [
-                [], null, null, null, 'foobar',
-            ],
-            'required array with duplicates' => [
-                [], null, null, null, ['username', 'username'],
-            ],
-            'required array of non-strings' => [
-                [], null, null, null, [1, 2, 3],
-            ],
-        ];
-    }
-
-    /**
-     * @covers ::mockObject
-     */
-    public function testMockObjectWithReferencedProps()
-    {
-        $mocker = new OpenApiDataMocker();
-        $obj = $mocker->mockObject(
-            (object) [
-                'cat' => [
-                    '$ref' => '#/components/schemas/CatRefTestClass',
-                ],
-            ]
-        );
-        $this->assertInternalType(IsType::TYPE_OBJECT, $obj->cat);
-        $this->assertInternalType(IsType::TYPE_STRING, $obj->cat->className);
-        $this->assertInternalType(IsType::TYPE_STRING, $obj->cat->color);
-        $this->assertInternalType(IsType::TYPE_BOOL, $obj->cat->declawed);
-    }
-
-    /**
-     * @dataProvider provideMockFromSchemaCorrectArguments
-     * @covers ::mockFromSchema
-     */
-    public function testMockFromSchemaWithCorrectArguments($schema, $expectedType)
-    {
-        $mocker = new OpenApiDataMocker();
-        $data = $mocker->mockFromSchema($schema);
-        $this->assertInternalType($expectedType, $data);
-    }
-
-    public function provideMockFromSchemaCorrectArguments()
-    {
-        return [
-            'string from object' => [
-                (object) ['type' => IMocker::DATA_TYPE_STRING],
-                IsType::TYPE_STRING,
-            ],
-            'string from array' => [
-                ['type' => IMocker::DATA_TYPE_STRING],
-                IsType::TYPE_STRING,
-            ],
-            'integer from object' => [
-                (object) ['type' => IMocker::DATA_TYPE_INTEGER],
-                IsType::TYPE_INT,
-            ],
-            'integer from array' => [
-                ['type' => IMocker::DATA_TYPE_INTEGER],
-                IsType::TYPE_INT,
-            ],
-            'number from object' => [
-                (object) ['type' => IMocker::DATA_TYPE_NUMBER],
-                IsType::TYPE_FLOAT,
-            ],
-            'number from array' => [
-                ['type' => IMocker::DATA_TYPE_NUMBER],
-                IsType::TYPE_FLOAT,
-            ],
-            'string from object' => [
-                (object) ['type' => IMocker::DATA_TYPE_STRING],
-                IsType::TYPE_STRING,
-            ],
-            'string from array' => [
-                ['type' => IMocker::DATA_TYPE_STRING],
-                IsType::TYPE_STRING,
-            ],
-            'boolean from object' => [
-                (object) ['type' => IMocker::DATA_TYPE_BOOLEAN],
-                IsType::TYPE_BOOL,
-            ],
-            'boolean from array' => [
-                ['type' => IMocker::DATA_TYPE_BOOLEAN],
-                IsType::TYPE_BOOL,
-            ],
-            'array of strings from object' => [
-                (object) [
-                    'type' => IMocker::DATA_TYPE_ARRAY,
-                    'items' => ['type' => IMocker::DATA_TYPE_STRING],
-                ],
-                IsType::TYPE_ARRAY,
-            ],
-            'array of strings from array' => [
-                [
-                    'type' => IMocker::DATA_TYPE_ARRAY,
-                    'items' => ['type' => IMocker::DATA_TYPE_STRING],
-                ],
-                IsType::TYPE_ARRAY,
-            ],
-            'object with username prop from object' => [
-                (object) [
-                    'type' => IMocker::DATA_TYPE_OBJECT,
-                    'properties' => ['username' => ['type' => IMocker::DATA_TYPE_STRING]],
-                ],
-                IsType::TYPE_OBJECT,
-            ],
-            'object with username prop from array' => [
-                [
-                    'type' => IMocker::DATA_TYPE_OBJECT,
-                    'properties' => ['username' => ['type' => IMocker::DATA_TYPE_STRING]],
-                ],
-                IsType::TYPE_OBJECT,
-            ],
-            'referenced class' => [
-                ['$ref' => '#/components/schemas/CatRefTestClass'],
-                IsType::TYPE_OBJECT,
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockFromSchemaInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @covers ::mockFromSchema
-     */
-    public function testMockFromSchemaWithInvalidArguments($schema)
-    {
-        $mocker = new OpenApiDataMocker();
-        $data = $mocker->mockFromSchema($schema);
-    }
-
-
-    public function provideMockFromSchemaInvalidArguments()
-    {
-        return [
-            'null' => [null],
-            'numeric' => [3.14],
-            'empty array' => [[]],
-            'empty object' => [(object) []],
-            'string' => ['foobar'],
-            'DateTime object' => [new DateTime()],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockFromRefCorrectArguments
-     * @covers ::mockFromRef
-     */
-    public function testMockFromRefWithCorrectArguments($ref, $expectedStructure)
-    {
-        $mocker = new OpenApiDataMocker();
-        $data = $mocker->mockFromRef($ref);
-        foreach ($expectedStructure as $expectedProp => $expectedType) {
-            $this->assertInternalType($expectedType, $data->$expectedProp);
-        }
-    }
-
-    public function provideMockFromRefCorrectArguments()
-    {
-        return [
-            'CatRefTestClass model' => [
-                '#/components/schemas/CatRefTestClass',
-                [
-                    'className' => IsType::TYPE_STRING,
-                    'color' => IsType::TYPE_STRING,
-                    'declawed' => IsType::TYPE_BOOL,
-                ]
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider provideMockFromRefInvalidArguments
-     * @expectedException \InvalidArgumentException
-     * @covers ::mockFromRef
-     */
-    public function testMockFromRefWithInvalidArguments($ref)
-    {
-        $mocker = new OpenApiDataMocker();
-        $data = $mocker->mockFromRef($ref);
-    }
-
-    public function provideMockFromRefInvalidArguments()
-    {
-        return [
-            'ref to unknown class' => ['#/components/schemas/UnknownClass'],
-            'ref to class without getOpenApiSchema method' => ['#/components/schemas/ClassWithoutGetSchemaMethod'],
-        ];
-    }
-}
-
-namespace OpenAPIServer\Model;
-
-// phpcs:disable PSR1.Classes.ClassDeclaration.MultipleClasses
-final class CatRefTestClass
-{
-    private const MODEL_SCHEMA = <<<'SCHEMA'
-{
-    "required" : [ "className" ],
-    "type" : "object",
-    "properties" : {
-        "className" : {
-            "type" : "string"
-        },
-        "color" : {
-            "type" : "string",
-            "default" : "red"
-        },
-        "declawed" : {
-            "type" : "boolean"
-        }
-    },
-    "discriminator" : {
-        "propertyName" : "className"
-    }
-}
-SCHEMA;
-
-    public static function getOpenApiSchema()
-    {
-        return json_decode(static::MODEL_SCHEMA, true);
-    }
-}
-
-final class ClassWithoutGetSchemaMethod
-{
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesAnyTypeTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesAnyTypeTest.php
deleted file mode 100644
index 52884b81c7f3..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesAnyTypeTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesAnyTypeTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesAnyType;
-
-/**
- * AdditionalPropertiesAnyTypeTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesAnyType
- */
-class AdditionalPropertiesAnyTypeTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesAnyType"
-     */
-    public function testAdditionalPropertiesAnyType()
-    {
-        $testAdditionalPropertiesAnyType = new AdditionalPropertiesAnyType();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesArrayTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesArrayTest.php
deleted file mode 100644
index 5084c28d0016..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesArrayTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesArrayTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesArray;
-
-/**
- * AdditionalPropertiesArrayTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesArray
- */
-class AdditionalPropertiesArrayTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesArray"
-     */
-    public function testAdditionalPropertiesArray()
-    {
-        $testAdditionalPropertiesArray = new AdditionalPropertiesArray();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesBooleanTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesBooleanTest.php
deleted file mode 100644
index 8816b8fcb880..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesBooleanTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesBooleanTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesBoolean;
-
-/**
- * AdditionalPropertiesBooleanTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesBoolean
- */
-class AdditionalPropertiesBooleanTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesBoolean"
-     */
-    public function testAdditionalPropertiesBoolean()
-    {
-        $testAdditionalPropertiesBoolean = new AdditionalPropertiesBoolean();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesClassTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesClassTest.php
deleted file mode 100644
index 09b852d612af..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesClassTest.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesClassTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesClass;
-
-/**
- * AdditionalPropertiesClassTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesClass
- */
-class AdditionalPropertiesClassTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesClass"
-     */
-    public function testAdditionalPropertiesClass()
-    {
-        $testAdditionalPropertiesClass = new AdditionalPropertiesClass();
-    }
-
-    /**
-     * Test attribute "mapString"
-     */
-    public function testPropertyMapString()
-    {
-    }
-
-    /**
-     * Test attribute "mapNumber"
-     */
-    public function testPropertyMapNumber()
-    {
-    }
-
-    /**
-     * Test attribute "mapInteger"
-     */
-    public function testPropertyMapInteger()
-    {
-    }
-
-    /**
-     * Test attribute "mapBoolean"
-     */
-    public function testPropertyMapBoolean()
-    {
-    }
-
-    /**
-     * Test attribute "mapArrayInteger"
-     */
-    public function testPropertyMapArrayInteger()
-    {
-    }
-
-    /**
-     * Test attribute "mapArrayAnytype"
-     */
-    public function testPropertyMapArrayAnytype()
-    {
-    }
-
-    /**
-     * Test attribute "mapMapString"
-     */
-    public function testPropertyMapMapString()
-    {
-    }
-
-    /**
-     * Test attribute "mapMapAnytype"
-     */
-    public function testPropertyMapMapAnytype()
-    {
-    }
-
-    /**
-     * Test attribute "anytype1"
-     */
-    public function testPropertyAnytype1()
-    {
-    }
-
-    /**
-     * Test attribute "anytype2"
-     */
-    public function testPropertyAnytype2()
-    {
-    }
-
-    /**
-     * Test attribute "anytype3"
-     */
-    public function testPropertyAnytype3()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesIntegerTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesIntegerTest.php
deleted file mode 100644
index affc7340852e..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesIntegerTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesIntegerTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesInteger;
-
-/**
- * AdditionalPropertiesIntegerTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesInteger
- */
-class AdditionalPropertiesIntegerTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesInteger"
-     */
-    public function testAdditionalPropertiesInteger()
-    {
-        $testAdditionalPropertiesInteger = new AdditionalPropertiesInteger();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesNumberTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesNumberTest.php
deleted file mode 100644
index 300e032b0669..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesNumberTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesNumberTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesNumber;
-
-/**
- * AdditionalPropertiesNumberTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesNumber
- */
-class AdditionalPropertiesNumberTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesNumber"
-     */
-    public function testAdditionalPropertiesNumber()
-    {
-        $testAdditionalPropertiesNumber = new AdditionalPropertiesNumber();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesObjectTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesObjectTest.php
deleted file mode 100644
index ea860dae5a99..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesObjectTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesObjectTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesObject;
-
-/**
- * AdditionalPropertiesObjectTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesObject
- */
-class AdditionalPropertiesObjectTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesObject"
-     */
-    public function testAdditionalPropertiesObject()
-    {
-        $testAdditionalPropertiesObject = new AdditionalPropertiesObject();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesStringTest.php b/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesStringTest.php
deleted file mode 100644
index 5cd34bdfef16..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/AdditionalPropertiesStringTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * AdditionalPropertiesStringTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\AdditionalPropertiesString;
-
-/**
- * AdditionalPropertiesStringTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\AdditionalPropertiesString
- */
-class AdditionalPropertiesStringTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "AdditionalPropertiesString"
-     */
-    public function testAdditionalPropertiesString()
-    {
-        $testAdditionalPropertiesString = new AdditionalPropertiesString();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/AnimalTest.php b/samples/server/petstore/php-slim4/test/Model/AnimalTest.php
deleted file mode 100644
index b5fb22d216e1..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/AnimalTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * AnimalTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Animal;
-
-/**
- * AnimalTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\Animal
- */
-class AnimalTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Animal"
-     */
-    public function testAnimal()
-    {
-        $testAnimal = new Animal();
-    }
-
-    /**
-     * Test attribute "className"
-     */
-    public function testPropertyClassName()
-    {
-    }
-
-    /**
-     * Test attribute "color"
-     */
-    public function testPropertyColor()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/ApiResponseTest.php b/samples/server/petstore/php-slim4/test/Model/ApiResponseTest.php
index 1f6dcd0f06ae..0190bd0490a0 100644
--- a/samples/server/petstore/php-slim4/test/Model/ApiResponseTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/ApiResponseTest.php
@@ -1,19 +1,16 @@
 <?php
 
 /**
- * ApiResponseTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -43,28 +40,28 @@ class ApiResponseTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -74,6 +71,15 @@ public static function tearDownAfterClass()
     public function testApiResponse()
     {
         $testApiResponse = new ApiResponse();
+        $namespacedClassname = ApiResponse::getModelsNamespace() . '\\ApiResponse';
+        $this->assertSame('\\' . ApiResponse::class, $namespacedClassname);
+        $this->assertTrue(
+            class_exists($namespacedClassname),
+            sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
+        );
+        $this->markTestIncomplete(
+            'Test of "ApiResponse" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -81,6 +87,9 @@ public function testApiResponse()
      */
     public function testPropertyCode()
     {
+        $this->markTestIncomplete(
+            'Test of "code" property in "ApiResponse" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -88,6 +97,9 @@ public function testPropertyCode()
      */
     public function testPropertyType()
     {
+        $this->markTestIncomplete(
+            'Test of "type" property in "ApiResponse" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -95,5 +107,18 @@ public function testPropertyType()
      */
     public function testPropertyMessage()
     {
+        $this->markTestIncomplete(
+            'Test of "message" property in "ApiResponse" model has not been implemented yet.'
+        );
+    }
+
+    /**
+     * Test getOpenApiSchema static method
+     * @covers ::getOpenApiSchema
+     */
+    public function testGetOpenApiSchema()
+    {
+        $schemaArr = ApiResponse::getOpenApiSchema();
+        $this->assertIsArray($schemaArr);
     }
 }
diff --git a/samples/server/petstore/php-slim4/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/server/petstore/php-slim4/test/Model/ArrayOfArrayOfNumberOnlyTest.php
deleted file mode 100644
index e424397b18c1..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * ArrayOfArrayOfNumberOnlyTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ArrayOfArrayOfNumberOnly;
-
-/**
- * ArrayOfArrayOfNumberOnlyTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\ArrayOfArrayOfNumberOnly
- */
-class ArrayOfArrayOfNumberOnlyTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ArrayOfArrayOfNumberOnly"
-     */
-    public function testArrayOfArrayOfNumberOnly()
-    {
-        $testArrayOfArrayOfNumberOnly = new ArrayOfArrayOfNumberOnly();
-    }
-
-    /**
-     * Test attribute "arrayArrayNumber"
-     */
-    public function testPropertyArrayArrayNumber()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/ArrayOfNumberOnlyTest.php b/samples/server/petstore/php-slim4/test/Model/ArrayOfNumberOnlyTest.php
deleted file mode 100644
index dccdad5444f9..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/ArrayOfNumberOnlyTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * ArrayOfNumberOnlyTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ArrayOfNumberOnly;
-
-/**
- * ArrayOfNumberOnlyTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\ArrayOfNumberOnly
- */
-class ArrayOfNumberOnlyTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ArrayOfNumberOnly"
-     */
-    public function testArrayOfNumberOnly()
-    {
-        $testArrayOfNumberOnly = new ArrayOfNumberOnly();
-    }
-
-    /**
-     * Test attribute "arrayNumber"
-     */
-    public function testPropertyArrayNumber()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/ArrayTestTest.php b/samples/server/petstore/php-slim4/test/Model/ArrayTestTest.php
deleted file mode 100644
index 1263212659d4..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/ArrayTestTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * ArrayTestTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ArrayTest;
-
-/**
- * ArrayTestTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\ArrayTest
- */
-class ArrayTestTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ArrayTest"
-     */
-    public function testArrayTest()
-    {
-        $testArrayTest = new ArrayTest();
-    }
-
-    /**
-     * Test attribute "arrayOfString"
-     */
-    public function testPropertyArrayOfString()
-    {
-    }
-
-    /**
-     * Test attribute "arrayArrayOfInteger"
-     */
-    public function testPropertyArrayArrayOfInteger()
-    {
-    }
-
-    /**
-     * Test attribute "arrayArrayOfModel"
-     */
-    public function testPropertyArrayArrayOfModel()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/BigCatAllOfTest.php b/samples/server/petstore/php-slim4/test/Model/BigCatAllOfTest.php
deleted file mode 100644
index 2f3518d5bb8d..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/BigCatAllOfTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * BigCatAllOfTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\BigCatAllOf;
-
-/**
- * BigCatAllOfTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\BigCatAllOf
- */
-class BigCatAllOfTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "BigCatAllOf"
-     */
-    public function testBigCatAllOf()
-    {
-        $testBigCatAllOf = new BigCatAllOf();
-    }
-
-    /**
-     * Test attribute "kind"
-     */
-    public function testPropertyKind()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/BigCatTest.php b/samples/server/petstore/php-slim4/test/Model/BigCatTest.php
deleted file mode 100644
index deb94624d7ce..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/BigCatTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * BigCatTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\BigCat;
-
-/**
- * BigCatTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\BigCat
- */
-class BigCatTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "BigCat"
-     */
-    public function testBigCat()
-    {
-        $testBigCat = new BigCat();
-    }
-
-    /**
-     * Test attribute "className"
-     */
-    public function testPropertyClassName()
-    {
-    }
-
-    /**
-     * Test attribute "color"
-     */
-    public function testPropertyColor()
-    {
-    }
-
-    /**
-     * Test attribute "declawed"
-     */
-    public function testPropertyDeclawed()
-    {
-    }
-
-    /**
-     * Test attribute "kind"
-     */
-    public function testPropertyKind()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/CapitalizationTest.php b/samples/server/petstore/php-slim4/test/Model/CapitalizationTest.php
deleted file mode 100644
index 652b41db51fd..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/CapitalizationTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/**
- * CapitalizationTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Capitalization;
-
-/**
- * CapitalizationTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\Capitalization
- */
-class CapitalizationTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Capitalization"
-     */
-    public function testCapitalization()
-    {
-        $testCapitalization = new Capitalization();
-    }
-
-    /**
-     * Test attribute "smallCamel"
-     */
-    public function testPropertySmallCamel()
-    {
-    }
-
-    /**
-     * Test attribute "capitalCamel"
-     */
-    public function testPropertyCapitalCamel()
-    {
-    }
-
-    /**
-     * Test attribute "smallSnake"
-     */
-    public function testPropertySmallSnake()
-    {
-    }
-
-    /**
-     * Test attribute "capitalSnake"
-     */
-    public function testPropertyCapitalSnake()
-    {
-    }
-
-    /**
-     * Test attribute "sCAETHFlowPoints"
-     */
-    public function testPropertySCAETHFlowPoints()
-    {
-    }
-
-    /**
-     * Test attribute "aTTNAME"
-     */
-    public function testPropertyATTNAME()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/CatAllOfTest.php b/samples/server/petstore/php-slim4/test/Model/CatAllOfTest.php
deleted file mode 100644
index 2a2d0fcf6a25..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/CatAllOfTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * CatAllOfTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\CatAllOf;
-
-/**
- * CatAllOfTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\CatAllOf
- */
-class CatAllOfTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "CatAllOf"
-     */
-    public function testCatAllOf()
-    {
-        $testCatAllOf = new CatAllOf();
-    }
-
-    /**
-     * Test attribute "declawed"
-     */
-    public function testPropertyDeclawed()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/CatTest.php b/samples/server/petstore/php-slim4/test/Model/CatTest.php
deleted file mode 100644
index 4c531265db9d..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/CatTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * CatTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Cat;
-
-/**
- * CatTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\Cat
- */
-class CatTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Cat"
-     */
-    public function testCat()
-    {
-        $testCat = new Cat();
-    }
-
-    /**
-     * Test attribute "className"
-     */
-    public function testPropertyClassName()
-    {
-    }
-
-    /**
-     * Test attribute "color"
-     */
-    public function testPropertyColor()
-    {
-    }
-
-    /**
-     * Test attribute "declawed"
-     */
-    public function testPropertyDeclawed()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/CategoryTest.php b/samples/server/petstore/php-slim4/test/Model/CategoryTest.php
index 602fdb5afbb6..e951b3673d3e 100644
--- a/samples/server/petstore/php-slim4/test/Model/CategoryTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/CategoryTest.php
@@ -1,19 +1,16 @@
 <?php
 
 /**
- * CategoryTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -43,28 +40,28 @@ class CategoryTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -74,6 +71,15 @@ public static function tearDownAfterClass()
     public function testCategory()
     {
         $testCategory = new Category();
+        $namespacedClassname = Category::getModelsNamespace() . '\\Category';
+        $this->assertSame('\\' . Category::class, $namespacedClassname);
+        $this->assertTrue(
+            class_exists($namespacedClassname),
+            sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
+        );
+        $this->markTestIncomplete(
+            'Test of "Category" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -81,6 +87,9 @@ public function testCategory()
      */
     public function testPropertyId()
     {
+        $this->markTestIncomplete(
+            'Test of "id" property in "Category" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -88,5 +97,18 @@ public function testPropertyId()
      */
     public function testPropertyName()
     {
+        $this->markTestIncomplete(
+            'Test of "name" property in "Category" model has not been implemented yet.'
+        );
+    }
+
+    /**
+     * Test getOpenApiSchema static method
+     * @covers ::getOpenApiSchema
+     */
+    public function testGetOpenApiSchema()
+    {
+        $schemaArr = Category::getOpenApiSchema();
+        $this->assertIsArray($schemaArr);
     }
 }
diff --git a/samples/server/petstore/php-slim4/test/Model/ClassModelTest.php b/samples/server/petstore/php-slim4/test/Model/ClassModelTest.php
deleted file mode 100644
index fe858ad7af1a..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/ClassModelTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * ClassModelTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ClassModel;
-
-/**
- * ClassModelTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\ClassModel
- */
-class ClassModelTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ClassModel"
-     */
-    public function testClassModel()
-    {
-        $testClassModel = new ClassModel();
-    }
-
-    /**
-     * Test attribute "class"
-     */
-    public function testPropertyClass()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/ClientTest.php b/samples/server/petstore/php-slim4/test/Model/ClientTest.php
deleted file mode 100644
index 0be5f2380fc8..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/ClientTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * ClientTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Client;
-
-/**
- * ClientTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\Client
- */
-class ClientTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Client"
-     */
-    public function testClient()
-    {
-        $testClient = new Client();
-    }
-
-    /**
-     * Test attribute "client"
-     */
-    public function testPropertyClient()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/DogAllOfTest.php b/samples/server/petstore/php-slim4/test/Model/DogAllOfTest.php
deleted file mode 100644
index eea0ac0c9ae7..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/DogAllOfTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * DogAllOfTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\DogAllOf;
-
-/**
- * DogAllOfTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\DogAllOf
- */
-class DogAllOfTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "DogAllOf"
-     */
-    public function testDogAllOf()
-    {
-        $testDogAllOf = new DogAllOf();
-    }
-
-    /**
-     * Test attribute "breed"
-     */
-    public function testPropertyBreed()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/DogTest.php b/samples/server/petstore/php-slim4/test/Model/DogTest.php
deleted file mode 100644
index 5067a3e1b222..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/DogTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * DogTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Dog;
-
-/**
- * DogTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\Dog
- */
-class DogTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Dog"
-     */
-    public function testDog()
-    {
-        $testDog = new Dog();
-    }
-
-    /**
-     * Test attribute "className"
-     */
-    public function testPropertyClassName()
-    {
-    }
-
-    /**
-     * Test attribute "color"
-     */
-    public function testPropertyColor()
-    {
-    }
-
-    /**
-     * Test attribute "breed"
-     */
-    public function testPropertyBreed()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/EnumArraysTest.php b/samples/server/petstore/php-slim4/test/Model/EnumArraysTest.php
deleted file mode 100644
index 0d3812b14420..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/EnumArraysTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * EnumArraysTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\EnumArrays;
-
-/**
- * EnumArraysTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\EnumArrays
- */
-class EnumArraysTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "EnumArrays"
-     */
-    public function testEnumArrays()
-    {
-        $testEnumArrays = new EnumArrays();
-    }
-
-    /**
-     * Test attribute "justSymbol"
-     */
-    public function testPropertyJustSymbol()
-    {
-    }
-
-    /**
-     * Test attribute "arrayEnum"
-     */
-    public function testPropertyArrayEnum()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/EnumClassTest.php b/samples/server/petstore/php-slim4/test/Model/EnumClassTest.php
deleted file mode 100644
index 1c50796ed4e1..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/EnumClassTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * EnumClassTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\EnumClass;
-
-/**
- * EnumClassTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\EnumClass
- */
-class EnumClassTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "EnumClass"
-     */
-    public function testEnumClass()
-    {
-        $testEnumClass = new EnumClass();
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/EnumTestTest.php b/samples/server/petstore/php-slim4/test/Model/EnumTestTest.php
deleted file mode 100644
index d2a8c7aaa903..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/EnumTestTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/**
- * EnumTestTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\EnumTest;
-
-/**
- * EnumTestTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\EnumTest
- */
-class EnumTestTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "EnumTest"
-     */
-    public function testEnumTest()
-    {
-        $testEnumTest = new EnumTest();
-    }
-
-    /**
-     * Test attribute "enumString"
-     */
-    public function testPropertyEnumString()
-    {
-    }
-
-    /**
-     * Test attribute "enumStringRequired"
-     */
-    public function testPropertyEnumStringRequired()
-    {
-    }
-
-    /**
-     * Test attribute "enumInteger"
-     */
-    public function testPropertyEnumInteger()
-    {
-    }
-
-    /**
-     * Test attribute "enumNumber"
-     */
-    public function testPropertyEnumNumber()
-    {
-    }
-
-    /**
-     * Test attribute "outerEnum"
-     */
-    public function testPropertyOuterEnum()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/FileSchemaTestClassTest.php b/samples/server/petstore/php-slim4/test/Model/FileSchemaTestClassTest.php
deleted file mode 100644
index 96ddcfb86a00..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/FileSchemaTestClassTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * FileSchemaTestClassTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\FileSchemaTestClass;
-
-/**
- * FileSchemaTestClassTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\FileSchemaTestClass
- */
-class FileSchemaTestClassTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "FileSchemaTestClass"
-     */
-    public function testFileSchemaTestClass()
-    {
-        $testFileSchemaTestClass = new FileSchemaTestClass();
-    }
-
-    /**
-     * Test attribute "file"
-     */
-    public function testPropertyFile()
-    {
-    }
-
-    /**
-     * Test attribute "files"
-     */
-    public function testPropertyFiles()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/FileTest.php b/samples/server/petstore/php-slim4/test/Model/FileTest.php
deleted file mode 100644
index 1da3c8b9bd4a..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/FileTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * FileTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\File;
-
-/**
- * FileTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\File
- */
-class FileTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "File"
-     */
-    public function testFile()
-    {
-        $testFile = new File();
-    }
-
-    /**
-     * Test attribute "sourceURI"
-     */
-    public function testPropertySourceURI()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/FormatTestTest.php b/samples/server/petstore/php-slim4/test/Model/FormatTestTest.php
deleted file mode 100644
index da887b233c02..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/FormatTestTest.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/**
- * FormatTestTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\FormatTest;
-
-/**
- * FormatTestTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\FormatTest
- */
-class FormatTestTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "FormatTest"
-     */
-    public function testFormatTest()
-    {
-        $testFormatTest = new FormatTest();
-    }
-
-    /**
-     * Test attribute "integer"
-     */
-    public function testPropertyInteger()
-    {
-    }
-
-    /**
-     * Test attribute "int32"
-     */
-    public function testPropertyInt32()
-    {
-    }
-
-    /**
-     * Test attribute "int64"
-     */
-    public function testPropertyInt64()
-    {
-    }
-
-    /**
-     * Test attribute "number"
-     */
-    public function testPropertyNumber()
-    {
-    }
-
-    /**
-     * Test attribute "float"
-     */
-    public function testPropertyFloat()
-    {
-    }
-
-    /**
-     * Test attribute "double"
-     */
-    public function testPropertyDouble()
-    {
-    }
-
-    /**
-     * Test attribute "string"
-     */
-    public function testPropertyString()
-    {
-    }
-
-    /**
-     * Test attribute "byte"
-     */
-    public function testPropertyByte()
-    {
-    }
-
-    /**
-     * Test attribute "binary"
-     */
-    public function testPropertyBinary()
-    {
-    }
-
-    /**
-     * Test attribute "date"
-     */
-    public function testPropertyDate()
-    {
-    }
-
-    /**
-     * Test attribute "dateTime"
-     */
-    public function testPropertyDateTime()
-    {
-    }
-
-    /**
-     * Test attribute "uuid"
-     */
-    public function testPropertyUuid()
-    {
-    }
-
-    /**
-     * Test attribute "password"
-     */
-    public function testPropertyPassword()
-    {
-    }
-
-    /**
-     * Test attribute "bigDecimal"
-     */
-    public function testPropertyBigDecimal()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/HasOnlyReadOnlyTest.php b/samples/server/petstore/php-slim4/test/Model/HasOnlyReadOnlyTest.php
deleted file mode 100644
index 37411694ad38..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/HasOnlyReadOnlyTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * HasOnlyReadOnlyTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\HasOnlyReadOnly;
-
-/**
- * HasOnlyReadOnlyTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\HasOnlyReadOnly
- */
-class HasOnlyReadOnlyTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "HasOnlyReadOnly"
-     */
-    public function testHasOnlyReadOnly()
-    {
-        $testHasOnlyReadOnly = new HasOnlyReadOnly();
-    }
-
-    /**
-     * Test attribute "bar"
-     */
-    public function testPropertyBar()
-    {
-    }
-
-    /**
-     * Test attribute "foo"
-     */
-    public function testPropertyFoo()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/InlineObject1Test.php b/samples/server/petstore/php-slim4/test/Model/InlineObject1Test.php
index 9f47cf77f6a5..c70074021a0d 100644
--- a/samples/server/petstore/php-slim4/test/Model/InlineObject1Test.php
+++ b/samples/server/petstore/php-slim4/test/Model/InlineObject1Test.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * InlineObject1Test
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class InlineObject1Test extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -74,6 +71,15 @@ public static function tearDownAfterClass()
     public function testInlineObject1()
     {
         $testInlineObject1 = new InlineObject1();
+        $namespacedClassname = InlineObject1::getModelsNamespace() . '\\InlineObject1';
+        $this->assertSame('\\' . InlineObject1::class, $namespacedClassname);
+        $this->assertTrue(
+            class_exists($namespacedClassname),
+            sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
+        );
+        $this->markTestIncomplete(
+            'Test of "InlineObject1" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -81,6 +87,9 @@ public function testInlineObject1()
      */
     public function testPropertyAdditionalMetadata()
     {
+        $this->markTestIncomplete(
+            'Test of "additionalMetadata" property in "InlineObject1" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -88,6 +97,9 @@ public function testPropertyAdditionalMetadata()
      */
     public function testPropertyFile()
     {
+        $this->markTestIncomplete(
+            'Test of "file" property in "InlineObject1" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -96,9 +108,7 @@ public function testPropertyFile()
      */
     public function testGetOpenApiSchema()
     {
-        $schemaObject = InlineObject1::getOpenApiSchema();
-        $schemaArr = InlineObject1::getOpenApiSchema(true);
-        $this->assertIsObject($schemaObject);
+        $schemaArr = InlineObject1::getOpenApiSchema();
         $this->assertIsArray($schemaArr);
     }
 }
diff --git a/samples/server/petstore/php-slim4/test/Model/InlineObjectTest.php b/samples/server/petstore/php-slim4/test/Model/InlineObjectTest.php
index 46716da936d3..0651084a62d0 100644
--- a/samples/server/petstore/php-slim4/test/Model/InlineObjectTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/InlineObjectTest.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * InlineObjectTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
@@ -43,28 +40,28 @@ class InlineObjectTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -74,6 +71,15 @@ public static function tearDownAfterClass()
     public function testInlineObject()
     {
         $testInlineObject = new InlineObject();
+        $namespacedClassname = InlineObject::getModelsNamespace() . '\\InlineObject';
+        $this->assertSame('\\' . InlineObject::class, $namespacedClassname);
+        $this->assertTrue(
+            class_exists($namespacedClassname),
+            sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
+        );
+        $this->markTestIncomplete(
+            'Test of "InlineObject" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -81,6 +87,9 @@ public function testInlineObject()
      */
     public function testPropertyName()
     {
+        $this->markTestIncomplete(
+            'Test of "name" property in "InlineObject" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -88,6 +97,9 @@ public function testPropertyName()
      */
     public function testPropertyStatus()
     {
+        $this->markTestIncomplete(
+            'Test of "status" property in "InlineObject" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -96,9 +108,7 @@ public function testPropertyStatus()
      */
     public function testGetOpenApiSchema()
     {
-        $schemaObject = InlineObject::getOpenApiSchema();
-        $schemaArr = InlineObject::getOpenApiSchema(true);
-        $this->assertIsObject($schemaObject);
+        $schemaArr = InlineObject::getOpenApiSchema();
         $this->assertIsArray($schemaArr);
     }
 }
diff --git a/samples/server/petstore/php-slim4/test/Model/MapTestTest.php b/samples/server/petstore/php-slim4/test/Model/MapTestTest.php
deleted file mode 100644
index a4a24e7e3049..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/MapTestTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * MapTestTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\MapTest;
-
-/**
- * MapTestTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\MapTest
- */
-class MapTestTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "MapTest"
-     */
-    public function testMapTest()
-    {
-        $testMapTest = new MapTest();
-    }
-
-    /**
-     * Test attribute "mapMapOfString"
-     */
-    public function testPropertyMapMapOfString()
-    {
-    }
-
-    /**
-     * Test attribute "mapOfEnumString"
-     */
-    public function testPropertyMapOfEnumString()
-    {
-    }
-
-    /**
-     * Test attribute "directMap"
-     */
-    public function testPropertyDirectMap()
-    {
-    }
-
-    /**
-     * Test attribute "indirectMap"
-     */
-    public function testPropertyIndirectMap()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/server/petstore/php-slim4/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
deleted file mode 100644
index b8c7c708f438..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * MixedPropertiesAndAdditionalPropertiesClassTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\MixedPropertiesAndAdditionalPropertiesClass;
-
-/**
- * MixedPropertiesAndAdditionalPropertiesClassTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\MixedPropertiesAndAdditionalPropertiesClass
- */
-class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "MixedPropertiesAndAdditionalPropertiesClass"
-     */
-    public function testMixedPropertiesAndAdditionalPropertiesClass()
-    {
-        $testMixedPropertiesAndAdditionalPropertiesClass = new MixedPropertiesAndAdditionalPropertiesClass();
-    }
-
-    /**
-     * Test attribute "uuid"
-     */
-    public function testPropertyUuid()
-    {
-    }
-
-    /**
-     * Test attribute "dateTime"
-     */
-    public function testPropertyDateTime()
-    {
-    }
-
-    /**
-     * Test attribute "map"
-     */
-    public function testPropertyMap()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/Model200ResponseTest.php b/samples/server/petstore/php-slim4/test/Model/Model200ResponseTest.php
deleted file mode 100644
index 9bc5a705dbb8..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/Model200ResponseTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * Model200ResponseTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Model200Response;
-
-/**
- * Model200ResponseTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\Model200Response
- */
-class Model200ResponseTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Model200Response"
-     */
-    public function testModel200Response()
-    {
-        $testModel200Response = new Model200Response();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-
-    /**
-     * Test attribute "class"
-     */
-    public function testPropertyClass()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/ModelListTest.php b/samples/server/petstore/php-slim4/test/Model/ModelListTest.php
deleted file mode 100644
index 439851bf0772..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/ModelListTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * ModelListTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ModelList;
-
-/**
- * ModelListTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\ModelList
- */
-class ModelListTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ModelList"
-     */
-    public function testModelList()
-    {
-        $testModelList = new ModelList();
-    }
-
-    /**
-     * Test attribute "_123list"
-     */
-    public function testProperty123list()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/ModelReturnTest.php b/samples/server/petstore/php-slim4/test/Model/ModelReturnTest.php
deleted file mode 100644
index aa796490c658..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/ModelReturnTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * ModelReturnTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ModelReturn;
-
-/**
- * ModelReturnTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\ModelReturn
- */
-class ModelReturnTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ModelReturn"
-     */
-    public function testModelReturn()
-    {
-        $testModelReturn = new ModelReturn();
-    }
-
-    /**
-     * Test attribute "return"
-     */
-    public function testPropertyReturn()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/NameTest.php b/samples/server/petstore/php-slim4/test/Model/NameTest.php
deleted file mode 100644
index d44c5becbe09..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/NameTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * NameTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\Name;
-
-/**
- * NameTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\Name
- */
-class NameTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "Name"
-     */
-    public function testName()
-    {
-        $testName = new Name();
-    }
-
-    /**
-     * Test attribute "name"
-     */
-    public function testPropertyName()
-    {
-    }
-
-    /**
-     * Test attribute "snakeCase"
-     */
-    public function testPropertySnakeCase()
-    {
-    }
-
-    /**
-     * Test attribute "property"
-     */
-    public function testPropertyProperty()
-    {
-    }
-
-    /**
-     * Test attribute "_123number"
-     */
-    public function testProperty123number()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/NumberOnlyTest.php b/samples/server/petstore/php-slim4/test/Model/NumberOnlyTest.php
deleted file mode 100644
index d80c55ea3d6d..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/NumberOnlyTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * NumberOnlyTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\NumberOnly;
-
-/**
- * NumberOnlyTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\NumberOnly
- */
-class NumberOnlyTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "NumberOnly"
-     */
-    public function testNumberOnly()
-    {
-        $testNumberOnly = new NumberOnly();
-    }
-
-    /**
-     * Test attribute "justNumber"
-     */
-    public function testPropertyJustNumber()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/OrderTest.php b/samples/server/petstore/php-slim4/test/Model/OrderTest.php
index d0f96df04e02..4275ab148c7a 100644
--- a/samples/server/petstore/php-slim4/test/Model/OrderTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/OrderTest.php
@@ -1,19 +1,16 @@
 <?php
 
 /**
- * OrderTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -43,28 +40,28 @@ class OrderTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -74,6 +71,15 @@ public static function tearDownAfterClass()
     public function testOrder()
     {
         $testOrder = new Order();
+        $namespacedClassname = Order::getModelsNamespace() . '\\Order';
+        $this->assertSame('\\' . Order::class, $namespacedClassname);
+        $this->assertTrue(
+            class_exists($namespacedClassname),
+            sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
+        );
+        $this->markTestIncomplete(
+            'Test of "Order" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -81,6 +87,9 @@ public function testOrder()
      */
     public function testPropertyId()
     {
+        $this->markTestIncomplete(
+            'Test of "id" property in "Order" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -88,6 +97,9 @@ public function testPropertyId()
      */
     public function testPropertyPetId()
     {
+        $this->markTestIncomplete(
+            'Test of "petId" property in "Order" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -95,6 +107,9 @@ public function testPropertyPetId()
      */
     public function testPropertyQuantity()
     {
+        $this->markTestIncomplete(
+            'Test of "quantity" property in "Order" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -102,6 +117,9 @@ public function testPropertyQuantity()
      */
     public function testPropertyShipDate()
     {
+        $this->markTestIncomplete(
+            'Test of "shipDate" property in "Order" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -109,6 +127,9 @@ public function testPropertyShipDate()
      */
     public function testPropertyStatus()
     {
+        $this->markTestIncomplete(
+            'Test of "status" property in "Order" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -116,5 +137,18 @@ public function testPropertyStatus()
      */
     public function testPropertyComplete()
     {
+        $this->markTestIncomplete(
+            'Test of "complete" property in "Order" model has not been implemented yet.'
+        );
+    }
+
+    /**
+     * Test getOpenApiSchema static method
+     * @covers ::getOpenApiSchema
+     */
+    public function testGetOpenApiSchema()
+    {
+        $schemaArr = Order::getOpenApiSchema();
+        $this->assertIsArray($schemaArr);
     }
 }
diff --git a/samples/server/petstore/php-slim4/test/Model/OuterCompositeTest.php b/samples/server/petstore/php-slim4/test/Model/OuterCompositeTest.php
deleted file mode 100644
index a469e77f62ff..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/OuterCompositeTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * OuterCompositeTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\OuterComposite;
-
-/**
- * OuterCompositeTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\OuterComposite
- */
-class OuterCompositeTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "OuterComposite"
-     */
-    public function testOuterComposite()
-    {
-        $testOuterComposite = new OuterComposite();
-    }
-
-    /**
-     * Test attribute "myNumber"
-     */
-    public function testPropertyMyNumber()
-    {
-    }
-
-    /**
-     * Test attribute "myString"
-     */
-    public function testPropertyMyString()
-    {
-    }
-
-    /**
-     * Test attribute "myBoolean"
-     */
-    public function testPropertyMyBoolean()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/OuterEnumTest.php b/samples/server/petstore/php-slim4/test/Model/OuterEnumTest.php
deleted file mode 100644
index 910b80be4a46..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/OuterEnumTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * OuterEnumTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\OuterEnum;
-
-/**
- * OuterEnumTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\OuterEnum
- */
-class OuterEnumTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "OuterEnum"
-     */
-    public function testOuterEnum()
-    {
-        $testOuterEnum = new OuterEnum();
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/PetTest.php b/samples/server/petstore/php-slim4/test/Model/PetTest.php
index 2fb306477417..d1ef40bc9d21 100644
--- a/samples/server/petstore/php-slim4/test/Model/PetTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/PetTest.php
@@ -1,19 +1,16 @@
 <?php
 
 /**
- * PetTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -43,28 +40,28 @@ class PetTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -74,6 +71,15 @@ public static function tearDownAfterClass()
     public function testPet()
     {
         $testPet = new Pet();
+        $namespacedClassname = Pet::getModelsNamespace() . '\\Pet';
+        $this->assertSame('\\' . Pet::class, $namespacedClassname);
+        $this->assertTrue(
+            class_exists($namespacedClassname),
+            sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
+        );
+        $this->markTestIncomplete(
+            'Test of "Pet" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -81,6 +87,9 @@ public function testPet()
      */
     public function testPropertyId()
     {
+        $this->markTestIncomplete(
+            'Test of "id" property in "Pet" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -88,6 +97,9 @@ public function testPropertyId()
      */
     public function testPropertyCategory()
     {
+        $this->markTestIncomplete(
+            'Test of "category" property in "Pet" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -95,6 +107,9 @@ public function testPropertyCategory()
      */
     public function testPropertyName()
     {
+        $this->markTestIncomplete(
+            'Test of "name" property in "Pet" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -102,6 +117,9 @@ public function testPropertyName()
      */
     public function testPropertyPhotoUrls()
     {
+        $this->markTestIncomplete(
+            'Test of "photoUrls" property in "Pet" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -109,6 +127,9 @@ public function testPropertyPhotoUrls()
      */
     public function testPropertyTags()
     {
+        $this->markTestIncomplete(
+            'Test of "tags" property in "Pet" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -116,5 +137,18 @@ public function testPropertyTags()
      */
     public function testPropertyStatus()
     {
+        $this->markTestIncomplete(
+            'Test of "status" property in "Pet" model has not been implemented yet.'
+        );
+    }
+
+    /**
+     * Test getOpenApiSchema static method
+     * @covers ::getOpenApiSchema
+     */
+    public function testGetOpenApiSchema()
+    {
+        $schemaArr = Pet::getOpenApiSchema();
+        $this->assertIsArray($schemaArr);
     }
 }
diff --git a/samples/server/petstore/php-slim4/test/Model/ReadOnlyFirstTest.php b/samples/server/petstore/php-slim4/test/Model/ReadOnlyFirstTest.php
deleted file mode 100644
index 38d83681800f..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/ReadOnlyFirstTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * ReadOnlyFirstTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\ReadOnlyFirst;
-
-/**
- * ReadOnlyFirstTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\ReadOnlyFirst
- */
-class ReadOnlyFirstTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "ReadOnlyFirst"
-     */
-    public function testReadOnlyFirst()
-    {
-        $testReadOnlyFirst = new ReadOnlyFirst();
-    }
-
-    /**
-     * Test attribute "bar"
-     */
-    public function testPropertyBar()
-    {
-    }
-
-    /**
-     * Test attribute "baz"
-     */
-    public function testPropertyBaz()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/SpecialModelNameTest.php b/samples/server/petstore/php-slim4/test/Model/SpecialModelNameTest.php
deleted file mode 100644
index 5285980c73bf..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/SpecialModelNameTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * SpecialModelNameTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\SpecialModelName;
-
-/**
- * SpecialModelNameTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\SpecialModelName
- */
-class SpecialModelNameTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "SpecialModelName"
-     */
-    public function testSpecialModelName()
-    {
-        $testSpecialModelName = new SpecialModelName();
-    }
-
-    /**
-     * Test attribute "specialPropertyName"
-     */
-    public function testPropertySpecialPropertyName()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/TagTest.php b/samples/server/petstore/php-slim4/test/Model/TagTest.php
index 1c42050bfe7d..e5bf71c6221a 100644
--- a/samples/server/petstore/php-slim4/test/Model/TagTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/TagTest.php
@@ -1,19 +1,16 @@
 <?php
 
 /**
- * TagTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -43,28 +40,28 @@ class TagTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -74,6 +71,15 @@ public static function tearDownAfterClass()
     public function testTag()
     {
         $testTag = new Tag();
+        $namespacedClassname = Tag::getModelsNamespace() . '\\Tag';
+        $this->assertSame('\\' . Tag::class, $namespacedClassname);
+        $this->assertTrue(
+            class_exists($namespacedClassname),
+            sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
+        );
+        $this->markTestIncomplete(
+            'Test of "Tag" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -81,6 +87,9 @@ public function testTag()
      */
     public function testPropertyId()
     {
+        $this->markTestIncomplete(
+            'Test of "id" property in "Tag" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -88,5 +97,18 @@ public function testPropertyId()
      */
     public function testPropertyName()
     {
+        $this->markTestIncomplete(
+            'Test of "name" property in "Tag" model has not been implemented yet.'
+        );
+    }
+
+    /**
+     * Test getOpenApiSchema static method
+     * @covers ::getOpenApiSchema
+     */
+    public function testGetOpenApiSchema()
+    {
+        $schemaArr = Tag::getOpenApiSchema();
+        $this->assertIsArray($schemaArr);
     }
 }
diff --git a/samples/server/petstore/php-slim4/test/Model/TypeHolderDefaultTest.php b/samples/server/petstore/php-slim4/test/Model/TypeHolderDefaultTest.php
deleted file mode 100644
index 6ec77136c466..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/TypeHolderDefaultTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/**
- * TypeHolderDefaultTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\TypeHolderDefault;
-
-/**
- * TypeHolderDefaultTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\TypeHolderDefault
- */
-class TypeHolderDefaultTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "TypeHolderDefault"
-     */
-    public function testTypeHolderDefault()
-    {
-        $testTypeHolderDefault = new TypeHolderDefault();
-    }
-
-    /**
-     * Test attribute "stringItem"
-     */
-    public function testPropertyStringItem()
-    {
-    }
-
-    /**
-     * Test attribute "numberItem"
-     */
-    public function testPropertyNumberItem()
-    {
-    }
-
-    /**
-     * Test attribute "integerItem"
-     */
-    public function testPropertyIntegerItem()
-    {
-    }
-
-    /**
-     * Test attribute "boolItem"
-     */
-    public function testPropertyBoolItem()
-    {
-    }
-
-    /**
-     * Test attribute "arrayItem"
-     */
-    public function testPropertyArrayItem()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/TypeHolderExampleTest.php b/samples/server/petstore/php-slim4/test/Model/TypeHolderExampleTest.php
deleted file mode 100644
index 32cb11fef9cd..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/TypeHolderExampleTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/**
- * TypeHolderExampleTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\TypeHolderExample;
-
-/**
- * TypeHolderExampleTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\TypeHolderExample
- */
-class TypeHolderExampleTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "TypeHolderExample"
-     */
-    public function testTypeHolderExample()
-    {
-        $testTypeHolderExample = new TypeHolderExample();
-    }
-
-    /**
-     * Test attribute "stringItem"
-     */
-    public function testPropertyStringItem()
-    {
-    }
-
-    /**
-     * Test attribute "numberItem"
-     */
-    public function testPropertyNumberItem()
-    {
-    }
-
-    /**
-     * Test attribute "floatItem"
-     */
-    public function testPropertyFloatItem()
-    {
-    }
-
-    /**
-     * Test attribute "integerItem"
-     */
-    public function testPropertyIntegerItem()
-    {
-    }
-
-    /**
-     * Test attribute "boolItem"
-     */
-    public function testPropertyBoolItem()
-    {
-    }
-
-    /**
-     * Test attribute "arrayItem"
-     */
-    public function testPropertyArrayItem()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Model/UserTest.php b/samples/server/petstore/php-slim4/test/Model/UserTest.php
index 6523a90526c2..563fbaae4a8f 100644
--- a/samples/server/petstore/php-slim4/test/Model/UserTest.php
+++ b/samples/server/petstore/php-slim4/test/Model/UserTest.php
@@ -1,19 +1,16 @@
 <?php
 
 /**
- * UserTest
- *
- * PHP version 7.1
+ * OpenAPI Petstore
+ * PHP version 7.2
  *
- * @package OpenAPIServer\Model
+ * @package OpenAPIServer
  * @author  OpenAPI Generator team
  * @link    https://github.com/openapitools/openapi-generator
  */
 
 /**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
@@ -43,28 +40,28 @@ class UserTest extends TestCase
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 
@@ -74,6 +71,15 @@ public static function tearDownAfterClass()
     public function testUser()
     {
         $testUser = new User();
+        $namespacedClassname = User::getModelsNamespace() . '\\User';
+        $this->assertSame('\\' . User::class, $namespacedClassname);
+        $this->assertTrue(
+            class_exists($namespacedClassname),
+            sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
+        );
+        $this->markTestIncomplete(
+            'Test of "User" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -81,6 +87,9 @@ public function testUser()
      */
     public function testPropertyId()
     {
+        $this->markTestIncomplete(
+            'Test of "id" property in "User" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -88,6 +97,9 @@ public function testPropertyId()
      */
     public function testPropertyUsername()
     {
+        $this->markTestIncomplete(
+            'Test of "username" property in "User" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -95,6 +107,9 @@ public function testPropertyUsername()
      */
     public function testPropertyFirstName()
     {
+        $this->markTestIncomplete(
+            'Test of "firstName" property in "User" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -102,6 +117,9 @@ public function testPropertyFirstName()
      */
     public function testPropertyLastName()
     {
+        $this->markTestIncomplete(
+            'Test of "lastName" property in "User" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -109,6 +127,9 @@ public function testPropertyLastName()
      */
     public function testPropertyEmail()
     {
+        $this->markTestIncomplete(
+            'Test of "email" property in "User" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -116,6 +137,9 @@ public function testPropertyEmail()
      */
     public function testPropertyPassword()
     {
+        $this->markTestIncomplete(
+            'Test of "password" property in "User" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -123,6 +147,9 @@ public function testPropertyPassword()
      */
     public function testPropertyPhone()
     {
+        $this->markTestIncomplete(
+            'Test of "phone" property in "User" model has not been implemented yet.'
+        );
     }
 
     /**
@@ -130,5 +157,18 @@ public function testPropertyPhone()
      */
     public function testPropertyUserStatus()
     {
+        $this->markTestIncomplete(
+            'Test of "userStatus" property in "User" model has not been implemented yet.'
+        );
+    }
+
+    /**
+     * Test getOpenApiSchema static method
+     * @covers ::getOpenApiSchema
+     */
+    public function testGetOpenApiSchema()
+    {
+        $schemaArr = User::getOpenApiSchema();
+        $this->assertIsArray($schemaArr);
     }
 }
diff --git a/samples/server/petstore/php-slim4/test/Model/XmlItemTest.php b/samples/server/petstore/php-slim4/test/Model/XmlItemTest.php
deleted file mode 100644
index 843ea8a80c8b..000000000000
--- a/samples/server/petstore/php-slim4/test/Model/XmlItemTest.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-
-/**
- * XmlItemTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Please update the test case below to test the model.
- */
-namespace OpenAPIServer\Model;
-
-use PHPUnit\Framework\TestCase;
-use OpenAPIServer\Model\XmlItem;
-
-/**
- * XmlItemTest Class Doc Comment
- *
- * @package OpenAPIServer\Model
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- *
- * @coversDefaultClass \OpenAPIServer\Model\XmlItem
- */
-class XmlItemTest extends TestCase
-{
-
-    /**
-     * Setup before running any test cases
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Setup before running each test case
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Clean up after running each test case
-     */
-    public function tearDown()
-    {
-    }
-
-    /**
-     * Clean up after running all test cases
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * Test "XmlItem"
-     */
-    public function testXmlItem()
-    {
-        $testXmlItem = new XmlItem();
-    }
-
-    /**
-     * Test attribute "attributeString"
-     */
-    public function testPropertyAttributeString()
-    {
-    }
-
-    /**
-     * Test attribute "attributeNumber"
-     */
-    public function testPropertyAttributeNumber()
-    {
-    }
-
-    /**
-     * Test attribute "attributeInteger"
-     */
-    public function testPropertyAttributeInteger()
-    {
-    }
-
-    /**
-     * Test attribute "attributeBoolean"
-     */
-    public function testPropertyAttributeBoolean()
-    {
-    }
-
-    /**
-     * Test attribute "wrappedArray"
-     */
-    public function testPropertyWrappedArray()
-    {
-    }
-
-    /**
-     * Test attribute "nameString"
-     */
-    public function testPropertyNameString()
-    {
-    }
-
-    /**
-     * Test attribute "nameNumber"
-     */
-    public function testPropertyNameNumber()
-    {
-    }
-
-    /**
-     * Test attribute "nameInteger"
-     */
-    public function testPropertyNameInteger()
-    {
-    }
-
-    /**
-     * Test attribute "nameBoolean"
-     */
-    public function testPropertyNameBoolean()
-    {
-    }
-
-    /**
-     * Test attribute "nameArray"
-     */
-    public function testPropertyNameArray()
-    {
-    }
-
-    /**
-     * Test attribute "nameWrappedArray"
-     */
-    public function testPropertyNameWrappedArray()
-    {
-    }
-
-    /**
-     * Test attribute "prefixString"
-     */
-    public function testPropertyPrefixString()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNumber"
-     */
-    public function testPropertyPrefixNumber()
-    {
-    }
-
-    /**
-     * Test attribute "prefixInteger"
-     */
-    public function testPropertyPrefixInteger()
-    {
-    }
-
-    /**
-     * Test attribute "prefixBoolean"
-     */
-    public function testPropertyPrefixBoolean()
-    {
-    }
-
-    /**
-     * Test attribute "prefixArray"
-     */
-    public function testPropertyPrefixArray()
-    {
-    }
-
-    /**
-     * Test attribute "prefixWrappedArray"
-     */
-    public function testPropertyPrefixWrappedArray()
-    {
-    }
-
-    /**
-     * Test attribute "namespaceString"
-     */
-    public function testPropertyNamespaceString()
-    {
-    }
-
-    /**
-     * Test attribute "namespaceNumber"
-     */
-    public function testPropertyNamespaceNumber()
-    {
-    }
-
-    /**
-     * Test attribute "namespaceInteger"
-     */
-    public function testPropertyNamespaceInteger()
-    {
-    }
-
-    /**
-     * Test attribute "namespaceBoolean"
-     */
-    public function testPropertyNamespaceBoolean()
-    {
-    }
-
-    /**
-     * Test attribute "namespaceArray"
-     */
-    public function testPropertyNamespaceArray()
-    {
-    }
-
-    /**
-     * Test attribute "namespaceWrappedArray"
-     */
-    public function testPropertyNamespaceWrappedArray()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNsString"
-     */
-    public function testPropertyPrefixNsString()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNsNumber"
-     */
-    public function testPropertyPrefixNsNumber()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNsInteger"
-     */
-    public function testPropertyPrefixNsInteger()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNsBoolean"
-     */
-    public function testPropertyPrefixNsBoolean()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNsArray"
-     */
-    public function testPropertyPrefixNsArray()
-    {
-    }
-
-    /**
-     * Test attribute "prefixNsWrappedArray"
-     */
-    public function testPropertyPrefixNsWrappedArray()
-    {
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Utils/ModelUtilsTraitTest.php b/samples/server/petstore/php-slim4/test/Utils/ModelUtilsTraitTest.php
deleted file mode 100644
index 9ed05378f2b0..000000000000
--- a/samples/server/petstore/php-slim4/test/Utils/ModelUtilsTraitTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * ModelUtilsTraitTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Utils;
-
-use OpenAPIServer\Utils\ModelUtilsTrait as ModelUtils;
-use PHPUnit\Framework\TestCase;
-
-/**
- * ModelUtilsTraitTest Class Doc Comment
- *
- * @package OpenAPIServer\Utils
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Utils\ModelUtilsTrait
- */
-class ModelUtilsTraitTest extends TestCase
-{
-    /**
-     * @covers ::getSimpleRef
-     * @dataProvider provideRefs
-     */
-    public function testGetSimpleRef($ref, $expectedRef)
-    {
-        $this->assertSame($expectedRef, ModelUtils::getSimpleRef($ref));
-    }
-
-    public function provideRefs()
-    {
-        return [
-            'Reference Object OAS 3.0' => [
-                '#/components/schemas/Pet', 'Pet',
-            ],
-            'Reference Object Swagger 2.0' => [
-                '#/definitions/Pet', 'Pet',
-            ],
-            'Underscored classname' => [
-                '#/components/schemas/_foobar_Objects', '_foobar_Objects',
-            ],
-            'Relative Documents With Embedded Schema' => [
-                'definitions.json#/Pet', null,
-            ],
-            'null as argument' => [
-                null, null,
-            ],
-            'number as argument' => [
-                156, null,
-            ],
-        ];
-    }
-
-    /**
-     * @covers ::toModelName
-     * @dataProvider provideModelNames
-     */
-    public function testToModelName($name, $prefix, $suffix, $expectedModel)
-    {
-        $this->assertSame($expectedModel, ModelUtils::toModelName($name, $prefix, $suffix));
-    }
-
-    public function provideModelNames()
-    {
-        return [
-            // fixtures from modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/StringUtilsTest.java
-            ['abcd', null, null, 'Abcd'],
-            ['some-value', null, null, 'SomeValue'],
-            ['some_value', null, null, 'SomeValue'],
-            ['$type', null, null, 'Type'],
-            ['123', null, null, 'Model123'],
-            ['$123', null, null, 'Model123'],
-            ['return', null, null, 'ModelReturn'],
-            ['200Response', null, null, 'Model200Response'],
-            ['abcd', 'SuperModel', null, 'SuperModelAbcd'],
-            ['abcd', null, 'WithEnd', 'AbcdWithEnd'],
-            ['abcd', 'WithStart', 'AndEnd', 'WithStartAbcdAndEnd'],
-            ['_foobar_Objects', null, null, 'FoobarObjects'],
-            [null, null, null, null],
-        ];
-    }
-}
diff --git a/samples/server/petstore/php-slim4/test/Utils/StringUtilsTraitTest.php b/samples/server/petstore/php-slim4/test/Utils/StringUtilsTraitTest.php
deleted file mode 100644
index d06aa405eeba..000000000000
--- a/samples/server/petstore/php-slim4/test/Utils/StringUtilsTraitTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * StringUtilsTraitTest
- *
- * PHP version 7.1
- *
- * @package OpenAPIServer
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- */
-
-/**
- * OpenAPI Petstore
- *
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- * The version of the OpenAPI document: 1.0.0
- * Generated by: https://github.com/openapitools/openapi-generator.git
- */
-
-/**
- * NOTE: This class is auto generated by the openapi generator program.
- * https://github.com/openapitools/openapi-generator
- * Do not edit the class manually.
- */
-namespace OpenAPIServer\Utils;
-
-use OpenAPIServer\Utils\StringUtilsTrait as StringUtils;
-use PHPUnit\Framework\TestCase;
-
-/**
- * StringUtilsTraitTest Class Doc Comment
- *
- * @package OpenAPIServer\Utils
- * @author  OpenAPI Generator team
- * @link    https://github.com/openapitools/openapi-generator
- * @coversDefaultClass \OpenAPIServer\Utils\StringUtilsTrait
- */
-class StringUtilsTraitTest extends TestCase
-{
-    /**
-     * @covers ::camelize
-     * @dataProvider provideWordsForCamelizeTest
-     */
-    public function testCamelize($word, $lowercaseFirstLetter, $expectedWord)
-    {
-        $this->assertSame($expectedWord, StringUtils::camelize($word, $lowercaseFirstLetter));
-    }
-
-    public function provideWordsForCamelizeTest()
-    {
-        return [
-            // fixtures from modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/StringUtilsTest.java
-            ['openApiServer/model/pet', null, 'OpenApiServerModelPet'],
-            ['abcd', null, 'Abcd'],
-            ['some-value', null, 'SomeValue'],
-            ['some-Value', null, 'SomeValue'],
-            ['some_value', null, 'SomeValue'],
-            ['some_Value', null, 'SomeValue'],
-            ['$type', null, '$Type'],
-
-            ['abcd', true, 'abcd'],
-            ['some-value', true, 'someValue'],
-            ['some_value', true, 'someValue'],
-            ['Abcd', true, 'abcd'],
-            ['$type', true, '$type'],
-
-            ['123', true, '123'],
-            ['$123', true, '$123'],
-        ];
-    }
-
-    /**
-     * @covers ::isReservedWord
-     * @dataProvider provideWordsForIsReservedTest
-     */
-    public function testisReservedWord($word, $expected)
-    {
-        $this->assertSame($expected, StringUtils::isReservedWord($word));
-    }
-
-    public function provideWordsForIsReservedTest()
-    {
-        return [
-            ['return', true],
-            ['switch', true],
-            ['class', true],
-            ['interface', true],
-            ['ABSTRACT', true],
-            ['Trait', true],
-            ['final', true],
-            ['foobar', false],
-            ['DateTime', false],
-            ['Pet', false],
-            [123, false],
-            [null, false],
-        ];
-    }
-}
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php
index 3f574ee2e49d..ba7ecc50c5c8 100644
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php
@@ -275,7 +275,7 @@ public function findPetsByStatusAction(Request $request)
             $result = $handler->findPetsByStatus($status, $responseCode, $responseHeaders);
 
             // Find default response message
-            $message = 'successful operation';
+            $message = '';
 
             // Find a more specific message, if available
             switch ($responseCode) {
@@ -363,7 +363,7 @@ public function findPetsByTagsAction(Request $request)
             $result = $handler->findPetsByTags($tags, $responseCode, $responseHeaders);
 
             // Find default response message
-            $message = 'successful operation';
+            $message = '';
 
             // Find a more specific message, if available
             switch ($responseCode) {
@@ -448,7 +448,7 @@ public function getPetByIdAction(Request $request, $petId)
             $result = $handler->getPetById($petId, $responseCode, $responseHeaders);
 
             // Find default response message
-            $message = 'successful operation';
+            $message = '';
 
             // Find a more specific message, if available
             switch ($responseCode) {
@@ -727,7 +727,7 @@ public function uploadFileAction(Request $request, $petId)
             $result = $handler->uploadFile($petId, $additionalMetadata, $file, $responseCode, $responseHeaders);
 
             // Find default response message
-            $message = 'successful operation';
+            $message = '';
 
             // Find a more specific message, if available
             switch ($responseCode) {
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/StoreController.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/StoreController.php
index 288d35c8a704..d6e9e33bb369 100644
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/StoreController.php
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/StoreController.php
@@ -162,7 +162,7 @@ public function getInventoryAction(Request $request)
             $result = $handler->getInventory($responseCode, $responseHeaders);
 
             // Find default response message
-            $message = 'successful operation';
+            $message = '';
 
             // Find a more specific message, if available
             switch ($responseCode) {
@@ -241,7 +241,7 @@ public function getOrderByIdAction(Request $request, $orderId)
             $result = $handler->getOrderById($orderId, $responseCode, $responseHeaders);
 
             // Find default response message
-            $message = 'successful operation';
+            $message = '';
 
             // Find a more specific message, if available
             switch ($responseCode) {
@@ -334,7 +334,7 @@ public function placeOrderAction(Request $request)
             $result = $handler->placeOrder($body, $responseCode, $responseHeaders);
 
             // Find default response message
-            $message = 'successful operation';
+            $message = '';
 
             // Find a more specific message, if available
             switch ($responseCode) {
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/UserController.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/UserController.php
index 83b8d08027a2..3328426b0490 100644
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/UserController.php
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/UserController.php
@@ -406,7 +406,7 @@ public function getUserByNameAction(Request $request, $username)
             $result = $handler->getUserByName($username, $responseCode, $responseHeaders);
 
             // Find default response message
-            $message = 'successful operation';
+            $message = '';
 
             // Find a more specific message, if available
             switch ($responseCode) {
@@ -499,7 +499,7 @@ public function loginUserAction(Request $request)
             $result = $handler->loginUser($username, $password, $responseCode, $responseHeaders);
 
             // Find default response message
-            $message = 'successful operation';
+            $message = '';
 
             // Find a more specific message, if available
             switch ($responseCode) {
diff --git a/samples/server/petstore/php-ze-ph/.openapi-generator/FILES b/samples/server/petstore/php-ze-ph/.openapi-generator/FILES
index ea6de5a097c9..d2b3e5a4d233 100644
--- a/samples/server/petstore/php-ze-ph/.openapi-generator/FILES
+++ b/samples/server/petstore/php-ze-ph/.openapi-generator/FILES
@@ -7,67 +7,18 @@ application/config/path_handler.yml
 application/container.php
 composer.json
 public/index.php
-src/App/DTO/AdditionalPropertiesAnyType.php
-src/App/DTO/AdditionalPropertiesArray.php
-src/App/DTO/AdditionalPropertiesBoolean.php
-src/App/DTO/AdditionalPropertiesClass.php
-src/App/DTO/AdditionalPropertiesInteger.php
-src/App/DTO/AdditionalPropertiesNumber.php
-src/App/DTO/AdditionalPropertiesObject.php
-src/App/DTO/AdditionalPropertiesString.php
-src/App/DTO/Animal.php
 src/App/DTO/ApiResponse.php
-src/App/DTO/ArrayOfArrayOfNumberOnly.php
-src/App/DTO/ArrayOfNumberOnly.php
-src/App/DTO/ArrayTest.php
-src/App/DTO/BigCat.php
-src/App/DTO/BigCatAllOf.php
-src/App/DTO/Capitalization.php
-src/App/DTO/Cat.php
-src/App/DTO/CatAllOf.php
 src/App/DTO/Category.php
-src/App/DTO/ClassModel.php
-src/App/DTO/Client.php
-src/App/DTO/Dog.php
-src/App/DTO/DogAllOf.php
-src/App/DTO/EnumArrays.php
-src/App/DTO/EnumClass.php
-src/App/DTO/EnumTest.php
-src/App/DTO/FileSchemaTestClass.php
-src/App/DTO/FormatTest.php
-src/App/DTO/HasOnlyReadOnly.php
-src/App/DTO/MapTest.php
-src/App/DTO/MixedPropertiesAndAdditionalPropertiesClass.php
-src/App/DTO/Model200Response.php
-src/App/DTO/ModelReturn.php
-src/App/DTO/Name.php
-src/App/DTO/NumberOnly.php
+src/App/DTO/FindPetsByStatusQueryData.php
+src/App/DTO/FindPetsByTagsQueryData.php
+src/App/DTO/InlineObject.php
+src/App/DTO/InlineObject1.php
+src/App/DTO/LoginUserQueryData.php
 src/App/DTO/Order.php
-src/App/DTO/OuterComposite.php
-src/App/DTO/OuterEnum.php
 src/App/DTO/Pet.php
-src/App/DTO/ReadOnlyFirst.php
-src/App/DTO/SpecialModelName.php
 src/App/DTO/Tag.php
-src/App/DTO/TypeHolderDefault.php
-src/App/DTO/TypeHolderExample.php
 src/App/DTO/User.php
-src/App/DTO/XmlItem.php
 src/App/Factory.php
-src/App/Handler/AnotherFakeDummy.php
-src/App/Handler/Fake.php
-src/App/Handler/FakeBodyWithFileSchema.php
-src/App/Handler/FakeBodyWithQueryParams.php
-src/App/Handler/FakeClassnameTest.php
-src/App/Handler/FakeCreateXmlItem.php
-src/App/Handler/FakeInlineAdditionalProperties.php
-src/App/Handler/FakeJsonFormData.php
-src/App/Handler/FakeOuterBoolean.php
-src/App/Handler/FakeOuterComposite.php
-src/App/Handler/FakeOuterNumber.php
-src/App/Handler/FakeOuterString.php
-src/App/Handler/FakePetIdUploadImageWithRequiredFile.php
-src/App/Handler/FakeTestQueryParamters.php
 src/App/Handler/Pet.php
 src/App/Handler/PetFindByStatus.php
 src/App/Handler/PetFindByTags.php
diff --git a/samples/server/petstore/php-ze-ph/README.md b/samples/server/petstore/php-ze-ph/README.md
index 973240bb44ed..1cc1e36e9c29 100644
--- a/samples/server/petstore/php-ze-ph/README.md
+++ b/samples/server/petstore/php-ze-ph/README.md
@@ -5,7 +5,7 @@ Generated by the [OpenAPI Generator](https://openapi-generator.tech) project.
 ## Overview
 This server stub aims to provide light, yet comprehensive structure for your API project using:
 
-- PHP: >=7.1
+- PHP: >=7.2
 - [Zend Expressive](https://zendframework.github.io/zend-expressive): >=3.2
 - [Path Handler](https://github.com/Articus/PathHandler): >=0.4
 
diff --git a/samples/server/petstore/php-ze-ph/application/config/path_handler.yml b/samples/server/petstore/php-ze-ph/application/config/path_handler.yml
index 786a0330ced8..08762d5415aa 100644
--- a/samples/server/petstore/php-ze-ph/application/config/path_handler.yml
+++ b/samples/server/petstore/php-ze-ph/application/config/path_handler.yml
@@ -1,20 +1,6 @@
 Articus\PathHandler\RouteInjection\Factory:
   paths:
     '/v2':
-    - App\Handler\AnotherFakeDummy
-    - App\Handler\Fake
-    - App\Handler\FakeBodyWithFileSchema
-    - App\Handler\FakeBodyWithQueryParams
-    - App\Handler\FakeCreateXmlItem
-    - App\Handler\FakeInlineAdditionalProperties
-    - App\Handler\FakeJsonFormData
-    - App\Handler\FakeOuterBoolean
-    - App\Handler\FakeOuterComposite
-    - App\Handler\FakeOuterNumber
-    - App\Handler\FakeOuterString
-    - App\Handler\FakeTestQueryParamters
-    - App\Handler\FakePetIdUploadImageWithRequiredFile
-    - App\Handler\FakeClassnameTest
     - App\Handler\Pet
     - App\Handler\PetFindByStatus
     - App\Handler\PetFindByTags
@@ -43,20 +29,6 @@ Articus\PathHandler\RouteInjection\Factory:
 #    invokables:
 
 Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory:
-  App\Handler\AnotherFakeDummy: []
-  App\Handler\Fake: []
-  App\Handler\FakeBodyWithFileSchema: []
-  App\Handler\FakeBodyWithQueryParams: []
-  App\Handler\FakeCreateXmlItem: []
-  App\Handler\FakeInlineAdditionalProperties: []
-  App\Handler\FakeJsonFormData: []
-  App\Handler\FakeOuterBoolean: []
-  App\Handler\FakeOuterComposite: []
-  App\Handler\FakeOuterNumber: []
-  App\Handler\FakeOuterString: []
-  App\Handler\FakeTestQueryParamters: []
-  App\Handler\FakePetIdUploadImageWithRequiredFile: []
-  App\Handler\FakeClassnameTest: []
   App\Handler\Pet: []
   App\Handler\PetFindByStatus: []
   App\Handler\PetFindByTags: []
diff --git a/samples/server/petstore/php-ze-ph/composer.json b/samples/server/petstore/php-ze-ph/composer.json
index 99c78857b2f3..f22fd4929557 100644
--- a/samples/server/petstore/php-ze-ph/composer.json
+++ b/samples/server/petstore/php-ze-ph/composer.json
@@ -5,7 +5,7 @@
     "version": "1.0.0",
     "type": "project",
     "require": {
-        "php": "^7.1",
+        "php": "^7.2",
         "ext-yaml": "^2.0",
         "zendframework/zend-expressive": "^3.2",
         "zendframework/zend-diactoros": "^2.1",
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesAnyType.php b/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesAnyType.php
deleted file mode 100644
index 0cce3aa9a5f3..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesAnyType.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class AdditionalPropertiesAnyType
-{
-    /**
-     * @DTA\Data(field="name", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $name;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesArray.php b/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesArray.php
deleted file mode 100644
index af17aeea7dda..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesArray.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class AdditionalPropertiesArray
-{
-    /**
-     * @DTA\Data(field="name", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $name;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesBoolean.php b/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesBoolean.php
deleted file mode 100644
index 156ef46c38f2..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesBoolean.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class AdditionalPropertiesBoolean
-{
-    /**
-     * @DTA\Data(field="name", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $name;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesClass.php b/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesClass.php
deleted file mode 100644
index 00cfb7ac36b2..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesClass.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class AdditionalPropertiesClass
-{
-    /**
-     * @DTA\Data(field="map_string", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"string"}}
-     * }})
-     * @var map[string,string]
-     */
-    public $map_string;
-    /**
-     * @DTA\Data(field="map_number", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"float"}}
-     * }})
-     * @var map[string,float]
-     */
-    public $map_number;
-    /**
-     * @DTA\Data(field="map_integer", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"int"}}
-     * }})
-     * @var map[string,int]
-     */
-    public $map_integer;
-    /**
-     * @DTA\Data(field="map_boolean", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"bool"}}
-     * }})
-     * @var map[string,bool]
-     */
-    public $map_boolean;
-    /**
-     * @DTA\Data(field="map_array_integer", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Strategy(name="ObjectArray", options={"type":int[]::class})
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Dictionary", "options":{"type":int[]::class}}
-     * }})
-     * @var map[string,int[]]
-     */
-    public $map_array_integer;
-    /**
-     * @DTA\Data(field="map_array_anytype", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Strategy(name="ObjectArray", options={"type":object[]::class})
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Dictionary", "options":{"type":object[]::class}}
-     * }})
-     * @var map[string,object[]]
-     */
-    public $map_array_anytype;
-    /**
-     * @DTA\Data(field="map_map_string", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Strategy(name="ObjectArray", options={"type":map[string,string]::class})
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Dictionary", "options":{"type":map[string,string]::class}}
-     * }})
-     * @var map[string,map[string,string]]
-     */
-    public $map_map_string;
-    /**
-     * @DTA\Data(field="map_map_anytype", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Strategy(name="ObjectArray", options={"type":map[string,object]::class})
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Dictionary", "options":{"type":map[string,object]::class}}
-     * }})
-     * @var map[string,map[string,object]]
-     */
-    public $map_map_anytype;
-    /**
-     * @DTA\Data(field="anytype_1", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"object"})
-     * @var object
-     */
-    public $anytype_1;
-    /**
-     * @DTA\Data(field="anytype_2", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"object"})
-     * @var object
-     */
-    public $anytype_2;
-    /**
-     * @DTA\Data(field="anytype_3", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"object"})
-     * @var object
-     */
-    public $anytype_3;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesInteger.php b/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesInteger.php
deleted file mode 100644
index d6f6d3edaacc..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesInteger.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class AdditionalPropertiesInteger
-{
-    /**
-     * @DTA\Data(field="name", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $name;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesNumber.php b/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesNumber.php
deleted file mode 100644
index 12df1d5cbe19..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesNumber.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class AdditionalPropertiesNumber
-{
-    /**
-     * @DTA\Data(field="name", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $name;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesObject.php b/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesObject.php
deleted file mode 100644
index 4ce5b9c3c923..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesObject.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class AdditionalPropertiesObject
-{
-    /**
-     * @DTA\Data(field="name", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $name;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesString.php b/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesString.php
deleted file mode 100644
index 4281e9a406bd..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesString.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class AdditionalPropertiesString
-{
-    /**
-     * @DTA\Data(field="name", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $name;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/Animal.php b/samples/server/petstore/php-ze-ph/src/App/DTO/Animal.php
deleted file mode 100644
index affb1f842ee2..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/Animal.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class Animal
-{
-    /**
-     * @DTA\Data(field="className")
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $class_name;
-    /**
-     * @DTA\Data(field="color", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $color;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/ApiResponse.php b/samples/server/petstore/php-ze-ph/src/App/DTO/ApiResponse.php
index 16867d96c401..c15871c70179 100644
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/ApiResponse.php
+++ b/samples/server/petstore/php-ze-ph/src/App/DTO/ApiResponse.php
@@ -6,6 +6,7 @@
 use Articus\DataTransfer\Annotation as DTA;
 
 /**
+ * Describes the result of uploading an image resource
  */
 class ApiResponse
 {
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/ArrayOfArrayOfNumberOnly.php b/samples/server/petstore/php-ze-ph/src/App/DTO/ArrayOfArrayOfNumberOnly.php
deleted file mode 100644
index caacd0cc3d8b..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/ArrayOfArrayOfNumberOnly.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class ArrayOfArrayOfNumberOnly
-{
-    /**
-     * @DTA\Data(field="ArrayArrayNumber", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Strategy(name="ObjectArray", options={"type":float[]::class})
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Dictionary", "options":{"type":float[]::class}}
-     * }})
-     * @var float[][]
-     */
-    public $array_array_number;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/ArrayOfNumberOnly.php b/samples/server/petstore/php-ze-ph/src/App/DTO/ArrayOfNumberOnly.php
deleted file mode 100644
index afa8248ce370..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/ArrayOfNumberOnly.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class ArrayOfNumberOnly
-{
-    /**
-     * @DTA\Data(field="ArrayNumber", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"float"}}
-     * }})
-     * @var float[]
-     */
-    public $array_number;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/ArrayTest.php b/samples/server/petstore/php-ze-ph/src/App/DTO/ArrayTest.php
deleted file mode 100644
index 6180ca32e7fb..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/ArrayTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class ArrayTest
-{
-    /**
-     * @DTA\Data(field="array_of_string", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"string"}}
-     * }})
-     * @var string[]
-     */
-    public $array_of_string;
-    /**
-     * @DTA\Data(field="array_array_of_integer", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Strategy(name="ObjectArray", options={"type":int[]::class})
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Dictionary", "options":{"type":int[]::class}}
-     * }})
-     * @var int[][]
-     */
-    public $array_array_of_integer;
-    /**
-     * @DTA\Data(field="array_array_of_model", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Strategy(name="ObjectArray", options={"type":\App\DTO\ReadOnlyFirst[]::class})
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Dictionary", "options":{"type":\App\DTO\ReadOnlyFirst[]::class}}
-     * }})
-     * @var \App\DTO\ReadOnlyFirst[][]
-     */
-    public $array_array_of_model;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/BigCat.php b/samples/server/petstore/php-ze-ph/src/App/DTO/BigCat.php
deleted file mode 100644
index 5ac4027bad61..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/BigCat.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class BigCat
-{
-    /**
-     * @DTA\Data(field="className")
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $class_name;
-    /**
-     * @DTA\Data(field="color", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $color;
-    /**
-     * @DTA\Data(field="declawed", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"bool"})
-     * @var bool
-     */
-    public $declawed;
-    /**
-     * @DTA\Data(field="kind", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $kind;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/BigCatAllOf.php b/samples/server/petstore/php-ze-ph/src/App/DTO/BigCatAllOf.php
deleted file mode 100644
index e38ee3cf5274..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/BigCatAllOf.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class BigCatAllOf
-{
-    /**
-     * @DTA\Data(field="kind", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $kind;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/Capitalization.php b/samples/server/petstore/php-ze-ph/src/App/DTO/Capitalization.php
deleted file mode 100644
index e2076aa7345e..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/Capitalization.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class Capitalization
-{
-    /**
-     * @DTA\Data(field="smallCamel", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $small_camel;
-    /**
-     * @DTA\Data(field="CapitalCamel", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $capital_camel;
-    /**
-     * @DTA\Data(field="small_Snake", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $small_snake;
-    /**
-     * @DTA\Data(field="Capital_Snake", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $capital_snake;
-    /**
-     * @DTA\Data(field="SCA_ETH_Flow_Points", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $sca_eth_flow_points;
-    /**
-     * Name of the pet
-     * @DTA\Data(field="ATT_NAME", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $att_name;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/Cat.php b/samples/server/petstore/php-ze-ph/src/App/DTO/Cat.php
deleted file mode 100644
index 6686302c7021..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/Cat.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class Cat
-{
-    /**
-     * @DTA\Data(field="className")
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $class_name;
-    /**
-     * @DTA\Data(field="color", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $color;
-    /**
-     * @DTA\Data(field="declawed", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"bool"})
-     * @var bool
-     */
-    public $declawed;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/CatAllOf.php b/samples/server/petstore/php-ze-ph/src/App/DTO/CatAllOf.php
deleted file mode 100644
index 4c84469cb06b..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/CatAllOf.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class CatAllOf
-{
-    /**
-     * @DTA\Data(field="declawed", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"bool"})
-     * @var bool
-     */
-    public $declawed;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/Category.php b/samples/server/petstore/php-ze-ph/src/App/DTO/Category.php
index 70d1c11565ac..374098e15401 100644
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/Category.php
+++ b/samples/server/petstore/php-ze-ph/src/App/DTO/Category.php
@@ -6,6 +6,7 @@
 use Articus\DataTransfer\Annotation as DTA;
 
 /**
+ * A category for a pet
  */
 class Category
 {
@@ -16,8 +17,9 @@ class Category
      */
     public $id;
     /**
-     * @DTA\Data(field="name")
+     * @DTA\Data(field="name", nullable=true)
      * @DTA\Validator(name="Type", options={"type":"string"})
+     * @DTA\Validator(name="Regex", options={"pattern":"/^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$/"})
      * @var string
      */
     public $name;
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/ClassModel.php b/samples/server/petstore/php-ze-ph/src/App/DTO/ClassModel.php
deleted file mode 100644
index 865d35a58c85..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/ClassModel.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- * Model for testing model with \&quot;_class\&quot; property
- */
-class ClassModel
-{
-    /**
-     * @DTA\Data(field="_class", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $_class;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/Client.php b/samples/server/petstore/php-ze-ph/src/App/DTO/Client.php
deleted file mode 100644
index 638dfbdb55be..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/Client.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class Client
-{
-    /**
-     * @DTA\Data(field="client", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $client;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/Dog.php b/samples/server/petstore/php-ze-ph/src/App/DTO/Dog.php
deleted file mode 100644
index 29ec1624163e..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/Dog.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class Dog
-{
-    /**
-     * @DTA\Data(field="className")
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $class_name;
-    /**
-     * @DTA\Data(field="color", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $color;
-    /**
-     * @DTA\Data(field="breed", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $breed;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/DogAllOf.php b/samples/server/petstore/php-ze-ph/src/App/DTO/DogAllOf.php
deleted file mode 100644
index 84c1f6a1f860..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/DogAllOf.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class DogAllOf
-{
-    /**
-     * @DTA\Data(field="breed", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $breed;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/EnumArrays.php b/samples/server/petstore/php-ze-ph/src/App/DTO/EnumArrays.php
deleted file mode 100644
index c2104110e141..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/EnumArrays.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class EnumArrays
-{
-    /**
-     * @DTA\Data(field="just_symbol", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $just_symbol;
-    /**
-     * @DTA\Data(field="array_enum", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"string"}}
-     * }})
-     * @var string[]
-     */
-    public $array_enum;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/EnumClass.php b/samples/server/petstore/php-ze-ph/src/App/DTO/EnumClass.php
deleted file mode 100644
index ac1b80baee2e..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/EnumClass.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class EnumClass
-{
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/EnumTest.php b/samples/server/petstore/php-ze-ph/src/App/DTO/EnumTest.php
deleted file mode 100644
index 098d8b8402e0..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/EnumTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class EnumTest
-{
-    /**
-     * @DTA\Data(field="enum_string", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $enum_string;
-    /**
-     * @DTA\Data(field="enum_string_required")
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $enum_string_required;
-    /**
-     * @DTA\Data(field="enum_integer", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $enum_integer;
-    /**
-     * @DTA\Data(field="enum_number", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @var float
-     */
-    public $enum_number;
-    /**
-     * @DTA\Data(field="outerEnum", nullable=true)
-     * @DTA\Strategy(name="Object", options={"type":\App\DTO\OuterEnum::class})
-     * @DTA\Validator(name="Dictionary", options={"type":\App\DTO\OuterEnum::class})
-     * @var \App\DTO\OuterEnum
-     */
-    public $outer_enum;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/FileSchemaTestClass.php b/samples/server/petstore/php-ze-ph/src/App/DTO/FileSchemaTestClass.php
deleted file mode 100644
index 886943cebf8a..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/FileSchemaTestClass.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class FileSchemaTestClass
-{
-    /**
-     * @DTA\Data(field="file", nullable=true)
-     * @DTA\Strategy(name="Object", options={"type":\App\DTO\File::class})
-     * @DTA\Validator(name="Dictionary", options={"type":\App\DTO\File::class})
-     * @var \App\DTO\File
-     */
-    public $file;
-    /**
-     * @DTA\Data(field="files", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Strategy(name="ObjectArray", options={"type":\App\DTO\File::class})
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Dictionary", "options":{"type":\App\DTO\File::class}}
-     * }})
-     * @var \App\DTO\File[]
-     */
-    public $files;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/FindPetsByStatusQueryData.php b/samples/server/petstore/php-ze-ph/src/App/DTO/FindPetsByStatusQueryData.php
new file mode 100644
index 000000000000..4abe941d3dfb
--- /dev/null
+++ b/samples/server/petstore/php-ze-ph/src/App/DTO/FindPetsByStatusQueryData.php
@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DTO;
+
+use Articus\DataTransfer\Annotation as DTA;
+
+/**
+ * Query parameters for findPetsByStatus
+ */
+class FindPetsByStatusQueryData
+{
+    /**
+     * Status values that need to be considered for filter
+     * @DTA\Data(field="status")
+     * TODO check validator and strategy are correct and can handle container item type
+     * @DTA\Strategy(name="QueryParameterArray", options={"type":"string", "format":"csv"})
+     * @DTA\Validator(name="QueryParameterArrayType", options={"type":"string", "format":"csv"})
+     * @var string[]
+     */
+    public $status;
+}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/FindPetsByTagsQueryData.php b/samples/server/petstore/php-ze-ph/src/App/DTO/FindPetsByTagsQueryData.php
new file mode 100644
index 000000000000..e3b6f876c941
--- /dev/null
+++ b/samples/server/petstore/php-ze-ph/src/App/DTO/FindPetsByTagsQueryData.php
@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DTO;
+
+use Articus\DataTransfer\Annotation as DTA;
+
+/**
+ * Query parameters for findPetsByTags
+ */
+class FindPetsByTagsQueryData
+{
+    /**
+     * Tags to filter by
+     * @DTA\Data(field="tags")
+     * TODO check validator and strategy are correct and can handle container item type
+     * @DTA\Strategy(name="QueryParameterArray", options={"type":"string", "format":"csv"})
+     * @DTA\Validator(name="QueryParameterArrayType", options={"type":"string", "format":"csv"})
+     * @var string[]
+     */
+    public $tags;
+}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/FormatTest.php b/samples/server/petstore/php-ze-ph/src/App/DTO/FormatTest.php
deleted file mode 100644
index 0b7dd0772c87..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/FormatTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class FormatTest
-{
-    /**
-     * @DTA\Data(field="integer", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @DTA\Validator(name="GreaterThan", options={"min":10, "inclusive":true})
-     * @DTA\Validator(name="LessThan", options={"max":100, "inclusive":true})
-     * @var int
-     */
-    public $integer;
-    /**
-     * @DTA\Data(field="int32", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @DTA\Validator(name="GreaterThan", options={"min":20, "inclusive":true})
-     * @DTA\Validator(name="LessThan", options={"max":200, "inclusive":true})
-     * @var int
-     */
-    public $int32;
-    /**
-     * @DTA\Data(field="int64", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $int64;
-    /**
-     * @DTA\Data(field="number")
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @DTA\Validator(name="GreaterThan", options={"min":32.1, "inclusive":true})
-     * @DTA\Validator(name="LessThan", options={"max":543.2, "inclusive":true})
-     * @var float
-     */
-    public $number;
-    /**
-     * @DTA\Data(field="float", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @DTA\Validator(name="GreaterThan", options={"min":54.3, "inclusive":true})
-     * @DTA\Validator(name="LessThan", options={"max":987.6, "inclusive":true})
-     * @var float
-     */
-    public $float;
-    /**
-     * @DTA\Data(field="double", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @DTA\Validator(name="GreaterThan", options={"min":67.8, "inclusive":true})
-     * @DTA\Validator(name="LessThan", options={"max":123.4, "inclusive":true})
-     * @var float
-     */
-    public $double;
-    /**
-     * @DTA\Data(field="string", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @DTA\Validator(name="Regex", options={"pattern":"/[a-z]/i"})
-     * @var string
-     */
-    public $string;
-    /**
-     * @DTA\Data(field="byte")
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @DTA\Validator(name="Regex", options={"pattern":"/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/"})
-     * @var string
-     */
-    public $byte;
-    /**
-     * @DTA\Data(field="binary", nullable=true)
-     * @DTA\Strategy(name="Object", options={"type":\SplFileObject::class})
-     * @DTA\Validator(name="Dictionary", options={"type":\SplFileObject::class})
-     * @var \SplFileObject
-     */
-    public $binary;
-    /**
-     * @DTA\Data(field="date")
-     * @DTA\Strategy(name="Date")
-     * @DTA\Validator(name="Date")
-     * @var \DateTime
-     */
-    public $date;
-    /**
-     * @DTA\Data(field="dateTime", nullable=true)
-     * @DTA\Strategy(name="DateTime")
-     * @DTA\Validator(name="Date", options={"format": \DateTime::RFC3339})
-     * @var \DateTime
-     */
-    public $date_time;
-    /**
-     * @DTA\Data(field="uuid", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $uuid;
-    /**
-     * @DTA\Data(field="password")
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @DTA\Validator(name="StringLength", options={"min":10, "max":64})
-     * @var string
-     */
-    public $password;
-    /**
-     * @DTA\Data(field="BigDecimal", nullable=true)
-     * @DTA\Strategy(name="Object", options={"type":BigDecimal::class})
-     * @DTA\Validator(name="Dictionary", options={"type":BigDecimal::class})
-     * @var BigDecimal
-     */
-    public $big_decimal;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/HasOnlyReadOnly.php b/samples/server/petstore/php-ze-ph/src/App/DTO/HasOnlyReadOnly.php
deleted file mode 100644
index d898b858f467..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/HasOnlyReadOnly.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class HasOnlyReadOnly
-{
-    /**
-     * @DTA\Data(field="bar", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $bar;
-    /**
-     * @DTA\Data(field="foo", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $foo;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/InlineObject.php b/samples/server/petstore/php-ze-ph/src/App/DTO/InlineObject.php
new file mode 100644
index 000000000000..56871d3a9165
--- /dev/null
+++ b/samples/server/petstore/php-ze-ph/src/App/DTO/InlineObject.php
@@ -0,0 +1,26 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DTO;
+
+use Articus\DataTransfer\Annotation as DTA;
+
+/**
+ */
+class InlineObject
+{
+    /**
+     * Updated name of the pet
+     * @DTA\Data(field="name", nullable=true)
+     * @DTA\Validator(name="Type", options={"type":"string"})
+     * @var string
+     */
+    public $name;
+    /**
+     * Updated status of the pet
+     * @DTA\Data(field="status", nullable=true)
+     * @DTA\Validator(name="Type", options={"type":"string"})
+     * @var string
+     */
+    public $status;
+}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/InlineObject1.php b/samples/server/petstore/php-ze-ph/src/App/DTO/InlineObject1.php
new file mode 100644
index 000000000000..d65e76823b75
--- /dev/null
+++ b/samples/server/petstore/php-ze-ph/src/App/DTO/InlineObject1.php
@@ -0,0 +1,27 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DTO;
+
+use Articus\DataTransfer\Annotation as DTA;
+
+/**
+ */
+class InlineObject1
+{
+    /**
+     * Additional data to pass to server
+     * @DTA\Data(field="additionalMetadata", nullable=true)
+     * @DTA\Validator(name="Type", options={"type":"string"})
+     * @var string
+     */
+    public $additional_metadata;
+    /**
+     * file to upload
+     * @DTA\Data(field="file", nullable=true)
+     * @DTA\Strategy(name="Object", options={"type":\SplFileObject::class})
+     * @DTA\Validator(name="Dictionary", options={"type":\SplFileObject::class})
+     * @var \SplFileObject
+     */
+    public $file;
+}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/LoginUserQueryData.php b/samples/server/petstore/php-ze-ph/src/App/DTO/LoginUserQueryData.php
new file mode 100644
index 000000000000..0d279a084aa8
--- /dev/null
+++ b/samples/server/petstore/php-ze-ph/src/App/DTO/LoginUserQueryData.php
@@ -0,0 +1,30 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DTO;
+
+use Articus\DataTransfer\Annotation as DTA;
+
+/**
+ * Query parameters for loginUser
+ */
+class LoginUserQueryData
+{
+    /**
+     * The password for login in clear text
+     * @DTA\Data(field="password")
+     * @DTA\Strategy(name="QueryParameter", options={"type":"string"})
+     * @DTA\Validator(name="QueryParameterType", options={"type":"string"})
+     * @var string
+     */
+    public $password;
+    /**
+     * The user name for login
+     * @DTA\Data(field="username")
+     * @DTA\Strategy(name="QueryParameter", options={"type":"string"})
+     * @DTA\Validator(name="QueryParameterType", options={"type":"string"})
+     * @DTA\Validator(name="Regex", options={"pattern":"/^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$/"})
+     * @var string
+     */
+    public $username;
+}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/MapTest.php b/samples/server/petstore/php-ze-ph/src/App/DTO/MapTest.php
deleted file mode 100644
index b3c873dbd52d..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/MapTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class MapTest
-{
-    /**
-     * @DTA\Data(field="map_map_of_string", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Strategy(name="ObjectArray", options={"type":map[string,string]::class})
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Dictionary", "options":{"type":map[string,string]::class}}
-     * }})
-     * @var map[string,map[string,string]]
-     */
-    public $map_map_of_string;
-    /**
-     * @DTA\Data(field="map_of_enum_string", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"string"}}
-     * }})
-     * @var map[string,string]
-     */
-    public $map_of_enum_string;
-    /**
-     * @DTA\Data(field="direct_map", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"bool"}}
-     * }})
-     * @var map[string,bool]
-     */
-    public $direct_map;
-    /**
-     * @DTA\Data(field="indirect_map", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"bool"}}
-     * }})
-     * @var map[string,bool]
-     */
-    public $indirect_map;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/server/petstore/php-ze-ph/src/App/DTO/MixedPropertiesAndAdditionalPropertiesClass.php
deleted file mode 100644
index 83a6023e372c..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/MixedPropertiesAndAdditionalPropertiesClass.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class MixedPropertiesAndAdditionalPropertiesClass
-{
-    /**
-     * @DTA\Data(field="uuid", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $uuid;
-    /**
-     * @DTA\Data(field="dateTime", nullable=true)
-     * @DTA\Strategy(name="DateTime")
-     * @DTA\Validator(name="Date", options={"format": \DateTime::RFC3339})
-     * @var \DateTime
-     */
-    public $date_time;
-    /**
-     * @DTA\Data(field="map", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Strategy(name="ObjectArray", options={"type":\App\DTO\Animal::class})
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Dictionary", "options":{"type":\App\DTO\Animal::class}}
-     * }})
-     * @var map[string,\App\DTO\Animal]
-     */
-    public $map;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/Model200Response.php b/samples/server/petstore/php-ze-ph/src/App/DTO/Model200Response.php
deleted file mode 100644
index e97b7b2b5e5b..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/Model200Response.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- * Model for testing model name starting with number
- */
-class Model200Response
-{
-    /**
-     * @DTA\Data(field="name", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $name;
-    /**
-     * @DTA\Data(field="class", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $class;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/ModelReturn.php b/samples/server/petstore/php-ze-ph/src/App/DTO/ModelReturn.php
deleted file mode 100644
index 449f4e4a3b8c..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/ModelReturn.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- * Model for testing reserved words
- */
-class ModelReturn
-{
-    /**
-     * @DTA\Data(field="return", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $return;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/Name.php b/samples/server/petstore/php-ze-ph/src/App/DTO/Name.php
deleted file mode 100644
index 0047684c0bf1..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/Name.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- * Model for testing model name same as property name
- */
-class Name
-{
-    /**
-     * @DTA\Data(field="name")
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $name;
-    /**
-     * @DTA\Data(field="snake_case", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $snake_case;
-    /**
-     * @DTA\Data(field="property", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $property;
-    /**
-     * @DTA\Data(field="123Number", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $_123_number;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/NumberOnly.php b/samples/server/petstore/php-ze-ph/src/App/DTO/NumberOnly.php
deleted file mode 100644
index 0c3a037723e1..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/NumberOnly.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class NumberOnly
-{
-    /**
-     * @DTA\Data(field="JustNumber", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @var float
-     */
-    public $just_number;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/Order.php b/samples/server/petstore/php-ze-ph/src/App/DTO/Order.php
index 4af728854d71..63135e8ec505 100644
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/Order.php
+++ b/samples/server/petstore/php-ze-ph/src/App/DTO/Order.php
@@ -6,6 +6,7 @@
 use Articus\DataTransfer\Annotation as DTA;
 
 /**
+ * An order for a pets from the pet store
  */
 class Order
 {
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/OuterComposite.php b/samples/server/petstore/php-ze-ph/src/App/DTO/OuterComposite.php
deleted file mode 100644
index 493be470b160..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/OuterComposite.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class OuterComposite
-{
-    /**
-     * @DTA\Data(field="my_number", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @var float
-     */
-    public $my_number;
-    /**
-     * @DTA\Data(field="my_string", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $my_string;
-    /**
-     * @DTA\Data(field="my_boolean", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"bool"})
-     * @var bool
-     */
-    public $my_boolean;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/OuterEnum.php b/samples/server/petstore/php-ze-ph/src/App/DTO/OuterEnum.php
deleted file mode 100644
index 2c790d3318c6..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/OuterEnum.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class OuterEnum
-{
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/Pet.php b/samples/server/petstore/php-ze-ph/src/App/DTO/Pet.php
index 2bbad114c405..e25ed83c5142 100644
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/Pet.php
+++ b/samples/server/petstore/php-ze-ph/src/App/DTO/Pet.php
@@ -6,6 +6,7 @@
 use Articus\DataTransfer\Annotation as DTA;
 
 /**
+ * A pet for sale in the pet store
  */
 class Pet
 {
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/ReadOnlyFirst.php b/samples/server/petstore/php-ze-ph/src/App/DTO/ReadOnlyFirst.php
deleted file mode 100644
index 57a430a7607e..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/ReadOnlyFirst.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class ReadOnlyFirst
-{
-    /**
-     * @DTA\Data(field="bar", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $bar;
-    /**
-     * @DTA\Data(field="baz", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $baz;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/SpecialModelName.php b/samples/server/petstore/php-ze-ph/src/App/DTO/SpecialModelName.php
deleted file mode 100644
index bed2c4d88c20..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/SpecialModelName.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class SpecialModelName
-{
-    /**
-     * @DTA\Data(field="$special[property.name]", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $special_property_name;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/Tag.php b/samples/server/petstore/php-ze-ph/src/App/DTO/Tag.php
index 54ead8d4bfad..ebc8a7a7f439 100644
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/Tag.php
+++ b/samples/server/petstore/php-ze-ph/src/App/DTO/Tag.php
@@ -6,6 +6,7 @@
 use Articus\DataTransfer\Annotation as DTA;
 
 /**
+ * A tag for a pet
  */
 class Tag
 {
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/TypeHolderDefault.php b/samples/server/petstore/php-ze-ph/src/App/DTO/TypeHolderDefault.php
deleted file mode 100644
index ebd116619e8c..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/TypeHolderDefault.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class TypeHolderDefault
-{
-    /**
-     * @DTA\Data(field="string_item")
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $string_item;
-    /**
-     * @DTA\Data(field="number_item")
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @var float
-     */
-    public $number_item;
-    /**
-     * @DTA\Data(field="integer_item")
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $integer_item;
-    /**
-     * @DTA\Data(field="bool_item")
-     * @DTA\Validator(name="Type", options={"type":"bool"})
-     * @var bool
-     */
-    public $bool_item;
-    /**
-     * @DTA\Data(field="array_item")
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"int"}}
-     * }})
-     * @var int[]
-     */
-    public $array_item;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/TypeHolderExample.php b/samples/server/petstore/php-ze-ph/src/App/DTO/TypeHolderExample.php
deleted file mode 100644
index 3b400acfabd6..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/TypeHolderExample.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class TypeHolderExample
-{
-    /**
-     * @DTA\Data(field="string_item")
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $string_item;
-    /**
-     * @DTA\Data(field="number_item")
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @var float
-     */
-    public $number_item;
-    /**
-     * @DTA\Data(field="float_item")
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @var float
-     */
-    public $float_item;
-    /**
-     * @DTA\Data(field="integer_item")
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $integer_item;
-    /**
-     * @DTA\Data(field="bool_item")
-     * @DTA\Validator(name="Type", options={"type":"bool"})
-     * @var bool
-     */
-    public $bool_item;
-    /**
-     * @DTA\Data(field="array_item")
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"int"}}
-     * }})
-     * @var int[]
-     */
-    public $array_item;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/User.php b/samples/server/petstore/php-ze-ph/src/App/DTO/User.php
index d9c3b6045d1c..f4ed5d4fd1c0 100644
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/User.php
+++ b/samples/server/petstore/php-ze-ph/src/App/DTO/User.php
@@ -6,6 +6,7 @@
 use Articus\DataTransfer\Annotation as DTA;
 
 /**
+ * A User who is purchasing from the pet store
  */
 class User
 {
diff --git a/samples/server/petstore/php-ze-ph/src/App/DTO/XmlItem.php b/samples/server/petstore/php-ze-ph/src/App/DTO/XmlItem.php
deleted file mode 100644
index 2ee159d7cfb5..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/XmlItem.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\DTO;
-
-use Articus\DataTransfer\Annotation as DTA;
-
-/**
- */
-class XmlItem
-{
-    /**
-     * @DTA\Data(field="attribute_string", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $attribute_string;
-    /**
-     * @DTA\Data(field="attribute_number", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @var float
-     */
-    public $attribute_number;
-    /**
-     * @DTA\Data(field="attribute_integer", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $attribute_integer;
-    /**
-     * @DTA\Data(field="attribute_boolean", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"bool"})
-     * @var bool
-     */
-    public $attribute_boolean;
-    /**
-     * @DTA\Data(field="wrapped_array", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"int"}}
-     * }})
-     * @var int[]
-     */
-    public $wrapped_array;
-    /**
-     * @DTA\Data(field="name_string", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $name_string;
-    /**
-     * @DTA\Data(field="name_number", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @var float
-     */
-    public $name_number;
-    /**
-     * @DTA\Data(field="name_integer", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $name_integer;
-    /**
-     * @DTA\Data(field="name_boolean", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"bool"})
-     * @var bool
-     */
-    public $name_boolean;
-    /**
-     * @DTA\Data(field="name_array", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"int"}}
-     * }})
-     * @var int[]
-     */
-    public $name_array;
-    /**
-     * @DTA\Data(field="name_wrapped_array", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"int"}}
-     * }})
-     * @var int[]
-     */
-    public $name_wrapped_array;
-    /**
-     * @DTA\Data(field="prefix_string", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $prefix_string;
-    /**
-     * @DTA\Data(field="prefix_number", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @var float
-     */
-    public $prefix_number;
-    /**
-     * @DTA\Data(field="prefix_integer", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $prefix_integer;
-    /**
-     * @DTA\Data(field="prefix_boolean", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"bool"})
-     * @var bool
-     */
-    public $prefix_boolean;
-    /**
-     * @DTA\Data(field="prefix_array", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"int"}}
-     * }})
-     * @var int[]
-     */
-    public $prefix_array;
-    /**
-     * @DTA\Data(field="prefix_wrapped_array", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"int"}}
-     * }})
-     * @var int[]
-     */
-    public $prefix_wrapped_array;
-    /**
-     * @DTA\Data(field="namespace_string", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $namespace_string;
-    /**
-     * @DTA\Data(field="namespace_number", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @var float
-     */
-    public $namespace_number;
-    /**
-     * @DTA\Data(field="namespace_integer", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $namespace_integer;
-    /**
-     * @DTA\Data(field="namespace_boolean", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"bool"})
-     * @var bool
-     */
-    public $namespace_boolean;
-    /**
-     * @DTA\Data(field="namespace_array", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"int"}}
-     * }})
-     * @var int[]
-     */
-    public $namespace_array;
-    /**
-     * @DTA\Data(field="namespace_wrapped_array", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"int"}}
-     * }})
-     * @var int[]
-     */
-    public $namespace_wrapped_array;
-    /**
-     * @DTA\Data(field="prefix_ns_string", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"string"})
-     * @var string
-     */
-    public $prefix_ns_string;
-    /**
-     * @DTA\Data(field="prefix_ns_number", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"float"})
-     * @var float
-     */
-    public $prefix_ns_number;
-    /**
-     * @DTA\Data(field="prefix_ns_integer", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"int"})
-     * @var int
-     */
-    public $prefix_ns_integer;
-    /**
-     * @DTA\Data(field="prefix_ns_boolean", nullable=true)
-     * @DTA\Validator(name="Type", options={"type":"bool"})
-     * @var bool
-     */
-    public $prefix_ns_boolean;
-    /**
-     * @DTA\Data(field="prefix_ns_array", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"int"}}
-     * }})
-     * @var int[]
-     */
-    public $prefix_ns_array;
-    /**
-     * @DTA\Data(field="prefix_ns_wrapped_array", nullable=true)
-     * TODO check validator and strategy are correct and can handle container item type
-     * @DTA\Validator(name="Collection", options={"validators":{
-     *     {"name":"Type", "options":{"type":"int"}}
-     * }})
-     * @var int[]
-     */
-    public $prefix_ns_wrapped_array;
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/ErrorMiddleware.php b/samples/server/petstore/php-ze-ph/src/App/ErrorMiddleware.php
deleted file mode 100644
index 9660bf07a641..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/ErrorMiddleware.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace App;
-
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
-use Psr\Http\Message\ResponseInterface as Response;
-use Psr\Http\Message\ServerRequestInterface as Request;
-use Zend\Stdlib\ErrorHandler;
-
-class ErrorMiddleware implements MiddlewareInterface
-{
-    public function process(Request $request, DelegateInterface $delegate)
-    {
-        $result = null;
-        try {
-            ErrorHandler::start();
-            $result = $delegate->process($request);
-            ErrorHandler::stop(true);
-            if (!($result instanceof Response)) {
-                throw new \RuntimeException(sprintf(
-                    'Invalid response: expecting %s, got %s',
-                    Response::class,
-                    is_object($result)? get_class($result) : gettype($result)
-                ));
-            }
-        }
-        catch (\Exception $error) {
-            $result = (new \Zend\Diactoros\Response())->withStatus(500, 'Internal server error');
-            error_log((string)$error);
-        }
-        return $result;
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/AnotherFakeDummy.php b/samples/server/petstore/php-ze-ph/src/App/Handler/AnotherFakeDummy.php
deleted file mode 100644
index ee20ba08d24a..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/AnotherFakeDummy.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/another-fake/dummy")
- */
-class AnotherFakeDummy
-{
-    /**
-     * To test special tags
-     * @PHA\Patch()
-     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
-     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Client::class,"objectAttr":"bodyData"})
-     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json")
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     *
-     * @return \App\DTO\Client
-     */
-    public function call123TestSpecialTags(ServerRequestInterface $request): \App\DTO\Client
-    {
-        //TODO implement method
-        /** @var \App\DTO\Client $bodyData */
-        $bodyData = $request->getAttribute("bodyData");
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php b/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php
deleted file mode 100644
index 76880c68f6da..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/fake")
- */
-class Fake
-{
-    /**
-     * To test \&quot;client\&quot; model
-     * @PHA\Patch()
-     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
-     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Client::class,"objectAttr":"bodyData"})
-     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json")
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     *
-     * @return \App\DTO\Client
-     */
-    public function testClientModel(ServerRequestInterface $request): \App\DTO\Client
-    {
-        //TODO implement method
-        /** @var \App\DTO\Client $bodyData */
-        $bodyData = $request->getAttribute("bodyData");
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-    /**
-     * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-     * @PHA\Post()
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     */
-    public function testEndpointParameters(ServerRequestInterface $request)
-    {
-        //TODO implement method
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-    /**
-     * To test enum parameters
-     * @PHA\Get()
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     */
-    public function testEnumParameters(ServerRequestInterface $request)
-    {
-        //TODO implement method
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-    /**
-     * Fake endpoint to test group parameters (optional)
-     * @PHA\Delete()
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     */
-    public function testGroupParameters(ServerRequestInterface $request)
-    {
-        //TODO implement method
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithFileSchema.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithFileSchema.php
deleted file mode 100644
index 47ce029df6e1..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithFileSchema.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/fake/body-with-file-schema")
- */
-class FakeBodyWithFileSchema
-{
-    /**
-     * @PHA\Put()
-     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
-     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\FileSchemaTestClass::class,"objectAttr":"bodyData"})
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     */
-    public function testBodyWithFileSchema(ServerRequestInterface $request)
-    {
-        //TODO implement method
-        /** @var \App\DTO\FileSchemaTestClass $bodyData */
-        $bodyData = $request->getAttribute("bodyData");
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithQueryParams.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithQueryParams.php
deleted file mode 100644
index 9844c5978164..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithQueryParams.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/fake/body-with-query-params")
- */
-class FakeBodyWithQueryParams
-{
-    /**
-     * @PHA\Put()
-     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
-     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\User::class,"objectAttr":"bodyData"})
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     */
-    public function testBodyWithQueryParams(ServerRequestInterface $request)
-    {
-        //TODO implement method
-        /** @var \App\DTO\User $bodyData */
-        $bodyData = $request->getAttribute("bodyData");
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeClassnameTest.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeClassnameTest.php
deleted file mode 100644
index 74991195dce0..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeClassnameTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/fake_classname_test")
- */
-class FakeClassnameTest
-{
-    /**
-     * To test class name in snake case
-     * @PHA\Patch()
-     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
-     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Client::class,"objectAttr":"bodyData"})
-     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json")
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     *
-     * @return \App\DTO\Client
-     */
-    public function testClassname(ServerRequestInterface $request): \App\DTO\Client
-    {
-        //TODO implement method
-        /** @var \App\DTO\Client $bodyData */
-        $bodyData = $request->getAttribute("bodyData");
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeCreateXmlItem.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeCreateXmlItem.php
deleted file mode 100644
index ec96b29c8ef0..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeCreateXmlItem.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/fake/create_xml_item")
- */
-class FakeCreateXmlItem
-{
-    /**
-     * creates an XmlItem
-     * @PHA\Post()
-     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/xml")
-     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/xml; charset=utf-8")
-     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/xml; charset=utf-16")
-     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="text/xml")
-     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="text/xml; charset=utf-8")
-     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="text/xml; charset=utf-16")
-     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\XmlItem::class,"objectAttr":"bodyData"})
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     */
-    public function createXmlItem(ServerRequestInterface $request)
-    {
-        //TODO implement method
-        /** @var \App\DTO\XmlItem $bodyData */
-        $bodyData = $request->getAttribute("bodyData");
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeInlineAdditionalProperties.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeInlineAdditionalProperties.php
deleted file mode 100644
index bb6868c68e3e..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeInlineAdditionalProperties.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/fake/inline-additionalProperties")
- */
-class FakeInlineAdditionalProperties
-{
-    /**
-     * test inline additionalProperties
-     * @PHA\Post()
-     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
-     * TODO check if attribute is valid and can handle your container type
-     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":"map[string,string]","objectAttr":"bodyData"})
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     */
-    public function testInlineAdditionalProperties(ServerRequestInterface $request)
-    {
-        //TODO implement method
-        /** @var map[string,string] $bodyData */
-        $bodyData = $request->getAttribute("bodyData");
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeJsonFormData.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeJsonFormData.php
deleted file mode 100644
index ed3e0f6d2efe..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeJsonFormData.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/fake/jsonFormData")
- */
-class FakeJsonFormData
-{
-    /**
-     * test json serialization of form data
-     * @PHA\Get()
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     */
-    public function testJsonFormData(ServerRequestInterface $request)
-    {
-        //TODO implement method
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterBoolean.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterBoolean.php
deleted file mode 100644
index 2ecd0bc9c7d7..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterBoolean.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/fake/outer/boolean")
- */
-class FakeOuterBoolean
-{
-    /**
-     * @PHA\Post()
-     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a")
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     *
-     * @return bool
-     */
-    public function fakeOuterBooleanSerialize(ServerRequestInterface $request): bool
-    {
-        //TODO implement method
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterComposite.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterComposite.php
deleted file mode 100644
index 8f3a4081cafb..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterComposite.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/fake/outer/composite")
- */
-class FakeOuterComposite
-{
-    /**
-     * @PHA\Post()
-     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\OuterComposite::class,"objectAttr":"bodyData"})
-     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a")
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     *
-     * @return \App\DTO\OuterComposite
-     */
-    public function fakeOuterCompositeSerialize(ServerRequestInterface $request): \App\DTO\OuterComposite
-    {
-        //TODO implement method
-        /** @var \App\DTO\OuterComposite $bodyData */
-        $bodyData = $request->getAttribute("bodyData");
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterNumber.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterNumber.php
deleted file mode 100644
index 595690de8977..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterNumber.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/fake/outer/number")
- */
-class FakeOuterNumber
-{
-    /**
-     * @PHA\Post()
-     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a")
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     *
-     * @return float
-     */
-    public function fakeOuterNumberSerialize(ServerRequestInterface $request): float
-    {
-        //TODO implement method
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterString.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterString.php
deleted file mode 100644
index 7ce93abfdbdf..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterString.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/fake/outer/string")
- */
-class FakeOuterString
-{
-    /**
-     * @PHA\Post()
-     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a")
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     *
-     * @return string
-     */
-    public function fakeOuterStringSerialize(ServerRequestInterface $request): string
-    {
-        //TODO implement method
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakePetIdUploadImageWithRequiredFile.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakePetIdUploadImageWithRequiredFile.php
deleted file mode 100644
index 7648339dd49c..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakePetIdUploadImageWithRequiredFile.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/fake/{petId}/uploadImageWithRequiredFile")
- */
-class FakePetIdUploadImageWithRequiredFile
-{
-    /**
-     * uploads an image (required)
-     * @PHA\Post()
-     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json")
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     *
-     * @return \App\DTO\ApiResponse
-     */
-    public function uploadFileWithRequiredFile(ServerRequestInterface $request): \App\DTO\ApiResponse
-    {
-        //TODO implement method
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeTestQueryParamters.php b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeTestQueryParamters.php
deleted file mode 100644
index 0648ce97f2da..000000000000
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeTestQueryParamters.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Handler;
-
-use Articus\PathHandler\Annotation as PHA;
-use Articus\PathHandler\Consumer as PHConsumer;
-use Articus\PathHandler\Producer as PHProducer;
-use Articus\PathHandler\Attribute as PHAttribute;
-use Articus\PathHandler\Exception as PHException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * @PHA\Route(pattern="/fake/test-query-paramters")
- */
-class FakeTestQueryParamters
-{
-    /**
-     * @PHA\Put()
-     * @param ServerRequestInterface $request
-     *
-     * @throws PHException\HttpCode 501 if the method is not implemented
-     */
-    public function testQueryParameterCollectionFormat(ServerRequestInterface $request)
-    {
-        //TODO implement method
-        throw new PHException\HttpCode(501, "Not implemented");
-    }
-}
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php b/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php
index 064a9712bf8d..c4dfdce081f6 100644
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php
@@ -23,11 +23,17 @@ class Pet
      * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
      * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/xml")
      * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Pet::class,"objectAttr":"bodyData"})
+     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
+     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml")
+     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
+     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json")
      * @param ServerRequestInterface $request
      *
      * @throws PHException\HttpCode 501 if the method is not implemented
+     *
+     * @return \App\DTO\Pet
      */
-    public function addPet(ServerRequestInterface $request)
+    public function addPet(ServerRequestInterface $request): \App\DTO\Pet
     {
         //TODO implement method
         /** @var \App\DTO\Pet $bodyData */
@@ -42,11 +48,17 @@ public function addPet(ServerRequestInterface $request)
      * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
      * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/xml")
      * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Pet::class,"objectAttr":"bodyData"})
+     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
+     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml")
+     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
+     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json")
      * @param ServerRequestInterface $request
      *
      * @throws PHException\HttpCode 501 if the method is not implemented
+     *
+     * @return \App\DTO\Pet
      */
-    public function updatePet(ServerRequestInterface $request)
+    public function updatePet(ServerRequestInterface $request): \App\DTO\Pet
     {
         //TODO implement method
         /** @var \App\DTO\Pet $bodyData */
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php
index 65fe83918d4d..c1c1ce754007 100644
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php
@@ -18,6 +18,11 @@ class PetFindByStatus
     /**
      * Finds Pets by status
      * @PHA\Get()
+     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={
+     *     "type":\App\DTO\FindPetsByStatusQueryData::class,
+     *     "objectAttr":"queryData",
+     *     "source": PHAttribute\Transfer::SOURCE_GET
+     * })
      * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
      * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml")
      * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
@@ -32,6 +37,8 @@ class PetFindByStatus
     public function findPetsByStatus(ServerRequestInterface $request): array
     {
         //TODO implement method
+        /** @var \App\DTO\FindPetsByStatusQueryData $queryData */
+        $queryData = $request->getAttribute("queryData");
         throw new PHException\HttpCode(501, "Not implemented");
     }
 }
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php
index 0126ada37c0a..b722a310efb0 100644
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php
@@ -18,6 +18,11 @@ class PetFindByTags
     /**
      * Finds Pets by tags
      * @PHA\Get()
+     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={
+     *     "type":\App\DTO\FindPetsByTagsQueryData::class,
+     *     "objectAttr":"queryData",
+     *     "source": PHAttribute\Transfer::SOURCE_GET
+     * })
      * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
      * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml")
      * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
@@ -32,6 +37,8 @@ class PetFindByTags
     public function findPetsByTags(ServerRequestInterface $request): array
     {
         //TODO implement method
+        /** @var \App\DTO\FindPetsByTagsQueryData $queryData */
+        $queryData = $request->getAttribute("queryData");
         throw new PHException\HttpCode(501, "Not implemented");
     }
 }
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php
index 23623764409a..567e312fea5a 100644
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php
@@ -18,6 +18,8 @@ class StoreOrder
     /**
      * Place an order for a pet
      * @PHA\Post()
+     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
+     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
      * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Order::class,"objectAttr":"bodyData"})
      * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
      * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml")
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php
index 28aa169a0c89..31c53e597eb3 100644
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php
@@ -11,7 +11,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 
 /**
- * @PHA\Route(pattern="/store/order/{order_id}")
+ * @PHA\Route(pattern="/store/order/{orderId}")
  */
 class StoreOrderOrderId
 {
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/User.php b/samples/server/petstore/php-ze-ph/src/App/Handler/User.php
index 9d3d8ceb9e37..db151a05c60a 100644
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/User.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/User.php
@@ -18,6 +18,8 @@ class User
     /**
      * Create user
      * @PHA\Post()
+     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
+     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
      * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\User::class,"objectAttr":"bodyData"})
      * @param ServerRequestInterface $request
      *
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php
index 8ac24b28f2f6..4a2204fb7c0d 100644
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php
@@ -18,6 +18,8 @@ class UserCreateWithArray
     /**
      * Creates list of users with given input array
      * @PHA\Post()
+     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
+     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
      * TODO check if attribute is valid and can handle your container type
      * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":"\App\DTO\User[]","objectAttr":"bodyData"})
      * @param ServerRequestInterface $request
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php
index 27ccafbb5d22..f61d9e4061eb 100644
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php
@@ -18,6 +18,8 @@ class UserCreateWithList
     /**
      * Creates list of users with given input array
      * @PHA\Post()
+     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
+     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
      * TODO check if attribute is valid and can handle your container type
      * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":"\App\DTO\User[]","objectAttr":"bodyData"})
      * @param ServerRequestInterface $request
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php
index 2322e8f2317f..577e7c3f5629 100644
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php
@@ -18,6 +18,11 @@ class UserLogin
     /**
      * Logs user into the system
      * @PHA\Get()
+     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={
+     *     "type":\App\DTO\LoginUserQueryData::class,
+     *     "objectAttr":"queryData",
+     *     "source": PHAttribute\Transfer::SOURCE_GET
+     * })
      * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
      * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml")
      * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
@@ -31,6 +36,8 @@ class UserLogin
     public function loginUser(ServerRequestInterface $request): string
     {
         //TODO implement method
+        /** @var \App\DTO\LoginUserQueryData $queryData */
+        $queryData = $request->getAttribute("queryData");
         throw new PHException\HttpCode(501, "Not implemented");
     }
 }
diff --git a/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php b/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php
index 290bfeb9731d..1888015fea9b 100644
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php
@@ -48,6 +48,8 @@ public function getUserByName(ServerRequestInterface $request): \App\DTO\User
     /**
      * Updated user
      * @PHA\Put()
+     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
+     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
      * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\User::class,"objectAttr":"bodyData"})
      * @param ServerRequestInterface $request
      *
diff --git a/samples/server/petstore/python-flask-python2/.dockerignore b/samples/server/petstore/python-flask-python2/.dockerignore
deleted file mode 100644
index f9619601908b..000000000000
--- a/samples/server/petstore/python-flask-python2/.dockerignore
+++ /dev/null
@@ -1,72 +0,0 @@
-.travis.yaml
-.openapi-generator-ignore
-README.md
-tox.ini
-git_push.sh
-test-requirements.txt
-setup.py
-
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*,cover
-.hypothesis/
-venv/
-.python-version
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-#Ipython Notebook
-.ipynb_checkpoints
diff --git a/samples/server/petstore/python-flask-python2/.openapi-generator/FILES b/samples/server/petstore/python-flask-python2/.openapi-generator/FILES
deleted file mode 100644
index 2d71840efc01..000000000000
--- a/samples/server/petstore/python-flask-python2/.openapi-generator/FILES
+++ /dev/null
@@ -1,30 +0,0 @@
-.dockerignore
-.gitignore
-.travis.yml
-Dockerfile
-README.md
-git_push.sh
-openapi_server/__init__.py
-openapi_server/__main__.py
-openapi_server/controllers/__init__.py
-openapi_server/controllers/pet_controller.py
-openapi_server/controllers/security_controller_.py
-openapi_server/controllers/store_controller.py
-openapi_server/controllers/user_controller.py
-openapi_server/encoder.py
-openapi_server/models/__init__.py
-openapi_server/models/api_response.py
-openapi_server/models/base_model_.py
-openapi_server/models/category.py
-openapi_server/models/order.py
-openapi_server/models/pet.py
-openapi_server/models/tag.py
-openapi_server/models/user.py
-openapi_server/openapi/openapi.yaml
-openapi_server/test/__init__.py
-openapi_server/typing_utils.py
-openapi_server/util.py
-requirements.txt
-setup.py
-test-requirements.txt
-tox.ini
diff --git a/samples/server/petstore/python-flask-python2/.travis.yml b/samples/server/petstore/python-flask-python2/.travis.yml
deleted file mode 100644
index 388de83128fe..000000000000
--- a/samples/server/petstore/python-flask-python2/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# ref: https://docs.travis-ci.com/user/languages/python
-language: python
-python:
-  - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-  - "3.6"
-  - "3.7"
-  - "3.8"
-# command to install dependencies
-install: "pip install -r requirements.txt"
-# command to run tests
-script: nosetests
diff --git a/samples/server/petstore/python-flask-python2/Dockerfile b/samples/server/petstore/python-flask-python2/Dockerfile
deleted file mode 100644
index d51d2b7a8568..000000000000
--- a/samples/server/petstore/python-flask-python2/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM python:2-alpine
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-COPY requirements.txt /usr/src/app/
-
-RUN pip install --no-cache-dir -r requirements.txt
-
-COPY . /usr/src/app
-
-EXPOSE 8080
-
-ENTRYPOINT ["python"]
-
-CMD ["-m", "openapi_server"]
\ No newline at end of file
diff --git a/samples/server/petstore/python-flask-python2/Makefile b/samples/server/petstore/python-flask-python2/Makefile
deleted file mode 100644
index 02f8acd53b4d..000000000000
--- a/samples/server/petstore/python-flask-python2/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
- #!/bin/bash
-
-REQUIREMENTS_OUT=test-requirements.txt.log
-SETUP_OUT=*.egg-info
-VENV=.venv
-
-clean:
-		rm -rf $(REQUIREMENTS_OUT)
-		rm -rf $(SETUP_OUT)
-		rm -rf $(VENV)
-		rm -rf .tox
-		rm -rf .coverage
-		find . -name "*.py[oc]" -delete
-		find . -name "__pycache__" -delete
-
-test: clean
-		bash ./test_python2.sh
-
-test-all: clean
-		bash ./test_python2.sh
diff --git a/samples/server/petstore/python-flask-python2/README.md b/samples/server/petstore/python-flask-python2/README.md
deleted file mode 100644
index ceebd18c340b..000000000000
--- a/samples/server/petstore/python-flask-python2/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# OpenAPI generated server
-
-## Overview
-This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the
-[OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
-is an example of building a OpenAPI-enabled Flask server.
-
-This example uses the [Connexion](https://github.com/zalando/connexion) library on top of Flask.
-
-## Requirements
-Python 2.7+
-
-## Usage
-To run the server, please execute the following from the root directory:
-
-```
-pip install -r requirements.txt
-python -m openapi_server
-```
-
-and open your browser to here:
-
-```
-http://localhost:8080/v2/ui/
-```
-
-Your OpenAPI definition lives here:
-
-```
-http://localhost:8080/v2/openapi.json
-```
-
-To launch the integration tests, use tox:
-```
-sudo pip install tox
-tox
-```
-
-## Running with Docker
-
-To run the server on a Docker container, please execute the following from the root directory:
-
-```bash
-# building the image
-docker build -t openapi_server .
-
-# starting up a container
-docker run -p 8080:8080 openapi_server
-```
\ No newline at end of file
diff --git a/samples/server/petstore/python-flask-python2/dev-requirements.txt b/samples/server/petstore/python-flask-python2/dev-requirements.txt
deleted file mode 100644
index ccdfca629494..000000000000
--- a/samples/server/petstore/python-flask-python2/dev-requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-tox
-flake8
diff --git a/samples/server/petstore/python-flask-python2/git_push.sh b/samples/server/petstore/python-flask-python2/git_push.sh
deleted file mode 100644
index ced3be2b0c7b..000000000000
--- a/samples/server/petstore/python-flask-python2/git_push.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
-#
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
-
-git_user_id=$1
-git_repo_id=$2
-release_note=$3
-git_host=$4
-
-if [ "$git_host" = "" ]; then
-    git_host="github.com"
-    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
-fi
-
-if [ "$git_user_id" = "" ]; then
-    git_user_id="GIT_USER_ID"
-    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
-fi
-
-if [ "$git_repo_id" = "" ]; then
-    git_repo_id="GIT_REPO_ID"
-    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
-fi
-
-if [ "$release_note" = "" ]; then
-    release_note="Minor update"
-    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
-fi
-
-# Initialize the local directory as a Git repository
-git init
-
-# Adds the files in the local repository and stages them for commit.
-git add .
-
-# Commits the tracked changes and prepares them to be pushed to a remote repository.
-git commit -m "$release_note"
-
-# Sets the new remote
-git_remote=`git remote`
-if [ "$git_remote" = "" ]; then # git remote not defined
-
-    if [ "$GIT_TOKEN" = "" ]; then
-        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
-        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
-    else
-        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
-    fi
-
-fi
-
-git pull origin master
-
-# Pushes (Forces) the changes in the local repository up to the remote repository
-echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
-git push origin master 2>&1 | grep -v 'To https'
-
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/__main__.py b/samples/server/petstore/python-flask-python2/openapi_server/__main__.py
deleted file mode 100644
index a6fa13105b89..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/__main__.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-
-import connexion
-
-from openapi_server import encoder
-
-
-def main():
-    app = connexion.App(__name__, specification_dir='./openapi/')
-    app.app.json_encoder = encoder.JSONEncoder
-    app.add_api('openapi.yaml',
-                arguments={'title': 'OpenAPI Petstore'},
-                pythonic_params=True)
-    app.run(port=8080)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-flask-python2/openapi_server/controllers/pet_controller.py
deleted file mode 100644
index 17699957ddd3..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/controllers/pet_controller.py
+++ /dev/null
@@ -1,124 +0,0 @@
-import connexion
-import six
-
-from openapi_server.models.api_response import ApiResponse  # noqa: E501
-from openapi_server.models.pet import Pet  # noqa: E501
-from openapi_server import util
-
-
-def add_pet(body):  # noqa: E501
-    """Add a new pet to the store
-
-     # noqa: E501
-
-    :param body: Pet object that needs to be added to the store
-    :type body: dict | bytes
-
-    :rtype: None
-    """
-    if connexion.request.is_json:
-        body = Pet.from_dict(connexion.request.get_json())  # noqa: E501
-    return 'do some magic!'
-
-
-def delete_pet(pet_id, api_key=None):  # noqa: E501
-    """Deletes a pet
-
-     # noqa: E501
-
-    :param pet_id: Pet id to delete
-    :type pet_id: int
-    :param api_key: 
-    :type api_key: str
-
-    :rtype: None
-    """
-    return 'do some magic!'
-
-
-def find_pets_by_status(status):  # noqa: E501
-    """Finds Pets by status
-
-    Multiple status values can be provided with comma separated strings # noqa: E501
-
-    :param status: Status values that need to be considered for filter
-    :type status: List[str]
-
-    :rtype: List[Pet]
-    """
-    return 'do some magic!'
-
-
-def find_pets_by_tags(tags):  # noqa: E501
-    """Finds Pets by tags
-
-    Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. # noqa: E501
-
-    :param tags: Tags to filter by
-    :type tags: List[str]
-
-    :rtype: List[Pet]
-    """
-    return 'do some magic!'
-
-
-def get_pet_by_id(pet_id):  # noqa: E501
-    """Find pet by ID
-
-    Returns a single pet # noqa: E501
-
-    :param pet_id: ID of pet to return
-    :type pet_id: int
-
-    :rtype: Pet
-    """
-    return 'do some magic!'
-
-
-def update_pet(body):  # noqa: E501
-    """Update an existing pet
-
-     # noqa: E501
-
-    :param body: Pet object that needs to be added to the store
-    :type body: dict | bytes
-
-    :rtype: None
-    """
-    if connexion.request.is_json:
-        body = Pet.from_dict(connexion.request.get_json())  # noqa: E501
-    return 'do some magic!'
-
-
-def update_pet_with_form(pet_id, name=None, status=None):  # noqa: E501
-    """Updates a pet in the store with form data
-
-     # noqa: E501
-
-    :param pet_id: ID of pet that needs to be updated
-    :type pet_id: int
-    :param name: Updated name of the pet
-    :type name: str
-    :param status: Updated status of the pet
-    :type status: str
-
-    :rtype: None
-    """
-    return 'do some magic!'
-
-
-def upload_file(pet_id, additional_metadata=None, file=None):  # noqa: E501
-    """uploads an image
-
-     # noqa: E501
-
-    :param pet_id: ID of pet to update
-    :type pet_id: int
-    :param additional_metadata: Additional data to pass to server
-    :type additional_metadata: str
-    :param file: file to upload
-    :type file: str
-
-    :rtype: ApiResponse
-    """
-    return 'do some magic!'
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/controllers/security_controller_.py b/samples/server/petstore/python-flask-python2/openapi_server/controllers/security_controller_.py
deleted file mode 100644
index 1db7a68f4665..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/controllers/security_controller_.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from typing import List
-
-
-def info_from_api_key(api_key, required_scopes):
-    """
-    Check and retrieve authentication information from api_key.
-    Returned value will be passed in 'token_info' parameter of your operation function, if there is one.
-    'sub' or 'uid' will be set in 'user' parameter of your operation function, if there is one.
-
-    :param api_key API key provided by Authorization header
-    :type api_key: str
-    :param required_scopes Always None. Used for other authentication method
-    :type required_scopes: None
-    :return: Information attached to provided api_key or None if api_key is invalid or does not allow access to called API
-    :rtype: dict | None
-    """
-    return {'uid': 'user_id'}
-
-
-def info_from_petstore_auth(token):
-    """
-    Validate and decode token.
-    Returned value will be passed in 'token_info' parameter of your operation function, if there is one.
-    'sub' or 'uid' will be set in 'user' parameter of your operation function, if there is one.
-    'scope' or 'scopes' will be passed to scope validation function.
-
-    :param token Token provided by Authorization header
-    :type token: str
-    :return: Decoded token information or None if token is invalid
-    :rtype: dict | None
-    """
-    return {'scopes': ['read:pets', 'write:pets'], 'uid': 'user_id'}
-
-
-def validate_scope_petstore_auth(required_scopes, token_scopes):
-    """
-    Validate required scopes are included in token scope
-
-    :param required_scopes Required scope to access called API
-    :type required_scopes: List[str]
-    :param token_scopes Scope present in token
-    :type token_scopes: List[str]
-    :return: True if access to called API is allowed
-    :rtype: bool
-    """
-    return set(required_scopes).issubset(set(token_scopes))
-
-
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/controllers/store_controller.py b/samples/server/petstore/python-flask-python2/openapi_server/controllers/store_controller.py
deleted file mode 100644
index 7bb43a970f5b..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/controllers/store_controller.py
+++ /dev/null
@@ -1,57 +0,0 @@
-import connexion
-import six
-
-from openapi_server.models.order import Order  # noqa: E501
-from openapi_server import util
-
-
-def delete_order(order_id):  # noqa: E501
-    """Delete purchase order by ID
-
-    For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors # noqa: E501
-
-    :param order_id: ID of the order that needs to be deleted
-    :type order_id: str
-
-    :rtype: None
-    """
-    return 'do some magic!'
-
-
-def get_inventory():  # noqa: E501
-    """Returns pet inventories by status
-
-    Returns a map of status codes to quantities # noqa: E501
-
-
-    :rtype: Dict[str, int]
-    """
-    return 'do some magic!'
-
-
-def get_order_by_id(order_id):  # noqa: E501
-    """Find purchase order by ID
-
-    For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions # noqa: E501
-
-    :param order_id: ID of pet that needs to be fetched
-    :type order_id: int
-
-    :rtype: Order
-    """
-    return 'do some magic!'
-
-
-def place_order(body):  # noqa: E501
-    """Place an order for a pet
-
-     # noqa: E501
-
-    :param body: order placed for purchasing the pet
-    :type body: dict | bytes
-
-    :rtype: Order
-    """
-    if connexion.request.is_json:
-        body = Order.from_dict(connexion.request.get_json())  # noqa: E501
-    return 'do some magic!'
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/controllers/user_controller.py b/samples/server/petstore/python-flask-python2/openapi_server/controllers/user_controller.py
deleted file mode 100644
index 18173c5fe316..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/controllers/user_controller.py
+++ /dev/null
@@ -1,119 +0,0 @@
-import connexion
-import six
-
-from openapi_server.models.user import User  # noqa: E501
-from openapi_server import util
-
-
-def create_user(body):  # noqa: E501
-    """Create user
-
-    This can only be done by the logged in user. # noqa: E501
-
-    :param body: Created user object
-    :type body: dict | bytes
-
-    :rtype: None
-    """
-    if connexion.request.is_json:
-        body = User.from_dict(connexion.request.get_json())  # noqa: E501
-    return 'do some magic!'
-
-
-def create_users_with_array_input(body):  # noqa: E501
-    """Creates list of users with given input array
-
-     # noqa: E501
-
-    :param body: List of user object
-    :type body: list | bytes
-
-    :rtype: None
-    """
-    if connexion.request.is_json:
-        body = [User.from_dict(d) for d in connexion.request.get_json()]  # noqa: E501
-    return 'do some magic!'
-
-
-def create_users_with_list_input(body):  # noqa: E501
-    """Creates list of users with given input array
-
-     # noqa: E501
-
-    :param body: List of user object
-    :type body: list | bytes
-
-    :rtype: None
-    """
-    if connexion.request.is_json:
-        body = [User.from_dict(d) for d in connexion.request.get_json()]  # noqa: E501
-    return 'do some magic!'
-
-
-def delete_user(username):  # noqa: E501
-    """Delete user
-
-    This can only be done by the logged in user. # noqa: E501
-
-    :param username: The name that needs to be deleted
-    :type username: str
-
-    :rtype: None
-    """
-    return 'do some magic!'
-
-
-def get_user_by_name(username):  # noqa: E501
-    """Get user by user name
-
-     # noqa: E501
-
-    :param username: The name that needs to be fetched. Use user1 for testing.
-    :type username: str
-
-    :rtype: User
-    """
-    return 'do some magic!'
-
-
-def login_user(username, password):  # noqa: E501
-    """Logs user into the system
-
-     # noqa: E501
-
-    :param username: The user name for login
-    :type username: str
-    :param password: The password for login in clear text
-    :type password: str
-
-    :rtype: str
-    """
-    return 'do some magic!'
-
-
-def logout_user():  # noqa: E501
-    """Logs out current logged in user session
-
-     # noqa: E501
-
-
-    :rtype: None
-    """
-    return 'do some magic!'
-
-
-def update_user(username, body):  # noqa: E501
-    """Updated user
-
-    This can only be done by the logged in user. # noqa: E501
-
-    :param username: name that need to be deleted
-    :type username: str
-    :param body: Updated user object
-    :type body: dict | bytes
-
-    :rtype: None
-    """
-    if connexion.request.is_json:
-        body = User.from_dict(connexion.request.get_json())  # noqa: E501
-    return 'do some magic!'
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/encoder.py b/samples/server/petstore/python-flask-python2/openapi_server/encoder.py
deleted file mode 100644
index 3bbef854f3b8..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/encoder.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from connexion.apps.flask_app import FlaskJSONEncoder
-import six
-
-from openapi_server.models.base_model_ import Model
-
-
-class JSONEncoder(FlaskJSONEncoder):
-    include_nulls = False
-
-    def default(self, o):
-        if isinstance(o, Model):
-            dikt = {}
-            for attr, _ in six.iteritems(o.openapi_types):
-                value = getattr(o, attr)
-                if value is None and not self.include_nulls:
-                    continue
-                attr = o.attribute_map[attr]
-                dikt[attr] = value
-            return dikt
-        return FlaskJSONEncoder.default(self, o)
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/models/__init__.py b/samples/server/petstore/python-flask-python2/openapi_server/models/__init__.py
deleted file mode 100644
index 962f6f34936d..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/models/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# coding: utf-8
-
-# flake8: noqa
-from __future__ import absolute_import
-# import models into model package
-from openapi_server.models.api_response import ApiResponse
-from openapi_server.models.category import Category
-from openapi_server.models.order import Order
-from openapi_server.models.pet import Pet
-from openapi_server.models.tag import Tag
-from openapi_server.models.user import User
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/models/api_response.py b/samples/server/petstore/python-flask-python2/openapi_server/models/api_response.py
deleted file mode 100644
index f4f26e834a27..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/models/api_response.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# coding: utf-8
-
-from __future__ import absolute_import
-from datetime import date, datetime  # noqa: F401
-
-from typing import List, Dict  # noqa: F401
-
-from openapi_server.models.base_model_ import Model
-from openapi_server import util
-
-
-class ApiResponse(Model):
-    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-
-    Do not edit the class manually.
-    """
-
-    def __init__(self, code=None, type=None, message=None):  # noqa: E501
-        """ApiResponse - a model defined in OpenAPI
-
-        :param code: The code of this ApiResponse.  # noqa: E501
-        :type code: int
-        :param type: The type of this ApiResponse.  # noqa: E501
-        :type type: str
-        :param message: The message of this ApiResponse.  # noqa: E501
-        :type message: str
-        """
-        self.openapi_types = {
-            'code': int,
-            'type': str,
-            'message': str
-        }
-
-        self.attribute_map = {
-            'code': 'code',
-            'type': 'type',
-            'message': 'message'
-        }
-
-        self._code = code
-        self._type = type
-        self._message = message
-
-    @classmethod
-    def from_dict(cls, dikt):
-        """Returns the dict as a model
-
-        :param dikt: A dict.
-        :type: dict
-        :return: The ApiResponse of this ApiResponse.  # noqa: E501
-        :rtype: ApiResponse
-        """
-        return util.deserialize_model(dikt, cls)
-
-    @property
-    def code(self):
-        """Gets the code of this ApiResponse.
-
-
-        :return: The code of this ApiResponse.
-        :rtype: int
-        """
-        return self._code
-
-    @code.setter
-    def code(self, code):
-        """Sets the code of this ApiResponse.
-
-
-        :param code: The code of this ApiResponse.
-        :type code: int
-        """
-
-        self._code = code
-
-    @property
-    def type(self):
-        """Gets the type of this ApiResponse.
-
-
-        :return: The type of this ApiResponse.
-        :rtype: str
-        """
-        return self._type
-
-    @type.setter
-    def type(self, type):
-        """Sets the type of this ApiResponse.
-
-
-        :param type: The type of this ApiResponse.
-        :type type: str
-        """
-
-        self._type = type
-
-    @property
-    def message(self):
-        """Gets the message of this ApiResponse.
-
-
-        :return: The message of this ApiResponse.
-        :rtype: str
-        """
-        return self._message
-
-    @message.setter
-    def message(self, message):
-        """Sets the message of this ApiResponse.
-
-
-        :param message: The message of this ApiResponse.
-        :type message: str
-        """
-
-        self._message = message
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/models/base_model_.py b/samples/server/petstore/python-flask-python2/openapi_server/models/base_model_.py
deleted file mode 100644
index 2f7f96c14e47..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/models/base_model_.py
+++ /dev/null
@@ -1,66 +0,0 @@
-import pprint
-
-import six
-
-from openapi_server import util
-
-
-class Model(object):
-    # openapiTypes: The key is attribute name and the
-    # value is attribute type.
-    openapi_types = {}
-
-    # attributeMap: The key is attribute name and the
-    # value is json key in definition.
-    attribute_map = {}
-
-    @classmethod
-    def from_dict(cls, dikt):
-        """Returns the dict as a model"""
-        return util.deserialize_model(dikt, cls)
-
-    def to_dict(self):
-        """Returns the model properties as a dict
-
-        :rtype: dict
-        """
-        result = {}
-
-        for attr, _ in six.iteritems(self.openapi_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model
-
-        :rtype: str
-        """
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/models/category.py b/samples/server/petstore/python-flask-python2/openapi_server/models/category.py
deleted file mode 100644
index fc2b224078a3..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/models/category.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# coding: utf-8
-
-from __future__ import absolute_import
-from datetime import date, datetime  # noqa: F401
-
-from typing import List, Dict  # noqa: F401
-
-from openapi_server.models.base_model_ import Model
-from openapi_server import util
-
-
-class Category(Model):
-    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-
-    Do not edit the class manually.
-    """
-
-    def __init__(self, id=None, name=None):  # noqa: E501
-        """Category - a model defined in OpenAPI
-
-        :param id: The id of this Category.  # noqa: E501
-        :type id: long
-        :param name: The name of this Category.  # noqa: E501
-        :type name: str
-        """
-        self.openapi_types = {
-            'id': long,
-            'name': str
-        }
-
-        self.attribute_map = {
-            'id': 'id',
-            'name': 'name'
-        }
-
-        self._id = id
-        self._name = name
-
-    @classmethod
-    def from_dict(cls, dikt):
-        """Returns the dict as a model
-
-        :param dikt: A dict.
-        :type: dict
-        :return: The Category of this Category.  # noqa: E501
-        :rtype: Category
-        """
-        return util.deserialize_model(dikt, cls)
-
-    @property
-    def id(self):
-        """Gets the id of this Category.
-
-
-        :return: The id of this Category.
-        :rtype: long
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Category.
-
-
-        :param id: The id of this Category.
-        :type id: long
-        """
-
-        self._id = id
-
-    @property
-    def name(self):
-        """Gets the name of this Category.
-
-
-        :return: The name of this Category.
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Category.
-
-
-        :param name: The name of this Category.
-        :type name: str
-        """
-
-        self._name = name
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/models/order.py b/samples/server/petstore/python-flask-python2/openapi_server/models/order.py
deleted file mode 100644
index 02ea8c4fd728..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/models/order.py
+++ /dev/null
@@ -1,202 +0,0 @@
-# coding: utf-8
-
-from __future__ import absolute_import
-from datetime import date, datetime  # noqa: F401
-
-from typing import List, Dict  # noqa: F401
-
-from openapi_server.models.base_model_ import Model
-from openapi_server import util
-
-
-class Order(Model):
-    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-
-    Do not edit the class manually.
-    """
-
-    def __init__(self, id=None, pet_id=None, quantity=None, ship_date=None, status=None, complete=False):  # noqa: E501
-        """Order - a model defined in OpenAPI
-
-        :param id: The id of this Order.  # noqa: E501
-        :type id: long
-        :param pet_id: The pet_id of this Order.  # noqa: E501
-        :type pet_id: long
-        :param quantity: The quantity of this Order.  # noqa: E501
-        :type quantity: int
-        :param ship_date: The ship_date of this Order.  # noqa: E501
-        :type ship_date: datetime
-        :param status: The status of this Order.  # noqa: E501
-        :type status: str
-        :param complete: The complete of this Order.  # noqa: E501
-        :type complete: bool
-        """
-        self.openapi_types = {
-            'id': long,
-            'pet_id': long,
-            'quantity': int,
-            'ship_date': datetime,
-            'status': str,
-            'complete': bool
-        }
-
-        self.attribute_map = {
-            'id': 'id',
-            'pet_id': 'petId',
-            'quantity': 'quantity',
-            'ship_date': 'shipDate',
-            'status': 'status',
-            'complete': 'complete'
-        }
-
-        self._id = id
-        self._pet_id = pet_id
-        self._quantity = quantity
-        self._ship_date = ship_date
-        self._status = status
-        self._complete = complete
-
-    @classmethod
-    def from_dict(cls, dikt):
-        """Returns the dict as a model
-
-        :param dikt: A dict.
-        :type: dict
-        :return: The Order of this Order.  # noqa: E501
-        :rtype: Order
-        """
-        return util.deserialize_model(dikt, cls)
-
-    @property
-    def id(self):
-        """Gets the id of this Order.
-
-
-        :return: The id of this Order.
-        :rtype: long
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Order.
-
-
-        :param id: The id of this Order.
-        :type id: long
-        """
-
-        self._id = id
-
-    @property
-    def pet_id(self):
-        """Gets the pet_id of this Order.
-
-
-        :return: The pet_id of this Order.
-        :rtype: long
-        """
-        return self._pet_id
-
-    @pet_id.setter
-    def pet_id(self, pet_id):
-        """Sets the pet_id of this Order.
-
-
-        :param pet_id: The pet_id of this Order.
-        :type pet_id: long
-        """
-
-        self._pet_id = pet_id
-
-    @property
-    def quantity(self):
-        """Gets the quantity of this Order.
-
-
-        :return: The quantity of this Order.
-        :rtype: int
-        """
-        return self._quantity
-
-    @quantity.setter
-    def quantity(self, quantity):
-        """Sets the quantity of this Order.
-
-
-        :param quantity: The quantity of this Order.
-        :type quantity: int
-        """
-
-        self._quantity = quantity
-
-    @property
-    def ship_date(self):
-        """Gets the ship_date of this Order.
-
-
-        :return: The ship_date of this Order.
-        :rtype: datetime
-        """
-        return self._ship_date
-
-    @ship_date.setter
-    def ship_date(self, ship_date):
-        """Sets the ship_date of this Order.
-
-
-        :param ship_date: The ship_date of this Order.
-        :type ship_date: datetime
-        """
-
-        self._ship_date = ship_date
-
-    @property
-    def status(self):
-        """Gets the status of this Order.
-
-        Order Status  # noqa: E501
-
-        :return: The status of this Order.
-        :rtype: str
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this Order.
-
-        Order Status  # noqa: E501
-
-        :param status: The status of this Order.
-        :type status: str
-        """
-        allowed_values = ["placed", "approved", "delivered"]  # noqa: E501
-        if status not in allowed_values:
-            raise ValueError(
-                "Invalid value for `status` ({0}), must be one of {1}"
-                .format(status, allowed_values)
-            )
-
-        self._status = status
-
-    @property
-    def complete(self):
-        """Gets the complete of this Order.
-
-
-        :return: The complete of this Order.
-        :rtype: bool
-        """
-        return self._complete
-
-    @complete.setter
-    def complete(self, complete):
-        """Sets the complete of this Order.
-
-
-        :param complete: The complete of this Order.
-        :type complete: bool
-        """
-
-        self._complete = complete
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/models/pet.py b/samples/server/petstore/python-flask-python2/openapi_server/models/pet.py
deleted file mode 100644
index a9c5e52330fc..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/models/pet.py
+++ /dev/null
@@ -1,210 +0,0 @@
-# coding: utf-8
-
-from __future__ import absolute_import
-from datetime import date, datetime  # noqa: F401
-
-from typing import List, Dict  # noqa: F401
-
-from openapi_server.models.base_model_ import Model
-from openapi_server.models.category import Category
-from openapi_server.models.tag import Tag
-from openapi_server import util
-
-from openapi_server.models.category import Category  # noqa: E501
-from openapi_server.models.tag import Tag  # noqa: E501
-
-class Pet(Model):
-    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-
-    Do not edit the class manually.
-    """
-
-    def __init__(self, id=None, category=None, name=None, photo_urls=None, tags=None, status=None):  # noqa: E501
-        """Pet - a model defined in OpenAPI
-
-        :param id: The id of this Pet.  # noqa: E501
-        :type id: long
-        :param category: The category of this Pet.  # noqa: E501
-        :type category: Category
-        :param name: The name of this Pet.  # noqa: E501
-        :type name: str
-        :param photo_urls: The photo_urls of this Pet.  # noqa: E501
-        :type photo_urls: List[str]
-        :param tags: The tags of this Pet.  # noqa: E501
-        :type tags: List[Tag]
-        :param status: The status of this Pet.  # noqa: E501
-        :type status: str
-        """
-        self.openapi_types = {
-            'id': long,
-            'category': Category,
-            'name': str,
-            'photo_urls': List[str],
-            'tags': List[Tag],
-            'status': str
-        }
-
-        self.attribute_map = {
-            'id': 'id',
-            'category': 'category',
-            'name': 'name',
-            'photo_urls': 'photoUrls',
-            'tags': 'tags',
-            'status': 'status'
-        }
-
-        self._id = id
-        self._category = category
-        self._name = name
-        self._photo_urls = photo_urls
-        self._tags = tags
-        self._status = status
-
-    @classmethod
-    def from_dict(cls, dikt):
-        """Returns the dict as a model
-
-        :param dikt: A dict.
-        :type: dict
-        :return: The Pet of this Pet.  # noqa: E501
-        :rtype: Pet
-        """
-        return util.deserialize_model(dikt, cls)
-
-    @property
-    def id(self):
-        """Gets the id of this Pet.
-
-
-        :return: The id of this Pet.
-        :rtype: long
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Pet.
-
-
-        :param id: The id of this Pet.
-        :type id: long
-        """
-
-        self._id = id
-
-    @property
-    def category(self):
-        """Gets the category of this Pet.
-
-
-        :return: The category of this Pet.
-        :rtype: Category
-        """
-        return self._category
-
-    @category.setter
-    def category(self, category):
-        """Sets the category of this Pet.
-
-
-        :param category: The category of this Pet.
-        :type category: Category
-        """
-
-        self._category = category
-
-    @property
-    def name(self):
-        """Gets the name of this Pet.
-
-
-        :return: The name of this Pet.
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Pet.
-
-
-        :param name: The name of this Pet.
-        :type name: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def photo_urls(self):
-        """Gets the photo_urls of this Pet.
-
-
-        :return: The photo_urls of this Pet.
-        :rtype: List[str]
-        """
-        return self._photo_urls
-
-    @photo_urls.setter
-    def photo_urls(self, photo_urls):
-        """Sets the photo_urls of this Pet.
-
-
-        :param photo_urls: The photo_urls of this Pet.
-        :type photo_urls: List[str]
-        """
-        if photo_urls is None:
-            raise ValueError("Invalid value for `photo_urls`, must not be `None`")  # noqa: E501
-
-        self._photo_urls = photo_urls
-
-    @property
-    def tags(self):
-        """Gets the tags of this Pet.
-
-
-        :return: The tags of this Pet.
-        :rtype: List[Tag]
-        """
-        return self._tags
-
-    @tags.setter
-    def tags(self, tags):
-        """Sets the tags of this Pet.
-
-
-        :param tags: The tags of this Pet.
-        :type tags: List[Tag]
-        """
-
-        self._tags = tags
-
-    @property
-    def status(self):
-        """Gets the status of this Pet.
-
-        pet status in the store  # noqa: E501
-
-        :return: The status of this Pet.
-        :rtype: str
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this Pet.
-
-        pet status in the store  # noqa: E501
-
-        :param status: The status of this Pet.
-        :type status: str
-        """
-        allowed_values = ["available", "pending", "sold"]  # noqa: E501
-        if status not in allowed_values:
-            raise ValueError(
-                "Invalid value for `status` ({0}), must be one of {1}"
-                .format(status, allowed_values)
-            )
-
-        self._status = status
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/models/tag.py b/samples/server/petstore/python-flask-python2/openapi_server/models/tag.py
deleted file mode 100644
index 24a262951ed9..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/models/tag.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# coding: utf-8
-
-from __future__ import absolute_import
-from datetime import date, datetime  # noqa: F401
-
-from typing import List, Dict  # noqa: F401
-
-from openapi_server.models.base_model_ import Model
-from openapi_server import util
-
-
-class Tag(Model):
-    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-
-    Do not edit the class manually.
-    """
-
-    def __init__(self, id=None, name=None):  # noqa: E501
-        """Tag - a model defined in OpenAPI
-
-        :param id: The id of this Tag.  # noqa: E501
-        :type id: long
-        :param name: The name of this Tag.  # noqa: E501
-        :type name: str
-        """
-        self.openapi_types = {
-            'id': long,
-            'name': str
-        }
-
-        self.attribute_map = {
-            'id': 'id',
-            'name': 'name'
-        }
-
-        self._id = id
-        self._name = name
-
-    @classmethod
-    def from_dict(cls, dikt):
-        """Returns the dict as a model
-
-        :param dikt: A dict.
-        :type: dict
-        :return: The Tag of this Tag.  # noqa: E501
-        :rtype: Tag
-        """
-        return util.deserialize_model(dikt, cls)
-
-    @property
-    def id(self):
-        """Gets the id of this Tag.
-
-
-        :return: The id of this Tag.
-        :rtype: long
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Tag.
-
-
-        :param id: The id of this Tag.
-        :type id: long
-        """
-
-        self._id = id
-
-    @property
-    def name(self):
-        """Gets the name of this Tag.
-
-
-        :return: The name of this Tag.
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Tag.
-
-
-        :param name: The name of this Tag.
-        :type name: str
-        """
-
-        self._name = name
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/models/user.py b/samples/server/petstore/python-flask-python2/openapi_server/models/user.py
deleted file mode 100644
index 3807bfe99782..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/models/user.py
+++ /dev/null
@@ -1,248 +0,0 @@
-# coding: utf-8
-
-from __future__ import absolute_import
-from datetime import date, datetime  # noqa: F401
-
-from typing import List, Dict  # noqa: F401
-
-from openapi_server.models.base_model_ import Model
-from openapi_server import util
-
-
-class User(Model):
-    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-
-    Do not edit the class manually.
-    """
-
-    def __init__(self, id=None, username=None, first_name=None, last_name=None, email=None, password=None, phone=None, user_status=None):  # noqa: E501
-        """User - a model defined in OpenAPI
-
-        :param id: The id of this User.  # noqa: E501
-        :type id: long
-        :param username: The username of this User.  # noqa: E501
-        :type username: str
-        :param first_name: The first_name of this User.  # noqa: E501
-        :type first_name: str
-        :param last_name: The last_name of this User.  # noqa: E501
-        :type last_name: str
-        :param email: The email of this User.  # noqa: E501
-        :type email: str
-        :param password: The password of this User.  # noqa: E501
-        :type password: str
-        :param phone: The phone of this User.  # noqa: E501
-        :type phone: str
-        :param user_status: The user_status of this User.  # noqa: E501
-        :type user_status: int
-        """
-        self.openapi_types = {
-            'id': long,
-            'username': str,
-            'first_name': str,
-            'last_name': str,
-            'email': str,
-            'password': str,
-            'phone': str,
-            'user_status': int
-        }
-
-        self.attribute_map = {
-            'id': 'id',
-            'username': 'username',
-            'first_name': 'firstName',
-            'last_name': 'lastName',
-            'email': 'email',
-            'password': 'password',
-            'phone': 'phone',
-            'user_status': 'userStatus'
-        }
-
-        self._id = id
-        self._username = username
-        self._first_name = first_name
-        self._last_name = last_name
-        self._email = email
-        self._password = password
-        self._phone = phone
-        self._user_status = user_status
-
-    @classmethod
-    def from_dict(cls, dikt):
-        """Returns the dict as a model
-
-        :param dikt: A dict.
-        :type: dict
-        :return: The User of this User.  # noqa: E501
-        :rtype: User
-        """
-        return util.deserialize_model(dikt, cls)
-
-    @property
-    def id(self):
-        """Gets the id of this User.
-
-
-        :return: The id of this User.
-        :rtype: long
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this User.
-
-
-        :param id: The id of this User.
-        :type id: long
-        """
-
-        self._id = id
-
-    @property
-    def username(self):
-        """Gets the username of this User.
-
-
-        :return: The username of this User.
-        :rtype: str
-        """
-        return self._username
-
-    @username.setter
-    def username(self, username):
-        """Sets the username of this User.
-
-
-        :param username: The username of this User.
-        :type username: str
-        """
-
-        self._username = username
-
-    @property
-    def first_name(self):
-        """Gets the first_name of this User.
-
-
-        :return: The first_name of this User.
-        :rtype: str
-        """
-        return self._first_name
-
-    @first_name.setter
-    def first_name(self, first_name):
-        """Sets the first_name of this User.
-
-
-        :param first_name: The first_name of this User.
-        :type first_name: str
-        """
-
-        self._first_name = first_name
-
-    @property
-    def last_name(self):
-        """Gets the last_name of this User.
-
-
-        :return: The last_name of this User.
-        :rtype: str
-        """
-        return self._last_name
-
-    @last_name.setter
-    def last_name(self, last_name):
-        """Sets the last_name of this User.
-
-
-        :param last_name: The last_name of this User.
-        :type last_name: str
-        """
-
-        self._last_name = last_name
-
-    @property
-    def email(self):
-        """Gets the email of this User.
-
-
-        :return: The email of this User.
-        :rtype: str
-        """
-        return self._email
-
-    @email.setter
-    def email(self, email):
-        """Sets the email of this User.
-
-
-        :param email: The email of this User.
-        :type email: str
-        """
-
-        self._email = email
-
-    @property
-    def password(self):
-        """Gets the password of this User.
-
-
-        :return: The password of this User.
-        :rtype: str
-        """
-        return self._password
-
-    @password.setter
-    def password(self, password):
-        """Sets the password of this User.
-
-
-        :param password: The password of this User.
-        :type password: str
-        """
-
-        self._password = password
-
-    @property
-    def phone(self):
-        """Gets the phone of this User.
-
-
-        :return: The phone of this User.
-        :rtype: str
-        """
-        return self._phone
-
-    @phone.setter
-    def phone(self, phone):
-        """Sets the phone of this User.
-
-
-        :param phone: The phone of this User.
-        :type phone: str
-        """
-
-        self._phone = phone
-
-    @property
-    def user_status(self):
-        """Gets the user_status of this User.
-
-        User Status  # noqa: E501
-
-        :return: The user_status of this User.
-        :rtype: int
-        """
-        return self._user_status
-
-    @user_status.setter
-    def user_status(self, user_status):
-        """Sets the user_status of this User.
-
-        User Status  # noqa: E501
-
-        :param user_status: The user_status of this User.
-        :type user_status: int
-        """
-
-        self._user_status = user_status
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml b/samples/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml
deleted file mode 100644
index 69c15a8f11a3..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml
+++ /dev/null
@@ -1,785 +0,0 @@
-openapi: 3.0.1
-info:
-  description: This is a sample server Petstore server. For this sample, you can use
-    the api key `special-key` to test the authorization filters.
-  license:
-    name: Apache-2.0
-    url: https://www.apache.org/licenses/LICENSE-2.0.html
-  title: OpenAPI Petstore
-  version: 1.0.0
-servers:
-- url: http://petstore.swagger.io/v2
-tags:
-- description: Everything about your Pets
-  name: pet
-- description: Access to Petstore orders
-  name: store
-- description: Operations about user
-  name: user
-paths:
-  /pet:
-    post:
-      operationId: add_pet
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Pet'
-          application/xml:
-            schema:
-              $ref: '#/components/schemas/Pet'
-        description: Pet object that needs to be added to the store
-        required: true
-      responses:
-        "405":
-          content: {}
-          description: Invalid input
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: Add a new pet to the store
-      tags:
-      - pet
-      x-codegen-request-body-name: body
-      x-openapi-router-controller: openapi_server.controllers.pet_controller
-    put:
-      operationId: update_pet
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Pet'
-          application/xml:
-            schema:
-              $ref: '#/components/schemas/Pet'
-        description: Pet object that needs to be added to the store
-        required: true
-      responses:
-        "400":
-          content: {}
-          description: Invalid ID supplied
-        "404":
-          content: {}
-          description: Pet not found
-        "405":
-          content: {}
-          description: Validation exception
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: Update an existing pet
-      tags:
-      - pet
-      x-codegen-request-body-name: body
-      x-openapi-router-controller: openapi_server.controllers.pet_controller
-  /pet/findByStatus:
-    get:
-      description: Multiple status values can be provided with comma separated strings
-      operationId: find_pets_by_status
-      parameters:
-      - description: Status values that need to be considered for filter
-        explode: false
-        in: query
-        name: status
-        required: true
-        schema:
-          items:
-            default: available
-            enum:
-            - available
-            - pending
-            - sold
-            type: string
-          type: array
-        style: form
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                items:
-                  $ref: '#/components/schemas/Pet'
-                type: array
-            application/json:
-              schema:
-                items:
-                  $ref: '#/components/schemas/Pet'
-                type: array
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid status value
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: Finds Pets by status
-      tags:
-      - pet
-      x-openapi-router-controller: openapi_server.controllers.pet_controller
-  /pet/findByTags:
-    get:
-      deprecated: true
-      description: Multiple tags can be provided with comma separated strings. Use
-        tag1, tag2, tag3 for testing.
-      operationId: find_pets_by_tags
-      parameters:
-      - description: Tags to filter by
-        explode: false
-        in: query
-        name: tags
-        required: true
-        schema:
-          items:
-            type: string
-          type: array
-        style: form
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                items:
-                  $ref: '#/components/schemas/Pet'
-                type: array
-            application/json:
-              schema:
-                items:
-                  $ref: '#/components/schemas/Pet'
-                type: array
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid tag value
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: Finds Pets by tags
-      tags:
-      - pet
-      x-openapi-router-controller: openapi_server.controllers.pet_controller
-  /pet/{petId}:
-    delete:
-      operationId: delete_pet
-      parameters:
-      - in: header
-        name: api_key
-        schema:
-          type: string
-      - description: Pet id to delete
-        in: path
-        name: petId
-        required: true
-        schema:
-          format: int64
-          type: integer
-      responses:
-        "400":
-          content: {}
-          description: Invalid pet value
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: Deletes a pet
-      tags:
-      - pet
-      x-openapi-router-controller: openapi_server.controllers.pet_controller
-    get:
-      description: Returns a single pet
-      operationId: get_pet_by_id
-      parameters:
-      - description: ID of pet to return
-        in: path
-        name: petId
-        required: true
-        schema:
-          format: int64
-          type: integer
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                $ref: '#/components/schemas/Pet'
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Pet'
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid ID supplied
-        "404":
-          content: {}
-          description: Pet not found
-      security:
-      - api_key: []
-      summary: Find pet by ID
-      tags:
-      - pet
-      x-openapi-router-controller: openapi_server.controllers.pet_controller
-    post:
-      operationId: update_pet_with_form
-      parameters:
-      - description: ID of pet that needs to be updated
-        in: path
-        name: petId
-        required: true
-        schema:
-          format: int64
-          type: integer
-      requestBody:
-        content:
-          application/x-www-form-urlencoded:
-            schema:
-              properties:
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
-      responses:
-        "405":
-          content: {}
-          description: Invalid input
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: Updates a pet in the store with form data
-      tags:
-      - pet
-      x-openapi-router-controller: openapi_server.controllers.pet_controller
-  /pet/{petId}/uploadImage:
-    post:
-      operationId: upload_file
-      parameters:
-      - description: ID of pet to update
-        in: path
-        name: petId
-        required: true
-        schema:
-          format: int64
-          type: integer
-      requestBody:
-        content:
-          multipart/form-data:
-            schema:
-              properties:
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ApiResponse'
-          description: successful operation
-      security:
-      - petstore_auth:
-        - write:pets
-        - read:pets
-      summary: uploads an image
-      tags:
-      - pet
-      x-openapi-router-controller: openapi_server.controllers.pet_controller
-  /store/inventory:
-    get:
-      description: Returns a map of status codes to quantities
-      operationId: get_inventory
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                additionalProperties:
-                  format: int32
-                  type: integer
-                type: object
-          description: successful operation
-      security:
-      - api_key: []
-      summary: Returns pet inventories by status
-      tags:
-      - store
-      x-openapi-router-controller: openapi_server.controllers.store_controller
-  /store/order:
-    post:
-      operationId: place_order
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              $ref: '#/components/schemas/Order'
-        description: order placed for purchasing the pet
-        required: true
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                $ref: '#/components/schemas/Order'
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid Order
-      summary: Place an order for a pet
-      tags:
-      - store
-      x-codegen-request-body-name: body
-      x-openapi-router-controller: openapi_server.controllers.store_controller
-  /store/order/{orderId}:
-    delete:
-      description: For valid response try integer IDs with value < 1000. Anything
-        above 1000 or nonintegers will generate API errors
-      operationId: delete_order
-      parameters:
-      - description: ID of the order that needs to be deleted
-        in: path
-        name: orderId
-        required: true
-        schema:
-          type: string
-      responses:
-        "400":
-          content: {}
-          description: Invalid ID supplied
-        "404":
-          content: {}
-          description: Order not found
-      summary: Delete purchase order by ID
-      tags:
-      - store
-      x-openapi-router-controller: openapi_server.controllers.store_controller
-    get:
-      description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
-      operationId: get_order_by_id
-      parameters:
-      - description: ID of pet that needs to be fetched
-        in: path
-        name: orderId
-        required: true
-        schema:
-          format: int64
-          maximum: 5
-          minimum: 1
-          type: integer
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                $ref: '#/components/schemas/Order'
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid ID supplied
-        "404":
-          content: {}
-          description: Order not found
-      summary: Find purchase order by ID
-      tags:
-      - store
-      x-openapi-router-controller: openapi_server.controllers.store_controller
-  /user:
-    post:
-      description: This can only be done by the logged in user.
-      operationId: create_user
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              $ref: '#/components/schemas/User'
-        description: Created user object
-        required: true
-      responses:
-        default:
-          content: {}
-          description: successful operation
-      summary: Create user
-      tags:
-      - user
-      x-codegen-request-body-name: body
-      x-openapi-router-controller: openapi_server.controllers.user_controller
-  /user/createWithArray:
-    post:
-      operationId: create_users_with_array_input
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              items:
-                $ref: '#/components/schemas/User'
-              type: array
-        description: List of user object
-        required: true
-      responses:
-        default:
-          content: {}
-          description: successful operation
-      summary: Creates list of users with given input array
-      tags:
-      - user
-      x-codegen-request-body-name: body
-      x-openapi-router-controller: openapi_server.controllers.user_controller
-  /user/createWithList:
-    post:
-      operationId: create_users_with_list_input
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              items:
-                $ref: '#/components/schemas/User'
-              type: array
-        description: List of user object
-        required: true
-      responses:
-        default:
-          content: {}
-          description: successful operation
-      summary: Creates list of users with given input array
-      tags:
-      - user
-      x-codegen-request-body-name: body
-      x-openapi-router-controller: openapi_server.controllers.user_controller
-  /user/login:
-    get:
-      operationId: login_user
-      parameters:
-      - description: The user name for login
-        in: query
-        name: username
-        required: true
-        schema:
-          type: string
-      - description: The password for login in clear text
-        in: query
-        name: password
-        required: true
-        schema:
-          type: string
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                type: string
-            application/json:
-              schema:
-                type: string
-          description: successful operation
-          headers:
-            X-Rate-Limit:
-              description: calls per hour allowed by the user
-              schema:
-                format: int32
-                type: integer
-            X-Expires-After:
-              description: date in UTC when toekn expires
-              schema:
-                format: date-time
-                type: string
-        "400":
-          content: {}
-          description: Invalid username/password supplied
-      summary: Logs user into the system
-      tags:
-      - user
-      x-openapi-router-controller: openapi_server.controllers.user_controller
-  /user/logout:
-    get:
-      operationId: logout_user
-      responses:
-        default:
-          content: {}
-          description: successful operation
-      summary: Logs out current logged in user session
-      tags:
-      - user
-      x-openapi-router-controller: openapi_server.controllers.user_controller
-  /user/{username}:
-    delete:
-      description: This can only be done by the logged in user.
-      operationId: delete_user
-      parameters:
-      - description: The name that needs to be deleted
-        in: path
-        name: username
-        required: true
-        schema:
-          type: string
-      responses:
-        "400":
-          content: {}
-          description: Invalid username supplied
-        "404":
-          content: {}
-          description: User not found
-      summary: Delete user
-      tags:
-      - user
-      x-openapi-router-controller: openapi_server.controllers.user_controller
-    get:
-      operationId: get_user_by_name
-      parameters:
-      - description: The name that needs to be fetched. Use user1 for testing.
-        in: path
-        name: username
-        required: true
-        schema:
-          type: string
-      responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                $ref: '#/components/schemas/User'
-            application/json:
-              schema:
-                $ref: '#/components/schemas/User'
-          description: successful operation
-        "400":
-          content: {}
-          description: Invalid username supplied
-        "404":
-          content: {}
-          description: User not found
-      summary: Get user by user name
-      tags:
-      - user
-      x-openapi-router-controller: openapi_server.controllers.user_controller
-    put:
-      description: This can only be done by the logged in user.
-      operationId: update_user
-      parameters:
-      - description: name that need to be deleted
-        in: path
-        name: username
-        required: true
-        schema:
-          type: string
-      requestBody:
-        content:
-          '*/*':
-            schema:
-              $ref: '#/components/schemas/User'
-        description: Updated user object
-        required: true
-      responses:
-        "400":
-          content: {}
-          description: Invalid user supplied
-        "404":
-          content: {}
-          description: User not found
-      summary: Updated user
-      tags:
-      - user
-      x-codegen-request-body-name: body
-      x-openapi-router-controller: openapi_server.controllers.user_controller
-components:
-  schemas:
-    Order:
-      description: An order for a pets from the pet store
-      example:
-        petId: 6
-        quantity: 1
-        id: 0
-        shipDate: 2000-01-23T04:56:07.000+00:00
-        complete: false
-        status: placed
-      properties:
-        id:
-          format: int64
-          type: integer
-        petId:
-          format: int64
-          type: integer
-        quantity:
-          format: int32
-          type: integer
-        shipDate:
-          format: date-time
-          type: string
-        status:
-          description: Order Status
-          enum:
-          - placed
-          - approved
-          - delivered
-          type: string
-        complete:
-          default: false
-          type: boolean
-      title: Pet Order
-      type: object
-      xml:
-        name: Order
-    Category:
-      description: A category for a pet
-      example:
-        name: name
-        id: 6
-      properties:
-        id:
-          format: int64
-          type: integer
-        name:
-          type: string
-      title: Pet category
-      type: object
-      xml:
-        name: Category
-    User:
-      description: A User who is purchasing from the pet store
-      example:
-        firstName: firstName
-        lastName: lastName
-        password: password
-        userStatus: 6
-        phone: phone
-        id: 0
-        email: email
-        username: username
-      properties:
-        id:
-          format: int64
-          type: integer
-        username:
-          type: string
-        firstName:
-          type: string
-        lastName:
-          type: string
-        email:
-          type: string
-        password:
-          type: string
-        phone:
-          type: string
-        userStatus:
-          description: User Status
-          format: int32
-          type: integer
-      title: a User
-      type: object
-      xml:
-        name: User
-    Tag:
-      description: A tag for a pet
-      example:
-        name: name
-        id: 1
-      properties:
-        id:
-          format: int64
-          type: integer
-        name:
-          type: string
-      title: Pet Tag
-      type: object
-      xml:
-        name: Tag
-    Pet:
-      description: A pet for sale in the pet store
-      example:
-        photoUrls:
-        - photoUrls
-        - photoUrls
-        name: doggie
-        id: 0
-        category:
-          name: name
-          id: 6
-        tags:
-        - name: name
-          id: 1
-        - name: name
-          id: 1
-        status: available
-      properties:
-        id:
-          format: int64
-          type: integer
-        category:
-          $ref: '#/components/schemas/Category'
-        name:
-          example: doggie
-          type: string
-        photoUrls:
-          items:
-            type: string
-          type: array
-          xml:
-            name: photoUrl
-            wrapped: true
-        tags:
-          items:
-            $ref: '#/components/schemas/Tag'
-          type: array
-          xml:
-            name: tag
-            wrapped: true
-        status:
-          description: pet status in the store
-          enum:
-          - available
-          - pending
-          - sold
-          type: string
-      required:
-      - name
-      - photoUrls
-      title: a Pet
-      type: object
-      xml:
-        name: Pet
-    ApiResponse:
-      description: Describes the result of uploading an image resource
-      example:
-        code: 0
-        type: type
-        message: message
-      properties:
-        code:
-          format: int32
-          type: integer
-        type:
-          type: string
-        message:
-          type: string
-      title: An uploaded response
-      type: object
-  securitySchemes:
-    petstore_auth:
-      flows:
-        implicit:
-          authorizationUrl: http://petstore.swagger.io/api/oauth/dialog
-          scopes:
-            write:pets: modify pets in your account
-            read:pets: read your pets
-      type: oauth2
-      x-tokenInfoFunc: openapi_server.controllers.security_controller_.info_from_petstore_auth
-      x-scopeValidateFunc: openapi_server.controllers.security_controller_.validate_scope_petstore_auth
-    api_key:
-      in: header
-      name: api_key
-      type: apiKey
-      x-apikeyInfoFunc: openapi_server.controllers.security_controller_.info_from_api_key
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/test/__init__.py b/samples/server/petstore/python-flask-python2/openapi_server/test/__init__.py
deleted file mode 100644
index 364aba9fbf88..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/test/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import logging
-
-import connexion
-from flask_testing import TestCase
-
-from openapi_server.encoder import JSONEncoder
-
-
-class BaseTestCase(TestCase):
-
-    def create_app(self):
-        logging.getLogger('connexion.operation').setLevel('ERROR')
-        app = connexion.App(__name__, specification_dir='../openapi/')
-        app.app.json_encoder = JSONEncoder
-        app.add_api('openapi.yaml', pythonic_params=True)
-        return app.app
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/test/test_pet_controller.py b/samples/server/petstore/python-flask-python2/openapi_server/test/test_pet_controller.py
deleted file mode 100644
index 3100b498b35f..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/test/test_pet_controller.py
+++ /dev/null
@@ -1,202 +0,0 @@
-# coding: utf-8
-
-from __future__ import absolute_import
-import unittest
-
-from flask import json
-from six import BytesIO
-
-from openapi_server.models.api_response import ApiResponse  # noqa: E501
-from openapi_server.models.pet import Pet  # noqa: E501
-from openapi_server.test import BaseTestCase
-
-
-class TestPetController(BaseTestCase):
-    """PetController integration test stubs"""
-
-    @unittest.skip("Connexion does not support multiple consummes. See https://github.com/zalando/connexion/pull/760")
-    def test_add_pet(self):
-        """Test case for add_pet
-
-        Add a new pet to the store
-        """
-        body = {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}
-        headers = { 
-            'Content-Type': 'application/json',
-            'Authorization': 'Bearer special-key',
-        }
-        response = self.client.open(
-            '/v2/pet',
-            method='POST',
-            headers=headers,
-            data=json.dumps(body),
-            content_type='application/json')
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    def test_delete_pet(self):
-        """Test case for delete_pet
-
-        Deletes a pet
-        """
-        headers = { 
-            'api_key': 'api_key_example',
-            'Authorization': 'Bearer special-key',
-        }
-        response = self.client.open(
-            '/v2/pet/{pet_id}'.format(pet_id=789),
-            method='DELETE',
-            headers=headers)
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    def test_find_pets_by_status(self):
-        """Test case for find_pets_by_status
-
-        Finds Pets by status
-        """
-        query_string = [('status', 'available')]
-        headers = { 
-            'Accept': 'application/json',
-            'Authorization': 'Bearer special-key',
-        }
-        response = self.client.open(
-            '/v2/pet/findByStatus',
-            method='GET',
-            headers=headers,
-            query_string=query_string)
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    def test_find_pets_by_tags(self):
-        """Test case for find_pets_by_tags
-
-        Finds Pets by tags
-        """
-        query_string = [('tags', 'tags_example')]
-        headers = { 
-            'Accept': 'application/json',
-            'Authorization': 'Bearer special-key',
-        }
-        response = self.client.open(
-            '/v2/pet/findByTags',
-            method='GET',
-            headers=headers,
-            query_string=query_string)
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    def test_get_pet_by_id(self):
-        """Test case for get_pet_by_id
-
-        Find pet by ID
-        """
-        headers = { 
-            'Accept': 'application/json',
-            'api_key': 'special-key',
-        }
-        response = self.client.open(
-            '/v2/pet/{pet_id}'.format(pet_id=789),
-            method='GET',
-            headers=headers)
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    @unittest.skip("Connexion does not support multiple consummes. See https://github.com/zalando/connexion/pull/760")
-    def test_update_pet(self):
-        """Test case for update_pet
-
-        Update an existing pet
-        """
-        body = {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}
-        headers = { 
-            'Content-Type': 'application/json',
-            'Authorization': 'Bearer special-key',
-        }
-        response = self.client.open(
-            '/v2/pet',
-            method='PUT',
-            headers=headers,
-            data=json.dumps(body),
-            content_type='application/json')
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    @unittest.skip("application/x-www-form-urlencoded not supported by Connexion")
-    def test_update_pet_with_form(self):
-        """Test case for update_pet_with_form
-
-        Updates a pet in the store with form data
-        """
-        headers = { 
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'Authorization': 'Bearer special-key',
-        }
-        data = dict(name='name_example',
-                    status='status_example')
-        response = self.client.open(
-            '/v2/pet/{pet_id}'.format(pet_id=789),
-            method='POST',
-            headers=headers,
-            data=data,
-            content_type='application/x-www-form-urlencoded')
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    @unittest.skip("multipart/form-data not supported by Connexion")
-    def test_upload_file(self):
-        """Test case for upload_file
-
-        uploads an image
-        """
-        headers = { 
-            'Accept': 'application/json',
-            'Content-Type': 'multipart/form-data',
-            'Authorization': 'Bearer special-key',
-        }
-        data = dict(additional_metadata='additional_metadata_example',
-                    file=(BytesIO(b'some file data'), 'file.txt'))
-        response = self.client.open(
-            '/v2/pet/{pet_id}/uploadImage'.format(pet_id=789),
-            method='POST',
-            headers=headers,
-            data=data,
-            content_type='multipart/form-data')
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/test/test_store_controller.py b/samples/server/petstore/python-flask-python2/openapi_server/test/test_store_controller.py
deleted file mode 100644
index e2d0c7ddd372..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/test/test_store_controller.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# coding: utf-8
-
-from __future__ import absolute_import
-import unittest
-
-from flask import json
-from six import BytesIO
-
-from openapi_server.models.order import Order  # noqa: E501
-from openapi_server.test import BaseTestCase
-
-
-class TestStoreController(BaseTestCase):
-    """StoreController integration test stubs"""
-
-    def test_delete_order(self):
-        """Test case for delete_order
-
-        Delete purchase order by ID
-        """
-        headers = { 
-        }
-        response = self.client.open(
-            '/v2/store/order/{order_id}'.format(order_id='order_id_example'),
-            method='DELETE',
-            headers=headers)
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    def test_get_inventory(self):
-        """Test case for get_inventory
-
-        Returns pet inventories by status
-        """
-        headers = { 
-            'Accept': 'application/json',
-            'api_key': 'special-key',
-        }
-        response = self.client.open(
-            '/v2/store/inventory',
-            method='GET',
-            headers=headers)
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    def test_get_order_by_id(self):
-        """Test case for get_order_by_id
-
-        Find purchase order by ID
-        """
-        headers = { 
-            'Accept': 'application/json',
-        }
-        response = self.client.open(
-            '/v2/store/order/{order_id}'.format(order_id=5),
-            method='GET',
-            headers=headers)
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    @unittest.skip("*/* not supported by Connexion. Use application/json instead. See https://github.com/zalando/connexion/pull/760")
-    def test_place_order(self):
-        """Test case for place_order
-
-        Place an order for a pet
-        """
-        body = {}
-        headers = { 
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-        }
-        response = self.client.open(
-            '/v2/store/order',
-            method='POST',
-            headers=headers,
-            data=json.dumps(body),
-            content_type='application/json')
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/test/test_user_controller.py b/samples/server/petstore/python-flask-python2/openapi_server/test/test_user_controller.py
deleted file mode 100644
index 172ff22d13d0..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/test/test_user_controller.py
+++ /dev/null
@@ -1,155 +0,0 @@
-# coding: utf-8
-
-from __future__ import absolute_import
-import unittest
-
-from flask import json
-from six import BytesIO
-
-from openapi_server.models.user import User  # noqa: E501
-from openapi_server.test import BaseTestCase
-
-
-class TestUserController(BaseTestCase):
-    """UserController integration test stubs"""
-
-    @unittest.skip("*/* not supported by Connexion. Use application/json instead. See https://github.com/zalando/connexion/pull/760")
-    def test_create_user(self):
-        """Test case for create_user
-
-        Create user
-        """
-        body = {}
-        headers = { 
-            'Content-Type': 'application/json',
-        }
-        response = self.client.open(
-            '/v2/user',
-            method='POST',
-            headers=headers,
-            data=json.dumps(body),
-            content_type='application/json')
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    @unittest.skip("*/* not supported by Connexion. Use application/json instead. See https://github.com/zalando/connexion/pull/760")
-    def test_create_users_with_array_input(self):
-        """Test case for create_users_with_array_input
-
-        Creates list of users with given input array
-        """
-        body = [{}]
-        headers = { 
-            'Content-Type': 'application/json',
-        }
-        response = self.client.open(
-            '/v2/user/createWithArray',
-            method='POST',
-            headers=headers,
-            data=json.dumps(body),
-            content_type='application/json')
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    @unittest.skip("*/* not supported by Connexion. Use application/json instead. See https://github.com/zalando/connexion/pull/760")
-    def test_create_users_with_list_input(self):
-        """Test case for create_users_with_list_input
-
-        Creates list of users with given input array
-        """
-        body = [{}]
-        headers = { 
-            'Content-Type': 'application/json',
-        }
-        response = self.client.open(
-            '/v2/user/createWithList',
-            method='POST',
-            headers=headers,
-            data=json.dumps(body),
-            content_type='application/json')
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    def test_delete_user(self):
-        """Test case for delete_user
-
-        Delete user
-        """
-        headers = { 
-        }
-        response = self.client.open(
-            '/v2/user/{username}'.format(username='username_example'),
-            method='DELETE',
-            headers=headers)
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    def test_get_user_by_name(self):
-        """Test case for get_user_by_name
-
-        Get user by user name
-        """
-        headers = { 
-            'Accept': 'application/json',
-        }
-        response = self.client.open(
-            '/v2/user/{username}'.format(username='username_example'),
-            method='GET',
-            headers=headers)
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    def test_login_user(self):
-        """Test case for login_user
-
-        Logs user into the system
-        """
-        query_string = [('username', 'username_example'),
-                        ('password', 'password_example')]
-        headers = { 
-            'Accept': 'application/json',
-        }
-        response = self.client.open(
-            '/v2/user/login',
-            method='GET',
-            headers=headers,
-            query_string=query_string)
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    def test_logout_user(self):
-        """Test case for logout_user
-
-        Logs out current logged in user session
-        """
-        headers = { 
-        }
-        response = self.client.open(
-            '/v2/user/logout',
-            method='GET',
-            headers=headers)
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-    @unittest.skip("*/* not supported by Connexion. Use application/json instead. See https://github.com/zalando/connexion/pull/760")
-    def test_update_user(self):
-        """Test case for update_user
-
-        Updated user
-        """
-        body = {}
-        headers = { 
-            'Content-Type': 'application/json',
-        }
-        response = self.client.open(
-            '/v2/user/{username}'.format(username='username_example'),
-            method='PUT',
-            headers=headers,
-            data=json.dumps(body),
-            content_type='application/json')
-        self.assert200(response,
-                       'Response body is : ' + response.data.decode('utf-8'))
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/typing_utils.py b/samples/server/petstore/python-flask-python2/openapi_server/typing_utils.py
deleted file mode 100644
index 0563f81fd534..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/typing_utils.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# coding: utf-8
-
-import sys
-
-if sys.version_info < (3, 7):
-    import typing
-
-    def is_generic(klass):
-        """ Determine whether klass is a generic class """
-        return type(klass) == typing.GenericMeta
-
-    def is_dict(klass):
-        """ Determine whether klass is a Dict """
-        return klass.__extra__ == dict
-
-    def is_list(klass):
-        """ Determine whether klass is a List """
-        return klass.__extra__ == list
-
-else:
-
-    def is_generic(klass):
-        """ Determine whether klass is a generic class """
-        return hasattr(klass, '__origin__')
-
-    def is_dict(klass):
-        """ Determine whether klass is a Dict """
-        return klass.__origin__ == dict
-
-    def is_list(klass):
-        """ Determine whether klass is a List """
-        return klass.__origin__ == list
diff --git a/samples/server/petstore/python-flask-python2/openapi_server/util.py b/samples/server/petstore/python-flask-python2/openapi_server/util.py
deleted file mode 100644
index e1185a713ec9..000000000000
--- a/samples/server/petstore/python-flask-python2/openapi_server/util.py
+++ /dev/null
@@ -1,142 +0,0 @@
-import datetime
-
-import six
-import typing
-from openapi_server import typing_utils
-
-
-def _deserialize(data, klass):
-    """Deserializes dict, list, str into an object.
-
-    :param data: dict, list or str.
-    :param klass: class literal, or string of class name.
-
-    :return: object.
-    """
-    if data is None:
-        return None
-
-    if klass in six.integer_types or klass in (float, str, bool, bytearray):
-        return _deserialize_primitive(data, klass)
-    elif klass == object:
-        return _deserialize_object(data)
-    elif klass == datetime.date:
-        return deserialize_date(data)
-    elif klass == datetime.datetime:
-        return deserialize_datetime(data)
-    elif typing_utils.is_generic(klass):
-        if typing_utils.is_list(klass):
-            return _deserialize_list(data, klass.__args__[0])
-        if typing_utils.is_dict(klass):
-            return _deserialize_dict(data, klass.__args__[1])
-    else:
-        return deserialize_model(data, klass)
-
-
-def _deserialize_primitive(data, klass):
-    """Deserializes to primitive type.
-
-    :param data: data to deserialize.
-    :param klass: class literal.
-
-    :return: int, long, float, str, bool.
-    :rtype: int | long | float | str | bool
-    """
-    try:
-        value = klass(data)
-    except UnicodeEncodeError:
-        value = six.u(data)
-    except TypeError:
-        value = data
-    return value
-
-
-def _deserialize_object(value):
-    """Return an original value.
-
-    :return: object.
-    """
-    return value
-
-
-def deserialize_date(string):
-    """Deserializes string to date.
-
-    :param string: str.
-    :type string: str
-    :return: date.
-    :rtype: date
-    """
-    try:
-        from dateutil.parser import parse
-        return parse(string).date()
-    except ImportError:
-        return string
-
-
-def deserialize_datetime(string):
-    """Deserializes string to datetime.
-
-    The string should be in iso8601 datetime format.
-
-    :param string: str.
-    :type string: str
-    :return: datetime.
-    :rtype: datetime
-    """
-    try:
-        from dateutil.parser import parse
-        return parse(string)
-    except ImportError:
-        return string
-
-
-def deserialize_model(data, klass):
-    """Deserializes list or dict to model.
-
-    :param data: dict, list.
-    :type data: dict | list
-    :param klass: class literal.
-    :return: model object.
-    """
-    instance = klass()
-
-    if not instance.openapi_types:
-        return data
-
-    for attr, attr_type in six.iteritems(instance.openapi_types):
-        if data is not None \
-                and instance.attribute_map[attr] in data \
-                and isinstance(data, (list, dict)):
-            value = data[instance.attribute_map[attr]]
-            setattr(instance, attr, _deserialize(value, attr_type))
-
-    return instance
-
-
-def _deserialize_list(data, boxed_type):
-    """Deserializes a list and its elements.
-
-    :param data: list to deserialize.
-    :type data: list
-    :param boxed_type: class literal.
-
-    :return: deserialized list.
-    :rtype: list
-    """
-    return [_deserialize(sub_data, boxed_type)
-            for sub_data in data]
-
-
-def _deserialize_dict(data, boxed_type):
-    """Deserializes a dict and its elements.
-
-    :param data: dict to deserialize.
-    :type data: dict
-    :param boxed_type: class literal.
-
-    :return: deserialized dict.
-    :rtype: dict
-    """
-    return {k: _deserialize(v, boxed_type)
-            for k, v in six.iteritems(data)}
diff --git a/samples/server/petstore/python-flask-python2/pom.xml b/samples/server/petstore/python-flask-python2/pom.xml
deleted file mode 100644
index 430bddf2ed3f..000000000000
--- a/samples/server/petstore/python-flask-python2/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>PythonFlaskConnexionTestsPython2</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>Python Flask Server python 2</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <id>test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>make</executable>
-                            <arguments>
-                                <argument>test-all</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/samples/server/petstore/python-flask-python2/requirements.txt b/samples/server/petstore/python-flask-python2/requirements.txt
deleted file mode 100644
index 55ef66307fc4..000000000000
--- a/samples/server/petstore/python-flask-python2/requirements.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-connexion[swagger-ui] >= 2.6.0; python_version>="3.6"
-# 2.3 is the last version that supports python 3.4-3.5
-connexion[swagger-ui] <= 2.3.0; python_version=="3.5" or python_version=="3.4"
-connexion[swagger-ui] == 2.4.0; python_version<="2.7"
-# connexion requires werkzeug but connexion < 2.4.0 does not install werkzeug
-# we must peg werkzeug versions below to fix connexion
-# https://github.com/zalando/connexion/pull/1044
-werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4"
-swagger-ui-bundle >= 0.0.2
-python_dateutil >= 2.6.0
-typing >= 3.5.2.2
-# For specs with timestamps, pyyaml 5.3 broke connexion's spec parsing in python 2.
-# Connexion uses copy.deepcopy() on the spec, thus hitting this bug:
-# https://github.com/yaml/pyyaml/issues/387
-pyyaml < 5.3; python_version<="2.7"
-setuptools >= 21.0.0
diff --git a/samples/server/petstore/python-flask-python2/setup.py b/samples/server/petstore/python-flask-python2/setup.py
deleted file mode 100644
index 322e14e654a7..000000000000
--- a/samples/server/petstore/python-flask-python2/setup.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-import sys
-from setuptools import setup, find_packages
-
-NAME = "openapi_server"
-VERSION = "1.0.0"
-
-# To install the library, run the following
-#
-# python setup.py install
-#
-# prerequisite: setuptools
-# http://pypi.python.org/pypi/setuptools
-
-REQUIRES = [
-    "connexion>=2.0.2",
-    "swagger-ui-bundle>=0.0.2",
-    "python_dateutil>=2.6.0",
-    "typing>=3.5.2.2"
-]
-
-setup(
-    name=NAME,
-    version=VERSION,
-    description="OpenAPI Petstore",
-    author_email="",
-    url="",
-    keywords=["OpenAPI", "OpenAPI Petstore"],
-    install_requires=REQUIRES,
-    packages=find_packages(),
-    package_data={'': ['openapi/openapi.yaml']},
-    include_package_data=True,
-    entry_points={
-        'console_scripts': ['openapi_server=openapi_server.__main__:main']},
-    long_description="""\
-    This is a sample server Petstore server. For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.
-    """
-)
-
diff --git a/samples/server/petstore/python-flask-python2/test-requirements.txt b/samples/server/petstore/python-flask-python2/test-requirements.txt
deleted file mode 100644
index 0970f28c7c5a..000000000000
--- a/samples/server/petstore/python-flask-python2/test-requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-pytest~=4.6.7 # needed for python 2.7+3.4
-pytest-cov>=2.8.1
-pytest-randomly==1.2.3 # needed for python 2.7+3.4
-Flask-Testing==0.8.0
diff --git a/samples/server/petstore/python-flask-python2/test_python2.sh b/samples/server/petstore/python-flask-python2/test_python2.sh
deleted file mode 100755
index 25da371537e5..000000000000
--- a/samples/server/petstore/python-flask-python2/test_python2.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-REQUIREMENTS_FILE=dev-requirements.txt
-REQUIREMENTS_OUT=dev-requirements.txt.log
-SETUP_OUT=*.egg-info
-VENV=.venv
-DEACTIVE=false
-
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
-
-### set virtualenv
-if [ -z "$VIRTUAL_ENV" ]; then
-		virtualenv $VENV --no-site-packages --always-copy --python python
-		source $VENV/bin/activate
-    DEACTIVE=true
-fi
-
-### install dependencies
-pip install -r $REQUIREMENTS_FILE | tee -a $REQUIREMENTS_OUT
-
-### run tests
-tox -e py27 || exit 1
-
-### static analysis of code
-#flake8 --show-source openapi_server/
-
-### deactivate virtualenv
-# if [ $DEACTIVE == true ]; then
-#     deactivate
-# fi
diff --git a/samples/server/petstore/python-flask-python2/tox.ini b/samples/server/petstore/python-flask-python2/tox.ini
deleted file mode 100644
index d63c4ac5aac0..000000000000
--- a/samples/server/petstore/python-flask-python2/tox.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[tox]
-envlist = py27, py3
-skipsdist=True
-
-[testenv]
-deps=-r{toxinidir}/requirements.txt
-     -r{toxinidir}/test-requirements.txt
-	 {toxinidir}
-
-commands=
-   pytest --cov=openapi_server
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs
index 44319896f1e0..e72d476174f4 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs
@@ -9,13 +9,14 @@ use std::io::{ErrorKind, Read};
 use std::error::Error;
 use std::future::Future;
 use std::fmt;
+use std::marker::PhantomData;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 use std::str;
 use std::str::FromStr;
 use std::string::ToString;
 use std::task::{Context, Poll};
-use swagger::{ApiError, AuthData, BodyExt, Connector, Has, XSpanIdString};
+use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, XSpanIdString};
 use url::form_urlencoded;
 
 use mime::Mime;
@@ -65,49 +66,57 @@ fn into_base_path(input: impl TryInto<Uri, Error=hyper::http::uri::InvalidUri>,
 }
 
 /// A client that implements the API by making HTTP calls out to a server.
-pub struct Client<S> where
+pub struct Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Inner service
     client_service: S,
 
     /// Base path of the API
     base_path: String,
+
+    /// Marker
+    marker: PhantomData<fn(C)>,
 }
 
-impl<S> fmt::Debug for Client<S> where
+impl<S, C> fmt::Debug for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Client {{ base_path: {} }}", self.base_path)
     }
 }
 
-impl<S> Clone for Client<S> where
+impl<S, C> Clone for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn clone(&self) -> Self {
         Self {
             client_service: self.client_service.clone(),
             base_path: self.base_path.clone(),
+            marker: PhantomData,
         }
     }
 }
 
-impl<C> Client<hyper::client::Client<C, Body>> where
-      C: hyper::client::connect::Connect + Clone + Send + Sync + 'static
+impl<Connector, C> Client<DropContextService<hyper::client::Client<Connector, Body>, C>, C> where
+    Connector: hyper::client::connect::Connect + Clone + Send + Sync + 'static,
+    C: Clone + Send + Sync + 'static,
 {
     /// Create a client with a custom implementation of hyper::client::Connect.
     ///
@@ -126,14 +135,16 @@ impl<C> Client<hyper::client::Client<C, Body>> where
     pub fn try_new_with_connector(
         base_path: &str,
         protocol: Option<&'static str>,
-        connector: C,
+        connector: Connector,
     ) -> Result<Self, ClientInitError>
     {
         let client_service = hyper::client::Client::builder().build(connector);
+        let client_service = DropContextService::new(client_service);
 
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, protocol)?,
+            marker: PhantomData,
         })
     }
 }
@@ -164,7 +175,9 @@ impl Service<Request<Body>> for HyperClient {
     }
 }
 
-impl Client<HyperClient> {
+impl<C> Client<DropContextService<HyperClient, C>, C> where
+    C: Clone + Send + Sync + 'static,
+{
     /// Create an HTTP client.
     ///
     /// # Arguments
@@ -194,14 +207,18 @@ impl Client<HyperClient> {
             }
         };
 
+        let client_service = DropContextService::new(client_service);
+
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
 
-impl Client<hyper::client::Client<hyper::client::HttpConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<hyper::client::HttpConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create an HTTP client.
     ///
@@ -222,7 +239,8 @@ type HttpsConnector = hyper_tls::HttpsConnector<hyper::client::HttpConnector>;
 #[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
 type HttpsConnector = hyper_openssl::HttpsConnector<hyper::client::HttpConnector>;
 
-impl Client<hyper::client::Client<HttpsConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<HttpsConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create a client with a TLS connection to the server
     ///
@@ -287,12 +305,13 @@ impl Client<hyper::client::Client<HttpsConnector, Body>>
     }
 }
 
-impl<S> Client<S> where
+impl<S, C> Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Constructor for creating a `Client` by passing in a pre-made `hyper::service::Service` /
     /// `tower::Service`
@@ -306,6 +325,7 @@ impl<S> Client<S> where
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
@@ -351,13 +371,13 @@ impl Error for ClientInitError {
 }
 
 #[async_trait]
-impl<C, S> Api<C> for Client<S> where
-    C: Has<XSpanIdString>  + Clone + Send + Sync + 'static,
+impl<S, C> Api<C> for Client<S, C> where
     S: Service<
-       Request<Body>,
+       (Request<Body>, C),
        Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Has<XSpanIdString>  + Clone + Send + Sync + 'static,
 {
     fn poll_ready(&self, cx: &mut Context) -> Poll<Result<(), crate::ServiceError>> {
         match self.client_service.clone().poll_ready(cx) {
@@ -480,7 +500,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -554,7 +574,7 @@ impl<C, S> Api<C> for Client<S> where
 
             let string_field_str = match serde_json::to_string(&param_string_field) {
                 Ok(str) => str,
-                Err(e) => return Err(ApiError(format!("Unable to parse string_field to string: {}", e))),
+                Err(e) => return Err(ApiError(format!("Unable to serialize string_field to string: {}", e))),
             };
 
             let string_field_vec = string_field_str.as_bytes().to_vec();
@@ -566,7 +586,7 @@ impl<C, S> Api<C> for Client<S> where
 
             let optional_string_field_str = match serde_json::to_string(&param_optional_string_field) {
                 Ok(str) => str,
-                Err(e) => return Err(ApiError(format!("Unable to parse optional_string_field to string: {}", e))),
+                Err(e) => return Err(ApiError(format!("Unable to serialize optional_string_field to string: {}", e))),
             };
 
             let optional_string_field_vec = optional_string_field_str.as_bytes().to_vec();
@@ -578,7 +598,7 @@ impl<C, S> Api<C> for Client<S> where
 
             let object_field_str = match serde_json::to_string(&param_object_field) {
                 Ok(str) => str,
-                Err(e) => return Err(ApiError(format!("Unable to parse object_field to string: {}", e))),
+                Err(e) => return Err(ApiError(format!("Unable to serialize object_field to string: {}", e))),
             };
 
             let object_field_vec = object_field_str.as_bytes().to_vec();
@@ -621,6 +641,7 @@ impl<C, S> Api<C> for Client<S> where
         };
 
         *request.body_mut() = Body::from(body_string);
+
         request.headers_mut().insert(CONTENT_TYPE, match HeaderValue::from_str(&multipart_header) {
             Ok(h) => h,
             Err(e) => return Err(ApiError(format!("Unable to create header: {} - {}", multipart_header, e)))
@@ -632,7 +653,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -759,7 +780,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
diff --git a/samples/server/petstore/rust-server/output/no-example-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/no-example-v3/src/client/mod.rs
index 5948c84d2eb3..c43b0ae8ad08 100644
--- a/samples/server/petstore/rust-server/output/no-example-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/no-example-v3/src/client/mod.rs
@@ -9,13 +9,14 @@ use std::io::{ErrorKind, Read};
 use std::error::Error;
 use std::future::Future;
 use std::fmt;
+use std::marker::PhantomData;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 use std::str;
 use std::str::FromStr;
 use std::string::ToString;
 use std::task::{Context, Poll};
-use swagger::{ApiError, AuthData, BodyExt, Connector, Has, XSpanIdString};
+use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, XSpanIdString};
 use url::form_urlencoded;
 
 
@@ -58,49 +59,57 @@ fn into_base_path(input: impl TryInto<Uri, Error=hyper::http::uri::InvalidUri>,
 }
 
 /// A client that implements the API by making HTTP calls out to a server.
-pub struct Client<S> where
+pub struct Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Inner service
     client_service: S,
 
     /// Base path of the API
     base_path: String,
+
+    /// Marker
+    marker: PhantomData<fn(C)>,
 }
 
-impl<S> fmt::Debug for Client<S> where
+impl<S, C> fmt::Debug for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Client {{ base_path: {} }}", self.base_path)
     }
 }
 
-impl<S> Clone for Client<S> where
+impl<S, C> Clone for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn clone(&self) -> Self {
         Self {
             client_service: self.client_service.clone(),
             base_path: self.base_path.clone(),
+            marker: PhantomData,
         }
     }
 }
 
-impl<C> Client<hyper::client::Client<C, Body>> where
-      C: hyper::client::connect::Connect + Clone + Send + Sync + 'static
+impl<Connector, C> Client<DropContextService<hyper::client::Client<Connector, Body>, C>, C> where
+    Connector: hyper::client::connect::Connect + Clone + Send + Sync + 'static,
+    C: Clone + Send + Sync + 'static,
 {
     /// Create a client with a custom implementation of hyper::client::Connect.
     ///
@@ -119,14 +128,16 @@ impl<C> Client<hyper::client::Client<C, Body>> where
     pub fn try_new_with_connector(
         base_path: &str,
         protocol: Option<&'static str>,
-        connector: C,
+        connector: Connector,
     ) -> Result<Self, ClientInitError>
     {
         let client_service = hyper::client::Client::builder().build(connector);
+        let client_service = DropContextService::new(client_service);
 
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, protocol)?,
+            marker: PhantomData,
         })
     }
 }
@@ -157,7 +168,9 @@ impl Service<Request<Body>> for HyperClient {
     }
 }
 
-impl Client<HyperClient> {
+impl<C> Client<DropContextService<HyperClient, C>, C> where
+    C: Clone + Send + Sync + 'static,
+{
     /// Create an HTTP client.
     ///
     /// # Arguments
@@ -187,14 +200,18 @@ impl Client<HyperClient> {
             }
         };
 
+        let client_service = DropContextService::new(client_service);
+
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
 
-impl Client<hyper::client::Client<hyper::client::HttpConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<hyper::client::HttpConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create an HTTP client.
     ///
@@ -215,7 +232,8 @@ type HttpsConnector = hyper_tls::HttpsConnector<hyper::client::HttpConnector>;
 #[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
 type HttpsConnector = hyper_openssl::HttpsConnector<hyper::client::HttpConnector>;
 
-impl Client<hyper::client::Client<HttpsConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<HttpsConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create a client with a TLS connection to the server
     ///
@@ -280,12 +298,13 @@ impl Client<hyper::client::Client<HttpsConnector, Body>>
     }
 }
 
-impl<S> Client<S> where
+impl<S, C> Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Constructor for creating a `Client` by passing in a pre-made `hyper::service::Service` /
     /// `tower::Service`
@@ -299,6 +318,7 @@ impl<S> Client<S> where
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
@@ -344,13 +364,13 @@ impl Error for ClientInitError {
 }
 
 #[async_trait]
-impl<C, S> Api<C> for Client<S> where
-    C: Has<XSpanIdString>  + Clone + Send + Sync + 'static,
+impl<S, C> Api<C> for Client<S, C> where
     S: Service<
-       Request<Body>,
+       (Request<Body>, C),
        Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Has<XSpanIdString>  + Clone + Send + Sync + 'static,
 {
     fn poll_ready(&self, cx: &mut Context) -> Poll<Result<(), crate::ServiceError>> {
         match self.client_service.clone().poll_ready(cx) {
@@ -411,7 +431,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/FILES b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/FILES
index 5033d9399037..5f3122fbc3d0 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/FILES
+++ b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/FILES
@@ -3,6 +3,7 @@
 Cargo.toml
 README.md
 api/openapi.yaml
+docs/AdditionalPropertiesWithList.md
 docs/AnotherXmlArray.md
 docs/AnotherXmlInner.md
 docs/AnotherXmlObject.md
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/README.md b/samples/server/petstore/rust-server/output/openapi-v3/README.md
index 6665a4aa63fe..b0fc2ee15f10 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/README.md
+++ b/samples/server/petstore/rust-server/output/openapi-v3/README.md
@@ -63,6 +63,7 @@ To run a client, follow one of the following simple steps:
 ```
 cargo run --example client CallbackWithHeaderPost
 cargo run --example client ComplexQueryParamGet
+cargo run --example client JsonComplexQueryParamGet
 cargo run --example client MandatoryRequestHeaderGet
 cargo run --example client MergePatchJsonGet
 cargo run --example client MultigetGet
@@ -119,6 +120,7 @@ Method | HTTP request | Description
 [****](docs/default_api.md#) | **POST** /callback-with-header | 
 [****](docs/default_api.md#) | **GET** /complex-query-param | 
 [****](docs/default_api.md#) | **GET** /enum_in_path/{path_param} | 
+[****](docs/default_api.md#) | **GET** /json-complex-query-param | 
 [****](docs/default_api.md#) | **GET** /mandatory-request-header | 
 [****](docs/default_api.md#) | **GET** /merge-patch-json | 
 [****](docs/default_api.md#) | **GET** /multiget | Get some stuff.
@@ -143,6 +145,7 @@ Method | HTTP request | Description
 
 ## Documentation For Models
 
+ - [AdditionalPropertiesWithList](docs/AdditionalPropertiesWithList.md)
  - [AnotherXmlArray](docs/AnotherXmlArray.md)
  - [AnotherXmlInner](docs/AnotherXmlInner.md)
  - [AnotherXmlObject](docs/AnotherXmlObject.md)
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/api/openapi.yaml b/samples/server/petstore/rust-server/output/openapi-v3/api/openapi.yaml
index 894bb1537ab6..907d126e3dad 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/api/openapi.yaml
+++ b/samples/server/petstore/rust-server/output/openapi-v3/api/openapi.yaml
@@ -211,6 +211,7 @@ paths:
           headers:
             Success-Info:
               explode: false
+              required: true
               schema:
                 type: String
               style: simple
@@ -406,6 +407,23 @@ paths:
           description: Success
       tags:
       - Repo
+  /json-complex-query-param:
+    get:
+      parameters:
+      - content:
+          application/json:
+            schema:
+              items:
+                $ref: '#/components/schemas/StringObject'
+              type: array
+        explode: true
+        in: query
+        name: list-of-strings
+        required: false
+        style: form
+      responses:
+        "200":
+          description: Success
 components:
   schemas:
     EnumWithStarObject:
@@ -540,6 +558,13 @@ components:
       type: boolean
     OptionalObjectHeader:
       type: integer
+    AdditionalPropertiesWithList:
+      additionalProperties:
+        items:
+          type: string
+        type: array
+      maxProperties: 1
+      type: object
     NullableTest:
       properties:
         nullable:
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/docs/AdditionalPropertiesWithList.md b/samples/server/petstore/rust-server/output/openapi-v3/docs/AdditionalPropertiesWithList.md
new file mode 100644
index 000000000000..a589150380b4
--- /dev/null
+++ b/samples/server/petstore/rust-server/output/openapi-v3/docs/AdditionalPropertiesWithList.md
@@ -0,0 +1,9 @@
+# AdditionalPropertiesWithList
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md b/samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md
index a6a5027eb0df..3271e66c40c7 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md
+++ b/samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md
@@ -7,6 +7,7 @@ Method | HTTP request | Description
 ****](default_api.md#) | **POST** /callback-with-header | 
 ****](default_api.md#) | **GET** /complex-query-param | 
 ****](default_api.md#) | **GET** /enum_in_path/{path_param} | 
+****](default_api.md#) | **GET** /json-complex-query-param | 
 ****](default_api.md#) | **GET** /mandatory-request-header | 
 ****](default_api.md#) | **GET** /merge-patch-json | 
 ****](default_api.md#) | **GET** /multiget | Get some stuff.
@@ -109,6 +110,38 @@ No authorization required
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# ****
+> (optional)
+
+
+### Required Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **optional** | **map[string]interface{}** | optional parameters | nil if no parameters
+
+### Optional Parameters
+Optional parameters are passed through a map[string]interface{}.
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **list_of_strings** | [**String**](String.md)|  | 
+
+### Return type
+
+ (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # ****
 > (x_header)
 
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/examples/client/main.rs b/samples/server/petstore/rust-server/output/openapi-v3/examples/client/main.rs
index 633d4e319145..700e2ff22353 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/examples/client/main.rs
+++ b/samples/server/petstore/rust-server/output/openapi-v3/examples/client/main.rs
@@ -9,6 +9,7 @@ use openapi_v3::{Api, ApiNoContext, Client, ContextWrapperExt, models,
                       CallbackWithHeaderPostResponse,
                       ComplexQueryParamGetResponse,
                       EnumInPathPathParamGetResponse,
+                      JsonComplexQueryParamGetResponse,
                       MandatoryRequestHeaderGetResponse,
                       MergePatchJsonGetResponse,
                       MultigetGetResponse,
@@ -52,6 +53,7 @@ fn main() {
             .possible_values(&[
                 "CallbackWithHeaderPost",
                 "ComplexQueryParamGet",
+                "JsonComplexQueryParamGet",
                 "MandatoryRequestHeaderGet",
                 "MergePatchJsonGet",
                 "MultigetGet",
@@ -138,6 +140,12 @@ fn main() {
             info!("{:?} (X-Span-ID: {:?})", result, (client.context() as &dyn Has<XSpanIdString>).get().clone());
         },
         */
+        Some("JsonComplexQueryParamGet") => {
+            let result = rt.block_on(client.json_complex_query_param_get(
+                  Some(&Vec::new())
+            ));
+            info!("{:?} (X-Span-ID: {:?})", result, (client.context() as &dyn Has<XSpanIdString>).get().clone());
+        },
         Some("MandatoryRequestHeaderGet") => {
             let result = rt.block_on(client.mandatory_request_header_get(
                   "x_header_example".to_string()
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs b/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs
index 9377679f314b..8df91e373f73 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs
+++ b/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs
@@ -99,6 +99,7 @@ use openapi_v3::{
     CallbackWithHeaderPostResponse,
     ComplexQueryParamGetResponse,
     EnumInPathPathParamGetResponse,
+    JsonComplexQueryParamGetResponse,
     MandatoryRequestHeaderGetResponse,
     MergePatchJsonGetResponse,
     MultigetGetResponse,
@@ -157,6 +158,16 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString> + Send + Sync
         Err("Generic failuare".into())
     }
 
+    async fn json_complex_query_param_get(
+        &self,
+        list_of_strings: Option<&Vec<models::StringObject>>,
+        context: &C) -> Result<JsonComplexQueryParamGetResponse, ApiError>
+    {
+        let context = context.clone();
+        info!("json_complex_query_param_get({:?}) - X-Span-ID: {:?}", list_of_strings, context.get().0.clone());
+        Err("Generic failuare".into())
+    }
+
     async fn mandatory_request_header_get(
         &self,
         x_header: String,
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs
index 46a800969749..3817bd07555b 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs
@@ -9,13 +9,14 @@ use std::io::{ErrorKind, Read};
 use std::error::Error;
 use std::future::Future;
 use std::fmt;
+use std::marker::PhantomData;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 use std::str;
 use std::str::FromStr;
 use std::string::ToString;
 use std::task::{Context, Poll};
-use swagger::{ApiError, AuthData, BodyExt, Connector, Has, XSpanIdString};
+use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, XSpanIdString};
 use url::form_urlencoded;
 
 
@@ -38,6 +39,7 @@ use crate::{Api,
      CallbackWithHeaderPostResponse,
      ComplexQueryParamGetResponse,
      EnumInPathPathParamGetResponse,
+     JsonComplexQueryParamGetResponse,
      MandatoryRequestHeaderGetResponse,
      MergePatchJsonGetResponse,
      MultigetGetResponse,
@@ -82,49 +84,57 @@ fn into_base_path(input: impl TryInto<Uri, Error=hyper::http::uri::InvalidUri>,
 }
 
 /// A client that implements the API by making HTTP calls out to a server.
-pub struct Client<S> where
+pub struct Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Inner service
     client_service: S,
 
     /// Base path of the API
     base_path: String,
+
+    /// Marker
+    marker: PhantomData<fn(C)>,
 }
 
-impl<S> fmt::Debug for Client<S> where
+impl<S, C> fmt::Debug for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Client {{ base_path: {} }}", self.base_path)
     }
 }
 
-impl<S> Clone for Client<S> where
+impl<S, C> Clone for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn clone(&self) -> Self {
         Self {
             client_service: self.client_service.clone(),
             base_path: self.base_path.clone(),
+            marker: PhantomData,
         }
     }
 }
 
-impl<C> Client<hyper::client::Client<C, Body>> where
-      C: hyper::client::connect::Connect + Clone + Send + Sync + 'static
+impl<Connector, C> Client<DropContextService<hyper::client::Client<Connector, Body>, C>, C> where
+    Connector: hyper::client::connect::Connect + Clone + Send + Sync + 'static,
+    C: Clone + Send + Sync + 'static,
 {
     /// Create a client with a custom implementation of hyper::client::Connect.
     ///
@@ -143,14 +153,16 @@ impl<C> Client<hyper::client::Client<C, Body>> where
     pub fn try_new_with_connector(
         base_path: &str,
         protocol: Option<&'static str>,
-        connector: C,
+        connector: Connector,
     ) -> Result<Self, ClientInitError>
     {
         let client_service = hyper::client::Client::builder().build(connector);
+        let client_service = DropContextService::new(client_service);
 
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, protocol)?,
+            marker: PhantomData,
         })
     }
 }
@@ -181,7 +193,9 @@ impl Service<Request<Body>> for HyperClient {
     }
 }
 
-impl Client<HyperClient> {
+impl<C> Client<DropContextService<HyperClient, C>, C> where
+    C: Clone + Send + Sync + 'static,
+{
     /// Create an HTTP client.
     ///
     /// # Arguments
@@ -211,14 +225,18 @@ impl Client<HyperClient> {
             }
         };
 
+        let client_service = DropContextService::new(client_service);
+
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
 
-impl Client<hyper::client::Client<hyper::client::HttpConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<hyper::client::HttpConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create an HTTP client.
     ///
@@ -239,7 +257,8 @@ type HttpsConnector = hyper_tls::HttpsConnector<hyper::client::HttpConnector>;
 #[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
 type HttpsConnector = hyper_openssl::HttpsConnector<hyper::client::HttpConnector>;
 
-impl Client<hyper::client::Client<HttpsConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<HttpsConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create a client with a TLS connection to the server
     ///
@@ -304,12 +323,13 @@ impl Client<hyper::client::Client<HttpsConnector, Body>>
     }
 }
 
-impl<S> Client<S> where
+impl<S, C> Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Constructor for creating a `Client` by passing in a pre-made `hyper::service::Service` /
     /// `tower::Service`
@@ -323,6 +343,7 @@ impl<S> Client<S> where
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
@@ -368,13 +389,13 @@ impl Error for ClientInitError {
 }
 
 #[async_trait]
-impl<C, S> Api<C> for Client<S> where
-    C: Has<XSpanIdString> + Has<Option<AuthData>> + Clone + Send + Sync + 'static,
+impl<S, C> Api<C> for Client<S, C> where
     S: Service<
-       Request<Body>,
+       (Request<Body>, C),
        Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Has<XSpanIdString> + Has<Option<AuthData>> + Clone + Send + Sync + 'static,
 {
     fn poll_ready(&self, cx: &mut Context) -> Poll<Result<(), crate::ServiceError>> {
         match self.client_service.clone().poll_ready(cx) {
@@ -398,7 +419,8 @@ impl<C, S> Api<C> for Client<S> where
         // Query parameters
         let query_string = {
             let mut query_string = form_urlencoded::Serializer::new("".to_owned());
-                query_string.append_pair("url", &param_url.to_string());
+                query_string.append_pair("url",
+                    &param_url.to_string());
             query_string.finish()
         };
         if !query_string.is_empty() {
@@ -425,7 +447,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -470,7 +492,8 @@ impl<C, S> Api<C> for Client<S> where
         let query_string = {
             let mut query_string = form_urlencoded::Serializer::new("".to_owned());
             if let Some(param_list_of_strings) = param_list_of_strings {
-                query_string.append_pair("list-of-strings", &param_list_of_strings.iter().map(ToString::to_string).collect::<Vec<String>>().join(","));
+                query_string.append_pair("list-of-strings",
+                    &param_list_of_strings.iter().map(ToString::to_string).collect::<Vec<String>>().join(","));
             }
             query_string.finish()
         };
@@ -498,7 +521,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -569,7 +592,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -599,6 +622,83 @@ impl<C, S> Api<C> for Client<S> where
         }
     }
 
+    async fn json_complex_query_param_get(
+        &self,
+        param_list_of_strings: Option<&Vec<models::StringObject>>,
+        context: &C) -> Result<JsonComplexQueryParamGetResponse, ApiError>
+    {
+        let mut client_service = self.client_service.clone();
+        let mut uri = format!(
+            "{}/json-complex-query-param",
+            self.base_path
+        );
+
+        // Query parameters
+        let query_string = {
+            let mut query_string = form_urlencoded::Serializer::new("".to_owned());
+            if let Some(param_list_of_strings) = param_list_of_strings {
+                query_string.append_pair("list-of-strings",
+                    &match serde_json::to_string(&param_list_of_strings) {
+                        Ok(str) => str,
+                        Err(e) => return Err(ApiError(format!("Unable to serialize list_of_strings to string: {}", e))),
+                    });
+            }
+            query_string.finish()
+        };
+        if !query_string.is_empty() {
+            uri += "?";
+            uri += &query_string;
+        }
+
+        let uri = match Uri::from_str(&uri) {
+            Ok(uri) => uri,
+            Err(err) => return Err(ApiError(format!("Unable to build URI: {}", err))),
+        };
+
+        let mut request = match Request::builder()
+            .method("GET")
+            .uri(uri)
+            .body(Body::empty()) {
+                Ok(req) => req,
+                Err(e) => return Err(ApiError(format!("Unable to create request: {}", e)))
+        };
+
+        let header = HeaderValue::from_str(Has::<XSpanIdString>::get(context).0.clone().to_string().as_str());
+        request.headers_mut().insert(HeaderName::from_static("x-span-id"), match header {
+            Ok(h) => h,
+            Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
+        });
+
+        let mut response = client_service.call((request, context.clone()))
+            .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
+
+        match response.status().as_u16() {
+            200 => {
+                let body = response.into_body();
+                Ok(
+                    JsonComplexQueryParamGetResponse::Success
+                )
+            }
+            code => {
+                let headers = response.headers().clone();
+                let body = response.into_body()
+                       .take(100)
+                       .to_raw().await;
+                Err(ApiError(format!("Unexpected response code {}:\n{:?}\n\n{}",
+                    code,
+                    headers,
+                    match body {
+                        Ok(body) => match String::from_utf8(body) {
+                            Ok(body) => body,
+                            Err(e) => format!("<Body was not UTF8: {:?}>", e),
+                        },
+                        Err(e) => format!("<Failed to read body: {}>", e),
+                    }
+                )))
+            }
+        }
+    }
+
     async fn mandatory_request_header_get(
         &self,
         param_x_header: String,
@@ -650,7 +750,7 @@ impl<C, S> Api<C> for Client<S> where
                 },
             });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -719,7 +819,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -794,7 +894,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -959,7 +1059,7 @@ impl<C, S> Api<C> for Client<S> where
             }
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1028,7 +1128,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1075,13 +1175,16 @@ impl<C, S> Api<C> for Client<S> where
         let query_string = {
             let mut query_string = form_urlencoded::Serializer::new("".to_owned());
             if let Some(param_uuid) = param_uuid {
-                query_string.append_pair("uuid", &param_uuid.to_string());
+                query_string.append_pair("uuid",
+                    &param_uuid.to_string());
             }
             if let Some(param_some_object) = param_some_object {
-                query_string.append_pair("someObject", &param_some_object.to_string());
+                query_string.append_pair("someObject",
+                    &param_some_object.to_string());
             }
             if let Some(param_some_list) = param_some_list {
-                query_string.append_pair("someList", &param_some_list.to_string());
+                query_string.append_pair("someList",
+                    &param_some_list.to_string());
             }
             query_string.finish()
         };
@@ -1109,7 +1212,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1201,7 +1304,7 @@ impl<C, S> Api<C> for Client<S> where
             }
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1245,7 +1348,8 @@ impl<C, S> Api<C> for Client<S> where
         // Query parameters
         let query_string = {
             let mut query_string = form_urlencoded::Serializer::new("".to_owned());
-                query_string.append_pair("url", &param_url.to_string());
+                query_string.append_pair("url",
+                    &param_url.to_string());
             query_string.finish()
         };
         if !query_string.is_empty() {
@@ -1272,7 +1376,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1350,7 +1454,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1419,52 +1523,55 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
             200 => {
                 let response_success_info = match response.headers().get(HeaderName::from_static("success-info")) {
-                    Some(response_success_info) => response_success_info.clone(),
-                    None => {
-                        return Err(ApiError(String::from("Required response header Success-Info for response 200 was not found.")));
-                    }
-                };
-                let response_success_info = match TryInto::<header::IntoHeaderValue<String>>::try_into(response_success_info) {
-                    Ok(value) => value,
-                    Err(e) => {
-                        return Err(ApiError(format!("Invalid response header Success-Info for response 200 - {}", e)));
-                    },
+                    Some(response_success_info) => {
+                        let response_success_info = response_success_info.clone();
+                        let response_success_info = match TryInto::<header::IntoHeaderValue<String>>::try_into(response_success_info) {
+                            Ok(value) => value,
+                            Err(e) => {
+                                return Err(ApiError(format!("Invalid response header Success-Info for response 200 - {}", e)));
+                            },
+                        };
+                        let response_success_info = response_success_info.0;
+                        response_success_info
+                        },
+                    None => return Err(ApiError(String::from("Required response header Success-Info for response 200 was not found."))),
                 };
-                let response_success_info = response_success_info.0;
 
                 let response_bool_header = match response.headers().get(HeaderName::from_static("bool-header")) {
-                    Some(response_bool_header) => response_bool_header.clone(),
-                    None => {
-                        return Err(ApiError(String::from("Required response header Bool-Header for response 200 was not found.")));
-                    }
-                };
-                let response_bool_header = match TryInto::<header::IntoHeaderValue<bool>>::try_into(response_bool_header) {
-                    Ok(value) => value,
-                    Err(e) => {
-                        return Err(ApiError(format!("Invalid response header Bool-Header for response 200 - {}", e)));
-                    },
+                    Some(response_bool_header) => {
+                        let response_bool_header = response_bool_header.clone();
+                        let response_bool_header = match TryInto::<header::IntoHeaderValue<bool>>::try_into(response_bool_header) {
+                            Ok(value) => value,
+                            Err(e) => {
+                                return Err(ApiError(format!("Invalid response header Bool-Header for response 200 - {}", e)));
+                            },
+                        };
+                        let response_bool_header = response_bool_header.0;
+                        Some(response_bool_header)
+                        },
+                    None => None,
                 };
-                let response_bool_header = response_bool_header.0;
 
                 let response_object_header = match response.headers().get(HeaderName::from_static("object-header")) {
-                    Some(response_object_header) => response_object_header.clone(),
-                    None => {
-                        return Err(ApiError(String::from("Required response header Object-Header for response 200 was not found.")));
-                    }
-                };
-                let response_object_header = match TryInto::<header::IntoHeaderValue<models::ObjectHeader>>::try_into(response_object_header) {
-                    Ok(value) => value,
-                    Err(e) => {
-                        return Err(ApiError(format!("Invalid response header Object-Header for response 200 - {}", e)));
-                    },
+                    Some(response_object_header) => {
+                        let response_object_header = response_object_header.clone();
+                        let response_object_header = match TryInto::<header::IntoHeaderValue<models::ObjectHeader>>::try_into(response_object_header) {
+                            Ok(value) => value,
+                            Err(e) => {
+                                return Err(ApiError(format!("Invalid response header Object-Header for response 200 - {}", e)));
+                            },
+                        };
+                        let response_object_header = response_object_header.0;
+                        Some(response_object_header)
+                        },
+                    None => None,
                 };
-                let response_object_header = response_object_header.0;
 
                 let body = response.into_body();
                 let body = body
@@ -1484,32 +1591,34 @@ impl<C, S> Api<C> for Client<S> where
             }
             412 => {
                 let response_further_info = match response.headers().get(HeaderName::from_static("further-info")) {
-                    Some(response_further_info) => response_further_info.clone(),
-                    None => {
-                        return Err(ApiError(String::from("Required response header Further-Info for response 412 was not found.")));
-                    }
-                };
-                let response_further_info = match TryInto::<header::IntoHeaderValue<String>>::try_into(response_further_info) {
-                    Ok(value) => value,
-                    Err(e) => {
-                        return Err(ApiError(format!("Invalid response header Further-Info for response 412 - {}", e)));
-                    },
+                    Some(response_further_info) => {
+                        let response_further_info = response_further_info.clone();
+                        let response_further_info = match TryInto::<header::IntoHeaderValue<String>>::try_into(response_further_info) {
+                            Ok(value) => value,
+                            Err(e) => {
+                                return Err(ApiError(format!("Invalid response header Further-Info for response 412 - {}", e)));
+                            },
+                        };
+                        let response_further_info = response_further_info.0;
+                        Some(response_further_info)
+                        },
+                    None => None,
                 };
-                let response_further_info = response_further_info.0;
 
                 let response_failure_info = match response.headers().get(HeaderName::from_static("failure-info")) {
-                    Some(response_failure_info) => response_failure_info.clone(),
-                    None => {
-                        return Err(ApiError(String::from("Required response header Failure-Info for response 412 was not found.")));
-                    }
-                };
-                let response_failure_info = match TryInto::<header::IntoHeaderValue<String>>::try_into(response_failure_info) {
-                    Ok(value) => value,
-                    Err(e) => {
-                        return Err(ApiError(format!("Invalid response header Failure-Info for response 412 - {}", e)));
-                    },
+                    Some(response_failure_info) => {
+                        let response_failure_info = response_failure_info.clone();
+                        let response_failure_info = match TryInto::<header::IntoHeaderValue<String>>::try_into(response_failure_info) {
+                            Ok(value) => value,
+                            Err(e) => {
+                                return Err(ApiError(format!("Invalid response header Failure-Info for response 412 - {}", e)));
+                            },
+                        };
+                        let response_failure_info = response_failure_info.0;
+                        Some(response_failure_info)
+                        },
+                    None => None,
                 };
-                let response_failure_info = response_failure_info.0;
 
                 let body = response.into_body();
                 Ok(
@@ -1579,7 +1688,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1694,7 +1803,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1763,7 +1872,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1851,7 +1960,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1939,7 +2048,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2036,7 +2145,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2124,7 +2233,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2214,7 +2323,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2299,7 +2408,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2370,7 +2479,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs
index fee0011bc984..6a269c49f2a9 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs
+++ b/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs
@@ -29,6 +29,12 @@ pub enum EnumInPathPathParamGetResponse {
     Success
 }
 
+#[derive(Debug, PartialEq)]
+pub enum JsonComplexQueryParamGetResponse {
+    /// Success
+    Success
+}
+
 #[derive(Debug, PartialEq)]
 pub enum MandatoryRequestHeaderGetResponse {
     /// Success
@@ -118,16 +124,32 @@ pub enum ResponsesWithHeadersGetResponse {
     Success
     {
         body: String,
-        success_info: String,
-        bool_header: bool,
-        object_header: models::ObjectHeader
+        success_info:
+        String
+        ,
+        bool_header:
+        Option<
+        bool
+        >
+        ,
+        object_header:
+        Option<
+        models::ObjectHeader
+        >
     }
     ,
     /// Precondition Failed
     PreconditionFailed
     {
-        further_info: String,
-        failure_info: String
+        further_info:
+        Option<
+        String
+        >
+        ,
+        failure_info:
+        Option<
+        String
+        >
     }
 }
 
@@ -246,6 +268,11 @@ pub trait Api<C: Send + Sync> {
         path_param: models::StringEnum,
         context: &C) -> Result<EnumInPathPathParamGetResponse, ApiError>;
 
+    async fn json_complex_query_param_get(
+        &self,
+        list_of_strings: Option<&Vec<models::StringObject>>,
+        context: &C) -> Result<JsonComplexQueryParamGetResponse, ApiError>;
+
     async fn mandatory_request_header_get(
         &self,
         x_header: String,
@@ -368,6 +395,11 @@ pub trait ApiNoContext<C: Send + Sync> {
         path_param: models::StringEnum,
         ) -> Result<EnumInPathPathParamGetResponse, ApiError>;
 
+    async fn json_complex_query_param_get(
+        &self,
+        list_of_strings: Option<&Vec<models::StringObject>>,
+        ) -> Result<JsonComplexQueryParamGetResponse, ApiError>;
+
     async fn mandatory_request_header_get(
         &self,
         x_header: String,
@@ -517,6 +549,15 @@ impl<T: Api<C> + Send + Sync, C: Clone + Send + Sync> ApiNoContext<C> for Contex
         self.api().enum_in_path_path_param_get(path_param, &context).await
     }
 
+    async fn json_complex_query_param_get(
+        &self,
+        list_of_strings: Option<&Vec<models::StringObject>>,
+        ) -> Result<JsonComplexQueryParamGetResponse, ApiError>
+    {
+        let context = self.context().clone();
+        self.api().json_complex_query_param_get(list_of_strings, &context).await
+    }
+
     async fn mandatory_request_header_get(
         &self,
         x_header: String,
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs
index 884dab3b875b..729d1279e63c 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs
+++ b/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs
@@ -5,6 +5,66 @@ use crate::models;
 use crate::header;
 
 
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+#[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
+pub struct AdditionalPropertiesWithList(std::collections::HashMap<String, Vec<String>>);
+
+impl std::convert::From<std::collections::HashMap<String, Vec<String>>> for AdditionalPropertiesWithList {
+    fn from(x: std::collections::HashMap<String, Vec<String>>) -> Self {
+        AdditionalPropertiesWithList(x)
+    }
+}
+
+
+impl std::convert::From<AdditionalPropertiesWithList> for std::collections::HashMap<String, Vec<String>> {
+    fn from(x: AdditionalPropertiesWithList) -> Self {
+        x.0
+    }
+}
+
+impl std::ops::Deref for AdditionalPropertiesWithList {
+    type Target = std::collections::HashMap<String, Vec<String>>;
+    fn deref(&self) -> &std::collections::HashMap<String, Vec<String>> {
+        &self.0
+    }
+}
+
+impl std::ops::DerefMut for AdditionalPropertiesWithList {
+    fn deref_mut(&mut self) -> &mut std::collections::HashMap<String, Vec<String>> {
+        &mut self.0
+    }
+}
+
+/// Converts the AdditionalPropertiesWithList value to the Query Parameters representation (style=form, explode=false)
+/// specified in https://swagger.io/docs/specification/serialization/
+/// Should be implemented in a serde serializer
+impl ::std::string::ToString for AdditionalPropertiesWithList {
+    fn to_string(&self) -> String {
+        // Skipping additionalProperties in query parameter serialization
+        "".to_string()
+    }
+}
+
+/// Converts Query Parameters representation (style=form, explode=false) to a AdditionalPropertiesWithList value
+/// as specified in https://swagger.io/docs/specification/serialization/
+/// Should be implemented in a serde deserializer
+impl ::std::str::FromStr for AdditionalPropertiesWithList {
+    type Err = &'static str;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        std::result::Result::Err("Parsing additionalProperties for AdditionalPropertiesWithList is not supported")
+    }
+}
+
+impl AdditionalPropertiesWithList {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn to_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
 // Methods for converting between header::IntoHeaderValue<AnotherXmlArray> and hyper::header::HeaderValue
 
 #[cfg(any(feature = "client", feature = "server"))]
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/server/callbacks.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/server/callbacks.rs
index 0f3ab78824ac..fff50aecdfe6 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/src/server/callbacks.rs
+++ b/samples/server/petstore/rust-server/output/openapi-v3/src/server/callbacks.rs
@@ -9,13 +9,14 @@ use std::io::{ErrorKind, Read};
 use std::error::Error;
 use std::future::Future;
 use std::fmt;
+use std::marker::PhantomData;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 use std::str;
 use std::str::FromStr;
 use std::string::ToString;
 use std::task::{Context, Poll};
-use swagger::{ApiError, AuthData, BodyExt, Connector, Has, XSpanIdString};
+use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, XSpanIdString};
 use url::form_urlencoded;
 
 
@@ -39,45 +40,53 @@ use crate::CallbackCallbackWithHeaderPostResponse;
 use crate::CallbackCallbackPostResponse;
 
 /// A client that implements the API by making HTTP calls out to a server.
-pub struct Client<S> where
+pub struct Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>,
            Error=hyper::Error> + Clone + Send + Sync,
     S::Future: Send + 'static,
+    C: Clone + Send + Sync + 'static
 {
     /// Inner service
     client_service: S,
+
+    /// Marker
+    marker: PhantomData<fn(C)>,
 }
 
-impl<S> fmt::Debug for Client<S> where
+impl<S, C> fmt::Debug for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>,
            Error=hyper::Error> + Clone + Send + Sync,
     S::Future: Send + 'static,
+    C: Clone + Send + Sync + 'static
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Client")
     }
 }
 
-impl<S> Clone for Client<S> where
+impl<S, C> Clone for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>,
            Error=hyper::Error> + Clone + Send + Sync,
     S::Future: Send + 'static,
+    C: Clone + Send + Sync + 'static
 {
     fn clone(&self) -> Self {
         Self {
             client_service: self.client_service.clone(),
+            marker: PhantomData,
         }
     }
 }
 
-impl<C> Client<hyper::client::Client<C, Body>> where
-      C: hyper::client::connect::Connect + Clone + Send + Sync + 'static
+impl<Connector, C> Client<DropContextService<hyper::client::Client<Connector, Body>, C>, C> where
+    Connector: hyper::client::connect::Connect + Clone + Send + Sync + 'static,
+    C: Clone + Send + Sync + 'static
 {
     /// Create a client with a custom implementation of hyper::client::Connect.
     ///
@@ -91,17 +100,20 @@ impl<C> Client<hyper::client::Client<C, Body>> where
     /// # Arguments
     ///
     /// * `connector` - Implementation of `hyper::client::Connect` to use for the client
-    pub fn new_with_connector(connector: C) -> Self
+    pub fn new_with_connector(connector: Connector) -> Self
     {
         let client_service = hyper::client::Client::builder().build(connector);
+        let client_service = DropContextService::new(client_service);
 
         Self {
             client_service,
+            marker: PhantomData,
         }
     }
 }
 
-impl Client<hyper::client::Client<hyper::client::HttpConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<hyper::client::HttpConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create an HTTP client.
     pub fn new_http() -> Self {
@@ -116,7 +128,8 @@ type HttpConnector = hyper_tls::HttpsConnector<hyper::client::HttpConnector>;
 #[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
 type HttpsConnector = hyper_openssl::HttpsConnector<hyper::client::HttpConnector>;
 
-impl Client<hyper::client::Client<HttpsConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<HttpsConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create a client with a TLS connection to the server.
     #[cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))]
@@ -177,12 +190,13 @@ impl Client<hyper::client::Client<HttpsConnector, Body>>
     }
 }
 
-impl<S> Client<S> where
+impl<S, C> Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>,
            Error=hyper::Error> + Clone + Send + Sync,
     S::Future: Send + 'static,
+    C: Clone + Send + Sync + 'static
 {
     /// Constructor for creating a `Client` by passing in a pre-made `swagger::Service`
     ///
@@ -192,19 +206,20 @@ impl<S> Client<S> where
     ) -> Self {
         Client {
             client_service,
+            marker: PhantomData,
         }
     }
 }
 
 #[async_trait]
-impl<C, S> CallbackApi<C> for Client<S> where
-    C: Has<XSpanIdString> + Has<Option<AuthData>> + Send + Sync,
+impl<S, C> CallbackApi<C> for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>,
            Error=hyper::Error> + Clone + Send + Sync,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Has<XSpanIdString> + Has<Option<AuthData>> + Clone + Send + Sync,
 {
     fn poll_ready(&self, cx: &mut Context) -> Poll<Result<(), crate::ServiceError>> {
         match self.client_service.clone().poll_ready(cx) {
@@ -271,7 +286,7 @@ impl<C, S> CallbackApi<C> for Client<S> where
             None => {}
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -341,7 +356,7 @@ impl<C, S> CallbackApi<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs
index 1244ae2af5b3..eb6ca9839322 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs
+++ b/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs
@@ -25,6 +25,7 @@ use crate::{Api,
      CallbackWithHeaderPostResponse,
      ComplexQueryParamGetResponse,
      EnumInPathPathParamGetResponse,
+     JsonComplexQueryParamGetResponse,
      MandatoryRequestHeaderGetResponse,
      MergePatchJsonGetResponse,
      MultigetGetResponse,
@@ -57,6 +58,7 @@ mod paths {
             r"^/callback-with-header$",
             r"^/complex-query-param$",
             r"^/enum_in_path/(?P<path_param>[^/?#]*)$",
+            r"^/json-complex-query-param$",
             r"^/mandatory-request-header$",
             r"^/merge-patch-json$",
             r"^/multiget$",
@@ -86,29 +88,30 @@ mod paths {
             regex::Regex::new(r"^/enum_in_path/(?P<path_param>[^/?#]*)$")
                 .expect("Unable to create regex for ENUM_IN_PATH_PATH_PARAM");
     }
-    pub(crate) static ID_MANDATORY_REQUEST_HEADER: usize = 3;
-    pub(crate) static ID_MERGE_PATCH_JSON: usize = 4;
-    pub(crate) static ID_MULTIGET: usize = 5;
-    pub(crate) static ID_MULTIPLE_AUTH_SCHEME: usize = 6;
-    pub(crate) static ID_OVERRIDE_SERVER: usize = 7;
-    pub(crate) static ID_PARAMGET: usize = 8;
-    pub(crate) static ID_READONLY_AUTH_SCHEME: usize = 9;
-    pub(crate) static ID_REGISTER_CALLBACK: usize = 10;
-    pub(crate) static ID_REPOS: usize = 11;
-    pub(crate) static ID_REPOS_REPOID: usize = 12;
+    pub(crate) static ID_JSON_COMPLEX_QUERY_PARAM: usize = 3;
+    pub(crate) static ID_MANDATORY_REQUEST_HEADER: usize = 4;
+    pub(crate) static ID_MERGE_PATCH_JSON: usize = 5;
+    pub(crate) static ID_MULTIGET: usize = 6;
+    pub(crate) static ID_MULTIPLE_AUTH_SCHEME: usize = 7;
+    pub(crate) static ID_OVERRIDE_SERVER: usize = 8;
+    pub(crate) static ID_PARAMGET: usize = 9;
+    pub(crate) static ID_READONLY_AUTH_SCHEME: usize = 10;
+    pub(crate) static ID_REGISTER_CALLBACK: usize = 11;
+    pub(crate) static ID_REPOS: usize = 12;
+    pub(crate) static ID_REPOS_REPOID: usize = 13;
     lazy_static! {
         pub static ref REGEX_REPOS_REPOID: regex::Regex =
             regex::Regex::new(r"^/repos/(?P<repoId>[^/?#]*)$")
                 .expect("Unable to create regex for REPOS_REPOID");
     }
-    pub(crate) static ID_REQUIRED_OCTET_STREAM: usize = 13;
-    pub(crate) static ID_RESPONSES_WITH_HEADERS: usize = 14;
-    pub(crate) static ID_RFC7807: usize = 15;
-    pub(crate) static ID_UNTYPED_PROPERTY: usize = 16;
-    pub(crate) static ID_UUID: usize = 17;
-    pub(crate) static ID_XML: usize = 18;
-    pub(crate) static ID_XML_EXTRA: usize = 19;
-    pub(crate) static ID_XML_OTHER: usize = 20;
+    pub(crate) static ID_REQUIRED_OCTET_STREAM: usize = 14;
+    pub(crate) static ID_RESPONSES_WITH_HEADERS: usize = 15;
+    pub(crate) static ID_RFC7807: usize = 16;
+    pub(crate) static ID_UNTYPED_PROPERTY: usize = 17;
+    pub(crate) static ID_UUID: usize = 18;
+    pub(crate) static ID_XML: usize = 19;
+    pub(crate) static ID_XML_EXTRA: usize = 20;
+    pub(crate) static ID_XML_OTHER: usize = 21;
 }
 
 pub struct MakeService<T, C> where
@@ -220,17 +223,26 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                 let param_url = query_params.iter().filter(|e| e.0 == "url").map(|e| e.1.to_owned())
                     .nth(0);
                 let param_url = match param_url {
-                    Some(param_url) => match param_url.parse::<String>() {
-                        Ok(param_url) => param_url,
-                        Err(e) => return Ok(Response::builder()
-                                        .status(StatusCode::BAD_REQUEST)
-                                        .body(Body::from(format!("Couldn't parse query parameter url - doesn't match schema: {}", e)))
-                                        .expect("Unable to create Bad Request response for invalid query parameter url")),
+                    Some(param_url) => {
+                        let param_url =
+                            <String as std::str::FromStr>::from_str
+                                (&param_url);
+                        match param_url {
+                            Ok(param_url) => Some(param_url),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter url - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter url")),
+                        }
                     },
+                    None => None,
+                };
+                let param_url = match param_url {
+                    Some(param_url) => param_url,
                     None => return Ok(Response::builder()
-                                        .status(StatusCode::BAD_REQUEST)
-                                        .body(Body::from("Missing required query parameter url"))
-                                        .expect("Unable to create Bad Request response for missing qeury parameter url")),
+                        .status(StatusCode::BAD_REQUEST)
+                        .body(Body::from("Missing required query parameter url"))
+                        .expect("Unable to create Bad Request response for missing query parameter url")),
                 };
 
                                 let result = api_impl.callback_with_header_post(
@@ -355,6 +367,56 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                                         Ok(response)
             },
 
+            // JsonComplexQueryParamGet - GET /json-complex-query-param
+            &hyper::Method::GET if path.matched(paths::ID_JSON_COMPLEX_QUERY_PARAM) => {
+                // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
+                let query_params = form_urlencoded::parse(uri.query().unwrap_or_default().as_bytes()).collect::<Vec<_>>();
+                let param_list_of_strings = query_params.iter().filter(|e| e.0 == "list-of-strings").map(|e| e.1.to_owned())
+                    .nth(0);
+                let param_list_of_strings = match param_list_of_strings {
+                    Some(param_list_of_strings) => {
+                        let param_list_of_strings =
+                            serde_json::from_str::<Vec<models::StringObject>>
+                                (&param_list_of_strings);
+                        match param_list_of_strings {
+                            Ok(param_list_of_strings) => Some(param_list_of_strings),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter list-of-strings - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter list-of-strings")),
+                        }
+                    },
+                    None => None,
+                };
+
+                                let result = api_impl.json_complex_query_param_get(
+                                            param_list_of_strings.as_ref(),
+                                        &context
+                                    ).await;
+                                let mut response = Response::new(Body::empty());
+                                response.headers_mut().insert(
+                                            HeaderName::from_static("x-span-id"),
+                                            HeaderValue::from_str((&context as &dyn Has<XSpanIdString>).get().0.clone().to_string().as_str())
+                                                .expect("Unable to create X-Span-ID header value"));
+
+                                        match result {
+                                            Ok(rsp) => match rsp {
+                                                JsonComplexQueryParamGetResponse::Success
+                                                => {
+                                                    *response.status_mut() = StatusCode::from_u16(200).expect("Unable to turn 200 into a StatusCode");
+                                                },
+                                            },
+                                            Err(_) => {
+                                                // Application code returned an error. This should not happen, as the implementation should
+                                                // return a valid response.
+                                                *response.status_mut() = StatusCode::INTERNAL_SERVER_ERROR;
+                                                *response.body_mut() = Body::from("An internal error occurred");
+                                            },
+                                        }
+
+                                        Ok(response)
+            },
+
             // MandatoryRequestHeaderGet - GET /mandatory-request-header
             &hyper::Method::GET if path.matched(paths::ID_MANDATORY_REQUEST_HEADER) => {
                 // Header parameters
@@ -640,13 +702,55 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                 let query_params = form_urlencoded::parse(uri.query().unwrap_or_default().as_bytes()).collect::<Vec<_>>();
                 let param_uuid = query_params.iter().filter(|e| e.0 == "uuid").map(|e| e.1.to_owned())
                     .nth(0);
-                let param_uuid = param_uuid.and_then(|param_uuid| param_uuid.parse::<>().ok());
+                let param_uuid = match param_uuid {
+                    Some(param_uuid) => {
+                        let param_uuid =
+                            <uuid::Uuid as std::str::FromStr>::from_str
+                                (&param_uuid);
+                        match param_uuid {
+                            Ok(param_uuid) => Some(param_uuid),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter uuid - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter uuid")),
+                        }
+                    },
+                    None => None,
+                };
                 let param_some_object = query_params.iter().filter(|e| e.0 == "someObject").map(|e| e.1.to_owned())
                     .nth(0);
-                let param_some_object = param_some_object.and_then(|param_some_object| param_some_object.parse::<>().ok());
+                let param_some_object = match param_some_object {
+                    Some(param_some_object) => {
+                        let param_some_object =
+                            <models::ObjectParam as std::str::FromStr>::from_str
+                                (&param_some_object);
+                        match param_some_object {
+                            Ok(param_some_object) => Some(param_some_object),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter someObject - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter someObject")),
+                        }
+                    },
+                    None => None,
+                };
                 let param_some_list = query_params.iter().filter(|e| e.0 == "someList").map(|e| e.1.to_owned())
                     .nth(0);
-                let param_some_list = param_some_list.and_then(|param_some_list| param_some_list.parse::<>().ok());
+                let param_some_list = match param_some_list {
+                    Some(param_some_list) => {
+                        let param_some_list =
+                            <models::MyIdList as std::str::FromStr>::from_str
+                                (&param_some_list);
+                        match param_some_list {
+                            Ok(param_some_list) => Some(param_some_list),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter someList - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter someList")),
+                        }
+                    },
+                    None => None,
+                };
 
                                 let result = api_impl.paramget_get(
                                             param_uuid,
@@ -750,17 +854,26 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                 let param_url = query_params.iter().filter(|e| e.0 == "url").map(|e| e.1.to_owned())
                     .nth(0);
                 let param_url = match param_url {
-                    Some(param_url) => match param_url.parse::<String>() {
-                        Ok(param_url) => param_url,
-                        Err(e) => return Ok(Response::builder()
-                                        .status(StatusCode::BAD_REQUEST)
-                                        .body(Body::from(format!("Couldn't parse query parameter url - doesn't match schema: {}", e)))
-                                        .expect("Unable to create Bad Request response for invalid query parameter url")),
+                    Some(param_url) => {
+                        let param_url =
+                            <String as std::str::FromStr>::from_str
+                                (&param_url);
+                        match param_url {
+                            Ok(param_url) => Some(param_url),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter url - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter url")),
+                        }
                     },
+                    None => None,
+                };
+                let param_url = match param_url {
+                    Some(param_url) => param_url,
                     None => return Ok(Response::builder()
-                                        .status(StatusCode::BAD_REQUEST)
-                                        .body(Body::from("Missing required query parameter url"))
-                                        .expect("Unable to create Bad Request response for missing qeury parameter url")),
+                        .status(StatusCode::BAD_REQUEST)
+                        .body(Body::from("Missing required query parameter url"))
+                        .expect("Unable to create Bad Request response for missing query parameter url")),
                 };
 
                                 let result = api_impl.register_callback_post(
@@ -877,6 +990,11 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                                                         }
                                                     };
 
+                                                    response.headers_mut().insert(
+                                                        HeaderName::from_static("success-info"),
+                                                        success_info
+                                                    );
+                                                    if let Some(bool_header) = bool_header {
                                                     let bool_header = match header::IntoHeaderValue(bool_header).try_into() {
                                                         Ok(val) => val,
                                                         Err(e) => {
@@ -887,6 +1005,12 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                                                         }
                                                     };
 
+                                                    response.headers_mut().insert(
+                                                        HeaderName::from_static("bool-header"),
+                                                        bool_header
+                                                    );
+                                                    }
+                                                    if let Some(object_header) = object_header {
                                                     let object_header = match header::IntoHeaderValue(object_header).try_into() {
                                                         Ok(val) => val,
                                                         Err(e) => {
@@ -897,19 +1021,12 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                                                         }
                                                     };
 
-                                                    *response.status_mut() = StatusCode::from_u16(200).expect("Unable to turn 200 into a StatusCode");
-                                                    response.headers_mut().insert(
-                                                        HeaderName::from_static("success-info"),
-                                                        success_info
-                                                    );
-                                                    response.headers_mut().insert(
-                                                        HeaderName::from_static("bool-header"),
-                                                        bool_header
-                                                    );
                                                     response.headers_mut().insert(
                                                         HeaderName::from_static("object-header"),
                                                         object_header
                                                     );
+                                                    }
+                                                    *response.status_mut() = StatusCode::from_u16(200).expect("Unable to turn 200 into a StatusCode");
                                                     response.headers_mut().insert(
                                                         CONTENT_TYPE,
                                                         HeaderValue::from_str("application/json")
@@ -923,6 +1040,7 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                                                         failure_info
                                                     }
                                                 => {
+                                                    if let Some(further_info) = further_info {
                                                     let further_info = match header::IntoHeaderValue(further_info).try_into() {
                                                         Ok(val) => val,
                                                         Err(e) => {
@@ -933,6 +1051,12 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                                                         }
                                                     };
 
+                                                    response.headers_mut().insert(
+                                                        HeaderName::from_static("further-info"),
+                                                        further_info
+                                                    );
+                                                    }
+                                                    if let Some(failure_info) = failure_info {
                                                     let failure_info = match header::IntoHeaderValue(failure_info).try_into() {
                                                         Ok(val) => val,
                                                         Err(e) => {
@@ -943,15 +1067,12 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                                                         }
                                                     };
 
-                                                    *response.status_mut() = StatusCode::from_u16(412).expect("Unable to turn 412 into a StatusCode");
-                                                    response.headers_mut().insert(
-                                                        HeaderName::from_static("further-info"),
-                                                        further_info
-                                                    );
                                                     response.headers_mut().insert(
                                                         HeaderName::from_static("failure-info"),
                                                         failure_info
                                                     );
+                                                    }
+                                                    *response.status_mut() = StatusCode::from_u16(412).expect("Unable to turn 412 into a StatusCode");
                                                 },
                                             },
                                             Err(_) => {
@@ -1604,6 +1725,7 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
             _ if path.matched(paths::ID_CALLBACK_WITH_HEADER) => method_not_allowed(),
             _ if path.matched(paths::ID_COMPLEX_QUERY_PARAM) => method_not_allowed(),
             _ if path.matched(paths::ID_ENUM_IN_PATH_PATH_PARAM) => method_not_allowed(),
+            _ if path.matched(paths::ID_JSON_COMPLEX_QUERY_PARAM) => method_not_allowed(),
             _ if path.matched(paths::ID_MANDATORY_REQUEST_HEADER) => method_not_allowed(),
             _ if path.matched(paths::ID_MERGE_PATCH_JSON) => method_not_allowed(),
             _ if path.matched(paths::ID_MULTIGET) => method_not_allowed(),
@@ -1641,6 +1763,8 @@ impl<T> RequestParser<T> for ApiRequestParser {
             &hyper::Method::GET if path.matched(paths::ID_COMPLEX_QUERY_PARAM) => Ok("ComplexQueryParamGet"),
             // EnumInPathPathParamGet - GET /enum_in_path/{path_param}
             &hyper::Method::GET if path.matched(paths::ID_ENUM_IN_PATH_PATH_PARAM) => Ok("EnumInPathPathParamGet"),
+            // JsonComplexQueryParamGet - GET /json-complex-query-param
+            &hyper::Method::GET if path.matched(paths::ID_JSON_COMPLEX_QUERY_PARAM) => Ok("JsonComplexQueryParamGet"),
             // MandatoryRequestHeaderGet - GET /mandatory-request-header
             &hyper::Method::GET if path.matched(paths::ID_MANDATORY_REQUEST_HEADER) => Ok("MandatoryRequestHeaderGet"),
             // MergePatchJsonGet - GET /merge-patch-json
diff --git a/samples/server/petstore/rust-server/output/ops-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/ops-v3/src/client/mod.rs
index 48817db8753c..86c8aaa7a4a5 100644
--- a/samples/server/petstore/rust-server/output/ops-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/ops-v3/src/client/mod.rs
@@ -9,13 +9,14 @@ use std::io::{ErrorKind, Read};
 use std::error::Error;
 use std::future::Future;
 use std::fmt;
+use std::marker::PhantomData;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 use std::str;
 use std::str::FromStr;
 use std::string::ToString;
 use std::task::{Context, Poll};
-use swagger::{ApiError, AuthData, BodyExt, Connector, Has, XSpanIdString};
+use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, XSpanIdString};
 use url::form_urlencoded;
 
 
@@ -94,49 +95,57 @@ fn into_base_path(input: impl TryInto<Uri, Error=hyper::http::uri::InvalidUri>,
 }
 
 /// A client that implements the API by making HTTP calls out to a server.
-pub struct Client<S> where
+pub struct Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Inner service
     client_service: S,
 
     /// Base path of the API
     base_path: String,
+
+    /// Marker
+    marker: PhantomData<fn(C)>,
 }
 
-impl<S> fmt::Debug for Client<S> where
+impl<S, C> fmt::Debug for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Client {{ base_path: {} }}", self.base_path)
     }
 }
 
-impl<S> Clone for Client<S> where
+impl<S, C> Clone for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn clone(&self) -> Self {
         Self {
             client_service: self.client_service.clone(),
             base_path: self.base_path.clone(),
+            marker: PhantomData,
         }
     }
 }
 
-impl<C> Client<hyper::client::Client<C, Body>> where
-      C: hyper::client::connect::Connect + Clone + Send + Sync + 'static
+impl<Connector, C> Client<DropContextService<hyper::client::Client<Connector, Body>, C>, C> where
+    Connector: hyper::client::connect::Connect + Clone + Send + Sync + 'static,
+    C: Clone + Send + Sync + 'static,
 {
     /// Create a client with a custom implementation of hyper::client::Connect.
     ///
@@ -155,14 +164,16 @@ impl<C> Client<hyper::client::Client<C, Body>> where
     pub fn try_new_with_connector(
         base_path: &str,
         protocol: Option<&'static str>,
-        connector: C,
+        connector: Connector,
     ) -> Result<Self, ClientInitError>
     {
         let client_service = hyper::client::Client::builder().build(connector);
+        let client_service = DropContextService::new(client_service);
 
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, protocol)?,
+            marker: PhantomData,
         })
     }
 }
@@ -193,7 +204,9 @@ impl Service<Request<Body>> for HyperClient {
     }
 }
 
-impl Client<HyperClient> {
+impl<C> Client<DropContextService<HyperClient, C>, C> where
+    C: Clone + Send + Sync + 'static,
+{
     /// Create an HTTP client.
     ///
     /// # Arguments
@@ -223,14 +236,18 @@ impl Client<HyperClient> {
             }
         };
 
+        let client_service = DropContextService::new(client_service);
+
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
 
-impl Client<hyper::client::Client<hyper::client::HttpConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<hyper::client::HttpConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create an HTTP client.
     ///
@@ -251,7 +268,8 @@ type HttpsConnector = hyper_tls::HttpsConnector<hyper::client::HttpConnector>;
 #[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
 type HttpsConnector = hyper_openssl::HttpsConnector<hyper::client::HttpConnector>;
 
-impl Client<hyper::client::Client<HttpsConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<HttpsConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create a client with a TLS connection to the server
     ///
@@ -316,12 +334,13 @@ impl Client<hyper::client::Client<HttpsConnector, Body>>
     }
 }
 
-impl<S> Client<S> where
+impl<S, C> Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Constructor for creating a `Client` by passing in a pre-made `hyper::service::Service` /
     /// `tower::Service`
@@ -335,6 +354,7 @@ impl<S> Client<S> where
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
@@ -380,13 +400,13 @@ impl Error for ClientInitError {
 }
 
 #[async_trait]
-impl<C, S> Api<C> for Client<S> where
-    C: Has<XSpanIdString>  + Clone + Send + Sync + 'static,
+impl<S, C> Api<C> for Client<S, C> where
     S: Service<
-       Request<Body>,
+       (Request<Body>, C),
        Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Has<XSpanIdString>  + Clone + Send + Sync + 'static,
 {
     fn poll_ready(&self, cx: &mut Context) -> Poll<Result<(), crate::ServiceError>> {
         match self.client_service.clone().poll_ready(cx) {
@@ -435,7 +455,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -504,7 +524,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -573,7 +593,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -642,7 +662,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -711,7 +731,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -780,7 +800,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -849,7 +869,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -918,7 +938,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -987,7 +1007,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1056,7 +1076,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1125,7 +1145,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1194,7 +1214,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1263,7 +1283,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1332,7 +1352,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1401,7 +1421,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1470,7 +1490,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1539,7 +1559,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1608,7 +1628,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1677,7 +1697,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1746,7 +1766,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1815,7 +1835,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1884,7 +1904,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1953,7 +1973,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2022,7 +2042,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2091,7 +2111,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2160,7 +2180,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2229,7 +2249,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2298,7 +2318,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2367,7 +2387,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2436,7 +2456,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2505,7 +2525,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2574,7 +2594,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2643,7 +2663,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2712,7 +2732,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2781,7 +2801,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2850,7 +2870,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2919,7 +2939,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
index f6e3986c318e..cdb16442bc40 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
@@ -9,13 +9,14 @@ use std::io::{ErrorKind, Read};
 use std::error::Error;
 use std::future::Future;
 use std::fmt;
+use std::marker::PhantomData;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 use std::str;
 use std::str::FromStr;
 use std::string::ToString;
 use std::task::{Context, Poll};
-use swagger::{ApiError, AuthData, BodyExt, Connector, Has, XSpanIdString};
+use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, XSpanIdString};
 use url::form_urlencoded;
 
 use mime::Mime;
@@ -95,49 +96,57 @@ fn into_base_path(input: impl TryInto<Uri, Error=hyper::http::uri::InvalidUri>,
 }
 
 /// A client that implements the API by making HTTP calls out to a server.
-pub struct Client<S> where
+pub struct Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Inner service
     client_service: S,
 
     /// Base path of the API
     base_path: String,
+
+    /// Marker
+    marker: PhantomData<fn(C)>,
 }
 
-impl<S> fmt::Debug for Client<S> where
+impl<S, C> fmt::Debug for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Client {{ base_path: {} }}", self.base_path)
     }
 }
 
-impl<S> Clone for Client<S> where
+impl<S, C> Clone for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn clone(&self) -> Self {
         Self {
             client_service: self.client_service.clone(),
             base_path: self.base_path.clone(),
+            marker: PhantomData,
         }
     }
 }
 
-impl<C> Client<hyper::client::Client<C, Body>> where
-      C: hyper::client::connect::Connect + Clone + Send + Sync + 'static
+impl<Connector, C> Client<DropContextService<hyper::client::Client<Connector, Body>, C>, C> where
+    Connector: hyper::client::connect::Connect + Clone + Send + Sync + 'static,
+    C: Clone + Send + Sync + 'static,
 {
     /// Create a client with a custom implementation of hyper::client::Connect.
     ///
@@ -156,14 +165,16 @@ impl<C> Client<hyper::client::Client<C, Body>> where
     pub fn try_new_with_connector(
         base_path: &str,
         protocol: Option<&'static str>,
-        connector: C,
+        connector: Connector,
     ) -> Result<Self, ClientInitError>
     {
         let client_service = hyper::client::Client::builder().build(connector);
+        let client_service = DropContextService::new(client_service);
 
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, protocol)?,
+            marker: PhantomData,
         })
     }
 }
@@ -194,7 +205,9 @@ impl Service<Request<Body>> for HyperClient {
     }
 }
 
-impl Client<HyperClient> {
+impl<C> Client<DropContextService<HyperClient, C>, C> where
+    C: Clone + Send + Sync + 'static,
+{
     /// Create an HTTP client.
     ///
     /// # Arguments
@@ -224,14 +237,18 @@ impl Client<HyperClient> {
             }
         };
 
+        let client_service = DropContextService::new(client_service);
+
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
 
-impl Client<hyper::client::Client<hyper::client::HttpConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<hyper::client::HttpConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create an HTTP client.
     ///
@@ -252,7 +269,8 @@ type HttpsConnector = hyper_tls::HttpsConnector<hyper::client::HttpConnector>;
 #[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
 type HttpsConnector = hyper_openssl::HttpsConnector<hyper::client::HttpConnector>;
 
-impl Client<hyper::client::Client<HttpsConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<HttpsConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create a client with a TLS connection to the server
     ///
@@ -317,12 +335,13 @@ impl Client<hyper::client::Client<HttpsConnector, Body>>
     }
 }
 
-impl<S> Client<S> where
+impl<S, C> Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Constructor for creating a `Client` by passing in a pre-made `hyper::service::Service` /
     /// `tower::Service`
@@ -336,6 +355,7 @@ impl<S> Client<S> where
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
@@ -381,13 +401,13 @@ impl Error for ClientInitError {
 }
 
 #[async_trait]
-impl<C, S> Api<C> for Client<S> where
-    C: Has<XSpanIdString> + Has<Option<AuthData>> + Clone + Send + Sync + 'static,
+impl<S, C> Api<C> for Client<S, C> where
     S: Service<
-       Request<Body>,
+       (Request<Body>, C),
        Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Has<XSpanIdString> + Has<Option<AuthData>> + Clone + Send + Sync + 'static,
 {
     fn poll_ready(&self, cx: &mut Context) -> Poll<Result<(), crate::ServiceError>> {
         match self.client_service.clone().poll_ready(cx) {
@@ -448,7 +468,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -523,7 +543,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -605,7 +625,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -693,7 +713,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -781,7 +801,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -869,7 +889,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -944,7 +964,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1015,7 +1035,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1060,7 +1080,8 @@ impl<C, S> Api<C> for Client<S> where
         // Query parameters
         let query_string = {
             let mut query_string = form_urlencoded::Serializer::new("".to_owned());
-                query_string.append_pair("query", &param_query.to_string());
+                query_string.append_pair("query",
+                    &param_query.to_string());
             query_string.finish()
         };
         if !query_string.is_empty() {
@@ -1095,7 +1116,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1173,7 +1194,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1303,7 +1324,7 @@ impl<C, S> Api<C> for Client<S> where
             }
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1360,16 +1381,20 @@ impl<C, S> Api<C> for Client<S> where
         let query_string = {
             let mut query_string = form_urlencoded::Serializer::new("".to_owned());
             if let Some(param_enum_query_string_array) = param_enum_query_string_array {
-                query_string.append_pair("enum_query_string_array", &param_enum_query_string_array.iter().map(ToString::to_string).collect::<Vec<String>>().join(","));
+                query_string.append_pair("enum_query_string_array",
+                    &param_enum_query_string_array.iter().map(ToString::to_string).collect::<Vec<String>>().join(","));
             }
             if let Some(param_enum_query_string) = param_enum_query_string {
-                query_string.append_pair("enum_query_string", &param_enum_query_string.to_string());
+                query_string.append_pair("enum_query_string",
+                    &param_enum_query_string.to_string());
             }
             if let Some(param_enum_query_integer) = param_enum_query_integer {
-                query_string.append_pair("enum_query_integer", &param_enum_query_integer.to_string());
+                query_string.append_pair("enum_query_integer",
+                    &param_enum_query_integer.to_string());
             }
             if let Some(param_enum_query_double) = param_enum_query_double {
-                query_string.append_pair("enum_query_double", &param_enum_query_double.to_string());
+                query_string.append_pair("enum_query_double",
+                    &param_enum_query_double.to_string());
             }
             query_string.finish()
         };
@@ -1439,7 +1464,7 @@ impl<C, S> Api<C> for Client<S> where
             None => {}
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1523,7 +1548,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1606,7 +1631,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1699,7 +1724,7 @@ impl<C, S> Api<C> for Client<S> where
             }
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1801,7 +1826,7 @@ impl<C, S> Api<C> for Client<S> where
             }
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1906,7 +1931,7 @@ impl<C, S> Api<C> for Client<S> where
             None => {}
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1950,7 +1975,8 @@ impl<C, S> Api<C> for Client<S> where
         // Query parameters
         let query_string = {
             let mut query_string = form_urlencoded::Serializer::new("".to_owned());
-                query_string.append_pair("status", &param_status.iter().map(ToString::to_string).collect::<Vec<String>>().join(","));
+                query_string.append_pair("status",
+                    &param_status.iter().map(ToString::to_string).collect::<Vec<String>>().join(","));
             query_string.finish()
         };
         if !query_string.is_empty() {
@@ -1994,7 +2020,7 @@ impl<C, S> Api<C> for Client<S> where
             }
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2053,7 +2079,8 @@ impl<C, S> Api<C> for Client<S> where
         // Query parameters
         let query_string = {
             let mut query_string = form_urlencoded::Serializer::new("".to_owned());
-                query_string.append_pair("tags", &param_tags.iter().map(ToString::to_string).collect::<Vec<String>>().join(","));
+                query_string.append_pair("tags",
+                    &param_tags.iter().map(ToString::to_string).collect::<Vec<String>>().join(","));
             query_string.finish()
         };
         if !query_string.is_empty() {
@@ -2097,7 +2124,7 @@ impl<C, S> Api<C> for Client<S> where
             }
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2190,7 +2217,7 @@ impl<C, S> Api<C> for Client<S> where
             }
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2306,7 +2333,7 @@ impl<C, S> Api<C> for Client<S> where
             }
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2420,7 +2447,7 @@ impl<C, S> Api<C> for Client<S> where
             }
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2494,7 +2521,7 @@ impl<C, S> Api<C> for Client<S> where
 
             let additional_metadata_str = match serde_json::to_string(&param_additional_metadata) {
                 Ok(str) => str,
-                Err(e) => return Err(ApiError(format!("Unable to parse additional_metadata to string: {}", e))),
+                Err(e) => return Err(ApiError(format!("Unable to serialize additional_metadata to string: {}", e))),
             };
 
             let additional_metadata_vec = additional_metadata_str.as_bytes().to_vec();
@@ -2506,7 +2533,7 @@ impl<C, S> Api<C> for Client<S> where
 
             let file_str = match serde_json::to_string(&param_file) {
                 Ok(str) => str,
-                Err(e) => return Err(ApiError(format!("Unable to parse file to string: {}", e))),
+                Err(e) => return Err(ApiError(format!("Unable to serialize file to string: {}", e))),
             };
 
             let file_vec = file_str.as_bytes().to_vec();
@@ -2536,6 +2563,7 @@ impl<C, S> Api<C> for Client<S> where
         };
 
         *request.body_mut() = Body::from(body_string);
+
         request.headers_mut().insert(CONTENT_TYPE, match HeaderValue::from_str(&multipart_header) {
             Ok(h) => h,
             Err(e) => return Err(ApiError(format!("Unable to create header: {} - {}", multipart_header, e)))
@@ -2564,7 +2592,7 @@ impl<C, S> Api<C> for Client<S> where
             }
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2641,7 +2669,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2723,7 +2751,7 @@ impl<C, S> Api<C> for Client<S> where
             }
         }
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2800,7 +2828,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2901,7 +2929,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -2995,7 +3023,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -3073,7 +3101,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -3151,7 +3179,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -3222,7 +3250,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -3299,7 +3327,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -3365,8 +3393,10 @@ impl<C, S> Api<C> for Client<S> where
         // Query parameters
         let query_string = {
             let mut query_string = form_urlencoded::Serializer::new("".to_owned());
-                query_string.append_pair("username", &param_username.to_string());
-                query_string.append_pair("password", &param_password.to_string());
+                query_string.append_pair("username",
+                    &param_username.to_string());
+                query_string.append_pair("password",
+                    &param_password.to_string());
             query_string.finish()
         };
         if !query_string.is_empty() {
@@ -3393,38 +3423,40 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
             200 => {
                 let response_x_rate_limit = match response.headers().get(HeaderName::from_static("x-rate-limit")) {
-                    Some(response_x_rate_limit) => response_x_rate_limit.clone(),
-                    None => {
-                        return Err(ApiError(String::from("Required response header X-Rate-Limit for response 200 was not found.")));
-                    }
-                };
-                let response_x_rate_limit = match TryInto::<header::IntoHeaderValue<i32>>::try_into(response_x_rate_limit) {
-                    Ok(value) => value,
-                    Err(e) => {
-                        return Err(ApiError(format!("Invalid response header X-Rate-Limit for response 200 - {}", e)));
-                    },
+                    Some(response_x_rate_limit) => {
+                        let response_x_rate_limit = response_x_rate_limit.clone();
+                        let response_x_rate_limit = match TryInto::<header::IntoHeaderValue<i32>>::try_into(response_x_rate_limit) {
+                            Ok(value) => value,
+                            Err(e) => {
+                                return Err(ApiError(format!("Invalid response header X-Rate-Limit for response 200 - {}", e)));
+                            },
+                        };
+                        let response_x_rate_limit = response_x_rate_limit.0;
+                        Some(response_x_rate_limit)
+                        },
+                    None => None,
                 };
-                let response_x_rate_limit = response_x_rate_limit.0;
 
                 let response_x_expires_after = match response.headers().get(HeaderName::from_static("x-expires-after")) {
-                    Some(response_x_expires_after) => response_x_expires_after.clone(),
-                    None => {
-                        return Err(ApiError(String::from("Required response header X-Expires-After for response 200 was not found.")));
-                    }
-                };
-                let response_x_expires_after = match TryInto::<header::IntoHeaderValue<chrono::DateTime::<chrono::Utc>>>::try_into(response_x_expires_after) {
-                    Ok(value) => value,
-                    Err(e) => {
-                        return Err(ApiError(format!("Invalid response header X-Expires-After for response 200 - {}", e)));
-                    },
+                    Some(response_x_expires_after) => {
+                        let response_x_expires_after = response_x_expires_after.clone();
+                        let response_x_expires_after = match TryInto::<header::IntoHeaderValue<chrono::DateTime::<chrono::Utc>>>::try_into(response_x_expires_after) {
+                            Ok(value) => value,
+                            Err(e) => {
+                                return Err(ApiError(format!("Invalid response header X-Expires-After for response 200 - {}", e)));
+                            },
+                        };
+                        let response_x_expires_after = response_x_expires_after.0;
+                        Some(response_x_expires_after)
+                        },
+                    None => None,
                 };
-                let response_x_expires_after = response_x_expires_after.0;
 
                 let body = response.into_body();
                 let body = body
@@ -3509,7 +3541,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -3591,7 +3623,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
index 03eae5fb7653..601410d3be94 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
@@ -281,8 +281,15 @@ pub enum LoginUserResponse {
     SuccessfulOperation
     {
         body: String,
-        x_rate_limit: i32,
-        x_expires_after: chrono::DateTime::<chrono::Utc>
+        x_rate_limit:
+        Option<
+        i32
+        >
+        ,
+        x_expires_after:
+        Option<
+        chrono::DateTime::<chrono::Utc>
+        >
     }
     ,
     /// Invalid username/password supplied
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
index 1cbdc1fda254..a4ea1843810a 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
@@ -730,17 +730,26 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                 let param_query = query_params.iter().filter(|e| e.0 == "query").map(|e| e.1.to_owned())
                     .nth(0);
                 let param_query = match param_query {
-                    Some(param_query) => match param_query.parse::<String>() {
-                        Ok(param_query) => param_query,
-                        Err(e) => return Ok(Response::builder()
-                                        .status(StatusCode::BAD_REQUEST)
-                                        .body(Body::from(format!("Couldn't parse query parameter query - doesn't match schema: {}", e)))
-                                        .expect("Unable to create Bad Request response for invalid query parameter query")),
+                    Some(param_query) => {
+                        let param_query =
+                            <String as std::str::FromStr>::from_str
+                                (&param_query);
+                        match param_query {
+                            Ok(param_query) => Some(param_query),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter query - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter query")),
+                        }
                     },
+                    None => None,
+                };
+                let param_query = match param_query {
+                    Some(param_query) => param_query,
                     None => return Ok(Response::builder()
-                                        .status(StatusCode::BAD_REQUEST)
-                                        .body(Body::from("Missing required query parameter query"))
-                                        .expect("Unable to create Bad Request response for missing qeury parameter query")),
+                        .status(StatusCode::BAD_REQUEST)
+                        .body(Body::from("Missing required query parameter query"))
+                        .expect("Unable to create Bad Request response for missing query parameter query")),
                 };
 
                 // Body parameters (note that non-required body parameters will ignore garbage
@@ -1020,13 +1029,55 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                 };
                 let param_enum_query_string = query_params.iter().filter(|e| e.0 == "enum_query_string").map(|e| e.1.to_owned())
                     .nth(0);
-                let param_enum_query_string = param_enum_query_string.and_then(|param_enum_query_string| param_enum_query_string.parse::<>().ok());
+                let param_enum_query_string = match param_enum_query_string {
+                    Some(param_enum_query_string) => {
+                        let param_enum_query_string =
+                            <String as std::str::FromStr>::from_str
+                                (&param_enum_query_string);
+                        match param_enum_query_string {
+                            Ok(param_enum_query_string) => Some(param_enum_query_string),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter enum_query_string - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter enum_query_string")),
+                        }
+                    },
+                    None => None,
+                };
                 let param_enum_query_integer = query_params.iter().filter(|e| e.0 == "enum_query_integer").map(|e| e.1.to_owned())
                     .nth(0);
-                let param_enum_query_integer = param_enum_query_integer.and_then(|param_enum_query_integer| param_enum_query_integer.parse::<>().ok());
+                let param_enum_query_integer = match param_enum_query_integer {
+                    Some(param_enum_query_integer) => {
+                        let param_enum_query_integer =
+                            <i32 as std::str::FromStr>::from_str
+                                (&param_enum_query_integer);
+                        match param_enum_query_integer {
+                            Ok(param_enum_query_integer) => Some(param_enum_query_integer),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter enum_query_integer - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter enum_query_integer")),
+                        }
+                    },
+                    None => None,
+                };
                 let param_enum_query_double = query_params.iter().filter(|e| e.0 == "enum_query_double").map(|e| e.1.to_owned())
                     .nth(0);
-                let param_enum_query_double = param_enum_query_double.and_then(|param_enum_query_double| param_enum_query_double.parse::<>().ok());
+                let param_enum_query_double = match param_enum_query_double {
+                    Some(param_enum_query_double) => {
+                        let param_enum_query_double =
+                            <f64 as std::str::FromStr>::from_str
+                                (&param_enum_query_double);
+                        match param_enum_query_double {
+                            Ok(param_enum_query_double) => Some(param_enum_query_double),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter enum_query_double - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter enum_query_double")),
+                        }
+                    },
+                    None => None,
+                };
 
                                 // Form parameters
                                 let param_enum_form_string = Some("enum_form_string_example".to_string());
@@ -2686,32 +2737,50 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                 let param_username = query_params.iter().filter(|e| e.0 == "username").map(|e| e.1.to_owned())
                     .nth(0);
                 let param_username = match param_username {
-                    Some(param_username) => match param_username.parse::<String>() {
-                        Ok(param_username) => param_username,
-                        Err(e) => return Ok(Response::builder()
-                                        .status(StatusCode::BAD_REQUEST)
-                                        .body(Body::from(format!("Couldn't parse query parameter username - doesn't match schema: {}", e)))
-                                        .expect("Unable to create Bad Request response for invalid query parameter username")),
+                    Some(param_username) => {
+                        let param_username =
+                            <String as std::str::FromStr>::from_str
+                                (&param_username);
+                        match param_username {
+                            Ok(param_username) => Some(param_username),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter username - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter username")),
+                        }
                     },
+                    None => None,
+                };
+                let param_username = match param_username {
+                    Some(param_username) => param_username,
                     None => return Ok(Response::builder()
-                                        .status(StatusCode::BAD_REQUEST)
-                                        .body(Body::from("Missing required query parameter username"))
-                                        .expect("Unable to create Bad Request response for missing qeury parameter username")),
+                        .status(StatusCode::BAD_REQUEST)
+                        .body(Body::from("Missing required query parameter username"))
+                        .expect("Unable to create Bad Request response for missing query parameter username")),
                 };
                 let param_password = query_params.iter().filter(|e| e.0 == "password").map(|e| e.1.to_owned())
                     .nth(0);
                 let param_password = match param_password {
-                    Some(param_password) => match param_password.parse::<String>() {
-                        Ok(param_password) => param_password,
-                        Err(e) => return Ok(Response::builder()
-                                        .status(StatusCode::BAD_REQUEST)
-                                        .body(Body::from(format!("Couldn't parse query parameter password - doesn't match schema: {}", e)))
-                                        .expect("Unable to create Bad Request response for invalid query parameter password")),
+                    Some(param_password) => {
+                        let param_password =
+                            <String as std::str::FromStr>::from_str
+                                (&param_password);
+                        match param_password {
+                            Ok(param_password) => Some(param_password),
+                            Err(e) => return Ok(Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from(format!("Couldn't parse query parameter password - doesn't match schema: {}", e)))
+                                .expect("Unable to create Bad Request response for invalid query parameter password")),
+                        }
                     },
+                    None => None,
+                };
+                let param_password = match param_password {
+                    Some(param_password) => param_password,
                     None => return Ok(Response::builder()
-                                        .status(StatusCode::BAD_REQUEST)
-                                        .body(Body::from("Missing required query parameter password"))
-                                        .expect("Unable to create Bad Request response for missing qeury parameter password")),
+                        .status(StatusCode::BAD_REQUEST)
+                        .body(Body::from("Missing required query parameter password"))
+                        .expect("Unable to create Bad Request response for missing query parameter password")),
                 };
 
                                 let result = api_impl.login_user(
@@ -2734,6 +2803,7 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                                                         x_expires_after
                                                     }
                                                 => {
+                                                    if let Some(x_rate_limit) = x_rate_limit {
                                                     let x_rate_limit = match header::IntoHeaderValue(x_rate_limit).try_into() {
                                                         Ok(val) => val,
                                                         Err(e) => {
@@ -2744,6 +2814,12 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                                                         }
                                                     };
 
+                                                    response.headers_mut().insert(
+                                                        HeaderName::from_static("x-rate-limit"),
+                                                        x_rate_limit
+                                                    );
+                                                    }
+                                                    if let Some(x_expires_after) = x_expires_after {
                                                     let x_expires_after = match header::IntoHeaderValue(x_expires_after).try_into() {
                                                         Ok(val) => val,
                                                         Err(e) => {
@@ -2754,15 +2830,12 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                                                         }
                                                     };
 
-                                                    *response.status_mut() = StatusCode::from_u16(200).expect("Unable to turn 200 into a StatusCode");
-                                                    response.headers_mut().insert(
-                                                        HeaderName::from_static("x-rate-limit"),
-                                                        x_rate_limit
-                                                    );
                                                     response.headers_mut().insert(
                                                         HeaderName::from_static("x-expires-after"),
                                                         x_expires_after
                                                     );
+                                                    }
+                                                    *response.status_mut() = StatusCode::from_u16(200).expect("Unable to turn 200 into a StatusCode");
                                                     response.headers_mut().insert(
                                                         CONTENT_TYPE,
                                                         HeaderValue::from_str("application/xml")
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs b/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs
index aaece7a9b13f..bbae182ce25a 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs
@@ -9,13 +9,14 @@ use std::io::{ErrorKind, Read};
 use std::error::Error;
 use std::future::Future;
 use std::fmt;
+use std::marker::PhantomData;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 use std::str;
 use std::str::FromStr;
 use std::string::ToString;
 use std::task::{Context, Poll};
-use swagger::{ApiError, AuthData, BodyExt, Connector, Has, XSpanIdString};
+use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, XSpanIdString};
 use url::form_urlencoded;
 
 
@@ -66,49 +67,57 @@ fn into_base_path(input: impl TryInto<Uri, Error=hyper::http::uri::InvalidUri>,
 }
 
 /// A client that implements the API by making HTTP calls out to a server.
-pub struct Client<S> where
+pub struct Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Inner service
     client_service: S,
 
     /// Base path of the API
     base_path: String,
+
+    /// Marker
+    marker: PhantomData<fn(C)>,
 }
 
-impl<S> fmt::Debug for Client<S> where
+impl<S, C> fmt::Debug for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Client {{ base_path: {} }}", self.base_path)
     }
 }
 
-impl<S> Clone for Client<S> where
+impl<S, C> Clone for Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     fn clone(&self) -> Self {
         Self {
             client_service: self.client_service.clone(),
             base_path: self.base_path.clone(),
+            marker: PhantomData,
         }
     }
 }
 
-impl<C> Client<hyper::client::Client<C, Body>> where
-      C: hyper::client::connect::Connect + Clone + Send + Sync + 'static
+impl<Connector, C> Client<DropContextService<hyper::client::Client<Connector, Body>, C>, C> where
+    Connector: hyper::client::connect::Connect + Clone + Send + Sync + 'static,
+    C: Clone + Send + Sync + 'static,
 {
     /// Create a client with a custom implementation of hyper::client::Connect.
     ///
@@ -127,14 +136,16 @@ impl<C> Client<hyper::client::Client<C, Body>> where
     pub fn try_new_with_connector(
         base_path: &str,
         protocol: Option<&'static str>,
-        connector: C,
+        connector: Connector,
     ) -> Result<Self, ClientInitError>
     {
         let client_service = hyper::client::Client::builder().build(connector);
+        let client_service = DropContextService::new(client_service);
 
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, protocol)?,
+            marker: PhantomData,
         })
     }
 }
@@ -165,7 +176,9 @@ impl Service<Request<Body>> for HyperClient {
     }
 }
 
-impl Client<HyperClient> {
+impl<C> Client<DropContextService<HyperClient, C>, C> where
+    C: Clone + Send + Sync + 'static,
+{
     /// Create an HTTP client.
     ///
     /// # Arguments
@@ -195,14 +208,18 @@ impl Client<HyperClient> {
             }
         };
 
+        let client_service = DropContextService::new(client_service);
+
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
 
-impl Client<hyper::client::Client<hyper::client::HttpConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<hyper::client::HttpConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create an HTTP client.
     ///
@@ -223,7 +240,8 @@ type HttpsConnector = hyper_tls::HttpsConnector<hyper::client::HttpConnector>;
 #[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
 type HttpsConnector = hyper_openssl::HttpsConnector<hyper::client::HttpConnector>;
 
-impl Client<hyper::client::Client<HttpsConnector, Body>>
+impl<C> Client<DropContextService<hyper::client::Client<HttpsConnector, Body>, C>, C> where
+    C: Clone + Send + Sync + 'static
 {
     /// Create a client with a TLS connection to the server
     ///
@@ -288,12 +306,13 @@ impl Client<hyper::client::Client<HttpsConnector, Body>>
     }
 }
 
-impl<S> Client<S> where
+impl<S, C> Client<S, C> where
     S: Service<
-           Request<Body>,
+           (Request<Body>, C),
            Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Clone + Send + Sync + 'static
 {
     /// Constructor for creating a `Client` by passing in a pre-made `hyper::service::Service` /
     /// `tower::Service`
@@ -307,6 +326,7 @@ impl<S> Client<S> where
         Ok(Self {
             client_service,
             base_path: into_base_path(base_path, None)?,
+            marker: PhantomData,
         })
     }
 }
@@ -352,13 +372,13 @@ impl Error for ClientInitError {
 }
 
 #[async_trait]
-impl<C, S> Api<C> for Client<S> where
-    C: Has<XSpanIdString>  + Clone + Send + Sync + 'static,
+impl<S, C> Api<C> for Client<S, C> where
     S: Service<
-       Request<Body>,
+       (Request<Body>, C),
        Response=Response<Body>> + Clone + Sync + Send + 'static,
     S::Future: Send + 'static,
     S::Error: Into<crate::ServiceError> + fmt::Display,
+    C: Has<XSpanIdString>  + Clone + Send + Sync + 'static,
 {
     fn poll_ready(&self, cx: &mut Context) -> Poll<Result<(), crate::ServiceError>> {
         match self.client_service.clone().poll_ready(cx) {
@@ -407,7 +427,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -482,7 +502,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -560,7 +580,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -629,7 +649,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -704,7 +724,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -788,7 +808,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -872,7 +892,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -941,7 +961,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
@@ -1027,7 +1047,7 @@ impl<C, S> Api<C> for Client<S> where
             Err(e) => return Err(ApiError(format!("Unable to create X-Span ID header value: {}", e)))
         });
 
-        let mut response = client_service.call(request)
+        let mut response = client_service.call((request, context.clone()))
             .map_err(|e| ApiError(format!("No response received: {}", e))).await?;
 
         match response.status().as_u16() {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
index a9b716d1b22e..31246e3dc8b7 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -28,7 +28,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "another-fake", description = "the another-fake API")
 public interface AnotherFakeApi {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApiController.java
index d0e45c0458b9..7e8132190d66 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApiController.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class AnotherFakeApiController implements AnotherFakeApi {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
index 2baeaa479927..25c244ded220 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
@@ -38,7 +38,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApiController.java
index 16d3908be7cd..1ac9ecd804c4 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class FakeApiController implements FakeApi {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index b074d8ed6b11..ad63ff9527c7 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -28,7 +28,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake_classname_test", description = "the fake_classname_test API")
 public interface FakeClassnameTestApi {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
index 709a1981f75f..68f9c4233e88 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class FakeClassnameTestApiController implements FakeClassnameTestApi {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
index 1657d3098a44..6883dcacee84 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
@@ -31,7 +31,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApiController.java
index e6d6429de31e..1485b58cb3ec 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApiController.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class PetApiController implements PetApi {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
index 602204ea5686..ea131aed2712 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
@@ -29,7 +29,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApiController.java
index c4cd0487fb88..3a8489c4176d 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApiController.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class StoreApiController implements StoreApi {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
index 55e566b7b3d3..4832b81b2a47 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
@@ -29,7 +29,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "user", description = "the user API")
 public interface UserApi {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApiController.java
index 07044abe99c9..85e906911582 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApiController.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class UserApiController implements UserApi {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
index 9dc9e8f88053..3df5ef9f3c34 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
@@ -17,7 +17,7 @@
 
 import javax.servlet.ServletContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Configuration
 @EnableSwagger2
 public class OpenAPIDocumentationConfig {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/OpenAPIUiConfiguration.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/OpenAPIUiConfiguration.java
index ecf9e79f65ff..e61611e3b14f 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/OpenAPIUiConfiguration.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/OpenAPIUiConfiguration.java
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Configuration
 @ComponentScan(basePackages = {"org.openapitools.api", "org.openapitools.configuration"})
 @EnableWebMvc
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/WebApplication.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/WebApplication.java
index 27692cf59496..01abb13330d9 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/WebApplication.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/WebApplication.java
@@ -2,7 +2,7 @@
 
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class WebApplication extends AbstractAnnotationConfigDispatcherServletInitializer {
 
     @Override
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/WebMvcConfiguration.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/WebMvcConfiguration.java
index 0252c9861928..1fa5ce119f81 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/WebMvcConfiguration.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/configuration/WebMvcConfiguration.java
@@ -3,7 +3,7 @@
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class WebMvcConfiguration extends WebMvcConfigurationSupport {
     @Override
     public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 448c77cea931..817c5dbee9e9 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a80499fd79b9..e617dc74d1cb 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d8db9baf3105..cd910636ca69 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 44e1e29d741e..f284380cbe13 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,7 +16,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
   @Valid
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index b94e539aa3f2..8faf67a5b652 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index c33e1e3b7a21..0d0076dda3f9 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index cab0c80d9b4c..6b8f52be750e 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 894eb466b4cc..5f308494e9b0 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java
index 376b84f872e9..983aaa651682 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java
@@ -14,7 +14,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index d4aeef01b3e3..7daefec9c1e3 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index b2da4b9b26a6..e61668a02e36 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java
index fb134a8c4419..f093b5145b14 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,7 +15,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest   {
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/BigCat.java
index 9bc946d6cc1a..68b76cd48854 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/BigCat.java
@@ -15,7 +15,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/BigCatAllOf.java
index 9a57d85eecad..3198b91b6d4f 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -13,7 +13,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java
index e1346fe63ea8..3f226a3826a0 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,7 +12,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java
index f6d3c17d0be3..5a431e966bba 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java
@@ -14,7 +14,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/CatAllOf.java
index cf145ae53718..2853ec34afd5 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,7 +12,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf   {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java
index db3f8e08dc0d..a60e65b76f5c 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java
@@ -12,7 +12,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java
index ba96dc2add68..c953d09e40ee 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java
index 59d479c85336..9d54590ff88e 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java
@@ -12,7 +12,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client   {
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java
index 02e027c3feea..5f7e3c788a49 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java
@@ -14,7 +14,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/DogAllOf.java
index a1c4c17d8907..1ef6c5e1bb76 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,7 +12,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf   {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java
index 7ee6a9816197..d78fbfba9c88 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,7 +15,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java
index 8eff3e0c49aa..36de994dfa0f 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,7 +14,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 2e88258ce75c..91048bcc9da5 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,7 +14,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass   {
   @JsonProperty("file")
   private java.io.File file;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
index a0a7ba857344..ce4f590b9b75 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest   {
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c0e7dd75528e..9739eccbd61e 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,7 +12,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java
index 80195fc3d4be..6f5f28691c78 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java
@@ -16,7 +16,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest   {
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 22f4e38a3775..0e73c00c6e34 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java
index 04606fb90460..227f9d14bb2c 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,7 +13,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java
index 1d385b21bd4d..9952d79cde12 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,7 +12,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java
index 82026635f5cb..c8de97c9e060 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,7 +13,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn   {
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java
index 1180f019ea3f..75097d13c16c 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java
@@ -13,7 +13,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java
index 4423a2ac631d..4e7050b7076f 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,7 +13,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly   {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java
index 011bb43df5ee..d6542c00e833 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java
@@ -14,7 +14,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java
index 61dbaaefeeae..260288087a34 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,7 +13,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite   {
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java
index 6b815c789260..4e7e80f529f3 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java
@@ -19,7 +19,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 4e1c3e681095..199ed97783f8 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,7 +12,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java
index 6c0bfa749d3d..5285c2d9ced7 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,7 +12,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java
index c72064ce0428..caef83520fcb 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java
@@ -12,7 +12,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7dd51d7ccd56..b85f22fb8fdf 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderExample.java
index c1f4cbd00a72..a16645b03a59 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample   {
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java
index d195089778a9..6512ac673542 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java
@@ -12,7 +12,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/XmlItem.java
index dae97d794675..7590a9b7ed96 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,7 +15,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem   {
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 4236103bf676..2052f5808def 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "another-fake", description = "the another-fake API")
 public interface AnotherFakeApi {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApiController.java
index d0e45c0458b9..7e8132190d66 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApiController.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class AnotherFakeApiController implements AnotherFakeApi {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
index 83af11f666ed..779131b34af8 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
@@ -37,7 +37,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApiController.java
index 16d3908be7cd..1ac9ecd804c4 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class FakeApiController implements FakeApi {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 1f419fa0a6eb..765feb517438 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake_classname_test", description = "the fake_classname_test API")
 public interface FakeClassnameTestApi {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
index 709a1981f75f..68f9c4233e88 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class FakeClassnameTestApiController implements FakeClassnameTestApi {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
index 4349917e1167..23311c253bbd 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApiController.java
index e6d6429de31e..1485b58cb3ec 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApiController.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class PetApiController implements PetApi {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
index 26bb1a8482aa..e135ad2702c0 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApiController.java
index c4cd0487fb88..3a8489c4176d 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApiController.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class StoreApiController implements StoreApi {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
index 23205a5d72a3..d19c52cdfd66 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "user", description = "the user API")
 public interface UserApi {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApiController.java
index 07044abe99c9..85e906911582 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApiController.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class UserApiController implements UserApi {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
index 9dc9e8f88053..3df5ef9f3c34 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
@@ -17,7 +17,7 @@
 
 import javax.servlet.ServletContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Configuration
 @EnableSwagger2
 public class OpenAPIDocumentationConfig {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/OpenAPIUiConfiguration.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/OpenAPIUiConfiguration.java
index ecf9e79f65ff..e61611e3b14f 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/OpenAPIUiConfiguration.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/OpenAPIUiConfiguration.java
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Configuration
 @ComponentScan(basePackages = {"org.openapitools.api", "org.openapitools.configuration"})
 @EnableWebMvc
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/WebApplication.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/WebApplication.java
index 27692cf59496..01abb13330d9 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/WebApplication.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/WebApplication.java
@@ -2,7 +2,7 @@
 
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class WebApplication extends AbstractAnnotationConfigDispatcherServletInitializer {
 
     @Override
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/WebMvcConfiguration.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/WebMvcConfiguration.java
index 0252c9861928..1fa5ce119f81 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/WebMvcConfiguration.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/configuration/WebMvcConfiguration.java
@@ -3,7 +3,7 @@
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class WebMvcConfiguration extends WebMvcConfigurationSupport {
     @Override
     public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 448c77cea931..817c5dbee9e9 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a80499fd79b9..e617dc74d1cb 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d8db9baf3105..cd910636ca69 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 44e1e29d741e..f284380cbe13 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,7 +16,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
   @Valid
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index b94e539aa3f2..8faf67a5b652 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index c33e1e3b7a21..0d0076dda3f9 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index cab0c80d9b4c..6b8f52be750e 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 894eb466b4cc..5f308494e9b0 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Animal.java
index 376b84f872e9..983aaa651682 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Animal.java
@@ -14,7 +14,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index d4aeef01b3e3..7daefec9c1e3 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index b2da4b9b26a6..e61668a02e36 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ArrayTest.java
index fb134a8c4419..f093b5145b14 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,7 +15,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest   {
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/BigCat.java
index 9bc946d6cc1a..68b76cd48854 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/BigCat.java
@@ -15,7 +15,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/BigCatAllOf.java
index 9a57d85eecad..3198b91b6d4f 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -13,7 +13,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Capitalization.java
index e1346fe63ea8..3f226a3826a0 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,7 +12,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Cat.java
index f6d3c17d0be3..5a431e966bba 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Cat.java
@@ -14,7 +14,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/CatAllOf.java
index cf145ae53718..2853ec34afd5 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,7 +12,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf   {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Category.java
index db3f8e08dc0d..a60e65b76f5c 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Category.java
@@ -12,7 +12,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ClassModel.java
index ba96dc2add68..c953d09e40ee 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Client.java
index 59d479c85336..9d54590ff88e 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Client.java
@@ -12,7 +12,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client   {
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Dog.java
index 02e027c3feea..5f7e3c788a49 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Dog.java
@@ -14,7 +14,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/DogAllOf.java
index a1c4c17d8907..1ef6c5e1bb76 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,7 +12,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf   {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumArrays.java
index 7ee6a9816197..d78fbfba9c88 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,7 +15,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumTest.java
index 8eff3e0c49aa..36de994dfa0f 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,7 +14,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 2e88258ce75c..91048bcc9da5 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,7 +14,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass   {
   @JsonProperty("file")
   private java.io.File file;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java
index 0d412f5d64da..3ca6bb8ffe2a 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest   {
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c0e7dd75528e..9739eccbd61e 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,7 +12,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/MapTest.java
index 80195fc3d4be..6f5f28691c78 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/MapTest.java
@@ -16,7 +16,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest   {
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 26d45ea4978c..684026212217 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Model200Response.java
index 04606fb90460..227f9d14bb2c 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,7 +13,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ModelApiResponse.java
index 1d385b21bd4d..9952d79cde12 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,7 +12,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ModelReturn.java
index 82026635f5cb..c8de97c9e060 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,7 +13,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn   {
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Name.java
index 1180f019ea3f..75097d13c16c 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Name.java
@@ -13,7 +13,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/NumberOnly.java
index 4423a2ac631d..4e7050b7076f 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,7 +13,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly   {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Order.java
index ca7e599422fa..6c9e2dac20f0 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Order.java
@@ -14,7 +14,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/OuterComposite.java
index 61dbaaefeeae..260288087a34 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,7 +13,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite   {
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Pet.java
index 6b815c789260..4e7e80f529f3 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Pet.java
@@ -19,7 +19,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 4e1c3e681095..199ed97783f8 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,7 +12,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/SpecialModelName.java
index 6c0bfa749d3d..5285c2d9ced7 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,7 +12,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Tag.java
index c72064ce0428..caef83520fcb 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Tag.java
@@ -12,7 +12,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7dd51d7ccd56..b85f22fb8fdf 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/TypeHolderExample.java
index c1f4cbd00a72..a16645b03a59 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample   {
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/User.java
index d195089778a9..6512ac673542 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/User.java
@@ -12,7 +12,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/XmlItem.java
index dae97d794675..7590a9b7ed96 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,7 +15,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem   {
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 579bd42634b8..fef78e6b9021 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -23,7 +23,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "another-fake", description = "the another-fake API")
 public interface AnotherFakeApi {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApiController.java
index 4e726b8380bd..731880309bfb 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApiController.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApiController.java
@@ -20,7 +20,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class AnotherFakeApiController implements AnotherFakeApi {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
index b3aec42a28e6..364b70eb9fd4 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
@@ -33,7 +33,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java
index c3eab8152a54..68f42954ab3b 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java
@@ -30,7 +30,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class FakeApiController implements FakeApi {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index d144c94bfda2..6a8919d2d1b4 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -23,7 +23,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake_classname_test", description = "the fake_classname_test API")
 public interface FakeClassnameTestApi {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
index ef55a490d396..90b1fcb28b5c 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
@@ -20,7 +20,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class FakeClassnameTestApiController implements FakeClassnameTestApi {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
index 7a9b6e56cc40..0c13bf4b97de 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
@@ -26,7 +26,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java
index 22d0330c63f4..ac991356a7a6 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java
@@ -23,7 +23,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class PetApiController implements PetApi {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
index 5d9b575d9877..fe89b207bfee 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
@@ -24,7 +24,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java
index e926baf28298..b03098aa747f 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java
@@ -21,7 +21,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class StoreApiController implements StoreApi {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
index d8a1580f8de2..488b5b7c3ac9 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
@@ -24,7 +24,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "user", description = "the user API")
 public interface UserApi {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApiController.java
index ee0f252668d0..24445f783726 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApiController.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApiController.java
@@ -21,7 +21,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/}")
 public class UserApiController implements UserApi {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
index dcc94c95823d..41d0edf11651 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
@@ -17,7 +17,7 @@
 
 import javax.servlet.ServletContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Configuration
 @EnableSwagger2
 public class OpenAPIDocumentationConfig {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/OpenAPIUiConfiguration.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/OpenAPIUiConfiguration.java
index 838bce567dce..15f4ddf5ae18 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/OpenAPIUiConfiguration.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/OpenAPIUiConfiguration.java
@@ -22,7 +22,7 @@
 
 import java.util.List;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Configuration
 @ComponentScan(basePackages = {"org.openapitools.api", "org.openapitools.configuration"})
 @EnableWebMvc
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/WebApplication.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/WebApplication.java
index 27692cf59496..01abb13330d9 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/WebApplication.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/WebApplication.java
@@ -2,7 +2,7 @@
 
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class WebApplication extends AbstractAnnotationConfigDispatcherServletInitializer {
 
     @Override
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/WebMvcConfiguration.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/WebMvcConfiguration.java
index 0252c9861928..1fa5ce119f81 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/WebMvcConfiguration.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/configuration/WebMvcConfiguration.java
@@ -3,7 +3,7 @@
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class WebMvcConfiguration extends WebMvcConfigurationSupport {
     @Override
     public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 448c77cea931..817c5dbee9e9 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a80499fd79b9..e617dc74d1cb 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d8db9baf3105..cd910636ca69 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 16b3408f323b..accbd514dcad 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,7 +16,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
   @Valid
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index b94e539aa3f2..8faf67a5b652 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index c33e1e3b7a21..0d0076dda3f9 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index cab0c80d9b4c..6b8f52be750e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 894eb466b4cc..5f308494e9b0 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java
index 376b84f872e9..983aaa651682 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java
@@ -14,7 +14,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index a1fe8166abf8..e6562d841044 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a76320466a38..3df8310ee9e2 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java
index df4610324400..11afea41c019 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,7 +15,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest   {
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCat.java
index 9bc946d6cc1a..68b76cd48854 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCat.java
@@ -15,7 +15,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCatAllOf.java
index 9a57d85eecad..3198b91b6d4f 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -13,7 +13,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java
index e1346fe63ea8..3f226a3826a0 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,7 +12,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java
index f6d3c17d0be3..5a431e966bba 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java
@@ -14,7 +14,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java
index cf145ae53718..2853ec34afd5 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,7 +12,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf   {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java
index db3f8e08dc0d..a60e65b76f5c 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java
@@ -12,7 +12,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java
index ba96dc2add68..c953d09e40ee 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java
index 59d479c85336..9d54590ff88e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java
@@ -12,7 +12,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client   {
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java
index 02e027c3feea..5f7e3c788a49 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java
@@ -14,7 +14,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java
index a1c4c17d8907..1ef6c5e1bb76 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,7 +12,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf   {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java
index d57bb6c1de46..a0018a9a7fa6 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,7 +15,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java
index 8eff3e0c49aa..36de994dfa0f 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,7 +14,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index ab7b747bf2fa..56b56a169c62 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,7 +14,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass   {
   @JsonProperty("file")
   private java.io.File file;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
index e63a63e74edc..971e9e254abd 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest   {
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c0e7dd75528e..9739eccbd61e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,7 +12,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java
index c9b418c6901b..7ba96a617a7a 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java
@@ -16,7 +16,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest   {
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index f174af450d2e..ef568c52b0c6 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java
index 04606fb90460..227f9d14bb2c 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,7 +13,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java
index 1d385b21bd4d..9952d79cde12 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,7 +12,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java
index 82026635f5cb..c8de97c9e060 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,7 +13,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn   {
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java
index 1180f019ea3f..75097d13c16c 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java
@@ -13,7 +13,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java
index 4423a2ac631d..4e7050b7076f 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,7 +13,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly   {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java
index f74c5d48fc2a..15ac8f5bdda5 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java
@@ -14,7 +14,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java
index 61dbaaefeeae..260288087a34 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,7 +13,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite   {
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java
index 3e66cbdb75df..d53d84898239 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java
@@ -19,7 +19,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 4e1c3e681095..199ed97783f8 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,7 +12,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java
index 6c0bfa749d3d..5285c2d9ced7 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,7 +12,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java
index c72064ce0428..caef83520fcb 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java
@@ -12,7 +12,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java
index b88e00b47d78..c5a00c2c8f8f 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java
index 85694fed2185..d7073c73a2f5 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample   {
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java
index d195089778a9..6512ac673542 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java
@@ -12,7 +12,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java
index ca74cfcfd91c..b179e232e4c6 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,7 +15,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem   {
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 579bd42634b8..fef78e6b9021 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -23,7 +23,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "another-fake", description = "the another-fake API")
 public interface AnotherFakeApi {
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApiController.java
index 7c59d2bef71a..50393d3230ad 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApiController.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApiController.java
@@ -20,7 +20,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class AnotherFakeApiController implements AnotherFakeApi {
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
index b3aec42a28e6..364b70eb9fd4 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
@@ -33,7 +33,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java
index 57210db4bd95..75f81592a13b 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java
@@ -30,7 +30,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeApiController implements FakeApi {
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index d144c94bfda2..6a8919d2d1b4 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -23,7 +23,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake_classname_test", description = "the fake_classname_test API")
 public interface FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
index 2d420c2f7862..237a76382362 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
@@ -20,7 +20,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeClassnameTestApiController implements FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
index 7a9b6e56cc40..0c13bf4b97de 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
@@ -26,7 +26,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java
index e6ffc7d6653a..6621ae38e156 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java
@@ -23,7 +23,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class PetApiController implements PetApi {
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
index 5d9b575d9877..fe89b207bfee 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
@@ -24,7 +24,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java
index bba9d136df69..1a02c0b756d1 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java
@@ -21,7 +21,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class StoreApiController implements StoreApi {
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
index d8a1580f8de2..488b5b7c3ac9 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
@@ -24,7 +24,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "user", description = "the user API")
 public interface UserApi {
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApiController.java
index fd1e6d5ab5db..3950bf5f863d 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApiController.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApiController.java
@@ -21,7 +21,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class UserApiController implements UserApi {
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
index bdf5a026ce14..425e530b93b1 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
@@ -17,7 +17,7 @@
 
 import javax.servlet.ServletContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Configuration
 @EnableSwagger2
 public class OpenAPIDocumentationConfig {
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 448c77cea931..817c5dbee9e9 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a80499fd79b9..e617dc74d1cb 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d8db9baf3105..cd910636ca69 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 16b3408f323b..accbd514dcad 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,7 +16,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
   @Valid
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index b94e539aa3f2..8faf67a5b652 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index c33e1e3b7a21..0d0076dda3f9 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index cab0c80d9b4c..6b8f52be750e 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 894eb466b4cc..5f308494e9b0 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java
index 376b84f872e9..983aaa651682 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java
@@ -14,7 +14,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index a1fe8166abf8..e6562d841044 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a76320466a38..3df8310ee9e2 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java
index df4610324400..11afea41c019 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,7 +15,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest   {
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java
index 9bc946d6cc1a..68b76cd48854 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java
@@ -15,7 +15,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java
index 9a57d85eecad..3198b91b6d4f 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -13,7 +13,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java
index e1346fe63ea8..3f226a3826a0 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,7 +12,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java
index f6d3c17d0be3..5a431e966bba 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java
@@ -14,7 +14,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java
index cf145ae53718..2853ec34afd5 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,7 +12,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf   {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java
index db3f8e08dc0d..a60e65b76f5c 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java
@@ -12,7 +12,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java
index ba96dc2add68..c953d09e40ee 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java
index 59d479c85336..9d54590ff88e 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java
@@ -12,7 +12,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client   {
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java
index 02e027c3feea..5f7e3c788a49 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java
@@ -14,7 +14,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java
index a1c4c17d8907..1ef6c5e1bb76 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,7 +12,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf   {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java
index d57bb6c1de46..a0018a9a7fa6 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,7 +15,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java
index 8eff3e0c49aa..36de994dfa0f 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,7 +14,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index ab7b747bf2fa..56b56a169c62 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,7 +14,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass   {
   @JsonProperty("file")
   private java.io.File file;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
index e63a63e74edc..971e9e254abd 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest   {
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c0e7dd75528e..9739eccbd61e 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,7 +12,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java
index c9b418c6901b..7ba96a617a7a 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java
@@ -16,7 +16,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest   {
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index f174af450d2e..ef568c52b0c6 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java
index 04606fb90460..227f9d14bb2c 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,7 +13,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java
index 1d385b21bd4d..9952d79cde12 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,7 +12,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java
index 82026635f5cb..c8de97c9e060 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,7 +13,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn   {
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java
index 1180f019ea3f..75097d13c16c 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java
@@ -13,7 +13,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java
index 4423a2ac631d..4e7050b7076f 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,7 +13,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly   {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java
index f74c5d48fc2a..15ac8f5bdda5 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java
@@ -14,7 +14,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java
index 61dbaaefeeae..260288087a34 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,7 +13,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite   {
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
index 3e66cbdb75df..d53d84898239 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
@@ -19,7 +19,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 4e1c3e681095..199ed97783f8 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,7 +12,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java
index 6c0bfa749d3d..5285c2d9ced7 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,7 +12,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java
index c72064ce0428..caef83520fcb 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java
@@ -12,7 +12,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java
index b88e00b47d78..c5a00c2c8f8f 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java
index 85694fed2185..d7073c73a2f5 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample   {
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java
index d195089778a9..6512ac673542 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java
@@ -12,7 +12,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java
index ca74cfcfd91c..b179e232e4c6 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,7 +15,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem   {
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 67fbd51d9b5e..b1aa060029fa 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -23,7 +23,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "another-fake", description = "the another-fake API")
 public interface AnotherFakeApi {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java
index 3bc2df15df60..df11134c8067 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class AnotherFakeApiController implements AnotherFakeApi {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
index 1ccbe873d5ad..7e6ac74b30f4 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
@@ -16,7 +16,7 @@
  * A delegate to be called by the {@link AnotherFakeApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface AnotherFakeApiDelegate {
 
     default Optional<NativeWebRequest> getRequest() {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
index 99556098f919..6be604287145 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -33,7 +33,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java
index 75c4b5587be1..6b22c1aba661 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeApiController implements FakeApi {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
index d1dd5548a627..48f9c6a1ae63 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -26,7 +26,7 @@
  * A delegate to be called by the {@link FakeApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface FakeApiDelegate {
 
     default Optional<NativeWebRequest> getRequest() {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index c955e7d315d9..fe355dfca693 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -23,7 +23,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake_classname_test", description = "the fake_classname_test API")
 public interface FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
index 6566359e66f5..58497641e4c5 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeClassnameTestApiController implements FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
index 7436e049bdeb..c71fe13d195a 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
@@ -16,7 +16,7 @@
  * A delegate to be called by the {@link FakeClassnameTestApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface FakeClassnameTestApiDelegate {
 
     default Optional<NativeWebRequest> getRequest() {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
index 0ac0d186bb5f..fd05628030b4 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
@@ -26,7 +26,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiController.java
index a8c8c3765a66..5fa088c6f10b 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiController.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class PetApiController implements PetApi {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java
index c8b6b0ad5ef7..5a70de5ef3e6 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -19,7 +19,7 @@
  * A delegate to be called by the {@link PetApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface PetApiDelegate {
 
     default Optional<NativeWebRequest> getRequest() {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
index b703bff5c23b..17d14a277fb0 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
@@ -24,7 +24,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiController.java
index d00b4841fc0a..9e08c646ae92 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiController.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class StoreApiController implements StoreApi {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java
index 5fe814ddf2b8..5091e7e1f2cc 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -17,7 +17,7 @@
  * A delegate to be called by the {@link StoreApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface StoreApiDelegate {
 
     default Optional<NativeWebRequest> getRequest() {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
index 715c941bd87f..b63a472aeb08 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
@@ -24,7 +24,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "user", description = "the user API")
 public interface UserApi {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiController.java
index 5bd8c1f9f573..bc2d33598fd9 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiController.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class UserApiController implements UserApi {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java
index 9319e143d793..78da7c8510bc 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java
@@ -17,7 +17,7 @@
  * A delegate to be called by the {@link UserApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface UserApiDelegate {
 
     default Optional<NativeWebRequest> getRequest() {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
index ab1e85b3b842..589dd7dc5e7f 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
@@ -17,7 +17,7 @@
 
 import javax.servlet.ServletContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Configuration
 @EnableSwagger2
 public class OpenAPIDocumentationConfig {
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 448c77cea931..817c5dbee9e9 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a80499fd79b9..e617dc74d1cb 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d8db9baf3105..cd910636ca69 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 44e1e29d741e..f284380cbe13 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,7 +16,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index b94e539aa3f2..8faf67a5b652 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index c33e1e3b7a21..0d0076dda3f9 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index cab0c80d9b4c..6b8f52be750e 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 894eb466b4cc..5f308494e9b0 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java
index 376b84f872e9..983aaa651682 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java
@@ -14,7 +14,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index d4aeef01b3e3..7daefec9c1e3 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index b2da4b9b26a6..e61668a02e36 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java
index fb134a8c4419..f093b5145b14 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,7 +15,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest   {
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java
index 9bc946d6cc1a..68b76cd48854 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java
@@ -15,7 +15,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java
index 9a57d85eecad..3198b91b6d4f 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -13,7 +13,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java
index e1346fe63ea8..3f226a3826a0 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,7 +12,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java
index f6d3c17d0be3..5a431e966bba 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java
@@ -14,7 +14,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java
index cf145ae53718..2853ec34afd5 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,7 +12,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf   {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java
index db3f8e08dc0d..a60e65b76f5c 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java
@@ -12,7 +12,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java
index ba96dc2add68..c953d09e40ee 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java
index 59d479c85336..9d54590ff88e 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java
@@ -12,7 +12,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client   {
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java
index 02e027c3feea..5f7e3c788a49 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java
@@ -14,7 +14,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java
index a1c4c17d8907..1ef6c5e1bb76 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,7 +12,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf   {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java
index 7ee6a9816197..d78fbfba9c88 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,7 +15,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java
index 8eff3e0c49aa..36de994dfa0f 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,7 +14,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 2e88258ce75c..91048bcc9da5 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,7 +14,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass   {
   @JsonProperty("file")
   private java.io.File file;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
index a0a7ba857344..ce4f590b9b75 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest   {
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c0e7dd75528e..9739eccbd61e 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,7 +12,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java
index 80195fc3d4be..6f5f28691c78 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java
@@ -16,7 +16,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest   {
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 22f4e38a3775..0e73c00c6e34 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java
index 04606fb90460..227f9d14bb2c 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,7 +13,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
index 1d385b21bd4d..9952d79cde12 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,7 +12,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java
index 82026635f5cb..c8de97c9e060 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,7 +13,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn   {
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java
index 1180f019ea3f..75097d13c16c 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java
@@ -13,7 +13,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java
index 4423a2ac631d..4e7050b7076f 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,7 +13,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly   {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java
index 011bb43df5ee..d6542c00e833 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java
@@ -14,7 +14,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java
index 61dbaaefeeae..260288087a34 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,7 +13,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite   {
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
index 6b815c789260..4e7e80f529f3 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
@@ -19,7 +19,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 4e1c3e681095..199ed97783f8 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,7 +12,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java
index 6c0bfa749d3d..5285c2d9ced7 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,7 +12,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java
index c72064ce0428..caef83520fcb 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java
@@ -12,7 +12,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7dd51d7ccd56..b85f22fb8fdf 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
index c1f4cbd00a72..a16645b03a59 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample   {
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java
index d195089778a9..6512ac673542 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java
@@ -12,7 +12,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java
index dae97d794675..7590a9b7ed96 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,7 +15,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem   {
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 579bd42634b8..fef78e6b9021 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -23,7 +23,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "another-fake", description = "the another-fake API")
 public interface AnotherFakeApi {
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java
index c331936e9ac6..659e82778aa4 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiController.java
@@ -19,7 +19,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class AnotherFakeApiController implements AnotherFakeApi {
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
index a81e1aa6f58a..d17e376d976f 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
@@ -12,7 +12,7 @@
  * A delegate to be called by the {@link AnotherFakeApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface AnotherFakeApiDelegate {
 
     /**
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
index b3aec42a28e6..364b70eb9fd4 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
@@ -33,7 +33,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java
index b75ecc8e90d9..d61d01c66ba6 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java
@@ -29,7 +29,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeApiController implements FakeApi {
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
index 77c9d65965d8..c28f5b8e99fb 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -22,7 +22,7 @@
  * A delegate to be called by the {@link FakeApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface FakeApiDelegate {
 
     /**
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index d144c94bfda2..6a8919d2d1b4 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -23,7 +23,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake_classname_test", description = "the fake_classname_test API")
 public interface FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
index 176d4d3378d9..5c14bb5bed37 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
@@ -19,7 +19,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeClassnameTestApiController implements FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
index fbf48bc9fcfa..20d9b798c627 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
@@ -12,7 +12,7 @@
  * A delegate to be called by the {@link FakeClassnameTestApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface FakeClassnameTestApiDelegate {
 
     /**
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
index 7a9b6e56cc40..0c13bf4b97de 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
@@ -26,7 +26,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java
index 1241e84f8ec6..4a8a378932dc 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java
@@ -22,7 +22,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class PetApiController implements PetApi {
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java
index 6a9c39f47b09..426aeb269488 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -15,7 +15,7 @@
  * A delegate to be called by the {@link PetApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface PetApiDelegate {
 
     /**
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
index 5d9b575d9877..fe89b207bfee 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
@@ -24,7 +24,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java
index 53b5b7a76dbc..ad6c539471b0 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java
@@ -20,7 +20,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class StoreApiController implements StoreApi {
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java
index a3c84b992164..a7bfc60e1289 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -13,7 +13,7 @@
  * A delegate to be called by the {@link StoreApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface StoreApiDelegate {
 
     /**
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
index d8a1580f8de2..488b5b7c3ac9 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
@@ -24,7 +24,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "user", description = "the user API")
 public interface UserApi {
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java
index ce006c46dc02..4ee524e3a04d 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java
@@ -20,7 +20,7 @@
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class UserApiController implements UserApi {
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java
index 021cbf1ad7b9..81c3ecc25887 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java
@@ -13,7 +13,7 @@
  * A delegate to be called by the {@link UserApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface UserApiDelegate {
 
     /**
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
index bdf5a026ce14..425e530b93b1 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
@@ -17,7 +17,7 @@
 
 import javax.servlet.ServletContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Configuration
 @EnableSwagger2
 public class OpenAPIDocumentationConfig {
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 448c77cea931..817c5dbee9e9 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a80499fd79b9..e617dc74d1cb 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d8db9baf3105..cd910636ca69 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 16b3408f323b..accbd514dcad 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,7 +16,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index b94e539aa3f2..8faf67a5b652 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index c33e1e3b7a21..0d0076dda3f9 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index cab0c80d9b4c..6b8f52be750e 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 894eb466b4cc..5f308494e9b0 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
index 376b84f872e9..983aaa651682 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
@@ -14,7 +14,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index a1fe8166abf8..e6562d841044 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a76320466a38..3df8310ee9e2 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
index df4610324400..11afea41c019 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,7 +15,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest   {
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
index 9bc946d6cc1a..68b76cd48854 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
@@ -15,7 +15,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
index 9a57d85eecad..3198b91b6d4f 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -13,7 +13,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
index e1346fe63ea8..3f226a3826a0 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,7 +12,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
index f6d3c17d0be3..5a431e966bba 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
@@ -14,7 +14,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
index cf145ae53718..2853ec34afd5 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,7 +12,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf   {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
index db3f8e08dc0d..a60e65b76f5c 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
@@ -12,7 +12,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
index ba96dc2add68..c953d09e40ee 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
index 59d479c85336..9d54590ff88e 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
@@ -12,7 +12,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client   {
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
index 02e027c3feea..5f7e3c788a49 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
@@ -14,7 +14,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
index a1c4c17d8907..1ef6c5e1bb76 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,7 +12,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf   {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
index d57bb6c1de46..a0018a9a7fa6 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,7 +15,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
index 8eff3e0c49aa..36de994dfa0f 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,7 +14,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index ab7b747bf2fa..56b56a169c62 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,7 +14,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass   {
   @JsonProperty("file")
   private java.io.File file;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
index e63a63e74edc..971e9e254abd 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest   {
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c0e7dd75528e..9739eccbd61e 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,7 +12,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
index c9b418c6901b..7ba96a617a7a 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
@@ -16,7 +16,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest   {
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index f174af450d2e..ef568c52b0c6 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
index 04606fb90460..227f9d14bb2c 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,7 +13,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
index 1d385b21bd4d..9952d79cde12 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,7 +12,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
index 82026635f5cb..c8de97c9e060 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,7 +13,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn   {
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
index 1180f019ea3f..75097d13c16c 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
@@ -13,7 +13,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
index 4423a2ac631d..4e7050b7076f 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,7 +13,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly   {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
index f74c5d48fc2a..15ac8f5bdda5 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
@@ -14,7 +14,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
index 61dbaaefeeae..260288087a34 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,7 +13,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite   {
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
index 3e66cbdb75df..d53d84898239 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
@@ -19,7 +19,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 4e1c3e681095..199ed97783f8 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,7 +12,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
index 6c0bfa749d3d..5285c2d9ced7 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,7 +12,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
index c72064ce0428..caef83520fcb 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
@@ -12,7 +12,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
index b88e00b47d78..c5a00c2c8f8f 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
index 85694fed2185..d7073c73a2f5 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample   {
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
index d195089778a9..6512ac673542 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
@@ -12,7 +12,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
index ca74cfcfd91c..b179e232e4c6 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,7 +15,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem   {
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 1e7104c0b37d..c82299203b63 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "another-fake", description = "the another-fake API")
 public interface AnotherFakeApi {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java
index fff17a03c074..d8efcca7f8a4 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class AnotherFakeApiController implements AnotherFakeApi {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
index 887035221f84..b1cd89769a8d 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
@@ -37,7 +37,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java
index 36a7304885eb..c4b88419aabe 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeApiController implements FakeApi {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 969c419ca97e..e0da9a480310 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake_classname_test", description = "the fake_classname_test API")
 public interface FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
index f4cccda6d621..85458b255da5 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeClassnameTestApiController implements FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
index dc4bb5bf7675..05b6668260fd 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java
index 1138014eedf7..e72c57e3cbec 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class PetApiController implements PetApi {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
index a87f92e8c347..7ee3a40eb744 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java
index 7b2593af1b1c..1293b5c8f6e4 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class StoreApiController implements StoreApi {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
index c972d1c20465..c4b85c1f2aba 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "user", description = "the user API")
 public interface UserApi {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java
index 5eca262e4327..3f6c4d9a2d6f 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class UserApiController implements UserApi {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
index ab1e85b3b842..589dd7dc5e7f 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
@@ -17,7 +17,7 @@
 
 import javax.servlet.ServletContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Configuration
 @EnableSwagger2
 public class OpenAPIDocumentationConfig {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 448c77cea931..817c5dbee9e9 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a80499fd79b9..e617dc74d1cb 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d8db9baf3105..cd910636ca69 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 44e1e29d741e..f284380cbe13 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,7 +16,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
   @Valid
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index b94e539aa3f2..8faf67a5b652 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index c33e1e3b7a21..0d0076dda3f9 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index cab0c80d9b4c..6b8f52be750e 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 894eb466b4cc..5f308494e9b0 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
index 376b84f872e9..983aaa651682 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
@@ -14,7 +14,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index d4aeef01b3e3..7daefec9c1e3 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index b2da4b9b26a6..e61668a02e36 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
index fb134a8c4419..f093b5145b14 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,7 +15,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest   {
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
index 9bc946d6cc1a..68b76cd48854 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
@@ -15,7 +15,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
index 9a57d85eecad..3198b91b6d4f 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -13,7 +13,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
index e1346fe63ea8..3f226a3826a0 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,7 +12,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
index f6d3c17d0be3..5a431e966bba 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
@@ -14,7 +14,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
index cf145ae53718..2853ec34afd5 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,7 +12,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf   {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
index db3f8e08dc0d..a60e65b76f5c 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
@@ -12,7 +12,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
index ba96dc2add68..c953d09e40ee 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
index 59d479c85336..9d54590ff88e 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
@@ -12,7 +12,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client   {
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
index 02e027c3feea..5f7e3c788a49 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
@@ -14,7 +14,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
index a1c4c17d8907..1ef6c5e1bb76 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,7 +12,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf   {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
index 7ee6a9816197..d78fbfba9c88 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,7 +15,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
index 8eff3e0c49aa..36de994dfa0f 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,7 +14,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 2e88258ce75c..91048bcc9da5 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,7 +14,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass   {
   @JsonProperty("file")
   private java.io.File file;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
index a0a7ba857344..ce4f590b9b75 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest   {
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c0e7dd75528e..9739eccbd61e 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,7 +12,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
index 80195fc3d4be..6f5f28691c78 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
@@ -16,7 +16,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest   {
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 22f4e38a3775..0e73c00c6e34 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
index 04606fb90460..227f9d14bb2c 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,7 +13,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
index 1d385b21bd4d..9952d79cde12 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,7 +12,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
index 82026635f5cb..c8de97c9e060 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,7 +13,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn   {
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
index 1180f019ea3f..75097d13c16c 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
@@ -13,7 +13,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
index 4423a2ac631d..4e7050b7076f 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,7 +13,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly   {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
index 011bb43df5ee..d6542c00e833 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
@@ -14,7 +14,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
index 61dbaaefeeae..260288087a34 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,7 +13,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite   {
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
index 6b815c789260..4e7e80f529f3 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
@@ -19,7 +19,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 4e1c3e681095..199ed97783f8 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,7 +12,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
index 6c0bfa749d3d..5285c2d9ced7 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,7 +12,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
index c72064ce0428..caef83520fcb 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
@@ -12,7 +12,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7dd51d7ccd56..b85f22fb8fdf 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
index c1f4cbd00a72..a16645b03a59 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample   {
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
index d195089778a9..6512ac673542 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
@@ -12,7 +12,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
index dae97d794675..7590a9b7ed96 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,7 +15,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem   {
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 7faf2b8b83da..a7c9567e168d 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -26,7 +26,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "another-fake", description = "the another-fake API")
 public interface AnotherFakeApi {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java
index 3bc2df15df60..df11134c8067 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class AnotherFakeApiController implements AnotherFakeApi {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
index b3b75e8872b8..bc51a545ff54 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
@@ -19,7 +19,7 @@
  * A delegate to be called by the {@link AnotherFakeApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface AnotherFakeApiDelegate {
 
     default Optional<NativeWebRequest> getRequest() {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
index 4735c092eb39..203c4720538e 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
@@ -36,7 +36,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java
index 75c4b5587be1..6b22c1aba661 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeApiController implements FakeApi {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
index 2f4d5ac28753..e3bf18868356 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -29,7 +29,7 @@
  * A delegate to be called by the {@link FakeApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface FakeApiDelegate {
 
     default Optional<NativeWebRequest> getRequest() {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 7121790c11e8..c3b92d8b54b2 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -26,7 +26,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake_classname_test", description = "the fake_classname_test API")
 public interface FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
index 6566359e66f5..58497641e4c5 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeClassnameTestApiController implements FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
index f273c4040bc0..ea6c1aec4b82 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
@@ -19,7 +19,7 @@
  * A delegate to be called by the {@link FakeClassnameTestApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface FakeClassnameTestApiDelegate {
 
     default Optional<NativeWebRequest> getRequest() {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
index d882151d5057..1eb822dea268 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
@@ -29,7 +29,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java
index a8c8c3765a66..5fa088c6f10b 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class PetApiController implements PetApi {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java
index 538ca335758c..f8c2b92e9989 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -22,7 +22,7 @@
  * A delegate to be called by the {@link PetApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface PetApiDelegate {
 
     default Optional<NativeWebRequest> getRequest() {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
index 6495db3d5816..68b06d86791b 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
@@ -27,7 +27,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java
index d00b4841fc0a..9e08c646ae92 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class StoreApiController implements StoreApi {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java
index 7aad4e8fc2e4..37457faadcd1 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -20,7 +20,7 @@
  * A delegate to be called by the {@link StoreApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface StoreApiDelegate {
 
     default Optional<NativeWebRequest> getRequest() {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
index 157885f7e388..8a580c56cdac 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
@@ -27,7 +27,7 @@
 import javax.validation.constraints.*;
 import java.util.List;
 import java.util.Map;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "user", description = "the user API")
 public interface UserApi {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java
index 5bd8c1f9f573..bc2d33598fd9 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class UserApiController implements UserApi {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java
index 6b8e3d5d8180..1f80fee7bf99 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java
@@ -20,7 +20,7 @@
  * A delegate to be called by the {@link UserApiController}}.
  * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class.
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public interface UserApiDelegate {
 
     default Optional<NativeWebRequest> getRequest() {
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 448c77cea931..817c5dbee9e9 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a80499fd79b9..e617dc74d1cb 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d8db9baf3105..cd910636ca69 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 44e1e29d741e..f284380cbe13 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,7 +16,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
   @Valid
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index b94e539aa3f2..8faf67a5b652 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index c33e1e3b7a21..0d0076dda3f9 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index cab0c80d9b4c..6b8f52be750e 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 894eb466b4cc..5f308494e9b0 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
index 376b84f872e9..983aaa651682 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
@@ -14,7 +14,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index d4aeef01b3e3..7daefec9c1e3 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index b2da4b9b26a6..e61668a02e36 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
index fb134a8c4419..f093b5145b14 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,7 +15,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest   {
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java
index 9bc946d6cc1a..68b76cd48854 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java
@@ -15,7 +15,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
index 9a57d85eecad..3198b91b6d4f 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -13,7 +13,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
index e1346fe63ea8..3f226a3826a0 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,7 +12,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java
index f6d3c17d0be3..5a431e966bba 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java
@@ -14,7 +14,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java
index cf145ae53718..2853ec34afd5 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,7 +12,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf   {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
index db3f8e08dc0d..a60e65b76f5c 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
@@ -12,7 +12,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
index ba96dc2add68..c953d09e40ee 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
index 59d479c85336..9d54590ff88e 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
@@ -12,7 +12,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client   {
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java
index 02e027c3feea..5f7e3c788a49 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java
@@ -14,7 +14,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java
index a1c4c17d8907..1ef6c5e1bb76 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,7 +12,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf   {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
index 7ee6a9816197..d78fbfba9c88 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,7 +15,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
index 8eff3e0c49aa..36de994dfa0f 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,7 +14,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 2e88258ce75c..91048bcc9da5 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,7 +14,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass   {
   @JsonProperty("file")
   private java.io.File file;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
index a0a7ba857344..ce4f590b9b75 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest   {
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c0e7dd75528e..9739eccbd61e 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,7 +12,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
index 80195fc3d4be..6f5f28691c78 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
@@ -16,7 +16,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest   {
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 22f4e38a3775..0e73c00c6e34 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
index 04606fb90460..227f9d14bb2c 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,7 +13,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
index 1d385b21bd4d..9952d79cde12 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,7 +12,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
index 82026635f5cb..c8de97c9e060 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,7 +13,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn   {
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
index 1180f019ea3f..75097d13c16c 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
@@ -13,7 +13,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
index 4423a2ac631d..4e7050b7076f 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,7 +13,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly   {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
index 011bb43df5ee..d6542c00e833 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
@@ -14,7 +14,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
index 61dbaaefeeae..260288087a34 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,7 +13,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite   {
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
index 6b815c789260..4e7e80f529f3 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
@@ -19,7 +19,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 4e1c3e681095..199ed97783f8 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,7 +12,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
index 6c0bfa749d3d..5285c2d9ced7 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,7 +12,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
index c72064ce0428..caef83520fcb 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
@@ -12,7 +12,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7dd51d7ccd56..b85f22fb8fdf 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
index c1f4cbd00a72..a16645b03a59 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample   {
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
index d195089778a9..6512ac673542 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
@@ -12,7 +12,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
index dae97d794675..7590a9b7ed96 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,7 +15,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem   {
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 4236103bf676..2052f5808def 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "another-fake", description = "the another-fake API")
 public interface AnotherFakeApi {
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java
index fff17a03c074..d8efcca7f8a4 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class AnotherFakeApiController implements AnotherFakeApi {
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
index b2292e6932c0..b0855540d130 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
@@ -37,7 +37,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java
index 36a7304885eb..c4b88419aabe 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeApiController implements FakeApi {
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 1f419fa0a6eb..765feb517438 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake_classname_test", description = "the fake_classname_test API")
 public interface FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
index f4cccda6d621..85458b255da5 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeClassnameTestApiController implements FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
index 3310a276528a..53c4221aacd1 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java
index 1138014eedf7..e72c57e3cbec 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class PetApiController implements PetApi {
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
index 26bb1a8482aa..e135ad2702c0 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java
index 7b2593af1b1c..1293b5c8f6e4 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class StoreApiController implements StoreApi {
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
index 23205a5d72a3..d19c52cdfd66 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "user", description = "the user API")
 public interface UserApi {
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java
index 5eca262e4327..3f6c4d9a2d6f 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class UserApiController implements UserApi {
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
index b9883262f5c6..f5a755245da8 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
@@ -18,7 +18,7 @@
 import java.util.Optional;
 import javax.servlet.ServletContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Configuration
 @EnableSwagger2
 public class OpenAPIDocumentationConfig {
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 448c77cea931..817c5dbee9e9 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a80499fd79b9..e617dc74d1cb 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d8db9baf3105..cd910636ca69 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 44e1e29d741e..f284380cbe13 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,7 +16,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
   @Valid
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index b94e539aa3f2..8faf67a5b652 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index c33e1e3b7a21..0d0076dda3f9 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index cab0c80d9b4c..6b8f52be750e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 894eb466b4cc..5f308494e9b0 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
index 376b84f872e9..983aaa651682 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
@@ -14,7 +14,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index d4aeef01b3e3..7daefec9c1e3 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index b2da4b9b26a6..e61668a02e36 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
index fb134a8c4419..f093b5145b14 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,7 +15,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest   {
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java
index 9bc946d6cc1a..68b76cd48854 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java
@@ -15,7 +15,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java
index 9a57d85eecad..3198b91b6d4f 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -13,7 +13,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
index e1346fe63ea8..3f226a3826a0 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,7 +12,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java
index f6d3c17d0be3..5a431e966bba 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java
@@ -14,7 +14,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java
index cf145ae53718..2853ec34afd5 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,7 +12,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf   {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
index db3f8e08dc0d..a60e65b76f5c 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
@@ -12,7 +12,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
index ba96dc2add68..c953d09e40ee 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
index 59d479c85336..9d54590ff88e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
@@ -12,7 +12,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client   {
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java
index 02e027c3feea..5f7e3c788a49 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java
@@ -14,7 +14,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java
index a1c4c17d8907..1ef6c5e1bb76 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,7 +12,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf   {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
index 7ee6a9816197..d78fbfba9c88 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,7 +15,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
index 8eff3e0c49aa..36de994dfa0f 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,7 +14,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 2e88258ce75c..91048bcc9da5 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,7 +14,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass   {
   @JsonProperty("file")
   private java.io.File file;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
index a0a7ba857344..ce4f590b9b75 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest   {
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c0e7dd75528e..9739eccbd61e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,7 +12,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
index 80195fc3d4be..6f5f28691c78 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
@@ -16,7 +16,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest   {
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 22f4e38a3775..0e73c00c6e34 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
index 04606fb90460..227f9d14bb2c 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,7 +13,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
index 1d385b21bd4d..9952d79cde12 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,7 +12,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
index 82026635f5cb..c8de97c9e060 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,7 +13,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn   {
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
index 1180f019ea3f..75097d13c16c 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
@@ -13,7 +13,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
index 4423a2ac631d..4e7050b7076f 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,7 +13,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly   {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
index 011bb43df5ee..d6542c00e833 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
@@ -14,7 +14,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
index 61dbaaefeeae..260288087a34 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,7 +13,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite   {
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
index 6b815c789260..4e7e80f529f3 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
@@ -19,7 +19,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 4e1c3e681095..199ed97783f8 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,7 +12,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
index 6c0bfa749d3d..5285c2d9ced7 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,7 +12,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
index c72064ce0428..caef83520fcb 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
@@ -12,7 +12,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7dd51d7ccd56..b85f22fb8fdf 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
index c1f4cbd00a72..a16645b03a59 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample   {
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
index d195089778a9..6512ac673542 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
@@ -12,7 +12,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
index dae97d794675..7590a9b7ed96 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,7 +15,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem   {
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
index 91a77eb41644..7bdd11028aaf 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
@@ -17,7 +17,7 @@
 
 import javax.servlet.ServletContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Configuration
 @EnableSwagger2
 public class OpenAPIDocumentationConfig {
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java
index 720a33e181df..5d6e8ecaf63b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "another-fake", description = "the another-fake API")
 @VirtualService
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApiController.java
index 8ba61766e9e0..78ba74424cb6 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApiController.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class AnotherFakeApiController implements AnotherFakeApi {
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
index 9dff9c093bfa..c02b842be9bb 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
@@ -39,7 +39,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake", description = "the fake API")
 @VirtualService
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java
index 4b2e463440dc..4d76ead36678 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeApiController implements FakeApi {
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java
index 25944a080117..feb616710d83 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake_classname_test", description = "the fake_classname_test API")
 @VirtualService
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApiController.java
index 9a048c36e727..a737205f48f6 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApiController.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeClassnameTestApiController implements FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
index befb74b3a208..fbe40637013a 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
@@ -32,7 +32,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "pet", description = "the pet API")
 @VirtualService
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApiController.java
index d9f4d8f12646..0abcfc3c7138 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApiController.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class PetApiController implements PetApi {
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
index 53579226831d..0e9b4c38c199 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "store", description = "the store API")
 @VirtualService
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApiController.java
index abb0e0f53700..8302e1607788 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApiController.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class StoreApiController implements StoreApi {
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java
index 017f2b63a31c..4eaafdd0f23c 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "user", description = "the user API")
 @VirtualService
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApiController.java
index 01ceadc0d000..46bbd55b84f9 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApiController.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class UserApiController implements UserApi {
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java
index bc5960e9e2a0..b5e7a7cccd9e 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java
index 2cfbb24d2edf..314ec6683552 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java
index 8e55722065f4..89bc70b7798a 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
index bf1af7c2e709..d4b6fbd7a2e0 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
@@ -16,7 +16,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
   @Valid
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java
index 2b47dfbf1c73..00f8fed328e7 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java
index fe6a25142e7e..f7bb213b1d73 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java
index 247eb15053a5..fb4cf79f9514 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java
index 860a174ebc00..c6c34fe98295 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java
index c4b21a516049..4a033980187e 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java
@@ -14,7 +14,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java
index 97983a205d65..0d978e5bff68 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java
index c621a5abdd83..0b74d6a8d594 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java
index a1c0e06ea614..38dee3e3d70b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java
@@ -15,7 +15,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest   {
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java
index aad86c60481e..347a321bc9be 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java
@@ -15,7 +15,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java
index b98ba1e2fa12..eb3bcb8a8042 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java
@@ -13,7 +13,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java
index 37fbab45b5de..effa21f4696d 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java
@@ -12,7 +12,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java
index 11b3fdcac09c..a8692fa3961b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java
@@ -14,7 +14,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java
index aee739099baf..c1158711761e 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java
@@ -12,7 +12,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf   {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java
index 1de7ecef165d..fe7d1cb7fe66 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java
@@ -12,7 +12,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java
index c9963672df27..c0bd458211f4 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java
@@ -13,7 +13,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java
index bdfe8ab1441d..c2a3e5573262 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java
@@ -12,7 +12,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client   {
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java
index 1cbf5a5cbc0a..e635e8a3826a 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java
@@ -14,7 +14,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java
index adb89e08f8a3..59020d1e3b8b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java
@@ -12,7 +12,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf   {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java
index d2346d758a63..24d1f5a5e27b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java
@@ -15,7 +15,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java
index cc61c7818af9..9e9ebbeee36a 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java
@@ -14,7 +14,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java
index a3eb0b9febc7..b9ab4a75ed19 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java
@@ -14,7 +14,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass   {
   @JsonProperty("file")
   private java.io.File file;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
index 88c862b29b79..456fa9277f3b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
@@ -17,7 +17,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest   {
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java
index 722c0d1e398c..4622b7bb4266 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java
@@ -12,7 +12,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java
index 0e2354891e5b..039bdc8be922 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java
@@ -16,7 +16,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest   {
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 5a2047eb98c5..725aa2a59c1a 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java
index 83cc4f8174cb..3b7f00d67920 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java
@@ -13,7 +13,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java
index 8ff519aea3e7..0215b0def64e 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java
@@ -12,7 +12,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java
index 16f683d95dc7..b9bcee3865aa 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java
@@ -13,7 +13,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn   {
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java
index fd419b60a0cf..f4ec62f55112 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java
@@ -13,7 +13,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java
index 494ac9d66d95..57f1c7d81e83 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java
@@ -13,7 +13,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly   {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java
index 2b56ad706266..4425b3904dac 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java
@@ -14,7 +14,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java
index cdff3253b98d..a85678bf34ad 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java
@@ -13,7 +13,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite   {
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
index 196538b59e8a..8cf5d57c02b3 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
@@ -19,7 +19,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java
index 2526f0d1f72f..e95b3beb1615 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java
@@ -12,7 +12,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java
index b4bc84c7b910..6d76dd1312e8 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java
@@ -12,7 +12,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java
index b833cfcd350a..3ba3bb2210d3 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java
@@ -12,7 +12,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java
index 99ab478b4724..be45dd107007 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java
index 484e8f018b95..622b1d429f6d 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample   {
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java
index b5a97b806c97..01f181e57b46 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java
@@ -12,7 +12,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java
index ac1ba8ac6353..f1e098a90a12 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java
@@ -15,7 +15,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem   {
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 4236103bf676..2052f5808def 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "another-fake", description = "the another-fake API")
 public interface AnotherFakeApi {
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApiController.java
index fff17a03c074..d8efcca7f8a4 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApiController.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class AnotherFakeApiController implements AnotherFakeApi {
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
index 2135b88c3d14..637dabcf2d2e 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
@@ -37,7 +37,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java
index 36a7304885eb..c4b88419aabe 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeApiController implements FakeApi {
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 1f419fa0a6eb..765feb517438 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "fake_classname_test", description = "the fake_classname_test API")
 public interface FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
index f4cccda6d621..85458b255da5 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeClassnameTestApiController implements FakeClassnameTestApi {
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
index 4349917e1167..23311c253bbd 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "pet", description = "the pet API")
 public interface PetApi {
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApiController.java
index 1138014eedf7..e72c57e3cbec 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApiController.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class PetApiController implements PetApi {
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
index 26bb1a8482aa..e135ad2702c0 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "store", description = "the store API")
 public interface StoreApi {
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApiController.java
index 7b2593af1b1c..1293b5c8f6e4 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApiController.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class StoreApiController implements StoreApi {
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
index 23205a5d72a3..d19c52cdfd66 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Validated
 @Api(value = "user", description = "the user API")
 public interface UserApi {
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApiController.java
index 5eca262e4327..3f6c4d9a2d6f 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApiController.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApiController.java
@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.NativeWebRequest;
 import java.util.Optional;
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Controller
 @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class UserApiController implements UserApi {
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
index ab1e85b3b842..589dd7dc5e7f 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
@@ -17,7 +17,7 @@
 
 import javax.servlet.ServletContext;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @Configuration
 @EnableSwagger2
 public class OpenAPIDocumentationConfig {
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 448c77cea931..817c5dbee9e9 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a80499fd79b9..e617dc74d1cb 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesArray
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d8db9baf3105..cd910636ca69 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 44e1e29d741e..f284380cbe13 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,7 +16,7 @@
 /**
  * AdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
   @Valid
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index b94e539aa3f2..8faf67a5b652 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesInteger
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index c33e1e3b7a21..0d0076dda3f9 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,7 +15,7 @@
 /**
  * AdditionalPropertiesNumber
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index cab0c80d9b4c..6b8f52be750e 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesObject
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 894eb466b4cc..5f308494e9b0 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,7 +14,7 @@
 /**
  * AdditionalPropertiesString
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java
index 376b84f872e9..983aaa651682 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Animal.java
@@ -14,7 +14,7 @@
 /**
  * Animal
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index d4aeef01b3e3..7daefec9c1e3 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index b2da4b9b26a6..e61668a02e36 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,7 +15,7 @@
 /**
  * ArrayOfNumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   @Valid
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java
index fb134a8c4419..f093b5145b14 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,7 +15,7 @@
 /**
  * ArrayTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest   {
   @JsonProperty("array_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java
index 9bc946d6cc1a..68b76cd48854 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCat.java
@@ -15,7 +15,7 @@
 /**
  * BigCat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCat extends Cat  {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java
index 9a57d85eecad..3198b91b6d4f 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -13,7 +13,7 @@
 /**
  * BigCatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BigCatAllOf   {
   /**
    * Gets or Sets kind
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java
index e1346fe63ea8..3f226a3826a0 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,7 +12,7 @@
 /**
  * Capitalization
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java
index f6d3c17d0be3..5a431e966bba 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Cat.java
@@ -14,7 +14,7 @@
 /**
  * Cat
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java
index cf145ae53718..2853ec34afd5 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,7 +12,7 @@
 /**
  * CatAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf   {
   @JsonProperty("declawed")
   private Boolean declawed;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
index db3f8e08dc0d..a60e65b76f5c 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
@@ -12,7 +12,7 @@
 /**
  * Category
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java
index ba96dc2add68..c953d09e40ee 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java
index 59d479c85336..9d54590ff88e 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Client.java
@@ -12,7 +12,7 @@
 /**
  * Client
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client   {
   @JsonProperty("client")
   private String client;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java
index 02e027c3feea..5f7e3c788a49 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Dog.java
@@ -14,7 +14,7 @@
 /**
  * Dog
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java
index a1c4c17d8907..1ef6c5e1bb76 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,7 +12,7 @@
 /**
  * DogAllOf
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf   {
   @JsonProperty("breed")
   private String breed;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java
index 7ee6a9816197..d78fbfba9c88 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,7 +15,7 @@
 /**
  * EnumArrays
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumArrays   {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java
index 8eff3e0c49aa..36de994dfa0f 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,7 +14,7 @@
 /**
  * EnumTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EnumTest   {
   /**
    * Gets or Sets enumString
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 2e88258ce75c..91048bcc9da5 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,7 +14,7 @@
 /**
  * FileSchemaTestClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass   {
   @JsonProperty("file")
   private java.io.File file;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java
index a0a7ba857344..ce4f590b9b75 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,7 @@
 /**
  * FormatTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest   {
   @JsonProperty("integer")
   private Integer integer;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c0e7dd75528e..9739eccbd61e 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,7 +12,7 @@
 /**
  * HasOnlyReadOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java
index 80195fc3d4be..6f5f28691c78 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTest.java
@@ -16,7 +16,7 @@
 /**
  * MapTest
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest   {
   @JsonProperty("map_map_of_string")
   @Valid
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 22f4e38a3775..0e73c00c6e34 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,7 +18,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   private UUID uuid;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java
index 04606fb90460..227f9d14bb2c 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,7 +13,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
index 1d385b21bd4d..9952d79cde12 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,7 +12,7 @@
 /**
  * ModelApiResponse
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse   {
   @JsonProperty("code")
   private Integer code;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java
index 82026635f5cb..c8de97c9e060 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,7 +13,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn   {
   @JsonProperty("return")
   private Integer _return;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java
index 1180f019ea3f..75097d13c16c 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Name.java
@@ -13,7 +13,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name   {
   @JsonProperty("name")
   private Integer name;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java
index 4423a2ac631d..4e7050b7076f 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,7 +13,7 @@
 /**
  * NumberOnly
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly   {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
index 011bb43df5ee..d6542c00e833 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
@@ -14,7 +14,7 @@
 /**
  * Order
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java
index 61dbaaefeeae..260288087a34 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,7 +13,7 @@
 /**
  * OuterComposite
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite   {
   @JsonProperty("my_number")
   private BigDecimal myNumber;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
index 6b815c789260..4e7e80f529f3 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
@@ -19,7 +19,7 @@
 /**
  * Pet
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 4e1c3e681095..199ed97783f8 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,7 +12,7 @@
 /**
  * ReadOnlyFirst
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
   private String bar;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java
index 6c0bfa749d3d..5285c2d9ced7 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,7 +12,7 @@
 /**
  * SpecialModelName
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
index c72064ce0428..caef83520fcb 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
@@ -12,7 +12,7 @@
 /**
  * Tag
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7dd51d7ccd56..b85f22fb8fdf 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderDefault
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
   private String stringItem = "what";
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java
index c1f4cbd00a72..a16645b03a59 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,7 +15,7 @@
 /**
  * TypeHolderExample
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample   {
   @JsonProperty("string_item")
   private String stringItem;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
index d195089778a9..6512ac673542 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
@@ -12,7 +12,7 @@
 /**
  * User
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User   {
   @JsonProperty("id")
   private Long id;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java
index dae97d794675..7590a9b7ed96 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,7 +15,7 @@
 /**
  * XmlItem
  */
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem   {
   @JsonProperty("attribute_string")
   private String attributeString;
diff --git a/website/src/dynamic/sponsors.yml b/website/src/dynamic/sponsors.yml
index b5b5f04b2be6..68bcf586a175 100644
--- a/website/src/dynamic/sponsors.yml
+++ b/website/src/dynamic/sponsors.yml
@@ -18,3 +18,8 @@
   image: "img/companies/datadog.png"
   infoLink: "https://datadoghq.com/?utm_source=openapi_generator&utm_medium=official_website&utm_campaign=sponsor"
   bronze: true
+-
+  caption: "Thales"
+  image: "img/companies/thales.jpg"
+  infoLink: "https://cpl.thalesgroup.com/?utm_source=openapi_generator&utm_medium=official_website&utm_campaign=sponsor"
+  bronze: true
diff --git a/website/static/img/companies/thales.jpg b/website/static/img/companies/thales.jpg
new file mode 100644
index 000000000000..feb6195cbdf6
Binary files /dev/null and b/website/static/img/companies/thales.jpg differ